diff --git a/.tx/config b/.tx/config
index d3ded2878a..cb617326b9 100644
--- a/.tx/config
+++ b/.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
diff --git a/AUTHORS b/AUTHORS
index 0f793cc5f4..8cd86d38dc 100644
--- a/AUTHORS
+++ b/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.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 3b1734157d..1563c25043 100644
--- a/CONTRIBUTING.rst
+++ b/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.
diff --git a/MANIFEST.in b/MANIFEST.in
index fbda541d22..0e0aba1268 100644
--- a/MANIFEST.in
+++ b/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 *
diff --git a/django/bin/daily_cleanup.py b/django/bin/daily_cleanup.py
index ac3de00f2c..5a2ce210f4 100755
--- a/django/bin/daily_cleanup.py
+++ b/django/bin/daily_cleanup.py
@@ -15,5 +15,5 @@ if __name__ == "__main__":
     warnings.warn(
         "The `daily_cleanup` script has been deprecated "
         "in favor of `django-admin.py clearsessions`.",
-        PendingDeprecationWarning)
+        DeprecationWarning)
     management.call_command('clearsessions')
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index b00c8d5046..f876c490c8 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -8,6 +8,7 @@ a list of all possible variables.
 
 import logging
 import os
+import sys
 import time     # Needed for Windows
 import warnings
 
@@ -15,6 +16,7 @@ from django.conf import global_settings
 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 @@ class LazySettings(LazyObject):
         """
         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 @@ class Settings(BaseSettings):
                         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 @@ class UserSettingsHolder(BaseSettings):
         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]
diff --git a/django/conf/app_template/admin.py b/django/conf/app_template/admin.py
new file mode 100644
index 0000000000..8c38f3f3da
--- /dev/null
+++ b/django/conf/app_template/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/django/conf/app_template/tests.py b/django/conf/app_template/tests.py
index 501deb776c..7ce503c2dd 100644
--- a/django/conf/app_template/tests.py
+++ b/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.
diff --git a/django/conf/app_template/views.py b/django/conf/app_template/views.py
index 60f00ef0ef..91ea44a218 100644
--- a/django/conf/app_template/views.py
+++ b/django/conf/app_template/views.py
@@ -1 +1,3 @@
+from django.shortcuts import render
+
 # Create your views here.
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index c533efc41c..a9af4baa59 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -29,6 +29,10 @@ ADMINS = ()
 #   * 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 @@ USE_TZ = False
 # 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 @@ LANGUAGES = (
     ('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 @@ LANGUAGES = (
     ('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 @@ LANGUAGES = (
     ('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 @@ LANGUAGES = (
     ('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 @@ FILE_CHARSET = 'utf-8'
 # 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 @@ ALLOWED_INCLUDE_ROOTS = ()
 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 @@ DATE_INPUT_FORMATS = (
 # * 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_RESET_TIMEOUT_DAYS = 3
 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_NAME = 'csrftoken'
 CSRF_COOKIE_DOMAIN = None
 CSRF_COOKIE_PATH = '/'
 CSRF_COOKIE_SECURE = False
+CSRF_COOKIE_HTTPONLY = False
 
 ############
 # MESSAGES #
diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py
index 45e56b6d19..df6ab07663 100644
--- a/django/conf/locale/__init__.py
+++ b/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 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         'bidi': True,
         'code': 'fa',
         'name': 'Persian',
-        'name_local': '\u0641\u0627\u0631\u0633\u06cc',
+        'name_local': 'فارسی',
     },
     'fi': {
         'bidi': False,
@@ -140,7 +165,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'fr',
         'name': 'French',
-        'name_local': 'fran\xe7ais',
+        'name_local': 'français',
     },
     'fy-nl': {
         'bidi': False,
@@ -164,7 +189,7 @@ LANG_INFO = {
         'bidi': True,
         'code': 'he',
         'name': 'Hebrew',
-        'name_local': '\u05e2\u05d1\u05e8\u05d9\u05ea',
+        'name_local': 'עברית',
     },
     'hi': {
         'bidi': False,
@@ -184,6 +209,12 @@ LANG_INFO = {
         'name': 'Hungarian',
         'name_local': 'Magyar',
     },
+    'ia': {
+        'bidi': False,
+        'code': 'ia',
+        'name': 'Interlingua',
+        'name_local': 'Interlingua',
+    },
     'id': {
         'bidi': False,
         'code': 'id',
@@ -194,7 +225,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'is',
         'name': 'Icelandic',
-        'name_local': '\xcdslenska',
+        'name_local': 'Íslenska',
     },
     'it': {
         'bidi': False,
@@ -206,19 +237,19 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         'name': 'Norwegian',
         'name_local': 'norsk',
     },
+    'os': {
+        'bidi': False,
+        'code': 'os',
+        'name': 'Ossetic',
+        'name_local': 'Ирон',
+    },
     'pa': {
         'bidi': False,
         'code': 'pa',
@@ -314,37 +363,37 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         'bidi': False,
         'code': 'sr',
         'name': 'Serbian',
-        'name_local': '\u0441\u0440\u043f\u0441\u043a\u0438',
+        'name_local': 'српски',
     },
     'sr-latn': {
         'bidi': False,
@@ -380,13 +429,13 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         '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 @@ LANG_INFO = {
         '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': '繁體中文',
     }
 }
diff --git a/django/conf/locale/af/LC_MESSAGES/django.mo b/django/conf/locale/af/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..84a21e49a6
Binary files /dev/null and b/django/conf/locale/af/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/af/LC_MESSAGES/django.po b/django/conf/locale/af/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..7d3ed8d9d4
--- /dev/null
+++ b/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."
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo
index 5f6f4c269f..d81a322813 100644
Binary files a/django/conf/locale/ar/LC_MESSAGES/django.mo and b/django/conf/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.po b/django/conf/locale/ar/LC_MESSAGES/django.po
index d0e3ebdb15..d2886168db 100644
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "البنغاليّة"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "البوسنيّة"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "الكتلانيّة"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "التشيكيّة"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "الويلز"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "الدنماركيّة"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "الألمانيّة"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "اليونانيّة"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "الإنجليزيّة"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "الإنجليزيّة البريطانيّة"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "الإسبانيّة"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "الأسبانية الأرجنتينية"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "الأسبانية المكسيكية"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "الإستونيّة"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "الباسك"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "الفارسيّة"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "الفنلنديّة"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "الفرنسيّة"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "الفريزيّة"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "الإيرلنديّة"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "الجليقيّة"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "العبريّة"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "الهندية"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "الكرواتيّة"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "الهنغاريّة"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "الإندونيسيّة"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "الآيسلنديّة"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "الإيطاليّة"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "اليابانيّة"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "الجورجيّة"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "الخمر"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "الهنديّة (كنّادا)"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "الكوريّة"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "اللتوانيّة"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "اللاتفيّة"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "المقدونيّة"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "المايالام"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "المنغوليّة"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "البوكمال نرويجيّة"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "الهولنديّة"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "النينورسك نرويجيّة"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "البنجابيّة"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "البولنديّة"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "البرتغاليّة"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "البرتغاليّة البرازيليّة"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "الرومانيّة"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "الروسيّة"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "السلوفاكيّة"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "السلوفانيّة"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "الألبانيّة"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "الصربيّة"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "اللاتينيّة الصربيّة"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "السويديّة"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "التاميل"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "التيلوغو"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "التايلنديّة"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "التركيّة"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "الأكرانيّة"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "الأوردو"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "الفيتناميّة"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "الصينيّة المبسطة"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "الصينيّة التقليدية"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "أدخل قيمة صحيحة."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "يبدو أن هذا الرابط غير متوفر."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "أدخل رابطاً صحيحاً."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "أدخل عنوان بريد إلكتروني صحيح."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "أدخل عنوان IPv4 صحيح."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "أدخل أرقاما فقط مفصول بينها بفواصل."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "تحقق من أن تكون هذه القيمة أقل من %(limit_value)s أو مساوية لها."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "تحقق من أن تكون هذه القيمة أكثر من %(limit_value)s أو مساوية لها."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -364,7 +384,7 @@ msgstr ""
 "تحقق من أن هذه القيمة تحتوي %(limit_value)d أحرف على الأقل (عدد أحرفها "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -373,271 +393,271 @@ msgstr ""
 "تحقق من أن هذه القيمة مكونة من %(limit_value)d أحرف كحد أقصى (عدد أحرفها "
 "الآن %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "و"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 والحقل %(field_label)s موجود مسبقاً."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "القيمة %r ليست خياراً صالحاً."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "لا يمكن تعيين null كقيمة لهذا الحقل."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "لا يمكن ترك هذا الحقل فارغاً."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "حقل نوع: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "عدد صحيح"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "ثنائي (إما True أو False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "سلسلة نص (%(max_length)s كحد أقصى)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "أرقام صحيحة مفصولة بفواصل"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "التاريخ (دون الوقت)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "التاريخ (مع الوقت)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "رقم عشري"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "عنوان بريد إلكتروني"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "مسار الملف"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "رقم فاصلة عائمة"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "عدد صحيح كبير (8 بايت)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "عنوان IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "ثنائي (إما True أو False أو None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "نص"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "وقت"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "رابط"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "النموذج %(model)s ذو الحقل الرئيسي %(pk)r غير موجود."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "الحقل المرتبط (تم تحديد النوع وفقاً للحقل المرتبط)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "علاقة واحد إلى واحد"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "علاقة متعدد إلى متعدد"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "اضغط زر التحكم \"Control\", أو \"Command\" على أجهزة Mac لاختيار أكثر من "
 "واحد."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "هذا الحقل مطلوب."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "أدخل رقما صحيحا."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "أدخل رقماً."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "تحقق من أن تدخل %s أرقام لا أكثر."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "تحقق من أن تدخل %s خانات عشرية لا أكثر."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "تحقق من أن تدخل %s أرقام قبل الفاصل العشري لا أكثر."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "أدخل تاريخاً صحيحاً."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "أدخل وقتاً صحيحاً."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "أدخل تاريخاً/وقتاً صحيحاً."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "لم يتم ارسال ملف، الرجاء التأكد من نوع ترميز الاستمارة."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "لم يتم إرسال اي ملف."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "الملف الذي قمت بإرساله فارغ."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -645,11 +665,11 @@ msgstr ""
 "تحقق من أن اسم الملف يتكون بحد أقصى من %(max)d أحرف (يتكون حالياً من "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "رجاءً أرسل ملف أو صح علامة صح عند مربع اختيار \"فارغ\"، وليس كلاهما."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -657,34 +677,38 @@ msgstr ""
 "قم برفع صورة صحيحة، الملف الذي قمت برفعه إما أنه ليس ملفا لصورة أو أنه ملف "
 "معطوب."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "أدخل رابطاً صحيحاً."
+
+#: 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 "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "أدخل قائمة من القيم."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "الترتيب"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "احذف"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "رجاء صحّح بيانات %(field)s المتكررة."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -693,64 +717,64 @@ msgstr ""
 "رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة لـ%(lookup)s "
 "في %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "انتق خياراً صحيحاً. %s ليس أحد الخيارات المتاحة."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "القيمة \"%s\" هي صحيحة للحقل المرجعي."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "حالياً"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "عدّل"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "تفريغ"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "مجهول"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "نعم"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "لا"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "نعم,لا,ربما"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -761,52 +785,52 @@ msgstr[3] "%(size)d بايتان"
 msgstr[4] "%(size)d بايت"
 msgstr[5] "%(size)d بايت"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s ك.ب"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s م.ب"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s ج.ب"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s ت.ب"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s ب.ب"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "م"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "ص"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "م"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ص"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "منتصف الليل"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "ظهراً"
 
@@ -1082,22 +1106,22 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "ديسمبر"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "أو"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr "، "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "سنة"
@@ -1107,7 +1131,7 @@ msgstr[3] "سنوات"
 msgstr[4] "سنة"
 msgstr[5] "سنة"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "شهر"
@@ -1117,7 +1141,7 @@ msgstr[3] "أشهر"
 msgstr[4] "شهر"
 msgstr[5] "شهر"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "أسبوع"
@@ -1127,7 +1151,7 @@ msgstr[3] "أسابيع"
 msgstr[4] "أسبوع"
 msgstr[5] "أسبوع"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "يوم"
@@ -1137,7 +1161,7 @@ msgstr[3] "أيام"
 msgstr[4] "يوم"
 msgstr[5] "يوم"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ساعة"
@@ -1147,7 +1171,7 @@ msgstr[3] "ساعات"
 msgstr[4] "ساعة"
 msgstr[5] "ساعة"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "دقيقة"
@@ -1157,71 +1181,56 @@ msgstr[3] "دقائق"
 msgstr[4] "دقيقة"
 msgstr[5] "دقيقة"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "دقائق"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr "، %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s تم إنشاءه بنجاح."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s تم تحديثه بنجاح."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s تم حذفه."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "لم تحدد السنة"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "لم تحدد الشهر"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "لم تحدد اليوم"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "لم تحدد الأسبوع"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "لا يوجد %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1230,26 +1239,26 @@ msgstr ""
 "التاريخ بالمستقبل %(verbose_name_plural)s غير متوفر لأن قيمة %(class_name)s."
 "allow_future هي False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "نسق تاريخ غير صحيح '%(datestr)s' محدد بالشكل '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "لم يعثر على أي %(verbose_name)s مطابقة لهذا الإستعلام"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "الصفحة ليست 'الأخيرة'، ولا يمكن تحويل القيمة إلى رقم صحيح."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "صفحة غير صحيحة (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "قائمة فارغة و '%(class_name)s.allow_empty' قيمته False."
diff --git a/django/conf/locale/az/LC_MESSAGES/django.mo b/django/conf/locale/az/LC_MESSAGES/django.mo
index ff9b42de6a..514fca5763 100644
Binary files a/django/conf/locale/az/LC_MESSAGES/django.mo and b/django/conf/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/az/LC_MESSAGES/django.po b/django/conf/locale/az/LC_MESSAGES/django.po
index bb02304f14..ab4b660424 100644
--- a/django/conf/locale/az/LC_MESSAGES/django.po
+++ b/django/conf/locale/az/LC_MESSAGES/django.po
@@ -1,364 +1,384 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Ismayilov <ali@ismailov.info>, 2011.
+# Ali Ismayilov <ali@ismailov.info>, 2011-2013.
 # Metin Amiroff <amiroff@gmail.com>, 2011.
 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-03-05 06:00+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Afrikaansca"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Ərəbcə"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azərbaycanca"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bolqarca"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Belarusca"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Benqalca"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretonca"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosniyaca"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalanca"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Çexcə"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Uelscə"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danimarkaca"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Almanca"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Yunanca"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "İngiliscə"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Britaniya İngiliscəsi"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "İspanca"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentina İspancası"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Meksika İspancası"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nikaraqua İspancası"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venesuela İspancası"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonca"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskca"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Farsca"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Fincə"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Fransızca"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Friscə"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "İrlandca"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Qallik dili"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "İbranicə"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindcə"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Xorvatca"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Macarca"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "İnterlinqua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "İndonezcə"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "İslandca"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Yaponca"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Gürcücə"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Qazax"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Kxmercə"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada dili"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreyca"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Lüksemburqca"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litva dili"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latviya dili"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonca"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayamca"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Monqolca"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Bokmal Norveçcəsi"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepal"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Flamandca"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Nynorsk Norveçcəsi"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Pancabicə"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polyakca"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portuqalca"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Braziliya Portuqalcası"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumınca"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rusca"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovakca"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovencə"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanca"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbcə"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbcə Latın"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "İsveçcə"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Suahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamilcə"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Teluqu dili"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tayca"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Türkcə"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatar"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurtca"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukraynaca"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urduca"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vyetnamca"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Sadələşdirilmiş Çincə"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Ənənəvi Çincə"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Düzgün qiymət daxil edin."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL işləmir."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Düzgün e-poçt ünvanını daxil edin."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Düzgün URL daxil edin."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Düzgün e-poçt ünvanı daxil edin."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "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:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Düzgün IPv4 ünvanı daxil edin."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
-msgstr ""
+msgstr "Düzgün IPv6 ünvanını daxil edin."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "Düzgün IPv4 və ya IPv6 ünvanını daxil edin."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Vergüllə ayırmaqla yalnız rəqəmlər daxil edin."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Əmin edin ki, bu qiymət %(limit_value)s-dir (bu %(show_value)s-dir)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Bu qiymətin %(limit_value)s-ya bərabər və ya ondan kiçik olduğunu yoxlayın."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Bu qiymətin %(limit_value)s-ya bərabər və ya ondan böyük olduğunu yoxlayın."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -367,7 +387,7 @@ 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:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -376,271 +396,275 @@ 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:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "və"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 bu %(field_label)s sahə ilə artıq mövcuddur."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r qiyməti düzgün seçim deyil."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Bu sahə boş qala bilməz."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Bu sahə ağ qala bilməz."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Sahənin tipi: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Tam ədəd"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
-msgstr ""
+msgstr "'%s' tam ədəd olmalıdır."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "'%s' Doğru (True) və ya Yalan (False) olmalıdır."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Bul (ya Doğru, ya Yalan)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Sətir (%(max_length)s simvola kimi)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Vergüllə ayrılmış tam ədədlər"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
+msgstr "'%s' səhv tarix formatındadır. O, İİİİ-AA-GG formatında olmalıdır."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
+msgstr "'%s' düzgün formatdadır (İİİİ-AA-GG), lakin tarix özü səhvdir."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Tarix (saatsız)"
 
-#: db/models/fields/__init__.py:732
+#: 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' səhv formatdadır. O, İİİİ-AA-GG SS:DD[:ss[.mmmmmm]][ZQ] formatında "
+"olmalıdır."
 
-#: db/models/fields/__init__.py:736
+#: 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' düzgün formatdadır (İİİİ-AA-GG SS:DD[:ss[.mmmmmm]][ZQ]), lakin tarix/"
+"vaxt səhvdir."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Tarix (vaxt ilə)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "'%s' onluq kəsr ədədi olmalıdır."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Rasional ədəd"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "E-poçt ünvanı"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "E-poçt"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Faylın ünvanı"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
-msgstr ""
+msgstr "'%s' rasional ədəd olmalıdır."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Sürüşən vergüllü ədəd"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Böyük (8 bayt) tam ədəd"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "IPv4 ünvanı"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP ünvan"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "'%s' ya Heç nə (None), ya Doğru (True), ya da Yalan (False) olmalıdır."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Bul (Ya Doğru, ya Yalan, ya da Heç nə)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "Müsbət tam ədəd"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "Müsbət tam kiçik ədəd"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Əzmə (%(max_length)s simvola kimi)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "Kiçik tam ədəd"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Mətn"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
+msgstr "'%s' səhv formatdadır. O, SS:DD[:ss[.mmmmmm]] formatında olmalıdır."
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
+msgstr "'%s' düzgün formatdadır (SS:DD[:ss[.mmmmmm]]), lakin vaxt səhvdir."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Vaxt"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "Fayl"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "Şəkil"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "%(pk)r pk ilə %(model)s modeli mövcud deyil."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Xarici açar (bağlı olduğu sahəyə uyğun tipi alır)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Birin-birə münasibət"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Çoxun-çoxa münasibət"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Birdən artıq seçim etmək istəyirsinizsə, \"Control\" düyməsini basılı "
 "saxlayın, Mac istifadəçiləri üçün \"Command\""
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Bu sahə vacibdir."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Tam ədəd daxil edin."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Ədəd daxil edin."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Ədəddəki rəqəmlərin sayını %s-i aşmadığına əmin olun."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Kəsr hissəsindəki rəqəmlərin sayının %s-i aşmadığına əmin olun."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Tam hissəsindəki rəqəmlərin sayının %s-i aşmadığına əmin olun."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Düzgün tarix daxil edin."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Düzgün vaxt daxil edin."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Düzgün tarix/vaxt daxil edin."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Fayl göndərilməyib. Vərəqənin (\"form\") şifrələmə tipini yoxlayın."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Fayl göndərilməyib."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Göndərilən fayl boşdur."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -648,12 +672,12 @@ msgstr ""
 "Faylın adının %(max)d simvoldan az olduğunu yoxlayın (indi %(length)d "
 "simvoldan ibarətdir)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Ya fayl göndərin, ya da xanaya quş qoymayın, hər ikisini də birdən etməyin."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -661,36 +685,40 @@ msgstr ""
 "Düzgün şəkil göndərin. Göndərdiyiniz fayl ya şəkil deyil, ya da şəkildə "
 "problem var."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Düzgün URL daxil edin."
+
+#: 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 "Düzgün seçim edin. %(value)s seçimlər arasında yoxdur."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Qiymətlərin siyahısını daxil edin."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Sırala"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Sil"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "%(field)s sahəsinə görə təkrarlanan məlumatlara düzəliş edin."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "%(field)s sahəsinə görə təkrarlanan məlumatlara düzəliş edin, onların hamısı "
 "fərqli olmalıdır."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -699,115 +727,117 @@ msgstr ""
 "%(field_name)s sahəsinə görə təkrarlanan məlumatlara düzəliş edin, onlar "
 "%(date_field)s %(lookup)s-a görə fərqli olmalıdır."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Aşağıda təkrarlanan qiymətlərə düzəliş edin."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Xarici açar ana obyektin əsas açarı ilə üst-üstə düşmür."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Düzgün seçim edin. Bu seçim mümkün deyil."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Düzgün seçim edin. %s mümkün seçim deyil."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" əsas açar olmaq üçün düzgün qiymət deyil."
 
-#: forms/util.py:70
+#: 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 %(current_timezone)s zaman qurşağında ifadə oluna bilmir; ya "
+"duallıq, ya da yanlışlıq var."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Hal-hazırda"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Dəyiş"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Təmizlə"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Məlum deyil"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Hə"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Yox"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "hə, yox, bəlkə"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bayt"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "gecə yarısı"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "günorta"
 
@@ -1083,128 +1113,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Dekabr"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "və ya"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] ""
 "one: il\n"
 "other: il"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 "one: ay\n"
 "other: ay"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] ""
 "one: həftə\n"
 "other: həftə"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 "one: gün\n"
 "other: gün"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 "one: saat\n"
 "other: saat"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 "one: dəqiqə\n"
 "other: dəqiqə"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Ünvan indekslərinə icazə verilmir."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" mövcud deyil"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "%(directory)s-nin indeksi"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s uğurla yaradıldı."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s uğurla yeniləndi."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s uğurla silindi."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "İl göstərilməyib"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Ay göstərilməyib"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Gün göstərilməyib"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Həftə göstərilməyib"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s seçmək mümkün deyil"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1213,26 +1228,26 @@ msgstr ""
 "Gələcək %(verbose_name_plural)s seçmək mümkün deyil, çünki %(class_name)s."
 "allow_future Yalan kimi qeyd olunub."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "\"%(format)s\" formatına görə \"%(datestr)s\" tarixi düzgün deyil"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Sorğuya uyğun %(verbose_name)s tapılmadı"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Səhifə nə \"axırıncı\"dır, nə də tam ədədə çevirmək mümkündür."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Düzgün səhifə deyil (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Qeyri-düzgün səhifə (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Siyahı boşdur və '%(class_name)s.allow_empty' Yalan kimi qeyd olunub."
diff --git a/django/conf/locale/be/LC_MESSAGES/django.mo b/django/conf/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..21a61eaad8
Binary files /dev/null and b/django/conf/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/be/LC_MESSAGES/django.po b/django/conf/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..42d53e3b8a
--- /dev/null
+++ b/django/conf/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,1261 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+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-01-02 08:47+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Арабская"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "Азэрбайджанская"
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "Баўгарская"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "Бэнґальская"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "Басьнійская"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "Каталёнская"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "Чэская"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "Валійская"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "Дацкая"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "Нямецкая"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "Грэцкая"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "Анґельская"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "Анґельская (Брытанская)"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr "Эспэранта"
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "Гішпанская"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "Гішпанская (Арґентына)"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr "Гішпанская (Мэксыка)"
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr "Гішпанская (Нікараґуа)"
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "Эстонская"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "Басконская"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "Фарсі"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "Фінская"
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr "Француская"
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr "Фрызкая"
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr "Ірляндзкая"
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr "Ґальская"
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr "Габрэйская"
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr "Гінды"
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr "Харвацкая"
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr "Вугорская"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "Інданэзійская"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "Ісьляндзкая"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "Італьянская"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "Японская"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "Грузінская"
+
+#: conf/global_settings.py:88
+msgid "Kazakh"
+msgstr "Казаская"
+
+#: conf/global_settings.py:89
+msgid "Khmer"
+msgstr "Кхмерская"
+
+#: conf/global_settings.py:90
+msgid "Kannada"
+msgstr "Каннада"
+
+#: conf/global_settings.py:91
+msgid "Korean"
+msgstr "Карэйская"
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr "Літоўская"
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "Латыская"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "Македонская"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "Малаялам"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "Манґольская"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "Нарвэская букмол"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr "Нэпальская"
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "Галяндзкая"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr "Нарвэская нюнорск"
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr "Панджабі"
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "Польская"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "Партуґальская"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "Партуґальская (Бразылія)"
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr "Румынская"
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr "Расейская"
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr "Славацкая"
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr "Славенская"
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr "Альбанская"
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr "Сэрбская"
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr "Сэрбская (лацінка)"
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr "Швэдзкая"
+
+#: conf/global_settings.py:114
+msgid "Swahili"
+msgstr "Суахілі"
+
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "Тамільская"
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr "Тэлуґу"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "Тайская"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "Турэцкая"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr "Татарская"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "Украінская"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr "Урду"
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "Віетнамская"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "Кітайская (спрошчаная)"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "Кітайская (звычайная)"
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Пазначце правільнае значэньне."
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr "Бірка можа зьмяшчаць літары, лічбы, знакі падкрэсьліваньня ды злучкі."
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr "Пазначце чынны адрас IPv4."
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr "Пазначце чынны адрас IPv6."
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Пазначце чынны адрас IPv4 або IPv6."
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr "Набярыце лічбы, падзеленыя коскамі."
+
+#: core/validators.py:157
+#, 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: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 "Значэньне мусіць быць меншым або роўным %(limit_value)s."
+
+#: 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 "Значэньне мусіць быць большым або роўным %(limit_value)s."
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+"Мусіць зьмяшчаць прынамсі %(limit_value)d знакаў (зараз — %(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 ""
+"Мусіць зьмяшчаць ня болей за %(limit_value)d знакаў (зараз — %(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 мусіць быць непаўторным для «%(lookup)s» у полі "
+"«%(date_field)s»."
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr "і"
+
+#: 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 з такім %(field_label)s ужо існуе."
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr "Нельга абіраць %r."
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr "Поле ня можа мець значэньне «null»."
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr "Трэба запоўніць поле."
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Палі віду: %(field_type)s"
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr "Цэлы лік"
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "«%s» мусіць быць цэлым лікам."
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "«%s» мусіць быць мець значэньне «сапраўдна» або «не сапраўдна»."
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr "Ляґічнае («сапраўдна» або «не сапраўдна»)"
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Радок (ня болей за %(max_length)s)"
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr "Цэлыя лікі, падзеленыя коскаю"
+
+#: 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». Дата запісваецца ў выглядзе ГГГГ-ММ-ДД."
+
+#: 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» запісалі ў належным выглядзе, але гэта несапраўдная дата."
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr "Дата (бяз часу)"
+
+#: 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». Трэба запісваць у выглядзе «ГГГГ-ММ-ДД ГГ:ХХ[:сс[."
+"мммммм]][ЧА], дзе ЧА — часавы абсяг."
+
+#: 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» запісалі ў належным выглядзе («ГГГГ-ММ-ДД ГГ:ХХ[:сс[.мммммм]][ЧА]»), "
+"але гэта несапраўдная дата або час."
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr "Дата (разам з часам)"
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "«%s» мусіць быць дзесятковым лікам."
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr "Дзесятковы лік"
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Адрас эл. пошты"
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr "Шлях да файла"
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "«%s» мусіць быць лікам з коскаю."
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr "Лік зь пераноснай коскаю"
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr "Вялікі (8 байтаў) цэлы"
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr "Адрас IPv4"
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr "Адрас IP"
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
+"«%s» мусіць быць мець значэньне «сапраўдна», «не сапраўдна» або «нічога»."
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr "Ляґічнае («сапраўдна», «не сапраўдна» ці «нічога»)"
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr "Дадатны цэлы лік"
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr "Дадатны малы цэлы лік"
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Бірка (ня болей за %(max_length)s)"
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr "Малы цэлы лік"
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "Тэкст"
+
+#: 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». Трэба запісваць у выглядзе «ГГ:ХХ[:сс[.мммммм]]."
+
+#: 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» запісалі ў належным выглядзе («ГГ:ХХ[:сс[.мммммм]]»), але гэта "
+"несапраўдны час."
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr "Час"
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "Сеціўная спасылка"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr "Файл"
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr "Выява"
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "Мадэль %(model)s з ключом %(pk)r не існуе."
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr "Вонкавы ключ (від вызначаецца паводле зьвязанага поля)"
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr "Сувязь «адзін да аднаго»"
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr "Сувязь «некалькі да некалькіх»"
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Каб абраць некалькі пунктаў, трымайце «Ctrl» (на «Маках» — «Command»)."
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr "Поле трэба запоўніць."
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr "Набярыце ўвесь лік."
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr "Набярыце лік."
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Упэўніцеся, што набралі ня болей за %s лічбаў."
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Упэўніцеся, што набралі ня болей за %s лічбаў пасьля коскі."
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Упэўніцеся, што набралі ня болей за %s лічбаў да коскі."
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr "Пазначце чынную дату."
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr "Пазначце чынны час."
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr "Пазначце чынныя час і дату."
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Файл не даслалі. Зірніце кадоўку блянку."
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr "Файл не даслалі."
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr "Дасланы файл — парожні."
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"У назьве файла мусіць быць ня болей за %(max)d знакаў (зараз — %(length)d)."
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+"Трэба або даслаць файл, або абраць «Ачысьціць», але нельга рабіць гэта "
+"адначасова."
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Запампаваць чынны малюнак. Запампавалі або не выяву, або пашкоджаную выяву."
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Пазначце чынную спасылку."
+
+#: 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 "Абярыце дазволенае. %(value)s няма ў даступных значэньнях."
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr "Упішыце сьпіс значэньняў."
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr "Парадак"
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr "Выдаліць"
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "У полі «%(field)s» выпраўце зьвесткі, якія паўтараюцца."
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Выпраўце зьвесткі ў полі «%(field)s»: нельга, каб яны паўтараліся."
+
+#: 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 ""
+"Выпраўце зьвесткі ў полі «%(field_name)s»: нельга каб зьвесткі ў "
+"«%(date_field)s» для «%(lookup)s» паўтараліся."
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr "Выпраўце зьвесткі, якія паўтараюцца (гл. ніжэй)."
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "Вонкавы ключ не супадае з бацькоўскім першасным ключом."
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Абярыце дазволенае. Абранага няма ў даступных значэньнях."
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Абярыце дазволенае. %s няма ў даступных значэньнях."
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr "«%s» ня ёсьць чынным значэньне першаснага ключа."
+
+#: 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 ""
+"У часавым абсягу «%(current_timezone)s» нельга зразумець дату %(datetime)s: "
+"яна можа быць неадназначнаю або яе можа не існаваць."
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr "Зараз"
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr "Зьмяніць"
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr "Ачысьціць"
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr "Невядома"
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr "Так"
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr "Не"
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr "так,не,магчыма"
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d байт"
+msgstr[1] "%(size)d байты"
+msgstr[2] "%(size)d байтаў"
+msgstr[3] "%(size)d байтаў"
+
+#: template/defaultfilters.py:835
+#, python-format
+msgid "%s KB"
+msgstr "%s КБ"
+
+#: template/defaultfilters.py:837
+#, python-format
+msgid "%s MB"
+msgstr "%s МБ"
+
+#: template/defaultfilters.py:839
+#, python-format
+msgid "%s GB"
+msgstr "%s ҐБ"
+
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr "%s ТБ"
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr "%s ПБ"
+
+#: utils/dateformat.py:47
+msgid "p.m."
+msgstr "папаўдні"
+
+#: utils/dateformat.py:48
+msgid "a.m."
+msgstr "папоўначы"
+
+#: utils/dateformat.py:53
+msgid "PM"
+msgstr "папаўдні"
+
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr "папоўначы"
+
+#: utils/dateformat.py:103
+msgid "midnight"
+msgstr "поўнач"
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr "поўдзень"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Панядзелак"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Аўторак"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Серада"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Чацьвер"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Пятніца"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Субота"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Нядзеля"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Пн"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Аў"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Ср"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Чц"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Пт"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Сб"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Нд"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "студзеня"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "лютага"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "сакавік"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "красавіка"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "траўня"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "чэрвеня"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "ліпеня"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "жніўня"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "верасьня"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "кастрычніка"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "лістапада"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "сьнежня"
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr "сту"
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr "лют"
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr "сак"
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr "кра"
+
+#: utils/dates.py:23
+msgid "may"
+msgstr "тра"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "чэр"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "ліп"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "жні"
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr "вер"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "кас"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "ліс"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "сьн"
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "Сту."
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "Люты"
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "сакавік"
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "красавіка"
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "траўня"
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "чэрвеня"
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "ліпеня"
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "Жні."
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "Вер."
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "Кас."
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Ліс."
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Сьн."
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "студзеня"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "лютага"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "сакавік"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "красавіка"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "траўня"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "чэрвеня"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "ліпеня"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "жніўня"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "верасьня"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "кастрычніка"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "лістапада"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "сьнежня"
+
+#: 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 "або"
+
+#. 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] "год"
+msgstr[1] "гады"
+msgstr[2] "гадоў"
+msgstr[3] "гадоў"
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] "месяц"
+msgstr[1] "месяцы"
+msgstr[2] "месяцаў"
+msgstr[3] "месяцаў"
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "тыдзень"
+msgstr[1] "тыдні"
+msgstr[2] "тыдняў"
+msgstr[3] "тыдняў"
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] "дзень"
+msgstr[1] "дні"
+msgstr[2] "дзён"
+msgstr[3] "дзён"
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "гадзіна"
+msgstr[1] "гадзіны"
+msgstr[2] "гадзін"
+msgstr[3] "гадзін"
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "хвіліна"
+msgstr[1] "хвіліны"
+msgstr[2] "хвілінаў"
+msgstr[3] "хвілінаў"
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr "хв."
+
+#: 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 "Не дазваляецца глядзець сьпіс файлаў каталёґа."
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "Шлях «%(path)s» не існуе."
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Файлы каталёґа «%(directory)s»"
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr "Не пазначылі год"
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr "Не пазначылі месяц"
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr "Не пазначылі дзень"
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr "Не пазначылі тыдзень"
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Няма доступу да %(verbose_name_plural)s"
+
+#: views/generic/dates.py:646
+#, 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» мае значэньне «не сапраўдна»."
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr "Радок даты «%(datestr)s» не адпавядае выгляду «%(format)s»"
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Па запыце не знайшлі ніводнага %(verbose_name)s"
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+"Нумар бачыны ня мае значэньня «last» і яго нельга ператварыць у цэлы лік."
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
+"Сьпіс парожні, але «%(class_name)s.allow_empty» мае значэньне «не "
+"сапраўдна», што забараняе паказваць парожнія сьпісы."
diff --git a/django/conf/locale/bg/LC_MESSAGES/django.mo b/django/conf/locale/bg/LC_MESSAGES/django.mo
index c3ab7e0105..caa8a91d7c 100644
Binary files a/django/conf/locale/bg/LC_MESSAGES/django.mo and b/django/conf/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/bg/LC_MESSAGES/django.po b/django/conf/locale/bg/LC_MESSAGES/django.po
index 1028ef17e7..36eae55777 100644
--- a/django/conf/locale/bg/LC_MESSAGES/django.po
+++ b/django/conf/locale/bg/LC_MESSAGES/django.po
@@ -1,363 +1,384 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <aatanasov@gmail.com>, 2012.
 # Boris Chervenkov <office@sentido.bg>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Todor Lubenov <tlubenov@gmail.com>, 2011.
+# Todor Lubenov <tlubenov@gmail.com>, 2011-2012.
 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"
-"Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: zaxl <aatanasov@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "бенгалски език"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "босненски език"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "каталунски език"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "чешки език"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "уелски език"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "датски език"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "немски език"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "гръцки език"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "английски език"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "британски английски"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Есперанто"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "испански език"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "кастилски"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Мексикански испански"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "никарагуански испански"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "естонски език"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "баски"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "персийски език"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "финландски език"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "френски език"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "фризийски език"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ирландски език"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "галицейски език"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "иврит"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "хинди"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "хърватски език"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "унгарски език"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "индонезийски език"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "исландски език"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "италиански език"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "японски език"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "грузински език"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Казахски"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "кхмерски език"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "каннада"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "корейски език"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "литовски език"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "латвийски език"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "македонски език"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "малаялам"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "монголски език"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "норвежки букмол"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Непалски"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "холандски"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "норвежки съвременен език"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "пенджаби"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "полски език"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "португалски език"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "бразилски португалски"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "румънски език"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "руски език"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "словашки език"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "словенски език"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "албански език"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "сръбски език"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "сръбски с латински букви"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "шведски език"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Суахили"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "тамил"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "телугу"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "тайландски език"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "турски език"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Татарски"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "украински език"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Урду"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "виетнамски език"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "китайски език"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "традиционен китайски"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Въведете валидна стойност.  "
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Този URL адрес може да е счупен линк.  "
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Въведете валиден имейл адрес."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Въведете валиден URL адрес."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Въведете валиден email адрес.  "
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Въведете валиден 'слъг', състоящ се от букви, цифри, тирета или долни тирета."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Въведете валиден IPv4 адрес."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Въведете валиден IPv6 адрес."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Въведете валиден IPv4 или IPv6 адрес."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Въведете само еднозначни числа, разделени със запетая.  "
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Уверете се, че тази стойност е по-малка или равна на %(limit_value)s ."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Уверете се, че тази стойност е по-голяма или равна на %(limit_value)s ."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +387,7 @@ msgstr ""
 "Уверете се, че тази стойност има най-малко %(limit_value)d знаци (има "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,84 +396,84 @@ msgstr ""
 "Уверете се, че тази стойност има най-много %(limit_value)d  знаци (има "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "и"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 с този %(field_label)s вече съществува."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Стойността %r не е валиден избор."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Това поле не може да има празна стойност."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Това поле не може да е празно."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Поле от тип: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Цяло число"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Стойността на '%s' трябва да е цяло число."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Стойността на '%s' трябва да е \"True\" или \"False\"."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (True или False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Символен низ (до %(max_length)s символа)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Цели числа, разделени с запетая"
 
-#: db/models/fields/__init__.py:647
+#: 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' е в невалиден формат на дата. Форматът трябва да бъде "
 "ГГГГ-ММ-ДД"
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' е в правилен формат (ГГГГ-ММ-ДД), но датата е невалидна."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Дата (без час)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -462,7 +483,7 @@ msgstr ""
 "ДД ЧЧ:ММ[:сс[.uuuuuu]][TZ] (където u означава милисекунда, а TZ -  часова "
 "зона)"
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -471,79 +492,79 @@ msgstr ""
 "Стойността на  '%s' формат ( ГГГГ-ММ-ДД ЧЧ:ММ[:сс[.uuuuuu]][TZ] (където u "
 "означава милисекунда, а TZ -  часова зона), но датата/часът са невалидни"
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Дата (и час)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Стойността на '%s' трябва да е десетично число."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Десетична дроб"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Email адрес"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Път към файл"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Стойността на '%s' трябва да бъде десетично число с плаваща запетая."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Число с плаваща запетая"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Голямо (8 байта) цяло число"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 адрес"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP адрес"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Стойността на '%s' трябва да е \"Nonw\", \"True\" или \"False\""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (Възможните стойности са True, False или None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "Положително цяло число"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "Положително 2 байта цяло число"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Slug (до %(max_length)s )"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "2 байта цяло число"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Текст"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -551,7 +572,7 @@ msgstr ""
 "Стойността на '%s' е в невалиден формат.Форматът трябва да бъде ЧЧ:ММ [:сс[."
 "uuuuuu]] (където u означава милисекунда)"
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -560,110 +581,110 @@ msgstr ""
 "Стойността на '%s' е в правилния формат (ЧЧ:ММ [:сс[.uuuuuu]] (където u "
 "означава милисекунда), но часът е невалиден."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Време"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL адрес"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "Файл"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Моделът %(model)s с pk %(pk)r не съществува."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Външен ключ (тип, определен от свързаното поле)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "словенски език"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Много-към-много връзка"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Задръжте натиснат клавиша \"Control\" (или \"Command\" на Mac), за да "
 "направите повече от един избор.  "
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Това поле е задължително."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Въведете цяло число.  "
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Въведете число."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Уверете се, че не сте въвели повече от %s цифри."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Уверете се, че няма повече от %s знака след запетаята."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Уверете се, че няма повече от %s цифри преди десетичната запетая."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Въведете валидна дата.  "
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Въведете валиден час."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Въведете валидна дата/час.  "
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Не е получен файл.  Проверете типа кодиране на формата.  "
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Няма изпратен файл."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Каченият файл е празен.  "
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "Уверете се, че файловото име е най-много %(max)d знаци (има %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Моля, или пратете файл или маркирайте полето за изчистване, но не и двете."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -671,36 +692,40 @@ msgstr ""
 "Качете валидно изображение. Файлът, който сте качили или не е изображение, "
 "или е повреден.  "
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Въведете валиден URL адрес."
+
+#: 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 "Направете валиден избор. %(value)s не е един от възможните избори."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Въведете списък от стойности"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ред"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Изтрий"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Моля, коригирайте дублираните данни за %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Моля, коригирайте дублираните данни за %(field)s, които трябва да са "
 "уникални."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -709,29 +734,29 @@ msgstr ""
 "Моля, коригирайте дублиранитe данни за %(field_name)s , които трябва да са "
 "уникални за %(lookup)s в %(date_field)s ."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Моля, коригирайте повтарящите се стойности по-долу."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Невалидна избрана стойност."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Направете валиден избор. Този не е един от възможните избори.  "
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Направете валиден избор.  %s не е един от възможните избори.  "
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" не е валидна стойност за първичен ключ."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -740,87 +765,87 @@ msgstr ""
 "%(datetime)s не може да бъде разчетено в  %(current_timezone)s; може да е "
 "двусмислен или да не съществува"
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Сега"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Промени"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Изчисти"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Да"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Не"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "да, не, може би"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d, байт"
 msgstr[1] "%(size)d, байта"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s ТБ"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
-msgstr "преди обяд"
+msgstr "след обяд"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
-msgstr "след обяд"
-
-#: utils/dateformat.py:51
-msgid "PM"
 msgstr "преди обяд"
 
-#: utils/dateformat.py:52
-msgid "AM"
+#: utils/dateformat.py:53
+msgid "PM"
 msgstr "след обяд"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr "преди обяд"
+
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "полунощ"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "обяд"
 
@@ -1096,122 +1121,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Декември"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "или"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "година"
 msgstr[1] "години"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "месец"
 msgstr[1] "месеци"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "седмица"
 msgstr[1] "седмици"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ден"
 msgstr[1] "дни"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часове"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минути"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "минути"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Тук не е позволено индексиране на директория."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" не съществува"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "Индекс %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Обектът %(verbose_name)s бе успешно създаден.  "
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Обектът %(verbose_name)s бе успешно актуализиран."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Обектът %(verbose_name)s бе изтрит."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Не е посочена година"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Не е посочен месец"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "ноев"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Не е посочена седмица"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Няма достъпни %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1220,26 +1230,26 @@ msgstr ""
 "Бъдещo %(verbose_name_plural)s е достъпно, тъй като %(class_name)s."
 "allow_future е False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Невалидна дата '%(datestr)s' посочен формат '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Няма %(verbose_name)s , съвпадащи със заявката"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Страницата не е 'last' нито може да се преобразува в int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Невалидна страница (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Празен списък и '%(class_name)s.allow_empty' не е валидно."
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index b9838adfc2..a1e427bd19 100644
Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index 009563932a..9d12fa5bf8 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@@ -2,646 +2,668 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#  <nasim.haque@gmail.com>, 2013.
+#   <rafi.tahmid@gmail.com>, 2012.
 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"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-08 15:20+0000\n"
+"Last-Translator: nsmgr8 <nasim.haque@gmail.com>\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "আফ্রিকার অন্যতম সরকারি ভাষা"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "আরবী"
 
-#: conf/global_settings.py:49
-msgid "Azerbaijani"
-msgstr ""
-
 #: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "আজারবাইজানি"
+
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "বুলগেরিয়ান"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "বেলারুশীয়"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "বাংলা"
 
-#: conf/global_settings.py:52
-msgid "Bosnian"
-msgstr ""
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "ব্রেটন"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "বসনিয়ান"
+
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "ক্যাটালান"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "চেক"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "ওয়েল্স"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "ড্যানিশ"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "জার্মান"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "গ্রিক"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "ইংলিশ"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
-msgstr ""
+msgstr "বৃটিশ ইংলিশ"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "আন্তর্জাতিক ভাষা"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "স্প্যানিশ"
 
-#: conf/global_settings.py:63
-msgid "Argentinian Spanish"
-msgstr ""
-
-#: conf/global_settings.py:64
-msgid "Mexican Spanish"
-msgstr ""
-
-#: conf/global_settings.py:65
-msgid "Nicaraguan Spanish"
-msgstr ""
-
 #: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "আর্জেন্টিনিয়ান স্প্যানিশ"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr "মেক্সিকান স্প্যানিশ"
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr "নিকারাগুয়ান স্প্যানিশ"
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "ভেনেজুয়েলার স্প্যানিশ"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "এস্তোনিয়ান"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "বাস্ক"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "ফারসি"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "ফিনিশ"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ফ্রেঞ্চ"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
-msgstr ""
+msgstr "ফ্রিজ্ল্যানডের ভাষা"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "আইরিশ"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "গ্যালিসিয়ান"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "হিব্রু"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
-msgstr ""
+msgstr "হিন্দী"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "ক্রোয়েশিয়ান"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "হাঙ্গেরিয়ান"
 
-#: conf/global_settings.py:78
-msgid "Indonesian"
+#: conf/global_settings.py:82
+msgid "Interlingua"
 msgstr ""
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "ইন্দোনেশিয়ান"
+
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "আইসল্যান্ডিক"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "ইটালিয়ান"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "জাপানিজ"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "জর্জিয়ান"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "কাজাখ"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "খমার"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "কান্নাড়া"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "কোরিয়ান"
 
-#: conf/global_settings.py:87
-msgid "Lithuanian"
-msgstr "লিথুয়ানিয়ান"
-
-#: conf/global_settings.py:88
-msgid "Latvian"
-msgstr "লাটভিয়ান"
-
-#: conf/global_settings.py:89
-msgid "Macedonian"
-msgstr "ম্যাসাডোনিয়ান"
-
-#: conf/global_settings.py:90
-msgid "Malayalam"
-msgstr ""
-
-#: conf/global_settings.py:91
-msgid "Mongolian"
-msgstr ""
-
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
-msgstr ""
+msgid "Lithuanian"
+msgstr "লিথুয়ানিয়ান"
 
 #: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "লাটভিয়ান"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "ম্যাসাডোনিয়ান"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "মালায়ালম"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "মঙ্গোলিয়ান"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "নরওয়েজীয় বোকমাল"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr "নেপালি"
+
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "ডাচ"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "নরওয়েজীয়ান নিনর্স্ক"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
-msgstr ""
+msgstr "পাঞ্জাবী"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "পোলিশ"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
-msgstr ""
+msgstr "পর্তুগীজ"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "ব্রাজিলিয়ান পর্তুগীজ"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "রোমানিয়ান"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "রাশান"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "স্লোভাক"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "স্লোভেনিয়ান"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
-msgstr ""
+msgstr "আলবেনীয়ান"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "সার্বিয়ান"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
-msgstr ""
+msgstr "সার্বিয়ান ল্যাটিন"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "সুইডিশ"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "সোয়াহিলি"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "তামিল"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "তেলেগু"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
-msgstr ""
+msgstr "থাই"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "তুর্কি"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "তাতারদেশীয়"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ইউক্রেনিয়ান"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
-msgstr ""
+msgstr "উর্দু"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
-msgstr ""
+msgstr "ভিয়েতনামিজ"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "সরলীকৃত চাইনীজ"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "প্রচলিত চাইনীজ"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "একটি বৈধ মান দিন।"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "এই URL টি সঠিক নয়।"
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "একটি বৈধ ইমেইল ঠিকানা লিখুন."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "বৈধ URL দিন"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "বৈধ ইমেইল ঠিকানা দিন।"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "বৈধ ’slug' প্রবেশ করান যাতে শুধুমাত্র ইংরেজী বর্ণ, অঙ্ক, আন্ডারস্কোর অথবা হাইফেন "
 "রয়েছে।"
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "একটি বৈধ IPv4 ঠিকানা দিন।"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
-msgstr ""
+msgstr "একটি বৈধ IPv6 ঠিকানা টাইপ করুন।"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "একটি বৈধ IPv4 অথবা IPv6 ঠিকানা টাইপ করুন।"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "শুধুমাত্র কমা দিয়ে সংখ্যা দিন।"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "এবং"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "%(field_label)s সহ %(model_name)s আরেকটি রয়েছে।"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "এর মান null হতে পারবে না।"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
-msgstr ""
+msgstr "এই ফিল্ডের মান ফাঁকা হতে পারে না"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "ফিল্ডের ধরণ: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "ইন্টিজার"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
-msgstr ""
+msgstr "'%s' এর মান অবশ্যই ইন্টিজার হতে হবে।"
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "'%s' এর মান শুধুমাত্র True অথবা False হতে হবে।"
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "বুলিয়ান (হয় True অথবা False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "স্ট্রিং (সর্বোচ্চ %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
-msgstr "কমা দিয়ে আলাদা করা ইন্টিজার"
+msgstr "কমা দিয়ে আলাদা করা ইন্টিজার"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "তারিখ (সময় বাদে)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "তারিখ (সময় সহ)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "'%s' এর মান অবশ্যই দশমিক সংখ্যা হতে হবে।"
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "দশমিক সংখ্যা"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "ইমেইল ঠিকানা"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "ফাইল পথ"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
-msgstr ""
+msgstr "'%s' এর মান অবশ্যই ফ্লোটিং পয়েন্ট নম্বর হতে হবে।"
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "ফ্লোটিং পয়েন্ট সংখ্যা"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "বিগ (৮ বাইট) ইন্টিজার"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "IPv4 ঠিকানা"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "আইপি ঠিকানা"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "বুলিয়ান (হয়  True, False অথবা None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "পজিটিভ ইন্টিজার"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "স্মল ইন্টিজার"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "টেক্সট"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "সময়"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "ইউআরএল (URL)"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "ফাইল"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "ইমেজ"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
-msgstr ""
+msgstr "ওয়ান-টু-ওয়ান রিলেশানশিপ"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
-msgstr ""
+msgstr "ম্যানি-টু-ম্যানি রিলেশানশিপ"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "একাধিক বাছাই করতে \"কন্ট্রোল\", অথবা ম্যাকে \"কমান্ড\", চেপে ধরুন।"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "এটি আবশ্যক।"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "একটি পূর্ণসংখ্যা দিন"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "একটি সংখ্যা প্রবেশ করান।"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "নিশ্চিত করুন যে, এখানে %s সংখ্যক দশমিক অঙ্ক রয়েছে।"
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "নিশ্চিত করুন যে, এখানে %s -এর বেশি দশমিক সংখ্যা নেই।"
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "নিশ্চিত করুন যে, এখানে %s -এর বেশি দশমিক সংখ্যা নেই।"
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "বৈধ তারিখ দিন।"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "বৈধ সময় দিন।"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
-msgstr "বৈধ ডারিখ/সময় দিন।"
+msgstr "বৈধ তারিখ/সময় দিন।"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "কোন ফাইল দেয়া হয়নি। ফর্মের এনকোডিং ঠিক আছে কিনা দেখুন।"
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "কোন ফাইল দেয়া হয়নি।"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "ফাইলটি খালি।"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -649,150 +671,154 @@ msgstr ""
 "সঠিক ছবি আপলোড করুন। যে ফাইলটি আপলোড করা হয়েছে তা হয় ছবি নয় অথবা নষ্ট হয়ে "
 "যাওয়া ছবি।"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "বৈধ URL দিন"
+
+#: 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 "%(value)s বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "কয়েকটি মানের তালিকা দিন।"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "ক্রম"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "মুছুন"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:581
+#: 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 ""
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "এটি বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "%s বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" প্রাইমারি কি এর জন্য কোন বৈধ মান নয়"
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
-msgstr ""
+msgstr "এই মুহুর্তে"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "পরিবর্তন"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
-msgstr ""
+msgstr "পরিষ্কার করুন"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "অজানা"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "না"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "হ্যাঁ,না,হয়তো"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d বাইট"
 msgstr[1] "%(size)d বাইট"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
-msgstr ""
+msgstr "%s কিলোবাইট"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
-msgstr ""
-
-#: template/defaultfilters.py:836
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#: template/defaultfilters.py:838
-#, python-format
-msgid "%s TB"
-msgstr ""
+msgstr "%s মেগাবাইট"
 
 #: template/defaultfilters.py:839
 #, python-format
-msgid "%s PB"
-msgstr ""
+msgid "%s GB"
+msgstr "%s গিগাবাইট"
 
-#: utils/dateformat.py:45
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr "%s টেরাবাইট"
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr "%s পেটাবাইট"
+
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "অপরাহ্ন"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "পূর্বাহ্ন"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "অপরাহ্ন"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "পূর্বাহ্ন"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "মধ্যরাত"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "দুপুর"
 
@@ -810,7 +836,7 @@ msgstr "বুধবার"
 
 #: utils/dates.py:6
 msgid "Thursday"
-msgstr "বৃহঃ"
+msgstr "বৃহস্পতিবার"
 
 #: utils/dates.py:6
 msgid "Friday"
@@ -951,12 +977,12 @@ msgstr "ডিসে."
 #: utils/dates.py:31
 msgctxt "abbrev. month"
 msgid "Jan."
-msgstr ""
+msgstr "জানু."
 
 #: utils/dates.py:32
 msgctxt "abbrev. month"
 msgid "Feb."
-msgstr ""
+msgstr "ফেব্রু."
 
 #: utils/dates.py:33
 msgctxt "abbrev. month"
@@ -986,27 +1012,27 @@ msgstr "জুলাই"
 #: utils/dates.py:38
 msgctxt "abbrev. month"
 msgid "Aug."
-msgstr ""
+msgstr "আগ."
 
 #: utils/dates.py:39
 msgctxt "abbrev. month"
 msgid "Sept."
-msgstr ""
+msgstr "সেপ্ট."
 
 #: utils/dates.py:40
 msgctxt "abbrev. month"
 msgid "Oct."
-msgstr ""
+msgstr "অক্টো."
 
 #: utils/dates.py:41
 msgctxt "abbrev. month"
 msgid "Nov."
-msgstr ""
+msgstr "নভে."
 
 #: utils/dates.py:42
 msgctxt "abbrev. month"
 msgid "Dec."
-msgstr ""
+msgstr "ডিসে."
 
 #: utils/dates.py:45
 msgctxt "alt. month"
@@ -1068,148 +1094,133 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "ডিসেম্বর"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "অথবা"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "বছর"
 msgstr[1] "বছর"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "মাস"
 msgstr[1] "মাস"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "সপ্তাহ"
 msgstr[1] "সপ্তাহ"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "দিন"
 msgstr[1] "দিন"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ঘন্টা"
 msgstr[1] "ঘন্টা"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "মিনিট"
 msgstr[1] "মিনিট"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "মিনিট"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "ডিরেক্টরি ইনডেক্স অনুমোদিত নয়"
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s তৈরী সফল হয়েছে।"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s হালনাগাদ সফল হয়েছে।"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s মুছে ফেলা হয়েছে।"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
-msgstr ""
+msgstr "কোন বছর উল্লেখ করা হয়নি"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
-msgstr ""
+msgstr "কোন মাস উল্লেখ করা হয়নি"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
-msgstr ""
+msgstr "কোন দিন উল্লেখ করা হয়নি"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
-msgstr ""
+msgstr "কোন সপ্তাহ উল্লেখ করা হয়নি"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/bn/formats.py b/django/conf/locale/bn/formats.py
index a99bea1533..eed24e605e 100644
--- a/django/conf/locale/bn/formats.py
+++ b/django/conf/locale/bn/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/br/LC_MESSAGES/django.mo b/django/conf/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..f805b4a6db
Binary files /dev/null and b/django/conf/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/br/LC_MESSAGES/django.po b/django/conf/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..f755c0210b
--- /dev/null
+++ b/django/conf/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,1259 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 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-01-02 08:47+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Arabeg"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "Azeri"
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "Bulgareg"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "Bengaleg"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "Bosneg"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "Katalaneg"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "Tchekeg"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "Kembraeg"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "Daneg"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "Alamaneg"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "Gresianeg"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "Saozneg"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "Saozneg Breizh-Veur"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr "Esperanteg"
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "Spagnoleg"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "Spagnoleg Arc'hantina"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr "Spagnoleg Mec'hiko"
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr "Spagnoleg Nicaragua"
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "Estoneg"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "Euskareg"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "Perseg"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "Finneg"
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr "Galleg"
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr "Frizeg"
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr "Iwerzhoneg"
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr "Galizeg"
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr "Hebraeg"
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr "Hindi"
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr "Kroateg"
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr "Hungareg"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "Indonezeg"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "Islandeg"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "Italianeg"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "Japaneg"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "Jorjianeg"
+
+#: conf/global_settings.py:88
+msgid "Kazakh"
+msgstr "kazak"
+
+#: conf/global_settings.py:89
+msgid "Khmer"
+msgstr "Khmer"
+
+#: conf/global_settings.py:90
+msgid "Kannada"
+msgstr "Kannata"
+
+#: conf/global_settings.py:91
+msgid "Korean"
+msgstr "Koreaneg"
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr "Lituaneg"
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "Latveg"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "Makedoneg"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "Mongoleg"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "Norvegeg Bokmal"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr "nepaleg"
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "Nederlandeg"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr "Norvegeg Nynorsk"
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr "Punjabeg"
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "Poloneg"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "Portugaleg"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "Portugaleg Brazil"
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr "Roumaneg"
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr "Rusianeg"
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr "Slovakeg"
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr "Sloveneg"
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr "Albaneg"
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr "Serbeg"
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr "Serbeg e lizherennoù latin"
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr "Svedeg"
+
+#: conf/global_settings.py:114
+msgid "Swahili"
+msgstr "swahileg"
+
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "Tamileg"
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr "Telougou"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "Thai"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "Turkeg"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr "tatar"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "Ukraineg"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr "Ourdou"
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "Vietnameg"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "Sinaeg eeunaet"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "Sinaeg hengounel"
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Merkit un talvoud reizh"
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"N'hall bezañ er vaezienn-mañ nemet lizherennoù, niveroù, tiredoù izel _ ha "
+"barrennigoù-stagañ."
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr "Merkit ur chomlec'h IPv4 reizh."
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr "Merkit ur chomlec'h IPv6 reizh."
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Merkit ur chomlec'h IPv4 pe IPv6 reizh."
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr "Merkañ hepken sifroù dispartiet dre skejoù."
+
+#: core/validators.py:157
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+"Bezit sur ez eo an talvoud-mañ %(limit_value)s (evit ar mare ez eo "
+"%(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 "Gwiriit mat emañ an talvoud-mañ a-is pe par da %(limit_value)s."
+
+#: 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 "Gwiriit mat emañ an talvoud-mañ a-us pe par da %(limit_value)s."
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+"Gwiriit mat ez eus da nebeutañ %(limit_value)d arouezenn en talvoud-mañ "
+"(evit ar mare ez eus %(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 ""
+"Gwiriit mat ez eus d'ar muiañ %(limit_value)d arouezenn en talvoud-mañ (evit "
+"ar mare ez eus %(show_value)d)."
+
+#: db/models/base.py:857
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr ""
+"Ret eo da %(field_name)s bezañ e-unan evit al lodenn %(date_field)s "
+"%(lookup)s."
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr "ha"
+
+#: 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 "Bez' ez eus c'hoazh eus ur %(model_name)s gant ar %(field_label)s-mañ."
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr "N'eo ket an talvoud %r un dibab reizh."
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr "N'hall ket ar vaezienn chom goullo"
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr "N'hall ket ar vaezienn chom goullo"
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Seurt maezienn : %(field_type)s"
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr "Anterin"
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Ret eo d'an talvoud '%s' bezañ un niver anterin."
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Ret eo d'an talvoud '%s' bezañ Gwir pe Gaou."
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr "Boulean (gwir pe gaou)"
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "neudennad arouezennoù (betek %(max_length)s)"
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr "Niveroù anterin dispartiet dre ur skej"
+
+#: 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 ""
+"Direizh eo furmad deiziad an talvoud '%s'. Ret eo dezhañ klotañ gant BBBB-MM-"
+"DD."
+
+#: 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 ""
+"Reizh eo furmad deiziad an talvoud '%s'  (BBBB-MM-DD) nemet eo faos an "
+"deiziad."
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr "Deizad (hep eur)"
+
+#: 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 ""
+"Direizh eo furmad deiziad an talvoud '%s'. Ret eo dezhañ klotañ gant ar "
+"furmad BBBB-MM-DD HH:MM[:ss[.uuuuuu]][TZ] ."
+
+#: 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 ""
+"Reizh eo furmad deiziad an talvoud '%s' (BBBB-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
+"nemet eo faos an eur/deiziad."
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr "Deizad (gant an eur)"
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Ret eo d'an talvoud '%s' bezañ un niver dekvedennel."
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr "Niver dekvedennel"
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Chomlec'h postel"
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr "Treug war-du ar restr"
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Ret eo d'an talvoud '%s' bezañ ur skej nij."
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr "Niver gant skej nij"
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr "Anterin bras (8 okted)"
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr "Chomlec'h IPv4"
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr "Chomlec'h IP"
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Ret eo d'an talvoud '%s' bezañ Netra, Gwir pe Gaou."
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr "Boulean (gwir pe gaou pe netra)"
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr "Niver anterin pozitivel"
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr "Niver anterin bihan pozitivel"
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (betek %(max_length)s arouez.)"
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr "Niver anterin bihan"
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "Testenn"
+
+#: 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 ""
+"Direizh eo furmad an talvoud '%s'. Ret eo dezhañ klotañ gant ar furmad HH:MM"
+"[:ss[.uuuuuu]]."
+
+#: 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 ""
+"Reizh eo furmad deiziad an talvoud '%s' (HH:MM[:ss[.uuuuuu]]) nemet eo faos "
+"an eur."
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr "Eur"
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr "Restr"
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr "Skeudenn"
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "N'eus ket eus ar patrom %(model)s gant an alc'hwez-mamm pk %(pk)r."
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr "Alc'hwez estren (seurt termenet dre ar vaezienn liammet)"
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr "Darempred unan-ouzh-unan"
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr "Darempred lies-ouzh-lies"
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Dalc'hit da bouezañ \"Ktrl\" pe \"Urzhiad\" (stokell Aval) war ur Mac."
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr "Rekis eo leuniañ ar vaezienn."
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr "Merkit un niver anterin."
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr "Merkit un niver."
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Gwiriit mat n'eus ket ouzhpenn %s sifr en holl."
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Gwiriit mat n'eus ket ouzhpenn %s sifr goude ar skej."
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Gwiriit mat n'eus ket ouzhpenn %s sifr a-raok ar skej."
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr "Merkit un deiziad reizh"
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr "Merkit un eur reizh"
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr "Merkit un eur/deiziad reizh"
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "N'eus ket kaset restr ebet. Gwiriit ar seurt enkodañ evit ar restr"
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr "N'eus bet kaset restr ebet."
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr "Goullo eo ar restr kaset."
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Gwiriit mat n'eus ket ouzhpenn %(max)d arouezenn da anv ar restr (bez' he "
+"deus %(length)d)."
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr "Kasit ur restr pe askit al log riñsañ; an eil pe egile"
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Enpozhiit ur skeudenn reizh. Ar seurt bet enporzhiet ganeoc'h a oa foeltret "
+"pe ne oa ket ur skeudenn"
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Merkit un URL reizh"
+
+#: 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 "Dizuit un dibab reizh. %(value)s n'emañ ket e-touez an dibaboù posupl."
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr "Merkit ur roll talvoudoù"
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr "Urzh"
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr "Diverkañ"
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Reizhit ar roadennoù e doubl e %(field)s."
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+"Reizhit ar roadennoù e doubl e %(field)s, na zle bezañ enni nemet talvoudoù "
+"dzho o-unan."
+
+#: 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 ""
+"Reizhit ar roadennoù e doubl e %(field_name)s a rank bezañ ennañ talvodoù en "
+"o-unan evit lodenn %(lookup)s %(date_field)s."
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr "Reizhañ ar roadennoù e doubl zo a-is"
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+"Ne glot ket an alc'hwez estren enlinenn gant alc'hwez-mamm an urzhiataer "
+"galloudel kar"
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Diuzit un dibab reizh. N'emañ ket an dibab-mañ e-touez ar re bosupl."
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Diuzit un dibab reizh. N'emañ ket %s e-touez ar re bosupl."
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr "N'eo ket \"%s\" un talvoud reizh evit un alc'hwez-mamm."
+
+#: 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 ""
+"N'eo ket bete komprenet an talvoud %(datetime)s er werzhid eur "
+"%(current_timezone)s; pe eo amjestr pe n'eus ket anezhañ."
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr "Evit ar mare"
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr "Kemmañ"
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr "Riñsañ"
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr "Dianav"
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr "Ya"
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr "Ket"
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr "ya, ket, marteze"
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d okted"
+msgstr[1] "%(size)d okted"
+
+#: 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 "g.m."
+
+#: utils/dateformat.py:48
+msgid "a.m."
+msgstr "mintin"
+
+#: utils/dateformat.py:53
+msgid "PM"
+msgstr "G.M."
+
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr "Mintin"
+
+#: utils/dateformat.py:103
+msgid "midnight"
+msgstr "hanternoz"
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr "kreisteiz"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Lun"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Meurzh"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Merc'her"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Yaou"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Gwener"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Sadorn"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Sul"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Lun"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Meu"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Mer"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Yao"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Gwe"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Sad"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Sul"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "Genver"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "C'hwevrer"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "Meurzh"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "Ebrel"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "Mae"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "Mezheven"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "Gouere"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "Eost"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "Gwengolo"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "Here"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "Du"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "Kerzu"
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr "Gen"
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr "C'hwe"
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr "Meu"
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr "Ebr"
+
+#: utils/dates.py:23
+msgid "may"
+msgstr "Mae"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "Mez"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "Gou"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "Eos"
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr "Gwe"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "Her"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "Du"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "Kzu"
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "Gen."
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "C'hwe."
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Meu."
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "Ebr."
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "Mae"
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "Mez."
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "Gou."
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "Eos."
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "Gwe."
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "Her."
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Du"
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Kzu"
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "Genver"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "C'hwevrer"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "Meurzh"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "Ebrel"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "Mae"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "Mezheven"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "Gouere"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "Eost"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "Gwengolo"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "Here"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "Du"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "Kerzu"
+
+#: 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 "pe"
+
+#. 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] "bloaz"
+msgstr[1] "bloaz"
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] "miz"
+msgstr[1] "miz"
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "sizhun"
+msgstr[1] "sizhun"
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] "deiz"
+msgstr[1] "deiz"
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "eur"
+msgstr[1] "eur"
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "munut"
+msgstr[1] "munut"
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr "munut"
+
+#: 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 "N'haller ket diskwel endalc'had ar c'havlec'h-mañ."
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "N'eus ket eus \"%(path)s\""
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Meneger %(directory)s"
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr "N'eus bet resisaet bloavezh ebet"
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr "N'eus bet resisaet miz ebet"
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr "N'eus bet resisaet deiz ebet"
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr "N'eus bet resisaet sizhun ebet"
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "N'eus %(verbose_name_plural)s ebet da gaout."
+
+#: views/generic/dates.py:646
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"En dazont ne vo ket a %(verbose_name_plural)s rak faos eo %(class_name)s."
+"allow_future."
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+"Direizh eo ar furmad '%(format)s' evit an neudennad deiziad '%(datestr)s'"
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+"N'eus bet kavet traezenn %(verbose_name)s ebet o klotaén gant ar goulenn"
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+"N'eo ket 'last' ar bajenn na n'hall ket bezañ amdroet en un niver anterin."
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr "Roll goullo ha faos eo '%(class_name)s.allow_empty'."
diff --git a/django/conf/locale/bs/LC_MESSAGES/django.mo b/django/conf/locale/bs/LC_MESSAGES/django.mo
index 7703a8e981..9271fee109 100644
Binary files a/django/conf/locale/bs/LC_MESSAGES/django.mo and b/django/conf/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/bs/LC_MESSAGES/django.po b/django/conf/locale/bs/LC_MESSAGES/django.po
index 330d8ee61a..0b6f00d6f7 100644
--- a/django/conf/locale/bs/LC_MESSAGES/django.po
+++ b/django/conf/locale/bs/LC_MESSAGES/django.po
@@ -7,359 +7,379 @@ 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: Filip Dupanović <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "arapski"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbejdžanski"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "bugarski"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengalski"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosanski"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "katalonski"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "češki"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "velški"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "danski"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "njemački"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "grčki"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "engleski"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Britanski engleski"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "španski"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentinski španski"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Meksički španski"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nikuaraganski španski"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estonski"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "baskijski"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persijski"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "finski"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francuski"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frišanski"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irski"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galski"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "hebrejski"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "hrvatski"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "mađarski"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonežanski"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandski"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "italijanski"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "japanski"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "gruzijski"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "kambođanski"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kanada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "korejski"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "litvanski"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "latvijski"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "makedonski"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malajalamski"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolski"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norveški književni"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "holandski"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norveški novi"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Pandžabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "poljski"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "brazilski portugalski"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumunski"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "ruski"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "slovački"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "slovenački"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albanski"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "srpski"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "srpski latinski"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "švedski"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamilski"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "tajlandski"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turski"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ukrajinski"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vijetnamežanski"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "novokineski"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "starokineski"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Unesite ispravnu vrijednost."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Ovaj URL izgleda ne vodi nikuda."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Unesite ispravan URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Unesite važeću email adresu."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Unesite ispravan „slug“, koji se sastoji od slova, brojki, donjih crta ili "
 "crtica."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Unesite ispravnu IPv4 adresu."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Unesite samo brojke razdvojene zapetama."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Pobrinite se da je ova vrijednost %(limit_value)s (trenutno je "
 "%(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Ova vrijednost mora da bude manja ili jednaka %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Ova vrijednost mora biti veća ili jednaka %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -368,7 +388,7 @@ msgstr ""
 "Pobrinite se da ova vrijednost ima najmanje %(limit_value)d znamenki "
 "(trenutno ima %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -377,271 +397,271 @@ msgstr ""
 "Pobrinite se da ova vrijednost ima najviše %(limit_value)d znamenki (ima "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s mora da bude jedinstven za %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "i"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 sa ovom vrijednošću %(field_label)s već postoji."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Vrijednost %r nije dozvoljen izbor."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Ovo polje ne može ostati prazno."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Ovo polje ne može biti prazno."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Polje tipa: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Cijeo broj"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Bulova vrijednost (True ili False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (najviše %(max_length)s znakova)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Cijeli brojevi razdvojeni zapetama"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datum (bez vremena)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datum (sa vremenom)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimalni broj"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Email adresa"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Putanja fajla"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Broj sa pokrenom zapetom"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Big (8 bajtni) integer"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP adresa"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Bulova vrijednost (True, False ili None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Vrijeme"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s sa pk %(pk)r ne postoji."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Strani ključ (tip određen povezanim poljem)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Jedan-na-jedan odnos"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Više-na-više odsnos"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Držite „Control“, ili „Command“ na Mac-u da biste obilježili više od jedne "
 "stavke."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Ovo polje se mora popuniti."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Unesite cijeo broj."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Unesite broj."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Ne smije biti ukupno više od %s cifara. Provjerite."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Ne smije biti ukupno više od %s decimalnih mijesta. Provjerite."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Ne smije biti ukupno više od %s cifara prije zapete. Provjerite."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Unesite ispravan datum."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Unesite ispravno vrijeme"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Unesite ispravan datum/vrijeme."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Fajl nije prebačen. Provjerite tip enkodiranja formulara."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Fajl nije prebačen."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Prebačen fajl je prazan."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -649,11 +669,11 @@ msgstr ""
 "Naziv fajla mora da sadrži bar %(max)d slovnih mijesta (trenutno ima "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -661,36 +681,40 @@ msgstr ""
 "Prebacite ispravan fajl. Fajl koji je prebačen ili nije slika, ili je "
 "oštećen."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Unesite ispravan URL."
+
+#: 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 ""
 "%(value)s nije među ponuđenim vrijednostima. Odaberite jednu od ponuđenih."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Unesite listu vrijednosti."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Redoslijed"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Obriši"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Ispravite dupli sadržaj za polja: %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Ispravite dupli sadržaj za polja: %(field)s, koji mora da bude jedinstven."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -699,65 +723,65 @@ msgstr ""
 "Ispravite dupli sadržaj za polja: %(field_name)s, koji mora da bude "
 "jedinstven za %(lookup)s u %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Ispravite duple vrijednosti dole."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Strani ključ se nije poklopio sa instancom roditeljskog ključa."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Odabrana vrijednost nije među ponuđenima. Odaberite jednu od ponuđenih."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "%s nije među ponuđenim vrijednostima. Odaberite jednu od ponuđenih."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "„%s“ nije ispravna vrijednost za primarni ključ."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Trenutno"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Izmjeni"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Očisti"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Da"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ne"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "da,ne,možda"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -765,52 +789,52 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "po p."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "prije p."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "ponoć"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "podne"
 
@@ -1086,154 +1110,139 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "decembar"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ili"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuta"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s je uspješno kreiran."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s je uspješno ažuriran."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s je obrisan."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Godina nije naznačena"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Mjesec nije naznačen"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Dan nije naznačen"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Sedmica nije naznačena"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/bs/formats.py b/django/conf/locale/bs/formats.py
index 34e9eac197..454fab1e1e 100644
--- a/django/conf/locale/bs/formats.py
+++ b/django/conf/locale/bs/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/ca/LC_MESSAGES/django.mo b/django/conf/locale/ca/LC_MESSAGES/django.mo
index b811c3591d..a062434f08 100644
Binary files a/django/conf/locale/ca/LC_MESSAGES/django.mo and b/django/conf/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ca/LC_MESSAGES/django.po b/django/conf/locale/ca/LC_MESSAGES/django.po
index 7eff29310e..ca7b489b11 100644
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Antoni Aloy <aaloy@apsl.net>, 2012.
 # Antoni Aloy <antoni.aloy@trespams.com>, 2012.
 # Carles Barrobés <carles@barrobes.com>, 2011, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
@@ -8,358 +9,378 @@ 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-13 19:36+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Afrikans"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "àrab"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "azerbaijanès"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "búlgar"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Bielorús"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengalí"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretó"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosnià"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "català"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "txec"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "gal·lès"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "danès"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "alemany"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "grec"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "anglès"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "anglès britànic"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "espanyol"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "castellà d'Argentina"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "espanyol de Mèxic"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "castellà de Nicaragua"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Espanyol de Veneçuela"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estonià"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "euskera"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persa"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "finlandès"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francès"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frisi"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irlandès"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "gallec"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "hebreu"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "croat"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "hongarès"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonesi"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandès"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "italià"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "japonès"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "georgià"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazakh"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kannarès"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "coreà"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxemburguès"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "lituà"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "letó"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "macedoni"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "malaiàlam "
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongol"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "noruec bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepalí"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "holandès"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "noruec nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "panjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "polonès"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portuguès"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "portuguès de brasil"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "romanès"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "rus"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "eslovac"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "eslovè"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albanès"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "serbi"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "serbi llatí"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "suec"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tàmil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "tailandès"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turc"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatar"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ucraïnès"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vietnamita"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "xinès simplificat"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "xinès tradicional"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Introduïu un valor vàlid."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Aquesta URL sembla ser un enllaç trencat."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Introdueix una adreça de correu electrònic vàlida"
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Introduïu una URL vàlida."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Introduïu una adreça de correu vàlida."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Introduïu un 'slug' vàlid, consistent en lletres, números, guions o guions "
 "baixos."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Introduïu una adreça IPv4 vàlida."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Entreu una adreça IPv6 vàlida."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Entreu una adreça IPv4 o IPv6 vàlida."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Introduïu només dígits separats per comes."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Assegureu-vos que el valor sigui %(limit_value)s (és %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Assegureu-vos que aquest valor sigui menor o igual que %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Assegureu-vos que aquest valor sigui més gran o igual que %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -368,7 +389,7 @@ msgstr ""
 "Assegureu-vos que el valor tingui com a mínim %(limit_value)d caràcters (en "
 "té %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -377,84 +398,84 @@ msgstr ""
 "Assegureu-vos que el valor tingui com a màxim %(limit_value)d caràcters (en "
 "té %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "El camp %(field_name)s ha de ser únic per a %(lookup)s %(date_field)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "i"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Ja existeix %(model_name)s amb aquest %(field_label)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "El valor %r no és una opció vàlida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Aquest camp no pot ser nul."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Aquest camp no pot estar en blanc."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Camp del tipus: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Enter"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "El valor '%s' ha de ser un nombre enter."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "El valor '%s' ha de ser True o False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Booleà (Cert o Fals)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Cadena (de fins a %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Enters separats per comes"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "El valor '%s' no té un format de data vàlid. Ha de tenir el format YYYY-MM-"
 "DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 "El valor '%s' té el format correcte (YYYY-MM-DD) però no és una data vàlida."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Data (sense hora)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -463,7 +484,7 @@ msgstr ""
 "El valor '%s' no té un format vàlid. Ha de tenir el format YYYY-MM-DD HH:MM[:"
 "ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -472,79 +493,79 @@ msgstr ""
 "El valor '%s' té el format correcte (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
 "però no és una data/hora vàlida."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Data (amb hora)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "El valor '%s' ha de ser un nombre decimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Número decimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Ruta del fitxer"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "El valor '%s' ha de ser un número de coma flotant."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Número de coma flotant"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Enter gran (8 bytes)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Adreça IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Adreça IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "El valor '%s' ha de ser None, True o False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleà (Cert, Fals o Cap ('None'))"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Enter positiu"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Enter petit positiu"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (fins a %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Enter petit"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Text"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -552,7 +573,7 @@ msgstr ""
 "El valor '%s' no té un format vàlid. Ha de tenir el format HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -561,99 +582,99 @@ msgstr ""
 "El valor '%s' té el format correcte (HH:MM[:ss[.uuuuuu]]) però no és una "
 "hora vàlida."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Hora"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Arxiu"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Imatge"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "No existeix el model %(model)s amb la clau primària %(pk)r."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Clau forana (tipus determinat pel camp relacionat)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Inter-relació un-a-un"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Inter-relació molts-a-molts"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Premeu la tecla \"Control\", o \"Command\" en un Mac, per seleccionar més "
 "d'un valor."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Aquest camp és obligatori."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Introduïu un número sencer."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Introduïu un número."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Assegureu-vos que no hi ha més de %s dígits en total."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Assegureu-vos que no hi ha més de %s decimals."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Assegureu-vos que no hi ha més de %s dígits decimals."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Introduïu una data vàlida."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Introduïu una hora vàlida."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Introduïu una data/hora vàlides."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "No s'ha enviat cap fitxer. Comproveu el tipus de codificació del formulari."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "No s'ha enviat cap fitxer."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "El fitxer enviat està buit."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -661,13 +682,13 @@ msgstr ""
 "Assegureu-vos que el valor té com a màxim %(max)d caràcters (en té "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Si us plau, envieu un fitxer o marqueu la casella de selecció \"netejar\", "
 "no ambdós."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -675,36 +696,40 @@ msgstr ""
 "Carregueu una imatge vàlida. El fitxer que heu carregat no era una imatge o "
 "estava corrupte."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Introduïu una URL vàlida."
+
+#: 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 "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Introduïu una llista de valors."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordre"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Eliminar"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Si us plau, corregiu la dada duplicada per a %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser "
 "única."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -713,32 +738,32 @@ msgstr ""
 "Si us plau, corregiu la dada duplicada per a %(field_name)s, la qual ha de "
 "ser única per a %(lookup)s en %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Si us plau, corregiu els valors duplicats a sota."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "La clau forana en línia no coincideix amb la clau primària de la instància "
 "mare."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Esculli una opció vàlida. Aquesta opció no és una de les opcions disponibles."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Escolliu una opció vàlida; %s no és una de les opcions vàlides."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" no és un valor vàlid per a una clau primària."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -747,87 +772,87 @@ msgstr ""
 "No s'ha pogut interpretar %(datetime)s a la zona horària "
 "%(current_timezone)s; potser és ambigua o no existeix."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Actualment"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modificar"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Netejar"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Sí"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "No"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "sí,no,potser"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "mitjanit"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "migdia"
 
@@ -1103,122 +1128,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "desembre"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "o"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "any"
 msgstr[1] "anys"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "mesos"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "setmana"
 msgstr[1] "setmanes"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dies"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuts"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "No es permeten índexos de directori aquí"
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" no existeix"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índex de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "El/la %(verbose_name)s s'ha creat amb èxit."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "El/la %(verbose_name)s s'ha actualtzat amb èxit."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "El/la %(verbose_name)s s'ha eliminat."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "No s'ha especificat any"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "No s'ha especificat mes"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "No s'ha especificat dia"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "No s'ha especificat setmana"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Cap %(verbose_name_plural)s disponible"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1227,26 +1237,26 @@ msgstr ""
 "Futurs %(verbose_name_plural)s no disponibles perquè %(class_name)s."
 "allow_future és Fals."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Cadena invàlida de dats '%(datestr)s' donat el format '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "No s'ha trobat sap %(verbose_name)s que coincideixi amb la petició"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "La pàgina no és 'last', ni es pot convertir en un enter"
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Pàgina invàlida (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Plana invàlida  (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Llista buida i '%(class_name)s.allow_empty' és Fals."
diff --git a/django/conf/locale/ca/formats.py b/django/conf/locale/ca/formats.py
index b9431b5b67..0335617ac8 100644
--- a/django/conf/locale/ca/formats.py
+++ b/django/conf/locale/ca/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -21,8 +22,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = ','
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index 46dd006cfe..7d6ae6428e 100644
Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index fe20e19a3f..3284e45f3d 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -2,362 +2,383 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Jan Papež <honyczek@centrum.cz>, 2012.
 # Jirka Vejrazka <Jirka.Vejrazka@gmail.com>, 2011.
 # Vlada Macek <macek@sandbox.cz>, 2012.
 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: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "afrikánsky"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "arabsky"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Ázerbájdžánština"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "bulharsky"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "bělorusky"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengálsky"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "bretonsky"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosensky"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "katalánsky"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "česky"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
-msgstr "welšsky"
+msgstr "velšsky"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "dánsky"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "německy"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "řecky"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "anglicky"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
-msgstr "anglicky (Británie)"
+msgstr "britskou angličtinou"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "esperantsky"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "španělsky"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
-msgstr "španělsky (Argentina)"
+msgstr "argentinskou španělštinou"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mexická španělština"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nikaragujskou španělštinou"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "venezuelskou španělštinou"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estonsky"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "baskicky"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persky"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "finsky"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francouzsky"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frísky"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irsky"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galicijsky"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "hebrejsky"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindsky"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "chorvatsky"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "maďarsky"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonésky"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandsky"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "italsky"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "japonsky"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "gruzínsky"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "kazašsky"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "khmersky"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kannadsky"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "korejsky"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "lucembursky"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "litevsky"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "lotyšsky"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "makedonsky"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "malajálamsky"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongolsky"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "norsky (Bokmål)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "nepálsky"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
-msgstr "holandsky"
+msgstr "nizozemsky"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "norsky (Nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
-msgstr "Paňdžábsky"
+msgstr "paňdžábsky"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "polsky"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugalsky"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
-msgstr "portugalsky (Brazílie)"
+msgstr "brazilskou portugalštinou"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumunsky"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "rusky"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "slovensky"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "slovinsky"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albánsky"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "srbsky"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "srbsky (latinkou)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "švédsky"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "svahilsky"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamilsky"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telužsky"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "thajsky"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turecky"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "tatarsky"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "udmurtsky"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ukrajinsky"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdština"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vietnamsky"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "čínsky (zjednodušeně)"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "čínsky (tradičně)"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Vložte platnou hodnotu."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Tato adresa URL je zřejmě neplatný odkaz."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Zadejte platnou e-mailovou adresu."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Vložte platnou adresu URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Vložte platnou e-mailovou adresu."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Vložte platný identifikátor složený pouze z písmen, čísel, podtržítek a "
 "pomlček."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Vložte platnou adresu typu IPv4."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Zadejte platnou adresu typu IPv6."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Zadejte platnou adresu typu IPv4 nebo IPv6."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Vložte pouze číslice oddělené čárkami."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Hodnota musí být %(limit_value)s (nyní je %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Hodnota musí být menší nebo rovna %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Hodnota musí být větší nebo rovna %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +387,7 @@ msgstr ""
 "Hodnota musí mít alespoň %(limit_value)d znaků, ale nyní jich má "
 "%(show_value)d."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,84 +396,84 @@ msgstr ""
 "Hodnota smí mít nejvýše %(limit_value)d znaků, ale nyní jich má "
 "%(show_value)d."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "Pole %(field_name)s musí být unikátní testem %(lookup)s pole %(date_field)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "a"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
 "Položka %(model_name)s s touto hodnotou v poli %(field_label)s již existuje."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Hodnota %r není platnou volbou."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Pole nemůže být null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Pole nemůže být prázdné."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Pole typu: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Celé číslo"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Hodnota '%s' musí být celé číslo."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Hodnota '%s' musí být buď True nebo False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Pravdivost (buď Ano (True), nebo Ne (False))"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Řetězec (max. %(max_length)s znaků)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Celá čísla oddělená čárkou"
 
-#: db/models/fields/__init__.py:647
+#: 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 "Hodnota '%s' není platné datum. Musí být ve tvaru RRRR-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 "Ačkoli hodnota '%s' je ve správném tvaru (RRRR-MM-DD), jde o neplatné datum."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datum (bez času)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -461,7 +482,7 @@ msgstr ""
 "Hodnota '%s' je v neplatném tvaru, který má být RRRR-MM-DD HH:MM[:SS[."
 "uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -470,85 +491,85 @@ msgstr ""
 "Ačkoli hodnota '%s' je ve správném tvaru (RRRR-MM-DD HH:MM[:SS[.uuuuuu]]"
 "[TZ]), jde o neplatné datum a čas."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datum (s časem)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Hodnota '%s' musí být desítkové číslo."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Desetinné číslo"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-mailová adresa"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Hodnota '%s' musí být reálné číslo."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Číslo s pohyblivou řádovou čárkou"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Velké číslo (8 bajtů)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Adresa IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Adresa IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Hodnota '%s' musí být buď None, True nebo False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Pravdivost (buď Ano (True), Ne (False) nebo Nic (None))"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Kladné celé číslo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Kladné malé celé číslo"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Identifikátor (nejvýše %(max_length)s znaků)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Malé celé číslo"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Text"
 
-#: db/models/fields/__init__.py:1180
+#: 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 "Hodnota '%s' je v neplatném tvaru, který má být HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -557,144 +578,148 @@ msgstr ""
 "Ačkoli hodnota '%s' je ve správném tvaru (HH:MM[:ss[.uuuuuu]]), jde o "
 "neplatný čas."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Čas"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Soubor"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Obrázek"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Položka typu %(model)s s primárním klíčem %(pk)r neexistuje."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Cizí klíč (typ určen pomocí souvisejícího pole)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Vazba jedna-jedna"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Vazba mnoho-mnoho"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Výběr více než jedné položky je možný přidržením klávesy \"Control\" (nebo "
 "\"Command\" na Macu)."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Pole je povinné."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Vložte celé číslo."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Vložte číslo."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Hodnota nesmí celkem mít více než %s cifer."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Hodnota nesmí mít za desetinnou čárkou více než %s cifer."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Hodnota nesmí mít před desetinnou čárkou více než %s cifer."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Vložte platné datum."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Vložte platný čas."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Vložte platné datum a čas."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Soubor nebyl odeslán. Zkontrolujte parametr \"encoding type\" formuláře."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Žádný soubor nebyl odeslán."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Odeslaný soubor je prázdný."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "Délka názvu souboru má být nejvýše %(max)d znaků, ale nyní je %(length)d."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Musíte vybrat cestu k souboru nebo vymazat výběr, ne obojí."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 "Nahrajte platný obrázek. Odeslaný soubor buď nebyl obrázek nebo byl poškozen."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Vložte platnou adresu URL."
+
+#: 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 "Vyberte platnou možnost, \"%(value)s\" není k dispozici."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Vložte seznam hodnot."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Pořadí"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Odstranit"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Opravte duplicitní data v poli %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Opravte duplicitní data v poli %(field)s, které musí být unikátní."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -703,30 +728,30 @@ msgstr ""
 "Opravte duplicitní data v poli %(field_name)s, které musí být unikátní "
 "testem %(lookup)s pole %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Odstraňte duplicitní hodnoty níže."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Cizí klíč typu inline neodpovídá primárnímu klíči v rodičovské položce."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Vyberte platnou možnost. Tato není k dispozici."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Vyberte platnou možnost, \"%s\" není k dispozici."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "Hodnota \"%s\" není platný primární klíč."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -735,35 +760,35 @@ msgstr ""
 "Hodnotu %(datetime)s nelze interpretovat v časové zóně %(current_timezone)s; "
 "může to být nejednoznačné nebo nemusí existovat."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Aktuálně"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Změnit"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Zrušit"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ano"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ne"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ano, ne, možná"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -771,52 +796,52 @@ msgstr[0] "%(size)d bajt"
 msgstr[1] "%(size)d bajty"
 msgstr[2] "%(size)d bajtů"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "odp."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "dop."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "odp."
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "dop."
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "půlnoc"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "poledne"
 
@@ -1092,128 +1117,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "prosince"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "nebo"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "rok"
 msgstr[1] "roky"
 msgstr[2] "let"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "měsíc"
 msgstr[1] "měsíce"
 msgstr[2] "měsíců"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "týden"
 msgstr[1] "týdny"
 msgstr[2] "týdnů"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "den"
 msgstr[1] "dny"
 msgstr[2] "dnů"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodin"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuty"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Indexy adresářů zde nejsou povoleny."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" neexistuje"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Index adresáře %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Položka typu %(verbose_name)s byla úspěšně vytvořena."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Položka typu %(verbose_name)s byla úspěšně aktualizována."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Položka typu %(verbose_name)s byla odstraněna."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Nebyl specifikován rok"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Nebyl specifikován měsíc"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Nebyl specifikován den"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nebyl specifikován týden"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s nejsou k dispozici"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1222,26 +1232,26 @@ msgstr ""
 "%(verbose_name_plural)s s budoucím datem nejsou k dipozici protoze "
 "%(class_name)s.allow_future je False"
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Datum '%(datestr)s' neodpovídá formátu '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Nepodařilo se nalézt žádný objekt %(verbose_name)s"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Požadavek na stránku nemohl být konvertován na číslo, ani není 'last'"
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Chybné číslo stránky (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Neplatná stránka (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "List je prázdný a '%(class_name)s.allow_empty' je nastaveno na False"
diff --git a/django/conf/locale/cs/formats.py b/django/conf/locale/cs/formats.py
index ea28718f57..42ca212392 100644
--- a/django/conf/locale/cs/formats.py
+++ b/django/conf/locale/cs/formats.py
@@ -29,10 +29,12 @@ TIME_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '05.01.2006 04:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '05.01.2006 04:30:59.000200'
     '%d.%m.%Y %H.%M',       # '05.01.2006 04.30'
     '%d.%m.%Y %H:%M',       # '05.01.2006 04:30'
     '%d.%m.%Y',             # '05.01.2006'
     '%d. %m. %Y %H:%M:%S',  # '05. 01. 2006 04:30:59'
+    '%d. %m. %Y %H:%M:%S.%f', # '05. 01. 2006 04:30:59.000200'
     '%d. %m. %Y %H.%M',     # '05. 01. 2006 04.30'
     '%d. %m. %Y %H:%M',     # '05. 01. 2006 04:30'
     '%d. %m. %Y',           # '05. 01. 2006'
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 75a868e99b..2bf3a436d8 100644
Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index 6c116674ec..249e9b6d5b 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -2,644 +2,666 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Maredudd ap Gwyndaf <maredudd@maredudd.com>, 2012.
 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"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Maredudd ap Gwyndaf <maredudd@maredudd.com>\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
 #: conf/global_settings.py:48
-msgid "Arabic"
+msgid "Afrikaans"
 msgstr ""
 
 #: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Arabeg"
+
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr ""
 
-#: conf/global_settings.py:50
-msgid "Bulgarian"
-msgstr ""
-
 #: conf/global_settings.py:51
-msgid "Bengali"
-msgstr "Bengaleg"
+msgid "Bulgarian"
+msgstr "Bwlgareg"
 
 #: conf/global_settings.py:52
-msgid "Bosnian"
+msgid "Belarusian"
 msgstr ""
 
 #: conf/global_settings.py:53
-msgid "Catalan"
-msgstr ""
+msgid "Bengali"
+msgstr "Bengaleg"
 
 #: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "Bosnieg"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "Catalaneg"
+
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tsieceg"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Cymraeg"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Daneg"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Almaeneg"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
-msgstr ""
+msgstr "Groegedd"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Saesneg"
 
-#: conf/global_settings.py:60
-msgid "British English"
-msgstr ""
-
-#: conf/global_settings.py:61
-msgid "Esperanto"
-msgstr ""
-
-#: conf/global_settings.py:62
-msgid "Spanish"
-msgstr "Spaeneg"
-
 #: conf/global_settings.py:63
-msgid "Argentinian Spanish"
-msgstr ""
+msgid "British English"
+msgstr "Saesneg Prydain"
 
 #: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "Sbaeneg"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "Sbaeneg Ariannin"
+
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr ""
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
-msgid "Estonian"
-msgstr ""
-
-#: conf/global_settings.py:67
-msgid "Basque"
-msgstr ""
-
-#: conf/global_settings.py:68
-msgid "Persian"
-msgstr ""
-
 #: conf/global_settings.py:69
-msgid "Finnish"
+msgid "Venezuelan Spanish"
 msgstr ""
 
 #: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "Estoneg"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "Basgeg"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "Persieg"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "Ffinneg"
+
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Ffrangeg"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
-msgstr ""
+msgstr "Ffrisieg"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
-msgstr ""
+msgstr "Gwyddeleg"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galisieg"
 
-#: conf/global_settings.py:74
-msgid "Hebrew"
-msgstr ""
-
-#: conf/global_settings.py:75
-msgid "Hindi"
-msgstr ""
-
-#: conf/global_settings.py:76
-msgid "Croatian"
-msgstr ""
-
-#: conf/global_settings.py:77
-msgid "Hungarian"
-msgstr ""
-
 #: conf/global_settings.py:78
-msgid "Indonesian"
-msgstr ""
+msgid "Hebrew"
+msgstr "Hebraeg"
 
 #: conf/global_settings.py:79
-msgid "Icelandic"
-msgstr "Islandeg"
+msgid "Hindi"
+msgstr "Hindi"
 
 #: conf/global_settings.py:80
-msgid "Italian"
-msgstr "Eidaleg"
+msgid "Croatian"
+msgstr "Croasieg"
 
 #: conf/global_settings.py:81
-msgid "Japanese"
-msgstr ""
+msgid "Hungarian"
+msgstr "Hwngareg"
 
 #: conf/global_settings.py:82
-msgid "Georgian"
+msgid "Interlingua"
 msgstr ""
 
 #: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "Indoneseg"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "Islandeg"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "Eidaleg"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "Siapanëeg"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "Georgeg"
+
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr ""
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr ""
 
-#: conf/global_settings.py:86
-msgid "Korean"
-msgstr ""
-
-#: conf/global_settings.py:87
-msgid "Lithuanian"
-msgstr ""
-
-#: conf/global_settings.py:88
-msgid "Latvian"
-msgstr ""
-
-#: conf/global_settings.py:89
-msgid "Macedonian"
-msgstr ""
-
-#: conf/global_settings.py:90
-msgid "Malayalam"
-msgstr ""
-
 #: conf/global_settings.py:91
-msgid "Mongolian"
-msgstr ""
+msgid "Korean"
+msgstr "Corëeg"
 
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
+msgid "Lithuanian"
 msgstr ""
 
 #: conf/global_settings.py:94
-msgid "Dutch"
+msgid "Latvian"
 msgstr ""
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
+msgid "Macedonian"
 msgstr ""
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
+msgid "Malayalam"
 msgstr ""
 
 #: conf/global_settings.py:97
-msgid "Polish"
+msgid "Mongolian"
 msgstr ""
 
 #: conf/global_settings.py:98
-msgid "Portuguese"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: conf/global_settings.py:99
-msgid "Brazilian Portuguese"
+msgid "Nepali"
 msgstr ""
 
 #: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "Iseldireg"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr ""
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "Pwyleg"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "Portiwgaleg"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "Portiwgaleg Brasil"
+
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Romaneg"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rwsieg"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slofaceg"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
-msgstr ""
+msgstr "Slofeneg"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr ""
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbeg"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr ""
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Swedeg"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
-msgstr ""
+msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr ""
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr ""
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
-msgstr ""
+msgstr "Twrceg"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr ""
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr ""
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr ""
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Tsieinëeg Symledig"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
-msgstr ""
+msgstr "Tseinëeg Traddodiadol"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
+msgstr "Rhowch werth dilys."
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr ""
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr ""
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Rhowch cyfeiriad e-bost ddilys."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Rhowch digidau gwahanu gyda atalnodau yn unig."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ac"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr ""
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr ""
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dyddiad (heb amser)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dyddiad (gyda amser)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Rhif degol"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Cyfeiriad e-bost"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr ""
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Llwybr ffeil"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "cyfeiriad IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boole (Naill ai True, False neu None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Testun"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Amser"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Mae angen y faes yma."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Rhowch rhif cyfan."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr ""
 
-#: forms/fields.py:264
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
-
 #: forms/fields.py:265
 #, python-format
-msgid "Ensure that there are no more than %s decimal places."
+msgid "Ensure that there are no more than %s digits in total."
 msgstr ""
 
 #: forms/fields.py:266
 #, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr ""
+
+#: forms/fields.py:267
+#, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Mae'r ffeil yn wag."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -647,98 +669,102 @@ msgstr ""
 "Llwythwch delwedd dilys. Doedd y delwedd a llwythwyd dim yn ddelwedd dilys, "
 "neu roedd o'n ddelwedd llwgr."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Rhowch URL dilys."
+
+#: 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 ""
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Dileu"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:581
+#: 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 ""
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Newidio"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ie"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Na"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ie,na,efallai"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -747,52 +773,52 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
-msgstr ""
-
-#: template/defaultfilters.py:836
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#: template/defaultfilters.py:838
-#, python-format
-msgid "%s TB"
-msgstr ""
+msgstr "%s MB"
 
 #: template/defaultfilters.py:839
 #, python-format
-msgid "%s PB"
-msgstr ""
+msgid "%s GB"
+msgstr "%s GB"
 
-#: utils/dateformat.py:45
+#: 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 ""
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr ""
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr ""
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr ""
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr ""
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr ""
 
@@ -826,31 +852,31 @@ msgstr "Dydd Sul"
 
 #: utils/dates.py:10
 msgid "Mon"
-msgstr ""
+msgstr "Llu"
 
 #: utils/dates.py:10
 msgid "Tue"
-msgstr ""
+msgstr "Maw"
 
 #: utils/dates.py:10
 msgid "Wed"
-msgstr ""
+msgstr "Mer"
 
 #: utils/dates.py:10
 msgid "Thu"
-msgstr ""
+msgstr "Iau"
 
 #: utils/dates.py:10
 msgid "Fri"
-msgstr ""
+msgstr "Gwe"
 
 #: utils/dates.py:11
 msgid "Sat"
-msgstr ""
+msgstr "Sad"
 
 #: utils/dates.py:11
 msgid "Sun"
-msgstr ""
+msgstr "Sul"
 
 #: utils/dates.py:18
 msgid "January"
@@ -902,51 +928,51 @@ msgstr "Rhagfyr"
 
 #: utils/dates.py:23
 msgid "jan"
-msgstr ""
+msgstr "ion"
 
 #: utils/dates.py:23
 msgid "feb"
-msgstr ""
+msgstr "chw"
 
 #: utils/dates.py:23
 msgid "mar"
-msgstr ""
+msgstr "maw"
 
 #: utils/dates.py:23
 msgid "apr"
-msgstr ""
+msgstr "ebr"
 
 #: utils/dates.py:23
 msgid "may"
-msgstr ""
+msgstr "mai"
 
 #: utils/dates.py:23
 msgid "jun"
-msgstr ""
+msgstr "meh"
 
 #: utils/dates.py:24
 msgid "jul"
-msgstr ""
+msgstr "gor"
 
 #: utils/dates.py:24
 msgid "aug"
-msgstr ""
+msgstr "aws"
 
 #: utils/dates.py:24
 msgid "sep"
-msgstr ""
+msgstr "med"
 
 #: utils/dates.py:24
 msgid "oct"
-msgstr ""
+msgstr "hyd"
 
 #: utils/dates.py:24
 msgid "nov"
-msgstr ""
+msgstr "tach"
 
 #: utils/dates.py:24
 msgid "dec"
-msgstr ""
+msgstr "rhag"
 
 #: utils/dates.py:31
 msgctxt "abbrev. month"
@@ -1068,22 +1094,22 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Rhagfyr"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
-msgstr ""
+msgstr "neu"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] ""
@@ -1091,7 +1117,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
@@ -1099,7 +1125,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] ""
@@ -1107,7 +1133,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
@@ -1115,7 +1141,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
@@ -1123,7 +1149,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
@@ -1131,97 +1157,82 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr ""
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr ""
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ""
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr ""
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr ""
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr ""
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/cy/formats.py b/django/conf/locale/cy/formats.py
index 6e0e7027cd..ba4b275938 100644
--- a/django/conf/locale/cy/formats.py
+++ b/django/conf/locale/cy/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 9e40b2b3c9..c0d60aea00 100644
Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index 1687e14dc5..cbcf268660 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
@@ -2,363 +2,384 @@
 #
 # Translators:
 # Christian Joergensen <christian@gmta.info>, 2012.
-# Erik Wognsen <r4mses@gmail.com>, 2011, 2012.
+# Erik Wognsen <r4mses@gmail.com>, 2011-2013.
 # Finn Gruwier <finn@gruwier.dk>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <jonaskoelker@gnu.org>, 2012.
 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-19 12:49+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-13 04:19+0000\n"
 "Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
-msgid "Arabic"
-msgstr "Arabisk"
+msgid "Afrikaans"
+msgstr "afrikaans"
 
 #: conf/global_settings.py:49
-msgid "Azerbaijani"
-msgstr "Azerbaidjansk"
+msgid "Arabic"
+msgstr "arabisk"
 
 #: conf/global_settings.py:50
-msgid "Bulgarian"
-msgstr "Bulgarsk"
+msgid "Azerbaijani"
+msgstr "azerbaidjansk"
 
 #: conf/global_settings.py:51
-msgid "Bengali"
-msgstr "Bengalsk"
+msgid "Bulgarian"
+msgstr "bulgarsk"
 
 #: conf/global_settings.py:52
-msgid "Bosnian"
-msgstr "Bosnisk"
+msgid "Belarusian"
+msgstr "hviderussisk"
 
 #: conf/global_settings.py:53
-msgid "Catalan"
-msgstr "Catalansk"
+msgid "Bengali"
+msgstr "bengalsk"
 
 #: conf/global_settings.py:54
-msgid "Czech"
-msgstr "Tjekkisk"
+msgid "Breton"
+msgstr "bretonsk"
 
 #: conf/global_settings.py:55
-msgid "Welsh"
-msgstr "Walisisk"
+msgid "Bosnian"
+msgstr "bosnisk"
 
 #: conf/global_settings.py:56
-msgid "Danish"
-msgstr "Dansk"
+msgid "Catalan"
+msgstr "catalansk"
 
 #: conf/global_settings.py:57
-msgid "German"
-msgstr "Tysk"
+msgid "Czech"
+msgstr "tjekkisk"
 
 #: conf/global_settings.py:58
-msgid "Greek"
-msgstr "Græsk"
+msgid "Welsh"
+msgstr "walisisk"
 
 #: conf/global_settings.py:59
-msgid "English"
-msgstr "Engelsk"
+msgid "Danish"
+msgstr "dansk"
 
 #: conf/global_settings.py:60
-msgid "British English"
-msgstr "Britisk engelsk"
+msgid "German"
+msgstr "tysk"
 
 #: conf/global_settings.py:61
-msgid "Esperanto"
-msgstr ""
+msgid "Greek"
+msgstr "græsk"
 
 #: conf/global_settings.py:62
-msgid "Spanish"
-msgstr "Spansk"
+msgid "English"
+msgstr "engelsk"
 
 #: conf/global_settings.py:63
-msgid "Argentinian Spanish"
-msgstr "Argentinsk spansk"
+msgid "British English"
+msgstr "britisk engelsk"
 
 #: conf/global_settings.py:64
-msgid "Mexican Spanish"
-msgstr "Mexikansk spansk"
+msgid "Esperanto"
+msgstr "esperanto"
 
 #: conf/global_settings.py:65
-msgid "Nicaraguan Spanish"
-msgstr "Nicaraguansk spansk"
+msgid "Spanish"
+msgstr "spansk"
 
 #: conf/global_settings.py:66
-msgid "Estonian"
-msgstr "Estisk"
+msgid "Argentinian Spanish"
+msgstr "argentinsk spansk"
 
 #: conf/global_settings.py:67
-msgid "Basque"
-msgstr "Baskisk"
+msgid "Mexican Spanish"
+msgstr "mexikansk spansk"
 
 #: conf/global_settings.py:68
-msgid "Persian"
-msgstr "Persisk"
+msgid "Nicaraguan Spanish"
+msgstr "nicaraguansk spansk"
 
 #: conf/global_settings.py:69
-msgid "Finnish"
-msgstr "Finsk"
+msgid "Venezuelan Spanish"
+msgstr "venezuelansk spansk"
 
 #: conf/global_settings.py:70
-msgid "French"
-msgstr "Fransk"
+msgid "Estonian"
+msgstr "estisk"
 
 #: conf/global_settings.py:71
-msgid "Frisian"
-msgstr "Frisisk"
+msgid "Basque"
+msgstr "baskisk"
 
 #: conf/global_settings.py:72
-msgid "Irish"
-msgstr "Irsk"
+msgid "Persian"
+msgstr "persisk"
 
 #: conf/global_settings.py:73
-msgid "Galician"
-msgstr "Galicisk"
+msgid "Finnish"
+msgstr "finsk"
 
 #: conf/global_settings.py:74
-msgid "Hebrew"
-msgstr "Hebræisk"
+msgid "French"
+msgstr "fransk"
 
 #: conf/global_settings.py:75
-msgid "Hindi"
-msgstr "Hindi"
+msgid "Frisian"
+msgstr "frisisk"
 
 #: conf/global_settings.py:76
-msgid "Croatian"
-msgstr "Kroatisk"
+msgid "Irish"
+msgstr "irsk"
 
 #: conf/global_settings.py:77
-msgid "Hungarian"
-msgstr "Ungarsk"
+msgid "Galician"
+msgstr "galicisk"
 
 #: conf/global_settings.py:78
-msgid "Indonesian"
-msgstr "Indonesisk"
+msgid "Hebrew"
+msgstr "hebraisk"
 
 #: conf/global_settings.py:79
-msgid "Icelandic"
-msgstr "Islandsk"
+msgid "Hindi"
+msgstr "hindi"
 
 #: conf/global_settings.py:80
-msgid "Italian"
-msgstr "Italiensk"
+msgid "Croatian"
+msgstr "kroatisk"
 
 #: conf/global_settings.py:81
-msgid "Japanese"
-msgstr "Japansk"
+msgid "Hungarian"
+msgstr "ungarsk"
 
 #: conf/global_settings.py:82
-msgid "Georgian"
-msgstr "Georgisk"
+msgid "Interlingua"
+msgstr "interlingua"
 
 #: conf/global_settings.py:83
-msgid "Kazakh"
-msgstr ""
+msgid "Indonesian"
+msgstr "indonesisk"
 
 #: conf/global_settings.py:84
-msgid "Khmer"
-msgstr "Khmer"
+msgid "Icelandic"
+msgstr "islandsk"
 
 #: conf/global_settings.py:85
-msgid "Kannada"
-msgstr "Kannada"
+msgid "Italian"
+msgstr "italiensk"
 
 #: conf/global_settings.py:86
-msgid "Korean"
-msgstr "Koreansk"
+msgid "Japanese"
+msgstr "japansk"
 
 #: conf/global_settings.py:87
-msgid "Lithuanian"
-msgstr "Litauisk"
+msgid "Georgian"
+msgstr "georgisk"
 
 #: conf/global_settings.py:88
-msgid "Latvian"
-msgstr "Lettisk"
+msgid "Kazakh"
+msgstr "kasakhisk"
 
 #: conf/global_settings.py:89
-msgid "Macedonian"
-msgstr "Makedonsk"
+msgid "Khmer"
+msgstr "khmer"
 
 #: conf/global_settings.py:90
-msgid "Malayalam"
-msgstr "Malaysisk"
+msgid "Kannada"
+msgstr "kannada"
 
 #: conf/global_settings.py:91
-msgid "Mongolian"
-msgstr "Mongolsk"
+msgid "Korean"
+msgstr "koreansk"
 
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
-msgstr "Norsk bokmål"
+msgid "Luxembourgish"
+msgstr "luxembourgisk"
 
 #: conf/global_settings.py:93
-msgid "Nepali"
-msgstr ""
+msgid "Lithuanian"
+msgstr "litauisk"
 
 #: conf/global_settings.py:94
-msgid "Dutch"
-msgstr "Hollandsk"
+msgid "Latvian"
+msgstr "lettisk"
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
-msgstr "Norsk nynorsk"
+msgid "Macedonian"
+msgstr "makedonsk"
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
-msgstr "Punjabi"
+msgid "Malayalam"
+msgstr "malaysisk"
 
 #: conf/global_settings.py:97
-msgid "Polish"
-msgstr "Polsk"
+msgid "Mongolian"
+msgstr "mongolsk"
 
 #: conf/global_settings.py:98
-msgid "Portuguese"
-msgstr "Portugisisk"
+msgid "Norwegian Bokmal"
+msgstr "norsk bokmål"
 
 #: conf/global_settings.py:99
-msgid "Brazilian Portuguese"
-msgstr "Brasiliansk portugisisk"
+msgid "Nepali"
+msgstr "nepalesisk"
 
 #: conf/global_settings.py:100
-msgid "Romanian"
-msgstr "Rumænsk"
+msgid "Dutch"
+msgstr "hollandsk"
 
 #: conf/global_settings.py:101
-msgid "Russian"
-msgstr "Russisk"
+msgid "Norwegian Nynorsk"
+msgstr "norsk nynorsk"
 
 #: conf/global_settings.py:102
-msgid "Slovak"
-msgstr "Slovakisk"
+msgid "Punjabi"
+msgstr "punjabi"
 
 #: conf/global_settings.py:103
-msgid "Slovenian"
-msgstr "Slovensk"
+msgid "Polish"
+msgstr "polsk"
 
 #: conf/global_settings.py:104
-msgid "Albanian"
-msgstr "Albansk"
+msgid "Portuguese"
+msgstr "portugisisk"
 
 #: conf/global_settings.py:105
-msgid "Serbian"
-msgstr "Serbisk"
+msgid "Brazilian Portuguese"
+msgstr "brasiliansk portugisisk"
 
 #: conf/global_settings.py:106
-msgid "Serbian Latin"
-msgstr "Serbisk (latin)"
+msgid "Romanian"
+msgstr "rumænsk"
 
 #: conf/global_settings.py:107
-msgid "Swedish"
-msgstr "Svensk"
+msgid "Russian"
+msgstr "russisk"
 
 #: conf/global_settings.py:108
-msgid "Swahili"
-msgstr ""
+msgid "Slovak"
+msgstr "slovakisk"
 
 #: conf/global_settings.py:109
-msgid "Tamil"
-msgstr "Tamil"
+msgid "Slovenian"
+msgstr "slovensk"
 
 #: conf/global_settings.py:110
-msgid "Telugu"
-msgstr "Telugu"
+msgid "Albanian"
+msgstr "albansk"
 
 #: conf/global_settings.py:111
-msgid "Thai"
-msgstr "Thai"
+msgid "Serbian"
+msgstr "serbisk"
 
 #: conf/global_settings.py:112
-msgid "Turkish"
-msgstr "Tyrkisk"
+msgid "Serbian Latin"
+msgstr "serbisk (latin)"
 
 #: conf/global_settings.py:113
-msgid "Tatar"
-msgstr ""
+msgid "Swedish"
+msgstr "svensk"
 
 #: conf/global_settings.py:114
-msgid "Ukrainian"
-msgstr "Ukrainsk"
+msgid "Swahili"
+msgstr "swahili"
 
 #: conf/global_settings.py:115
-msgid "Urdu"
-msgstr "Urdu"
+msgid "Tamil"
+msgstr "tamil"
 
 #: conf/global_settings.py:116
-msgid "Vietnamese"
-msgstr "Vietnamesisk"
+msgid "Telugu"
+msgstr "telugu"
 
 #: conf/global_settings.py:117
-msgid "Simplified Chinese"
-msgstr "Forenklet kinesisk"
+msgid "Thai"
+msgstr "thai"
 
 #: conf/global_settings.py:118
-msgid "Traditional Chinese"
-msgstr "Traditionelt kinesisk"
+msgid "Turkish"
+msgstr "tyrkisk"
 
-#: core/validators.py:24 forms/fields.py:51
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr "tatarisk"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "udmurtisk"
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "ukrainsk"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr "urdu"
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "vietnamesisk"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "forenklet kinesisk"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "traditionelt kinesisk"
+
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Indtast en gyldig værdi."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Denne URL henviser ikke til en gyldig side eller fil."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Indtast en gyldig URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Indtast en gyldig e-mail-adresse."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Indtast en \"slug\" bestående af bogstaver, cifre, understreger og "
 "bindestreger."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Indtast en gyldig IPv4-adresse."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Indtast en gyldig IPv6-adresse."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Indtast en gyldig IPv4- eller IPv6-adresse."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Indtast kun cifre adskilt af kommaer."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Denne værdi skal være %(limit_value)s (den er %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Denne værdi skal være mindre end eller lig %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Denne værdi skal være større end eller lig %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -367,7 +388,7 @@ msgstr ""
 "Denne værdi skal mindst indeholde %(limit_value)d tegn (den indeholder "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -376,83 +397,83 @@ msgstr ""
 "Denne værdi må maksimalt indeholde %(limit_value)d tegn (den har "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s skal være unik for %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "og"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 med dette %(field_label)s eksisterer allerede."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Værdien %r er ikke et gyldigt valg."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Dette felt kan ikke være null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Dette felt kan ikke være tomt."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Felt af type: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Heltal"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' værdien skal være et heltal."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' værdien skal være enten True eller False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolsk (enten True eller False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Streng (op til %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Kommaseparerede heltal"
 
-#: db/models/fields/__init__.py:647
+#: 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' værdien har et ugyldigt datoformat. Det skal være i formatet ÅÅÅÅ-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' værdien har det korrekte format (ÅÅÅÅ-MM-DD) men er en ugyldig dato."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dato (uden tid)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -461,7 +482,7 @@ msgstr ""
 "'%s' værdien har et ugyldigt datoformat. Det skal være i formatet ÅÅÅÅ-MM-DD "
 "TT:MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -470,79 +491,79 @@ msgstr ""
 "'%s' værdien har det korrekte format (ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]][TZ]) "
 "men er en ugyldig dato/tid."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dato (med tid)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' værdien skal være et decimaltal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimaltal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-mail-adresse"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Sti"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' værdien skal være en float."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Flydende-komma-tal"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Stort heltal (8 byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4-adresse"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' værdien skal være enten None, True eller False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolsk (True, False eller None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Positivt heltal"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Positivt lille heltal"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "\"Slug\" (op til %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Lille heltal"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -550,7 +571,7 @@ msgstr ""
 "'%s' værdien har et ugyldigt datoformat. Det skal være i formatet ÅÅÅÅ-MM-DD "
 "TT:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -559,109 +580,109 @@ msgstr ""
 "'%s' værdien har det korrekte format (ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]) men er "
 "en ugyldig dato/tid."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Tid"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fil"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Billede"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "En model %(model)s med primærnøgle %(pk)r eksisterer ikke."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Fremmednøgle (type bestemt af relateret felt)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "En-til-en-relation"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Mange-til-mange-relation"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Hold \"Ctrl\" (eller \"Æbletasten\" på Mac) nede for at vælge mere end en."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Dette felt er påkrævet."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Indtast et heltal."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Indtast et tal."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Der må maksimalt være %s cifre i alt."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Der må højst være %s decimalpladser."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Der må maksimalt være %s cifre før decimaltegnet."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Indtast en gyldig dato."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Indtast en gyldig tid."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Indtast gyldig dato/tid."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Ingen fil blev indsendt. Kontroller kodningstypen i formularen."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Ingen fil blev indsendt."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Den indsendte fil er tom."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr "Denne værdi må maksimalt indeholde %(max)d tegn (den har %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Du skal enten indsende en fil eller afmarkere afkrydsningsfeltet, ikke begge "
 "dele."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -669,36 +690,40 @@ msgstr ""
 "Indsend en billedfil. Filen, du indsendte, var enten ikke et billede eller "
 "en defekt billedfil."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Indtast en gyldig URL."
+
+#: 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 ""
-"Marker en gyldigt valgmulighed; '%(value)s' er ikke en af de tilgængelige "
+"Marker en gyldig valgmulighed. %(value)s er ikke en af de tilgængelige "
 "valgmuligheder."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Indtast en liste af værdier."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Rækkefølge"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Slet"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Ret venligst duplikerede data for %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Ret venligst de duplikerede data for %(field)s, som skal være unik."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -707,33 +732,34 @@ msgstr ""
 "Ret venligst de duplikerede data for %(field_name)s, som skal være unik for "
 "%(lookup)s i %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Ret venligst de duplikerede data herunder."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Den indlejrede fremmednøgle passede ikke med forælderinstansens primærnøgle."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Marker en gyldig valgmulighed. Det valg, du har foretaget, er ikke blandt de "
 "tilgængelige valgmuligheder."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
-"Marker et gyldigt valg. %s er ikke en af de tilgængelige valgmuligheder."
+"Marker en gyldig valgmulighed. %s er ikke en af de tilgængelige "
+"valgmuligheder."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" er ikke en gyldig værdi for en primærnøgle."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -742,145 +768,145 @@ msgstr ""
 "%(datetime)s kunne ikke fortolkes i tidszonen %(current_timezone)s; den kan "
 "være tvetydig eller den eksisterer måske ikke."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Aktuelt"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Ret"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Afmarkér"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ja"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nej"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ja,nej,måske"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "midnat"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "middag"
 
 #: utils/dates.py:6
 msgid "Monday"
-msgstr "Mandag"
+msgstr "mandag"
 
 #: utils/dates.py:6
 msgid "Tuesday"
-msgstr "Tirsdag"
+msgstr "tirsdag"
 
 #: utils/dates.py:6
 msgid "Wednesday"
-msgstr "Onsdag"
+msgstr "onsdag"
 
 #: utils/dates.py:6
 msgid "Thursday"
-msgstr "Torsdag"
+msgstr "torsdag"
 
 #: utils/dates.py:6
 msgid "Friday"
-msgstr "Fredag"
+msgstr "fredag"
 
 #: utils/dates.py:7
 msgid "Saturday"
-msgstr "Lørdag"
+msgstr "lørdag"
 
 #: utils/dates.py:7
 msgid "Sunday"
-msgstr "Søndag"
+msgstr "søndag"
 
 #: utils/dates.py:10
 msgid "Mon"
-msgstr "Man"
+msgstr "man"
 
 #: utils/dates.py:10
 msgid "Tue"
-msgstr "Tir"
+msgstr "tir"
 
 #: utils/dates.py:10
 msgid "Wed"
-msgstr "Ons"
+msgstr "ons"
 
 #: utils/dates.py:10
 msgid "Thu"
-msgstr "Tor"
+msgstr "tor"
 
 #: utils/dates.py:10
 msgid "Fri"
-msgstr "Fre"
+msgstr "fre"
 
 #: utils/dates.py:11
 msgid "Sat"
-msgstr "Lør"
+msgstr "lør"
 
 #: utils/dates.py:11
 msgid "Sun"
-msgstr "Søn"
+msgstr "søn"
 
 #: utils/dates.py:18
 msgid "January"
@@ -1098,122 +1124,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "december"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "eller"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "år"
 msgstr[1] "år"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "måned"
 msgstr[1] "måneder"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "uge"
 msgstr[1] "uger"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dage"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutter"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutter"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Mappeindekser er ikke tilladte her"
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\" %(path)s\" eksisterer ikke"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Indeks for %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s blev oprettet."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s blev opdateret."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s blev slettet."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Intet år specificeret"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Ingen måned specificeret"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Ingen dag specificeret"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Ingen uge specificeret"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Ingen %(verbose_name_plural)s  til rådighed"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1222,26 +1233,26 @@ msgstr ""
 "Fremtidige %(verbose_name_plural)s  ikke tilgængelige, fordi %(class_name)s ."
 "allow_future er falsk."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Ugyldig datostreng ' %(datestr)s ' givet format ' %(format)s '"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Ingen %(verbose_name)s  fundet matcher forespørgslen"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Side er ikke 'sidste', kan heller ikke konverteres til en int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ugyldig side ( %(page_number)s )"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Ugyldig side (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Tom liste og ' %(class_name)s .allow_empty' er falsk."
diff --git a/django/conf/locale/da/formats.py b/django/conf/locale/da/formats.py
index 9022eb2ed4..dcdf35173e 100644
--- a/django/conf/locale/da/formats.py
+++ b/django/conf/locale/da/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -20,6 +21,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',                # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',             # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',                   # '25.10.2006 14:30'
 )
 DECIMAL_SEPARATOR = ','
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 82b6239f26..1eed4542e8 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index 6c3cb21d54..fa7ce6344d 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -3,364 +3,384 @@
 # Translators:
 # André Hagenbruch <ahagenbruch@googlemail.com>, 2011, 2012.
 # apollo13 <florian@apolloner.eu>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011-2012.
 # jnns <jvajen@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:29+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: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\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 "Arabisch"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Aserbaidschanisch"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Weißrussisch"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretonisch"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Walisisch"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Dänisch"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Deutsch"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Griechisch"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Englisch"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Britisches Englisch"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentinisches Spanisch"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mexikanisches Spanisch"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nicaraguanisches Spanisch"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venezolanisches Spanisch"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estnisch"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskisch"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persisch"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Französisch"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Friesisch"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irisch"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galicisch"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Isländisch"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italienisch"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kasachisch"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxemburgisch"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Lettisch"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Mazedonisch"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolisch"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norwegisch (Bokmål)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepali"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Holländisch"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norwegisch (Nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Panjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polnisch"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brasilianisches Portugiesisch"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Russisch"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanisch"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbisch (Latein)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamilisch"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugisch"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatarisch"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurtisch"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Bitte einen gültigen Wert eingeben."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Diese Adresse scheint nicht gültig zu sein."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Bitte gültige E-Mail-Adresse eingeben."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Bitte eine gültige Adresse eingeben."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Bitte eine gültige E-Mail-Adresse eingeben."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Bitte ein gültiges Kürzel, bestehend aus Buchstaben, Ziffern, Unterstrichen "
 "und Bindestrichen, eingeben."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Bitte eine gültige IPv4-Adresse eingeben."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Eine gültige IPv6-Adresse eingeben."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Eine gültige IPv4- oder IPv6-Adresse eingeben"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Bitte nur durch Komma getrennte Ziffern eingeben."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Bitte sicherstellen, dass der Wert %(limit_value)s ist. (Er ist "
 "%(show_value)s)"
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Dieser Wert muss kleiner oder gleich %(limit_value)s sein."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Dieser Wert muss größer oder gleich %(limit_value)s sein."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -369,7 +389,7 @@ msgstr ""
 "Bitte sicherstellen, dass der Wert mindestens %(limit_value)d Zeichen hat. "
 "(Er hat %(show_value)d)"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -378,73 +398,73 @@ msgstr ""
 "Bitte sicherstellen, dass der Wert maximal %(limit_value)d Zeichen hat. (Er "
 "hat %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s muss für %(date_field)s %(lookup)s eindeutig sein."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "und"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 mit diesem %(field_label)s existiert bereits."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Wert %r ist keine gültige Option."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Feldtyp: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Der Wert '%s' muss eine ganze  Zahl sein."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Der Wert '%s' muss entweder True oder False sein."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolescher Wert (True oder False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Kommaseparierte Liste von Ganzzahlen"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Der Wert '%s' hat ein ungültiges Datumsformat. Er muss im Format JJJJ-MM-TT "
 "sein."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -452,11 +472,11 @@ msgstr ""
 "Der Wert '%s' hat das richtige Format (JJJJ-MM-TT), ist aber ein ungültiges "
 "Datum."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datum (ohne Uhrzeit)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +485,7 @@ msgstr ""
 "'%s' ist falsch formatiert. Das korrekte Format lautet: YYYY-MM-DD HH:MM[:ss"
 "[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,86 +494,86 @@ msgstr ""
 "'%s' hat das richtige Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), ist aber "
 "keine gültige Datums-/Zeitangabe."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datum (mit Uhrzeit)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' muss eine Dezimalzahl sein."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Dezimalzahl"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Dateipfad"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' muss eine Gleitkommazahl sein."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Gleitkommazahl"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Große Ganzzahl (8 Byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4-Adresse"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-Adresse"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Der Wert '%s' muss entweder None, True oder False sein."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolescher Wert (True, False oder None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Positive ganze Zahl"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Positive kleine ganze Zahl"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Kürzel (bis zu %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Kleine ganze Zahl"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Text"
 
-#: db/models/fields/__init__.py:1180
+#: 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' ist falsch formatiert. Das korrekte Format lautet: HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -562,99 +582,99 @@ msgstr ""
 "'%s' hat das richtige Format (HH:MM[:ss[.uuuuuu]]), ist aber keine gültige "
 "Zeitangabe."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Zeit"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "Adresse (URL)"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Datei"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Bild"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modell %(model)s mit dem Primärschlüssel %(pk)r ist nicht vorhanden."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Fremdschlüssel (Typ definiert durch verknüpftes Feld)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "One-to-one-Beziehung"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Many-to-many-Beziehung"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Halten Sie die Strg-Taste (⌘ für Mac) während des Klickens gedrückt, um "
 "mehrere Einträge auszuwählen."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Dieses Feld ist zwingend erforderlich."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Bitte eine ganze Zahl eingeben."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Bitte eine Zahl eingeben."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Bitte geben Sie nicht mehr als insgesamt %s Ziffern ein."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Bitte geben Sie nicht mehr als %s Dezimalstellen ein."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Bitte geben Sie nicht mehr als %s Ziffern vor dem Komma ein."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Bitte ein gültiges Datum eingeben."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Bitte eine gültige Uhrzeit eingeben."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Bitte ein gültiges Datum und Uhrzeit eingeben."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Es wurde keine Datei übermittelt. Überprüfen Sie das Encoding des Formulars."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Es wurde keine Datei übertragen."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Die ausgewählte Datei ist leer."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -662,13 +682,13 @@ msgstr ""
 "Bitte sicherstellen, dass der Dateiname maximal %(max)d Zeichen hat. (Er hat "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Bitte wählen Sie entweder eine Datei aus oder wählen Sie \"Löschen\", nicht "
 "beides."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -676,36 +696,40 @@ msgstr ""
 "Bitte ein Bild hochladen. Die hochgeladene Datei ist kein Bild oder ist "
 "defekt."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Bitte eine gültige Adresse eingeben."
+
+#: 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 ""
 "Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Bitte eine Liste mit Werten eingeben."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Reihenfolge"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Löschen"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Bitte die doppelten Daten für %(field)s korrigieren."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Bitte die doppelten Daten für %(field)s korrigieren, das eindeutig sein muss."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -714,31 +738,31 @@ msgstr ""
 "Bitte die doppelten Daten für %(field_name)s korrigieren, da es für "
 "%(lookup)s in %(date_field)s eindeutig sein muss."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Bitte die unten aufgeführten doppelten Werte korrigieren."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Der Inline-Fremdschlüssel passt nicht zum Primärschlüssel der übergeordneten "
 "Instanz."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Bitte eine gültige Auswahl treffen. Dies ist keine gültige Auswahl."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Bitte eine gültige Auswahl treffen. %s ist keine gültige Auswahl."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ist kein gültiger Wert für einen Primärschlüssel."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -747,87 +771,87 @@ msgstr ""
 "%(datetime)s konnte mit der Zeitzone %(current_timezone)s nicht eindeutig "
 "interpretiert werden, da es doppeldeutig oder eventuell inkorrekt ist."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Derzeit"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Ändern"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Zurücksetzen"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ja"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nein"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "Ja,Nein,Vielleicht"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d Byte"
 msgstr[1] "%(size)d Bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "nachm."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "vorm."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "nachm."
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "vorm."
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "Mitternacht"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "Mittag"
 
@@ -1103,122 +1127,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Dezember"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "oder"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "Jahr"
 msgstr[1] "Jahre"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "Monat"
 msgstr[1] "Monate"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "Woche"
 msgstr[1] "Wochen"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Tag"
 msgstr[1] "Tage"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "Minuten"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Dateilisten sind untersagt."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" ist nicht vorhanden"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Verzeichnis %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s wurde erfolgreich angelegt."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s wurde erfolgreich aktualisiert."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s wurde gelöscht."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Kein Jahr angegeben"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Kein Monat angegeben"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Kein Tag angegeben"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Keine Woche angegeben"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Keine %(verbose_name_plural)s verfügbar"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1227,28 +1236,28 @@ msgstr ""
 "In der Zukunft liegende %(verbose_name_plural)s sind nicht verfügbar, da "
 "%(class_name)s.allow_future False ist."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Ungültiges Datum '%(datestr)s' für das Format '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Unter dieser Anfrage wurden keine %(verbose_name)s gefunden"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Weder ist dies die letzte Seite ('last') noch konnte sie in einen "
 "ganzzahligen Wert umgewandelt werden."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ungültige Seite (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Ungültige Seite (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Leere Liste und '%(class_name)s.allow_empty' ist False."
diff --git a/django/conf/locale/de/formats.py b/django/conf/locale/de/formats.py
index a75b806acb..b3731a3617 100644
--- a/django/conf/locale/de/formats.py
+++ b/django/conf/locale/de/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -21,6 +22,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
 )
diff --git a/django/conf/locale/de_CH/formats.py b/django/conf/locale/de_CH/formats.py
index 667d1eced0..bf8a5ce372 100644
--- a/django/conf/locale/de_CH/formats.py
+++ b/django/conf/locale/de_CH/formats.py
@@ -23,6 +23,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
 )
diff --git a/django/conf/locale/el/LC_MESSAGES/django.mo b/django/conf/locale/el/LC_MESSAGES/django.mo
index ff481cdfdd..64fcf4b189 100644
Binary files a/django/conf/locale/el/LC_MESSAGES/django.mo and b/django/conf/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/el/LC_MESSAGES/django.po b/django/conf/locale/el/LC_MESSAGES/django.po
index c7dc54a20f..135b20bbda 100644
--- a/django/conf/locale/el/LC_MESSAGES/django.po
+++ b/django/conf/locale/el/LC_MESSAGES/django.po
@@ -1,364 +1,386 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Apostolis Bessas <mpessas+txc@transifex.com>, 2013.
 # Dimitris Glezos <glezos@indifex.com>, 2011.
+# Dimitris Glezos <glezos@transifex.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Yorgos Pagles <y.pagles@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:29+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: Yorgos Pagles <y.pagles@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-23 22:50+0000\n"
+"Last-Translator: Apostolos Mpessas <mpessas+txc@transifex.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Μπενγκάλι"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Βοσνιακά"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Καταλανικά"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Τσέχικα"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Ουαλικά"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Δανέζικα"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Γερμανικά"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Ελληνικά"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Αγγλικά"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Αγγλικά Βρετανίας"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Εσπεράντο"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Ισπανικά"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Ισπανικά Αργεντινής"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Μεξικανική διάλεκτος Ισπανικών"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Ισπανικά Νικαράγουας "
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Εσθονικά"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Βάσκικα"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Περσικά"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Φινλανδικά"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Γαλλικά"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisian"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Ιρλανδικά"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Γαελικά"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Εβραϊκά"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Ινδικά"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Κροατικά"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Ουγγρικά"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Ινδονησιακά"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Ισλανδικά"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Ιταλικά"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Γιαπωνέζικα"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Γεωργιανά"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Καζακστά"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Χμερ"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Κανάντα"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Κορεάτικα"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Λιθουανικά"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Λεττονικά"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Μακεδονικά"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Μαλαγιαλάμ"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Μογγολικά"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Νορβηγική διάλεκτος Μποκμάλ - \"γλώσσα των βιβλίων\""
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Νορβηγική διάλεκτος Nynorsk - Νεονορβηγική"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Πουντζάμπι"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Πολωνικά"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Πορτογαλικά"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Πορτογαλικά - διάλεκτος Βραζιλίας"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Ρουμανικά"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Ρωσικά"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Σλοβακικά"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Σλοβενικά"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Αλβανικά"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Σερβικά"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Σέρβικα Λατινικά"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Σουηδικά"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Διάλεκτος Ταμίλ"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Τελούγκου"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Ταϊλάνδης"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Τουρκικά"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ουκρανικά"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Βιετναμέζικα"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Απλοποιημένα Κινέζικα"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Παραδοσιακά Κινέζικα"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Εισάγετε μια έγκυρη τιμή."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Αυτό το URL φαίνεται να είναι ένας χαλασμένος σύνδεσμος."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Εισάγετε ένα έγκυρο URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Ένα έγκυρο 'slug' αποτελείται από γράμματα, αριθμούς, παύλες ή κάτω παύλες."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Εισάγετε μια έγκυρη διεύθυνση IPv4."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Εισάγετε μία έγκυρη IPv6 διεύθυνση"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Εισάγετε μία έγκυρη IPv4 ή IPv6 διεύθυνση"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Εισάγετε μόνο ψηφία χωρισμένα με κόμματα."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Βεβαιωθείτε ότι η τιμή είναι μικρότερη ή ίση από %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Βεβαιωθείτε ότι η τιμή είναι μεγαλύτερη ή ίση από %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -367,7 +389,7 @@ msgstr ""
 "Βεβαιωθείτε ότι η τιμή έχει μέγεθος τουλάχιστον %(limit_value)d χαρακτήρες "
 "(η τιμή που καταχωρήσατε έχει %(show_value)d χαρακτήρες)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -376,72 +398,72 @@ msgstr ""
 "Βεβαιωθείτε ότι η τιμή έχει το πολύ %(limit_value)d χαρακτήρες (η τιμή που "
 "καταχωρήσατε έχει %(show_value)d χαρακτήρες)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "και"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 με αυτό το %(field_label)s υπάρχει ήδη."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Η τιμή %r δεν είναι έγκυρη επιλογή."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Αυτό το πεδίο δεν μπορεί να είναι κενό (null)."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Το πεδίο αυτό δεν μπορεί να είναι κενό."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Είδος πεδίου: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Ακέραιος"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Η τιμή του '%s' πρέπει να είναι ακέραιος αριθμός (integer)."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Η τιμή του '%s' πρέπει να είναι True ή False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (Είτε Αληθές ή Ψευδές)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Συμβολοσειρά (μέχρι %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Ακέραιοι χωρισμένοι με κόμματα"
 
-#: db/models/fields/__init__.py:647
+#: 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' έχει λάθος μορφή. Η μορφή του πρέπει είναι YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -449,11 +471,11 @@ msgstr ""
 "Η τιμή του '%s' έχει σωστή μορφή (YYYY-MM-DD) αλλά δεν αντιστοιχεί σε σωστή "
 "ημερομηνία."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Ημερομηνία (χωρίς την ώρα)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -462,7 +484,7 @@ msgstr ""
 "Η τιμή του '%s' έχει λάθος μορφή. Η μορφή του πρέπει είναι YYYY-MM-DD.HH:MM[:"
 "ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -471,186 +493,186 @@ msgstr ""
 "Η τιμή του '%s' έχει σωστή μορφή (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) αλλά "
 "δεν αντιστοιχεί σε σωστή ημερομηνία και ώρα."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Ημερομηνία (με την ώρα)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Η τιμή του '%s' πρέπει να είναι ακέραιος δεκαδικός αριθμός (decimal)."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Δεκαδικός αριθμός"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Ηλεκτρονική διεύθυνση"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Τοποθεσία αρχείου"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Η τιμή του '%s' πρέπει να είναι αριθμός κινητής υποδιαστολής (float)."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Αριθμός κινητής υποδιαστολής"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Μεγάλος ακέραιος - big integer (8 bytes)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "Διεύθυνση IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "διεύθυνση IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "Η τιμή του '%s' πρέπει να είναι None, True ή False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (Αληθές, Ψευδές, ή τίποτα)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "Θετικός ακέραιος"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "Θετικός μικρός ακέραιος"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "Μικρός ακέραιος"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Κείμενο"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Ώρα"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "Αρχείο"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "Εικόνα"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Το μοντέλο %(model)s με πρωτεύον κλειδί %(pk)r δεν υπάρχει."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 "Εξωτερικό Κλειδί - Foreign Key (ο τύπος καθορίζεται από το πεδίο του "
 "συσχετισμού)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Σχέση ένα-προς-ένα"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Σχέση πολλά-προς-πολλά"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Κρατήστε πατημένο το πλήκτρο \"Control\" ή σε Mac το πλήκτρο \"Command\" για "
 "να επιλέξετε περισσότερα από ένα."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Αυτό το πεδίο είναι απαραίτητο."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Εισάγετε έναν ακέραιο αριθμό."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Εισάγετε έναν αριθμό."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %s ψηφία συνολικά."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %s δεκαδικά ψηφία."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %s ψηφία πριν την υποδιαστολή."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Εισάγετε μια έγκυρη ημερομηνία."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Εισάγετε μια έγκυρη ώρα."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Εισάγετε μια έγκυρη ημερομηνία/ώρα."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Δεν έχει υποβληθεί κάποιο αρχείο. Ελέγξτε τον τύπο κωδικοποίησης στη φόρμα."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Δεν έχει υποβληθεί κάποιο αρχείο."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Το αρχείο που υποβλήθηκε είναι κενό."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -658,14 +680,14 @@ msgstr ""
 "Βεβαιωθείτε ότι το όνομα του αρχείου έχει μέγιστο μήκος %(max)d χαρακτήρες "
 "(τώρα έχει %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Βεβαιωθείτε ότι είτε έχετε επιλέξει ένα αρχείο για αποστολή είτε έχετε "
 "επιλέξει την εκκαθάριση του πεδίου. Δεν είναι δυνατή η επιλογή και των δύο "
 "ταυτοχρόνως."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -673,38 +695,42 @@ msgstr ""
 "Βεβεαιωθείτε ότι το αρχείο που έχετε επιλέξει για αποστολή είναι αρχείο "
 "εικόνας. Το τρέχον είτε δεν ήταν εικόνα είτε έχει υποστεί φθορά."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Εισάγετε ένα έγκυρο URL."
+
+#: 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 ""
 "Βεβαιωθείτε ότι έχετε επιλέξει μία έγκυρη επιλογή. Η τιμή %(value)s δεν "
 "είναι διαθέσιμη προς επιλογή."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Εισάγετε μια λίστα τιμών."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ταξινόμηση"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Στο %(field)s έχετε ξαναεισάγει τα ίδια δεδομένα."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Στο %(field)s έχετε ξαναεισάγει τα ίδια δεδομένα. Θα πρέπει να εμφανίζονται "
 "μία φορά. "
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -713,122 +739,122 @@ msgstr ""
 "Στο %(field_name)s έχετε ξαναεισάγει τα ίδια δεδομένα. Θα πρέπει να "
 "εμφανίζονται μία φορά για το %(lookup)s στο %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Έχετε ξαναεισάγει την ίδια τιμη. Βεβαιωθείτε ότι είναι μοναδική."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Το ενσωματωμένο εξωτερικό κλειδί δεν αντιστοιχεί με το κλειδί του "
 "αντικειμένου από το οποίο πηγάζει."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Επιλέξτε μια έγκυρη επιλογή. Η επιλογή αυτή δεν είναι μία από τις διαθέσιμες "
 "επιλογές."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Επιλέξτε μια έγκυρη επιλογή. Η επιλογή %s δεν είναι μία από τις διαθέσιμες "
 "επιλογές."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "Η %s δεν είναι έγκυρη επιλογή σαν πρωτεύον κλειδί."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Τώρα"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Επεξεργασία"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Εκκαθάσριση"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ναι"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Όχι"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ναι,όχι,ίσως"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bytes"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "μμ."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "πμ."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "ΜΜ"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ΠΜ"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "μεσάνυχτα"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "μεσημέρι"
 
@@ -1104,122 +1130,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Δεκεμβρίου"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ή"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "χρόνος"
 msgstr[1] "χρόνια"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "μήνας"
 msgstr[1] "μήνες"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "εβδομάδα"
 msgstr[1] "εβδομάδες"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ημέρα"
 msgstr[1] "ημέρες"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ώρα"
 msgstr[1] "ώρες"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "λεπτό"
 msgstr[1] "λεπτά"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "λεπτά"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Επιτυχής δημιουργία του %(verbose_name)s."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Επιτυχής ανανέωση του %(verbose_name)s."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Πραγματοποιήθηκε διαγραφή του %(verbose_name)s."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Δεν έχει οριστεί χρονιά"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Δεν έχει οριστεί μήνας"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Δεν έχει οριστεί μέρα"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Δεν έχει οριστεί εβδομάδα"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Δεν υπάρχουν διαθέσιμα %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1228,30 +1239,30 @@ msgstr ""
 "Μελλοντικά %(verbose_name_plural)s δεν είναι διαθέσιμα διότι δεν έχει τεθεί "
 "το %(class_name)s.allow_future."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "Λανθασμένη αναπαράσταση ημερομηνίας '%(datestr)s' για την επιλεγμένη μορφή "
 "'%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Δεν βρέθηκαν %(verbose_name)s που να ικανοποιούν την αναζήτηση."
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Η σελίδα δεν έχει την τιμή 'last' υποδηλώνοντας την τελευταία σελίδα, ούτε "
 "μπορεί να μετατραπεί σε ακέραιο."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Μη διαθέσιμη σελίδα (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Άκυρη σελίδα (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Άδεια λίστα ενώ '%(class_name)s.allow_empty' δεν έχει τεθεί."
diff --git a/django/conf/locale/el/formats.py b/django/conf/locale/el/formats.py
index 9226490a38..a44b909b2e 100644
--- a/django/conf/locale/el/formats.py
+++ b/django/conf/locale/el/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 338ee3de28..0d4c976d26 100644
Binary files a/django/conf/locale/en/LC_MESSAGES/django.mo and b/django/conf/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 1e301665c6..2980c02ef7 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:55+0200\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,754 +13,809 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: conf/global_settings.py:48
-msgid "Arabic"
-msgstr ""
-
-#: conf/global_settings.py:49
-msgid "Azerbaijani"
-msgstr ""
-
-#: conf/global_settings.py:50
-msgid "Bulgarian"
-msgstr ""
-
 #: conf/global_settings.py:51
-msgid "Bengali"
+msgid "Afrikaans"
 msgstr ""
 
 #: conf/global_settings.py:52
-msgid "Bosnian"
+msgid "Arabic"
 msgstr ""
 
 #: conf/global_settings.py:53
-msgid "Catalan"
+msgid "Azerbaijani"
 msgstr ""
 
 #: conf/global_settings.py:54
-msgid "Czech"
+msgid "Bulgarian"
 msgstr ""
 
 #: conf/global_settings.py:55
-msgid "Welsh"
+msgid "Belarusian"
 msgstr ""
 
 #: conf/global_settings.py:56
-msgid "Danish"
+msgid "Bengali"
 msgstr ""
 
 #: conf/global_settings.py:57
-msgid "German"
+msgid "Breton"
 msgstr ""
 
 #: conf/global_settings.py:58
-msgid "Greek"
+msgid "Bosnian"
 msgstr ""
 
 #: conf/global_settings.py:59
-msgid "English"
+msgid "Catalan"
 msgstr ""
 
 #: conf/global_settings.py:60
-msgid "British English"
+msgid "Czech"
 msgstr ""
 
 #: conf/global_settings.py:61
-msgid "Esperanto"
+msgid "Welsh"
 msgstr ""
 
 #: conf/global_settings.py:62
-msgid "Spanish"
+msgid "Danish"
 msgstr ""
 
 #: conf/global_settings.py:63
-msgid "Argentinian Spanish"
+msgid "German"
 msgstr ""
 
 #: conf/global_settings.py:64
-msgid "Mexican Spanish"
+msgid "Greek"
 msgstr ""
 
 #: conf/global_settings.py:65
-msgid "Nicaraguan Spanish"
+msgid "English"
 msgstr ""
 
 #: conf/global_settings.py:66
-msgid "Estonian"
+msgid "British English"
 msgstr ""
 
 #: conf/global_settings.py:67
-msgid "Basque"
+msgid "Esperanto"
 msgstr ""
 
 #: conf/global_settings.py:68
-msgid "Persian"
+msgid "Spanish"
 msgstr ""
 
 #: conf/global_settings.py:69
-msgid "Finnish"
+msgid "Argentinian Spanish"
 msgstr ""
 
 #: conf/global_settings.py:70
-msgid "French"
+msgid "Mexican Spanish"
 msgstr ""
 
 #: conf/global_settings.py:71
-msgid "Frisian"
+msgid "Nicaraguan Spanish"
 msgstr ""
 
 #: conf/global_settings.py:72
-msgid "Irish"
+msgid "Venezuelan Spanish"
 msgstr ""
 
 #: conf/global_settings.py:73
-msgid "Galician"
+msgid "Estonian"
 msgstr ""
 
 #: conf/global_settings.py:74
-msgid "Hebrew"
+msgid "Basque"
 msgstr ""
 
 #: conf/global_settings.py:75
-msgid "Hindi"
+msgid "Persian"
 msgstr ""
 
 #: conf/global_settings.py:76
-msgid "Croatian"
+msgid "Finnish"
 msgstr ""
 
 #: conf/global_settings.py:77
-msgid "Hungarian"
+msgid "French"
 msgstr ""
 
 #: conf/global_settings.py:78
-msgid "Indonesian"
+msgid "Frisian"
 msgstr ""
 
 #: conf/global_settings.py:79
-msgid "Icelandic"
+msgid "Irish"
 msgstr ""
 
 #: conf/global_settings.py:80
-msgid "Italian"
+msgid "Galician"
 msgstr ""
 
 #: conf/global_settings.py:81
-msgid "Japanese"
+msgid "Hebrew"
 msgstr ""
 
 #: conf/global_settings.py:82
-msgid "Georgian"
+msgid "Hindi"
 msgstr ""
 
 #: conf/global_settings.py:83
-msgid "Kazakh"
+msgid "Croatian"
 msgstr ""
 
 #: conf/global_settings.py:84
-msgid "Khmer"
+msgid "Hungarian"
 msgstr ""
 
 #: conf/global_settings.py:85
-msgid "Kannada"
+msgid "Interlingua"
 msgstr ""
 
 #: conf/global_settings.py:86
-msgid "Korean"
+msgid "Indonesian"
 msgstr ""
 
 #: conf/global_settings.py:87
-msgid "Lithuanian"
+msgid "Icelandic"
 msgstr ""
 
 #: conf/global_settings.py:88
-msgid "Latvian"
+msgid "Italian"
 msgstr ""
 
 #: conf/global_settings.py:89
-msgid "Macedonian"
+msgid "Japanese"
 msgstr ""
 
 #: conf/global_settings.py:90
-msgid "Malayalam"
+msgid "Georgian"
 msgstr ""
 
 #: conf/global_settings.py:91
-msgid "Mongolian"
+msgid "Kazakh"
 msgstr ""
 
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Khmer"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
+msgid "Kannada"
 msgstr ""
 
 #: conf/global_settings.py:94
-msgid "Dutch"
+msgid "Korean"
 msgstr ""
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
+msgid "Lithuanian"
 msgstr ""
 
 #: conf/global_settings.py:97
-msgid "Polish"
+msgid "Latvian"
 msgstr ""
 
 #: conf/global_settings.py:98
-msgid "Portuguese"
+msgid "Macedonian"
 msgstr ""
 
 #: conf/global_settings.py:99
-msgid "Brazilian Portuguese"
+msgid "Malayalam"
 msgstr ""
 
 #: conf/global_settings.py:100
-msgid "Romanian"
+msgid "Mongolian"
 msgstr ""
 
 #: conf/global_settings.py:101
-msgid "Russian"
+msgid "Burmese"
 msgstr ""
 
 #: conf/global_settings.py:102
-msgid "Slovak"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: conf/global_settings.py:103
-msgid "Slovenian"
+msgid "Nepali"
 msgstr ""
 
 #: conf/global_settings.py:104
-msgid "Albanian"
+msgid "Dutch"
 msgstr ""
 
 #: conf/global_settings.py:105
-msgid "Serbian"
+msgid "Norwegian Nynorsk"
 msgstr ""
 
 #: conf/global_settings.py:106
-msgid "Serbian Latin"
+msgid "Ossetic"
 msgstr ""
 
 #: conf/global_settings.py:107
-msgid "Swedish"
+msgid "Punjabi"
 msgstr ""
 
 #: conf/global_settings.py:108
-msgid "Swahili"
+msgid "Polish"
 msgstr ""
 
 #: conf/global_settings.py:109
-msgid "Tamil"
+msgid "Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:110
-msgid "Telugu"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:111
-msgid "Thai"
+msgid "Romanian"
 msgstr ""
 
 #: conf/global_settings.py:112
-msgid "Turkish"
+msgid "Russian"
 msgstr ""
 
 #: conf/global_settings.py:113
-msgid "Tatar"
+msgid "Slovak"
 msgstr ""
 
 #: conf/global_settings.py:114
-msgid "Ukrainian"
+msgid "Slovenian"
 msgstr ""
 
 #: conf/global_settings.py:115
-msgid "Urdu"
+msgid "Albanian"
 msgstr ""
 
 #: conf/global_settings.py:116
-msgid "Vietnamese"
+msgid "Serbian"
 msgstr ""
 
 #: conf/global_settings.py:117
-msgid "Simplified Chinese"
+msgid "Serbian Latin"
 msgstr ""
 
 #: conf/global_settings.py:118
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:119
+msgid "Swahili"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Tamil"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Telugu"
+msgstr ""
+
+#: conf/global_settings.py:122
+msgid "Thai"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Turkish"
+msgstr ""
+
+#: conf/global_settings.py:124
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:125
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:126
+msgid "Ukrainian"
+msgstr ""
+
+#: conf/global_settings.py:127
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:128
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:129
+msgid "Simplified Chinese"
+msgstr ""
+
+#: conf/global_settings.py:130
 msgid "Traditional Chinese"
 msgstr ""
 
-#: core/validators.py:21 forms/fields.py:52
+#: core/validators.py:21
 msgid "Enter a valid value."
 msgstr ""
 
-#: core/validators.py:104 forms/fields.py:464
+#: core/validators.py:53 forms/fields.py:627
+msgid "Enter a valid URL."
+msgstr ""
+
+#: core/validators.py:83
 msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:107 forms/fields.py:1013
+#: core/validators.py:131
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+#: core/validators.py:134 core/validators.py:153
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: core/validators.py:115 core/validators.py:130
+#: core/validators.py:139 core/validators.py:154
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:125 core/validators.py:128
+#: core/validators.py:149 core/validators.py:152
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:151 db/models/fields/__init__.py:655
+#: core/validators.py:175 db/models/fields/__init__.py:704
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: core/validators.py:157
+#: core/validators.py:181
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:176 forms/fields.py:210 forms/fields.py:263
+#: core/validators.py:200
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:182 forms/fields.py:211 forms/fields.py:264
+#: core/validators.py:206
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:189
+#: core/validators.py:214
 #, python-format
 msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: core/validators.py:196
+#: core/validators.py:224
 #, python-format
 msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: db/models/base.py:843
+#: db/models/base.py:882
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:866 forms/models.py:573
+#: db/models/base.py:905 forms/models.py:590
 msgid "and"
 msgstr ""
 
-#: db/models/base.py:867 db/models/fields/__init__.py:70
+#: db/models/base.py:906 db/models/fields/__init__.py:83
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr ""
 
-#: db/models/fields/__init__.py:67
+#: db/models/fields/__init__.py:80
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:68
+#: db/models/fields/__init__.py:81
 msgid "This field cannot be null."
 msgstr ""
 
-#: db/models/fields/__init__.py:69
+#: db/models/fields/__init__.py:82
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:76
+#: db/models/fields/__init__.py:89
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+#: db/models/fields/__init__.py:568 db/models/fields/__init__.py:1034
 msgid "Integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:572 db/models/fields/__init__.py:1032
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:569
+#: db/models/fields/__init__.py:620
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:571
+#: db/models/fields/__init__.py:622
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: db/models/fields/__init__.py:622
+#: db/models/fields/__init__.py:671
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:650
+#: db/models/fields/__init__.py:699
 msgid "Comma-separated integers"
 msgstr ""
 
-#: db/models/fields/__init__.py:664
+#: db/models/fields/__init__.py:713
 #, python-format
 msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
 msgstr ""
 
-#: db/models/fields/__init__.py:666 db/models/fields/__init__.py:754
+#: db/models/fields/__init__.py:715 db/models/fields/__init__.py:803
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
 msgstr ""
 
-#: db/models/fields/__init__.py:669
+#: db/models/fields/__init__.py:718
 msgid "Date (without time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:752
+#: db/models/fields/__init__.py:801
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: db/models/fields/__init__.py:756
+#: db/models/fields/__init__.py:805
 #, 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 ""
 
-#: db/models/fields/__init__.py:760
+#: db/models/fields/__init__.py:809
 msgid "Date (with time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:849
+#: db/models/fields/__init__.py:898
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:851
+#: db/models/fields/__init__.py:900
 msgid "Decimal number"
 msgstr ""
 
-#: db/models/fields/__init__.py:908
+#: db/models/fields/__init__.py:957
 msgid "Email address"
 msgstr ""
 
-#: db/models/fields/__init__.py:927
+#: db/models/fields/__init__.py:976
 msgid "File path"
 msgstr ""
 
-#: db/models/fields/__init__.py:954
+#: db/models/fields/__init__.py:1003
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:956
+#: db/models/fields/__init__.py:1005
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:1017
+#: db/models/fields/__init__.py:1066
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1080
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1047
+#: db/models/fields/__init__.py:1096
 msgid "IP address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1090
+#: db/models/fields/__init__.py:1139
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1092
+#: db/models/fields/__init__.py:1141
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1141
+#: db/models/fields/__init__.py:1190
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1152
+#: db/models/fields/__init__.py:1201
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1163
+#: db/models/fields/__init__.py:1212
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1181
+#: db/models/fields/__init__.py:1230
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1187
+#: db/models/fields/__init__.py:1236
 msgid "Text"
 msgstr ""
 
-#: db/models/fields/__init__.py:1205
+#: db/models/fields/__init__.py:1254
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
 msgstr ""
 
-#: db/models/fields/__init__.py:1207
+#: db/models/fields/__init__.py:1256
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
 "time."
 msgstr ""
 
-#: db/models/fields/__init__.py:1210
+#: db/models/fields/__init__.py:1259
 msgid "Time"
 msgstr ""
 
-#: db/models/fields/__init__.py:1272
+#: db/models/fields/__init__.py:1321
 msgid "URL"
 msgstr ""
 
-#: db/models/fields/files.py:211
-#, python-format
-msgid "Filename is %(extra)d characters too long."
+#: db/models/fields/__init__.py:1338
+msgid "Raw binary data"
 msgstr ""
 
-#: db/models/fields/files.py:221
+#: db/models/fields/files.py:215
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:347
+#: db/models/fields/files.py:322
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:950
+#: db/models/fields/related.py:1133
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:952
+#: db/models/fields/related.py:1135
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1082
+#: db/models/fields/related.py:1272
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1149
+#: db/models/fields/related.py:1339
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1174
+#: db/models/fields/related.py:1366
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: forms/fields.py:51
+#: forms/fields.py:56
 msgid "This field is required."
 msgstr ""
 
-#: forms/fields.py:209
+#: forms/fields.py:225
 msgid "Enter a whole number."
 msgstr ""
 
-#: forms/fields.py:241 forms/fields.py:262
+#: forms/fields.py:266 forms/fields.py:294
 msgid "Enter a number."
 msgstr ""
 
-#: forms/fields.py:265
+#: forms/fields.py:295
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr ""
 
-#: forms/fields.py:266
+#: forms/fields.py:296
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr ""
 
-#: forms/fields.py:267
+#: forms/fields.py:297
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 
-#: forms/fields.py:355 forms/fields.py:953
+#: forms/fields.py:393 forms/fields.py:1045
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:378 forms/fields.py:954
+#: forms/fields.py:417 forms/fields.py:1046
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:399
+#: forms/fields.py:438
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:475
+#: forms/fields.py:512
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:476
+#: forms/fields.py:513
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:477
+#: forms/fields.py:514
 msgid "The submitted file is empty."
 msgstr ""
 
-#: forms/fields.py:478
+#: forms/fields.py:516
 #, python-format
-msgid ""
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: forms/fields.py:479
+#: forms/fields.py:519
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:534
+#: forms/fields.py:580
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: forms/fields.py:580
-msgid "Enter a valid URL."
-msgstr ""
-
-#: forms/fields.py:666 forms/fields.py:746
+#: forms/fields.py:733 forms/fields.py:811
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: forms/fields.py:747 forms/fields.py:835 forms/models.py:999
+#: forms/fields.py:812 forms/fields.py:915 forms/models.py:1026
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/formsets.py:323 forms/formsets.py:325
+#: forms/forms.py:158
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#: forms/formsets.py:305
+#, python-format
+msgid "Please submit %s or fewer forms."
+msgstr ""
+
+#: forms/formsets.py:331 forms/formsets.py:333
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:327
+#: forms/formsets.py:335
 msgid "Delete"
 msgstr ""
 
-#: forms/models.py:567
+#: forms/models.py:584
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:571
+#: forms/models.py:588
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:577
+#: forms/models.py:594
 #, 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 ""
 
-#: forms/models.py:585
+#: forms/models.py:602
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:868
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:932
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1000
+#: forms/models.py:1027
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1002
+#: forms/models.py:1029
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/util.py:81
+#: forms/util.py:84
 #, 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 ""
 
-#: forms/widgets.py:336
+#: forms/widgets.py:326
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:337
+#: forms/widgets.py:327
 msgid "Change"
 msgstr ""
 
-#: forms/widgets.py:338
+#: forms/widgets.py:328
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:591
+#: forms/widgets.py:546
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:592
+#: forms/widgets.py:547
 msgid "Yes"
 msgstr ""
 
-#: forms/widgets.py:593
+#: forms/widgets.py:548
 msgid "No"
 msgstr ""
 
-#: template/defaultfilters.py:794
+#: template/defaultfilters.py:785
 msgid "yes,no,maybe"
 msgstr ""
 
-#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#: template/defaultfilters.py:813 template/defaultfilters.py:824
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/defaultfilters.py:835
+#: template/defaultfilters.py:826
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:837
+#: template/defaultfilters.py:828
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:830
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:841
+#: template/defaultfilters.py:832
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:842
+#: template/defaultfilters.py:833
 #, python-format
 msgid "%s PB"
 msgstr ""
@@ -1067,75 +1122,71 @@ msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:239
+#: utils/text.py:225
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:256
+#: utils/text.py:242 utils/timesince.py:54
 msgid ", "
 msgstr ""
 
 #: utils/timesince.py:22
-msgid "year"
-msgid_plural "years"
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
 #: utils/timesince.py:23
-msgid "month"
-msgid_plural "months"
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
 #: utils/timesince.py:24
-msgid "week"
-msgid_plural "weeks"
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: utils/timesince.py:25
-msgid "day"
-msgid_plural "days"
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
 #: utils/timesince.py:26
-msgid "hour"
-msgid_plural "hours"
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #: utils/timesince.py:27
-msgid "minute"
-msgid_plural "minutes"
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: utils/timesince.py:43
-msgid "minutes"
+msgid "0 minutes"
 msgstr ""
 
-#: utils/timesince.py:48
-#, python-format
-msgid "%(number)d %(type)s"
-msgstr ""
-
-#: utils/timesince.py:54
-#, python-format
-msgid ", %(number)d %(type)s"
-msgstr ""
-
-#: views/static.py:55
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:57
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:98
+#: views/static.py:99
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
@@ -1156,19 +1207,19 @@ msgstr ""
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:368 views/generic/dates.py:393
+#: views/generic/dates.py:368 views/generic/dates.py:396
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:646
+#: views/generic/dates.py:649
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:678
+#: views/generic/dates.py:681
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
@@ -1178,16 +1229,16 @@ msgstr ""
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:49
+#: views/generic/list.py:54
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:54
+#: views/generic/list.py:59
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:134
+#: views/generic/list.py:150
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/en/formats.py b/django/conf/locale/en/formats.py
index 6bd693e60e..e73bc62367 100644
--- a/django/conf/locale/en/formats.py
+++ b/django/conf/locale/en/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -25,12 +26,15 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
+    '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
     '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
     '%m/%d/%Y',              # '10/25/2006'
     '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
+    '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
     '%m/%d/%y',              # '10/25/06'
 )
diff --git a/django/conf/locale/en_GB/LC_MESSAGES/django.mo b/django/conf/locale/en_GB/LC_MESSAGES/django.mo
index 68c37c0501..22b84d8c92 100644
Binary files a/django/conf/locale/en_GB/LC_MESSAGES/django.mo and b/django/conf/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/en_GB/LC_MESSAGES/django.po b/django/conf/locale/en_GB/LC_MESSAGES/django.po
index 625054b1bc..5ccd224241 100644
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.po
@@ -9,355 +9,375 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:29+0100\n"
-"PO-Revision-Date: 2012-03-12 21:48+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arabic"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaijani"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalan"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Czech"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Welsh"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danish"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "German"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Greek"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "English"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "British English"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spanish"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentinian Spanish"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nicaraguan Spanish"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonian"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Basque"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persian"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finnish"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "French"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisian"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irish"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galician"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Croatian"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesian"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Icelandic"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italian"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japanese"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgian"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazakh"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Korean"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latvian"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolian"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norwegian Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepali"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Dutch"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norwegian Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polish"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Romanian"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Russian"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovak"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanian"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbian"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbian Latin"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Swedish"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thai"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turkish"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Tatar"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Enter a valid value."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "This URL appears to be a broken link."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Enter a valid URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Enter a valid e-mail address."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Enter a valid IPv4 address."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Enter a valid IPv6 address."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Enter a valid IPv4 or IPv6 address."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Enter only digits separated by commas."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Ensure this value is less than or equal to %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Ensure this value is greater than or equal to %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +386,7 @@ msgstr ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,83 +395,83 @@ msgstr ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "and"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 with this %(field_label)s already exists."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Value %r is not a valid choice."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "This field cannot be null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "This field cannot be blank."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Field of type: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Integer"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' value must be an integer."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' value must be either True or False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (Either True or False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (up to %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Comma-separated integers"
 
-#: db/models/fields/__init__.py:647
+#: 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' value has an invalid date format. It must be in YYYY-MM-DD format."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' value has the correct format (YYYY-MM-DD) but it is an invalid date."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Date (without time)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -460,7 +480,7 @@ msgstr ""
 "'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -469,86 +489,86 @@ msgstr ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
 "it is an invalid date/time."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Date (with time)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' value must be a decimal number."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimal number"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Email address"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "File path"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' value must be a float."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Floating point number"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Big (8 byte) integer"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 address"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP address"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' value must be either None, True or False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (Either True, False or None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Positive integer"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Positive small integer"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (up to %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Small integer"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Text"
 
-#: db/models/fields/__init__.py:1180
+#: 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' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -557,108 +577,108 @@ msgstr ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
 "time."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Time"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "File"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Image"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s with pk %(pk)r does not exist."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Foreign Key (type determined by related field)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "One-to-one relationship"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Many-to-many relationship"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "This field is required."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Enter a whole number."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Enter a number."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Ensure that there are no more than %s digits in total."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Ensure that there are no more than %s decimal places."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Ensure that there are no more than %s digits before the decimal point."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Enter a valid date."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Enter a valid time."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Enter a valid date/time."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "No file was submitted. Check the encoding type on the form."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "No file was submitted."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "The submitted file is empty."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Please either submit a file or check the clear checkbox, not both."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -666,34 +686,38 @@ msgstr ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Enter a valid URL."
+
+#: 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 "Select a valid choice. %(value)s is not one of the available choices."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Enter a list of values."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Order"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Delete"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Please correct the duplicate data for %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Please correct the duplicate data for %(field)s, which must be unique."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -702,30 +726,30 @@ msgstr ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
 "for the %(lookup)s in %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Please correct the duplicate values below."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "The inline foreign key did not match the parent instance primary key."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Select a valid choice. That choice is not one of the available choices."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Select a valid choice. %s is not one of the available choices."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" is not a valid value for a primary key."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -734,87 +758,87 @@ msgstr ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Currently"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Change"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Clear"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Unknown"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Yes"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "No"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "yes,no,maybe"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "midnight"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "noon"
 
@@ -1090,122 +1114,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "December"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "or"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "year"
 msgstr[1] "years"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "month"
 msgstr[1] "months"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "week"
 msgstr[1] "weeks"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutes"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Directory indexes are not allowed here."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" does not exist"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Index of %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "The %(verbose_name)s was created successfully."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "The %(verbose_name)s was updated successfully."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "The %(verbose_name)s was deleted."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "No year specified"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "No month specified"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "No day specified"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "No week specified"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "No %(verbose_name_plural)s available"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1214,26 +1223,26 @@ msgstr ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Invalid date string '%(datestr)s' given format '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "No %(verbose_name)s found matching the query"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Page is not 'last', nor can it be converted to an int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Empty list and '%(class_name)s.allow_empty' is False."
diff --git a/django/conf/locale/en_GB/formats.py b/django/conf/locale/en_GB/formats.py
index b594aafb74..3cf7f79224 100644
--- a/django/conf/locale/en_GB/formats.py
+++ b/django/conf/locale/en_GB/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -24,12 +25,15 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',                # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',             # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',                   # '2006-10-25 14:30'
     '%Y-%m-%d',                         # '2006-10-25'
     '%d/%m/%Y %H:%M:%S',                # '25/10/2006 14:30:59'
+    '%d/%m/%Y %H:%M:%S.%f',             # '25/10/2006 14:30:59.000200'
     '%d/%m/%Y %H:%M',                   # '25/10/2006 14:30'
     '%d/%m/%Y',                         # '25/10/2006'
     '%d/%m/%y %H:%M:%S',                # '25/10/06 14:30:59'
+    '%d/%m/%y %H:%M:%S.%f',             # '25/10/06 14:30:59.000200'
     '%d/%m/%y %H:%M',                   # '25/10/06 14:30'
     '%d/%m/%y',                         # '25/10/06'
 )
diff --git a/django/conf/locale/eo/LC_MESSAGES/django.mo b/django/conf/locale/eo/LC_MESSAGES/django.mo
index 44a73e95cf..171cbfe7af 100644
Binary files a/django/conf/locale/eo/LC_MESSAGES/django.mo and b/django/conf/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/eo/LC_MESSAGES/django.po b/django/conf/locale/eo/LC_MESSAGES/django.po
index f6e326e8bf..f42dd4dc36 100644
--- a/django/conf/locale/eo/LC_MESSAGES/django.po
+++ b/django/conf/locale/eo/LC_MESSAGES/django.po
@@ -1,7 +1,9 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <adam.raizen@gmail.com>, 2012.
 # Baptiste  <bapdarth@yahoo.fr>, 2012.
+# Baptiste  <baptiste+transifex@darthenay.fr>, 2012.
 # batisteo <bapdarth@yahoo·fr>, 2011.
 #   <gherman@darwin.in-berlin.de>, 2011.
 # kristjan <kristjan.schmidt@googlemail.com>, 2011.
@@ -10,453 +12,471 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:29+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: sagittarian <adam.raizen@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Araba"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbajĝana"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengala"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnia"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Kataluna"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Kimra"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Dana"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Germana"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Greka"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Angla"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Angla (Brita)"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Hispana"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Hispana (Argentinio)"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Hispana (Meksiko)"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Hispana (Nikaragvo)"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estona"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Eŭska"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persa"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finna"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Franca"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisa"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlanda"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galega"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hinda"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroata"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Hungara"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indoneza"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islanda"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Itala"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japana"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Kartvela"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazaĥa"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Kmera"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kanara"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Korea"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litova"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latva"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedona"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malajala"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongola"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norvega (bokmål)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepala"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
-msgstr "norvega (nynorsk)"
+msgstr "Norvega (nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Panĝaba"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Pola"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Portugala (Brazilo)"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumana"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rusa"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovena"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albana"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serba"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serba (latina)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Sveda"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Svahila"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamila"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugua"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Taja"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turka"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Tatara"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdua"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Ĉina (simpligite)"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Ĉina (tradicie)"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Enigu validan valoron."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Ĉi-tiu URL ŝajnas esti nefunkcianta ligilo."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Enigu validan adreson."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Enigu validan retpoŝtadreson."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Tiu kampo nur devas havi literojn, nombrojn, substrekojn aŭ streketojn."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Enigu validan IPv4-adreson."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Enigu validan IPv6-adreson."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Enigu validan IPv4 aŭ IPv6-adreson."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Enigu nur ciferojn apartigitajn per komoj."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
-"Certigu ke ĉi-tiu valoro estas %(limit_value)s (ĝi estas %(show_value)s). "
+"Certigu ke ĉi tiu valoro estas %(limit_value)s (ĝi estas %(show_value)s). "
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
-"Certigu ke ĉi-tiun valoron estas malpli granda aŭ egala al %(limit_value)s."
+msgstr "Certigu ke ĉi tiu valoro estas malpli ol aŭ egala al %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
-"Certigu ke ĉi-tiun valoron estas pli granda aŭ egala al %(limit_value)s."
+msgstr "Certigu ke ĉi tiu valoro estas pli ol aŭ egala al %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
-"Certigu ke ĉi-tiun valoron havas almenaŭ %(limit_value)d karakteroj (ĝi "
-"havas %(show_value)d)."
+"Certigu ke ĉi tiu valoro havas almenaŭ %(limit_value)d signoj (ĝi havas "
+"%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
-"Certigu ke ĉi-tiun valoron havas maksimume %(limit_value)d karakteroj (ĝi "
-"havas %(show_value)d)."
+"Certigu ke ĉi tiu valoro havas maksimume %(limit_value)d signoj (ĝi havas "
+"%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s devas esti unika por %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "kaj"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 kun tiu %(field_label)s jam ekzistas."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Valoro %r ne estas valida elekto."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
-msgstr "Tiu-ĉi kampo ne povas esti senvalore (NULL)."
+msgstr "Tiu ĉi kampo ne povas esti senvalora (null)."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
-msgstr "Tiu-ĉi kampo ne povas esti malplena."
+msgstr "Tiu ĉi kampo ne povas esti malplena."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
-msgstr "Tipo de kampo: %(field_type)s"
+msgstr "Kampo de tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Entjero"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' valoro devas esti entjero."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' valoro devas esti Vera aŭ Malvera"
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Bulea (Vera aŭ Malvera)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Ĉeno (ĝis %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
-msgstr "Komo-apartigitaj entjeroj"
+msgstr "Kom-apartigitaj entjeroj"
 
-#: db/models/fields/__init__.py:647
+#: 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' valoro ne havas validan datformaton. Ĝi devas esti kiel formato JJJJ-MM-"
 "TT."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' valoro havas la ĝustan formaton (JJJJ-MM-TT), sed ne estas valida dato."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dato (sen horo)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +485,7 @@ msgstr ""
 "'%s' valoro ne havas validan formaton. Ĝi devas esti kiel formato JJJJ-MM-TT "
 "HH:MM[:ss[.uuuuuu]][HZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,200 +494,201 @@ msgstr ""
 "'%s' valoro havas la ĝustan formaton (JJJJ-MM-TT HH:MM[:ss[.uuuuuu]][HZ]), "
 "sed ne estas valida dato kaj horo."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dato (kun horo)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' valoro devas esti dekuma nombro."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Dekuma nombro"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Retpoŝtadreso"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Retpoŝtadreso"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Dosiervojo"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' valoro devas esti glitkoma nombro."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Glitkoma nombro"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Granda (8 bitoka) entjero"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4-adreso"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-adreso"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr "'%s' valoro devas esti ĉu Neniu, Vera aŭ Malvera."
+msgstr "'%s' valoro devas esti Neniu, Vera aŭ Malvera."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Buleo (Vera, Malvera aŭ Neniu)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "Pozitiva entjero"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "Pozitiva malgranda entjero"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Ĵetonvorto (ĝis %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "Malgranda entjero"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Teksto"
 
-#: db/models/fields/__init__.py:1180
+#: 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' valoro ne havas validan formaton. Ĝi devas esti kiel formato HH:MM[:ss[."
-"uuuuuu]]."
+"'%s' valoro ne havas validan formaton. Ĝi devas esti laŭ la formato HH:MM[:ss"
+"[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: 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' valoro havas ĝustan formato (HH:MM[:ss[.uuuuuu]]), sed ne estas valida "
+"'%s' valoro havas ĝustan formaton (HH:MM[:ss[.uuuuuu]]), sed ne estas valida "
 "horo."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Horo"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "Dosiero"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "Bildo"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modelo %(model)s kun ĉefŝlosilo %(pk)r ne ekzistas."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
-msgstr "Fremdaŝlosilo (tipo determinita per rilata kampo)"
+msgstr "Fremda ŝlosilo (tipo determinita per rilata kampo)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Unu-al-unu rilato"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
-msgstr "Multaj-al-multa rilato"
+msgstr "Mult-al-multa rilato"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
-"Premadu la stirklavon, aŭ Komando-klavon sur Mac, por elekti pli ol unu."
+"Premadu la stirklavon, aŭ Komando-klavon ĉe Mac, por elekti pli ol unu."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
-msgstr "Tiu kampo estas postulata."
+msgstr "Ĉi tiu kampo estas deviga."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
-msgstr "Enigu tutan nombron."
+msgstr "Enigu plenan nombron."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Enigu nombron."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Certigu ke ne estas pli ol %s ciferoj entute."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Certigu ke ne estas pli ol %s dekumaj lokoj."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Certigu ke ne estas pli ol %s ciferoj antaŭ la dekuma punkto."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Enigu validan daton."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
-msgstr "Enigu validan tempon."
+msgstr "Enigu validan horon."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Enigu validan daton/tempon."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
-"Neniu dosiero estis sendita. Kontrolu la kodoprezentan tipon en la formularo."
+"Neniu dosiero estis alŝutita. Kontrolu la kodoprezentan tipon en la "
+"formularo."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
-msgstr "Neniu dosiero estis sendita."
+msgstr "Neniu dosiero estis alŝutita."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
-msgstr "La sendita dosiero estas malplena."
+msgstr "La alŝutita dosiero estas malplena."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
-"Certigu ke ĉi-tiun valoron havas maksimume %(max)d karakteroj (ĝi havas "
+"Certigu ke ĉi tiu valoro havas maksimume %(max)d signojn (ĝi havas "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
-"Bonvolu ĉu transsendi dosieron, ĉu elekti la malplena markobutono, ne ambaŭ."
+"Bonvolu aŭ alŝuti dosieron, aŭ elekti la malplenan markobutonon, ne ambaŭ."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -675,35 +696,39 @@ msgstr ""
 "Alŝutu validan bildon. La alŝutita dosiero ne estas bildo, aŭ estas "
 "difektita bildo."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Enigu validan adreson."
+
+#: 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 "Elektu validan elekton. %(value)s ne estas el la haveblaj elektoj."
+msgstr "Elektu validan elekton. %(value)s ne estas el la eblaj elektoj."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
-msgstr "Enigu valoroliston."
+msgstr "Enigu liston de valoroj."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordo"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Forigi"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Bonvolu ĝustigi la duoblan datumon por %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Bonvolu ĝustigi la duoblan datumon por %(field)s, kiu devas esti unika."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -712,29 +737,29 @@ msgstr ""
 "Bonvolu ĝustigi la duoblan datumon por %(field_name)s, kiu devas esti unika "
 "por la %(lookup)s en %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Bonvolu ĝustigi la duoblan valoron sube."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "La enteksta fremda ŝlosilo ne egalis la ĉefŝlosilon de patra apero."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Elektu validan elekton. Ĉi-tiu elekto ne estas el la haveblaj elektoj."
+msgstr "Elektu validan elekton. Ĉi tiu elekto ne estas el la eblaj elektoj."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Elektu validan elekton. %s ne estas el la haveblaj elektoj."
+msgstr "Elektu validan elekton. %s ne estas el la eblaj elektoj."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ne estas valida valoro por ĉefŝlosilo"
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -743,145 +768,145 @@ msgstr ""
 "%(datetime)s ne povus esti interpretita en horzono %(current_timezone)s; ĝi "
 "povas esti plursenca aŭ ne ekzistas."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Nuntempe"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Ŝanĝi"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Vakigi"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Jes"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ne"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "jes,ne,eble"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bitoko"
 msgstr[1] "%(size)d bitokoj"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "ptm"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "atm"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PTM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ATM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "noktomezo"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "tagmezo"
 
 #: utils/dates.py:6
 msgid "Monday"
-msgstr "Lundo"
+msgstr "lundo"
 
 #: utils/dates.py:6
 msgid "Tuesday"
-msgstr "Mardo"
+msgstr "mardo"
 
 #: utils/dates.py:6
 msgid "Wednesday"
-msgstr "Merkredo"
+msgstr "merkredo"
 
 #: utils/dates.py:6
 msgid "Thursday"
-msgstr "Ĵaŭdo"
+msgstr "ĵaŭdo"
 
 #: utils/dates.py:6
 msgid "Friday"
-msgstr "Vendredo"
+msgstr "vendredo"
 
 #: utils/dates.py:7
 msgid "Saturday"
-msgstr "Sabato"
+msgstr "sabato"
 
 #: utils/dates.py:7
 msgid "Sunday"
-msgstr "Dimanĉo"
+msgstr "dimanĉo"
 
 #: utils/dates.py:10
 msgid "Mon"
-msgstr "Lun"
+msgstr "lun"
 
 #: utils/dates.py:10
 msgid "Tue"
-msgstr "Mar"
+msgstr "mar"
 
 #: utils/dates.py:10
 msgid "Wed"
-msgstr "Mer"
+msgstr "mer"
 
 #: utils/dates.py:10
 msgid "Thu"
-msgstr "Ĵaŭ"
+msgstr "ĵaŭ"
 
 #: utils/dates.py:10
 msgid "Fri"
-msgstr "Ven"
+msgstr "ven"
 
 #: utils/dates.py:11
 msgid "Sat"
-msgstr "Sab"
+msgstr "sab"
 
 #: utils/dates.py:11
 msgid "Sun"
-msgstr "Dim"
+msgstr "dim"
 
 #: utils/dates.py:18
 msgid "January"
@@ -1099,152 +1124,137 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Decembro"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "aŭ"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "jaro"
 msgstr[1] "jaroj"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "monato"
 msgstr[1] "monatoj"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semajno"
 msgstr[1] "semajnoj"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "tago"
 msgstr[1] "tagoj"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "horo"
 msgstr[1] "horoj"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutoj"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutoj"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Dosierujaj indeksoj ne estas permesitaj tie."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" ne ekzistas"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "Indekso de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "La %(verbose_name)s estis kreita sukcese."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "La %(verbose_name)s estis ĝisdatigita sukcese."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "La %(verbose_name)s estis forigita."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Neniu jaro specifita"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Neniu monato specifita"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Neniu tago specifita"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Neniu semajno specifita"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
-msgstr "Neniu %(verbose_name_plural)s haveblaj"
+msgstr "Neniu %(verbose_name_plural)s disponeblaj"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
-"Estonta %(verbose_name_plural)s malhaveblaj ĉar %(class_name)s.allow_future "
-"estas Malvera."
+"Estonta %(verbose_name_plural)s ne disponeblas ĉar %(class_name)s."
+"allow_future estas Malvera."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "La formato « %(format)s » aplikita al la data ĉeno '%(datestr)s' ne estas "
 "valida"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
-msgstr "Neniu %(verbose_name)s trovita kongruas la informpeton"
+msgstr "Neniu %(verbose_name)s trovita kongruas kun la informpeto"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Paĝo ne estas 'last', kaj ne povus esti transformita al entjero."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Malvalida paĝo (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Malplena listo kaj '%(class_name)s.allow_empty' estas Malvera."
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 02c3c308b6..7fc5d8eeb5 100644
Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 0c936669fa..25c4e7facc 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -1,368 +1,392 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Antoni Aloy <aaloy@apsl.net>, 2012.
 # Antoni Aloy <antoni.aloy@trespams.com>, 2011, 2012.
+# Diego Andrés Sanabria <diegueus9@gmail.com>, 2012.
 # Diego Schulz <dschulz@gmail.com>, 2012.
 # franchukelly <fcocuadrado@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2011.
 # Marc Garcia <garcia.marc@gmail.com>, 2011.
+#   <monobot.soft@gmail.com>, 2012.
+#  <ntrrgc@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:29+0100\n"
-"PO-Revision-Date: 2012-03-13 19:44+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-17 21:09+0000\n"
+"Last-Translator: ntrrgc <ntrrgc@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
-msgid "Arabic"
-msgstr "árabe"
+msgid "Afrikaans"
+msgstr "Afrikaans"
 
 #: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Árabe"
+
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaiyán"
 
-#: conf/global_settings.py:50
-msgid "Bulgarian"
-msgstr "búlgaro"
-
 #: conf/global_settings.py:51
-msgid "Bengali"
-msgstr "bengalí"
+msgid "Bulgarian"
+msgstr "Búlgaro"
 
 #: conf/global_settings.py:52
-msgid "Bosnian"
-msgstr "bosnio"
+msgid "Belarusian"
+msgstr "Bielorruso"
 
 #: conf/global_settings.py:53
-msgid "Catalan"
-msgstr "catalán"
+msgid "Bengali"
+msgstr "Bengalí"
 
 #: conf/global_settings.py:54
-msgid "Czech"
-msgstr "checo"
+msgid "Breton"
+msgstr "Bretón"
 
 #: conf/global_settings.py:55
-msgid "Welsh"
-msgstr "galés"
+msgid "Bosnian"
+msgstr "Bosnio"
 
 #: conf/global_settings.py:56
-msgid "Danish"
-msgstr "danés"
+msgid "Catalan"
+msgstr "Catalán"
 
 #: conf/global_settings.py:57
-msgid "German"
-msgstr "alemán"
+msgid "Czech"
+msgstr "Checo"
 
 #: conf/global_settings.py:58
-msgid "Greek"
-msgstr "griego"
+msgid "Welsh"
+msgstr "Galés"
 
 #: conf/global_settings.py:59
-msgid "English"
-msgstr "inglés"
+msgid "Danish"
+msgstr "Danés"
 
 #: conf/global_settings.py:60
-msgid "British English"
-msgstr "inglés británico"
+msgid "German"
+msgstr "Alemán"
 
 #: conf/global_settings.py:61
-msgid "Esperanto"
-msgstr ""
+msgid "Greek"
+msgstr "Griego"
 
 #: conf/global_settings.py:62
-msgid "Spanish"
-msgstr "español"
+msgid "English"
+msgstr "Inglés"
 
 #: conf/global_settings.py:63
-msgid "Argentinian Spanish"
-msgstr "español de Argentina"
+msgid "British English"
+msgstr "Inglés británico"
 
 #: conf/global_settings.py:64
-msgid "Mexican Spanish"
-msgstr "Español (México)"
+msgid "Esperanto"
+msgstr "Esperanto"
 
 #: conf/global_settings.py:65
-msgid "Nicaraguan Spanish"
-msgstr "Español (Nicaragua)"
+msgid "Spanish"
+msgstr "Español"
 
 #: conf/global_settings.py:66
-msgid "Estonian"
-msgstr "estonio"
+msgid "Argentinian Spanish"
+msgstr "Español de Argentina"
 
 #: conf/global_settings.py:67
-msgid "Basque"
-msgstr "vasco"
+msgid "Mexican Spanish"
+msgstr "Español de México"
 
 #: conf/global_settings.py:68
-msgid "Persian"
-msgstr "persa"
+msgid "Nicaraguan Spanish"
+msgstr "Español de Nicaragua"
 
 #: conf/global_settings.py:69
-msgid "Finnish"
-msgstr "finés"
+msgid "Venezuelan Spanish"
+msgstr "Español venezolano"
 
 #: conf/global_settings.py:70
-msgid "French"
-msgstr "francés"
+msgid "Estonian"
+msgstr "Estonio"
 
 #: conf/global_settings.py:71
-msgid "Frisian"
-msgstr "frisón"
+msgid "Basque"
+msgstr "Vasco"
 
 #: conf/global_settings.py:72
-msgid "Irish"
-msgstr "irlandés"
+msgid "Persian"
+msgstr "Persa"
 
 #: conf/global_settings.py:73
-msgid "Galician"
-msgstr "gallego"
+msgid "Finnish"
+msgstr "Finés"
 
 #: conf/global_settings.py:74
-msgid "Hebrew"
-msgstr "hebreo"
+msgid "French"
+msgstr "Francés"
 
 #: conf/global_settings.py:75
-msgid "Hindi"
-msgstr "hindi"
+msgid "Frisian"
+msgstr "Frisón"
 
 #: conf/global_settings.py:76
-msgid "Croatian"
-msgstr "croata"
+msgid "Irish"
+msgstr "Irlandés"
 
 #: conf/global_settings.py:77
-msgid "Hungarian"
-msgstr "húngaro"
+msgid "Galician"
+msgstr "Gallego"
 
 #: conf/global_settings.py:78
-msgid "Indonesian"
-msgstr "indonesio"
+msgid "Hebrew"
+msgstr "Hebreo"
 
 #: conf/global_settings.py:79
-msgid "Icelandic"
-msgstr "islandés"
+msgid "Hindi"
+msgstr "Hindi"
 
 #: conf/global_settings.py:80
-msgid "Italian"
-msgstr "italiano"
+msgid "Croatian"
+msgstr "Croata"
 
 #: conf/global_settings.py:81
-msgid "Japanese"
-msgstr "japonés"
+msgid "Hungarian"
+msgstr "Húngaro"
 
 #: conf/global_settings.py:82
-msgid "Georgian"
-msgstr "georgiano"
+msgid "Interlingua"
+msgstr "Interlingua"
 
 #: conf/global_settings.py:83
-msgid "Kazakh"
-msgstr ""
+msgid "Indonesian"
+msgstr "Indonesio"
 
 #: conf/global_settings.py:84
-msgid "Khmer"
-msgstr "khmer"
+msgid "Icelandic"
+msgstr "Islandés"
 
 #: conf/global_settings.py:85
-msgid "Kannada"
-msgstr "kannada"
+msgid "Italian"
+msgstr "Italiano"
 
 #: conf/global_settings.py:86
-msgid "Korean"
-msgstr "koreano"
+msgid "Japanese"
+msgstr "Japonés"
 
 #: conf/global_settings.py:87
-msgid "Lithuanian"
-msgstr "lituano"
+msgid "Georgian"
+msgstr "Georgiano"
 
 #: conf/global_settings.py:88
-msgid "Latvian"
-msgstr "letón"
+msgid "Kazakh"
+msgstr "Kazajo"
 
 #: conf/global_settings.py:89
-msgid "Macedonian"
-msgstr "macedonio"
+msgid "Khmer"
+msgstr "Khmer"
 
 #: conf/global_settings.py:90
-msgid "Malayalam"
-msgstr "malayalam"
+msgid "Kannada"
+msgstr "Kannada"
 
 #: conf/global_settings.py:91
-msgid "Mongolian"
-msgstr "mongol"
+msgid "Korean"
+msgstr "Koreano"
 
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
-msgstr "bokmål"
+msgid "Luxembourgish"
+msgstr "Luxenburgués"
 
 #: conf/global_settings.py:93
-msgid "Nepali"
-msgstr ""
+msgid "Lithuanian"
+msgstr "Lituano"
 
 #: conf/global_settings.py:94
-msgid "Dutch"
-msgstr "holandés"
+msgid "Latvian"
+msgstr "Letón"
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
-msgstr "nynorsk"
+msgid "Macedonian"
+msgstr "Macedonio"
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
-msgstr "panyabí"
+msgid "Malayalam"
+msgstr "Malayalam"
 
 #: conf/global_settings.py:97
-msgid "Polish"
-msgstr "polaco"
+msgid "Mongolian"
+msgstr "Mongol"
 
 #: conf/global_settings.py:98
-msgid "Portuguese"
-msgstr "portugués"
+msgid "Norwegian Bokmal"
+msgstr "Nokmål"
 
 #: conf/global_settings.py:99
-msgid "Brazilian Portuguese"
-msgstr "portugués de Brasil"
+msgid "Nepali"
+msgstr "Nepalí"
 
 #: conf/global_settings.py:100
-msgid "Romanian"
-msgstr "rumano"
+msgid "Dutch"
+msgstr "Holandés"
 
 #: conf/global_settings.py:101
-msgid "Russian"
-msgstr "ruso"
+msgid "Norwegian Nynorsk"
+msgstr "Nynorsk"
 
 #: conf/global_settings.py:102
-msgid "Slovak"
-msgstr "eslovaco"
+msgid "Punjabi"
+msgstr "Panyabí"
 
 #: conf/global_settings.py:103
-msgid "Slovenian"
-msgstr "esloveno"
+msgid "Polish"
+msgstr "Polaco"
 
 #: conf/global_settings.py:104
-msgid "Albanian"
-msgstr "albanés"
+msgid "Portuguese"
+msgstr "Portugués"
 
 #: conf/global_settings.py:105
-msgid "Serbian"
-msgstr "serbio"
+msgid "Brazilian Portuguese"
+msgstr "Portugués de Brasil"
 
 #: conf/global_settings.py:106
-msgid "Serbian Latin"
-msgstr "serbio latino"
+msgid "Romanian"
+msgstr "Rumano"
 
 #: conf/global_settings.py:107
-msgid "Swedish"
-msgstr "sueco"
+msgid "Russian"
+msgstr "Ruso"
 
 #: conf/global_settings.py:108
-msgid "Swahili"
-msgstr ""
+msgid "Slovak"
+msgstr "Eslovaco"
 
 #: conf/global_settings.py:109
-msgid "Tamil"
-msgstr "tamil"
+msgid "Slovenian"
+msgstr "Esloveno"
 
 #: conf/global_settings.py:110
-msgid "Telugu"
-msgstr "telugu"
+msgid "Albanian"
+msgstr "Albanés"
 
 #: conf/global_settings.py:111
-msgid "Thai"
-msgstr "tailandés"
+msgid "Serbian"
+msgstr "Serbio"
 
 #: conf/global_settings.py:112
-msgid "Turkish"
-msgstr "turco"
+msgid "Serbian Latin"
+msgstr "Serbio latino"
 
 #: conf/global_settings.py:113
-msgid "Tatar"
-msgstr ""
+msgid "Swedish"
+msgstr "Sueco"
 
 #: conf/global_settings.py:114
-msgid "Ukrainian"
-msgstr "ucraniano"
+msgid "Swahili"
+msgstr "Suajili"
 
 #: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "Tamil"
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr "Telugu"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "Tailandés"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "Turco"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr "Tártaro"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
-msgstr "vietnamita"
+msgstr "Vietnamita"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
-msgstr "chino simplificado"
+msgstr "Cino simplificado"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
-msgstr "chino tradicional"
+msgstr "Chino tradicional"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Introduzca un valor correcto."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "La URL parece ser un enlace roto."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Introduzca una dirección de correo electrónica válida."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Introduzca una URL válida."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una dirección de correo electrónico válida."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Introduzca un 'slug' válido, consistente en letras, números, guiones bajos o "
 "medios."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Introduzca una dirección IPv4 válida."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Introduzca una dirección IPv6 válida."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Introduzca una dirección IPv4 o IPv6 válida."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Introduzca sólo dígitos separados por comas."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Asegúrese de que este valor es %(limit_value)s (actualmente es "
 "%(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Asegúrese de que este valor es menor o igual a %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Asegúrese de que este valor es mayor o igual a %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -371,82 +395,82 @@ msgstr ""
 "Asegúrese de que este valor tiene al menos %(limit_value)d caracteres "
 "(actualmente tiene %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
-"Asegúrese de que este valor tiene a lo más %(limit_value)d caracteres "
+"Asegúrese de que este valor tiene como mucho %(limit_value)d caracteres "
 "(actualmente tiene %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "El campo %(field_name)s debe ser único para %(lookup)s %(date_field)s"
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "y"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Ya existe %(model_name)s con este %(field_label)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "El valor %r no es una opción válida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
-msgstr "Este campo no puede estar vacío."
+msgstr "Este campo no puede ser nulo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Este campo no puede estar vacío."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo de tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Entero"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "El valor '%s' debe ser un entero."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "El valor '%s' debe ser True o False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (Verdadero o Falso)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Cadena (máximo %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Enteros separados por comas"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "El valor '%s' tiene formato de fecha inválido. Debe ser de la forma YYYY-MM-"
 "DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -454,11 +478,11 @@ msgstr ""
 "El valor '%s' tiene el formato correcto (YYYY-MM-DD) pero es una fecha no "
 "válida"
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Fecha (sin hora)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -467,7 +491,7 @@ msgstr ""
 "'%s' tiene un formato incorrecto. Debe ser del tipo YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -476,79 +500,79 @@ msgstr ""
 "El valor '%s' tiene el formato correcto (YYYY-MM-DD HH: MM [:ss [.uuuuuu]] "
 "[TZ]), pero no es una fecha/hora válida."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Fecha (con hora)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "El valor '%s' debe ser un número decimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Número decimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Dirección de correo electrónico"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "dirección de correo electrónico"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Ruta de fichero"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "El valor '%s' debe ser un número decimal."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Número en coma flotante"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "El valor '%s' debe ser None, True o False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (Verdadero, Falso o Nulo)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Entero positivo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Entero positivo corto"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (hasta %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Entero corto"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Texto"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -556,7 +580,7 @@ msgstr ""
 "El valor '%s' tiene un formato inválido. Debe ser de la forma HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -565,100 +589,100 @@ msgstr ""
 "El valor '%s' tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero no "
 "representa una tiempo válido."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Hora"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Archivo"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Imagen"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "No existe ningún objeto %(model)s con la clave primaria %(pk)r."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Llave foránea (tipo determinado por el campo relacionado)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relación uno-a-uno"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relación muchos-a-muchos"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar "
 "más de una opción."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Este campo es obligatorio."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Introduzca un número entero."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Introduzca un número."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Asegúrese de que no hay más de %s dígitos en total."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Asegúrese de que no hay más de %s decimales."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Asegúrese de que no hay más de %s dígitos antes de la coma decimal."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Introduzca una fecha válida."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Introduzca una hora válida."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Introduzca una fecha/hora válida."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "No se ha enviado ningún fichero. Compruebe el tipo de codificación en el "
 "formulario."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "No se ha enviado ningún fichero"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "El fichero enviado está vacío."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -666,12 +690,12 @@ msgstr ""
 "Asegúrese de que su texto tiene no más de %(max)d caracteres (actualmente "
 "tiene %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Por favor envíe un fichero o marque la casilla de limpiar, pero no ambos."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -679,36 +703,40 @@ msgstr ""
 "Envíe una imagen válida. El fichero que ha enviado no era una imagen o se "
 "trataba de una imagen corrupta."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Introduzca una URL válida."
+
+#: 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 ""
 "Escoja una opción válida. %(value)s no es una de las opciones disponibles."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Introduzca una lista de valores."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Orden"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Eliminar"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Por favor, corrija el dato duplicado para %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Por favor corriga el dato duplicado para %(field)s, el cual debe ser único."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -717,31 +745,31 @@ msgstr ""
 "Por favor corriga los datos duplicados para %(field_name)s el cual debe ser "
 "único para %(lookup)s en %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija los valores duplicados abajo."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "La clave foránea en linea no coincide con la clave primaria de la instancia "
 "padre."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Escoja una opción válida. Esa opción no está entre las disponibles."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Escoja una opción válida; '%s' no es una de las opciones disponibles."
+msgstr "Escoja una opción válida; %s no es una de las opciones disponibles."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" no es un valor válido para una clave primaria."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -750,506 +778,491 @@ msgstr ""
 "%(datetime)s no puede interpretarse en la zona temporal "
 "%(current_timezone)s; puede ser ambiguo o puede no existir."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Actualmente"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modificar"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Limpiar"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Sí"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "No"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
-msgstr "sí,no,tal vez"
+msgstr "sí, no, quizás"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "media noche"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "medio día"
 
 #: utils/dates.py:6
 msgid "Monday"
-msgstr "lunes"
+msgstr "Lunes"
 
 #: utils/dates.py:6
 msgid "Tuesday"
-msgstr "martes"
+msgstr "Martes"
 
 #: utils/dates.py:6
 msgid "Wednesday"
-msgstr "miércoles"
+msgstr "Miércoles"
 
 #: utils/dates.py:6
 msgid "Thursday"
-msgstr "jueves"
+msgstr "Jueves"
 
 #: utils/dates.py:6
 msgid "Friday"
-msgstr "viernes"
+msgstr "Viernes"
 
 #: utils/dates.py:7
 msgid "Saturday"
-msgstr "sábado"
+msgstr "Sábado"
 
 #: utils/dates.py:7
 msgid "Sunday"
-msgstr "domingo"
+msgstr "Domingo"
 
 #: utils/dates.py:10
 msgid "Mon"
-msgstr "lun"
+msgstr "Lun"
 
 #: utils/dates.py:10
 msgid "Tue"
-msgstr "mar"
+msgstr "Mar"
 
 #: utils/dates.py:10
 msgid "Wed"
-msgstr "mié"
+msgstr "Mié"
 
 #: utils/dates.py:10
 msgid "Thu"
-msgstr "jue"
+msgstr "Jue"
 
 #: utils/dates.py:10
 msgid "Fri"
-msgstr "vie"
+msgstr "Vie"
 
 #: utils/dates.py:11
 msgid "Sat"
-msgstr "sáb"
+msgstr "Sáb"
 
 #: utils/dates.py:11
 msgid "Sun"
-msgstr "dom"
+msgstr "Dom"
 
 #: utils/dates.py:18
 msgid "January"
-msgstr "enero"
+msgstr "Enero"
 
 #: utils/dates.py:18
 msgid "February"
-msgstr "febrero"
+msgstr "Febrero"
 
 #: utils/dates.py:18
 msgid "March"
-msgstr "marzo"
+msgstr "Marzo"
 
 #: utils/dates.py:18
 msgid "April"
-msgstr "abril"
+msgstr "Abril"
 
 #: utils/dates.py:18
 msgid "May"
-msgstr "mayo"
+msgstr "Mayo"
 
 #: utils/dates.py:18
 msgid "June"
-msgstr "junio"
+msgstr "Junio"
 
 #: utils/dates.py:19
 msgid "July"
-msgstr "julio"
+msgstr "Julio"
 
 #: utils/dates.py:19
 msgid "August"
-msgstr "agosto"
+msgstr "Agosto"
 
 #: utils/dates.py:19
 msgid "September"
-msgstr "septiembre"
+msgstr "Septiembre"
 
 #: utils/dates.py:19
 msgid "October"
-msgstr "octubre"
+msgstr "Octubre"
 
 #: utils/dates.py:19
 msgid "November"
-msgstr "noviembre"
+msgstr "Noviembre"
 
 #: utils/dates.py:20
 msgid "December"
-msgstr "diciembre"
+msgstr "Diciembre"
 
 #: utils/dates.py:23
 msgid "jan"
-msgstr "ene"
+msgstr "Ene"
 
 #: utils/dates.py:23
 msgid "feb"
-msgstr "feb"
+msgstr "Feb"
 
 #: utils/dates.py:23
 msgid "mar"
-msgstr "mar"
+msgstr "Mar"
 
 #: utils/dates.py:23
 msgid "apr"
-msgstr "abr"
+msgstr "Abr"
 
 #: utils/dates.py:23
 msgid "may"
-msgstr "may"
+msgstr "May"
 
 #: utils/dates.py:23
 msgid "jun"
-msgstr "jun"
+msgstr "Jun"
 
 #: utils/dates.py:24
 msgid "jul"
-msgstr "jul"
+msgstr "Jul"
 
 #: utils/dates.py:24
 msgid "aug"
-msgstr "ago"
+msgstr "Ago"
 
 #: utils/dates.py:24
 msgid "sep"
-msgstr "sep"
+msgstr "Sep"
 
 #: utils/dates.py:24
 msgid "oct"
-msgstr "oct"
+msgstr "Oct"
 
 #: utils/dates.py:24
 msgid "nov"
-msgstr "nov"
+msgstr "Nov"
 
 #: utils/dates.py:24
 msgid "dec"
-msgstr "dic"
+msgstr "Dic"
 
 #: utils/dates.py:31
 msgctxt "abbrev. month"
 msgid "Jan."
-msgstr "ene."
+msgstr "Ene."
 
 #: utils/dates.py:32
 msgctxt "abbrev. month"
 msgid "Feb."
-msgstr "feb."
+msgstr "Feb."
 
 #: utils/dates.py:33
 msgctxt "abbrev. month"
 msgid "March"
-msgstr "mar."
+msgstr "Mar."
 
 #: utils/dates.py:34
 msgctxt "abbrev. month"
 msgid "April"
-msgstr "abr."
+msgstr "Abr."
 
 #: utils/dates.py:35
 msgctxt "abbrev. month"
 msgid "May"
-msgstr "mayo"
+msgstr "Mayo"
 
 #: utils/dates.py:36
 msgctxt "abbrev. month"
 msgid "June"
-msgstr "jun."
+msgstr "Jun."
 
 #: utils/dates.py:37
 msgctxt "abbrev. month"
 msgid "July"
-msgstr "jul."
+msgstr "Jul."
 
 #: utils/dates.py:38
 msgctxt "abbrev. month"
 msgid "Aug."
-msgstr "ago."
+msgstr "Ago."
 
 #: utils/dates.py:39
 msgctxt "abbrev. month"
 msgid "Sept."
-msgstr "sept."
+msgstr "Sept."
 
 #: utils/dates.py:40
 msgctxt "abbrev. month"
 msgid "Oct."
-msgstr "oct."
+msgstr "Oct."
 
 #: utils/dates.py:41
 msgctxt "abbrev. month"
 msgid "Nov."
-msgstr "nov."
+msgstr "Nov."
 
 #: utils/dates.py:42
 msgctxt "abbrev. month"
 msgid "Dec."
-msgstr "dic."
+msgstr "Dic."
 
 #: utils/dates.py:45
 msgctxt "alt. month"
 msgid "January"
-msgstr "enero"
+msgstr "Enero"
 
 #: utils/dates.py:46
 msgctxt "alt. month"
 msgid "February"
-msgstr "febrero"
+msgstr "Febrero"
 
 #: utils/dates.py:47
 msgctxt "alt. month"
 msgid "March"
-msgstr "marzo"
+msgstr "Marzo"
 
 #: utils/dates.py:48
 msgctxt "alt. month"
 msgid "April"
-msgstr "abril"
+msgstr "Abril"
 
 #: utils/dates.py:49
 msgctxt "alt. month"
 msgid "May"
-msgstr "mayo"
+msgstr "Mayo"
 
 #: utils/dates.py:50
 msgctxt "alt. month"
 msgid "June"
-msgstr "junio"
+msgstr "Junio"
 
 #: utils/dates.py:51
 msgctxt "alt. month"
 msgid "July"
-msgstr "julio"
+msgstr "Julio"
 
 #: utils/dates.py:52
 msgctxt "alt. month"
 msgid "August"
-msgstr "agosto"
+msgstr "Agosto"
 
 #: utils/dates.py:53
 msgctxt "alt. month"
 msgid "September"
-msgstr "septiembre"
+msgstr "Septiembre"
 
 #: utils/dates.py:54
 msgctxt "alt. month"
 msgid "October"
-msgstr "octubre"
+msgstr "Octubre"
 
 #: utils/dates.py:55
 msgctxt "alt. month"
 msgid "November"
-msgstr "noviembre"
+msgstr "Noviembre"
 
 #: utils/dates.py:56
 msgctxt "alt. month"
 msgid "December"
-msgstr "diciembre"
+msgstr "Diciembre"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "o"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "año"
 msgstr[1] "años"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "meses"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semana"
 msgstr[1] "semanas"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutos"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Los índices de directorio no están permitidos."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" no existe"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índice de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "El/La %(verbose_name)s se ha creado exitosamente."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Se actualizó con éxito el %(verbose_name)s."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "El/La %(verbose_name)s ha sido borrado."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "No se ha indicado el año"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "No se ha indicado el mes"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "No se ha indicado el día"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "No se ha indicado la semana"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "No %(verbose_name_plural)s disponibles"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
-"Futuro %(verbose_name_plural)s no esta disponible porque %(class_name)s."
-"allow_future es Falso."
+"Los futuros %(verbose_name_plural)s no están disponibles porque "
+"%(class_name)s.allow_future es Falso."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Fecha '%(datestr)s' no válida, el formato válido es '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
-msgstr "No %(verbose_name)s encontrado coincide con la consulta"
+msgstr "No se encontró ningún %(verbose_name)s coincidente con la consulta"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
-msgstr "La página no es \"ultimo\", ni puede ser convertido a un entero."
+msgstr "La página no es la \"ultima\", ni puede ser convertida a un entero."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Página no válida (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Página inválida (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Lista vacía y '%(class_name)s.allow_empty' es Falso."
diff --git a/django/conf/locale/es/formats.py b/django/conf/locale/es/formats.py
index 6241158338..7e5ecb39a6 100644
--- a/django/conf/locale/es/formats.py
+++ b/django/conf/locale/es/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -21,8 +22,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = ','
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
index 444ca706de..7566b13508 100644
Binary files a/django/conf/locale/es_AR/LC_MESSAGES/django.mo and b/django/conf/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po
index e72f067567..fd41f37b08 100644
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
@@ -2,361 +2,381 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Ramiro Morales <cramm0@gmail.com>, 2011, 2012.
+# Ramiro Morales <cramm0@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:29+0100\n"
-"PO-Revision-Date: 2012-03-14 19:50+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "afrikáans"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "árabe"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaiyán"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "búlgaro"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "bielorruso"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengalí"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "bretón"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosnio"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "catalán"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "checo"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "galés"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "danés"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "alemán"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "griego"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "inglés"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "inglés británico"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "español"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "español de Argentina"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Español de México"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Español (Nicaragua)"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "español de Venezuela"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estonio"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "vasco"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persa"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "finlandés"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francés"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frisón"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irlandés"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "gallego"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "hebreo"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "croata"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "húngaro"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonesio"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandés"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "italiano"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "japonés"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "georgiano"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "kazajo"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "jémer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "canarés"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "coreano"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "luxemburgués"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "lituano"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "letón"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "macedonio"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongol"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "bokmål"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "nepalés"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "holandés"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Panyabí"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "polaco"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugués"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "portugués de Brasil"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumano"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "ruso"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "eslovaco"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "esloveno"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albanés"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "serbio"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Latín de Serbia"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "sueco"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "suajili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "tailandés"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turco"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "tártaro"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "udmurto"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ucraniano"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vietnamita"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "chino simplificado"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "chino tradicional"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Introduzca un valor válido."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "La URL parece ser un enlace roto."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Introduzca una dirección de email válida."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Introduzca una URL válida."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una dirección de correo electrónico válida"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "Introduzca un 'slug' válido consistente de letras, números o guiones."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Introduzca una dirección IPv4 válida"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Introduzca una dirección IPv6 válida."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Introduzca una dirección IPv4 o IPv6 válida."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Introduzca sólo dígitos separados por comas."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Asegúrese de que este valor sea %(limit_value)s (actualmente es "
 "%(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Asegúrese de que este valor sea menor o igual a %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Asegúrese de que este valor sea mayor o igual a %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -365,7 +385,7 @@ msgstr ""
 "Asegúrese de que este valor tenga al menos %(limit_value)d caracteres (tiene "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -374,75 +394,75 @@ msgstr ""
 "Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres "
 "(tiene %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(field_name)s debe ser único/a para un %(lookup)s %(date_field)s "
 "determinado."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "y"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Ya existe un/a %(model_name)s con este/a %(field_label)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "El valor %r no es una opción válida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Este campo no puede ser nulo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Este campo no puede estar en blanco."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Entero"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "El valor de '%s' debe ser un número entero."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "El valor de '%s' debe ser Verdadero o Falso."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (Verdadero o Falso)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Cadena (máximo %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Enteros separados por comas"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "El valor de '%s' tiene un formato de fecha inválido. El mismo debe usar el "
 "formato AAAA-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -450,11 +470,11 @@ msgstr ""
 "El valor de '%s' tiene un formato de fecha correcto (AAAA-MM-DD) pero "
 "representa una fecha inválida."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Fecha (sin hora)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -463,7 +483,7 @@ msgstr ""
 "El valor de '%s' tiene un formato inválido. El mismo debe usar el formato "
 "AAAA-MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -472,79 +492,79 @@ msgstr ""
 "El valor de '%s' tiene un formato correcto (AAAA-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) pero representa una fecha/hora invalida."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Fecha (con hora)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "El valor de '%s' debe ser un número decimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Número decimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Dirección de correo electrónico"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Ruta de archivo"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "El valor de '%s' debe ser un número de coma flotante."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Número de punto flotante"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "El valor de '%s' debe ser None, Verdadero o Falso."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (Verdadero, Falso o Nulo)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Entero positivo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Entero pequeño positivo"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (de hasta %(max_length)s caracteres)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Entero pequeño"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Texto"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -552,7 +572,7 @@ msgstr ""
 "El valor de '%s' tiene un formato inválido. El mismo debe usar el formato HH:"
 "MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -561,99 +581,99 @@ msgstr ""
 "El valor de '%s' tiene un formato correcto (HH:MM[:ss[.uuuuuu]]) pero "
 "representa una hora inválida."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Hora"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Archivo"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Imagen"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "No existe un modelo %(model)s con una clave primaria %(pk)r."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relación uno-a-uno"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relación muchos-a-muchos"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Mantenga presionada \"Control\" (\"Command\" en una Mac) para seleccionar "
 "más de uno."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Este campo es obligatorio."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Introduzca un número entero."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Introduzca un número."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Asegúrese de que no existan en total mas de %s dígitos."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Asegúrese de que no existan mas de %s lugares decimales."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Asegúrese de que no existan mas de %s dígitos antes del punto decimal."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Introduzca una fecha válida."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Introduzca un valor de hora válido."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Introduzca un valor de fecha/hora válido."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "No se envió un archivo. Verifique el tipo de codificación en el formulario."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "No se envió ningún archivo."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "El archivo enviado está vacío."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -661,11 +681,11 @@ msgstr ""
 "Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres "
 "(tiene %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Por favor envíe un archivo o active el checkbox, pero no ambas cosas."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -673,37 +693,41 @@ msgstr ""
 "Seleccione una imagen válida. El archivo que ha seleccionado no es una "
 "imagen o es un un archivo de imagen corrupto."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Introduzca una URL válida."
+
+#: 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 ""
 "Seleccione una opción válida. %(value)s no es una de las opciones "
 "disponibles."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Introduzca una lista de valores."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordenar"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Eliminar"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Por favor, corrija la información duplicada en %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Por favor corrija la información duplicada en %(field)s, que debe ser única."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -712,34 +736,34 @@ msgstr ""
 "Por favor corrija la información duplicada en %(field_name)s que debe ser "
 "única para el %(lookup)s en %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "La clave foránea del modelo inline no coincide con la clave primaria de la "
 "instancia padre."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Seleccione una opción válida. La opción seleccionada no es una de las "
 "disponibles."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Seleccione una opción válida. %s no es una de las opciones disponibles."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" no es un valor válido para una clave primaria."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -748,87 +772,87 @@ msgstr ""
 "%(datetime)s no puede ser interpretado en la zona horaria "
 "%(current_timezone)s; ya que podría ser ambiguo o podría no existir."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Actualmente"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modificar"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Eliminar"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Sí"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "No"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "si,no,talvez"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "medianoche"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "mediodía"
 
@@ -1104,124 +1128,109 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Diciembre"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "o"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "año"
 msgstr[1] "años"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "meses"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semana"
 msgstr[1] "semanas"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutos"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 "No está habilitada la generación de listados de directorios en esta "
 "ubicación."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" no existe"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Listado de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Se creó con éxito %(verbose_name)s."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Se actualizó con éxito %(verbose_name)s."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Se eliminó %(verbose_name)s."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "No se ha especificado el valor año"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "No se ha especificado el valor mes"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "No se ha especificado el valor día"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "No se ha especificado el valor semana"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "No hay %(verbose_name_plural)s disponibles"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1230,26 +1239,26 @@ msgstr ""
 "No hay %(verbose_name_plural)s futuros disponibles porque %(class_name)s."
 "allow_future tiene el valor False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Cadena de fecha inválida '%(datestr)s', formato '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "No se han encontrado %(verbose_name)s que coincidan con la consulta "
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Página debe tener el valor 'last' o un valor número entero."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Página inválida (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Página inválida (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Lista vacía y '%(class_name)s.allow_empty' tiene el valor False."
diff --git a/django/conf/locale/es_AR/formats.py b/django/conf/locale/es_AR/formats.py
index 651690bfdf..41c732f7b8 100644
--- a/django/conf/locale/es_AR/formats.py
+++ b/django/conf/locale/es_AR/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -21,8 +22,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = ','
diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.mo b/django/conf/locale/es_MX/LC_MESSAGES/django.mo
index c36e6515ef..2598245430 100644
Binary files a/django/conf/locale/es_MX/LC_MESSAGES/django.mo and b/django/conf/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.po b/django/conf/locale/es_MX/LC_MESSAGES/django.po
index d867c9131b..c20d2a4050 100644
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.po
@@ -7,356 +7,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:29+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: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Árabe"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaijani"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalán"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Checo"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Galés"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danés"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Alemán"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Griego"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Inglés"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Inglés británico"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Español"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Español de Argentina"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Español de México"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Español de nicaragua"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonio"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Vasco"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persa"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finés"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Francés"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisón"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlandés"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Gallego"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Croata"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandés"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japonés"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazajstán"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Coreano"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Letón"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongol"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Noruego Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepal"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Holandés"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Noruego Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polaco"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Portugués de Brasil"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumano"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Ruso"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanés"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbio"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Latin Serbio"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Sueco"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tailandés"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turco"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Tatar"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Introduzca un valor válido."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Esta dirección URL que parece ser un enlace roto."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Ingrese una URL válida."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una dirección de correo electrónico válida."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Introduzca un \"slug\", compuesto por letras, números, guiones bajos o "
 "medios."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Introduzca una dirección IPv4 válida."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Introduzca una dirección IPv6 válida."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Introduzca una dirección IPv4 o IPv6 válida."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Introduzca sólo números separados por comas."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Asegúrese de que este valor es %(limit_value)s  (es %(show_value)s )."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Asegúrese de que este valor sea menor o igual a %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Asegúrese de que este valor sea mayor o igual a %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -365,7 +385,7 @@ msgstr ""
 "Asegúrese de que este valor tenga al menos %(limit_value)d caracteres (tiene "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -374,75 +394,75 @@ msgstr ""
 "Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres "
 "(tiene %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(field_name)s debe ser único/a para un %(lookup)s %(date_field)s "
 "determinado."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "y"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Ya existe un/a %(model_name)s con este/a %(field_label)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "El valor %r no es una opción válida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Este campo no puede ser nulo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Este campo no puede estar en blanco."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Entero"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "El valor '%s' debe ser entero."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "El valor '%s' debe ser Verdadero o Falso."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (Verdadero o Falso)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Cadena (máximo %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Enteros separados por comas"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "El valor '%s' tiene formato de fecha inválido. Debe ser de la forma YYYY-MM-"
 "DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -450,11 +470,11 @@ msgstr ""
 "El valor '%s' tiene el formato correcto (YYYY-MM-DD) pero es una fecha "
 "inválida."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Fecha (sin hora)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -463,7 +483,7 @@ msgstr ""
 "El valor '%s' tiene formato de fecha inválido. Debe ser de la forma YYYY-MM-"
 "DD HH:MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -472,79 +492,79 @@ msgstr ""
 "El valor '%s' tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
 "pero es una fecha inválida."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Fecha (con hora)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "El valor '%s' debe ser un número decimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Número decimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Dirección de correo electrónico"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Ruta de archivo"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "El valor '%s' debe ser flotante."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Número de punto flotante"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "El valor '%s' debe ser Ningúno, Verdadero o Falso."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (Verdadero, Falso o Nulo)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Entero positivo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Entero positivo pequeño"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (hasta %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Entero pequeño"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Texto"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -552,7 +572,7 @@ msgstr ""
 "El valor '%s' tiene formato de hora inválido. Debe ser de la forma HH:MM[:ss"
 "[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -561,99 +581,99 @@ msgstr ""
 "El valor '%s' tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una "
 "hora inválida."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Hora"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Archivo"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Imagen"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "No existe un modelo %(model)s con una clave primaria %(pk)r."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relación uno-a-uno"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relación muchos-a-muchos"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Mantenga presionada \"Control\", o \"Command\" en una Mac, para seleccionar "
 "más de uno."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Este campo es obligatorio."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Introduzca un número entero."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Introduzca un número."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Asegúrese de que no hay más de %s dígitos en total."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Asegúrese de que no hay más de %s decimales."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Asegúrese de que no existan mas de %s dígitos antes del punto decimal."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Introduzca una fecha válida."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Introduzca una hora válida."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Introduzca una fecha/hora válida."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "No se envió un archivo. Verifique el tipo de codificación en el formulario."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "No se envió ningún archivo."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "El archivo enviado está vacío."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -661,11 +681,11 @@ msgstr ""
 "Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres "
 "(tiene %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Por favor envíe un archivo o marque la casilla, no ambos."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -673,37 +693,41 @@ msgstr ""
 "Seleccione una imagen válida. El archivo que ha seleccionado no es una "
 "imagen o es un un archivo de imagen corrupto."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Ingrese una URL válida."
+
+#: 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 ""
 "Seleccione una opción válida. %(value)s no es una de las opciones "
 "disponibles."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Introduzca una lista de valores."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordenar"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Eliminar"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Por favor, corrija la información duplicada en %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Por favor corrija la información duplicada en %(field)s, que debe ser única."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -712,34 +736,34 @@ msgstr ""
 "Por favor corrija la información duplicada en %(field_name)s que debe ser "
 "única para el %(lookup)s en %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "La clave foránea del modelo inline no coincide con la clave primaria de la "
 "instancia padre."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Seleccione una opción válida. La opción seleccionada no es una de las "
 "disponibles."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Seleccione una opción válida. %s no es una de las opciones disponibles."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" no es un valor válido para una clave primaria."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -748,87 +772,87 @@ msgstr ""
 "La fecha %(datetime)s no puede se interpretada en la zona horaria  "
 "%(current_timezone)s; ya que puede ser ambigua o que no pueden existir."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Actualmente"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modificar"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Borrar"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Sí"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "No"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "sí, no, tal vez"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "medianoche"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "mediodía"
 
@@ -1104,122 +1128,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Diciembre"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "o"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "años"
 msgstr[1] "años"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "meses"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semana"
 msgstr[1] "semanas"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "horas"
 msgstr[1] "horas"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutos"
 msgstr[1] "minutos"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutos"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Los índices del directorio no están permitidos."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" no existe"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índice de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Se creó con éxito %(verbose_name)s."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Se actualizó con éxito %(verbose_name)s."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Se eliminó %(verbose_name)s."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "No se ha especificado el valor año"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "No se ha especificado el valor mes"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "No se ha especificado el valor dia"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "No se ha especificado el valor semana"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "No hay %(verbose_name_plural)s disponibles"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1228,26 +1237,26 @@ msgstr ""
 "No hay %(verbose_name_plural)s futuros disponibles porque %(class_name)s."
 "allow_future tiene el valor False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Cadena de fecha inválida '%(datestr)s', formato '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "No se han encontrado %(verbose_name)s que coincidan con la consulta"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "La página no es \"last\", ni puede ser convertido a un int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Página inválida (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Lista vacía y '%(class_name)s.allow_empty' tiene el valor False."
diff --git a/django/conf/locale/es_MX/formats.py b/django/conf/locale/es_MX/formats.py
index e0e6d7f16d..e3ac674ab0 100644
--- a/django/conf/locale/es_MX/formats.py
+++ b/django/conf/locale/es_MX/formats.py
@@ -17,8 +17,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = '.'   # ',' is also official (less common): NOM-008-SCFI-2002
diff --git a/django/conf/locale/es_NI/formats.py b/django/conf/locale/es_NI/formats.py
index a22432a16a..8220b80b78 100644
--- a/django/conf/locale/es_NI/formats.py
+++ b/django/conf/locale/es_NI/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i:s'
@@ -17,8 +18,10 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
     '%d/%m/%Y %H:%M',
     '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
     '%d/%m/%y %H:%M',
 )
 DECIMAL_SEPARATOR = '.'
diff --git a/django/contrib/databrowse/plugins/__init__.py b/django/conf/locale/es_PR/__init__.py
similarity index 100%
rename from django/contrib/databrowse/plugins/__init__.py
rename to django/conf/locale/es_PR/__init__.py
diff --git a/django/conf/locale/es_PR/formats.py b/django/conf/locale/es_PR/formats.py
new file mode 100644
index 0000000000..1d4e76c55b
--- /dev/null
+++ b/django/conf/locale/es_PR/formats.py
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+from __future__ import unicode_literals
+
+DATE_FORMAT = r'j \d\e F \d\e Y'
+TIME_FORMAT = 'H:i:s'
+DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = r'F \d\e Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
+SHORT_DATE_FORMAT = 'd/m/Y'
+SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
+FIRST_DAY_OF_WEEK = 0 # Sunday
+
+DATE_INPUT_FORMATS = (
+    # '31/12/2009', '31/12/09'
+    '%d/%m/%Y', '%d/%m/%y'
+)
+DATETIME_INPUT_FORMATS = (
+    '%d/%m/%Y %H:%M:%S',
+    '%d/%m/%Y %H:%M:%S.%f',
+    '%d/%m/%Y %H:%M',
+    '%d/%m/%y %H:%M:%S',
+    '%d/%m/%y %H:%M:%S.%f',
+    '%d/%m/%y %H:%M',
+)
+
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+NUMBER_GROUPING = 3
diff --git a/django/conf/locale/es_VE/LC_MESSAGES/django.mo b/django/conf/locale/es_VE/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..7f06739573
Binary files /dev/null and b/django/conf/locale/es_VE/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es_VE/LC_MESSAGES/django.po b/django/conf/locale/es_VE/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..ee8e4ce440
--- /dev/null
+++ b/django/conf/locale/es_VE/LC_MESSAGES/django.po
@@ -0,0 +1,1229 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Sebastián Ramírez Magrí <sebasmagri@gmail.com>, 2011.
+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-01-02 08:47+0000\n"
+"Last-Translator: Sebastián Ramírez Magrí <sebasmagri@gmail.com>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/"
+"django/language/es_VE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_VE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Árabe"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr ""
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "Bengalí"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "Bosnio"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "Catalán"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "Checo"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "Galés"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "Danés"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "Alemán"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "Griego"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "Inglés"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "Inglés Británic"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr ""
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "Español"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "Español de Argentina"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr ""
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "Estonio"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "Vazco"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "Persa"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "Finlandés"
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr "Francés"
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr "Frisio"
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr "Irlandés"
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr "Galés"
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr "Hindi"
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr "Croata"
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "Indonesio"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "Islandés"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "Italiano"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "Japonés"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "Georgiano"
+
+#: conf/global_settings.py:88
+msgid "Kazakh"
+msgstr ""
+
+#: conf/global_settings.py:89
+msgid "Khmer"
+msgstr "Khmer"
+
+#: conf/global_settings.py:90
+msgid "Kannada"
+msgstr "Canarés"
+
+#: conf/global_settings.py:91
+msgid "Korean"
+msgstr "Coreano"
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "Latvio"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "Macedonio"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "Malayala"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "Mongol"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "Noruego Bokmål"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr ""
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "Holandés"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr "Nynorsk"
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "Polaco"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "Portugués de Brasil"
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr "Ruman"
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr "Ruso"
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr "Eslovaco"
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr "Eslovenio"
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr "Albano"
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr "Serbi"
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr "Latín Serbio"
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr "Sueco"
+
+#: conf/global_settings.py:114
+msgid "Swahili"
+msgstr ""
+
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "Tamil"
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr "Telugu"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "Tailandés"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "Turco"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "Ucranio"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "Chino simplificado"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "Chino tradicional"
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Introduzca un valor válido."
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Introduzca un 'slug' válido, consistente de letras, números, guiones bajos o "
+"guiones."
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr "Introduzca una dirección IPv4 válida"
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr "Introduzca solo dígitos separados por comas."
+
+#: core/validators.py:157
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr "Asegúrese de que este valor %(limit_value)s (ahora es %(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 "Asegúrese de que este valor es menor o igual que %(limit_value)s."
+
+#: 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 "Asegúrese de que este valor es mayor o igual que %(limit_value)s."
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+"Asegúrese de que este valor tiene al menos %(limit_value)d caracteres (ahora "
+"tiene %(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 ""
+
+#: db/models/base.py:857
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr ""
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr ""
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr ""
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr ""
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr ""
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr ""
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr ""
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr ""
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr ""
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr "Dirección IP"
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr "Booleano (True, False o None)"
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "Texto"
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr "Hora"
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "El modelo %(model)s con llave primaria %(pk)r no existe"
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr "Clave foránea (tipo determinado por el campo relacionado)"
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr "Relación uno a uno"
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr "Relación muchos a muchos"
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar "
+"más de una opción."
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr "Introduzca un número completo."
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr "Introduzca un número"
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Asegúrese de que no hay más de %s dígitos en total."
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Asegúrese de que no hay más de %s decimales."
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Asegúrese de que no hay más de %s dígitos en la parte entera."
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr "Introduzca una fecha válida."
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr "Introduzca una hora válida."
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr "Introduzca una hora y fecha válida."
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"No se envió archivo alguno. Revise el tipo de codificación del formulario."
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr "No se envió ningún archivo."
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr "El archivo enviado está vacío"
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Asegúrese de que este nombre de archivo tiene como máximo %(max)d caracteres "
+"(actualmente tiene %(length)d)."
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr "Por favor provea un archivo o active el selector de limpiar, no ambos."
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Introduzca una URL válida."
+
+#: 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 ""
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr ""
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr ""
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr ""
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: 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 ""
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr ""
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr ""
+
+#: 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 ""
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr ""
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr ""
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr ""
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr ""
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr ""
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr ""
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr ""
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/defaultfilters.py:835
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: template/defaultfilters.py:837
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: template/defaultfilters.py:839
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: utils/dateformat.py:47
+msgid "p.m."
+msgstr ""
+
+#: utils/dateformat.py:48
+msgid "a.m."
+msgstr ""
+
+#: utils/dateformat.py:53
+msgid "PM"
+msgstr ""
+
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr ""
+
+#: utils/dateformat.py:103
+msgid "midnight"
+msgstr ""
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr ""
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr ""
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr ""
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "January"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "February"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "December"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "may"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr ""
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr ""
+
+#: utils/text.py:70
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:239
+msgid "or"
+msgstr ""
+
+#. 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] ""
+msgstr[1] ""
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr ""
+
+#: utils/timesince.py:48
+#, python-format
+msgid "%(number)d %(type)s"
+msgstr ""
+
+#: utils/timesince.py:54
+#, python-format
+msgid ", %(number)d %(type)s"
+msgstr ""
+
+#: views/static.py:56
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: views/generic/dates.py:646
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo
index acb044f9c5..fd16776a18 100644
Binary files a/django/conf/locale/et/LC_MESSAGES/django.mo and b/django/conf/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/et/LC_MESSAGES/django.po b/django/conf/locale/et/LC_MESSAGES/django.po
index 6fb1f21361..a905fbe3d0 100644
--- a/django/conf/locale/et/LC_MESSAGES/django.po
+++ b/django/conf/locale/et/LC_MESSAGES/django.po
@@ -9,355 +9,375 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:29+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: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "araabia"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Aserbaidžaani"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "bulgaaria"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "katalaani"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "tšehhi"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "uelsi"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "taani"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "saksa"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "kreeka"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "inglise"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "briti inglise"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "hispaania"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "argentiina hispaani"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "mehhiko hispaania"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "eesti"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "baski"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "pärsia"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "soome"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "prantsuse"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "friisi"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "iiri"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galiitsia"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "heebrea"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "horvaatia"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ungari"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indoneesi"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandi"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "itaalia"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "jaapani"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "gruusia"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "khmeri"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "korea"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "leedu"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "läti"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "makedoonia"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "malaia"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongoolia"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "norra (bokmal)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "hollandi"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "norra (nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "pandžab"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "poola"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugali"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "brasiilia portugali"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumeenia"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "vene"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "slovaki"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albaania"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "serbia"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "serbia (ladina)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "rootsi"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamiili"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "tai"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "türgi"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ukrania"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vietnami"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "lihtsustatud hiina"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "traditsiooniline hiina"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Sisestage korrektne väärtus."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "See URL näib olevat katkine."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Sisestage korrektne URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Sisestage korrektne e-posti aadress."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "See väärtus võib sisaldada ainult tähti, nubmreid, alljooni ja sidekriipse."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Sisestage korrektne IPv4 aadress."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Sisestage ainult komaga eraldatud numbreid."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Veendu, et see väärtus on %(limit_value)s (hetkel on %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Veendu, et see väärtus on väiksem või võrdne kui %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Veendu, et see väärtus on suurem või võrdne kui %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +386,7 @@ msgstr ""
 "Veendu, et see väärtus sisaldab vähemalt %(limit_value)d tähte (hetkel on "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,269 +395,269 @@ msgstr ""
 "Veendu, et sellel väärtusel on mitte rohkem kui %(limit_value)d tähte "
 "(hetkel on %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s peab olema unikaalne %(date_field)s %(lookup)s suhtes."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ja"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Sellise %(field_label)s-väljaga %(model_name)s on juba olemas."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Väärtus %r ei ole kehtiv valik."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "See lahter ei tohi olla tühi."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "See väli ei saa olla tühi."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Lahter tüüpi: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Täisarv"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Tõeväärtus (Kas tõene või väär)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (kuni %(max_length)s märki)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Komaga eraldatud täisarvud"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Kuupäev (kellaajata)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Kuupäev (kellaajaga)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Kümnendmurd"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-posti aadress"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Faili asukoht"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Ujukomaarv"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Suur (8 baiti) täisarv"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP aadress"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Tõeväärtus (Kas tõene, väär või tühi)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Aeg"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Mudel %(model)s primaarvõtmega %(pk)r ei leidu."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Välisvõti (tüübi määrab seotud väli) "
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Üks-ühele seos"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Mitu-mitmele seos"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "Et valida mitu, hoidke all \"Control\"-nuppu (Maci puhul \"Command\")."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "See lahter on nõutav."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Sisestage täisarv."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Sisestage arv."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Veenduge, et kogu numbrikohtade arv ei ületaks %s."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Veenduge, et komakohtade arv ei ületaks %s."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Veenduge, et komast vasakul olevaid numbreid ei oleks rohkem kui %s."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Sisestage korrektne kuupäev."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Sisestage korrektne kellaaeg."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Sisestage korrektne kuupäev ja kellaaeg."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Ühtegi faili ei saadetud. Kontrollige vormi kodeeringutüüpi."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Ühtegi faili ei saadetud."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Saadetud fail on tühi."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -645,11 +665,11 @@ msgstr ""
 "Veenduge, et see failinimi sisaldab kõige rohkem %(max)d tähemärki (hetkel "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Palun laadige fail või märgistage 'tühjenda' kast, mitte mõlemat."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -657,35 +677,39 @@ msgstr ""
 "Laadige korrektne pilt. Fail, mille laadisite, ei olnud kas pilt või oli "
 "fail vigane."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Sisestage korrektne URL."
+
+#: 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 "Valige korrektne väärtus. %(value)s ei ole valitav."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Sisestage väärtuste nimekiri."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Järjestus"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Kustuta"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Palun parandage duplikaat-andmed lahtris %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Palun parandage duplikaat-andmed lahtris %(field)s, mis peab olema unikaalne."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -694,116 +718,116 @@ msgstr ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
 "for the %(lookup)s in %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Palun parandage allolevad duplikaat-väärtused"
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Pesastatud välisvõti ei sobi ülemobjekti primaarvõtmega."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Valige korrektne väärtus. Valitud väärtus ei ole valitav."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Valige korrektne väärtus. %s ei ole valitav."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ei ole sobiv väärtust primaarvõtmeks."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Hetkel"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Muuda"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Tühjenda"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Jah"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ei"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "jah,ei,võib-olla"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bait"
 msgstr[1] "%(size)d baiti"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.l."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "e.l."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PL"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "EL"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "südaöö"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "keskpäev"
 
@@ -1079,122 +1103,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "detsember"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "või"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "aasta"
 msgstr[1] "aastat"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "kuu"
 msgstr[1] "kuud"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "nädal"
 msgstr[1] "nädalat"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päev"
 msgstr[1] "päeva"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tund"
 msgstr[1] "tundi"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutit"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutit"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s edukalt loodud."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s edukalt muudetud."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s kustutatud."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Aasta on valimata"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Kuu on valimata"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Päev on valimata"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nädal on valimata"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Ei leitud %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1203,26 +1212,26 @@ msgstr ""
 "Tulevane %(verbose_name_plural)s pole saadaval, sest %(class_name)s."
 "allow_future on False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Vigane kuupäeva-string '%(datestr)s' lähtudes formaadist '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Päringule vastavat %(verbose_name)s ei leitud"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Lehekülg ei ole 'last', ka ei saa teda konvertida täisarvuks."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Vigane lehekülg (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Tühi list ja '%(class_name)s.allow_empty' on False."
diff --git a/django/conf/locale/eu/LC_MESSAGES/django.mo b/django/conf/locale/eu/LC_MESSAGES/django.mo
index 78b54ae944..5c51d25cbb 100644
Binary files a/django/conf/locale/eu/LC_MESSAGES/django.mo and b/django/conf/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/eu/LC_MESSAGES/django.po b/django/conf/locale/eu/LC_MESSAGES/django.po
index b4724b6aa3..f4a29958dc 100644
--- a/django/conf/locale/eu/LC_MESSAGES/django.po
+++ b/django/conf/locale/eu/LC_MESSAGES/django.po
@@ -1,367 +1,387 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Aitzol Naberan <anaberan@codesyntax.com>, 2011, 2012.
+# Aitzol Naberan <anaberan@codesyntax.com>, 2011-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # jazpillaga <jazpillaga@codesyntax.com>, 2011.
 # julen <julenx@gmail.com>, 2011.
+#   <julenx@gmail.com>, 2012.
+#   <totorika93@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+0100\n"
-"PO-Revision-Date: 2012-03-09 09:34+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-05 11:27+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Afrikarrak"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arabiera"
 
-#: conf/global_settings.py:49
-msgid "Azerbaijani"
-msgstr "Azebaianera"
-
 #: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "Azerbaianera"
+
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgariera"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Belarusiera"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalera"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretoia"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosniera"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalana"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Txekiera"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Gales"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Daniera"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Alemaniera"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Greziera"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Ingelesa"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Ingelesa"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperantoa"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Espainola"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Espainola (Argentina)"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Espainola (Mexiko)"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Espainola (Nikaragua)"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venezuelako gaztelera"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estoniera"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Euskara"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persiera"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finlandiera"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Frantzesa"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisiera"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlandako gaelera"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galiziera"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebreera"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroaziarra"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Hungariera"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesiera"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandiera"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiera"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japoniera"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgiera"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazakhera"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khemerera"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kanadiera"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreera"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxenburgera"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lituaniera"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Letoniera"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Mazedoniera"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malabarera"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongoliera"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepalera"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Holandera"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabera"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Poloniera"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugalera"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Portugalera (Brazil)"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Errumaniera"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Errusiera"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Eslovakiera"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Esloveniera"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albaniera"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbiera"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbiera"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Suediera"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahilia"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamilera"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telegu hizkuntza"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thailandiera"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turkiera"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatarera"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainera"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdua"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamamera"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Txinera (sinpletua)"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Txinera (tradizionala)"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Idatzi balio zuzena."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL hau ez dago ondo."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Gehitu baleko email helbide bat"
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "URL zuzen bat idatzi."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "e-mail helbide zuzena idatzi."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
-"Hizki, zenbaki, azpimarra edo marratxoz osatutako baleko 'slug' bat sartu."
+"Idatzi hizki, zenbaki, azpimarra edo marratxoz osatutako baleko 'slug' bat."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Sartu IPv4 helbide zuzena."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Sartu IPv6 helbide zuzena"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Sartu IPv4 edo IPv6 helbide zuzena."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
-msgstr "Komaz bereiztutako digitoak bakarrik idatzi."
+msgstr "Idatzi komaz bereizitako digitoak soilik."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
-"Ziurtatu balioak %(limit_value)s karraktere dituela gutxienez  (orain "
+"Ziurtatu balioak %(limit_value)s gutxienez karaktere dituela  (orain "
 "%(show_value)s dauzka)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
-"Ziurta zaitez balio hau %(limit_value)s baino txikiago edo berdina dela."
+msgstr "Ziurtatu balio hau %(limit_value)s baino txikiagoa edo berdina dela."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
-"Ziurta zaitez balio hau %(limit_value)s baino handiago edo berdina dela."
+msgstr "Ziurtatu balio hau %(limit_value)s baino handiagoa edo berdina dela."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -370,7 +390,7 @@ msgstr ""
 "Ziurtatu gutxienez %(limit_value)d karaktere dauzkala (orain %(show_value)d "
 "dauzka)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -378,85 +398,85 @@ msgid ""
 msgstr ""
 "Ziurtatu gehienez %(limit_value)d dauzkala (orain %(show_value)d dauzka)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(date_field)s eremuan %(lookup)s egiteko %(field_name)s bakarra izan behar "
 "da."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "eta"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "%(field_label)s hori daukan %(model_name)s dagoeneko existitzen da."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
-msgstr "%r balioa ez da balekoa"
+msgstr "%r balioa ez da baliozkoa."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Eremu hau ezin daiteke hutsa izan (null)."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Eremu hau ezin da hutsik egon."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Eremuaren mota: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Zenbaki osoa"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' osoko zenbakia izan behar da."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' balioa True edo False izan behar da."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolearra (egia ala gezurra)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Katea (%(max_length)s gehienez)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Komaz bereiztutako zenbaki osoak"
 
-#: db/models/fields/__init__.py:647
+#: 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' balioak ez dauka data formatu zuzena. Formatu zuzena UUUU-HH-EE da."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' balioak formatu zuzena (UUUU-HH-EE) dauka, baina ez da data zuzen bat."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Data (ordurik gabe)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +485,7 @@ msgstr ""
 "'%s' balioak ez dauka formatu zuzena. Formatu zuzena UUUU-HH-EE .\n"
 "OO:MM[:ss[.uuuuuu]][TZ] da."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,79 +494,79 @@ msgstr ""
 "'%s' balioak formatu zuzena dauka (UUUU-HH-EE OO:MM[:ss[.uuuuuu]][TZ]),\n"
 "baina ez da data/ordu zuzena."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Data (orduarekin)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' balioa hamartarra izan behar da."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Zenbaki hamartarra"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "E-mail helbidea"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Eposta helbidea"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
-msgstr "Fitxegi bidea"
+msgstr "Fitxategiaren bidea"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' balioa koma higikorreko zenbaki bat izan behar da."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Koma higikorreko zenbakia (float)"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
-msgstr "Zenbaki osoa (handia 8 byte)."
+msgstr "Zenbaki osoa (handia 8 byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 helbidea"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP helbidea"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr "'%s' balioa None, True edo False izan behar da."
+msgstr "'%s' balioak None, True edo False izan behar du."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolearra (egia, gezurra edo hutsa[None])"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Osoko positiboa"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Osoko positibo txikia"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (gehienez %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Osoko txikia"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
-msgstr "Textua"
+msgstr "Testua"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -554,7 +574,7 @@ msgstr ""
 "'%s' balioak ez dauka formatu zuzena. OO:MM[:ss[.uuuuuu]] fotmatuan egon "
 "behar da."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -563,100 +583,99 @@ msgstr ""
 "'%s' balioak formatu zuzena dauka (OO:MM[:ss[.uuuuuu]]) baina ez da ordu \n"
 "zuzena"
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Ordua"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fitxategia"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Irudia"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr "%(pk)r pk duen %(model)s modeloa ez da existitzen."
+msgstr "Ez dago %(pk)r pk duen %(model)s modelorik."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
-msgstr "1-N (mota lotutako eremuaren arabera)"
+msgstr "1-N (mota erlazionatutako eremuaren arabera)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Bat-bat erlazioa"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "M:N erlazioa"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
-"Zapaldu \"Control\" karakterea edo \"Command\" Mac batean, bat baino gehiago "
-"aukeratzeko."
+"Bat baino gehiago hautatzeko, sakatu \"Kontrol\" tekla edo \"Command\" Mac "
+"batean."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Eremu hau beharrezkoa da."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
-msgstr "Zenbaki bat idatzi."
+msgstr "Idatzi zenbaki oso bat."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Idatzi zenbaki bat."
 
-#: forms/fields.py:264
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr "Ziurta zaitez %s baino digito gehiago ez dagoela."
-
 #: forms/fields.py:265
 #, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr "Ziurta zaitez %s baino hamartar gehiago ez dagoela."
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Ziurtatu ez daudela %s baino digitu gehiago."
 
 #: forms/fields.py:266
 #, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Ziurtatu ez daudela %s baino hamartar gehiago."
+
+#: forms/fields.py:267
+#, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
-"Ziurta zaitez %s digitu baino gehiago ez dagoela puntu hamartarraren "
-"aurretik."
+"Ziurtatu ez daudela %s digitu baino gehiago puntu hamartarraren aurretik."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
-msgstr "Data zuzen bat idatzi."
+msgstr "Idatzi baliozko data bat."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
-msgstr "Ordu zuzen bat idatzi."
+msgstr "Idatzi baliozko ordu bat."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
-msgstr "Data/Ordu zuzen bat idatzi."
+msgstr "Idatzi baliozko data/ordua."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Ez da fitxategirik bidali. Baiztatu ezazu formularioren kodeketa."
+msgstr "Ez da fitxategirik bidali. Egiaztatu inprimakiaren kodeketa-mota."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Ez da fitxategirik bidali."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Bidalitako fitxategia hutsik dago."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -664,78 +683,81 @@ msgstr ""
 "Ziurtatu fitxategiaren izenak gehienez %(max)d karaktere dituela (%(length)d "
 "dauzka)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr "Mesedez, igo fitxategi bat edo klikatu garbitu botoia, ez biak."
+msgstr "Mesedez, igo fitxategi bat edo egin klik garbitu botoian, ez biak."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
-"Bidali irudi zuzena. Zuk bidalitako fitxategia ez da irudi motako edo akatsa "
+"Bidali baliozko irudia. Zuk bidalitako fitxategia ez da irudia edo akatsa "
 "dauka."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Idatzi baliozko URL bat."
+
+#: 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 "Aukeratu aukera zuzen bat. %(value)s ez da zuzena."
+msgstr "Hautatu baliozko aukera bat. %(value)s ez dago erabilgarri."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
-msgstr "Balio zerrenda bat idatzi ezazu."
+msgstr "Idatzi balio-zerrenda bat."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordena"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
-msgstr "Mesedez zuzendu bikoiztketa %(field)s eremuan."
+msgstr "Zuzendu bikoiztketa %(field)s eremuan."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr "Mesedez zuzendu bikoizketa %(field)s eremuan. Bakarra izan behar da."
+msgstr "Zuzendu bikoizketa %(field)s eremuan. Bakarra izan behar da."
 
-#: forms/models.py:581
+#: 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 ""
-"Mesedez zuzendu bakarra izan behar den%(field_name)s eramuarentzako "
-"bikoiztutako data\n"
-"%(lookup)s egiteko %(date_field)s eremuan"
+"Zuzendu bakarra izan behar den%(field_name)s eremuarentzako bikoiztutako "
+"data %(lookup)s egiteko %(date_field)s eremuan"
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
-msgstr "Mesedez zuzendu hurrengo balio bikoiztuak."
+msgstr "Zuzendu hurrengo balio bikoiztuak."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Barneko gakoa eta gurasoaren gakoa ez datoz bat."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Aukera zuzen bat aukeratu. Aukeratutakoa ez da zuzena."
+msgstr "Hautatu aukera zuzen bat. Hautatutakoa ez da zuzena."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Aukera zuzena aukeratu. %s ez da aukeretako bat."
+msgstr "Hautatu aukera zuzena. %s ez da aukeretako bat."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ez da balekoa gako nagusi gisa."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -744,87 +766,87 @@ msgstr ""
 "%(datetime)s ezin da interpretatu %(current_timezone)s ordu-eremuan;\n"
 "baliteke ez existitzea edo anbiguoa izatea"
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Orain"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Aldatu"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Garbitu"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Bai"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ez"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "bai,ez,agian"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "byte %(size)d "
 msgstr[1] "%(size)d byte"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "gauerdia"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "eguerdia"
 
@@ -1100,122 +1122,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Abendua"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "edo"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "urtea"
 msgstr[1] "urteak"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "hilabetea"
 msgstr[1] "hilabeteak"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "astea"
 msgstr[1] "asteak"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "eguna"
 msgstr[1] "egunak"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ordua"
 msgstr[1] "orduak"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutu"
 msgstr[1] "minutuak"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutuak"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Direktorio zerrendak ez daude baimenduak."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" ez da existitzen"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s zerrenda"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s arazorik gabe sortu da"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s arazorik gabe eguneratu da."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s ezabatu da."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Ez da urterik zehaztu"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Ez da hilabeterik zehaztu"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Ez da egunik zehaztu"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Ez da asterik zehaztu"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Ez dago %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1224,26 +1231,26 @@ msgstr ""
 "Etorkizuneko %(verbose_name_plural)s ez dago aukeran \n"
 "%(class_name)s.alloe_future False delako"
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "%(datestr)s data string okerra '%(format)s' formaturako"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Bilaketarekin bat datorren %(verbose_name)s-rik ez dago"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Orria ez da azkena, hortaz ezin da osokora (int) biurtu."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Orri okerra (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Orri baliogabea (%(page_number)s):%(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Zerrenda hutsa eta '%(class_name)s.allow_empty' False da"
diff --git a/django/conf/locale/eu/formats.py b/django/conf/locale/eu/formats.py
index 5e045b2ae6..5b768eabca 100644
--- a/django/conf/locale/eu/formats.py
+++ b/django/conf/locale/eu/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/fa/LC_MESSAGES/django.mo b/django/conf/locale/fa/LC_MESSAGES/django.mo
index 115ddaef17..240b78fe82 100644
Binary files a/django/conf/locale/fa/LC_MESSAGES/django.mo and b/django/conf/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fa/LC_MESSAGES/django.po b/django/conf/locale/fa/LC_MESSAGES/django.po
index 63f1a1a995..439b85fec2 100644
--- a/django/conf/locale/fa/LC_MESSAGES/django.po
+++ b/django/conf/locale/fa/LC_MESSAGES/django.po
@@ -1,8 +1,9 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Nikneshan <ali@nikneshan.com>, 2011.
-# Alireza Savand <alireza.savand@gmail.com>, 2012.
+# Ali Nikneshan <ali@nikneshan.com>, 2011-2012.
+# Alireza Savand <alireza.savand@gmail.com>, 2012-2013.
+# Arash Fazeli <arash_fazeli77@yahoo.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Saeed  <sd.javadi@gmail.com>, 2011.
 # Sina Cheraghi <sinacher@gmail.com>, 2011.
@@ -10,354 +11,374 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+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-11 08:29+0000\n"
 "Last-Translator: Alireza Savand <alireza.savand@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\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
-msgid "Bulgarian"
-msgstr "پاک کردن"
-
 #: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "بلغاری"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "بلاروس"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "بنگالی"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "برتون"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "بوسنیایی"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "کاتالونیایی"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "چکی"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "ویلزی"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "دانمارکی"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "آلمانی"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "یونانی"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "انگلیسی"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "انگلیسی بریتیش"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "اسپرانتو"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "اسپانیایی"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "اسپانیایی آرژانتینی"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "اسپانیولی مکزیکی"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "نیکاراگوئه اسپانیایی"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "ونزوئلا اسپانیایی"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "استونی"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "باسکی"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "فارسی"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "فنلاندی"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "فرانسوی"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "فریزی"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ایرلندی"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "گالیسیایی"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "عبری"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "هندی"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "کرواتی"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "مجاری"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "اینترلینگوا"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "اندونزیایی"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "ایسلندی"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "ایتالیایی"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "ژاپنی"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "گرجی"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "قزاقستان"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "خمری"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "کناده‌ای"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "کره‌ای"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "لوگزامبورگی"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "لیتوانی"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "لتونیایی"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "مقدونی"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "مالایایی"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "مغولی"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "نروژی Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "نپالی"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "هلندی"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "نروژی Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "پنجابی"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "لهستانی"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "پرتغالی"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "پرتغالیِ برزیل"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "رومانی"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "روسی"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "اسلواکی"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "اسلووِنی"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "آلبانیایی"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "صربی"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "صربی لاتین"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "سوئدی"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "سواحیلی"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "تامیلی"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "تلوگویی"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "تایلندی"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "ترکی"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "تاتار"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "ادمورت"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "اکراینی"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "اردو"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "ویتنامی"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "چینی ساده‌شده"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "چینی سنتی"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "یک مقدار معتبر وارد کنید."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "به نظر می‌رسد این نشانی یک پیوند شکسته است."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "یک ایمیل آدرس معتبر وارد کنید."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "یک نشانی اینترنتی معتبر وارد کنید."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "یک نشانی پست الکترونیکی معتبر وارد کنید."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "یک 'slug' معتبر شامل حروف، ارقام، خط زیر و یا خط تیره وارد کنید."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "یک نشانی IPv4 معتبر وارد کنید."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "یک آدرس معتبر IPv6 وارد کنید."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "IPv4 یا IPv6 آدرس معتبر وارد کنید."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "فقط ارقام جدا شده با کاما وارد کنید."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "مطمئن شوید این مقدار کوچکتر و یا مساوی %(limit_value)s است."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "مطمئن شوید این مقدار بزرگتر و یا مساوی %(limit_value)s است."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +387,7 @@ msgstr ""
 "مطمئن شوید این مقدار حداقل %(limit_value)d نویسه دارد. (الان %(show_value)d "
 "دارد.)"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,282 +396,291 @@ msgstr ""
 "مطمئن شوید این متغیر حداکثر  %(limit_value)d نویسه داشته باشد.(اکنون  "
 "%(show_value)d نویسه دارد)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "و"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 با این %(field_label)s از قبل موجود است."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "مقدار %r معتبر نیست."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "این فیلد نمی تواند پوچ باشد."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "این فیلد نمی تواند خالی باشد."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "فیلد با نوع: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "عدد صحیح"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' باید مقدار عددی باشد."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "مقدار «%s» را باید به صورت True یا False باشد."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "بولی (درست یا غلط)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "رشته (تا %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "اعداد صحیح جدا-شده با ویلگول"
 
-#: db/models/fields/__init__.py:647
+#: 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» را به یک فرمت تاریخ نامعتبر است. این باید در قالب YYYY-MM-DD باشد."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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» را با فرمت صحیح (YYYY-MM-DD) وارد شده است، اما تاریخ نامعتبر است."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "تاریخ (بدون زمان)"
 
-#: db/models/fields/__init__.py:732
+#: 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\" فرمت نامعتبر است. باید در YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] "
+"باشد.."
 
-#: db/models/fields/__init__.py:736
+#: 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'  را با فرمت صحیح (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) اما آن است "
+"که یک تاریخ / زمان نامعتبر است."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "تاریخ (با زمان)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "مقدار '%s' باید عدد دسیمال باشد"
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "عدد دهدهی"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "نشانی پست الکترونیکی"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "مسیر پرونده"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
-msgstr ""
+msgstr "مقدار '%s'  را باید یک شناور است."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "عدد اعشاری"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "بزرگ (8 بایت) عدد صحیح"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 آدرس"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "نشانی IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "مقدار '%s' را باید یا هیچ کدام، درست یا غلط است."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "‌بولی (درست، نادرست یا پوچ)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "عدد صحیح مثبت"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "مثبت عدد صحیح کوچک"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "تیتر (حداکثر %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "عدد صحیح کوچک"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "متن"
 
-#: db/models/fields/__init__.py:1180
+#: 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' فرمت نامعتبر است. این باید در فرمت HH:MM[:ss[.uuuuuu]] باشد."
 
-#: db/models/fields/__init__.py:1182
+#: 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» را با فرمت صحیح (HH:MM[:ss[.uuuuuu]])  وارد شده است، اما از آن "
+"زمان نامعتبر است."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "زمان"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "پرونده"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "تصویر"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "مدل %(model)s با کلید اصلی %(pk)r وجود ندارد."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "کلید خارجی ( نوع بر اساس فیلد رابط مشخص میشود )"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "رابطه یک به یک "
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "رابطه چند به چند"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "برای انتخاب بیش از یکی \"Control\"، یا \"Command\" روی Mac، را پایین نگه "
 "دارید."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "این فیلد لازم است."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "به طور کامل یک عدد وارد کنید."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "یک عدد وارد کنید."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "مطمئن شوید در مجموع بیش از %s رقم نداشته باشد."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "مطمئن شوید بیش از %s رقم اعشاری نداشته باشد."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "مطمئن شوید بیش از %s رقم قبل ممیز نداشته باشد."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "یک تاریخ معتبر وارد کنید."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "یک زمان معتبر وارد کنید."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "یک تاریخ/زمان معتبر وارد کنید."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "پرونده‌ای ارسال نشده است. نوع کدگذاری فرم را بررسی کنید."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "پرونده‌ای ارسال نشده است."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "پروندهٔ ارسال‌شده خالیست."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "مطمئن شوید این مقدار حداکثر %(max)d نویسه دارد. (الان %(length)d دارد.)"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr "لطفا یا فایل ارسال کنید یا دکمه clear را علامت بزنید، نه هردو."
+msgstr "لطفا یا فایل ارسال کنید یا دکمه پاک کردن را علامت بزنید، نه هردو."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -658,34 +688,38 @@ msgstr ""
 "یک تصویر معتبر بارگذاری کنید. پرونده‌ای که بارگذاری کردید یا تصویر نبوده و یا "
 "تصویری مخدوش بوده است."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "یک نشانی اینترنتی معتبر وارد کنید."
+
+#: 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 "یک گزینهٔ معتبر انتخاب کنید. %(value)s از گزینه‌های موجود نیست."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "فهرستی از مقادیر وارد کنید."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "ترتیب:"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "حذف"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "لطفا محتوی تکراری برای %(field)s را اصلاح کنید."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "لطفا محتوی تکراری برای %(field)s را که باید یکتا باشد اصلاح کنید."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -694,115 +728,117 @@ msgstr ""
 "لطفا اطلاعات تکراری  %(field_name)s را اصلاح کنید که باید در  %(lookup)s "
 "یکتا باشد %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "لطفا مقدار تکراری را اصلاح کنید."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "کلید های درون خطی خارجی با هم مطابقت ندارند ."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "یک گزینهٔ معتبر انتخاب کنید. آن گزینه از گزینه‌های موجود نیست."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "یک گزینهٔ معتبر انتخاب کنید. %s از گزینه‌های موجود نیست."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" مقدار معتبری برای کلید اصلی نیست. "
 
-#: forms/util.py:70
+#: 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 نمیتواند در %(current_timezone)s معنی شود.شاید این زمان مبهم "
+"است و یا وجود ندارد."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "در حال حاضر"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "تغییر"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
-msgstr "واضح"
+msgstr "پاک کردن"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "بله"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "خیر"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "بله،خیر،شاید"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d بایت"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "ب.ظ."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "صبح"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "بعد از ظهر"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "صبح"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "نیمه شب"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "ظهر"
 
@@ -1078,116 +1114,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "دسامبر"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "یا"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr "،"
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "سال"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "ماه"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "هفته"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "روز"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ساعت"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "دقیقه"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "دقیقه"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr "، %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "شاخص دایرکتوری اینجا قابل قبول نیست."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" وجود ندارد"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "فهرست %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s با موفقیت ایجاد شد."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s با موفقیت به روز شد."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s حذف شد."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "هیچ سالی مشخص نشده است"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "هیچ ماهی مشخص نشده است"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "هیچ روزی مشخص نشده است"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "هیچ هفته‌ای مشخص نشده است"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "هیچ %(verbose_name_plural)s موجود نیست"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1196,26 +1217,26 @@ msgstr ""
 "آینده %(verbose_name_plural)s امکان پذیر نیست زیرا مقدار %(class_name)s."
 "allow_future برابر False تنظیم شده است."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "متن تاریخ '%(datestr)s' با فرمت  '%(format)s' غلط است."
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "هیچ %(verbose_name)s ای مطابق جستجو پیدا نشد."
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Page مقدار 'last' نیست,همچنین قابل تبدیل به عدد هم نمیباشد."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "صفحه نادرست (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "صفحه‌ی اشتباه (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr " لیست خالی است و '%(class_name)s.allow_empty' برابر False است."
diff --git a/django/conf/locale/fi/LC_MESSAGES/django.mo b/django/conf/locale/fi/LC_MESSAGES/django.mo
index e17a621e29..315005f342 100644
Binary files a/django/conf/locale/fi/LC_MESSAGES/django.mo and b/django/conf/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fi/LC_MESSAGES/django.po b/django/conf/locale/fi/LC_MESSAGES/django.po
index f115720492..856f4ea950 100644
--- a/django/conf/locale/fi/LC_MESSAGES/django.po
+++ b/django/conf/locale/fi/LC_MESSAGES/django.po
@@ -8,356 +8,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+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: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "arabia"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azeri"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "bulgaria"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "katalaani"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "tšekki"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "wales"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "tanska"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "saksa"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "kreikka"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "englanti"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "brittienglanti"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "espanja"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentiinan espanja"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Meksikon espanja"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nicaraguan espanja"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "viro"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "baski"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persia"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "suomi"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ranska"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "friisi"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irlanti"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galicia"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "heprea"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "kroatia"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "unkari"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islanti"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "italia"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "japani"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "georgia"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "korea"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "latvia"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "malajalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongolia"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "norja (kirjanorja)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "hollanti"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "norja (uusnorja)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "punjabin kieli"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "puola"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugali"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "brasilian portugali"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "romania"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "venäjä"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "slovakia"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "slovenia"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albaani"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "serbia"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "serbian latina"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamili"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "thain kieli"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turkki"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ukraina"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Syötä oikea arvo."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Tämä URL-osoite on rikkinäinen linkki."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Syötä oikea URL-osoite."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Syötä kelvollinen sähköpostiosoite."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Tässä voidaan käyttää vain kirjaimia (a-z), numeroita (0-9) sekä ala- ja "
 "tavuviivoja (_ -)."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Syötä kelvollinen IPv4-osoite."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Vain pilkulla erotetut kokonaisluvut kelpaavat tässä."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Tämän arvon on oltava %(limit_value)s (nyt %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Tämän arvon on oltava enintään %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Tämän luvun on oltava vähintään %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,280 +386,280 @@ msgstr ""
 "Tähän tarvitaan vähintään %(limit_value)d merkkiä (nyt on vain "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr "Tähän kelpaa enintään %(limit_value)d merkkiä (nyt on %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "\"%(field_name)s\"-kentän on oltava uniikki suhteessa: %(date_field)s "
 "%(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ja"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 jolla on tämä %(field_label)s, on jo olemassa."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Arvo %r ei kelpaa."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Tämän kentän arvo ei voi olla \"null\"."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Tämä kenttä ei voi olla tyhjä."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Kenttä tyyppiä: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Kokonaisluku"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Totuusarvo: joko tosi (True) tai epätosi (False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Merkkijono (enintään %(max_length)s merkkiä)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Pilkulla erotetut kokonaisluvut"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Päivämäärä (ilman kellonaikaa)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Päivämäärä ja kellonaika"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Desimaaliluku"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Tiedostopolku"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Liukuluku"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Suuri (8-tavuinen) kokonaisluku"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-osoite"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Totuusarvo: joko tosi (True), epätosi (False) tai ei mikään (None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekstiä"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Kellonaika"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL-osoite"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Mallia %(model)s pääavaimella %(pk)r ei ole olemassa."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Vierasavain (tyyppi määräytyy liittyvän kentän mukaan)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Yksi-yhteen relaatio"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Moni-moneen relaatio"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Pidä \"Ctrl\"-näppäin (tai Macin \"Command\") pohjassa valitaksesi useita "
 "vaihtoehtoja."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Tämä kenttä vaaditaan."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Syötä kokonaisluku."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Syötä luku."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Tässä luvussa voi olla yhteensä enintään %s numeroa."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Tässä luvussa saa olla enintään %s desimaalia."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Tässä luvussa saa olla enintään %s numeroa ennen desimaalipilkkua."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Syötä oikea päivämäärä."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Syötä oikea kellonaika."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Syötä oikea pvm/kellonaika."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Tiedostoa ei lähetetty. Tarkista lomakkeen koodaus (encoding)."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Yhtään tiedostoa ei ole lähetetty."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Lähetetty tiedosto on tyhjä."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -647,45 +667,49 @@ msgstr ""
 "Tähän tiedostonimeen kelpaa enintään %(max)d merkkiä (nyt niitä on "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Voit joko lähettää tai poistaa tiedoston, muttei kumpaakin samalla."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 "Kuva ei kelpaa. Lähettämäsi tiedosto ei ole kuva, tai tiedosto on vioittunut."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Syötä oikea URL-osoite."
+
+#: 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 "Valitse oikea vaihtoehto. %(value)s ei ole vaihtoehtojen joukossa."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Syötä lista."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Järjestys"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Poista"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Korjaa kaksoisarvo kentälle %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Ole hyvä ja korjaa uniikin kentän %(field)s kaksoisarvo."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -694,116 +718,116 @@ msgstr ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
 "for the %(lookup)s in %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Korjaa allaolevat kaksoisarvot."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Liittyvä perusavain ei vastannut vanhemman perusavainta."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Valitse oikea vaihtoehto. Valintasi ei löydy vaihtoehtojen joukosta."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Valitse oikea vaihtoehto. %s ei löydy vaihtoehtojen joukosta."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ei kelpaa perusavaimeksi."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Tällä hetkellä"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Muokkaa"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Poista"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Kyllä"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ei"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "kyllä,ei,ehkä"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d tavu"
 msgstr[1] "%(size)d tavua"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "ip"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "ap"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "IP"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AP"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "keskiyö"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "keskipäivä"
 
@@ -1079,122 +1103,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "joulukuuta"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "tai"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "vuosi"
 msgstr[1] "vuotta"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "kuukausi"
 msgstr[1] "kuukautta"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "viikko"
 msgstr[1] "viikkoa"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuuttia"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s luotiin onnistuneesti."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s päivitettiin onnistuneesti."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s on poistettu."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Vuosi puuttuu"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Kuukausi puuttuu"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Päivä puuttuu"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Viikko puuttuu"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s: yhtään kohdetta ei löydy"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1203,26 +1212,26 @@ msgstr ""
 "%(verbose_name_plural)s: tulevia kohteita ei löydy, koska %(class_name)s."
 "allow_future:n arvo on False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Päivämäärä '%(datestr)s' ei ole muotoa '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Hakua vastaavaa %(verbose_name)s -kohdetta ei löytynyt"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Sivunumero ei ole 'last' (viimeinen) eikä näytä luvulta."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Virheellinen sivu (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Lista on tyhjä, ja '%(class_name)s.allow_empty':n arvo on False."
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 82bcb3a560..58f8008ab8 100644
Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 128c56f8ff..c0285f1e70 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -1,7 +1,8 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-#   <claude@2xlibre.net>, 2011, 2012.
+#   <charette.s@gmail.com>, 2012.
+#   <claude@2xlibre.net>, 2011-2012.
 # claudep <claude@2xlibre.net>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Larlet davidbgk <larlet@gmail.com>, 2011.
@@ -9,360 +10,380 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+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: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\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 "Arabe"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azéri"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Biélorusse"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalî"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Breton"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosniaque"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalan"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tchèque"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Gallois"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Dannois"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Allemand"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Grec"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Anglais"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Anglais britannique"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Espéranto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Espagnol argentin"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Espagnol mexicain"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Espagnol nicaraguayen"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Espagnol vénézuélien"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonien"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Basque"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Perse"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finlandais"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Français"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frise"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlandais"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galicien"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Croate"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonésien"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandais"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italien"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japonais"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Géorgien"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazakh"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Coréen"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxembourgeois"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Letton"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayâlam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongole"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norvégien Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Népalais"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norvégien Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Penjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polonais"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Portugais brésilien"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Roumain"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Russe"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanais"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbe"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbe latin"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Suédois"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Télougou"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thaï"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turc"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatar"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Oudmourte"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Ourdou"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Chinois simplifié"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Saisissez une valeur valide."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Cette URL semble être cassée."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Saisissez une adresse de courriel valide."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Saisissez une URL valide."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Entrez une adresse de courriel valide."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et "
 "des traits d'union."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Saisissez une adresse IPv4 valide."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Saisissez une adresse IPv6 valide."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Saisissez une adresse IPv4 ou IPv6 valide."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Saisissez uniquement des chiffres séparés par des virgules."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Assurez-vous que cette valeur est %(limit_value)s (actuellement "
 "%(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Assurez-vous que cette valeur est inférieure ou égale à %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Assurez-vous que cette valeur est supérieure ou égale à %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -371,7 +392,7 @@ msgstr ""
 "Assurez-vous que cette valeur comporte au moins %(limit_value)d caractères "
 "(actuellement %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -380,74 +401,74 @@ msgstr ""
 "Assurez-vous que cette valeur comporte au maximum %(limit_value)d caractères "
 "(actuellement %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(field_name)s doit être unique pour la partie %(lookup)s de %(date_field)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "et"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Un(e) %(model_name)s avec ce %(field_label)s existe déjà."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "La valeur « %r » n'est pas un choix valide."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Ce champ ne peut pas être vide."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Ce champ ne peut pas être vide."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Champ de type : %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Entier"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "La valeur « %s » doit être un nombre entier."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "La valeur « %s » doit être soit True (vrai), soit False (faux)."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Booléen (soit vrai ou faux)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Chaîne de caractère (jusqu'à %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Des entiers séparés par une virgule"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Le format de date de la valeur « %s » n'est pas valide. Le format correct "
 "est AAAA-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -455,11 +476,11 @@ msgstr ""
 "Le format de date de la valeur « %s » est correct (AAAA-MM-DD), mais la date "
 "n'est pas valide."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Date (sans l'heure)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -468,7 +489,7 @@ msgstr ""
 "Le format de la valeur « %s » n'est pas valide. Le format correct est AAAA-"
 "MM-DD HH:MM[:ss[.uuuuuu]][FH]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -477,80 +498,80 @@ msgstr ""
 "Le format de date de la valeur « %s » est correct (AAAA-MM-DD HH:MM[:ss[."
 "uuuuuu]][FH]), mais la date ou l'heure n'est pas valide."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Date (avec l'heure)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "La valeur « %s » doit être un nombre décimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Nombre décimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Adresse électronique"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Chemin vers le fichier"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "La valeur « %s » doit être un nombre à virgule flottante."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Nombre à virgule flottante"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Grand entier (8 octets)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Adresse IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 "La valeur « %s » doit valoir soit None (rien), True (vrai) ou False (faux)."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Booléen (soit vrai, faux ou nul)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Nombre entier positif"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Petit nombre entier positif"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (jusqu'à %(max_length)s car.)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Petit nombre entier"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Texte"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -558,7 +579,7 @@ msgstr ""
 "Le format de la valeur « %s » n'est pas valide. Le format correct est HH:MM[:"
 "ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -567,99 +588,99 @@ msgstr ""
 "Le format de la valeur « %s » est correct (HH:MM[:ss[.uuuuuu]]), mais "
 "l'heure n'est pas valide."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Heure"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fichier"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Image"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Le modèle %(model)s avec la clef primaire %(pk)r n'existe pas."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Clé étrangère (type défini par le champ lié)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relation un à un"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relation plusieurs à plusieurs"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Maintenez appuyé « Ctrl », ou « Commande (touche pomme) » sur un Mac, pour "
 "en sélectionner plusieurs."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Ce champ est obligatoire."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Saisissez un nombre entier."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Saisissez un nombre."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres au total."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres après la virgule."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres avant la virgule."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Saisissez une date valide."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Saisissez une heure valide."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Saisissez une date et une heure valides."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Aucun fichier n'a été soumis. Vérifiez le type d'encodage du formulaire."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Aucun fichier n'a été soumis."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Le fichier soumis est vide."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -667,11 +688,11 @@ msgstr ""
 "Assurez-vous que ce nom de fichier ne contient pas plus de %(max)d "
 "caractères (actuellement %(length)d caractères)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Envoyez un fichier ou cochez la case d'effacement, mais pas les deux."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -679,36 +700,40 @@ msgstr ""
 "Téléversez une image valide. Le fichier que vous avez transféré n'est pas "
 "une image ou bien est corrompu."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Saisissez une URL valide."
+
+#: 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 "Sélectionnez un choix valide. %(value)s n'en fait pas partie."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Saisissez une liste de valeurs."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordre"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Supprimer"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Corrigez les données à double dans %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Corrigez les données à double dans %(field)s qui doit contenir des valeurs "
 "uniques."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -717,33 +742,33 @@ msgstr ""
 "Corrigez les données à double dans %(field_name)s qui doit contenir des "
 "valeurs uniques pour la partie %(lookup)s de %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Corrigez les valeurs à double ci-dessous."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "La clé étrangère en ligne ne correspond pas à la clé primaire de l'instance "
 "parente."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Sélectionnez un choix valide. Ce choix ne fait pas partie de ceux "
 "disponibles."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Sélectionnez un choix valide ; %s n'en fait pas partie."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "« %s » n'est pas une valeur correcte pour une clé primaire."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -752,87 +777,87 @@ msgstr ""
 "La valeur %(datetime)s n'a pas pu être interprétée dans le fuseau horaire "
 "%(current_timezone)s ; elle est peut-être ambigüe ou elle n'existe pas."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Actuellement"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modifier"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Effacer"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Oui"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Non"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "oui, non, peut-être"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d octet"
 msgstr[1] "%(size)d octets"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
-msgstr "%s KB"
+msgstr "%s Kio"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
-msgstr "%s MB"
-
-#: template/defaultfilters.py:836
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#: template/defaultfilters.py:838
-#, python-format
-msgid "%s TB"
-msgstr "%s TB"
+msgstr "%s Mio"
 
 #: template/defaultfilters.py:839
 #, python-format
-msgid "%s PB"
-msgstr "%s PB"
+msgid "%s GB"
+msgstr "%s Gio"
 
-#: utils/dateformat.py:45
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr "%s Tio"
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr "%s Pio"
+
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "après-midi"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "matin"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "Après-midi"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "Matin"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "minuit"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "midi"
 
@@ -1108,122 +1133,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Décembre"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s…"
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ou"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "an"
 msgstr[1] "ans"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mois"
 msgstr[1] "mois"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semaine"
 msgstr[1] "semaines"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "jour"
 msgstr[1] "jours"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutes"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Il n'est pas autorisé d'afficher le contenu de ce répertoire."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "« %(path)s » n'existe pas"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Index de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "L'objet %(verbose_name)s a été créé avec succès."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "L'objet %(verbose_name)s a été mis à jour avec succès."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "L'objet %(verbose_name)s a été supprimé."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Aucune année indiquée"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Aucun mois indiqué"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Aucun jour indiqué"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Aucune semaine indiquée"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Pas de %(verbose_name_plural)s disponible"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1232,30 +1242,30 @@ msgstr ""
 "Pas de %(verbose_name_plural)s disponible dans le futur car %(class_name)s."
 "allow_future est faux (False)."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "Le format « %(format)s » appliqué à la chaîne date « %(datestr)s » n'est pas "
 "valide"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Aucun objet %(verbose_name)s trouvé en réponse à la requête"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Page ne vaut pas « last » et ne peut pas non plus être converti en un nombre "
 "entier."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Page non valide (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Page non valide (%(page_number)s) : %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Liste vide et %(class_name)s.allow_empty est faux (False)."
diff --git a/django/conf/locale/fr/formats.py b/django/conf/locale/fr/formats.py
index 1ef7ecb242..f6c8f40648 100644
--- a/django/conf/locale/fr/formats.py
+++ b/django/conf/locale/fr/formats.py
@@ -23,9 +23,11 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',    # '25/10/2006 14:30:59'
+    '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200'
     '%d/%m/%Y %H:%M',       # '25/10/2006 14:30'
     '%d/%m/%Y',             # '25/10/2006'
     '%d.%m.%Y %H:%M:%S',    # Swiss (fr_CH), '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # Swiss (fr_CH), '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # Swiss (fr_CH), '25.10.2006 14:30'
     '%d.%m.%Y',             # Swiss (fr_CH), '25.10.2006'
 )
diff --git a/django/conf/locale/fy_NL/LC_MESSAGES/django.mo b/django/conf/locale/fy_NL/LC_MESSAGES/django.mo
index 132c1d48bf..169739a8da 100644
Binary files a/django/conf/locale/fy_NL/LC_MESSAGES/django.mo and b/django/conf/locale/fy_NL/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fy_NL/LC_MESSAGES/django.po b/django/conf/locale/fy_NL/LC_MESSAGES/django.po
index d9a1aee0af..51da022bb8 100644
--- a/django/conf/locale/fy_NL/LC_MESSAGES/django.po
+++ b/django/conf/locale/fy_NL/LC_MESSAGES/django.po
@@ -6,645 +6,665 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+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: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: fy_NL\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: fy_NL\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
-msgid "Arabic"
+msgid "Afrikaans"
 msgstr ""
 
 #: conf/global_settings.py:49
-msgid "Azerbaijani"
+msgid "Arabic"
 msgstr ""
 
 #: conf/global_settings.py:50
-msgid "Bulgarian"
+msgid "Azerbaijani"
 msgstr ""
 
 #: conf/global_settings.py:51
-msgid "Bengali"
+msgid "Bulgarian"
 msgstr ""
 
 #: conf/global_settings.py:52
-msgid "Bosnian"
+msgid "Belarusian"
 msgstr ""
 
 #: conf/global_settings.py:53
-msgid "Catalan"
+msgid "Bengali"
 msgstr ""
 
 #: conf/global_settings.py:54
-msgid "Czech"
+msgid "Breton"
 msgstr ""
 
 #: conf/global_settings.py:55
-msgid "Welsh"
+msgid "Bosnian"
 msgstr ""
 
 #: conf/global_settings.py:56
-msgid "Danish"
+msgid "Catalan"
 msgstr ""
 
 #: conf/global_settings.py:57
-msgid "German"
+msgid "Czech"
 msgstr ""
 
 #: conf/global_settings.py:58
-msgid "Greek"
+msgid "Welsh"
 msgstr ""
 
 #: conf/global_settings.py:59
-msgid "English"
+msgid "Danish"
 msgstr ""
 
 #: conf/global_settings.py:60
-msgid "British English"
+msgid "German"
 msgstr ""
 
 #: conf/global_settings.py:61
-msgid "Esperanto"
+msgid "Greek"
 msgstr ""
 
 #: conf/global_settings.py:62
-msgid "Spanish"
+msgid "English"
 msgstr ""
 
 #: conf/global_settings.py:63
-msgid "Argentinian Spanish"
+msgid "British English"
 msgstr ""
 
 #: conf/global_settings.py:64
-msgid "Mexican Spanish"
+msgid "Esperanto"
 msgstr ""
 
 #: conf/global_settings.py:65
-msgid "Nicaraguan Spanish"
+msgid "Spanish"
 msgstr ""
 
 #: conf/global_settings.py:66
-msgid "Estonian"
+msgid "Argentinian Spanish"
 msgstr ""
 
 #: conf/global_settings.py:67
-msgid "Basque"
+msgid "Mexican Spanish"
 msgstr ""
 
 #: conf/global_settings.py:68
-msgid "Persian"
+msgid "Nicaraguan Spanish"
 msgstr ""
 
 #: conf/global_settings.py:69
-msgid "Finnish"
+msgid "Venezuelan Spanish"
 msgstr ""
 
 #: conf/global_settings.py:70
-msgid "French"
+msgid "Estonian"
 msgstr ""
 
 #: conf/global_settings.py:71
-msgid "Frisian"
+msgid "Basque"
 msgstr ""
 
 #: conf/global_settings.py:72
-msgid "Irish"
+msgid "Persian"
 msgstr ""
 
 #: conf/global_settings.py:73
-msgid "Galician"
+msgid "Finnish"
 msgstr ""
 
 #: conf/global_settings.py:74
-msgid "Hebrew"
+msgid "French"
 msgstr ""
 
 #: conf/global_settings.py:75
-msgid "Hindi"
+msgid "Frisian"
 msgstr ""
 
 #: conf/global_settings.py:76
-msgid "Croatian"
+msgid "Irish"
 msgstr ""
 
 #: conf/global_settings.py:77
-msgid "Hungarian"
+msgid "Galician"
 msgstr ""
 
 #: conf/global_settings.py:78
-msgid "Indonesian"
+msgid "Hebrew"
 msgstr ""
 
 #: conf/global_settings.py:79
-msgid "Icelandic"
+msgid "Hindi"
 msgstr ""
 
 #: conf/global_settings.py:80
-msgid "Italian"
+msgid "Croatian"
 msgstr ""
 
 #: conf/global_settings.py:81
-msgid "Japanese"
+msgid "Hungarian"
 msgstr ""
 
 #: conf/global_settings.py:82
-msgid "Georgian"
+msgid "Interlingua"
 msgstr ""
 
 #: conf/global_settings.py:83
-msgid "Kazakh"
+msgid "Indonesian"
 msgstr ""
 
 #: conf/global_settings.py:84
-msgid "Khmer"
+msgid "Icelandic"
 msgstr ""
 
 #: conf/global_settings.py:85
-msgid "Kannada"
+msgid "Italian"
 msgstr ""
 
 #: conf/global_settings.py:86
-msgid "Korean"
+msgid "Japanese"
 msgstr ""
 
 #: conf/global_settings.py:87
-msgid "Lithuanian"
+msgid "Georgian"
 msgstr ""
 
 #: conf/global_settings.py:88
-msgid "Latvian"
+msgid "Kazakh"
 msgstr ""
 
 #: conf/global_settings.py:89
-msgid "Macedonian"
+msgid "Khmer"
 msgstr ""
 
 #: conf/global_settings.py:90
-msgid "Malayalam"
+msgid "Kannada"
 msgstr ""
 
 #: conf/global_settings.py:91
-msgid "Mongolian"
+msgid "Korean"
 msgstr ""
 
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
+msgid "Lithuanian"
 msgstr ""
 
 #: conf/global_settings.py:94
-msgid "Dutch"
+msgid "Latvian"
 msgstr ""
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
+msgid "Macedonian"
 msgstr ""
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
+msgid "Malayalam"
 msgstr ""
 
 #: conf/global_settings.py:97
-msgid "Polish"
+msgid "Mongolian"
 msgstr ""
 
 #: conf/global_settings.py:98
-msgid "Portuguese"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: conf/global_settings.py:99
-msgid "Brazilian Portuguese"
+msgid "Nepali"
 msgstr ""
 
 #: conf/global_settings.py:100
-msgid "Romanian"
+msgid "Dutch"
 msgstr ""
 
 #: conf/global_settings.py:101
-msgid "Russian"
+msgid "Norwegian Nynorsk"
 msgstr ""
 
 #: conf/global_settings.py:102
-msgid "Slovak"
+msgid "Punjabi"
 msgstr ""
 
 #: conf/global_settings.py:103
-msgid "Slovenian"
+msgid "Polish"
 msgstr ""
 
 #: conf/global_settings.py:104
-msgid "Albanian"
+msgid "Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:105
-msgid "Serbian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:106
-msgid "Serbian Latin"
+msgid "Romanian"
 msgstr ""
 
 #: conf/global_settings.py:107
-msgid "Swedish"
+msgid "Russian"
 msgstr ""
 
 #: conf/global_settings.py:108
-msgid "Swahili"
+msgid "Slovak"
 msgstr ""
 
 #: conf/global_settings.py:109
-msgid "Tamil"
+msgid "Slovenian"
 msgstr ""
 
 #: conf/global_settings.py:110
-msgid "Telugu"
+msgid "Albanian"
 msgstr ""
 
 #: conf/global_settings.py:111
-msgid "Thai"
+msgid "Serbian"
 msgstr ""
 
 #: conf/global_settings.py:112
-msgid "Turkish"
+msgid "Serbian Latin"
 msgstr ""
 
 #: conf/global_settings.py:113
-msgid "Tatar"
+msgid "Swedish"
 msgstr ""
 
 #: conf/global_settings.py:114
-msgid "Ukrainian"
+msgid "Swahili"
 msgstr ""
 
 #: conf/global_settings.py:115
-msgid "Urdu"
+msgid "Tamil"
 msgstr ""
 
 #: conf/global_settings.py:116
-msgid "Vietnamese"
+msgid "Telugu"
 msgstr ""
 
 #: conf/global_settings.py:117
-msgid "Simplified Chinese"
+msgid "Thai"
 msgstr ""
 
 #: conf/global_settings.py:118
+msgid "Turkish"
+msgstr ""
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr ""
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr ""
+
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr ""
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Jou in falide wearde."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Dit URL liket in ferbrutsen keppeling."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Jou in falide URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Jou in falida 'slug' gearsteld mei letters, nûmers, ûnderstreekjes of "
 "koppelteken."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Jou in falide IPv4-adres."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Jou allinnich sifers, skieden troch komma's."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr ""
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 mei dit %(field_label)s bestiet al."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Dit fjild kin net leech wêze."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr ""
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr ""
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr ""
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr ""
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr ""
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr ""
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr ""
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Hâld \"Control\", of \"Command\" op in Mac del, om mear as ien te "
 "selektearjen."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Dit fjild is fereaske."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Jou in folslein nûmer."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Jou in nûmer."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Wês wis dat der yn totaal net mear as %s sifers binne."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Wês wis dat der net mear as %s desimale plakken binne."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Wês wis dat der net mear as %s sifers foar it desimale punt."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Jou in falide datum."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Jou in falide tiid."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Jou in falide datum.tiid."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Der is gjin bestân yntsjinne. Kontrolearje it kodearringstype op it "
 "formulier."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Der is gjin bestân yntsjinne."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "It yntsjinne bestân is leech."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -652,152 +672,156 @@ msgstr ""
 "Laad in falide ôfbylding op. It bestân dy't jo opladen hawwe wie net in "
 "ôfbylding of in skansearre ôfbylding."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Jou in falide URL."
+
+#: 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 ""
 "Selektearje in falide kar. %(value)s is net ien fan de beskikbere karren."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Jou in list mei weardes."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Oarder"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr ""
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:581
+#: 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 ""
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Selektearje in falide kar. Dizze kar is net ien fan de beskikbere karren."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Selektearje in falide kar. %s is net ien fan de beskikbere karren."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr ""
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr ""
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr ""
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr ""
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr ""
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr ""
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr ""
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr ""
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr ""
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr ""
 
@@ -1073,148 +1097,133 @@ msgctxt "alt. month"
 msgid "December"
 msgstr ""
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr ""
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr ""
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ""
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "De %(verbose_name)s is súksesfol oanmakke."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "De %(verbose_name)s is súksesfol fernijd."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "De %(verbose_name)s is fuortsmiten."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/fy_NL/formats.py b/django/conf/locale/fy_NL/formats.py
index bf26f4b31c..4355928ca0 100644
--- a/django/conf/locale/fy_NL/formats.py
+++ b/django/conf/locale/fy_NL/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/ga/LC_MESSAGES/django.mo b/django/conf/locale/ga/LC_MESSAGES/django.mo
index e9142ae973..dcdb00f277 100644
Binary files a/django/conf/locale/ga/LC_MESSAGES/django.mo and b/django/conf/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ga/LC_MESSAGES/django.po b/django/conf/locale/ga/LC_MESSAGES/django.po
index 18f054d3ad..9923569bd2 100644
--- a/django/conf/locale/ga/LC_MESSAGES/django.po
+++ b/django/conf/locale/ga/LC_MESSAGES/django.po
@@ -9,360 +9,380 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+0100\n"
-"PO-Revision-Date: 2012-03-16 12:04+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Araibis"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Asarbaiseáinis"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgáiris"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Beangáilis"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Boisnis"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalóinis"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Seicis"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Breatnais"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danmhairgis "
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Gearmáinis"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Gréigis"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Béarla"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Béarla na Breataine"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spáinnis"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Spáinnis na hAirgintíne"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Spáinnis Mheicsiceo "
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Spáinnis Nicearagua"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Eastóinis"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Bascais"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Peirsis"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Fionlainnis"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Fraincis"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Freaslainnis"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Gaeilge"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Gailísis"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Eabhrais"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hiondúis"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Cróitis"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Ungáiris"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indinéisis"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Íoslainnis"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Iodáilis"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Seapáinis"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Seoirsis"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Ciméiris"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Cannadais"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Cóiréis"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Liotuáinis"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Laitvis"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macadóinis"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Mailéalaimis"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongóilis"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Ioruais Bokmål"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Ollainnis"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Ioruais Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Puinseáibis"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polainnis"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portaingéilis"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Portaingéilis na Brasaíle"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rómáinis"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rúisis"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slóvaicis"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slóivéinis"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albáinis"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Seirbis"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Seirbis (Laidineach)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Sualainnis"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamailis"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Teileagúis"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Téalainnis"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Tuircis"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Úcráinis"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdais"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vítneamais"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Sínis Simplithe"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Sínis Traidisiúnta"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Iontráil luach bailí"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Dealraíonn sé gur nasc briste é an URL seo."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Iontráil URL bailí."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Iontráil seoladh ríomhphoist bailí."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Iontráil 'slug' bailí a chuimsíonn litreacha, uimhreacha, fostríoca nó "
 "fleiscíní."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Iontráil seoladh IPv4 bailí."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Cuir seoladh bailí IPv6 isteach."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Cuir seoladh bailí IPv4 nó IPv6 isteach."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Ná hiontráil ach digití atá deighilte le camóga."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Cinntigh go bhfuil an luach seo %(limit_value)s (tá sé %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Cinntigh go bhfuil an luach seo níos lú ná nó cothrom le %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Cinntigh go bhfuil an luach seo níos mó ná nó cothrom le %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -371,7 +391,7 @@ msgstr ""
 "Cinntigh nach bhfuil níos lú ná %(limit_value)d carachtar ag an luach seo "
 "(tá %(show_value)d aige)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -380,84 +400,84 @@ msgstr ""
 "Cinntigh nach bhfuil níos mó ná %(limit_value)d carachtar ag an luach seo "
 "(tá %(show_value)d aige)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "Ní mór a bheith %(field_name)s uathúil ar %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "agus"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Tá %(model_name)s leis an %(field_label)s seo ann cheana."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Ní rogha bailí é an luach %r."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Ní cheadaítear luach nialasach sa réimse seo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Ní cheadaítear luach nialasach sa réimse seo."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Réimse de Cineál: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Slánuimhir"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Ní mór don luach '%s' a bheith ina shlánuimhir."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Ní mór don luach '%s' a bheith Fíor nó Bréagach."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boole"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Teaghrán (suas go %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Slánuimhireacha camóg-scartha"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Tá an luach '%s' i bhformáid dáta neamhbhailí. Caithfidh sé a bheith i "
 "bhformáid YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 "Tá an formáid ceart (YYYY-MM-DD) ag an luach '%s' ach tá an dáta neamhbhailí"
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dáta (gan am)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -466,7 +486,7 @@ msgstr ""
 "Tá an luach '%s' i bhformáid neamhbhailí. Caithfidh sé a bheith i bhformáid "
 "YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -475,79 +495,79 @@ msgstr ""
 "Tá an formáid ceart (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) ag an luach '%s' "
 "ach tá an dáta/am neamhbhailí"
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dáta (le am)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Ní mór don luach '%s' a bheith ina uimhir dheachúlach."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Uimhir deachúlach"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Seoladh ríomhphoist"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "R-phost"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Conair comhaid"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Ní mór don luach '%s' a bheith ina uimhir snámhpointe."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Snámhphointe"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Mór (8 byte) slánuimhi"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Seoladh IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Seoladh IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Ní mór don luach '%s' a bheith Faic, Fíor nó Bréagach."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boole (Fíor, Bréagach nó Dada)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Slánuimhir dearfach"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Slánuimhir beag dearfach"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (suas go %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Slánuimhir beag"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Téacs"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -555,7 +575,7 @@ msgstr ""
 "Tá an luach '%s' i bhformáid neamhbhailí. Caithfidh sé a bheith i bhformáid "
 "HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -564,98 +584,98 @@ msgstr ""
 "Tá an formáid ceart (HH:MM[:ss[.uuuuuu]]) ag an luach '%s' ach tá an am "
 "neamhbhailí"
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Am"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Comhaid"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Íomhá"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Níl %(model)s le eochair %(pk)r ann."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Eochair Eachtracha (cineál a chinnfear de réir réimse a bhaineann)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Duine-le-duine caidreamh"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Go leor le go leor caidreamh"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Ar ríomhaire Mac, coinnigh an eochair \"Control\" nó \"Command\" síos chun "
 "níos mó ná rud amháin a roghnú."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Tá an réimse seo riachtanach."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Iontráil slánuimhir."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Iontráil uimhir."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Bí cinnte nach bhfuil níos mó ná %s digit ann."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Bí cinnte nach bhfuil níos mó ná %s ionad deachúlach ann."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Bí cinnte nach bhfuil níos mó ná %s digit roimh an bpointe deachúlach."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Iontráil dáta bailí."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Iontráil am bailí."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Iontráil dáta/am bailí."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Níor seoladh comhad. Deimhnigh cineál an ionchódaithe ar an bhfoirm."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Níor seoladh aon chomhad."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Tá an comhad a seoladh folamh."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -663,13 +683,13 @@ msgstr ""
 "Cinntiú go bhfuil níos lú ná %(max)d carachtair (tá sé %(length)d) ag ainm "
 "an chomhaid seo."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Cuir ceachtar isteach comhad nó an ticbhosca soiléir, ní féidir an dá "
 "sheiceáil."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -677,36 +697,40 @@ msgstr ""
 "Uasluchtaigh íomhá bhailí. Níorbh íomhá é an comhad a d'uasluchtaigh tú, nó "
 "b'íomhá thruaillithe é."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Iontráil URL bailí."
+
+#: 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 "Déan rogha bhailí. Ní ceann de na roghanna é %(value)s."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Cuir liosta de luachanna isteach."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ord"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Scrios"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Le do thoil ceartaigh an sonra dúbail le %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Ceart le do thoil na sonraí a dhúbailt le haghaidh %(field)s, chaithfidh a "
 "bheith uathúil."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -715,31 +739,31 @@ msgstr ""
 "Ceart le do thoil na sonraí a dhúbailt le haghaidh %(field_name)s ní mór a "
 "bheith uaithúil le haghaidh an %(lookup)s i %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Le do thoil ceartaigh na luachanna dúbail thíos."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Ní raibh an eochair eachtrach comhoiriúnach leis an tuismitheoir ásc príomh-"
 "eochair."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Déan rogha bhailí. Ní ceann de na roghanna é do roghasa."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Déan rogha bhailí. Ní ceann de na roghanna é %s."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "Níl \"%s\" luach bailí le príomh-eochair."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -748,35 +772,35 @@ msgstr ""
 "Ní féidir an %(datetime)s a léirmhíniú i gcrios ama %(current_timezone)s; "
 "B'fhéidir go bhfuil sé débhríoch nó nach bhfuil sé ann."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Faoi láthair"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Athraigh"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Glan"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Tá"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Níl"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "tá, níl, b'fhéidir"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -786,52 +810,52 @@ msgstr[2] "%(size)d bheart"
 msgstr[3] "%(size)d mbeart"
 msgstr[4] "%(size)d beart"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "i.n."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "r.n."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "IN"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "RN"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "meán oíche"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "nóin"
 
@@ -1107,22 +1131,22 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Mí na Nollag"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "nó"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "bliain"
@@ -1131,7 +1155,7 @@ msgstr[2] "bliana"
 msgstr[3] "mbliana"
 msgstr[4] "bliana"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mhí"
@@ -1140,7 +1164,7 @@ msgstr[2] "mhí"
 msgstr[3] "mí"
 msgstr[4] "mí"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "seachtain"
@@ -1149,7 +1173,7 @@ msgstr[2] "sheachtain"
 msgstr[3] "seachtain"
 msgstr[4] "seachtain"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "lá"
@@ -1158,7 +1182,7 @@ msgstr[2] "lá"
 msgstr[3] "lá"
 msgstr[4] "lá"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uair"
@@ -1167,7 +1191,7 @@ msgstr[2] "uair"
 msgstr[3] "n-uair"
 msgstr[4] "uair"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "nóiméad"
@@ -1176,71 +1200,56 @@ msgstr[2] "nóiméad"
 msgstr[3] "nóiméad"
 msgstr[4] "nóiméad"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "nóiméad"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Níl innéacsanna chomhadlann cheadaítear anseo."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "Níl %(path)s ann."
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Innéacs de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "D'éirigh le cruthú %(verbose_name)s."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "D'éirigh le nuashonrú %(verbose_name)s."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Scriosadh %(verbose_name)s."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Bliain gan sonrú"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Mí gan sonrú"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Lá gan sonrú"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Seachtain gan sonrú"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Gan %(verbose_name_plural)s ar fáil"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1249,28 +1258,28 @@ msgstr ""
 "Níl %(verbose_name_plural)s sa todhchaí ar fáil mar tá  %(class_name)s."
 "allow_future Bréagach."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "Teaghrán dáta neamhbhailí '%(datestr)s' nuair formáid '%(format)s' á húsáid"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Níl bhfuarthas %(verbose_name)s le hadhaigh an iarratas"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Ní 'deireanach' é an leathanach, agus ní féidir é a thiontú go slánuimhir."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Leathanach neamhbhailí (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Liosta folamh agus tá '%(class_name)s .allow_empty' Bréagach."
diff --git a/django/conf/locale/ga/formats.py b/django/conf/locale/ga/formats.py
index 50c68a9c11..ce271ab533 100644
--- a/django/conf/locale/ga/formats.py
+++ b/django/conf/locale/ga/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index 051dba0ab5..a53e20f9ab 100644
Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index b26836c959..aa43a3e1a6 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -3,363 +3,385 @@
 # Translators:
 # fasouto <fsoutomoure@gmail.com>, 2011.
 # fonso <fonzzo@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 #   <fsoutomoure@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Oscar Carballal <oscar.carballal@cidadania.coop>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: fasouto <fsoutomoure@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-07 11:24+0000\n"
+"Last-Translator: fonso <fonzzo@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "africáner"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "árabe"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "azerí"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "búlgaro"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "bielorruso"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengalí"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "bretón"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosníaco"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "catalán"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "checo"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "galés"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "dinamarqués"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "alemán"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "grego"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "inglés"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "inglés británico"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "español"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "español da Arxentina"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "español de México"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Español de Nicaragua"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "español de Venezuela"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estoniano"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "vasco"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persa"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "finés"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francés"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frisón"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irlandés"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galego"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "hebreo"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "croata"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "húngaro"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonesio"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandés"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "italiano"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "xaponés"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "xeorxiano"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "casaco"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "camboxano"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "canará"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "coreano"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "luxemburgués"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "lituano"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "letón"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "macedonio"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "mala"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongol"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "malaiala"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "nepalés"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "holandés"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "noruegués (nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "panxabiano"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "polaco"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugués"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "portugués do Brasil"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "romanés"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "ruso"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "eslovaco"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "esloveno"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albanés"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "serbio"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "serbio (alfabeto latino)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "sueco"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "suahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "támil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "tai"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turco"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "tártaro"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "udmurt"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ucraíno"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vietnamita"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "chinés simplificado"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "chinés tradicional"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Insira un valor válido."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Semella que este URL é unha ligazón rota."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Insira un URL válido."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Insira un enderezo de correo electrónico válido."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Insira un 'slug' valido composto por letras, números, guións baixos ou "
 "medios."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Insira unha dirección IPv4 válida."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Insira unha dirección IPv6 válida"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Insira unha dirección IPv4 ou IPv6 válida"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Insira só díxitos separados por comas."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Asegúrese de que este valor é %(limit_value)s (agora é %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Asegure que este valor é menor ou igual a %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Asegure que este valor é maior ou igual a %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -368,7 +390,7 @@ msgstr ""
 "Asegúrese que este valor é de polo menos %(limit_value)d caracteres (agora "
 "ten %(show_value)d). "
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -377,276 +399,287 @@ msgstr ""
 "Asegúrese de que este valor ten como máximo %(limit_value)d caracteres "
 "(agora ten %(show_value)d))."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "O campo %(field_name)s debe ser único para a busca %(lookup)s en "
 "%(date_field)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "e"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
 "Xa existe un modelo %(model_name)s coa etiqueta de campo %(field_label)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "O valor %r non é unha opción válida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Este campo non pode ser nulo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Este campo non pode estar baleiro."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo do tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Número enteiro"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' debe ser un número enteiro."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' debe ser verdadeiro ou falso."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Valor booleano (verdadeiro ou falso)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Cadea (máximo %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Números enteiros separados por comas"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
+"O valor de '%s' ten un formato inválido de data. Debe estar no formato YYYY-"
+"MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
+"O valor '%s' ten o formato correcto (AAAA-MM-DD) pero non é unha data válida."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Data (sen a hora)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
+"O valor '%s' non ten un formato válido. Debe de ter o formato AAAA-MM-DD HH:"
+"MM[:ss[.uuuuuu]][TZ] "
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
+"O valor '%s' ten o formato correcto (AAAA-MM-DD HH:MM[:ss[.uuuuuu]][TZ] ) "
+"pero non é unha data/hora válida."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Data (coa hora)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' debe ser un número en formato decimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Número decimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Enderezo de correo electrónico"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Enderezo electrónico"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Ruta do ficheiro"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' debe ser un número en coma flotante."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Número en coma flotante"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Enteiro grande (8 bytes)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Enderezo IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "O valor '%s' debe ser None, True ou False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (verdadeiro, falso ou ningún)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Enteiro positivo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "Enteiro pequeno positivo"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (ata %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "Enteiro pequeno"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Texto"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
+"O valor '%s' non ten un formato válido. Debe ter o formato HH:MM[:ss[."
+"uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
+"O valor '%s' ten o formato correcto (HH:MM[:ss[.uuuuuu]]) pero non é unha "
+"hora válida."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Hora"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Arquivo"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Imaxe"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Non existe modelo %(model)s coa clave primaria %(pk)r."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Clave Estranxeira (tipo determinado por un campo relacionado)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relación un a un"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relación moitos a moitos"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Para seleccionar máis dunha entrada, manteña premida a tecla \"Control\", "
 "ou \"Comando\" nun Mac."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Requírese este campo."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Insira un número enteiro."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Insira un número."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Asegñurese de que non hai máis de %s díxitos en total."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Asegúrese de que non hai máis de %s lugares decimais."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Asegúrese de que no hai máis de %s díxitos antes do punto ou coma decimal."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Insira unha data válida."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Insira unha hora válida."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Insira unha data/hora válida."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Non se enviou ficheiro ningún. Comprobe o tipo de codificación do formulario."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Non se enviou ficheiro ningún."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "O ficheiro enviado está baleiro."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -654,13 +687,13 @@ msgstr ""
 "Asegúrese de que o nome de ficheiro ten como máximo %(max)d caracteres "
 "(agora ten %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Ou ben envíe un ficheiro, ou ben marque a casilla de eliminar, pero non "
 "ambas as dúas cousas."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -668,36 +701,40 @@ msgstr ""
 "Suba unha imaxe válida. O ficheiro subido non era unha imaxe ou esta estaba "
 "corrupta."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Insira un URL válido."
+
+#: 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 ""
 "Escolla unha opción válida. %(value)s non se atopa entre as opción "
 "dispoñibles."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Insira unha lista de valores."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Orde"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Eliminar"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Corrixa os datos duplicados no campo %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Corrixa os datos duplicados no campo %(field)s, que debe ser único."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -706,120 +743,122 @@ msgstr ""
 "Corrixa os datos duplicados no campo %(field_name)s, que debe ser único para "
 "a busca %(lookup)s no campo %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Corrixa os valores duplicados embaixo."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "A clave estranxeira en liña non coincide coa clave primaria da instancia nai."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Escolla unha opción válida. Esta opción non se atopa entre as opcións "
 "dispoñíbeis"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Escolla unha opción válida. %s non se atopa entre as opcións dispoñíbeis."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" non é un valor válido para unha clave primaria."
 
-#: forms/util.py:70
+#: 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 non se puido interpretar na zona hora horaria "
+"%(current_timezone)s; pode ser ambiguo ou non existir."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Actualmente"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modificar"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Limpar"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Si"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Non"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "si,non,quizais"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "medianoite"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "mediodía"
 
@@ -1095,122 +1134,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "decembro"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ou"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ano"
 msgstr[1] "anos"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "meses"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semana"
 msgstr[1] "semanas"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutos"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Os índices de directorio non están permitidos aquí."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" non existe"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índice de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Creouse correctamente o/a %(verbose_name)s ."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Actualizouse correctamente o/a %(verbose_name)s."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Eliminouse o/a %(verbose_name)s"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Non se especificou un ano"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Non se especificou un mes"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Non se especificou un día"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Non se especificou unha semana"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Non hai %(verbose_name_plural)s dispoñibles"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1219,26 +1243,26 @@ msgstr ""
 "Non hai dispoñibles %(verbose_name_plural)s futuros/as porque %(class_name)s."
 "allow_futuro é False"
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "A cadea de data '%(datestr)s' non é válida para o formato '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Non se atopou ningún/ha %(verbose_name)s que coincidise coa consulta"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "A páxina non é 'last' nin se pode converter a int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Páxina non válida (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Páxina non válida (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "A lista está baleira pero '%(class_name)s.allow_empty' é False."
diff --git a/django/conf/locale/he/LC_MESSAGES/django.mo b/django/conf/locale/he/LC_MESSAGES/django.mo
index 68c19c5260..44d5412198 100644
Binary files a/django/conf/locale/he/LC_MESSAGES/django.mo and b/django/conf/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/he/LC_MESSAGES/django.po b/django/conf/locale/he/LC_MESSAGES/django.po
index a68fb036e8..0e7f545b15 100644
--- a/django/conf/locale/he/LC_MESSAGES/django.po
+++ b/django/conf/locale/he/LC_MESSAGES/django.po
@@ -9,354 +9,374 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+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: Meir Kriheli <mkriheli@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "בנגאלית"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "בוסנית"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "קאטלונית"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "צ'כית"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "וולשית"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "דנית"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "גרמנית"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "יוונית"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "אנגלית"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "אנגלית בריטית"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "אספרנטו"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "ספרדית"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "ספרדית ארגנטינית"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "ספרדית מקסיקנית"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "ספרדית ניקרגואה"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "אסטונית"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "בסקית"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "פרסית"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "פינית"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "צרפתית"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "פריזית"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "אירית"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "גאליציאנית"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "עברית"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "הינדי"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "קרואטית"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "הונגרית"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "אינדונזית"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "איסלנדית"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "איטלקית"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "יפנית"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "גיאורגית"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "קזחית"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "חמר"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "קאנאדה"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "קוריאנית"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "ליטאית"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "לטבית"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "מקדונית"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "מלאיאלאם"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "מונגולי"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "נורבגית ספרותית"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "נפאלית"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "הולנדית"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "נורבגית חדשה"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "פנג'אבי"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "פולנית"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "פורטוגזית"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "פורטוגזית ברזילאית"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "רומנית"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "רוסית"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "סלובקית"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "סלובנית"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "אלבנית"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "סרבית"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "סרבית לטינית"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "שוודית"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "סווהילי"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "טמילית"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "טלגו"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "תאילנדית"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "טורקית"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "טטרית"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "אוקראינית"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "אורדו"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "וייטנאמית"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "סינית פשוטה"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "סינית מסורתית"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "יש להזין ערך חוקי."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "ה־URL הזה נראה כקישור שבור."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "נא להזין כתובת דוא\"ל חוקית"
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "יש להזין URL חוקי."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "יש להזין כתובת דוא\"ל חוקית."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים תחתונים ומקפים בלבד."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "יש להזין כתובת IPv4 חוקית."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "יש להזין כתובת IPv6 חוקית."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "יש להזין כתובת IPv4 או IPv6 חוקית."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "יש להזין רק ספרות מופרדות בפסיקים."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "יש לוודא שערך זה פחות מ או שווה ל־%(limit_value)s ."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "יש לוודא שהערך גדול מ או שווה ל־%(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -364,7 +384,7 @@ msgid ""
 msgstr ""
 "יש לוודא שערך זה מכיל לפחות %(limit_value)d תווים (מכיל %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -372,81 +392,81 @@ msgid ""
 msgstr ""
 "יש לוודא שערך זה מכיל %(limit_value)d תווים לכל היותר (מכיל %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s חייב להיות ייחודי ל%(lookup)s של ה־%(date_field)s"
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ו"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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·עם·%(field_label)s·זה קיימת כבר."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "ערך %r אינו אפשרות חוקית."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "שדה זה אינו יכול להיות ריק."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "שדה זה אינו יכול להיות ריק."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "שדה מסוג: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "מספר שלם"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "הערך  '%s' חייב להיות מספר שלם."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "הערך  '%s' חייב להיות אמת או שקר."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "בוליאני (אמת או שקר)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "מחרוזת (עד %(max_length)s תווים)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "מספרים שלמים מופרדים בפסיקים"
 
-#: db/models/fields/__init__.py:647
+#: 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' מכיל תאריך בפורמט לא חוקי. חייב להיות בפורמט YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' בפורמט הנכון (YYYY-MM-DD), אך אינו תאריך חוקי."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "תאריך (ללא שעה)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -455,7 +475,7 @@ msgstr ""
 "התחביר של ערך '%s' אינו חוקי. התחביר חייב להיות YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -464,225 +484,229 @@ msgstr ""
 "התחביר של ערך '%s' חוקי (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) אך אינו תאריך/"
 "זמן חוקי."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "תאריך (כולל שעה)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "הערך '%s' חייב להיות מספר עשרוני."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "מספר עשרוני"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "כתובת דוא\"ל"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "נתיב קובץ"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "הערך '%s' חייב להיות מספר עם נקודה צפה."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "מספר עשרוני"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "מספר שלם גדול (8 בתים)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "כתובת IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "כתובת IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "הערך '%s' חייב להיות None‏, True או False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "בוליאני (אמת, שקר או כלום)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "מספר שלם חיובי"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "מספר שלם חיובי קטן"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Slug (עד %(max_length)s תווים)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "מספר שלם קטן"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "טקסט"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
+msgstr "הערך '%s' מכיל פורמט לא חוקי. חייב להיות בפורמט  HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
+msgstr "הערך '%s' בעל פורמט חוקי (HH:MM[:ss[.uuuuuu]]) אך אינו זמן חוקי."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "זמן"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "קובץ"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "תמונה"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "מודל %(model)s עם מפתח ראשי %(pk)r אינו קיים."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Foreign Key (הסוג נקבע לפי השדה המקושר)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "יחס של אחד לאחד"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "יחס של רבים לרבים"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "יש להחזיק את \"Control\", או \"Command\" על מק, לחוץ כדי לבחור יותר מאחד."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "יש להזין תוכן בשדה זה."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "נא להזין מספר שלם."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "נא להזין מספר."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "נא לוודא שאין יותר מ־%s ספרות סה\"כ"
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "נא לוודא שאין יותר מ־%s ספרות אחרי הנקודה"
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "נא לוודא שאין יותר מ־%s ספרות לפני הנקודה העשרונית"
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "יש להזין תאריך חוקי."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "יש להזין שעה חוקית."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "יש להזין תאריך ושעה חוקיים."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "לא נשלח שום קובץ. נא לבדוק את סוג הקידוד של הטופס."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "לא נשלח שום קובץ"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "הקובץ שנשלח ריק."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr "על שם הקובץ להיות לא יותר מ־%(max)d תווים (יש לו%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "נא לשים קובץ או סימן את התיבה לניקוי, לא שניהם."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "נא להעלות תמונה חוקית. הקובץ שהעלת אינו תמונה או מכיל תמונה מקולקלת."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "יש להזין URL חוקי."
+
+#: 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 "יש לבחור אפשרות חוקית. %(value)s אינו בין האפשרויות הזמינות."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "יש להזין רשימת ערכים"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "מיון"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "מחיקה"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "נא לתקן את הערכים הכפולים ל%(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "נא לתקן את הערכים הכפולים ל%(field)s, שערכים בו חייבים להיות ייחודיים."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -691,116 +715,118 @@ msgstr ""
 "נא לתקן את הערכים הכפולים %(field_name)s, שחייבים להיות ייחודיים ל%(lookup)s "
 "של %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "נא לתקן את הערכים הכפולים למטה."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "המפתח הזר ה־inline לא התאים למפתח הראשי של האב."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "יש לבחור אפשרות חוקית; אפשרות זו אינה אחת מהזמינות."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "יש לבחור אפשרות חוקית. %s אינו בין האפשרויות הזמינות."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" איננו חוקי כמפתח ראשי."
 
-#: forms/util.py:70
+#: 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 באזור זמן  %(current_timezone)s; הוא עשוי להיות "
+"דו-משמעי או לא קיים."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "עכשיו"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "שינוי"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "לסלק"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "כן"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "לא"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "כן,לא,אולי"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "בית %(size)d "
 msgstr[1] "%(size)d בתים"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s ק\"ב"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s מ\"ב"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s ג\"ב"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s ט\"ב"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s פ\"ב"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "אחר הצהריים"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "בבוקר"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "אחר הצהריים"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "בבוקר"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "חצות"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "12 בצהריים"
 
@@ -870,7 +896,7 @@ msgstr "פברואר"
 
 #: utils/dates.py:18
 msgid "March"
-msgstr "מרס"
+msgstr "מרץ"
 
 #: utils/dates.py:18
 msgid "April"
@@ -918,7 +944,7 @@ msgstr "פבר"
 
 #: utils/dates.py:23
 msgid "mar"
-msgstr "מרס"
+msgstr "מרץ"
 
 #: utils/dates.py:23
 msgid "apr"
@@ -1076,122 +1102,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "דצמבר"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "או"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "שנה"
 msgstr[1] "שנים"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "חודש"
 msgstr[1] "חודשים"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "שבוע"
 msgstr[1] "שבועות"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "יום"
 msgstr[1] "ימים"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "שעה"
 msgstr[1] "שעות"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "דקה"
 msgstr[1] "דקות"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "דקות"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "אינדקסים על תיקיה אסורים כאן."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" אינו קיים"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "אינדקס של %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "ה־%(verbose_name)s  נוצר בהצלחה."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "ה־%(verbose_name)s עודכן בהצלחה."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "ה־%(verbose_name)s נמחק."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "לא צויינה שנה"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "לא צויין חודש"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "לא צויין יום"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "לא צויין שבוע"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "לא נמצאו %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1200,26 +1211,26 @@ msgstr ""
 "לא נמצאו %(verbose_name_plural)s בזמן עתיד מאחר ש-%(class_name)s."
 "allow_future מוגדר False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "מחרוזת תאריך לא חוקית '%(datestr)s' בהתחשב בתחביר '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "לא נמצא/ה %(verbose_name)s התואם/ת לשאילתה"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "העמוד אינו 'last', או אינו ניתן להמרה למספר."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "עמוד לא חוקי (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "רשימה ריקה -ו'%(class_name)s.allow_empty' מוגדר False."
diff --git a/django/conf/locale/hi/LC_MESSAGES/django.mo b/django/conf/locale/hi/LC_MESSAGES/django.mo
index 2e6e9b1e4c..5f8c0b3b71 100644
Binary files a/django/conf/locale/hi/LC_MESSAGES/django.mo and b/django/conf/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/hi/LC_MESSAGES/django.po b/django/conf/locale/hi/LC_MESSAGES/django.po
index 308baaf316..a6e7049f45 100644
--- a/django/conf/locale/hi/LC_MESSAGES/django.po
+++ b/django/conf/locale/hi/LC_MESSAGES/django.po
@@ -1,362 +1,383 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <alok.kumar@gmail.com>, 2013.
 # Chandan kumar <chandankumar.093047@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+0100\n"
-"PO-Revision-Date: 2012-03-15 14:07+0000\n"
-"Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-06 13:46+0000\n"
+"Last-Translator: alkuma <alok.kumar@gmail.com>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 "बेलारूसी"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "बंगाली"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "ब्रेटन"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "बोस्नियन"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "कटलान"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "च्चेक"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "वेल्श"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "दानिश"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "जर्मन"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "ग्रीक"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "अंग्रेज़ी "
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "ब्रिटिश अंग्रेजी"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "एस्परेन्तो"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "स्पानिश"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "अर्जेंटीना स्पैनिश "
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "मेक्सिकन स्पैनिश"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "निकारागुआ स्पैनिश"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "वेनेज़ुएलाई स्पेनिश"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "एस्टोनियन"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "बास्क"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "पारसी"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "फ़िन्निश"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "फ्रेंच"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "फ्रिसियन"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "आयरिश"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "गलिशियन"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "हि‍ब्रू"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "हिंदी"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "क्रोयेशियन"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "हंगेरियन"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "इंतर्लिंगुआ"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "इन्डोनेशियन "
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "आयिस्लान्डिक"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "इटैलियन"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "जपानी"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "ज्योर्जियन"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "कज़ाख"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "ख्मेर"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "कन्‍नड़"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "कोरियन"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "लक्संबर्गी"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "लिथुवेनियन"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "लात्वियन"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "मेसिडोनियन"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "मलयालम"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "मंगोलियन"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "नार्वेजियन बोकमाल"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "नेपाली"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "डच"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "नार्वेजियन नायनॉर्स्क"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "पंजाबी"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "पोलिश"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "पुर्तगाली"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "ब्रजिलियन पुर्तगाली"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "रोमानियन"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "रूसी"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "स्लोवाक"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "स्लोवेनियन"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "अल्बेनियन्"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "सर्बियन"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "सर्बियाई लैटिन"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "स्वीडिश"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "स्वाहिली"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "तमिल"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "तेलुगु"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "थाई"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "तुर्किश"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "तातार"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "उद्मर्त"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "यूक्रानियन"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "उर्दू"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "वियतनामी"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "सरल चीनी"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "पारम्परिक चीनी"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "एक मान्य मूल्य दर्ज करें"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "यह यूआरएल टूटी हुई लिंक के सामान प्रतीत होता है।"
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "वैध डाक पता प्रविष्ट करें।"
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "वैध यू.आर.एल भरें ।"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "मान्य ईमेल पता भरें"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "एक वैध 'काउंटर' वर्णों, संख्याओं,रेखांकित चिन्ह ,या हाइफ़न से मिलाकर दर्ज करें ।"
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "वैध आइ.पि वी 4 पता भरें ।"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "वैध IPv6 पता दर्ज करें."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "वैध IPv4 या IPv6 पता दर्ज करें."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "अल्पविराम अंक मात्र ही भरें ।"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "सुनिश्चित करें कि यह मान %(limit_value)s (यह\n"
 " %(show_value)s  है) है ।"
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "सुनिश्चित करें कि यह मान  %(limit_value)s से कम या बराबर है ।"
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "सुनिश्चित करें यह मान  %(limit_value)s से बड़ा या बराबर है ।"
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -365,7 +386,7 @@ msgstr ""
 "सुनिश्चित करें कि यह मान में कम से कम  %(limit_value)d  अक्षरों (इसका\n"
 " %(show_value)d  है) की है."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -374,81 +395,81 @@ msgstr ""
 "सुनिश्चित करें कि यह मान अधिकांश %(limit_value)d अक्षरों (इसका \n"
 " %(show_value)d है)  में है."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "  %(date_field)s %(lookup)s के लिए %(field_name)s अद्वितीय होना चाहिए."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "और"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "इस %(field_label)s के साथ एक %(model_name)s पहले से ही उपस्थित है ।"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "मान %r एक वैध चुनाव नहीं है."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "यह मूल्य खाली नहीं हो सकता ।"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "इस फ़ील्ड रिक्त नहीं हो सकता है."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "फील्ड के प्रकार: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "पूर्णांक"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' मान पूर्णांक होना चाहिए."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' मान या तो सही है या गलत होना चाहिए."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "बूलियन (सही अथ‌वा गलत)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "स्ट्रिंग (अधिकतम लम्बाई %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "अल्पविराम सीमांकित संख्या"
 
-#: db/models/fields/__init__.py:647
+#: 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'  मान एक अमान्य दिनांक फॉर्मेट मे है. यह YYYY-MM-DD फॉर्मेट में होना चाहिए."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' मान को सही प्रारूप (YYYY-MM-DD) है, लेकिन यह एक अमान्य तिथि है."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "तिथि (बिना समय)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -457,7 +478,7 @@ msgstr ""
 "'%s' मान एक अमान्य स्वरूप में है. यह YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] में होना "
 "चाहिए."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -466,181 +487,181 @@ msgstr ""
 ".'%s' मान सही प्रारूप (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) मे नहीं है लेकिन यह एक "
 "अमान्य तिथि / समय है."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "तिथि (समय के साथ)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' मान को एक दशमलव संख्या में होना चाहिए."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "दशमलव संख्या"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "ईमेल पता"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "संचिका पथ"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' मान को दशमलब मे होना चाहिए."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "चल बिन्दु संख्या"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "बड़ा (8 बाइट) पूर्णांक "
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 पता"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "आइ.पि पता"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' मान को  सही है या गलत या तो कोई नहीं, होना चाहिए."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "बूलियन (सही, गलत या कुछ नहीं)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "धनात्मक पूर्णांक"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "धनात्मक छोटा पूर्णांक"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "स्लग (%(max_length)s तक)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "छोटा पूर्णांक"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "पाठ"
 
-#: db/models/fields/__init__.py:1180
+#: 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' मान एक अमान्य स्वरूप में है.यह  HH:MM[:ss[.uuuuuu]] स्वरूप में होना चाहिए."
 
-#: db/models/fields/__init__.py:1182
+#: 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' मान सही स्वरूप (HH:MM[:ss[.uuuuuu]]) मे है, लेकिन यह एक अवैध समय है."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "समय"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "यू.आर.एल"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "फाइल"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "छवि"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "मॉडल%(model)s  pk %(pk)r के साथ मौजूद नहीं है. "
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "विदेशी कुंजी (संबंधित क्षेत्र के द्वारा प्रकार निर्धारित)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "एक-एक संबंध"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "बहुत से कई संबंध"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "एक से अधिक का चयन करने के लिए मैक पर \"कमांड\",या\"नियंत्रण\" नीचे दबाए रखें."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "यह क्षेत्र अपेक्षित हैं"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "एक पूर्ण संख्या दर्ज करें ।"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "एक संख्या दर्ज करें ।"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "सुनिश्चित करें कि वहाँ कुल में %s से अधिक अंक न हो."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "सुनिश्चित करें कि वहाँ  %s से अधिक दशमलव स्थान न हो."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "सुनिश्चित करें कि वहाँ %s से अधिक अंको के पहले दशमलव बिंदु न हो."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "वैध तिथि भरें ।"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "वैध समय भरें ।"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "वैध तिथि/समय भरें ।"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "कोई संचिका निवेदित नहीं हुई । कृपया कूटलेखन की जाँच करें ।"
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "कोई संचिका निवेदित नहीं हुई ।"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "निवेदित संचिका खाली है ।"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -648,44 +669,48 @@ msgstr ""
 "सुनिश्चित करें कि इस फ़ाइल का नाम अधिकांश %(max)d वर्णों (इसका \n"
 "%(length)d है)को है"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "कृपया या फ़ाइल प्रस्तुत करे या साफ जांचपेटी की जाँच करे,दोनों नहीं ."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "वैध चित्र निवेदन करें । आप के द्वारा निवेदित संचिका अमान्य अथवा दूषित है ।"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "वैध यू.आर.एल भरें ।"
+
+#: 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 "मान्य इच्छा चयन करें । %(value)s लभ्य इच्छाओं में उप्लब्ध नहीं हैं ।"
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "मूल्य सूची दर्ज करें ।"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "छाटें"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "मिटाएँ"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "कृपया %(field)s के लिए डुप्लिकेट डेटा को सही करे."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "कृपया %(field)s के डुप्लिकेट डेटा जो अद्वितीय होना चाहिए को सही करें."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -694,29 +719,29 @@ msgstr ""
 "कृपया %(field_name)s के लिए डुप्लिकेट डेटा को सही करे जो %(date_field)s में "
 "%(lookup)s के लिए अद्वितीय होना चाहिए."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "कृपया डुप्लिकेट मानों को सही करें."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "इनलाइन विदेशी कुंजी पैरेंट आवृत्ति  प्राथमिक कुंजी से मेल नहीं खाता है ."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "मान्य विकल्प चयन करें । यह विकल्प उपस्थित विकल्पों में नहीं है ।"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "मान्य विकल्प चयन करें । %s उपस्थित विकल्पों में नहीं है ।"
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "प्राथमिक कुंजी के लिए \"%s\" वैध मान नहीं है."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -725,87 +750,87 @@ msgstr ""
 "%(current_timezone)s समय क्षेत्र में %(datetime)s का व्याख्या  नहीं कर सकता है, यह "
 "अस्पष्ट हो सकता है या नहीं मौजूद हो सकते हैं."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "फिलहाल"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "बदलें"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "रिक्त करें"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "अनजान"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "हाँ"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "नहीं"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "हाँ, नहीं, शायद"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d बाइट"
 msgstr[1] "%(size)d बाइट"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s केबी "
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s मेबी "
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s जीबी "
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s टीबी"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s पीबी"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "बजे"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "बजे"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "बजे"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "बजे"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "मध्यरात्री"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "दोपहर"
 
@@ -1081,122 +1106,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "दिसंबर"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "अथवा"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "साल"
 msgstr[1] "साल"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "महीना"
 msgstr[1] "महीना"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "सप्ताह"
 msgstr[1] "सप्ताह"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "दिन"
 msgstr[1] "दिन"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "घंटा"
 msgstr[1] "घंटा"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "मिनट"
 msgstr[1] "मिनट"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "मिनट"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "निर्देशिका अनुक्रमित की अनुमति यहाँ नहीं है."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" मौजूद नहीं है"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s का अनुक्रमणिका"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s को कामयाबी से निर्माण किया गया हैं ।"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s को कामयाबी से अद्यतन किया गया हैं ।"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s को मिटाया गया हैं ।"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "कोई साल निर्दिष्ट नहीं किया गया "
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "कोई महीने निर्दिष्ट नहीं किया गया "
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "कोई दिन निर्दिष्ट नहीं किया गया "
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "कोई सप्ताह निर्दिष्ट नहीं किया गया "
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s उपलब्ध नहीं है"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1205,26 +1215,26 @@ msgstr ""
 "भविष्य %(verbose_name_plural)s उपलब्ध नहीं है क्योंकि %(class_name)s.allow_future "
 "गलत है."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "तिथि स्ट्रिंग '%(datestr)s' दिया गया प्रारूप '%(format)s' अवैध है "
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr " इस प्रश्न %(verbose_name)s से मेल नहीं खाते है"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "पृष्ठ 'अंतिम' नहीं है और न ही यह एक पूर्णांक के लिए परिवर्तित किया जा सकता है."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "अमान्य पृष्ठ (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "अवैध पन्ना (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "रिक्त सूची और  '%(class_name)s.allow_empty' गलत है."
diff --git a/django/conf/locale/hi/formats.py b/django/conf/locale/hi/formats.py
index 95db623bd9..f4fabe00cd 100644
--- a/django/conf/locale/hi/formats.py
+++ b/django/conf/locale/hi/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/hr/LC_MESSAGES/django.mo b/django/conf/locale/hr/LC_MESSAGES/django.mo
index be1a8a57a9..5b5cdce40f 100644
Binary files a/django/conf/locale/hr/LC_MESSAGES/django.mo and b/django/conf/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/hr/LC_MESSAGES/django.po b/django/conf/locale/hr/LC_MESSAGES/django.po
index f684b21266..fa103572e1 100644
--- a/django/conf/locale/hr/LC_MESSAGES/django.po
+++ b/django/conf/locale/hr/LC_MESSAGES/django.po
@@ -2,368 +2,390 @@
 #
 # Translators:
 # aljosa <aljosa.mohorovic@gmail.com>, 2011.
+#   <aljosa.mohorovic@gmail.com>, 2013.
 # Bojan Mihelač <bmihelac@mihelac.org>, 2012.
-# Davor Lučić <r.dav.lc@gmail.com>, 2011.
+# Davor Lučić <r.dav.lc@gmail.com>, 2011-2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <senko.rasic@dobarkod.hr>, 2012.
 # Ylodi <stjepan@gmail.com>, 2011.
 #   <zlatko.masek@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+0100\n"
-"PO-Revision-Date: 2012-03-22 17:08+0000\n"
-"Last-Translator: zmasek <zlatko.masek@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-14 18:26+0000\n"
+"Last-Translator: aljosa <aljosa.mohorovic@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arapski"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azarbejdžanac"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Unesite ispravnu IPv4 adresu."
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Bjeloruski"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalski"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretonski"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bošnjački"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalanski"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Češki"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Velški"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danski"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Njemački"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Grčki"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Engleski"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Britanski engleski"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Španjolski"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentinski španjolski"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Meksički španjolski"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nikaragvanski Španjolski"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venezuelanski Španjolski"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonski"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskijski"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Perzijski"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finski"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Francuski"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frizijski"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irski"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galičanski"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Mađarski"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonezijski"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandski"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Talijanski"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japanski"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Gruzijski"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazaški"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Kambođanski"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreanski"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luksemburški"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litvanski"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latvijski"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonski"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolski"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norveški Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepalski"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Nizozemski"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norveški Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Pendžabljanin"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Poljski"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brazilski portugalski"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumunjski"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Ruski"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovački"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovenski"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanski"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Srpski"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Latinski srpski"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Švedski"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamilski"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Teluški"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thai (tajlandski)"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turski"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatarski"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurtski"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vijetnamski"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Pojednostavljeni kineski"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Tradicionalni kineski"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Unesite ispravnu vrijednost."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Izgleda da je URL neispravan."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Unesite ispravan URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Unesite ispravnu e-mail adresu."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Unesite ispravan 'slug' koji se sastoji samo od slova, brojeva, povlaka ili "
 "crtica."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Unesite ispravnu IPv4 adresu."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Unesite ispravnu IPv6 adresu."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Unesite ispravnu IPv4 ili IPv6 adresu."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Unesite samo brojeve razdvojene zarezom."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Osigurajte da ova vrijednost ima %(limit_value)s (trenutno je "
 "%(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Osigurajte da je ova vrijednost manja ili jednaka %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Osigurajte da je ova vrijednost veća ili jednaka %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -372,7 +394,7 @@ msgstr ""
 "Osigurajte da ova vrijednost ima najmanje %(limit_value)d znakova (ima "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -381,85 +403,85 @@ msgstr ""
 "Osigurajte da ova vrijednost ima najviše %(limit_value)d znakova (ima "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(field_name)s mora biti jedinstven pojam za %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "i"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 sa navedenim %(field_label)s već postoji."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Vrijednost %r nije ispravan izbor."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Ovo polje ne može biti null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Ovo polje ne može biti prazno."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Polje tipa: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Cijeli broj"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' vrijednost treba biti cijeli broj."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' vrijednost treba biti ili \"True\" ili \"False\"."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (True ili False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Slova (do %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Cijeli brojevi odvojeni zarezom"
 
-#: db/models/fields/__init__.py:647
+#: 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' vrijednost je neispravno formatiran datum. Treba biti u YYYY-MM-DD "
 "formatu."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' vrijednost ima ispravan format (YYYY-MM-DD) ali je nevaljan datum."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datum (bez vremena/sati)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -468,7 +490,7 @@ msgstr ""
 "'%s' vrijednost je neispravno formatirana. Treba biti u YYYY-MM-DD HH:MM[:ss"
 "[.uuuuuu]][TZ] formatu."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -477,79 +499,79 @@ msgstr ""
 "'%s' vrijednost ima ispravan format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) ali "
 "je nevaljan datum/vrijeme."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datum (sa vremenom/satima)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' vrijednost treba biti decimalni broj."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimalni broj"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-mail adresa"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Put do datoteke"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' vrijednost treba biti broj sa pomičnim zarezom."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Broj s pomičnim zarezom (floating point number)"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Big (8 byte) integer"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 adresa"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP adresa"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' vrijednost treba biti \"None\", \"True\" ili \"False\"."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (True, False ili None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Pozitivan cijeli broj"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Pozitivan mali cijeli broj"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "'Slug' (do %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Mali broj"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -557,7 +579,7 @@ msgstr ""
 "'%s' vrijednost je neispravno formatirana. Treba biti u HH:MM[:ss[.uuuuuu]] "
 "formatu."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -566,100 +588,100 @@ msgstr ""
 "'%s' vrijednost ima ispravan format (HH:MM[:ss[.uuuuuu]]) ali je nevaljano "
 "vrijeme."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Vrijeme"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Datoteka"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Slika"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s sa pk %(pk)r ne postoji."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Foreign Key (type determined by related field)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "One-to-one relationship"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Many-to-many relationship"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Držite \"Control\", ili \"Command\" na Mac-u, da bi odabrali više od jednog "
 "objekta."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Unos za ovo polje je obavezan."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Unesite cijeli broj."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Unesite broj."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Osigurajte da ukupno nema više od %s numeričkih znakova."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Osigurajte da ukupno nema više od %s decimalnih mjesta."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Osigurajte da ukupno nema više od %s numeričkih znakova prije decimalne "
 "točke."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Unesite ispravan datum."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Unesite ispravno vrijeme."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Unesite ispravan datum/vrijeme."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Datoteka nije poslana. Provjerite 'encoding type' forme."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Datoteka nije poslana."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Poslana datoteka je prazna."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -667,11 +689,11 @@ msgstr ""
 "Osigurajte da ova datoteka ima najviše %(max)d znakova (trenutno ima "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Molimo Vas da pošaljete ili datoteku ili označite izbor, a ne oboje."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -679,36 +701,40 @@ msgstr ""
 "Upload-ajte ispravnu sliku. Datoteka koju ste upload-ali ili nije slika ili "
 "je oštečena."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Unesite ispravan URL."
+
+#: 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 "Odaberite iz ponuđenog. %(value)s nije ponuđen kao opcija."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Unesite listu vrijednosti."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Redoslijed:"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Izbriši"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Ispravite duplicirane podatke za %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Molimo ispravite duplicirane podatke za %(field)s, koji moraju biti "
 "jedinstveni."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -717,29 +743,29 @@ msgstr ""
 "Molimo ispravite duplicirane podatke za %(field_name)s koji moraju biti "
 "jedinstveni za %(lookup)s u %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Molimo ispravite duplicirane vrijednosti ispod."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "The inline foreign key did not match the parent instance primary key."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Izaberite ispravnu opciju. Ta opcija nije jedna od dostupnih opcija."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Odaberite iz ponuđenog. %s nije ponuđen kao opcija."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" nije ispravna vrijednost za primarni kluč."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -748,35 +774,35 @@ msgstr ""
 "%(datetime)s ne može biti interpretirano u vremenskoj zoni "
 "%(current_timezone)s; možda je dvosmisleno ili ne postoji."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Trenutno"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Promijeni"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Isprazni"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Nepoznat pojam"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Da"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ne"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "da,ne,možda"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -784,52 +810,52 @@ msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d byte-a"
 msgstr[2] "%(size)d byte-a"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "popodne"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "ujutro"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "popodne"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ujutro"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "ponoć"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "podne"
 
@@ -1105,128 +1131,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "prosinca"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ili"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "godina"
 msgstr[1] "godine"
 msgstr[2] "godine"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mjesec"
 msgstr[1] "mjeseci"
 msgstr[2] "mjeseci"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "tjedan"
 msgstr[1] "tjedna"
 msgstr[2] "tjedna"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
 msgstr[1] "dani"
 msgstr[2] "dana"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
 msgstr[1] "sati"
 msgstr[2] "sata"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minute"
 msgstr[2] "minute"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuta"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Sadržaji direktorija ovdje nisu dozvoljeni."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" ne postoji"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Sadržaj direktorija %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s je uspješno kreirano."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s je uspješno promijenjeno."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s je izbrisano."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Nije navedena godina"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Nije naveden mjesec"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Nije naveden dan"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Tjedan nije određen"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Nije dostupno: %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1235,26 +1246,26 @@ msgstr ""
 "%(verbose_name_plural)s nije dostupno jer je %(class_name)s.allow_future "
 "False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Neispravan datum '%(datestr)s' za format '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "%(verbose_name)s - pretragom nisu pronađeni rezultati za upit"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Stranica nije 'zadnja', niti se može pretvoriti u cijeli broj."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Neispravna stranica (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Nevažeća stranica (%(page_number)s):%(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Prazna lista i '%(class_name)s.allow_empty' je False."
diff --git a/django/conf/locale/hr/formats.py b/django/conf/locale/hr/formats.py
index 9f4c74051e..96a724b2b8 100644
--- a/django/conf/locale/hr/formats.py
+++ b/django/conf/locale/hr/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -23,18 +24,23 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',      # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',   # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',         # '2006-10-25 14:30'
     '%Y-%m-%d',               # '2006-10-25'
     '%d.%m.%Y. %H:%M:%S',     # '25.10.2006. 14:30:59'
+    '%d.%m.%Y. %H:%M:%S.%f',  # '25.10.2006. 14:30:59.000200'
     '%d.%m.%Y. %H:%M',        # '25.10.2006. 14:30'
     '%d.%m.%Y.',              # '25.10.2006.'
     '%d.%m.%y. %H:%M:%S',     # '25.10.06. 14:30:59'
+    '%d.%m.%y. %H:%M:%S.%f',  # '25.10.06. 14:30:59.000200'
     '%d.%m.%y. %H:%M',        # '25.10.06. 14:30'
     '%d.%m.%y.',              # '25.10.06.'
     '%d. %m. %Y. %H:%M:%S',   # '25. 10. 2006. 14:30:59'
+    '%d. %m. %Y. %H:%M:%S.%f',# '25. 10. 2006. 14:30:59.000200'
     '%d. %m. %Y. %H:%M',      # '25. 10. 2006. 14:30'
     '%d. %m. %Y.',            # '25. 10. 2006.'
     '%d. %m. %y. %H:%M:%S',   # '25. 10. 06. 14:30:59'
+    '%d. %m. %y. %H:%M:%S.%f',# '25. 10. 06. 14:30:59.000200'
     '%d. %m. %y. %H:%M',      # '25. 10. 06. 14:30'
     '%d. %m. %y.',            # '25. 10. 06.'
 )
diff --git a/django/conf/locale/hu/LC_MESSAGES/django.mo b/django/conf/locale/hu/LC_MESSAGES/django.mo
index 0806bbfbbf..3940f4bb19 100644
Binary files a/django/conf/locale/hu/LC_MESSAGES/django.mo and b/django/conf/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/hu/LC_MESSAGES/django.po b/django/conf/locale/hu/LC_MESSAGES/django.po
index b42ccbdc79..2229650b26 100644
--- a/django/conf/locale/hu/LC_MESSAGES/django.po
+++ b/django/conf/locale/hu/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Attila Nagy <>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # János Péter Ronkay <transifex@hangya.net>, 2011, 2012.
 # Szilveszter Farkas <szilveszter.farkas@gmail.com>, 2011.
@@ -8,358 +9,378 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+0100\n"
-"PO-Revision-Date: 2012-03-19 20:01+0000\n"
-"Last-Translator: istvanf <istvan.farkas@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Attila Nagy <>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arab"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "azerbajdzsáni"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bolgár"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengáli"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnyák"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalán"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Cseh"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Walesi"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Dán"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Német"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Görög"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Angol"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Brit angol"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Eszperantó"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentin spanyol"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mexikói spanyol"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nicaraguai spanyol"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Észt"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baszk "
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Perzsa"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finn"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Francia"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Fríz"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Ír"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Gall"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Héber"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Horvát"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonéz"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Izlandi"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Olasz"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japán"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Grúz"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazak"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreai"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litván"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Lett"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macedón"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malajálam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongol"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Bokmål norvég"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepáli"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Holland"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Nynorsk norvég"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Lengyel"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugál"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brazíliai portugál"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Román"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Orosz"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Szlovák"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Szlovén"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albán"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Szerb"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Latin betűs szerb"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Svéd"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Szuahéli"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thai"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Török"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Tatár"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrán"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnámi"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Egyszerű kínai"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Hagyományos kínai"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Adjon meg egy érvényes értéket."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Ez a hivatkozás törött linknek tűnik."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Adjon meg egy érvényes URL-t."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Írjon be egy érvényes e-mail címet."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Az URL barát cím csak betűket, számokat, aláhúzásokat és kötőjeleket "
 "tartalmazhat."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Írjon be egy érvényes IPv4 címet."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Írjon be egy érvényes IPv6 címet."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Írjon be egy érvényes IPv4 vagy IPv6 címet."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Csak számokat adjon meg, vesszővel elválasztva."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Bizonyosodjon meg arról, hogy az érték %(limit_value)s (jelenleg: "
 "%(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Bizonyosodjon meg arról, hogy az érték %(limit_value)s, vagy kisebb."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Bizonyosodjon meg arról, hogy az érték %(limit_value)s, vagy nagyobb."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -368,7 +389,7 @@ msgstr ""
 "Bizonyosodjon meg arról, hogy ez az érték legalább %(limit_value)d karaktert "
 "tartalmaz (jelenlegi hossza: %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -377,75 +398,75 @@ msgstr ""
 "Bizonyosodjon meg arról, hogy ez az érték legfeljebb %(limit_value)d "
 "karaktert tartalmaz (jelenlegi hossza: %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(field_name)s egyedi kell hogy legyen %(lookup)s alapján a dátum mezőn: "
 "%(date_field)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "és"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Már létezik %(model_name)s ilyennel: %(field_label)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r érték érvénytelen."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Ez a mező nem lehet nulla."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Ez a mező nem lehet üres."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Mezőtípus: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Egész"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' értéknek egész számnak kell lennie."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' érték csak igaz (True) vagy hamis (False) lehet."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Logikai (True vagy False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Karakterlánc (%(max_length)s hosszig)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Vesszővel elválasztott egészek"
 
-#: db/models/fields/__init__.py:647
+#: 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' érték érvénytelen dátum formátumban van. A dátumnak YYYY-MM-DD "
 "formátumban kell lennie."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -453,11 +474,11 @@ msgstr ""
 "'%s' érték megfelelő formátumban van (YYYY-MM-DD), de a megadott dátum "
 "érvénytelen."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dátum (idő nélkül)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -466,7 +487,7 @@ msgstr ""
 "'%s' érték érvénytelen dátum formátumban van. A dátumnak YYYY-MM-DD HH:MM[:ss"
 "[.uuuuuu]][TZ] formátumban kell lennie."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -475,79 +496,79 @@ msgstr ""
 "'%s' érték megfelelő formátumban van (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), "
 "de a megadott dátum/idő érvénytelen."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dátum (idővel)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' értéknek decimálisnak kell lennie."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Tizes számrendszerű (decimális) szám"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-mail cím"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Elérési út"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' értéknek lebegőpontos számnak kell lennie."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Lebegőpontos szám"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Nagy egész szám (8 bájtos)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 cím"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP cím"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' érték csak semmi (None), igaz (True) vagy hamis (False) lehet."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Logikai (True, False vagy None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Pozitív egész"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Pozitív kis egész"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "URL-barát cím (%(max_length)s hosszig)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Kis egész"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Szöveg"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -555,7 +576,7 @@ msgstr ""
 "'%s' érték formátuma érvénytelen. Az időnek HH:MM[:ss[.uuuuuu]] formátumban "
 "kell lennie."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -564,100 +585,100 @@ msgstr ""
 "'%s' formátuma megfelelő (HH:MM[:ss[.uuuuuu]]), de a megadott időpont "
 "érvénytelen."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Idő"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fájl"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Kép"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "%(model)s modell %(pk)r elsődleges kulccsal nem létezik."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Idegen kulcs (típusa a kapcsolódó mezőtől függ)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Egy-egy kapcsolat"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Több-több kapcsolat"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Tartsa lenyomva a \"Control\"-t (vagy Mac-en a \"Command\"-ot) több elem "
 "kiválasztásához."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Ennek a mezőnek a megadása kötelező."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Adjon meg egy egész számot."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Adj meg egy számot."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Bizonyosodjon meg arról, hogy nincs ennél több számjegy: %s."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Bizonyosodjon meg arról, hogy nincs ennél több tizedesjegy: %s."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Bizonyosodjon meg arról, hogy nincs ennél több számjegy a tizedesvessző "
 "előtt: %s."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Adjon meg egy érvényes dátumot."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Adjon meg egy érvényes időt."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Adjon meg egy érvényes dátumot/időt."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Nem küldött el fájlt. Ellenőrizze a kódolás típusát az űrlapon."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Semmilyen fájl sem került feltöltésre."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "A küldött fájl üres."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -665,13 +686,13 @@ msgstr ""
 "Bizonyosodjon meg arról, hogy a fájlnév legfeljebb %(max)d karakterből áll "
 "(jelenlegi hossza: %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Küldjön egy új fájlt, vagy jelölje be a törlés négyzetet, de ne mindkettőt "
 "egyszerre."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -679,37 +700,41 @@ msgstr ""
 "Töltsön fel egy érvényes képfájlt. A feltöltött fájl nem kép volt, vagy "
 "megsérült."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Adjon meg egy érvényes URL-t."
+
+#: 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 ""
 "Válasszon érvényes elemet. '%(value)s' nincs az elérhető lehetőségek között."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Adja meg értékek egy listáját."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Sorrend"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Törlés"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Javítsa a mezőhöz tartozó duplikált adatokat: %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Javítsa a mezőhöz tartozó duplikált adatokat: %(field)s (egyedinek kell "
 "lenniük)."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -718,33 +743,33 @@ msgstr ""
 "Javítsa a mezőhöz tartozó duplikált adatokat: %(field_name)s (egyedinek kell "
 "lenniük %(lookup)s alapján a dátum mezőn: %(date_field)s)."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Javítsa az alábbi duplikált értékeket."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "A beágyazott idegen kulcs nem egyezik meg a szülő példány elsődleges "
 "kulcsával."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Válasszon érvényes elemet. Az Ön választása nincs az elérhető lehetőségek "
 "között."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Válasszon érvényes elemet. %s nincs az elérhető lehetőségek között."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" egy érvénytelen elsődleges kulcs érték."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -753,87 +778,87 @@ msgstr ""
 "%(datetime)s értelmezhetetlen a megadott %(current_timezone)s időzónában; "
 "vagy félreérthető, vagy nem létezik."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Jelenleg"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Módosítás"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Törlés"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Igen"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nem"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "igen,nem,talán"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bájt"
 msgstr[1] "%(size)d bájt"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "du"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "de"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "DU"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "DE"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "éjfél"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "dél"
 
@@ -1109,122 +1134,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "december"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "vagy"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "év"
 msgstr[1] "év"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "hónap"
 msgstr[1] "hónap"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "hét"
 msgstr[1] "hét"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "nap"
 msgstr[1] "nap"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "óra"
 msgstr[1] "óra"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "perc"
 msgstr[1] "perc"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "perc"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "A könyvtárak listázása itt nincs engedélyezve."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" nem létezik"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "A %(directory)s könyvtár tartalma"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s sikeresen létrehozva."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s sikeresen frissítve."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s törölve."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Nincs év megadva"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Nincs hónap megadva"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Nincs nap megadva"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nincs hét megadva"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Nincsenek elérhető %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1233,27 +1243,27 @@ msgstr ""
 "Jövőbeli %(verbose_name_plural)s nem elérhetők, mert %(class_name)s."
 "allow_future értéke False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "'%(datestr)s' érvénytelen a meghatározott formátum alapján: '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Nincs a keresési feltételeknek megfelelő %(verbose_name)s"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Az oldal nem 'last', vagy nem lehet egésszé alakítani."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Érvénytelen oldal (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Üres lista, és '%(class_name)s.allow_empty' értéke False."
diff --git a/django/conf/locale/hu/formats.py b/django/conf/locale/hu/formats.py
index a9298bf022..9b6630d775 100644
--- a/django/conf/locale/hu/formats.py
+++ b/django/conf/locale/hu/formats.py
@@ -25,6 +25,7 @@ TIME_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y.%m.%d. %H.%M.%S',   # '2006.10.25. 14.30.59'
+    '%Y.%m.%d. %H.%M.%S.%f', # '2006.10.25. 14.30.59.000200'
     '%Y.%m.%d. %H.%M',      # '2006.10.25. 14.30'
     '%Y.%m.%d.',            # '2006.10.25.'
 )
diff --git a/django/conf/locale/ia/LC_MESSAGES/django.mo b/django/conf/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..f904ca3608
Binary files /dev/null and b/django/conf/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ia/LC_MESSAGES/django.po b/django/conf/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..6c3e9a38db
--- /dev/null
+++ b/django/conf/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,1258 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 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-01-02 08:47+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "arabe"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "azeri"
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "bulgaro"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "bengali"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "bosniaco"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "catalano"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "tcheco"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "gallese"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "danese"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "germano"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "greco"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "anglese"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "anglese britannic"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "espaniol"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "espaniol argentin"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr "espaniol mexican"
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr "espaniol nicaraguan"
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "estoniano"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "basco"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "persiano"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "finnese"
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr "francese"
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr "frison"
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr "irlandese"
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr "galiciano"
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr "hebreo"
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr "hindi"
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr "croato"
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr "hungaro"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "indonesiano"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "islandese"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "italiano"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "japonese"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "georgiano"
+
+#: 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 "coreano"
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr "lituano"
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "letton"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "macedone"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "malayalam"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "mongolico"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "norvegiano, bokmål"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr "nepali"
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "hollandese"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr "norvegiano, nynorsk"
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr "punjabi"
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "polonese"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "portugese"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "portugese brasilian"
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr "romaniano"
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr "russo"
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr "slovaco"
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr "sloveno"
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr "albanese"
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr "serbo"
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr "serbo latin"
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr "svedese"
+
+#: 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 "telugu"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "thailandese"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "turco"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr "tartaro"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "ukrainiano"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr "urdu"
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "vietnamese"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "chinese simplificate"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "chinese traditional"
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Specifica un valor valide."
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Specifica un denotation valide, consistente de litteras, numeros, tractos de "
+"sublineamento o tractos de union."
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr "Specifica un adresse IPv4 valide."
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr "Specifica un adresse IPv6 valide."
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Specifica un adresse IPv4 o IPv6 valide."
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr "Scribe solmente digitos separate per commas."
+
+#: core/validators.py:157
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+"Assecura te que iste valor es %(limit_value)s (illo es %(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 "Assecura te que iste valor es inferior o equal a %(limit_value)s."
+
+#: 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 "Assecura te que iste valor es superior o equal a %(limit_value)s."
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+"Assecura te que iste valor contine al minus %(limit_value)d characteres "
+"(illo ha %(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 ""
+"Assecura te que iste valor non contine plus de %(limit_value)d characteres "
+"(illo ha %(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 debe esser unic pro %(lookup)s de %(date_field)s."
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr "e"
+
+#: 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 con iste %(field_label)s jam existe."
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr "Le valor %r non es un option valide."
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr "Iste campo non pote esser nulle."
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr "Iste campo non pote esser vacue."
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo de typo: %(field_type)s"
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr "Numero integre"
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Le valor '%s' debe esser un numero integre."
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Le valor '%s' debe esser o True/Ver o False."
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (ver o false)"
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Catena (longitude maxime: %(max_length)s)"
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr "Numeros integre separate per commas"
+
+#: 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 ""
+"Le valor '%s' es in un formato de data invalide. Debe esser in formato AAAA-"
+"MM-DD."
+
+#: 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 ""
+"Le valor '%s' es in le format de data correcte (AAAA-MM-DD) ma es un data "
+"invalide."
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr "Data (sin hora)"
+
+#: 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 ""
+"Le valor '%s' es in un formato invalide. Debe esser in formato AAAA-MM-DD HH:"
+"MM[:ss[.uuuuuu]][FH]."
+
+#: 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 ""
+"Le valor '%s' es in le formato correcte (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][FH]) "
+"ma es un data/hora invalide."
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr "Data (con hora)"
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Le valor '%s' debe esser un numero decimal."
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr "Numero decimal"
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Adresse de e-mail"
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr "Cammino de file"
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Le valor '%s' debe esser un numero a comma flottante."
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr "Numero a comma flottante"
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr "Numero integre grande (8 bytes)"
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr "Adresse IPv4"
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr "Adresse IP"
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Le valor '%s' debe esser None/Nulle, True/Ver o False."
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr "Booleano (ver, false o nulle)"
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr "Numero integre positive"
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr "Parve numero integre positive"
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Denotation (longitude maxime: %(max_length)s)"
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr "Parve numero integre"
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "Texto"
+
+#: 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 ""
+"Le valor '%s' es in un formato invalide. Debe esser in formato HH:MM[:ss[."
+"uuuuuu]]."
+
+#: 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 ""
+"Le valor '%s' es in le formato correcte (HH:MM[:ss[.uuuuuu]]) ma es un hora "
+"invalide."
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr "Hora"
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr "File"
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr "Imagine"
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "Le modello %(model)s con clave primari %(pk)r non existe."
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr "Clave estranier (typo determinate per le campo associate)"
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr "Relation un a un"
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr "Relation multes a multes"
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Tene premite \"Control\" o \"Command\" sur un Mac pro seliger plures."
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr "Iste campo es obligatori."
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr "Specifica un numero integre."
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr "Specifica un numero."
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Assecura te que il non ha plus de %s digitos in total."
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Assecura te que il non ha plus de %s cifras post le comma decimal."
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Assecura te que il non ha plus de %s cifras ante le comma decimal."
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr "Specifica un data valide."
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr "Specifica un hora valide."
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr "Specifica un data e hora valide."
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"Nulle file esseva submittite. Verifica le typo de codification in le "
+"formulario."
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr "Nulle file esseva submittite."
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr "Le file submittite es vacue."
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Assecura te que iste nomine de file non contine plus de %(max)d characteres "
+"(illo contine %(length)d)."
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr "Per favor o submitte un file o marca le quadrato \"rader\", non ambes."
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Per favor incarga un imagine valide. Le file que tu incargava o non esseva "
+"un imagine o esseva un imagine corrumpite."
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Specifica un URL valide."
+
+#: 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 ""
+"Selige un option valide. %(value)s non es inter le optiones disponibile."
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr "Scribe un lista de valores."
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr "Ordine"
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr "Deler"
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Per favor corrige le datos duplicate pro %(field)s."
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+"Per favor corrige le datos duplicate pro %(field)s, que debe esser unic."
+
+#: 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 ""
+"Per favor corrige le datos duplicate pro %(field_name)s, que debe esser unic "
+"pro le %(lookup)s in %(date_field)s."
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr "Per favor corrige le sequente valores duplicate."
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+"Le clave estranier incorporate non correspondeva al clave primari del "
+"instantia genitor."
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Per favor selige un option valide. Iste option non es inter le optiones "
+"disponibile."
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr ""
+"Per favor selige un option valide. %s non es inter le optiones disponibile."
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr "\"%s\" non es un valor valide pro un clave primari."
+
+#: 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 non poteva esser interpretate in le fuso horari "
+"%(current_timezone)s; illo pote esser ambigue o illo pote non exister."
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr "Actualmente"
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr "Cambiar"
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr "Rader"
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr "Incognite"
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr "Si"
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr "No"
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr "si,no,forsan"
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
+
+#: 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 "pm."
+
+#: utils/dateformat.py:48
+msgid "a.m."
+msgstr "am."
+
+#: utils/dateformat.py:53
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:103
+msgid "midnight"
+msgstr "medienocte"
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr "mediedie"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "lunedi"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "martedi"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "mercuridi"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "jovedi"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "venerdi"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "sabbato"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "dominica"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "lun"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "mar"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "mer"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "jov"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "ven"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "sab"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "dom"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "januario"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "februario"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "martio"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "april"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "maio"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "junio"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "julio"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "augusto"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "septembre"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "octobre"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "novembre"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "decembre"
+
+#: 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 "mai"
+
+#: 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 "sep"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "oct"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "nov"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "dec"
+
+#: 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 "Mar."
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "Maio"
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "Junio"
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "Julio"
+
+#: 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 "Oct."
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Nov."
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Dec."
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "Januario"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "Februario"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "Martio"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "Maio"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "Junio"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "Julio"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "Augusto"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "Septembre"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "Octobre"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "Novembre"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "Decembre"
+
+#: 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 "o"
+
+#. 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] "anno"
+msgstr[1] "annos"
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mense"
+msgstr[1] "menses"
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "septimana"
+msgstr[1] "septimanas"
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] "die"
+msgstr[1] "dies"
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuta"
+msgstr[1] "minutas"
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr "minutas"
+
+#: 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 "Le indices de directorio non es permittite hic."
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" non existe"
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indice de %(directory)s"
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr "Nulle anno specificate"
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr "Nulle mense specificate"
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr "Nulle die specificate"
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr "Nulle septimana specificate"
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Il non ha %(verbose_name_plural)s disponibile"
+
+#: views/generic/dates.py:646
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"In le futuro, %(verbose_name_plural)s non essera disponibile perque "
+"%(class_name)s.allow_future es False."
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr "Le data '%(datestr)s' es invalide secundo le formato '%(format)s'"
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Nulle %(verbose_name)s trovate que corresponde al consulta"
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr "Pagina non es 'last', ni pote esser convertite in un numero integre."
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr "Le lista es vacue e '%(class_name)s.allow_empty' es False."
diff --git a/django/conf/locale/id/LC_MESSAGES/django.mo b/django/conf/locale/id/LC_MESSAGES/django.mo
index 5f594f0f62..b24d2b8613 100644
Binary files a/django/conf/locale/id/LC_MESSAGES/django.mo and b/django/conf/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/id/LC_MESSAGES/django.po b/django/conf/locale/id/LC_MESSAGES/django.po
index 61c9fad046..e67456ae31 100644
--- a/django/conf/locale/id/LC_MESSAGES/django.po
+++ b/django/conf/locale/id/LC_MESSAGES/django.po
@@ -3,361 +3,381 @@
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # rodin <romihardiyanto@gmail.com>, 2011.
-#   <romihardiyanto@gmail.com>, 2011, 2012.
+#   <romihardiyanto@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+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: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arab"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaijani"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgaria"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnia"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalan"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Ceska"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Wales"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Denmark"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Jerman"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Yunani"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Inggris"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Inggris Britania"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Spanyol Argentina"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Spanyol Meksiko"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Spanyol Nikaragua"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonia"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Basque"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persia"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finlandia"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Perancis"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisia"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlandia"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galicia"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Ibrani"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroasia"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Hungaria"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesia"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandia"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italia"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Jepang"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgia"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazakhstan"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Korea"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lithuania"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latvia"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonia"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolia"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norwegia Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepal"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Belanda"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norwegia Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polandia"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugis"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Portugis Brazil"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Romania"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rusia"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovakia"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovenia"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albania"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbia"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbia Latin"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Swedia"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thailand"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turki"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Tatar"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainia"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Cina Sederhana"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Cina Tradisionil"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Masukkan nilai yang valid."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL ini tampaknya merupakan tautan rusak."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Masukkan alamat email yang valid."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Masukkan URL yang valid."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Masukkan alamat e-mail yang valid."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Masukkan 'slug' yang terdiri dari huruf, bilangan, garis bawah, atau tanda "
 "minus."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Masukkan alamat IPv4 yang valid."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Masukkan alamat IPv6 yang valid"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Masukkan alamat IPv4 atau IPv6 yang valid"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Hanya masukkan angka yang dipisahkan dengan koma."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Pastikan nilai ini %(limit_value)s (saat ini %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Pastikan nilai ini lebih kecil dari atau sama dengan %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Pastikan nilai ini lebih besar dari atau sama dengan %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +386,7 @@ msgstr ""
 "Pastikan nilai ini memiliki sedikitnya %(limit_value)d karakter (saat ini "
 "%(show_value)d karakter)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,81 +395,81 @@ msgstr ""
 "Pastikan nilai ini tidak memiliki lebih dari %(limit_value)d karakter (saat "
 "ini %(show_value)d karakter)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s harus unik untuk %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "dan"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 dengan %(field_label)s telah ada."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Nilai %r bukan pilihan yang valid."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Field ini tidak boleh null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Field ini tidak boleh kosong."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Field dengan tipe: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Bilangan Asli"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Nilai '%s' harus berupa bilangan asli."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Nilai '%s' harus bernilai True atau False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Nilai Boolean (Salah satu dari True atau False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (maksimum %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Bilangan asli yang dipisahkan dengan koma"
 
-#: db/models/fields/__init__.py:647
+#: 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 "Format nilai '%s' tidak valid. Format yang benar adalah YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 "Format nilai '%s' benar (YYYY-MM-DD) tetapi tanggalnya tidak valid."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Tanggal (tanpa waktu)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -458,7 +478,7 @@ msgstr ""
 "Format nilai '%s' tidak valid. Format yang benar adalah YYYY-MM-DD HH:MM[:ss"
 "[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -467,86 +487,86 @@ msgstr ""
 "Format nilai '%s' benar (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) tetapi tanggal/"
 "waktunya tidak valid."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Tanggal (dengan waktu)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Nilai '%s' harus berupa angka desimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Bilangan desimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Alamat email"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Lokasi berkas"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Nilai '%s' harus berupa bilangan real."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Bilangan 'floating point'"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Bilangan asli raksasa (8 byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Alamat IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Alamat IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Nilai '%s' harus bernilai None, True, atau False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (Salah satu dari True, False, atau None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Bilangan asli positif"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Bilangan asli kecil positif"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (hingga %(max_length)s karakter)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Bilangan asli kecil"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Teks"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 "Format nilai '%s' tidak valid. Format yang benar adalah HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -555,99 +575,99 @@ msgstr ""
 "Format nilai '%s' benar (HH:MM[:ss[.uuuuuu]]) tetapi nilai waktunya tidak "
 "valid."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Waktu"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Berkas"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Gambar"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s dengan pk %(pk)r tidak ada."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Kunci Asing (tipe tergantung dari bidang yang berkaitan)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Hubungan satu-ke-satu"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Hubungan banyak-ke-banyak"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Tekan \"Control\", atau \"Command\" pada Mac untuk memilih lebih dari satu."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Bidang ini tidak boleh kosong."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Masukkan keseluruhan angka bilangan."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Masukkan sebuah bilangan."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Pastikan jumlah angka pada bilangan tidak melebihi %s angka."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Pastikan bilangan tidak memiliki lebih dari %s angka desimal."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Pastikan jumlah angka sebelum desimal pada bilangan tidak memiliki lebih "
 "dari %s angka."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Masukkan tanggal yang valid."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Masukkan waktu yang valid."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Masukkan tanggal/waktu yang valid."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Tidak ada berkas yang dikirimkan. Periksa tipe pengaksaraan formulir."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Tidak ada berkas yang dikirimkan."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Berkas yang dikirimkan kosong."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -655,13 +675,13 @@ msgstr ""
 "Pastikan nama berkas ini tidak melebihi %(max)d karakter (saat ini "
 "%(length)d karakter)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Pilih antara mengirimkan berkas atau menghapus tanda centang pada kotak "
 "centang"
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -669,36 +689,40 @@ msgstr ""
 "Unggah gambar yang valid. Berkas yang Anda unggah bukan merupakan berkas "
 "gambar atau gambarnya rusak."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Masukkan URL yang valid."
+
+#: 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 ""
 "Masukkan pilihan yang valid. %(value)s bukan salah satu dari pilihan yang "
 "tersedia."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Masukkan beberapa nilai."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Urutan"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Hapus"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Perbaiki data ganda untuk %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Perbaiki data ganda untuk %(field)s yang nilainya harus unik."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -707,33 +731,33 @@ msgstr ""
 "Perbaiki data ganda untuk %(field_name)s yang nilainya harus unik untuk "
 "pencarian %(lookup)s pada %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Perbaiki nilai ganda di bawah ini."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Kunci asing 'inline' tidak cocok dengan kunci utama 'instance' milik induk."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Masukkan pilihan yang valid. Pilihan tersebut bukan salah satu dari pilihan "
 "yang tersedia."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Masukkan pilihan yang valid. %s bukan salah satu pilihan yang tersedia."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" bukan nilai yang benar untuk kunci utama."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -742,86 +766,86 @@ msgstr ""
 "%(datetime)s tidak dapat diinterpretasikan pada zona waktu "
 "%(current_timezone)s; mungkin nilainya ambigu atau mungkin tidak ada."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Saat ini"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Ubah"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Hapus"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ya"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Tidak"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ya,tidak,mungkin"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bita"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "tengah malam"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "siang"
 
@@ -1097,116 +1121,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Desember"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "atau"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "tahun"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "bulan"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "minggu"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "hari"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "jam"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "menit"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "menit"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Indeks direktori tidak diizinkan di sini."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" tidak ada"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Daftar isi %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s berhasil dibuat."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s berhasil diperbarui."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s telah dihapus."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Tidak ada tahun dipilih"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Tidak ada bulan dipilih"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Tidak ada hari dipilih"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Tidak ada minggu dipilih"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Tidak ada %(verbose_name_plural)s tersedia"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1215,28 +1224,28 @@ msgstr ""
 "%(verbose_name_plural)s di masa depan tidak tersedia karena %(class_name)s."
 "allow_future bernilai False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Teks tanggal tidak valid '%(datestr)s' dalam format '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Tidak ada %(verbose_name)s yang cocok dengan kueri"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Laman bukan yang 'terakhir' atau juga tidak dapat dikonversikan ke bilangan "
 "bulat."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Laman tidak valid (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Daftar kosong dan '%(class_name)s.allow_empty' bernilai False."
diff --git a/django/conf/locale/id/formats.py b/django/conf/locale/id/formats.py
index d609762117..d2a6ce6f4d 100644
--- a/django/conf/locale/id/formats.py
+++ b/django/conf/locale/id/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -29,15 +30,19 @@ TIME_INPUT_FORMATS = (
 
 DATETIME_INPUT_FORMATS = (
     '%d-%m-%Y %H.%M.%S',                # '25-10-2009 14.30.59'
+    '%d-%m-%Y %H.%M.%S.%f',             # '25-10-2009 14.30.59.000200'
     '%d-%m-%Y %H.%M',                   # '25-10-2009 14.30'
     '%d-%m-%Y',                         # '25-10-2009'
     '%d-%m-%y %H.%M.%S',                # '25-10-09' 14.30.59'
+    '%d-%m-%y %H.%M.%S.%f',             # '25-10-09' 14.30.59.000200'
     '%d-%m-%y %H.%M',                   # '25-10-09' 14.30'
     '%d-%m-%y',                         # '25-10-09''
     '%m/%d/%y %H.%M.%S',                # '10/25/06 14.30.59'
+    '%m/%d/%y %H.%M.%S.%f',             # '10/25/06 14.30.59.000200'
     '%m/%d/%y %H.%M',                   # '10/25/06 14.30'
     '%m/%d/%y',                         # '10/25/06'
     '%m/%d/%Y %H.%M.%S',                # '25/10/2009 14.30.59'
+    '%m/%d/%Y %H.%M.%S.%f',             # '25/10/2009 14.30.59.000200'
     '%m/%d/%Y %H.%M',                   # '25/10/2009 14.30'
     '%m/%d/%Y',                         # '10/25/2009'
 )
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 19083838bd..d559491cd1 100644
Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index b90ba2f346..606514c882 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.po
+++ b/django/conf/locale/is/LC_MESSAGES/django.po
@@ -9,359 +9,379 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:30+0100\n"
-"PO-Revision-Date: 2012-03-19 14:44+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arabíska"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Aserbaídsjíska"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Búlgarska"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalska"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosníska"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalónska"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tékkneska"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Velska"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danska"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Þýska"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Gríska"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Enska"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Bresk enska"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spænska"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentínsk spænska"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mexíkósk Spænska"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Níkaragva spænska"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Eistland"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskneska"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persneska"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finnska"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Franska"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frísneska"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Írska"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galíska"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebreska"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindí"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Króatíska"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Ungverska"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indónesíska"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Íslenska"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Ítalska"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japanska"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgíska"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Kmeríska"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannadanska"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Kóreska"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litháenska"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Lettneska"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedónska"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malajalamska"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongólska"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norska bókmál"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Hollenska"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Nýnorska"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Púndjabíska"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Pólska"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portúgalska"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brasilísk Portúgalska"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rúmenska"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rússneska"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slóvaska"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slóvenska"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanska"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbneska"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbnesk latína"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Sænska"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamílska"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telúgúska"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tælenska"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Tyrkneska"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Úkraínska"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Úrdú"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Víetnamska"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Einfölduð kínverska "
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Hefðbundin kínverska"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Sláðu inn gilt gildi."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Síðan á þessari slóð lítur út fyrir að skila villu."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Sláðu inn gilt veffang (URL)."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Sláðu inn gilt tölvupóstfang."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Settu inn gildan vefslóðartitil sem samanstendur af latneskum bókstöfum, "
 "númerin, undirstrikum og bandstrikum."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Sláðu inn gilda IPv4 tölu."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Sláðu inn gilt IPv6 vistfang."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Sláðu inn gilt IPv4 eða IPv6 vistfang."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Skrifaðu einungis tölur aðskildar með kommum."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Gakktu úr skugga um að gildi sé %(limit_value)s (það er %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Gakktu úr skugga um að gildið sé minna en eða jafnt og %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Gakktu úr skugga um að gildið sé stærra en eða jafnt og %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -370,7 +390,7 @@ msgstr ""
 "Gakktu úr skugga um að þetta gildi hafi a.m.k. %(limit_value)d stafi (it has "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -379,83 +399,83 @@ msgstr ""
 "Gakktu úr skugga um að þetta gildi hafi í mesta lagi %(limit_value)d stafi "
 "(it has %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(field_name)s verður að vera einkvæmt fyrir %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "og"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 með þetta %(field_label)s er nú þegar til."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Gildið %r er ógilt."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Þessi reitur getur ekki haft tómgildi (null)."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Þessi reitur má ekki vera tómur."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Reitur af gerð: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Heiltala"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Gildi '%s' verður að vera heiltala."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Gildi '%s' verður að vera annaðhvort satt eða ósatt."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boole-gildi (True eða False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Strengur (mest %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Heiltölur aðgreindar með kommum"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Gildi '%s' er ógilt dagsetningarsnið. Það verður að vera á ÁÁÁÁ-MM-DD sniði."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 "Gildi '%s' hefur rétt snið (ÁÁÁÁ-MM-DD) en dagsetningin er ógild."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dagsetning (án tíma)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -464,7 +484,7 @@ msgstr ""
 "Gildi '%s' hefur ógilt snið. Það verður að vera á sniðinu: ÁÁÁÁ-MM-DD KK:MM "
 "[:ss[.uuuuuu]] [TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -473,79 +493,79 @@ msgstr ""
 "Gildi '%s' hefur rétt snið (YYYY-MM-DD HH:MM [:ss[.uuuuuu]] [TZ]) en það er "
 "ógild dagsetning / tími."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dagsetning (með tíma)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Gildi '%s' verður að vera heiltala."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Tugatala"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Tölvupóstfang"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Netfang"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Skjalaslóð"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Gildi '%s' verður að vera fleytitala."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Fleytitala (floating point number)"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Stór (8 bæta) heiltala"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 vistfang"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP tala"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Gildi '%s' verða að vera eitt eftirtalinna: None, True eða False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boole-gildi (True, False eða None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Jákvæð heiltala"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Jákvæð lítil heiltala"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slögg (allt að %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Lítil heiltala"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Texti"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -553,7 +573,7 @@ msgstr ""
 "Gildi '%s' er á ógildu sniði. Það verður að vera á sniðinu HH: MM [: ss [."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -561,107 +581,107 @@ msgid ""
 msgstr ""
 "Gildi '%s' er á réttu sniði (HH:MM[:ss[.uuuuuu]]), en gildið er ekki gilt."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Tími"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "Veffang"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Skrá"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Mynd"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Módel %(model)s með lykil %(pk)r er ekki til."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Ytri lykill (Gerð ákveðin af skyldum reit)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Einn-á-einn samband."
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Margir-til-margra samband."
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Haltu inni „Control“, eða „Command“ á Mac til þess að velja fleira en eitt."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Þennan reit þarf að fylla út."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Sláðu inn heila tölu."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Sláðu inn heila tölu."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Gildið má ekki hafa fleiri en %s tölur."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Gildið má ekki hafa meira en %s tugatölustafi (decimal places)."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Gildið má ekki hafa fleiri en %s tölur fyrir tugabrotskil."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Sláðu inn gilda dagsetningu."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Sláðu inn gilda tímasetningu."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Sláðu inn gilda dagsetningu ásamt tíma."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Engin skrá var send. Athugaðu kótunartegund á forminu (encoding type)."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Engin skrá var send."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Innsend skrá er tóm."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr "Gildið má ekki hafa fleiri en %(max)d stafi (gildið hefur %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Vinsamlegast sendu annað hvort inn skrá eða merktu í boxið, ekki bæði."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -669,36 +689,40 @@ msgstr ""
 "Halaðu upp gildri myndskrá. Skráin sem þú halaðir upp var annað hvort gölluð "
 "eða ekki mynd."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Sláðu inn gilt veffang (URL)."
+
+#: 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 ""
 "Veldu gildan valmöguleika. %(value)s er ekki eitt af gildum valmöguleikum."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Sláðu inn lista af gildum."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Röð"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Eyða"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Vinsamlegast leiðréttu tvítekin gögn í reit %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Vinsamlegast lagfærðu gögn í reit %(field)s, sem verða að vera einstök."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -707,31 +731,31 @@ msgstr ""
 "Vinsamlegast leiðréttu tvítekin gögn í reit %(field_name)s sem verða að vera "
 "einstök fyrir %(lookup)s í %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Vinsamlegast lagfærðu tvítöldu gögnin fyrir neðan."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Ytri lykill virðist ekki passa við aðallykil eiganda."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Veldu gildan valmöguleika. Valið virðist ekki vera eitt af gildum "
 "valmöguleikum."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Veldu gildan valmöguleika. %s er ekki einn af gildum valmöguleikum."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" er ekki gilt sem lykill."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -740,87 +764,87 @@ msgstr ""
 "%(datetime)s er ekki hægt að túlka í tímabelti %(current_timezone)s, það "
 "getur verið óljóst eða að það er ekki til."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Eins og er:"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Breyta"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Hreinsa"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Já"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nei"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "já,nei,kannski"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bæti"
 msgstr[1] "%(size)d bæti"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "eftirmiðdegi"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "morgun"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "Eftirmiðdegi"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "Morgun"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "miðnætti"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "hádegi"
 
@@ -1096,122 +1120,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Desember"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "eða"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ár"
 msgstr[1] "ár"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mánuður"
 msgstr[1] "mánuðir"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "vika"
 msgstr[1] "vikur"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dagur"
 msgstr[1] "dagar"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "klukkutími"
 msgstr[1] "klukkutímar"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "mínúta"
 msgstr[1] "mínútur"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "mínútur"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Möppulistar eru ekki leyfðir hér."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" er ekki til"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Innihald %(directory)s "
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s var fært inn."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s var uppfært."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s var eytt."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Ekkert ár tilgreint"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Enginn mánuður tilgreindur"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Enginn dagur tilgreindur"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Engin vika tilgreind"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Ekkert %(verbose_name_plural)s í boði."
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1220,26 +1229,26 @@ msgstr ""
 "Framtíðar %(verbose_name_plural)s ekki í boði því %(class_name)s."
 "allow_future er Ósatt."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Ógilt snið dagsetningar \"%(datestr)s\" gefið sniðið \"%(format)s\""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Ekkert %(verbose_name)s sem uppfyllir skilyrði"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Þetta er hvorki síðasta síða, né er hægt að breyta í heiltölu."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ógild síða (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Tómur listi og '%(class_name)s.allow_empty er Ósatt."
diff --git a/django/conf/locale/is/formats.py b/django/conf/locale/is/formats.py
index e7f3418fb1..90f251abe7 100644
--- a/django/conf/locale/is/formats.py
+++ b/django/conf/locale/is/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 15bb37daa9..3225a5eb2e 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index bdbdec6752..db54c2954c 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -4,362 +4,382 @@
 # C8E <C8E@miron.it>, 2011.
 # Denis Darii <sinednx@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nicola Larosa <transifex@teknico.net>, 2011, 2012.
+# Nicola Larosa <transifex@teknico.net>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+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: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\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 "arabo"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azero"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "bulgaro"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Bielorusso"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretone"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosniaco"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "catalano"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "ceco"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "gallese"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "danese"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "tedesco"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "greco"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "inglese"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "inglese britannico"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "spagnolo"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "spagnolo argentino"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Spagnolo messicano"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Spagnolo nicaraguense"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Spagnolo venezuelano"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estone"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "basco"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persiano"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "finlandese"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francese"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frisone"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irlandese"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galiziano"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ebraico"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "croato"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ungherese"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonesiano"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandese"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "italiano"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "giapponese"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "georgiano"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazakh"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "coreano"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Lussemburghese"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "lituano"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "lettone"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "macedone"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongolo"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "norvegese bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepali"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "olandese"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "norvegese nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "polacco"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portoghese"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "brasiliano portoghese"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumeno"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "russo"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "slovacco"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "sloveno"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albanese"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "serbo"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "serbo latino"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "svedese"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "tailandese"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turco"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatar"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ucraino"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vietnamita"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "cinese semplificato"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "cinese tradizionale"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Inserisci un valore valido."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Questa URL non sembra funzionare."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Inserisci un indirizzo email valido."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Inserisci una URL valida."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Inserisci un indirizzo e-mail valido."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o "
 "trattini."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Inserisci un indirizzo IPv4 valido."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Inserisci un indirizzo IPv6 valido."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Inserisci un indirizzo IPv4 o IPv6 valido."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Inserisci solo cifre separate da virgole."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Assicurati che questo valore sia %(limit_value)s (ora è %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Assicurati che questo valore sia minore o uguale a %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Assicuratii che questo valore sia maggiore o uguale a %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -368,7 +388,7 @@ msgstr ""
 "Assicurati che questo valore contenga almeno %(limit_value)d caratteri (ne "
 "ha %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -377,84 +397,84 @@ msgstr ""
 "Assicuratii che questo valore non contenga più di %(limit_value)d caratteri "
 "(ne ha %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s deve essere unico per %(lookup)s %(date_field)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "e"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 con questo %(field_label)s esiste già."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Il valore %r non è una scelta valida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Questo campo non può essere nullo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Questo campo non può essere vuoto."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo di tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Intero"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Il valore '%s' deve essere un numero intero."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Il valore '%s' deve essere True o False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (True o False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Stringa (fino a %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Interi separati da virgole"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Il valore '%s' ha un formato di data non valido. Deve essere nel formato "
 "AAAA-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 "Il valore '%s' ha il formato corretto (AAAA-MM-DD), ma è una data non valida."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Data (senza ora)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -463,7 +483,7 @@ msgstr ""
 "Il valore '%s' ha un formato non valido. Deve essere nel formato AAAA-MM-GG "
 "HH:MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -472,79 +492,79 @@ msgstr ""
 "Il valore '%s' ha il formato corretto (AAAA-MM-GG HH:MM[:ss[.uuuuuu]][TZ]), "
 "ma è una data/ora non valida."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Data (con ora)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Il valore '%s' deve essere un numero decimale."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Numero decimale"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Indirizzo e-mail"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Indirizzo email"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Percorso di file"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Il valore '%s' deve essere un numero in virgola mobile."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Numero decimale"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Intero grande (8 byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Indirizzo IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Il valore '%s' deve essere None, True o False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (True, False o None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Intero positivo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Piccolo intero positivo"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (fino a %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Piccolo intero"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Testo"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -552,7 +572,7 @@ msgstr ""
 "Il valore '%s' ha un formato non valido. Deve essere nel formato HH:MM[:ss[."
 "uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -561,98 +581,98 @@ msgstr ""
 "Il valore '%s' ha il formato corretto (HH:MM[:ss[.uuuuuu]][TZ]), ma è una "
 "data/ora non valida."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Ora"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "File"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Immagine"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Il modello %(model)s con chiave primaria %(pk)r non esiste."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Foreign Key (tipo determinato dal campo collegato)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relazione uno a uno"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relazione molti a molti"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Questo campo è obbligatorio."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Inserisci un numero intero."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Inserisci un numero."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Assicurati che non vi siano più di %s cifre in totale."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Assicurati che non vi siano più di %s cifre decimali."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Assicurati che non vi siano più di %s cifre prima della virgola."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Inserisci una data valida."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Inserisci un'ora valida."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Inserisci una data/ora valida."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Non è stato inviato alcun file. Verifica il tipo di codifica sulla form."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Nessun file è stato inviato."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Il file inviato è vuoto."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -660,48 +680,52 @@ msgstr ""
 "Assicurati che questo nome di file non contenga più di %(max)d caratteri (ne "
 "ha %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "È possibile inviare un file o selezionare la casella \"svuota\", ma non "
 "entrambi."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 "Carica un'immagine valida. Il file caricato non è un'immagine o è corrotto."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Inserisci una URL valida."
+
+#: 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 ""
 "Scegli un'opzione valida. %(value)s non compare tra quelle disponibili."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Inserisci una lista di valori."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordine"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Cancella"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Correggi i dati duplicati di %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Correggi i dati duplicati di %(field)s, che deve essere unico."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -710,32 +734,32 @@ msgstr ""
 "Correggi i dati duplicati di %(field_name)s che deve essere unico/a per "
 "%(lookup)s in %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Correggi i dati duplicati qui sotto."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "La foreign key inline non concorda con la chiave primaria dell'istanza padre."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Scegli un'opzione valida. La scelta effettuata non compare tra quelle "
 "disponibili."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Scegli un'opzione valida. %s non compare tra quelle disponibili."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" non è un valore valido per una chiave primaria."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -744,87 +768,87 @@ msgstr ""
 " %(datetime)s non può essere interpretato nel fuso orario "
 "%(current_timezone)s: potrebbe essere ambiguo o non esistere."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Attualmente"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modifica"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Svuota"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Sì"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "No"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "sì,no,forse"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d byte"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "mezzanotte"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "mezzogiorno"
 
@@ -1100,122 +1124,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Dicembre"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr " %(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "o"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "anno"
 msgstr[1] "anni"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mese"
 msgstr[1] "mesi"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "settimana"
 msgstr[1] "settimane"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "giorno"
 msgstr[1] "giorni"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ora"
 msgstr[1] "ore"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minuti"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuti"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Indici di directory non sono consentiti qui."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" non esiste"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Indice di %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s creato/a correttamente."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s aggiornato/a correttamente."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s cancellato/a."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Anno non specificato"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Mese non specificato"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Giorno non specificato"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Settimana non specificata"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Nessun %(verbose_name_plural)s disponibile"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1224,26 +1233,26 @@ msgstr ""
 "%(verbose_name_plural)s futuri/e non disponibili/e poichè %(class_name)s."
 "allow_future è False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Data non valida '%(datestr)s' con il formato '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Trovato nessun %(verbose_name)s corrispondente alla query"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "La pagina non è 'ultima', né può essere convertita in un int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Pagina non valida (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Pagina non valida (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Elenco vuoto e '%(class_name)s.allow_empty' è False."
diff --git a/django/conf/locale/it/formats.py b/django/conf/locale/it/formats.py
index de81fa6cdf..b12e478ccb 100644
--- a/django/conf/locale/it/formats.py
+++ b/django/conf/locale/it/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -22,18 +23,23 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59'
+    '%d/%m/%Y %H:%M:%S.%f',  # '25/10/2006 14:30:59.000200'
     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30'
     '%d/%m/%Y',              # '25/10/2006'
     '%d/%m/%y %H:%M:%S',     # '25/10/06 14:30:59'
+    '%d/%m/%y %H:%M:%S.%f',  # '25/10/06 14:30:59.000200'
     '%d/%m/%y %H:%M',        # '25/10/06 14:30'
     '%d/%m/%y',              # '25/10/06'
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%d-%m-%Y %H:%M:%S',     # '25-10-2006 14:30:59'
+    '%d-%m-%Y %H:%M:%S.%f',  # '25-10-2006 14:30:59.000200'
     '%d-%m-%Y %H:%M',        # '25-10-2006 14:30'
     '%d-%m-%Y',              # '25-10-2006'
     '%d-%m-%y %H:%M:%S',     # '25-10-06 14:30:59'
+    '%d-%m-%y %H:%M:%S.%f',  # '25-10-06 14:30:59.000200'
     '%d-%m-%y %H:%M',        # '25-10-06 14:30'
     '%d-%m-%y',              # '25-10-06'
 )
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
index 54339ff54a..9947789698 100644
Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po
index 217dca9181..2af7d82a3f 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -8,356 +8,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+0100\n"
-"PO-Revision-Date: 2012-03-08 14:54+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "ベンガル語"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "ボスニア語"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "カタロニア語"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "チェコ語"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "ウェールズ語"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "ドイツ語"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "ギリシャ語"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "英語(米国)"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "英語(英国)"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "エスペラント語"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "アルゼンチンスペイン語"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "メキシコスペイン語"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "ニカラグアスペイン語"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "エストニア語"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "バスク語"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "ペルシア語"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "フランス語"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "フリジア語"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "アイルランド語"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "ガリシア語"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "ヒンディー語"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "クロアチア語"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "インドネシア語"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "アイスランド語"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "イタリア語"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "日本語"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "グルジア語"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "カザフ語"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "クメール語"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "カンナダ語"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "韓国語"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "ラトビア語"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "マケドニア語"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "マラヤーラム語"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "モンゴル語"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "ノルウェーのブークモール"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "ネパール語"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "ノルウェーのニーノシュク"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "パンジャブ語"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "ブラジルポルトガル語"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "ロシア語"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "スロヴェニア語"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "アルバニア語"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "セルビア語ラテン文字"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "スワヒリ語"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "タミル語"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "テルグ語"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "タイ語"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "タタール語"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "ウルドゥー語"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "値を正しく入力してください。"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "このURLはリンクが壊れています。"
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "URLを正しく入力してください。"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "有効なメールアドレスを入力してください。"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "slug には半角の英数字、アンダースコア、ハイフン以外は使用できません。"
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "有効なIPアドレス (IPv4) を入力してください。"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "IPv6の正しいアドレスを入力してください。"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "IPv4またはIPv6の正しいアドレスを入力してください。"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "カンマ区切りの数字だけを入力してください。"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "この値は %(limit_value)s 以下でなければなりません。"
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "この値は %(limit_value)s 以上でなければなりません。"
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +386,7 @@ msgstr ""
 "%(limit_value)d 字以上で入力してください(実際には %(show_value)d 文字でし"
 "た)。"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,274 +395,279 @@ msgstr ""
 "%(limit_value)d 字以下で入力してください(実際には %(show_value)d 文字でし"
 "た)。"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(date_field)s %(lookup)s では %(field_name)s がユニークである必要がありま"
 "す。"
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "と"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "この %(field_label)s を持った %(model_name)s が既に存在します。"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r は有効な選択肢ではありません。"
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "このフィールドには NULL を指定できません。"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "このフィールドは空ではいけません。"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "タイプが %(field_type)s のフィールド"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "整数"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' は整数値にしなければなりません。"
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' は真偽値にしなければなりません。"
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "ブール値 (真: True または偽: False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "文字列 ( %(max_length)s 字まで )"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "カンマ区切りの整数"
 
-#: db/models/fields/__init__.py:647
+#: 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' は無効な日付形式です。YYYY-MM-DD形式にしなければなりません。"
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' は有効な日付形式(YYYY-MM-DD)ですが、日付が不正です。"
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "日付"
 
-#: db/models/fields/__init__.py:732
+#: 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' は無効な形式の値です。 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 形式でなければ"
+"なりません。"
 
-#: db/models/fields/__init__.py:736
+#: 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' は正しい形式(YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ])の値ですが、無効な日時で"
+"す。"
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "日時"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' は10進浮動小数値にしなければなりません。"
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "10 進数 (小数可)"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "メールアドレス"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "ファイルの場所"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' は小数値にしなければなりません。"
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "浮動小数点"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "大きな(8バイト)整数"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4アドレス"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP アドレス"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "'%s' はNone、TrueまたはFalseの値でなければなりません。"
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "ブール値 (真: True 、偽: False または None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "正の整数"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "小さな正の整数"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "スラグ(%(max_length)s文字以内)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "小さな整数"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "テキスト"
 
-#: db/models/fields/__init__.py:1180
+#: 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' は無効な形式の値です。 HH:MM[:ss[.uuuuuu]] 形式でなければなりません。"
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
+msgstr "'%s' は正しい形式(HH:MM[:ss[.uuuuuu]])ですが、無効な時刻です。"
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "時刻"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "ファイル"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "画像"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "主キーが %(pk)r である %(model)s モデルは存在しません。"
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "外部キー(型は関連フィールドによって決まります)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "1対1の関連"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "多対多の関連"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "複数選択するときには Control キーを押したまま選択してください。Mac は "
 "Command キーを使ってください"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "このフィールドは必須です。"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "整数を入力してください。"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "整数を入力してください。"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "整数部と少数部を併せて %s 桁までで入力して下さい。"
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "少数部は %s 桁までで入力して下さい。"
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "整数部は %s 桁までで入力して下さい。"
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "日付を正しく入力してください。"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "時間を正しく入力してください。"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "日付/時間を正しく入力してください。"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "ファイルが取得できませんでした。formのencoding typeを確認してください。"
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "ファイルが送信されていません。"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "入力されたファイルは空です。"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -650,13 +675,13 @@ msgstr ""
 "ファイル名は %(max)d 字以上で入力してください( %(length)d 文字入力されまし"
 "た)。"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "ファイルを投稿するか、クリアチェックボックスをチェックするかどちらかを選択し"
 "てください。両方とも行ってはいけません。"
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -664,36 +689,40 @@ msgstr ""
 "画像をアップロードしてください。アップロードしたファイルは画像でないか、また"
 "は壊れています。"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "URLを正しく入力してください。"
+
+#: 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 "正しく選択してください。 %(value)s は候補にありません。"
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "リストを入力してください。"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "並び変え"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "削除"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "%(field)s の重複したデータを修正してください。"
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "%(field)s の重複したデータを修正してください。このフィールドはユニークである"
 "必要があります。"
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -702,115 +731,117 @@ msgstr ""
 "%(field_name)s の重複したデータを修正してください。%(date_field)s %(lookup)s "
 "では %(field_name)s がユニークである必要があります。"
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "下記の重複したデータを修正してください。"
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "インライン外部キーが親インスタンスの主キーと一致しません。"
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "正しく選択してください。選択したものは候補にありません。"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "正しく選択してください。 %s は候補にありません。"
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" はプライマリキーとして無効な値です。"
 
-#: forms/util.py:70
+#: 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 は%(current_timezone)sのタイムゾーンでは解釈できませんでした。そ"
+"れは曖昧であるか、存在しない可能性があります。"
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "現在"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "変更"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "クリア"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "不明"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "はい"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "いいえ"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "はい,いいえ,たぶん"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d バイト"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "0時"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "12時"
 
@@ -1086,142 +1117,129 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "12月"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "または"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "年"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "ヶ月"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "週間"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "分"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Directory indexes are not allowed here."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" does not exist"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Index of %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s を作成しました。"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s を更新しました。"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr " %(verbose_name)s を削除しました。"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "年が未指定です"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "月が未指定です"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "日が未指定です"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "週が未指定です"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "%(verbose_name_plural)s は利用できません"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
+"%(class_name)s.allow_futureがFalseであるため、未来の%(verbose_name_plural)sは"
+"利用できません。"
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "指定された形式 '%(format)s' では '%(datestr)s' は無効な日付文字列です"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "クエリーに一致する %(verbose_name)s は見つかりませんでした"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "ページは数値に変換できる値、または 'last' ではありません。"
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "空の一覧かつ '%(class_name)s.allow_empty' がFalseです。"
diff --git a/django/conf/locale/ka/LC_MESSAGES/django.mo b/django/conf/locale/ka/LC_MESSAGES/django.mo
index 5977cd0b90..ce14158d09 100644
Binary files a/django/conf/locale/ka/LC_MESSAGES/django.mo and b/django/conf/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ka/LC_MESSAGES/django.po b/django/conf/locale/ka/LC_MESSAGES/django.po
index f8bc69859a..23a00de29f 100644
--- a/django/conf/locale/ka/LC_MESSAGES/django.po
+++ b/django/conf/locale/ka/LC_MESSAGES/django.po
@@ -1,362 +1,383 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # avsd05 <avsd05@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: avsd05 <avsd05@gmail.com>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-03-02 08:50+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "აფრიკაანსი"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "არაბული"
 
-#: conf/global_settings.py:49
-msgid "Azerbaijani"
-msgstr ""
-
 #: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "აზერბაიჯანული"
+
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "ბულგარული"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "ბელარუსული"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "ბენგალიური"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "ბრეტონული"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "ბოსნიური"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "კატალანური"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "ჩეხური"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "უელსური"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "დანიური"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "გერმანული"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "ბერძნული"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "ინგლისური"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "ბრიტანეთის ინგლისური"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "ესპერანტო"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "ესპანური"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "არგენტინის ესპანური"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
-msgstr ""
+msgstr "მექსიკური ესპანური"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
-msgstr ""
+msgstr "ნიკარაგუული ესპანური"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "ვენესუელის ესპანური"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "ესტონური"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "ბასკური"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "სპარსული"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "ფინური"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ფრანგული"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "ფრისიული"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ირლანდიური"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "გალიციური"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ებრაული"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "ჰინდი"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "ხორვატიული"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "უნგრული"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "ინტერლინგუა"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "ინდონეზიური"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "ისლანდიური"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "იტალიური"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "იაპონური"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "ქართული"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "ყაზახური"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "ხმერული"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "კანნადა"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "კორეული"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "ლუქსემბურგული"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "ლიტვური"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "ლატვიური"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "მაკედონიური"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "მალაიზიური"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "მონღოლური"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "ნორვეგიული-ბოკმალი"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "ნეპალური"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "ჰოლანდიური"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "ნორვეგიული-ნინორსკი"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "პუნჯაბი"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "პოლონური"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "პორტუგალიური"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "ბრაზილიური პორტუგალიური"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "რუმინული"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "რუსული"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "სლოვაკური"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "სლოვენიური"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "ალბანური"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "სერბული"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "სერბული (ლათინური)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "შვედური"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "სუაჰილი"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "თამილური"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "ტელუგუ"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "ტაი"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "თურქული"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "თათრული"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "უდმურტული"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "უკრაინული"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
-msgstr ""
+msgstr "ურდუ"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "ვიეტნამური"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "გამარტივებული ჩინური"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "ტრადიციული ჩინური"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "შეიყვანეთ სწორი მნიშვნელობა."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "როგორც ჩანს, URL არის გაწყვეტილი ბმული."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "შეიყვანეთ მართებული ელფოსტის მისამართი."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "შეიყვანეთ სწორი URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "შეიყვანეთ სწორი ელ. ფოსტის მისამართი."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "შეიყვანეთ სწორი 'slug'-მნიშვნელობა, რომელიც შეიცავს მხოლოდ ასოებს, ციფრებს, "
 "ხაზგასმის ნიშნებს და დეფისებს."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "შეიყვანეთ სწორი IPv4 მისამართი."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
-msgstr ""
+msgstr "შეიყვანეთ მართებული IPv6 მისამართი."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "შეიყვანეთ მართებული IPv4 ან IPv6 მისამართი."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "შეიყვანეთ მხოლოდ მძიმეებით გამოყოფილი ციფრები."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "მნიშვნელობა უნდა იყოს %(limit_value)s-ზე ნაკლები ან ტოლი."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "მნიშვნელობა უნდა იყოს %(limit_value)s-ზე მეტი ან ტოლი."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -365,7 +386,7 @@ msgstr ""
 "მნიშვნელობა უნდა შეიცავდეს სულ მცირე %(limit_value)d სიმბოლოს (იგი შეიცავს "
 "%(show_value)d-ს)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -374,272 +395,272 @@ msgstr ""
 "მნიშვნელობა უნდა შეიცავდეს არაუმეტეს %(limit_value)d სიმბოლოს (იგი შეიცავს "
 "%(show_value)d-ს)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "და"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 მოცემული %(field_label)s-ით უკვე არსებობს."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "მნიშვნელობა %r არ არის დასაშვები."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "ეს ველი არ შეიძლება იყოს null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "ეს ველი არ შეიძლება იყოს ცარიელი."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "ველის ტიპი: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "მთელი"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
-msgstr ""
+msgstr "მნიშვნელობა '%s' უნდა იყოს მთელი რიცხვი."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "მნიშვნელობა '%s' უნდა იყოს True ან False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "ლოგიკური (True ან False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "სტრიქონი (%(max_length)s სიმბოლომდე)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "მძიმით გამოყოფილი მთელი რიცხვები"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "თარიღი (დროის გარეშე)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "თარიღი (დროსთან ერთად)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "მნიშვნელობა '%s' უნდა იყოს ათობითი რიცხვი."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "ათობითი რიცხვი"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "ელ. ფოსტის მისამართი"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "გზა ფაილისაკენ"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
-msgstr ""
+msgstr "მნიშვნელობა '%s' უნდა იყოს ათწილადი."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "რიცხვი მცოცავი წერტილით"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "დიდი მთელი (8-ბაიტიანი)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "IPv4 მისამართი"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-მისამართი"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "მნიშვნელობა '%s' უნდა იყოს None, True ან False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "ლოგიკური (True, False ან None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "დადებითი მთელი რიცხვი"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "დადებითი პატარა მთელი რიცხვი"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "სლაგი (%(max_length)s-მდე)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "პატარა მთელი რიცხვი"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "ტექსტი"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "დრო"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "ფაილი"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "გამოსახულება"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "მოდელი %(model)s პირველადი გასაღებით %(pk)r არ არსებობს."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "გარე გასაღები (ტიპი განისაზღვრება დაკავშირებული ველის ტიპით)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "კავშირი ერთი-ერთტან"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "კავშირი მრავალი-მრავალთან"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "დააჭირეთ \"Control\", ან \"Command\" Mac-ზე, ერთზე მეტი მნიშვნელობის "
 "ასარჩევად."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "ეს ველი აუცილებელია."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "შეიყვანეთ მთელი რიცხვი"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "შეიყვანეთ რიცხვი."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "დარწმუნდით, რომ მნიშვნელობა %s თანრიგს არ აღემატება."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "დარწმუნდით, რომ წილადი ნაწილი %s თანრიგს არ აღემატება."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "დარწმუნდით, რომ მთელი ნაწილი %s თანრიგს არ აღემატება."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "შეიყვანეთ სწორი თარიღი."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "შეიყვანეთ სწორი დრო."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "შეიყვანეთ სწორი თარიღი და დრო."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "ფაილი არ იყო გამოგზავნილი. შეამოწმეთ კოდირების ტიპი მოცემული ფორმისათვის."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "ფაილი არ იყო გამოგზავნილი."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "გამოგზავნილი ფაილი ცარიელია."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -647,11 +668,11 @@ msgstr ""
 "ფაილის სახელი უნდა შედგებოდეს არაუმეტეს %(max)d სიმბოლოსაგან (იგი შეიცავს "
 "%(length)d-ს)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "ან გამოგზავნეთ ფაილი, ან მონიშნეთ \"წაშლის\" დროშა."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -659,36 +680,40 @@ msgstr ""
 "ატვირთეთ დასაშვები გამოსახულება. თქვენს მიერ გამოგზავნილი ფაილი ან არ არის "
 "გამოსახულება, ან დაზიანებულია."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "შეიყვანეთ სწორი URL."
+
+#: 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 "აირჩიეთ დასაშვები მნიშვნელობა. %(value)s დასაშვები არ არის."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "შეიყვანეთ მნიშვნელობების სია."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "დალაგება"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "წავშალოთ"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "გთხოვთ, შეასწოროთ დუბლირებული მონაცემები %(field)s-თვის."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობა %(field)s ველისთვის, რომელიც უნდა "
 "იყოს უნიკალური."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -697,115 +722,115 @@ msgstr ""
 "გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობა %(field_name)s ველისთვის, რომელიც "
 "უნდა იყოს უნიკალური %(lookup)s-ზე, %(date_field)s-თვის."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობები."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "გარე გასაღების მნიშვნელობა მშობლის პირველად გასაღებს არ ემთხვევა."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "აირჩიეთ დასაშვები მნიშვნელობა. ეს არჩევანი დასაშვები არ არის."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "აირჩიეთ დასაშვები მნიშვნელობა. %s დასაშვები არ არის."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" არ არის დასაშვები მნიშვნელობა პირველადი გასაღებისათვის."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "ამჟამად"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "შეცვლა"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "წაშლა"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "გაურკვეველი"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "კი"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "არა"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "კი,არა,შესაძლოა"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d ბაიტი"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s კბ"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s მბ"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s გბ"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s ტბ"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s პბ"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "შუაღამე"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "შუადღე"
 
@@ -1081,142 +1106,130 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "დეკემბერი"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ან"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "წელი"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "თვე"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "კვირა"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "დღე"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "საათი"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "წუთი"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "წუთი"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" არ არსებობს"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s წარმატებით შეიქმნა."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s წარმატებით შეიცვალა."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s წაიშალა."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
-msgstr ""
+msgstr "არ არის მითითებული წელი"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
-msgstr ""
+msgstr "არ არის მითითებული თვე"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
-msgstr ""
+msgstr "არ არის მითითებული დღე"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
-msgstr ""
+msgstr "არ არის მითითებული კვირა"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "%(verbose_name_plural)s არ არსებობს"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, 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:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
+"არასწორი თარიღის სტრიქონი '%(datestr)s' გამომდინარე ფორმატიდან '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "არ მოიძებნა არცერთი მოთხოვნის თანმხვედრი %(verbose_name)s"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "ცარიელი სია და '%(class_name)s.allow_empty' არის False."
diff --git a/django/conf/locale/ka/formats.py b/django/conf/locale/ka/formats.py
index c3552e0661..bb26bec6be 100644
--- a/django/conf/locale/ka/formats.py
+++ b/django/conf/locale/ka/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -24,18 +25,23 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%d.%m.%Y %H:%M:%S',     # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',        # '25.10.2006 14:30'
     '%d.%m.%Y',              # '25.10.2006'
     '%d.%m.%y %H:%M:%S',     # '25.10.06 14:30:59'
+    '%d.%m.%y %H:%M:%S.%f',  # '25.10.06 14:30:59.000200'
     '%d.%m.%y %H:%M',        # '25.10.06 14:30'
     '%d.%m.%y',              # '25.10.06'
     '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
+    '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
     '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
     '%m/%d/%Y',              # '10/25/2006'
     '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
+    '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
     '%m/%d/%y',              # '10/25/06'
 )
diff --git a/django/conf/locale/kk/LC_MESSAGES/django.mo b/django/conf/locale/kk/LC_MESSAGES/django.mo
index 8bbd2ae62b..d6653745e4 100644
Binary files a/django/conf/locale/kk/LC_MESSAGES/django.mo and b/django/conf/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/kk/LC_MESSAGES/django.po b/django/conf/locale/kk/LC_MESSAGES/django.po
index 4ddae0d045..4f9cd782be 100644
--- a/django/conf/locale/kk/LC_MESSAGES/django.po
+++ b/django/conf/locale/kk/LC_MESSAGES/django.po
@@ -8,359 +8,379 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+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: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Бенгал"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Босния"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Каталан"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Чех"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Валлий"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Дания"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Неміс"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Грек"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Ағылшын"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Британдық ағылшын"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Испан"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Аргентиналық испан"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Мексикалық испан"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Никарагуа испан"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Эстон"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Баск"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Парсы"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Фин"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Француз"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Фриз"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Ирландия"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Галиц"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Хинди"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Кроат"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Венгрия"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Индонезия"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Исладия"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Итальян"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Жапон"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Грузин"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Кхмер"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Канада"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Корей"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Литва"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Латвия"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Македон"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Малаялам"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Монғол"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Норвегиялық букмол"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Дат"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Норвегиялық нюнор"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Пенджаб"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Поляк"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Португал"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Бразилиялық португал"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Роман"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Орыс"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Словак"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Славян"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Албан"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Серб"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Сербиялық латын"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Швед"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Тамиль"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Телугу"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Тай"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Түрік"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Украин"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Урду"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Вьетнам"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Жеңілдетілген қытай"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Дәстүрлі қытай"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Тура мәнін енгізіңіз."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Бұл URL - бузық сілтеме."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Тура URL-ді енгізіңіз."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Тура e-mail адресті енгізіңіз."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Тек әріптерден, сандардан, астыңғы сызықтардан немесе дефистерден құралатын "
 "тура 'slug'-ті енгізіңіз."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Тура IPv4 адресті енгізіңіз."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Тек үтірлермен бөлінген цифрлерді енгізіңіз."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Бұл мәннің мынадан %(limit_value)s кіші немесе тең екендігін тексеріңіз."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Бұл мәннің мынадан %(limit_value)s үлкен немесе тең екендігін тексеріңіз."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -369,7 +389,7 @@ msgstr ""
 "Бұл мәннің кем дегенде %(limit_value)d символдан тұратынын тексеріңіз (кәзір "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -378,273 +398,273 @@ msgstr ""
 "Бұл мәннің ең көп дегенде %(limit_value)d символдан тұратынын тексеріңіз "
 "(кәзір %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "және"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 %(field_label)s жолақпен бұрыннан бар."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r мәні - дұрыс таңдау емес."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Бұл жолақ null болмау керек."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Бұл жолақ бос болмау керек."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Жолақтын түрі: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Бүтін сан"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (True немесе False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Жол (%(max_length)s символға дейін)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Үтірмен бөлінген бүтін сандар"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Дата (уақытсыз)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Дата (уақытпен)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Ондық сан"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "E-mail адрес"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Email адрес"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Файл жолы"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Реал сан"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Ұзын (8 байт) бүтін сан"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP мекенжайы"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Булеан (True, False немесе None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Мәтін"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Уақыт"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "%(pk)r pk мен %(model)s модель жоқ."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Foreign Key (тип related field арқылы анықталады)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "One-to-one қатынас"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Many-to-many қатынас"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Бірден көп элемент таңдау үшін \"Control\" немесе МасBook-те \"Command\" "
 "батырмасын басып тұрыңыз."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Бұл өрісті толтыру міндетті."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Толық санды енгізіңіз."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Сан енгізіңіз."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Санда ең көп %s цифр болу керек."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Санда үтірден кейін ең көп %s болу керек."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Санда үтірге дейін ең көп %s болу керек."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Дұрыс күнді енгізіңіз."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Дұрыс уақытты енгізіңіз."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Дұрыс күнді/уақытты енгізіңіз."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Ешқандай файл жіберілмеді. Форманың кодтау түрін тексеріңіз."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Ешқандай файл жіберілмеді."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Бос файл жіберілді."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -652,45 +672,49 @@ msgstr ""
 "Файл атауыныEnsure this filename has at most %(max)d characters (it has "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Файлды жіберіңіз немесе тазалауды белгіленіз, екеуін бірге емес."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 "Дұрыс сүретті жүктеңіз. Сіз жүктеген файл - сүрет емес немесе бұзылған сүрет."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Тура URL-ді енгізіңіз."
+
+#: 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 "Дұрыс тандау жасаңыз. %(value)s дұрыс тандау емес."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Мәндер тізімін енгізіңіз."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Сұрыптау"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Жою"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "%(field)s жолақтағы қайталанған мәнді түзетіңіз."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "%(field)s жолақтағы мәнді түзетіңіз, ол бірегей болу керек."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -699,116 +723,116 @@ msgstr ""
 "%(field_name)s жолақтағы мәнді түзетіңіз. Ол %(date_field)s жолақтың ішінде "
 "%(lookup)s үшін бірегей болу керек."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Қайталанатын мәндерді түзетіңіз."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Кірістірілген сыртқы кілт аталық дананың бастапқы кілтімен сәйкес келмейді."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Дұрыс нұсқаны таңдаңыз. Бұл нұсқа дұрыс таңдаулардың арасында жоқ."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Дұрыс нұсқаны таңдаңыз. %s дұрыс таңдаулардың арасында жоқ."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" бастапқы кілт үшін дұрыс мән емес."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Кәзіргі"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Түзету"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Тазалау"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Иә"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Жоқ"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "иә,жоқ,мүмкін"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d байт"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s ТБ"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s ПБ"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "Т.Қ."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "Т.Ж."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "ТҚ"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ТЖ"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "түнжарым"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "түсқайта"
 
@@ -1084,116 +1108,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Желтоқсан"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "немесе"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "жыл"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "ай"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "апта"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "күн"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сағат"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "минут"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s ойдағыдай құрылды."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s ойдағыдай түзетілді."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s жойылды."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Жыл таңдалмаған"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Ай таңдалмаған"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Күн таңдалмаған"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Апта таңдалмаған"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s қол жеткізгісіз"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1202,26 +1211,26 @@ msgstr ""
 "Болашақ %(verbose_name_plural)s қол жеткізгісіз, себебі %(class_name)s."
 "allow_future False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "'%(format)s' пішімі үшін дұрыс емес '%(datestr)s' уақыт жолы"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "%(verbose_name)s табылған жоқ"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Бет соңғы емес және оны санға түрлендіруге болмайды."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Тура емес бет (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Бос тізім және '%(class_name)s.allow_empty' - False."
diff --git a/django/conf/locale/km/LC_MESSAGES/django.mo b/django/conf/locale/km/LC_MESSAGES/django.mo
index d26a36d3d7..f7f91703e9 100644
Binary files a/django/conf/locale/km/LC_MESSAGES/django.mo and b/django/conf/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/km/LC_MESSAGES/django.po b/django/conf/locale/km/LC_MESSAGES/django.po
index 242117a1a5..2d94ef110e 100644
--- a/django/conf/locale/km/LC_MESSAGES/django.po
+++ b/django/conf/locale/km/LC_MESSAGES/django.po
@@ -6,788 +6,812 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+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: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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
-msgid "Bengali"
-msgstr "ភាសាបេឡារុស្ស"
-
 #: conf/global_settings.py:52
-msgid "Bosnian"
+msgid "Belarusian"
 msgstr ""
 
 #: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "ភាសាបេឡារុស្ស"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr ""
+
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "ភាសាឆេក"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "ភាសាអ៊ុយក្រែន"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "ភាសាដាណឺម៉ាក"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "ភាសាអាល្លឺម៉ង់"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "ភាសាហ្កែលិគ"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "ភាសាអង់គ្លេស"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr ""
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "ភាសាអេស្ប៉ាញ"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr ""
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr ""
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr ""
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr ""
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr ""
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "ភាសាហ្វាំងឡង់"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ភាសាបារាំង"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr ""
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr ""
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "ភាសាហ្កែលិគ"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ភាសាហេប្រិ"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr ""
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr ""
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ភាសាហុងគ្រី"
 
-#: conf/global_settings.py:78
-msgid "Indonesian"
-msgstr ""
-
-#: conf/global_settings.py:79
-msgid "Icelandic"
-msgstr "ភាសាអ៉ីស្លង់"
-
-#: conf/global_settings.py:80
-msgid "Italian"
-msgstr "ភាសាអ៊ីតាលី"
-
-#: conf/global_settings.py:81
-msgid "Japanese"
-msgstr "ភាសាជប៉ុន"
-
 #: conf/global_settings.py:82
-msgid "Georgian"
+msgid "Interlingua"
 msgstr ""
 
 #: conf/global_settings.py:83
-msgid "Kazakh"
+msgid "Indonesian"
 msgstr ""
 
 #: conf/global_settings.py:84
-msgid "Khmer"
-msgstr ""
+msgid "Icelandic"
+msgstr "ភាសាអ៉ីស្លង់"
 
 #: conf/global_settings.py:85
-msgid "Kannada"
-msgstr ""
+msgid "Italian"
+msgstr "ភាសាអ៊ីតាលី"
 
 #: conf/global_settings.py:86
-msgid "Korean"
-msgstr ""
+msgid "Japanese"
+msgstr "ភាសាជប៉ុន"
 
 #: conf/global_settings.py:87
-msgid "Lithuanian"
+msgid "Georgian"
 msgstr ""
 
 #: conf/global_settings.py:88
-msgid "Latvian"
+msgid "Kazakh"
 msgstr ""
 
 #: conf/global_settings.py:89
-msgid "Macedonian"
+msgid "Khmer"
 msgstr ""
 
 #: conf/global_settings.py:90
-msgid "Malayalam"
+msgid "Kannada"
 msgstr ""
 
 #: conf/global_settings.py:91
-msgid "Mongolian"
+msgid "Korean"
 msgstr ""
 
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
+msgid "Lithuanian"
 msgstr ""
 
 #: conf/global_settings.py:94
-msgid "Dutch"
-msgstr "ភាសាហ្វាំងឡង់"
+msgid "Latvian"
+msgstr ""
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
+msgid "Macedonian"
 msgstr ""
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
+msgid "Malayalam"
 msgstr ""
 
 #: conf/global_settings.py:97
-msgid "Polish"
+msgid "Mongolian"
 msgstr ""
 
 #: conf/global_settings.py:98
-msgid "Portuguese"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: conf/global_settings.py:99
-msgid "Brazilian Portuguese"
+msgid "Nepali"
 msgstr ""
 
 #: conf/global_settings.py:100
-msgid "Romanian"
-msgstr "ភាសារូម៉ានី"
+msgid "Dutch"
+msgstr "ភាសាហ្វាំងឡង់"
 
 #: conf/global_settings.py:101
-msgid "Russian"
-msgstr "ភាសាรัរូស្ស៉ី"
+msgid "Norwegian Nynorsk"
+msgstr ""
 
 #: conf/global_settings.py:102
-msgid "Slovak"
-msgstr "ភាសាស្លូវ៉ាគី"
+msgid "Punjabi"
+msgstr ""
 
 #: conf/global_settings.py:103
-msgid "Slovenian"
-msgstr "ភាសាស្លូវ៉ានី"
+msgid "Polish"
+msgstr ""
 
 #: conf/global_settings.py:104
-msgid "Albanian"
+msgid "Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:105
-msgid "Serbian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:106
-msgid "Serbian Latin"
-msgstr ""
+msgid "Romanian"
+msgstr "ភាសារូម៉ានី"
 
 #: conf/global_settings.py:107
-msgid "Swedish"
-msgstr "ភាសាស៊ុយអែដ"
+msgid "Russian"
+msgstr "ភាសាรัរូស្ស៉ី"
 
 #: conf/global_settings.py:108
-msgid "Swahili"
-msgstr ""
+msgid "Slovak"
+msgstr "ភាសាស្លូវ៉ាគី"
 
 #: conf/global_settings.py:109
-msgid "Tamil"
-msgstr "ភាសាតាមីល"
+msgid "Slovenian"
+msgstr "ភាសាស្លូវ៉ានី"
 
 #: conf/global_settings.py:110
-msgid "Telugu"
+msgid "Albanian"
 msgstr ""
 
 #: conf/global_settings.py:111
-msgid "Thai"
+msgid "Serbian"
 msgstr ""
 
 #: conf/global_settings.py:112
-msgid "Turkish"
-msgstr "ភាសាទួរគី"
+msgid "Serbian Latin"
+msgstr ""
 
 #: conf/global_settings.py:113
-msgid "Tatar"
-msgstr ""
+msgid "Swedish"
+msgstr "ភាសាស៊ុយអែដ"
 
 #: conf/global_settings.py:114
-msgid "Ukrainian"
-msgstr "ភាសាអ៊ុយក្រែន"
-
-#: conf/global_settings.py:115
-msgid "Urdu"
+msgid "Swahili"
 msgstr ""
 
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "ភាសាតាមីល"
+
 #: conf/global_settings.py:116
-msgid "Vietnamese"
+msgid "Telugu"
 msgstr ""
 
 #: conf/global_settings.py:117
+msgid "Thai"
+msgstr ""
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "ភាសាទួរគី"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "ភាសាអ៊ុយក្រែន"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "ភាសាចិនសាមញ្ញ"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "ភាសាចិនបុរាណ"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr ""
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr ""
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "សូមបំពេញអ៊ីមែល"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "បំពេញតែលេខហើយផ្តាច់ចេញពីគ្នាដោយសញ្ញាក្បៀស។"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "និង"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "ចំនួនពិត(Integer)"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (អាច​ជា True រឺ False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "ចំនួនពិត(Integer) ដែលផ្តាច់ចេញពីគ្នាដោយ​ក្បៀស"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "កាល​បរិច្ឆេទ (Date) (មិនមានសរសេរម៉ោង)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "កាល​បរិច្ឆេទ (Date) (មានសរសេរម៉ោង)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "ចំនួនទសភាគ (Decimal)"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "អ៊ីម៉ែល"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr ""
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "ផ្លូវទៅកាន់ឯកសារ"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "លេខ IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (អាចជា True​ រឺ False រឺ None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "អត្ថបទ"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "ពេលវេលា"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "អាស័យដ្ឋានគេហទំព័រ(URL)"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "សូមចុចប៉ូតុន \"Control\", ឬ \"Command\" ចំពោះកុំព្យូទ័រ Mac, ដើម្បីជ្រើសរើសច្រើនជាងមួយ។"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "បំពេញចំនួនទាំងអស់។"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr ""
 
-#: forms/fields.py:264
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
-
 #: forms/fields.py:265
 #, python-format
-msgid "Ensure that there are no more than %s decimal places."
+msgid "Ensure that there are no more than %s digits in total."
 msgstr ""
 
 #: forms/fields.py:266
 #, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr ""
+
+#: forms/fields.py:267
+#, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "មិនមានឯកសារត្រូវបានជ្រើសរើស។ សូមពិនិត្យប្រភេទឯកសារម្តងទៀត។"
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "ពុំមានឯកសារ។​"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "រូបភាពដែលទាញយកមិនត្រឹមត្រូវ ប្រហែលជាមិនមែនជារូបភាព ឬក៏ជា រូបភាពខូច។"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr ""
+
+#: 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 ""
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "លប់"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:581
+#: 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 ""
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "ផ្លាស់ប្តូរ"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "មិន​ដឹង"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "យល់ព្រម"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "មិនយល់ព្រម"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "យល់ព្រម មិនយល់ព្រម​ ប្រហែល"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] ""
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr ""
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr ""
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr ""
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr ""
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr ""
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr ""
 
@@ -1063,142 +1087,127 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "ធ្នូ"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ឆ្នាំ"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "ខែ"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "សប្តាហ៍"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ថ្ងៃ"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ម៉ោង"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "នាទី"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "នាទី"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr ""
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ""
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr ""
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "The %(verbose_name)s បានផ្លាស់ប្តូរដោយជោគជ័យ។"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "The %(verbose_name)s​ បានលប់។ "
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/kn/LC_MESSAGES/django.mo b/django/conf/locale/kn/LC_MESSAGES/django.mo
index 67da4d82f6..ee007c2521 100644
Binary files a/django/conf/locale/kn/LC_MESSAGES/django.mo and b/django/conf/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/kn/LC_MESSAGES/django.po b/django/conf/locale/kn/LC_MESSAGES/django.po
index 70006047e3..967c708030 100644
--- a/django/conf/locale/kn/LC_MESSAGES/django.po
+++ b/django/conf/locale/kn/LC_MESSAGES/django.po
@@ -8,361 +8,381 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+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: karthikbgl <karthikbgl@gmail.com>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "ಬೆಂಗಾಲಿ"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "ಬೋಸ್ನಿಯನ್"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "ಕೆಟಲಾನ್"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "ಝೆಕ್"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "ವೆಲ್ಷ್"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "ಡ್ಯಾನಿಷ್"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "ಜರ್ಮನ್"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "ಗ್ರೀಕ್"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "ಇಂಗ್ಲಿಷ್"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "ಬ್ರಿಟೀಶ್ ಇಂಗ್ಲಿಷ್"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "ಸ್ಪ್ಯಾನಿಷ್"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "ಅರ್ಜೆಂಟಿನಿಯನ್ ಸ್ಪಾನಿಷ್"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "ಮೆಕ್ಸಿಕನ್ ಸ್ಪಾನಿಷ್"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "nicarguan ಸ್ಪಾನಿಷ್"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "ಎಷ್ಟೋನಿಯನ್"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "ಬಾಸ್ಕ್‍"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "ಪರ್ಶಿಯನ್"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "ಫಿನ್ನಿಶ್"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ಫ್ರೆಂಚ್"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "ಫ್ರಿಸಿಯನ್"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ಐರಿಶ್"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "ಗೆಲಿಶಿಯನ್"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ಹೀಬ್ರೂ"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "ಹಿಂದಿ"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "ಕ್ರೊಯೇಶಿಯನ್"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ಹಂಗೇರಿಯನ್"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "ಇಂಡೋನಿಶಿಯನ್"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "ಐಸ್‌ಲ್ಯಾಂಡಿಕ್"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "ಇಟಾಲಿಯನ್"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "ಜಾಪನೀಸ್"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "ಜಾರ್ಜೆಯನ್ "
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "ಖಮೇರ್"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "ಕನ್ನಡ"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "ಕೊರಿಯನ್"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "ಲಿತುವಾನಿಯನ್ "
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "ಲಾಟ್ವಿಯನ್"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "ಮೆಸಡೊನಿಯನ್"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "ಮಲಯಾಳಂ"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "ಮಂಗೊಲಿಯನ್"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "ನಾರ್ವೇಜಿಯನ್ ಬೋಕ್ಮಲ್"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "ಡಚ್"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "ನಾರ್ವೇಜಿಯನ್ ನಿನೋರ್ಕ್"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "ಪಂಜಾಬಿ"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "ಪೋಲಿಷ್"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "ಪೋರ್ಚುಗೀಸ್"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "ಬ್ರಜೀಲಿಯನ್ ಪೋರ್ಚುಗೀಸ್"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "ರೋಮೇನಿಯನ್"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "ರಶಿಯನ್"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "ಸ್ಲೋವಾಕ್"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "ಸ್ಲೋವೇನಿಯನ್"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "ಅಲ್ಬೆನಿಯನ್ "
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "ಸರ್ಬಿಯನ್"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "ಸರ್ಬಿಯನ್ ಲ್ಯಾಟಿನ್"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "ಸ್ವೀಡಿಷ್"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "ತಮಿಳು"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "ತೆಲುಗು"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "ಥಾಯ್"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "ಟರ್ಕಿಶ್"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ಉಕ್ರೇನಿಯನ್"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "ಉರ್ದು"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "ವಿಯೆತ್ನಾಮೀಸ್"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "ಸರಳೀಕೃತ ಚೈನೀಸ್"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "ಸಂಪ್ರದಾಯಿಕ ಚೈನೀಸ್ "
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "ಸಿಂಧುವಾದ ಮೌಲ್ಯವನ್ನು ನಮೂದಿಸಿ."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "ಈ URL ಒಂದು ತುಂಡಾದ ಜಾಲಕೊಂಡಿಯಾಗಿದೆ."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "ಸರಿಯಾದ ಒಂದು URL ಅನ್ನು ನಮೂದಿಸಿ."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "ಸಿಂಧುವಾದ ಇ-ಮೈಲೊಂದನ್ನು ನಮೂದಿಸಿ."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "ಅಕ್ಷರಗಳು, ಅಂಕೆಗಳು, ಅಡಿಗೆರೆಗಳು (ಅಂಡರ್ಸ್ಕೋರ್) ಹಾಗು ಅಡ್ಡಗೆರೆಗಳನ್ನು ಹೊಂದಿರುವ ಒಂದು "
 "ಸರಿಯಾದ 'slug' ಅನ್ನು ನಮೂದಿಸಿ."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "ಒಂದು ಸರಿಯಾದ IPv4 ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "ಮಾನ್ಯವಾದ IPv6 ವಿಳಾಸ ದಾಖಲಿಸಿ"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "ಮಾನ್ಯವಾದ IPv4 ಅಥವಾ IPv6 ವಿಳಾಸ ದಾಖಲಿಸಿ"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "ಅಲ್ಪವಿರಾಮ(,)ಗಳಿಂದ ಬೇರ್ಪಟ್ಟ ಅಂಕೆಗಳನ್ನು ಮಾತ್ರ ಬರೆಯಿರಿ."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "ಈ ಮೌಲ್ಯವು %(limit_value)s ಕ್ಕಿಂತ ಕಡಿಮೆಯ ಅಥವ ಸಮನಾದ ಮೌಲ್ಯವಾಗಿದೆ ಎಂದು ಖಾತ್ರಿ "
 "ಮಾಡಿಕೊಳ್ಳಿ."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "ಈ ಮೌಲ್ಯವು %(limit_value)s ಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಅಥವ ಸಮನಾದ ಮೌಲ್ಯವಾಗಿದೆ ಎಂದು ಖಾತ್ರಿ "
 "ಮಾಡಿಕೊಳ್ಳಿ."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -371,7 +391,7 @@ msgstr ""
 "ಈ ಮೌಲ್ಯವು ಕನಿಷ್ಟ %(limit_value)d ಅಕ್ಷರಗಳನ್ನು ಅನ್ನು ಹೊಂದಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ "
 "(ಇದು %(show_value)d ಹೊಂದಿದೆ)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -380,276 +400,276 @@ msgstr ""
 "ಈ ಮೌಲ್ಯವು ಗರಿಷ್ಟ %(limit_value)d ಅಕ್ಷರಗಳನ್ನು ಅನ್ನು ಹೊಂದಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ "
 "(ಇದು %(show_value)d ಹೊಂದಿದೆ)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ಮತ್ತು"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
 "ಈ %(field_label)s ಅನ್ನು ಹೊಂದಿರುವ ಒಂದು %(model_name)s ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r ಎಂಬ ಮೌಲ್ಯವು ಒಂದು ಸರಿಯಾದ ಆಯ್ಕೆಯಾಗಿಲ್ಲ."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "ಈ ಅಂಶವನ್ನು ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "ಈ ಸ್ಥಳವು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "ಕ್ಷೇತ್ರದ ಬಗೆ: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "ಪೂರ್ಣಾಂಕ"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' ಪೂರ್ಣಾಂಕ ಇರಬೇಕು"
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "%s True ಅಥವಾ False ಇರಬೇಕು"
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "ಬೂಲಿಯನ್ (ಹೌದು ಅಥವ ಅಲ್ಲ)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "ಪದಪುಂಜ (%(max_length)s ವರೆಗೆ)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "ಅಲ್ಪವಿರಾಮ(,) ದಿಂದ ಬೇರ್ಪಟ್ಟ ಪೂರ್ಣಸಂಖ್ಯೆಗಳು"
 
-#: db/models/fields/__init__.py:647
+#: 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' ಅಮಾನ್ಯ ದಿನಾಂಕದ ಸ್ವರೂಪ ಹೊಂದಿದೆ. YYYY-MM-DD ಆಗಿರಬೇಕು"
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "ದಿನಾಂಕ (ಸಮಯವಿಲ್ಲದೆ)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "ದಿನಾಂಕ (ಸಮಯದೊಂದಿಗೆ)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' ದಶಮಾಂಶ ಸಂಖ್ಯೆ ಆಗಿರಬೇಕು"
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "ದಶಮಾನ ಸಂಖ್ಯೆ"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "ಇ-ಮೈಲ್ ವಿಳಾಸ"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr ""
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "ಕಡತದ ಸ್ಥಾನಪಥ"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' float ಆಗಿರಬೇಕು"
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "ತೇಲುವ-ಬಿಂದು ಸಂಖ್ಯೆ"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "ಬೃಹತ್ (೮ ಬೈಟ್) ಪೂರ್ಣ ಸಂಖ್ಯೆ"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 ವಿಳಾಸ"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP ವಿಳಾಸ"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' None, True ಅಥವಾ False ಇರಬೇಕು"
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "ಬೂಲಿಯನ್ (ನಿಜ, ಸುಳ್ಳು ಅಥವ ಯಾವುದೂ ಅಲ್ಲ ಇವುಗಳಲ್ಲಿ ಒಂದು)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "ಪಠ್ಯ"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "ಸಮಯ"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "pk %(pk)r ಅನ್ನು ಹೊಂದಿರುವ %(model)s ಎನ್ನುವ ಮಾದರಿಯು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "ಬಾಹ್ಯ ಕೀಲಿ (ಸಂಬಂಧಿತ ಸ್ಥಳದಿಂದ ಪ್ರಕಾರವನ್ನು ನಿರ್ಧರಿಸಲಾಗುತ್ತದೆ)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "ಒನ್-ಟು-ಒನ್ (ಪರಸ್ಪರ) ಸಂಬಂಧ"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "ಮೆನಿ-ಟು-ಮೆನಿ (ಸಾರ್ವಜನಿಕ) ಸಂಬಂಧ"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚನ್ನು ಆಯ್ದುಕೊಳ್ಳಲು ಮ್ಯಾಕ್ ಗಣಕದಲ್ಲಿನ \"ಕಂಟ್ರೋಲ್\", ಅಥವಾ \"ಕಮ್ಯಾಂಡ್\" ಅನ್ನು "
 "ಒತ್ತಿ ಹಿಡಿಯಿರಿ."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "ಈ ಸ್ಥಳವು ಅಗತ್ಯವಿರುತ್ತದೆ."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "ಪೂರ್ಣಾಂಕವೊಂದನ್ನು ನಮೂದಿಸಿ."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "ಒಂದು ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "ಒಟ್ಟು %s ಅಂಕಿಗಳಿಗಿಂತ ಹೆಚ್ಚಿನ ಅಂಕಿಗಳು ಇಲ್ಲ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "ಒಟ್ಟು %s ದಶಮಾಂಶ ಸ್ಥಾನಗಳಿಗಿಂತ ಹೆಚ್ಚಿನವುಗಳು ಇಲ್ಲ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "ದಶಾಂಶ ಬಿಂದುವಿನ ಮೊದಲು %s ಅಂಕಿಗಳಿಗಿಂರ ಹೆಚ್ಚಿನ ಅಂಕಿಗಳು ಇಲ್ಲ ಎಂದು ಖಾತ್ರಿ ಮಾಡಿಕೊಳ್ಳಿ."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "ಸರಿಯಾದ ದಿನಾಂಕವನ್ನು ನಮೂದಿಸಿ."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "ಸರಿಯಾದ ಸಮಯವನ್ನು ನಮೂದಿಸಿ."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "ಸರಿಯಾದ ದಿನಾಂಕ/ಸಮಯವನ್ನು ನಮೂದಿಸಿ."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "ಯಾವದೇ ಕಡತವನ್ನೂ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ. ನಮೂನೆಯ ಮೇಲಿನ ಸಂಕೇತೀಕರಣ (ಎನ್ಕೋಡಿಂಗ್) ಬಗೆಯನ್ನು "
 "ಪರೀಕ್ಷಿಸಿ."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "ಯಾವದೇ ಕಡತವನ್ನೂ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "ಸಲ್ಲಿಸಲಾದ ಕಡತ ಖಾಲಿ ಇದೆ."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -657,13 +677,13 @@ msgstr ""
 "ಈ ಕಡತದ ಹೆಸರು ಗರಿಷ್ಟ %(max)d ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿವೆ ಎನ್ನುವುದನ್ನು ಖಾತ್ರಿ ಪಡಿಸಿಕೊಳ್ಳಿ "
 "(ಅದು %(length)d ಅನ್ನು ಹೊಂದಿದೆ)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "ದಯವಿಟ್ಟು ಕಡತವನ್ನು ಸಲ್ಲಿಸಿ ಅಥವ ಅಳಿಸುವ ಗುರುತುಚೌಕವನ್ನು ಗುರುತು ಹಾಕಿ, ಎರಡನ್ನೂ ಒಟ್ಟಿಗೆ "
 "ಮಾಡಬೇಡಿ."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -671,36 +691,40 @@ msgstr ""
 "ಸರಿಯಾದ ಚಿತ್ರವನ್ನು ಸೇರಿಸಿ. ನೀವು ಸೇರಿಸಿದ ಕಡತವು ಚಿತ್ರವೇ ಅಲ್ಲ ಅಥವಾ ಅದು ಒಂದು ಹಾಳಾದ "
 "ಚಿತ್ರವಾಗಿದೆ. "
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "ಸರಿಯಾದ ಒಂದು URL ಅನ್ನು ನಮೂದಿಸಿ."
+
+#: 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 "ಸರಿಯಾದ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ. %(value)s ಎನ್ನುವುದು ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳಲ್ಲಿ ಇಲ್ಲ."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "ಮೌಲ್ಯಗಳ ಒಂದು ಪಟ್ಟಿಯನ್ನು ನಮೂದಿಸಿ."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "ಕ್ರಮ"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "ಅಳಿಸಿಹಾಕಿ"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "%(field)s ಗಾಗಿ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮಾಹಿತಿಯನ್ನು ಸರಿಪಡಿಸಿ."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "%(field)s ಗಾಗಿ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮಾಹಿತಿಯನ್ನು ಸರಿಪಡಿಸಿ, ಇದರ ಮೌಲ್ಯವು "
 "ವಿಶಿಷ್ಟವಾಗಿರಬೇಕು."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -709,115 +733,115 @@ msgstr ""
 "%(field_name)s ಗಾಗಿ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮಾಹಿತಿಯನ್ನು ಸರಿಪಡಿಸಿ, %(date_field)s "
 "ನಲ್ಲಿನ %(lookup)s ಗಾಗಿ ಇದರ ಮೌಲ್ಯವು ವಿಶಿಷ್ಟವಾಗಿರಬೇಕು."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "ದಯವಿಟ್ಟು ಈ ಕೆಳಗೆ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮೌಲ್ಯವನ್ನು ಸರಿಪಡಿಸಿ."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "ಸಾಲಿನೊಳಗಿನ ಪ್ರಾಥಮಿಕ ಕೀಲಿಯು ಮೂಲ ಇನ್‌ಸ್ಟನ್ಸ್‍ ಪ್ರಾಥಮಿಕ ಕೀಲಿಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "ಸರಿಯಾದ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ. ಆ ಆಯ್ಕೆಯು ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳಲ್ಲಿ ಇಲ್ಲ."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "ಸರಿಯಾದ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ. %s ಎನ್ನುವುದು ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳಲ್ಲಿ ಇಲ್ಲ."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ಎನ್ನುವುದು ಒಂದು ಸರಿಯಾದ ಪ್ರಾಥಮಿಕ ಕೀಲಿಯಲ್ಲ."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "ಪ್ರಸಕ್ತ"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "ಬದಲಾವಣೆ"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "ಮುಕ್ತಗೊಳಿಸು"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "ಗೊತ್ತಿರದ"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "ಹೌದು"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "ಇಲ್ಲ"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ಹೌದು,ಇಲ್ಲ,ಇರಬಹುದು"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d ಬೈಟ್‌ಗಳು"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "ಅಪರಾಹ್ನ"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "ಪೂರ್ವಾಹ್ನ"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "ಅಪರಾಹ್ನ"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ಪೂರ್ವಾಹ್ನ"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "ಮಧ್ಯರಾತ್ರಿ"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "ಮಧ್ಯಾಹ್ನ"
 
@@ -1093,116 +1117,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "ಡಿಸೆಂಬರ್"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ಅಥವ"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ವರ್ಷಗಳು"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "ತಿಂಗಳುಗಳು"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "ವಾರಗಳು"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ದಿನಗಳು"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ಗಂಟೆಗಳು"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ನಿಮಿಷಗಳು"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "ನಿಮಿಷಗಳು"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr " %(verbose_name)s ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ  ರಚಿಸಲಾಗಿದೆ."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr " %(verbose_name)s ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr " %(verbose_name)s ಅನ್ನು ಅಳಿಸಲಾಗಿದೆ."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "ಯಾವುದೆ ವರ್ಷವನ್ನು ಸೂಚಿಲಾಗಿಲ್ಲ"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "ಯಾವುದೆ ತಿಂಗಳನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "ಯಾವುದೆ ದಿನವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "ಯಾವುದೆ ವಾರವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "ಯಾವುದೆ %(verbose_name_plural)s ಲಭ್ಯವಿಲ್ಲ"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1211,27 +1220,27 @@ msgstr ""
 "ಭವಿಷ್ಯದ %(verbose_name_plural)s ಲಭ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ %(class_name)s.allow_future "
 "ಎನ್ನುವುದು ಅಸತ್ಯವಾಗಿದೆ (ಫಾಲ್ಸ್‍) ಆಗಿದೆ."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "ಅಸಿಂಧುವಾದ '%(datestr)s' ದಿನಾಂಕ ಪದಪುಂಜ ಒದಗಿಸಲಾದ ವಿನ್ಯಾಸವು '%(format)s' ಆಗಿದೆ"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "ಮನವಿಗೆ ತಾಳೆಯಾಗುವ ಯಾವುದೆ %(verbose_name)s ಕಂಡುಬಂದಿಲ್ಲ"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "ಪುಟವು 'ಕೊನೆಯ'ದಲ್ಲ, ಅಥವ ಅದನ್ನು ಒಂದು int ಆಗಿ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "ಅಸಿಂಧುವಾದ ಪುಟ (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/kn/formats.py b/django/conf/locale/kn/formats.py
index 2af6f83a3f..ce1999ac93 100644
--- a/django/conf/locale/kn/formats.py
+++ b/django/conf/locale/kn/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/ko/LC_MESSAGES/django.mo b/django/conf/locale/ko/LC_MESSAGES/django.mo
index d3f3b294c0..6772aaf3c4 100644
Binary files a/django/conf/locale/ko/LC_MESSAGES/django.mo and b/django/conf/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ko/LC_MESSAGES/django.po b/django/conf/locale/ko/LC_MESSAGES/django.po
index e53b913ac0..023a1e1c0e 100644
--- a/django/conf/locale/ko/LC_MESSAGES/django.po
+++ b/django/conf/locale/ko/LC_MESSAGES/django.po
@@ -7,356 +7,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+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: Jaehong Kim <mixe@korea.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "방글라데시어"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "보스니아어"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "카탈로니아어"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "체코어"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "웨일즈어"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "덴마크어"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "독일어"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "그리스어"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "영어"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "영어 (영국)"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "스페인어"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "아르헨티나 스페인어"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "멕시컨 스페인어"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "에스토니아어"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "바스크어"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "페르시아어"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "핀란드어"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "프랑스어"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "프리슬란트어"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "아일랜드어"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "갈리시아어"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "히브리어"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "힌두어"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "크로아티아어"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "헝가리어"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "인도네시아어"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "아이슬란드어"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "이탈리아어"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "일본어"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "조지아어"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "크메르어"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "칸나다어"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "한국어"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "리투아니아어"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "라트비아어"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "마케도니아어"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "말레이지아어"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "몽고어"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "노르웨이어 (보크몰)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "네덜란드어"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "노르웨이어 (뉘노르스크)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "펀자브어"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "폴란드어"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "포르투갈어"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "브라질 포르투갈어"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "루마니아어"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "러시아어"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "슬로바키아어"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "슬로베니아어"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "알바니아어"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "세르비아어"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "세르비아어"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "스웨덴어"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "타밀어"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "텔루구어"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "태국어"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "터키어"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "우크라이나어"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "우르드어"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "베트남어"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "중국어 간체"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "중국어 번체"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "올바른 값을 입력하세요."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "해당 URL의 링크가 잘못 되어 있습니다."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "올바른 URL을 입력하세요."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "올바른 이메일 주소를 입력하세요."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "문자, 숫자, '_', '-'만 가능합니다."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "올바른 IPv4 주소를 입력하세요."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "콤마로 구분된 숫자만 입력하세요."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "%(limit_value)s 이하의 값을 입력해 주세요."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "%(limit_value)s 이상의 값을 입력해 주세요."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -365,7 +385,7 @@ msgstr ""
 "%(limit_value)d글자 이상 입력해 주세요. (입력하신 내용은 %(show_value)d글자입"
 "니다.)"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -374,272 +394,272 @@ msgstr ""
 "%(limit_value)d글자 이하로 입력해 주세요. (입력하신 내용은 %(show_value)d글자"
 "입니다)"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "또한"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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의 %(field_label)s(은)는 이미 존재합니다."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r은 올바른 선택사항이 아닙니다."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "이 필드는 null 값은 사용할 수 없습니다. "
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "이 필드는 null 값은 사용할 수 없습니다. "
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "%(field_type)s 형식 필드"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "정수"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "boolean(참 또는 거짓)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "문자열(%(max_length)s 글자까지)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "정수(콤마로 구분)"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "날짜(시간 제외)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "날짜(시간 포함)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "10진수"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "이메일 주소"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "파일 경로"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "부동소수점 숫자"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "큰 정수 (8 byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP 주소"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "boolean (참, 거짓 또는 none)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "텍스트"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "시각"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Primary key %(pk)r에 대한 모델 %(model)s가 존재하지 않습니다."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "외래 키 (연관 필드에 의해 형식 결정)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "일대일 관계"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "다대다 관계"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "복수 선택 시에는 \"Control\" 키를 누른 상태에서 선택해 주세요.(Mac은 "
 "\"Command\" 키)"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "필수 항목입니다."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "정수를 입력하세요."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "숫자를 입력하세요."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "전체 자릿수가 %s 개를 넘지 않도록 해주세요."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "전체 유효자리 개수가 %s 개를 넘지 않도록 해주세요."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "소숫점 앞의 자릿수가 %s 개를 넘지 않도록 해주세요."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "올바른 날짜를 입력하세요."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "올바른 시각을 입력하세요."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "올바른 날짜/시각을 입력하세요."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "등록된 파일이 없습니다. 인코딩 형식을 확인하세요."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "파일이 전송되지 않았습니다."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "입력하신 파일은 빈 파일입니다."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -647,11 +667,11 @@ msgstr ""
 "파일 이름은 %(max)d 글자 이하로 입력해 주세요. (입력하신 내용은 %(length)d 자"
 "입니다)"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "파일을 보내거나 취소 체크박스를 체크하세요. 또는 둘다 비워두세요."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -659,34 +679,38 @@ msgstr ""
 "올바른 이미지를 업로드하세요. 업로드하신 파일은 이미지 파일이 아니거나 파일"
 "이 깨져 있습니다."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "올바른 URL을 입력하세요."
+
+#: 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 "올바르게 선택해 주세요. %(value)s (이)가 선택가능항목에 없습니다."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "리스트를 입력하세요."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "순서:"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "삭제"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "%(field)s의 중복된 데이터를 고쳐주세요."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "%(field)s의 중복된 데이터를 고쳐주세요. 유일한 값이어야 합니다."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -695,115 +719,115 @@ msgstr ""
 "%(field_name)s의 값은 %(date_field)s의 %(lookup)s에 대해 유일해야 합니다. 중"
 "복된 데이터를 고쳐주세요."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "아래의 중복된 값들을 고쳐주세요."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "부모 오브젝트의 primary key와 inline foreign key가 맞지 않습니다."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "올바르게 선택해 주세요. 선택하신 것이 선택가능항목에 없습니다."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "올바르게 선택해 주세요. %s (이)가 선택가능항목에 없습니다."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\"은 primary key로 적합하지 않습니다."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "현재"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "변경"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "취소"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "알 수 없습니다."
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "예"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "아니오"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "예,아니오,아마도"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d 바이트"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "오후"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "오전"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "오후"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "오전"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "자정"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "정오"
 
@@ -1079,116 +1103,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "12월"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "또는"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "년"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "개월"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "주"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "일"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "시간"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "분"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "분"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d%(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d%(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s(이)가 생성되었습니다."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s(이)가 수정되었습니다."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s(이)가 삭제되었습니다."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "년도가 없습니다."
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "월이 없습니다."
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "날짜가 없습니다."
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "주가 없습니다."
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr " %(verbose_name_plural)s를 사용할 수 없습니다."
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1197,26 +1206,26 @@ msgstr ""
 "Future 모듈 %(verbose_name_plural)s을 사용할 수 없습니다. %(class_name)s."
 "allow_future가 False 입니다."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "날짜 문자열 '%(datestr)s'이 표준 형식 '%(format)s'과 다릅니다."
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "쿼리 결과에 %(verbose_name)s가 없습니다."
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "'마지막' 페이지가 아니거나, 정수형으로 변환할 수 없습니다."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "잘못된 페이지 (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "빈 리스트이고 '%(class_name)s.allow_empty'가 False입니다."
diff --git a/django/conf/locale/ko/formats.py b/django/conf/locale/ko/formats.py
index b794afe900..28b4d06ca2 100644
--- a/django/conf/locale/ko/formats.py
+++ b/django/conf/locale/ko/formats.py
@@ -27,18 +27,22 @@ DATE_INPUT_FORMATS = (
 )
 TIME_INPUT_FORMATS = (
     '%H:%M:%S',     # '14:30:59'
+    '%H:%M:%S.%f',  # '14:30:59.000200'
     '%H:%M',        # '14:30'
     '%H시 %M분 %S초',   # '14시 30분 59초'
     '%H시 %M분',        # '14시 30분'
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
+    '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
     '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
     '%m/%d/%Y',              # '10/25/2006'
     '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
+    '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
     '%m/%d/%y',              # '10/25/06'
 
diff --git a/django/conf/locale/lb/LC_MESSAGES/django.mo b/django/conf/locale/lb/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..5e46c3a2e8
Binary files /dev/null and b/django/conf/locale/lb/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/lb/LC_MESSAGES/django.po b/django/conf/locale/lb/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..9c2e55070b
--- /dev/null
+++ b/django/conf/locale/lb/LC_MESSAGES/django.po
@@ -0,0 +1,1221 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+#  <sim0n@trypill.org>, 2013.
+#   <sim0n@trypill.org>, 2011.
+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-01-26 12:36+0000\n"
+"Last-Translator: sim0n <sim0n@trypill.org>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/django/"
+"language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Arabesch"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr ""
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "Bulgaresch"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "Bengalesch"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "Bosnesch"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "Katalanesch"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "Tschechesch"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "Walisesch"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "Dänesch"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "Däitsch"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "Griichesch"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "Englesch"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "Britesch Englesch"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr ""
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "Spuenesch"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "Argentinesch Spuenesch"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr ""
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "Estonesch"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "Baskesch"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "Persesch"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "Finnesch"
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr "Franséisch"
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr "Frisesch"
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr "Iresch"
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr "Galesch"
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr "Hebräesch"
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr "Hindi"
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr "Kroatesch"
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr "Ungaresch"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "Indonesesch"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "Islännesch"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "Italienesch"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "Japanesch"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "Georgesch"
+
+#: conf/global_settings.py:88
+msgid "Kazakh"
+msgstr ""
+
+#: conf/global_settings.py:89
+msgid "Khmer"
+msgstr "Khmer"
+
+#: conf/global_settings.py:90
+msgid "Kannada"
+msgstr "Kanadesch"
+
+#: conf/global_settings.py:91
+msgid "Korean"
+msgstr "Koreanesch"
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr "Lithuanesesch"
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "Lättesch"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "Macedonesch"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "Mongolesch"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "Norwegesch Bokmal"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr ""
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "Hollännesch"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr "Norwegesch Nynorsk"
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "Polnesch"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "Portugisesch"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "Brasilianesch Portugisesch"
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr "Rumänesch"
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr "Russesch"
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr "Slowakesch"
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr "Slowenesch"
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr "Albanesch"
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr "Serbesch"
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr "Serbesch Latäinesch"
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr "Schwedesch"
+
+#: conf/global_settings.py:114
+msgid "Swahili"
+msgstr ""
+
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "Tamil"
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr "Telugu"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "Thai"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "Tierkesch"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "Ukrainesch"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "Vietnamesesch"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "Einfach d'Chinesesch"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "Traditionell d'Chinesesch"
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Gëff en validen Wärt an."
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr "Gëff eng valid IPv4 Adress an."
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:157
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+
+#: core/validators.py:196
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+
+#: db/models/base.py:857
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr ""
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr "an"
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr ""
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr ""
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr ""
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr "Zuel"
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr ""
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr ""
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr ""
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr ""
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr ""
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "Text"
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr "Zäit"
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr ""
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr ""
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr ""
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr ""
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr ""
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr ""
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr ""
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr ""
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr ""
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr ""
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr ""
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr ""
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr "Et ass keng Datei geschéckt ginn."
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr ""
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Gëff eng valid URL an."
+
+#: 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 ""
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr "Gëff eng Lescht vun Wäerter an."
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr "Sortéier"
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr "Läsch"
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: 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 ""
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr ""
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr ""
+
+#: 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 ""
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr "Momentan"
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr "Änner"
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr "Maach eidel"
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr "Onbekannt"
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr "Jo"
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr "Nee"
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr "jo,nee,vläit"
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/defaultfilters.py:835
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: template/defaultfilters.py:837
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: template/defaultfilters.py:839
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: 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 ""
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Méindeg"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Dënschdeg"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Mëttwoch"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Donneschdes"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Freides"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Samschdes"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Sonndes"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Mei"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Dën"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Mett"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Don"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Fre"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Sam"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Son"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "Januar"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "Februar"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "März"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "Abrell"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "December"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "may"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr ""
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "März"
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "Abrell"
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "Januar"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "Februar"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "März"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "Abrell"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr ""
+
+#: utils/text.py:70
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:239
+msgid "or"
+msgstr ""
+
+#. 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] ""
+msgstr[1] ""
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr ""
+
+#: utils/timesince.py:48
+#, python-format
+msgid "%(number)d %(type)s"
+msgstr ""
+
+#: utils/timesince.py:54
+#, python-format
+msgid ", %(number)d %(type)s"
+msgstr ""
+
+#: views/static.py:56
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: views/generic/dates.py:646
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/lt/LC_MESSAGES/django.mo b/django/conf/locale/lt/LC_MESSAGES/django.mo
index 7c874ea263..995b65de68 100644
Binary files a/django/conf/locale/lt/LC_MESSAGES/django.mo and b/django/conf/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/lt/LC_MESSAGES/django.po b/django/conf/locale/lt/LC_MESSAGES/django.po
index bb1ebc2017..0c834d7ade 100644
--- a/django/conf/locale/lt/LC_MESSAGES/django.po
+++ b/django/conf/locale/lt/LC_MESSAGES/django.po
@@ -4,366 +4,389 @@
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Kostas  <tamosiunas@gmail.com>, 2011.
 # lauris <lauris@runbox.com>, 2011.
+#   <naktinis@gmail.com>, 2012.
+# Nikolajus Krauklis <nikolajus@gmail.com>, 2013.
 # Povilas Balzaravičius <pavvka@gmail.com>, 2011, 2012.
+# Simonas Kazlauskas <simonas@kazlauskas.me>, 2012.
 # Simonas Simas <simonas@kazlauskas.me>, 2012.
 # Vytautas Astrauskas <vastrauskas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+0100\n"
-"PO-Revision-Date: 2012-03-09 11:37+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-23 13:00+0000\n"
+"Last-Translator: Nikolajus Krauklis <nikolajus@gmail.com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Afrikiečių"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arabų"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaidžaniečių"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgarų"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Belarusų"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalų"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Breton"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnių"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalonų"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Čekų"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Velso"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danų"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Vokiečių"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Graikų"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Anglų"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Britų Anglų"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Ispanų"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentiniečių Ispanų"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Meksikiečių Ispanų"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nikaragvos Ispanijos"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venesuelos Ispanų"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estų"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskų"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persų"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Suomių"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Prancūzų"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Fryzų"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Airių"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galų"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebrajų"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroatų"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Vengrų"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonecijos"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandų"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italų"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japonų"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Gruzinų"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazachų"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmerų"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Dravidų"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Korėjiečių"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Liuksemburgiečių"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latvių"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonų"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malajalių"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolų"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norvegų Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepalų"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Olandų"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norvegų Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Pandžabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Lenkų"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Protugalų"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brazilijos Portugalų"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumunų"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rusų"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovakų"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovėnų"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanų"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbų"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbų Lotynų"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Švedų"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Svahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamilų"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugų"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tailando"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turkų"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Totorių"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurtų"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainiečių"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamiečių"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Supaprastinta kinų"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Tradicinė kinų"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Įveskite tinkamą reikšmę."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL adresas atrodo sugadintas."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Įveskite teisingą el. pašto adresą."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Įveskite tinkamą URL adresą."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Įveskite tinkamą el. pašto adresą."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Šią reikšmę gali sudaryti tik raidės, skaičiai, pabraukimo arba paprasto "
 "brūkšnio simboliai."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Įveskite validų IPv4 adresą."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Įveskite validų IPv6 adresą."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Įveskite validų IPv4 arba IPv6 adresą."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Įveskite skaitmenis atskirtus kableliais."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Įsitikinkite, kad reikšmę sudaro %(limit_value)s simbolių (dabar yra "
 "%(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Įsitikinkite, kad reikšmė yra mažesnė arba lygi %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Įsitikinkite, kad reikšmė yra didesnė arba lygi %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -372,7 +395,7 @@ msgstr ""
 "Įsitikinkite, kad reikšmę sudaro bent %(limit_value)d simboliai (dabar "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -381,82 +404,82 @@ msgstr ""
 "Įsitikinkite, kad reikšmės ilgis mažesnis nei %(limit_value)d simboliai "
 "(dabar %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s privalo būti unikalus %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ir"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 su šiuo %(field_label)s jau egzistuoja."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Reikšmės %r rinktis negalima."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Šis laukas negali būti null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Lauką privaloma užpildyti."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Lauko tipas: %(field_type)s "
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Sveikas skaičius"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' reikšmė privalo būti sveikas skaičius."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' reikšmė privalo būti True arba False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Loginė reikšmė (True arba False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Eilutė (ilgis iki %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Kableliais atskirti sveikieji skaičiai"
 
-#: db/models/fields/__init__.py:647
+#: 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' reikšmė yra netinkamo formato. Ji turi būti YYYY-MM-DD formatu."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' reikšmė yra teisingo formato (YYYY-MM-DD), tačiau data yra neteisinga."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Data (be laiko)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +488,7 @@ msgstr ""
 "'%s' reikšmė yra neteisingo formato. Ji turi būti pateikta YYYY-MM-DD HH:MM[:"
 "ss[.uuuuuu]][TZ] formatu."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,79 +497,79 @@ msgstr ""
 "'%s' reikšmė yra teisingo formato (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), "
 "tačiau data yra neteisinga."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Data (su laiku)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' reikšmė turi būti dešimtainis skaičius."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Dešimtainis skaičius"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "El. pašto adresas"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Kelias iki failo"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' reikšmė turi būti slankiojo kablelio skaičius."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Slankaus kablelio skaičius"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Didelis (8 baitų) sveikas skaičius"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 adresas"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP adresas"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' reikšmė turi būti None, True arba False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Loginė reikšmė (True, False arba None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Teigiamas sveikasis skaičius"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Nedidelis teigiamas sveikasis skaičius"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Unikalus adresas (iki %(max_length)s ženklų)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Nedidelis sveikasis skaičius"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekstas"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -554,7 +577,7 @@ msgstr ""
 "'%s' reikšmė yra neteisingo formato. Ji turi būti HH:MM[:ss[.uuuuuu]] "
 "formatu."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -563,98 +586,98 @@ msgstr ""
 "'%s' reikšmė yra teisingo formato (HH:MM[:ss[.uuuuuu]]), tačiau tai nėra "
 "teisingas laikas."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Laikas"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Failas"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Paveiksliukas"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modelis %(model)s su pirminiu raktu %(pk)r neegzistuoja."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Išorinis raktas (tipas nustatomas susijusiame lauke)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Sąryšis vienas su vienu"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Sąryšis daug su daug"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Nuspauskite \"Control\", arba \"Command\" Mac kompiuteriuose, kad pasirinkti "
 "daugiau nei vieną."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Šis laukas yra privalomas."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Įveskite pilną skaičių."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Įveskite skaičių."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Užtikrinkite, kad visumoje nėra daugiau skaitmenų nei %s."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Užtikrinkite, kad dešimtainių reikšmių nėra daugiau nei %s."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Užtikrinkite, kad skaitmenų prieš keblelį nėra daugiau nei %s."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Įveskite tinkamą datą."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Įveskite tinkamą laiką."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Įveskite tinkamą datą/laiką."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Nebuvo nurodytas failas. Patikrinkite formos koduotę."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Failas nebuvo nurodytas."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Nurodytas failas yra tuščias."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -662,11 +685,11 @@ msgstr ""
 "Įsitikinkite, kad reikšmę sudaro daugiausia %(max)d simbolių (dabar "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Nurodykite failą arba pažymėkite išvalyti. Abu pasirinkimai negalimi."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -674,36 +697,40 @@ msgstr ""
 "Atsiųskite tinkamą paveiksliuką. Failas, kurį siuntėte nebuvo paveiksliukas, "
 "arba buvo sugadintas."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Įveskite tinkamą URL adresą."
+
+#: 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 "Nurodykite tinkamą reikšmę. %(value)s nėra galimas pasirinkimas."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Įveskite reikšmių sarašą."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Nurodyti"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Pataisykite pasikartojančius duomenis laukui %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Pataisykite pasikartojančius duomenis laukui %(field)s. Duomenys privalo "
 "būti unikalūs."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -712,29 +739,29 @@ msgstr ""
 "Pataisykite pasikartojančius duomenis laukui %(field_name)s. Duomenys "
 "privalo būti unikalūs %(lookup)s peržiūroms per %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Pataisykite žemiau esančias pasikartojančias reikšmes."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Išorinis raktas neatitinka tėvinio objekto pirminio rakto."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Pasirinkite tinkamą reikšmę. Parinkta reikšmė nėra galima."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Pasirinkite tinkamą. %s nėra vienas(-a) iš galimų."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" nėra pirminiam raktui tinkama reikšmė."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -743,35 +770,35 @@ msgstr ""
 "Nepavyko interpretuoti %(datetime)s %(current_timezone)s laiko juostoje; "
 "Data gali turėti keletą reikšmių arba neegzistuoti."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Šiuo metu"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Pakeisti"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Taip"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ne"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "taip,ne,galbūt"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -779,52 +806,52 @@ msgstr[0] "%(size)d baitas"
 msgstr[1] "%(size)d baitai"
 msgstr[2] "%(size)d baitai"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "vidurnaktis"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "vidurdienis"
 
@@ -886,51 +913,51 @@ msgstr "S"
 
 #: utils/dates.py:18
 msgid "January"
-msgstr "Sausis"
+msgstr "sausis"
 
 #: utils/dates.py:18
 msgid "February"
-msgstr "Vasaris"
+msgstr "vasaris"
 
 #: utils/dates.py:18
 msgid "March"
-msgstr "Kovas"
+msgstr "kovas"
 
 #: utils/dates.py:18
 msgid "April"
-msgstr "Balandis"
+msgstr "balandis"
 
 #: utils/dates.py:18
 msgid "May"
-msgstr "Gegužė"
+msgstr "gegužė"
 
 #: utils/dates.py:18
 msgid "June"
-msgstr "Birželis"
+msgstr "birželis"
 
 #: utils/dates.py:19
 msgid "July"
-msgstr "Liepa"
+msgstr "liepa"
 
 #: utils/dates.py:19
 msgid "August"
-msgstr "Rugpjūtis"
+msgstr "rugpjūtis"
 
 #: utils/dates.py:19
 msgid "September"
-msgstr "Rugsėjis"
+msgstr "rugsėjis"
 
 #: utils/dates.py:19
 msgid "October"
-msgstr "Spalis"
+msgstr "spalis"
 
 #: utils/dates.py:19
 msgid "November"
-msgstr "Lapkritis"
+msgstr "lapkritis"
 
 #: utils/dates.py:20
 msgid "December"
-msgstr "Gruodis"
+msgstr "gruodis"
 
 #: utils/dates.py:23
 msgid "jan"
@@ -983,245 +1010,230 @@ msgstr "grd"
 #: utils/dates.py:31
 msgctxt "abbrev. month"
 msgid "Jan."
-msgstr "Sau."
+msgstr "saus."
 
 #: utils/dates.py:32
 msgctxt "abbrev. month"
 msgid "Feb."
-msgstr "Vas."
+msgstr "vas."
 
 #: utils/dates.py:33
 msgctxt "abbrev. month"
 msgid "March"
-msgstr "Kovas"
+msgstr "kov."
 
 #: utils/dates.py:34
 msgctxt "abbrev. month"
 msgid "April"
-msgstr "Balandis"
+msgstr "bal."
 
 #: utils/dates.py:35
 msgctxt "abbrev. month"
 msgid "May"
-msgstr "Gegužė"
+msgstr "geg."
 
 #: utils/dates.py:36
 msgctxt "abbrev. month"
 msgid "June"
-msgstr "Birželis"
+msgstr "birž."
 
 #: utils/dates.py:37
 msgctxt "abbrev. month"
 msgid "July"
-msgstr "Liepa"
+msgstr "liep."
 
 #: utils/dates.py:38
 msgctxt "abbrev. month"
 msgid "Aug."
-msgstr "Rugp."
+msgstr "rugpj."
 
 #: utils/dates.py:39
 msgctxt "abbrev. month"
 msgid "Sept."
-msgstr "Rugs."
+msgstr "rugs."
 
 #: utils/dates.py:40
 msgctxt "abbrev. month"
 msgid "Oct."
-msgstr "Spa."
+msgstr "spal."
 
 #: utils/dates.py:41
 msgctxt "abbrev. month"
 msgid "Nov."
-msgstr "Lap."
+msgstr "lapkr."
 
 #: utils/dates.py:42
 msgctxt "abbrev. month"
 msgid "Dec."
-msgstr "Grd."
+msgstr "gruod."
 
 #: utils/dates.py:45
 msgctxt "alt. month"
 msgid "January"
-msgstr "Sausis"
+msgstr "sausio"
 
 #: utils/dates.py:46
 msgctxt "alt. month"
 msgid "February"
-msgstr "Vasaris"
+msgstr "vasario"
 
 #: utils/dates.py:47
 msgctxt "alt. month"
 msgid "March"
-msgstr "Kovas"
+msgstr "kovo"
 
 #: utils/dates.py:48
 msgctxt "alt. month"
 msgid "April"
-msgstr "Balandis"
+msgstr "balandžio"
 
 #: utils/dates.py:49
 msgctxt "alt. month"
 msgid "May"
-msgstr "Gegužė"
+msgstr "gegužės"
 
 #: utils/dates.py:50
 msgctxt "alt. month"
 msgid "June"
-msgstr "Birželis"
+msgstr "birželio"
 
 #: utils/dates.py:51
 msgctxt "alt. month"
 msgid "July"
-msgstr "Liepa"
+msgstr "liepos"
 
 #: utils/dates.py:52
 msgctxt "alt. month"
 msgid "August"
-msgstr "Rugpjūtis"
+msgstr "rugpjūčio"
 
 #: utils/dates.py:53
 msgctxt "alt. month"
 msgid "September"
-msgstr "Rugsėjis"
+msgstr "rugsėjo"
 
 #: utils/dates.py:54
 msgctxt "alt. month"
 msgid "October"
-msgstr "Spalis"
+msgstr "spalio"
 
 #: utils/dates.py:55
 msgctxt "alt. month"
 msgid "November"
-msgstr "Lapkritis"
+msgstr "lapkričio"
 
 #: utils/dates.py:56
 msgctxt "alt. month"
 msgid "December"
-msgstr "Gruodis"
+msgstr "gruodžio"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "arba"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "metai"
 msgstr[1] "metai"
 msgstr[2] "metai"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mėnuo"
 msgstr[1] "mėnesiai"
 msgstr[2] "mėnesiai"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "savaitė"
 msgstr[1] "savaitės"
 msgstr[2] "savaitės"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "diena"
 msgstr[1] "dienos"
 msgstr[2] "dienos"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "valanda"
 msgstr[1] "valandos"
 msgstr[2] "valandos"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutė"
 msgstr[1] "minutės"
 msgstr[2] "minutės"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutės"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Aplankų indeksai čia neleidžiami."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" neegzistuoja"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s indeksas"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s sėkmingai sukurtas."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s sėkmingai atnaujintas."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s buvo ištrintas."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Nenurodyti metai"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Nenurodytas mėnuo"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Nenurodyta diena"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nenurodyta savaitė"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Nėra %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1230,27 +1242,27 @@ msgstr ""
 "Ateities %(verbose_name_plural)s nėra prieinami, nes %(class_name)s."
 "allow_future yra False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Data '%(datestr)s' neatitinka formato '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Atitinkantis užklausą %(verbose_name)s nerastas"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Puslapis nėra 'paskutinis', taip pat negali būti paverstas į sveiką skaičių."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Neegzistuojantis puslapis (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Neegzistuojantis puslapis (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Tuščias sąrašas ir '%(class_name)s.allow_empty' yra False."
diff --git a/django/conf/locale/lt/formats.py b/django/conf/locale/lt/formats.py
index c28600b6d6..1bff4d9861 100644
--- a/django/conf/locale/lt/formats.py
+++ b/django/conf/locale/lt/formats.py
@@ -1,23 +1,48 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = r'Y \m. F j \d.'
+DATE_FORMAT = r'Y \m. E j \d.'
 TIME_FORMAT = 'H:i:s'
-# DATETIME_FORMAT = 
-# YEAR_MONTH_FORMAT = 
-# MONTH_DAY_FORMAT = 
-SHORT_DATE_FORMAT = 'Y.m.d'
-# SHORT_DATETIME_FORMAT = 
-# FIRST_DAY_OF_WEEK = 
+DATETIME_FORMAT = r'Y \m. E j \d., H:i:s'
+YEAR_MONTH_FORMAT = r'Y \m. F'
+MONTH_DAY_FORMAT = r'E j \d.'
+SHORT_DATE_FORMAT = 'Y-m-d'
+SHORT_DATETIME_FORMAT = 'Y-m-d H:i'
+FIRST_DAY_OF_WEEK = 1  # Monday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS = 
-# TIME_INPUT_FORMATS = 
-# DATETIME_INPUT_FORMATS = 
+DATE_INPUT_FORMATS = (
+    '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
+)
+TIME_INPUT_FORMATS = (
+    '%H:%M:%S',     # '14:30:59'
+    '%H:%M:%S.%f',  # '14:30:59.000200'
+    '%H:%M',        # '14:30'
+    '%H.%M.%S',     # '14.30.59'
+    '%H.%M.%S.%f',  # '14.30.59.000200'
+    '%H.%M',        # '14.30'
+)
+DATETIME_INPUT_FORMATS = (
+    '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
+    '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
+    '%d.%m.%Y %H:%M:%S',     # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
+    '%d.%m.%Y %H:%M',        # '25.10.2006 14:30'
+    '%d.%m.%Y',              # '25.10.2006'
+    '%d.%m.%y %H:%M:%S',     # '25.10.06 14:30:59'
+    '%d.%m.%y %H:%M:%S.%f',  # '25.10.06 14:30:59.000200'
+    '%d.%m.%y %H:%M',        # '25.10.06 14:30'
+    '%d.%m.%y %H.%M.%S',     # '25.10.06 14.30.59'
+    '%d.%m.%y %H.%M.%S.%f',  # '25.10.06 14.30.59.000200'
+    '%d.%m.%y %H.%M',        # '25.10.06 14.30'
+    '%d.%m.%y',              # '25.10.06'
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING = 
+NUMBER_GROUPING = 3
diff --git a/django/conf/locale/lv/LC_MESSAGES/django.mo b/django/conf/locale/lv/LC_MESSAGES/django.mo
index a8e6995e84..c231680908 100644
Binary files a/django/conf/locale/lv/LC_MESSAGES/django.mo and b/django/conf/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/lv/LC_MESSAGES/django.po b/django/conf/locale/lv/LC_MESSAGES/django.po
index 839612fe18..114f40e6b0 100644
--- a/django/conf/locale/lv/LC_MESSAGES/django.po
+++ b/django/conf/locale/lv/LC_MESSAGES/django.po
@@ -7,357 +7,377 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+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: edgars <edgars.jekabsons@gmail.com>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "arābu"
 
-#: 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 "bulgāru"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengāļu"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosniešu"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "katalāņu"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "čehu"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "velsiešu"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "dāņu"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "vācu"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "grieķu"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "angļu"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Lielbritānijas angļu"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "spāņu"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr ""
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr ""
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "igauņu"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "basku"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persiešu"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "somu"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "franču"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frīzu"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "īru"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galīciešu"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ebreju"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "horvātu"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ungāru"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr ""
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandiešu"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "itāļu"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japāņu"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "vācu"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "khmeru"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kannādiešu"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "korejiešu"
 
-#: conf/global_settings.py:87
-msgid "Lithuanian"
-msgstr "lietuviešu"
-
-#: conf/global_settings.py:88
-msgid "Latvian"
-msgstr "latviešu"
-
-#: conf/global_settings.py:89
-msgid "Macedonian"
-msgstr "maķedoniešu"
-
-#: conf/global_settings.py:90
-msgid "Malayalam"
-msgstr ""
-
-#: conf/global_settings.py:91
-msgid "Mongolian"
-msgstr ""
-
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
-msgstr ""
+msgid "Lithuanian"
+msgstr "lietuviešu"
 
 #: conf/global_settings.py:94
-msgid "Dutch"
-msgstr "holandiešu"
+msgid "Latvian"
+msgstr "latviešu"
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
-msgstr ""
+msgid "Macedonian"
+msgstr "maķedoniešu"
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
+msgid "Malayalam"
 msgstr ""
 
 #: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr ""
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr ""
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "holandiešu"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr ""
+
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "poļu"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugāļu"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brazīlijas portugāļu"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumāņu"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "krievu"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "slovāku"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "slovēņu"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albāņu"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "serbu"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "serbu latīņu"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "zviedru"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamilu"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "taizemiešu"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turku"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ukraiņu"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr ""
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vjetnamiešu"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "vienkāršā ķīniešu"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "tradicionālā ķīniešu"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Ievadiet korektu vērtību."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Šī URL adrese šķiet bojāta."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Ievadiet korektu URL adresi."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Ievadiet korektu e-pasta adresi."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Ievadiet korektu vērtību, kas satur tikai burtus, numurus, apakšsvītras vai "
 "šķērssvītras."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Ievadiet korektu IPv4 adresi."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Ievadiet tikai numurus, atdalītus ar komatiem."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Nodrošiniet, ka vērtība ir %(limit_value)s (tā satur %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Šai vērtībai jabūt mazākai vai vienādai ar %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Vērtībai jābūt lielākai vai vienādai ar %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +386,7 @@ msgstr ""
 "Vērtībai jāsatur vismaz %(limit_value)d rakstu zīmes (tā satur "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,271 +395,271 @@ msgstr ""
 "Vērtībai jāsatur ne vairāk kā %(limit_value)d rakstu zīmes (tā satur "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s jābūt unikālam %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "un"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ar nosaukumu %(field_label)s jau eksistē."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Nederīga izvēle: %r."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Šis lauks nevar neksistēt (būt null)."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Šis lauks nevar būt tukšs"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Lauks ar tipu: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Vesels skaitlis"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (True vai False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Simbolu virkne (līdz pat %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Ar komatu atdalīti veselie skaitļi"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datums (bez laika)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datums (ar laiku)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimāls skaitlis"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-pasta adrese"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Faila ceļš"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Plūstošā punkta skaitlis"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Liels (8 baitu) vesels skaitlis"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP adrese"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (jā, nē vai neviens)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Teksts"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Laiks"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modelis %(model)s ar primāro atslēgu %(pk)r neeksistē."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Ārējā atslēga (tipu nosaka lauks uz kuru attiecas)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Attiecība viens pret vienu"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Attiecība daudzi pret daudziem"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Lai iezīmētu vairāk par vienu, pieturiet \"Ctrl\" (\"Command\" uz Mac "
 "datora) taustiņu."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Šis lauks ir obligāts."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Ievadiet veselu skaitli."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Ievadiet skaitli."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Pārliecinieties, ka kopā nav vairāk par %s cipariem."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Pārliecinieties, ka aiz decimālās zīmes nav vairāk par %s cipariem."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Pārliecinieties, ka pirms decimālās zīmes nav vairāk par %s cipariem."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Ievadiet korektu datumu."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Ievadiet korektu laiku."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Ievadiet korektu datumu/laiku."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Nav nosūtīts fails. Pārbaudiet formas kodējuma tipu."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Netika nosūtīts fails."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Jūsu nosūtītais fails ir tukšs."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -647,11 +667,11 @@ msgstr ""
 "Faila nosaukuma garums nedrīkst pārsniegt %(max)d rakstu zīmes (tas satur "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -659,35 +679,39 @@ msgstr ""
 "Augšupielādējiet korektu attēlu. Fails, ko augšupielādējāt, vai nu nav "
 "attēls, vai arī ir bojāts."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Ievadiet korektu URL adresi."
+
+#: 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 "Izvēlieties korektu izvēli. %(value)s nav pieejamo izvēļu sarakstā."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Ievadiet sarakstu ar vērtībām."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Sakārtojums"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Dzēst"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Lūdzu izlabojiet dublicētos datus priekš %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Lūdzu izlabojiet dublicētos datus laukam %(field)s, kam jābūt unikālam."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -696,64 +720,64 @@ msgstr ""
 "Lūdzu izlabojiet dublicētos datus laukam %(field_name)s, kam jābūt unikālam "
 "priekš %(lookup)s iekš %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Lūdzu izlabojiet dublicētās vērtības zemāk."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Iekļautā ārējā atslēga nesakrita ar vecāka elementa primāro atslēgu"
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Izvēlaties pareizu izvēli. Jūsu izvēlele neietilpst pieejamo sarakstā."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Izvēlieties pareizu izvēli. %s nav pieejamo izvēļu sarakstā."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ir nederīga vērtība priekš primārās atslēgas."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Izmainīt"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Jā"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nē"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "jā,nē,varbūt"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -761,52 +785,52 @@ msgstr[0] "%(size)d baits"
 msgstr[1] "%(size)d baiti"
 msgstr[2] "%(size)d baitu"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "pusnakts"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "dienasvidus"
 
@@ -1082,154 +1106,139 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "decembris"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "vai"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "gads"
 msgstr[1] "gadi"
 msgstr[2] "gadu"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mēnesis"
 msgstr[1] "mēneši"
 msgstr[2] "mēnesu"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "nedēļa"
 msgstr[1] "nedēļas"
 msgstr[2] "nedēļu"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "diena"
 msgstr[1] "dienas"
 msgstr[2] "dienu"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "stunda"
 msgstr[1] "stundas"
 msgstr[2] "stundu"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minūte"
 msgstr[1] "minūtes"
 msgstr[2] "minūšu"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minūtes"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s tika veiksmīgi izveidots."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s tika veiksmīgi dzēsts."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s tika dzēsts."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/lv/formats.py b/django/conf/locale/lv/formats.py
index f115a6e487..db1952e973 100644
--- a/django/conf/locale/lv/formats.py
+++ b/django/conf/locale/lv/formats.py
@@ -22,19 +22,25 @@ DATE_INPUT_FORMATS = (
 )
 TIME_INPUT_FORMATS = (
     '%H:%M:%S',     # '14:30:59'
-    '%H:%M',     # '14:30'
-    '%H.%M.%S', # '14.30.59'
-    '%H.%M', # '14.30'
+    '%H:%M:%S.%f',  # '14:30:59.000200'
+    '%H:%M',        # '14:30'
+    '%H.%M.%S',     # '14.30.59'
+    '%H.%M.%S.%f',  # '14.30.59.000200'
+    '%H.%M',        # '14.30'
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%d.%m.%Y %H:%M:%S',     # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',        # '25.10.2006 14:30'
     '%d.%m.%Y',              # '25.10.2006'
     '%d.%m.%y %H:%M:%S',     # '25.10.06 14:30:59'
+    '%d.%m.%y %H:%M:%S.%f',  # '25.10.06 14:30:59.000200'
     '%d.%m.%y %H:%M',        # '25.10.06 14:30'
     '%d.%m.%y %H.%M.%S',     # '25.10.06 14.30.59'
+    '%d.%m.%y %H.%M.%S.%f',  # '25.10.06 14.30.59.000200'
     '%d.%m.%y %H.%M',        # '25.10.06 14.30'
     '%d.%m.%y',              # '25.10.06'
 )
diff --git a/django/conf/locale/mk/LC_MESSAGES/django.mo b/django/conf/locale/mk/LC_MESSAGES/django.mo
index 5d720c71be..21e9c03cb7 100644
Binary files a/django/conf/locale/mk/LC_MESSAGES/django.mo and b/django/conf/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/mk/LC_MESSAGES/django.po b/django/conf/locale/mk/LC_MESSAGES/django.po
index d6d237a590..0704c4359e 100644
--- a/django/conf/locale/mk/LC_MESSAGES/django.po
+++ b/django/conf/locale/mk/LC_MESSAGES/django.po
@@ -8,360 +8,380 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+0100\n"
-"PO-Revision-Date: 2012-03-12 11:15+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Бенгалски"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Босански"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Каталански"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Чешки"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Велшки"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Дански"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Германски"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Грчки"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Англиски"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Британскиот англиски"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Есперанто"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Шпански"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Аргентински Шпански"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Мексикански шпански"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Никарагва шпански"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Естонски"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Баскиски"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Персиски"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Фински"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Француски"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Фризиски"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Ирски"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Галски"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Еврејски"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Хинди"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Хрватски"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Унгарски"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Индонезиски"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Исландски"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Италијански"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Јапонски"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Грузиски"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Казахстански"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Кмер"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Канада"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Корејски"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Литвански"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Латвиски"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Македонски"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Малајалам"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Монголски"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Норвешка bokmål"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Непалски"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Холандски"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Норвешки Нинорск"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Пунџаби"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Полски"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Португалкски"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Бразилско португалски"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Романски"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Руски"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Словачки"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Словенечки"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Албански"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Српски"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Српски Латиница"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Шведски"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Свахили"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Тамил"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Телугу"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Тајландски"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Турски"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Татарски"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Украински"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Урду"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Виетнамски"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Упростен кинески"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Традиционален кинески"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Внесете правилна вредност."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Оваа веб адреса изгледа дека не е достапна."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Внесете правилна веб адреса."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Внесeте правилна адреса за е-пошта."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Внесете правилно кратко име (slug) кое се соддржи од букви, цифри, долна "
 "црта или тире."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Внесeте правилна IPv4 адреса."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Внесете валидна IPv6 адреса."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Внесете валидна IPv4 или IPv6 адреса."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Внесете само цифри одделени со запирки."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Осигурајте се дека оваа вредност е помала или еднаква со %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Осигурајте се дека оваа вредност е поголема или еднаква со %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -370,7 +390,7 @@ msgstr ""
 "Осигурајте се дека оваа вредност има најмалку %(limit_value)d знаци (има "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -379,84 +399,84 @@ msgstr ""
 "Осигурајте се дека оваа вредност има најмногу %(limit_value)d знаци (има "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "и"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 со %(field_label)s веќе постои."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Вредноста %r не е валиден избор."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Оваа вредност неможе да биде null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Ова поле не може да биде празно"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Поле од тип: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Цел број"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Вредноста '%s'  мора да биде цел број."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Вредноста '%s' мора да биде точно или неточно."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Логичка (или точно или неточно)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Збор (до %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Целобројни вредности одделени со запирка"
 
-#: db/models/fields/__init__.py:647
+#: 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' има невалиден формат на датум. Таа мора да биде во формат "
 "ГГГГ-ММ-ДД."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' има правилен формат (ГГГГ-ММ-ДД), но тоа не е валиден датум."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Датум (без час)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +485,7 @@ msgstr ""
 "Вредноста '%s' има невалиден формат. Таа мора да биде во ГГГГ-ММ-ДД HH:MM[:сс"
 "[uuuuuu].] [ВЗ] формат."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,79 +494,79 @@ msgstr ""
 "Вредноста '%s' има правилен формат (ГГГГ-ММ-ДД HH:MM [:сс[uuuuuu].] [ВЗ]), "
 "но тоа не е валиден датум / време."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Датум (со час)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Вредноста '%s' мора да биде децимален број."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Децимален број"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Адреса на е-пошта"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Е-пошта"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Патека на датотека"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Вредноста '%s' мора да биде број со подвижна запирка."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Децимален број"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Голем (8 бајти) цел број"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 адреса"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "ИП адреса"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Вредноста '%s' мора да биде празна, точно или неточно."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Логичка (точно,неточно или празно)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Позитивен цел број"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Позитивен мал цел број"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Скратено име (до %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Мал цел број"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Текст"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -554,7 +574,7 @@ msgstr ""
 "Вредноста '%s' има невалиден формат. Таа мора да биде во HH:MM[:сс[uuuuuu].] "
 "Формат."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -563,98 +583,98 @@ msgstr ""
 "Вредноста '%s' има правилен формат (ЧЧ:ММ[:сс[uuuuuu].]), Но тоа не е "
 "валидно време."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Час"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Датотека"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Слика"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Модел %(model)s со примарен клуч %(pk)r не постои."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Надворешен клуч (типот е одреден според сврзаното поле)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Еден-према-еден релација"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Повеќе-према-повеќе релација"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Држете го „Control“, или „Command“ на Мекинтош, за да изберете повеќе од "
 "едно."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Ова поле е задолжително."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Внеси цел број."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Внесете број."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Осигурајте се дека вкупно нема повеќе од %s цифри."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Осигурајте се дека нема повеќе од %s децимални места."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Осигурајте се дека нема повеќе од %s цифри пред децималната запирка."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Внесете правилен датум."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Внесете правилно време."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Внесете правилен датум со време."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Не беше пратена датотека. Проверете го типот на енкодирање на формата."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Не беше пратена датотека."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Пратената датотека е празна."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -662,11 +682,11 @@ msgstr ""
 "Осигурајте се дека ова име на датотека има најмногу %(max)d знаци (има "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Или прикачете датотека или оттштиклирајте го полето."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -674,36 +694,40 @@ msgstr ""
 "Качете валидна слика. Датотеката која ја качивте или не беше слика или беше "
 "расипана датотеката."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Внесете правилна веб адреса."
+
+#: 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 "Внесете валиден избор. %(value)s не е еден од можните избори."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Внесете листа на вредности."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Редослед"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Избриши"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Ве молам поправете ја дуплираната вредност за  %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Ве молам поправете ја дуплираната вредност за %(field)s, која мора да биде "
 "уникатна."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -712,31 +736,31 @@ msgstr ""
 "Ве молам поправете ја дуплираната вредност за %(field_name)s која мора да "
 "биде уникатна за %(lookup)s во %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Ве молам поправете ги дуплираните вредности подолу."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Надворешниот клуч на вгезденото поле не се совпаѓа со примарниот клуч на "
 "родителската инстанца."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Изберете правилно. Тоа не е еден од можните избори."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Внесете правилно. %s не е еден од достапните вредности."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" не е правилна вредност за примарен клуч."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -745,87 +769,87 @@ msgstr ""
 "%(datetime)s не може да се толкува во временска зона %(current_timezone)s;  "
 "можеби е двосмислена или не постои."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Моментално"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Измени"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Исчисти"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Непознато"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Да"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Не"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "да, не, можеби"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d бајт"
 msgstr[1] "%(size)d бајти"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "попладне"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "наутро"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "попладне"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "наутро"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "полноќ"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "пладне"
 
@@ -1101,122 +1125,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Декември"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "или"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "година"
 msgstr[1] "години"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "месец"
 msgstr[1] "месеци"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "седмица"
 msgstr[1] "седмици"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ден"
 msgstr[1] "дена"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часа"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минути"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "минути"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Индекси на директориуми не се дозволени тука."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" не постои"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Индекс на %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Ставка %(verbose_name)s беше успешно создадена."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Ставка %(verbose_name)s беше успешно ажурирана."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Ставка %(verbose_name)s беше избришана."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Не е дадена година"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Не е даден месец"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Не е даден ден"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Не е дадена недела"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Нема достапни %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1225,28 +1234,28 @@ msgstr ""
 "Идни %(verbose_name_plural)s не се достапни бидејќи %(class_name)s."
 "allow_future е False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Невалиден текст за датум '%(datestr)s' даден формат '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Нема %(verbose_name)s што се совпаѓа со пребарувањето"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Страницата не е \"последна\", ниту пак може да се конвертира во еден цел "
 "број."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Невалидна страница (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Празна листа и '%(class_name)s .allow_empty' е False."
diff --git a/django/conf/locale/mk/formats.py b/django/conf/locale/mk/formats.py
index 44feb512bf..2a0df6c43f 100644
--- a/django/conf/locale/mk/formats.py
+++ b/django/conf/locale/mk/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -22,15 +23,19 @@ DATE_INPUT_FORMATS = (
 
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y. %H:%M:%S',     # '25.10.2006. 14:30:59'
+    '%d.%m.%Y. %H:%M:%S.%f',  # '25.10.2006. 14:30:59.000200'
     '%d.%m.%Y. %H:%M',        # '25.10.2006. 14:30'
     '%d.%m.%Y.',              # '25.10.2006.'
     '%d.%m.%y. %H:%M:%S',     # '25.10.06. 14:30:59'
+    '%d.%m.%y. %H:%M:%S.%f',  # '25.10.06. 14:30:59.000200'
     '%d.%m.%y. %H:%M',        # '25.10.06. 14:30'
     '%d.%m.%y.',              # '25.10.06.'
     '%d. %m. %Y. %H:%M:%S',   # '25. 10. 2006. 14:30:59'
+    '%d. %m. %Y. %H:%M:%S.%f', # '25. 10. 2006. 14:30:59.000200'
     '%d. %m. %Y. %H:%M',      # '25. 10. 2006. 14:30'
     '%d. %m. %Y.',            # '25. 10. 2006.'
     '%d. %m. %y. %H:%M:%S',   # '25. 10. 06. 14:30:59'
+    '%d. %m. %y. %H:%M:%S.%f', # '25. 10. 06. 14:30:59.000200'
     '%d. %m. %y. %H:%M',      # '25. 10. 06. 14:30'
     '%d. %m. %y.',            # '25. 10. 06.'
 )
diff --git a/django/conf/locale/ml/LC_MESSAGES/django.mo b/django/conf/locale/ml/LC_MESSAGES/django.mo
index b9363b3c97..e3a6975596 100644
Binary files a/django/conf/locale/ml/LC_MESSAGES/django.mo and b/django/conf/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ml/LC_MESSAGES/django.po b/django/conf/locale/ml/LC_MESSAGES/django.po
index 28c2dba4c0..71edc77659 100644
--- a/django/conf/locale/ml/LC_MESSAGES/django.po
+++ b/django/conf/locale/ml/LC_MESSAGES/django.po
@@ -8,354 +8,374 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+0100\n"
-"PO-Revision-Date: 2012-03-10 02:59+0000\n"
-"Last-Translator: Jeffy <jeffymj@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "ബംഗാളി"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "ബോസ്നിയന്‍"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "കാറ്റലന്‍"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "ചെക്"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "വെല്‍ഷ്"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "ഡാനിഷ്"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "ജര്‍മന്‍"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "ഗ്രീക്ക്"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "ഇംഗ്ളീഷ്"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "ബ്രിട്ടീഷ് ഇംഗ്ളീഷ്"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "എസ്പെരാന്റോ"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "സ്പാനിഷ്"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "അര്‍ജന്റീനിയന്‍ സ്പാനിഷ്"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "മെക്സിക്കന്‍ സ്പാനിഷ്"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
+msgstr "നിക്കരാഗ്വന്‍ സ്പാനിഷ്"
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "എസ്ടോണിയന്‍ സ്പാനിഷ്"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "ബാസ്ക്യു"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "പേര്‍ഷ്യന്‍"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "ഫിന്നിഷ്"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ഫ്രെഞ്ച്"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "ഫ്രിസിയന്‍"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ഐറിഷ്"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "ഗലിഷ്യന്‍"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ഹീബ്റു"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "ഹിന്ദി"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "ക്രൊയേഷ്യന്‍"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ഹംഗേറിയന്‍"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "ഇന്തൊനേഷ്യന്‍"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "ഐസ്ലാന്‍ഡിക്"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "ഇറ്റാലിയന്‍"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "ജാപ്പനീസ്"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "ജോര്‍ജിയന്‍"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "കസാക്"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "ഖ്മേര്‍"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "കന്നഡ"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "കൊറിയന്‍"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "ലിത്വാനിയന്‍"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "ലാറ്റ്വിയന്‍"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "മാസിഡോണിയന്‍"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "മലയാളം"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "മംഗോളിയന്‍"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "നോര്‍വീജിയന്‍ ബൊക്മാല്‍"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "നേപ്പാളി"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "ഡച്ച്"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "നോര്‍വീജിയന്‍ നിനോഷ്ക്"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "പഞ്ചാബി"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "പോളിഷ്"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "പോര്‍ചുഗീസ്"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "ബ്റസീലിയന്‍ പോര്‍ചുഗീസ്"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "റൊമാനിയന്‍"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "റഷ്യന്‍"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "സ്ളൊവാക്"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "സ്ളൊവേനിയന്‍"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "അല്‍ബേനിയന്‍"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "സെര്‍ബിയന്‍"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "സെര്‍ബിയന്‍ ലാറ്റിന്‍"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "സ്വീഡിഷ്"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "സ്വാഹിലി"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "തമിഴ്"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "തെലുങ്ക്"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "തായ്"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "ടര്‍ക്കിഷ്"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "തൊതാര്‍"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "യുക്രേനിയന്‍"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "ഉര്‍ദു"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "വിയറ്റ്നാമീസ്"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "ലഘു ചൈനീസ്"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "പരമ്പരാഗത ചൈനീസ്"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "ശരിയായ മൂല്യം നല്കണം."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "ഈ URL നിലവില്ലാത്ത വിലാസമാണ് കാണിക്കുന്നത്."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "ശരിയായ URL നല്കണം."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "ശരിയായ ഇ-മെയില്‍ വിലാസം നല്കുക."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "ശരിയായ സ്ളഗ് നല്കുക (അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, അണ്ടര്‍സ്കോര്‍, ഹൈഫന്‍ എന്നിവ മാത്രം ചേര്‍ന്നത്)."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "ശരിയായ IPv4 വിലാസം നല്കണം"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
-msgstr ""
+msgstr "ശരിയായ ഒരു IPv6 വിലാസം നല്കുക."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "ശരിയായ ഒരു IPv4 വിലാസമോ IPv6 വിലാസമോ നല്കുക."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "അക്കങ്ങള്‍ മാത്രം (കോമയിട്ടു വേര്‍തിരിച്ചത്)"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "ഇത് %(limit_value)s-ഓ അതില്‍ കുറവോ ആവണം"
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "ഇത് %(limit_value)s-ഓ അതില്‍ കൂടുതലോ ആവണം"
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -364,7 +384,7 @@ msgstr ""
 "ഇതിനു ഏറ്റവും കുറഞ്ഞത് %(limit_value)d അക്ഷരങ്ങള്‍ വേണം. (ഇപ്പോള്‍ %(show_value)d "
 "അക്ഷരങ്ങളുണ്ട്.)"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -373,269 +393,275 @@ msgstr ""
 "ഇതിനു പരമാവധി %(limit_value)d അക്ഷരങ്ങളേ ഉള്ളൂ എന്നു ഉറപ്പാക്കുക. (ഇപ്പോള്‍ "
 "%(show_value)d അക്ഷരങ്ങളുണ്ട്.)"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(date_field)s %(lookup)s-നു %(field_name)s ആവര്‍ത്തിക്കാന്‍ പാടില്ല."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ഉം"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "%(field_label)s-ഓടു കൂടിയ %(model_name)s നിലവിലുണ്ട്."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r അനുയോജ്യമല്ല."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "ഈ കളം (ഫീല്‍ഡ്) ഒഴിച്ചിടരുത്."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "ഈ കളം (ഫീല്‍ഡ്) ഒഴിച്ചിടരുത്."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "%(field_type)s എന്ന തരത്തിലുള്ള കളം (ഫീല്‍ഡ്)"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "പൂര്‍ണ്ണസംഖ്യ"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
-msgstr ""
+msgstr "'%s' മൂല്യം ഒരു പൂര്‍ണസംഖ്യ ആയിരിക്കണം."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "'%s' മൂല്യം True അഥവാ False ആയിരിക്കണം."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "ശരിയോ തെറ്റോ (True അഥവാ False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "സ്ട്രിങ്ങ് (%(max_length)s വരെ നീളമുള്ളത്)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "കോമയിട്ട് വേര്‍തിരിച്ച സംഖ്യകള്‍"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
+msgstr "'%s' മൂല്യം തെറ്റായ മാതൃകയിലാണ്. അത് YYYY-MM-DD എന്ന മാതൃകയിലാണ് നല്കേണ്ടത്."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
+msgstr "'%s' മൂല്യം ശരിയായ മാതൃകയിലാണ് (YYYY-MM-DD) പക്ഷേ തീയതി തെറ്റാണു്."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "തീയതി (സമയം വേണ്ട)"
 
-#: db/models/fields/__init__.py:732
+#: 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' മൂല്യം തെറ്റായ മാതൃകയിലാണ്. അത് YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] എന്ന "
+"മാതൃകയിലാണ് നല്കേണ്ടത്."
 
-#: db/models/fields/__init__.py:736
+#: 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' മൂല്യം ശരിയായ മാതൃകയിലാണ് (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) പക്ഷേ തീയതിയും "
+"സമയവും തെറ്റാണു്."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "തീയതി (സമയത്തോടൊപ്പം)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "'%s' മൂല്യം ഒരു ദശാംശസംഖ്യ decimal ആയിരിക്കണം."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "ദശാംശസംഖ്യ"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "ഇ-മെയില്‍ വിലാസം"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "ഫയല്‍ സ്ഥാനം"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
-msgstr ""
+msgstr "'%s' മൂല്യം ഒരു ദശാംശസംഖ്യ float ആയിരിക്കണം."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "ദശാംശസംഖ്യ"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "8 ബൈറ്റ് പൂര്‍ണസംഖ്യ."
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "IPv4 വിലാസം"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP വിലാസം"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "'%s' മൂല്യം None, True, False എന്നിവയില്‍ ഏതെങ്കിലും ഒന്നായിരിക്കണം."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "ശരിയോ തെറ്റോ എന്നു മാത്രം (True, False, None എന്നിവയില്‍ ഏതെങ്കിലും ഒന്ന്)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "ധന പൂര്‍ണസംഖ്യ"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "ധന ഹ്രസ്വ പൂര്‍ണസംഖ്യ"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "സ്ലഗ്  (%(max_length)s വരെ)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "ഹ്രസ്വ പൂര്‍ണസംഖ്യ"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "ടെക്സ്റ്റ്"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
+msgstr "'%s' മൂല്യം ശരിയായ മാതൃകയിലല്ല. അത് HH:MM[:ss[.uuuuuu]] എന്ന മാതൃകയിലാവണം."
 
-#: db/models/fields/__init__.py:1182
+#: 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' മൂല്യം ശരിയായ മാതൃകയിലാണ് (HH:MM[:ss[.uuuuuu]]) പക്ഷേ തെറ്റായ സമയത്തെ "
+"സൂചിപ്പിക്കുന്നു."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "സമയം"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL(വെബ്-വിലാസം)"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "ഫയല്‍"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "ചിത്രം"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "%(pk)r എന്ന pk ഉള്ള %(model)s എന്ന മോഡല്‍ നിലവിലില്ല."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "ഫോറിന്‍ കീ (ടൈപ്പ് ബന്ധപ്പെട്ട ഫീല്‍ഡില്‍ നിന്നും നിര്‍ണ്ണയിക്കുന്നതാണ്)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "വണ്‍-ടു-വണ്‍ ബന്ധം"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "മെനി-ടു-മെനി ബന്ധം"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "\"Control\" എന്ന കീ അമര്‍ത്തിപ്പിടിക്കുക. (Macലാണെങ്കില്‍  \"Command\")."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "ഈ കള്ളി(ഫീല്‍ഡ്) നിര്‍ബന്ധമാണ്."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "ഒരു പൂര്‍ണസംഖ്യ നല്കുക."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "ഒരു സംഖ്യ നല്കുക."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "മൊത്തം %s ലേറെ അക്കങ്ങള്‍ ഇല്ലെന്ന് ഉറപ്പു വരുത്തുക."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "%s ലേറെ ദശാംശസ്ഥാനങ്ങള്‍ ഇല്ലെന്ന് ഉറപ്പു വരുത്തുക."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "ദശാംശബിന്ദുവിനു മുമ്പ് %sലേറെ അക്കങ്ങള്‍ ഇല്ലെന്നു ഉറപ്പു വരുത്തുക."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "ശരിയായ തീയതി നല്കുക."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "ശരിയായ സമയം നല്കുക."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "ശരിയായ തീയതിയും സമയവും നല്കുക."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "ഫയലൊന്നും ലഭിച്ചിട്ടില്ല. ഫോമിലെ എന്‍-കോഡിംഗ് പരിശോധിക്കുക."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "ഫയലൊന്നും ലഭിച്ചിട്ടില്ല."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "ലഭിച്ച ഫയല്‍ ശൂന്യമാണ്."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -643,13 +669,13 @@ msgstr ""
 "ഈ ഫയലിന്റെ പേര് പരമാവധി %(max)d അക്ഷരങ്ങളുള്ളതായിരിക്കണം. (ഇപ്പോള്‍ %(length)d അക്ഷരങ്ങള്‍ "
 "ഉണ്ട്)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "ഒന്നുകില്‍ ഫയല്‍ സമര്‍പ്പിക്കണം, അല്ലെങ്കില്‍ ക്ളിയര്‍ എന്ന ചെക്ബോക്സ് ടിക് ചെയ്യണം. ദയവായി രണ്ടും "
 "കൂടി ചെയ്യരുത്."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -657,34 +683,38 @@ msgstr ""
 "ശരിയായ ചിത്രം അപ് ലോഡ് ചെയ്യുക. നിങ്ങള്‍ നല്കിയ ഫയല്‍ ഒന്നുകില്‍ ഒരു ചിത്രമല്ല, അല്ലെങ്കില്‍ "
 "വികലമാണ്."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "ശരിയായ URL നല്കണം."
+
+#: 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 "യോഗ്യമായത് തെരഞ്ഞെടുക്കുക. %(value)s ലഭ്യമായവയില്‍ ഉള്‍പ്പെടുന്നില്ല."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "മൂല്യങ്ങളുടെ പട്ടിക(ലിസ്റ്റ്) നല്കുക."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "ക്രമം"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "ഡിലീറ്റ്"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "%(field)s-നായി നല്കുന്ന വിവരം ആവര്‍ത്തിച്ചത് ദയവായി തിരുത്തുക."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "%(field)s-നായി നല്കുന്ന വിവരം ആവര്‍ത്തിക്കാന്‍ പാടില്ല. ദയവായി തിരുത്തുക."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -693,116 +723,118 @@ msgstr ""
 "%(date_field)s ലെ %(lookup)s നു വേണ്ടി %(field_name)s നു നല്കുന്ന വിവരം ആവര്‍ത്തിക്കാന്‍ "
 "പാടില്ല. ദയവായി തിരുത്തുക."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "താഴെ കൊടുത്തവയില്‍ ആവര്‍ത്തനം ഒഴിവാക്കുക."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "ഇന്‍ലൈനായി നല്കിയ ഫോറിന്‍ കീ മാത്രു വസ്തുവിന്റെ പ്രാഥമിക കീയുമായി യോജിക്കുന്നില്ല."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "യോഗ്യമായത് തെരഞ്ഞെടുക്കുക. നിങ്ങള്‍ നല്കിയത് ലഭ്യമായവയില്‍ ഉള്‍പ്പെടുന്നില്ല."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "യോഗ്യമായത് തെരഞ്ഞെടുക്കുക. %s തന്നിരിക്കുന്നവയില്‍ ഉള്‍പ്പെടുന്നില്ല."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" പ്രാഥമിക കീ ആവാന്‍ അനുയോജ്യമായ മൂല്യമല്ല."
 
-#: forms/util.py:70
+#: 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 %(current_timezone)s എന്ന സമയമേഖലയിലേക്ക് വ്യാഖ്യാനിക്കാന്‍ "
+"സാധിച്ചിട്ടില്ല; ഇത് ഒന്നുകില്‍ അവ്യക്തമാണ്, അല്ലെങ്കില്‍ നിലവിലില്ല."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "നിലവിലുള്ളത്"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "മാറ്റുക"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "കാലിയാക്കുക"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "അജ്ഞാതം"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "അതെ"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "അല്ല"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ഉണ്ട്, ഇല്ല, ഉണ്ടായേക്കാം"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d ബൈറ്റ്"
 msgstr[1] "%(size)d ബൈറ്റുകള്‍"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s കെ.ബി"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s എം.ബി"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s ജി.ബി"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s ടി.ബി"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s പി.ബി"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "പി. എം (ഉച്ചയ്ക്കു ശേഷം) "
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "എ. എം (ഉച്ചയ്ക്കു മുമ്പ്)"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "പി. എം (ഉച്ചയ്ക്കു ശേഷം) "
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "എ. എം (ഉച്ചയ്ക്കു മുമ്പ്)"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "അര്‍ധരാത്രി"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "ഉച്ച"
 
@@ -1078,148 +1110,136 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "ഡിസംബര്‍"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "അഥവാ"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "വര്‍ഷം"
 msgstr[1] "വര്‍ഷങ്ങള്‍"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "മാസം"
 msgstr[1] "മാസങ്ങള്‍"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "ആഴ്ച്ച"
 msgstr[1] "ആഴ്ച്ചകള്‍"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ദിവസം"
 msgstr[1] "ദിവസങ്ങള്‍"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "മണിക്കൂര്‍"
 msgstr[1] "മണിക്കൂറുകള്‍"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "മിനുട്ട്"
 msgstr[1] "മിനുട്ടുകള്‍"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "മിനുട്ടുകള്‍"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "ഡയറക്ടറി സൂചികകള്‍ ഇവിടെ അനുവദനീയമല്ല."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" നിലവിലില്ല"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "%(directory)s യുടെ സൂചിക"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s നെ സ്രുഷ്ടിച്ചു."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s നെ മെച്ചപ്പെടുത്തി."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s ഡിലീറ്റ് ചെയ്യപ്പെട്ടു."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "വര്‍ഷം പരാമര്‍ശിച്ചിട്ടില്ല"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "മാസം പരാമര്‍ശിച്ചിട്ടില്ല"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "ദിവസം പരാമര്‍ശിച്ചിട്ടില്ല"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "ആഴ്ച പരാമര്‍ശിച്ചിട്ടില്ല"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s ഒന്നും ലഭ്യമല്ല"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
+"%(class_name)s.allow_future ന്  False എന്നു നല്കിയിട്ടുള്ളതിനാല്‍  Future "
+"%(verbose_name_plural)s ഒന്നും ലഭ്യമല്ല."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "'%(datestr)s' എന്ന തെറ്റായ തീയതി '%(format)s' എന്ന മാതൃകയില്‍."
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "ചോദ്യത്തിനു ചേരുന്ന് %(verbose_name)s ഇല്ല"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
+"പേജ് നമ്പറായി സംഖ്യയാക്കി മാറ്റാന്‍ കഴിയുന്ന മൂല്യമോ 'last' എന്ന മൂല്യമോ അല്ല നല്കിയിട്ടുള്ളത്."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "താള് (%(page_number)s) അസാധുവാണ്"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "ലിസ്റ്റ് കാലിയുമാണ് %(class_name)s.allow_empty എന്നത് False എന്നു നല്കിയിട്ടുമുണ്ട്."
diff --git a/django/conf/locale/ml/formats.py b/django/conf/locale/ml/formats.py
index 6bd693e60e..e73bc62367 100644
--- a/django/conf/locale/ml/formats.py
+++ b/django/conf/locale/ml/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -25,12 +26,15 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
+    '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
     '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
     '%m/%d/%Y',              # '10/25/2006'
     '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
+    '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
     '%m/%d/%y',              # '10/25/06'
 )
diff --git a/django/conf/locale/mn/LC_MESSAGES/django.mo b/django/conf/locale/mn/LC_MESSAGES/django.mo
index 6a32caf7e6..5fff0afda9 100644
Binary files a/django/conf/locale/mn/LC_MESSAGES/django.mo and b/django/conf/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/mn/LC_MESSAGES/django.po b/django/conf/locale/mn/LC_MESSAGES/django.po
index 33e436ab5d..5107556626 100644
--- a/django/conf/locale/mn/LC_MESSAGES/django.po
+++ b/django/conf/locale/mn/LC_MESSAGES/django.po
@@ -5,364 +5,384 @@
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # jargalan <jargalanch@gmail.com>, 2011.
 # Tsolmon <mnts26@gmail.com>, 2011.
-# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011, 2012.
+# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011-2012.
 # Баясгалан Цэвлээ <bayasaa_7672@yahoo.com>, 2011.
 # Ганзориг БП <ganzo.bp@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:31+0100\n"
-"PO-Revision-Date: 2012-03-08 16:12+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Беларус"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Бенгал"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Бэрэйтон "
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Босни"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Каталан"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Чех"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Уэльс"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Дани"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Герман"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Грек"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Англи"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Британи Англи"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Эсперанто"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Испани"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Аргентинийн Испани"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Мексикийн Испани"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Никрагуан Испани"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Венесуэлийн Спани"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Эстони"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Баск"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Перс"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Финлянд"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Франц"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Фриз"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Ирланд"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Галици"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Еврэй"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Хинди"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Хорват"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Унгар"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Индонези"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Исланд"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Итали"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Япон"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Гүрж"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Казак"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Кхмер"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Канад"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Солонгос"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Лүксенбүргиш"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Литва"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Латви"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Македон"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Малайз"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Монгол"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Норвеги бокмал"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Непал"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Голланд"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Норвегийн нюнорск"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Панжаби"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Польш"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Португал"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Бразилийн Португали"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Румын"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Орос"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Словак"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Словен"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Альбани"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Серби"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Серби латин"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Щвед"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Савахил"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Тамил"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Тэлүгү"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Тайланд"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Турк"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Татар"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Удмурт"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Украйн"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Урду"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Вьетнам"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Хятад (хялбаршуулсан) "
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Хятад (уламжлалт)"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Зөв утга оруулна уу."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Энэ URL холбоос хүчингүй эсвэл буруу байна."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Зөв email хаяг оруулна уу"
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Зөв, хүчинтэй хаяг (URL) оруулна уу."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Зөв мэйл хаяг оруулна уу"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Үсэг, тоо, доогуур зураас, дундуур зурааснаас бүрдэх зөв 'slug' оруулна уу."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Зөв IPv4 хаяг оруулна уу. "
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Зөв IPv6  хаяг оруулна уу."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Зөв IPv4 эсвэл IPv6 хаяг оруулна уу."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Зөвхөн таслалаар тусгаарлагдсан цифр оруулна уу."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Энэ утга %(limit_value)s -с бага эсвэл тэнцүү байх ёстой."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Энэ утга %(limit_value)s -с их эсвэл тэнцүү байх нөхцлийг хангана уу."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -371,7 +391,7 @@ msgstr ""
 "Энэ утгын тэмдэгтийн тоо %(limit_value)d -с бага байх ёстой. (одоо "
 "%(show_value)d байна)"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -380,72 +400,72 @@ msgstr ""
 "Энэ утгын тэмдэгтийн тоо %(limit_value)d -с их байх ёстой. (одоо "
 "%(show_value)d байна)"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ба"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "%(field_label)s-тэй %(model_name)s-ийг аль хэдийнэ оруулсан байна."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Энэ утга %r буруу сонголт байна."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Энэ хэсгийг хоосон орхиж болохгүй."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Энэ хэсэг хоосон байж болохгүй."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Талбарийн төрөл нь : %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Бүхэл тоо"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' талбарт заавал бүхэн тоон утга оруулна."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' талбарт заавал True эсвэл False ийн аль нэг нь байна."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (Үнэн худлын аль нэг нь)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Бичвэр (%(max_length)s хүртэл)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Таслалаар тусгаарлагдсан бүхэл тоо"
 
-#: db/models/fields/__init__.py:647
+#: 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' утга буруу форматтай байна. Формат нь YYYY-MM-DD байх хэрэгтэй."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -453,11 +473,11 @@ msgstr ""
 "'%s' утга зөв форматтай байна. Гэвч огнооны хэсэгийн формат буруу байна. "
 "Формат нь (YYYY-MM-DD) байх хэрэгтэй."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Огноо (цаггүй)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -466,7 +486,7 @@ msgstr ""
 "'%s' утга буруу форматтай байна. Формат нь заавал YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] байх хэрэгтэй."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -475,79 +495,79 @@ msgstr ""
 "'%s' утга зөв форматтай байна(YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) гэвч буруу "
 "огноо/цаг байна. "
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Огноо (цагтай)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' заавал decimal утга байх."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Аравтын бутархайт тоо"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Цахим шуудангийн хаяг"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Файлын зам "
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' заавал float утга байх."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Хөвөгч таслалтай тоо"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Том (8 байт) бүхэл тоо"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 хаяг"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP хаяг"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' заавал  None, True эсвэл False утга авах."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (Үнэн, худал, эсвэл юу ч биш)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Бүхэл тоох утга"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Бага бүхэл тоон утга"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Слаг (ихдээ %(max_length)s )"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Бага тоон утна"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Текст"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -555,7 +575,7 @@ msgstr ""
 "'%s' утга буруу форматтай байна. Формат нь заавал HH:MM[:ss[.uuuuuu]] байх "
 "хэрэгтэй."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -564,97 +584,97 @@ msgstr ""
 "'%s' утгын формат нь зөв байна гэвч цагийн формат нь буруу байна. Цагийн "
 "формат заавал (HH:MM[:ss[.uuuuuu]]) байна."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Цаг"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Файл"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Зураг"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr " pk %(pk)r-тай %(model)s модель байхгүй байна."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Гадаад түлхүүр (тодорхой төрлийн холбоос талбар)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Нэг-нэг холбоос"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Олон-олон холбоос"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Олон утга сонгохын тулд \"Control\" (Mac дээр \"Command\")  товчыг ашиглана."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Энэ талбарыг бөглөх шаардлагатай."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Бүхэл тоон утга оруулна уу."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Тоон утга оруулна уу."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Энд нийтдээ %s -аас олонгүй цифр байх ёстой."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Энд %s -аас олонгүй бутархайн орон байх ёстой. "
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Энд бутархайн таслалаас өмнө %s-аас олонгүй цифр байх ёстой."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Зөв огноо оруулна уу."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Зөв цаг оруулна уу."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Огноо/цаг-ыг зөв оруулна уу."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Файл оруулаагүй байна. Маягтаас кодлох төрлийг чагтал. "
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Файл оруулаагүй байна."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Оруулсан файл хоосон байна. "
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -662,13 +682,13 @@ msgstr ""
 "Энэ файлын нэрний урт %(length)d байна. Файлын нэр хамгийн ихдээ %(max)d "
 "тэмдэгтээс бүрдэх нөхцлийг хангана уу."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Нэг бол сонголтын чягтыг авах эсвэл файл оруулна уу. Зэрэг хэрэгжих "
 "боломжгүй."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -676,36 +696,40 @@ msgstr ""
 "Зөв зураг оруулна уу. Таны оруулсан файл нэг бол зургийн файл биш эсвэл "
 "гэмтсэн зураг байна."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Зөв, хүчинтэй хаяг (URL) оруулна уу."
+
+#: 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 "Зөв сонголт хийнэ үү. %(value)s гэсэн сонголт байхгүй байна."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Өгөгдхүүний жагсаалтаа оруулна уу."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Эрэмбэлэх"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Устгах"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "%(field)s хэсэг дэх давхардсан утгыг засварлана уу. "
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "%(field)s хэсэг дэх давхардсан утгыг засварлана уу.  Түүний утгууд "
 "давхардахгүй байх ёстой."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -714,30 +738,30 @@ msgstr ""
 "%(field_name)s хэсэг дэх давхардсан утгыг засварлана уу. %(date_field)s-н "
 "%(lookup)s хувьд давхардахгүй байх ёстой."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Доорх давхардсан утгуудыг засна уу."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Inline обектийн гадаад түлхүүр Эцэг обектийн түлхүүртэй таарахгүй байна. "
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Зөв сонголт хийнэ үү. Энэ утга сонголтонд алга."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Зөв сонголт хийгээрэй. %s гэсэн сонголт байхгүй байна."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" нь primary key талбарт тохирохгүй утга байна."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -746,87 +770,87 @@ msgstr ""
 "%(datetime)s цагийн бүсийг хөрвүүлэж чадахгүй байна. %(current_timezone)s; "
 "цагийн бүс буруу эсвэл байхгүй байж магадгүй."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Одоогийн"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Засах"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Цэвэрлэх"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Тодорхойгүй"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Тийм"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Үгүй"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "тийм,үгүй,магадгүй"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d байт"
 msgstr[1] "%(size)d байт"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "шөнө дунд"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "үд дунд"
 
@@ -1102,122 +1126,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Гахай"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "буюу"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "жил "
 msgstr[1] "жил"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "сар"
 msgstr[1] "сар"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "долоо хоног"
 msgstr[1] "долоо хоног"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "өдөр"
 msgstr[1] "өдөр"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "цаг"
 msgstr[1] "цаг"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
 msgstr[1] "минут"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "минут"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Файлын жагсаалтыг энд зөвшөөрөөгүй."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" байхгүй байна."
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s ийн жагсаалт"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s амжилттай үүслээ."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr " %(verbose_name)s амжилттай шинэчлэгдлээ."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s устлаа."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Он тодорхойлоогүй байна"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Сар тодорхойлоогүй байна"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Өдөр тодорхойлоогүй байна"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Долоо хоног тодорхойлоогүй байна"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s боломжгүй"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1226,27 +1235,27 @@ msgstr ""
 "%(class_name)s.allow_future нь худлаа учраас %(verbose_name_plural)s нь "
 "боломжгүй."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "Буруу огноо. '%(datestr)s' огноо  '%(format)s' хэлбэрт тохирохгүй байна."
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Шүүлтүүрт таарах  %(verbose_name)s олдсонгүй "
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Хуудас нь 'last' биш, эсвэл тоонд хөрвүүлэж болохгүй байна."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "(%(page_number)s)-р хуудас байхгүй"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Буруу хуудас  (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/mn/formats.py b/django/conf/locale/mn/formats.py
index 54a46a903f..50ab9f101c 100644
--- a/django/conf/locale/mn/formats.py
+++ b/django/conf/locale/mn/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/my/LC_MESSAGES/django.mo b/django/conf/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..7acda01c8f
Binary files /dev/null and b/django/conf/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/my/LC_MESSAGES/django.po b/django/conf/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..8762aa3de7
--- /dev/null
+++ b/django/conf/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,1213 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+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-17 07:10+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "အာရပ်"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr ""
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "ဘူဂေးရီယန်"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "ဘင်းဂလီ"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "ဘော့်စ်နီယန်"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "ကက်တလန်"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "ချက်"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "ဝေးလ်"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "ဒိန်းမတ်"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "ဂျာမန်"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "ဂရိ"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "အင်္ဂလိပ်"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "ဗြိတိသျှအင်္ဂလိပ်"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr ""
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "စပိန်"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr ""
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr ""
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr ""
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr ""
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr ""
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr ""
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr ""
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr ""
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr ""
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr ""
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr ""
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr ""
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr ""
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr ""
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr ""
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr ""
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr ""
+
+#: conf/global_settings.py:88
+msgid "Kazakh"
+msgstr ""
+
+#: conf/global_settings.py:89
+msgid "Khmer"
+msgstr ""
+
+#: conf/global_settings.py:90
+msgid "Kannada"
+msgstr ""
+
+#: conf/global_settings.py:91
+msgid "Korean"
+msgstr ""
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr ""
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr ""
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr ""
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr ""
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr ""
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr ""
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr ""
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr ""
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr ""
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr ""
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr ""
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr ""
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr ""
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr ""
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr ""
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr ""
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:114
+msgid "Swahili"
+msgstr ""
+
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr ""
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr ""
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr ""
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr ""
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr ""
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr ""
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr ""
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr ""
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr ""
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:157
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+
+#: core/validators.py:196
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+
+#: db/models/base.py:857
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr ""
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr "နှင့်"
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr ""
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr ""
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr ""
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr "ကိန်းပြည့်"
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr ""
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr ""
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "အီးမေးလ်လိပ်စာ"
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr ""
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr ""
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr "အိုင်ပီဗီ၄လိပ်စာ"
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr "အိုင်ပီလိပ်စာ"
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "စာသား"
+
+#: 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 ""
+
+#: 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 ""
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr ""
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "ယူအာအယ်"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr "ဖိုင်"
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr "ပံု"
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr ""
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr ""
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr ""
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr ""
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr ""
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr ""
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr ""
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr ""
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr ""
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr ""
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr ""
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr ""
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr ""
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr ""
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr ""
+
+#: 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 ""
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr ""
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr "မှာကြား"
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr "ပယ်ဖျက်"
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: 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 ""
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr ""
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr ""
+
+#: 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 ""
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr ""
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr ""
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr ""
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr "အမည်မသိ"
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr "ဟုတ်"
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr "မဟုတ်"
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr ""
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d ဘိုက်များ"
+
+#: template/defaultfilters.py:835
+#, python-format
+msgid "%s KB"
+msgstr "%s ကီလိုဘိုက်"
+
+#: template/defaultfilters.py:837
+#, python-format
+msgid "%s MB"
+msgstr "%s မက်ဂါဘိုက်"
+
+#: template/defaultfilters.py:839
+#, python-format
+msgid "%s GB"
+msgstr "%s ဂစ်ဂါဘိုက်"
+
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr "%s တီရာဘိုက်"
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr "%s ပီတာဘိုက်"
+
+#: utils/dateformat.py:47
+msgid "p.m."
+msgstr "ညနေ"
+
+#: utils/dateformat.py:48
+msgid "a.m."
+msgstr "မနက်"
+
+#: utils/dateformat.py:53
+msgid "PM"
+msgstr "ညနေ"
+
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr "မနက်"
+
+#: utils/dateformat.py:103
+msgid "midnight"
+msgstr "သန်းခေါင်"
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr "မွန်းတည့်"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "တနင်္လာနေ့"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr ""
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr ""
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr ""
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "January"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "February"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:18
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "December"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "may"
+msgstr ""
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr ""
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr ""
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr ""
+
+#: utils/text.py:70
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:239
+msgid "or"
+msgstr ""
+
+#. 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] ""
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr ""
+
+#: utils/timesince.py:48
+#, python-format
+msgid "%(number)d %(type)s"
+msgstr ""
+
+#: utils/timesince.py:54
+#, python-format
+msgid ", %(number)d %(type)s"
+msgstr ""
+
+#: views/static.py:56
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: views/generic/dates.py:646
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/nb/LC_MESSAGES/django.mo b/django/conf/locale/nb/LC_MESSAGES/django.mo
index c0e47e7997..2f55423c36 100644
Binary files a/django/conf/locale/nb/LC_MESSAGES/django.mo and b/django/conf/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/nb/LC_MESSAGES/django.po b/django/conf/locale/nb/LC_MESSAGES/django.po
index bce6b9868d..c66e03ff86 100644
--- a/django/conf/locale/nb/LC_MESSAGES/django.po
+++ b/django/conf/locale/nb/LC_MESSAGES/django.po
@@ -2,442 +2,462 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-#   <jonklo@gmail.com>, 2012.
+#   <jonklo@gmail.com>, 2012-2013.
 # jonklo <jonklo@gmail.com>, 2011.
 #   <sigurdga-transifex@sigurdga.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-12 14:49+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-09 22:40+0000\n"
+"Last-Translator: jonklo <jonklo@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\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 "Arabisk"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Aserbajdsjansk"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Hviterussisk"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalsk"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretonsk"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Walisisk"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Dansk"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Tysk"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Gresk"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Engelsk"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Engelsk (britisk)"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spansk"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentinsk spansk"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Meksikansk spansk"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nicaraguansk spansk"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venezuelanske spansk"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estisk"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskisk"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persisk"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finsk"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Fransk"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisisk"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irsk"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galisisk"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesisk"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiensk"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japansk"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgisk"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kasakhisk"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreansk"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxembourgsk"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latvisk"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolsk"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norsk (bokmål)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepali"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norsk (nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Panjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polsk"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk portugisisk"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Russisk"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albansk"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbisk latin"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Svensk"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thai"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatarisk"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurtisk"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Forenklet kinesisk"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Oppgi en gyldig verdi."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Nettadressen fører til en side som ikke eksisterer."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Oppgi en gyldig e-postadresse"
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Oppgi en gyldig nettadresse."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Oppgi en gyldig e-postadresse."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 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."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Oppgi en gyldig IPv4-adresse."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Oppgi en gyldig IPv6-adresse."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Oppgi en gyldig IPv4- eller IPv6-adresse."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Oppgi kun tall adskilt med komma."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Verdien må være mindre enn eller lik %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Verdien må være større enn eller lik %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, 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)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, 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)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "og"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 med %(field_label)s finnes allerede."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Verdien %r er ikke et gyldig valg."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Feltet kan ikke være tomt."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Feltet kan ikke være blankt."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Felt av typen: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Heltall"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "«%s»-verdien må være et heltall."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "«%s»-verdien må være enten True eller False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolsk (True eller False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Tekst (opp til %(max_length)s tegn)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Heltall adskilt med komma"
 
-#: db/models/fields/__init__.py:647
+#: 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»-verdien har et ugyldig datoformat. Det må være på formen YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -445,11 +465,11 @@ msgstr ""
 "«%s»-verdien er på den korrekte formen (YYYY-MM-DD), men det er en ugyldig "
 "dato."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dato (uten tid)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -458,7 +478,7 @@ msgstr ""
 "«%s»-verdien har et ugyldig datoformat. Det må være på formen YYYY-MM-DD HH:"
 "MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -467,79 +487,79 @@ msgstr ""
 "«%s»-verdien er på den korrekte formen (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), "
 "men er ugyldig dato/tid."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dato (med tid)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "«%s»-verdien må være et desimaltall."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Desimaltall"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-postadresse"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Filsti"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "«%s»-verdien må være et flyttall."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Flyttall"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Stort (8 byte) heltall"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4-adresse"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "«%s»-verdien må være enten None, True eller False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolsk (True, False eller None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Positivt heltall"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Positivt lite heltall"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (opp til %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Lite heltall"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -547,7 +567,7 @@ msgstr ""
 "«%s»-verdien har et ugyldig format. Det må være på formen HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -556,107 +576,107 @@ msgstr ""
 "«%s»-verdien er på den korrekte formen (HH:MM[:ss[.uuuuuu]]), men det er en "
 "ugyldig dato."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Tid"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "Nettadresse"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fil"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Bilde"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, 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."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Fremmednøkkel (type bestemmes av relatert felt)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "En-til-en-relasjon"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Mange-til-mange-relasjon"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 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:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Feltet er påkrevet."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Oppgi et heltall."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Oppgi et tall."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Verdien kan ikke ha mer enn %s siffer totalt."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Verdien kan ikke ha mer enn %s desimaler."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, 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."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Oppgi en gyldig dato."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Oppgi et gyldig tidspunkt."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Oppgi gyldig dato og tidspunkt."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Ingen fil ble sendt. Sjekk «encoding»-typen på skjemaet."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Ingen fil ble sendt."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Filen er tom."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, 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)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Vennligst last opp en ny fil eller marker fjern-boksen, ikke begge."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -664,34 +684,38 @@ msgstr ""
 "Last opp et gyldig bilde. Filen du lastet opp var ødelagt eller ikke et "
 "bilde."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Oppgi en gyldig nettadresse."
+
+#: 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 "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Oppgi en liste med verdier."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Rekkefølge"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Slett"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Vennligst korriger dupliserte data for %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Vennligst korriger dupliserte data for %(field)s, som må være unike."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -700,29 +724,29 @@ msgstr ""
 "Vennligst korriger dupliserte data for %(field_name)s, som må være unike for "
 "%(lookup)s i %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
 
-#: forms/models.py:849
+#: forms/models.py:852
 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."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Velg et gyldig valg. Valget er ikke av de tilgjengelige valgene."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Velg et gyldig valg. %s er ikke av de tilgjengelige valgene."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, 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."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -731,87 +755,87 @@ msgstr ""
 "%(datetime)s kunne ikke tolkes i tidssonen %(current_timezone)s, det kan "
 "være tvetydig eller ikke eksistere."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Nåværende"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Endre"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Fjern"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ja"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nei"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ja,nei,kanskje"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d byte"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "midnatt"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "12:00"
 
@@ -1087,122 +1111,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Desember"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s…"
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "eller"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "år"
 msgstr[1] "år"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "måned"
 msgstr[1] "måneder"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "uke"
 msgstr[1] "uker"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dager"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutter"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Mappeinnhold er ikke tillatt her."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "«%(path)s» finnes ikke"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Innhold i %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s ble opprettet."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s ble oppdatert."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s ble slettet."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "År ikke spesifisert"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Måned ikke spesifisert"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Dag ikke spesifisert"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Uke ikke spesifisert"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Ingen %(verbose_name_plural)s tilgjengelig"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1211,26 +1220,26 @@ msgstr ""
 "Fremtidig %(verbose_name_plural)s ikke tilgjengelig fordi %(class_name)s."
 "allow_future er False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Ugyldig datostreng «%(datestr)s» gitt formatet «%(format)s»"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Fant ingen %(verbose_name)s som passet spørringen"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Siden er ikke «last», og kan heller ikke konverteres til et tall."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ugyldig side (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Ugyldig side (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Tom liste og «%(class_name)s.allow_empty» er False."
diff --git a/django/conf/locale/nb/formats.py b/django/conf/locale/nb/formats.py
index 9a009dc03a..8f976d7045 100644
--- a/django/conf/locale/nb/formats.py
+++ b/django/conf/locale/nb/formats.py
@@ -25,12 +25,15 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%d.%m.%Y %H:%M:%S',     # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',        # '25.10.2006 14:30'
     '%d.%m.%Y',              # '25.10.2006'
     '%d.%m.%y %H:%M:%S',     # '25.10.06 14:30:59'
+    '%d.%m.%y %H:%M:%S.%f',  # '25.10.06 14:30:59.000200'
     '%d.%m.%y %H:%M',        # '25.10.06 14:30'
     '%d.%m.%y',              # '25.10.06'
 )
diff --git a/django/conf/locale/ne/LC_MESSAGES/django.mo b/django/conf/locale/ne/LC_MESSAGES/django.mo
index 2a72d09d04..9b58bbe5ce 100644
Binary files a/django/conf/locale/ne/LC_MESSAGES/django.mo and b/django/conf/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ne/LC_MESSAGES/django.po b/django/conf/locale/ne/LC_MESSAGES/django.po
index a8a07e2ac5..e30a7f53d0 100644
--- a/django/conf/locale/ne/LC_MESSAGES/django.po
+++ b/django/conf/locale/ne/LC_MESSAGES/django.po
@@ -2,359 +2,380 @@
 #
 # Translators:
 #   <chalisesagar@gmail.com>, 2012.
+# Paras Nath Chaudhary <opnchaudhary@gmail.com>, 2012.
 # Sagar Chalise <chalisesagar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Paras Nath Chaudhary <opnchaudhary@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "बंगाली"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "बोस्नियाली"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "क्याटालान"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "चेक"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "वेल्स"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "डेनिस"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "जर्मन"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "ग्रिक"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "अंग्रेजी"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "बेलायती अंग्रेजी"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "स्पेनिस"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "अर्जेन्टिनाली स्पेनिस"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "मेक्सिकन स्पेनिस"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "निकारागुँवा स्पेनिस"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "इस्टोनियन"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "बास्क"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "फारसी"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "फिन्निस"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "फ्रान्सेली"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "फ्रिसियन"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "आयरिस"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "ग्यलिसियन"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "हिब्रु"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "हिन्दि "
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "क्रोषियन"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "हन्गेरियन"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "इन्डोनेसियाली"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "आइसल्यान्डिक"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "ईटालियन"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "जापनिज"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "जर्जीयन"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "कजाक"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "ख्मेर"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "कन्नडा"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "कोरियाली"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "लिथुवानियाली"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "लाट्भियन"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "म्यासेडोनियन"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "मलायलम"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "मंगोलियन"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "नर्वेली बोक्मल"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "नेपाली"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "डच"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "नर्वेली न्योर्स्क"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "पञ्जावी"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "पोलिस"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "पुर्तगाली"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "ब्राजिली पुर्तगाली"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "रोमानियाली"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "रुसी"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "सलोभाक"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "स्लोभेनियाली"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "अल्बानियाली"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "सर्वियाली"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "सर्वियाली ल्याटिन"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "स्विडिस"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "तामिल"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "तेलुगु"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "थाई"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "टर्किस"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "युक्रेनि"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "उर्दु"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "भियतनामी"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "सरल चिनि"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "प्राचिन चिनि"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "उपयुक्त मान राख्नुहोस ।"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "यो URL रद्द हुन सक्दछ ।"
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "उपयुक्त URL राख्नुहोस ।"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "उपयुक्त ई-मेल ठेगाना राख्नुहोस"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "अक्षर, अंक, _  र - भएका 'स्लग' मात्र हाल्नुहोस ।"
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "उपयुक्त IPv4 ठेगाना राख्नुहोस"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "उपयुक्त आइ.पी.६ ठेगाना राख्नुहोस ।"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "उपयुक्त आइ.पी.६ र आइ.पी.४ ठेगाना राख्नुहोस ।"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "कम्मा सहितका वर्ण मात्र राख्नुहोस ।"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "यो मान %(limit_value)s भन्दा कम अथवा बराबर छ भन्ने निश्चित गर्नुहोस ।"
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "यो मान %(limit_value)s भन्दा बढी अथवा बराबर छ भन्ने निशचित गर्नुहोस ।"
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -363,7 +384,7 @@ msgstr ""
 "यो मान कम्तिमा पनि %(limit_value)d अक्षर छ भन्ने निश्चित गर्नुहोस । (यसमा "
 "%(show_value)d छ ।)"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -372,280 +393,280 @@ msgstr ""
 "यो मान बढिमा पनि %(limit_value)d अक्षर छ भन्ने निश्चित गर्नुहोस । (यसमा "
 "%(show_value)d छ ।)"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(date_field)s %(lookup)s को %(field_name)s नौलो हुनुपर्दछ ।"
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "र"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "%(field_label)s भएको %(model_name)s पहिलै विद्धमान छ ।"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r उपयुक्त रोजाई होइन ।"
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "यो फाँट शून्य हुन सक्दैन ।"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "यो फाँट खाली हुन सक्दैन ।"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "फाँटको प्रकार: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "अंक"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
-msgstr ""
+msgstr "'%s' को मान अंकमा हुनुपर्दछ ।"
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "'%s' को मान True वा False हुनुपर्छ।"
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "बुलियन (True अथवा False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "वर्ण  (%(max_length)s सम्म)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "कम्माले छुट्याइएका अंकहरु ।"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
+msgstr "'%s' मिित को मान अमान्य स्वरूपमा छ। यो YYYY-MM-DDको स्वरूपमा हुनुपर्छ।"
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "मिति (समय रहित)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "मिति (समय सहित)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "'%s' को मान दशमलव संख्यामा हुनुपर्छ।"
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "दश्मलव संख्या"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "ई-मेल ठेगाना"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "फाइलको मार्ग"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "दश्मलव हुने संख्या"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "ठूलो (८ बाइटको) अंक"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr "आइ.पी.६ ठेगाना"
+msgstr "आइ.पी.भी४ ठेगाना"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP ठेगाना"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "'%s' को मान None, True वा False हुनुपर्छ।"
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "बुलियन (True, False अथवा None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "सकारात्मक पूर्णांक"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "स्लग(%(max_length)s सम्म)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "पाठ"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "समय"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "फाइल"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "चित्र"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "प्राइमरी की %(pk)r भएको मोडल %(model)s छैन ।"
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "फोरेन कि (प्रकार नातागत फाँटले जनाउछ)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "एक-देखि-एक नाता"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "अनेक-देखि-अनेक नाता"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "एक भन्दा बढी छान्न म्याकमा \"Control\" अथवा \"Command\" थिच्नुहोस ।"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "यो फाँट अनिवार्य छ ।"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "संख्या राख्नुहोस ।"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "संख्या राख्नुहोस ।"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "समग्रमा %s भन्दा बढी अक्षर नभएको निश्चित पार्नुहोस ।"
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "%s भन्दा बढी दश्मलव नभएको निश्चित पार्नुहोस ।"
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "दश्मलव अघि %s भन्दा बढी अक्षर नभएको निश्चित पार्नुहोस ।"
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "उपयुक्त मिति राख्नुहोस ।"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "उपयुक्त समय राख्नुहोस ।"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "उपयुक्त मिति/समय राख्नुहोस ।"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "कुनै फाईल पेश गरिएको छैन । फारममा ईनकोडिङको प्रकार जाँच गर्नुहोस । "
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "कुनै फाईल पेश गरिएको छैन ।"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "पेश गरिएको फाइल खाली छ ।"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "यो फाइलको नाममा बढीमा %(max)d अंक भएको निश्चित गर्नुहोस । (यसमा %(length)d छ ।)"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "दुवै नछान्नुहोस, कि त फाइल पेश गर्नुहोस वा चेक बाकस मा छान्नुहोस ।"
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -653,34 +674,38 @@ msgstr ""
 "उपयुक्त चित्र अपलोड गर्नुहोस । तपाइले अपलोड गर्नु भएको फाइल चित्र होइन वा बिग्रेको चित्र "
 "हो ।"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "उपयुक्त URL राख्नुहोस ।"
+
+#: 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 "उपयुक्त विकल्प छान्नुहोस ।  %(value)s प्रस्तावित विकल्प होइन ।"
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "मानहरु राख्नुहोस"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "क्रम"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "मेट्नुहोस"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "कृपया %(field)s का लागि दोहोरिइका तथ्याङ्कहरु सच्याउनुहोस ।"
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "कृपया %(field)s का लागि दोहोरिइका तथ्याङ्कहरु नौलो तथ्याङ्क सहित सच्याउनुहोस ।"
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -689,116 +714,116 @@ msgstr ""
 "कृपया %(field_name)s का लागि दोहोरिइका तथ्याङ्कहरु सच्याउनुहोस जसमा "
 "%(date_field)sको %(lookup)s नौलो हुनुपर्दछ ।"
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "कृपया तलका दोहोरिइका मानहरु सच्याउनुहोस ।"
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "भित्रि फोरेन की र अभिभावक प्राइमरी की मिलेन ।"
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "उपयुक्त विकल्प छान्नुहोस ।  छानिएको विकल्प प्रस्तावित विकल्प होइन ।"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "उपयुक्त विकल्प छान्नुहोस ।  %s प्रस्तावित विकल्प होइन ।"
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" प्राइमरी की को लागि उपयुक्त मान होइन ।"
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "अहिले"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "फेर्नुहोस"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "सबै खाली गर्नु होस ।"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "हुन्छ"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "होइन"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "हो, होइन, सायद"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d बाइट"
 msgstr[1] "%(size)d बाइटहरु"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s किलोबाइट"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s मेगाबाइट"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s गिगाबाइट"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s टेराबाइट"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s पिटाबाइट"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "मध्यरात"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "मध्यान्ह"
 
@@ -1074,122 +1099,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "डिसम्वर"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "अथवा"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "साल"
 msgstr[1] "सालहरु"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "महिना"
 msgstr[1] "महिनाहरु"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "साता"
 msgstr[1] "साताहरु"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "दिन"
 msgstr[1] "दिनहरु"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "घण्टा"
 msgstr[1] "घण्टाहरु"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "मिनट"
 msgstr[1] "मिनटहरु"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "मिनटहरु"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s सफलतापूर्वक बनेको छ ।"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s सफलतापूर्वक छ ।"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s मेटिएको छ ।"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "साल तोकिएको छैन ।"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "महिना तोकिएको छैन ।"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "दिन तोकिएको छैन ।"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "साता तोकिएको छैन ।"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s उपलब्ध छैन ।"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1198,26 +1208,26 @@ msgstr ""
 "%(class_name)s.allow_future 'False' हुनाले आगामी %(verbose_name_plural)s उपलब्ध "
 "छैन ।"
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "मिति ढाँचा'%(format)s'को लागि अनुपयुक्त मिति '%(datestr)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "%(verbose_name)s भेटिएन ।"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "पृष्ठ अन्तिमा पनि होइन र अंकमा बदलिन पनि सकिदैन ।"
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "अनुपयुक्त पृष्ठ (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "'%(class_name)s.allow_empty' 'False' छ र लिस्ट पनि खालि छ । "
diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo
index d4f277f1d5..32e5d9af35 100644
Binary files a/django/conf/locale/nl/LC_MESSAGES/django.mo and b/django/conf/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po
index d2d34916b2..8ac12c8e4a 100644
--- a/django/conf/locale/nl/LC_MESSAGES/django.po
+++ b/django/conf/locale/nl/LC_MESSAGES/django.po
@@ -1,6 +1,8 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <alexandervanratingen@gmail.com>, 2012.
+#   <bart@dispectu.com>, 2012-2013.
 # Bas Peschier <bas.peschier@gmail.com>, 2011.
 # Blue <alexandervanratingen@gmail.com>, 2011.
 # Harro van der Klauw <hvdklauw@gmail.com>, 2011, 2012.
@@ -10,358 +12,378 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-03 11:17+0000\n"
+"Last-Translator: bartdegoede <bart@dispectu.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\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 "Arabisch"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaijani"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Wit-Russisch"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengaals"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretons"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalaans"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tjechisch"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Welsh"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Deens"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Duits"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Grieks"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Engels"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Brits-Engels"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spaans"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentijns-Spaans"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mexicaans Spaans"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nicaraguaans Spaans"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venezolaans Spaans"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Ests"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskisch"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Perzisch"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Fins"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Frans"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Fries"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Iers"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galicisch"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebreews"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "IJslands"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiaans"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japans"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazachs"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreaans"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxemburgs"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litouws"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Lets"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macedonisch"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolisch"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Noorse Bokmål"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepalees"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Noorse Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Pools"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Braziliaans Portugees"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Roemeens"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Russisch"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovaaks"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanisch"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Servisch"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Servisch Latijn"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Zweeds"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telegu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thais"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turks"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tataars"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Oedmoerts"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Oekraïens"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamees"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Vereenvoudigd Chinees"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Traditioneel Chinees"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Geef een geldige waarde."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Deze URL lijkt niet te werken."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Vul een geldig emailadres in."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Geef een geldige URL op."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Geef een geldig e-mailadres op."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Vul een geldigde 'slug' in, bestaande uit letters, cijfers, liggende "
 "streepjes en verbindingsstreepjes."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Geef een geldig IPv4-adres op."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Voer een geldig IPv6-adres in."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Voer een geldig IPv4 of IPv6-adres in."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Geef alleen cijfers op, gescheiden door komma's."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Zorg ervoor dat deze waarde gelijk is aan %(limit_value)s (het is nu "
 "%(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Zorg ervoor dat deze waarde hoogstens %(limit_value)s is."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Zorg ervoor dat deze waarde minstens %(limit_value)s is."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -370,7 +392,7 @@ msgstr ""
 "Zorg ervoor dat deze waarde minstens %(limit_value)d karakters bevat (hij "
 "heeft er %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -379,73 +401,73 @@ msgstr ""
 "Zorg ervoor dat deze waarde hoogstens %(limit_value)d karakters bevat (hij "
 "heeft er %(show_value)d)."
 
-#: db/models/base.py:764
+#: 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 zijn voor %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "en"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Er bestaat al een %(model_name)s met eenzelfde %(field_label)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Waarde %r is geen geldige keuze."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Dit veld mag niet leeg zijn."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Dit veld kan niet leeg zijn"
 
-#: db/models/fields/__init__.py:71
+#: 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:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Geheel getal"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: 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 een geheel getal zijn."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' waarde moet True of False zijn."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (True danwel False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Karakterreeks (hooguit %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Komma-gescheiden gehele getallen"
 
-#: db/models/fields/__init__.py:647
+#: 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 heeft een ongeldig datum formaat. Het juiste formaat is YYYY-MM-"
 "DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -453,11 +475,11 @@ msgstr ""
 "'%s' waarde heeft een correct formaat (YYYY-MM-DD), maar is echter geen "
 "geldige datum."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datum (zonder tijd)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -466,7 +488,7 @@ msgstr ""
 "'%s' waarde heeft een ongeldig formaat. Het juiste formaat is YYYY-MM-DD HH:"
 "MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -475,79 +497,79 @@ msgstr ""
 "'%s' waarde heeft een geldig formaat (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), "
 "maar is een ongeldige datum/tijd."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datum (met tijd)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' waarde moet een decimaal getal zijn."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimaal getal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-mailadres"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Bestandspad"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' waarde moet een float zijn."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Decimaal getal"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Groot (8 byte) geheel getal"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 address"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-adres"
 
-#: db/models/fields/__init__.py:1065
+#: 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 zijn."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (True, False of None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Positief geheel getal"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Postitief klein geheel getal"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (max. lengte %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Klein geheel getal"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -555,7 +577,7 @@ msgstr ""
 "'%s' waarde heeft een ongeldig formaat. Het juiste formaat is HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -564,100 +586,100 @@ msgstr ""
 "'%s' waarde heeft het juiste formaat (HH:MM[:ss[.uuuuuu]]), maar is een "
 "ongeldige tijd."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Tijd"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Bestand"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Plaatje"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s met pk %(pk)r bestaat niet."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Refererende sleutel (type wordt bepaalde door gerelateerde veld)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Één-op-één relatie"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Veel-op-veel relatie"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Houd \"Control\", of \"Command\" op een Mac, ingedrukt om meerdere te "
 "selecteren."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Dit veld is verplicht."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Geef een geheel getal op."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Geef een getal op."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Zorg dat er minder dan %s cijfers zijn."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Zorg dat er minder dan %s cijfers na de komma staan."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Zorg dat er minder dan %s cijfers voor de komma staan."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Geef een geldige datum op."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Geef een geldige tijd op."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Geef een geldige datum/tijd op."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Er was geen bestand verstuurd. Controleer het coderingstype van het "
 "formulier."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Er was geen bestand verstuurd."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Het verstuurde bestand is leeg."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -665,11 +687,11 @@ msgstr ""
 "De bestandsnaam mag maximaal %(max)d karakters bevatten (dit zijn er nu "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Upload a.u.b. een bestand of vink de verwijder vink, niet allebei."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -677,34 +699,38 @@ msgstr ""
 "Bestand ongeldig. Het bestand dat is gegeven is geen afbeelding of is "
 "beschadigd."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Geef een geldige URL op."
+
+#: 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 "Selecteer een geldige keuze. %(value)s is geen beschikbare keuze."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Geef een lijst op met waardes."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Volgorde"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Verbeter de dubbele gegevens voor %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Verbeter de dubbele gegevens voor %(field)s, welke uniek moet zijn."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -713,31 +739,31 @@ msgstr ""
 "Verbeter de dubbele gegevens voor %(field_name)s, welke uniek moet zijn voor "
 "de %(lookup)s in %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Verbeter de dubbele waarden hieronder."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "De secundaire sleutel komt niet overeen met de primaire sleutel van de "
 "bovenliggende instantie."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Selecteer een geldige keuze. Deze keuze is niet beschikbaar."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Selecteer een geldige keuze. %s is geen beschikbare keuze."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" is geen geldige waarde voor een primaire sleutel."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -746,87 +772,87 @@ msgstr ""
 "%(datetime)s kon niet worden geïnterpreteerd in tijdzone "
 "%(current_timezone)s. Waarschijnlijk is deze ambigu of bestaat niet."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Huidige"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Wijzigen"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Verwijder"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ja"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nee"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ja,nee,misschien"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "middernacht"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "middag"
 
@@ -1102,122 +1128,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "december"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "of"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "jaar"
 msgstr[1] "jaren"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "maand"
 msgstr[1] "maanden"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "week"
 msgstr[1] "weken"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagen"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uur"
 msgstr[1] "uur"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuten"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Directory overzicht is hier niet toegestaan"
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" bestaat niet"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Overzicht van %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "De %(verbose_name)s is succesvol aangemaakt."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "De %(verbose_name)s is succesvol aangepast."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "De %(verbose_name)s is verwijderd."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Geen jaar opgegeven"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Geen maand opgegeven"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Geen dag opgegeven"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Geen week opgegeven"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: 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 beschikbaar"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1226,27 +1237,27 @@ msgstr ""
 "Geen toekomstige %(verbose_name_plural)s beschikbaar omdat %(class_name)s."
 "allow_future de waarde False (Onwaar) heeft."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Ongeldige datum tekst '%(datestr)s' op basis van formaat '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Geen %(verbose_name)s gevonden die voldoet aan de query"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Pagina is niet 'last' en kan ook niet geconverteerd worden naar een int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ongeldige pagina (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Ongeldige pagina (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/nl/formats.py b/django/conf/locale/nl/formats.py
index be5a146104..5db1f81d8f 100644
--- a/django/conf/locale/nl/formats.py
+++ b/django/conf/locale/nl/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -23,7 +24,9 @@ DATE_INPUT_FORMATS = (
 # Kept ISO formats as one is in first position
 TIME_INPUT_FORMATS = (
     '%H:%M:%S',                         # '15:23:35'
+    '%H:%M:%S.%f',                      # '15:23:35.000200'
     '%H.%M:%S',                         # '15.23:35'
+    '%H.%M:%S.%f',                      # '15.23:35.000200'
     '%H.%M',                            # '15.23'
     '%H:%M',                            # '15:23'
 )
@@ -32,10 +35,14 @@ DATETIME_INPUT_FORMATS = (
     '%d-%m-%Y %H:%M:%S', '%d-%m-%y %H:%M:%S', '%Y-%m-%d %H:%M:%S',  # '20-01-2009 15:23:35', '20-01-09 15:23:35', '2009-01-20 15:23:35'
     # '%d %b %Y %H:%M:%S', '%d %b %y %H:%M:%S',   # '20 jan 2009 15:23:35', '20 jan 09 15:23:35'
     # '%d %B %Y %H:%M:%S', '%d %B %y %H:%M:%S',   # '20 januari 2009 15:23:35', '20 januari 2009 15:23:35'
+    # With time in %H:%M:%S.%f :
+    '%d-%m-%Y %H:%M:%S.%f', '%d-%m-%y %H:%M:%S.%f', '%Y-%m-%d %H:%M:%S.%f',  # '20-01-2009 15:23:35.000200', '20-01-09 15:23:35.000200', '2009-01-20 15:23:35.000200'
     # With time in %H.%M:%S :
     '%d-%m-%Y %H.%M:%S', '%d-%m-%y %H.%M:%S',   # '20-01-2009 15.23:35', '20-01-09 15.23:35'
     # '%d %b %Y %H.%M:%S', '%d %b %y %H.%M:%S',   # '20 jan 2009 15.23:35', '20 jan 09 15.23:35'
     # '%d %B %Y %H.%M:%S', '%d %B %y %H.%M:%S',   # '20 januari 2009 15.23:35', '20 januari 2009 15.23:35'
+    # With time in %H.%M:%S.%f :
+    '%d-%m-%Y %H.%M:%S.%f', '%d-%m-%y %H.%M:%S.%f',   # '20-01-2009 15.23:35.000200', '20-01-09 15.23:35.000200'
     # With time in %H:%M :
     '%d-%m-%Y %H:%M', '%d-%m-%y %H:%M', '%Y-%m-%d %H:%M',   # '20-01-2009 15:23', '20-01-09 15:23', '2009-01-20 15:23'
     # '%d %b %Y %H:%M', '%d %b %y %H:%M',         # '20 jan 2009 15:23', '20 jan 09 15:23'
diff --git a/django/conf/locale/nn/LC_MESSAGES/django.mo b/django/conf/locale/nn/LC_MESSAGES/django.mo
index 3075adfe56..bd6f65a8af 100644
Binary files a/django/conf/locale/nn/LC_MESSAGES/django.mo and b/django/conf/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/nn/LC_MESSAGES/django.po b/django/conf/locale/nn/LC_MESSAGES/django.po
index d819920d6c..04eafec6d2 100644
--- a/django/conf/locale/nn/LC_MESSAGES/django.po
+++ b/django/conf/locale/nn/LC_MESSAGES/django.po
@@ -4,368 +4,389 @@
 #   <havard@grimelid.com>, 2011.
 # hgrimelid <havard@grimelid.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <odin.omdal@gmail.com>, 2012.
 #   <sigurdga-transifex@sigurdga.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-13 12:24+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: velmont <odin.omdal@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Aserbajansk"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalsk"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Walisisk"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Dansk"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Tysk"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Gresk"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Engelsk"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Engelsk (britisk)"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spansk"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Spansk (argentinsk)"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Spansk (meksikansk)"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Spansk (nicaraguansk)"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estisk"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskisk"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persisk"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finsk"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Fransk"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisisk"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irsk"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galisisk"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesisk"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiensk"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japansk"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgisk"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kasakhisk"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreansk"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latvisk"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolsk"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norsk (bokmål)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepali"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norsk (nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polsk"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk portugisisk"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Russisk"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albansk"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbisk latin"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Svensk"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thai"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Tatarisk"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Simplifisert kinesisk"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Oppgje ein gyldig verdi."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Nettadressa fører til ei side som ikkje eksisterar."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Oppgje ei gyldig nettadresse."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Oppgje ei gyldig e-postadresse."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Oppgje ein gyldig 'slug' som består av bokstavar, nummer, understrekar eller "
 "bindestrekar."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Oppgje ei gyldig IPv4-adresse."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Skriv inn ei gyldig IPv6-adresse."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Skriv inn ei gyldig IPv4- eller IPv6-adresse."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Oppgje berre tall skild med komma."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Verdien må minimum ha %(limit_value)s teikn (den er %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Verdien må vere mindre enn eller lik %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Verdien må vere større enn eller lik %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, 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 teikn (den er %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -373,81 +394,81 @@ msgid ""
 msgstr ""
 "Verdien kan maksimalt ha %(limit_value)d teikn (den er %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s må vere unik for %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "og"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 med %(field_label)s fins allereie."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Verdi %r er eit ugyldig val."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Feltet kan ikkje vere tomt."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Feltet kan ikkje vere tomt."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Felt av typen: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Heiltal"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "«%s» må vere eit heiltal."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "«%s» må vere anten True eller False"
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolsk (True eller False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Tekst (opp til %(max_length)s teikn)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Heiltal skild med komma"
 
-#: db/models/fields/__init__.py:647
+#: 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» har eit ugyldig datoformat. Det må vere på formen YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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» har rett format (YYYY-MM-DD) men ein ugyldig dato."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dato (utan tid)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -456,7 +477,7 @@ msgstr ""
 "«%s» har eit ugyldig format. Det må vere på formen YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -465,86 +486,86 @@ msgstr ""
 "«%s» har rett format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) men ugyldig dato "
 "eller klokkeslett."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dato (med tid)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "«%s» må vere eit desimaltal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Desimaltall"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-postadresse"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Filsti"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "«%s» må vere eit flyttal."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Flyttall"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Stort (8 bitar) heiltal"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4-adresse"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "«%s» må vere anten None, True eller False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolsk (True, False eller None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Positivt heiltal"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Positivt lite heiltal"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (opp til %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Lite heiltal"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: 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» har eit ugyldig format. Det må vere på formen HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -552,108 +573,108 @@ msgid ""
 msgstr ""
 "«%s» har rett format (HH:MM[:ss[.uuuuuu]]) men er eit ugyldig klokkeslett."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Tid"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "Nettadresse"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fil"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Bilete"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modellen %(model)s med primærnøkkelen %(pk)r eksisterer ikkje."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Primærnøkkel (type bestemt av relatert felt)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Ein-til-ein-forhold"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Mange-til-mange-forhold"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Hald nede \"Control\", eller \"Command\" på ein Mac, for å velge meir enn "
 "éin."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Feltet er påkravd."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Oppgje eit heiltall."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Oppgje eit tall."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Verdien kan ikkje ha meir enn %s siffer totalt."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Verdien kan ikkie ha meir enn %s desimalar."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Verdien kan ikkje ha meir enn %s siffer framfor komma."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Oppgje ein gyldig dato."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Oppgje eit gyldig tidspunkt."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Oppgje gyldig dato og tidspunkt."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Inga fil vart sendt. Sjekk \"encoding\"-typen på skjemaet."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Inga fil vart sendt."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Fila er tom."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr "Filnamnet kan maksimalt ha %(max)d teikn (det har %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Last enten opp ei fil eller huk av i avkryssingsboksen."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -661,35 +682,39 @@ msgstr ""
 "Last opp eit gyldig bilete. Fila du lasta opp var ødelagt eller ikkje eit "
 "bilete."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Oppgje ei gyldig nettadresse."
+
+#: 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 ""
 "Velg eit gyldig valg. %(value)s er ikkje eit av dei tilgjengelege valga."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Oppgje ei liste med verdiar."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Rekkefølge"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Slett"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Korriger dupliserte data for %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Korriger dupliserte data for %(field)s, som må vere unike."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -698,30 +723,30 @@ msgstr ""
 "Korriger dupliserte data for %(field_name)s, som må vere unike for "
 "%(lookup)s i %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Korriger dei dupliserte verdiane nedanfor."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Primærnøkkelen er ikkje den samme som foreldreinstansen sin primærnøkkel."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Velg eit gyldig valg. Valget er ikkje eit av dei tilgjengelege valga."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Velg eit gyldig valg. %s er ikkje eit av dei tilgjengelege valga."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" er ikkje ein gyldig verdi for ein primærnøkkel."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -730,87 +755,87 @@ msgstr ""
 "%(datetime)s kunne ikkje bli tolka i tidssona %(current_timezone)s. Verdien "
 "er anten tvetydig eller ugyldig."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Noverande"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Endre"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Tøm"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ja"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nei"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ja,nei,kanskje"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "midnatt"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "12:00"
 
@@ -1086,122 +1111,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Desember"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s…"
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "eller"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "år"
 msgstr[1] "år"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "månad"
 msgstr[1] "månadar"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "veke"
 msgstr[1] "veker"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagar"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timar"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minuttar"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuttar"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Mappeindeksar er ikkje tillate her."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "«%(path)s» finst ikkje."
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Indeks for %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s vart oppretta."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s vart oppdatert."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s vart sletta."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Årstal ikkje spesifisert"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Månad ikkje spesifisert"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Dag ikkje spesifisert"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Veke ikkje spesifisert"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s tilgjengeleg"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1210,26 +1220,26 @@ msgstr ""
 "Framtidig %(verbose_name_plural)s er ikkje tilgjengeleg fordi %(class_name)s."
 "allow_future er sett til False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Ugyldig datostreng '%(datestr)s' gitt format '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Fann ingen %(verbose_name)s som korresponderte med spørringa"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Sida er ikkje 'last' og kan heller ikkje konverterast til eit tal."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ugyldig side (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Tom liste og '%(class_name)s.allow_empty' er False."
diff --git a/django/conf/locale/nn/formats.py b/django/conf/locale/nn/formats.py
index a9b8b562fc..528ae30107 100644
--- a/django/conf/locale/nn/formats.py
+++ b/django/conf/locale/nn/formats.py
@@ -25,13 +25,16 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%Y-%m-%d',              # '2006-10-25'
     '%d.%m.%Y %H:%M:%S',     # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',        # '25.10.2006 14:30'
     '%d.%m.%Y',              # '25.10.2006'
     '%d.%m.%y %H:%M:%S',     # '25.10.06 14:30:59'
+    '%d.%m.%y %H:%M:%S.%f',  # '25.10.06 14:30:59.000200'
     '%d.%m.%y %H:%M',        # '25.10.06 14:30'
     '%d.%m.%y',              # '25.10.06'
 )
diff --git a/django/conf/locale/os/LC_MESSAGES/django.mo b/django/conf/locale/os/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..2f01da4862
Binary files /dev/null and b/django/conf/locale/os/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/os/LC_MESSAGES/django.po b/django/conf/locale/os/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..e690113126
--- /dev/null
+++ b/django/conf/locale/os/LC_MESSAGES/django.po
@@ -0,0 +1,1243 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Xwybylty Soslan <soslanx@gmail.com>, 2013.
+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-17 12:59+0000\n"
+"Last-Translator: Soslan Khubulov <soslanx@gmail.com>\n"
+"Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/"
+"os/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: os\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Африкаанс"
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Араббаг"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "Тӕтӕйраг"
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "Болгайраг"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Беларусаг"
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "Бенгалаг"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Бретойнаг"
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "Босниаг"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "Каталайнаг"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "Чехаг"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "Уельсаг"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "Даниаг"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "Немыцаг"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "Грекъаг"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "Англисаг"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "Бритайнаг англисаг"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr "Есперанто"
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "Испайнаг"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "Аргентинаг испайнаг"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr "Мексикайнаг Испайнаг"
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr "Никарагуайаг испайнаг"
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Венесуелаг испайнаг"
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "Эстойнаг"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "Баскаг"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "Персайнаг"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "Финнаг"
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr "Францаг"
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr "Фризаг"
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr "Ирландиаг"
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr "Галициаг"
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr "Иврит"
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr "Хинди"
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr "Хорватаг"
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr "Венгриаг"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Интерлингва"
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "Индонезиаг"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "Исландаг"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "Италиаг"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "Япойнаг"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "Гуырдзиаг"
+
+#: conf/global_settings.py:88
+msgid "Kazakh"
+msgstr "Казахаг"
+
+#: conf/global_settings.py:89
+msgid "Khmer"
+msgstr "Хмераг"
+
+#: conf/global_settings.py:90
+msgid "Kannada"
+msgstr "Каннадаг"
+
+#: conf/global_settings.py:91
+msgid "Korean"
+msgstr "Корейаг"
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Люксембургаг"
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr "Литвайаг"
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "Латвийаг"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "Мӕчъидон"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "Малайаг"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "Монголиаг"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "Норвегийаг бокмал"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr "Непалаг"
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "Нидерландаг"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr "Норвегийаг Нинорск"
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr "Пенджабаг"
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "Полаг"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "Португалаг"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "Бразилаг португалаг"
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr "Румынаг"
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr "Уырыссаг"
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr "Словакиаг"
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr "Словенаг"
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr "Албайнаг"
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr "Сербаг"
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr "Латинаг Сербаг"
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr "Шведаг"
+
+#: conf/global_settings.py:114
+msgid "Swahili"
+msgstr "Суахили"
+
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "Тамилаг"
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr "Телугу"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "Тайаг"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "Туркаг"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr "Тӕтӕйраг"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Удмуртаг"
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "Украинаг"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr "Урду"
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "Вьетнамаг"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "Ӕнцонгонд Китайаг"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "Традицион Китайаг"
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Раст бӕрц бафысс."
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Раст email адрис бафысс."
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Раст бӕрӕг ном бафысс, цӕмӕй дзы уой дамгъӕтӕ, нымӕцтӕ бынылхӕххытӕ кӕнӕ "
+"дефистӕ."
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr "Раст IPv4 адрис бафысс."
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr "Раст IPv6 адрис бафысс."
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Раст IPv4 кӕнӕ IPv6 адрис бафысс."
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr "Бафысс ӕрмӕст нымӕцтӕ, къӕдзгуытӕй дихгонд."
+
+#: core/validators.py:157
+#, 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: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 "Ацы бӕрц хъуамӕ уа %(limit_value)s, кӕнӕ цъусдӕр."
+
+#: 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 "Ацы бӕрц хъуамӕ уа %(limit_value)s, кӕнӕ цъусдӕр."
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+"Дӕ хъус бадар цӕмӕй ам %(limit_value)d дамгъӕйы уӕддӕр уа (ис дзы "
+"%(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 ""
+"Дӕ хъус бадар цӕмӕй ам %(limit_value)d дамгъӕйӕ фылдӕр ма уа (ис дзы "
+"%(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 хъуамӕ уникалон уа %(date_field)s %(lookup)s-ӕн."
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr "ӕмӕ"
+
+#: 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 ацы %(field_label)s-имӕ нырид ис."
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr "%r раст ӕвзӕрст нӕу."
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr "Ацы быдыр нул ма хъуамӕ уа."
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr "Ацы быдыр афтид ма хъуамӕ уа."
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Быдыры хуыз: %(field_type)s"
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr "Ӕгас нымӕц"
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' хъуамӕ ӕгас нымӕц уа."
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' хъуамӕ Бӕлвырд уа, кӕнӕ та Мӕнг."
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr "Булон (Бӕлвырд кӕнӕ Мӕнг)"
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Рӕнхъ (%(max_length)s-ы йонг)"
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr "Къӕдзыгӕй хицӕнгонд ӕгас нымӕцтӕ"
+
+#: 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'-ӕн раст боны формат нӕй. Хъуамӕ уа ахӕм форматы: YYYY-MM-DD."
+
+#: 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'-ӕн раст формат ис (YYYY-MM-DD), фӕлӕ бон раст нӕу."
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr "Бон (ӕнӕ рӕстӕг)"
+
+#: 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'-ӕн раст формат нӕй. Йӕ формат хъуамӕ уа YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]."
+
+#: 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'-ӕн раст формат ис (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), фӕлӕ бон ӕмӕ "
+"рӕстӕг раст не сты."
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr "Бон (ӕд рӕстӕг)"
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' хъуамӕ дӕсон нымӕц уа."
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr "Дӕсон нымӕц"
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Электрон посты адрис"
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr "Файлы фӕт"
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' хъуамӕ уӕгъд стъӕлфимӕ нымӕц уа."
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr "Уӕгъд стъӕлфимӕ нымӕц"
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr "Стыр (8 байты) ӕгас нымӕц"
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr "IPv4 адрис"
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr "IP адрис"
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' хъуамӕ уа кӕнӕ Ницы, кӕнӕ Бӕлвырд, кӕнӕ та Мӕнг."
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr "Булон (Бӕлвырд, Мӕнг кӕнӕ Ницы)"
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr "Позитивон ӕгас нымӕц"
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr "Позитивон гыццыл ӕгас нымӕц"
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Слаг (ӕппӕты фылдӕр %(max_length)s)"
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr "Гыццыл ӕгас нымӕц"
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "Текст"
+
+#: 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' раст форматы нӕй. Йӕ формат хъуамӕ уа HH:MM[:ss[.uuuuuu]]."
+
+#: 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' раст форматы ис (HH:MM[:ss[.uuuuuu]]), фӕлӕ рӕстӕг раст нӕу."
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr "Рӕстӕг"
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr "Файл"
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr "Ныв"
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "Йӕ фыццаг амонӕн %(pk)r кӕмӕн уа, ахӕм модел %(model)s нӕй."
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr "Ӕттагон Амонӕн (хӕстӕг быдырӕй бӕрӕггонд хуыз)"
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr "Иуӕн-иу бастдзинад"
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr "Бирӕйӕн-бирӕ бастдзинад"
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Ныххӕц \"Control\", кӕнӕ \"Command\" Mac-ыл, цӕмӕй иуӕй фылдӕр равзарай."
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr "Ацы быдыр ӕнӕмӕнг у."
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr "Бафысс ӕнӕхъӕн нымӕц."
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr "Бафысс нымӕц."
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Дӕ хъус бадар цӕмӕй иууыл иумӕ %s цифрӕйӕ фылдӕр уой."
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Дӕ хъус бадар цӕмӕй дӕсон бынӕттӕ %s-ӕй фылдӕр ма уой."
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Дӕ хъус бадар цӕмӕй дӕсон стъӕлфы размӕ %s цифрӕйӕ фылдӕр ма уа."
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr "Раст бон бафысс."
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr "Раст рӕстӕг бафысс."
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr "Раст бон/рӕстӕг бафысс."
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Ницы файл уыд лӕвӕрд. Абӕрӕг кӕн формӕйы кодкӕнынады хуыз."
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr "Ницы файл уыд лӕвӕрд."
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr "Лӕвӕрд файл афтид у."
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Дӕ хъус бадар цӕмӕй ацы файлы номы %(max)d дамгъӕйӕ фылдӕр ма уа(ис дзы "
+"%(length)d)."
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+"Дӕ хорзӕхӕй, кӕнӕ бадӕтт файл, кӕнӕ банысан кӕн сыгъдӕг чекбокс. Дыууӕ иумӕ "
+"нӕ."
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Раст ныв бавгӕн. Ды цы файл бавгӕдтай, уый кӕнӕ ныв нӕ уыд, кӕнӕ хӕлд ныв "
+"уыд."
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Раст URL бафысс."
+
+#: 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 "Раст фадат равзар. %(value)s фадӕтты ӕхсӕн нӕй."
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr "Бафысс мидисты номхыгъд."
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr "Рад"
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr "Схафын"
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Дӕ хорзӕхӕй, %(field)s-ы дывӕр рардтӕ сраст кӕн."
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr "Дӕ хорзӕхӕй, %(field)s-ы дывӕр рардтӕ сраст кӕн. Хъуамӕ уникалон уа."
+
+#: 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 ""
+"Дӕ хорзӕхӕй, %(field_name)s-ы дывӕр рардтӕ сраст кӕн. Хъуамӕ %(date_field)s-"
+"ы %(lookup)s-ӕн уникалон уа. "
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr "Дӕ хорзӕхӕй, бындӕр цы  дывӕр рардтӕ ис, уыдон сраст кӕн."
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "Ӕддагон амонӕнӕн нӕ разынд хистӕры фыццаг амонӕн."
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Раст фадат равзар. УКыцы фадат фадӕтты ӕхсӕн нӕй."
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Раст фадат равзар. %s фадӕтты ӕхсӕн нӕй."
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr "\"%s\" фыццаг амонӕнӕн нӕ бӕззы."
+
+#: 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 нӕ бӕрӕг кӕны ацы рӕстӕджы тагы %(current_timezone)s; гӕнӕн ис "
+"бирӕнысанон у кӕнӕ та нӕй."
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr "Ныр"
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr "Фӕивын"
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr "Сыгъдӕг"
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr "Ӕнӕбӕрӕг"
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr "О"
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr "Нӕ"
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr "о,нӕ,гӕнӕн ис"
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d байт"
+msgstr[1] "%(size)d байты"
+
+#: template/defaultfilters.py:835
+#, python-format
+msgid "%s KB"
+msgstr "%s КБ"
+
+#: template/defaultfilters.py:837
+#, python-format
+msgid "%s MB"
+msgstr "%s МБ"
+
+#: template/defaultfilters.py:839
+#, python-format
+msgid "%s GB"
+msgstr "%s ГБ"
+
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr "%s ТБ"
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr "%s ПБ"
+
+#: utils/dateformat.py:47
+msgid "p.m."
+msgstr "ӕ.ф."
+
+#: utils/dateformat.py:48
+msgid "a.m."
+msgstr "ӕ.р."
+
+#: utils/dateformat.py:53
+msgid "PM"
+msgstr "ӔФ"
+
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr "ӔР"
+
+#: utils/dateformat.py:103
+msgid "midnight"
+msgstr "ӕмбисӕхсӕв"
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr "ӕмбисбон"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Къуырисӕр"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Дыццӕг"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Ӕртыццӕг"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Цыппӕрӕм"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Майрӕмбон"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Сабат"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Хуыцаубон"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "Крс"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "Дцг"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "Ӕрт"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "Цпр"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "Мрб"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "Сбт"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "Хцб"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "Январь"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "Февраль"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "Мартъи"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "Апрель"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "Май"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "Июнь"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "Июль"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "Август"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "Сентябрь"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "Октябрь"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "Ноябрь"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "Декабрь"
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr "янв"
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr "фев"
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr "мар"
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr "апр"
+
+#: utils/dates.py:23
+msgid "may"
+msgstr "май"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "июн"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "июл"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "авг"
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr "сен"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "окт"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "ноя"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "дек"
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "Янв."
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "Фев."
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Мартъи"
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "Апрель"
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "Май"
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "Июнь"
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "Июль"
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "Авг."
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "Сен."
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "Окт."
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "Ноя."
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "Дек."
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "Январь"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "Февраль"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "Мартъи"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "Апрель"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "Май"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "Июнь"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "Июль"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "Август"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "Сентябрь"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "Октябрь"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "Ноябрь"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "Декабрь"
+
+#: 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 "кӕнӕ"
+
+#. 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] "аз"
+msgstr[1] "азы"
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] "мӕй"
+msgstr[1] "мӕйы"
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "къуыри"
+msgstr[1] "къуырийы"
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] "бон"
+msgstr[1] "боны"
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "сахат"
+msgstr[1] "сахаты"
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "минут"
+msgstr[1] "минуты"
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr "минуттӕ"
+
+#: 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 "Ам директориты индекстӕ нӕй гӕнӕн."
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" нӕй"
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s-ы индекс"
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr "Аз амынд нӕ уыд"
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr "Мӕй амынд нӕ уыд"
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr "Бон амынд нӕ уыд"
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr "Къуыри амынд нӕ уыд"
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Ницы %(verbose_name_plural)s ис"
+
+#: views/generic/dates.py:646
+#, 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 Мӕнг у."
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr "Боны рӕнхъ '%(datestr)s'-ы лӕвӕрд формат '%(format)s' раст нӕу"
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Домӕнӕн ницы %(verbose_name)s ӕмбӕлы"
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr "Фарс 'last' нӕу, нӕдӕр ӕй int-мӕ ис гӕнӕн раивын."
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Мӕнг фарс (%(page_number)s): %(message)s"
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr "Номхыгъд афтид у, ӕмӕ '%(class_name)s.allow_empty' мӕнг у."
diff --git a/django/conf/locale/pa/LC_MESSAGES/django.mo b/django/conf/locale/pa/LC_MESSAGES/django.mo
index 55b0eb84be..ea91f59aed 100644
Binary files a/django/conf/locale/pa/LC_MESSAGES/django.mo and b/django/conf/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pa/LC_MESSAGES/django.po b/django/conf/locale/pa/LC_MESSAGES/django.po
index b32cd9bb62..4512f6f229 100644
--- a/django/conf/locale/pa/LC_MESSAGES/django.po
+++ b/django/conf/locale/pa/LC_MESSAGES/django.po
@@ -7,789 +7,813 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+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: A S Alam <apreet.alam@gmail.com>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "ਬੰਗਾਲੀ"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "ਬੋਸਨੀਆਈ"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "ਕਾਟਾਲਾਨ"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "ਚੈੱਕ"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "ਵੈਲਸ਼"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "ਡੈਨਿਸ਼"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "ਜਰਮਨ"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "ਗਰੀਕ"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "ਅੰਗਰੇਜ਼ੀ"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "ਬਰਤਾਨੀਵੀਂ ਅੰਗਰੇਜ਼ੀ"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "ਸਪੇਨੀ"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "ਅਰਜਨਟੀਨੀ ਸਪੇਨੀ"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr ""
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "ਈਸਟੋਨੀਆਈ"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "ਬਸਕਿਊ"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "ਪਰਸ਼ੀਆਈ"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "ਫੈਨਿਸ਼"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ਫਰੈਂਚ"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "ਫ਼ਾਰਸੀ"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ਆਈਰਸ਼"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "ਗਲੀਸੀਆਈ"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ਹੈਬਰਿਊ"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "ਹਿੰਦੀ"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "ਕਰੋਆਟੀਆਈ"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ਹੰਗਰੀਆਈ"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "ਇੰਡੋਨੇਸ਼ੀਆਈ"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "ਆਈਸਲੈਂਡਿਕ"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "ਇਤਾਲਵੀ"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "ਜਾਪਾਨੀ"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "ਜਾਰਜੀਆਈ"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "ਖਮੀਰ"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "ਕੰਨੜ"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "ਕੋਰੀਆਈ"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "ਲੀਥੁਨੀਆਈ"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "ਲਾਟਵੀਅਨ"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "ਮੈਕਡੋਨੀਆਈ"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "ਮਲਿਆਲਮ"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "ਮੰਗੋਲੀਆਈ"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "ਨਾਰਵੇਗੀਆਈ ਬੋਕਮਾਲ"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "ਡੱਚ"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "ਨਾਰਵੇਗੀਅਨ ਨਯਨੋਰਸਕ"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "ਪੰਜਾਬੀ"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "ਪੋਲੈਂਡੀ"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "ਪੁਰਤਗਾਲੀ"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "ਬਰਾਜ਼ੀਲੀ ਪੁਰਤਗਾਲੀ"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "ਰੋਮਾਨੀਆਈ"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "ਰੂਸੀ"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "ਸਲੋਵਾਕ"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "ਸਲੋਵੀਨੀਆਈ"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "ਅਲਬੀਨੀਆਈ"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "ਸਰਬੀਆਈ"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "ਸਰਬੀਆਈ ਲੈਟਿਨ"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "ਸਵੀਡਨੀ"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "ਤਾਮਿਲ"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "ਤੇਲਗੂ"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "ਥਾਈ"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "ਤੁਰਕ"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ਯੂਕਰੇਨੀ"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr ""
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "ਵੀਅਤਨਾਮੀ"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "ਸਧਾਰਨ ਚੀਨੀ"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "ਮੂਲ ਚੀਨੀ"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "ਠੀਕ ਮੁੱਲ ਦਿਓ"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "ਠੀਕ URL ਦਿਉ।"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "ਠੀਕ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ਅਤੇ"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr ""
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "ਖੇਤਰ ਦੀ ਕਿਸਮ: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "ਅੰਕ"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr ""
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "ਮਿਤੀ (ਬਿਨਾਂ ਸਮਾਂ)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "ਮਿਤੀ (ਸਮੇਂ ਨਾਲ)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "ਦਸ਼ਮਲਵ ਅੰਕ"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "ਫਾਇਲ ਪਾਥ"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP ਐਡਰੈੱਸ"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "ਟੈਕਸਟ"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "ਇਹ ਖੇਤਰ ਲਾਜ਼ਮੀ ਹੈ।"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr ""
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "ਨੰਬਰ ਦਿਓ।"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr ""
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr ""
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "ਠੀਕ ਮਿਤੀ ਦਿਓ।"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "ਠੀਕ ਸਮਾਂ ਦਿਓ।"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "ਠੀਕ ਮਿਤੀ/ਸਮਾਂ ਦਿਓ।"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਭੇਜੀ।"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "ਦਿੱਤੀ ਫਾਇਲ ਖਾਲੀ ਹੈ।"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "ਠੀਕ URL ਦਿਉ।"
+
+#: 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 ""
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "ਮੁੱਲ ਦੀ ਲਿਸਟ ਦਿਓ।"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "ਲੜੀ"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:581
+#: 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 ""
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "ਮੌਜੂਦਾ"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "ਬਦਲੋ"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "ਸਾਫ਼ ਕਰੋ"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "ਨਹੀਂ"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ਹਾਂ,ਨਹੀਂ,ਸ਼ਾਇਦ"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d ਬਾਈਟ"
 msgstr[1] "%(size)d ਬਾਈਟ"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "ਸ਼ਾਮ"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ਸਵੇਰ"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "ਅੱਧੀ-ਰਾਤ"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "ਨੂਨ"
 
@@ -1065,148 +1089,133 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "ਦਸੰਬਰ"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ਜਾਂ"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ਸਾਲ"
 msgstr[1] "ਸਾਲ"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "ਮਹੀਨਾ"
 msgstr[1] "ਮਹੀਨਾ"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "ਹਫਤਾ"
 msgstr[1] "ਹਫਤਾ"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ਦਿਨ"
 msgstr[1] "ਦਿਨ"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ਘੰਟਾ"
 msgstr[1] "ਘੰਟਾ"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰਟ"
 msgstr[1] "ਮਿੰਟ"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "ਮਿੰਟ"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s ਠੀਕ ਤਰ੍ਹਾਂ ਬਣਾਇਆ ਗਿਆ।"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s ਠੀਕ ਤਰ੍ਹਾਂ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ।"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s ਹਟਾਇਆ ਗਿਆ।"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo
index 6741396eaf..618f642ec9 100644
Binary files a/django/conf/locale/pl/LC_MESSAGES/django.mo and b/django/conf/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pl/LC_MESSAGES/django.po b/django/conf/locale/pl/LC_MESSAGES/django.po
index bb50cf1aa7..5f8e634e5f 100644
--- a/django/conf/locale/pl/LC_MESSAGES/django.po
+++ b/django/conf/locale/pl/LC_MESSAGES/django.po
@@ -2,365 +2,387 @@
 #
 # Translators:
 # angularcircle <angular.circle@gmail.com>, 2011.
-#   <angular.circle@gmail.com>, 2012.
+#  <angular.circle@gmail.com>, 2013.
+#   <angular.circle@gmail.com>, 2012-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Karol  <kfuks2@o2.pl>, 2012.
 # konryd <konryd@gmail.com>, 2011.
 # Łukasz Rekucki <lrekucki@gmail.com>, 2011.
+# p  <poczciwiec@gmail.com>, 2012.
 # Roman Barczyński <rombar@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-21 13:04+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-28 13:10+0000\n"
 "Last-Translator: angularcircle <angular.circle@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Afryknerski"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "arabski"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "azerski"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "bułgarski"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "białoruski"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengalski"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "bretoński"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bośniacki"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "kataloński"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "czeski"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "walijski"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "duński"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "niemiecki"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "grecki"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "angielski"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "angielski brytyjski"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "hiszpański"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "hiszpański argentyński"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "hiszpański meksykański"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "hiszpański nikaraguański"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "hiszpański wenezuelski"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estoński"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "baskijski"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "perski"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "fiński"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francuski"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "fryzyjski"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irlandzki"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galicyjski"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "hebrajski"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "chorwacki"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "węgierski"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonezyjski"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandzki"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "włoski"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "japoński"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "gruziński"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "kazachski"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "khmerski"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "koreański"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "luksemburski"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "litewski"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "łotewski"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "macedoński"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "malajski"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongolski"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "norweski (Bokmal)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "nepalski"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "holenderski"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "norweski (Nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "pendżabski"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "polski"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "brazylijski portugalski"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumuński"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "rosyjski"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "słowacki"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "słoweński"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albański"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "serbski"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "serbski (łaciński)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "szwedzki"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "suahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamilski"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "tajski"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turecki"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "tatarski"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "udmurcki"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ukraiński"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "wietnamski"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "chiński uproszczony"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "chiński tradycyjny"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Wpisz poprawną wartość."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Ten odnośnik jest nieprawidłowy."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Wprowadź poprawny adres email."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Wpisz poprawny URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Wprowadź poprawny adres e-mail."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "To pole może zawierać jedynie litery, cyfry, podkreślenia i myślniki."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Wprowadź poprawny adres IPv4."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Wprowadź poprawny adres IPv6."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Wprowadź poprawny adres IPv4 lub IPv6."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Wpisz tylko cyfry oddzielone przecinkami."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Upewnij się, że ta wartość jest %(limit_value)s (jest %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Upewnij się, że ta wartość jest mniejsza lub równa %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Upewnij się, że ta wartość jest większa lub równa %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -369,7 +391,7 @@ msgstr ""
 "Upewnij się, że ta wartość ma co najmniej %(limit_value)d znaków (ma długość "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -378,85 +400,85 @@ msgstr ""
 "Upewnij się, że ta wartość ma co najwyżej %(limit_value)d znaków (ma długość "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "Wartości w %(field_name)s muszą być unikalne dla wyszukiwań %(lookup)s w "
 "%(date_field)s"
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "i"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "%(field_label)s już istnieje w %(model_name)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Wartość %r nie jest poprawnym wyborem."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "To pole nie może być puste."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "To pole nie może być puste."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Pole typu: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Liczba całkowita"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' wartość musi być liczbą całkowitą."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' wartość musi być True lub False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Wartość logiczna (True, False - prawda lub fałsz)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Łańcuch (do %(max_length)s znaków)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Liczby całkowite rozdzielone przecinkami"
 
-#: db/models/fields/__init__.py:647
+#: 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' wartość ma nieprawidłowy format daty. Wartość musi być zapisana w "
 "formacie YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' wartość ma odpowiedni format (YYYY-MM-DD), ale jest błędną datą."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Data (bez godziny)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +487,7 @@ msgstr ""
 "'%s' wartość ma nieprawidłowy format. Wartość musi być w formacie YYYY-MM-DD "
 "HH:MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,79 +496,79 @@ msgstr ""
 "'%s' wartość ma odpowiedni format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), ale "
 "jest nieprawidłową datą / czasem."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Data (z godziną)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' wartość musi być liczbą dziesiętną."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Liczba dziesiętna"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Adres e-mail"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' wartość musi być liczbą zmiennoprzecinkową."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Liczba zmiennoprzecinkowa"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Duża liczba całkowita (8 bajtów)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "adres IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Adres IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' wartość musi być None, True lub False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Wartość logiczna (True, False, None - prawda, fałsz lub nic)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Dodatnia liczba całkowita"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Dodatnia mała liczba całkowita"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (max. %(max_length)s znaków)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Mała liczba całkowita"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -554,7 +576,7 @@ msgstr ""
 "'%s' wartość ma nieprawidłowy format. Wartość musi być w formacie HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -563,98 +585,98 @@ msgstr ""
 "'%s' wartość ma odpowiedni format (HH:MM[:ss[.uuuuuu]]), ale jest "
 "nieprawidłowym czasem."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Czas"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Plik"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Plik graficzny"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s o kluczu głównym %(pk)r nie istnieje."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Klucz obcy (typ określony przez pole powiązane)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Powiązanie jeden do jednego"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Powiązanie wiele do wiele"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Przytrzymaj wciśnięty klawisz \"Ctrl\" lub \"Command\" na Mac'u aby "
 "zaznaczyć więcej niż jeden wybór."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "To pole jest wymagane."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Wpisz liczbę całkowitą."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Wpisz liczbę."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Upewnij się, że jest nie więcej niż %s cyfr."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Upewnij się, że jest nie więcej niż %s miejsc po przecinku."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Upewnij się, że jest nie więcej niż %s miejsc przed przecinkiem."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Wpisz poprawną datę."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Wpisz poprawną godzinę."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Wpisz poprawną datę/godzinę."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Nie wysłano żadnego pliku. Sprawdź typ kodowania formularza."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Żaden plik nie został przesłany."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Wysłany plik jest pusty."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -662,11 +684,11 @@ msgstr ""
 "Upewnij się, że nazwa tego pliku ma co najwyżej %(max)d znaków (ma długość "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Prześlij plik lub zaznacz by usunąć, ale nie oba na raz."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -674,35 +696,39 @@ msgstr ""
 "Wgraj poprawny plik graficzny. Ten, który został wgrany, nie jest obrazem, "
 "albo jest uszkodzony."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Wpisz poprawny URL."
+
+#: 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 ""
 "Wybierz poprawną wartość. %(value)s nie jest jednym z dostępnych wyborów."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Podaj listę wartości."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Porządek"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Usuń"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Popraw zduplikowane dane w %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Popraw zduplikowane dane w %(field)s, które wymaga unikalności."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -711,29 +737,29 @@ msgstr ""
 "Popraw zduplikowane dane w %(field_name)s, które wymaga unikalności dla "
 "%(lookup)s w polu %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Popraw poniższe zduplikowane wartości."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Osadzony klucz obcy nie pasuje do klucza głównego obiektu rodzica."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Wybierz poprawną wartość. %s nie jest jednym z dostępnych wyborów."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" nie jest poprawną wartością klucza głównego."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -742,35 +768,35 @@ msgstr ""
 "%(datetime)s nie może być interpretowany w strefie czasowej "
 "%(current_timezone)s; może być niejednoznaczne lub nie istnieć."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Teraz"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Zmień"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Tak"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nie"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "tak,nie,może"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -778,52 +804,52 @@ msgstr[0] "%(size)d bajt"
 msgstr[1] "%(size)d bajty"
 msgstr[2] "%(size)d bajtów"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "po południu"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "rano"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "po południu"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "rano"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "północ"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "południe"
 
@@ -1099,128 +1125,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "grudnia"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr " %(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "lub"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "rok"
 msgstr[1] "lata"
 msgstr[2] "lat"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "miesiąc"
 msgstr[1] "miesiące"
 msgstr[2] "miesięcy"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "tydzień"
 msgstr[1] "tygodnie"
 msgstr[2] "tygodni"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dzień"
 msgstr[1] "dni"
 msgstr[2] "dni"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "godzina"
 msgstr[1] "godziny"
 msgstr[2] "godzin"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuty"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Wyświetlanie zawartości katalogu jest tu niedozwolone."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\" %(path)s \" nie istnieje"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Zawartość %(directory)s "
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s zostało pomyślnie utworzone."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s zostało pomyślnie zmienione."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s zostało usunięte."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Nie określono roku"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Nie określono miesiąca"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Nie określono dnia"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nie określono tygodnia"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s nie jest dostępny"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1229,30 +1240,30 @@ msgstr ""
 "Wyświetlanie %(verbose_name_plural)s z datą przyszłą jest niedostępne, gdyż "
 "atrybut '%(class_name)s.allow_future' ma wartość 'False'."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "Ciąg znaków '%(datestr)s' jest niezgodny z podanym formatem daty '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Nie znaleziono %(verbose_name)s spełniających wybrane kryteria"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Podanego numeru strony nie można przekształcić na liczbę całkowitą, nie "
 "przyjął on również wartości 'last' oznaczającej ostatnią stronę z dostępnego "
 "zakresu."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Strona o numerze (%(page_number)s) nie istnieje"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Nieprawidłowy numer strony (%(page_number)s): %(message)s "
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/pl/formats.py b/django/conf/locale/pl/formats.py
index 064e75f1ee..25cfc793cf 100644
--- a/django/conf/locale/pl/formats.py
+++ b/django/conf/locale/pl/formats.py
@@ -23,6 +23,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
 )
diff --git a/django/conf/locale/pt/LC_MESSAGES/django.mo b/django/conf/locale/pt/LC_MESSAGES/django.mo
index 90d0cf6781..585107f8f3 100644
Binary files a/django/conf/locale/pt/LC_MESSAGES/django.mo and b/django/conf/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt/LC_MESSAGES/django.po b/django/conf/locale/pt/LC_MESSAGES/django.po
index 9e74064228..8efae4ad38 100644
--- a/django/conf/locale/pt/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt/LC_MESSAGES/django.po
@@ -1,362 +1,383 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Bruno Miguel Custódio <bruno@brunomcustodio.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nuno Mariz <nmariz@gmail.com>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011, 2012.
 # Paulo Köch <paulo.koch@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Bruno Miguel Custódio <bruno@brunomcustodio.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Africâner"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Árabe"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaijano"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Bielorusso"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalês"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretão"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bósnio"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalão"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Checo"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Galês"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Alemão"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Grego"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Inglês"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Inglês Britânico"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Espanhol Argentino"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Espanhol mexicano"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
-msgstr ""
+msgstr "Nicarágua Espanhol"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Espanhol Venezuelano"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estónio"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Basco"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persa"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Filandês"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Francês"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisão"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlandês"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galaciano"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Croata"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlíngua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonésio"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandês"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japonês"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Cazaque"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Canarês"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Coreano"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxemburguês"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Letão"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macedónio"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malaiala"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongol"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norueguês (Bokmål)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepali"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Holandês"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norueguês (Nynors)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Panjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polaco"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Português"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Português Brasileiro"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Romeno"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanês"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Sérvio Latim"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Sueco"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Suaíli"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thai"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turco"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatar"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurte"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Introduza um valor válido."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Este URL é link quebrado."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Introduza um URL válido."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Introduza um endereço de e-mail válido."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Este valor apenas poderá conter letras, números, undercores ou hífenes."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Introduza um endereço IPv4 válido."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
-msgstr ""
+msgstr "Insira um endereço IPv6 válido."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "Digite um endereço válido IPv4 ou IPv6."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Introduza apenas números separados por vírgulas."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Garanta que este valor seja %(limit_value)s (tem %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Garanta que este valor seja menor ou igual a %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Garanta que este valor seja maior ou igual a %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -365,7 +386,7 @@ msgstr ""
 "Garanta que este valor tem no mínimo %(limit_value)d carateres (tem "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -374,272 +395,282 @@ msgstr ""
 "Garanta que este valor tem no máximo %(limit_value)d carateres (tem "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s deverá ser único para %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "e"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 com este %(field_label)s já existe."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "O valor %r não é uma opção válida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Este campo não pode ser nulo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Este campo não pode ser vazio."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo do tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Inteiro"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
-msgstr ""
+msgstr "I valor '%s' deve ser um inteiro."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "O valor '%s' deve ser True ou False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (Pode ser True ou False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (até %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Inteiros separados por virgula"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
+"O valor '%s' tem um formato de data inválido. Deve ser no formato AAAA-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
+"O valor '%s' tem o formato correto (AAAA-MM-DD), mas é uma data inválida."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Data (sem hora)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
+"O valor '%s' tem um formato inválido. Deve ser no formato AAAA-MM-DD HH:MM[:"
+"ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
+"O valor '%s' tem o formato correto (AAAA-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) mas "
+"é uma data/hora inválida."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Data (com hora)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "O valor '%s' deve ser um número decimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Número décimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Caminho do ficheiro"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
-msgstr ""
+msgstr "O valor '%s' deve ser um número em vírgula flutuante."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Número em vírgula flutuante"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Inteiro grande (8 byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "Endereço IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "O valor '%s' deve ser None, True ou False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (Pode ser True, False ou None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "Inteiro positivo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "Pequeno número inteiro positivo"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Slug (até %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "Inteiro pequeno"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Texto"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
+"O valor '%s' tem um formato inválido. Deve estar no formato HH:MM[:ss[."
+"uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
+"O valor '%s' tem o formato correto (HH:MM[:ss[.uuuuuu]]) mas é uma hora "
+"inválida."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Hora"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "Ficheiro"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "Imagem"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "O modelo %(model)s com a chave primária %(pk)r não existe."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relação de um-para-um"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relação de muitos-para-muitos"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
-"Mantenha pressionado o \"Control\", or \"Command\" no Mac, para selecionar "
+"Mantenha pressionado o \"Control\", ou \"Command\" no Mac, para selecionar "
 "mais do que um."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Este campo é obrigatório."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Introduza um número inteiro."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Introduza um número."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Garanta que não contém no total mais do que %s dígitos."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Garanta que não contém mais do que %s casas decimais."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Garanta que não contém mais do que %s dígitos antes do ponto decimal."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Introduza uma data válida."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Introduza uma hora válida."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Introduza uma data/hora válida."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Nenhum ficheiro foi submetido. Verifique o tipo de codificação do formulário."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Nenhum ficheiro submetido."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "O ficheiro submetido encontra-se vazio."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -647,12 +678,12 @@ msgstr ""
 "Garanta que este nome do ficheiro tem no máximo %(max)d carateres (tem "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Por favor, submeta um ficheiro ou remova a seleção da caixa, não ambos."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -660,36 +691,40 @@ msgstr ""
 "Introduza uma imagem válida. O ficheiro que introduziu ou não é uma imagem "
 "ou está corrompido."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Introduza um URL válido."
+
+#: 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 ""
 "Selecione uma opção válida. %(value)s não se encontra nas opções disponíveis."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Introduza uma lista de valores."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordem"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Remover"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Por favor corrija os dados duplicados em %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Por favor corrija os dados duplicados em %(field)s, que deverá ser único."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -698,119 +733,121 @@ msgstr ""
 "Por favor corrija os dados duplicados em %(field_name)s que deverá ser único "
 "para o %(lookup)s em %(date_field)s.\""
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Por favor corrija os valores duplicados abaixo."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "A chave estrangeira em linha não coincide com a chave primária na instância "
 "pai."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Selecione uma opção válida. Esse valor não se encontra opções disponíveis."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Selecione uma opção válida. %s não se encontra nas opções disponíveis."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" não é um valor válido para uma chave primária."
 
-#: forms/util.py:70
+#: 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 não pode ser interpretada de fuso horário %(current_timezone)s; "
+"pode ser ambígua ou não podem existir."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Atualmente"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modificar"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Limpar"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Sim"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Não"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "sim,não,talvez"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "meia-noite"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "meio-dia"
 
@@ -1086,122 +1123,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Dezembro"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ou"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ano"
 msgstr[1] "anos"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mês"
 msgstr[1] "meses"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semana"
 msgstr[1] "semanas"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutos"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Índices de diretório não são permitidas aqui."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" não existe"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "Índice de %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "O(A) %(verbose_name)s foi criado(a) com sucesso."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "O(A) %(verbose_name)s foi atualizado(a) com sucesso."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "O(A) %(verbose_name)s foi removido(a)."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Nenhum ano especificado"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Nenhum mês especificado"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Nenhum dia especificado"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nenhuma semana especificado"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Nenhum %(verbose_name_plural)s  disponível"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1210,26 +1232,26 @@ msgstr ""
 "%(verbose_name_plural)s futuros indisponíveis porque %(class_name)s."
 "allow_future é False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Data inválida '%(datestr)s' formato '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Nenhum %(verbose_name)s de acordo com a procura."
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Página não é 'última' ou não é possível converter para um inteiro."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Página inválida (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Página inválida (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Lista vazia e '%(class_name)s.allow_empty' é False."
diff --git a/django/conf/locale/pt/formats.py b/django/conf/locale/pt/formats.py
index 2d6ca69647..9452428dd9 100644
--- a/django/conf/locale/pt/formats.py
+++ b/django/conf/locale/pt/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -23,12 +24,15 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59'
+    '%d/%m/%Y %H:%M:%S.%f',  # '25/10/2006 14:30:59.000200'
     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30'
     '%d/%m/%Y',              # '25/10/2006'
     '%d/%m/%y %H:%M:%S',     # '25/10/06 14:30:59'
+    '%d/%m/%y %H:%M:%S.%f',  # '25/10/06 14:30:59.000200'
     '%d/%m/%y %H:%M',        # '25/10/06 14:30'
     '%d/%m/%y',              # '25/10/06'
 )
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index f852f78164..abd9dc6092 100644
Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index 12a21bc518..7016f0b644 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,7 +1,9 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Eduardo Carvalho <eduardocereto@gmail.com>, 2011.
+#   <dudanogueira@gmail.com>, 2012.
+# Eduardo Carvalho <eduardocereto@gmail.com>, 2011, 2012.
+# Guilherme Gondim <semente@taurinus.org>, 2012.
 # Guilherme Gondim <semente+transifex@taurinus.org>, 2011, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Sandro  <sandrossv@hotmail.com>, 2011.
@@ -9,356 +11,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-19 18:35+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Africânder"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Árabe"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaijão"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Bielorrussa"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretão"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bósnio"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalão"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tcheco"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Galês"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Alemão"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Grego"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Inglês"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Inglês Britânico"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Espanhol Argentino"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Espanhol Mexicano"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Espanhol Nicaraguense"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Espanhol Venuzuelano"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estoniano"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Basco"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persa"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Francês"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frísia"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlandês"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galiciano"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Croata"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlíngua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonésio"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandês"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japonês"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Cazaque"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Canarês"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Coreano"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxemburguês"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Letão"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macedônio"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malaiala"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongol"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Dano-norueguês"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepalês"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Neerlandês"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Novo Norueguês"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polonês"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Português"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Português Brasileiro"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Romeno"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanesa"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Sérvio Latino"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Sueco"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Suaíli"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tâmil"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tailandês"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turco"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatar"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Informe um valor válido."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Esta URL parece ser um link quebrado."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Informe uma URL válida."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Informe um endereço de email válido."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Insira um \"slug\" válido consistindo de letras, números, sublinhados (_) ou "
 "hífens."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
-msgstr "Informe um endereço IPv4 válido."
+msgstr "Insira um endereço IPv4 válido."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Insira um endereço IPv6 válido."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Insira um endereço IPv4 ou IPv6 válido."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
-msgstr "Informe apenas dígitos separados por vírgulas."
+msgstr "Insira apenas dígitos separados por vírgulas."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Certifique-se de que o valor é %(limit_value)s (ele é %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Certifique-se que este valor seja menor ou igual a %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Certifique-se que este valor seja maior ou igual a %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -367,7 +389,7 @@ msgstr ""
 "Certifique-se de que o valor tenha no mínimo %(limit_value)d caracteres (ele "
 "possui %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -376,84 +398,86 @@ msgstr ""
 "Certifique-se de que o valor tenha no máximo %(limit_value)d caracteres (ele "
 "possui %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s deverá ser único para %(date_field)s %(lookup)s."
+msgstr ""
+"O campo \"%(field_name)s\" deve ser único para %(lookup)s de \"%(date_field)s"
+"\"."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "e"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 com este %(field_label)s já existe."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "O valor %r não é uma escolha válida."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Este campo não pode ser nulo."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
-msgstr "Este campo não pode estar em branco."
+msgstr "Este campo não pode estar vazio."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo do tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Inteiro"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "O valor de '%s' precisa ser um inteiro."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "O valor de '%s' deve ser True ou False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (Verdadeiro ou Falso)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (até %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Inteiros separados por vírgula"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "O valor de '%s' tem um formato de data inválido. A data deve estar no "
 "formato AAAA-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 "O valor de '%s' tem o formato correto (AAAA-MM-DD), mas a data é inválida."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Data (sem hora)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -462,7 +486,7 @@ msgstr ""
 "O valor de '%s' tem um formato inválido. O formato deve ser AAAA-MM-DD HH:MM"
 "[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -471,79 +495,79 @@ msgstr ""
 "O valor de '%s' tem o formato correto (AAAA-MM-DD HH:MM[:ss[.uuuuuu]] [TZ]), "
 "mas é uma data/hora inválida."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
-msgstr "Data e hora"
+msgstr "Data (com hora)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "O valor de '%s' deve ser um número decimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Número decimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
-msgstr "Caminho de arquivo"
+msgstr "Caminho do arquivo"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "O valor de '%s' deve ser um float."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Número de ponto flutuante"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Inteiro grande (8 byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "O valor de '%s' deve ser None, True ou False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (Verdadeiro, Falso ou Nada)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Inteiro positivo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Inteiro curto positivo"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (até %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Inteiro curto"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Texto"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -551,7 +575,7 @@ msgstr ""
 "O valor de '%s' tem um formato inválido. Deve estar no formato HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -560,99 +584,99 @@ msgstr ""
 "O valor de '%s' tem o formato correto (HH:MM[:ss[.uuuuuu]]), Mas é um "
 "horário inválido."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Hora"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Arquivo"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Imagem"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s com chave primária %(pk)r não existe."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relacionamento um-para-um"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relacionamento muitos-para-muitos"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
-"Mantenha pressionado \"Control\" (ou \"Command\" no Mac) para selecionar "
+"Mantenha o \"Control\", ou \"Command\" no Mac, pressionado para selecionar "
 "mais de uma opção."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Este campo é obrigatório."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Informe um número inteiro."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Informe um número."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Certifique-se de que não tenha mais de %s dígitos no total."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Certifique-se de que não tenha mais de %s casa decimais."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Certifique-se de que não tenha mais de %s dígitos antes do ponto decimal."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Informe uma data válida."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Informe uma hora válida."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Informe uma data/hora válida."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Nenhum arquivo enviado. Verifique o tipo de codificação do formulário."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
-msgstr "Não foi enviado nenhum arquivo."
+msgstr "Nenhum arquivo foi enviado."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "O arquivo enviado está vazio."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -660,11 +684,11 @@ msgstr ""
 "Certifique-se de que o arquivo tenha no máximo %(max)d caracteres (ele "
 "possui %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Por favor, envie um arquivo ou marque o checkbox, mas não ambos."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -672,68 +696,72 @@ msgstr ""
 "Envie uma imagem válida. O arquivo enviado não é uma imagem ou está "
 "corrompido."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Informe uma URL válida."
+
+#: 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 "Faça uma escolha válida. %(value)s não está disponível."
+msgstr "Faça uma escolha válida. %(value)s não é uma das escolhas disponíveis."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Informe uma lista de valores."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordem"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
-msgstr "Apagar"
+msgstr "Remover"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Por favor, corrija o valor duplicado para %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
-"Por favor, corrija o valor duplicado para %(field)s, o qual deve ser único"
+"Por favor, corrija o valor duplicado para %(field)s, o qual deve ser único."
 
-#: forms/models.py:581
+#: 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 ""
-"Por favor corrija os dados duplicados em %(field_name)s que deverá ser único "
-"para o %(lookup)s em %(date_field)s."
+"Por favor, corrija o dado duplicado para %(field_name)s, o qual deve ser "
+"único para %(lookup)s em %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija os valores duplicados abaixo."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "A chave estrangeira no inline não coincide com a chave primária na instância "
 "pai."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Faça uma escolha válida. Sua escolha não é uma das disponíveis."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Faça uma escolha válida. %s não está disponível."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" não é um valor válido para uma chave primária."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -742,89 +770,89 @@ msgstr ""
 " %(datetime)s não pôde ser interpretado no fuso horário "
 "%(current_timezone)s; pode estar ambíguo ou pode não existir."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Atualmente"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Modificar"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Limpar"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Sim"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Não"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "sim,não,talvez"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
-msgid "midnight"
-msgstr "meia noite"
-
 #: utils/dateformat.py:103
+msgid "midnight"
+msgstr "meia-noite"
+
+#: utils/dateformat.py:105
 msgid "noon"
-msgstr "meio dia"
+msgstr "meio-dia"
 
 #: utils/dates.py:6
 msgid "Monday"
@@ -1098,122 +1126,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Dezembro"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr " %(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ou"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ano"
 msgstr[1] "anos"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mês"
 msgstr[1] "meses"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semana"
 msgstr[1] "semanas"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minutos"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Índices de diretório não são permitidos aqui."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" não existe"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índice de %(directory)s "
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s: criado com sucesso."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s: atualizado com sucesso."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s: excluído."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Ano não especificado"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Mês não especificado"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Dia não especificado"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Semana não especificada"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
-msgstr "%(verbose_name_plural)s  não disponíveis"
+msgstr "Nenhum(a) %(verbose_name_plural)s disponível"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1222,26 +1235,26 @@ msgstr ""
 "%(verbose_name_plural)s futuros não disponíveis pois %(class_name)s."
 "allow_future é False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "' %(datestr)s ' string de data inválida dado o formato ' %(format)s '"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "%(verbose_name)s  não encontrado de acordo com a consulta"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "A página não é a 'última', nem pode ser convertido para um int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Página inválida ( %(page_number)s )"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Página (%(page_number)s) inválida: %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Lista vazia e '%(class_name)s.allow_empty' é False."
diff --git a/django/conf/locale/pt_BR/formats.py b/django/conf/locale/pt_BR/formats.py
index 7a6e0877c3..a5ec333d50 100644
--- a/django/conf/locale/pt_BR/formats.py
+++ b/django/conf/locale/pt_BR/formats.py
@@ -23,9 +23,11 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59'
+    '%d/%m/%Y %H:%M:%S.%f',  # '25/10/2006 14:30:59.000200'
     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30'
     '%d/%m/%Y',              # '25/10/2006'
     '%d/%m/%y %H:%M:%S',     # '25/10/06 14:30:59'
+    '%d/%m/%y %H:%M:%S.%f',  # '25/10/06 14:30:59.000200'
     '%d/%m/%y %H:%M',        # '25/10/06 14:30'
     '%d/%m/%y',              # '25/10/06'
 )
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index dc02f9983e..7eadb79b0d 100644
Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index f5c5a93085..4abaf5d5db 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@@ -10,360 +10,380 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-10 14:47+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: Ionel Cristian Mărieș <ionel.mc@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arabă"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azeră"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgară"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengaleză"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosniacă"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalană"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Cehă"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Galeză"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Daneză"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Germană"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Greacă"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Engleză"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Engleză britanică"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spaniolă"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Spaniolă Argentiniană"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Spaniolă Mexicană"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Spaniolă Nicaragua"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonă"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Bască"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persană"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finlandeză"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Franceză"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frizian"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlandeză"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galiciană"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Ebraică"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Croată"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Ungară"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indoneză"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandeză"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiană"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japoneză"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgiană"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmeră"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Limba kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreană"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lituaniană"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Letonă"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Macedoneană"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolă"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norvegiană Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Olandeză"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norvegiană Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Poloneză"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugheză"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Portugheză braziliană"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Română"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rusă"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovacă"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovenă"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albaneză"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Sârbă"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Sârbă latină"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Suedeză"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Limba tamila"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Limba telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tailandeză"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turcă"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ucraineană"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnameză"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Chineză simplificată"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Chineză tradițională"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Introduceți o valoare validă."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL-ul e invalid."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Introduceți un URL valid."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Introduceţi o adresă de email validă."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Introduceți un 'slug' valabil, compus numai din litere, numere, underscore "
 "sau cratime."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Introduceţi o adresă IPv4 validă."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Intoduceți o adresă IPv6 validă."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Introduceți o adresă IPv4 sau IPv6 validă."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Introduceţi numai numere separate de virgule."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Asiguraţi-vă că această valoare este %(limit_value)s  (este %(show_value)s )."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Asiguraţi-vă că această valoare este mai mică sau egală cu %(limit_value)s ."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Asiguraţi-vă că această valoare este mai mare sau egală cu %(limit_value)s ."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -372,7 +392,7 @@ msgstr ""
 "Asiguraţi-vă că această valoare are cel puţin%(limit_value)d caractere "
 "(aceasta are %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -381,82 +401,82 @@ msgstr ""
 "Asiguraţi-vă că această valoare are cel mult %(limit_value)d caractere "
 "(aceasta are %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s trebuie să fie unic pentru %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "și"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 cu %(field_label)s deja există."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Valoarea %r nu este o alegere valabilă."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Câmpul nu poate fi gol."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Acest câmp nu poate fi gol."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Câmp de tip: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Întreg"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Valoarea '%s' trebuie să fie un număr întreg."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Valoarea '%s' trebuie sa fie doar True sau False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (adevărat sau fals)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Şir de caractere (cel mult %(max_length)s caractere)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Numere întregi separate de virgule"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Valoarea '%s' este o dată invalidă. Trebuie sa fie in forma YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 "Valoarea '%s' are forma corectă (YYYY-MM-DD) dar este o dată invalidă."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dată (fară oră)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +485,7 @@ msgstr ""
 "Valoarea '%s' este invalidă. Trebuie sa fie in forma YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,79 +494,79 @@ msgstr ""
 "Valoarea '%s' are forma corectă (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) dar "
 "sunt dată/timp invalide."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dată (cu oră)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Valoarea \"%s\" trebuie să fie un număr zecimal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Număr zecimal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Adresă email"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Adresă e-mail"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Calea fisierului"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' value must be a float."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Număr cu virgulă"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Întreg mare (8 octeți)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "Adresă IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Adresă IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Valoarea '%s' trebuie să fie doar None, True sau False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (adevărat, fals sau niciuna)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Întreg pozitiv"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Întreg pozitiv mic"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (până la %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Întreg mic"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Text"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -554,7 +574,7 @@ msgstr ""
 "Valoarea '%s' are o formă invalida. Ea trebuie să fie in forma HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -563,98 +583,98 @@ msgstr ""
 "Valoarea '%s' are forma corectă (HH:MM[:ss[.uuuuuu]]) dar este un timp "
 "invalid."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Timp"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fișier"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Imagine"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modelul %(model)s cu pk %(pk)r nu există."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Foreign Key (tipul determinat de către câmpul relativ)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relaţie unul-la-unul"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relație multe-la-multe"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru selecție "
 "multiplă."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Acest câmp este obligatoriu."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Introduceţi un număr întreg."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Introduceţi un număr."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Asigurați-vă că nu exista mai mult de %s cifre în total."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Asigurați-vă că nu exista mai mult de %s spații zecimale."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Asigurați-vă că nu exista mai mult de %s cifre înainte de virgulă."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Introduceți o dată validă."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Introduceți o oră validă."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Introduceți o dată/oră validă."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Nici un fișier nu a fost trimis. Verificați tipul fișierului."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Nici un fișier nu a fost trimis."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Fișierul încărcat este gol."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -662,11 +682,11 @@ msgstr ""
 "Asiguraţi-vă că acest nume de fişier are cel mult %(max)d caractere (acesta "
 "are %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Fie indicați un fişier, fie bifaţi caseta de selectare, nu ambele."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -674,36 +694,40 @@ msgstr ""
 "Încărcaţi o imagine validă. Fişierul încărcat nu era o imagine sau era o "
 "imagine coruptă."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Introduceți un URL valid."
+
+#: 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 ""
 "Selectați o opțiune validă. %(value)s nu face parte din opțiunile "
 "disponibile."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Introduceți o listă de valori."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Ordine"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Șterge"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Corectaţi datele duplicate pentru %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Corectaţi datele duplicate pentru %(field)s , ce trebuie să fie unic."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -712,33 +736,33 @@ msgstr ""
 "Corectaţi datele duplicate pentru %(field_name)s , care trebuie să fie unice "
 "pentru %(lookup)s  în %(date_field)s ."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Corectaţi valorile duplicate de mai jos."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Foreign key-ul inline nu se potrivește cu cheia primară a istanței mamă."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Selectați o opțiune validă. Această opțiune nu face parte din opțiunile "
 "disponibile."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Selectați o opțiune validă. %s nu face parte din opțiunile disponibile."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" nu este o valoare valabilă pentru o cheie primară."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -747,35 +771,35 @@ msgstr ""
 "%(datetime)s nu poate fi interpetat in fusul orar %(current_timezone)s; este "
 "ambiguu sau nu există."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "În prezent"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Schimbă"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Șterge"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Da"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nu"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "da,nu,poate"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -783,52 +807,52 @@ msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 msgstr[2] "%(size)d bytes"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KO"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MO"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GO"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TO"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PO"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "miezul nopții"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "amiază"
 
@@ -1104,128 +1128,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Decembrie"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "sau"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "an"
 msgstr[1] "ani"
 msgstr[2] "de ani"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "lună"
 msgstr[1] "luni"
 msgstr[2] "de luni"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "săptămână"
 msgstr[1] "săptămâni"
 msgstr[2] "de săptămâni"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "zi"
 msgstr[1] "zile"
 msgstr[2] "de zile"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "oră"
 msgstr[1] "ore"
 msgstr[2] "de ore"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minute"
 msgstr[2] "de minute"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minute"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Aici nu sunt permise indexuri la directoare"
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" nu există"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Index pentru %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s a fost creat cu succes."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s a fost actualizat cu succes."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s a fost șters."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Niciun an specificat"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Nicio lună specificată"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Nicio zi specificată"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nicio săptămîna specificată"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s nu e disponibil"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1234,27 +1243,27 @@ msgstr ""
 "Viitorul %(verbose_name_plural)s nu e disponibil deoarece %(class_name)s ."
 "allow_future este Fals."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Dată incorectă '%(datestr)s' considerând formatul '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Niciun rezultat pentru %(verbose_name)s care se potrivesc interogării"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Pagina nu este \"ultima\" și nici nu poate fi convertită într-un întreg."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Pagină invalidă (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Listă goală și '%(class_name)s.allow_empty' este Fals."
diff --git a/django/conf/locale/ro/formats.py b/django/conf/locale/ro/formats.py
index 4be020f375..5435837483 100644
--- a/django/conf/locale/ro/formats.py
+++ b/django/conf/locale/ro/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 55cf3f76a2..1b6bf628ec 100644
Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 71856a17c4..72c8928da8 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -1,367 +1,388 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <andrew@ei-grad.ru>, 2012.
 # Denis Darii <sinednx@gmail.com>, 2011.
 # Dimmus <dmitri.chudinov@gmail.com>, 2011.
 # Eugene MechanisM <contact@mechanism.name>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Алексей Борискин <sun.void@gmail.com>, 2011, 2012.
+# Алексей Борискин <sun.void@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Eugene MechanisM <contact@mechanism.name>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 "Белоруский"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Бенгальский"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Бретонский"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Боснийский"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Каталанский"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Чешский"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Уэльский"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Датский"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Немецкий"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Греческий"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Английский"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Британский английский"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Эсперанто"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Испанский"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Аргентинский испанский"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Мексиканский испанский"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Никарагуанский испанский"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Венесуэльский Испанский"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Эстонский"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Баскский"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Персидский"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Финский"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Французский"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Фризский"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Ирландский"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Галисийский"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Хинди"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Хорватский"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Венгерский"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Интерлингва"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Индонезийский"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Исландский"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Итальянский"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Японский"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Грузинский"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Казахский"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Кхмерский"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Каннада"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Корейский"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Люксембургский"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Литовский"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Латвийский"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Македонский"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Малаялам"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Монгольский"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Норвежский (Букмол)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Непальский"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Голландский"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Норвежский (Нюнорск)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Панджаби"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Польский"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Бразильский португальский"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Румынский"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Русский"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Словенский"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Албанский"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Сербский"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Сербский (латиница)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Шведский"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Суахили"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Тамильский"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Телугу"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Тайский"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Турецкий"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Татарский"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Удмуртский"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Украинский"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Урду"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Вьетнамский"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Упрощенный китайский"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Традиционный китайский"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Введите правильное значение."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Эта ссылка не работает."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Введите правильный URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Введите правильный адрес электронной почты."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Значение должно состоять только из букв, цифр, знаков подчеркивания или "
 "дефиса."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Введите правильный IPv4 адрес."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Введите действительный IPv6 адрес."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Введите действительный IPv4 или IPv6 адрес."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Введите цифры, разделенные запятыми."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Убедитесь, что это значение меньше либо равно %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Убедитесь, что это значение больше либо равно %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -370,7 +391,7 @@ msgstr ""
 "Убедитесь, что это значение содержит не менее %(limit_value)d символов "
 "(сейчас %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -379,73 +400,73 @@ msgstr ""
 "Убедитесь, что это значение содержит не более %(limit_value)d символов "
 "(сейчас %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "Значение в поле %(field_name)s должно быть уникальным для %(lookup)s в поле "
 "%(date_field)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "и"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 с таким %(field_label)s уже существует."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Значения %r нет среди допустимых вариантов."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Это поле не может иметь значение NULL."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Это поле не может быть пустым."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Поле типа %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Целое"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' значение должно быть целым числом."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' значение должно быть True или False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Логическое (True или False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Строка (до %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Целые, разделенные запятыми"
 
-#: db/models/fields/__init__.py:647
+#: 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' значение задано неверно. Дата должна быть в формате ГГГГ-ММ-ДД."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -453,11 +474,11 @@ msgstr ""
 "Значение '%s' имеет корректный формат (YYYY-MM-DD), но это недействительная "
 "дата."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Дата (без указания времени)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -466,7 +487,7 @@ msgstr ""
 "Значение '%s' имеет неверный формат. Оно должно быть в формате YYYY-MM-DD HH:"
 "MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -475,79 +496,79 @@ msgstr ""
 "Значение '%s' имеет корректный формат (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
 "но это недействительные дата/время."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Дата (с указанием времени)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Значение '%s' должно быть десятичным числом."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Число с фиксированной запятой"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Адрес электронной почты"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Путь к файлу"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Значение '%s' должно быть числом с плавающей запятой."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Число с плавающей запятой"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Длинное целое (8 байт)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 адрес"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-адрес"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Значение '%s' должно быть None, True или False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Логическое (True, False или None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Положительное целое число"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Положительное малое целое число"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Слаг (до %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Малое целое число"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Текст"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -555,7 +576,7 @@ msgstr ""
 "Значение '%s' имеет неверный формат. Оно должно быть в формате ЧЧ:ММ[:сс[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -564,98 +585,98 @@ msgstr ""
 "Значение '%s' имеет корректный формат (HH:MM[:ss[.uuuuuu]]), но это "
 "недействительное время."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Время"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Файл"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Изображение"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Объект модели %(model)s с первичным ключом %(pk)r не существует."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Внешний ключ (тип определен по связанному полю)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Связь \"один к одному\""
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Связь \"многие ко многим\""
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Удерживайте \"Control\" (или \"Command\" на Mac), чтобы выбрать несколько "
 "значений."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Обязательное поле."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Введите целое число."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Введите число."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Убедитесь, что вы ввели не больше %s цифр."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Убедитесь, что вы ввели не больше %s цифр после запятой."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Убедитесь, что вы ввели не больше %s цифр до запятой."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Введите правильную дату."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Введите правильное время."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Введите правильную дату и время."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Ни одного файла не было отправлено. Проверьте тип кодировки формы."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Ни одного файла не было отправлено."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Отправленный файл пуст."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -663,13 +684,13 @@ msgstr ""
 "Убедитесь, что это имя файла содержит не более %(max)d символов (сейчас "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Пожалуйста, загрузите файл или поставьте флажок \"Очистить\", но не "
 "совершайте оба действия одновременно."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -677,35 +698,39 @@ msgstr ""
 "Загрузите правильное изображение. Файл, который вы загрузили, поврежден или "
 "не является изображением."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Введите правильный URL."
+
+#: 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 "Выберите корректный вариант. %(value)s нет среди допустимых значений."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Введите список значений."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Порядок"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Удалить"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Пожалуйста, измените повторяющееся значение в поле \"%(field)s\"."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Пожалуйста, измените значение в поле %(field)s, оно должно быть уникальным."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -714,30 +739,30 @@ msgstr ""
 "Пожалуйста, измените значение в поле %(field_name)s, оно должно быть "
 "уникальным для %(lookup)s в поле %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Пожалуйста, измените повторяющиеся значения ниже."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Внешний ключ не совпадает с первичным ключом родителя."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Выберите корректный вариант. Вашего варианта нет среди допустимых значений."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Выберите корректный вариант. %s нет среди допустимых значений."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" не является верным значением для первичного ключа."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -747,35 +772,35 @@ msgstr ""
 "%(current_timezone)s; дата может быть неоднозначной или оказаться "
 "несуществующей."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "На данный момент"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Изменить"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Очистить"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Да"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Нет"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "да,нет,может быть"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -783,52 +808,52 @@ msgstr[0] "%(size)d байт"
 msgstr[1] "%(size)d байта"
 msgstr[2] "%(size)d байт"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
-msgstr "%s KБ"
+msgstr "%s КБ"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
-msgstr "%s MБ"
-
-#: template/defaultfilters.py:836
-#, python-format
-msgid "%s GB"
-msgstr "%s GБ"
-
-#: template/defaultfilters.py:838
-#, python-format
-msgid "%s TB"
-msgstr "%s TБ"
+msgstr "%s МБ"
 
 #: template/defaultfilters.py:839
 #, python-format
+msgid "%s GB"
+msgstr "%s ГБ"
+
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr "%s ТБ"
+
+#: template/defaultfilters.py:842
+#, python-format
 msgid "%s PB"
 msgstr "%s ПБ"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "п.п."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "д.п."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "ПП"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ДП"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "полночь"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "полдень"
 
@@ -1104,128 +1129,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "декабря"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "или"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "год"
 msgstr[1] "года"
 msgstr[2] "лет"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "месяц"
 msgstr[1] "месяца"
 msgstr[2] "месяцев"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "неделя"
 msgstr[1] "недели"
 msgstr[2] "недель"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "день"
 msgstr[1] "дня"
 msgstr[2] "дней"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часа"
 msgstr[2] "часов"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минуты"
 msgstr[2] "минут"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "минут"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Просмотр списка файлов директории здесь не разрешен."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" не существует"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Список файлов директории %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s был успешно создан."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s был успешно изменен."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s был успешно удален."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Не указан год"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Не указан месяц"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Не указан день"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Не указана неделя"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s не доступен"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1234,30 +1244,30 @@ msgstr ""
 "Будущие %(verbose_name_plural)s недоступны, потому что %(class_name)s."
 "allow_future выставлен в значение \"Ложь\"."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "Не удалось распознать строку с датой '%(datestr)s', используя формат "
 "'%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Не найден ни один %(verbose_name)s, соответствующий запросу"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Номер страницы не содержит особое значение 'last', и его не удалось "
 "преобразовать к целому числу."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Неверная страница (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Неправильная страница (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/ru/formats.py b/django/conf/locale/ru/formats.py
index d692e67833..413ce2788b 100644
--- a/django/conf/locale/ru/formats.py
+++ b/django/conf/locale/ru/formats.py
@@ -22,9 +22,11 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',  # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',     # '25.10.2006 14:30'
     '%d.%m.%Y',           # '25.10.2006'
     '%d.%m.%y %H:%M:%S',  # '25.10.06 14:30:59'
+    '%d.%m.%y %H:%M:%S.%f', # '25.10.06 14:30:59.000200'
     '%d.%m.%y %H:%M',     # '25.10.06 14:30'
     '%d.%m.%y',           # '25.10.06'
 )
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 9d3e3594b9..c93a946026 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 876f12b74f..006ec866ab 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -2,362 +2,384 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Juraj Bubniak <>, 2012.
+# Juraj Bubniak <translations@jbub.eu>, 2012.
 # Marian Andre <marian@andre.sk>, 2011, 2012.
 # Martin Kosír <martin@martinkosir.net>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: Juraj Bubniak <translations@jbub.eu>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "afrikánsky"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "arabský"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "azerbajdžanský"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "bulharský"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "bieloruský"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengálsky"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "bretónsky"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosniansky"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "katalánsky"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "český"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "waleský"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "dánsky"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "nemecký"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "grécky"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "anglický"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "britský"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "esperantský"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "španielsky"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "argentínska španielčina"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "mexická španielčina"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "nikaragujská španielčina"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "venezuelská španielčina"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estónsky"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "baskický"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "perzský"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "fínsky"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francúzsky"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frízsky"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "írsky"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galícijský"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "hebrejský"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindský"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "chorvátsky"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "maďarský"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "interlinguánsky"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonézsky"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandský"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "taliansky"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "japonský"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "gruzínsky"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "kazašský"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "kmérsky"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kanadský"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "kórejský"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "luxemburský"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "litovský"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "lotyšský"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "macedónsky"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "malajalámsky"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongolský"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "nórsky (Bokmal)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "nepálsky"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "holandský"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "nórsky (Nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "pandžábsky"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "poľský"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugalský"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "portugalský (Brazília)"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumunský"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "ruský"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "slovenský"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "slovinský"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albánsky"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "srbský"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "srbský (Latin)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "švédsky"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "svahilský"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamilský"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telúgsky"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "thajský"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turecký"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "tatársky"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "udmurtský"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ukrajinský"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "urdský"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vietnamský"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "čínsky (zjednodušene)"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "čínsky (tradične)"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Zadajte platnú hodnotu."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Toto URL je chybný odkaz."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Zadajte platnú URL adresu."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Zadajte platnú e-mailovú adresu."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Zadajte platný 'slug' pozostávajúci z písmen, čísel, podčiarkovníkov alebo "
 "pomlčiek."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Zadajte platnú IPv4 adresu."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Zadajte platnú IPv6 adresu."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Zadajte platnú IPv4 alebo IPv6 adresu."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Zadajte len číslice oddelené čiarkami."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Uistite sa, že táto hodnota je %(limit_value)s (je to %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Uistite sa, že táto hodnota je menšia alebo rovná %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Uistite sa, že hodnota je väčšia alebo rovná %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +388,7 @@ msgstr ""
 "Uistite sa, že zadaná hodnota má najmenej %(limit_value)d znakov (má "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,82 +397,82 @@ msgstr ""
 "Uistite sa, že táto hodnota má najviac %(limit_value)d  znakov (má "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s musí byť unikátne pre %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "a"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 s týmto %(field_label)s už existuje."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Hodnota %r nie je platná možnosť."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Toto pole nemôže byť prázdne."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Toto pole nemôže byť prázdne."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Pole typu: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Celé číslo"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Hodnota '%s' musí byť celé číslo."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Hodnota '%s' value musí byť True alebo False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Logická hodnota (buď True alebo False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Reťazec (až do %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Celé čísla oddelené čiarkou"
 
-#: db/models/fields/__init__.py:647
+#: 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 "Hodnota '%s' má neplatný tvar dátumu. Musí byť v tvare YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 "Hodnota '%s' je v správnom tvare (YYYY-MM-DD), ale je to neplatný dátum."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Dátum (bez času)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -459,7 +481,7 @@ msgstr ""
 "Hodnota '%s' má neplatný tvar. Musí byť v tvare YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -468,85 +490,85 @@ msgstr ""
 "Hodnota '%s' je v správnom tvare (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), ale "
 "je to neplatný dátum/čas."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Dátum (a čas)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Hodnota '%s' musí byť desatinné číslo."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Desatinné číslo"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-mail adresa"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Hodnota '%s' musí byť desatinné čislo s plávajúcou desatinnou čiarkou."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Číslo s plávajúcou desatinnou čiarkou"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Veľké celé číslo (8 bajtov)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 adresa"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP adresa"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Hodnota '%s' musí byť buď None, True alebo False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Logická hodnota (buď True, False alebo None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "Kladné celé číslo"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "Malé kladné celé číslo"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Identifikátor (najviac %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "Malé celé číslo"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Text"
 
-#: db/models/fields/__init__.py:1180
+#: 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 "Hodnota '%s' má neplatný tvar. Musí byť v tvare HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -555,111 +577,111 @@ msgstr ""
 "Hodnota '%s' je v správnom tvare (HH:MM[:ss[.uuuuuu]]), ale je to neplaný "
 "čas."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Čas"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "Súbor"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "Obrázok"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s s primárnym kľúčom %(pk)r neexistuje."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Cudzí kľúč (typ určuje pole v relácii)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Typ relácie: jedna k jednej"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Typ relácie: M ku N"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Ak chcete vybrať viac ako jednu položku, podržte \"Control\", alebo \"Command"
 "\" na počítači Mac."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Toto pole je povinné."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Zadajte celé číslo."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Zadajte číslo."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Uistite sa, že nie je zadaných celkovo viac ako %s číslic."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Uistite sa, že nie je zadaných viac ako %s desatinných miest."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Uistite sa, že nie je zadaných viac ako %s číslic pred desatinnou čiarkou."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Zadajte platný dátum."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Zadajte platný čas."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Zadajte platný dátum a čas."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Súbor nebol odoslaný. Skontrolujte typ kódovania vo formulári."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Žiaden súbor nebol odoslaný."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Odoslaný súbor je prázdny."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr "Uistite sa, že názov súboru má najviac %(max)d znakov (má %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Odošlite prosím súbor alebo zaškrtnite políčko pre vymazanie vstupného poľa, "
 "nie oboje."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -667,34 +689,38 @@ msgstr ""
 "Nahrajte platný obrázok. Súbor, ktorý ste odoslali nebol obrázok alebo bol "
 "poškodený."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Zadajte platnú URL adresu."
+
+#: 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 "Vyberte platnú voľbu. %(value)s nepatrí medzi dostupné možnosti."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Vložte zoznam hodnôt."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Poradie"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Prosím, opravte duplicitné dáta pre %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Dáta pre %(field)s musia byť unikátne, prosím, opravte duplikáty."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -703,31 +729,31 @@ msgstr ""
 "Dáta pre %(field_name)s musia byť unikátne pre %(lookup)s v %(date_field)s, "
 "prosím, opravte duplikáty."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Prosím, opravte nižšie uvedené duplicitné hodnoty. "
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Vnorený cudzí kľúč sa nezhoduje s nadradenou inštanciou primárnho kľúča."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Vyberte platnú možnosť. Vybraná položka nepatrí medzi dostupné možnosti."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Vyberte platnú možnost. %s nepatrí medzi dostupné možnosti."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" nie je platná hodnota pre primárny kľúč."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -736,35 +762,35 @@ msgstr ""
 "Hodnota %(datetime)s v časovej zóne %(current_timezone)s sa nedá "
 "interpretovať; môže byť nejednoznačná alebo nemusí existovať."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Súčasne"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Zmeniť"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Vymazať"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Áno"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nie"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "áno,nie,možno"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -772,52 +798,52 @@ msgstr[0] "%(size)d bajt"
 msgstr[1] "%(size)d bajty"
 msgstr[2] "%(size)d bajtov"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "popoludní"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "dopoludnia"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "popoludní"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "dopoludnia"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "polnoc"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "poludnie"
 
@@ -1093,128 +1119,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "december"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "alebo"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "rok"
 msgstr[1] "roky"
 msgstr[2] "rokov"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mesiac"
 msgstr[1] "mesiace"
 msgstr[2] "mesiacov"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "týždeň"
 msgstr[1] "týždne"
 msgstr[2] "týždnov"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "deň"
 msgstr[1] "dni"
 msgstr[2] "dní"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodín"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minúta"
 msgstr[1] "minúty"
 msgstr[2] "minút"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minúty"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Výpis adresárov tu nieje povolený."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" neexistuje"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "Výpis %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Objekt %(verbose_name)s bol úspešne vytvorený."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Objekt %(verbose_name)s bol úspešne zmenený."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Objekt %(verbose_name)s bol zmazaný."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Nešpecifikovaný rok"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Nešpecifikovaný mesiac"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Nešpecifikovaný deň"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nešpecifikovaný týždeň"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s nie sú dostupné"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1223,29 +1234,29 @@ msgstr ""
 "Budúce %(verbose_name_plural)s nie sú dostupné pretože %(class_name)s."
 "allow_future má hodnotu False. "
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Neplatný dátumový reťazec  '%(datestr)s' pre formát '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 "Nebol nájdený žiadny %(verbose_name)s zodpovedajúci databázovému dopytu"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Stránka nemá hodnotu 'last' a taktiež nie je možné prekonvertovať hodnotu na "
 "celé číslo."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Neplatná stránka (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Nesprávna stránka (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/sk/formats.py b/django/conf/locale/sk/formats.py
index 85e2cd8af9..6ff8ca791b 100644
--- a/django/conf/locale/sk/formats.py
+++ b/django/conf/locale/sk/formats.py
@@ -23,6 +23,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
 )
diff --git a/django/conf/locale/sl/LC_MESSAGES/django.mo b/django/conf/locale/sl/LC_MESSAGES/django.mo
index 6c59a2acf0..c1b9c97f2e 100644
Binary files a/django/conf/locale/sl/LC_MESSAGES/django.mo and b/django/conf/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sl/LC_MESSAGES/django.po b/django/conf/locale/sl/LC_MESSAGES/django.po
index 4e5c630e46..2d7c867b57 100644
--- a/django/conf/locale/sl/LC_MESSAGES/django.po
+++ b/django/conf/locale/sl/LC_MESSAGES/django.po
@@ -1,366 +1,389 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <domen@dev.si>, 2012.
 # iElectric <domen@dev.si>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Jure Cuhalev <gandalf@owca.info>, 2012.
+#  <zejn@kiberpipa.org>, 2013.
 #   <zejn@kiberpipa.org>, 2012.
 # zejn <zejn@kiberpipa.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+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-02-15 18:10+0000\n"
 "Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Afrikanščina"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arabščina"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbajdžanščina"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bolgarščina"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Belorusko"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengalščina"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretonščina"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosanščina"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalonščina"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Češčina"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Valežanski jezik"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danščina"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Nemščina"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Grščina"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Angleščina"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Britanska Angleščina"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Španščina"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentinska španščina"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mehiška španščina"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nikaragvijska španščina"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Španščina (Venezuela)"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonščina"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskovščina"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Perzijščina"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finščina"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Francoščina"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frizijščina"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irščina"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galičanski jezik"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebrejski jezik"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindujščina"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Hrvaščina"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Madžarščina"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonezijski"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandski jezik"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italijanščina"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japonščina"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Gruzijščina"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazaščina"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Kmerščina"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kanareščina"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Korejščina"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luksemburščina"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litvanščina"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latvijščina"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonščina"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malajalščina"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongolščina"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norveščina Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepalščina"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Nizozemščina"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norveščina Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Pandžabščina"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Poljščina"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugalščina"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brazilska portugalščina"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Romunščina"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Ruščina"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovaščina"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovenščina"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanščina"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Srbščina"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Srbščina v latinici"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Švedščina"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Svahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamilščina"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Teluščina"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tajski jezik"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turščina"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatarščina"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurski jezik"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrajinščina"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Jezik Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamščina"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Poenostavljena kitajščina"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Tradicionalna kitajščina"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Vnesite veljavno vrednost."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Izgleda, da povezava na ta URL ne deluje."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Vnesite veljaven e-poštni naslov."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Vnesite veljaven URL naslov."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Vnesite veljaven e-mail."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Vnesite veljavno URL okrajšavo. Vrednost sme vsebovati le črke, števila, "
 "podčrtaje ali pomišljaje."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Vnesite veljaven IPv4 naslov."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Vnesite veljaven IPv6 naslov."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Vnesite veljaven IPv4 ali IPv6 naslov."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Vnesite samo števila, ločena z vejicami."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Poskrbite, da bo ta vrednost %(limit_value)s. Trenutno je %(show_value)s."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Poskrbite, da bo ta vrednost manj kot ali natanko %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Poskrbite, da bo ta vrednost večja ali enaka %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -369,7 +392,7 @@ msgstr ""
 "Poskrbite, da bo ta vrednost vsaj %(limit_value)d znakov. Trenutno jih ima "
 "%(show_value)d."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -378,81 +401,81 @@ msgstr ""
 "Poskrbite, da bo imela ta vrednost največ %(limit_value)d znakov. Trenutno "
 "jih ima %(show_value)d."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s mora biti edinstveno za %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "in"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 s tem %(field_label)s že obstaja."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Vrednost %r ni veljavna izbira."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "To polje ne more biti prazno."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "To polje ne more biti prazno."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Polje tipa: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Celo število (integer)"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Vrednost '%s' mora biti celoštevilska."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Vrednost '%s' mora biti bodisi \"res\" bodisi \"ni res\"."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolova vrednost (True ali False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Niz znakov (vse do %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Z vejico ločena cela števila (integer)"
 
-#: db/models/fields/__init__.py:647
+#: 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 "Vrednost '%s' je v napačnem zapisu. Biti mora v obliki LLLL-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 "Vrednost '%s' je v pravilnem zapisu (LLLL-MM-DD), a ta dan ne obstaja."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datum (brez ure)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -461,189 +484,189 @@ msgstr ""
 "Vrednost '%s' ima je v neveljavnem zapisu. Biti mora v obliki LLLL-MM-DD UU:"
 "MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: 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 "Vrednost '%s' je v pravilnem zapisu, a ta čas ne obstaja."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datum (z uro)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Vrednost '%s' mora biti decimalno število."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimalno število"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "E-mail naslov"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "E-poštni naslov"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Pot do datoteke"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Vrednost '%s' mora biti decimalno število v plavajoči vejici."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Število s plavajočo vejico"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Velika (8 bajtna) cela števila "
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 naslov"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP naslov"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Vrednost '%s' mora biti ali brez vrednosti ali \"res\" ali \"ni res\"."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolova vrednost (True, False ali None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Pozitivno celo število"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Pozitivno celo število (do 64 tisoč)"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Okrajšava naslova (do največ %(max_length)s znakov)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Celo število"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Besedilo"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 "Vrednost '%s' je v napačnem zapisu. Biti mora v obliki UU:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: 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 "Vrednost '%s' je v pravilni obliki, a ta čas ne obstaja."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Čas"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL (spletni naslov)"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Datoteka"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Slika"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s z glavnim ključem %(pk)r ne obstaja."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Tuji ključ (tip odvisen od povezanega polja)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relacija ena-na-ena"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relacija več-na-več"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "Držite \"Control\" (ali \"Command\" na Mac-u) za izbiro več kot enega."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "To polje je obvezno."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Vnesite celo število."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Vnesite število."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Poskrbite, da skupno ne bo več kot %s števil."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Poskrbite, da skupno ne bo več kot %s decimalnih mest."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Poskrbite, da ne bo več kot %s števil pred decimalno piko."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Vnesite veljaven datum."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Vnesite veljaven čas."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Vnesite veljaven datum/čas."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Datoteka ni bila poslana. Preverite nabor znakov v formi."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Poslali niste nobene datoteke."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Poslana datoteka je prazna."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -651,11 +674,11 @@ msgstr ""
 "Poskrbite, da bo imela ta datoteka največ %(max)d znakov (trenutno jih ima "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Prosim oddaj datoteko ali izberi počisti okvir, ampak ne oboje hkrati."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -663,35 +686,39 @@ msgstr ""
 "Naložite veljavno sliko. Naložena datoteka ni bila slika ali pa je bila le-"
 "ta okvarjena."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Vnesite veljaven URL naslov."
+
+#: 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 "Izberite veljavno možnost. %(value)s ni med ponujenimi izbirami."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Vnesite seznam vrednosti."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Razvrsti"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Izbriši"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Prosimo, odpravite podvojene vrednosti za %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Prosimo popravite podvojene vrednosti za %(field)s, ki morajo biti unikatne."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -700,29 +727,29 @@ msgstr ""
 "Prosimo popravite podvojene vrednosti za polje %(field_name)s, ki mora biti "
 "edinstveno za %(lookup)s po %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Prosimo odpravite podvojene vrednosti spodaj."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Tuji ključ se ne ujema z glavnim ključem povezanega vnosa."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Izberite veljavno možnost. Te možnosti ni med ponujenimi izbirami."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Izberite veljavno možnost. %s ni med ponujenimi izbirami."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ni veljavna vrednost za glavni ključ."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -731,35 +758,35 @@ msgstr ""
 "Vrednosti %(datetime)s ni bilo možno razumeti v časovnem pasu "
 "%(current_timezone)s; ali je izraz dvoumen ali pa ne obstaja."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Trenutno"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Spremeni"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Počisti"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Neznano"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Da"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ne"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "da,ne,morda"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -768,52 +795,52 @@ msgstr[1] "%(size)d bajta"
 msgstr[2] "%(size)d bajti"
 msgstr[3] "%(size)d bajtov"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "polnoč"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "poldne"
 
@@ -1089,22 +1116,22 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "December"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ali"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "leto"
@@ -1112,7 +1139,7 @@ msgstr[1] "leti"
 msgstr[2] "leta"
 msgstr[3] "let"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mesec"
@@ -1120,7 +1147,7 @@ msgstr[1] "meseca"
 msgstr[2] "meseci"
 msgstr[3] "mesecev"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "teden"
@@ -1128,7 +1155,7 @@ msgstr[1] "tedna"
 msgstr[2] "tedni"
 msgstr[3] "tednov"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
@@ -1136,7 +1163,7 @@ msgstr[1] "dneva"
 msgstr[2] "dnevi"
 msgstr[3] "dni"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ura"
@@ -1144,7 +1171,7 @@ msgstr[1] "uri"
 msgstr[2] "ure"
 msgstr[3] "ur"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
@@ -1152,71 +1179,56 @@ msgstr[1] "minuti"
 msgstr[2] "minute"
 msgstr[3] "minut"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minute"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Prikaz vsebine mape ni dovoljen."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" ne obstaja."
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Vsebina mape %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s je bil uspešno ustvarjen."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s je bil uspešno posodobljen."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s je bil uspešno izbrisan."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Leto ni vnešeno"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Mesec ni vnešen"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Dan ni vnešen"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Teden ni vnešen"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Na voljo ni noben %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1225,28 +1237,28 @@ msgstr ""
 "Prihodnje %(verbose_name_plural)s niso na voljo, ker je vrednost "
 "%(class_name)s.allow_future False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 "Neveljavna oblika datuma '%(datestr)s' glede na pričakovano obliko "
 "'%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Noben %(verbose_name)s ne ustreza poizvedbi"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Strani niti ni 'last' niti ni celo število."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Neveljavna stran (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Neveljavna stran (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Prazen seznam ob nastavitvi '%(class_name)s.allow_empty = False'."
diff --git a/django/conf/locale/sl/formats.py b/django/conf/locale/sl/formats.py
index 0d6137e1ed..ada379f9e7 100644
--- a/django/conf/locale/sl/formats.py
+++ b/django/conf/locale/sl/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -23,18 +24,23 @@ DATE_INPUT_FORMATS = (
 
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',            # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',         # '25.10.2006 14:30:59.000200'
     '%d.%m.%Y %H:%M',               # '25.10.2006 14:30'
     '%d.%m.%Y',                     # '25.10.2006'
     '%d.%m.%y %H:%M:%S',            # '25.10.06 14:30:59'
+    '%d.%m.%y %H:%M:%S.%f',         # '25.10.06 14:30:59.000200'
     '%d.%m.%y %H:%M',                # '25.10.06 14:30'
     '%d.%m.%y',                     # '25.10.06'
     '%d-%m-%Y %H:%M:%S',            # '25-10-2006 14:30:59'
+    '%d-%m-%Y %H:%M:%S.%f',         # '25-10-2006 14:30:59.000200'
     '%d-%m-%Y %H:%M',               # '25-10-2006 14:30'
     '%d-%m-%Y',                     # '25-10-2006'
     '%d. %m. %Y %H:%M:%S',          # '25. 10. 2006 14:30:59'
+    '%d. %m. %Y %H:%M:%S.%f',       # '25. 10. 2006 14:30:59.000200'
     '%d. %m. %Y %H:%M',             # '25. 10. 2006 14:30'
     '%d. %m. %Y',                   # '25. 10. 2006'
     '%d. %m. %y %H:%M:%S',          # '25. 10. 06 14:30:59'
+    '%d. %m. %y %H:%M:%S.%f',       # '25. 10. 06 14:30:59.000200'
     '%d. %m. %y %H:%M',             # '25. 10. 06 14:30'
     '%d. %m. %y',                   # '25. 10. 06'
 )
diff --git a/django/conf/locale/sq/LC_MESSAGES/django.mo b/django/conf/locale/sq/LC_MESSAGES/django.mo
index d78ebd55cb..75c33bbf60 100644
Binary files a/django/conf/locale/sq/LC_MESSAGES/django.mo and b/django/conf/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sq/LC_MESSAGES/django.po b/django/conf/locale/sq/LC_MESSAGES/django.po
index 74ff6a0f01..55e15cefbd 100644
--- a/django/conf/locale/sq/LC_MESSAGES/django.po
+++ b/django/conf/locale/sq/LC_MESSAGES/django.po
@@ -7,358 +7,378 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+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: Besnik <besnik@programeshqip.org>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\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 "Arabe"
 
-#: conf/global_settings.py:49
-msgid "Azerbaijani"
-msgstr ""
-
 #: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "Azerbaixhanase"
+
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Bjelloruse"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretone"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Boshnjake"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalane"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Çeke"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Uellsiane"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Daneze"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Gjermane"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Greke"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Angleze"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Anglishte Britanike"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spanjolle"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Spanjishte Argjentinase"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
-msgstr ""
+msgstr "Spanjishte Meksikane"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
-msgstr ""
+msgstr "Spanjishte Nikaraguane"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Spanjishte Venezueliane"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estoneze"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baske"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persiane"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finlandeze"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Frënge"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisiane"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irlandeze"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galike"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebraishte"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Indiane"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroate"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Hungareze"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indoneziane"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Islandeze"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italiane"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japoneze"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Gjeorgjiane"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazake"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmere"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreane"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luksemburgase"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lituaneze"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Latviane"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Maqedone"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malajalame"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongoliane"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norvegjeze Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepaleze"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Holandeze"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norvegjeze Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Panxhabe"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polake"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugeze"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Portugeze Braziliane"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumune"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Ruse"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovake"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovene"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Shqipe"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbe"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbe Latine"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Suedeze"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamileze"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tailandeze"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turke"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatare"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainase"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnameze"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Kineze e Thjeshtuar"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Kineze Tradicionale"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Jepni vlerë të vlefshme."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Kjo URL duket se është lidhje e dëmtuar."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Jepni një adresë email të vlefshme."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Jepni një URL të vlefshme."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Jepni një adresë e-mail të vlefshme."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Jepni një 'slug' të vlefshëm, të përbërë nga shkronja, numra, nëvija ose "
 "vija në mes."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Jepni një vendndodhje të vlefshme IPv4."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
-msgstr ""
+msgstr "Jepni një adresë IPv6 të vlefshme"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "Jepninjë adresë IPv4 ose IPv6 të vlefshme."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Jepni vetëm shifra të ndara nga presje."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Sigurohuni që kjo vlerë të jetë %(limit_value)s (është %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Sigurohuni që kjo vlerë të jetë më e vogël ose baraz me %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Sigurohuni që kjo vlerë është më e madhe ose baraz me %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -367,7 +387,7 @@ msgstr ""
 "Sigurohuni që kjo vlerë të ketë të paktën %(limit_value)d shenja (ka "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -376,285 +396,296 @@ msgstr ""
 "Sigurohuni që kjo vlerë të ketë e shumta %(limit_value)d shenja (ka "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s duhet të jetë unike për %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr " dhe "
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Ka tashmë një %(model_name)s me këtë %(field_label)s."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Vlera %r nuk është zgjedhje e vlefshme."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Kjo fushë nuk mund të jetë bosh."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Kjo fushë nuk mund të jetë e zbrazët."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Fushë e llojit: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Numër i plotë"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
-msgstr ""
+msgstr "Vlera '%s' duhet të jetë numër i plotë."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "Vlera '%s' duhet të jetë ose True, ose False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Buleane (Ose True, ose False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Varg (deri në %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Numra të plotë të ndarë me presje"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
+"Vlera '%s' ka një format të pavlefshëm datash. Duhet të jetë në formatin "
+"YYYY-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
+"Vlera '%s' ka formatin e saktë (YYYY-MM-DD) por është datë e pavlefshme."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datë (pa kohë)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
+"Vlera '%s' ka një format të pavlefshëm. Duhet të jetë në formatin YYYY-MM-DD "
+"HH:MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
+"Vlera '%s' ka format të saktë (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) por është "
+"datë/kohë e pavlefshme."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datë (me kohë)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "Vlera '%s' duhet të jetë një numër dhjetor."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Numër dhjetor"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Adresë e-mail"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Adresë email"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Shteg kartele"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Numër i plotë i madh (8 bajte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "Adresë IPv4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Adresë IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "Vlera '%s' duhet të jetë ose None, ose True, ose False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Buleane (Ose True, ose False, ose None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "Numër i plotë pozitiv"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Identifikues (deri në %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
+"Vlera '%s' ka format të pavlefshëm. Duhet të jetë në formatin HH:MM[:ss[."
+"uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
+"Vlera '%s' ka formatin e saktë (HH:MM[:ss[.uuuuuu]]) por është kohë e "
+"palvefshme."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Kohë"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "Kartelë"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "Figurë"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modeli %(model)s me pk %(pk)r nuk ekziston."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Kyç i Jashtëm (lloj i përcaktuar nga fusha përkatëse)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Marrëdhënie një-për-një"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Marrëdhënie shumë-për-shumë"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Mbani të shtypur \"Control\", ose \"Command\" në Mac, për të përzgjedhur më "
 "shumë se një."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Kjo fushë është e domosdoshme."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Jepni një numër të tërë."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Jepni një numër."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Sigurohuni që nuk ka më  tepër se %s shifra gjithsej."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Sigurohuni që nuk ka më shumë se %s vende dhjetore."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Sigurohuni që nuk ka më tepër se %s shifra para presjes dhjetore."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Jepni një datë të vlefshme."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Jepni një kohë të vlefshme."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Jepni një datë/kohë të vlefshme."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Nuk u parashtrua ndonjë kartelë. Kontrolloni llojin e kodimit te forma."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Nuk u parashtrua kartelë."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Kartela e parashtruar është bosh."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "Sigurohuni që ky emër kartele ka e shumta %(max)d shenja (ka %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Ju lutem, ose parashtroni një kartelë, ose i vini shenjë kutizës për "
 "pastrim, jo që të dyja."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -662,38 +693,42 @@ msgstr ""
 "Ngarkoni një figurë të vlefshme. Kartela që ngarkuat ose nuk qe figurë, ose "
 "qe figurë e dëmtuar."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Jepni një URL të vlefshme."
+
+#: 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 ""
 "Përzgjidhni një zgjedhje të vlefshme. %(value)s nuk është nga zgjedhjet e "
 "mundshme."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Jepni një listë vlerash."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Rend"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Fshije"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Ju lutem, ndreqni të dhënat dyfishe për %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Ju lutem, ndreqni të dhënat dyfishe për %(field)s, të cilat duhet të jenë "
 "unike."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -702,121 +737,123 @@ msgstr ""
 "Ju lutem, ndreqni të dhënat dyfishe për %(field_name)s të cilat duhet të "
 "jenë unike për %(lookup)s te %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Ju lutem, ndreqni vlerat dyfishe më poshtë."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Kyçi i jashtëm \"inline\" nuk u përputh me kyçin parësor të instancës mëmë."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Përzgjidhni një zgjedhje të vlefshme. Ajo zgjedhje nuk është një nga "
 "zgjedhjet e mundshme."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Përzgjidhni një zgjedhje të vlefshme. %s nuk është një nga zgjedhjet e "
 "mundshme."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" nuk është vlerë e vlefshme për kyç primar."
 
-#: forms/util.py:70
+#: 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 nuk u interpretua dot brenda zonë kohore %(current_timezone)s; "
+"mund të jetë e dykuptimtë ose mund të mos ekzistojë."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Tani"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Ndryshoje"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Pastroje"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "E panjohur"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Po"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Jo"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "po,jo,ndoshta"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bajt"
 msgstr[1] "%(size)d bajte"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
-msgstr ""
-
-#: template/defaultfilters.py:836
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#: template/defaultfilters.py:838
-#, python-format
-msgid "%s TB"
-msgstr ""
+msgstr "%s MB"
 
 #: template/defaultfilters.py:839
 #, python-format
-msgid "%s PB"
-msgstr ""
+msgid "%s GB"
+msgstr "%s GB"
 
-#: utils/dateformat.py:45
+#: 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:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "mesnatë"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "meditë"
 
@@ -1092,148 +1129,136 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Dhjetor"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ose"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "vit"
 msgstr[1] "vite"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "muaj"
 msgstr[1] "muaj"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "javë"
 msgstr[1] "javë"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ditë"
 msgstr[1] "ditë"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "orë"
 msgstr[1] "orë"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutë"
 msgstr[1] "minuta"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuta"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Këtu nuk lejohen treguesa drejtorish."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" nuk ekziston"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "Tregues i %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s u krijua me sukses."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s u përditësua me sukses."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s u fshi."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
-msgstr ""
+msgstr "Nuk është caktuar vit"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
-msgstr ""
+msgstr "Nuk është caktuar muaj"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
-msgstr ""
+msgstr "Nuk është caktuar ditë"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
-msgstr ""
+msgstr "Nuk është caktuar javë"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "Nuk ka %(verbose_name_plural)s të përcaktuar"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
+"%(verbose_name_plural)s i ardhshëm jo i passhëm, ngaqë %(class_name)s."
+"allow_future është False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
+"U dha varg i pavlefshëm date '%(datestr)s' formati i dhënë '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "Nuk u gjetën %(verbose_name)s me përputhje"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "Faqja nuk është 'last', as mund të shndërrohet në një int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Faqe e pavlefshme (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "Listë e zbrazët dhe '%(class_name)s.allow_empty' është False."
diff --git a/django/conf/locale/sq/formats.py b/django/conf/locale/sq/formats.py
index 6dd12e5800..1c04e2e5e8 100644
--- a/django/conf/locale/sq/formats.py
+++ b/django/conf/locale/sq/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index d97933c2ea..b017f86267 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 0d76244287..de728be93a 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -7,357 +7,377 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:32+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: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "бенгалски"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "босански"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "каталонски"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "чешки"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "велшки"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "дански"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "немачки"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "грчки"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "енглески"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "британски енглески"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "шпански"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "аргентински шпански"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "мексички шпански"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "никарагвански шпански"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "естонски"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "баскијски"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "персијски"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "фински"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "француски"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "фризијски"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ирски"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "галски"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "хебрејски"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "хинду"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "хрватски"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "мађарски"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "индонежански"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "исландски"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "италијански"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "јапански"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "грузијски"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "камбодијски"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "канада"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "корејски"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "литвански"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "латвијски"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "македонски"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "малајаламски"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "монголски"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "норвешки кнјжевни"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "холандски"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "норвешки нови"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Панџаби"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "пољски"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "португалски"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "бразилски португалски"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "румунски"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "руски"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "словачки"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "словеначки"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "албански"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "српски"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "српски (латиница)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "шведски"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "тамилски"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "телугу"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "тајландски"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "турски"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "украјински"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Урду"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "вијетнамски"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "новокинески"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "старокинески"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Унесите исправну вредност."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Овај URL изгледа не води никуда."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Унесите исправан URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Унесите важећу имејл адресу."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Унесите исрпаван „слаг“, који се састоји од слова, бројки, доњих црта или "
 "циртица."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Унесите исправну IPv4 адресу."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Унесите исправну IPv6 адресу."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Унесите исправну IPv4 или IPv6 адресу."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Унесите само бројке раздвојене запетама."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Ова вредност мора да буде мања од %(limit_value)s. или тачно толико."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Ова вредност мора бити већа од %(limit_value)s или тачно толико."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +386,7 @@ msgstr ""
 "Ово поље мора да садржи најмање %(limit_value)d словних места (тренутно има "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,90 +395,90 @@ msgstr ""
 "Ово поље мора да садржи највише %(limit_value)d словних места (тренутно има "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "и"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 са овом вредношћу %(field_label)s већ постоји."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Вредност %r није дозвољена."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Ово поље не може да остане празно."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Ово поље не може да остане празно."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Поње типа: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Цео број"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Вредност поља '%s' мора бити цео број."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Вредност поља '%s' мора бити True или False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Булова вредност (True или False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Стринг (највише %(max_length)s знакова)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Цели бројеви раздвојени запетама"
 
-#: db/models/fields/__init__.py:647
+#: 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' није исправан. Датум треба бити облика ГГГГ-ММ-ДД."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' је исправан (ГГГГ-ММ-ДД), али је датум непостојећи."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Датум (без времена)"
 
-#: db/models/fields/__init__.py:732
+#: 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' није у формату ГГГГ-ММ-ДД СС:ММ[:сс[.мммммм]][ВЗ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -467,85 +487,85 @@ msgstr ""
 "Вредност поља '%s' има добар формат (ГГГГ-ММ-ДД СС:ММ[:сс[.мммммм]][ВЗ]), "
 "али су датум и време непостојећи."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Датум (са временом)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Вредност поља '%s' мора бити децимални број."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Децимални број"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Имејл адреса"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Путања фајла"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Вредност поља '%s' мора бити број pokretnom zapetom."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Број са покреном запетом"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Велики цео број"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 adresa"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP адреса"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Вредност поља '%s' мора бити None, True или False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Булова вредност (True, False или None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Позитиван цео број"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Позитиван мали цео број"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Слаг (не дужи од %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Мали цео број"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Текст"
 
-#: db/models/fields/__init__.py:1180
+#: 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' нема добар формат СС:ММ[:сс[.мммммм]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -554,98 +574,98 @@ msgstr ""
 "Вредност поља '%s' има добар формат (СС:ММ[:сс[.мммммм]]), али је време "
 "непостојеће."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Време"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Фајл"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Слика"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Објекат класе %(model)s са примарним кључем %(pk)r не постоји."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Страни кључ (тип одређује референтно поље)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Релација један на један"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Релација више на више"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Држите „Control“, или „Command“ на Mac-у да бисте обележили више од једне "
 "ставке."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Ово поље се мора попунити."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Унесите цео број."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Унесите број."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Не сме бити укупно више од %s цифара. Проверите."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Не сме бити укупно више од %s децималних места. Проверите."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Не сме бити укупно више од %s цифара пре запете. Проверите."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Унесите исправан датум."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Унесите исправно време"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Унесите исправан датум/време."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Фајл није пребачен. Проверите тип енкодирања формулара."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Фајл није пребачен."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Пребачен фајл је празан."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -653,11 +673,11 @@ msgstr ""
 "Назив фајла мора да садржи бар %(max)d словних места (тренутно има "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Може се само послати фајл или избрисати, не оба."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -665,36 +685,40 @@ msgstr ""
 "Пребаците исправан фајл. Фајл који је пребачен или није слика, или је "
 "оштећен."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Унесите исправан URL."
+
+#: 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 ""
 "%(value)s није међу понуђеним вредностима. Одаберите једну од понуђених."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Унесите листу вредности."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Редослед"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Обриши"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Исправите дуплиран садржај за поља: %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Исправите дуплиран садржај за поља: %(field)s, који мора да буде јединствен."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -703,29 +727,29 @@ msgstr ""
 "Исправите дуплиран садржај за поља: %(field_name)s, који мора да буде "
 "јединствен за %(lookup)s у %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Исправите дуплиране вредности доле."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Страни кључ се није поклопио са инстанцом родитељског кључа."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Одабрана вредност није међу понуђенима. Одаберите једну од понуђених."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "%s није међу понуђеним вредностима. Одаберите једну од понуђених."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "„%s“ није исправна вредност за примарни кључ."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -734,35 +758,35 @@ msgstr ""
 "Време %(datetime)s не може се представити у временској зони "
 "%(current_timezone)s."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Тренутно"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Измени"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Очисти"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Непознато"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Да"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Не"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "да,не,можда"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -770,52 +794,52 @@ msgstr[0] "%(size)d бајт"
 msgstr[1] "%(size)d бајта"
 msgstr[2] "%(size)d бајтова"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "по п."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "пре п."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "поноћ"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "подне"
 
@@ -1091,128 +1115,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Децембар"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "или"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "година"
 msgstr[1] "године"
 msgstr[2] "година"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "месец"
 msgstr[1] "месеца"
 msgstr[2] "месеци"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "недеља"
 msgstr[1] "недеље"
 msgstr[2] "недеља"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "дан"
 msgstr[1] "дана"
 msgstr[2] "дана"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сат"
 msgstr[1] "сата"
 msgstr[2] "сати"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
 msgstr[1] "минута"
 msgstr[2] "минута"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "минута"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Индекси директоријума нису дозвољени овде."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "„%(path)s“ не постоји"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Индекс директоријума %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s је успешно креиран."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s је успешно ажуриран."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s је обрисан."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Година није назначена"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Месец није назначен"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Дан није назначен"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Недеља није назначена"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Недоступни објекти %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1221,26 +1230,26 @@ msgstr ""
 "Опција „future“ није доступна за „%(verbose_name_plural)s“ јер "
 "%(class_name)s.allow_future има вредност False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Неисправан датум „%(datestr)s“ дат формату „%(format)s“"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Ниједан објекат класе %(verbose_name)s није нађен датим упитом."
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Страница није последња, нити може бити конвертована у тип int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Неиспаравна страница (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Празна листа и „%(class_name)s.allow_empty“ има вредност False."
diff --git a/django/conf/locale/sr/formats.py b/django/conf/locale/sr/formats.py
index 227f20d723..8e9e9a487e 100644
--- a/django/conf/locale/sr/formats.py
+++ b/django/conf/locale/sr/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -24,15 +25,19 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y. %H:%M:%S',     # '25.10.2006. 14:30:59'
+    '%d.%m.%Y. %H:%M:%S.%f',  # '25.10.2006. 14:30:59.000200'
     '%d.%m.%Y. %H:%M',        # '25.10.2006. 14:30'
     '%d.%m.%Y.',              # '25.10.2006.'
     '%d.%m.%y. %H:%M:%S',     # '25.10.06. 14:30:59'
+    '%d.%m.%y. %H:%M:%S.%f',  # '25.10.06. 14:30:59.000200'
     '%d.%m.%y. %H:%M',        # '25.10.06. 14:30'
     '%d.%m.%y.',              # '25.10.06.'
     '%d. %m. %Y. %H:%M:%S',   # '25. 10. 2006. 14:30:59'
+    '%d. %m. %Y. %H:%M:%S.%f', # '25. 10. 2006. 14:30:59.000200'
     '%d. %m. %Y. %H:%M',      # '25. 10. 2006. 14:30'
     '%d. %m. %Y.',            # '25. 10. 2006.'
     '%d. %m. %y. %H:%M:%S',   # '25. 10. 06. 14:30:59'
+    '%d. %m. %y. %H:%M:%S.%f', # '25. 10. 06. 14:30:59.000200'
     '%d. %m. %y. %H:%M',      # '25. 10. 06. 14:30'
     '%d. %m. %y.',            # '25. 10. 06.'
 )
diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
index 53aa87b865..ebbb3b8716 100644
Binary files a/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.po b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
index bd230f7566..9d9a3b7d97 100644
--- a/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,357 +7,377 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+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: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "arapski"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "azerbejdžanski"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "bugarski"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "bengalski"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "bosanski"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "katalonski"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "češki"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "velški"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "danski"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "nemački"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "grčki"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "engleski"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "britanski engleski"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "španski"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "argentinski španski"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "meksički španski"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "nikaragvanski španski"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "estonski"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "baskijski"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "persijski"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "finski"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "francuski"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "frizijski"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "irski"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "galski"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "hebrejski"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "hindu"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "hrvatski"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "mađarski"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "indonežanski"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "islandski"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "italijanski"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "japanski"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "gruzijski"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "kambodijski"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "kanada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "korejski"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "litvanski"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "latvijski"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "makedonski"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "malajalamski"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "mongolski"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "norveški knjževni"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "holandski"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "norveški novi"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Pandžabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "poljski"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "brazilski portugalski"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "rumunski"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "ruski"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "slovački"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "slovenački"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "albanski"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "srpski"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "srpski (latinica)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "švedski"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "tamilski"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "tajlandski"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "turski"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ukrajinski"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "vijetnamski"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "novokineski"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "starokineski"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Unesite ispravnu vrednost."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Ovaj URL izgleda ne vodi nikuda."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Unesite ispravan URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Unesite važeću imejl adresu."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Unesite isrpavan „slag“, koji se sastoji od slova, brojki, donjih crta ili "
 "cirtica."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Unesite ispravnu IPv4 adresu."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Unesite ispravnu IPv6 adresu."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Unesite ispravnu IPv4 ili IPv6 adresu."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Unesite samo brojke razdvojene zapetama."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Ovo polje mora da bude %(limit_value)s (trenutno ima %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Ova vrednost mora da bude manja od %(limit_value)s. ili tačno toliko."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Ova vrednost mora biti veća od %(limit_value)s ili tačno toliko."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +386,7 @@ msgstr ""
 "Ovo polje mora da sadrži najmanje %(limit_value)d slovnih mesta (trenutno "
 "ima %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,90 +395,90 @@ msgstr ""
 "Ovo polje mora da sadrži najviše %(limit_value)d slovnih mesta (trenutno ima "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s mora da bude jedinstven za %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "i"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 sa ovom vrednošću %(field_label)s već postoji."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Vrednost %r nije dozvoljena."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Ovo polje ne može da ostane prazno."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Ovo polje ne može da ostane prazno."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Ponje tipa: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Ceo broj"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Vrednost polja '%s' mora biti ceo broj."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Vrednost polja '%s' mora biti True ili False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Bulova vrednost (True ili False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "String (najviše %(max_length)s znakova)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Celi brojevi razdvojeni zapetama"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Format datuma polja '%s' nije ispravan. Datum treba biti oblika GGGG-MM-DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 "Format datuma polja '%s' je ispravan (GGGG-MM-DD), ali je datum nepostojeći."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datum (bez vremena)"
 
-#: db/models/fields/__init__.py:732
+#: 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 "Vrednost polja '%s' nije u formatu GGGG-MM-DD SS:MM[:ss[.mmmmmm]][VZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -467,85 +487,85 @@ msgstr ""
 "Vrednost polja '%s' ima dobar format (GGGG-MM-DD SS:MM[:ss[.mmmmmm]][VZ]), "
 "ali su datum i vreme nepostojeći."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datum (sa vremenom)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Vrednost polja '%s' mora biti decimalni broj."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimalni broj"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Imejl adresa"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Putanja fajla"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Vrednost polja '%s' mora biti broj pokretnom zapetom."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Broj sa pokrenom zapetom"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Veliki ceo broj"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 adresa"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP adresa"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Vrednost polja '%s' mora biti None, True ili False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Bulova vrednost (True, False ili None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Pozitivan ceo broj"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Pozitivan mali ceo broj"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slag (ne duži od %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Mali ceo broj"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Tekst"
 
-#: db/models/fields/__init__.py:1180
+#: 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 "Vreme u polju '%s' nema dobar format SS:MM[:ss[.mmmmmm]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -554,98 +574,98 @@ msgstr ""
 "Vrednost polja '%s' ima dobar format (SS:MM[:ss[.mmmmmm]]), ali je vreme "
 "nepostojeće."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Vreme"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fajl"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Slika"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Objekat klase %(model)s sa primarnim ključem %(pk)r ne postoji."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Strani ključ (tip određuje referentno polje)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Relacija jedan na jedan"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Relacija više na više"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Držite „Control“, ili „Command“ na Mac-u da biste obeležili više od jedne "
 "stavke."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Ovo polje se mora popuniti."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Unesite ceo broj."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Unesite broj."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Ne sme biti ukupno više od %s cifara. Proverite."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Ne sme biti ukupno više od %s decimalnih mesta. Proverite."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Ne sme biti ukupno više od %s cifara pre zapete. Proverite."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Unesite ispravan datum."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Unesite ispravno vreme"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Unesite ispravan datum/vreme."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Fajl nije prebačen. Proverite tip enkodiranja formulara."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Fajl nije prebačen."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Prebačen fajl je prazan."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -653,11 +673,11 @@ msgstr ""
 "Naziv fajla mora da sadrži bar %(max)d slovnih mesta (trenutno ima "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Može se samo poslati fajl ili izbrisati, ne oba."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -665,36 +685,40 @@ msgstr ""
 "Prebacite ispravan fajl. Fajl koji je prebačen ili nije slika, ili je "
 "oštećen."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Unesite ispravan URL."
+
+#: 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 ""
 "%(value)s nije među ponuđenim vrednostima. Odaberite jednu od ponuđenih."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Unesite listu vrednosti."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Redosled"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Obriši"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Ispravite dupliran sadržaj za polja: %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Ispravite dupliran sadržaj za polja: %(field)s, koji mora da bude jedinstven."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -703,29 +727,29 @@ msgstr ""
 "Ispravite dupliran sadržaj za polja: %(field_name)s, koji mora da bude "
 "jedinstven za %(lookup)s u %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Ispravite duplirane vrednosti dole."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Strani ključ se nije poklopio sa instancom roditeljskog ključa."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Odabrana vrednost nije među ponuđenima. Odaberite jednu od ponuđenih."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "%s nije među ponuđenim vrednostima. Odaberite jednu od ponuđenih."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "„%s“ nije ispravna vrednost za primarni ključ."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -734,35 +758,35 @@ msgstr ""
 "Vreme %(datetime)s ne može se predstaviti u vremenskoj zoni "
 "%(current_timezone)s."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Trenutno"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Izmeni"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Očisti"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Da"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ne"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "da,ne,možda"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -770,52 +794,52 @@ msgstr[0] "%(size)d bajt"
 msgstr[1] "%(size)d bajta"
 msgstr[2] "%(size)d bajtova"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "po p."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "pre p."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "ponoć"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "podne"
 
@@ -1091,128 +1115,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Decembar"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ili"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "godina"
 msgstr[1] "godine"
 msgstr[2] "godina"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mesec"
 msgstr[1] "meseca"
 msgstr[2] "meseci"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "nedelja"
 msgstr[1] "nedelje"
 msgstr[2] "nedelja"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
 msgstr[1] "dana"
 msgstr[2] "dana"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
 msgstr[1] "sata"
 msgstr[2] "sati"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuta"
 msgstr[2] "minuta"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuta"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Indeksi direktorijuma nisu dozvoljeni ovde."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "„%(path)s“ ne postoji"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Indeks direktorijuma %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s je uspešno kreiran."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s je uspešno ažuriran."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s je obrisan."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Godina nije naznačena"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Mesec nije naznačen"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Dan nije naznačen"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Nedelja nije naznačena"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Nedostupni objekti %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1221,26 +1230,26 @@ msgstr ""
 "Opcija „future“ nije dostupna za „%(verbose_name_plural)s“ jer "
 "%(class_name)s.allow_future ima vrednost False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Neispravan datum „%(datestr)s“ dat formatu „%(format)s“"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Nijedan objekat klase %(verbose_name)s nije nađen datim upitom."
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Stranica nije poslednja, niti može biti konvertovana u tip int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Neisparavna stranica (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Prazna lista i „%(class_name)s.allow_empty“ ima vrednost False."
diff --git a/django/conf/locale/sr_Latn/formats.py b/django/conf/locale/sr_Latn/formats.py
index 227f20d723..8e9e9a487e 100644
--- a/django/conf/locale/sr_Latn/formats.py
+++ b/django/conf/locale/sr_Latn/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -24,15 +25,19 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y. %H:%M:%S',     # '25.10.2006. 14:30:59'
+    '%d.%m.%Y. %H:%M:%S.%f',  # '25.10.2006. 14:30:59.000200'
     '%d.%m.%Y. %H:%M',        # '25.10.2006. 14:30'
     '%d.%m.%Y.',              # '25.10.2006.'
     '%d.%m.%y. %H:%M:%S',     # '25.10.06. 14:30:59'
+    '%d.%m.%y. %H:%M:%S.%f',  # '25.10.06. 14:30:59.000200'
     '%d.%m.%y. %H:%M',        # '25.10.06. 14:30'
     '%d.%m.%y.',              # '25.10.06.'
     '%d. %m. %Y. %H:%M:%S',   # '25. 10. 2006. 14:30:59'
+    '%d. %m. %Y. %H:%M:%S.%f', # '25. 10. 2006. 14:30:59.000200'
     '%d. %m. %Y. %H:%M',      # '25. 10. 2006. 14:30'
     '%d. %m. %Y.',            # '25. 10. 2006.'
     '%d. %m. %y. %H:%M:%S',   # '25. 10. 06. 14:30:59'
+    '%d. %m. %y. %H:%M:%S.%f', # '25. 10. 06. 14:30:59.000200'
     '%d. %m. %y. %H:%M',      # '25. 10. 06. 14:30'
     '%d. %m. %y.',            # '25. 10. 06.'
 )
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index ddea0f5f04..06a6cbc2d8 100644
Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index a937905c93..cd525479a0 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -1,7 +1,8 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Andreas Pelme <andreas@pelme.se>, 2011, 2012.
+# Alex Nordlund <deep.alexander@gmail.com>, 2012.
+# Andreas Pelme <andreas@pelme.se>, 2011-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Mattias Jansson <mattias@colourandcode.se>, 2011.
 # Samuel Linde <samuel@linde.im>, 2011.
@@ -9,359 +10,379 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+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-06 08:47+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\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 "Arabiska"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbajdzjanska"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgariska"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Vitryska"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengaliska"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretonska"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Bosniska"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalanska"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Tjeckiska"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Walesiska"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danska"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Tyska"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Grekiska"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Engelska"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Brittisk engelska"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Spanska"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentinsk spanska"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mexikansk Spanska"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nicaraguansk spanska"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Spanska (Venezuela)"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estländska"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskiska"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Persiska"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Finska"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Franska"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisiska"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Irländska"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galisiska"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kroatiska"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Ungerska"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Indonesiska"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Isländska"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Italienska"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japanska"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgiska"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazakiska"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Koreanska"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Luxemburgiska"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Lettiska"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Lettiska"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonska"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Mongoliska"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norska (bokmål)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepali"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Holländska"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norska (nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Polska"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portugisiska"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brasiliensk portugisiska"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Rumänska"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Ryska"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovenska"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Albanska"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Serbiska"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbiska (latin)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Svenska"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamilska"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Thailändska"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Turkiska"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatariska"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurtiska"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukrainska"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamesiska"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Förenklad Kinesiska"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Traditionell Kinesiska"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Fyll i ett giltigt värde."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Denna URL verkar vara en trasig länk."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Fyll i en giltig URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Fyll i en giltig e-postadress."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Fyll i en giltig 'slug', beståendes av enbart bokstäver, siffror, "
 "understreck samt bindestreck."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Fyll i en giltig IPv4 adress."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Ange en giltig IPv6-adress."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Ange en giltig IPv4 eller IPv6-adress."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Fyll enbart i siffror separerade med kommatecken."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Kontrollera att detta värde är %(limit_value)s (det är %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Kontrollera att detta värde är mindre än eller lika med %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Kontrollera att detta värde är större än eller lika med %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -370,7 +391,7 @@ msgstr ""
 "Kontrollera att detta värde har minst %(limit_value)d tecken (det har "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -379,73 +400,73 @@ msgstr ""
 "Kontrollera att detta värde som mest har %(limit_value)d tecken (det har "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s måste vara unikt för %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "och"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 med detta %(field_label)s finns redan."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Värdet %r är inget giltigt alternativ."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Detta fält får inte vara null."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Detta fält får inte vara tomt."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Fält av typ: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Heltal"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "Värdet '%s' måste vara ett heltal."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Värdet '%s' måste vara antingen True eller False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolesk (antingen True eller False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Sträng (upp till %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Komma-separerade heltal"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Värdet '%s' har ett ogiltigt datumformat. Det måste vara i formatet YYYY-MM-"
 "DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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."
@@ -453,11 +474,11 @@ msgstr ""
 "Värdet '%s' har det giltiga formatet (YYYY-MM-DD) men det är ett ogiltigt "
 "datum."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Datum (utan tid)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -466,7 +487,7 @@ msgstr ""
 "Värdet '%s' har ett ogiltigt datumformat. Det måste vara i formatet YYYY-MM-"
 "DD HH:MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -475,79 +496,79 @@ msgstr ""
 "Värdet '%s' har det giltiga formatet (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
 "men det är ett ogiltigt datum/tid."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Datum (med tid)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Värdet '%s' måste vara ett decimaltal."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Decimaltal"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-postadress"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Sökväg till fil"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Värdet '%s' must vara ett flyttal."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Flyttal"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Stort (8 byte) heltal"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4-adress"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-adress"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Värdet '%s' måste vara antingen \"None\", True or False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolesk (antingen True, False eller None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Positivt heltal"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Positivt litet heltal"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (upp till %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Litet heltal"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Text"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -555,7 +576,7 @@ msgstr ""
 "Värdet '%s' har ett ogiltigt format. Det måste vara på formatet HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -564,110 +585,110 @@ msgstr ""
 "Värdet '%s' har det korrekta formatet (HH:MM[:ss[.uuuuuu]]) men är en "
 "ogiltig tid."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Tid"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Fil"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Bild"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Modell %(model)s med primärnyckel %(pk)r finns inte."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Främmande nyckel (typ bestäms av relaterat fält)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Ett-till-ett-samband"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Många-till-många-samband"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Håll ner \"Control\" eller \"Command\" på en Mac för att välja fler än en."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Detta fält måste fyllas i."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Fyll i ett heltal."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Fyll i ett tal."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Kontrollera att det inte finns mer än totalt %s siffror."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Kontrollera att det inte finns mer än %s decimaler."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Kontrollera att det inte finns mer än %s siffror före decimaltecknet."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Fyll i ett giltigt datum."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Fyll i en giltig tid."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Fyll i ett giltigt datum/tid."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Ingen fil skickades. Kontrollera kodningstypen i formuläret."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Ingen fil skickades."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Den skickade filen är tom."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "Kontrollera att detta värde har högst %(max)d tecken (det har %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Var vänlig antingen skicka en fil eller markera kryssrutan för att rensa, "
 "inte både och. "
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -675,36 +696,40 @@ msgstr ""
 "Ladda upp en giltig bild. Filen du laddade upp var antingen ingen bild eller "
 "en korrupt bild."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Fyll i en giltig URL."
+
+#: 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 ""
 "Välj ett giltigt alternativ. %(value)s finns inte bland tillgängliga "
 "alternativ."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Fyll i en lista med värden."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Sortering"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Radera"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Var vänlig korrigera duplikatdata för %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Var vänlig korrigera duplikatdata för %(field)s, som måste vara unik."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -713,34 +738,34 @@ msgstr ""
 "Var vänlig korrigera duplikatdata för %(field_name)s som måste vara unik för "
 "%(lookup)s i %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Vänligen korrigera duplikatvärdena nedan."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Den infogade främmande nyckeln matchade inte den överordnade instansens "
 "primära nyckel."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Välj ett giltigt alternativ. Det valet finns inte bland tillgängliga "
 "alternativ."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Välj ett giltigt alternativ. %s finns inte bland tillgängliga alternativ."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "En primärnyckel kan inte ha värde \"%s\""
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -749,87 +774,87 @@ msgstr ""
 "%(datetime)s kunde inte tolkas i tidszonen %(current_timezone)s; det kan "
 "vara en ogiltig eller tvetydigt tidpunkt"
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Nuvarande"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Ändra"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Rensa"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Okänt"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ja"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Nej"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ja,nej,kanske"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d byte"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "e.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "f.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "FM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "EM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "midnatt"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "middag"
 
@@ -1105,122 +1130,107 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "december"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "eller"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "år"
 msgstr[1] "år"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "månad"
 msgstr[1] "månader"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "vecka"
 msgstr[1] "veckor"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagar"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "timme"
 msgstr[1] "timmar"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "minuter"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Kataloglistningar är inte tillåtna här."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" finns inte"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Innehåll i %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s skapades."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s uppdaterades."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s togs bort."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Inget år angivet"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Ingen månad angiven"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Ingen dag angiven"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Ingen vecka angiven"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Inga %(verbose_name_plural)s är tillgängliga"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1229,26 +1239,26 @@ msgstr ""
 "Framtida %(verbose_name_plural)s är inte tillgängliga eftersom "
 "%(class_name)s.allow_future är False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Ogiltig datumsträng '%(datestr)s' med givet format '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Hittade inga %(verbose_name)s  som matchar frågan"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Sidan är inte 'last', och kan inte heller omvandlas till en int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ogiltig sida (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Ogiltig sida (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Tom lista och '%(class_name)s.allow_empty' är False."
diff --git a/django/conf/locale/sv/formats.py b/django/conf/locale/sv/formats.py
index 0f52c2c1a5..8874da7519 100644
--- a/django/conf/locale/sv/formats.py
+++ b/django/conf/locale/sv/formats.py
@@ -24,12 +24,15 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
     '%Y-%m-%d',              # '2006-10-25'
     '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
+    '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
     '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
     '%m/%d/%Y',              # '10/25/2006'
     '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
+    '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
     '%m/%d/%y',              # '10/25/06'
 )
diff --git a/django/conf/locale/sw/LC_MESSAGES/django.mo b/django/conf/locale/sw/LC_MESSAGES/django.mo
index 8a72a7bd1e..b30674d8ea 100644
Binary files a/django/conf/locale/sw/LC_MESSAGES/django.mo and b/django/conf/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sw/LC_MESSAGES/django.po b/django/conf/locale/sw/LC_MESSAGES/django.po
index fdb32eb828..ae2a804af2 100644
--- a/django/conf/locale/sw/LC_MESSAGES/django.po
+++ b/django/conf/locale/sw/LC_MESSAGES/django.po
@@ -5,533 +5,559 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+0100\n"
-"PO-Revision-Date: 2012-03-09 19:03+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Kiarabu"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Kiazerbaijani"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Kibulgaria"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Kibengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Kibosnia"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Kikatalani"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Kicheki"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
-msgstr ""
+msgstr "Kiweli"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Kideni"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Kijerumani"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Kigiriki"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Kiingereza"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Kiingereza cha Uingereza"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Kiesperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Kihispania"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Kihispania cha Argentina"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Kihispania cha Mexico"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Kihispania cha Nikaragua"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Kiestonia"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
-msgstr ""
+msgstr "Kibaskyue"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Kipershia"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Kifini"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Kifaransa"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
-msgstr ""
+msgstr "Kifrisi"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Kiairishi"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Kigalatia"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Kiyahudi"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Kihindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Kikroeshia"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
+msgstr "Kihangaria"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
 msgstr ""
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Kiindonesia"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
-msgstr ""
+msgstr "Kiaiselandi"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Kiitaliano"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Kijapani"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Kijiojia"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kizakhi"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
-msgstr ""
+msgstr "Kihema"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
-msgstr ""
+msgstr "Kikanada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Kikorea"
 
-#: conf/global_settings.py:87
-msgid "Lithuanian"
-msgstr ""
-
-#: conf/global_settings.py:88
-msgid "Latvian"
-msgstr "Kilatvia"
-
-#: conf/global_settings.py:89
-msgid "Macedonian"
-msgstr "Kimacedonia"
-
-#: conf/global_settings.py:90
-msgid "Malayalam"
-msgstr ""
-
-#: conf/global_settings.py:91
-msgid "Mongolian"
-msgstr "Kimongolia"
-
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
-msgstr ""
+msgid "Lithuanian"
+msgstr "Kilithuania"
 
 #: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "Kilatvia"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "Kimacedonia"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "Kimalayalam"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "Kimongolia"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "kibekmali cha Kinorwei"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr "Kinepali"
+
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Kidachi"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "Kinynorki cha Kinorwei"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Kipanjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Kipolishi"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Kireno"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Kireno cha Kibrazili"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Kiromania"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Kirusi"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Kislovakia"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Kislovenia"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Kialbania"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Kiserbia"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Kilatini cha Kiserbia"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Kiswidi"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Kiswahili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Kitamili"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
-msgstr ""
+msgstr "kitegulu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
-msgstr ""
+msgstr "Kithai"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Kituruki"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "Kitatari"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Kiukreni"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Kiurdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Kivietinamu"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Kichina Kilichorahisishwa"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
-msgstr "Kichina Asili"
+msgstr "Kichina Asilia"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Ingiza thamani halali"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL hii inaonekana kuwa ni kiungo kilichovunjika."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Ingiza URL halali."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Ingiza anuani halali ya baruapepe."
-
-#: core/validators.py:168 forms/fields.py:1023
-msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr "Ingiza slagi halali yenye herufi, namba, \"_\" au \"-\""
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Ingiza anuani halali ya IPV4"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Ingiza anuani halali ya IPV6"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Ingiza anuani halali za IPV4 au IPV6"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Ingiza tarakimu zilizotenganishwa kwa koma tu."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
+msgstr "Hakikisha thamani hii ni %(limit_value)s (ni %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Hakikisha thamani hii ni ndogo kuliko au sawa na %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Hakikisha thamani hii ni kubwa kuliko au sawa na %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
+"Hakikisha thamani hii ina angalao vibambo %(limit_value)d (ina "
+"%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
+"Hakikisha thamani hii ina si zaidi ya vibambo %(limit_value)d (ina "
+"%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
+msgstr "Ni lazima %(field_name)s kuwa pekee kwa  %(date_field)s %(lookup)s."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "na"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
+msgstr "Tayari kuna %(field_label)s kwa %(model_name)s nyingine."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Thamani %r si chaguo halali"
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
-msgstr "Sehemu hii haiwezi kuwa haina kitu."
+msgstr "Uga huu hauwezi kuwa hauna kitu."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
-msgstr "Sehemu hii haiwezi kuwa tupu"
+msgstr "Uga huu hauwezi kuwa mtupu"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Uga wa aina %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Inteja"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "thamani ya '%s' ni lazima iwe inteja."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "Thamani ya '%s' ni lazima iwe Kweli au Si Kweli."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Buleani (Aidha Kweli au Si kweli)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Tungo (hadi %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Inteja zilizotengwa kwa koma"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 "Thamani '%s' iko katika mfumo wa tarehe batili.Ni lazima kuwa katika mfumo "
 "wa MMMM-MM-TT "
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 "Thamani '%s' iko katika mfumo sahihi (MMMM-MM-TT) lakini ni tarehe batili."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Tarehe (bila ya muda)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
-"Thamani '%s' iko katika mfumo batili. Ni lazima kuwa katika mfumo MMMM-MM-"
-"TTSS:DD[:ss[.uuuuuu]][TZ]."
+"Thamani '%s' iko katika mfumo batili. Ni lazima kuwa katika mfumo HH:MM[:ss[."
+"uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
+"Thamani '%s' ina muundo sahihi (MMMM-MM-SS SS:DD[:ss[.uuuuuu]][TZ]) lakini "
+"ina muda au tarehe/muda batili."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Tarehe (pamoja na muda)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "Lazima thamani ya '%s' iwe namba ya desimali"
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Namba ya desimali"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Anwani ya barua pepe"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Anuani ya baruapepe"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Njia ya faili"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "Thamani ya '%s' ni lazima iwe floti."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
-msgstr ""
+msgstr "Namba ya `floating point`"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Inteja kubwa (baiti 8)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "anuani ya IPV4"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "anuani ya IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "Thamani ya '%s' ni lazima iwe aidha Hakuna, Kweli au Si Kweli."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Buleani (Aidha kweli, Si kweli au Hukuna)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Inteja chanya"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Inteja chanya ndogo"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slagi (hadi %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Inteja ndogo"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Maandishi"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -539,7 +565,7 @@ msgstr ""
 "Thamani '%s' iko katika mfumo batili. Ni lazima kuwa katika mfumo SS:DD[:ss[."
 "uuuuuu]]"
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -548,110 +574,110 @@ msgstr ""
 "Thamani '%s' iko katika mfumo halali (SS:DD[:ss[.uuuuuu]]) lakini ina muda "
 "batili."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Muda"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Faili"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Picha"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "Hakuna modeli %(model)s yenye pk %(pk)r."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "'Foreign Key' (aina inapatikana kwa uga unaohusiana)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
-msgstr ""
+msgstr "Uhusiano wa moja-kwa-moja"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Uhusiano wa vingi-kwa-vingi"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Shikilia chini \"Control\", au \"Command\" kwenye Mac, ili kuchagua zaidi ya "
 "moja. "
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Sehemu hii inahitajika"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Ingiza namba kamili"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Ingiza namba"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Hakikisha kuwa hakuna zaidi ya jumla ya tarakimu %s."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Hakikisha kuwa hakuna zaidi ya jumla ya nafasi %s za desimali."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Hakikisha kuwa hakuna zaidi ya tarakimu %s kabla ya nukta ya desimali."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Ingiza tarehe halali"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Ingiza muda halali"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Ingiza tarehe/muda halali"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Hakuna faili lililokusanywa. Angalia aina ya msimbo kwenye fomu."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Hakuna faili lililokusanywa."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Faili lililokusanywa ni tupu."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
-"Hakikisha jina la faili hili lina herufi zisizozidi %(max)d (lina "
+"Hakikisha jina la faili hili lina vibambo visivyozidi %(max)d (lina "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Tafadhali aidha kusanya faili au tiki kisanduku kilicho wazi, si yote."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -659,65 +685,71 @@ msgstr ""
 "Pakia picha halali. Faili ulilopakia lilikua aidha si picha au ni picha "
 "iliyopotoshwa."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Ingiza URL halali."
+
+#: 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 "Chagua chaguo halali. %(value)s si moja kati ya machaguo yaliyopo."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Ingiza orodha ya thamani"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Panga"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Futa"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Tafadhali rekebisha data zilizojirudia kwa %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Tafadhali rekebisha data zilizojirudia kwa %(field)s, zinazotakiwa kuwa za "
 "kipekee."
 
-#: forms/models.py:581
+#: 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 ""
+"Tafadhali sahihisha data zilizojirudia kwa %(field_name)s ,uga huu ni lazima "
+"kuwa wa pekee kwa %(lookup)s katika %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Tafadhali sahihisha thamani zilizojirudia hapo chini."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "`Inline foreign key` haijafanana tukio la `primary key` mama."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Chagua chaguo halali. Chaguo hilo si moja kati ya chaguzi halali"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Chagua chaguo halali. %s si moja kati machaguo yaliyopo."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" ni thamani batili kwa `primary key`."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -726,87 +758,87 @@ msgstr ""
 "Imeshindikana kufasiri %(datetime)s katika majira ya %(current_timezone)s;"
 "Inawezekana kuwa kuna utata au kiti hichi hakipo."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Kwa sasa"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Badili"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Safisha"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Haijulikani"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Ndiyo"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Hapana"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ndiyo,hapana,labda"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "baiti %(size)d"
 msgstr[1] "baiti %(size)d"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "KB %s"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "MB %s"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "GB %s"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "TB %s"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "PB %s"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
-msgstr ""
+msgstr "p.m"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
-msgstr ""
+msgstr "a.m"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
-msgstr ""
+msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
-msgstr ""
+msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "usiku wa manane"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "mchana"
 
@@ -1082,148 +1114,135 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Disemba"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "au"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
-msgstr ","
+msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "mwaka"
 msgstr[1] "miaka"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mwezi"
 msgstr[1] "miezi"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "wiki"
 msgstr[1] "wiki"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "siku"
 msgstr[1] "siku"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "saa"
 msgstr[1] "saa"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "dakika"
 msgstr[1] "dakika"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "dakika"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
-msgstr ""
+msgstr "%(type)s %(number)d"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(type)s %(number)d"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Sahirisi za saraka haziruhusiwi hapa."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" haipo"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "Sahirisi ya %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Uundaji wa %(verbose_name)s umefanikiwa"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Kusasisha %(verbose_name)s kumefanikiwa."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Kufuta %(verbose_name)s kumefanikiwa."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Hakuna mwaka maalum uliotajwa"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Hakuna mwezi maalum uliotajwa"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Hakuna siku maalum iliyitajwa"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Hakuna wiki maalum iliyotajwa"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Hakujapatikana %(verbose_name_plural)s"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
+"%(verbose_name_plural)s kutoka wakati ujao haiwezekani  kwani `"
+"%(class_name)s.allow_future` ni `False`."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "Tungo batili ya tarehe '%(datestr)s' muundo ni '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "hakuna %(verbose_name)s kulingana na ulizo"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Ukurasa huu si 'mwisho', na wala hauwezi kubadilishwa kuwa int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ukurasa batili (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Orodha tupu na '%(class_name)s.allow_empty'.ni 'False'."
diff --git a/django/conf/locale/ta/LC_MESSAGES/django.mo b/django/conf/locale/ta/LC_MESSAGES/django.mo
index d6e4e28ad3..1913bcadc0 100644
Binary files a/django/conf/locale/ta/LC_MESSAGES/django.mo and b/django/conf/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ta/LC_MESSAGES/django.po b/django/conf/locale/ta/LC_MESSAGES/django.po
index 83257b5811..635a6b79e0 100644
--- a/django/conf/locale/ta/LC_MESSAGES/django.po
+++ b/django/conf/locale/ta/LC_MESSAGES/django.po
@@ -6,642 +6,662 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+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: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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
-msgid "Bengali"
-msgstr "பெங்காலி"
-
 #: conf/global_settings.py:52
-msgid "Bosnian"
+msgid "Belarusian"
 msgstr ""
 
 #: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "பெங்காலி"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr ""
+
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "செக்"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "வெல்ஸ்"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "டேனிஷ்"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "ஜெர்மன்"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "கிரேக்கம்"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "ஆங்கிலம்"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr ""
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "ஸ்பானிஷ்"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr ""
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr ""
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr ""
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr ""
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr ""
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "பீனீஷ்"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ப்ரென்சு"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr ""
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr ""
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "கலீஷீயன்"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ஹீப்ரு"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr ""
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr ""
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ஹங்கேரியன்"
 
-#: conf/global_settings.py:78
-msgid "Indonesian"
-msgstr ""
-
-#: conf/global_settings.py:79
-msgid "Icelandic"
-msgstr "ஐஸ்லான்டிக்"
-
-#: conf/global_settings.py:80
-msgid "Italian"
-msgstr "இத்தாலியன்"
-
-#: conf/global_settings.py:81
-msgid "Japanese"
-msgstr "ஜப்பானிய"
-
 #: conf/global_settings.py:82
-msgid "Georgian"
+msgid "Interlingua"
 msgstr ""
 
 #: conf/global_settings.py:83
-msgid "Kazakh"
+msgid "Indonesian"
 msgstr ""
 
 #: conf/global_settings.py:84
-msgid "Khmer"
-msgstr ""
+msgid "Icelandic"
+msgstr "ஐஸ்லான்டிக்"
 
 #: conf/global_settings.py:85
-msgid "Kannada"
-msgstr ""
+msgid "Italian"
+msgstr "இத்தாலியன்"
 
 #: conf/global_settings.py:86
-msgid "Korean"
-msgstr ""
+msgid "Japanese"
+msgstr "ஜப்பானிய"
 
 #: conf/global_settings.py:87
-msgid "Lithuanian"
+msgid "Georgian"
 msgstr ""
 
 #: conf/global_settings.py:88
-msgid "Latvian"
+msgid "Kazakh"
 msgstr ""
 
 #: conf/global_settings.py:89
-msgid "Macedonian"
+msgid "Khmer"
 msgstr ""
 
 #: conf/global_settings.py:90
-msgid "Malayalam"
+msgid "Kannada"
 msgstr ""
 
 #: conf/global_settings.py:91
-msgid "Mongolian"
+msgid "Korean"
 msgstr ""
 
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
+msgid "Lithuanian"
 msgstr ""
 
 #: conf/global_settings.py:94
-msgid "Dutch"
-msgstr "டச்சு"
+msgid "Latvian"
+msgstr ""
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
+msgid "Macedonian"
 msgstr ""
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
+msgid "Malayalam"
 msgstr ""
 
 #: conf/global_settings.py:97
-msgid "Polish"
+msgid "Mongolian"
 msgstr ""
 
 #: conf/global_settings.py:98
-msgid "Portuguese"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: conf/global_settings.py:99
-msgid "Brazilian Portuguese"
+msgid "Nepali"
 msgstr ""
 
 #: conf/global_settings.py:100
-msgid "Romanian"
-msgstr "ரோமானியன்"
+msgid "Dutch"
+msgstr "டச்சு"
 
 #: conf/global_settings.py:101
-msgid "Russian"
-msgstr "ரஷ்யன்"
+msgid "Norwegian Nynorsk"
+msgstr ""
 
 #: conf/global_settings.py:102
-msgid "Slovak"
-msgstr "சுலோவாக்"
+msgid "Punjabi"
+msgstr ""
 
 #: conf/global_settings.py:103
-msgid "Slovenian"
-msgstr "ஸ்லோவேனியன்"
+msgid "Polish"
+msgstr ""
 
 #: conf/global_settings.py:104
-msgid "Albanian"
+msgid "Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:105
-msgid "Serbian"
-msgstr "செர்பியன்"
+msgid "Brazilian Portuguese"
+msgstr ""
 
 #: conf/global_settings.py:106
-msgid "Serbian Latin"
-msgstr ""
+msgid "Romanian"
+msgstr "ரோமானியன்"
 
 #: conf/global_settings.py:107
-msgid "Swedish"
-msgstr "சுவிடிஷ்"
+msgid "Russian"
+msgstr "ரஷ்யன்"
 
 #: conf/global_settings.py:108
-msgid "Swahili"
-msgstr ""
+msgid "Slovak"
+msgstr "சுலோவாக்"
 
 #: conf/global_settings.py:109
-msgid "Tamil"
-msgstr "தமிழ்"
+msgid "Slovenian"
+msgstr "ஸ்லோவேனியன்"
 
 #: conf/global_settings.py:110
-msgid "Telugu"
+msgid "Albanian"
 msgstr ""
 
 #: conf/global_settings.py:111
-msgid "Thai"
-msgstr ""
+msgid "Serbian"
+msgstr "செர்பியன்"
 
 #: conf/global_settings.py:112
-msgid "Turkish"
-msgstr "துருக்கிஷ்"
+msgid "Serbian Latin"
+msgstr ""
 
 #: conf/global_settings.py:113
-msgid "Tatar"
-msgstr ""
+msgid "Swedish"
+msgstr "சுவிடிஷ்"
 
 #: conf/global_settings.py:114
-msgid "Ukrainian"
-msgstr "உக்ரேனியன்"
-
-#: conf/global_settings.py:115
-msgid "Urdu"
+msgid "Swahili"
 msgstr ""
 
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "தமிழ்"
+
 #: conf/global_settings.py:116
-msgid "Vietnamese"
+msgid "Telugu"
 msgstr ""
 
 #: conf/global_settings.py:117
+msgid "Thai"
+msgstr ""
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "துருக்கிஷ்"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "உக்ரேனியன்"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "எளிய சீன மொழி"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "மரபு சீன மொழி"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr ""
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr ""
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "முறையான e முகவரிகள் மட்டும் எழுதவும்"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "இங்கு எண்களை மட்டுமே எழுதவும் காமவாள் தனிமைபடுத்தவும் "
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "மற்றும்"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "இந்த புலம் காலியாக இருக்கக் கூடாது"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "முழு எண்"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "பூலியன் (சரி அல்லது தவறு)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "கமாவாள் பிரிக்கப்பட்ட முழு எண்"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "தேதி (நேரமில்லாமல்)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "தேதி (நேரமுடன்)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "தசம எண்கள்"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "மின் அஞ்சல்"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr ""
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "கோப்புப் பாதை"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP விலாசம்"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "இலக்கு முறை (சரி, தவறு அல்லது ஒன்றும் இல்லை)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "உரை"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "நேரம்"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Mac இல், ஒன்றுக்கு மேற்பட்டவற்றை தேர்வு செய்ய \"Control\" அல்லது \"Command\" ஐ "
 "அழுத்தவும்"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "இந்த  புலத்தில் மதிப்பு தேவை"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "முழு எண் மட்டுமே எழுதவும்"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr ""
 
-#: forms/fields.py:264
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
-
 #: forms/fields.py:265
 #, python-format
-msgid "Ensure that there are no more than %s decimal places."
+msgid "Ensure that there are no more than %s digits in total."
 msgstr ""
 
 #: forms/fields.py:266
 #, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr ""
+
+#: forms/fields.py:267
+#, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "அந்த பக்கத்தின் encoding வகையைப் பரிசோதிக்க.கோப்பு சமர்பிக்கப் பட்டவில்லை "
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "சமர்பிக்கப் பட்ட கோப்புக் காலியாக உள்ளது"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -649,150 +669,154 @@ msgstr ""
 "முறையான படம் மட்டுமே பதிவேற்றம் செய்யவும். நீங்கள் பதிவேற்றம் செய்த கோப்பு படம் அள்ளாத "
 "அல்லது கெட்டுப்போன கோப்பாகும்"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr ""
+
+#: 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 ""
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:581
+#: 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 ""
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "மாற்றுக"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "ஆம்"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "இல்லை"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ஆம், இல்லை, இருக்கலாம்"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr ""
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr ""
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr ""
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr ""
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr ""
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr ""
 
@@ -1068,148 +1092,133 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "டிசம்பர்"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "வருடம்"
 msgstr[1] "வருடங்கள்"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "மாதம்"
 msgstr[1] "மாதங்கள்"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "வாரம்"
 msgstr[1] "வாரங்கள்"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "நாள்"
 msgstr[1] "நாட்கள்"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "மணி"
 msgstr[1] "மணி"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "நிமிடம்"
 msgstr[1] "நிமிடங்கள்"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "நிமிடங்கள்"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr ""
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ""
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s வெற்றிகரமாக சேர்க்கப்பட்டு விட்டது"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s வெற்றிகரமாக மாற்றபட்டு விட்டது"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s நீக்கப்பட்டுள்ளது"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/ta/formats.py b/django/conf/locale/ta/formats.py
index c03fb20183..1c08f17501 100644
--- a/django/conf/locale/ta/formats.py
+++ b/django/conf/locale/ta/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/te/LC_MESSAGES/django.mo b/django/conf/locale/te/LC_MESSAGES/django.mo
index effbdb2d94..86a3704a3e 100644
Binary files a/django/conf/locale/te/LC_MESSAGES/django.mo and b/django/conf/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/te/LC_MESSAGES/django.po b/django/conf/locale/te/LC_MESSAGES/django.po
index 394c933929..c7125601a6 100644
--- a/django/conf/locale/te/LC_MESSAGES/django.po
+++ b/django/conf/locale/te/LC_MESSAGES/django.po
@@ -8,356 +8,376 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+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: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "బెంగాలీ"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "బోస్నియన్"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "కాటలాన్"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "ఛెక్"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "వెల్ష్"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "డానిష్"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "జెర్మన్"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "గ్రీక్"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "ఆంగ్లం"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "బ్రిటీష్ ఆంగ్లం"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "స్పానిష్"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "అర్జెంటీనా స్పానిష్"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "మెక్షికన్  స్పానిష్ "
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "ఎస్టొనియన్"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "బాస్క్"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "పారసీ"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "ఫీన్నిష్"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ఫ్రెంచ్"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "ఫ్రిసియన్"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ఐరిష్"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "గలిసియన్"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "హీబ్రూ"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "హిందీ"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "క్రొయేషియన్"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "హంగేరియన్"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "ఇండోనేషియన్"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "ఐస్లాండిక్"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "ఇటాలియవ్"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "జపనీ"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "జార్జియన్"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "ఖ్మెర్"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "కన్నడ"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "కొరియన్"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "లిథుయేనియన్"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "లాత్వియన్"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "మెసిడోనియన్"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "మలయాళం"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "మంగోలియన్"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "నోర్వేగియన్ బొక్మల్ "
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "డచ్"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "నోర్వేగియన్ న్య్నోర్స్క్ "
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "పంజాబీ"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "పొలిష్"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "పోర్చుగీస్"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "బ్రజీలియన్  పోర్చుగీస్"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "రొమానియన్"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "రష్యన్"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "స్లొవాక్"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "స్లొవానియన్"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "అల్బేనియన్"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "సెర్బియన్"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "సెర్బియన్ లాటిన్"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "స్వీడిష్"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "తమిళం"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "తెలుగు"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "థాయి"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "టర్కిష్"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ఉక్రేనియన్"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "ఉర్దూ"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "వియెత్నామీ"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "సరళ చైనీ"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "సాంప్రదాయ  చైనీ"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "సరైన విలువని ఇవ్వండి."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "సరైన URL ఇవ్వండి."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "సరైన ఈమెయిలు చిరునామాను ఇవ్వండి."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "దయచేసి సరైన IPv4 అడ్రస్ ఇవ్వండి"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "కామాల తో అంకెలు విడడీసి ఇవ్వండి "
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "దయచేసి దీని విలువ %(limit_value)s కు సమానముగా లేక తక్కువగా ఉండేట్లు చూసుకొనుము."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "దయచేసి దీని విలువ %(limit_value)s కు సమానముగా లేక ఎక్కువగా ఉండేట్లు చూసుకొనుము."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -366,7 +386,7 @@ msgstr ""
 "దయచేసి ఈ విలువ యొక్క పొడువు కనీసం %(limit_value)d అక్షరములు ఉండేట్లు చూసుకొనుము. ( మీరు "
 "సమర్పించిన విలువ లో %(show_value)d అక్షరములు వున్నవి )"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -375,428 +395,432 @@ msgstr ""
 "దయచేసి ఈ విలువ యొక్క పొడువు %(limit_value)d అక్షరములు మాత్రమే ఉండేట్లు చూసుకొనుము. (మీరు "
 "సమర్పించిన విలువ లో %(show_value)d అక్షరములు వున్నవి )"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "మరియు"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 ""
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "ఈ ఫీల్డ్ కాళీగా ఉందకూడడు      "
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "ఈ ఖాళీని తప్పనిసరిగా పూరించాలి"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "పూర్ణసంఖ్య"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "బూలియన్ (అవునా లేక కాదా)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "పదబంధం (గరిష్ఠం %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "కామా  తో విడడీసిన  సంఖ్య"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "తేదీ (సమయం లేకుండా)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "తేది (సమయం తో)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "దశగణసంఖ్య"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "ఇటపా"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "ఈమెయిలు చిరునామా"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "ఫైల్   పాత్"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "ఐపీ చిరునామా"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "పాఠ్యం"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "సమయం"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "\"Control\" కాని  \"Command\" మాక్ లో  నొక్కి ఉంచండి  , ఒకటి కన్న ఎక్కువ ఎన్నుకోవటానికి"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "ఈ ఫీల్డ్ అవసరము"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "పూర్ణ సంఖ్య ఇవ్వండి"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "దయచేసి పూర్ణ సంఖ్య ఇవ్వండి"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr ""
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr ""
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "దయచేసి సరైన తేది ఇవ్వండి."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "దయచేసి సరైన సమయం ఇవ్వండి."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "దయచేసి సరైన తెది/సమయం ఇవ్వండి."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "ఫైలు సమర్పించబడలేదు."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "మీరు సమర్పించిన  ఫైల్ కాళీగా ఉంది "
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "సరైన URL ఇవ్వండి."
+
+#: 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 ""
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "సరైన విలువల జాబితాను ఇవ్వండి."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "అంతరము"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "దయచేసి %(field)s యొక్క నకలు విలువను సరిదిద్దుకోండి."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "దయచేసి %(field)s యొక్క నకలు విలువను సరిదిద్దుకోండి. దీని విలువ అద్వితీయమయినది "
 
-#: forms/models.py:581
+#: 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 ""
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "దయచేసి క్రింద ఉన్న నకలు విలువను సరిదిద్దుకోండి."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "ప్రస్తుతము "
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "మార్చు"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "తెలియనది"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "అవును"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "కాదు"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "అవును, కాదు , ఏమొ"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d బైటు"
 msgstr[1] "%(size)d బైట్లు"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s కిబై"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s మెబై"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s గిబై"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "అర్ధరాత్రి"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "మధ్యాహ్నం"
 
@@ -1072,148 +1096,133 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "డిసెంబర్"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "లేదా"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "సంవత్సరం"
 msgstr[1] "సంవత్సరాలు"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "నెల"
 msgstr[1] "నెలలు"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "వారం"
 msgstr[1] "వారాలు"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "రోజు"
 msgstr[1] "రోజులు"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "గంట"
 msgstr[1] "గంటలు"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "నిమిషం"
 msgstr[1] "నిమిషాలు"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "నిమిషాలు"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s జయప్రదంగా తయారయింది"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s జయప్రదంగా  @@"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s తీసివేయబడినది"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/te/formats.py b/django/conf/locale/te/formats.py
index 173b60bfba..02399d6c1b 100644
--- a/django/conf/locale/te/formats.py
+++ b/django/conf/locale/te/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/th/LC_MESSAGES/django.mo b/django/conf/locale/th/LC_MESSAGES/django.mo
index 2af63d32ea..da0196ae47 100644
Binary files a/django/conf/locale/th/LC_MESSAGES/django.mo and b/django/conf/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/th/LC_MESSAGES/django.po b/django/conf/locale/th/LC_MESSAGES/django.po
index 4943718e99..a4a106aa18 100644
--- a/django/conf/locale/th/LC_MESSAGES/django.po
+++ b/django/conf/locale/th/LC_MESSAGES/django.po
@@ -2,360 +2,381 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Kowit Charoenratchatabhan <kowito@gmail.com>, 2012.
+# Kowit Charoenratchatabhan <kowito@gmail.com>, 2012-2013.
 # Suteepat Damrongyingsupab <monkeycrew_topza@hotmail.com>, 2011, 2012.
+# Vichai Vongvorakul <vongvichai@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+0100\n"
-"PO-Revision-Date: 2012-03-09 03:28+0000\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-03-04 22:30+0000\n"
+"Last-Translator: Kowit Charoenratchatabhan <kowit.s.c@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\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 "เบลารุส"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "เบ็งกาลี"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "เบรตัน"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "บอสเนีย"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "คาตะลาน"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "เช็ก"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "เวลส์"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "เดนมาร์ก"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "เยอรมัน"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "กรีก"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "อังกฤษ"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "อังกฤษ - สหราชอาณาจักร"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "เอสเปรันโต"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "สเปน"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "สเปน - อาร์เจนติน่า"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "เม็กซิกันสเปน"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "นิการากัวสเปน"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "เวเนซุเอลาสเปน"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "เอสโตเนีย"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "แบ็ซค์"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "เปอร์เชีย"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "ฟินแลนด์"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "ฝรั่งเศส"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "ฟริเซียน"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "ไอริช"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "กาลิเซีย"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "ฮีบรู"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "ฮินดี"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "โครเอเชีย"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ฮังการี"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "ภาษากลาง"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "อินโดนิเซีย"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "ไอซ์แลนด์"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "อิตาลี"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "ญี่ปุ่น"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "จอร์เจีย"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "คาซัค"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "เขมร"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "กัณณาท"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "เกาหลี"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "ลักแซมเบิร์ก"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "ลิทัวเนีย"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "ลัตเวีย"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "มาซิโดเนีย"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "มลายู"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "มองโกเลีย"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "นอร์เวย์ - Bokmal"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "เนปาล"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "ดัตช์"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "นอร์เวย์ - Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "ปัญจาบี"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "โปแลนด์"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "โปรตุเกส"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "โปรตุเกส (บราซิล)"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "โรมาเนีย"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "รัสเซีย"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "สโลวัก"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "สโลวีเนีย"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "อัลแบเนีย"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "เซอร์เบีย"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "เซอร์เบียละติน"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "สวีเดน"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "สวาฮีลี"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "ทมิฬ"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "เตลุคู"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "ไทย"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "ตุรกี"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "ตาตาร์"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "อัดเมิร์ท"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "ยูเครน"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "เออร์ดู"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "เวียดนาม"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "จีนตัวย่อ"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "จีนตัวเต็ม"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "กรุณาใส่ค่าที่ถูกต้อง"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL อาจจะเป็นลิ้งค์ที่เสียหาย."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "ป้อนที่อยู่อีเมลที่ถูกต้อง"
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "ใส่ URL ที่ถูกต้อง"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "กรุณาใส่อีเมลที่ถูกต้อง"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "ใส่ 'slug' ประกอปด้วย ตัวหนังสือ ตัวเลข เครื่องหมายขีดล่าง หรือ  เครื่องหมายขีด"
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "กรุณาใส่หมายเลขไอพีที่ถูกต้อง"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "กรอก IPv6 address ให้ถูกต้อง"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "กรอก IPv4 หรือ IPv6 address ให้ถูกต้อง"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "ใส่ตัวเลขที่คั่นด้วยจุลภาคเท่านั้น"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "ค่านี้ต้องน้อยกว่าหรือเท่ากับ %(limit_value)s"
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "ค่านี้ต้องมากกว่าหรือเท่ากับ %(limit_value)s"
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -363,88 +384,88 @@ msgid ""
 msgstr ""
 "ค่านี้ต้องมีอย่างน้อย %(limit_value)d ตัวอักษร (ปัจจุบันมีจำนวน %(show_value)d ตัวอักษร)"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr "ค่านี้มีได้ไม่เกิน %(limit_value)d ตัวอักษร (ปัจจุบันมีจำนวน %(show_value)d ตัวอักษร)"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "และ"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 และ %(field_label)s มีอยู่แล้ว"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "ค่า %r ไม่ถูกต้อง"
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "ฟิลด์นี้ไม่สารถปล่อยว่างได้"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "ฟิลด์นี้เว้นว่างไม่ได้"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "ฟิลด์ข้อมูล: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "จำนวนเต็ม"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "ค่าของ '%s' ต้องเป็น integer"
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "ค่าของ '%s' ต้องเป็น True หรือ False อย่างใดอย่างหนึ่ง"
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "ตรรกะแบบบูลหมายถึง ค่า\"จริง\" (True) หรือ \"ไม่จริง \" (False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "สตริง(ได้ถึง %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "จำนวนเต็มแบบมีจุลภาค"
 
-#: db/models/fields/__init__.py:647
+#: 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' มีรูปแบบไม่ถูกต้อง แต่ควรจะอยู่ในรูปแบบ YYYY-MM-DD"
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' อยู่ในรูปแบบที่ถูกต้อง (YYYY-MM-DD) แต่เลขวันที่ผิด"
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "วันที่ (ไม่มีเวลา)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -452,7 +473,7 @@ msgid ""
 msgstr ""
 "ค่าของ '%s' มีรูปแบบไม่ถูกต้อง แต่ควรจะอยู่ในรูปแบบ YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]"
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -461,225 +482,229 @@ msgstr ""
 "ค่าของ '%s' อยู่ในรูปแบบที่ถูกต้อง (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) แต่ วันที่/เวลา "
 "ผิด"
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "วันที่ (พร้อมด้วยเวลา)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "ค่าของ '%s' ต้องเป็นตัวเลขฐานสิบ"
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "เลขฐานสิบหรือเลขทศนิยม"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "ที่อยู่อีเมล"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "อีเมล"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "ตำแหน่งไฟล์"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "ค่าของ '%s' ต้องเป็นตัวเลขที่มีจุดทศนิยม"
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "เลขทศนิยม"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "จำนวนเต็ม (8 byte)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 address"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "หมายเลขไอพี"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "ค่าของ '%s' ต้องเป็น None หรือ True หรือ False อย่างใดอย่างหนึ่ง"
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 "ตรรกะแบบบูลหมายถึง ค่า\"จริง\" (True) หรือ \"ไม่จริง \" (False) หรือ \"ไม่มี\" (None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "จํานวนเต็มบวก"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "จํานวนเต็มบวกขนาดเล็ก"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (ถึง %(max_length)s )"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "จำนวนเต็มขนาดเล็ก"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "ข้อความ"
 
-#: db/models/fields/__init__.py:1180
+#: 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' มีรูปแบบไม่ถูกต้อง แต่ควรจะอยู่ในรูปแบบ HH:MM[:ss[.uuuuuu]]"
 
-#: db/models/fields/__init__.py:1182
+#: 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' อยู่ในรูปแบบที่ถูกต้อง (HH:MM[:ss[.uuuuuu]]) แต่เวลาผิด"
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "เวลา"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "ไฟล์"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "รูปภาพ"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Primary key %(pk)r ของโมเดล %(model)s ไม่มีอยู่จริง"
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Foreign Key (ชนิดของข้อมูลจะถูกกำหนดจากฟิลด์ที่เกี่ยวข้อง)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "ความสัมพันธ์แบบหนึ่งต่อหนึ่ง"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "ความสัมพันธ์แบบ many-to-many"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "กดปุ่ม \"Control\", หรือ \"Command\" บน Mac ค้างไว้, เพื่อเลือกหลายๆตัวเลือก"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "ฟิลด์นี้จำเป็น"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "กรอกหมายเลข"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "กรอกหมายเลข"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s หลัก."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "แน่ใจว่ารวมแล้วเป็นทศนิยมไม่เกิน %s หลัก."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s หลัก ก่อนจุดทศนิยม."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "กรุณาใส่วัน"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "กรุณาใส่เวลา"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "กรุณาใส่วันเวลา"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "ไม่มีไฟล์ใดถูกส่ง. ตรวจสอบ encoding type ในฟอร์ม."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "ไม่มีไฟล์ใดถูกส่ง"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "ไฟล์ที่ส่งว่างเปล่า"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr "ชื่อไฟล์มีความยาวได้ไม่เกิน %(max)d ตัวอักษร (ปัจจุบันมี %(length)d ตัวอักษร)"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "โปรดเลือกไฟล์หรือติ๊ก clear checkbox อย่างใดอย่างหนึ่ง"
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "อัพโหลดรูปที่ถูกต้อง. ไฟล์ที่อัพโหลดไปไม่ใช่รูป หรือรูปเสียหาย."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "ใส่ URL ที่ถูกต้อง"
+
+#: 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 "เลือกตัวเลือกที่ถูกต้อง. %(value)s ไม่ใช่ตัวเลือกที่ใช้ได้."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "ใส่รายการ"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "เรียงลำดับ"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "ลบ"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "โปรดแก้ไขข้อมูลที่ซ้ำซ้อนใน %(field)s"
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "โปรดแก้ไขข้อมูลที่ซ้ำซ้อนใน %(field)s ซึ่งจะต้องไม่ซ้ำกัน"
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -688,29 +713,29 @@ msgstr ""
 "โปรดแก้ไขข้อมูลซ้ำซ้อนใน %(field_name)s ซึ่งจะต้องไม่ซ้ำกันสำหรับ %(lookup)s ใน "
 "%(date_field)s"
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "โปรดแก้ไขค่าที่ซ้ำซ้อนด้านล่าง"
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Foreign key ไม่สัมพันธ์กับ parent primary key"
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "เลือกตัวเลือกที่ถูกต้อง. ตัวเลือกนั้นไม่สามารถเลือกได้."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "เลือกตัวเลือกที่ถูกต้อง. %s ไม่สามารถเลือกได้"
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" ใช้เป็น primary key ไม่ได้"
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -719,86 +744,86 @@ msgstr ""
 "%(datetime)s ไม่สามารถแปลงให้อยู่ใน %(current_timezone)s time zone ได้ เนื่องจาก "
 "time zone ไม่ชัดเจน หรือไม่มีอยู่จริง"
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "ปัจจุบัน"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "เปลี่ยนแปลง"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "ล้าง"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "ไม่รู้"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "ใช่"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "ไม่ใช่"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ใช่,ไม่ใช่,อาจจะ"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d ไบต์"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "เที่ยงคืน"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "เที่ยงวัน"
 
@@ -1074,116 +1099,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "ธันวาคม"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "หรือ"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ปี"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "เดือน"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "สัปดาห์"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "วัน"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ชั่วโมง"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "นาที"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "นาที"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "ไม่ได้รับอนุญาตให้ใช้ Directory indexes ที่นี่"
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" ไม่มีอยู่"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "ดัชนีของ %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s ได้ถูกสร้างเรียบร้อยแล้ว"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s ได้ถูกปรับปรุงเรียบร้อยแล้ว"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s ได้ถูกลบเรียบร้อยแล้ว"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "ไม่ระบุปี"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "ไม่ระบุเดือน"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "ไม่ระบุวัน"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "ไม่ระบุสัปดาห์"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "ไม่มี %(verbose_name_plural)s ที่ใช้ได้"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1192,26 +1202,26 @@ msgstr ""
 "%(verbose_name_plural)s ในอนาคตไม่สามารถใช้ได้ เนื่องจาก %(class_name)s."
 "allow_future มีค่าเป็น False"
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "สตริงค์ '%(datestr)s' ของวันไม่ถูกต้องกับฟอร์แมต '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "ไม่พบ %(verbose_name)s จาก query"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "ไม่ใช่หน้าสุดท้าย และไม่สามารถค่าแปลงเป็น int ได้"
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "เลขหน้าผิด (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "หน้าไม่ถูกต้อง (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "list ว่างเปล่า และ '%(class_name)s.allow_empty' มีค่าเป็น False"
diff --git a/django/conf/locale/th/formats.py b/django/conf/locale/th/formats.py
index aa43108a40..7847a7c251 100644
--- a/django/conf/locale/th/formats.py
+++ b/django/conf/locale/th/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/tr/LC_MESSAGES/django.mo b/django/conf/locale/tr/LC_MESSAGES/django.mo
index 4e3f36a900..c40c5c42f3 100644
Binary files a/django/conf/locale/tr/LC_MESSAGES/django.mo and b/django/conf/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/tr/LC_MESSAGES/django.po b/django/conf/locale/tr/LC_MESSAGES/django.po
index a5f2d8b046..ae6c3f77df 100644
--- a/django/conf/locale/tr/LC_MESSAGES/django.po
+++ b/django/conf/locale/tr/LC_MESSAGES/django.po
@@ -1,367 +1,390 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Caner Başaran <basaran.caner@gmail.com>, 2012.
 #   <cihadgundogdu@gmail.com>, 2012.
+# Gökmen Görgen <gokmen@alageek.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Metin Amiroff <amiroff@gmail.com>, 2011.
+# Mesut Can Gürle <mesutcang@gmail.com>, 2013.
+# Metin Amiroff <amiroff@gmail.com>, 2011-2012.
 # Murat Çorlu <muratcorlu@gmail.com>, 2012.
 # Murat Sahin <martinamca@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+0100\n"
-"PO-Revision-Date: 2012-03-08 19:45+0000\n"
-"Last-Translator: Murat Çorlu <muratcorlu@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-24 17:10+0000\n"
+"Last-Translator: Gökmen Görgen <gokmen@alageek.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Güney Afrika Hollanda Lehçesi"
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Arapça"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerice"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Bulgarca"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Beyaz Rusça"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengali Dili"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Bretonca"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Boşnakça"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Katalanca"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Çekçe"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Galce"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Danca"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Almanca"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Yunanca"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "İngilizce"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "İngiltere İngilizce"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "İspanyolca"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Arjantin İspanyolcası"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Meksika İspanyolcası"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Nikaragua İspanyolcası"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Venezüella İspanyolcası"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Estonca"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Baskça"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Farsça"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Fince"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Fransızca"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Frisce"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "İrlandaca"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Galler Dili"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Hinduca"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Hırvatça"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Macarca"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Interlingua"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Endonezce"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "İzlanda dili"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Japonca"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Gürcüce"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazakça"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Kamboçyaca"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Kannada Dili"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Korece"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Lüksemburgca"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Litovca"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Leton Dili"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Makedonca"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Malayamca"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Moğolca"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Norveçce (Bokmal)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Nepalce"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Flamanca"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Norveçce (Nynorsk)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabice"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Lehçe"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Portekizce"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brezilya Portekizcesi"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Romence"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Rusça"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Slovakça"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Slovence"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Arnavutça"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Sırpça"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Sırp Latini"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "İsveççe"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Svahili Dili"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tamilce"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu Dili"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tayca"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Tatarca"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Udmurtça"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Ukraynaca"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urduca"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Vietnamca"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Basiteştirilmiş Çince"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Geleneksel Çince"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Geçerli bir değer girin."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Bu URL geçersiz bir link gibi duruyor."
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Geçerli bir URL girin."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "Geçerli bir e-posta adresi girin."
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "Lütfen sadece harf, rakam, altçizgi veya çizgiden oluşan değer girin."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Geçerli bir IPv4 adresi girin."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Geçerli bir IPv6 adresi girin."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Geçerli bir IPv4 veya IPv6 adresi girin"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Sadece virgülle ayrılmış sayılar girin."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Bu değerin en az %(limit_value)s karakterden oluştuğundan emin olun (şu anki "
 "karakter sayısı: %(show_value)s)."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Bu değerin %(limit_value)s karakterden az veya eşit olduğundan emin olun."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Bu değerin %(limit_value)s karakterden çok veya eşit olduğundan emin olun."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -370,7 +393,7 @@ msgstr ""
 "Bu değerin en az %(limit_value)d karakterden oluştuğundan emin olun (şu anki "
 "karakter sayısı: %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -379,84 +402,84 @@ msgstr ""
 "Bu değerin en fazla %(limit_value)d karakterden oluştuğundan emin olun (şu "
 "anki karakter sayısı: %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 "%(field_name)s değeri %(date_field)s alanı %(lookup)s işlemi için tek "
 "olmalıdır."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "ve"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "%(field_label)s alanına sahip %(model_name)s zaten mevcuttur."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "%r değeri geçerli bir seçim değil."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Bu alan boş bırakılamaz."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Bu alan boş bırakılamaz. "
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Alan türü: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Tamsayı"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' değeri bir tamsayı olmalıdır."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' değeri Doğru ya da Yanlış olması gerekir."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Mantıksal (True ya da False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Karakter disizi (en fazla %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Virgülle ayrılmış tamsayılar"
 
-#: db/models/fields/__init__.py:647
+#: 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' geçersiz tarih formatı. YYYY-AA-GG biçiminde olmalıdır."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' değeri doğru bir biçime sahip (YYYY-MM-DD) ancak bu geçersiz bir tarih."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Tarih (saat yok)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +488,7 @@ msgstr ""
 "'%s' değeri geçersiz bir biçime sahip. YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] "
 "biçiminde olması gerekiyor."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,79 +497,79 @@ msgstr ""
 "'%s' biçimsel olarak doğru (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) ancak bu "
 "geçersiz bir tarih/zaman."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Tarih (saat var)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' değeri bir ondalık sayı olmalıdır."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Ondalık sayı"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-posta adresi"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Dosya yolu"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' değeri float olmalı"
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Floating point rakamı"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Büyük (8 bayt) integer"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 adresi"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP adresi"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' değeri None, True veya False olmak zorundadır."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Mantıksal (True, False, ya da None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Positif sayı"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Pozitif küçük sayı"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Slug (%(max_length)s karaktere kadar)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Küçük sayı"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Metin"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -554,7 +577,7 @@ msgstr ""
 "'%s' değerinin geçersiz bir biçimi var. Bunun HH:MM[:ss[.uuuuuu]] biçiminde "
 "olması gerekiyor."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -563,98 +586,98 @@ msgstr ""
 "'%s' değeri doğru biçime sahip (HH:MM[:ss[.uuuuuu]]) ancak bu geçersiz bir "
 "zaman."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Saat"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Dosya"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Resim"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Birincil anahtarı %(pk)r olan %(model)s mevcut değil."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Yabancı Anahtar (türü ilişkili alana göre belirlenir)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Bire-bir ilişki"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Çoğa-çok ilişki"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "\"Ctrl\" (Mac'de \"Command\") tuşunu basılı tutularak birden fazla seçim "
 "yapılabilir."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Bu alan zorunludur."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Tam sayı girin."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Bir sayı girin."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Toplamda en fazla %s sayının olduğundan emin olun."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "En fazla %s onluk yerin olduğundan emin olun."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Onluk kısımdan önce en fazla %s sayı olduğundan emin olun."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Geçerli bir tarih girin."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Geçerli bir zaman girin."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Geçerli bir tarih/zaman girin."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Dosya gönderilmedi. Formdaki kodlama türünü kontrol edin."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Hiçbir dosya gönderilmedi."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Gönderilen dosya boş."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -662,13 +685,13 @@ msgstr ""
 "Bu dosya adının en fazla %(max)d karakterden oluştuğundan emin olun (şu anki "
 "karakter sayısı: %(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Lütfen ya dosya seçin, ya da sıfırla kutucuğunu işaretleyin. İkisini aynı "
 "anda yapmayın."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -676,36 +699,40 @@ msgstr ""
 "Geçerli bir resim girin. Gönderdiğiniz dosya resim değil, ya da bozuk bir "
 "dosya."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Geçerli bir URL girin."
+
+#: 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 "Geçerli bir seçimde bulunun; %(value)s mevcut değerlerden biri değil."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Değer listesi giriniz."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Sıralama"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Sil"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Lütfen %(field)s alanları için mükerrer kayıt problemini düzeltin."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Lütfen %(field)s alanı için mükerrer verileri düzeltin, bunlar eşsiz "
 "olmalıdır."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -714,32 +741,32 @@ msgstr ""
 "Lütfen %(field_name)s alanı için mükerrer verileri düzeltin, bunlar "
 "%(date_field)s alanı %(lookup)s sorgulamaları için eşsiz olmalıdır."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Lütfen aşağıdaki mükerrer kayıtları düzeltin."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "İçeride belirtilmiş yabancı anahtar ebeveyin nesnenin birincil anahtarı ile "
 "uyuşmadı."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Geçerli bir seçimde bulunun; seçiminiz mevcut değerlerden birisi değil."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Geçerli bir seçimde bulunun; %s mevcut değerlerden biri değil."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" birincil anahtar için geçerli bir değer değil."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -748,86 +775,86 @@ msgstr ""
 " %(datetime)s %(current_timezone)s saat dilimine yorumlanamadı; bu belirsiz "
 "olabilir ya da olmayabilir."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Geçerli"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Düzenle"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Sıfırla"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Evet"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Hayır"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "evet,hayır,olabilir"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bayt"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "ö.s."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "ö.ö."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "ÖS"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ÖÖ"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "gece yarısı"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "öğlen"
 
@@ -1103,116 +1130,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Aralık"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "ya da"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "yıl"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "ay"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "hafta"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "gün"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "saat"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "dakika"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "dakika"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Klasör indeksi görünümü kapalı."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" yok"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s indeksi"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s başarıyla oluşturuldu."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s başarıyla güncellendi."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s silindi."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Yıl bilgisi belirtilmedi"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Ay bilgisi belirtilmedi"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Gün bilgisi belirtilmedi"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Hafta bilgisi belirtilmedi"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Mevcut %(verbose_name_plural)s kaydı bulunamadı"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1221,26 +1233,26 @@ msgstr ""
 "Gelecek %(verbose_name_plural)s mevcut değil, çünkü %(class_name)s."
 "allow_future değeri False olarak tanımlıdır."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Geçersiz tarih dizisi: '%(datestr)s', format: '%(format)s' "
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Sorguya uygun herhangi bir %(verbose_name)s bulunamadı"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Sayfa 'sonuncu' değil, veya int'e çevirilemez."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Geçersiz sayfa (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Geçersiz sayfa (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Liste boş ve '%(class_name)s.allow_empty' değeri False olarak tanımlı."
diff --git a/django/conf/locale/tr/formats.py b/django/conf/locale/tr/formats.py
index 705b2ed659..395fca9114 100644
--- a/django/conf/locale/tr/formats.py
+++ b/django/conf/locale/tr/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -22,6 +23,7 @@ DATE_INPUT_FORMATS = (
 )
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',    # '25/10/2006 14:30:59'
+    '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200'
     '%d/%m/%Y %H:%M',       # '25/10/2006 14:30'
     '%d/%m/%Y',             # '25/10/2006'
 )
diff --git a/django/conf/locale/tt/LC_MESSAGES/django.mo b/django/conf/locale/tt/LC_MESSAGES/django.mo
index e58a9752c9..063ab3dfd5 100644
Binary files a/django/conf/locale/tt/LC_MESSAGES/django.mo and b/django/conf/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/tt/LC_MESSAGES/django.po b/django/conf/locale/tt/LC_MESSAGES/django.po
index 26720ac7f0..50027a99c9 100644
--- a/django/conf/locale/tt/LC_MESSAGES/django.po
+++ b/django/conf/locale/tt/LC_MESSAGES/django.po
@@ -6,359 +6,379 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+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: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Бенгалия теле"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Босния теле"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Каталан теле"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Чех теле"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Уэльс теле"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Дания теле"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Алман теле"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Грек теле"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Инглиз теле"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Британ инглиз теле"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Испан теле"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Аргентина испан теле"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Мексикалы испан"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Никарагуалы испан"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Эстон теле"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Баск теле"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Фарсы теле"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Финн теле"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Француз теле"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Фриз теле"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Ирланд теле"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Галлий теле"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Яһүд теле"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Хинд теле"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Хорват теле"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Венгр теле"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Индонезия теле"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Исланд теле"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Итальян теле"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Япон теле"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Грузин теле"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Кхмер теле"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Каннада теле"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Корея теле"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Литвалылар теле"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Латвия теле"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Македон теле"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Малаялам теле"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Монгол теле"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Норвегиялеләр (Букмол) теле"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Голланд теле"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Норвегиялеләр (Нюнорск) теле"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Паджаби теле"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Поляк теле"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Португал теле"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Бразилия португал теле"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Румын теле"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Рус теле"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Словак теле"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Словен теле"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Албан теле"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Серб теле"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Серб теле (латин алфавиты)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Швед теле"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Тамиль теле"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Телугу теле"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Тай теле"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Төрек теле"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Украин теле"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Урду"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Вьетнам теле"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Гадиләштерелгән кытай теле"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Традицион кытай теле"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Дөрес кыйммәтне кертегез."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "Бу сылтама эшләми."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Рөхсәт ителгән URLны кертегез."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Рөхсәт ителгән электрон почта адресын кертегез."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Кыйммәт хәрефләрдән, сан билгеләреннән, астына сызу билгесеннән яки дефистан "
 "торырга тиеш."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Рөхсәт ителгән IPv4 адресын кертегез."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Өтерләр белән бүленгән сан билгеләрен кертегез"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "Бу кыйммәтнең %(limit_value)s карата кечерәк яки тигез булуын тикшерегез."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "Бу кыйммәтнең %(limit_value)s карата зуррак яки тигез булуын тикшерегез."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -367,7 +387,7 @@ msgstr ""
 "Бу кыйммәтнең билгеләр санының ким дигәндә %(limit_value)d булуын тикшерегез "
 "(хәзер %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -376,274 +396,274 @@ msgstr ""
 "Бу кыйммәтнең билгеләр санының күп дигәндә %(limit_value)d булуын тикшерегез "
 "(хәзер %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "һәм"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "Мондый %(field_label)s белән булган %(model_name)s инде бар."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Кыйммәт %r рөхсәт ителмәгән."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Бу кырның кыйммәте NULL булырга тиеш түгел."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Бу кыр буш булырга тиеш түгел."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "%(field_type)s типтагы кыр"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Бөтен сан"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Логик (True яисә False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Юл (күп дигәндә %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Өтерләр белән бүленгән бөтен саннар"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Дата (вакыт күрсәтмәсе булмаган)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Дата (вакыт күрсәтмәсе белән)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Унарлы вакланма"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "Электрон почта адресы"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr ""
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Файл юлы"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Күчерелүчән өтер белән булган сан"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Зур бөтен (8 байт)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP-адрес"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Логик (True, False я None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Текст"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Вакыт"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "%(pk)r беренчел ачкычы белән булган %(model)s обйекты табылмаган."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Тыш ачкыч (тип бәйле кыр буенча билгеләнгән)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "\"Бергә бер\" элемтәсе"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "\"Күпкә куп\" элемтәсе"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Берничә кыйммәт сайлау өчен \"Control\" (Mac санакларында \"Command\") басып "
 "торыгыз."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Мәҗбүри кыр."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Бөтен сан кертегез."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Сан кертегез."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Цифрлар саны %s караганда күбрәк булмавын тикшерегез."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Унарлы урыннары %s караганда күбрәк булмавын тикшерегез."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Өтергә кадәр булган цифрлар саны %s караганда күбрәк булмавын тикшерегез."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Рөхсәт ителгән датаны кертегез."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Рөхсәт ителгән вакытны кертегез."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Рөхсәт ителгән дата һәм вакытны кертегез."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Һишбер файл җибәрелмәгән. Форма кодлавын тикшерегез."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Һишбер файл җибәрелмәгән."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Җибәрелгән файл буш."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -651,49 +671,53 @@ msgstr ""
 "Бу файлның исеменең озынлыгы күп дигәндә %(max)d булуын тикшерегез (хәзер "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Зинһар, җибәрегез файлны яисә бушайту байракчасын билгеләгез, икесен бергә "
 "түгел."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 "Рөхсәт ителгән рәсемне йөкләгез. Сез йөкләгән файл рәсем түгел яисә бозылган."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Рөхсәт ителгән URLны кертегез."
+
+#: 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 ""
 "Дөрес тәкъдимне сайлагыз. Рөхсәт ителгән кыйммәтләр арасында %(value)s юк. "
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Кыйммәтләр исемлеген кертегез."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Тәртип"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Бетерергә"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Зинһар, %(field)s кырындагы кабатлана торган кыйммәтне төзәтегез."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Зинһар, %(field)s кырындагы кыйммәтне төзәтегез, ул уникаль булырга тиеш."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -702,117 +726,117 @@ msgstr ""
 "Зинһар, %(field_name)s кырындагы кыйммәтне төзәтегез, ул %(date_field)s "
 "кырындагы %(lookup)s өчен уникаль булырга тиеш."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Зинһар, астагы кабатлана торган кыйммәтләрне төзәтегез."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Тыш ачкыч атаның баш ачкычы белән туры килмиләр."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Дөрес тәкъдимне сайлагыз. Рөхсәт ителгән кыйммәтләр арасында сезнең вариант "
 "юк."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Дөрес тәкъдимне сайлагыз. Рөхсәт ителгән кыйммәтләр арасында %s юк. "
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" кыйммәте баш ачкыч өчен рөхсәт ителмәгән."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Хәзерге вакытта"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Үзгәртергә"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Бушайтырга"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Билгесез"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Әйе"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Юк"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "әйе,юк,бәлки"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d байт"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s ТБ"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s ПБ"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "т.с."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "т.к."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "ТС"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "ТК"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "төн уртасы"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "көн уртасы"
 
@@ -1088,116 +1112,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "декабрь"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "я"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ","
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "ел"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "ай"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "атна"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "көн"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сәгать"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "минут"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s уңышлы рәвештә төзелгән."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s уңышлы рәвештә яңартылган."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s уңышлы рәвештә бетерелгән."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Ел билгеләнмәгән"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Ай билгеләнмәгән"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Көн билгеләнмәгән"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Атна билгеләнмәгән"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Файдалана алырлык %(verbose_name_plural)s юк"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1206,26 +1215,26 @@ msgstr ""
 "%(class_name)s.allow_future False булуы сәбәпле, киләсе "
 "%(verbose_name_plural)s файдалана алырлык түгел"
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Дөрес булмаган дата '%(datestr)s', бирелгән формат '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Таләпкә туры килгән %(verbose_name)s табылмаган"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "Сәхифә ни соңгы түгел, ни аны бөтен санга әверелдереп булмый"
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Ялгыш бит (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Буш исемлек һәм '%(class_name)s.allow_empty'  - False"
diff --git a/django/conf/locale/udm/LC_MESSAGES/django.mo b/django/conf/locale/udm/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..800ca90d2e
Binary files /dev/null and b/django/conf/locale/udm/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/udm/LC_MESSAGES/django.po b/django/conf/locale/udm/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..d4175c2bbe
--- /dev/null
+++ b/django/conf/locale/udm/LC_MESSAGES/django.po
@@ -0,0 +1,1229 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Andrew Boltachev <andrewboltachev@gmail.com>, 2012-2013.
+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-01-13 18:45+0000\n"
+"Last-Translator: Andrew Boltachev <andrewboltachev@gmail.com>\n"
+"Language-Team: Udmurt (http://www.transifex.com/projects/p/django/language/"
+"udm/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: udm\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr "Африкаанс"
+
+#: conf/global_settings.py:49
+msgid "Arabic"
+msgstr "Араб"
+
+#: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "Азербайджан"
+
+#: conf/global_settings.py:51
+msgid "Bulgarian"
+msgstr "Болгар"
+
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "Беларус"
+
+#: conf/global_settings.py:53
+msgid "Bengali"
+msgstr "Бенгал"
+
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Бретон"
+
+#: conf/global_settings.py:55
+msgid "Bosnian"
+msgstr "Босниец"
+
+#: conf/global_settings.py:56
+msgid "Catalan"
+msgstr "Каталан"
+
+#: conf/global_settings.py:57
+msgid "Czech"
+msgstr "Чех"
+
+#: conf/global_settings.py:58
+msgid "Welsh"
+msgstr "Уэльс"
+
+#: conf/global_settings.py:59
+msgid "Danish"
+msgstr "Датчан"
+
+#: conf/global_settings.py:60
+msgid "German"
+msgstr "Немец"
+
+#: conf/global_settings.py:61
+msgid "Greek"
+msgstr "Грек"
+
+#: conf/global_settings.py:62
+msgid "English"
+msgstr "Англи"
+
+#: conf/global_settings.py:63
+msgid "British English"
+msgstr "Британиысь англи"
+
+#: conf/global_settings.py:64
+msgid "Esperanto"
+msgstr "Эсперанто"
+
+#: conf/global_settings.py:65
+msgid "Spanish"
+msgstr "Испан"
+
+#: conf/global_settings.py:66
+msgid "Argentinian Spanish"
+msgstr "Аргентинаысь испан"
+
+#: conf/global_settings.py:67
+msgid "Mexican Spanish"
+msgstr "Мексикаысь испан"
+
+#: conf/global_settings.py:68
+msgid "Nicaraguan Spanish"
+msgstr "Никарагуаысь испан"
+
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Венесуэлаысь испан"
+
+#: conf/global_settings.py:70
+msgid "Estonian"
+msgstr "Эстон"
+
+#: conf/global_settings.py:71
+msgid "Basque"
+msgstr "Баск"
+
+#: conf/global_settings.py:72
+msgid "Persian"
+msgstr "Перс"
+
+#: conf/global_settings.py:73
+msgid "Finnish"
+msgstr "Финн"
+
+#: conf/global_settings.py:74
+msgid "French"
+msgstr "Француз"
+
+#: conf/global_settings.py:75
+msgid "Frisian"
+msgstr "Фриз"
+
+#: conf/global_settings.py:76
+msgid "Irish"
+msgstr "Ирланд"
+
+#: conf/global_settings.py:77
+msgid "Galician"
+msgstr "Галисий"
+
+#: conf/global_settings.py:78
+msgid "Hebrew"
+msgstr "Иврит"
+
+#: conf/global_settings.py:79
+msgid "Hindi"
+msgstr "Хинди"
+
+#: conf/global_settings.py:80
+msgid "Croatian"
+msgstr "Хорват"
+
+#: conf/global_settings.py:81
+msgid "Hungarian"
+msgstr "Венгер"
+
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Интерлингва"
+
+#: conf/global_settings.py:83
+msgid "Indonesian"
+msgstr "Индонези"
+
+#: conf/global_settings.py:84
+msgid "Icelandic"
+msgstr "Исланд"
+
+#: conf/global_settings.py:85
+msgid "Italian"
+msgstr "Итальян"
+
+#: conf/global_settings.py:86
+msgid "Japanese"
+msgstr "Япон"
+
+#: conf/global_settings.py:87
+msgid "Georgian"
+msgstr "Грузин"
+
+#: conf/global_settings.py:88
+msgid "Kazakh"
+msgstr "Казах"
+
+#: conf/global_settings.py:89
+msgid "Khmer"
+msgstr "Кхмер"
+
+#: conf/global_settings.py:90
+msgid "Kannada"
+msgstr "Каннада"
+
+#: conf/global_settings.py:91
+msgid "Korean"
+msgstr "Корей"
+
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Люксембург"
+
+#: conf/global_settings.py:93
+msgid "Lithuanian"
+msgstr "Литва"
+
+#: conf/global_settings.py:94
+msgid "Latvian"
+msgstr "Латвий"
+
+#: conf/global_settings.py:95
+msgid "Macedonian"
+msgstr "Македон"
+
+#: conf/global_settings.py:96
+msgid "Malayalam"
+msgstr "Малаялам"
+
+#: conf/global_settings.py:97
+msgid "Mongolian"
+msgstr "Монгол"
+
+#: conf/global_settings.py:98
+msgid "Norwegian Bokmal"
+msgstr "Норвег (букмол)"
+
+#: conf/global_settings.py:99
+msgid "Nepali"
+msgstr "Непал"
+
+#: conf/global_settings.py:100
+msgid "Dutch"
+msgstr "Голланд"
+
+#: conf/global_settings.py:101
+msgid "Norwegian Nynorsk"
+msgstr "Норвег (нюнорск)"
+
+#: conf/global_settings.py:102
+msgid "Punjabi"
+msgstr "Панджаби"
+
+#: conf/global_settings.py:103
+msgid "Polish"
+msgstr "Поляк"
+
+#: conf/global_settings.py:104
+msgid "Portuguese"
+msgstr "Португал"
+
+#: conf/global_settings.py:105
+msgid "Brazilian Portuguese"
+msgstr "Бразилиысь португал"
+
+#: conf/global_settings.py:106
+msgid "Romanian"
+msgstr "Румын"
+
+#: conf/global_settings.py:107
+msgid "Russian"
+msgstr "Ӟуч"
+
+#: conf/global_settings.py:108
+msgid "Slovak"
+msgstr "Словак"
+
+#: conf/global_settings.py:109
+msgid "Slovenian"
+msgstr "Словен"
+
+#: conf/global_settings.py:110
+msgid "Albanian"
+msgstr "Албан"
+
+#: conf/global_settings.py:111
+msgid "Serbian"
+msgstr "Серб"
+
+#: conf/global_settings.py:112
+msgid "Serbian Latin"
+msgstr "Серб (латиницаен)"
+
+#: conf/global_settings.py:113
+msgid "Swedish"
+msgstr "Швед"
+
+#: conf/global_settings.py:114
+msgid "Swahili"
+msgstr "Суахили"
+
+#: conf/global_settings.py:115
+msgid "Tamil"
+msgstr "Тамиль"
+
+#: conf/global_settings.py:116
+msgid "Telugu"
+msgstr "Телугу"
+
+#: conf/global_settings.py:117
+msgid "Thai"
+msgstr "Тай"
+
+#: conf/global_settings.py:118
+msgid "Turkish"
+msgstr "Турок"
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr "Бигер"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Удмурт"
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr "Украин"
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr "Урду"
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr "Вьетнам"
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr "Китай (капчиятэм)"
+
+#: conf/global_settings.py:125
+msgid "Traditional Chinese"
+msgstr "Китай (традици)"
+
+#: core/validators.py:21 forms/fields.py:52
+msgid "Enter a valid value."
+msgstr "Тазэ шонер гожтэ."
+
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Электорн почта адресэз шонер гожтэ"
+
+#: core/validators.py:107 forms/fields.py:1013
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Татчын букваос, лыдпусъёс, улӥ гож пусъёс но дефисъёс гинэ гожтыны яра."
+
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+msgid "Enter a valid IPv4 address."
+msgstr "Шонер IPv4-адрес гожтэ."
+
+#: core/validators.py:115 core/validators.py:130
+msgid "Enter a valid IPv6 address."
+msgstr "Шонер IPv6-адрес гожтэ."
+
+#: core/validators.py:125 core/validators.py:128
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Шонер IPv4 яке IPv6 адрес гожтэ."
+
+#: core/validators.py:151 db/models/fields/__init__.py:655
+msgid "Enter only digits separated by commas."
+msgstr "Запятойёсын висъям лыдпусъёсты гожтэ"
+
+#: core/validators.py:157
+#, 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: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 "Талы %(limit_value)s-лэсь бадӟымгес луыны уг яра."
+
+#: 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 "Талы %(limit_value)s-лэсь ӧжытгес луыны уг яра."
+
+#: core/validators.py:189
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr ""
+"Татын %(limit_value)d яке бадӟымгес пус луыны кулэ. Али татын %(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 ""
+"Татын %(limit_value)d яке ӧжытгес пус луыны кулэ. Али татын %(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 must be unique for %(date_field)s %(lookup)s."
+
+#: db/models/base.py:880 forms/models.py:573
+msgid "and"
+msgstr "но"
+
+#: 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 "Таӵе %(field_label)s-ен %(model_name)s вань ини."
+
+#: db/models/fields/__init__.py:67
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr "%r шонер вариант ӧвӧл."
+
+#: db/models/fields/__init__.py:68
+msgid "This field cannot be null."
+msgstr "Та NULL луыны уг яра."
+
+#: db/models/fields/__init__.py:69
+msgid "This field cannot be blank."
+msgstr "Та буш луыны уг яра."
+
+#: db/models/fields/__init__.py:76
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "%(field_type)s типъем бусы"
+
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+msgid "Integer"
+msgstr "целой"
+
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' целой лыд луыны кулэ."
+
+#: db/models/fields/__init__.py:569
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' True яке False луыны кулэ."
+
+#: db/models/fields/__init__.py:571
+msgid "Boolean (Either True or False)"
+msgstr "True яке False"
+
+#: db/models/fields/__init__.py:622
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Чур (%(max_length)s пусозь кузьда)"
+
+#: db/models/fields/__init__.py:650
+msgid "Comma-separated integers"
+msgstr "Запятоен висъям быдэс лыдъёс"
+
+#: 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' шонертэм гожтэмын. Дата АААА-ТТ-НН форматъя луыны кулэ."
+
+#: 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' форматезъя (АААА-ТТ-НН) шонер, но сыӵе дата луыны уг быгаты."
+
+#: db/models/fields/__init__.py:669
+msgid "Date (without time)"
+msgstr "Дата (час-минут пусйытэк)"
+
+#: 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' шонертэм гожтэмын. Дата но час-минут АААА-ТТ-НН ЧЧ:ММ[:сс[.мммммм]][ЧП] "
+"форматъя луыны кулэ."
+
+#: 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' форматезъя (АААА-ТТ-НН ЧЧ:ММ[:сс[.мммммм]][ЧП]) шонер, но сыӵе дата но "
+"час-минут луыны уг быгаты."
+
+#: db/models/fields/__init__.py:760
+msgid "Date (with time)"
+msgstr "Дата но час-минут"
+
+#: db/models/fields/__init__.py:849
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' десятичной лыд луыны кулэ."
+
+#: db/models/fields/__init__.py:851
+msgid "Decimal number"
+msgstr "Десятичной лыд."
+
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Электрон почта адрес"
+
+#: db/models/fields/__init__.py:927
+msgid "File path"
+msgstr "Файллэн нимыз"
+
+#: db/models/fields/__init__.py:954
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' вещественной лыд луыны кулэ."
+
+#: db/models/fields/__init__.py:956
+msgid "Floating point number"
+msgstr "Вещественной лыд"
+
+#: db/models/fields/__init__.py:1017
+msgid "Big (8 byte) integer"
+msgstr "Бадӟым (8 байтъем) целой лыд"
+
+#: db/models/fields/__init__.py:1031
+msgid "IPv4 address"
+msgstr "IPv4 адрес"
+
+#: db/models/fields/__init__.py:1047
+msgid "IP address"
+msgstr "IP адрес"
+
+#: db/models/fields/__init__.py:1090
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' None, True яке False луыны кулэ."
+
+#: db/models/fields/__init__.py:1092
+msgid "Boolean (Either True, False or None)"
+msgstr "True, False яке None"
+
+#: db/models/fields/__init__.py:1141
+msgid "Positive integer"
+msgstr "Целой, нольлэсь бадӟым лыд"
+
+#: db/models/fields/__init__.py:1152
+msgid "Positive small integer"
+msgstr "Нольлэсь бадӟым пичи целой лыд"
+
+#: db/models/fields/__init__.py:1163
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Компьютерной ним (%(max_length)s пусозь кузьда)"
+
+#: db/models/fields/__init__.py:1181
+msgid "Small integer"
+msgstr "Пичи целой лыд"
+
+#: db/models/fields/__init__.py:1187
+msgid "Text"
+msgstr "Текст"
+
+#: 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' шонертэм гожтэмын. Со ЧЧ:ММ[:сс[.мммммм]] форматъя луыны кулэ."
+
+#: 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' форматэзъя (ЧЧ:ММ[:сс[.мммммм]]) шонер, но таӵе час-минут луыны уг "
+"быгаты."
+
+#: db/models/fields/__init__.py:1210
+msgid "Time"
+msgstr "Час-минут"
+
+#: db/models/fields/__init__.py:1272
+msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/files.py:216
+msgid "File"
+msgstr "Файл"
+
+#: db/models/fields/files.py:323
+msgid "Image"
+msgstr "Суред"
+
+#: db/models/fields/related.py:979
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "Таӵе идентификаторен %(pk)r %(model)s ӧвӧл."
+
+#: db/models/fields/related.py:981
+msgid "Foreign Key (type determined by related field)"
+msgstr "Мукет моделен герӟет (тип герӟано бусыя валамын)."
+
+#: db/models/fields/related.py:1111
+msgid "One-to-one relationship"
+msgstr "Одӥг-одӥг герӟет"
+
+#: db/models/fields/related.py:1178
+msgid "Many-to-many relationship"
+msgstr "Трос-трос герӟет"
+
+#: db/models/fields/related.py:1203
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Тросэз быръён понна \"Control\", (яке, Mac-ын, \"Command\") кутэлэ."
+
+#: forms/fields.py:51
+msgid "This field is required."
+msgstr "Та клуэ."
+
+#: forms/fields.py:209
+msgid "Enter a whole number."
+msgstr "Целой лыд гожтэ."
+
+#: forms/fields.py:241 forms/fields.py:262
+msgid "Enter a number."
+msgstr "Лыд гожтэ."
+
+#: forms/fields.py:265
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Эскере та %s лыдпуслэсь кузьгес ӧвӧл шуыса."
+
+#: forms/fields.py:266
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Эскере, татын %s яке ӧжытгес десятичной лыдъёс луыны кулэ."
+
+#: forms/fields.py:267
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Эскере, запятой азьын %s-лэсь тросгес лыдпус ӧвӧл шуыса."
+
+#: forms/fields.py:355 forms/fields.py:953
+msgid "Enter a valid date."
+msgstr "Шонер дата гожтэ."
+
+#: forms/fields.py:378 forms/fields.py:954
+msgid "Enter a valid time."
+msgstr "Шонер час-минут гожтэ."
+
+#: forms/fields.py:399
+msgid "Enter a valid date/time."
+msgstr "Шонер дата но час-минут гожтэ."
+
+#: forms/fields.py:475
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Одӥг файл но лэзьымтэ. Формалэсь код."
+
+#: forms/fields.py:476
+msgid "No file was submitted."
+msgstr "Файл лэземын ӧвӧл."
+
+#: forms/fields.py:477
+msgid "The submitted file is empty."
+msgstr "Лэзем файл буш."
+
+#: forms/fields.py:478
+#, python-format
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Эскере, файллэн нимыз %(max)d пуслэсь кузьгес ӧвӧл шуыса (солэн кузьдалаез "
+"%(length)d пус)."
+
+#: forms/fields.py:479
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+"Файл лэзе яке файл ӵушоно шуыса пусъе, огдыръя соиз но, таиз но уг яра."
+
+#: forms/fields.py:534
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr "Суред лэзе. Тӥляд файлды лэзьымтэ яке со суред ӧвӧл."
+
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Шонер URL гожтэ."
+
+#: 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 "Шонер вариант быръе. %(value)s вариантъёс пӧлын ӧвӧл."
+
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
+msgid "Enter a list of values."
+msgstr "Список лэзе."
+
+#: forms/formsets.py:324 forms/formsets.py:326
+msgid "Order"
+msgstr "Рад"
+
+#: forms/formsets.py:328
+msgid "Delete"
+msgstr "Ӵушоно"
+
+#: forms/models.py:567
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: forms/models.py:571
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: 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 ""
+
+#: forms/models.py:585
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: forms/models.py:852
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+
+#: forms/models.py:913
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: forms/models.py:1003
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr ""
+
+#: forms/models.py:1005
+#, python-format
+msgid "\"%s\" is not a valid value for a primary key."
+msgstr ""
+
+#: 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 couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+
+#: forms/widgets.py:336
+msgid "Currently"
+msgstr "Али"
+
+#: forms/widgets.py:337
+msgid "Change"
+msgstr "Тупатъяно"
+
+#: forms/widgets.py:338
+msgid "Clear"
+msgstr "Буш кароно"
+
+#: forms/widgets.py:594
+msgid "Unknown"
+msgstr "Тодымтэ"
+
+#: forms/widgets.py:595
+msgid "Yes"
+msgstr "Бен"
+
+#: forms/widgets.py:596
+msgid "No"
+msgstr "Ӧвӧл"
+
+#: template/defaultfilters.py:794
+msgid "yes,no,maybe"
+msgstr "бен,ӧвӧл,уг тодӥськы"
+
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d байт"
+
+#: template/defaultfilters.py:835
+#, python-format
+msgid "%s KB"
+msgstr "%s КБ"
+
+#: template/defaultfilters.py:837
+#, python-format
+msgid "%s MB"
+msgstr "%s МБ"
+
+#: template/defaultfilters.py:839
+#, python-format
+msgid "%s GB"
+msgstr "%s МБ"
+
+#: template/defaultfilters.py:841
+#, python-format
+msgid "%s TB"
+msgstr "%s ТБ"
+
+#: template/defaultfilters.py:842
+#, python-format
+msgid "%s PB"
+msgstr "%s ПБ"
+
+#: utils/dateformat.py:47
+msgid "p.m."
+msgstr "лымшор бере"
+
+#: utils/dateformat.py:48
+msgid "a.m."
+msgstr "лымшор азе"
+
+#: utils/dateformat.py:53
+msgid "PM"
+msgstr "лымшор бере"
+
+#: utils/dateformat.py:54
+msgid "AM"
+msgstr "лымшор азе"
+
+#: utils/dateformat.py:103
+msgid "midnight"
+msgstr "уйшор"
+
+#: utils/dateformat.py:105
+msgid "noon"
+msgstr "лымшор"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Вордӥськон"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Пуксён"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Вирнунал"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Покчиарня"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Удмуртарня"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Кӧснунал"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Арнянунал"
+
+#: utils/dates.py:10
+msgid "Mon"
+msgstr "врд"
+
+#: utils/dates.py:10
+msgid "Tue"
+msgstr "пкс"
+
+#: utils/dates.py:10
+msgid "Wed"
+msgstr "врн"
+
+#: utils/dates.py:10
+msgid "Thu"
+msgstr "пкч"
+
+#: utils/dates.py:10
+msgid "Fri"
+msgstr "удм"
+
+#: utils/dates.py:11
+msgid "Sat"
+msgstr "ксн"
+
+#: utils/dates.py:11
+msgid "Sun"
+msgstr "арн"
+
+#: utils/dates.py:18
+msgid "January"
+msgstr "толшор"
+
+#: utils/dates.py:18
+msgid "February"
+msgstr "тулыспал"
+
+#: utils/dates.py:18
+msgid "March"
+msgstr "южтолэзь"
+
+#: utils/dates.py:18
+msgid "April"
+msgstr "оштолэзь"
+
+#: utils/dates.py:18
+msgid "May"
+msgstr "куартолэзь"
+
+#: utils/dates.py:18
+msgid "June"
+msgstr "инвожо"
+
+#: utils/dates.py:19
+msgid "July"
+msgstr "пӧсьтолэзь"
+
+#: utils/dates.py:19
+msgid "August"
+msgstr "гудырикошкон"
+
+#: utils/dates.py:19
+msgid "September"
+msgstr "куарусён"
+
+#: utils/dates.py:19
+msgid "October"
+msgstr "коньывуон"
+
+#: utils/dates.py:19
+msgid "November"
+msgstr "шуркынмон"
+
+#: utils/dates.py:20
+msgid "December"
+msgstr "толсур"
+
+#: utils/dates.py:23
+msgid "jan"
+msgstr "тшт"
+
+#: utils/dates.py:23
+msgid "feb"
+msgstr "тпт"
+
+#: utils/dates.py:23
+msgid "mar"
+msgstr "южт"
+
+#: utils/dates.py:23
+msgid "apr"
+msgstr "ошт"
+
+#: utils/dates.py:23
+msgid "may"
+msgstr "крт"
+
+#: utils/dates.py:23
+msgid "jun"
+msgstr "ивт"
+
+#: utils/dates.py:24
+msgid "jul"
+msgstr "пст"
+
+#: utils/dates.py:24
+msgid "aug"
+msgstr "гкт"
+
+#: utils/dates.py:24
+msgid "sep"
+msgstr "кут"
+
+#: utils/dates.py:24
+msgid "oct"
+msgstr "квт"
+
+#: utils/dates.py:24
+msgid "nov"
+msgstr "шкт"
+
+#: utils/dates.py:24
+msgid "dec"
+msgstr "тст"
+
+#: utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "тшт"
+
+#: utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "тпт"
+
+#: utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "южт"
+
+#: utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "ошт"
+
+#: utils/dates.py:35
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "крт"
+
+#: utils/dates.py:36
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "ивт"
+
+#: utils/dates.py:37
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "пст"
+
+#: utils/dates.py:38
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "гкт"
+
+#: utils/dates.py:39
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "кут"
+
+#: utils/dates.py:40
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "квт"
+
+#: utils/dates.py:41
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "шкт"
+
+#: utils/dates.py:42
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "тст"
+
+#: utils/dates.py:45
+msgctxt "alt. month"
+msgid "January"
+msgstr "толшоре"
+
+#: utils/dates.py:46
+msgctxt "alt. month"
+msgid "February"
+msgstr "тулыспалэ"
+
+#: utils/dates.py:47
+msgctxt "alt. month"
+msgid "March"
+msgstr "южтолэзе"
+
+#: utils/dates.py:48
+msgctxt "alt. month"
+msgid "April"
+msgstr "оштолэзе"
+
+#: utils/dates.py:49
+msgctxt "alt. month"
+msgid "May"
+msgstr "куартолэзе"
+
+#: utils/dates.py:50
+msgctxt "alt. month"
+msgid "June"
+msgstr "инвожое"
+
+#: utils/dates.py:51
+msgctxt "alt. month"
+msgid "July"
+msgstr "пӧсьтолэзе"
+
+#: utils/dates.py:52
+msgctxt "alt. month"
+msgid "August"
+msgstr "гудырикошконэ"
+
+#: utils/dates.py:53
+msgctxt "alt. month"
+msgid "September"
+msgstr "куарусёнэ"
+
+#: utils/dates.py:54
+msgctxt "alt. month"
+msgid "October"
+msgstr "коньывуонэ"
+
+#: utils/dates.py:55
+msgctxt "alt. month"
+msgid "November"
+msgstr "шуркынмонэ"
+
+#: utils/dates.py:56
+msgctxt "alt. month"
+msgid "December"
+msgstr "толсуре"
+
+#: 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 "яке"
+
+#. 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] "ар"
+
+#: utils/timesince.py:23
+msgid "month"
+msgid_plural "months"
+msgstr[0] "толэзь"
+
+#: utils/timesince.py:24
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "арня"
+
+#: utils/timesince.py:25
+msgid "day"
+msgid_plural "days"
+msgstr[0] "нунал"
+
+#: utils/timesince.py:26
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "час"
+
+#: utils/timesince.py:27
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "минут"
+
+#: utils/timesince.py:43
+msgid "minutes"
+msgstr "минут"
+
+#: 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 "Папкаослэсь пуштроссэс татын учкыны уг яра."
+
+#: views/static.py:58
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ӧвӧл"
+
+#: views/static.py:98
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s папкалэн пушторсэз"
+
+#: views/generic/dates.py:42
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:98
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:157
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:213
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:368 views/generic/dates.py:393
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: views/generic/dates.py:646
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:678
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:51
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:56
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: views/generic/list.py:137
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/uk/LC_MESSAGES/django.mo b/django/conf/locale/uk/LC_MESSAGES/django.mo
index a2793cb67a..23652d1966 100644
Binary files a/django/conf/locale/uk/LC_MESSAGES/django.mo and b/django/conf/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/uk/LC_MESSAGES/django.po b/django/conf/locale/uk/LC_MESSAGES/django.po
index 92966ea990..3f20987175 100644
--- a/django/conf/locale/uk/LC_MESSAGES/django.po
+++ b/django/conf/locale/uk/LC_MESSAGES/django.po
@@ -3,365 +3,386 @@
 # Translators:
 # Boryslav Larin <brabadu@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Sergey Lysach <sergikoff88@gmail.com>, 2011, 2012.
+#   <krzroman@gmail.com>, 2012.
+# Sergey Lysach <sergikoff88@gmail.com>, 2011-2013.
 # Sergiy Kuzmenko <s.kuzmenko@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+0100\n"
-"PO-Revision-Date: 2012-03-11 16:00+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-12 18:27+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 "Білоруська"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Бенгальська"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr "Бретонська"
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Боснійська"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Каталонська"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Чеська"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Валлійська"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Датська"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Німецька"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Грецька"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Англійська"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "Англійська (Великобританія)"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "Есперанто"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Іспанська (Аргентина)"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Мексиканьска (іспанська)"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Нікарагуанська іспанська"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "Венесуельська іспанська"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Румунська"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Баскська"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Перська"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Фінська"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Французька"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Фризька"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Ірландська"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Галіційська"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Іврит"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Хінді"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Хорватська"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Угорська"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr "Інтерлінгва"
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Індонезійська"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Ісландська"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Італійська"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Японська"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Грузинська"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "Казахська"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Кхмерська"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Канадська"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Корейська"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr "Люксембурзький"
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Литовська"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Латвійська"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Македонська"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Малаялам"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Монгольська"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Норвезька (Букмол)"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "Непальська"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Голландська"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Норвезька (Нюнорськ)"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Панджабі"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Польська"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Бразильска"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Румунська"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Російська"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Словацька"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Словенська"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Албанська"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Сербська"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Сербська (латинська)"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Шведська"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "Суахілі"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Тамільська"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Телугу"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Тайська"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Турецька"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
-msgstr ""
+msgstr "Татарська"
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr "Удмуртський"
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Урду"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "В'єтнамська"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Китайська спрощена"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Китайська традиційна"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Уведіть коректне значення."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL %s є пошкодженим посиланням."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr "Введіть коректну email адресу."
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Уведіть коректний URL."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Уведіть коректну e-mail адресу."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Введіть коректне значення 'slug' (короткого заголовку), що може містити "
 "тільки літери, числа, символи підкреслювання та дефіси."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Введіть коректну IPv4 адресу."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "Введіть дійсну IPv6 адресу."
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr "Введіть дійсну IPv4 чи IPv6 адресу."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Введіть тільки цифри, що розділені комами."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Переконайтеся, що це значення менше чи дорівнює %(limit_value)s."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Переконайтеся, що це значення більше чи дорівнює %(limit_value)s."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -370,7 +391,7 @@ msgstr ""
 "Переконайтеся, що це значення має щонайменше %(limit_value)d символів (зараз "
 "%(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -379,84 +400,84 @@ msgstr ""
 "Переконайтеся, що це значення має щонайбільше %(limit_value)d символів "
 "(зараз %(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "та"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 з таким %(field_label)s вже існує."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Значення %r не є дозволеним вибором."
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Це поле не може бути пустим."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Це поле не може бути порожнім."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Тип поля: %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Ціле число"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' значення повинне бути цілим числом."
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr "'%s' значення повинне бути True або False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Булеве значення (True або False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Рядок (до %(max_length)s)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Цілі, розділені комою"
 
-#: db/models/fields/__init__.py:647
+#: 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' значення має невірний формат дати. Вона повинна бути у форматі YYYY-MM-"
 "DD."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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' значення має правильний формат (YYYY-MM-DD), але це недійсна дата."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Дата (без часу)"
 
-#: db/models/fields/__init__.py:732
+#: 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[."
@@ -465,7 +486,7 @@ msgstr ""
 "'%s' значення має невірний формат. Воно повинне бути у форматі YYYY-MM-DD HH:"
 "MM[:ss[.uuuuuu]][TZ]."
 
-#: db/models/fields/__init__.py:736
+#: db/models/fields/__init__.py:756
 #, python-format
 msgid ""
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
@@ -474,79 +495,79 @@ msgstr ""
 "'%s' значення має вірний формат (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) але це "
 "невірна дата/час."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Дата (з часом)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr "'%s' значення повинне бути десятковим числом."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Десяткове число"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "E-mail адреса"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Шлях до файла"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr "'%s' значення повинне бути числом з плаваючою крапкою."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Число з плаваючою комою"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Велике (8 байтів) ціле число"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr "IPv4 адреса"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP адреса"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr "'%s' значення повинне бути None, True або False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Булеве значення (включаючи True, False або None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr "Додатнє ціле число"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr "Додатнє мале ціле число"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr "Слаг (до %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr "Мале ціле число"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Текст"
 
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
 #, python-format
 msgid ""
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
@@ -554,7 +575,7 @@ msgstr ""
 "'%s' значення має невірний формат. Воно повинне бути у форматі HH:MM[:ss[."
 "uuuuuu]]."
 
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
 #, python-format
 msgid ""
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
@@ -562,98 +583,98 @@ msgid ""
 msgstr ""
 "'%s' значення має вірний формат (HH:MM[:ss[.uuuuuu]]) але це недійсний час."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Час"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr "Файл"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr "Зображення"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Моделі %(model)s з ключем %(pk)r не існує."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Зовнішній ключ (тип визначається відповідно поля)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Один-до-одного"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Багато-до-багатьох"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Затисніть клавішу \"Control\", або \"Command\" на Маку, щоб обрати більше "
 "однієї опції."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Це поле обов'язкове."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Введіть ціле число."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Введіть число."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Переконайтеся, що тут не більше ніж %s цифр загалом."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Переконайтеся, що тут не більше ніж %s цифр після десяткової коми."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Переконайтеся, що тут не більше ніж %s цифр до десяткової коми."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Введіть коректну дату."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Введіть коректний час."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Уведіть коректну дату/час адресу."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Файл не надіслано. Перевірте тип кодування форми."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Файл не було надіслано."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Переданий файл порожній."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -661,13 +682,13 @@ msgstr ""
 "Переконайтеся, що ім'я файлу містить щонайбільше %(max)d символів (зараз "
 "%(length)d)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 "Будь ласка, або завантажте файл, або відмітьте прапорець очищення, а не "
 "обидва варіанти одразу"
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -675,36 +696,40 @@ msgstr ""
 "Завантажте правильний малюнок. Файл, який ви завантажили, не є малюнком, або "
 "є зіпсованим малюнком."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Уведіть коректний URL."
+
+#: 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 "Зробить коректний вибір, %(value)s немає серед варіантів вибору."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Введіть список значень."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Послідовність"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Видалити"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Будь ласка, виправте повторювані дані для поля %(field)s."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Будь ласка, виправте повторювані дані для поля %(field)s, яке має бути "
 "унікальним."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -713,31 +738,31 @@ msgstr ""
 "Будь ласка, виправте повторювані дані для поля %(field_name)s, яке має бути "
 "унікальним для вибірки %(lookup)s на %(date_field)s."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Будь ласка, виправте повторювані значення нижче."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 "Зв'язаний зовнішній ключ не відповідає первісному ключу батьківського "
 "екземпляру."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Зробить коректний вибір. Такого варіанту нема серед доступних."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Зробить коректний вибір. Такого варіанту %s нема серед доступних."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" не є допустимим значенням для первинного ключа."
 
-#: forms/util.py:70
+#: forms/util.py:81
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
@@ -746,35 +771,35 @@ msgstr ""
 "%(datetime)s не може бути інтерпретована в часовому поясі "
 "%(current_timezone)s; дата може бути неодзначною або виявитись неіснуючою."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Наразі"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Змінити"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Очистити"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Так"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Ні"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "так,ні,можливо"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
@@ -782,52 +807,52 @@ msgstr[0] "%(size)d байт"
 msgstr[1] "%(size)d байти"
 msgstr[2] "%(size)d байтів"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s Кб"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s Мб"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s Гб"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s Тб"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s Пб"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "після полудня"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "до полудня"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "після полудня"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "до полудня"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "північ"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "полудень"
 
@@ -1103,128 +1128,113 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "грудня"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "або"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "рік"
 msgstr[1] "роки"
 msgstr[2] "років"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "місяць"
 msgstr[1] "місяці"
 msgstr[2] "місяців"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "тиждень"
 msgstr[1] "тижні"
 msgstr[2] "тижнів"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "день"
 msgstr[1] "дні"
 msgstr[2] "днів"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "година"
 msgstr[1] "години"
 msgstr[2] "годин"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "хвилина"
 msgstr[1] "хвилини"
 msgstr[2] "хвилин"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "хвилин(а)"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr "Перегляд списку файлів у цій директорії не дозволений."
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr "\"%(path)s\" не існує"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Вміст директорії %(directory)s"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "Об'єкт %(verbose_name)s був успішно створений."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Об'єкт %(verbose_name)s був успішно змінений."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "Об'єкт %(verbose_name)s був успішно видалений."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Рік не вказано"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Місяць не вказано"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "День не вказано"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Тиждень не вказано"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s недоступні"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1233,28 +1243,28 @@ msgstr ""
 "Майбутні %(verbose_name_plural)s недоступні, тому що %(class_name)s."
 "allow_future має нульове значення."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Недійсна дата '%(datestr)s' для формату '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Жодні %(verbose_name)s не були знайдені по запиту"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Неправильна величина параметра сторінки: вона повинна бути задана цілим "
 "числом або значенням 'last'."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Недійсний номер сторінки (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Невірна сторінка (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Порожній список і величина '%(class_name)s.allow_empty' є нульовою."
diff --git a/django/conf/locale/ur/LC_MESSAGES/django.mo b/django/conf/locale/ur/LC_MESSAGES/django.mo
index 672e3c8ca4..c33c1a33c6 100644
Binary files a/django/conf/locale/ur/LC_MESSAGES/django.mo and b/django/conf/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ur/LC_MESSAGES/django.po b/django/conf/locale/ur/LC_MESSAGES/django.po
index 0d6d7fca59..c5f599af29 100644
--- a/django/conf/locale/ur/LC_MESSAGES/django.po
+++ b/django/conf/locale/ur/LC_MESSAGES/django.po
@@ -6,360 +6,380 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+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: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "بنگالی"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "بوسنیائی"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "کیٹالانی"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "زیچ"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "ویلش"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "ڈینش"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "جرمن"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "گریک"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "انگلش"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "برطانوی انگلش"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "ھسپانوی"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "ارجنٹائنی سپینش"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr ""
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "اسٹانین"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "باسک"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "فارسی"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "فنش"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "فرانسیسی"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "فریسی"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "آئرش"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "گیلیشین"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "عبرانی"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "ھندی"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "کروشن"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "ھونگارین"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "انڈونیشین"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "آئس لینڈک"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "اطالوی"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "جاپانی"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "جارجیائی"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "خمر"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "کناڈا"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "کوریائی"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "لیتھونیائی"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "لتوینی"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "میسیڈونین"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "ملایالم"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "منگولین"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "نارویائی بوکمال"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "ڈچ"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "نارویائی نینورسک"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "پنجابی"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "پولش"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "پورتگیز"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "برازیلی پورتگیز"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "رومانی"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "روسی"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "سلووک"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "سلووینین"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "البانوی"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "سربین"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "سربین لاطینی"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "سویڈش"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "تاملی"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "تیلگو"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "تھائی"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "ترکش"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "یوکرائنی"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr ""
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "ویتنامی"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "سادی چینی"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "روایتی چینی"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "درست قیمت (ویلیو) درج کریں۔"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "یہ یو آر ایل (URL) ٹوٹا ہوا رابطہ (لنک) معلوم ھوتا ھے۔"
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "درست یو آر ایل (URL) درج کریں۔"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "برقی خط کا درست پتہ درج کریں۔"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "درست 'slug' درج کریں جو حروف، نمبروں، انڈرسکور یا ھائفنز پر مشتمل ھو۔"
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "IPv4 کا درست پتہ درج کریں۔"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "صرف اعداد درج کریں جو کوموں سے الگ کئے ھوئے ھوں۔"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "اس بات کا یقین کر لیں کہ یہ قیمت (ویلیو) %(limit_value)s ھے۔ (یہ "
 "%(show_value)s ھے)%(show_value)s"
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 ""
 "اس بات کا یقین کر لیں کہ یہ قیمت (ویلیو) %(limit_value)s سے کم یا اس کے "
 "برابر ھے۔"
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 ""
 "اس بات کا یقین کر لیں کہ یہ قیمت (ویلیو) %(limit_value)s سے زیادہ یا اس کے "
 "برابر ھے۔"
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -368,7 +388,7 @@ msgstr ""
 "اس بات کا یقین کر لیں کہ اس قیمت (ویلیو) میں کم از کم %(limit_value)d حروف "
 "ہیں۔ (اس میں %(show_value)d ہیں۔"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -377,272 +397,272 @@ msgstr ""
 "اس بات کا یقین کر لیں کہ اس قیمت (ویلیو) میں زیادہ سے زیادہ %(limit_value)d "
 "حروف ہیں۔ (اس میں %(show_value)d ھیں۔"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, 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:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "اور"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 اس %(field_label)s کے ساتھ پہلے ہی موجود ھے۔"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "قیمت (ویلیو) %r درست انتخاب نھیں ھے۔"
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "یہ خانہ نامعلوم (null( نھیں رہ سکتا۔"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "یہ خانہ خالی نھیں چھوڑا جا سکتا۔"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "%(field_type)s قسم کا خانہ"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "صحیح عدد"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "بولین (True یا False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "سلسلۂ حروف (String) (%(max_length)s تک)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr " کومے سے الگ کئے ھوئے صحیح اعداد"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "تاریخ (وقت کے بغیر)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "تاریخ (بمع وقت)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "اعشاری نمبر"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "برقی خط کا پتہ"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr ""
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "فائل کا راستہ(path("
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "نقطہ اعشاریہ والا نمبر"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "بڑا (8 بائٹ) صحیح عدد"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP ایڈریس"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "بولین (True، False یا None("
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "متن"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "وقت"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "یو آر ایل"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "ماڈل %(model)s پرائمری کلید (PK) %(pk)r کے ساتھ موجود نھیں۔"
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "بیرونی کلید (FK( (قسم متعلقہ خانے سے متعین ھو گی)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "ون-ٹو-ون ریلیشن شپ"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "مینی-ٹو-مینی ریلیشن شپ"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "ایک سے زیادہ منتخب کرنے کے لئے \"Control\" دبا کر رکھیں۔ یا Mac OS پر "
 "\"Command\""
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "یہ خانہ درکار ھے۔"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "مکمل نمبر درج کریں۔"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "نمبر درج کریں۔"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "اس بات کا یقین کر لیں کہ کل %s سے زیادہ اعداد ھیں۔"
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "اس بات کا یقین کر لیں کہ %s سے زیادہ اعشاری مقامات نہیں۔"
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "اس بات کا یقین کر لیں کہ نقطۂ اعشاریہ سے پہلے %s سے زیادہ اعداد نہیں۔"
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "درست تاریخ درج کریں۔"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "درست وقت درج کریں۔"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "درست تاریخ/وقت درج کریں۔"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "کوئی فائل پیش نہیں کی گئی۔ فارم پر اینکوڈنگ کی قسم چیک کریں۔"
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "کوئی فائل پیش نہیں کی گئی تھی۔"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "پیش کی گئی فائل خالی ھے۔"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -650,11 +670,11 @@ msgstr ""
 "اس بات کا یقین کر لیں کہ اس فائل کے نام میں زیادہ سے زیادہ %(max)d حروف ہیں۔ "
 "(اس میں %(length)d ہیں)"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "براہ مھربانی فائل پیش کریں یا Clear checkbox منتخب کریں۔ نہ کہ دونوں۔"
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -662,35 +682,39 @@ msgstr ""
 "درست تصویر اپ لوڈ کریں۔ جو فائل آپ نے اپ لوڈ کی تھی وہ تصویر نہیں تھی یا "
 "خراب تصویر تھی۔"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "درست یو آر ایل (URL) درج کریں۔"
+
+#: 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 "درست انتخاب منتخب کریں۔ %(value)s دستیاب انتخابات میں سے کوئی نہیں۔"
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "قیمتوں (ویلیوز) کی لسٹ درج کریں۔"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "ترتیب"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "مٹائیں"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "براہ کرم %(field)s کے لئے دوہرا مواد درست کریں۔"
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "براہ کرم %(field)s کے لئے دوہرا مواد درست کریں جوکہ منفرد ھونا ضروری ھے۔"
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -699,116 +723,116 @@ msgstr ""
 "براہ کرم %(field_name)s میں دوہرا مواد درست کریں جو کہ %(date_field)s میں "
 "%(lookup)s کے لئے منفرد ھونا ضروری ھے۔"
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "براہ کرم نیچے دوہری قیمتیں (ویلیوز) درست کریں۔"
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "ان لائن بیرونی کلید (FK) آبائی پرائمری کلید (PK) سے نھیں ملتی۔"
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "درست انتخاب منتخب کریں۔ یہ انتخاب دستیاب انتخابات میں سے کوئی نہیں ھے۔"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "درست انتخاب منتخب کریں۔ %s دستیاب انتخابات میں سے کوئی نہیں ھے۔"
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" پرائمری کلید (PK) کے لئے درست قیمت (ویلیو) نھیں ھے۔"
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "فی الحال"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "تبدیل کریں"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "صاف کریں"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "ھاں"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "نھیں"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "ھاں،نہیں،ھوسکتاہے"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d بائٹ"
 msgstr[1] "%(size)d بائٹس"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s ک ۔ ب"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s م ۔ ب"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s ج ۔ ب"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s ٹ ۔ ب"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s پ ۔ پ"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "شام"
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "صبح"
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "شام"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "صبح"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "نصف رات"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "دوپہر"
 
@@ -1084,148 +1108,133 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "دسمبر"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "یا"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr "،"
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "سال"
 msgstr[1] "سال"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "مھینہ"
 msgstr[1] "مھینے"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "ھفتہ"
 msgstr[1] "ھفتے"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "دن"
 msgstr[1] "دن"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "گھنٹہ"
 msgstr[1] "گھنٹے"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "منٹ"
 msgstr[1] "منٹ"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "منٹ"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr "، %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s کامیابی سے بنایا گیا تھا۔"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s کامیابی سے تازہ کیا گیا تھا۔"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s مٹا دیا گیا تھا۔"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/conf/locale/vi/LC_MESSAGES/django.mo b/django/conf/locale/vi/LC_MESSAGES/django.mo
index e7e58ed75b..12de6ff1ac 100644
Binary files a/django/conf/locale/vi/LC_MESSAGES/django.mo and b/django/conf/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/vi/LC_MESSAGES/django.po b/django/conf/locale/vi/LC_MESSAGES/django.po
index 1b470eca0c..2d579bd1ff 100644
--- a/django/conf/locale/vi/LC_MESSAGES/django.po
+++ b/django/conf/locale/vi/LC_MESSAGES/django.po
@@ -9,354 +9,374 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+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: Tran Van <vantxm@yahoo.co.uk>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "Tiếng Ả Rập"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Azerbaijani"
 msgstr "Azerbaijan"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "Tiếng Bun-ga-ri"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "Bengali"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "Tiếng Bosnia"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "Catalan"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "Séc"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "Xứ Wales"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "Tiếng Đan Mạch"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "Tiếng Đức"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "Tiếng Hy Lạp"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "Tiếng Anh"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "British English"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "Tiếng Tây Ban Nha"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "Argentinian Spanish"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "Tiếng Tây Ban Nha-Nicaragua"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "Tiếng Estonia"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "Tiếng Baxcơ"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "Tiếng Ba Tư"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "Tiếng Phần Lan"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "Tiếng Pháp"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "Tiếng Frisco"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "Tiếng Ai-len"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "Tiếng Pháp cổ"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "Tiếng Do Thái cổ"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "Tiếng Hindi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "Tiếng Croatia"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "Tiếng Hung-ga-ri"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "Tiếng In-đô-nê-xi-a"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "Tiếng Aixơlen"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "Tiếng Ý"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "Tiếng Nhật Bản"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "Georgian"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "Tiếng Khơ-me"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "Tiếng Kannada"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "Tiếng Hàn Quốc"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "Tiếng Lat-vi"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "Ngôn ngữ vùng Bantic"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "Tiếng Maxêđôni"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "Tiếng Malayalam"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "Tiếng Mông Cổ"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "Tiếng Na Uy Bokmål"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "Tiếng Hà Lan"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "Tiếng Na Uy Nynorsk"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "Tiếng Ba lan"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "Tiếng Bồ Đào Nha"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "Tiếng Ru-ma-ni"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "Tiếng Nga"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "Ngôn ngữ Slô-vac"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "Tiếng Slôven"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "Tiếng Albania"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "Tiếng Xéc-bi"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "Serbian Latin"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "Tiếng Thụy Điển"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "Tiếng Ta-min"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "Tiếng Thái"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "Tiếng Thổ Nhĩ Kỳ"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "Tiếng Ukraina"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "Urdu"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "Tiếng Việt Nam"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "Tiếng Trung Hoa giản thể"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "Tiếng Trung Hoa truyền thống"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "Nhập một giá trị hợp lệ."
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL này dường như là một liên kết hỏng."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "Nhập một URL hợp lệ."
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "Hãy nhập địa chỉ email hợp lệ."
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "Nhập một 'slug' hợp lệ gồm chữ cái, số, gạch dưới và gạch nối."
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "Nhập một địa chỉ IPv4 hợp lệ."
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "Chỉ nhập chữ số, cách nhau bằng dấu phẩy."
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr "Đảm bảo giá trị này là %(limit_value)s  (nó là %(show_value)s )."
 
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "Đảm bảo giá trị này là nhỏ hơn hoặc bằng với %(limit_value)s ."
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "Đảm bảo giá trị này lớn hơn hoặc bằng với %(limit_value)s ."
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -364,7 +384,7 @@ msgid ""
 msgstr ""
 "Đảm bảo giá trị này có ít nhất %(limit_value)d ký tự (nó có %(show_value)d)."
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -373,281 +393,281 @@ msgstr ""
 "Đảm bảo giá trị này có nhiều nhất %(limit_value)d ký tự (nó có "
 "%(show_value)d)."
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr " %(field_name)s  phải là duy nhất cho %(date_field)s  %(lookup)s ."
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "và"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 có %(field_label)s đã tồn tại."
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "Lựa chọn giá trị %r là không hợp lệ"
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "Trường này không thể để trống."
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "Trường này không được để trắng."
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Trường thuộc dạng: %(field_type)s "
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "Số nguyên"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (hoặc là Đúng hoặc là Sai)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Chuỗi (dài đến %(max_length)s ký tự )"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "Các số nguyên được phân cách bằng dấu phẩy"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "Ngày (không có giờ)"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
 
-#: db/models/fields/__init__.py:736
+#: 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 ""
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "Ngày (có giờ)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "Số thập phân"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "Địa chỉ email"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "Đường dẫn tắt tới file"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "Giá trị dấu chấm động"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "Big (8 byte) integer"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "Địa chỉ IP"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "Luận lý (Có thể Đúng, Sai hoặc Không cái nào đúng)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "Đoạn văn"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "Giờ"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "Đường dẫn URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "Model %(model)s  với %(pk)r không tồn tại."
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "Khóa ngoại (kiểu được xác định bởi trường liên hệ)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "Mối quan hệ một-một"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "Mối quan hệ nhiều-nhiều"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "Giữ \"Control\", hoặc \"Command\" trên Mac, để chọn nhiều hơn một."
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "Trường này là bắt buộc."
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "Nhập một số tổng thể."
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "Nhập một số."
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "Hãy chắc chắn rằng tổng cộng không nhiều hơn %s chữ số."
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Hãy chắc chắn rằng không có nhiều hơn %s chữ số thập phân."
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 "Hãy chắc chắn rằng không có nhiều hơn %s chữ số trước dấu phẩy thập phân."
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "Nhập một ngày hợp lệ."
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "Nhập một thời gian hợp lệ."
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "Nhập một ngày/thời gian hợp lệ."
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Không có tập tin nào được gửi. Hãy kiểm tra kiểu mã hóa của biểu mẫu."
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "Không có tập tin nào được gửi."
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "Tập tin được gửi là rỗng."
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "Đảm bảo tên tập tin này có nhiều nhất %(max)d ký tự (nó có %(length)d ký tự)."
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Vui lòng gửi một tập tin hoặc để ô chọn trắng, không chọn cả hai."
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -655,36 +675,40 @@ msgstr ""
 "Hãy tải lên một hình ảnh hợp lệ. Tập tin mà bạn đã tải không phải là hình "
 "ảnh hoặc đã bị hư hỏng."
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "Nhập một URL hợp lệ."
+
+#: 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 ""
 "Hãy chọn một lựa chọn hợp lệ. %(value)s không phải là một trong các lựa chọn "
 "khả thi."
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "Nhập một danh sách giá trị."
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "Thứ tự"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "Xóa"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Hãy sửa các dữ liệu trùng lặp cho %(field)s ."
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Hãy sửa các dữ liệu trùng lặp cho %(field)s, mà phải là duy nhất."
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -693,117 +717,117 @@ msgstr ""
 "Hãy sửa các dữ liệu trùng lặp cho %(field_name)s  mà phải là duy nhất cho "
 "%(lookup)s tại %(date_field)s ."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "Hãy sửa các giá trị trùng lặp dưới đây."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "Khóa ngoại không tương ứng với khóa chính của đối tượng cha."
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Hãy chọn một lựa chọn hợp lệ. Lựa chọn đó không phải là một trong các lựa "
 "chọn khả thi."
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Hãy chọn một giá trị hợp lệ. %s không phải là lựa chọn phù hợp."
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" không phải là giá trị hợp lệ cho một khóa chính."
 
-#: forms/util.py:70
+#: 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 ""
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "Hiện nay"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "Thay đổi"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "Xóa"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "Chưa xác định"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "Có"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "Không"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "Có, Không, Có thể"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "chiều"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "sáng"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "Nửa đêm"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "Buổi trưa"
 
@@ -1079,116 +1103,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "Tháng mười hai"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "hoặc"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "năm"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "tháng"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "tuần"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ngày"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "giờ"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "phút"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "phút"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s đã được tạo thành công."
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s đã được cập nhật thành công."
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s đã bị xóa."
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "Không có năm xác định"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "Không có tháng xác định"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "Không có ngày xác định"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "Không có tuần xác định"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "Không có %(verbose_name_plural)s  phù hợp"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1197,27 +1206,27 @@ msgstr ""
 "%(verbose_name_plural)s trong tương lai không có sẵn vì %(class_name)s."
 "allow_future là False."
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "Chuỗi ngày không hợp lệ ' %(datestr)s' định dạng bởi '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Không có %(verbose_name)s tìm thấy phù hợp với truy vấn"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 "Trang không phải là 'nhất', và cũng không nó có thể được chuyển đổi sang int."
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "Trang không hợp lệ (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Danh sách rỗng và '%(class_name)s.allow_empty' là sai."
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index c63967a562..7148fa22d8 100644
Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index c8f0e1b928..ac4a4b2022 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -2,6 +2,7 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Kevin Shi <leiarix@gmail.com>, 2012.
 # Lele Long <schemacs@gmail.com>, 2011.
 # slene <vslene@gmail.com>, 2011.
 # Ziang Song <songziang@gmail.com>, 2011, 2012.
@@ -9,673 +10,698 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+0100\n"
-"PO-Revision-Date: 2012-03-08 16:49+0000\n"
-"Last-Translator: Ziang Song <songziang@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "孟加拉语"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "波斯尼亚语"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "捷克语"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "威尔士语"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "丹麦语"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "德语"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "希腊语"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "英语"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "英国英语"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "世界语"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "阿根廷西班牙语"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
 msgstr "墨西哥西班牙语"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
 msgstr "尼加拉瓜西班牙语"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "爱沙尼亚语"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "巴斯克语"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "波斯语"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "法语"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "夫里斯兰语"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "爱尔兰语"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "加利西亚语"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "希伯来语"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "北印度语"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "克罗地亚语"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "印尼语"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "冰岛语"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "意大利语"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "日语"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "格鲁吉亚语"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "哈萨克语"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "高棉语"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "埃纳德语"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "韩语"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "拉脱维亚语"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "马来亚拉姆语"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "蒙古语"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "挪威博克马尔"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "尼泊尔语"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "新挪威语"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "旁遮普语 "
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "波兰语"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "巴西葡萄牙语"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "俄语"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "阿尔巴尼亚语"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "塞尔维亚拉丁语"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "斯瓦西里语"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "泰米尔语"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "泰卢固语"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "泰语"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "鞑靼语"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
 msgstr "乌尔都语"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "输入一个有效的值。"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL %s 似乎是一个已损坏的链接。"
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
+msgstr ""
 
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "输入一个有效的 URL。"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr "输入一个有效的 e-mail 地址。"
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "输入一个有效的 'slug'，由字母、数字、下划线或横线组成。"
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "输入一个有效的 IPv4 地址。"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
 msgstr "填写合法的IPv6地址。"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "输入可用的IPv4 或 IPv6 地址."
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "只能输入用逗号分隔的数字。"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "确保该值小于或等于%(limit_value)s。"
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "确保该值大于或等于%(limit_value)s。"
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr "确保该值不少于 %(limit_value)d 个字符 (现在有 %(show_value)d 个)。"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr "确保该值不多于 %(limit_value)d 个字符 (现在有 %(show_value)d 个)。"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "在%(date_field)s %(lookup)s 需要唯一的 %(field_name)s"
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "和"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "具有 %(field_label)s 的 %(model_name)s 已存在。"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "值 %r 不是有效选项。"
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "这个值不能为 null。"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "此字段不能为空。"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "字段类型：%(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "整数"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
 msgstr "'%s' 值必须为一个整数（integer）类型。"
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "'%s' 值必须为 True 或 False."
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "布尔值（真或假）"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "字符串（最长 %(max_length)s 位）"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "逗号分隔的整数"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
+msgstr "'%s' 值的日期格式无效. 必须为 YYYY-MM-DD 格式."
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
+msgstr "'%s' 值的格式 (YYYY-MM-DD)正确， 但日期无效."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "日期（无时间）"
 
-#: db/models/fields/__init__.py:732
+#: 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 ""
+msgstr "'%s' 值格式无效. 必须为 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 格式."
 
-#: db/models/fields/__init__.py:736
+#: 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' 值格式正确 (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) 但是日期/时间无效."
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "日期（带时间）"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "'%s' 值必须为十进制小数."
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "小数"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
-msgstr "E-mail 地址"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
+msgstr "Email 地址"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "文件路径"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
-msgstr ""
+msgstr "'%s' 值必须为浮点数."
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "浮点数"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "大整数(8字节)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "IPv4 地址"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP 地址"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "'%s' 值必须为 None, True 或者 False."
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "布尔值（真、假或无)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "正整数"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "正小整数"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Slug (多达 %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "小整数"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "文本"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
+msgstr "'%s' 值格式无效. 必须为HH:MM[:ss[.uuuuuu]] 格式."
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
+msgstr "'%s' 值格式正确 (HH:MM[:ss[.uuuuuu]]) 但是时间无效."
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "时间"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "文件"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "图像"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "模型 %(model)s 的外键 %(pk)r 不存在。"
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "外键(由相关字段确定)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "一对一关系"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "多对多关系"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "按下 \"Control\"，或者在Mac上按 \"Command\" 来选择多个值。"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "这个字段是必填项。"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "输入整数。"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "输入一个数字。"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "确认数字全长不超过 %s 位。"
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "确认小数不超过 %s 位。"
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "确认小数点前不超过 %s 位。"
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "输入一个有效的日期。"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "输入一个有效的时间。"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "输入一个有效的日期/时间。"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "未提交文件。请检查表单的编码类型。"
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "没有提交文件。"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "所提交的是空文件。"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr "确保文件名不多于 %(max)d 个字符 (现在有 %(length)d 个)。"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "请提交文件或勾选清除复选框，两者其一即可。"
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr "请上传一张有效的图片。您所上传的文件不是图片或者是已损坏的图片。"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "输入一个有效的 URL。"
+
+#: 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 "选择一个有效的选项。 %(value)s 不在可用的选项中。"
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "输入一系列值。"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "排序"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "删除"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "请修改%(field)s的重复数据"
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "请修改%(field)s的重复数据.这个字段必须唯一"
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -684,115 +710,117 @@ msgstr ""
 "请修正%(field_name)s的重复数据。%(date_field)s %(lookup)s 在 %(field_name)s "
 "必须保证唯一."
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "请修正重复的数据."
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "内联外键与父实例的主键不匹配。"
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "选择一个有效的选项： 该选择不在可用的选项中。"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "选择一个有效的选项： '%s' 不在可用的选项中。"
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" 不是"
 
-#: forms/util.py:70
+#: 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 不能在时区 %(current_timezone)s正确解读; 可能时间有歧义或者不存"
+"在."
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "目前"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "修改"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "清除"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "未知"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "是"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "否"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "是、否、也许"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d 字节"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "午夜"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "中午"
 
@@ -1068,116 +1096,101 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "十二月"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "或"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr "，"
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "年"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "月"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "周"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "分钟"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "这里不允许目录索引"
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" 不存在"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "%(directory)s的索引"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s 创建成功。"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s 更新成功。"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s 已被删除。"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
 msgstr "没有指定年"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
 msgstr "没有指定月"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
 msgstr "没有指定天"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
 msgstr "没有指定周"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr "%(verbose_name_plural)s 不存在"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1186,26 +1199,26 @@ msgstr ""
 "因为 %(class_name)s.allow_future 设置为 False，所以特性 "
 "%(verbose_name_plural)s 不可用。"
 
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr "日期文字 '%(datestr)s' 不匹配格式 '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "没有找到符合查询的 %(verbose_name)s"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr "page 不等于 'last'，或者它不能被转为数字。"
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr "没有第 (%(page_number)s) 页了"
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "列表是空的并且'%(class_name)s.allow_empty 设置为 False'"
diff --git a/django/conf/locale/zh_CN/formats.py b/django/conf/locale/zh_CN/formats.py
index bf26f4b31c..4355928ca0 100644
--- a/django/conf/locale/zh_CN/formats.py
+++ b/django/conf/locale/zh_CN/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo
index c366fb6095..6b77703b85 100644
Binary files a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo and b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.po b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
index a06b0c0a2d..b011954e75 100644
--- a/django/conf/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,361 +1,383 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <ilay@ilay.tw>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # ming hsien tzang <tzangms@gmail.com>, 2011.
 # tcc <tcchou@tcchou.org>, 2011.
+#   <yyc1217@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:33+0100\n"
-"PO-Revision-Date: 2012-03-08 12:00+0000\n"
-"Last-Translator: tcc <tcchou@tcchou.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:47+0000\n"
+"Last-Translator: yyc1217 <yyc1217@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: conf/global_settings.py:48
+msgid "Afrikaans"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Arabic"
 msgstr "阿拉伯語"
 
-#: conf/global_settings.py:49
-msgid "Azerbaijani"
-msgstr ""
-
 #: conf/global_settings.py:50
+msgid "Azerbaijani"
+msgstr "阿塞拜疆(Azerbaijani)"
+
+#: conf/global_settings.py:51
 msgid "Bulgarian"
 msgstr "保加利亞語"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Belarusian"
+msgstr "白俄羅斯人"
+
+#: conf/global_settings.py:53
 msgid "Bengali"
 msgstr "孟加拉語"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
+msgid "Breton"
+msgstr ""
+
+#: conf/global_settings.py:55
 msgid "Bosnian"
 msgstr "波士尼亞語"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
 msgid "Catalan"
 msgstr "嘉泰羅尼亞語"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
 msgid "Czech"
 msgstr "捷克語"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
 msgid "Welsh"
 msgstr "威爾斯語"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
 msgid "Danish"
 msgstr "丹麥語"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
 msgid "German"
 msgstr "德語"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
 msgid "Greek"
 msgstr "希臘語"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
 msgid "English"
 msgstr "英語"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
 msgid "British English"
 msgstr "英國英語"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
 msgid "Esperanto"
-msgstr ""
+msgstr "世界語(Esperanto)"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
 msgid "Spanish"
 msgstr "西班牙語"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
 msgid "Argentinian Spanish"
 msgstr "阿根廷西班牙語"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
 msgid "Mexican Spanish"
-msgstr ""
+msgstr "墨西哥西班牙語(Mexican Spanish)"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
 msgid "Nicaraguan Spanish"
-msgstr ""
+msgstr "尼加拉瓜西班牙語(Nicaraguan Spanish)"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
+msgid "Venezuelan Spanish"
+msgstr "委內瑞拉西班牙人"
+
+#: conf/global_settings.py:70
 msgid "Estonian"
 msgstr "愛沙尼亞語"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Basque"
 msgstr "巴斯克語"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Persian"
 msgstr "波斯語"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Finnish"
 msgstr "芬蘭語"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "French"
 msgstr "法語"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Frisian"
 msgstr "弗里斯蘭語"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Irish"
 msgstr "愛爾蘭語"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Galician"
 msgstr "加里西亞語"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Hebrew"
 msgstr "希伯來語"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Hindi"
 msgstr "印度語"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Croatian"
 msgstr "克羅埃西亞語"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Hungarian"
 msgstr "匈牙利語"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
+msgid "Interlingua"
+msgstr ""
+
+#: conf/global_settings.py:83
 msgid "Indonesian"
 msgstr "印尼語"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
 msgid "Icelandic"
 msgstr "冰島語"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
 msgid "Italian"
 msgstr "義大利語"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
 msgid "Japanese"
 msgstr "日語"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
 msgid "Georgian"
 msgstr "喬治亞語"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
 msgid "Kazakh"
-msgstr ""
+msgstr "哈薩克(Kazakh)"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
 msgid "Khmer"
 msgstr "高棉語"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
 msgid "Kannada"
 msgstr "坎那達語"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:91
 msgid "Korean"
 msgstr "韓語"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:92
+msgid "Luxembourgish"
+msgstr ""
+
+#: conf/global_settings.py:93
 msgid "Lithuanian"
 msgstr "立陶宛語"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:94
 msgid "Latvian"
 msgstr "拉脫維亞語"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:95
 msgid "Macedonian"
 msgstr "馬其頓語"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:96
 msgid "Malayalam"
 msgstr "馬來亞拉姆語"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:97
 msgid "Mongolian"
 msgstr "蒙古語"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:98
 msgid "Norwegian Bokmal"
 msgstr "挪威語（波克默爾）"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:99
 msgid "Nepali"
-msgstr ""
+msgstr "尼泊爾(Nepali)"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:100
 msgid "Dutch"
 msgstr "荷蘭語"
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:101
 msgid "Norwegian Nynorsk"
 msgstr "挪威語（尼諾斯克）"
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:102
 msgid "Punjabi"
 msgstr "旁遮普語"
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:103
 msgid "Polish"
 msgstr "波蘭嶼"
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:104
 msgid "Portuguese"
 msgstr "葡萄牙語"
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:105
 msgid "Brazilian Portuguese"
 msgstr "巴西葡萄牙語"
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:106
 msgid "Romanian"
 msgstr "羅馬尼亞語"
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:107
 msgid "Russian"
 msgstr "俄語"
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:108
 msgid "Slovak"
 msgstr "斯洛伐克語"
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:109
 msgid "Slovenian"
 msgstr "斯洛維尼亞語"
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:110
 msgid "Albanian"
 msgstr "阿爾巴尼亞語"
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:111
 msgid "Serbian"
 msgstr "塞爾維亞語"
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:112
 msgid "Serbian Latin"
 msgstr "塞爾維亞拉丁語"
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:113
 msgid "Swedish"
 msgstr "瑞典語"
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:114
 msgid "Swahili"
-msgstr ""
+msgstr "斯瓦希裡(Swahili)"
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:115
 msgid "Tamil"
 msgstr "坦米爾語"
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:116
 msgid "Telugu"
 msgstr "泰盧固語"
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:117
 msgid "Thai"
 msgstr "泰語"
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:118
 msgid "Turkish"
 msgstr "土耳其語"
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:119
 msgid "Tatar"
+msgstr "韃靼(Tatar)"
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:121
 msgid "Ukrainian"
 msgstr "烏克蘭語"
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:122
 msgid "Urdu"
-msgstr ""
+msgstr "烏爾都語(Urdu)"
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:123
 msgid "Vietnamese"
 msgstr "越南語"
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:124
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr "繁體中文"
 
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
 msgid "Enter a valid value."
 msgstr "輸入有效的值"
 
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
-msgstr "URL %s 似乎是是斷掉的連結。"
-
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr "輸入有效的URL"
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
 msgstr "輸入有效的電子郵件地址。"
 
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "輸入一個有效的 'slug'，由字母、數字、底線與連字號組成。"
 
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
 msgid "Enter a valid IPv4 address."
 msgstr "輸入有效的 IPv4 位址。"
 
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
 msgid "Enter a valid IPv6 address."
-msgstr ""
+msgstr "請輸入有效的 IPv6 位址。"
 
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
+msgstr "請輸入有效的 IPv4 或 IPv6 位址。"
 
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
 msgid "Enter only digits separated by commas."
 msgstr "輸入以逗號分隔的數字。"
 
-#: core/validators.py:215
+#: core/validators.py:157
 #, 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:233 forms/fields.py:209 forms/fields.py:262
+#: 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 "確認這個數值是否小於或等於 %(limit_value)s。"
 
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: 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 "確認這個數值是否大於或等於 %(limit_value)s。"
 
-#: core/validators.py:244
+#: core/validators.py:189
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d characters (it has "
@@ -363,7 +385,7 @@ msgid ""
 msgstr ""
 "請確認這個內容至少要 %(limit_value)d 個字元 (目前有 %(show_value)d 個字)。"
 
-#: core/validators.py:250
+#: core/validators.py:196
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d characters (it has "
@@ -372,312 +394,318 @@ msgstr ""
 "請確認這個內容最多只能有 %(limit_value)d 個字元 (目前有 %(show_value)d 個"
 "字)。"
 
-#: db/models/base.py:764
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(date_field)s 的 %(lookup)s 在 %(field_name)s 必須是唯一的。"
 
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr "和"
 
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: 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 "這個 %(field_label)s 在 %(model_name)s 已經存在。"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr "數值 %r 並非是一個有效的選擇"
 
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
 msgid "This field cannot be null."
 msgstr "這個值不能是 null。"
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
 msgid "This field cannot be blank."
 msgstr "這個欄位不能留白"
 
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "欄位型態： %(field_type)s"
 
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
 msgid "Integer"
 msgstr "整數"
 
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
 #, python-format
 msgid "'%s' value must be an integer."
-msgstr ""
+msgstr "'%s' 的值必須為一個整數。"
 
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
 #, python-format
 msgid "'%s' value must be either True or False."
-msgstr ""
+msgstr "'%s' 的值必須為 True 或 False。"
 
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
 msgid "Boolean (Either True or False)"
 msgstr "布林值 (True 或 False)"
 
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "字串 (最長到 %(max_length)s 個字)"
 
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
 msgid "Comma-separated integers"
 msgstr "逗號分隔的整數"
 
-#: db/models/fields/__init__.py:647
+#: 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 ""
+msgstr "'%s' 的值為無效的日期格式。其格式必須為 YYYY-MM-DD 形式。"
 
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: 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 ""
+msgstr "'%s' 的值為有效的格式 (YYYY-MM-DD) 但日期有誤。"
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
 msgid "Date (without time)"
 msgstr "日期 (不包括時間)"
 
-#: db/models/fields/__init__.py:732
+#: 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' 的值為無效的格式。其格式必須為 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 形式。"
 
-#: db/models/fields/__init__.py:736
+#: 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' 的值為有效格式 (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) 但日期/時間有誤。"
 
-#: db/models/fields/__init__.py:740
+#: db/models/fields/__init__.py:760
 msgid "Date (with time)"
 msgstr "日期 (包括時間)"
 
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
 #, python-format
 msgid "'%s' value must be a decimal number."
-msgstr ""
+msgstr "'%s' 的值必須為一個十進位數字。"
 
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
 msgid "Decimal number"
 msgstr "十進位數(小數可)"
 
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
 msgstr "電子郵件地址"
 
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
 msgid "File path"
 msgstr "檔案路徑"
 
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
 #, python-format
 msgid "'%s' value must be a float."
-msgstr ""
+msgstr "'%s' 的值必須為浮點數。"
 
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
 msgid "Floating point number"
 msgstr "浮點數"
 
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
 msgid "Big (8 byte) integer"
 msgstr "大整數(8位元組)"
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "IPv4 address"
-msgstr ""
+msgstr "IPv4 地址"
 
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
 msgid "IP address"
 msgstr "IP 位址"
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
 #, python-format
 msgid "'%s' value must be either None, True or False."
-msgstr ""
+msgstr "'%s' 的值必須為空，True 或是 False。"
 
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
 msgid "Boolean (Either True, False or None)"
 msgstr "布林值 (True, False 或 None)"
 
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
 msgid "Positive integer"
-msgstr ""
+msgstr "正整數"
 
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
 msgid "Positive small integer"
-msgstr ""
+msgstr "正小整數"
 
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "可讀網址 (長度最多 %(max_length)s)"
 
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
 msgid "Small integer"
-msgstr ""
+msgstr "小整數"
 
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
 msgid "Text"
 msgstr "文字"
 
-#: db/models/fields/__init__.py:1180
+#: 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 ""
+msgstr "'%s' 的值為無效的格式。其格式必須為 HH:MM[:ss[.uuuuuu]] 形式。"
 
-#: db/models/fields/__init__.py:1182
+#: 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 ""
+msgstr "'%s' 的值為有效的格式 (HH:MM[:ss[.uuuuuu]]) 但時間有誤。"
 
-#: db/models/fields/__init__.py:1185
+#: db/models/fields/__init__.py:1210
 msgid "Time"
 msgstr "時間"
 
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
 msgid "URL"
 msgstr "URL"
 
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:216
 msgid "File"
-msgstr ""
+msgstr "檔案"
 
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:323
 msgid "Image"
-msgstr ""
+msgstr "影像"
 
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr "PK 為 %(pk)r 的 Model %(model)s 不存在。"
 
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr "外鍵 (型態由關連欄位決定)"
 
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr "一對一關連"
 
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr "多對多關連"
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "按住 \"Control\", 或者在 Mac 上按 \"Command\", 以選取更多值"
 
-#: forms/fields.py:50
+#: forms/fields.py:51
 msgid "This field is required."
 msgstr "這個欄位是必須的。"
 
-#: forms/fields.py:208
+#: forms/fields.py:209
 msgid "Enter a whole number."
 msgstr "輸入整數"
 
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
 msgid "Enter a number."
 msgstr "輸入一個數字"
 
-#: forms/fields.py:264
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "確認數字全長不超過 %s 位。"
 
-#: forms/fields.py:265
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "確認想小數不超過 %s 位。"
 
-#: forms/fields.py:266
+#: forms/fields.py:267
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "確認想小數點前不超過 %s 位。"
 
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
 msgid "Enter a valid date."
 msgstr "輸入有效的日期"
 
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
 msgid "Enter a valid time."
 msgstr "輸入有效的時間"
 
-#: forms/fields.py:409
+#: forms/fields.py:399
 msgid "Enter a valid date/time."
 msgstr "輸入有效的日期/時間"
 
-#: forms/fields.py:485
+#: forms/fields.py:475
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "沒有檔案被送出。請檢查表單的編碼類型。"
 
-#: forms/fields.py:486
+#: forms/fields.py:476
 msgid "No file was submitted."
 msgstr "沒有檔案送出"
 
-#: forms/fields.py:487
+#: forms/fields.py:477
 msgid "The submitted file is empty."
 msgstr "送出的檔案是空的。"
 
-#: forms/fields.py:488
+#: forms/fields.py:478
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr "請確認這個檔名最多只能有 %(max)d 個字元 (它現在是 %(length)d 個字)。"
 
-#: forms/fields.py:489
+#: forms/fields.py:479
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "請提交一個檔案或確認清除核可項, 不能兩者都做。"
 
-#: forms/fields.py:544
+#: forms/fields.py:534
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
-msgstr "上傳一個有效的圖片。你上傳的檔案不是圖片，否則就是壞掉的圖。"
+msgstr "上傳一個有效的圖檔。你上傳的檔案為非圖片，不然就是損壞的圖檔。"
 
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr "輸入有效的URL"
+
+#: 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 "請選擇有效的項目, %(value)s 不是一個可用的選擇。"
 
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr "輸入一個列表的值"
 
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr "排序"
 
-#: forms/formsets.py:321
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr "刪除"
 
-#: forms/models.py:571
+#: forms/models.py:567
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "請修正 %(field)s 的重覆資料"
 
-#: forms/models.py:575
+#: forms/models.py:571
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "請修正 %(field)s 的重覆資料, 必須為唯一值"
 
-#: forms/models.py:581
+#: forms/models.py:577
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -685,115 +713,117 @@ msgid ""
 msgstr ""
 "請修正 %(field_name)s 重複資料, %(date_field)s 的 %(lookup)s 必須是唯一值。"
 
-#: forms/models.py:589
+#: forms/models.py:585
 msgid "Please correct the duplicate values below."
 msgstr "請修正下方重覆的數值"
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr "內含的外鍵無法連接到對應的上層實體主鍵。"
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "選擇有效的選項： 此選擇不在可用的選項中。"
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "選擇一個有效的選項： '%s' 不在可用的選項中。"
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" 不是一個主鍵的有效資料。"
 
-#: forms/util.py:70
+#: 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 無法被轉換成 %(current_timezone)s 時區格式; 可能是不符格式或不存"
+"在。"
 
-#: forms/widgets.py:325
+#: forms/widgets.py:336
 msgid "Currently"
 msgstr "目前"
 
-#: forms/widgets.py:326
+#: forms/widgets.py:337
 msgid "Change"
 msgstr "變更"
 
-#: forms/widgets.py:327
+#: forms/widgets.py:338
 msgid "Clear"
 msgstr "清除"
 
-#: forms/widgets.py:582
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr "未知"
 
-#: forms/widgets.py:583
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr "是"
 
-#: forms/widgets.py:584
+#: forms/widgets.py:596
 msgid "No"
 msgstr "否"
 
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
 msgid "yes,no,maybe"
 msgstr "是、否、也許"
 
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d 位元組"
 
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
 #, python-format
 msgid "%s TB"
 msgstr "%s TB"
 
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
 #, python-format
 msgid "%s PB"
 msgstr "%s PB"
 
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
 msgid "midnight"
 msgstr "午夜"
 
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
 msgid "noon"
 msgstr "中午"
 
@@ -1069,142 +1099,129 @@ msgctxt "alt. month"
 msgid "December"
 msgstr "十二月"
 
-#: utils/text.py:65
+#: utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
-msgstr ""
+msgstr "%(truncated_text)s..."
 
-#: utils/text.py:234
+#: utils/text.py:239
 msgid "or"
 msgstr "或"
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
 msgid ", "
 msgstr ", "
 
-#: utils/timesince.py:20
+#: utils/timesince.py:22
 msgid "year"
 msgid_plural "years"
 msgstr[0] "年"
 
-#: utils/timesince.py:21
+#: utils/timesince.py:23
 msgid "month"
 msgid_plural "months"
 msgstr[0] "月"
 
-#: utils/timesince.py:22
+#: utils/timesince.py:24
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "週"
 
-#: utils/timesince.py:23
+#: utils/timesince.py:25
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: utils/timesince.py:24
+#: utils/timesince.py:26
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: utils/timesince.py:25
+#: utils/timesince.py:27
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
-#: utils/timesince.py:41
+#: utils/timesince.py:43
 msgid "minutes"
 msgstr "分鐘"
 
-#: utils/timesince.py:46
+#: utils/timesince.py:48
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:52
+#: utils/timesince.py:54
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: views/static.py:52
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "這裡不允許目錄索引。"
 
-#: views/static.py:54
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr ""
+msgstr "\"%(path)s\" 路徑不存在"
 
-#: views/static.py:95
+#: views/static.py:98
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "%(directory)s 的索引"
 
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s 新增成功。"
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s 變更成功。"
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s 已被刪除。"
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
 msgid "No year specified"
-msgstr ""
+msgstr "不指定年份"
 
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
 msgid "No month specified"
-msgstr ""
+msgstr "不指定月份"
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
 msgid "No day specified"
-msgstr ""
+msgstr "不指定日期"
 
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
 msgid "No week specified"
-msgstr ""
+msgstr "不指定週數"
 
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
 #, python-format
 msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "%(verbose_name_plural)s 無法使用"
 
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
 #, 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:501
+#: views/generic/dates.py:678
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "無效的日期字串 '%(datestr)s' 可接受格式 '%(format)s'"
 
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "無 %(verbose_name)s 符合本次搜尋"
 
-#: views/generic/list.py:45
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "頁面不是最後一頁，也無法被轉換為整數。"
 
-#: views/generic/list.py:50
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "無效的頁面 (%(page_number)s): %(message)s"
 
-#: views/generic/list.py:117
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "為空list且 '%(class_name)s.allow_empty' 為False."
diff --git a/django/conf/locale/zh_TW/formats.py b/django/conf/locale/zh_TW/formats.py
index bf26f4b31c..4355928ca0 100644
--- a/django/conf/locale/zh_TW/formats.py
+++ b/django/conf/locale/zh_TW/formats.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
+from __future__ import unicode_literals
 
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
diff --git a/django/conf/project_template/project_name/settings.py b/django/conf/project_template/project_name/settings.py
index 559e27ca16..efe8091e81 100644
--- a/django/conf/project_template/project_name/settings.py
+++ b/django/conf/project_template/project_name/settings.py
@@ -1,152 +1,82 @@
-# Django settings for {{ project_name }} project.
+"""
+Django settings for {{ project_name }} project.
 
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
+For more information on this file, see
+https://docs.djangoproject.com/en/{{ docs_version }}/topics/settings/
 
-ADMINS = (
-    # ('Your Name', 'your_email@example.com'),
-)
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/{{ docs_version }}/ref/settings/
+"""
 
-MANAGERS = ADMINS
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import os
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': '',                      # Or path to database file if using sqlite3.
-        # The following settings are not used with sqlite3:
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '',                      # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
-        'PORT': '',                      # Set to empty string for default.
-    }
-}
 
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# In a Windows environment this must be set to your system time zone.
-TIME_ZONE = 'America/Chicago'
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/{{ docs_version }}/howto/deployment/checklist/
 
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale.
-USE_L10N = True
-
-# If you set this to False, Django will not use timezone-aware datetimes.
-USE_TZ = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/var/www/example.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://example.com/media/", "http://media.example.com/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/var/www/example.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://example.com/static/", "http://static.example.com/"
-STATIC_URL = '/static/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
+# SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = '{{ secret_key }}'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-    # 'django.template.loaders.eggs.Loader',
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+TEMPLATE_DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = (
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
 )
 
 MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    # Uncomment the next line for simple clickjacking protection:
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
 ROOT_URLCONF = '{{ project_name }}.urls'
 
-# Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = '{{ project_name }}.wsgi.application'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
 
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
-    # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
-)
+# Database
+# https://docs.djangoproject.com/en/{{ docs_version }}/ref/settings/#databases
 
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error when DEBUG=False.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
-        }
-    },
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
+
+# Internationalization
+# https://docs.djangoproject.com/en/{{ docs_version }}/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/{{ docs_version }}/howto/static-files/
+
+STATIC_URL = '/static/'
diff --git a/django/conf/project_template/project_name/urls.py b/django/conf/project_template/project_name/urls.py
index eb471d54a8..f03a29478d 100644
--- a/django/conf/project_template/project_name/urls.py
+++ b/django/conf/project_template/project_name/urls.py
@@ -1,17 +1,12 @@
 from django.conf.urls import patterns, include, url
 
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
     # Examples:
     # url(r'^$', '{{ project_name }}.views.home', name='home'),
-    # url(r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')),
+    # url(r'^blog/', include('blog.urls')),
 
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', include(admin.site.urls)),
 )
diff --git a/django/conf/project_template/project_name/wsgi.py b/django/conf/project_template/project_name/wsgi.py
index f768265b23..94d60c8cf9 100644
--- a/django/conf/project_template/project_name/wsgi.py
+++ b/django/conf/project_template/project_name/wsgi.py
@@ -1,32 +1,14 @@
 """
 WSGI config for {{ project_name }} project.
 
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
+It exposes the WSGI callable as a module-level variable named ``application``.
 
+For more information on this file, see
+https://docs.djangoproject.com/en/{{ docs_version }}/howto/deployment/wsgi/
 """
-import os
 
-# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
-# if running multiple sites in the same mod_wsgi process. To fix this, use
-# mod_wsgi daemon mode with each site in its own daemon process, or use
-# os.environ["DJANGO_SETTINGS_MODULE"] = "{{ project_name }}.settings"
+import os
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings")
 
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)
diff --git a/django/conf/urls/defaults.py b/django/conf/urls/defaults.py
deleted file mode 100644
index 7d5c738bad..0000000000
--- a/django/conf/urls/defaults.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import warnings
-warnings.warn("django.conf.urls.defaults is deprecated; use django.conf.urls instead",
-              DeprecationWarning)
-
-from django.conf.urls import (handler403, handler404, handler500,
-        include, patterns, url)
diff --git a/django/conf/urls/shortcut.py b/django/conf/urls/shortcut.py
index 6eb2e55e68..c00d176ad6 100644
--- a/django/conf/urls/shortcut.py
+++ b/django/conf/urls/shortcut.py
@@ -1,5 +1,10 @@
+import warnings
+
 from django.conf.urls import patterns
 
+warnings.warn("django.conf.urls.shortcut will be removed in Django 1.8.",
+    PendingDeprecationWarning)
+
 urlpatterns = patterns('django.views',
     (r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'),
 )
diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py
index 201101736e..a56c6a6168 100644
--- a/django/contrib/admin/actions.py
+++ b/django/contrib/admin/actions.py
@@ -3,6 +3,7 @@ Built-in, globally-available admin actions.
 """
 
 from django.core.exceptions import PermissionDenied
+from django.contrib import messages
 from django.contrib.admin import helpers
 from django.contrib.admin.util import get_deleted_objects, model_ngettext
 from django.db import router
@@ -47,7 +48,7 @@ def delete_selected(modeladmin, request, queryset):
             queryset.delete()
             modeladmin.message_user(request, _("Successfully deleted %(count)d %(items)s.") % {
                 "count": n, "items": model_ngettext(modeladmin.opts, n)
-            })
+            }, messages.SUCCESS)
         # Return None to display the change list page again.
         return None
 
@@ -75,7 +76,7 @@ def delete_selected(modeladmin, request, queryset):
 
     # Display the confirmation page
     return TemplateResponse(request, modeladmin.delete_selected_confirmation_template or [
-        "admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.object_name.lower()),
+        "admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.model_name),
         "admin/%s/delete_selected_confirmation.html" % app_label,
         "admin/delete_selected_confirmation.html"
     ], context, current_app=modeladmin.admin_site.name)
diff --git a/django/contrib/admin/static/admin/js/compress.py b/django/contrib/admin/bin/compress.py
similarity index 92%
rename from django/contrib/admin/static/admin/js/compress.py
rename to django/contrib/admin/bin/compress.py
index 8d2caa28ea..e15f2d3ef6 100644
--- a/django/contrib/admin/static/admin/js/compress.py
+++ b/django/contrib/admin/bin/compress.py
@@ -4,7 +4,7 @@ import optparse
 import subprocess
 import sys
 
-here = os.path.dirname(__file__)
+js_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'static', 'admin', 'js')
 
 def main():
     usage = "usage: %prog [file1..fileN]"
@@ -27,7 +27,7 @@ Compiler library and Java version 6 or later."""
     if not args:
         if options.verbose:
             sys.stdout.write("No filenames given; defaulting to admin scripts\n")
-        args = [os.path.join(here, f) for f in [
+        args = [os.path.join(js_path, f) for f in [
             "actions.js", "collapse.js", "inlines.js", "prepopulate.js"]]
 
     for arg in args:
diff --git a/django/contrib/admin/forms.py b/django/contrib/admin/forms.py
index 1fabdce245..38c445f71a 100644
--- a/django/contrib/admin/forms.py
+++ b/django/contrib/admin/forms.py
@@ -33,5 +33,4 @@ class AdminAuthenticationForm(AuthenticationForm):
                 raise forms.ValidationError(message % {
                     'username': self.username_field.verbose_name
                 })
-        self.check_for_test_cookie()
         return self.cleaned_data
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
index 4203287123..adc2302587 100644
--- a/django/contrib/admin/helpers.py
+++ b/django/contrib/admin/helpers.py
@@ -224,19 +224,20 @@ class InlineAdminFormSet(object):
 
     def fields(self):
         fk = getattr(self.formset, "fk", None)
-        for i, field in enumerate(flatten_fieldsets(self.fieldsets)):
-            if fk and fk.name == field:
+        for i, field_name in enumerate(flatten_fieldsets(self.fieldsets)):
+            if fk and fk.name == field_name:
                 continue
-            if field in self.readonly_fields:
+            if field_name in self.readonly_fields:
                 yield {
-                    'label': label_for_field(field, self.opts.model, self.opts),
+                    'label': label_for_field(field_name, self.opts.model, self.opts),
                     'widget': {
                         'is_hidden': False
                     },
-                    'required': False
+                    'required': False,
+                    'help_text': help_text_for_field(field_name, self.opts.model),
                 }
             else:
-                yield self.formset.form.base_fields[field]
+                yield self.formset.form.base_fields[field_name]
 
     def _media(self):
         media = self.opts.media + self.formset.media
diff --git a/django/contrib/admin/locale/af/LC_MESSAGES/django.mo b/django/contrib/admin/locale/af/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..00af9926ea
Binary files /dev/null and b/django/contrib/admin/locale/af/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/af/LC_MESSAGES/django.po b/django/contrib/admin/locale/af/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..db2cc1b0c0
--- /dev/null
+++ b/django/contrib/admin/locale/af/LC_MESSAGES/django.po
@@ -0,0 +1,832 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Christopher Penkin <chris.penkin@gmail.com>, 2012.
+# Piet Delport <pjdelport@gmail.com>, 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-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@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"
+
+#: actions.py:48
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr "Het %(count)d %(items)s suksesvol geskrap."
+
+#: actions.py:60 options.py:1347
+#, python-format
+msgid "Cannot delete %(name)s"
+msgstr "Kan %(name)s nie skrap nie"
+
+#: actions.py:62 options.py:1349
+msgid "Are you sure?"
+msgstr "Is jy seker?"
+
+#: actions.py:83
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr "Skrap gekose %(verbose_name_plural)s"
+
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
+msgid "All"
+msgstr "Alles"
+
+#: filters.py:238
+msgid "Yes"
+msgstr "Ja"
+
+#: filters.py:239
+msgid "No"
+msgstr "Geen"
+
+#: filters.py:253
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: filters.py:308
+msgid "Any date"
+msgstr "Enige datum"
+
+#: filters.py:309
+msgid "Today"
+msgstr "Vandag"
+
+#: filters.py:313
+msgid "Past 7 days"
+msgstr "Vorige 7 dae"
+
+#: filters.py:317
+msgid "This month"
+msgstr "Hierdie maand"
+
+#: filters.py:321
+msgid "This year"
+msgstr "Hierdie jaar"
+
+#: forms.py:9
+#, python-format
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr "Teken asseblief weer in, want jou sessie het verstryk."
+
+#: helpers.py:23
+msgid "Action:"
+msgstr "Aksie:"
+
+#: models.py:24
+msgid "action time"
+msgstr "aksie tyd"
+
+#: models.py:27
+msgid "object id"
+msgstr "objek id"
+
+#: models.py:28
+msgid "object repr"
+msgstr "objek repr"
+
+#: models.py:29
+msgid "action flag"
+msgstr "aksie vlag"
+
+#: models.py:30
+msgid "change message"
+msgstr "verandering boodskap"
+
+#: models.py:35
+msgid "log entry"
+msgstr ""
+
+#: models.py:36
+msgid "log entries"
+msgstr ""
+
+#: models.py:45
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr "Het \"%(object)s\" bygevoeg."
+
+#: models.py:47
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr "Het \"%(object)s\" verander - %(changes)s"
+
+#: models.py:52
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr "Het \"%(object)s\" geskrap."
+
+#: models.py:54
+msgid "LogEntry Object"
+msgstr ""
+
+#: options.py:156 options.py:172
+msgid "None"
+msgstr "None"
+
+#: options.py:684
+#, python-format
+msgid "Changed %s."
+msgstr "Het %s verander."
+
+#: options.py:684 options.py:694
+msgid "and"
+msgstr "en"
+
+#: options.py:689
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Het %(name)s \"%(object)s\" bygevoeg."
+
+#: options.py:693
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Het %(list)s vir %(name)s \"%(object)s\" verander."
+
+#: options.py:698
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Het %(name)s \"%(object)s\" geskrap."
+
+#: options.py:702
+msgid "No fields changed."
+msgstr "Geen velde verander nie."
+
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"Die %(name)s \"%(obj)s\" was suksesvol verander. Jy mag dit weereens "
+"hieronder wysig."
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Die %(name)s \"%(obj)s\" was suksesvol bygevoeg."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Die %(name)s \"%(obj)s\" was suksesvol verander."
+
+#: options.py:951 options.py:1211
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+"Items moet gekies word om aksies op hulle uit te voer. Geen items is "
+"verander."
+
+#: options.py:970
+msgid "No action selected."
+msgstr "Geen aksie gekies nie."
+
+#: options.py:1050
+#, python-format
+msgid "Add %s"
+msgstr "Voeg %s by"
+
+#: options.py:1074 options.py:1319
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr "%(name)s voorwerp met primêre sleutel %(key)r bestaan ​​nie."
+
+#: options.py:1140
+#, python-format
+msgid "Change %s"
+msgstr "Verander %s"
+
+#: options.py:1190
+msgid "Database error"
+msgstr "Databasis fout"
+
+#: options.py:1253
+#, python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] "%(count)s %(name)s was suksesvol verander."
+msgstr[1] "%(count)s %(name)s  was suksesvol verander."
+
+#: options.py:1280
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] "%(total_count)s gekies"
+msgstr[1] "Al %(total_count)s gekies"
+
+#: options.py:1285
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "0 uit %(cnt)s gekies"
+
+#: options.py:1335
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Die %(name)s \"%(obj)s\" was suksesvol geskrap."
+
+#: options.py:1382
+#, python-format
+msgid "Change history: %s"
+msgstr "Verander geskiedenis: %s"
+
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
+msgid "Log in"
+msgstr "Teken in"
+
+#: sites.py:388
+msgid "Site administration"
+msgstr "Werf administrasie"
+
+#: sites.py:440
+#, python-format
+msgid "%s administration"
+msgstr "%s administrasie"
+
+#: widgets.py:90
+msgid "Date:"
+msgstr "Datum:"
+
+#: widgets.py:91
+msgid "Time:"
+msgstr "Tyd:"
+
+#: widgets.py:165
+msgid "Lookup"
+msgstr "Soek"
+
+#: widgets.py:271
+msgid "Add Another"
+msgstr "Voeg nog een by"
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
+#: templates/admin/404.html:4 templates/admin/404.html.py:8
+msgid "Page not found"
+msgstr "Bladsy nie gevind nie"
+
+#: templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Ons is jammer, maar die aangevraagde bladsy kon nie gevind word nie."
+
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
+msgid "Home"
+msgstr "Tuisblad"
+
+#: templates/admin/500.html:7
+msgid "Server error"
+msgstr "Bedienerfout"
+
+#: templates/admin/500.html:11
+msgid "Server error (500)"
+msgstr "Bedienerfout (500)"
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr "Bedienerfout <em>(500)</em>"
+
+#: templates/admin/500.html:15
+msgid ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr "Hardloop die gekose aksie"
+
+#: templates/admin/actions.html:4
+msgid "Go"
+msgstr "Gaan"
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr "Kliek hier om die objekte oor alle bladsye te kies."
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr "Kies al %(total_count)s %(module_name)s"
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr "Verwyder keuses"
+
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
+#: templates/admin/base.html:28
+msgid "Welcome,"
+msgstr "Welkom,"
+
+#: templates/admin/base.html:33
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr "Dokumentasie"
+
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr "Verander wagwoord"
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Log out"
+msgstr "Teken uit"
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django werf admin"
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administrasie"
+
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
+msgid "Add"
+msgstr "Voeg by"
+
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
+msgid "History"
+msgstr "Geskiedenis"
+
+#: templates/admin/change_form.html:33
+#: templates/admin/edit_inline/stacked.html:9
+#: templates/admin/edit_inline/tabular.html:30
+msgid "View on site"
+msgstr "Bekyk op werf"
+
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Korrigeer asseblief die fout hieronder."
+msgstr[1] "Korrigeer asseblief die foute hieronder."
+
+#: templates/admin/change_list.html:58
+#, python-format
+msgid "Add %(name)s"
+msgstr "Voeg %(name)s by"
+
+#: templates/admin/change_list.html:78
+msgid "Filter"
+msgstr "Filter"
+
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr "Verwyder van sortering"
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr "Sortering prioriteit: %(priority_number)s"
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr "Wissel sortering"
+
+#: templates/admin/delete_confirmation.html:11
+#: templates/admin/submit_line.html:4
+msgid "Delete"
+msgstr "Skrap"
+
+#: templates/admin/delete_confirmation.html:18
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:26
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+"Om die %(object_name)s '%(escaped_object)s' te skrap sou vereis dat die "
+"volgende beskermde verwante objekte geskrap word:"
+
+#: templates/admin/delete_confirmation.html:34
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
+msgid "Yes, I'm sure"
+msgstr "Ja, ek is seker"
+
+#: templates/admin/delete_selected_confirmation.html:10
+msgid "Delete multiple objects"
+msgstr "Skrap meerdere objekte"
+
+#: templates/admin/delete_selected_confirmation.html:17
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Om die gekose %(objects_name)s te skrap sou verwante objekte skrap, maar jou "
+"rekening het nie toestemming om die volgende tipes objekte te skrap nie:"
+
+#: templates/admin/delete_selected_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+"Om die gekose %(objects_name)s te skrap veries dat die volgende beskermde "
+"verwante objekte geskrap word:"
+
+#: templates/admin/delete_selected_confirmation.html:33
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+"Is jy seker jy wil die gekose %(objects_name)s skrap? Al die volgende "
+"objekte en hul verwante items sal geskrap word:"
+
+#: templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr "Deur %(filter_title)s"
+
+#: templates/admin/index.html:20
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr ""
+
+#: templates/admin/index.html:39
+msgid "Change"
+msgstr "Verander"
+
+#: templates/admin/index.html:49
+msgid "You don't have permission to edit anything."
+msgstr "Jy het nie toestemming om enigiets te wysig nie."
+
+#: templates/admin/index.html:57
+msgid "Recent Actions"
+msgstr "Onlangse Aksies"
+
+#: templates/admin/index.html:58
+msgid "My Actions"
+msgstr "My Aksies"
+
+#: templates/admin/index.html:62
+msgid "None available"
+msgstr "Niks beskikbaar nie"
+
+#: templates/admin/index.html:76
+msgid "Unknown content"
+msgstr "Onbekend inhoud"
+
+#: templates/admin/invalid_setup.html:12
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+
+#: templates/admin/login.html:37
+msgid "Password:"
+msgstr "Wagwoord:"
+
+#: templates/admin/login.html:44
+msgid "Forgotten your password or username?"
+msgstr "Wagwoord of gebruikersnaam vergeet?"
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr "Datum/tyd"
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr "Gebruiker"
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr "Aksie"
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Hierdie item het nie 'n veranderingsgeskiedenis nie. Dit was waarskynlik nie "
+"deur middel van hierdie admin werf bygevoeg nie."
+
+#: templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Wys alle"
+
+#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Stoor"
+
+#: templates/admin/search_form.html:7
+msgid "Search"
+msgstr "Soek"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] "%(counter)s resultaat"
+msgstr[1] "%(counter)s resultate"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s in totaal"
+
+#: templates/admin/submit_line.html:5
+msgid "Save as new"
+msgstr "Stoor as nuwe"
+
+#: templates/admin/submit_line.html:6
+msgid "Save and add another"
+msgstr "Stoor en voeg 'n ander by"
+
+#: templates/admin/submit_line.html:7
+msgid "Save and continue editing"
+msgstr "Stoor en wysig verder"
+
+#: templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+"Vul eers 'n gebruikersnaam en wagwoord in. Dan sal jy in staat wees om meer "
+"gebruikersopsies te wysig."
+
+#: templates/admin/auth/user/add_form.html:8
+msgid "Enter a username and password."
+msgstr "Vul 'n gebruikersnaam en wagwoord in."
+
+#: templates/admin/auth/user/change_password.html:31
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr "Vul 'n nuwe wagwoord vir gebruiker <strong>%(username)s</strong> in."
+
+#: templates/admin/auth/user/change_password.html:38
+msgid "Password"
+msgstr "Wagwoord"
+
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
+msgid "Password (again)"
+msgstr "Wagwoord (weer)"
+
+#: templates/admin/auth/user/change_password.html:45
+msgid "Enter the same password as above, for verification."
+msgstr "Vul dieselfde wagwoord in as hierbo, for bevestiging."
+
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Verwyder"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr "Voeg nog 'n %(verbose_name)s by"
+
+#: templates/admin/edit_inline/tabular.html:17
+msgid "Delete?"
+msgstr "Skrap?"
+
+#: templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr ""
+
+#: templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Teken weer in"
+
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
+msgid "Password change"
+msgstr "Wagwoord verandering"
+
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
+msgid "Password change successful"
+msgstr "Wagwoord verandering suksesvol"
+
+#: templates/registration/password_change_done.html:17
+msgid "Your password was changed."
+msgstr "Jou wagwoord was verander."
+
+#: templates/registration/password_change_form.html:26
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Tik jou ou wagwoord, ter wille van sekuriteit's, en dan 'n nuwe wagwoord "
+"twee keer so dat ons kan seker wees dat jy dit korrek ingetik het."
+
+#: templates/registration/password_change_form.html:32
+msgid "Old password"
+msgstr "Ou wagwoord"
+
+#: templates/registration/password_change_form.html:37
+msgid "New password"
+msgstr "Nuwe wagwoord"
+
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
+msgid "Change my password"
+msgstr "Verander my wagwoord"
+
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
+msgid "Password reset"
+msgstr "Wagwoord herstel"
+
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
+msgid "Password reset complete"
+msgstr "Wagwoord herstel voltooi"
+
+#: templates/registration/password_reset_complete.html:17
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr "Jou wagwoord is gestel. Jy kan nou voort gaan en aanteken."
+
+#: templates/registration/password_reset_confirm.html:7
+msgid "Password reset confirmation"
+msgstr "Wagwoord herstel bevestiging"
+
+#: templates/registration/password_reset_confirm.html:17
+msgid "Enter new password"
+msgstr "Vul 'n nuwe wagwoord in"
+
+#: templates/registration/password_reset_confirm.html:19
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+"Tik jou nuwe wagwoord twee keer in so ons kan seker wees dat jy dit korrek "
+"ingetik het."
+
+#: templates/registration/password_reset_confirm.html:23
+msgid "New password:"
+msgstr "Nuwe wagwoord:"
+
+#: templates/registration/password_reset_confirm.html:25
+msgid "Confirm password:"
+msgstr "Bevestig wagwoord:"
+
+#: templates/registration/password_reset_confirm.html:31
+msgid "Password reset unsuccessful"
+msgstr "Wagwoord herstel onsuksesvol"
+
+#: templates/registration/password_reset_confirm.html:33
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
+msgid "Password reset successful"
+msgstr "Wagwoord herstel suksesvol"
+
+#: templates/registration/password_reset_done.html:17
+msgid ""
+"We've emailed you instructions for setting your password to the email "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr "Gaan asseblief na die volgende bladsy en kies 'n nuwe wagwoord:"
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr "Jou gebruikersnaam, in geval jy vergeet het:"
+
+#: templates/registration/password_reset_email.html:10
+msgid "Thanks for using our site!"
+msgstr "Dankie vir die gebruik van ons webwerf!"
+
+#: templates/registration/password_reset_email.html:12
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Die %(site_name)s span"
+
+#: templates/registration/password_reset_form.html:17
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Reset my password"
+msgstr "Herstel my wagwoord"
+
+#: templatetags/admin_list.py:344
+msgid "All dates"
+msgstr "Alle datums"
+
+#: views/main.py:33
+msgid "(None)"
+msgstr "(Geen)"
+
+#: views/main.py:76
+#, python-format
+msgid "Select %s"
+msgstr "Kies %s"
+
+#: views/main.py:78
+#, python-format
+msgid "Select %s to change"
+msgstr "Kies %s om te verander"
diff --git a/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..b18b81ea35
Binary files /dev/null and b/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..0ed16de19e
--- /dev/null
+++ b/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.po
@@ -0,0 +1,170 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Piet Delport <pjdelport@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2013-03-26 06:30+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"
+
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
+msgid "Available %s"
+msgstr "Beskikbaar %s"
+
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into this box to filter down the list of available %s."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:57
+msgid "Filter"
+msgstr "Filter"
+
+#: static/admin/js/SelectFilter2.js:61
+msgid "Choose all"
+msgstr "Kies alle"
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:67
+msgid "Choose"
+msgstr "Kies"
+
+#: static/admin/js/SelectFilter2.js:69
+msgid "Remove"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Chosen %s"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
+msgstr "Verwyder alle"
+
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr ""
+
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+
+#: static/admin/js/calendar.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+
+#: static/admin/js/calendar.js:27
+msgid "S M T W T F S"
+msgstr ""
+
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr "Wys"
+
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr "Versteek"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
+msgid "Now"
+msgstr "Nou"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:53
+msgid "Clock"
+msgstr "Klok"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:81
+msgid "Choose a time"
+msgstr "Kies 'n tyd"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:86
+msgid "Midnight"
+msgstr "Middernag"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:87
+msgid "6 a.m."
+msgstr "6 v.m."
+
+#: static/admin/js/admin/DateTimeShortcuts.js:88
+msgid "Noon"
+msgstr "Middag"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
+msgid "Cancel"
+msgstr "Kanselleer"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
+msgid "Today"
+msgstr "Vandag"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:148
+msgid "Calendar"
+msgstr "Kalender"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:195
+msgid "Yesterday"
+msgstr "Gister"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:199
+msgid "Tomorrow"
+msgstr "Môre"
diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo
index 3bf2548b25..3c13bd5fab 100644
Binary files a/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/django.po b/django/contrib/admin/locale/ar/LC_MESSAGES/django.po
index caba662a7f..d5f0728248 100644
--- a/django/contrib/admin/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ar/LC_MESSAGES/django.po
@@ -2,34 +2,34 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Ossama Khayat <okhayat@gmail.com>, 2011.
+# Ossama Khayat <okhayat@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+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"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "تم حذف %(count)d %(items)s بنجاح."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "لا يمكن حذف %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "هل أنت متأكد؟"
 
@@ -38,196 +38,203 @@ msgstr "هل أنت متأكد؟"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "حذف سجلات %(verbose_name_plural)s المحددة"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "الكل"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "نعم"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "لا"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "مجهول"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "أي تاريخ"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "اليوم"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "الأيام السبعة الماضية"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "هذا الشهر"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "هذه السنة"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "رجاءً ادخل مرةً أخرى لأن جلستك انتهت."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"بريدك الإلكتروني ليس اسم المستخدم الخاص بك، جرب استخدام '%s' بدلا من ذلك."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "إجراء:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "وقت الإجراء"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "معرف العنصر"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "ممثل العنصر"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "علامة الإجراء"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "غيّر الرسالة"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "مُدخل السجل"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "مُدخلات السجل"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "تم إضافة العناصر \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "تم تعديل العناصر \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "تم حذف العناصر \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "كائن LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "لاشيء"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "عدّل %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "و"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "أضاف %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "غيّر %(list)s في %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "حذف %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "لم يتم تغيير أية حقول."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "تم اضافة %(name)s \"%(obj)s\" بنجاح."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "يمكنك تعديله مجددا في الأسفل."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "يمكنك إضافة %s آخر بالأسفل."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "تم تغيير %(name)s \"%(obj)s\" بنجاح."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "تمت إضافة %(name)s \"%(obj)s\" بنجاح، يمكنك تعديله مرة أخرى بالأسفل."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "تم اضافة %(name)s \"%(obj)s\" بنجاح."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "تم تغيير %(name)s \"%(obj)s\" بنجاح."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr "يجب تحديد العناصر لتطبيق الإجراءات عليها. لم يتم تغيير أية عناصر."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "لم يحدد أي إجراء."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "أضف %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "عدّل %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "خطـأ في قاعدة البيانات"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -238,7 +245,7 @@ msgstr[3] "تم تغيير %(count)s %(name)s بنجاح."
 msgstr[4] "تم تغيير %(count)s %(name)s بنجاح."
 msgstr[5] "تم تغيير %(count)s %(name)s بنجاح."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -249,52 +256,60 @@ msgstr[3] "تم تحديد %(total_count)s"
 msgstr[4] "تم تحديد %(total_count)s"
 msgstr[5] "تم تحديد %(total_count)s"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "لا شيء محدد من %(cnt)s"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "تاريخ التغيير: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "ادخل"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "إدارة الموقع"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "إدارة %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "التاريخ:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "الوقت:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "ابحث"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "أضف آخر"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "حالياً:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "تغيير:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "تعذر العثور على الصفحة"
@@ -303,42 +318,40 @@ msgstr "تعذر العثور على الصفحة"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "نحن آسفون، لكننا لم نعثر على الصفحة المطلوبة."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "الرئيسية"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "خطأ في المزود"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "خطأ في المزود (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "خطأ في المزود <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"حدث خطأ، وقم تم الابلاغ عنه إلى مدراء الموقع عبر البريد الإلكتروني وسيتم حل "
-"المشكلة قريبا. شكرا لك على صبرك."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -361,7 +374,7 @@ msgstr "اختيار %(total_count)s %(module_name)s جميعها"
 msgid "Clear selection"
 msgstr "إزالة الاختيار"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -371,22 +384,22 @@ msgid "Welcome,"
 msgstr "أهلا، "
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "الوثائق"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "غيّر كلمة المرور"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "اخرج"
 
@@ -398,24 +411,24 @@ msgstr "إدارة موقع جانغو"
 msgid "Django administration"
 msgstr "إدارة جانغو"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "أضف"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "تاريخ"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "مشاهدة على الموقع"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "الرجاء تصحيح الخطأ أدناه."
@@ -425,34 +438,34 @@ msgstr[3] "الرجاء تصحيح الأخطاء أدناه."
 msgstr[4] "الرجاء تصحيح الخطأ أدناه."
 msgstr[5] "الرجاء تصحيح الخطأ أدناه."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "أضف %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "مرشّح"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "إزالة من الترتيب"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "أولوية الترتيب: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "عكس الترتيب"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "احذف"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -462,7 +475,7 @@ msgstr ""
 "حذف العنصر %(object_name)s '%(escaped_object)s' سيتسبب بحذف العناصر المرتبطة "
 "به، إلا أنك لا تملك صلاحية حذف العناصر التالية:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -471,7 +484,7 @@ msgstr ""
 "حذف %(object_name)s '%(escaped_object)s' سيتسبب أيضاً بحذف العناصر المرتبطة، "
 "إلا أن حسابك ليس لديه صلاحية حذف أنواع العناصر التالية:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -480,16 +493,16 @@ msgstr ""
 "متأكد أنك تريد حذف العنصر %(object_name)s \"%(escaped_object)s\"؟ سيتم حذف "
 "جميع العناصر التالية المرتبطة به:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "نعم، أنا متأكد"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "حذف عدّة عناصر"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -499,7 +512,7 @@ msgstr ""
 "حذف عناصر %(objects_name)s المُحدّدة سيتسبب بحذف العناصر المرتبطة، إلا أن "
 "حسابك ليس له صلاحية حذف أنواع العناصر التالية:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -508,7 +521,7 @@ msgstr ""
 "حذف عناصر %(objects_name)s المحدّدة قد يتطلب حذف العناصر المحميّة المرتبطة "
 "التالية:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -522,36 +535,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " حسب %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "النماذج المتوفرة في التطبيق %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "عدّل"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "ليست لديك الصلاحية لتعديل أي شيء."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "آخر الإجراءات"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "إجراءاتي"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "لا يوجد"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "مُحتوى مجهول"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -560,31 +573,27 @@ msgstr ""
 "هنالك أمر خاطئ في تركيب قاعدة بياناتك، تأكد من أنه تم انشاء جداول قاعدة "
 "البيانات الملائمة، وأن قاعدة البيانات قابلة للقراءة من قبل المستخدم الملائم."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "اسم المستخدم:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "نسيت كلمة السر أو اسم المستخدم الخاص بك؟"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "التاريخ/الوقت"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "المستخدم"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "إجراء"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -644,64 +653,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "أدخل اسم مستخدم وكلمة مرور."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "أدخل كلمة مرور جديدة للمستخدم <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "كلمة المرور (مجدداً)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "أدخل كلمة المرور ذاتها التي أعلاه لتأكيدها."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "أزل"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "إضافة سجل %(verbose_name)s آخر"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "أزل"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "احذفه؟"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "شكراً لك على قضائك بعض الوقت مع الموقع اليوم."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "ادخل مجدداً"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "غيّر كلمة مرورك"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "تم تغيير كلمة المرور بنجاح"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "تمّ تغيير كلمة مرورك."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -709,64 +718,64 @@ msgstr ""
 "رجاءً أدخل كلمة مرورك القديمة، للأمان، ثم أدخل كلمة مرور الجديدة مرتين كي "
 "تتأكّد من كتابتها بشكل صحيح."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "كلمة المرور القديمة"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "كلمة المرور الجديدة"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "غيّر كلمة مروري"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "استعادة كلمة المرور"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "تم استعادة كلمة المرور"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "تم تعيين كلمة مرورك. يمكن الاستمرار وتسجيل دخولك الآن."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "تأكيد استعادة كلمة المرور"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "أدخل كلمة المرور الجديدة"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "رجاءً أدخل كلمة مرورك الجديدة مرتين كي تتأكّد من كتابتها بشكل صحيح."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "كلمة المرور الجديدة:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "أكّد كلمة المرور:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "تم إعادة تعيين كلمة المرور بنجاح"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -774,27 +783,23 @@ msgstr ""
 "رابط استعادة كلمة المرور غير صحيح، ربما لأنه استُخدم من قبل. رجاءً اطلب "
 "استعادة كلمة المرور مرة أخرى."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "تم إعادة ضبط كلمة المرور بنجاح"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"لقد قمنا بإرسال تعليمات تعيين كلمة مرورك إلى عنوان البريد الإلكتروني الذي "
-"كتبته. يجب أن تصلك رسالتنا قريباً."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"تصلك هذه الرسالة لأنك طلبت إستعادة كلمة المرور الخاصة بك على الموقع "
-"%(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -813,36 +818,34 @@ msgstr "شكراً لاستخدامك موقعنا!"
 msgid "The %(site_name)s team"
 msgstr "فريق %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"نسيت كلمة مرورك؟ أدخل عنوان بريدك الإلكتروني بالأسفل وسنقوم بإرسال تعليمات "
-"تعيين كلمة مرور جديدة."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "عنوان البريد الإلكتروني:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "استعد كلمة مروري"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "كافة التواريخ"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(لاشيء)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "اختر %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "اختر %s لتغييره"
diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo
index e2a9d92e24..f2ffd727a1 100644
Binary files a/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po
index f874b7758c..15e8692e27 100644
--- a/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po
@@ -2,22 +2,22 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Ossama Khayat <okhayat@gmail.com>, 2011.
+# Ossama Khayat <okhayat@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
+"PO-Revision-Date: 2012-11-27 17:05+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"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -30,11 +30,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"هذه قائمة %s المتوفرة. يمكنك اختيار بعضها بانتقائها في الصندوق أدناه ثم "
+"الضغط على سهم الـ\"اختيار\" بين الصندوقين."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "اكتب في هذا الصندوق لتصفية قائمة %s المتوفرة."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -47,11 +49,11 @@ msgstr "اختر الكل"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "اضغط لاختيار جميع %s جملة واحدة."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "اختيار"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -68,15 +70,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"هذه قائمة %s المحددة. يمكنك إزالة بعضها باختيارها في الصندوق أدناه ثم اضغط "
+"على سهم الـ\"إزالة\" بين الصندوقين."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "إزالة الكل"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "اضغط لإزالة جميع %s المحددة جملة واحدة."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/django.mo b/django/contrib/admin/locale/az/LC_MESSAGES/django.mo
index 71a391a1b8..b691248c2e 100644
Binary files a/django/contrib/admin/locale/az/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/django.po b/django/contrib/admin/locale/az/LC_MESSAGES/django.po
index 158e054f9e..d0d99126a5 100644
--- a/django/contrib/admin/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/az/LC_MESSAGES/django.po
@@ -1,33 +1,33 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Ismayilov <ali@ismailov.info>, 2011.
+# Ali Ismayilov <ali@ismailov.info>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s uğurla silindi."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s silinmir"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Əminsiniz?"
 
@@ -36,160 +36,137 @@ msgstr "Əminsiniz?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Seçilmiş %(verbose_name_plural)s-ləri sil"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Hamısı"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Hə"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Yox"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Bilinmir"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "İstənilən tarix"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Bu gün"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Son 7 gündə"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Bu ay"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Bu il"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Yenidən daxil olun, çünki seansın vaxtı bitmişdir."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Sizin e-poçt ünvanınız istifadəçi adınız deyil. \"%s\" isə yoxlayın."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Əməliyyat:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "əməliyyat vaxtı"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "obyekt id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "obyekt repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "bayraq"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "dəyişmə mesajı"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "loq yazısı"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "loq yazıları"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "\"%(object)s\" əlavə olundu."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "\"%(object)s\" - %(changes)s dəyişiklikləri qeydə alındı."
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "\"%(object)s\" silindi."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "LogEntry obyekti"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Heç nə"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s dəyişdi."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "və"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" əlavə olundu."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr " %(list)s %(name)s \"%(object)s\" üçün dəyişdi."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" siyahısından silindi."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Heç bir sahə dəyişmədi."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" siyahısına uğurla əlavə edildi."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Aşağıda yenə dəyişiklik apara bilərsiniz."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Aşağıda yeni %s əlavə edə bilərsiniz."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" siyahısında uğurla dəyişdirildi."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -197,7 +174,38 @@ msgstr ""
 "%(name)s \"%(obj)s\" siyahısına uğurla əlavə olundu. Yenə onu aşağıda "
 "redaktə edə bilərsiniz."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" siyahısına uğurla əlavə edildi."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" siyahısında uğurla dəyişdirildi."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -205,87 +213,95 @@ msgstr ""
 "Biz elementlər üzərində nəsə əməliyyat aparmaq üçün siz onları seçməlisiniz. "
 "Heç bir element dəyişmədi."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Heç bir əməliyyat seçilmədi."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s əlavə et"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(key)r əsas açarı ilə %(name)s mövcud deyil."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s dəyiş"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Bazada xəta"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s uğurla dəyişdirildi."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s - hamısı seçilib"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s-dan 0 seçilib"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" uğurla silindi."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Dəyişmə tarixi: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Daxil ol"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Sayt administrasiyası"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s administrasiyası"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Tarix:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Vaxt:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Sorğu"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Yenisini əlavə et"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Səhifə tapılmadı"
@@ -294,42 +310,42 @@ msgstr "Səhifə tapılmadı"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Üzrlər, amma soruşduğunuz sayt tapılmadı."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Ev"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Serverdə xəta"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Serverdə xəta (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Serverdə xəta <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Xəta baş verib. Bu haqda sayt administratorlarına e-poçt vasitəsilə xəbər "
-"edilmişdir. Xəta tezliklə aradan qaldırılmalıdır."
+"Xəta baş verdi. Sayt administratorlarına e-poçt göndərildi və onlar xəta ilə "
+"tezliklə məşğul olacaqlar. Səbrli olun."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -352,7 +368,7 @@ msgstr "Bütün %(total_count)s sayda %(module_name)s seç"
 msgid "Clear selection"
 msgstr "Seçimi təmizlə"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -362,22 +378,22 @@ msgid "Welcome,"
 msgstr "Xoş gördük,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Sənədləşdirmə"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Parolu dəyiş"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Çıx"
 
@@ -389,58 +405,58 @@ msgstr "Django sayt administratoru"
 msgid "Django administration"
 msgstr "Django administrasiya"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Əlavə et"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Tarix"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Saytda göstər"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] ""
 "one: Aşağıdakı səhvi düzəltməyi xahiş edirik.\n"
 "other: Aşağıdakı səhvləri düzəltməyi xahiş edirik."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s əlavə et"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Süzgəc"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "Sıralamadan çıxar"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "Sıralama prioriteti: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "Sıralamanı çevir"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -451,7 +467,7 @@ msgstr ""
 "obyektlər də silinməlidir. Ancaq sizin hesabın aşağıdakı tip obyektləri "
 "silməyə səlahiyyəti çatmır:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -460,7 +476,7 @@ msgstr ""
 "%(object_name)s \"%(escaped_object)s\" obyektini silmək üçün aşağıdakı "
 "qorunan obyektlər də silinməlidir:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -469,16 +485,16 @@ msgstr ""
 "%(object_name)s \"%(escaped_object)s\" obyektini silməkdə əminsiniz? Ona "
 "bağlı olan aşağıdakı obyektlər də silinəcək:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Hə, əminəm"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Bir neçə obyekt sil"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -489,7 +505,7 @@ msgstr ""
 "Ancaq sizin hesabınızın aşağıdakı tip obyektləri silmək səlahiyyətinə malik "
 "deyil:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -498,7 +514,7 @@ msgstr ""
 "%(objects_name)s obyektini silmək üçün aşağıdakı qorunan obyektlər də "
 "silinməlidir:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -512,36 +528,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s görə "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s tətbiqetməsində mövcud olan modellər"
+msgid "Models in the %(name)s application"
+msgstr "%(name)s proqramındakı modellər"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Dəyiş"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Üzrlər, amma sizin nəyisə dəyişməyə səlahiyyətiniz çatmır."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Son əməliyyatlar"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mənim etdiklərim"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Heç nə yoxdur"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Naməlum"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -550,31 +566,27 @@ msgstr ""
 "Bazanın qurulması ilə nəsə problem var. Lazımi cədvəllərin bazada "
 "yaradıldığını və uyğun istifadəçinin bazadan oxuya bildiyini yoxlayın."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "İstifadəçi adı:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Parol:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Parol və ya istifadəçi adını unutmusan?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Tarix/vaxt"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "İstifadəçi"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Əməliyyat"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -629,64 +641,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "İstifadəçi adını və parolu daxil edin."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "<strong>%(username)s</strong> üçün yeni parol daxil edin."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Parol"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Parol (bir daha)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Yuxarıdakı parolu yenidən daxil edin, dəqiqləşdirmək üçün"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Yığışdır"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Daha bir %(verbose_name)s əlavə et"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Yığışdır"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Silək?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Sayt ilə səmərəli vaxt keçirdiyiniz üçün təşəkkür."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Yenidən daxil ol"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Parol dəyişmək"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Parol uğurla dəyişdi"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Sizin parolunuz dəyişdi."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -694,64 +706,64 @@ msgstr ""
 "Yoxlama üçün köhnə parolunuzu daxil edin. Sonra isə yeni parolu iki dəfə "
 "daxil edin ki, səhv etmədiyinizə əmin olaq."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Köhnə parol"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Yeni parol"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Mənim parolumu dəyiş"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Parolun sıfırlanması"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Parolun sıfırlanması başa çatdı"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Yeni parol artıq qüvvədədir.  Yenidən daxil ola bilərsiniz."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Parolun sıfırlanması üçün təsdiq"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Yeni parolu daxil edin"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "Yeni parolu iki dəfə daxil edin ki, səhv etmədiyinizə əmin olaq."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Yeni parol:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Yeni parol (bir daha):"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Parolun sıfırlanması baş tutmadı"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -759,27 +771,27 @@ msgstr ""
 "Parolun sıfırlanması üçün olan keçid, yəqin ki, artıq istifadə olunub.  "
 "Parolu sıfırlamaq üçün yenə müraciət edin."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Parolun sıfırlanması uğurla başa çatdı."
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Parolunuzu dəyişmək üçün təlimatları qeydiyyat zamanı göstərdiyiniz e-poçt "
-"ünvanına göndərdik. İndi gələcək."
+"Parol seçmək üçün təlimatları təqdim etdiyiniz e-poçt ünvanına göndərdik. "
+"Poçtu yoxlaya bilərsiniz."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"%(site_name)s saytındakı hesabınızın parolunu dəyişmək istədiyiniz üçün bu "
-"məktubu almısınız."
+"%(site_name)s saytında parolu yeniləmək istədiyinizə görə bu məktubu "
+"göndərdik."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -798,36 +810,36 @@ msgstr "Bizim saytdan istifadə etdiyiniz üçün təşəkkür edirik!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s komandası"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Parolu unutmusunuz? E-poçt ünvanınızı aşağıda qeyd edin və biz sizə yeni "
-"parol əldə etmək haqda təlimatları göndərcəyik."
+"Parolu unutmusunuz? Aşağıda e-poçt ünvanınızı təqdim edin, biz isə yeni "
+"parol seçmək təlimatlarını sizə göndərək."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-poçt  ünvanı:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "E-poçt:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Parolumu sıfırla"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Bütün tarixlərdə"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Heç nə)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s seç"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s dəyişmək üçün seç"
diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo
index a7aee154cb..8a8c68f1d9 100644
Binary files a/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po
index 5a0ca33e31..6eafbc1ed5 100644
--- a/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po
@@ -1,21 +1,21 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Ismayilov <ali@ismailov.info>, 2011.
+# Ali Ismayilov <ali@ismailov.info>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
+"PO-Revision-Date: 2012-05-08 13:33+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -28,11 +28,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Bu, mümkün %s siyahısıdır. Onlardan bir neçəsini qarşısındakı xanaya işarə "
+"qoymaq və iki xana arasındakı \"Seç\"i tıqlamaqla seçmək olar."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Bu xanaya yazmaqla mümkün %s siyahısını filtrləyə bilərsiniz."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -45,11 +47,11 @@ msgstr "Hamısını seç"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Bütün %s siyahısını seçmək üçün tıqlayın."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Seç"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -66,15 +68,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Bu, seçilmiş %s siyahısıdır. Onlardan bir neçəsini aşağıdakı xanaya işarə "
+"qoymaq və iki xana arasındakı \"Sil\"i tıqlamaqla silmək olar."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "Hamısını sil"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Seçilmiş %s siyahısının hamısını silmək üçün tıqlayın."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/django.mo b/django/contrib/admin/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..7b9ae3bbbb
Binary files /dev/null and b/django/contrib/admin/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/django.po b/django/contrib/admin/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..83c58cb5b3
--- /dev/null
+++ b/django/contrib/admin/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,843 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+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-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: actions.py:48
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr "Выдалілі %(count)d %(items)s."
+
+#: actions.py:60 options.py:1347
+#, python-format
+msgid "Cannot delete %(name)s"
+msgstr "Не ўдаецца выдаліць %(name)s"
+
+#: actions.py:62 options.py:1349
+msgid "Are you sure?"
+msgstr "Ці ўпэўненыя вы?"
+
+#: actions.py:83
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr "Выдаліць абраныя %(verbose_name_plural)s"
+
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
+msgid "All"
+msgstr "Усе"
+
+#: filters.py:238
+msgid "Yes"
+msgstr "Так"
+
+#: filters.py:239
+msgid "No"
+msgstr "Не"
+
+#: filters.py:253
+msgid "Unknown"
+msgstr "Невядома"
+
+#: filters.py:308
+msgid "Any date"
+msgstr "Хоць-якая дата"
+
+#: filters.py:309
+msgid "Today"
+msgstr "Сёньня"
+
+#: filters.py:313
+msgid "Past 7 days"
+msgstr "Апошні тыдзень"
+
+#: filters.py:317
+msgid "This month"
+msgstr "Гэты месяц"
+
+#: filters.py:321
+msgid "This year"
+msgstr "Гэты год"
+
+#: forms.py:9
+#, python-format
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr "Тэрмін сэансу скончыўся, таму ўвайдзіце зноўку."
+
+#: helpers.py:23
+msgid "Action:"
+msgstr "Дзеяньне:"
+
+#: models.py:24
+msgid "action time"
+msgstr "час дзеяньня"
+
+#: models.py:27
+msgid "object id"
+msgstr "нумар аб’екта"
+
+#: models.py:28
+msgid "object repr"
+msgstr "прадстаўленьне аб’екта"
+
+#: models.py:29
+msgid "action flag"
+msgstr "від дзеяньня"
+
+#: models.py:30
+msgid "change message"
+msgstr "паведамленьне пра зьмену"
+
+#: models.py:35
+msgid "log entry"
+msgstr "запіс у справаздачы"
+
+#: models.py:36
+msgid "log entries"
+msgstr "запісы ў справаздачы"
+
+#: models.py:45
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr "Дадалі «%(object)s»."
+
+#: models.py:47
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr "Зьмянілі «%(object)s» — %(changes)s"
+
+#: models.py:52
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr "Выдалілі «%(object)s»."
+
+#: models.py:54
+msgid "LogEntry Object"
+msgstr "Запіс у справаздачы"
+
+#: options.py:156 options.py:172
+msgid "None"
+msgstr "Няма"
+
+#: options.py:684
+#, python-format
+msgid "Changed %s."
+msgstr "Зьмянілі %s."
+
+#: options.py:684 options.py:694
+msgid "and"
+msgstr "і"
+
+#: options.py:689
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Дадалі %(name)s «%(object)s»."
+
+#: options.py:693
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Зьмянілі %(list)s для %(name)s «%(object)s»."
+
+#: options.py:698
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Выдалілі %(name)s «%(object)s»."
+
+#: options.py:702
+msgid "No fields changed."
+msgstr "Палі не зьмяняліся."
+
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "Дадалі %(name)s «%(obj)s». Ніжэй яго можна зноўку правіць."
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Дадалі %(name)s «%(obj)s»."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Зьмянілі %(name)s «%(obj)s»."
+
+#: options.py:951 options.py:1211
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+"Каб нешта рабіць, трэба спачатку абраць, з чым гэта рабіць. Нічога не "
+"зьмянілася."
+
+#: options.py:970
+msgid "No action selected."
+msgstr "Не абралі дзеяньняў."
+
+#: options.py:1050
+#, python-format
+msgid "Add %s"
+msgstr "Дадаць %s"
+
+#: options.py:1074 options.py:1319
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr "Аб’ект %(name)s з галоўным ключом %(key)r не існуе."
+
+#: options.py:1140
+#, python-format
+msgid "Change %s"
+msgstr "Зьмяніць %s"
+
+#: options.py:1190
+msgid "Database error"
+msgstr "База зьвестак дала хібу"
+
+#: options.py:1253
+#, python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] "Зьмянілі %(count)s %(name)s."
+msgstr[1] "Зьмянілі %(count)s %(name)s."
+msgstr[2] "Зьмянілі %(count)s %(name)s."
+msgstr[3] "Зьмянілі %(count)s %(name)s."
+
+#: options.py:1280
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] "Абралі %(total_count)s"
+msgstr[1] "Абралі ўсе %(total_count)s"
+msgstr[2] "Абралі ўсе %(total_count)s"
+msgstr[3] "Абралі ўсе %(total_count)s"
+
+#: options.py:1285
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "Абралі 0 аб’ектаў з %(cnt)s"
+
+#: options.py:1335
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Сьцерлі %(name)s «%(obj)s»."
+
+#: options.py:1382
+#, python-format
+msgid "Change history: %s"
+msgstr "Гісторыя зьменаў: %s"
+
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
+msgid "Log in"
+msgstr "Увайсьці"
+
+#: sites.py:388
+msgid "Site administration"
+msgstr "Кіраваць пляцоўкаю"
+
+#: sites.py:440
+#, python-format
+msgid "%s administration"
+msgstr "Кіраваць %s"
+
+#: widgets.py:90
+msgid "Date:"
+msgstr "Дата:"
+
+#: widgets.py:91
+msgid "Time:"
+msgstr "Час:"
+
+#: widgets.py:165
+msgid "Lookup"
+msgstr "Шукаць"
+
+#: widgets.py:271
+msgid "Add Another"
+msgstr "Дадаць яшчэ"
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
+#: templates/admin/404.html:4 templates/admin/404.html.py:8
+msgid "Page not found"
+msgstr "Бачыну не знайшлі"
+
+#: templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "На жаль, запытаную бачыну немагчыма знайсьці."
+
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
+msgid "Home"
+msgstr "Пачатак"
+
+#: templates/admin/500.html:7
+msgid "Server error"
+msgstr "Паслужнік даў хібу"
+
+#: templates/admin/500.html:11
+msgid "Server error (500)"
+msgstr "Паслужнік даў хібу (памылка 500)"
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr "Паслужнік даў хібу <em>(памылка 500)</em>"
+
+#: templates/admin/500.html:15
+msgid ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr "Выканаць абранае дзеяньне"
+
+#: templates/admin/actions.html:4
+msgid "Go"
+msgstr "Выканаць"
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr "Каб абраць аб’екты на ўсіх бачынах, націсьніце сюды"
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr "Абраць усе %(total_count)s %(module_name)s"
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr "Не абіраць нічога"
+
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
+#: templates/admin/base.html:28
+msgid "Welcome,"
+msgstr "Вітаем,"
+
+#: templates/admin/base.html:33
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr "Дакумэнтацыя"
+
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr "Зьмяніць пароль"
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Log out"
+msgstr "Выйсьці"
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Кіраўнічая пляцоўка «Джэнґа»"
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Кіраваць «Джэнґаю»"
+
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
+msgid "Add"
+msgstr "Дадаць"
+
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
+msgid "History"
+msgstr "Гісторыя"
+
+#: templates/admin/change_form.html:33
+#: templates/admin/edit_inline/stacked.html:9
+#: templates/admin/edit_inline/tabular.html:30
+msgid "View on site"
+msgstr "Зірнуць на пляцоўцы"
+
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Выпраўце хібу, апісаную ніжэй."
+msgstr[1] "Выпраўце хібы, апісаныя ніжэй."
+msgstr[2] "Выпраўце хібы, апісаныя ніжэй."
+msgstr[3] "Выпраўце хібы, апісаныя ніжэй."
+
+#: templates/admin/change_list.html:58
+#, python-format
+msgid "Add %(name)s"
+msgstr "Дадаць %(name)s"
+
+#: templates/admin/change_list.html:78
+msgid "Filter"
+msgstr "Прасеяць"
+
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr "Прыбраць з упарадкаванага"
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr "Парадак: %(priority_number)s"
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr "Парадкаваць наадварот"
+
+#: templates/admin/delete_confirmation.html:11
+#: templates/admin/submit_line.html:4
+msgid "Delete"
+msgstr "Выдаліць"
+
+#: templates/admin/delete_confirmation.html:18
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+"Калі выдаліць %(object_name)s «%(escaped_object)s», выдаляцца зьвязаныя "
+"аб’екты, але ваш рахунак ня мае дазволу выдаляць наступныя віды аб’ектаў:"
+
+#: templates/admin/delete_confirmation.html:26
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+"Каб выдаліць %(object_name)s «%(escaped_object)s», трэба выдаліць і "
+"зьвязаныя абароненыя аб’екты:"
+
+#: templates/admin/delete_confirmation.html:34
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+"Ці выдаліць %(object_name)s «%(escaped_object)s»? Усе наступныя зьвязаныя "
+"складнікі выдаляцца:"
+
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
+msgid "Yes, I'm sure"
+msgstr "Так, дакладна"
+
+#: templates/admin/delete_selected_confirmation.html:10
+msgid "Delete multiple objects"
+msgstr "Выдаліць некалькі аб’ектаў"
+
+#: templates/admin/delete_selected_confirmation.html:17
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Калі выдаліць абранае (%(objects_name)s), выдаляцца зьвязаныя аб’екты, але "
+"ваш рахунак ня мае дазволу выдаляць наступныя віды аб’ектаў:"
+
+#: templates/admin/delete_selected_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+"Каб выдаліць абранае (%(objects_name)s), трэба выдаліць і зьвязаныя "
+"абароненыя аб’екты:"
+
+#: templates/admin/delete_selected_confirmation.html:33
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+"Ці выдаліць абранае (%(objects_name)s)? Усе наступныя аб’екты ды зьвязаныя "
+"зь імі складнікі выдаляцца:"
+
+#: templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " %(filter_title)s "
+
+#: templates/admin/index.html:20
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr ""
+
+#: templates/admin/index.html:39
+msgid "Change"
+msgstr "Зьмяніць"
+
+#: templates/admin/index.html:49
+msgid "You don't have permission to edit anything."
+msgstr "Вы ня маеце дазволу нешта зьмяняць."
+
+#: templates/admin/index.html:57
+msgid "Recent Actions"
+msgstr "Нядаўнія дзеяньні"
+
+#: templates/admin/index.html:58
+msgid "My Actions"
+msgstr "Мае дзеяньні"
+
+#: templates/admin/index.html:62
+msgid "None available"
+msgstr "Недаступнае"
+
+#: templates/admin/index.html:76
+msgid "Unknown content"
+msgstr "Невядомае зьмесьціва"
+
+#: templates/admin/invalid_setup.html:12
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+"Нешта ня так з усталяванаю базаю зьвестак. Упэўніцеся, што ў базе стварылі "
+"патрэбныя табліцы, і што базу можа чытаць адпаведны карыстальнік."
+
+#: templates/admin/login.html:37
+msgid "Password:"
+msgstr "Пароль:"
+
+#: templates/admin/login.html:44
+msgid "Forgotten your password or username?"
+msgstr "Забыліся на імя ці пароль?"
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr "Час, дата"
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr "Карыстальнік"
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr "Дзеяньне"
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Аб’ект ня мае гісторыі зьменаў. Мажліва, яго дадавалі не праз кіраўнічую "
+"пляцоўку."
+
+#: templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Паказаць усё"
+
+#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Захаваць"
+
+#: templates/admin/search_form.html:7
+msgid "Search"
+msgstr "Шукаць"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] "%(counter)s вынік"
+msgstr[1] "%(counter)s вынікі"
+msgstr[2] "%(counter)s вынікаў"
+msgstr[3] "%(counter)s вынікаў"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "Разам %(full_result_count)s"
+
+#: templates/admin/submit_line.html:5
+msgid "Save as new"
+msgstr "Захаваць як новы"
+
+#: templates/admin/submit_line.html:6
+msgid "Save and add another"
+msgstr "Захаваць і дадаць іншы"
+
+#: templates/admin/submit_line.html:7
+msgid "Save and continue editing"
+msgstr "Захаваць і працягваць правіць"
+
+#: templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+"Спачатку пазначце імя карыстальніка ды пароль. Потым можна будзе наставіць "
+"іншыя можнасьці."
+
+#: templates/admin/auth/user/add_form.html:8
+msgid "Enter a username and password."
+msgstr "Пазначце імя карыстальніка ды пароль."
+
+#: templates/admin/auth/user/change_password.html:31
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr "Пазначце пароль для карыстальніка «<strong>%(username)s</strong>»."
+
+#: templates/admin/auth/user/change_password.html:38
+msgid "Password"
+msgstr "Пароль"
+
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
+msgid "Password (again)"
+msgstr "Пароль (яшчэ раз)"
+
+#: templates/admin/auth/user/change_password.html:45
+msgid "Enter the same password as above, for verification."
+msgstr "Дзеля пэўнасьці набярыце такі самы пароль яшчэ раз."
+
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Прыбраць"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr "Дадаць яшчэ %(verbose_name)s"
+
+#: templates/admin/edit_inline/tabular.html:17
+msgid "Delete?"
+msgstr "Ці выдаліць?"
+
+#: templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Дзякуем за час, які вы сёньня правялі на гэтай пляцоўцы."
+
+#: templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Увайсьці зноўку"
+
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
+msgid "Password change"
+msgstr "Зьмяніць пароль"
+
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
+msgid "Password change successful"
+msgstr "Пароль зьмянілі"
+
+#: templates/registration/password_change_done.html:17
+msgid "Your password was changed."
+msgstr "Ваш пароль зьмяніўся."
+
+#: templates/registration/password_change_form.html:26
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Дзеля бясьпекі пазначце стары пароль, а потым набярыце новы пароль двойчы "
+"— каб упэўніцца, што набралі без памылак."
+
+#: templates/registration/password_change_form.html:32
+msgid "Old password"
+msgstr "Стары пароль"
+
+#: templates/registration/password_change_form.html:37
+msgid "New password"
+msgstr "Новы пароль"
+
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
+msgid "Change my password"
+msgstr "Зьмяніць пароль"
+
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
+msgid "Password reset"
+msgstr "Узнавіць пароль"
+
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
+msgid "Password reset complete"
+msgstr "Пароль узнавілі"
+
+#: templates/registration/password_reset_complete.html:17
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr "Вам усталявалі пароль.  Можаце вярнуцца ды ўвайсьці зноўку."
+
+#: templates/registration/password_reset_confirm.html:7
+msgid "Password reset confirmation"
+msgstr "Пацьвердзіце, што трэба ўзнавіць пароль"
+
+#: templates/registration/password_reset_confirm.html:17
+msgid "Enter new password"
+msgstr "Пазначце новы пароль"
+
+#: templates/registration/password_reset_confirm.html:19
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr "Набярыце новы пароль двойчы — каб упэўніцца, што набралі без памылак."
+
+#: templates/registration/password_reset_confirm.html:23
+msgid "New password:"
+msgstr "Новы пароль:"
+
+#: templates/registration/password_reset_confirm.html:25
+msgid "Confirm password:"
+msgstr "Пацьвердзіце пароль:"
+
+#: templates/registration/password_reset_confirm.html:31
+msgid "Password reset unsuccessful"
+msgstr "Не ўдалося ўзнавіць пароль"
+
+#: templates/registration/password_reset_confirm.html:33
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+"Спасылка ўзнавіць пароль хібная: мажліва таму, што ёю ўжо скарысталіся.  "
+"Запытайцеся ўзнавіць пароль яшчэ раз."
+
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
+msgid "Password reset successful"
+msgstr "Пароль узнавілі"
+
+#: templates/registration/password_reset_done.html:17
+msgid ""
+"We've emailed you instructions for setting your password to the email "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr "Перайдзіце да наступнае бачыны ды абярыце новы пароль:"
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr "Імя карыстальніка, калі раптам вы забыліся:"
+
+#: templates/registration/password_reset_email.html:10
+msgid "Thanks for using our site!"
+msgstr "Дзякуем, што карыстаецеся нашаю пляцоўкаю!"
+
+#: templates/registration/password_reset_email.html:12
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Каманда «%(site_name)s»"
+
+#: templates/registration/password_reset_form.html:17
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Reset my password"
+msgstr "Узнавіць пароль"
+
+#: templatetags/admin_list.py:344
+msgid "All dates"
+msgstr "Усе даты"
+
+#: views/main.py:33
+msgid "(None)"
+msgstr "(Нічога)"
+
+#: views/main.py:76
+#, python-format
+msgid "Select %s"
+msgstr "Абраць %s"
+
+#: views/main.py:78
+#, python-format
+msgid "Select %s to change"
+msgstr "Абярыце %s, каб зьмяніць"
diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..ba6f73895d
Binary files /dev/null and b/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..c408f6eb7b
--- /dev/null
+++ b/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po
@@ -0,0 +1,183 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2012-08-01 08:14+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
+msgid "Available %s"
+msgstr "Даступныя %s"
+
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
+msgstr ""
+"Сьпіс даступных %s. Каб нешта абраць, пазначце патрэбнае ў полі ніжэй і "
+"пстрыкніце па стрэлцы «Абраць» між двума палямі."
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into this box to filter down the list of available %s."
+msgstr "Каб прасеяць даступныя %s, друкуйце ў гэтым полі."
+
+#: static/admin/js/SelectFilter2.js:57
+msgid "Filter"
+msgstr "Прасеяць"
+
+#: static/admin/js/SelectFilter2.js:61
+msgid "Choose all"
+msgstr "Абраць усе"
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
+msgstr "Каб абраць усе %s, пстрыкніце тут."
+
+#: static/admin/js/SelectFilter2.js:67
+msgid "Choose"
+msgstr "Абраць"
+
+#: static/admin/js/SelectFilter2.js:69
+msgid "Remove"
+msgstr "Прыбраць"
+
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Chosen %s"
+msgstr "Абралі %s"
+
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
+msgstr ""
+"Сьпіс абраных %s. Каб нешта прыбраць, пазначце патрэбнае ў полі ніжэй і "
+"пстрыкніце па стрэлцы «Прыбраць» між двума палямі."
+
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
+msgstr "Прыбраць усё"
+
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr "Каб прыбраць усе %s, пстрыкніце тут."
+
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "Абралі %(sel)s з %(cnt)s"
+msgstr[1] "Абралі %(sel)s з %(cnt)s"
+msgstr[2] "Абралі %(sel)s з %(cnt)s"
+msgstr[3] "Абралі %(sel)s з %(cnt)s"
+
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+"У пэўных палях засталіся незахаваныя зьмены. Калі выканаць дзеяньне, "
+"незахаванае страціцца."
+
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+"Абралі дзеяньне, але не захавалі зьмены ў пэўных палях. Каб захаваць, "
+"націсьніце «Добра». Дзеяньне потым трэба будзе запусьціць нанова."
+
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+"Абралі дзеяньне, а ў палях нічога не зьмянялі. Мажліва, вы хацелі націснуць "
+"кнопку «Выканаць», а ня кнопку «Захаваць»."
+
+#: static/admin/js/calendar.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Студзень Люты Сакавік Красавік Травень Чэрвень Ліпень Жнівень Верасень "
+"Кастрычнік Лістапад Сьнежань"
+
+#: static/admin/js/calendar.js:27
+msgid "S M T W T F S"
+msgstr "Н П А С Ч П С"
+
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr "Паказаць"
+
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr "Схаваць"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
+msgid "Now"
+msgstr "Цяпер"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:53
+msgid "Clock"
+msgstr "Гадзіньнік"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:81
+msgid "Choose a time"
+msgstr "Абярыце час"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:86
+msgid "Midnight"
+msgstr "Поўнач"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:87
+msgid "6 a.m."
+msgstr "6 папоўначы"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:88
+msgid "Noon"
+msgstr "Поўдзень"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
+msgid "Cancel"
+msgstr "Скасаваць"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
+msgid "Today"
+msgstr "Сёньня"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:148
+msgid "Calendar"
+msgstr "Каляндар"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:195
+msgid "Yesterday"
+msgstr "Учора"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:199
+msgid "Tomorrow"
+msgstr "Заўтра"
diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo
index 562f7d925d..85af8ff301 100644
Binary files a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po
index 72ed680b5c..8568108238 100644
--- a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po
@@ -3,33 +3,33 @@
 # Translators:
 # Boris Chervenkov <office@sentido.bg>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Todor Lubenov <tlubenov@gmail.com>, 2011.
+# Todor Lubenov <tlubenov@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Успешно изтрити %(count)d %(items)s ."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Не можете да изтриете %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Сигурни ли сте?"
 
@@ -38,162 +38,137 @@ msgstr "Сигурни ли сте?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Изтриване на избраните %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Всички"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Да"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Не"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Коя-да-е дата"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Днес"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Последните 7 дни"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Този месец"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Тази година"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Моля, въведете правилното потребителско име и парола. Забележка: и двете "
-"полета правят разлика между големи и малки букви."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Моля, влезте отново, тъй като сесията е изтекла."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "E-mail адресът Ви не е Вашето потребителско име. Опитайте '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Действие:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "време на действие"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id на обекта"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr на обекта"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "флаг за действие"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "промени съобщение"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "записка"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "записки"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Добавен \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Променени \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Изтрит \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry обект"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Празно"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Променено %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "и"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Добавени %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Променени %(list)s за %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Изтрити %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Няма променени полета."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Обектът %(name)s \"%(obj)s\" бе успешно добавен.  "
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Може да го редактирате отново по-долу.  "
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Може да добавите още един обект %s по-долу.  "
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Обектът %(name)s \"%(obj)s\" бе успешно актуализиран.  "
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,7 +176,38 @@ msgstr ""
 "Обектът %(name)s \"%(obj)s\" бе успешно добавен.  Може да го редактирате по-"
 "долу.  "
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Обектът %(name)s \"%(obj)s\" бе успешно добавен.  "
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Обектът %(name)s \"%(obj)s\" бе успешно актуализиран.  "
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,89 +215,97 @@ msgstr ""
 "Елементите трябва да бъдат избрани, за да се извършат действия по тях. Няма "
 "променени елементи."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Няма избрани действия."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Добави %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s обект с първичен ключ %(key)r не съществува."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Промени %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Грешка в базата данни"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s беше променено успешно."
 msgstr[1] "%(count)s %(name)s бяха променени успешно."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s е избран"
 msgstr[1] "Всички %(total_count)s са избрани"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 от %(cnt)s са избрани"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Обектът %(name)s \"%(obj)s\" бе успешно изтрит.  "
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "История на промените: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Вход"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Администрация на сайта"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s администрация"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Дата:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Час:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Търсене"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Добави друг"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Страница не е намерена"
@@ -300,42 +314,42 @@ msgstr "Страница не е намерена"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Съжалявам, но исканата страница не е намерена."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Начало"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Сървърна грешка"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Сървърна грешка (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Сървърна грешка <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Грешка. Изпратен е email на администратора на сайта.  Благодарим Ви за "
-"търпението."
+"Станала е грешка. Съобщава се на администраторите на сайта по електронна "
+"поща и трябва да бъде поправено скоро. Благодарим ви за търпението."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -358,7 +372,7 @@ msgstr "Избери всички %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Изтрий избраното"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -368,22 +382,22 @@ msgid "Welcome,"
 msgstr "Добре дошли,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Промени парола"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Изход"
 
@@ -395,35 +409,35 @@ msgstr "Административен панел"
 msgid "Django administration"
 msgstr "Административен панел"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Добави"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "История"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Разгледай в сайта"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Моля, поправете грешката по-долу."
 msgstr[1] "Моля, поправете грешките по-долу."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Добави %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Филтър"
 
@@ -440,12 +454,12 @@ msgstr "Ред на подреждане: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Обърни подреждането"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Изтрий"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -456,7 +470,7 @@ msgstr ""
 "извършено без да се изтрият и някои свързани обекти, върху които обаче "
 "нямате права: "
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -465,7 +479,7 @@ msgstr ""
 "Изтриването на %(object_name)s '%(escaped_object)s' ще доведе до "
 "заличаването на следните защитени свързани обекти:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +488,16 @@ msgstr ""
 "Наистина ли искате да изтриете обектите %(object_name)s \"%(escaped_object)s"
 "\"? Следните свързани елементи също ще бъдат изтрити:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Да, сигурен съм"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Изтриване на множество обекти"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +507,7 @@ msgstr ""
 "Изтриването на избраните %(objects_name)s ще доведе до изтриване на свързани "
 "обекти. Вашият профил няма права за изтриване на следните типове обекти:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +516,7 @@ msgstr ""
 "Изтриването на избраните %(objects_name)s ще доведе до заличаването на "
 "следните защитени свързани обекти:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +530,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " По %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Модели, достъпни в приложението %(name)s "
+msgid "Models in the %(name)s application"
+msgstr "Моделите в %(name)s приложение"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Промени"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Нямате права да редактирате каквото и да е."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Последни действия"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Моите действия"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Няма налични"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Неизвестно съдържание"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -554,31 +568,27 @@ msgstr ""
 "Проблем с базата данни. Проверете дали необходимите таблици са създадени и "
 "дали съответния потребител има необходимите права за достъп.  "
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Потребител:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Парола:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Забравена парола или потребителско име?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Дата/час"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Потребител"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Действие"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -634,64 +644,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Въведете потребителско име и парола."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Въведете нова парола за потребител <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Парола"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Парола (отново)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Въведете същата парола още веднъж за проверка.  "
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Премахване"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Добави друг %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Премахване"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Изтриване?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Благодарим Ви, че използвахте този сайт днес."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Влез пак"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Промяна на парола"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Паролата е сменена успешно"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Паролата ви е променена."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -699,46 +709,46 @@ msgstr ""
 "Въведете старата си парола /за сигурност/. След това въведете желаната нова "
 "парола два пъти от съображения за сигурност"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Стара парола"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Нова парола"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Промяна на парола"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Нова парола"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Промяната на парола завърши"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Паролата е променена. Вече можете да се впишете"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Парола за потвърждение"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Въведете нова парола"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -746,19 +756,19 @@ msgstr ""
 "Моля, въведете новата парола два пъти, за да може да се потвърди, че сте я "
 "написали правилно."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Нова парола:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Потвърдете паролата:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Неуспешна промяна на паролата "
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -766,27 +776,27 @@ msgstr ""
 "Връзката за възстановяване на паролата е невалидна, може би защото вече е "
 "използвана. Моля, поискайте нова промяна на паролата."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Паролата е успешно променена."
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Пратили сме ви указания за задаване на парола за достъп на посочения от Вас "
-"email адрес. Трябва да ги получите скоро."
+"Изпратихме ви инструкции за задаването на паролата на имейл адреса, който "
+"сте изпратили. Трябва да я получите скоро."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Вие получавате това email съобщение, защото пожелахте възстановяване на "
-"паролата на Вашия потребителски профил в %(site_name)s ."
+"Вие сте получили този имейл, защото сте поискали да промените паролата за "
+"вашия потребителски акаунт в %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -805,36 +815,36 @@ msgstr "Благодарим, че ползвате сайта ни!"
 msgid "The %(site_name)s team"
 msgstr "Екипът на %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Забравена парола? Въведете вашия email адрес по-долу и ние ще Ви изпратим "
-"инструкции за създаване на нова."
+"Забравили сте си паролата? Въведете своя имейл адрес по-долу, а ние ще ви "
+"изпратим инструкции за създаване на нова."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Email адрес:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "E-mail адреси:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Нова парола"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Всички дати"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Празен)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Изберете %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Изберете %s за промяна"
diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo
index a86d142418..d989428864 100644
Binary files a/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po
index f6499aa5c4..4e31a049cd 100644
--- a/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po
@@ -2,21 +2,21 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Todor Lubenov <tlubenov@gmail.com>, 2011.
+# Todor Lubenov <tlubenov@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
+"PO-Revision-Date: 2012-08-30 15:03+0000\n"
 "Last-Translator: Todor Lubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -29,11 +29,14 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Това е списък на наличните %s . Можете да изберете някои, като ги изберете в "
+"полето по-долу и след това кликнете върху \"Избор\" стрелка между двете "
+"кутии."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Въведете в това поле, за да филтрирате списъка на наличните %s."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -46,11 +49,11 @@ msgstr "Избери всички"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Кликнете, за да изберете всички %s наведнъж."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Избирам"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -67,6 +70,9 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Това е списък на избрания %s. Можете да премахнете някои, като ги изберете в "
+"полето по-долу и след това щракнете върху \"Премахни\" стрелка между двете "
+"кутии."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
@@ -75,7 +81,7 @@ msgstr "Премахване на всички"
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Кликнете, за да премахнете всички избрани %s наведнъж."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo
index 64019c77c0..440f7b2d1f 100644
Binary files a/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/bn/LC_MESSAGES/django.po b/django/contrib/admin/locale/bn/LC_MESSAGES/django.po
index be2b6cffca..ac505656d7 100644
--- a/django/contrib/admin/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/bn/LC_MESSAGES/django.po
@@ -1,195 +1,175 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+#  <anubhab91@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <rafi.tahmid@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-20 15:10+0000\n"
+"Last-Translator: anubhab91 <anubhab91@gmail.com>\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr ""
+msgstr "%(count)d টি %(items)s সফলভাবে মুছে ফেলা হয়েছে"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
-msgstr ""
+msgstr "%(name)s ডিলিট করা সম্ভব নয়"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "আপনি কি নিশ্চিত?"
 
 #: actions.py:83
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
-msgstr ""
+msgstr "চিহ্নিত অংশটি %(verbose_name_plural)s মুছে ফেলুন"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "সকল"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "না"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "অজানা"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "যে কোন তারিখ"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "‍আজ"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "শেষ ৭ দিন"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "এ মাসে"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "এ বছরে"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "অনুগ্রহ করে পুনরায় প্রবেশ করুন, কেননা আপনার সেশনের মেয়াদ শেষ।"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "আপনার ইমেইল ঠিকানা, আপনার সদস্যনাম নয়। ’%s' চেষ্টা করতে পারেন।"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
-msgstr ""
+msgstr "কাজ:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "কার্য সময়"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "অবজেক্ট আইডি"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "অবজেক্ট উপস্থাপক"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "কার্যচিহ্ন"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "বার্তা পরিবর্তন করুন"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "লগ এন্ট্রি"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "লগ এন্ট্রিসমূহ"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "%(object)s অ্যাড করা হয়েছে"
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "\"%(object)s\" ডিলিট করা হয়েছে"
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "লগ-এন্ট্রি দ্রব্য"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "কিছু না"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s পরিবর্তিত হয়েছে।"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "এবং"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" যুক্ত হয়েছে।"
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" এর জন্য %(list)s পরিবর্তিত হয়েছে।"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" মোছা হয়েছে।"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "কোন ফিল্ড পরিবর্তন হয়নি।"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে।"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "আপনি নিচে থেকে এটি পুনরায় সম্পাদন করতে পারেন।"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "আপনি নিচে থেকে আরেকটি %s যোগ করতে পারেন।"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" সফলতার সাথে পরিবর্তিত হয়েছে।"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -197,95 +177,134 @@ msgstr ""
 "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে। আপনি নিচে থেকে এটি পুনরায় সম্পাদন "
 "করতে পারেন।"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে।"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" সফলতার সাথে পরিবর্তিত হয়েছে।"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
-msgstr ""
+msgstr "কাজ করার আগে বস্তুগুলিকে অবশ্যই চিহ্নিত করতে হবে। কোনো বস্তু পরিবর্তিত হয়নি।"
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
-msgstr ""
+msgstr "কোনো কাজ "
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s যোগ করুন"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s পরিবর্তন করুন"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "ডাটাবেস সমস্যা"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
-msgstr ""
+msgstr "%(cnt)s টি থেকে ০ টি সিলেক্ট করা হয়েছে"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" সফলতার সাথে মুছে ফেলা হয়েছে।"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "ইতিহাস পরিবর্তনঃ %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "প্রবেশ করুন"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "সাইট প্রশাসন"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s প্রশাসন"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "তারিখঃ"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "সময়ঃ"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "খুঁজুন"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "আরেকটি যোগ করুন"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "বর্তমান অবস্থা:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "পরিবর্তন:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "পৃষ্ঠা পাওয়া যায়নি"
@@ -294,46 +313,44 @@ msgstr "পৃষ্ঠা পাওয়া যায়নি"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "দুঃখিত, অনুরোধকৃত পাতাটি পাওয়া যায়নি।"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "নীড়পাতা"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "সার্ভার সমস্যা"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "সার্ভার সমস্যা (৫০০)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "সার্ভার সমস্যা <em>(৫০০)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"একটি সমস্যা দেখা গিয়েছে। সাইট প্রশাসনকে ইমেইলের মাধ্যমে অবহিত করা হয়েছে। খুব "
-"শীঘ্রই সমস্যার সমাধান হবে আশা করা যাচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন।"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
-msgstr ""
+msgstr "চিহ্নিত কাজটি শুরু করুন"
 
 #: templates/admin/actions.html:4
 msgid "Go"
@@ -341,7 +358,7 @@ msgstr "যান"
 
 #: templates/admin/actions.html:11
 msgid "Click here to select the objects across all pages"
-msgstr ""
+msgstr "সকল পৃষ্ঠার দ্রব্য পছন্দ করতে এখানে ক্লিক করুন"
 
 #: templates/admin/actions.html:11
 #, python-format
@@ -350,9 +367,9 @@ msgstr ""
 
 #: templates/admin/actions.html:13
 msgid "Clear selection"
-msgstr ""
+msgstr "চিহ্নিত অংশের চিহ্ন মুছে ফেলুন"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -362,22 +379,22 @@ msgid "Welcome,"
 msgstr "স্বাগতম,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "সহায়িকা"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "পাসওয়ার্ড বদলান"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "প্রস্থান"
 
@@ -389,41 +406,41 @@ msgstr "জ্যাঙ্গো সাইট প্রশাসক"
 msgid "Django administration"
 msgstr "জ্যাঙ্গো প্রশাসন"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "যোগ করুন"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "ইতিহাস"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "সাইটে দেখুন"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "অনুগ্রহ করে নিচের ভুলটি সংশোধন করুন।"
 msgstr[1] "অনুগ্রহ করে নিচের ভুলগুলো সংশোধন করুন।"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s যোগ করুন"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "ফিল্টার"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "ক্রমানুসারে সাজানো থেকে বিরত হোন"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
@@ -432,14 +449,14 @@ msgstr ""
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "ক্রমানুসারে সাজানো চালু করুন/ বন্ধ করুন"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "মুছুন"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -449,14 +466,14 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' মুছে ফেললে এর সম্পর্কিত অবজেক্টগুলোও মুছে "
 "যাবে, কিন্তু আপনার নিম্নবর্ণিত অবজেক্টগুলো মোছার অধিকার নেইঃ"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -465,16 +482,16 @@ msgstr ""
 "আপনি কি %(object_name)s \"%(escaped_object)s\" মুছে ফেলার ব্যাপারে নিশ্চিত? "
 "নিম্নে বর্ণিত সকল আইটেম মুছে যাবেঃ"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "হ্যা়ঁ, আমি নিশ্চিত"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
-msgstr ""
+msgstr "একাধিক জিনিস মুছে ফেলুন"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -482,14 +499,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -501,36 +518,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s অনুযায়ী "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s এ্যপ্লিকেশনে অবস্থিত মডেলসমূহ"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "পরিবর্তন"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "কোন কিছু পরিবর্তনে আপনার অধিকার নেই।"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "সাম্প্রতিক কার্যাবলী"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "আমার কার্যাবলী"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "কিছুই পাওয়া যায়নি"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
-msgstr ""
+msgstr "অজানা বিষয়"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -539,31 +556,27 @@ msgstr ""
 "আপনার ডাটাবেস ইনস্টলে সমস্যা হয়েছে। নিশ্চিত করুন যে, ডাটাবেস টেবিলগুলো সঠিকভাবে "
 "তৈরী হয়েছে, এবং যথাযথ সদস্যের ডাটাবেস পড়ার অধিকার রয়েছে।"
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "সদস্যনামঃ"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "পাসওয়ার্ডঃ"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "ইউজার নেইম অথবা পাসওয়ার্ড ভুলে গেছেন?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "তারিখ/সময়"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "সদস্য"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "কার্য"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -579,7 +592,7 @@ msgstr "সংরক্ষণ করুন"
 
 #: templates/admin/search_form.html:7
 msgid "Search"
-msgstr ""
+msgstr "সার্চ"
 
 #: templates/admin/search_form.html:9
 #, python-format
@@ -615,66 +628,66 @@ msgstr ""
 
 #: templates/admin/auth/user/add_form.html:8
 msgid "Enter a username and password."
-msgstr ""
+msgstr "ইউজার নেইম এবং পাসওয়ার্ড টাইপ করুন।"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "<strong>%(username)s</strong> সদস্যের জন্য নতুন পাসওয়ার্ড দিন।"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "পাসওয়ার্ড"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "পাসওয়ার্ড (পুনরায়)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "মুছে ফেলুন"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "মুছে ফেলুন"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "মুছে ফেলুন?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "ওয়েবসাইটে কিছু সময় কাটানোর জন্য আপনাকে আন্তরিক ধন্যবাদ।"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "পুনরায় প্রবেশ করুন"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "পাসওয়ার্ড বদলান"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "পাসওয়ার্ড বদল সফল হয়েছে"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "আপনার পাসওয়ার্ড বদলানো হয়েছে।"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -682,46 +695,46 @@ msgstr ""
 "অনুগ্রহ করে আপনার পুরনো পাসওয়ার্ড প্রবেশ করান, নিরাপত্তার কাতিরে, এবং পরপর দু’বার "
 "নতুন পাসওয়ার্ড প্রবেশ করান, যাচাই করার জন্য।"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "পুরনো পাসওয়ার্ড"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "নতুন পাসওয়ার্ড"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "আমার পাসওয়ার্ড পরিবর্তন করুন"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "পাসওয়ার্ড রিসেট করুন"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "পাসওয়ার্ড রিসেট সম্পন্ন হয়েছে"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "আপনার পাসওয়ার্ড দেয়া হয়েছে। আপনি এখন প্রবেশ (লগইন) করতে পারেন।"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "পাসওয়ার্ড রিসেট নিশ্চিত করুন"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "নতুন পাসওয়ার্ড দিন"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -729,19 +742,19 @@ msgstr ""
 "অনুগ্রহ করে আপনার পাসওয়ার্ড দুবার প্রবেশ করান, যাতে আমরা যাচাই করতে পারি আপনি "
 "সঠিকভাবে টাইপ করেছেন।"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "নতুন পাসওয়ার্ডঃ"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "পাসওয়ার্ড নিশ্চিতকরণঃ"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "পাসওয়ার্ড রিসেট সফল হয়নি"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -749,22 +762,21 @@ msgstr ""
 "পাসওয়ার্ড রিসেট লিঙ্কটি ঠিক নয়, হয়তো এটা ইতোমধ্যে ব্যবহৃত হয়েছে। পাসওয়ার্ড "
 "রিসেটের জন্য অনুগ্রহ করে নতুনভাবে আবেদন করুন।"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "পাসওয়ার্ড রিসেট সফল হয়েছে"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"আপনার পাসওয়ার্ড ঠিক করার নিয়ম আপনাকে ইমেইল করা হয়েছে। শীঘ্রই আপনি ইমেইল পাবেন।"
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -785,36 +797,34 @@ msgstr "আমাদের সাইট ব্যবহারের জন্য
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s দল"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"পাসওয়ার্ড ভুলে গেছেন? আপনার ইমেইল ঠিকানা দিন, আমরা নতুন পাসওয়ার্ড দেয়ার নিয়ম "
-"আপনাকে মেইল করে দেবো।"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "ইমেইল ঠিকানঃ"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "ইমেইল ঠিকানা:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "আমার পাসওয়ার্ড রিসেট করুন"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "সকল তারিখ"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
-msgstr ""
+msgstr "(কিছুই না)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s বাছাই করুন"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s পরিবর্তনের জন্য বাছাই করুন"
diff --git a/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.mo
index f5a69a9c45..d746d04202 100644
Binary files a/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.po
index e44dd860fa..9fa2d361b2 100644
--- a/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.po
@@ -9,13 +9,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/br/LC_MESSAGES/django.mo b/django/contrib/admin/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..9121c62db4
Binary files /dev/null and b/django/contrib/admin/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/br/LC_MESSAGES/django.po b/django/contrib/admin/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..94518e9b09
--- /dev/null
+++ b/django/contrib/admin/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,811 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 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-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: actions.py:48
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr ""
+
+#: actions.py:60 options.py:1347
+#, python-format
+msgid "Cannot delete %(name)s"
+msgstr ""
+
+#: actions.py:62 options.py:1349
+msgid "Are you sure?"
+msgstr "Ha sur oc'h ?"
+
+#: actions.py:83
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr ""
+
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
+msgid "All"
+msgstr "An holl"
+
+#: filters.py:238
+msgid "Yes"
+msgstr "Ya"
+
+#: filters.py:239
+msgid "No"
+msgstr "Ket"
+
+#: filters.py:253
+msgid "Unknown"
+msgstr "Dianav"
+
+#: filters.py:308
+msgid "Any date"
+msgstr "Forzh pegoulz"
+
+#: filters.py:309
+msgid "Today"
+msgstr "Hiziv"
+
+#: filters.py:313
+msgid "Past 7 days"
+msgstr "Er 7 devezh diwezhañ"
+
+#: filters.py:317
+msgid "This month"
+msgstr "Ar miz-mañ"
+
+#: filters.py:321
+msgid "This year"
+msgstr "Ar bloaz-mañ"
+
+#: forms.py:9
+#, python-format
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr ""
+
+#: helpers.py:23
+msgid "Action:"
+msgstr "Ober :"
+
+#: models.py:24
+msgid "action time"
+msgstr "eur an ober"
+
+#: models.py:27
+msgid "object id"
+msgstr ""
+
+#: models.py:28
+msgid "object repr"
+msgstr ""
+
+#: models.py:29
+msgid "action flag"
+msgstr ""
+
+#: models.py:30
+msgid "change message"
+msgstr "Kemennadenn gemmañ"
+
+#: models.py:35
+msgid "log entry"
+msgstr ""
+
+#: models.py:36
+msgid "log entries"
+msgstr ""
+
+#: models.py:45
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr ""
+
+#: models.py:47
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr ""
+
+#: models.py:52
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr ""
+
+#: models.py:54
+msgid "LogEntry Object"
+msgstr "Traezenn eus ar marilh"
+
+#: options.py:156 options.py:172
+msgid "None"
+msgstr "Hini ebet"
+
+#: options.py:684
+#, python-format
+msgid "Changed %s."
+msgstr "Kemmet %s."
+
+#: options.py:684 options.py:694
+msgid "and"
+msgstr "ha"
+
+#: options.py:689
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:693
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:698
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:702
+msgid "No fields changed."
+msgstr "N'eus bet kemmet maezienn ebet."
+
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: options.py:951 options.py:1211
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+
+#: options.py:970
+msgid "No action selected."
+msgstr ""
+
+#: options.py:1050
+#, python-format
+msgid "Add %s"
+msgstr "Ouzhpennañ %s"
+
+#: options.py:1074 options.py:1319
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr ""
+
+#: options.py:1140
+#, python-format
+msgid "Change %s"
+msgstr "Kemmañ %s"
+
+#: options.py:1190
+msgid "Database error"
+msgstr "Fazi en diaz roadennoù"
+
+#: options.py:1253
+#, python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] ""
+msgstr[1] ""
+
+#: options.py:1280
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: options.py:1285
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr ""
+
+#: options.py:1335
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: options.py:1382
+#, python-format
+msgid "Change history: %s"
+msgstr "Istor ar c'hemmoù : %s"
+
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
+msgid "Log in"
+msgstr "Kevreañ"
+
+#: sites.py:388
+msgid "Site administration"
+msgstr "Merañ al lec'hienn"
+
+#: sites.py:440
+#, python-format
+msgid "%s administration"
+msgstr "Merañ %s"
+
+#: widgets.py:90
+msgid "Date:"
+msgstr "Deiziad :"
+
+#: widgets.py:91
+msgid "Time:"
+msgstr "Eur :"
+
+#: widgets.py:165
+msgid "Lookup"
+msgstr "Klask"
+
+#: widgets.py:271
+msgid "Add Another"
+msgstr "Ouzhpennañ unan all"
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
+#: templates/admin/404.html:4 templates/admin/404.html.py:8
+msgid "Page not found"
+msgstr "N'eo ket bet kavet ar bajenn"
+
+#: templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
+msgid "Home"
+msgstr "Degemer"
+
+#: templates/admin/500.html:7
+msgid "Server error"
+msgstr "Fazi servijer"
+
+#: templates/admin/500.html:11
+msgid "Server error (500)"
+msgstr "Fazi servijer (500)"
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr "Fazi servijer <em>(500)</em>"
+
+#: templates/admin/500.html:15
+msgid ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Go"
+msgstr "Mont"
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr ""
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr ""
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr "Riñsañ an diuzadenn"
+
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
+#: templates/admin/base.html:28
+msgid "Welcome,"
+msgstr "Degemer mat,"
+
+#: templates/admin/base.html:33
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr "Teulioù"
+
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr "Cheñch ger-tremen"
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Log out"
+msgstr "Digevreañ"
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Lec'hienn verañ Django"
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Merañ Django"
+
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
+msgid "Add"
+msgstr "Ouzhpennañ"
+
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
+msgid "History"
+msgstr "Istor"
+
+#: templates/admin/change_form.html:33
+#: templates/admin/edit_inline/stacked.html:9
+#: templates/admin/edit_inline/tabular.html:30
+msgid "View on site"
+msgstr "Gwelet war al lec'hienn"
+
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/admin/change_list.html:58
+#, python-format
+msgid "Add %(name)s"
+msgstr "Ouzhpennañ %(name)s"
+
+#: templates/admin/change_list.html:78
+msgid "Filter"
+msgstr "Sil"
+
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr ""
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr ""
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr "Eilpennañ an diuzadenn"
+
+#: templates/admin/delete_confirmation.html:11
+#: templates/admin/submit_line.html:4
+msgid "Delete"
+msgstr "Diverkañ"
+
+#: templates/admin/delete_confirmation.html:18
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:26
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:34
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
+msgid "Yes, I'm sure"
+msgstr "Ya, sur on"
+
+#: templates/admin/delete_selected_confirmation.html:10
+msgid "Delete multiple objects"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:17
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:33
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+
+#: templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " dre %(filter_title)s "
+
+#: templates/admin/index.html:20
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr ""
+
+#: templates/admin/index.html:39
+msgid "Change"
+msgstr "Kemmañ"
+
+#: templates/admin/index.html:49
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: templates/admin/index.html:57
+msgid "Recent Actions"
+msgstr ""
+
+#: templates/admin/index.html:58
+msgid "My Actions"
+msgstr "Ma oberoù"
+
+#: templates/admin/index.html:62
+msgid "None available"
+msgstr ""
+
+#: templates/admin/index.html:76
+msgid "Unknown content"
+msgstr "Endalc'had dianav"
+
+#: templates/admin/invalid_setup.html:12
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+
+#: templates/admin/login.html:37
+msgid "Password:"
+msgstr "Ger-tremen :"
+
+#: templates/admin/login.html:44
+msgid "Forgotten your password or username?"
+msgstr "Disoñjet ho ker-tremen pe hoc'h anv implijer ganeoc'h ?"
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr "Deiziad/eur"
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr "Implijer"
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr "Ober"
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+
+#: templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Diskouez pep tra"
+
+#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Enrollañ"
+
+#: templates/admin/search_form.html:7
+msgid "Search"
+msgstr "Klask"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr ""
+
+#: templates/admin/submit_line.html:5
+msgid "Save as new"
+msgstr "Enrollañ evel nevez"
+
+#: templates/admin/submit_line.html:6
+msgid "Save and add another"
+msgstr "Enrollañ hag ouzhpennañ unan all"
+
+#: templates/admin/submit_line.html:7
+msgid "Save and continue editing"
+msgstr "Enrollañ ha derc'hel da gemmañ"
+
+#: templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+
+#: templates/admin/auth/user/add_form.html:8
+msgid "Enter a username and password."
+msgstr "Merkit un anv implijer hag ur ger-tremen."
+
+#: templates/admin/auth/user/change_password.html:31
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:38
+msgid "Password"
+msgstr "Ger-tremen"
+
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
+msgid "Password (again)"
+msgstr "Ger-tremen (adarre)"
+
+#: templates/admin/auth/user/change_password.html:45
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Lemel kuit"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr ""
+
+#: templates/admin/edit_inline/tabular.html:17
+msgid "Delete?"
+msgstr "Diverkañ ?"
+
+#: templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr ""
+
+#: templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Kevreañ en-dro"
+
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
+msgid "Password change"
+msgstr "Cheñch ho ker-tremen"
+
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
+msgid "Password change successful"
+msgstr "Ger-termen cheñchet ervat"
+
+#: templates/registration/password_change_done.html:17
+msgid "Your password was changed."
+msgstr "Cheñchet eo bet ho ker-tremen."
+
+#: templates/registration/password_change_form.html:26
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+
+#: templates/registration/password_change_form.html:32
+msgid "Old password"
+msgstr "Ger-tremen kozh"
+
+#: templates/registration/password_change_form.html:37
+msgid "New password"
+msgstr "Ger-tremen nevez"
+
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
+msgid "Change my password"
+msgstr "Cheñch ma ger-tremen"
+
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
+msgid "Password reset"
+msgstr "Adderaouekaat ar ger-tremen"
+
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
+msgid "Password reset complete"
+msgstr "Adderaouekaet eo bet ar ger-tremen ervat"
+
+#: templates/registration/password_reset_complete.html:17
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:7
+msgid "Password reset confirmation"
+msgstr "Kadarnaat eo bet cheñchet ar ger-tremen"
+
+#: templates/registration/password_reset_confirm.html:17
+msgid "Enter new password"
+msgstr "Merkañ ur ger-tremen nevez"
+
+#: templates/registration/password_reset_confirm.html:19
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:23
+msgid "New password:"
+msgstr "Ger-tremen nevez :"
+
+#: templates/registration/password_reset_confirm.html:25
+msgid "Confirm password:"
+msgstr "Kadarnaat ar ger-tremen :"
+
+#: templates/registration/password_reset_confirm.html:31
+msgid "Password reset unsuccessful"
+msgstr "Ur fazi zo c'hoarvezet en ur cheñch ger-tremen"
+
+#: templates/registration/password_reset_confirm.html:33
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
+msgid "Password reset successful"
+msgstr "Cheñchet eo bet ar ger-tremen ervat"
+
+#: templates/registration/password_reset_done.html:17
+msgid ""
+"We've emailed you instructions for setting your password to the email "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:10
+msgid "Thanks for using our site!"
+msgstr "Ho trugarekaat da ober gant hol lec'hienn !"
+
+#: templates/registration/password_reset_email.html:12
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:17
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Reset my password"
+msgstr ""
+
+#: templatetags/admin_list.py:344
+msgid "All dates"
+msgstr "An holl zeiziadoù"
+
+#: views/main.py:33
+msgid "(None)"
+msgstr "(hini)"
+
+#: views/main.py:76
+#, python-format
+msgid "Select %s"
+msgstr "Diuzañ %s"
+
+#: views/main.py:78
+#, python-format
+msgid "Select %s to change"
+msgstr ""
diff --git a/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..aadd5d27c2
Binary files /dev/null and b/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..bc95737f70
--- /dev/null
+++ b/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.po
@@ -0,0 +1,170 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2012-06-30 18:35+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
+msgid "Available %s"
+msgstr "Hegerz %s"
+
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into this box to filter down the list of available %s."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:57
+msgid "Filter"
+msgstr "Sil"
+
+#: static/admin/js/SelectFilter2.js:61
+msgid "Choose all"
+msgstr "Dibab an holl"
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
+msgstr "Klikañ evit dibab an holl %s war un dro."
+
+#: static/admin/js/SelectFilter2.js:67
+msgid "Choose"
+msgstr "Dibab"
+
+#: static/admin/js/SelectFilter2.js:69
+msgid "Remove"
+msgstr "Lemel kuit"
+
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Chosen %s"
+msgstr "Dibabet %s"
+
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
+msgstr "Lemel kuit pep tra"
+
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr "Klikañ evit dilemel an holl %s dibabet war un dro."
+
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+
+#: static/admin/js/calendar.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Genver C'hwevrer Meurzh Ebrel Mae Mezheven Gouere Eost Gwengolo Here Du Kerzu"
+
+#: static/admin/js/calendar.js:27
+msgid "S M T W T F S"
+msgstr "S L M M Y G S"
+
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr "Diskouez"
+
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr "Kuzhat"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
+msgid "Now"
+msgstr "Bremañ"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:53
+msgid "Clock"
+msgstr "Horolaj"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:81
+msgid "Choose a time"
+msgstr "Dibab un eur"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:86
+msgid "Midnight"
+msgstr "Hanternoz"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:87
+msgid "6 a.m."
+msgstr "6e00"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:88
+msgid "Noon"
+msgstr "Kreisteiz"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
+msgid "Cancel"
+msgstr "Nullañ"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
+msgid "Today"
+msgstr "Hiziv"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:148
+msgid "Calendar"
+msgstr "Deiziadur"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:195
+msgid "Yesterday"
+msgstr "Dec'h"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:199
+msgid "Tomorrow"
+msgstr "Warc'hoazh"
diff --git a/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo
index fdb5eff241..d54fc1e187 100644
Binary files a/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/bs/LC_MESSAGES/django.po b/django/contrib/admin/locale/bs/LC_MESSAGES/django.po
index 85f3d21f58..b3e56cf0b1 100644
--- a/django/contrib/admin/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/bs/LC_MESSAGES/django.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Filip Dupanović <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Uspješno izbrisano %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Da li ste sigurni?"
 
@@ -38,160 +38,137 @@ msgstr "Da li ste sigurni?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Izbriši odabrane %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Svi"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Da"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ne"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Svi datumi"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Danas"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Poslednjih 7 dana"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Ovaj mesec"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Ova godina"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Molimo da se prijavite ponovo, pošto je vaša sesija istekla."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Vaša email adresa nije vaše korisničko ime. Probajte sa „%s“."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Radnja:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "vrijeme radnje"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id objekta"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr objekta"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "oznaka radnje"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "opis izmjene"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "zapis u logovima"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "zapisi u logovima"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Nijedan"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Promijenjeno %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "i"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Dodano %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Promijeni %(list)s za %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Izbrisani %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nije bilo izmjena polja."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspješno."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Dole možete ponovo unositi izmjene."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Dole možete dodati novi objekat klase %s"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Objekat „%(obj)s“ klase %(name)s izmjenjen je uspješno."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -199,7 +176,38 @@ msgstr ""
 "Objekat „%(obj)s“ klase %(name)s dodat je uspješno. Dole možete unjeti "
 "dodatne izmjene."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspješno."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Objekat „%(obj)s“ klase %(name)s izmjenjen je uspješno."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -207,30 +215,30 @@ msgstr ""
 "Predmeti moraju biti izabrani da bi se mogla obaviti akcija nad njima. "
 "Nijedan predmet nije bio izmjenjen."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nijedna akcija nije izabrana."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Dodaj objekat klase %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objekat klase %(name)s sa primarnim ključem %(key)r ne postoji."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Izmjeni objekat klase %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Greška u bazi podataka"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -238,7 +246,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -246,52 +254,60 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 od %(cnt)s izabrani"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Objekat „%(obj)s“ klase %(name)s obrisan je uspješno."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Historijat izmjena: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Prijava"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administracija sistema"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administracija %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Vrijeme:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Pretraži"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Dodaj još jedan"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Stranica nije pronađena"
@@ -300,42 +316,40 @@ msgstr "Stranica nije pronađena"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Žao nam je, tražena stranica nije pronađena."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Početna"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Greška na serveru"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Greška na serveru (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Greška na serveru <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Došlo je do greške. Administrator sajta je obavešten emailom i greška će "
-"biti uskoro otklonjena. Hvala na strpljenju."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -358,7 +372,7 @@ msgstr "Izaberite svih %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Izbrišite izbor"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -368,22 +382,22 @@ msgid "Welcome,"
 msgstr "Dobrodošli,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Promjena lozinke"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Odjava"
 
@@ -395,36 +409,36 @@ msgstr "Django administracija sajta"
 msgid "Django administration"
 msgstr "Django administracija"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historijat"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Pregled na sajtu"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Dodaj objekat klase %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -441,12 +455,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -457,14 +471,14 @@ msgstr ""
 "objekata koji su povezani sa ovim objektom, ali vaš nalog nema dozvole za "
 "brisanje slijedećih tipova objekata:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +488,16 @@ msgstr ""
 "„%(escaped_object)s“? Slijedeći objekti koji su u vezi sa ovim objektom će "
 "također biti obrisani:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Da, siguran sam"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Brisanje više objekata"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -491,14 +505,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -510,36 +524,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeli dostupni u aplikaciji %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Izmjeni"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nemate dozvole da unosite bilo kakve izmjene."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Posjlednje radnje"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Moje radnje"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nema podataka"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Nepoznat sadržaj"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -548,31 +562,27 @@ msgstr ""
 "Nešto nije uredu sa vašom bazom podataka. Provjerite da li postoje "
 "odgovarajuće tabele i da li odgovarajući korisnik ima pristup bazi."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Korisnik:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datum/vrijeme"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Korisnik"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Radnja"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -629,64 +639,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Unesite novu lozinku za korisnika <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Lozinka (ponovite)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Radi provjere tačnosti ponovo unesite lozinku koju ste unijeli gore."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Obriši"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Dodaj još jedan %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Obriši"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Brisanje?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Hvala što ste danas proveli vrijeme na ovom sajtu."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Ponovna prijava"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Izmjena lozinke"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "uspješna izmjena lozinke"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Vaša lozinka je izmjenjena."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -694,46 +704,46 @@ msgstr ""
 "Iz bezbjednosnih razloga prvo unesite svoju staru lozinku, a novu zatim "
 "unesite dva puta da bismo mogli da provjerimo da li ste je pravilno unijeli."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Stara lozinka"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Izmijeni moju lozinku"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Resetovanje lozinke"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Resetovanje lozinke uspješno"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Vaša lozinka je postavljena.  Možete se prijaviti."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Potvrda resetovanja lozinke"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Unesite novu lozinku"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -741,19 +751,19 @@ msgstr ""
 "Unesite novu lozinku dva puta kako bismo mogli da provjerimo da li ste je "
 "pravilno unijeli."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nova lozinka:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Potvrda lozinke:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Resetovanje lozinke neuspješno"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -761,23 +771,21 @@ msgstr ""
 "Link za resetovanje lozinke nije važeći, vjerovatno zato što je već "
 "iskorišćen.  Ponovo zatražite resetovanje lozinke."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Resetovanje lozinke uspješno."
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Poslali smo uputstva za postavljanje nove lozinke na email adresu koju ste "
-"nam dali. Uputstva ćete dobiti uskoro."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -798,36 +806,34 @@ msgstr "Hvala što koristite naš sajt!"
 msgid "The %(site_name)s team"
 msgstr "Uredništvo sajta %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Zaboravili ste lozinku? Unesite svoju email adresu dole i poslaćemo vam "
-"uputstva za postavljanje nove."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Email adresa:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Resetuj moju lozinku"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Svi datumi"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Odaberi objekat klase %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Odaberi objekat klase %s za izmjenu"
diff --git a/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.mo
index 46b6452579..9e9b2e3978 100644
Binary files a/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.po
index cf93e7fb1c..95ef7116b4 100644
--- a/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.po
@@ -9,14 +9,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Filip Dupanović <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo
index d1d5a0800e..e9210c0fa8 100644
Binary files a/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/django.po b/django/contrib/admin/locale/ca/LC_MESSAGES/django.po
index 4fa557ba4d..9cc2355dcb 100644
--- a/django/contrib/admin/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ca/LC_MESSAGES/django.po
@@ -1,34 +1,35 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Antoni Aloy <aaloy@apsl.net>, 2012-2013.
 # Carles Barrobés <carles@barrobes.com>, 2011, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-10 18:52+0000\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "No es pot esborrar %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "N'esteu segur?"
 
@@ -37,172 +38,183 @@ msgstr "N'esteu segur?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Eliminar els %(verbose_name_plural)s seleccionats"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Tots"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Sí"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "No"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Qualsevol data"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Avui"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Últims 7 dies"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Aquest mes"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Aquest any"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Sisplau entreu el nom d'usuari i la contrasenya correctes per a un compte "
-"administratiu. Tingueu en compte que es diferencien majúscules i minúscules "
-"per als dos camps. "
+"Si us plau, introduïu un %(username)s i clau correcta per un compte de "
+"personal. Observeu que ambdós camps són sensibles a majúscules."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Si us plau, entreu de nou perquè la vostra sessió ha caducat."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en el "
-"seu lloc."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Acció:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "moment de l'acció"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id de l'objecte"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "'repr' de l'objecte"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "indicador de l'acció"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "missatge del canvi"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entrada del registre"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entrades del registre"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Afegit \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Modificat \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Eliminat \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objecte entrada del registre"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "cap"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Modificat %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "i"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Afegit %(name)s \"%(object)s\""
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Eliminat %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Cap camp modificat."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "El/la %(name)s \"%(obj)s\" ha estat afegit/da amb èxit."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Podeu editar-lo de nou a sota."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Podeu afegir un altre %s a sota."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "S'ha afegit amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou a sota."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"El  %(name)s \"%(obj)s fou afegit satisfactòriament. Pos afegir un altre "
+"%(name)s a continuació."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "El/la %(name)s \"%(obj)s\" ha estat afegit/da amb èxit."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"El %(name)s \"%(obj)s\" fou canviat satisfactòriament. Pot editar-lo un "
+"altra vegada a continuació."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"El %(name)s \"%(obj)s\" fou canviat satisfactòriament. Pots afegir un altre "
+"%(name)s a continuació."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -210,89 +222,97 @@ msgstr ""
 "Heu de seleccionar els elements per poder realitzar-hi accions. No heu "
 "seleccionat cap element."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "no heu seleccionat cap acció"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Afegir %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "No existeix cap objecte %(name)s amb la clau primària %(key)r."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Error de base de dades"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s s'ha modificat amb èxit."
 msgstr[1] "%(count)s %(name)s s'han modificat amb èxit."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s seleccionat(s)"
 msgstr[1] "Tots %(total_count)s seleccionat(s)"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 de %(cnt)s seleccionats"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "El/la %(name)s \"%(obj)s\" s'ha eliminat amb èxit."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Modificar històric: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Iniciar sessió"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administració del lloc"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administració de %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Data:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Hora:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Cercar"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Afegir-ne un altre"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Actualment:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Canviar:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "No s'ha pogut trobar la pàgina"
@@ -301,39 +321,39 @@ msgstr "No s'ha pogut trobar la pàgina"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Inici"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Error del servidor"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Error del servidor (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Error del servidor <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "S'ha produït un error. Se n'ha informat els administradors del lloc per "
 "correu electrònic, i hauria d'arreglar-se en breu. Gràcies per la vostra "
@@ -360,7 +380,7 @@ msgstr "Seleccioneu tots %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Netejar la selecció"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -370,22 +390,22 @@ msgid "Welcome,"
 msgstr "Benvingut/da,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentació"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Canviar contrasenya"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Finalitzar sessió"
 
@@ -397,35 +417,35 @@ msgstr "Lloc administratiu de Django"
 msgid "Django administration"
 msgstr "Administració de Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Afegir"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Històric"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Veure al lloc"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Si us plau, corregiu l'error mostrat a sota."
 msgstr[1] "Si us plau, corregiu els errors mostrats a sota."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Afegir %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtre"
 
@@ -442,12 +462,12 @@ msgstr "Prioritat d'ordenació: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Commutar ordenació"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -458,7 +478,7 @@ msgstr ""
 "d'objectes relacionats, però el vostre compte no te permisos per esborrar "
 "els tipus d'objecte següents:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -467,7 +487,7 @@ msgstr ""
 "Esborrar %(object_name)s '%(escaped_object)s' requeriria esborrar els "
 "següents objectes relacionats protegits:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -476,16 +496,16 @@ msgstr ""
 "Esteu segurs de voler esborrar els/les %(object_name)s \"%(escaped_object)s"
 "\"? S'esborraran els següents elements relacionats:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Sí, n'estic segur"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Eliminar múltiples objectes"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -496,7 +516,7 @@ msgstr ""
 "relacionats, però el vostre compte no té permisos per esborrar els següents "
 "tipus d'objectes:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -505,7 +525,7 @@ msgstr ""
 "Esborrar els %(objects_name)s seleccionats requeriria esborrar els següents "
 "objectes relacionats protegits:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -519,36 +539,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Per %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Models disponibles a l'aplicació %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Models en l'aplicació %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modificar"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "No teniu permís per editar res."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Accions recents"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Les meves accions"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Cap disponible"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Contingut desconegut"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -558,31 +578,27 @@ msgstr ""
 "vos que s'han creat les taules adients, i que la base de dades és llegible "
 "per l'usuari apropiat."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Nom d'usuari:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Heu oblidat la vostra contrasenya o nom d'usuari?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Data/hora"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Usuari"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Acció"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -638,64 +654,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Introduïu un nom d'usuari i contrasenya."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Introduïu una contrasenya per l'usuari <strong>%(username)s</strong>"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Contrasenya (de nou)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Eliminar"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Afegir un/a altre/a %(verbose_name)s."
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Eliminar"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Eliminar?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Gràcies per passar una estona de qualitat al web durant el dia d'avui."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Iniciar sessió de nou"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Canvi de contrasenya"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Contrasenya canviada amb èxit"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "La seva contrasenya ha estat canviada."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -704,47 +720,47 @@ msgstr ""
 "seguit introduïu la vostra contrasenya nova dues vegades per verificar que "
 "l'heu escrita correctament."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Contrasenya antiga"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Canviar la meva contrasenya:"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Restablir contrasenya"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Contrasenya restablerta"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "S'ha canviat la vostra contrasenya. Ara podeu continuar i iniciar sessió."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmació de restabliment de contrasenya"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Introduïu la nova contrasenya"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -752,19 +768,19 @@ msgstr ""
 "Si us plau, introduïu la vostra nova contrasenya dues vegades, per verificar "
 "que l'heu escrita correctament."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Contrasenya nova:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirmar contrasenya:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Restabliment de contrasenya fallat"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -772,14 +788,14 @@ msgstr ""
 "L'enllaç de restabliment de contrasenya era invàlid, potser perquè ja s'ha "
 "utilitzat. Si us plau, sol·liciteu un nou reestabliment de contrasenya."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Restabliment de contrasenya amb èxit"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "Us hem enviat les instruccions per canviar la vostra contrasenya a l'adreça "
@@ -788,10 +804,10 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Heu rebut aquest correu perquè vau sol·licitar un reinici de contrasenya per "
+"Heu rebut aquest correu perquè vau sol·licitar restablir la contrasenya per "
 "al vostre compte d'usuari a %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
@@ -811,36 +827,36 @@ msgstr "Gràcies per fer ús del nostre lloc!"
 msgid "The %(site_name)s team"
 msgstr "L'equip de %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "Heu oblidat la vostra contrasenya? Introduïu la vostra adreça de correu "
 "electrònic a sota, i us enviarem instruccions per canviar-la."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "Adreça de correu electrònic:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Restablir la meva contrasenya"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Totes les dates"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Cap)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Seleccioneu %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Seleccioneu %s per modificar"
diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo
index f246800793..76eb4dce4a 100644
Binary files a/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po
index d10f5ed907..89fbfdcdfa 100644
--- a/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo
index a000348984..403d6e8baa 100644
Binary files a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.po b/django/contrib/admin/locale/cs/LC_MESSAGES/django.po
index fd6e4bff99..fde2281b16 100644
--- a/django/contrib/admin/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/cs/LC_MESSAGES/django.po
@@ -3,33 +3,33 @@
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Jirka Vejrazka <Jirka.Vejrazka@gmail.com>, 2011.
-# Vlada Macek <macek@sandbox.cz>, 2012.
+# Vlada Macek <macek@sandbox.cz>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-05 08:37+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Úspěšně odstraněno: %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Nelze smazat %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Jste si jisti?"
 
@@ -38,164 +38,139 @@ msgstr "Jste si jisti?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Odstranit vybrané položky typu %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Vše"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ano"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ne"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Libovolné datum"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Dnes"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Posledních 7 dní"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Tento měsíc"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Tento rok"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Zadejte správné uživatelské jméno a heslo pro účet personálu. U obou polí "
-"záleží na malých/velkých písmenech."
+"Zadejte správné %(username)s a heslo pro personál. Obě pole mohou rozlišovat "
+"velká a malá písmena."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Přihlaste se znovu, vaše sezení vypršelo."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Vaše e-mailová adresa není vaše uživatelské jméno. Zkuste místo toho \"%s\"."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Operace:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "čas operace"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id položky"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "reprez. položky"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "příznak operace"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "zpráva o změně"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "položka protokolu"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "položky protokolu"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Přidán objekt \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Změněn objekt \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Odstraněn objekt \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objekt záznam v protokolu"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Žádný"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Změněno: %s"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "a"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Položka \"%(object)s\" typu %(name)s byla přidána."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
-msgstr ""
-"Pole \"%(list)s\" pro položku \"%(object)s\" typu %(name)s změněno/změněna."
+msgstr "Změna polí: %(list)s pro položku \"%(object)s\" typu %(name)s."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Položka \"%(object)s\" typu %(name)s byla odstraněna."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nebyla změněna žádná pole."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně přidána."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "V úpravách můžete pokračovat níže."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Níže můžete přidat další položku typu %s."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně změněna."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -203,7 +178,44 @@ msgstr ""
 "Položka \"%(obj)s\" typu %(name)s byla úspěšně přidána. Níže můžete v "
 "úpravách pokračovat."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"Objekt \"%(obj)s\" typu %(name)s byl úspěšně přidán. Níže můžete přidat "
+"další %(name)s."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně přidána."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"Objekt \"%(obj)s\" typu %(name)s byl úspěšně změněn. Níže ho můžete znovu "
+"upravovat."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"Objekt \"%(obj)s\" typu %(name)s byl úspěšně změněn. Níže můžete přidat "
+"další %(name)s."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně změněna."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -211,30 +223,30 @@ msgstr ""
 "K provedení hromadných operací je třeba vybrat nějaké položky. Nedošlo k "
 "žádným změnám."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nebyla vybrána žádná operace."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s: přidat"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Položka \"%(name)s\" s primárním klíčem \"%(key)r\" neexistuje."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s: změnit"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Chyba databáze"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -242,7 +254,7 @@ msgstr[0] "Položka %(name)s byla úspěšně změněna."
 msgstr[1] "%(count)s položky %(name)s byly úspěšně změněny."
 msgstr[2] "%(count)s položek %(name)s bylo úspěšně změněno."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -250,52 +262,60 @@ msgstr[0] "%(total_count)s položka vybrána."
 msgstr[1] "Všechny %(total_count)s položky vybrány."
 msgstr[2] "Vybráno všech %(total_count)s položek."
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "Vybraných je 0 položek z celkem %(cnt)s."
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně odstraněna."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Historie změn: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Přihlášení"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Správa webu"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Správa aplikace %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Čas:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Hledat"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Přidat další"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Aktuálně:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Změna:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Stránka nenalezena"
@@ -304,42 +324,42 @@ msgstr "Stránka nenalezena"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Požadovaná stránka nebyla bohužel nalezena."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Domů"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Chyba serveru"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Chyba serveru (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Chyba serveru <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Došlo k chybě. Byla oznámena správci serveru e-mailem a měla by být brzy "
-"odstraněna. Děkujeme za trpělivost."
+"V systému došlo k chybě. Byla e-mailem nahlášena správcům, kteří by ji měli "
+"v krátké době opravit. Děkujeme za trpělivost."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -362,7 +382,7 @@ msgstr "Vybrat všechny položky typu %(module_name)s, celkem %(total_count)s."
 msgid "Clear selection"
 msgstr "Zrušit výběr"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -372,22 +392,22 @@ msgid "Welcome,"
 msgstr "Vítejte, uživateli"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentace"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Odhlásit se"
 
@@ -399,36 +419,36 @@ msgstr "Správa webu Django"
 msgid "Django administration"
 msgstr "Správa systému Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Přidat"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historie"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Zobrazení na webu"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Opravte níže uvedenou chybu."
 msgstr[1] "Opravte níže uvedené chyby."
 msgstr[2] "Opravte níže uvedené chyby."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s: přidat"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtr"
 
@@ -445,12 +465,12 @@ msgstr "Priorita řazení: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Přehodit řazení"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Odstranit"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -461,7 +481,7 @@ msgstr ""
 "odstranění souvisejících položek. Nemáte však oprávnění k odstranění položek "
 "následujících typů:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -470,7 +490,7 @@ msgstr ""
 "Odstranění položky '%(escaped_object)s' typu %(object_name)s by vyžadovalo "
 "odstranění souvisejících chráněných položek:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -479,16 +499,16 @@ msgstr ""
 "Opravdu má být odstraněna položka \"%(escaped_object)s\" typu "
 "%(object_name)s? Následující související položky budou všechny odstraněny:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ano, jsem si jist(a)"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Odstranit vybrané položky"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -499,7 +519,7 @@ msgstr ""
 "souvisejících položek. Nemáte však oprávnění k odstranění položek "
 "následujících typů:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -508,7 +528,7 @@ msgstr ""
 "Odstranění vybrané položky typu %(objects_name)s by vyžadovalo odstranění "
 "následujících souvisejících chráněných položek:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -522,36 +542,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Dle: %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Dostupné modely v aplikaci %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modely v aplikaci %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Změnit"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nemáte oprávnění nic měnit."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Poslední operace"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Vaše operace"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nic"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Neznámý obsah"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -561,31 +581,27 @@ msgstr ""
 "odpovídající tabulky a že databáze je přístupná pro čtení příslušným "
 "uživatelem."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Uživatelské jméno:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Heslo:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Zapomněli jste heslo nebo uživatelské jméno?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datum a čas"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Uživatel"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Operace"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -642,64 +658,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Vložte uživatelské jméno a heslo."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Vložte nové heslo pro uživatele <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Pro ověření vložte stejné heslo znovu."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Odebrat"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Přidat %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Odebrat"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Odstranit?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Děkujeme za čas strávený s tímto webem."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Přihlaste se znovu"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Změna hesla"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Změna hesla byla úspěšná"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Vaše heslo bylo změněno."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -707,64 +723,64 @@ msgstr ""
 "Vložte svoje současné heslo a poté vložte dvakrát heslo nové. Omezíme tak "
 "možnost překlepu."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Současné heslo"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Změnit heslo"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Obnovení hesla"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Heslo bylo obnoveno"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Vaše heslo bylo nastaveno. Nyní se můžete přihlásit."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Potvrzení obnovy hesla"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Vložte nové heslo"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "Vložte dvakrát nové heslo. Tak ověříme, že bylo zadáno správně."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nové heslo:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Potvrdit heslo:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Obnovení hesla bylo neúspěšné"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -772,27 +788,27 @@ msgstr ""
 "Odkaz pro obnovení hesla byl neplatný, možná již byl použit. Požádejte o "
 "obnovení hesla znovu."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Obnovení hesla bylo úspěšné"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Poslali jsme vám e-mailem pokyny pro nastavení hesla na vámi zadanou e-"
-"mailovou adresu. Za chvíli by měly dorazit do vaší schránky."
+"Na vámi zadanou e-mailovou adresu vám byly zaslány instrukce k nastavení  "
+"hesla, které by měly brzy dorazit."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Obdrželi jste tento e-mail, protože byl vyžádán reset hesla pro vaše "
-"uživatelské jméno na %(site_name)s."
+"Tento e-mail vám byl zaslán na základě vyžádání obnovy hesla vašeho "
+"uživatelskému účtu na systému %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -811,36 +827,36 @@ msgstr "Děkujeme za používání našeho webu!"
 msgid "The %(site_name)s team"
 msgstr "Tým aplikace %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Zapomněl(a) jste své současné heslo? Vložte svou e-mailovou adresu a e-"
-"mailem obdržíte pokyny pro nastavení nového."
+"Zapomněli jste heslo? Zadejte níže e-mailovou adresu a systém vám odešle "
+"instrukce k nastavení nového."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "E-mailová adresa:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Obnovit heslo"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Všechna data"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(None)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s: vybrat"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Vyberte položku %s ke změně"
diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo
index 6c5eff4678..d2f221b8e9 100644
Binary files a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po
index 9c8db36955..d667080a32 100644
--- a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo b/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo
index cfd4285310..7a804bec6a 100644
Binary files a/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/cy/LC_MESSAGES/django.po b/django/contrib/admin/locale/cy/LC_MESSAGES/django.po
index 451aeb78b3..f161bfe673 100644
--- a/django/contrib/admin/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/cy/LC_MESSAGES/django.po
@@ -6,28 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Ydych yn sicr?"
 
@@ -36,195 +37,203 @@ msgstr "Ydych yn sicr?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr ""
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr ""
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ie"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Na"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr ""
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Unrhyw dyddiad"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Heddiw"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "7 diwrnod gorffennol"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Mis yma"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Blwyddyn yma"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr ""
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr ""
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "amser gweithred"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id gwrthrych"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr gwrthrych"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "fflag gweithred"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "neges newid"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "cofnod"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "cofnodion"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr ""
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Newidiwyd %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ac"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr ""
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr ""
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr ""
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Ychwanegu %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Newidio %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr ""
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -233,7 +242,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -242,52 +251,60 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Hanes newid: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Mewngofnodi"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Gweinyddiad safle"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr ""
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dyddiad:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Amser:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr ""
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr ""
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Tudalen heb ei ddarganfod"
@@ -296,42 +313,40 @@ msgstr "Tudalen heb ei ddarganfod"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Adref"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Gwall gweinyddwr"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Gwall gweinyddwr (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Gwall Gweinyddwr <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Mae gwall wedi digwydd. Adroddwyd i weinyddwyr y safle drwy e-bost ac ddylai "
-"cael ei drwsio cyn bo hir."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -354,7 +369,7 @@ msgstr ""
 msgid "Clear selection"
 msgstr ""
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr ""
@@ -364,22 +379,22 @@ msgid "Welcome,"
 msgstr "Croeso,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dogfennaeth"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Newid cyfrinair"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Allgofnodi"
 
@@ -391,24 +406,24 @@ msgstr "Gweinyddiad safle Django"
 msgid "Django administration"
 msgstr "Gweinyddiad Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Hanes"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Gweld ar safle"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] ""
@@ -416,12 +431,12 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Ychwanegu %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr ""
 
@@ -438,12 +453,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Dileu"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -451,30 +466,30 @@ msgid ""
 "following types of objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Yndw, rwy'n sicr"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -482,14 +497,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -501,67 +516,63 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr ""
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
+msgid "Models in the %(name)s application"
 msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Newidio"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Does genych ddim hawl i olygu unrhywbeth."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Gweithredau Diweddar"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Fy Ngweithredau"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Dim ar gael"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr ""
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Enw defnyddiwr:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dyddiad/amser"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Gweithred"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -617,64 +628,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr ""
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
-#, python-format
-msgid "Add another %(verbose_name)s"
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
 msgstr ""
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
 msgstr ""
 
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr ""
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Diolch am dreulio amser ansawdd gyda'r safle we heddiw 'ma."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Ailmewngofnodi"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Newid cyfrinair"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Newid cyfrinair yn lwyddianus"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Newidwyd eich cyfrinair."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -682,84 +693,84 @@ msgstr ""
 "Rhowch eich cyfrinair hen, er mwyn gwarchodaeth, yna rhowch eich cyfrinair "
 "newydd dwywaith er mwyn i ni wirio y teipiwyd yn gywir."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr ""
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr ""
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Newidio fy nghyfrinair"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Ailosod cyfrinair"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr ""
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Cyfrinair newydd:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Cadarnhewch cyfrinair:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Ailosod cyfrinair yn lwyddianus"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -780,34 +791,34 @@ msgstr "Diolch am ddefnyddio ein safle!"
 msgid "The %(site_name)s team"
 msgstr "Y tîm %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Cyfeiriad e-bost:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Ailosodi fy nghyfrinair"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Dyddiadau i gyd"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Dewis %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Dewis %s i newid"
diff --git a/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.mo
index a8e957b2f1..49fe05e7fa 100644
Binary files a/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.po
index 7433bdcc6b..aaf1d63dc7 100644
--- a/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.po
@@ -9,13 +9,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo
index b071c28d96..5a9d73c041 100644
Binary files a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.po b/django/contrib/admin/locale/da/LC_MESSAGES/django.po
index 143b2419f7..c9a906b6bc 100644
--- a/django/contrib/admin/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/da/LC_MESSAGES/django.po
@@ -2,35 +2,36 @@
 #
 # Translators:
 # Christian Joergensen <christian@gmta.info>, 2012.
-# Erik Wognsen <r4mses@gmail.com>, 2011, 2012.
+# Dimitris Glezos <glezos@transifex.com>, 2012.
+# Erik Wognsen <r4mses@gmail.com>, 2011-2013.
 # Finn Gruwier <finn@gruwier.dk>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-12 20:31+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-13 04:48+0000\n"
 "Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s blev slettet."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Kan ikke slette %(name)s "
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
@@ -39,168 +40,181 @@ msgstr "Er du sikker?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Slet valgte %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Alle"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ja"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nej"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Når som helst"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "I dag"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "De sidste 7 dage"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Denne måned"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Dette år"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Indtast venligst det korrekte brugernavn og adgangskode for en personale-"
-"konto. Bemærk at der er forskel på store og små bogstaver i begge felter"
+"Indtast venligst det korrekte %(username)s og adgangskode for en "
+"personalekonto. Bemærk at begge felter kan være versalfølsomme."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Log venligst ind igen, da din session er udløbet."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Din e-mail-adresse er ikke dit brugernavn. Prøv '%s' i stedet."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Handling"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "handlingstid"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objekt-ID"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objekt repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "handlingsflag"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "ændringsmeddelelse"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "logmeddelelse"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "logmeddelelser"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Tilføjede \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Ændrede \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Slettede \"%(object)s\"."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry-objekt"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ingen"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Ændrede %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "og"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Tilføjede %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Ændrede %(list)s for %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Slettede %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Ingen felter ændret."
 
-#: options.py:772
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"%(name)s \"%(obj)s\" blev tilføjet. Du kan redigere den/det igen herunder."
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" blev tilføjet. Du kan endnu en/et %(name)s herunder."
+
+#: options.py:839
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" blev tilføjet i databasen."
+msgstr "%(name)s \"%(obj)s\" blev tilføjet."
 
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Du kan redigere det igen herunder."
-
-#: options.py:788 options.py:837
+#: options.py:853
 #, python-format
-msgid "You may add another %s below."
-msgstr "Du kan tilføje endnu en %s herunder."
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" blev ændret. Du kan redigere den/det igen herunder."
 
-#: options.py:822
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" blev ændret. Du kan tilføje endnu en/et %(name)s "
+"herunder."
+
+#: options.py:873
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" blev ændret."
 
-#: options.py:830
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "%(name)s \"%(obj)s\" blev tilføjet. Du kan redigere det igen herunder."
-
-#: options.py:899 options.py:1159
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,89 +222,97 @@ msgstr ""
 "Der skal være valgt nogle emner for at man kan udføre handlinger på dem. "
 "Ingen emner er blev ændret."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Ingen handling valgt."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Tilføj %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Der findes ikke et %(name)s-objekt med primærnøgle %(key)r."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Ret %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "databasefejl"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s blev ændret."
 msgstr[1] "%(count)s %(name)s blev ændret."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s valgt"
 msgstr[1] "Alle %(total_count)s valgt"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 af %(cnt)s valgt"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" blev slettet."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Ændringshistorik: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Log ind"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Website-administration"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administration af %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dato:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Tid:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Slå op"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Tilføj endnu en"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Nuværende:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Ændring:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Siden blev ikke fundet"
@@ -299,39 +321,39 @@ msgstr "Siden blev ikke fundet"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Vi beklager, men den ønskede side kunne ikke findes"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Hjem"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Serverfejl"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Serverfejl (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Serverfejl <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "Der opstod en fejl. Fejlen er rapporteret til website-administratoren via e-"
 "mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed."
@@ -357,7 +379,7 @@ msgstr "Vælg alle %(total_count)s  %(module_name)s "
 msgid "Clear selection"
 msgstr "Ryd valg"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -367,22 +389,22 @@ msgid "Welcome,"
 msgstr "Velkommen,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Skift adgangskode"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Log ud"
 
@@ -394,35 +416,35 @@ msgstr "Django website-administration"
 msgid "Django administration"
 msgstr "Django administration"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Tilføj"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historik"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Se på website"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Ret venligst fejlen herunder."
 msgstr[1] "Ret venligst fejlene herunder."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Tilføj %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrer"
 
@@ -439,12 +461,12 @@ msgstr "Sorteringsprioritet: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Skift sortering"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -455,7 +477,7 @@ msgstr ""
 "relaterede objekter, men din konto har ikke rettigheder til at slette "
 "følgende objekttyper:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -464,7 +486,7 @@ msgstr ""
 "Sletning af %(object_name)s  ' %(escaped_object)s ' vil kræve sletning af "
 "følgende beskyttede relaterede objekter:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -473,16 +495,16 @@ msgstr ""
 "Er du sikker på du vil slette %(object_name)s \"%(escaped_object)s\"? Alle "
 "de følgende relaterede objekter vil blive slettet:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ja, jeg er sikker"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Slet flere objekter"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +515,7 @@ msgstr ""
 "relaterede objekter, men din konto har ikke tilladelse til at slette "
 "følgende typer af objekter:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +524,7 @@ msgstr ""
 "Sletning af de valgte %(objects_name)s  vil kræve sletning af følgende "
 "beskyttede relaterede objekter:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +538,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Efter %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeller til rådighed i %(name)s-applikationen."
+msgid "Models in the %(name)s application"
+msgstr "Modeller i applikationen %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Ret"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Du har ikke rettigheder til at foretage ændringer."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Seneste handlinger"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mine handlinger"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ingen tilgængelige"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Ukendt indhold"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -555,31 +577,27 @@ msgstr ""
 "databasetabellerne er blevet oprettet og at databasen er læsbar for den "
 "pågældende bruger."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Brugernavn:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Har du glemt dit password eller brugernavn?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dato/tid"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Bruger"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Funktion"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -635,64 +653,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Indtast et brugernavn og en adgangskode."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Indtast en ny adgangskode for brugeren <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Adgangskode"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Adgangskode (igen)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Indtast den samme adgangskode som ovenfor for verifikation."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Fjern"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Tilføj endnu en %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Fjern"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Slet?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Tak for den kvalitetstid du brugte på websitet i dag."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Log ind igen"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Skift adgangskode"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Adgangskoden blev ændret"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Din adgangskode blev ændret."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -701,46 +719,46 @@ msgstr ""
 "din nye adgangskode to gange, så vi kan være sikre på, at den er indtastet "
 "korrekt."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Gammel adgangskode"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Skift min adgangskode"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Nulstil adgangskode"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Adgangskoden blev nulstillet"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Din adgangskode er blevet sat. Du kan logge ind med den nu."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Bekræftelse for nulstilling af adgangskode"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Indtast ny adgangskode"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -748,19 +766,19 @@ msgstr ""
 "Indtast venligst din nye adgangskode to gange, så vi kan være sikre på, at "
 "den er indtastet korrekt."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Ny adgangskode:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Bekræft ny adgangskode:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Adgangskoden blev ikke nulstillet"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -768,23 +786,23 @@ msgstr ""
 "Linket for nulstilling af adgangskoden er ugyldigt, måske fordi det allerede "
 "har været brugt. Anmod venligst påny om nulstilling af adgangskoden."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Adgangskoden blev nulstillet"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Vi har sendt en instruktion til din e-mail-adresse. Du skulle modtage den om "
-"ganske kort tid."
+"Vi har sendt en e-mail til den adresse, du angav, med instruktioner i at "
+"vælge en ny adgangskode . Du skulle modtage e-mailen om kort tid."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 "Du modtager denne e-mail, fordi du har anmodet om en nulstilling af "
@@ -807,36 +825,36 @@ msgstr "Tak fordi du brugte vores website!"
 msgid "The %(site_name)s team"
 msgstr "Med venlig hilsen %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Har du glemt din adgangskode? Indtast din e-mail-adresse herunder, så sender "
-"vi dig en instruktion vedrørende ny adgangskode."
+"Har du glemt din adgangskode? Skriv din e-mail-adresse herunder, så sender "
+"vi dig instruktioner i at vælge en ny adgangskode."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "E-mail-adresse:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Nulstil min adgangskode"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Alle datoer"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Vælg %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Vælg %s, der skal ændres"
diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo
index 999c7db582..38104f9559 100644
Binary files a/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po
index 138c6cb23d..ddcd8b1055 100644
--- a/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po
@@ -12,13 +12,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-12 20:46+0000\n"
 "Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/django.mo b/django/contrib/admin/locale/de/LC_MESSAGES/django.mo
index 73ca3f1a07..905079ce3c 100644
Binary files a/django/contrib/admin/locale/de/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/django.po b/django/contrib/admin/locale/de/LC_MESSAGES/django.po
index 2f9fbb0b24..a99a710a17 100644
--- a/django/contrib/admin/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/de/LC_MESSAGES/django.po
@@ -3,33 +3,34 @@
 # Translators:
 # André Hagenbruch <ahagenbruch@googlemail.com>, 2012.
 # apollo13 <florian@apolloner.eu>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011, 2012.
+# Dimitris Glezos <glezos@transifex.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-14 06:37+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-05 19:38+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Erfolgreich %(count)d %(items)s gelöscht."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Kann %(name)s nicht löschen"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
@@ -38,171 +39,183 @@ msgstr "Sind Sie sicher?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Ausgewählte %(verbose_name_plural)s löschen"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Alle"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ja"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nein"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Alle Daten"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Heute"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Letzte 7 Tage"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Diesen Monat"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Dieses Jahr"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Bitte einen korrekten Benutzernamen und Passwort für Staff-Account eingeben."
+"Bitte %(username)s und Passwort für einen Staff-Account korrekt eingeben."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Bitte melden Sie sich erneut an, da Ihre Sitzung abgelaufen ist."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen "
-"'%s' versuchen."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Aktion:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "Zeitpunkt der Aktion"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "Objekt-ID"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "Objekt Darst."
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "Aktionskennzeichen"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "Änderungsmeldung"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "Logeintrag"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "Logeinträge"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" hinzufügt."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\" verändert - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\" gelöscht."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry Objekt"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "-"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s geändert."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "und"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" hinzugefügt."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s von %(name)s \"%(object)s\" geändert."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" gelöscht."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Keine Felder geändert."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Das Element kann jetzt erneut bearbeitet werden."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Es kann ein weiteres Element des Typs %s angelegt werden."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
-"%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt "
-"geändert werden."
+"%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt und kann unten geändert "
+"werden."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Es kann jetzt ein "
+"weiteres %(name)s unten hinzugefügt werden."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" wurde erfolgreich geändert. Weitere Änderungen können "
+"unten vorgenommen werden."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" wurde erfolgreich geändert. Es kann jetzt ein weiteres "
+"%(name)s unten hinzugefügt werden."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -210,90 +223,98 @@ msgstr ""
 "Es müssen Objekte aus der Liste ausgewählt werden, um Aktionen "
 "durchzuführen. Es wurden keine Objekte geändert."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Keine Aktion ausgewählt."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 "Das %(name)s-Objekt mit dem Primärschlüssel %(key)r ist nicht vorhanden."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s ändern"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Datenbankfehler"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s \"%(name)s\" wurde erfolgreich geändert."
 msgstr[1] "%(count)s \"%(name)s\" wurden erfolgreich geändert."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s ausgewählt"
 msgstr[1] "Alle %(total_count)s ausgewählt"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 von %(cnt)s ausgewählt"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Änderungsgeschichte: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Anmelden"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Website-Verwaltung"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s-Verwaltung"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Zeit:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Suchen"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Neu hinzufügen"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Aktuell:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Ändern:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Seite nicht gefunden"
@@ -303,43 +324,42 @@ msgid "We're sorry, but the requested page could not be found."
 msgstr ""
 "Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Start"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Serverfehler"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Serverfehler (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Serverfehler <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-"
-"Mail gemeldet und sollte in Kürze behoben sein. Vielen Dank für Ihr "
-"Verständnis."
+"Ein Fehler ist aufgetreten und wurde an die Administratoren per E-Mail "
+"gemeldet. Danke für die Geduld, der Fehler sollte in Kürze behoben sein."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -362,7 +382,7 @@ msgstr "Alle %(total_count)s %(module_name)s auswählen"
 msgid "Clear selection"
 msgstr "Auswahl widerrufen"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -372,22 +392,22 @@ msgid "Welcome,"
 msgstr "Willkommen,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -399,35 +419,35 @@ msgstr "Django-Systemverwaltung"
 msgid "Django administration"
 msgstr "Django-Verwaltung"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Geschichte"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Auf der Website anzeigen"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Bitte den aufgeführten Fehler korrigieren."
 msgstr[1] "Bitte die aufgeführten Fehler korrigieren."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s hinzufügen"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -444,23 +464,23 @@ msgstr "Sortierung: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Sortierung ein-/ausschalten"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
 "related objects, but your account doesn't have permission to delete the "
 "following types of objects:"
 msgstr ""
-"Das Löschen des %(object_name)s '%(escaped_object)s' hätte das Löschen davon "
-"abhängiger Daten zur Folge, aber Sie haben nicht die nötigen Rechte, um die "
-"folgenden davon abhängigen Daten zu löschen:"
+"Das Löschen des %(object_name)s \"%(escaped_object)s\" hätte das Löschen "
+"davon abhängiger Daten zur Folge, aber Sie haben nicht die nötigen Rechte, "
+"um die folgenden davon abhängigen Daten zu löschen:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -469,7 +489,7 @@ msgstr ""
 "Das Löschen von %(object_name)s „%(escaped_object)s“ würde ein Löschen der "
 "folgenden geschützten verwandten Objekte erfordern:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -478,16 +498,16 @@ msgstr ""
 "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen "
 "wollen? Es werden zusätzlich die folgenden davon abhängigen Daten gelöscht:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ja, ich bin sicher"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Mehrere Objekte löschen"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -496,9 +516,9 @@ msgid ""
 msgstr ""
 "Das Löschen der ausgewählten %(objects_name)s würde im Löschen geschützter "
 "verwandter Objekte resultieren, allerdings besitzt Ihr Benutzerkonto nicht "
-"die nötigen Rechte um diese zu löschen:"
+"die nötigen Rechte, um diese zu löschen:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -507,7 +527,7 @@ msgstr ""
 "Das Löschen der ausgewählten %(objects_name)s würde ein Löschen der "
 "folgenden geschützten verwandten Objekte erfordern:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -521,36 +541,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Nach %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelle, die in der Anwendung %(name)s vorhanden sind."
+msgid "Models in the %(name)s application"
+msgstr "Modelle der %(name)s-Anwendung"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Ändern"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Sie haben keine Berechtigung, irgendetwas zu ändern."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Kürzliche Aktionen"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Meine Aktionen"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Keine vorhanden"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Unbekannter Inhalt"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -560,31 +580,27 @@ msgstr ""
 "die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom "
 "verwendeten Datenbankbenutzer auch lesbar ist."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Passwort:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Benutzername oder Passwort vergessen?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datum/Zeit"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Benutzer"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Aktion"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -640,66 +656,66 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Bitte einen Benutzernamen und ein Passwort eingeben."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Bitte geben Sie ein neues Passwort für den Benutzer <strong>%(username)s</"
 "strong> ein."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Entfernen"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "%(verbose_name)s hinzufügen"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Entfernen"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Löschen?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Vielen Dank, dass Sie hier ein paar nette Minuten verbracht haben."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Erneut anmelden"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Passwort ändern"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Passwort erfolgreich geändert"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -708,46 +724,46 @@ msgstr ""
 "dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das "
 "neue Passwort ein."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Mein Passwort ändern"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Passwort zurücksetzen"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Passwort zurücksetzen beendet"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Ihr Passwort wurde zurückgesetzt. Sie können sich nun anmelden."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Zurücksetzen des Passworts bestätigen"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -755,19 +771,19 @@ msgstr ""
 "Bitte geben Sie Ihr neues Passwort zweimal ein, damit wir überprüfen können, "
 "ob es richtig eingetippt wurde."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Neues Passwort:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Passwort wiederholen:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Passwort wurde nicht erfolgreich zurückgesetzt"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -775,28 +791,27 @@ msgstr ""
 "Der Link zum Zurücksetzen Ihres Passworts ist ungültig, wahrscheinlich weil "
 "er schon einmal benutzt wurde. Bitte setzen Sie Ihr Passwort erneut zurück."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Passwort wurde erfolgreich zurückgesetzt"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Wir haben Ihnen eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passwort "
-"an die von Ihnen angegebene E-Mail-Adresse geschickt. Sie sollten diese in "
-"Kürze erhalten."
+"Die Anweisungen zum Setzen des Passworts wurde an die eingegebene E-Mail-"
+"Adresse versendet."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Sie erhalten diese E-Mail, da Sie das Passwort für ihren %(site_name)s "
-"Account zurücksetzen lassen möchten."
+"Diese E-Mail wurde aufgrund einer Anfrage zum Zurücksetzen des Passworts auf "
+"der Website %(site_name)s versendet."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -808,43 +823,43 @@ msgstr "Ihr Benutzername, falls Sie ihn vergessen haben:"
 
 #: templates/registration/password_reset_email.html:10
 msgid "Thanks for using our site!"
-msgstr "Vielen Dank, dass Sie unsere Website benutzen!"
+msgstr "Vielen Dank, dass Sie unsere Webseite benutzen!"
 
 #: templates/registration/password_reset_email.html:12
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "Das Team von %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Passwort vergessen? Einfach Ihre E-Mail-Adresse eingeben und wir senden "
-"Ihnen Anweisungen zum Zurücksetzen Ihres Passworts."
+"Passwort vergessen? Einfach die E-Mail-Adresse unten eingeben und den "
+"Anweisungen zum Zurücksetzen des Passworts in der E-Mail folgen."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Mein Passwort zurücksetzen"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Alle Daten"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(leer)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s auswählen"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s zur Änderung auswählen"
diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo
index c3553a973c..d7e6847c3b 100644
Binary files a/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po
index 9e8bce9060..2ffae78eab 100644
--- a/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: André Hagenbruch <ahagenbruch@googlemail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/django.mo b/django/contrib/admin/locale/el/LC_MESSAGES/django.mo
index 6d0fb5c70c..343e7943f3 100644
Binary files a/django/contrib/admin/locale/el/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/django.po b/django/contrib/admin/locale/el/LC_MESSAGES/django.po
index e16c7f3efc..496ff15eb7 100644
--- a/django/contrib/admin/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/el/LC_MESSAGES/django.po
@@ -8,28 +8,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Yorgos Pagles <y.pagles@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Επιτυχημένη διαγραφή %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Αδύνατη τη διαγραφή του %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Είστε σίγουροι;"
 
@@ -38,165 +38,137 @@ msgstr "Είστε σίγουροι;"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Διαγραφη επιλεγμένων %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Όλα"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ναι"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Όχι"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Οποιαδήποτε ημερομηνία"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Σήμερα"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Τελευταίες 7 ημέρες"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Αυτόν το μήνα"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Αυτόν το χρόνο"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Παρακαλούμε εισάγετε το σωστό όνομα χρήστη και συνθηματικό για το λογαριασμό "
-"σας σαν μέλος του προσωπικού. Και τα δύο πεδία κάνουν διάκριση πεζών και "
-"κεφαλαίων χαρακτήρων."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Η συνεδρία σας έχει λήξει. Παρακαλούμε συνδεθείτε ξανά."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Η ηλεκτρονική σας διεύθυνση δεν είναι το όνομα χρήστη σας. Δοκιμάστε '%s' "
-"στη θέση αυτού."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Ενέργεια:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "ώρα ενέργειας"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "κωδικός αντικειμένου"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "αναπαράσταση αντικειμένου"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "σημαία ενέργειας"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "αλλαγή μηνύματος"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "εγγραφή καταγραφής"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "εγγραφές καταγραφής"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Προστέθηκαν \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Αλλάχθηκαν \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Διαγράφηκαν \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry Object"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Κανένα"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Έγινε επεξεργασία του %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "και"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Προστέθηκε %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Έγινε επεξεργασία %(list)s για %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Διαγράφη %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Κανένα πεδίο δεν άλλαξε."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Το %(name)s \"%(obj)s\" αποθηκεύτηκε με επιτυχία."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Μπορείτε να το επεξεργαστείτε ξανά παρακάτω."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Μπορείτε να προσθέσετε ακόμα ένα %s παρακάτω."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Το %(name)s \"%(obj)s\" αλλάχτηκε με επιτυχία."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -204,7 +176,38 @@ msgstr ""
 "Το %(name)s \"%(obj)s\" αποθηκεύτηκε με επιτυχία. Μπορείτε να το "
 "επεξεργαστείτε πάλι παρακάτω."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Το %(name)s \"%(obj)s\" αποθηκεύτηκε με επιτυχία."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Το %(name)s \"%(obj)s\" αλλάχτηκε με επιτυχία."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -213,89 +216,97 @@ msgstr ""
 "αντικείμενο. Πρέπει να επιλέξετε ένα ή περισσότερα αντικείμενα για να "
 "πραγματοποιήσετε ενέργειες σε αυτά."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Δεν έχει επιλεγεί ενέργεια."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Προσθήκη %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr " Το αντικείμενο %(name)s  με πρωτεύον κλειδί %(key)r δεν βρέθηκε."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Αλλαγή του %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Σφάλμα βάσης δεδομένων"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s άλλαξε επιτυχώς."
 msgstr[1] "%(count)s %(name)s άλλαξαν επιτυχώς."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "Επιλέχθηκε %(total_count)s"
 msgstr[1] "Επιλέχθηκαν και τα %(total_count)s"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "Επιλέγησαν 0 από %(cnt)s"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Το %(name)s \"%(obj)s\" διαγράφηκε με επιτυχία."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Ιστορικό αλλαγών: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Σύνδεση"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Διαχείριση του ιστότοπου"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Διαχείριση %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Ημ/νία:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Ώρα:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Αναζήτηση"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Προσθέστε κι άλλο"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Η σελίδα δε βρέθηκε"
@@ -304,43 +315,40 @@ msgstr "Η σελίδα δε βρέθηκε"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Λυπόμαστε, αλλά η σελίδα που ζητήθηκε δε μπόρεσε να βρεθεί."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Αρχική"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Σφάλμα εξυπηρετητή"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Σφάλμα εξυπηρετητή (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Σφάλμα εξυπηρετητή <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Υπήρξε ένα σφάλμα. Έχει αναφερθεί στους διαχειριστές του ιστότοπου μέσω ηλ. "
-"ταχυδρομείου και θα πρέπει να επιδιορθωθεί σύντομα. Ευχαριστούμε για την "
-"υπομονή σας."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -363,7 +371,7 @@ msgstr "Επιλέξτε και τα %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Καθαρισμός επιλογής"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -373,22 +381,22 @@ msgid "Welcome,"
 msgstr "Καλωσήρθατε,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Τεκμηρίωση"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Αλλαγή συνθηματικού"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
@@ -400,35 +408,35 @@ msgstr "Διαχειριστής ιστότοπου Django"
 msgid "Django administration"
 msgstr "Διαχείριση Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Ιστορικό"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Προβολή στην ιστοσελίδα"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Παρακαλούμε διορθώστε το παρακάτω λάθος."
 msgstr[1] "Παρακαλούμε διορθώστε τα παρακάτω λάθη."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Προσθήκη %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Φίλτρο"
 
@@ -445,12 +453,12 @@ msgstr "Προτεραιότητα ταξινόμησης: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Εναλλαγή ταξινόμησης"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -462,7 +470,7 @@ msgstr ""
 "για τα οποία δεν έχετε δικάιωμα διαγραφής. Τα είδη των αντικειμένων αυτών "
 "είναι:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -471,7 +479,7 @@ msgstr ""
 "Η διαγραφή του %(object_name)s '%(escaped_object)s'  απαιτεί την διαγραφή "
 "των παρακάτω προστατευμένων αντικειμένων:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -481,16 +489,16 @@ msgstr ""
 "\"%(escaped_object)s\". Αν προχωρήσετε με την διαγραφή όλα τα παρακάτω "
 "συσχετισμένα αντικείμενα θα διαγραφούν επίσης:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ναι, είμαι βέβαιος"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Διαγραφή πολλών αντικειμένων"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -501,7 +509,7 @@ msgstr ""
 "διαγραφή συσχετισμένων αντικειμένων για τα οποία δεν έχετε το διακαίωμα "
 "διαγραφής:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -510,7 +518,7 @@ msgstr ""
 "Η διαγραφή των επιλεγμένων %(objects_name)s απαιτεί την διαγραφή των "
 "παρακάτω προστατευμένων αντικειμένων:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -525,36 +533,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Ανά %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Διαθέσιμα μοντέλα στην εφαρμογή %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Επεξεργασία"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Δεν έχετε δικαίωμα να επεξεργαστείτε τίποτα."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Πρόσφατες ενέργειες"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Οι ενέργειες μου"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Κανένα διαθέσιμο"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Άγνωστο περιεχόμενο"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -564,31 +572,27 @@ msgstr ""
 "βεβαιωθείτε ότι οι απαραίτητοι πίνακες έχουν δημιουργηθεί και ότι η βάση "
 "είναι προσβάσιμη από τον αντίστοιχο χρήστη που έχετε δηλώσει."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Όνομα χρήστη:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Συνθηματικό:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Ξεχάσατε το συνθηματικό ή τον κωδικό χρήστη σας;"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Ημερομηνία/ώρα"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Χρήστης"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -645,66 +649,66 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Εισάγετε όνομα χρήστη και κωδικό πρόσβασης."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Εισάγετε ένα νέο κωδικό πρόσβασης για τον χρήστη <strong>%(username)s</"
 "strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Συνθηματικό (ξανά)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Εισάγετε το ίδιο συνθηματικό όπως παραπάνω, για λόγους επιβεβαίωσης."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Προσθήκη νέου %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Αφαίρεση"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Θέλετε να πραγματοποιηθεί διαγραφή?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Ευχαριστούμε που διαθέσατε κάποιο ποιοτικό χρόνο στον ιστότοπο σήμερα."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Σύνδεση ξανά"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Αλλαγή συνθηματικού"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Επιτυχής αλλαγή συνθηματικού"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Το συνθηματικό σας έχει αλλαχτεί."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -713,48 +717,48 @@ msgstr ""
 "κατόπιν εισάγετε το νέο σας συνθηματικό δύο φορές ούτως ώστε να "
 "πιστοποιήσουμε ότι το πληκτρολογήσατε σωστά."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Προηγούμενος κωδικός πρόσβασης"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Νέος κωδικός πρόσβασης"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Αλλαγή του συνθηματικού μου"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Επαναφορά συνθηματικού"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Ολοκληρώθηκε η επαναφορά του κωδικού πρόσβασης."
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "Ορίσατε επιτυχώς έναν κωδικό πρόσβασής. Πλέον έχετε την δυνατότητα να "
 "συνδεθήτε."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Επιβεβαίωση επαναφοράς κωδικού πρόσβασης"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Πληκτρολογήστε νέο συνθηματικό"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -762,19 +766,19 @@ msgstr ""
 "Παρακαλούμε πληκτρολογήστε το νέο κωδικό πρόσβασης δύο φορές ώστε να "
 "βεβαιωθούμε ότι δεν πληκτρολογήσατε κάποιον χαρακτήρα λανθασμένα."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Νέο συνθηματικό:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Επιβεβαίωση συνθηματικού:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Επαναφορά συνθηματικού ανεπιτυχής"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -784,28 +788,23 @@ msgstr ""
 "πραγματοποιήσετε και πάλι την διαδικασία αίτησης επαναφοράς του κωδικού "
 "πρόσβασης."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Επιτυχής επαναφορά συνθηματικού"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Σας έχουν σταλεί οδηγίες για την επαναφορά του κωδικού πρόσβασής σας στην "
-"διύεθυνση ηλεκτρονικού ταχυδρομίου που δηλώσατε. Ελέγξτε το ηλεκτρονικό σας "
-"ταχυδρομείο για την παραλαβή τους."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Έχετε λάβει αυτό το μήνυμα επειδή ζητήσατε την επαναφορά του κωδικού "
-"πρόσβασής σας στον ιστότοπο %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -828,37 +827,34 @@ msgstr "Ευχαριστούμε που χρησιμοποιήσατε τον ι
 msgid "The %(site_name)s team"
 msgstr "Η ομάδα του %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Ξεχάσατε τον κωδικό πρόσβασής? Μπορείτε να εισάγετε την διεύθυνση του "
-"ηλεκτρονικού σας ταχυδρομείου και θα σας στείλουμε οδηγίες για να δηλώσετε "
-"ένα νέο κωδικό."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Ηλεκτρονική διεύθυνση:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Επαναφορά του συνθηματικού μου"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Όλες οι ημερομηνίες"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Κενό)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Επιλέξτε %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Επιλέξτε %s προς αλλαγή"
diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.mo
index 3b5686aecb..53155585f3 100644
Binary files a/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.po
index ecc9ad0c79..7bdbe451d3 100644
--- a/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.po
@@ -10,14 +10,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: Dimitris Glezos <glezos@indifex.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Dimitris Glezos <glezos@transifex.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.mo b/django/contrib/admin/locale/en/LC_MESSAGES/django.mo
index c3231dc25b..7b60cfe7a9 100644
Binary files a/django/contrib/admin/locale/en/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
index 497c7463c2..53f64941f4 100644
--- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
@@ -1,287 +1,337 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr ""
+msgstr "Successfully deleted %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1361
 #, python-format
 msgid "Cannot delete %(name)s"
-msgstr ""
+msgstr "Cannot delete %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1363
 msgid "Are you sure?"
-msgstr ""
+msgstr "Are you sure?"
 
 #: actions.py:83
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
-msgstr ""
+msgstr "Delete selected %(verbose_name_plural)s"
 
 #: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
-msgstr ""
+msgstr "All"
 
 #: filters.py:238
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
 #: filters.py:239
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: filters.py:253
 msgid "Unknown"
-msgstr ""
+msgstr "Unknown"
 
 #: filters.py:308
 msgid "Any date"
-msgstr ""
+msgstr "Any date"
 
 #: filters.py:309
 msgid "Today"
-msgstr ""
+msgstr "Today"
 
 #: filters.py:313
 msgid "Past 7 days"
-msgstr ""
+msgstr "Past 7 days"
 
 #: filters.py:317
 msgid "This month"
-msgstr ""
+msgstr "This month"
 
 #: filters.py:321
 msgid "This year"
-msgstr ""
+msgstr "This year"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 
 #: forms.py:19
 msgid "Please log in again, because your session has expired."
-msgstr ""
+msgstr "Please log in again, because your session has expired."
 
 #: helpers.py:23
 msgid "Action:"
-msgstr ""
+msgstr "Action:"
 
-#: models.py:24
+#: models.py:25
 msgid "action time"
-msgstr ""
-
-#: models.py:27
-msgid "object id"
-msgstr ""
+msgstr "action time"
 
 #: models.py:28
-msgid "object repr"
-msgstr ""
+msgid "object id"
+msgstr "object id"
 
 #: models.py:29
-msgid "action flag"
-msgstr ""
+msgid "object repr"
+msgstr "object repr"
 
 #: models.py:30
-msgid "change message"
-msgstr ""
+msgid "action flag"
+msgstr "action flag"
 
-#: models.py:35
-msgid "log entry"
-msgstr ""
+#: models.py:31
+msgid "change message"
+msgstr "change message"
 
 #: models.py:36
-msgid "log entries"
-msgstr ""
+msgid "log entry"
+msgstr "log entry"
 
-#: models.py:45
+#: models.py:37
+msgid "log entries"
+msgstr "log entries"
+
+#: models.py:46
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "Added \"%(object)s\"."
 
-#: models.py:47
+#: models.py:48
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "Changed \"%(object)s\" - %(changes)s"
 
-#: models.py:49
+#: models.py:53
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "Deleted \"%(object)s.\""
 
-#: models.py:51
+#: models.py:55
 msgid "LogEntry Object"
-msgstr ""
+msgstr "LogEntry Object"
 
-#: options.py:151 options.py:167
+#: options.py:163 options.py:192
 msgid "None"
-msgstr ""
+msgstr "None"
 
-#: options.py:672
+#: options.py:710
 #, python-format
 msgid "Changed %s."
-msgstr ""
+msgstr "Changed %s."
 
-#: options.py:672 options.py:682
+#: options.py:710 options.py:720 options.py:1510
 msgid "and"
-msgstr ""
+msgstr "and"
 
-#: options.py:677
+#: options.py:715
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
-msgstr ""
+msgstr "Added %(name)s \"%(object)s\"."
 
-#: options.py:681
+#: options.py:719
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
-msgstr ""
+msgstr "Changed %(list)s for %(name)s \"%(object)s\"."
 
-#: options.py:686
+#: options.py:724
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
-msgstr ""
+msgstr "Deleted %(name)s \"%(object)s\"."
 
-#: options.py:690
+#: options.py:728
 msgid "No fields changed."
-msgstr ""
+msgstr "No fields changed."
 
-#: options.py:773
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: options.py:777 options.py:825
-msgid "You may edit it again below."
-msgstr ""
-
-#: options.py:789 options.py:838
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: options.py:823
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: options.py:831
+#: options.py:831 options.py:874
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 
-#: options.py:900 options.py:1159
+#: options.py:849
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+
+#: options.py:853
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "The %(name)s \"%(obj)s\" was added successfully."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+
+#: options.py:881
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+
+#: options.py:887
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "The %(name)s \"%(obj)s\" was changed successfully."
+
+#: options.py:965 options.py:1225
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
 
-#: options.py:919
+#: options.py:984
 msgid "No action selected."
-msgstr ""
+msgstr "No action selected."
 
-#: options.py:999
+#: options.py:1064
 #, python-format
 msgid "Add %s"
-msgstr ""
+msgstr "Add %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1088 options.py:1333
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
-msgstr ""
+msgstr "%(name)s object with primary key %(key)r does not exist."
 
-#: options.py:1089
+#: options.py:1154
 #, python-format
 msgid "Change %s"
-msgstr ""
+msgstr "Change %s"
 
-#: options.py:1138
+#: options.py:1204
 msgid "Database error"
-msgstr ""
+msgstr "Database error"
 
-#: options.py:1201
+#: options.py:1267
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(count)s %(name)s was changed successfully."
+msgstr[1] "%(count)s %(name)s were changed successfully."
 
-#: options.py:1228
+#: options.py:1294
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(total_count)s selected"
+msgstr[1] "All %(total_count)s selected"
 
-#: options.py:1233
+#: options.py:1299
 #, python-format
 msgid "0 of %(cnt)s selected"
-msgstr ""
+msgstr "0 of %(cnt)s selected"
 
-#: options.py:1283
+#: options.py:1349
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr "The %(name)s \"%(obj)s\" was deleted successfully."
 
-#: options.py:1330
+#: options.py:1402
 #, python-format
 msgid "Change history: %s"
+msgstr "Change history: %s"
+
+#. Translators: Model verbose name and instance representation, suitable to be an item in a list
+#: options.py:1504
+#, python-format
+msgid "%(class_name)s %(instance)s"
 msgstr ""
 
-#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: options.py:1511
+#, fuzzy, python-format
+msgid ""
+"Deleting %(class_name)s %(instance)s would require deleting the following "
+"protected related objects: %(related_objects)s"
+msgstr ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+
+#: sites.py:324 tests.py:71 templates/admin/login.html:48
 #: templates/registration/password_reset_complete.html:19
 #: views/decorators.py:24
 msgid "Log in"
-msgstr ""
+msgstr "Log in"
 
-#: sites.py:388
+#: sites.py:392
 msgid "Site administration"
-msgstr ""
+msgstr "Site administration"
 
-#: sites.py:440
+#: sites.py:446
 #, python-format
 msgid "%s administration"
-msgstr ""
+msgstr "%s administration"
 
 #: widgets.py:90
 msgid "Date:"
-msgstr ""
+msgstr "Date:"
 
 #: widgets.py:91
 msgid "Time:"
-msgstr ""
+msgstr "Time:"
 
 #: widgets.py:165
 msgid "Lookup"
-msgstr ""
+msgstr "Lookup"
 
-#: widgets.py:271
+#: widgets.py:260
 msgid "Add Another"
-msgstr ""
+msgstr "Add Another"
+
+#: widgets.py:302
+msgid "Currently:"
+msgstr "Currently:"
+
+#: widgets.py:303
+msgid "Change:"
+msgstr "Change:"
 
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
-msgstr ""
+msgstr "Page not found"
 
 #: templates/admin/404.html:10
 msgid "We're sorry, but the requested page could not be found."
-msgstr ""
+msgstr "We're sorry, but the requested page could not be found."
 
 #: templates/admin/500.html:6 templates/admin/app_index.html:7
 #: templates/admin/base.html:47 templates/admin/change_form.html:19
@@ -298,61 +348,63 @@ msgstr ""
 #: templates/registration/password_reset_done.html:6
 #: templates/registration/password_reset_form.html:6
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: templates/admin/500.html:7
 msgid "Server error"
-msgstr ""
+msgstr "Server error"
 
 #: templates/admin/500.html:11
 msgid "Server error (500)"
-msgstr ""
+msgstr "Server error (500)"
 
 #: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
-msgstr ""
+msgstr "Server Error <em>(500)</em>"
 
 #: templates/admin/500.html:15
 msgid ""
 "There's been an error. It's been reported to the site administrators via "
 "email and should be fixed shortly. Thanks for your patience."
 msgstr ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
-msgstr ""
+msgstr "Run the selected action"
 
 #: templates/admin/actions.html:4
 msgid "Go"
-msgstr ""
+msgstr "Go"
 
 #: templates/admin/actions.html:11
 msgid "Click here to select the objects across all pages"
-msgstr ""
+msgstr "Click here to select the objects across all pages"
 
 #: templates/admin/actions.html:11
 #, python-format
 msgid "Select all %(total_count)s %(module_name)s"
-msgstr ""
+msgstr "Select all %(total_count)s %(module_name)s"
 
 #: templates/admin/actions.html:13
 msgid "Clear selection"
-msgstr ""
+msgstr "Clear selection"
 
 #: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
-msgstr ""
+msgstr "%(name)s"
 
 #: templates/admin/base.html:28
 msgid "Welcome,"
-msgstr ""
+msgstr "Welcome,"
 
 #: templates/admin/base.html:33
 #: templates/registration/password_change_done.html:3
 #: templates/registration/password_change_form.html:4
 msgid "Documentation"
-msgstr ""
+msgstr "Documentation"
 
 #: templates/admin/base.html:36
 #: templates/admin/auth/user/change_password.html:17
@@ -360,35 +412,35 @@ msgstr ""
 #: templates/registration/password_change_done.html:3
 #: templates/registration/password_change_form.html:4
 msgid "Change password"
-msgstr ""
+msgstr "Change password"
 
 #: templates/admin/base.html:38
 #: templates/registration/password_change_done.html:3
 #: templates/registration/password_change_form.html:4
 msgid "Log out"
-msgstr ""
+msgstr "Log out"
 
 #: templates/admin/base_site.html:4
 msgid "Django site admin"
-msgstr ""
+msgstr "Django site admin"
 
 #: templates/admin/base_site.html:7
 msgid "Django administration"
-msgstr ""
+msgstr "Django administration"
 
 #: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
-msgstr ""
+msgstr "Add"
 
 #: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
-msgstr ""
+msgstr "History"
 
 #: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
-msgstr ""
+msgstr "View on site"
 
 #: templates/admin/change_form.html:44 templates/admin/change_list.html:67
 #: templates/admin/login.html:17
@@ -396,35 +448,35 @@ msgstr ""
 #: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Please correct the error below."
+msgstr[1] "Please correct the errors below."
 
 #: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
-msgstr ""
+msgstr "Add %(name)s"
 
 #: templates/admin/change_list.html:78
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "Remove from sorting"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "Sorting priority: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "Toggle sorting"
 
 #: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
-msgstr ""
+msgstr "Delete"
 
 #: templates/admin/delete_confirmation.html:18
 #, python-format
@@ -433,6 +485,9 @@ msgid ""
 "related objects, but your account doesn't have permission to delete the "
 "following types of objects:"
 msgstr ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
 
 #: templates/admin/delete_confirmation.html:26
 #, python-format
@@ -440,6 +495,8 @@ msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
 
 #: templates/admin/delete_confirmation.html:34
 #, python-format
@@ -447,15 +504,17 @@ msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
 
 #: templates/admin/delete_confirmation.html:39
 #: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
-msgstr ""
+msgstr "Yes, I'm sure"
 
 #: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
-msgstr ""
+msgstr "Delete multiple objects"
 
 #: templates/admin/delete_selected_confirmation.html:17
 #, python-format
@@ -464,6 +523,9 @@ msgid ""
 "objects, but your account doesn't have permission to delete the following "
 "types of objects:"
 msgstr ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
 
 #: templates/admin/delete_selected_confirmation.html:25
 #, python-format
@@ -471,6 +533,8 @@ msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
 
 #: templates/admin/delete_selected_confirmation.html:33
 #, python-format
@@ -478,40 +542,42 @@ msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
 "following objects and their related items will be deleted:"
 msgstr ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
 
 #: templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
-msgstr ""
+msgstr " By %(filter_title)s "
 
 #: templates/admin/index.html:20
 #, python-format
 msgid "Models in the %(name)s application"
-msgstr ""
+msgstr "Models in the %(name)s application"
 
 #: templates/admin/index.html:39
 msgid "Change"
-msgstr ""
+msgstr "Change"
 
 #: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
-msgstr ""
+msgstr "You don't have permission to edit anything."
 
 #: templates/admin/index.html:57
 msgid "Recent Actions"
-msgstr ""
+msgstr "Recent Actions"
 
 #: templates/admin/index.html:58
 msgid "My Actions"
-msgstr ""
+msgstr "My Actions"
 
 #: templates/admin/index.html:62
 msgid "None available"
-msgstr ""
+msgstr "None available"
 
 #: templates/admin/index.html:76
 msgid "Unknown content"
-msgstr ""
+msgstr "Unknown content"
 
 #: templates/admin/invalid_setup.html:12
 msgid ""
@@ -519,154 +585,163 @@ msgid ""
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
 
 #: templates/admin/login.html:37
 msgid "Password:"
-msgstr ""
+msgstr "Password:"
 
 #: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Forgotten your password or username?"
 
 #: templates/admin/object_history.html:23
 msgid "Date/time"
-msgstr ""
+msgstr "Date/time"
 
 #: templates/admin/object_history.html:24
 msgid "User"
-msgstr ""
+msgstr "User"
 
 #: templates/admin/object_history.html:25
 msgid "Action"
-msgstr ""
+msgstr "Action"
 
 #: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
 msgstr ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
 
 #: templates/admin/pagination.html:10
 msgid "Show all"
-msgstr ""
+msgstr "Show all"
 
 #: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
 msgid "Save"
-msgstr ""
+msgstr "Save"
 
 #: templates/admin/search_form.html:7
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
 #: templates/admin/search_form.html:9
 #, python-format
 msgid "%(counter)s result"
 msgid_plural "%(counter)s results"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(counter)s result"
+msgstr[1] "%(counter)s results"
 
 #: templates/admin/search_form.html:9
 #, python-format
 msgid "%(full_result_count)s total"
-msgstr ""
+msgstr "%(full_result_count)s total"
 
 #: templates/admin/submit_line.html:5
 msgid "Save as new"
-msgstr ""
+msgstr "Save as new"
 
 #: templates/admin/submit_line.html:6
 msgid "Save and add another"
-msgstr ""
+msgstr "Save and add another"
 
 #: templates/admin/submit_line.html:7
 msgid "Save and continue editing"
-msgstr ""
+msgstr "Save and continue editing"
 
 #: templates/admin/auth/user/add_form.html:6
 msgid ""
 "First, enter a username and password. Then, you'll be able to edit more user "
 "options."
 msgstr ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
 
 #: templates/admin/auth/user/add_form.html:8
 msgid "Enter a username and password."
-msgstr ""
+msgstr "Enter a username and password."
 
 #: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr ""
+msgstr "Enter a new password for the user <strong>%(username)s</strong>."
 
 #: templates/admin/auth/user/change_password.html:38
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
 #: templates/admin/auth/user/change_password.html:44
 #: templates/registration/password_change_form.html:42
 msgid "Password (again)"
-msgstr ""
+msgstr "Password (again)"
 
 #: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
-msgstr ""
+msgstr "Enter the same password as above, for verification."
 
 #: templates/admin/edit_inline/stacked.html:26
 #: templates/admin/edit_inline/tabular.html:76
 msgid "Remove"
-msgstr ""
+msgstr "Remove"
 
 #: templates/admin/edit_inline/stacked.html:27
 #: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
-msgstr ""
+msgstr "Add another %(verbose_name)s"
 
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
-msgstr ""
+msgstr "Delete?"
 
 #: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
-msgstr ""
+msgstr "Thanks for spending some quality time with the Web site today."
 
 #: templates/registration/logged_out.html:10
 msgid "Log in again"
-msgstr ""
+msgstr "Log in again"
 
 #: templates/registration/password_change_done.html:7
 #: templates/registration/password_change_form.html:8
 #: templates/registration/password_change_form.html:12
 #: templates/registration/password_change_form.html:24
 msgid "Password change"
-msgstr ""
+msgstr "Password change"
 
 #: templates/registration/password_change_done.html:11
 #: templates/registration/password_change_done.html:15
 msgid "Password change successful"
-msgstr ""
+msgstr "Password change successful"
 
 #: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
-msgstr ""
+msgstr "Your password was changed."
 
 #: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 msgstr ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
 
 #: templates/registration/password_change_form.html:32
 msgid "Old password"
-msgstr ""
+msgstr "Old password"
 
 #: templates/registration/password_change_form.html:37
 msgid "New password"
-msgstr ""
+msgstr "New password"
 
 #: templates/registration/password_change_form.html:48
 #: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
-msgstr ""
+msgstr "Change my password"
 
 #: templates/registration/password_reset_complete.html:7
 #: templates/registration/password_reset_confirm.html:11
@@ -675,58 +750,71 @@ msgstr ""
 #: templates/registration/password_reset_form.html:11
 #: templates/registration/password_reset_form.html:15
 msgid "Password reset"
-msgstr ""
+msgstr "Password reset"
 
 #: templates/registration/password_reset_complete.html:11
 #: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
-msgstr ""
+msgstr "Password reset complete"
 
 #: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
-msgstr ""
+msgstr "Your password has been set.  You may go ahead and log in now."
 
 #: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
-msgstr ""
+msgstr "Password reset confirmation"
 
 #: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
-msgstr ""
+msgstr "Enter new password"
 
 #: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
 
 #: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
-msgstr ""
+msgstr "New password:"
 
 #: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
-msgstr ""
+msgstr "Confirm password:"
 
 #: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
-msgstr ""
+msgstr "Password reset unsuccessful"
 
 #: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
 
 #: templates/registration/password_reset_done.html:11
 #: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
-msgstr ""
+msgstr "Password reset successful"
 
 #: templates/registration/password_reset_done.html:17
+#, fuzzy
 msgid ""
+"We've emailed you instructions for setting your password. You should be "
+"receiving them shortly."
+msgstr ""
 "We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
+
+#: templates/registration/password_reset_done.html:19
+msgid ""
+"If you don't receive an email, please make sure you've entered the address "
+"you registered with, and check your spam folder."
 msgstr ""
 
 #: templates/registration/password_reset_email.html:2
@@ -735,52 +823,56 @@ msgid ""
 "You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
-msgstr ""
+msgstr "Please go to the following page and choose a new password:"
 
 #: templates/registration/password_reset_email.html:8
 msgid "Your username, in case you've forgotten:"
-msgstr ""
+msgstr "Your username, in case you've forgotten:"
 
 #: templates/registration/password_reset_email.html:10
 msgid "Thanks for using our site!"
-msgstr ""
+msgstr "Thanks for using our site!"
 
 #: templates/registration/password_reset_email.html:12
 #, python-format
 msgid "The %(site_name)s team"
-msgstr ""
+msgstr "The %(site_name)s team"
 
 #: templates/registration/password_reset_form.html:17
 msgid ""
 "Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
 
 #: templates/registration/password_reset_form.html:21
 msgid "Email address:"
-msgstr ""
+msgstr "Email address:"
 
 #: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
-msgstr ""
+msgstr "Reset my password"
 
-#: templatetags/admin_list.py:344
+#: templatetags/admin_list.py:348
 msgid "All dates"
-msgstr ""
+msgstr "All dates"
 
-#: views/main.py:33
+#: views/main.py:37
 msgid "(None)"
-msgstr ""
+msgstr "(None)"
 
-#: views/main.py:76
+#: views/main.py:86
 #, python-format
 msgid "Select %s"
-msgstr ""
+msgstr "Select %s"
 
-#: views/main.py:78
+#: views/main.py:88
 #, python-format
 msgid "Select %s to change"
-msgstr ""
+msgstr "Select %s to change"
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.mo
index 915c43512a..9851b29c10 100644
Binary files a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
index 16883fae7d..64f3850b13 100644
--- a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
@@ -1,22 +1,25 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-03-08 10:42+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
 msgid "Available %s"
-msgstr ""
+msgstr "Available %s"
 
 #: static/admin/js/SelectFilter2.js:46
 #, c-format
@@ -24,37 +27,39 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Type into this box to filter down the list of available %s."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #: static/admin/js/SelectFilter2.js:61
 msgid "Choose all"
-msgstr ""
+msgstr "Choose all"
 
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Click to choose all %s at once."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Choose"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
-msgstr ""
+msgstr "Remove"
 
 #: static/admin/js/SelectFilter2.js:75
 #, c-format
 msgid "Chosen %s"
-msgstr ""
+msgstr "Chosen %s"
 
 #: static/admin/js/SelectFilter2.js:76
 #, c-format
@@ -62,34 +67,41 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "Remove all"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Click to remove all chosen %s at once."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
 msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(sel)s of %(cnt)s selected"
+msgstr[1] "%(sel)s of %(cnt)s selected"
 
 #: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
 msgid ""
 "You have unsaved changes on individual editable fields. If you run an "
 "action, your unsaved changes will be lost."
 msgstr ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
 
-#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5
 msgid ""
 "You have selected an action, but you haven't saved your changes to "
 "individual fields yet. Please click OK to save. You'll need to re-run the "
 "action."
 msgstr ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
 
 #: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
 msgid ""
@@ -97,69 +109,74 @@ msgid ""
 "fields. You're probably looking for the Go button rather than the Save "
 "button."
 msgstr ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
 
-#: static/admin/js/calendar.js:26
+#: static/admin/js/calendar.js:8
 msgid ""
 "January February March April May June July August September October November "
 "December"
 msgstr ""
+"January February March April May June July August September October November "
+"December"
 
-#: static/admin/js/calendar.js:27
+#: static/admin/js/calendar.js:9
 msgid "S M T W T F S"
-msgstr ""
+msgstr "S M T W T F S"
 
 #: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
 #: static/admin/js/collapse.min.js:1
 msgid "Show"
-msgstr ""
+msgstr "Show"
 
-#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1
 msgid "Hide"
-msgstr ""
+msgstr "Hide"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:49
 #: static/admin/js/admin/DateTimeShortcuts.js:85
 msgid "Now"
-msgstr ""
+msgstr "Now"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:53
 msgid "Clock"
-msgstr ""
+msgstr "Clock"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:81
 msgid "Choose a time"
-msgstr ""
+msgstr "Choose a time"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:86
 msgid "Midnight"
-msgstr ""
+msgstr "Midnight"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:87
 msgid "6 a.m."
-msgstr ""
+msgstr "6 a.m."
 
 #: static/admin/js/admin/DateTimeShortcuts.js:88
 msgid "Noon"
-msgstr ""
+msgstr "Noon"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:92
 #: static/admin/js/admin/DateTimeShortcuts.js:204
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:144
 #: static/admin/js/admin/DateTimeShortcuts.js:197
 msgid "Today"
-msgstr ""
+msgstr "Today"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:148
 msgid "Calendar"
-msgstr ""
+msgstr "Calendar"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:195
 msgid "Yesterday"
-msgstr ""
+msgstr "Yesterday"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:199
 msgid "Tomorrow"
-msgstr ""
+msgstr "Tomorrow"
diff --git a/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo
index f90d901414..06cee99605 100644
Binary files a/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po
index 24beab5675..cdc154432b 100644
--- a/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po
@@ -8,28 +8,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-12 21:43+0000\n"
-"Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Successfully deleted %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Cannot delete %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Are you sure?"
 
@@ -38,169 +38,175 @@ msgstr "Are you sure?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Delete selected %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "All"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Yes"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "No"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Unknown"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Any date"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Today"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Past 7 days"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "This month"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "This year"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Please log in again, because your session has expired."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Your e-mail address is not your username. Try '%s' instead."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Action:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "action time"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "object id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "object repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "action flag"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "change message"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "log entry"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "log entries"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Added \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Changed \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Deleted \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry Object"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "None"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Changed %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "and"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Added %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Changed %(list)s for %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Deleted %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "No fields changed."
 
-#: options.py:772
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "The %(name)s \"%(obj)s\" was added successfully."
 
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "You may edit it again below."
-
-#: options.py:788 options.py:837
+#: options.py:853
 #, python-format
-msgid "You may add another %s below."
-msgstr "You may add another %s below."
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
 
-#: options.py:822
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "The %(name)s \"%(obj)s\" was changed successfully."
 
-#: options.py:830
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-
-#: options.py:899 options.py:1159
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,89 +214,97 @@ msgstr ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "No action selected."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Add %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s object with primary key %(key)r does not exist."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Change %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Database error"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s was changed successfully."
 msgstr[1] "%(count)s %(name)s were changed successfully."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s selected"
 msgstr[1] "All %(total_count)s selected"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 of %(cnt)s selected"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "The %(name)s \"%(obj)s\" was deleted successfully."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Change history: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Log in"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Site administration"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s administration"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Date:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Time:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Lookup"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Add Another"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Page not found"
@@ -299,42 +313,40 @@ msgstr "Page not found"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "We're sorry, but the requested page could not be found."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Home"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Server error"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Server error (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Server Error <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -357,7 +369,7 @@ msgstr "Select all %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Clear selection"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -367,22 +379,22 @@ msgid "Welcome,"
 msgstr "Welcome,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentation"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Change password"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Log out"
 
@@ -394,35 +406,35 @@ msgstr "Django site admin"
 msgid "Django administration"
 msgstr "Django administration"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Add"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "History"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "View on site"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Please correct the error below."
 msgstr[1] "Please correct the errors below."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Add %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -439,12 +451,12 @@ msgstr "Sorting priority: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Toggle sorting"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -455,7 +467,7 @@ msgstr ""
 "related objects, but your account doesn't have permission to delete the "
 "following types of objects:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -464,7 +476,7 @@ msgstr ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -473,16 +485,16 @@ msgstr ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Yes, I'm sure"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Delete multiple objects"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +505,7 @@ msgstr ""
 "objects, but your account doesn't have permission to delete the following "
 "types of objects:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +514,7 @@ msgstr ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +528,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " By %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Models available in the %(name)s application."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Change"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "You don't have permission to edit anything."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Recent Actions"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "My Actions"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "None available"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Unknown content"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -555,31 +567,27 @@ msgstr ""
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Username:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Password:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Forgotten your password or username?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Date/time"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "User"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Action"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -635,64 +643,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Enter a username and password."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Enter a new password for the user <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Password"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Enter the same password as above, for verification."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Remove"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Add another %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Remove"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Delete?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Thanks for spending some quality time with the Web site today."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Log in again"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Password change"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Password change successful"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Your password was changed."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -700,46 +708,46 @@ msgstr ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Old password"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "New password"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Change my password"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Password reset"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Password reset complete"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Your password has been set.  You may go ahead and log in now."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Password reset confirmation"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Enter new password"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -747,19 +755,19 @@ msgstr ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "New password:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirm password:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Password reset unsuccessful"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -767,27 +775,23 @@ msgstr ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Password reset successful"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"We've e-mailed you instructions for setting your password to the e-mail "
-"address you submitted. You should be receiving it shortly."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"You're receiving this e-mail because you requested a password reset for your "
-"user account at %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -806,36 +810,34 @@ msgstr "Thanks for using our site!"
 msgid "The %(site_name)s team"
 msgstr "The %(site_name)s team"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
-"instructions for setting a new one."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Reset my password"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "All dates"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(None)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Select %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Select %s to change"
diff --git a/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.mo
index cacc13c6f6..b5c51e2ba5 100644
Binary files a/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.po
index ad134036c6..be6faea102 100644
--- a/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-12 21:55+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo b/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo
index 04f14bfc63..5799acda2b 100644
Binary files a/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/eo/LC_MESSAGES/django.po b/django/contrib/admin/locale/eo/LC_MESSAGES/django.po
index f61f01415a..8d2de8a973 100644
--- a/django/contrib/admin/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/eo/LC_MESSAGES/django.po
@@ -1,206 +1,214 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <adam.raizen@gmail.com>, 2012.
+# Baptiste  <baptiste+transifex@darthenay.fr>, 2012.
 # Dinu Gherman <gherman@darwin.in-berlin.de>, 2011.
 #   <kristjan.schmidt@googlemail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: sagittarian <adam.raizen@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr "Sukcese %(count)d %(items)s forigitaj."
+msgstr "Sukcese forigis %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Ne povas forigi %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
-msgstr "Ĉu certas?"
+msgstr "Ĉu vi certas?"
 
 #: actions.py:83
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
-msgstr "Forigi elektitaj %(verbose_name_plural)s"
+msgstr "Forigi elektitajn %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Ĉio"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Jes"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ne"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Ajna dato"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hodiaŭ"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Lastaj 7 tagoj"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
-msgstr "Ĉi-tiu monato"
+msgstr "Ĉi tiu monato"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
-msgstr "Ĉi-tiu jaro"
+msgstr "Ĉi tiu jaro"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Bonvolu tajpi la ĝustan salutnomon kaj pasvorton por personara konto. Notu "
-"ke ambaŭ kampoj estas usklecodistingaj."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Bonvolu ensaluti denove, ĉar via seanco senvalidiĝis."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Via retpoŝto ne estas via salutnomo. Provu '%s' anstataŭe."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Ago:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "aga tempo"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objekta identigaĵo"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objekta prezento"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "aga marko"
 
-#: models.py:25
-msgid "change message"
-msgstr "ŝanĝa mesaĝo"
-
 #: models.py:30
+msgid "change message"
+msgstr "ŝanĝmesaĝo"
+
+#: models.py:35
 msgid "log entry"
 msgstr "protokolero"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "protokoleroj"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" aldonita."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Ŝanĝita \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Forigita \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Protokolera objekto"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Neniu"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Ŝanĝita %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "kaj"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Aldonita %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Ŝanĝita %(list)s por %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Forigita %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Neniu kampo ŝanĝita."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "La %(name)s \"%(obj)s\" estis aldonita sukcese."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Vi devus ĝin redakti denove sube."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Vi devus aldoni alia %s sube."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "La %(name)s \"%(obj)s\" estis ŝanĝita sukcese."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
-"La %(name)s \"%(obj)s\" estis aldonita sukcese. Vi devus ĝin redakti denove "
+"La %(name)s \"%(obj)s\" estis aldonita sukcese. Vi rajtas ĝin redakti denove "
 "sube."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "La %(name)s \"%(obj)s\" estis aldonita sukcese."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "La %(name)s \"%(obj)s\" estis ŝanĝita sukcese."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,88 +216,96 @@ msgstr ""
 "Elementoj devas esti elektitaj por elfari agojn sur ilin. Neniu elemento "
 "estis ŝanĝita."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Neniu ago elektita."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Aldoni %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s objekto kun ĉefŝlosilo %(key)r ne ekzistas."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Ŝanĝi %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Datumbaza eraro"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
-msgstr[0] "%(count)s %(name)s estis ŝanĝita sukcese."
-msgstr[1] "%(count)s %(name)s estis ŝanĝitaj sukcese."
+msgstr[0] "%(count)s %(name)s estis sukcese ŝanĝita."
+msgstr[1] "%(count)s %(name)s estis sukcese ŝanĝitaj."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s elektitaj"
 msgstr[1] "Ĉiuj %(total_count)s elektitaj"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 el %(cnt)s elektita"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "La %(name)s \"%(obj)s\" estis forigita sukcese."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Ŝanĝa historio: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Ensaluti"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Reteja administrado"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s administrado"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dato:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Horo:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Trarigardo"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
-msgstr "Aldoni alian"
+msgstr "Aldoni ankoraŭ unu"
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
 
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
@@ -299,42 +315,40 @@ msgstr "Paĝo ne trovita"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Bedaŭrinde la petitan paĝon ne povas esti trovita."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Ĉefpaĝo"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Servila eraro"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Servila eraro (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Servila eraro <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Tie estis eraro. Ĝi estis raportita al la retejaj administrantoj tra "
-"retpoŝto kaj devus esti riparita rapide. Dankon por via pacienco."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -357,7 +371,7 @@ msgstr "Elekti ĉiuj %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Viŝi elekton"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -367,24 +381,24 @@ msgid "Welcome,"
 msgstr "Bonvenon,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentaro"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Ŝanĝi pasvorton"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
-msgstr "Adiaŭi"
+msgstr "Elsaluti"
 
 #: templates/admin/base_site.html:4
 msgid "Django site admin"
@@ -394,57 +408,57 @@ msgstr "Djanga reteja administrado"
 msgid "Django administration"
 msgstr "Djanga administrado"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Aldoni"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historio"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Vidi sur retejo"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Bonvolu ĝustigi la eraron sube."
 msgstr[1] "Bonvolu ĝustigi la erarojn sube."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Aldoni %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtri"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr "Forigi de ordigado"
+msgstr "Forigi el ordigado"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr "Ordigada prioritaton: %(priority_number)s"
+msgstr "Ordiga prioritato: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
 msgstr "Ŝalti ordigadon"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -455,96 +469,96 @@ msgstr ""
 "rilatajn objektojn, sed via konto ne havas permeson por forigi la sekvantajn "
 "tipojn de objektoj:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
-"Foriganti la %(object_name)s '%(escaped_object)s' postulus foriganti la "
-"sekvajn protektitajn rilatitajn objektojn:"
+"Forigi la %(object_name)s '%(escaped_object)s' postulus forigi la sekvajn "
+"protektitajn rilatajn objektojn:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
-"Ĉu sendube vi deziras forigi %(object_name)s \"%(escaped_object)s\"? Ĉiuj el "
-"la sekvantaj rilataj eroj estos forigitaj:"
+"Ĉu vi certas, ke vi volas forigi %(object_name)s \"%(escaped_object)s\"? "
+"Ĉiuj el la sekvaj rilataj eroj estos forigitaj:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Jes, mi certas"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Forigi plurajn objektojn"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
 "objects, but your account doesn't have permission to delete the following "
 "types of objects:"
 msgstr ""
-"Foriganti la %(objects_name)s rezultus en foriganti rilatajn objektojn, sed "
-"via konto ne havas permeson por forigi la sekvantajn tipojn de objektoj:"
+"Forigi la %(objects_name)s rezultus en forigi rilatajn objektojn, sed via "
+"konto ne havas permeson por forigi la sekvajn tipojn de objektoj:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
-"Foriganti la %(objects_name)s postulus foriganti la sekvajn protektitajn "
-"rilatitajn objektojn:"
+"Forigi la %(objects_name)s postulus forigi la sekvajn protektitajn rilatajn "
+"objektojn:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
 "following objects and their related items will be deleted:"
 msgstr ""
-"Ĉu sendube vi deziras forigi la elektitajn %(objects_name)s? Ĉiuj el la "
-"sekvantaj objektoj kaj iliaj rilataj eroj estos forigita:"
+"Ĉu vi certas, ke vi volas forigi la elektitajn %(objects_name)s? Ĉiuj el la "
+"sekvaj objektoj kaj iliaj rilataj eroj estos forigita:"
 
 #: templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
 msgstr " Laŭ %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeloj haveblaj en la %(name)s aplikaĵo."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Ŝanĝi"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
-msgstr "Vi ne havas permeson por redakti ion-ajn."
+msgstr "Vi ne havas permeson por redakti ĉion ajn."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
-msgstr "Ĵusaj agoj"
+msgstr "Lastaj agoj"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Miaj agoj"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Neniu disponebla"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Nekonata enhavo"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -554,36 +568,32 @@ msgstr ""
 "de datumbazo estis kreitaj, kaj ke la datumbazo estas legebla per la ĝusta "
 "uzanto."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Salutnomo:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Ĉu vi forgesis vian pasvorton aŭ salutnomo?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dato/horo"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Uzanto"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Ago"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
 msgstr ""
-"Ĉi-tiu objekto ne havas ŝanĝan historion. Eble ĝi ne estis aldonita per la "
+"Ĉi tiu objekto ne havas ŝanĝ-historion. Eble ĝi ne estis aldonita per la "
 "administranta retejo."
 
 #: templates/admin/pagination.html:10
@@ -612,7 +622,7 @@ msgstr "%(full_result_count)s entute"
 
 #: templates/admin/submit_line.html:5
 msgid "Save as new"
-msgstr "Konservi kiel nova"
+msgstr "Konservi kiel novan"
 
 #: templates/admin/submit_line.html:6
 msgid "Save and add another"
@@ -620,126 +630,125 @@ msgstr "Konservi kaj aldoni alian"
 
 #: templates/admin/submit_line.html:7
 msgid "Save and continue editing"
-msgstr "Konservi kaj daŭri redakton"
+msgstr "Konservi kaj daŭre redakti"
 
 #: templates/admin/auth/user/add_form.html:6
 msgid ""
 "First, enter a username and password. Then, you'll be able to edit more user "
 "options."
 msgstr ""
-"Unue, bovolu tajpi salutnomon kaj pasvorton. Tiam, vi estos kapabla redakti "
-"pli da uzantajn agordojn."
+"Unue, bovolu tajpi salutnomon kaj pasvorton. Tiam, vi povos redakti pli da "
+"uzantaj agordoj."
 
 #: templates/admin/auth/user/add_form.html:8
 msgid "Enter a username and password."
-msgstr "Entajpu salutnomon kaj pasvorton."
+msgstr "Enigu salutnomon kaj pasvorton."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "Entajpu novan pasvorton por la uzanto <strong>%(username)s</strong>."
+msgstr "Enigu novan pasvorton por la uzanto <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Pasvorto (denove)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Entajpu la saman pasvorton kiel supre, por konfirmo."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Forigu"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Aldoni alian %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Forigu"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
-msgstr "Froviŝi?"
+msgstr "Forviŝi?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Dankon por trapasi iun superkvalitan tempon kun la retejo hodiaŭ."
+msgstr "Dankon pro pasigo de kvalita tempon kun la retejo hodiaŭ."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Ensaluti denove"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
-msgstr "Pasvorto ŝanĝo"
+msgstr "Pasvorta ŝanĝo"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
-msgstr "Pasvorto suksese ŝanĝita"
+msgstr "Pasvorto sukcese ŝanĝita"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
-msgstr "Via pasvorto estis suksese ŝanĝita."
+msgstr "Via pasvorto estis sukcese ŝanĝita."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 msgstr ""
-"Bonvolu entajpi vian malnovan pasvorton, pro sekureca kialo, kaj tiam "
-"entajpi vian novan pasvorton dufoje, tiel ni povas konfirmi ke vi ĝuste "
-"tajpis ĝin."
+"Bonvolu enigi vian malnovan pasvorton, pro sekureco, kaj tiam enigi vian "
+"novan pasvorton dufoje, tiel ni povas konfirmi ke vi ĝuste tajpis ĝin."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Malnova pasvorto"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Ŝanĝi mian passvorton"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Pasvorta rekomencigo"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Pasvorta rekomencigo plenumita"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Via pasvorto estis ŝanĝita. Vi povas iri antaŭen kaj ensaluti nun."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Pasvorta rekomenciga konfirmo"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
-msgstr "Entajpu novan pasvorton"
+msgstr "Enigu novan pasvorton"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -747,19 +756,19 @@ msgstr ""
 "Bonvolu entajpi vian novan pasvorton dufoje, tiel ni povas konfirmi ke vi "
 "ĝuste tajpis ĝin."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nova pasvorto:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Konfirmi pasvorton:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Pasvorta rekomencigo malsuksesis"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -767,27 +776,23 @@ msgstr ""
 "La pasvorta rekomenciga ligo malvalidis, eble ĉar ĝi jam estis uzata.  "
 "Bonvolu peti novan pasvortan rekomencigon."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Pasvorta rekomencigo suksesis"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Ni sendis al vi retpoŝton kun instruoj por ŝanĝi vian pasvorton al la "
-"sendita retpoŝtadreso. Vi devus ricevi ĝin rapide."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Vi ricevas ĉi-tiun retpoŝton ĉar vi petis pasvortan ŝanĝon por via uzanta "
-"konto ĉe %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -799,43 +804,41 @@ msgstr "Via salutnomo, se vi forgesis:"
 
 #: templates/registration/password_reset_email.html:10
 msgid "Thanks for using our site!"
-msgstr "Dankon por uzi nian retejon!"
+msgstr "Dankon pro uzo de nia retejo!"
 
 #: templates/registration/password_reset_email.html:12
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "La %(site_name)s teamo"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Pasvorton forgesita? Entajpu vian retpoŝtadreson malsupre kaj ni sendos "
-"instruojn por rekomencigi novan pasvortonu."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Retpoŝtadreso:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Rekomencigi mian pasvorton"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Ĉiuj datoj"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Neniu)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Elekti %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Elekti %s por ŝanĝi"
diff --git a/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.mo
index fd524b686d..b89655ef44 100644
Binary files a/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.po
index d1ee79179a..3ef579977d 100644
--- a/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.po
@@ -1,26 +1,28 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <adam.raizen@gmail.com>, 2012.
+# Baptiste  <baptiste+transifex@darthenay.fr>, 2012.
 # Jaffa McNeill <jaffa.mcneill@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: Jaffa McNeill <jaffa.mcneill@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"PO-Revision-Date: 2012-12-11 19:24+0000\n"
+"Last-Translator: sagittarian <adam.raizen@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
 msgid "Available %s"
-msgstr "Havebla %s"
+msgstr "Disponebla %s"
 
 #: static/admin/js/SelectFilter2.js:46
 #, c-format
@@ -28,11 +30,14 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Tio ĉi estas la listo de disponeblaj %s. Vi povas forigi kelkajn elektante "
+"ilin en la suba skatolo kaj tiam klakante la \"Elekti\" sagon inter la du "
+"skatoloj."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Entipu en ĉi-tiu skatolo por filtri la liston de haveblaj %s."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -40,16 +45,16 @@ msgstr "Filtru"
 
 #: static/admin/js/SelectFilter2.js:61
 msgid "Choose all"
-msgstr ""
+msgstr "Elekti ĉiuj"
 
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Klaku por tuj elekti ĉiuj %s."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Elekti"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -58,7 +63,7 @@ msgstr "Forigu"
 #: static/admin/js/SelectFilter2.js:75
 #, c-format
 msgid "Chosen %s"
-msgstr ""
+msgstr "Elektita %s"
 
 #: static/admin/js/SelectFilter2.js:76
 #, c-format
@@ -66,6 +71,9 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Tio ĉi estas la listo de elektitaj %s. Vi povas forigi kelkajn elektante "
+"ilin en la suba skatolo kaj tiam klakante la \"Forigi\" sagon inter la du "
+"skatoloj."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
@@ -74,7 +82,7 @@ msgstr "Forigu ĉiujn"
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Klaku por tuj forigi ĉiujn %s elektitajn."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
@@ -87,8 +95,8 @@ msgid ""
 "You have unsaved changes on individual editable fields. If you run an "
 "action, your unsaved changes will be lost."
 msgstr ""
-"Vi havas nesavitajn ŝanĝojn sur individuaj redakteblaj kampoj. Se vi faros "
-"agon, viaj nesavitaj ŝanĝoj estos perdita."
+"Vi havas neŝirmitajn ŝanĝojn je unuopaj redakteblaj kampoj. Se vi faros "
+"agon, viaj neŝirmitaj ŝanĝoj perdiĝos."
 
 #: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
 msgid ""
@@ -96,8 +104,8 @@ msgid ""
 "individual fields yet. Please click OK to save. You'll need to re-run the "
 "action."
 msgstr ""
-"Vi elektas agon, sed vi ne savis viajn ŝanĝojn al individuaj kampoj ĝis nun. "
-"Bonvolu klaku BONA por savi. Vi devos ripeton la agon"
+"Vi elektas agon, sed vi ne ŝirmis viajn ŝanĝojn al individuaj kampoj ĝis "
+"nun. Bonvolu klaku BONA por ŝirmi. Vi devos ripeton la agon"
 
 #: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
 msgid ""
@@ -105,8 +113,8 @@ msgid ""
 "fields. You're probably looking for the Go button rather than the Save "
 "button."
 msgstr ""
-"Vi elektas agon, kaj vi ne faris iujn ŝanĝojn sur individuaj kampoj. Vi  "
-"verŝajne serĉas la Iru butonon prefere ol la Savu butono."
+"Vi elektas agon, kaj vi ne faris ajnajn ŝanĝojn ĉe unuopaj kampoj. Vi  "
+"verŝajne serĉas la Iru-butonon prefere ol la Ŝirmu-butono."
 
 #: static/admin/js/calendar.js:26
 msgid ""
@@ -123,7 +131,7 @@ msgstr "D L M M Ĵ V S"
 #: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
 #: static/admin/js/collapse.min.js:1
 msgid "Show"
-msgstr "Manifestu"
+msgstr "Montru"
 
 #: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
 msgid "Hide"
@@ -132,7 +140,7 @@ msgstr "Kaŝu"
 #: static/admin/js/admin/DateTimeShortcuts.js:49
 #: static/admin/js/admin/DateTimeShortcuts.js:85
 msgid "Now"
-msgstr "Nu"
+msgstr "Nun"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:53
 msgid "Clock"
diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo
index c1c7a50c9b..49359ff41f 100644
Binary files a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.po b/django/contrib/admin/locale/es/LC_MESSAGES/django.po
index 69f8733f39..37302a2a1f 100644
--- a/django/contrib/admin/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/es/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Antoni Aloy <aaloy@apsl.net>, 2012-2013.
 # Antoni Aloy <antoni.aloy@trespams.com>, 2011, 2012.
 # franchukelly <fcocuadrado@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
@@ -10,28 +11,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: guillem <serra.guillem@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-10 18:48+0000\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Eliminado/s %(count)d %(items)s satisfactoriamente."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "No se puede eliminar %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
@@ -40,171 +41,183 @@ msgstr "¿Está seguro?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Eliminar %(verbose_name_plural)s seleccionado/s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Todo"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Sí"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "No"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Cualquier fecha"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hoy"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Últimos 7 días"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Este mes"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Este año"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Por favor introduce un usuario y clave adecuado para una cuenta de personal. "
-"Fíjate que ambos campos son sensibles a mayúsculas."
+"Por favor introduce el %(username)s y la clave correctos para una cuenta de "
+"personal. Observa que campos pueden ser sensibles a mayúsculas."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Por favor, inicie sesión de nuevo, ya que su sesión ha caducado."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su "
-"lugar."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Acción:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "hora de acción"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id de objeto"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr de objeto"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "marca de acción"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "mensaje de cambio"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entrada de registro"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entradas de registro"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Añadidos \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Cambiados \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Eliminados \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objeto de registro de Log"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ninguno"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Modificado/a %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "y"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Añadido/a \"%(object)s\" %(name)s."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Modificados %(list)s para \"%(object)s\" %(name)s."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Eliminado/a \"%(object)s\" %(name)s."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "No ha cambiado ningún campo."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Puede editarlo de nuevo abajo."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede añadir otro %s abajo."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "Se añadió con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"El  %(name)s \"%(obj)s\" fue añadido satisfactoriamente. Puedes añadir otro "
+"%(name)s a continuación."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"El %(name)s \"%(obj)s\" fue cambiado satisfactoriamente. Puedes editarlo "
+"otra vez a continuación."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"El  %(name)s \"%(obj)s\" fue cambiado satisfactoriamente. Puedes añadir otro "
+"%(name)s a continuación."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -212,89 +225,97 @@ msgstr ""
 "Se deben seleccionar elementos para poder realizar acciones sobre estos. No "
 "se han modificado elementos."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "No se seleccionó ninguna acción."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Añadir %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "No existe ningún objeto %(name)s con la clave primaria %(key)r."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Error en la base de datos"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s fué modificado con éxito."
 msgstr[1] "%(count)s %(name)s fueron modificados con éxito."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s seleccionado"
 msgstr[1] "Todos %(total_count)s seleccionados"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "seleccionados 0 de %(cnt)s"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Histórico de modificaciones: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Sitio administrativo"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administración de %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Fecha:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Hora:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Buscar"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Añadir otro"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Actualmente:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Cambiar:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Página no encontrada"
@@ -303,43 +324,43 @@ msgstr "Página no encontrada"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Lo sentimos, pero no se encuentra la página solicitada."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Inicio"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Error del servidor"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Error del servidor (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Error de servidor <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ha ocurrido un error. Se ha informado a los administradores del sitio "
-"mediante correo electrónico y debería arreglarse en breve. Gracias por su "
-"paciencia."
+"Ha habido un error. Ha sido comunicado al administrador del sitio por correo "
+"electrónico y debería solucionarse a la mayor brevedad. Gracias por tu "
+"paciencia y comprensión."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -362,7 +383,7 @@ msgstr "Seleccionar todos los %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Limpiar selección"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -372,22 +393,22 @@ msgid "Welcome,"
 msgstr "Bienvenido/a,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Terminar sesión"
 
@@ -399,35 +420,35 @@ msgstr "Sitio de administración de Django"
 msgid "Django administration"
 msgstr "Administración de Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Añadir"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Histórico"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Ver en el sitio"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor, corrija el siguiente error."
 msgstr[1] "Por favor, corrija los siguientes errores."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Añadir %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtro"
 
@@ -444,12 +465,12 @@ msgstr "Prioridad de la ordenación: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Activar la ordenación"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -460,7 +481,7 @@ msgstr ""
 "de objetos relacionados, pero su cuenta no tiene permiso para borrar los "
 "siguientes tipos de objetos:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -469,7 +490,7 @@ msgstr ""
 "La eliminación de %(object_name)s %(escaped_object)s requeriría eliminar los "
 "siguientes objetos relacionados protegidos:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -478,16 +499,16 @@ msgstr ""
 "¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s"
 "\"? Se borrarán los siguientes objetos relacionados:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Sí, estoy seguro"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Eliminar múltiples objetos."
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -498,7 +519,7 @@ msgstr ""
 "objetos relacionados, pero su cuenta no tiene permisos para borrar los "
 "siguientes tipos de objetos:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -507,7 +528,7 @@ msgstr ""
 "La eliminación de %(objects_name)s seleccionado requeriría el borrado de los "
 "siguientes objetos protegidos relacionados:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -521,36 +542,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Por %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelos disponibles en la aplicación %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modelos en la aplicación %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modificar"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "No tiene permiso para editar nada."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Acciones recientes"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mis acciones"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ninguno disponible"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Contenido desconocido"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -560,31 +581,27 @@ msgstr ""
 "necesarias han sido creadas, y que la base de datos puede ser leída por el "
 "usuario apropiado."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Usuario:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "¿Olvidaste la contraseña o el nombre de usuario?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Fecha/hora"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Usuario"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Acción"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -640,66 +657,66 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Entre un nombre de usuario y contraseña"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Introduzca una nueva contraseña para el usuario <strong>%(username)s</"
 "strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Introduzca la misma contraseña que arriba, para verificación."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Eliminar"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Agregar otro %(verbose_name)s."
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Eliminar"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "¿Eliminar?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Gracias por el tiempo que ha dedicado hoy al sitio web."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Iniciar sesión de nuevo"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Cambio de contraseña exitoso"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Su contraseña ha sido cambiada."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -708,48 +725,48 @@ msgstr ""
 "introduzca la nueva contraseña dos veces para verificar que la ha escrito "
 "correctamente."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Contraseña antigua"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Cambiar mi contraseña"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Restablecer contraseña"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Restablecimiento de contraseña completado"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "Su contraseña ha sido establecida. Ahora puede seguir adelante e iniciar "
 "sesión."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmación de restablecimiento de contraseña"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Introduzca una nueva contraseña"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -757,19 +774,19 @@ msgstr ""
 "Por favor, introduzca su contraseña nueva dos veces para verificar que la ha "
 "escrito correctamente."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Contraseña nueva:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirme contraseña:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Restablecimiento de contraseña fallido"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -778,14 +795,14 @@ msgstr ""
 "haberse utilizado previamente. Por favor, solicite un nuevo restablecimiento "
 "de contraseña."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Restablecimiento de contraseña exitoso"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "Le hemos enviado un correo electrónico con instrucciones para cambiar su "
@@ -795,11 +812,11 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Ha recibido este correo porque ha solicitado reiniciar la contraseña de la "
-"cuenta de su usuario en %(site_name)s."
+"Recibes este correo electrónico porqué has solicitado restablecer tu clave "
+"para tu cuenta en %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -818,36 +835,37 @@ msgstr "¡Gracias por usar nuestro sitio!"
 msgid "The %(site_name)s team"
 msgstr "El equipo de %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"¿Ha olvidado su contraseña? Introduzca su dirección de correo electrónico, y "
-"le enviaremos instrucciones para cambiarla por una nueva."
+"¿Has olvidado tu clave? Introduce tu dirección de correo a continuación y te "
+"enviaremos por correo electrónico las instrucciones para establecer una "
+"nueva."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Dirección de correo electrónico:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Correo electrónico:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Restablecer mi contraseña"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Todas las fechas"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Nada)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Escoja %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Escoja %s a modificar"
diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo
index 3c31c07dcc..b2e9327aa0 100644
Binary files a/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po
index b10bcc4663..32ba138722 100644
--- a/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po
@@ -10,14 +10,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-14 19:11+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo
index 9d96821af2..86545c10e6 100644
Binary files a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po
index 273b1b6993..2cb53ac3a4 100644
--- a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po
@@ -1,34 +1,36 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Ramiro Morales <cramm0@gmail.com>, 2011, 2012.
+# Leonardo José Guzmán <ljguzman@gmail.com>, 2013.
+# Ramiro Morales <cramm0@gmail.com>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-21 14:25+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-03-21 02:50+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Se eliminaron con éxito %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "No se puede eliminar %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
@@ -37,165 +39,140 @@ msgstr "¿Está seguro?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Eliminar %(verbose_name_plural)s seleccionados/as"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Todos/as"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Sí"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "No"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Cualquier fecha"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hoy"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Últimos 7 días"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Este mes"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Este año"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Por favor introduza el nombre de usuario y contraseña correctos de un "
-"miembro del grupo staff. Note que ambos campos son sensibles a diferencias "
-"en mayúsculas/minúsculas."
+"Por favor introduza %(username)s y contraseña correctos de una cuenta de "
+"staff. Note que puede que ambos campos sean estrictos en relación a "
+"diferencias entre mayúsculas y minúsculas."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Por favor, identifíquese de nuevo porque su sesión ha caducado."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Su dirección de correo electrónico no es su nombre de usuario. Intente "
-"nuevamente usando '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Acción:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "hora de la acción"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id de objeto"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr de objeto"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "marca de acción"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "mensaje de cambio"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entrada de registro"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entradas de registro"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Se agrega \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Se modifica \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Se elimina \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objeto LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ninguno"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Modifica %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "y"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Se agregó %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Se modificaron %(list)s en %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Se eliminó %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "No ha modificado ningún campo."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Se agregó con éxito %(name)s \"%(obj)s\"."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Puede modificarlo/a nuevamente abajo."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede agregar otro/a %s abajo."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modificó con éxito %(name)s \"%(obj)s\"."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -203,7 +180,43 @@ msgstr ""
 "Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente "
 "abajo."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"Se agregó con éxito %(name)s \"%(obj)s\". Puede agregar otro %(name)s  abajo."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Se agregó con éxito %(name)s \"%(obj)s\"."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"Se modificó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente "
+"abajo."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"Se modificó con éxito %(name)s \"%(obj)s\". Puede agregar otro %(name)s "
+"abajo."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Se modificó con éxito %(name)s \"%(obj)s\"."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -211,89 +224,97 @@ msgstr ""
 "Deben existir items seleccionados para poder realizar acciones sobre los "
 "mismos. No se modificó ningún item."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "No se ha seleccionado ninguna acción."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Agregar %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "No existe un objeto %(name)s con una clave primaria %(key)r."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Error de base de datos"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "Se ha modificado con éxito %(count)s %(name)s."
 msgstr[1] "Se han modificado con éxito %(count)s %(name)s."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s seleccionados/as"
 msgstr[1] "Todos/as (%(total_count)s en total) han sido seleccionados/as"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 de %(cnt)s seleccionados/as"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Historia de modificaciones: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Identificarse"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administración de sitio"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administración de %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Fecha:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Hora:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Buscar"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Agregar otro/a"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Actualmente:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Cambiar:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Página no encontrada"
@@ -302,43 +323,43 @@ msgstr "Página no encontrada"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Lo sentimos, pero no se encuentra la página solicitada."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Inicio"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Error del servidor"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Error del servidor (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Error de servidor <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ha ocurrido un error. Se ha informado a los administradores del sitio "
-"mediante correo electrónico y debería ser solucionado en breve. Gracias por "
-"su paciencia."
+"Ha ocurrido un error. Se ha reportado el mismo a los administradores del "
+"sitio vía email y debería ser solucionado en breve. Le damos gracias por su "
+"paciencia."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -361,7 +382,7 @@ msgstr "Seleccionar lo(s)/a(s) %(total_count)s de %(module_name)s"
 msgid "Clear selection"
 msgstr "Borrar selección"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -371,22 +392,22 @@ msgid "Welcome,"
 msgstr "Bienvenido/a,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Cerrar sesión"
 
@@ -398,35 +419,35 @@ msgstr "Administración de sitio Django"
 msgid "Django administration"
 msgstr "Administración de Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Agregar"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historia"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Ver en el sitio"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor, corrija el siguiente error."
 msgstr[1] "Por favor, corrija los siguientes errores."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Agregar %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrar"
 
@@ -443,12 +464,12 @@ msgstr "Prioridad de ordenamiento: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "(des)activar ordenamiento"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -459,7 +480,7 @@ msgstr ""
 "de objetos relacionados, pero su cuenta no tiene permiso para eliminar los "
 "siguientes tipos de objetos:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -468,7 +489,7 @@ msgstr ""
 "El eliminar los %(object_name)s '%(escaped_object)s' requeriría eliminar los "
 "siguientes objetos relacionados protegidos:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -477,16 +498,16 @@ msgstr ""
 "¿Está seguro de que quiere eliminar los %(object_name)s \"%(escaped_object)s"
 "\"? Se eliminarán los siguientes objetos relacionados:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Sí, estoy seguro"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Eliminar múltiples objetos"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -497,7 +518,7 @@ msgstr ""
 "relacionados a los mismos, pero su cuenta de usuario no tiene los permisos "
 "necesarios para eliminar los siguientes tipos de objetos:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -506,7 +527,7 @@ msgstr ""
 "El eliminar los %(objects_name)s seleccionados requeriría eliminar los "
 "siguientes objetos relacionados protegidos:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -520,36 +541,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Por %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelos disponibles en la aplicación %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modelos en la aplicación %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modificar"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "No tiene permiso para editar nada."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Acciones recientes"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mis acciones"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ninguna disponible"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Contenido desconocido"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -559,31 +580,27 @@ msgstr ""
 "tablas de la misma hayan sido creadas, y asegúrese de que el usuario "
 "apropiado tenga permisos de lectura en la base de datos."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Usuario:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "¿Olvidó su contraseña o nombre de usuario?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Fecha/hora"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Usuario"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Acción"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -639,67 +656,67 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Introduzca un nombre de usuario y una contraseña."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Introduzca una nueva contraseña para el usuario <strong>%(username)s</"
 "strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Para verificación, introduzca la misma contraseña que introdujo arriba."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Eliminar"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Agregar otro/a %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Eliminar"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Eliminar?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Identificarse de nuevo"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Cambio de contraseña exitoso"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Su contraseña ha sido cambiada."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -708,46 +725,46 @@ msgstr ""
 "antigua y luego introduzca la nueva contraseña dos veces para verificar que "
 "la ha escrito correctamente."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Contraseña antigua"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Cambiar mi contraseña"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Recuperar contraseña"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Reinicialización de contraseña completada"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
-msgstr "Se le ha enviado su contraseña.  Ahora puede continuar e ingresar."
+msgstr "Su contraseña ha sido cambiada.  Ahora puede continuar e ingresar."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmación de reincialización de contraseña"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Introduzca la nueva contraseña"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -755,19 +772,19 @@ msgstr ""
 "Por favor introduzca su nueva contraseña dos veces de manera que podamos "
 "verificar que la ha escrito correctamente."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Contraseña nueva:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirme contraseña:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Reinicialización de contraseña fallida"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -776,28 +793,28 @@ msgstr ""
 "a que ya ha sido usado. Por favor solicite una nueva reinicialización de "
 "contraseña."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Recuperación de contraseña exitosa"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Le hemos enviado instrucciones sobre como establecer su contraseña a la "
-"dirección de correo electrónico que ha suministrado. Debería recibir las "
-"mismas en breve."
+"Le hemos enviado vía email instrucciones para establecer una nueva "
+"contraseña a la dirección de email que Ud. había especificado. Debería "
+"recibir dicho email pronto."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Ha recibido este email porque ha solicitado la generación de una nueva "
-"contraseña de su cuenta de usuario en %(site_name)s."
+"Le enviamos este email porque Ud. ha solicitado que se reestablezca la "
+"contraseña para su cuenta de usuario en %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -818,36 +835,36 @@ msgstr "¡Gracias por usar nuestro sitio!"
 msgid "The %(site_name)s team"
 msgstr "El equipo de %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"¿Ha olvidado su contraseña?. Introduzca su dirección de correo electrónico "
-"mas abajo y le enviaremos instrucciones para establecer una nueva."
+"¿Olvidó su contraseña? Introduzca su dirección de email abajo y le "
+"enviaremos instrucciones para establecer una nueva."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Dirección de correo electrónico:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Dirección de email:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Recuperar mi contraseña"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Todas las fechas"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ninguno/a)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Seleccione %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Seleccione %s a modificar"
diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo
index bdd4350e04..16d5698065 100644
Binary files a/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po
index 8be1bc35c6..f97b67d638 100644
--- a/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po
@@ -1,22 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Ramiro Morales <cramm0@gmail.com>, 2011, 2012.
+# Ramiro Morales <cramm0@gmail.com>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-14 20:02+0000\n"
+"PO-Revision-Date: 2013-03-22 20:00+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -29,9 +30,9 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
-"Esta es la lista de %s disponibles. Puede elegir algunos seleccionándolos en "
-"el cuadro de abajo y luego haciendo click en la flecha \"Elegir\" ubicada "
-"entre las dos listas."
+"Esta es la lista de %s disponibles. Puede elegir algunos/as seleccionándolos/"
+"as en el cuadro de abajo y luego haciendo click en la flecha \"Seleccionar\" "
+"ubicada entre las dos listas."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
@@ -49,11 +50,11 @@ msgstr "Seleccionar todos/as"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr "Haga click para seleccionar todos los %s."
+msgstr "Haga click para seleccionar todos/as los/as %s."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr "Seleccione"
+msgstr "Seleccionar"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -62,7 +63,7 @@ msgstr "Eliminar"
 #: static/admin/js/SelectFilter2.js:75
 #, c-format
 msgid "Chosen %s"
-msgstr "%s seleccionados"
+msgstr "%s seleccionados/as"
 
 #: static/admin/js/SelectFilter2.js:76
 #, c-format
@@ -70,9 +71,9 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
-"Esta es la lista de %s elegidos. Puede eliminar algunos de ellos "
-"selecciónando los mismos en la lista de abajo y luego haciendo click en la "
-"flecha \"Eliminar\" ubicada entre las dos listas."
+"Esta es la lista de %s seleccionados. Puede deseleccionar algunos de ellos "
+"activándolos en la lista de abajo y luego haciendo click en la flecha "
+"\"Eliminar\" ubicada entre las dos listas."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
@@ -81,7 +82,7 @@ msgstr "Eliminar todos/as"
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr "Haga clic para deselecionar todos los %s."
+msgstr "Haga clic para deselecionar todos/as los/as %s."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo
index 760f47e3f5..018ffbe511 100644
Binary files a/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po
index 2a0972deb2..a60bc2ea18 100644
--- a/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Se eliminaron con éxito %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "No se puede eliminar %(name)s "
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
@@ -36,164 +36,137 @@ msgstr "¿Está seguro?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Eliminar %(verbose_name_plural)s seleccionados/as"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Todos/as"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Sí"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "No"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Cualquier fecha"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hoy"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Últimos 7 días"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Este mes"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Este año"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Por favor introduce un usuario y clave adecuado para una cuenta de personal. "
-"Fíjate que ambos campos son sensibles a mayúsculas."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Por favor, identifíquese de nuevo porque su sesión ha expirado."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Su dirección de correo electrónico no es su nombre de usuario. Intente "
-"nuevamente usando '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Acción:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "hora de la acción"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id de objeto"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr de objeto"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "marca de acción"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "mensaje de cambio"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entrada de registro"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entradas de registro"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Añadidos \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Modificados \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Eliminados \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objeto de registro de Log"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ninguno"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Modifica %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "y"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Se agregó %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Se modificaron %(list)s en %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Se eliminó %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "No ha modificado ningún campo."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Se agregó con éxito %(name)s \"%(obj)s\"."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Puede modificarlo/a nuevamente abajo."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede agregar otro/a %s abajo."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modificó con éxito %(name)s \"%(obj)s\"."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,7 +174,38 @@ msgstr ""
 "Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente "
 "abajo."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Se agregó con éxito %(name)s \"%(obj)s\"."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Se modificó con éxito %(name)s \"%(obj)s\"."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,89 +213,97 @@ msgstr ""
 "Deben existir items seleccionados para poder realizar acciones sobre los "
 "mismos. No se modificó ningún item."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "No se ha seleccionado ninguna acción."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Agregar %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "No existe un objeto %(name)s con una clave primaria %(key)r."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Error en la base de datos"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "Se ha modificado con éxito %(count)s %(name)s."
 msgstr[1] "Se han modificado con éxito %(count)s %(name)s."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s seleccionados/as"
 msgstr[1] "Todos/as (%(total_count)s en total) han sido seleccionados/as"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 de %(cnt)s seleccionados/as"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Historia de modificaciones: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Identificarse"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administración del sitio"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administración de %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Fecha:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Hora:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Buscar"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Agregar otro/a"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Página no encontrada"
@@ -300,43 +312,40 @@ msgstr "Página no encontrada"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Lo sentimos, pero no se encuentra la página solicitada."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Inicio"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Error del servidor"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Error del servidor (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Error de servidor <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ha ocurrido un error. Se ha informado a los administradores del sitio "
-"mediante correo electrónico y debería ser solucionado en breve. Gracias por "
-"su paciencia."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -359,7 +368,7 @@ msgstr "Seleccionar lo(s)/a(s) %(total_count)s de %(module_name)s"
 msgid "Clear selection"
 msgstr "Borrar selección"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -369,22 +378,22 @@ msgid "Welcome,"
 msgstr "Bienvenido,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Cerrar sesión"
 
@@ -396,35 +405,35 @@ msgstr "Sitio de administración de Django"
 msgid "Django administration"
 msgstr "Administración de Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Agregar"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historia"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Ver en el sitio"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor, corrija el siguiente error."
 msgstr[1] "Por favor, corrija los siguientes errores."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Agregar %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrar"
 
@@ -441,12 +450,12 @@ msgstr "Prioridad de la clasificación: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Activar la clasificación"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -457,7 +466,7 @@ msgstr ""
 "de objetos relacionados, pero su cuenta no tiene permiso para eliminar los "
 "siguientes tipos de objetos:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -466,7 +475,7 @@ msgstr ""
 "Para eliminar %(object_name)s '%(escaped_object)s' requiere eliminar los "
 "siguientes objetos relacionados protegidos:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -475,16 +484,16 @@ msgstr ""
 "¿Está seguro de que quiere eliminar los %(object_name)s \"%(escaped_object)s"
 "\"? Se eliminarán los siguientes objetos relacionados:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Sí, estoy seguro"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Eliminar múltiples objetos"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -495,7 +504,7 @@ msgstr ""
 "pero tu cuenta no tiene permisos para eliminar los siguientes tipos de "
 "objetos:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -504,7 +513,7 @@ msgstr ""
 "Eliminar el seleccionado %(objects_name)s requiere eliminar los siguientes "
 "objetos relacionados protegidas:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -518,36 +527,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Por %(filter_title)s"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelos disponibles en la aplicación %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modificar"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "No tiene permiso para editar nada"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Acciones recientes"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mis acciones"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ninguna disponible"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Contenido desconocido"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -557,31 +566,27 @@ msgstr ""
 "tablas de la misma hayan sido creadas, y asegúrese de que el usuario "
 "apropiado tenga permisos de lectura en la base de datos."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Usuario:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "¿Ha olvidado su contraseña o nombre de usuario?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Fecha/hora"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Usuario"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Acción"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -637,66 +642,66 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Introduzca un nombre de usuario y una contraseña."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Introduzca una nueva contraseña para el usuario <strong>%(username)s</"
 "strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Para verificar, introduzca la misma contraseña que introdujo arriba."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Eliminar"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Agregar otro/a %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Eliminar"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Eliminar?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Identificarse de nuevo"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Cambio de contraseña exitoso"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Su contraseña ha sido cambiada."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -705,46 +710,46 @@ msgstr ""
 "antigua y luego introduzca la nueva contraseña dos veces para verificar que "
 "la ha escrito correctamente."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Contraseña anterior"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Cambiar mi contraseña"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Recuperar contraseña"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Reinicialización de contraseña completada"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Se le ha enviado su contraseña. Ahora puede continuar e ingresar."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmación de reincialización de contraseña"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Introduzca la nueva contraseña"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -752,19 +757,19 @@ msgstr ""
 "Por favor introduzca su nueva contraseña dos veces de manera que podamos "
 "verificar que la ha escrito correctamente."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nueva contraseña:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirme contraseña:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Reinicialización de contraseña no exitosa"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -773,28 +778,23 @@ msgstr ""
 "a que ya ha sido usado. Por favor solicite una nueva reinicialización de "
 "contraseña."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Recuperación de contraseña exitosa"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Le hemos enviado instrucciones sobre como establecer su contraseña a la "
-"dirección de correo electrónico que ha ingresado. Debería recibir las mismas "
-"en breve."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Usted está recibiendo este e-mail porque usted solicitó un restablecimiento "
-"de la contraseña de su cuenta de usuario en %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -815,36 +815,34 @@ msgstr "¡Gracias por usar nuestro sitio!"
 msgid "The %(site_name)s team"
 msgstr "El equipo de %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"¿Ha olvidado su contraseña?. Introduzca su dirección de correo electrónico "
-"mas abajo y le enviaremos instrucciones para establecer una nueva."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Dirección de correo electrónico"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Recuperar mi contraseña"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Todas las fechas"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Seleccione %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Seleccione %s a modificar"
diff --git a/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.mo
index e538ba0aa1..45c8805d81 100644
Binary files a/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.po
index aa306c4413..7f90bb68b1 100644
--- a/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.po
@@ -9,13 +9,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/django.mo b/django/contrib/admin/locale/et/LC_MESSAGES/django.mo
index 6ddac3f22d..6e839ea67e 100644
Binary files a/django/contrib/admin/locale/et/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/django.po b/django/contrib/admin/locale/et/LC_MESSAGES/django.po
index ce6e1fcffa..6a6549e54e 100644
--- a/django/contrib/admin/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/et/LC_MESSAGES/django.po
@@ -7,28 +7,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: eallik <eallik@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s kustutamine õnnestus"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Ei saa kustutada %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Kas olete kindel?"
 
@@ -37,166 +37,174 @@ msgstr "Kas olete kindel?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Kustuta valitud %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Kõik"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Jah"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ei"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Suvaline kuupäev"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Täna"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Viimased 7 päeva"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Käesolev kuu"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Käesolev aasta"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Teie sessioon on aegunud. Palun logige uuesti sisse."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Toiming:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "toimingu aeg"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objekti id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objekti esitus"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "toimingu lipp"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "muudatuse tekst"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "logisissekanne"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "logisissekanded"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Puudub"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Muutsin %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ja"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Lisatud %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Muudetud %(list)s objektil %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Kustutatud %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Ühtegi välja ei muudetud."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" lisamine õnnestus."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Võite jätkata redigeerimist."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Võite jätkata uue %s lisamisega."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" muutmine õnnestus."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" lisamine õnnestus. Te võite seda muuta."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" lisamine õnnestus."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" muutmine õnnestus."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -204,89 +212,97 @@ msgstr ""
 "Palun märgistage elemendid, millega soovite toiminguid sooritada. Ühtegi "
 "elementi ei muudetud."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Toiming valimata."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Lisa %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s objekt primaarvõtmega %(key)r ei eksisteeri."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Muuda %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Andmebaasi viga"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s muutmine õnnestus."
 msgstr[1] "%(count)s %(name)s muutmine õnnestus."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s valitud"
 msgstr[1] "Kõik %(total_count)s valitud"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "valitud 0/%(cnt)s"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" kustutati."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Muudatuste ajalugu: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Sisene"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Saidi administreerimine"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s - administreerimine"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Kuupäev:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Aeg:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Otsi"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Lisa Uus"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Lehte ei leitud"
@@ -295,43 +311,40 @@ msgstr "Lehte ei leitud"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Vabandame, kuid soovitud lehte ei leitud."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Kodu"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Serveri viga"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Serveri viga (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Serveri Viga <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"On tekkinud viga. Vastavasisuline teavitus on saadetud süsteemi haldajale "
-"ning vea parandamisega tegeletakse esimesel võimalusel. Täname mõistva "
-"suhtumise eest!"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -354,7 +367,7 @@ msgstr "Märgista kõik %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Tühjenda valik"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -364,22 +377,22 @@ msgid "Welcome,"
 msgstr "Tere tulemast,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Muuda salasõna"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Logi välja"
 
@@ -391,35 +404,35 @@ msgstr "Django administreerimisliides"
 msgid "Django administration"
 msgstr "Django administreerimisliides"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Lisa"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Ajalugu"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Näita lehel"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Palun parandage allolev viga"
 msgstr[1] "Palun parandage allolevad vead"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Lisa %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtreeri"
 
@@ -436,12 +449,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -452,7 +465,7 @@ msgstr ""
 "kustutada lisaks ka kõik seotud objecktid, aga teil puudub õigus järgnevat "
 "tüüpi objektide kustutamiseks:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -461,7 +474,7 @@ msgstr ""
 "Et kustutada %(object_name)s '%(escaped_object)s', on vaja kustutada "
 "järgmised kaitstud seotud objektid:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -471,16 +484,16 @@ msgstr ""
 "\"%(escaped_object)s\"? Kõik järgnevad seotud objektid kustutatakse koos "
 "sellega:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Jah, olen kindel"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Kustuta mitu objekti"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -490,7 +503,7 @@ msgstr ""
 "Kui kustutada valitud %(objects_name)s, peaks kustutama ka seotud objektid, "
 "aga sinu kasutajakontol pole õigusi järgmiste objektitüüpide kustutamiseks:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -499,7 +512,7 @@ msgstr ""
 "Et kustutada valitud %(objects_name)s, on vaja kustutada ka järgmised "
 "kaitstud seotud objektid:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -513,36 +526,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Rakenduses %(name)s leitud mudelid"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Muuda"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Teil ei ole õigust midagi muuta."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Hiljutised Toimingud"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Minu Toimingud"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ei leitud ühtegi"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Tundmatu sisu"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -552,31 +565,27 @@ msgstr ""
 "andmebaasitabelid on loodud  ning et andmebaas on vastava kasutaja poolt "
 "loetav."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Kasutajatunnus:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Salasõna:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Kuupäev/kellaaeg"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Kasutaja"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Toiming"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -632,65 +641,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Sisestage kasutajanimi ja salasõna."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Sisestage uus salasõna kasutajale <strong>%(username)s</strong>"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Salasõna"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Salasõna (uuesti)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Sisestage sama salasõna uuesti veendumaks, et sisestamisel ei tekkinud vigu"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Eemalda"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Lisa veel üks %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Eemalda"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Kustutan?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Tänan, et veetsite aega meie lehel."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Logi uuesti sisse"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Salasõna muutmine"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Salasõna muutmine õnnestus"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Teie salasõna on vahetatud."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -699,46 +708,46 @@ msgstr ""
 "uus salasõna.Veendumaks, et uue salasõna sisestamisel ei tekkinud vigu, "
 "palun sisestage see kaks korda."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Vana salasõna"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Uus salasõna"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Muuda salasõna"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Uue parooli loomine"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Uue salasõna loomine valmis"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Teie salasõna on määratud. Võite nüüd sisse logida."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Uue salasõna loomise kinnitamine"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Sisestage uus salasõna"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -746,19 +755,19 @@ msgstr ""
 "Palun sisestage uus salasõna kaks korda, et saaksime veenduda, et "
 "sisestamisel ei tekkinud vigu."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Uus salasõna:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Kinnita salasõna:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Uue salasõna loomine ebaõnnestus"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -766,27 +775,23 @@ msgstr ""
 "Uue salasõna loomise link ei olnud korrektne. Võimalik, et seda on varem "
 "kasutatud. Esitage uue salasõna taotlus uuesti."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Uue parooli loomine õnnestus"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Teie poolt sisestatud e-posti aadressile on saadetud juhised uue salasõna "
-"määramiseks. Kiri peaks kohale jõudma varsti."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Oled selle kirja saanud, sest soovisite salasõna algseadistust oma "
-"kasutajakontole saidil %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -805,36 +810,34 @@ msgstr "Täname meie lehte külastamast!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s meeskond"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Unustasid parool? Sisesta oma e-posti aadress ning me saadame sulle juhised "
-"uue parooli määramiseks."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-posti aadress:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Reseti parool"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Kõik kuupäevad"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Puudub)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Vali %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Vali %s mida muuta"
diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo
index e0c1cabb93..d61cc268af 100644
Binary files a/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po
index 02216d7f98..986b684a27 100644
--- a/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: eallik <eallik@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo b/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo
index 52d53270ed..fecd54ade4 100644
Binary files a/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/django.po b/django/contrib/admin/locale/eu/LC_MESSAGES/django.po
index 09c83488aa..d583101952 100644
--- a/django/contrib/admin/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/eu/LC_MESSAGES/django.po
@@ -1,206 +1,221 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Aitzol Naberan <anaberan@codesyntax.com>, 2011, 2012.
+# Translators:
+# Aitzol Naberan <anaberan@codesyntax.com>, 2011-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#  <julenx@gmail.com>, 2013.
+#   <julenx@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 14:08+0000\n"
-"Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-16 11:21+0000\n"
+"Last-Translator: julen <julenx@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s elementu ezabatu dira."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
-msgstr "Ezin ezabatu %(name)s"
+msgstr "Ezin da %(name)s ezabatu"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
-msgstr "Ziur al zaude?"
+msgstr "Ziur zaude?"
 
 #: actions.py:83
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Ezabatu aukeratutako %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Dena"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Bai"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ez"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Edozein data"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Gaur"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Aurreko 7 egunak"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Hilabete hau"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Urte hau"
 
 #: forms.py:9
-msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
-msgstr ""
-"Mesedez sartu kudeaketa gunerako erabiltzaile izen eta pasahitz zuzena. "
-"Kontuan izan biek maiuskula/minuskulak desberdintzen dutela."
-
-#: forms.py:18
-msgid "Please log in again, because your session has expired."
-msgstr ""
-"Zure sesioa iraungitu da. Mesedez sartu berriro.\n"
-"."
-
-#: forms.py:37
 #, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Zure e-mail helbidea ez da zure erabiltzaile izena. Saiatu '%s' rekin."
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+"Idatzi kudeaketa gunerako %(username)s eta pasahitz zuzena. Kontuan izan "
+"biek maiuskula/minuskulak desberdintzen dituztela."
 
-#: helpers.py:20
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr "Hasi saioa berriro, zure sesioa iraungitu egin da."
+
+#: helpers.py:23
 msgid "Action:"
 msgstr "Ekintza:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "Ekintza hordua"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "Objetuaren id-a"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "Objeturaren aurkezpena"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "Ekintza botoia"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "Mezua aldatu"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "Log sarrera"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "log sarrerak"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr "%(object)s sortuta"
+msgstr "\"%(object)s\" gehituta."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr "%(object)s aldatuta - %(changes)s"
+msgstr "\"%(object)s\" aldatuta - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr "%(object)s ezabatuta."
+msgstr "\"%(object)s\" ezabatuta."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry objektua"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
-msgstr "None"
+msgstr "Bat ere ez"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s aldatuta."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "eta"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" gehituta."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Changed %(list)s for %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" ezabatuta."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Ez da eremurik aldatu."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" ondo gehitu da."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Berriro alkatu zenezake beherago."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Beste %s gehitu dezakezu jarraian."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ondo aldatu da."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" ondo gehitu da. Jarraian aldatu dezakezu berriro."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" ondo gehitu da. Beste %(name)s bat gehitu dezakezu "
+"jarraian."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" ondo gehitu da."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" ondo aldatu da. Aldaketa gehiago egin ditzazkezu "
+"jarraian."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" ondo aldatu da. Beste %(name)s bat gehitu dezakezu "
+"jarraian."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ondo aldatu da."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,89 +223,97 @@ msgstr ""
 "Elementuak aukeratu behar dira beraien gain ekintzak burutzeko. Ez da "
 "elementurik aldatu."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Ez dago ekintzarik aukeratuta."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
-msgstr "%s gehitu"
+msgstr "Gehitu %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
-msgstr "Ez da existitzen %(key)r gakodun %(name)s objecturik."
+msgstr "Ez dago %(key)r gakodun %(name)s objekturik."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
-msgstr "%s aldatu"
+msgstr "Aldatu %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
-msgstr "Data base errorea"
+msgstr "Datu-basearen errorea"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(name)s %(count)s  ondo aldatu da."
 msgstr[1] "%(count)s %(name)s ondo aldatu dira."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "Guztira %(total_count)s aukeratuta"
 msgstr[1] "Guztira %(total_count)s aukeratuta"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "Guztira %(cnt)s, 0 aukeratuta"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ondo ezabatu da."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
-msgstr "Aldaketa zerrenda: %s"
+msgstr "Aldaketen historia: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Sartu"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
-msgstr "Web gunearen kudeaketa"
+msgstr "Webgunearen kudeaketa"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s kudeaketa"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Data:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Ordua:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Lookup"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Beste bat gehitu"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Oraingoa:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Aldatu:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Ez da orririk aurkitu"
@@ -299,92 +322,92 @@ msgstr "Ez da orririk aurkitu"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Barkatu, eskatutako orria ezin daiteke aurkitu"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Hasiera"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
-msgstr "Zerbitzari errorea"
+msgstr "Zerbitzariaren errorea"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
-msgstr "Zerbitzari errorea (500)"
+msgstr "Zerbitzariaren errorea (500)"
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr "Zerbitzariaren errorea <em>(500)</em>"
 
 #: templates/admin/500.html:15
-msgid "Server Error <em>(500)</em>"
-msgstr "Zerbitzari Errorea <em>(500)</em>"
-
-#: templates/admin/500.html:16
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Arazo bat izan da. Web guneraren administradoreri abisu email bat bidali "
-"zaio eta laister konpondua egon beharko luke. Barkatu eragozpenak."
+"Errore bat gertatu da. Errorea guneko kudeatzaileari jakinarazi zaio email "
+"bidez eta laister egon beharko luke konponduta. Barkatu eragozpenak."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
-msgstr "Aukeratutako ekintza burutu"
+msgstr "Burutu hautatutako ekintza"
 
 #: templates/admin/actions.html:4
 msgid "Go"
-msgstr "Aurrera"
+msgstr "Joan"
 
 #: templates/admin/actions.html:11
 msgid "Click here to select the objects across all pages"
-msgstr "Egin klik hemen orri guztietako objectuak aukeratzeko"
+msgstr "Egin klik hemen orri guztietako objektuak aukeratzeko"
 
 #: templates/admin/actions.html:11
 #, python-format
 msgid "Select all %(total_count)s %(module_name)s"
-msgstr "Aukeratu %(total_count)s %(module_name)s"
+msgstr "Hautatu %(total_count)s %(module_name)s guztiak"
 
 #: templates/admin/actions.html:13
 msgid "Clear selection"
-msgstr "Garbitu aukeraketa"
+msgstr "Garbitu hautapena"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
 
 #: templates/admin/base.html:28
 msgid "Welcome,"
-msgstr "Ongi etorri."
+msgstr "Ongi etorri,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentazioa"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
-msgid "Change password"
-msgstr "Pasahitza aldatu"
-
 #: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr "Aldatu pasahitza"
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
-msgstr "Atera"
+msgstr "Irten"
 
 #: templates/admin/base_site.html:4
 msgid "Django site admin"
@@ -394,57 +417,57 @@ msgstr "Django kudeaketa gunea"
 msgid "Django administration"
 msgstr "Django kudeaketa"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Gehitu"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
-msgstr "Aurrekoak"
+msgstr "Historia"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
-msgstr "Webgunean ikusi"
+msgstr "Ikusi gunean"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] "Arren zuzendu akatsa"
-msgstr[1] "Arren zuzendu akatsak"
+msgstr[0] "Zuzendu azpiko errorea."
+msgstr[1] "Zuzendu azpiko erroreak."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Gehitu  %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
-msgstr "Filtroa"
+msgstr "Iragazkia"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr "Ezabatu ordenaziotik"
+msgstr "Kendu ordenaziotik"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr "Ordenazio lehentasuna: %(priority_number)s"
+msgstr "Ordenatzeko lehentasuna: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr "Trukatu ordenazioa"
+msgstr "Txandakatu ordenazioa"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -454,16 +477,16 @@ msgstr ""
 "%(object_name)s ezabatzean bere '%(escaped_object)s' ere ezabatzen dira, "
 "baina zure kontuak ez dauka baimenik objetu mota hauek ezabatzeko:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
-"%(object_name)s '%(escaped_object)s' ezabatzeak, lotutako babestutako "
-"objektu hauek ezabatzea eskatzen du:"
+"%(object_name)s '%(escaped_object)s' ezabatzeak erlazionatutako objektu "
+"babestu hauek ezabatzea eskatzen du:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -472,122 +495,118 @@ msgstr ""
 "Ziur zaude %(object_name)s \"%(escaped_object)s\" ezabatu nahi dituzula? "
 "Erlazionaturik dauden hurrengo elementuak ere ezabatuko dira:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Bai, ziur nago"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Ezabatu hainbat objektu"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
 "objects, but your account doesn't have permission to delete the following "
 "types of objects:"
 msgstr ""
-"Aukeratutako %(objects_name)s ezabatzeak, erlazionatutako objektuak "
-"ezabatzea eskatzen du, baina zure kontuak ez dauzka nahiko baimen objektu "
-"mota hauek ezabatzeko: "
+"Hautatutako %(objects_name)s ezabatzeak erlazionatutako objektuak ezabatzea "
+"eskatzen du baina zure kontuak ez dauka baimen nahikorik objektu mota hauek "
+"ezabatzeko: "
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
-"Aukeratutako %(objects_name)s ezabatzeak, lotutako babestutako objektu hauek "
-"ezabatzea eskatzen du:"
+"Hautatutako %(objects_name)s ezabatzeak erlazionatutako objektu babestu "
+"hauek ezabatzea eskatzen du:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
 "following objects and their related items will be deleted:"
 msgstr ""
-"Ziur zaude aukeratutako %(objects_name)s ezabatu nahi duzula? Objektu guzti "
-"hauek eta eralzionatutako elementu guztiak ezabatuko dira:"
+"Ziur zaude hautatutako %(objects_name)s ezabatu nahi duzula? Objektu guzti "
+"hauek eta erlazionatutako elementu guztiak ezabatuko dira:"
 
 #: templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
-msgstr " %(filter_title)s gatik"
+msgstr "Irizpidea: %(filter_title)s"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s aplikazioan eskuragarri dauden modeloak."
+msgid "Models in the %(name)s application"
+msgstr "%(name)s aplikazioaren modeloak"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Aldatu"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
-msgstr "Ezer aldatzeko baimenik ez duzu."
+msgstr "Ez daukazu ezer aldatzeko baimenik."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Azken ekintzak"
 
-#: templates/admin/index.html:54
-msgid "My Actions"
-msgstr "Nere ekintzak"
-
 #: templates/admin/index.html:58
+msgid "My Actions"
+msgstr "Nire ekintzak"
+
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ez dago ezer"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Eduki ezezaguna"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
-"Zerbait gaizki dago zure data-basearekin. Ziurtatu ezazu datu-baseko taulak "
-"sortu direla eta erabiltzaile egokiak duela irakurketa baimena"
+"Zerbait gaizki dago zure datu-basearekin. Ziurtatu datu-baseko taulak sortu "
+"direla eta erabiltzaile egokiak irakurtzeko baimena duela."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Erabiltzaile izena:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr "Pasahitza edo erabiltzaile izena ahaztu duzu?"
+msgstr "Pasahitza edo erabiltzaile-izena ahaztu duzu?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Data/ordua"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Erabiltzailea"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Ekintza"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
 msgstr ""
-"Objetu honek ez dauka aldaketa zerrendarik. Ziur asko, kudeaketa gunetik "
+"Objektu honek ez dauka aldaketen historiarik. Ziurrenik kudeaketa gunetik "
 "kanpo gehituko zen."
 
 #: templates/admin/pagination.html:10
 msgid "Show all"
-msgstr "Dena erakutsi"
+msgstr "Erakutsi dena"
 
 #: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
 msgid "Save"
@@ -611,229 +630,228 @@ msgstr "%(full_result_count)s guztira"
 
 #: templates/admin/submit_line.html:5
 msgid "Save as new"
-msgstr "Berria bezala gorde"
+msgstr "Gorde berri gisa"
 
 #: templates/admin/submit_line.html:6
 msgid "Save and add another"
-msgstr "Gorde eta beste bat gehitu"
+msgstr "Gorde eta gehitu beste bat"
 
 #: templates/admin/submit_line.html:7
 msgid "Save and continue editing"
-msgstr "Gorde eta aldatzen jarraitu"
+msgstr "Gorde eta jarraitu editatzen"
 
 #: templates/admin/auth/user/add_form.html:6
 msgid ""
 "First, enter a username and password. Then, you'll be able to edit more user "
 "options."
 msgstr ""
-"Lehenengo erabiltzaile izena eta pasahitza idatzi. Gero erabiltzaile aukera "
-"gehiago aldatzeko aukera gehiago izango duzu"
+"Lehenik idatzi erabiltzaile-izena eta pasahitza. Gero erabiltzaile-aukera "
+"gehiago aldatu ahal izango dituzu."
 
 #: templates/admin/auth/user/add_form.html:8
 msgid "Enter a username and password."
-msgstr "Sartu erabiltzaile izen eta pasahitza."
+msgstr "Idatzi erabiltzaile-izen eta pasahitza."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
-"Pasahitz berria idatzi <strong>%(username)s</strong> erabiltzailearentzat."
+"Idatzi pasahitz berria <strong>%(username)s</strong> erabiltzailearentzat."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Pasahitza (berriro)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
-msgstr "Idatzi berriro pasahitza."
+msgstr "Idatzi goiko pasahitz bera, egiaztapenerako."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Kendu"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Gehitu beste %(verbose_name)s bat"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Ezabatu"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Ezabatu?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Mila esker gaur zure denbora web gunean erabiltzegatik."
+msgstr "Eskerrik asko webguneari zure probetxuzko denbora eskaintzeagatik."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
-msgstr "Sartu berriro"
+msgstr "Hasi saioa berriro"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
-msgstr "Pasahitza aldatu"
+msgstr "Aldatu pasahitza"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Pasahitza ondo aldatu da"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
-msgstr "Pasahitza aldatu da"
+msgstr "Zure pasahitza aldatu egin da."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 msgstr ""
 "Idatzi pasahitz zaharra segurtasun arrazoiengatik eta gero pasahitz berria "
-"bi aldiz, akatsik egiten ez duzula ziurtatu dezagun."
+"bi aldiz, akatsik egiten ez duzula ziurta dezagun."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Pasahitz zaharra"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
-msgstr "Nire pasahitza aldatu"
+msgstr "Aldatu nire pasahitza"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
-msgstr "Pasahitza berrezarri"
+msgstr "Berrezarri pasahitza"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
-msgstr "Pasahitza berresartzea burutu da"
+msgstr "Pasahitza berrezartzea burutu da"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Zure pasahitza ezarri da. Orain aurrera egin eta sartu zaitezke."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
-msgstr "Pasahitza berresartzeko konfirmazioa"
+msgstr "Pasahitza berrezartzeko berrespena"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
-msgstr "Sartu pasahitz berroa"
+msgstr "Idatzi pasahitz berria"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
-msgstr ""
-"Mesedez sartu pasahitz berria birritan ondo idatzita dagoela ziurta dezagun."
+msgstr "Idatzi pasahitz berria birritan ondo idatzita dagoela ziurta dezagun."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Pasahitz berria:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
-msgstr "Pasahitza baieztatu:"
+msgstr "Berretsi pasahitza:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Pasahitza ez da berrezarri"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
-"Pasahitza berresartzeko lotura ez da balekoa. Baliteke lotura aurretik "
-"erabilita egotea. Mesedez eskatu berriro pasahitz berrezarpena."
+"Pasahitza berrezartzeko loturak baliogabea dirudi. Baliteke lotura aurretik "
+"erabilita egotea. Eskatu berriro pasahitza berrezartzea."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Pasahitza ondo berrezarri da"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Emandako eposta helbidera bidali dizugu pasahitz berrezarketareko "
-"jarraibideak. Epe laburrean jaso beharko zenuke."
+"Emandako helbide elektronikora bidali dizkizugu pasahitza berrezartzeko "
+"jarraibideak. Epe laburrean jaso behar zenuke."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Email hau jaso duzu pasahitza berresartzeko eskatu duzulako\n"
-"%(site_name)s webgunean"
+"Mezu hau %(site_name)s webgunean pasahitza berrezartzea eskatu duzulako jaso "
+"duzu"
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
-msgstr "Mesedez, zoaz hurrengo orrira eta aukeratu pasahitz berria:"
+msgstr "Zoaz hurrengo orrira eta aukeratu pasahitz berria:"
 
 #: templates/registration/password_reset_email.html:8
 msgid "Your username, in case you've forgotten:"
-msgstr "Zure erabiltzaile izena (ahaztu badezu):"
+msgstr "Zure erabiltzaile-izena (ahaztu baduzu):"
 
 #: templates/registration/password_reset_email.html:10
 msgid "Thanks for using our site!"
-msgstr "Mila esker gure web gunea erabiltzeagatik!"
+msgstr "Mila esker gure webgunea erabiltzeagatik!"
 
 #: templates/registration/password_reset_email.html:12
 #, python-format
 msgid "The %(site_name)s team"
-msgstr "%(site_name)s web guneko taldea"
+msgstr "%(site_name)s webguneko taldea"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Pasahitza ahaztu duzu? Sartu zure eposta helbidea eta berri bat ezartzeko "
-"jarraibideak bidaliko dizkizugu."
+"Pasahitza ahaztu duzu? Idatzi zure helbide elektronikoa eta berri bat "
+"ezartzeko jarraibideak bidaliko dizkizugu."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-mail helbidea:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Helbide elektronikoa:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
-msgstr "Pasahitza berrezarri"
+msgstr "Berrezarri pasahitza"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Data guztiak"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
-msgstr "(None)"
-
-#: views/main.py:74
-#, python-format
-msgid "Select %s"
-msgstr "%s aukeratu"
+msgstr "(Bat ere ez)"
 
 #: views/main.py:76
 #, python-format
+msgid "Select %s"
+msgstr "Hautatu %s"
+
+#: views/main.py:78
+#, python-format
 msgid "Select %s to change"
-msgstr "Aldaketarako %s aukeratu"
+msgstr "Hautatu %s aldatzeko"
diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo
index b2d98f5d80..b7c044259b 100644
Binary files a/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po
index 234a567221..a019912d2d 100644
--- a/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po
@@ -1,22 +1,25 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Aitzol Naberan <anaberan@codesyntax.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#  <julenx@gmail.com>, 2013.
+#   <julenx@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 14:15+0000\n"
-"Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"PO-Revision-Date: 2013-03-12 13:40+0000\n"
+"Last-Translator: julen <julenx@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -29,14 +32,14 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
-"Hau da aukeran dauden %s zerrenda. Hauetako zenbait aukeratu ditzazkezu "
+"Hau da aukeran dauden %s zerrenda. Hauetako zenbait aukera ditzakezu "
 "azpiko \n"
-"kaxan klik egin eta kutxen artean dagoen \"aukeratu\" gezian klik eginez"
+"kaxan hautatu eta kutxen artean dagoen \"Aukeratu\" gezian klik eginez."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr "Idatzi kutxa honetan, aukeran %s objektuak iragazteko."
+msgstr "Idatzi kutxa honetan erabilgarri dauden %s objektuak iragazteko."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -49,7 +52,7 @@ msgstr "Denak aukeratu"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr "Klik egin %s guztiak batera aukeratzeko"
+msgstr "Egin klik %s guztiak batera aukeratzeko."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
@@ -57,7 +60,7 @@ msgstr "Aukeratu"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
-msgstr "Ezabatu"
+msgstr "Kendu"
 
 #: static/admin/js/SelectFilter2.js:75
 #, c-format
@@ -70,18 +73,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
-"Hau da aukeratutako %s zerrenda. Hauetazko zenbait ezabatu ditzazkezu azpiko "
-"kutxan\n"
-"klik egin eta kutxen artean dagoen \"Ezabatu\" gezian klik eginez"
+"Hau da aukeratutako %s zerrenda. Hauetako zenbait ezaba ditzakezu azpiko "
+"kutxan hautatu eta bi kutxen artean dagoen \"Ezabatu\" gezian klik eginez."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr "Ezabatu guztiak"
+msgstr "Kendu guztiak"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr "Klik egin aukeratuako %s guztiak ezabatzeko."
+msgstr "Egin klik aukeratutako %s guztiak kentzeko."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
@@ -103,8 +105,8 @@ msgid ""
 "individual fields yet. Please click OK to save. You'll need to re-run the "
 "action."
 msgstr ""
-"Ekintza bat aukeratu duzu, baina oraindik ez duzu eremuetako aldaketak "
-"gorde. Mesedez, sakatu OK gordetzeko. Ekintza berriro exekutatu beharko duzu."
+"Ekintza bat hautatu duzu, baina oraindik ez duzu eremuetako aldaketak gorde. "
+"Mesedez, sakatu OK gordetzeko. Ekintza berriro exekutatu beharko duzu."
 
 #: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
 msgid ""
@@ -112,7 +114,7 @@ msgid ""
 "fields. You're probably looking for the Go button rather than the Save "
 "button."
 msgstr ""
-"Ekintza bat aukeratu duzu, baina ez duzu inongo aldaketarik egin eremuetan. "
+"Ekintza bat hautatu duzu, baina ez duzu inongo aldaketarik egin eremuetan. "
 "Litekeena da, Gorde botoia beharrean Aurrera botoiaren bila aritzea."
 
 #: static/admin/js/calendar.js:26
diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo
index a4288a88d5..b7d27871c3 100644
Binary files a/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/django.po b/django/contrib/admin/locale/fa/LC_MESSAGES/django.po
index 4689628d8e..c78c74bf5a 100644
--- a/django/contrib/admin/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/fa/LC_MESSAGES/django.po
@@ -1,290 +1,318 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Nikneshan <ali@nikneshan.com>, 2011.
+# Ali Nikneshan <ali@nikneshan.com>, 2011-2012.
+# Alireza Savand <alireza.savand@gmail.com>, 2012-2013.
+# Arash Fazeli <a.fazeli@gmail.com>, 2012.
+# Arash Fazeli <arash_fazeli77@yahoo.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-11 08:27+0000\n"
+"Last-Translator: Alireza Savand <alireza.savand@gmail.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d عدد از %(items)s با موفقیت پاک شد"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
-msgstr ""
+msgstr "ناتوان در حذف %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "آیا مطمئن هستید؟"
 
 #: actions.py:83
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
-msgstr ""
+msgstr "حذف  %(verbose_name_plural)s های انتخاب شده"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "همه"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "بله"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "خیر"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "هر تاریخی"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "امروز"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "۷ روز اخیر"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "این ماه"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "امسال"
 
 #: forms.py:9
-msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
-msgstr ""
-
-#: forms.py:18
-msgid "Please log in again, because your session has expired."
-msgstr ""
-
-#: forms.py:37
 #, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"نشانی پست الکترونیکی شما نام کابریتان نیست. %s را به جای آن امتحان کنید."
+"لطفا %(username)s و گذرواژهٔ را برای حساب کارکنان وارد کنید.\n"
+"توجه داشته باشید که هر دو میتوانند به کوچکی و بزرگی حروف حساس باشند."
 
-#: helpers.py:20
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr "لطفا دوباره وارد شوید، جلسه شما منقضی شد."
+
+#: helpers.py:23
 msgid "Action:"
-msgstr ""
+msgstr "حرکت"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "زمان اتفاق"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "شناسهٔ شیء"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "صورت شیء"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "نشانه عمل"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "پیغام تغییر"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "مورد اتفاقات"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "موارد اتفاقات"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "\"%(object)s\" افروده شد."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "تغییر \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "\"%(object)s\" حدف شد."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "شئ LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "هیچ"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s تغییر یافته."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "و"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s «%(object)s» اضافه شد."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s %(name)s «%(object)s» تغییر یافت."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s «%(object)s» حذف شد."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "فیلدی تغییر نیافته است."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s «%(obj)s» با موفقیت اضافه شد."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "می‌توانید مجدداً آنرا در این پایین ویراش کنید."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "می‌توانید یک %s دیگر در این پایین اضافه کنید"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s·\"%(obj)s\" با موفقیت تغییر یافت."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s·\"%(obj)s\" با موفقیت اضافه شد. می‌توانید در این پایین ویرایشش کنید."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" با موفقیت اضافه شد. شما می‌توانید در ذیل یک %(name)s "
+"دیگر اضافه نمایید."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s «%(obj)s» با موفقیت اضافه شد."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" با موفقیت تغییر یافت. شما می‌توانید در ذیل مجدداُ آنرا "
+"ویرایش نمایید."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" با موفقیت تغییر یافت. شما می‌توانید در ذیل یک %(name)s "
+"دیگر اضافه نمایید."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s·\"%(obj)s\" با موفقیت تغییر یافت."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
+"آیتم ها باید به منظور انجام عملیات بر روی آنها انتخاب شود. هیچ آیتمی با "
+"تغییر نیافته است."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
-msgstr ""
+msgstr "حرکتی انتخاب نشده"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "اضافه کردن %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
-msgstr ""
+msgstr "ایتم%(name)s با کلید اصلی %(key)r وجود ندارد."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "تغییر %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "خطا در بانک اطلاعاتی"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
-msgstr[0] ""
+msgstr[0] "%(count)s %(name)s با موفقیت تغییر کرد."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
-msgstr[0] ""
+msgstr[0] "همه موارد %(total_count)s انتخاب شده"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
-msgstr ""
+msgstr "0 از %(cnt)s انتخاب شده‌اند"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s·\"%(obj)s\" با موفقیت حذف شد."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "تاریخچهٔ تغییر: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "ورود"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "مدیریت وبگاه"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "مدیریت %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "تاریخ:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "زمان:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "جستجو"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "اضافه کردن یکی دیگر"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "در حال حاضر:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "تغییر یافته:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "صفحه یافت نشد"
@@ -293,46 +321,46 @@ msgstr "صفحه یافت نشد"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "متأسفیم، صفحه مورد تقاضا یافت نشد."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "آغازه"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "خطای کارگزار"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "خطای کارگزار (۵۰۰)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "خطای کارگزار <em>(۵۰۰)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"خطایی وجود دارد. این خطا توسط پست الکترونیکی به مدیران وبگاه گزارش داده شده "
-"است و در اولین فرصت اصلاح خواهد شد. از بردباری شما متشکریم."
+"مشکلی پیش آمده. این مشکل از طریق ایمیل به مدیران سایت اطلاع داده شد و به "
+"زودی اصلاح میگردد. از صبر شما ممنونیم"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
-msgstr ""
+msgstr "اجرای حرکت انتخاب شده"
 
 #: templates/admin/actions.html:4
 msgid "Go"
@@ -340,18 +368,18 @@ msgstr "برو"
 
 #: templates/admin/actions.html:11
 msgid "Click here to select the objects across all pages"
-msgstr ""
+msgstr "برای انتخاب موجودیت‌ها در تمام صفحات اینجا را کلیک کنید"
 
 #: templates/admin/actions.html:11
 #, python-format
 msgid "Select all %(total_count)s %(module_name)s"
-msgstr ""
+msgstr "انتخاب تمامی %(total_count)s %(module_name)s"
 
 #: templates/admin/actions.html:13
 msgid "Clear selection"
-msgstr ""
+msgstr "لغو انتخاب‌ها"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -361,22 +389,22 @@ msgid "Welcome,"
 msgstr "خوش آمدید،"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "مستندات"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "تغییر گذرواژه"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "خروج"
 
@@ -388,56 +416,56 @@ msgstr "وب‌گاه مدیریت Django"
 msgid "Django administration"
 msgstr "مدیریت Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "اضافه کردن"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "تاریخچه"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "مشاهده در وبگاه"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "لطفاً خطای زیر را حل کنید."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "اضافه‌کردن %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "فیلتر"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "حذف از مرتب سازی"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "اولویت مرتب‌سازی: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "تعویض مرتب سازی"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -447,14 +475,16 @@ msgstr ""
 "حذف %(object_name)s·'%(escaped_object)s' می تواند باعث حذف اشیاء مرتبط شود. "
 "اما حساب شما دسترسی لازم برای حذف اشیای از انواع زیر را ندارد:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
+"حذف %(object_name)s '%(escaped_object)s' نیاز به حذف موجودیت‌های مرتبط محافظت "
+"شده ذیل دارد:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -463,72 +493,78 @@ msgstr ""
 "آیا مطمئنید که می‌خواهید %(object_name)s·\"%(escaped_object)s\" را حذف کنید؟ "
 "کلیهٔ اشیای مرتبط زیر حذف خواهند شد:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "بله، مطمئن هستم."
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
-msgstr ""
+msgstr "حذف اشیاء متعدد"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
 "objects, but your account doesn't have permission to delete the following "
 "types of objects:"
 msgstr ""
+"حذف %(objects_name)s انتخاب شده منجر به حذف موجودیت‌های مرتبط خواهد شد، ولی "
+"شناسه شما اجازه حذف اینگونه از موجودیت‌های ذیل را ندارد:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
+"حذف %(objects_name)s انتخاب شده نیاز به حذف موجودیت‌های مرتبط محافظت شده ذیل "
+"دارد:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
 "following objects and their related items will be deleted:"
 msgstr ""
+"آیا در خصوص حذف %(objects_name)s انتخاب شده اطمینان دارید؟ تمام موجودیت‌های "
+"ذیل به همراه موارد مرتبط با آنها حذف خواهند شد:"
 
 #: templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
 msgstr "براساس %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "مدل‌های موجود در برنامهٔ %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "مدلها در برنامه %(name)s "
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "تغییر"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "شما اجازهٔ ویرایش چیزی را ندارید."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "اعمال اخیر"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "اعمال من"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "چیزی در دسترس نیست"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
-msgstr ""
+msgstr "محتوا ناشناخته"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -538,31 +574,27 @@ msgstr ""
 "درستی ایجاد شده‌اند و اطمینان حاصل کنید که بانک اطلاعاتی توسط کاربر مربوطه "
 "قابل خواندن می باشد."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "نام کاربری:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "آیا گذرواژه یا نام کاربری خود را فراموش کرده؟"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "تاریخ/ساعت"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "کاربر"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "عمل"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -580,13 +612,13 @@ msgstr "ذخیره"
 
 #: templates/admin/search_form.html:7
 msgid "Search"
-msgstr ""
+msgstr "جستجو"
 
 #: templates/admin/search_form.html:9
 #, python-format
 msgid "%(counter)s result"
 msgid_plural "%(counter)s results"
-msgstr[0] ""
+msgstr[0] "%(counter)s نتیجه"
 
 #: templates/admin/search_form.html:9
 #, python-format
@@ -615,66 +647,66 @@ msgstr ""
 
 #: templates/admin/auth/user/add_form.html:8
 msgid "Enter a username and password."
-msgstr ""
+msgstr "یک نام کاربری و رمز عبور را وارد کنید."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "برای کابر <strong>%(username)s</strong> یک گذرنامهٔ جدید وارد کنید."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "گذرواژه (تکرار)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "همان گذرواژهٔ بالایی را برای اطمینان دوباره وارد کنید."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
-#, python-format
-msgid "Add another %(verbose_name)s"
-msgstr ""
-
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
 msgid "Remove"
 msgstr "حذف"
 
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr "افزودن یک %(verbose_name)s دیگر"
+
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "حذف؟"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "متشکر از اینکه مدتی از وقت خود را به ما اختصاص دادید."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "ورود دوباره"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "تغییر گذرواژه"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "گذرواژه تغییر یافت."
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "گذرواژهٔ شما تغییر یافت."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -682,46 +714,46 @@ msgstr ""
 "گذرواژهٔ قدیمی خود را، برای امنیت بیشتر، وارد کنید و سپس گذرواژهٔ جدیدتان را "
 "دوبار وارد کنید تا ما بتوانیم چک کنیم که به درستی تایپ کرده‌اید."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "گذرواژهٔ قدیمی"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "گذرواژهٔ جدید"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "تغییر گذرواژهٔ من"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "ایجاد گذرواژهٔ جدید"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "گذرواژهٔ جدید ایجاد شد"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "گذرواژهٔ جدیدتان تنظیم شد. اکنون می‌توانید وارد وبگاه شوید."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "تصدیق گذرواژهٔ جدید"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "ورود گذرواژهٔ جدید"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -729,19 +761,19 @@ msgstr ""
 "گذرواژهٔ جدیدتان را دوبار وارد کنید تا ما بتوانیم چک کنیم که به درستی تایپ "
 "کرده‌اید."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "گذرواژهٔ جدید"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "تکرار گذرواژه"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "گذرواژهٔ جدید ایجاد نشد."
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -749,25 +781,27 @@ msgstr ""
 "پیوند ایجاد گذرواژهٔ جدید نامعتبر بود، احتمالاً به این علت که قبلاً از آن "
 "استفاده شده است. لطفاً برای یک گذرواژهٔ جدید درخواست دهید."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "گذرواژهٔ جدید ایجاد شد."
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"ما به نشانی پست اکترونیکی‌ای که وارد کردید دستورالعملی برای تنظیم گذرواژه‌تان "
-"فرستادیم. به زودی به شما می‌رسد."
+"ما روش تنظیم مجدد رمز را برایتان ارسال نمودیم. شما به زودی این ایمیل را "
+"دریافت می کنید."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
+"شما این ایمیل را بخاطر تقاضای تغییر رمز حساب در  %(site_name)s. دریافت کرده "
+"اید."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -786,36 +820,36 @@ msgstr "متشکر از استفادهٔ شما از وبگاه ما"
 msgid "The %(site_name)s team"
 msgstr "گروه %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"گذرواژه خود را فراموش کرده‌اید؟ نشانی پست الکترونیکی خود را وارد کنید. ما "
-"دستورالعملی برای ایجاد گذرنامهٔ جدید به پست الکترونیکی‌تان خواهیم فرستاد."
+"رمز خود را فراموش کرده اید؟ آدرس ایمیل خود را در زیر وارد کنید، و ما روش "
+"تنظیم رمز جدید را برایتان می فرستیم."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "نشانی پست الکترونیکی:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "آدرس ایمیل:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "ایجاد گذرواژهٔ جدید"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "همهٔ تاریخ‌ها"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
-msgstr ""
+msgstr "(هیچ)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s انتخاب کنید"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s را برای تغییر انتخاب کنید"
diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo
index 228becb1d1..7e48205753 100644
Binary files a/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po
index 7b274dd8f0..9379eab186 100644
--- a/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po
@@ -1,7 +1,8 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Nikneshan <ali@nikneshan.com>, 2011.
+# Ali Nikneshan <ali@nikneshan.com>, 2011, 2012.
+# Alireza Savand <alireza.savand@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Sina Cheraghi <sinacher@gmail.com>, 2011.
 msgid ""
@@ -9,15 +10,15 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: Sina Cheraghi <sinacher@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"PO-Revision-Date: 2012-08-11 08:33+0000\n"
+"Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -30,11 +31,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"این لیست%s های  در دسترس است. شما ممکن است برخی از آنها را در محل  زیرانتخاب "
+"نمایید و سپس روی \"انتخاب\" بین دو جعبه کلیک کنید."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "درون این جعبه تایپ کنید تا لیست %s های موجود فیلتر شود."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -47,11 +50,11 @@ msgstr "انتخاب همه"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "کلیک کنید را انتخاب کنید تمام %s را در یک بار."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "انتخاب"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -68,15 +71,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"این فهرست %s های انتخاب شده است. شما ممکن است برخی از انتخاب آنها را در محل "
+"زیر وارد نمایید و سپس روی \"حذف\" جهت دار بین دو جعبه حذف شده است."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "حذف همه"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "کلیک کنید تا تمام %s های انتخاب شده حذف شوند."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo
index fe07f3a01c..3a9df3402c 100644
Binary files a/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/django.po b/django/contrib/admin/locale/fi/LC_MESSAGES/django.po
index 75e5f83ddd..56cea83515 100644
--- a/django/contrib/admin/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/fi/LC_MESSAGES/django.po
@@ -3,32 +3,33 @@
 # Translators:
 # Antti Kaihola <akaihol+transifex@ambitone.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <klaus.dahlen@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr "Onnistuneesti poistettu %(count)d \"%(items)s\"-kohdetta."
+msgstr "%(count)d \"%(items)s\"-kohdetta poistettu."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Ei voida poistaa: %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Oletko varma?"
 
@@ -37,166 +38,174 @@ msgstr "Oletko varma?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Poista valitut \"%(verbose_name_plural)s\"-kohteet"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Kaikki"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Kyllä"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ei"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Mikä tahansa päivä"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Tänään"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Viimeiset 7 päivää"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Tässä kuussa"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Tänä vuonna"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Kirjaudu uudelleen sisään, sillä istuntosi on vanhentunut."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Sähköpostiosoitteesi ei ole käyttäjätunnuksesi. Kokeile '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Toiminto:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "tapahtumahetki"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "kohteen tunniste"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "kohteen tiedot"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "tapahtumatyyppi"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "selitys"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "lokimerkintä"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "lokimerkinnät"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ei arvoa"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Muokattu: %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ja"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Lisätty %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Muutettu %(list)s kohteelle %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Poistettu %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Ei muutoksia kenttiin."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" on lisätty."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Voit muokata sitä edelleen alla."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Uusi %s on lisättävissä alla."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" on muutettu."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" on lisätty. Voit muokata sitä uudelleen alla."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" on lisätty."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" on muutettu."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -204,89 +213,97 @@ msgstr ""
 "Kohteiden täytyy olla valittuna, jotta niihin voi kohdistaa toimintoja. "
 "Kohteita ei ole muutettu."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Ei toimintoa valittuna."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Lisää %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s perusavaimella %(key)r ei ole olemassa."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Muokkaa %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s on muokattu."
 msgstr[1] "%(count)s \"%(name)s\"-kohdetta on muokattu."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s valittu"
 msgstr[1] "Kaikki %(total_count)s valittu"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 valittuna %(cnt)s mahdollisesta"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" on poistettu."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Muokkaushistoria: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Sivuston ylläpito"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s ylläpito"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Pvm:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Klo:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Etsi"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Lisää seuraava"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Sivua ei löydy"
@@ -295,42 +312,40 @@ msgstr "Sivua ei löydy"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Pahoittelemme, pyydettyä sivua ei löytynyt."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Etusivu"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Palvelinvirhe"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Palvelinvirhe (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Palvelinvirhe <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Palvelimella on tapahtunut virhe. Virheestä on ilmoitettu sivuston "
-"ylläpitäjille ja se hoidetaan pian. Kiitämme kärsivällisyydestä."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -353,7 +368,7 @@ msgstr "Valitse kaikki %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Tyhjennä valinta"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -363,22 +378,22 @@ msgid "Welcome,"
 msgstr "Tervetuloa,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Ohjeita"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
@@ -390,35 +405,35 @@ msgstr "Django-sivuston ylläpito"
 msgid "Django administration"
 msgstr "Djangon ylläpito"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Lisää"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Muokkaushistoria"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Näytä lopputulos"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Korjaa allaoleva virhe."
 msgstr[1] "Korjaa allaolevat virheet."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Lisää %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Suodatin"
 
@@ -435,12 +450,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -451,7 +466,7 @@ msgstr ""
 "liittyviä kohteita, mutta sinulla ei ole oikeutta näiden kohteiden "
 "poistamiseen:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -460,7 +475,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s': poistettaessa joudutaan poistamaan "
 "myös seuraavat suojatut siihen liittyvät kohteet:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -469,16 +484,16 @@ msgstr ""
 "Haluatko varmasti poistaa kohteen \"%(escaped_object)s\" (%(object_name)s)? "
 "Myös seuraavat kohteet poistettaisiin samalla:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Kyllä, olen varma"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Poista useita kohteita"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -489,7 +504,7 @@ msgstr ""
 "liittyviä kohteita. Sinulla ei kuitenkaan ole oikeutta poistaa seuraavia "
 "kohdetyyppejä:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -498,7 +513,7 @@ msgstr ""
 "Jos valitut %(objects_name)s poistetaan, pitää poistaa myös seuraavat "
 "suojatut niihin liittyvät kohteet:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -512,36 +527,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Sovelluksen %(name)s mallit."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Muokkaa"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Sinulla ei ole oikeutta muokata mitään."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Viimeisimmät tapahtumat"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Omat tapahtumani"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ei yhtään"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Tuntematon sisältö"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -550,31 +565,27 @@ msgstr ""
 "Tietokanta-asennuksessa on jotain vialla. Varmista, että sopivat taulut on "
 "luotu ja että oikea käyttäjä voi lukea tietokantaa."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Käyttäjätunnus:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Salasana:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Unohditko salasanasi tai käyttäjätunnuksesi?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Pvm/klo"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Käyttäjä"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Tapahtuma"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -630,64 +641,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Syötä käyttäjätunnus ja salasana."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Syötä käyttäjän <strong>%(username)s</strong> uusi salasana."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Salasana toistamiseen"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Syötä sama salasana tarkistuksen vuoksi toistamiseen."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Poista"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Lisää toinen %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Poista"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Poista?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Kiitos sivuillamme viettämästäsi ajasta."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Kirjaudu uudelleen sisään"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Salasanan vaihtaminen"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Salasanan vaihtaminen onnistui"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Salasanasi on vaihdettu."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -695,46 +706,46 @@ msgstr ""
 "Syötä vanha salasanasi varmistukseksi, ja syötä sitten uusi salasanasi kaksi "
 "kertaa, jotta se tulee varmasti oikein."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Vanha salasana"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Vaihda salasana"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Salasanan nollaus"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Salasanan nollaus valmis"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Salasanasi on asetettu. Nyt voit kirjautua sisään."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Salasanan nollauksen vahvistus"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Syötä uusi salasana"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -742,19 +753,19 @@ msgstr ""
 "Syötä uusi salasanasi kaksi kertaa, jotta voimme varmistaa että syötit sen "
 "oikein."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Uusi salasana:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Varmista uusi salasana:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Salasanan nollaus ei onnistunut"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -762,27 +773,23 @@ msgstr ""
 "Salasanan nollauslinkki oli virheellinen, mahdollisesti siksi että se on jo "
 "käytetty. Ole hyvä ja pyydä uusi salasanan nollaus."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Salasanan nollaus onnistui"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Uusi salasanasi on lähetetty antamaasi sähköpostiosoitteeseen. Se saapuu "
-"tuota pikaa."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Sait tämän sähköpostin, koska olet pyytänyt nollaamaan käyttäjätilisi "
-"salasanan sivustolla %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -801,36 +808,34 @@ msgstr "Kiitos vierailustasi sivuillamme!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s -sivuston ylläpitäjät"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Unohditko salasanasi? Syötä alle sähköpostiosoitteesi, niin \n"
-"lähetämme sinulle uuden salasanan."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Nollaa salasanani"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Kaikki päivät"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ei mitään)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Valitse %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Valitse muokattava %s"
diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo
index 2b37d1c06b..55342bce14 100644
Binary files a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po
index fed367eb15..340c2546d4 100644
--- a/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo
index 7519e47f2c..c130560aa6 100644
Binary files a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po
index cfecfd39b9..5e7a93aecd 100644
--- a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po
@@ -1,35 +1,35 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-#   <claude@2xlibre.net>, 2011, 2012.
+#   <claude@2xlibre.net>, 2011-2013.
 # claudep <claude@2xlibre.net>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-03 13:55+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr "%(count)d %(items)s supprimés avec succès."
+msgstr "La suppression de %(count)d %(items)s a réussi."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Impossible de supprimer %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
 
@@ -38,164 +38,140 @@ msgstr "Êtes-vous sûr ?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Supprimer les %(verbose_name_plural)s sélectionnés"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Tout"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Oui"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Non"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Toutes les dates"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Les 7 derniers jours"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Ce mois-ci"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Cette année"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Veuillez saisir un nom d'utilisateur et un mot de passe corrects d'un compte "
-"autorisé. Sachez que les deux champs sont sensibles à la casse."
+"Veuillez compléter correctement les champs « %(username)s » et « mot de "
+"passe » d'un compte autorisé. Sachez que les deux champs peuvent être "
+"sensibles à la casse."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Reconnectez-vous car votre session a expiré."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Votre adresse électronique n'est pas votre nom d'utilisateur. Essayez « %s » "
-"à la place."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Action :"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "heure de l'action"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id de l'objet"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "représentation de l'objet"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "indicateur de l'action"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "message de modification"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entrée d'historique"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entrées d'historique"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "%(object)s ajouté(e)s."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "%(object)s modifié(e)s - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "%(object)s supprimé(e)s"
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objet de journal"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Aucun(e)"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Modifié %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "et"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s « %(object)s » ajouté."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s modifié pour %(name)s « %(object)s »."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s « %(object)s » supprimé."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Aucun champ modifié."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "L'objet %(name)s « %(obj)s » a été ajouté avec succès."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Vous pouvez continuer l'édition ci-dessous."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Vous pouvez ajouter un autre %s ci-dessous."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "L'objet %(name)s « %(obj)s » a été modifié avec succès."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -203,7 +179,44 @@ msgstr ""
 "L'objet %(name)s « %(obj)s » a été ajouté avec succès. Vous pouvez continuer "
 "l'édition ci-dessous."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"L'objet %(name)s « %(obj)s » a été ajouté avec succès. Vous pouvez ajouter "
+"un autre objet « %(name)s » ci-dessous."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "L'objet %(name)s « %(obj)s » a été ajouté avec succès."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"L'objet %(name)s « %(obj)s » a été modifié avec succès. Vous pouvez "
+"continuer l'édition ci-dessous."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"L'objet %(name)s « %(obj)s » a été modifié avec succès. Vous pouvez ajouter "
+"un autre objet %(name)s ci-dessous."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "L'objet %(name)s « %(obj)s » a été modifié avec succès."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -211,89 +224,97 @@ msgstr ""
 "Des éléments doivent être sélectionnés afin d'appliquer les actions. Aucun "
 "élément n'a été modifié."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Aucune action sélectionnée."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Ajout %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "L'objet %(name)s avec la clef primaire %(key)r n'existe pas."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modification de %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Erreur de base de données"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s objet %(name)s a été modifié avec succès."
 msgstr[1] "%(count)s objets %(name)s ont été modifiés avec succès."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s sélectionné"
 msgstr[1] "Tous les %(total_count)s sélectionnés"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 sur %(cnt)s sélectionné"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "L'objet %(name)s « %(obj)s » a été supprimé avec succès."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Historique des changements : %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Connexion"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administration du site"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administration %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Date :"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Heure :"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Recherche"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Ajouter un autre"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Actuellement :"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Modifier :"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Cette page n'a pas été trouvée"
@@ -302,39 +323,39 @@ msgstr "Cette page n'a pas été trouvée"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Nous sommes désolés, mais la page demandée est introuvable."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Accueil"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Erreur du serveur"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Erreur du serveur (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Erreur du serveur <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "Une erreur est survenue. Elle a été transmise par courriel aux "
 "administrateurs du site et sera corrigée dans les meilleurs délais. Merci "
@@ -361,7 +382,7 @@ msgstr "Sélectionner tous les %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Effacer la sélection"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -371,22 +392,22 @@ msgid "Welcome,"
 msgstr "Bienvenue,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentation"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Modifier votre mot de passe"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Déconnexion"
 
@@ -398,35 +419,35 @@ msgstr "Site d'administration de Django"
 msgid "Django administration"
 msgstr "Administration de Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Ajouter"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historique"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Voir sur le site"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Corrigez l'erreur suivante."
 msgstr[1] "Corrigez les erreurs suivantes."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Ajouter %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtre"
 
@@ -443,12 +464,12 @@ msgstr "Priorité de tri : %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Inverser le tri"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -459,7 +480,7 @@ msgstr ""
 "suppression des objets qui lui sont liés, mais votre compte ne possède pas "
 "la permission de supprimer les types d'objets suivants :"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -468,7 +489,7 @@ msgstr ""
 "Supprimer l'objet %(object_name)s « %(escaped_object)s » provoquerait la "
 "suppression des objets liés et protégés suivants :"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -478,16 +499,16 @@ msgstr ""
 "« %(escaped_object)s » ? Les éléments suivants sont liés à celui-ci et "
 "seront aussi supprimés :"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Oui, je suis sûr"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Supprimer plusieurs objets"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -498,7 +519,7 @@ msgstr ""
 "suppression d'objets liés, mais votre compte n'est pas autorisé à supprimer "
 "les types d'objet suivants :"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -507,7 +528,7 @@ msgstr ""
 "La suppression des objets %(objects_name)s sélectionnés provoquerait la "
 "suppression des objets liés et protégés suivants :"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -521,36 +542,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Par %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modèles disponibles dans l'application %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modèles de l'application %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modifier"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Vous n'avez pas la permission de modifier quoi que ce soit."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Actions récentes"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mes actions"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Aucun(e) disponible"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Contenu inconnu"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -560,31 +581,27 @@ msgstr ""
 "tables utiles ont été créées, et que la base est accessible par "
 "l'utilisateur concerné."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Mot de passe ou nom d'utilisateur oublié ?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Date/heure"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Utilisateur"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Action"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -640,66 +657,66 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Saisissez un nom d'utilisateur et un mot de passe."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Saisissez un nouveau mot de passe pour l'utilisateur <strong>%(username)s</"
 "strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Mot de passe (à nouveau)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Saisissez le même mot de passe que précédemment, pour vérification."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Supprimer"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Ajouter un objet %(verbose_name)s supplémentaire"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Supprimer"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Supprimer ?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Merci pour le temps que vous avez accordé à ce site aujourd'hui."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Connectez-vous à nouveau"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Modification de votre mot de passe"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Mot de passe modifié avec succès"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Votre mot de passe a été modifié."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -708,47 +725,47 @@ msgstr ""
 "nouveau mot de passe à deux reprises afin de vérifier qu'il est correctement "
 "saisi."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Modifier mon mot de passe"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Réinitialisation du mot de passe"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Mise à jour du mot de passe effectuée avec succès"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "Votre mot de passe a été défini. Vous pouvez maintenant vous authentifier."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmation de mise à jour du mot de passe"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Saisissez un nouveau mot de passe"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -756,19 +773,19 @@ msgstr ""
 "Saisissez deux fois votre nouveau mot de passe afin de vérifier qu'il est "
 "correctement saisi."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nouveau mot de passe :"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirmation du mot de passe :"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Échec lors de la mise à jour du mot de passe"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -777,14 +794,14 @@ msgstr ""
 "raison de sa précédente utilisation. Veuillez renouveler votre demande de "
 "mise à jour de mot de passe."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Mot de passe mis à jour avec succès"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "Nous vous avons envoyé par courriel les instructions pour changer de mot de "
@@ -794,7 +811,7 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 "Vous recevez ce message en réponse à votre demande de réinitialisation du "
@@ -818,36 +835,36 @@ msgstr "Merci d'utiliser notre site !"
 msgid "The %(site_name)s team"
 msgstr "L'équipe %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "Mot de passe perdu ? Saisissez votre adresse électronique ci-dessous et nous "
 "vous enverrons les instructions pour en créer un nouveau."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "Adresse électronique :"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Réinitialiser mon mot de passe"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Toutes les dates"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(aucun-e)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Sélectionnez %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Sélectionnez l'objet %s à changer"
diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo
index b838daa4f7..8ada5e5738 100644
Binary files a/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po
index ec06c0c64c..ffe8230ef9 100644
--- a/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo
index 6e247659f8..09b4895e9a 100644
Binary files a/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/django.po b/django/contrib/admin/locale/ga/LC_MESSAGES/django.po
index ff1a6b6927..d84e4bb0eb 100644
--- a/django/contrib/admin/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ga/LC_MESSAGES/django.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-16 11:42+0000\n"
-"Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "D'éirigh le scriosadh %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Ní féidir scriosadh %(name)s "
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "An bhfuil tú cinnte?"
 
@@ -38,162 +38,137 @@ msgstr "An bhfuil tú cinnte?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Scrios %(verbose_name_plural) roghnaithe"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Gach"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Tá"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Níl"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Gan aithne"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Aon dáta"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Inniu"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "7 lá a chuaigh thart"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Táim cinnte"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "An blian seo"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Le do thoil, iontráil ainm úsaideora agus focal faire ceart. Bí cúramach go "
-"bhfuil an beirt acu cásíogair."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Le do thoil, logáil isteach arís cé go bhfuil to seisúin críochnaithe."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Níl do ríomhseoladh do ainm úsaideora. Bain trial as '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Aicsean:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "am aicsean"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id oibiacht"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr oibiacht"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "brat an aicsean"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "teachtaireacht athrú"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "loga iontráil"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "loga iontrálacha"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" curtha isteach."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\" - %(changes)s aithrithe"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s.\" scrioste"
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Oibiacht LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Dada"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Athraithe %s"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "agus"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Suimithe %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Athraithe %(list)s le %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Scriosaithe %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Dada réimse aithraithe"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Bhí  %(name)s \"%(obj)s\" breisithe go rathúil"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Is féidir leat é a cuir in eagar thíos."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Is féidir le ceann eile %s a cuir le thíos."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Bhí an %(name)s \"%(obj)s\" aithraithe to rathúil"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,7 +176,38 @@ msgstr ""
 "Chuir an %(name)s·\"%(obj)s\"·go rathúil.·Is féidir leat é a cuir in eagar "
 "thíos."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Bhí  %(name)s \"%(obj)s\" breisithe go rathúil"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Bhí an %(name)s \"%(obj)s\" aithraithe to rathúil"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,30 +215,30 @@ msgstr ""
 "Ní mór Míreanna a roghnú chun caingne a dhéanamh orthu. Níl aon mhíreanna a "
 "athrú."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Uimh gníomh roghnaithe."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Cuir %s le"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Níl réad le hainm %(name)s agus eochair %(key)r ann."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Aithrigh %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Botún bunachar sonraí"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -242,7 +248,7 @@ msgstr[2] "%(count)s %(name)s athraithe go rathúil"
 msgstr[3] "%(count)s %(name)s athraithe go rathúil"
 msgstr[4] "%(count)s %(name)s athraithe go rathúil"
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -252,52 +258,60 @@ msgstr[2] "Gach %(total_count)s roghnaithe"
 msgstr[3] "Gach %(total_count)s roghnaithe"
 msgstr[4] "Gach %(total_count)s roghnaithe"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 as %(cnt)s roghnaithe."
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Bhí %(name)s \"%(obj)s\" scrioste go rathúil."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Athraigh stáir %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Logáil isteach"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Riaracháin an suíomh"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s riaracháin"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dáta:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Am:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Cuardach"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Cuir le"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Ní bhfuarthas an leathanach"
@@ -306,42 +320,40 @@ msgstr "Ní bhfuarthas an leathanach"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Tá brón orainn, ach ní bhfuarthas an leathanach iarraite."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Baile"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Botún freastalaí"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Botún freastalaí (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Botún Freastalaí <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Bhí botún. Seolah é go dtí riarthóirí an suíomh agus beidh sé ceartaithe i "
-"gceann tamallín. Go raibh maith agat le hadhaigh do foighne."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -365,7 +377,7 @@ msgstr "Roghnaigh gach %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Scroiseadh modhnóir"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -375,22 +387,22 @@ msgid "Welcome,"
 msgstr "Fáilte"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Doiciméadúchán"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Athraigh focal faire"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Logáil amach"
 
@@ -402,24 +414,24 @@ msgstr "Riarthóir suíomh Django"
 msgid "Django administration"
 msgstr "Riarachán Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Cuir le"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Stair"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Breath ar suíomh"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Ceartaigh an botún thíos le do thoil"
@@ -428,12 +440,12 @@ msgstr[2] "Ceartaigh na botúin thíos le do thoil"
 msgstr[3] "Ceartaigh na botúin thíos le do thoil"
 msgstr[4] "Ceartaigh na botúin thíos le do thoil"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Cuir %(name)s le"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Scagaire"
 
@@ -450,12 +462,12 @@ msgstr "Sórtáil tosaíocht: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Toggle sórtáil"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Cealaigh"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -465,7 +477,7 @@ msgstr ""
 "Má scriossan tú  %(object_name)s '%(escaped_object)s' scriosfaidh oibiachtí "
 "gaolta. Ach níl cead ag do cuntas na oibiacht a leanúint a scriosadh:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -474,7 +486,7 @@ msgstr ""
 "Bheadh Scriosadh an %(object_name)s  '%(escaped_object)s' a cheangal ar an "
 "méid seo a leanas a scriosadh nithe cosanta a bhaineann le:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -483,16 +495,16 @@ msgstr ""
 "An bhfuil tú cinnte na  %(object_name)s \"%(escaped_object)s\" a scroiseadh?"
 "Beidh gach oibiacht a leanúint scroiste freisin:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Táim cinnte"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Scrios na réadanna"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -503,7 +515,7 @@ msgstr ""
 "gaolmhara a scriosadh, ach níl cead do chuntas a scriosadh na cineálacha seo "
 "a leanas na cuspóirí:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -512,7 +524,7 @@ msgstr ""
 "Teastaíonn scriosadh na %(objects_name)s roghnaithe  scriosadh na hoibiacht "
 "gaolta cosainte a leanúint:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -526,36 +538,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Trí %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Samhla ar fáil ins an feidhmchlár %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Athraigh"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Níl cead agat aon rud a cuir in eagar."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Aicsean úrnua"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mo Aicseain"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Dada ar fáil"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Inneachair anaithnid"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -565,31 +577,27 @@ msgstr ""
 "boird an bunachar sonraI cruthaithe cheana, agus déan cinnte go bhfuil do "
 "úsaideoir in ann an bunacchar sonraí a léamh."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Ainm úsaideor:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Focal faire:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Dearmad déanta ar do focal faire nó ainm úsaideora"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dáta/am"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Úsaideoir"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Aicsean"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -648,66 +656,66 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Cuir isteach ainm úsáideora agus focal faire."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Iontráil focal faire nua le hadhaigh an úsaideor <strong>%(username)s</"
 "strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Focal faire"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Focal faire (arís)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Iontráíl an focal faire céanna mar thuas, le fíorúchán."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Tóg amach"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Cuir eile %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Tóg amach"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Cealaigh?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Go raibh maith agat le hadhaigh do cuairt ar an suíomh idirlínn inniú."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Logáil isteacj arís"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Athrú focal faire"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Athrú an focal faire rathúil"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Bhí do focal faire aithraithe."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -716,46 +724,46 @@ msgstr ""
 "iontráil do focal faire dhá uaire cé go mbeimid in ann a seiceal go bhfuil "
 "sé scríobhte isteach i gceart."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Sean-focal faire "
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Focal faire nua"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Athraigh mo focal faire"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Athsocraigh focal faire"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Athshocraigh an focal faire críochnaithe"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Tá do focal faire réidh.  Is féidir leat logáil isteach anois."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Deimhniú athshocraigh focal faire"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Cuir isteach focal faire nua"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -763,19 +771,19 @@ msgstr ""
 "Le do thoil, iontráil do focal faire dhá uaire cé go mbeimid in ann a "
 "seiceal go bhfuil sé scríobhte isteach i gceart."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Focal faire nua:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Deimhnigh focal faire:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Athshocraigh focal faire mí-rathúil"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -783,27 +791,23 @@ msgstr ""
 "Bhí nasc athshocraigh an focal faire mícheart, b'fheidir mar go raibh sé "
 "úsaidte cheana.  Le do thoil, iarr ar athsocraigh focal faire nua."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Athshocraigh focal faire mí-rathúil"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Seolamar teagasca chugat le hadhaigh do r-phost a úsaid mar to focal faire.  "
-"Gheobaidh tú an r-phost i gceann tamallín."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Tá tú ag fáil an r-phost seo mar iarr tú ar do phasfhocal a athshocrú le "
-"hadhaigh do chuntas úsáideora ag %(site_name)s ."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -824,36 +828,34 @@ msgstr "Go raibh maith agat le hadhaigh do cuairt!"
 msgid "The %(site_name)s team"
 msgstr "Foireann an %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Dearmad déanta ar do focal faire? Iontráil do r-phost thíos agus seolfaimid "
-"teagasca chun ceann nua a fháil."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "R-phost:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Athsocraigh mo focal faire"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Gach dáta"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Dada)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Roghnaigh %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Roghnaigh %s a athrú"
diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo
index 0d1b86fab0..0a11369f4a 100644
Binary files a/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po
index 7e0fe0ee16..40af9ec40f 100644
--- a/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po
@@ -10,14 +10,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-16 12:28+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo
index 5fab28bfaf..599b863bca 100644
Binary files a/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/django.po b/django/contrib/admin/locale/gl/LC_MESSAGES/django.po
index ef9b30ba84..16ff2f4f1c 100644
--- a/django/contrib/admin/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/gl/LC_MESSAGES/django.po
@@ -3,35 +3,37 @@
 # Translators:
 # fasouto <fsoutomoure@gmail.com>, 2011.
 # fonso <fonzzo@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 #   <fsoutomoure@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Oscar Carballal <oscar.carballal@cidadania.coop>, 2012.
 # oscarcp <oscar@cidadania.coop>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: fasouto <fsoutomoure@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-07 11:11+0000\n"
+"Last-Translator: fonso <fonzzo@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Borrado exitosamente %(count)d %(items)s"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Non se pode eliminar %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
@@ -40,168 +42,182 @@ msgstr "¿Está seguro?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Borrar %(verbose_name_plural)s seleccionados."
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Todo"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Si"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Non"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Calquera data"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hoxe"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Últimos 7 días"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Este mes"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Este ano"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
+"Por favor, insira os %(username)s e contrasinal dunha conta de persoal. Teña "
+"en conta que ambos os dous campos distingues maiúsculas e minúsculas."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Por favor ingrese de novo, a súa sesión expirou."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"O seu enderezo de correo electrónico non é o seu nome de usuario. Probe con "
-"'%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Acción:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "hora da acción"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id do obxecto"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr do obxecto"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "código do tipo de acción"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "cambiar mensaxe"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entrada de rexistro"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entradas de rexistro"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Engadido \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Modificados \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Borrados \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "Obxecto LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ningún"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Modificado(s) %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "e"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Engadido %(name)s \"%(object)s\""
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Modificáronse %(list)s en %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Elimináronse %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Non se modificou ningún campo."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Engadiuse correctamente o/a %(name)s  \"%(obj)s\"."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Pode editalo embaixo."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Pode engadir outro/a %s embaixo."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Modificouse correctamente o/a %(name)s \"%(obj)s\"."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\" Pode editalo embaixo."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"O/a %(name)s \"%(obj)s\" foi engadido correctamente. Pode engadir outro/a "
+"%(name)s embaixo."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Engadiuse correctamente o/a %(name)s  \"%(obj)s\"."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"O/a %(name)s \"%(obj)s\" foi modificado correctamente. Pode editalo de novo "
+"embaixo."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"O/a %(name)s \"%(obj)s\" for modificalo correctamente. Pode engadir outro/a "
+"%(name)s embaixo."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Modificouse correctamente o/a %(name)s \"%(obj)s\"."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,89 +225,97 @@ msgstr ""
 "Deb seleccionar ítems para poder facer accións con eles. Ningún ítem foi "
 "cambiado."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Non se elixiu ningunha acción."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Engadir %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "O obxecto %(name)s con primary key %(key)r non existe."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Erro da base de datos"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s foi cambiado satisfactoriamente."
 msgstr[1] "%(count)s %(name)s foron cambiados satisfactoriamente."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s seleccionado."
 msgstr[1] "Tódolos %(total_count)s seleccionados."
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 de %(cnt)s seleccionados."
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Eliminouse correctamente o/a %(name)s \"%(obj)s\"."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Histórico de cambios: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administración do sitio web"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s administración"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Data:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Hora"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Procurar"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Engadir outro"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Actualmente:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Modificar:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Páxina non atopada"
@@ -300,42 +324,42 @@ msgstr "Páxina non atopada"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Sentímolo, pero non se atopou a páxina solicitada."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Inicio"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Erro no servidor"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Erro no servidor (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Erro do servidor <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Houbo un erro. Xa se informou aos administradores do sitio por correo "
-"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia."
+"Ocorreu un erro. Os administradores do sitio foron informados por email e "
+"debería ser arranxado pronto. Grazas pola súa paciencia."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -358,7 +382,7 @@ msgstr "Seleccionar todos os %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Limpar selección"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -368,22 +392,22 @@ msgid "Welcome,"
 msgstr "Benvido,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Cambiar contrasinal"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Rematar sesión"
 
@@ -395,57 +419,57 @@ msgstr "Administración de sitio Django"
 msgid "Django administration"
 msgstr "Administración de Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Engadir"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Histórico"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Ver na web"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor, corrixa o erro de embaixo."
 msgstr[1] "Por favor, corrixa os erros de embaixo."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Engadir %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtro"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "Eliminar da clasificación"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "Prioridade de clasificación: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "Activar clasificación"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -456,7 +480,7 @@ msgstr ""
 "elementos relacionados, pero a súa conta non ten permiso para borrar os "
 "seguintes tipos de elementos:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -465,7 +489,7 @@ msgstr ""
 "Para borrar o obxecto %(object_name)s '%(escaped_object)s' requiriríase "
 "borrar os seguintes obxectos protexidos relacionados:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +498,16 @@ msgstr ""
 "Seguro que quere borrar o %(object_name)s \"%(escaped_object)s\"? "
 "Eliminaranse os seguintes obxectos relacionados:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Si, estou seguro"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Eliminar múltiples obxectos"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -494,7 +518,7 @@ msgstr ""
 "de obxectos relacionados, pero a súa conta non ten permiso para borrar os "
 "seguintes tipos de obxecto:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -503,7 +527,7 @@ msgstr ""
 "Para borrar os obxectos %(objects_name)s relacionados requiriríase eliminar "
 "os seguintes obxectos protexidos relacionados:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -518,36 +542,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Por %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelos dispoñíbeis na aplicación %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modelos na aplicación %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modificar"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Non ten permiso para editar nada."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Accións recentes"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "As miñas accións"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ningunha dispoñíbel"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Contenido descoñecido"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -557,31 +581,27 @@ msgstr ""
 "creasen as táboas axeitadas na base de datos, e de que o usuario apropiado "
 "teña permisos para lela."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Usuario:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "¿Olvidou o usuario ou contrasinal?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Data/hora"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Usuario"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Acción"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -637,65 +657,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Introduza un nome de usuario e contrasinal."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Insira un novo contrasinal para o usuario <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Contrasinal (outra vez)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Insira o mesmo contrasinal ca enriba para verificalo."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Eliminar"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Engadir outro %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Eliminar"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "¿Eliminar?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Grazas polo tempo que dedicou ao sitio web."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Entrar de novo"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Cambiar o contrasinal"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "O seu contrasinal cambiouse correctamente."
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Cambiouse o seu contrasinal."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -703,48 +723,48 @@ msgstr ""
 "Por razóns de seguridade, introduza o contrasinal actual. Despois introduza "
 "dúas veces o contrasinal para verificarmos que o escribiu correctamente."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Contrasinal antigo"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Contrasinal novo"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Recuperar o contrasinal"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Reseteo do contrasinal completo"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "A túa clave foi gardada.\n"
 "Xa podes entrar."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmación de reseteo da contrasinal"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Insira o novo contrasinal"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -752,19 +772,19 @@ msgstr ""
 "Por favor insira a súa contrasinal dúas veces para que podamos verificar se "
 "a escribiu correctamente."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Contrasinal novo:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirmar contrasinal:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Reseteo da contrasinal non satisfactorio."
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -772,27 +792,27 @@ msgstr ""
 "A ligazón de reseteo da contrasinal non é válida, posiblemente porque xa foi "
 "usada.  Por favor pida un novo reseteo da contrasinal."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "O contrasinal foi recuperado correctamente"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Enviámoslle un correo electrónico con instrucións para configurar a súa "
-"contrasinal á dirección que nos dixo. Debería recibilo en breves."
+"Acabamos de enviarlle as instrucións para configurar o contrasinal ao "
+"enderezo de email que nos indicou. Debería recibilas axiña."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Recibe esta mensaxe porque solicitou restablecer o contrasinal da súa conta "
-"de usuario en %(site_name)s."
+"Recibe este email porque solicitou restablecer o contrasinal para a súa "
+"conta de usuario en %(site_name)s"
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -811,36 +831,36 @@ msgstr "Grazas por usar o noso sitio web!"
 msgid "The %(site_name)s team"
 msgstr "O equipo de %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"¿Olvidou a súa contrasinal? Insira a súa dirección de correo embaixo, e nos "
-"enviarémoslle instrucións para crear una nova."
+"Esqueceu o contrasinal? Insira o seu enderezo de email embaixo e "
+"enviarémoslle as instrucións para configurar un novo."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "Enderezo de correo electrónico:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Recuperar o meu contrasinal"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Todas as datas"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ningún)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Seleccione un/ha %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Seleccione %s que modificar"
diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.mo
index 81f3a297bb..ec96d51f15 100644
Binary files a/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.po
index 81f7107411..646bd6530c 100644
--- a/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.po
@@ -3,21 +3,22 @@
 # Translators:
 # fasouto <fsoutomoure@gmail.com>, 2011.
 # fonso <fonzzo@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
+"PO-Revision-Date: 2013-01-07 11:30+0000\n"
 "Last-Translator: fonso <fonzzo@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -30,11 +31,14 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Esta é unha lista de %s dispoñíbeis. Pode escoller algúns seleccionándoos na "
+"caixa inferior e a continuación facendo clic na frecha \"Escoller\" situada "
+"entre as dúas caixas."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Escriba nesta caixa para filtrar a lista de %s dispoñíbeis."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -47,11 +51,11 @@ msgstr "Escoller todo"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Faga clic para escoller todos/as os/as '%s' dunha vez."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Escoller"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -68,15 +72,18 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Esta é a lista de %s escollidos/as. Pode eliminar algúns seleccionándoos na "
+"caixa inferior e a continuación facendo clic na frecha \"Eliminar\" situada "
+"entre as dúas caixas."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "Eliminar todos"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Faga clic para eliminar da lista todos/as os/as '%s' escollidos/as."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/django.mo b/django/contrib/admin/locale/he/LC_MESSAGES/django.mo
index 6c99a1adee..e80fff86e8 100644
Binary files a/django/contrib/admin/locale/he/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/django.po b/django/contrib/admin/locale/he/LC_MESSAGES/django.po
index 2c03f68a46..3062e136a4 100644
--- a/django/contrib/admin/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/he/LC_MESSAGES/django.po
@@ -4,32 +4,33 @@
 # Alex Gaynor <alex.gaynor@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Meir Kriheli <meir@mksoft.co.il>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s  נמחקו בהצלחה."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "לא ניתן למחוק %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "האם את/ה בטוח/ה ?"
 
@@ -38,254 +39,270 @@ msgstr "האם את/ה בטוח/ה ?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "מחק %(verbose_name_plural)s שנבחרו"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "הכל"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "כן"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "לא"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "כל תאריך"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "היום"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "בשבוע האחרון"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "החודש"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "השנה"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "עליך להתחבר שנית כי פג הזמן המוקצב לך."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "כתובת הדוא\"ל שלך אינה שם המשתמש שלך. נסה/י '%s' במקום."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "פעולה"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "זמן פעולה"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "מזהה אובייקט"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "ייצוג אובייקט"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "דגל פעולה"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "הערה לשינוי"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "רישום יומן"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "רישומי יומן"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "בוצעה הוספת \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "בוצע שינוי \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "בוצעה מחיקת \"%(object)s\"."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "אובייקט LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "ללא"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s שונה."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ו"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
-msgstr "התווסף %(name)s \"%(object)s\"."
+msgstr "בוצעה הוספת %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
-msgstr "שונה %(list)s עבור %(name)s \"%(object)s\"."
+msgstr "בוצע שינוי %(list)s עבור %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
-msgstr "נמחק %(name)s \"%(object)s\"."
+msgstr "בוצעה מחיקת %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "אף שדה לא השתנה."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "ניתן לערוך שוב מתחת"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "ניתן להוסיף %s נוסף מתחת."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לערוך אותו שוב מתחת."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr "יש לסמן פריטים כדי לבצע עליהם פעולות. לא שונו פריטים."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "לא נבחרה פעולה."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "הוספת %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "הפריט %(name)s עם המפתח הראשי %(key)r אינו קיים."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "שינוי %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "שגיאת בסיס נתונים"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
-msgstr[0] "שינוי %(count)s %(name)s בהצלחה."
-msgstr[1] "שינוי %(count)s %(name)s בהצלחה."
+msgstr[0] "שינוי %(count)s %(name)s בוצע בהצלחה."
+msgstr[1] "שינוי %(count)s %(name)s בוצע בהצלחה."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s נבחר"
 msgstr[1] "כל ה־%(total_count)s נבחרו"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
-msgstr "0 מ %(cnt)s נבחרות"
+msgstr "0 מ %(cnt)s נבחרים"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "היסטוריית שינוי: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "כניסה"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "ניהול אתר"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "ניהול %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "תאריך:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "שעה:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "חפש"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "הוסף עוד אחת"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "דף לא קיים"
@@ -294,39 +311,39 @@ msgstr "דף לא קיים"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "אנו מצטערים, לא ניתן למצוא את הדף המבוקש."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "דף הבית"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "שגיאת שרת"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "שגיאת שרת (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "שגיאת שרת <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "התרחשה שגיאה. היא דווחה למנהלי האתר בדוא\"ל ותתוקן בקרוב. תודה על סבלנותך."
 
@@ -351,7 +368,7 @@ msgstr "בחירת כל %(total_count)s ה־%(module_name)s"
 msgid "Clear selection"
 msgstr "איפוס בחירה"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -361,22 +378,22 @@ msgid "Welcome,"
 msgstr "שלום,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "תיעוד"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "שינוי סיסמה"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "יציאה"
 
@@ -388,57 +405,57 @@ msgstr "ניהול אתר Django"
 msgid "Django administration"
 msgstr "ניהול Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "הוספה"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "היסטוריה"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "צפיה באתר"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "נא לתקן את השגיאה המופיעה מתחת."
 msgstr[1] "נא לתקן את השגיאות המופיעות מתחת."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "הוספת %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "סינון"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "הסרה ממיון"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "עדיפות מיון: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "החלף כיוון מיון"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -448,7 +465,7 @@ msgstr ""
 "מחיקת %(object_name)s '%(escaped_object)s' מצריכה מחיקת אובייקטים מקושרים, "
 "אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -457,7 +474,7 @@ msgstr ""
 "מחיקת ה%(object_name)s '%(escaped_object)s' תדרוש מחיקת האובייקטים הקשורים "
 "והמוגנים הבאים:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -466,16 +483,16 @@ msgstr ""
 "האם ברצונך למחוק את %(object_name)s \"%(escaped_object)s\"? כל הפריטים "
 "הקשורים הבאים יימחקו:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "כן, אני בטוח/ה"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "מחק כמה פריטים"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -485,7 +502,7 @@ msgstr ""
 "מחיקת ב%(objects_name)s הנבחרת תביא במחיקת אובייקטים קשורים, אבל החשבון שלך "
 "אינו הרשאה למחוק את הסוגים הבאים של אובייקטים:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -494,7 +511,7 @@ msgstr ""
 "מחיקת ה%(objects_name)s אשר סימנת תדרוש מחיקת האובייקטים הקשורים והמוגנים "
 "הבאים:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -508,36 +525,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " לפי %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "מודלים זמינים ביישום %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "מודלים ביישום %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "שינוי"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "אין לך הרשאות לעריכה."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "פעולות אחרונות"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "הפעולות שלי"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "לא נמצאו"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "תוכן לא ידוע"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -546,31 +563,27 @@ msgstr ""
 "משהו שגוי בהתקנת בסיס הנתונים שלך. נא לוודא שנוצרו טבלאות בסיס הנתונים "
 "המתאימות, ובסיס הנתונים ניתן לקריאה על ידי המשתמש המתאים."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "שם משתמש:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "שכחת את שם המשתמש והסיסמה שלך ?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "תאריך/שעה"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "משתמש"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "פעולה"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -625,64 +638,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "נא לשים שם משתמש וסיסמה."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "יש להזין סיסמה חדשה עבור המשתמש <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "סיסמה"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "סיסמה (שוב)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "יש להזין את אותה סיסמה שוב,לאימות."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "להסיר"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "הוספת %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "להסיר"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "מחיקה ?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "תודה על בילוי זמן איכות עם האתר."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "התחבר/י שוב"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "שינוי סיסמה"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "הסיסמה שונתה בהצלחה"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "סיסמתך שונתה."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -690,64 +703,64 @@ msgstr ""
 "נא להזין את סיסמתך הישנה, לצרכי אבטחה, ולאחר מכן את סיסמתך החדשה פעמיים כדי "
 "שנוכל לוודא שהקלדת אותה כראוי."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "סיסמה ישנה"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "שנה את סיסמתי"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "איפוס סיסמה"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "איפוס הסיסמה הושלם"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "ססמתך נשמרה. כעת ניתן להתחבר."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "אימות איפוס סיסמה"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "הזנת סיסמה חדשה"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "נא להזין את סיסמתך החדשה פעמיים כדי שנוכל לוודא שהקלדת אותה כראוי."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "סיסמה חדשה:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "אימות סיסמה:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "איפוס הסיסמה נכשל"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -755,14 +768,14 @@ msgstr ""
 "הקישור לאיפוס הסיסמה אינו חוקי. ייתכן והשתמשו בו כבר. נא לבקש איפוס סיסמה "
 "חדש."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "הסיסמה אופסה בהצלחה"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "שלחנו הוראות לקביעת הסיסמה אל כתובת הדוא\"ל שהזנת. ההודעה אמורה להתקבל בקרוב."
@@ -770,7 +783,7 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 "הודעה זו נשלחה אליך עקב בקשתך לאיפוס הסיסמה עבור המשתמש שלך באתר "
@@ -793,36 +806,36 @@ msgstr "תודה על השימוש באתר שלנו!"
 msgid "The %(site_name)s team"
 msgstr "צוות %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "שכחת את סיסמתך ? נא להזין את כתובת הדוא\"ל מתחת, ואנו נשלח הוראות לקביעת "
 "סיסמה חדשה."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "כתובת דוא\"ל:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "אפס את סיסמתי"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "כל התאריכים"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(אין)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "בחירת %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "בחירת %s לשינוי"
diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo
index e3bad0ef4a..fc6b8b704e 100644
Binary files a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po
index dfb148dcae..0bcb7a62e5 100644
--- a/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po
@@ -4,20 +4,21 @@
 # Alex Gaynor <alex.gaynor@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Meir Kriheli <meir@mksoft.co.il>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: Alex Gaynor <alex.gaynor@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"PO-Revision-Date: 2012-10-21 11:05+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -30,11 +31,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"זו רשימת %s הזמינים לבחירה. ניתן לבחור חלק ע\"י סימון בתיבה מתחת ולחיצה על "
+"חץ  \"בחר\" בין שתי התיבות."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "ניתן להקליד בתיבה זו כדי לסנן %s."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -47,11 +50,11 @@ msgstr "בחירת הכל"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "בחירת כל ה%s בבת אחת."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "בחר"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -60,7 +63,7 @@ msgstr "הסרה"
 #: static/admin/js/SelectFilter2.js:75
 #, c-format
 msgid "Chosen %s"
-msgstr "%s נבחרות"
+msgstr "%s אשר נבחרו"
 
 #: static/admin/js/SelectFilter2.js:76
 #, c-format
@@ -68,15 +71,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"זו רשימת %s אשר נבחרו. ניתן להסיר חלק ע\"י בחירה בתיבה מתחת ולחיצה על חץ "
+"\"הסרה\" בין שתי התיבות."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "הסרת הכל"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "הסרת כל %s אשר נבחרו בבת אחת."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo
index b2ba165b9f..fb0b69c6e9 100644
Binary files a/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/hi/LC_MESSAGES/django.po b/django/contrib/admin/locale/hi/LC_MESSAGES/django.po
index af4eab2d7c..91712c7c75 100644
--- a/django/contrib/admin/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/hi/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <alok.kumar@gmail.com>, 2013.
 # Chandan kumar <chandankumar.093047@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Sandeep Satavlekar <sandysat@gmail.com>, 2011.
@@ -8,28 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-09 10:14+0000\n"
+"Last-Translator: alkuma <alok.kumar@gmail.com>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s सफलतापूर्वक हट गयें |"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s नहीं हटा सकते"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "क्या आप निश्चित हैं?"
 
@@ -38,258 +39,278 @@ msgstr "क्या आप निश्चित हैं?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "चुने हुए %(verbose_name_plural)s  हटा दीजिये "
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "सभी"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "हाँ"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "नहीं"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "अनजान"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "कोई भी तारीख"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "आज"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "पिछले 7 दिन"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "इस महीने"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "इस साल"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"कृपया कर्मचारी के खाते के लिए सही उपयोगकर्ता नाम और कूटशब्द दर्ज करें.ध्यान दें कि दोनों "
-"क्षेत्रों मामले के प्रति संवेदनशील हैं"
+"कृपया कर्मचारी खाते का सही %(username)s व कूटशब्द भरें। भरते समय दीर्घाक्षर और लघु अक्षर "
+"का खयाल रखें।"
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "कृपया फिर से प्रवेश करें, क्योंकि आपका सत्र समाप्त हो गया है |"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"अपना ई मेल पता आपका उपयोगकर्ता नाम नहीं है | कृपया '%s'  का प्रयोग कर के देखिये |"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr " क्रिया:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "कार्य समय"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "वस्तु आई डी "
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "वस्तु प्रतिनिधित्व"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "कार्य ध्वज"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "परिवर्तन सन्देश"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "लॉग प्रविष्टि"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "लॉग प्रविष्टियाँ"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" को जोड़ा गया."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "परिवर्तित \"%(object)s\" - %(changes)s "
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\" को नष्ट कर दिया है."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry ऑब्जेक्ट"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "कोई नहीं"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s को बदला गया हैं"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "और"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" को जोडा गया हैं"
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" की %(list)s बदला गया है"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" निकाला गया है"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "कोई क्षेत्र नहीं बदला"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" को कामयाबी से जोडा गया है"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "आप इसे फिर से संपादित कर सकते हैं"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "आप नीचे एक और %s जोड सकते हैं"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" को कामयाबी से बदला गया हैं"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" कामयाबी से जोडा गया हैं । आप इसे फिर से संपादित कर सकते हैं"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+" %(name)s \"%(obj)s\" सफलतापूर्वक जोड़ दिया गया। आप चाहें तो नीचे एक और %(name)s "
+"जोड़ सकते हैं।"
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" को कामयाबी से जोडा गया है"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+" %(name)s \"%(obj)s\" सफलतापूर्वक जोड़ दिया गया। आप चाहें तो नीचे इसे बदल भी सकते हैं।"
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+" %(name)s \"%(obj)s\" सफलतापूर्वक बदल दिया गया। आप चाहें तो नीचे एक और %(name)s "
+"जोड़ सकते हैं।"
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" को कामयाबी से बदला गया हैं"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr "कार्रवाई हेतु आयटम सही अनुक्रम में चुने जाने चाहिए | कोई आइटम नहीं बदले गये हैं."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "कोई कार्रवाई नहीं चुनी है |"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s बढाएं"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s  नामक कोई वस्तू जिस की प्राथमिक कुंजी %(key)r हो, अस्तित्व में नहीं हैं |"
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s बदलो"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "डेटाबेस त्रुटि"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s का परिवर्तन कामयाब हुआ |"
 msgstr[1] "%(count)s %(name)s का परिवर्तन कामयाब हुआ |"
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s चुने"
 msgstr[1] "सभी %(total_count)s चुने "
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s में से 0 चुने"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" को कामयाबी से निकाला गया है"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "इतिहास बदलो: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "लॉगिन"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "साइट प्रशासन"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s प्रशासन"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "तिथि:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "समय:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "लुक अप"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "अन्य बढाएं"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "फ़िलहाल - "
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "बदलाव -"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "पृष्ठ लापता"
@@ -298,42 +319,42 @@ msgstr "पृष्ठ लापता"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "क्षमा कीजिए पर निवेदित पृष्ठ लापता है ।"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "गृह"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "सर्वर त्रुटि"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "सर्वर त्रुटि (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "सर्वर त्रुटि <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"एक ग़लती हुई हैं | उसकी जानकारी साईट प्रशासन को इ-मेल द्वारा दी गयी हैं और जल्द ही उसे "
-"संवारा जायेगा | आप के धैर्य के लिए धन्यवाद |"
+"एक त्रुटि मिली है। इसकी जानकारी स्थल के संचालकों को डाक द्वारा दे दी गई है, और यह जल्द "
+"ठीक हो जानी चाहिए। धीरज रखने के लिए शुक्रिया।"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -356,7 +377,7 @@ msgstr "तमाम %(total_count)s %(module_name)s चुनें"
 msgid "Clear selection"
 msgstr "चयन खालिज किया जाये "
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -366,22 +387,22 @@ msgid "Welcome,"
 msgstr "आपका स्वागत है,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "दस्तावेज़ीकरण"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "कूटशब्द बदलें"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "लॉग आउट"
 
@@ -393,35 +414,35 @@ msgstr "ज्याँगो साइट प्रशासन"
 msgid "Django administration"
 msgstr "ज्याँगो प्रशासन"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "बढाएं"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "इतिहास"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "साइट पे देखें"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "कृपया नीचे पायी गयी गलती ठीक करें ।"
 msgstr[1] "कृपया नीचे पायी गयी गलतियाँ ठीक करें ।"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s बढाएं"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "छन्नी"
 
@@ -438,12 +459,12 @@ msgstr "श्रेणीकरण प्राथमिकता : %(priority_
 msgid "Toggle sorting"
 msgstr "टॉगल श्रेणीकरण"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "मिटाएँ"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -453,7 +474,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' को मिटाने पर सम्बंधित वस्तुएँ भी मिटा दी "
 "जाएगी, परन्तु आप के खाते में निम्नलिखित प्रकार की वस्तुओं को मिटाने की अनुमति नहीं हैं |"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -462,7 +483,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' को  हटाने के लिए उनसे संबंधित निम्नलिखित "
 "संरक्षित वस्तुओं को हटाने की आवश्यकता होगी:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -471,16 +492,16 @@ msgstr ""
 "क्या आप %(object_name)s \"%(escaped_object)s\" हटाना चाहते हैं? निम्नलिखित सभी "
 "संबंधित वस्तुएँ नष्ट की जाएगी"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "हाँ, मैंने पक्का तय किया हैं "
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "अनेक वस्तुएं हटाएँ"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -490,7 +511,7 @@ msgstr ""
 "चयनित %(objects_name)s हटाने पर उस से सम्बंधित वस्तुएं भी हट जाएगी, परन्तु आपके खाते में "
 "वस्तुओं के निम्नलिखित प्रकार हटाने की अनुमति नहीं है:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -499,7 +520,7 @@ msgstr ""
 "चयनित %(objects_name)s को हटाने के पश्चात् निम्नलिखित संरक्षित संबंधित वस्तुओं को हटाने "
 "की आवश्यकता होगी |"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -513,36 +534,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "%(filter_title)s द्वारा"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s के आवेदन में उपलब्ध मॉडल |"
+msgid "Models in the %(name)s application"
+msgstr "%(name)s अनुप्रयोग के प्रतिरूप"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "बदलें"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "आपके पास कुछ भी संपादन करने के लिये अनुमति नहीं है ।"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "हाल क्रियाएँ"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "मेरे कार्य"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr " कोई भी उपलब्ध नहीं"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "अज्ञात सामग्री"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -551,31 +572,27 @@ msgstr ""
 "अपने डेटाबेस स्थापना के साथ कुछ गलत तो है | सुनिश्चित करें कि उचित डेटाबेस तालिका बनायीं "
 "गयी है, और सुनिश्चित करें कि डेटाबेस उपयुक्त उपयोक्ता के द्वारा पठनीय है |"
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "प्रवोक्ता नाम"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "कूटशब्द"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "अपना पासवर्ड या उपयोगकर्ता नाम भूल गये हैं?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "तिथि / समय"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "उपभोक्ता"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "कार्य"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -631,64 +648,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "उपयोगकर्ता का नाम और कूटशब्द दर्ज करें."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "<strong>%(username)s</strong> प्रवोक्ता के लिए नयी कूटशब्द दर्ज करें ।"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "कूटशब्द"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "शब्दकूट (दुबारा)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "सत्याप्ती के लिए ऊपर दर्ज किए कूटशब्द को फिर से प्रवेश करें"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "निकालें"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "एक और %(verbose_name)s जोड़ें "
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "निकालें"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "मिटाएँ ?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "आज हमारे वेब साइट पर आने के लिए धन्यवाद ।"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "फिर से लॉगिन कीजिए"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "कूटशब्द बदलें"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "कूटशब्द कदली कामयाब"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "आपके कूटशब्द को बदला गया है"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -696,64 +713,64 @@ msgstr ""
 "सुरक्षा कारणों के लिए कृपया पुराना कूटशब्द दर्ज करें । उसके पश्चात नए कूटशब्द को दो बार दर्ज "
 "करें ताकि हम उसे सत्यापित कर सकें ।"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "पुराना कूटशब्द "
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "नया कूटशब्द "
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "कूटशब्द बदलें"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "कूटशब्द पुनस्थाप"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "कूटशब्द पुनस्थाप कामयाब"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "आपके कूटशब्द को स्थापित किया गया है । अब आप लॉगिन कर सकते है ।"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "कूटशब्द पुष्टि"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "नया कूटशब्द दीजिएं"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "कृपया आपके नये कूटशब्द को दो बार दर्ज करें ताकि हम उसकी सत्याप्ती कर सकते है ।"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "नया कूटशब्द "
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "कूटशब्द पुष्टि कीजिए"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "कूटशब्द पुनस्थाप असफल"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -761,27 +778,27 @@ msgstr ""
 "कूटशब्द पुनस्थाप संपर्क अमान्य है, संभावना है कि उसे उपयोग किया गया है। कृपया फिर से कूटशब्द "
 "पुनस्थाप की आवेदन करें ।"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "कूटशब्द पुनस्थाप सफल"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"हमने आपके ईमेल पता पर कूटशब्द स्थापित करने के निर्देश भेजे है । थोडी ही देर में आप उसे प्राप्त "
-"करेंगे ।"
+"हमने आपके डाक पते पर कूटशब्द स्थापित करने के निर्देश भेजे है । थोडी ही देर में ये आपको मिल "
+"जाएँगे।"
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"आप यह इ-मेल पा रहे हो क्योंकी आप ने %(site_name)s पर आप के उपयोग कर्ता खाते का कूटशब्द "
-"पुनःस्थापित करने का अनुरोध किया था |"
+"आपको यह डाक इसलिए आई है क्योंकि आप ने %(site_name)s पर अपने खाते का कूटशब्द बदलने का "
+"अनुरोध किया था |"
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -800,36 +817,35 @@ msgstr "हमारे साइट को उपयोग करने के
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s दल"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"क्या आप कूटशब्द भूल गये हैं? कृपया नीचे अपना ईमेल पता दर्ज करें, हम नया कूटशब्द स्थापित करने "
-"के निर्देश ईमेल के द्वारा भेजेंगे ।"
+"कूटशब्द भूल गए? नीचे अपना डाक पता भरें, वहाँ पर हम आपको नया कूटशब्द रखने के निर्देश भेजेंगे।"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "ईमेल पता :"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "डाक पता -"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr " मेरे कूटशब्द की पुनःस्थापना"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "सभी तिथियों"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(कोई नहीं)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s चुनें"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s के बदली के लिए चयन करें"
diff --git a/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.mo
index 5757046b66..9ff9bb645f 100644
Binary files a/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.po
index 9b13753fdb..a5fe15044b 100644
--- a/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-15 12:59+0000\n"
 "Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo
index 2a4dcaa2b9..0255edafeb 100644
Binary files a/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/hr/LC_MESSAGES/django.po b/django/contrib/admin/locale/hr/LC_MESSAGES/django.po
index 24a7cbc1c1..d19c3eead9 100644
--- a/django/contrib/admin/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/hr/LC_MESSAGES/django.po
@@ -2,37 +2,38 @@
 #
 # Translators:
 # aljosa <aljosa.mohorovic@gmail.com>, 2011.
+#   <aljosa.mohorovic@gmail.com>, 2013.
 # Bojan Mihelač <bmihelac@mihelac.org>, 2012.
-# Davor Lučić <r.dav.lc@gmail.com>, 2011.
+# Davor Lučić <r.dav.lc@gmail.com>, 2011-2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Ylodi <stjepan@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-19 16:18+0000\n"
-"Last-Translator: Bojan Mihelač <bmihelac@mihelac.org>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-14 18:34+0000\n"
+"Last-Translator: aljosa <aljosa.mohorovic@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Uspješno izbrisano %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Nije moguće izbrisati %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Jeste li sigurni?"
 
@@ -41,168 +42,182 @@ msgstr "Jeste li sigurni?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Izbrišite odabrane %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Svi"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Da"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ne"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Nepoznat pojam"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Bilo koji datum"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Danas"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Prošlih 7 dana"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Ovaj mjesec"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Ova godina"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Molimo unesite ispravno korisničko ime i lozinku za korisnički račun "
-"osoblja.  Uzmite u obzir da oba polja razlikuju velika/mala slova."
+"Molimo unesite ispravno %(username)s i lozinku za pristup. Imajte na umu da "
+"oba polja mogu biti velika i mala slova."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Molim prijavite se ponovo jer je vaš session istekao."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Vaša e-mail adresa nije vaše korisničko ime. Pokušajte sa '%s'"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Akcija:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "vrijeme akcije"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id objekta"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr objekta"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "oznaka akcije"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "promijeni poruku"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "zapis"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "zapisi"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Dodano \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Promijenjeno \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Obrisano \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Log zapis"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Nijedan"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Promijenjeno %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "i"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Dodano %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Promijeni %(list)s za %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Izbrisani %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nije bilo promjena polja."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" uspješno je dodano."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Možete ponovo urediti unos dolje."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Možete dodati još jedan %s ispod."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" uspješno promijenjeno."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" uspješno dodan. Možete ponovo urediti unos dolje."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"Unos %(name)s \"%(obj)s\" je uspješno dodan. Možete dodati još jedan unos "
+"(%(name)s) u nastavku."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" uspješno je dodano."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"Unos %(name)s \"%(obj)s\" je uspješno promijenjen. Možete ga urediti ponovno "
+"ispod."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"Unos %(name)s \"%(obj)s\" je uspješno promijenjen. Možete dodati još jedan "
+"(%(name)s) u nastavku."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" uspješno promijenjeno."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -210,30 +225,30 @@ msgstr ""
 "Unosi moraju biti odabrani da bi se nad njima mogle izvršiti akcije. Nijedan "
 "unos nije promijenjen."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nije odabrana akcija."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Novi unos (%s)"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Unos %(name)s sa primarnim ključem %(key)r ne postoji."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Promijeni %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Pogreška u bazi"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -241,7 +256,7 @@ msgstr[0] "%(count)s %(name)s uspješno promijenjen."
 msgstr[1] "%(count)s %(name)s uspješno promijenjeno."
 msgstr[2] "%(count)s %(name)s uspješno promijenjeno."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -249,52 +264,60 @@ msgstr[0] "%(total_count)s odabrano"
 msgstr[1] "Svih %(total_count)s odabrano"
 msgstr[2] "Svih %(total_count)s odabrano"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 od %(cnt)s odabrano"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" uspješno izbrisan."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Promijeni povijest: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Prijavi se"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administracija stranica"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s administracija"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Vrijeme:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Potraži"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Unesi još"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Trenutno:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Promijeni:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Stranica nije pronađena"
@@ -303,42 +326,42 @@ msgstr "Stranica nije pronađena"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ispričavamo se, ali tražena stranica nije pronađena."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Početna"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Greška na serveru"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Greška na serveru (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Greška na serveru <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Dogodila se greška. Administratori su obaviješteni putem e-maila te bi "
-"greška uskoro trebala biti ispravljena. Hvala na strpljenju."
+"Dogodila se greška. Administratori su obaviješteni putem elektroničke pošte "
+"te bi greška uskoro trebala biti ispravljena. Hvala na strpljenju."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -361,7 +384,7 @@ msgstr "Odaberi svih %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Očisti odabir"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -371,22 +394,22 @@ msgid "Welcome,"
 msgstr "Dobrodošli,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Promijeni lozinku"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Odjava"
 
@@ -398,36 +421,36 @@ msgstr "Django administracija stranica"
 msgid "Django administration"
 msgstr "Django administracija"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Novi unos"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Povijest"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Pogledaj na stranicama"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Molimo ispravite navedenu grešku."
 msgstr[1] "Molimo ispravite navedene greške."
 msgstr[2] "Molimo ispravite navedene greške."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Novi unos - %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -444,12 +467,12 @@ msgstr "Prioritet sortiranja: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Preklopi sortiranje"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -459,7 +482,7 @@ msgstr ""
 "Brisanje %(object_name)s '%(escaped_object)s' rezultiralo bi brisanjem "
 "povezanih objekta, ali vi nemate privilegije za brisanje navedenih objekta: "
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -468,7 +491,7 @@ msgstr ""
 "Brisanje %(object_name)s '%(escaped_object)s' bi zahtijevalo i brisanje "
 "sljedećih zaštićenih povezanih objekata:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -477,16 +500,16 @@ msgstr ""
 "Jeste li sigurni da želite izbrisati %(object_name)s \"%(escaped_object)s\"? "
 "Svi navedeni objekti biti će izbrisani:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Da, siguran sam"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Izbriši više unosa."
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -497,7 +520,7 @@ msgstr ""
 "objekta, ali vaš korisnički račun nema dozvolu za brisanje sljedeće vrste "
 "objekata:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -506,7 +529,7 @@ msgstr ""
 "Brisanje odabranog %(objects_name)s  će zahtijevati brisanje sljedećih "
 "zaštićenih povezanih objekata:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -520,36 +543,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Po %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeli dostupni u %(name)s aplikaciji."
+msgid "Models in the %(name)s application"
+msgstr "Modeli u aplikaciji %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Promijeni"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nemate privilegije za promjenu podataka."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Nedavne promjene"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Moje promjene"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nije dostupno"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Sadržaj nepoznat"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -558,31 +581,27 @@ msgstr ""
 "Nešto nije uredu sa instalacijom/postavkama baze. Provjerite jesu li "
 "potrebne tablice u bazi kreirane i provjerite je li baza dostupna korisniku."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Korisničko ime:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Zaboravili ste lozinku ili korisničko ime?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datum/vrijeme"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Korisnik"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Akcija"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -639,64 +658,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Unesite korisničko ime i lozinku."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Unesite novu lozinku za korisnika <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Lozinka (unesi ponovo)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Unesite istu lozinku, za potvrdu."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Ukloni"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Dodaj još jedan %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Ukloni"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Izbriši?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Hvala što ste proveli malo kvalitetnog vremena na stranicama danas."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Prijavite se ponovo"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Promjena lozinke"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Promjena lozinke uspješna"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Vaša lozinka je promijenjena."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -704,46 +723,46 @@ msgstr ""
 "Molim unesite staru lozinku, zbog sigurnosti, i onda unesite novu lozinku "
 "dvaput da bi mogli provjeriti jeste li je ispravno unijeli."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Stara lozinka"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Promijeni moju lozinku"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Resetiranje lozinke"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Resetiranje lozinke završeno"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Vaša lozinka je postavljena. Sada se možete prijaviti."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Potvrda promjene lozinke"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Unesite novu lozinku"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -751,19 +770,19 @@ msgstr ""
 "Molimo vas da unesete novu lozinku dvaput da bi mogli provjeriti jeste li je "
 "ispravno unijeli."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nova lozinka:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Potvrdi lozinku:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Resetiranje lozinke neuspješno"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -771,14 +790,14 @@ msgstr ""
 "Link za resetiranje lozinke je neispravan, vjerojatno jer je već korišten. "
 "Molimo zatražite novo resetiranje lozinke."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Resetiranje lozinke uspješno"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "Poslali smo vam upute za postavljenje vaše lozinke na e-mail adresu koju ste "
@@ -787,10 +806,10 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Dobili ste ovu e-mail poruku jer ste zatražili obnovu lozinke za vaš "
+"Primili ste ovu poruku jer ste zatražili postavljanje nove lozinke za svoj "
 "korisnički račun na %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
@@ -810,36 +829,36 @@ msgstr "Hvala šta koristite naše stranice!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s tim"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "Zaboravili ste lozinku? Unesite vašu e-mail adresu ispod i poslati ćemo vam "
 "upute kako postaviti novu."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "E-mail adresa:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Resetiraj moju lozinku"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Svi datumi"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Nijedan)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Odaberi %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Odaberi za promjenu - %s"
diff --git a/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.mo
index cd94c23894..3e7bd0ae2f 100644
Binary files a/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.po
index ce45497183..a2c0c4f2df 100644
--- a/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.po
@@ -12,14 +12,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-22 11:03+0000\n"
 "Last-Translator: Bojan Mihelač <bmihelac@mihelac.org>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo
index dbd0c48136..bae1c89fe2 100644
Binary files a/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/django.po b/django/contrib/admin/locale/hu/LC_MESSAGES/django.po
index 4eb299ddce..9435f13370 100644
--- a/django/contrib/admin/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/hu/LC_MESSAGES/django.po
@@ -4,33 +4,34 @@
 #   <gabor@20y.hu>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Kristóf Gruber <>, 2012.
+# Máté Őry <orymate@iit.bme.hu>, 2012.
 # Szilveszter Farkas <szilveszter.farkas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-19 19:23+0000\n"
-"Last-Translator: Kristóf Gruber <>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s sikeresen törölve lett."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s törlése nem sikerült"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Biztos benne?"
 
@@ -39,166 +40,174 @@ msgstr "Biztos benne?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Kiválasztott %(verbose_name_plural)s törlése"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Mind"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Igen"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nem"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Bármely dátum"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Ma"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Utolsó 7 nap"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Ez a hónap"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Ez az év"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Jelentkezzen be újra, mert a munkamenete lejárt."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Az email címe nem a felhasználóneve. Próbálja inkább ezt: %s."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Művelet:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "művelet időpontja"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objektum id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objektum repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "művelet jelölés"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "üzenet módosítása"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "naplóbejegyzés"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "naplóbejegyzések"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" hozzáadva."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\" megváltoztatva: %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\" törölve."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr "Napló bejegyzés objektum"
+msgstr "Naplóbejegyzés objektum"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Egyik sem"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s módosítva."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "és"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "\"%(object)s\" %(name)s létrehozva."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "\"%(object)s\" %(name)s tulajdonságai (%(list)s) megváltoztak."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "\"%(object)s\" %(name)s törlésre került."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Egy mező sem változott."
 
-#: options.py:772
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "\"%(obj)s\" %(name)s sikeresen létrehozva. Alább ismét szerkesztheti."
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "\"%(obj)s\" %(name)s sikeresen létrehozva."
 
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Alább ismét szerkesztheti."
-
-#: options.py:788 options.py:837
+#: options.py:853
 #, python-format
-msgid "You may add another %s below."
-msgstr "Alább hozzáadhat egy másikat ebből: %s."
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
 
-#: options.py:822
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "\"%(obj)s\" %(name)s sikeresen módosítva."
 
-#: options.py:830
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "\"%(obj)s\" %(name)s sikeresen létrehozva. Alább ismét szerkesztheted."
-
-#: options.py:899 options.py:1159
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -206,89 +215,97 @@ msgstr ""
 "A műveletek végrehajtásához ki kell választani legalább egy elemet. Semmi "
 "sem lett módosítva."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nem választott ki műveletet."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Új %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s objektum %(key)r elsődleges kulccsal nem létezik."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s módosítása"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
-msgstr "Adatbázis hiba"
+msgstr "Adatbázishiba"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s sikeresen módosítva lett."
 msgstr[1] "%(count)s %(name)s sikeresen módosítva lett."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s kiválasztva"
 msgstr[1] "%(total_count)s kiválasztva"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 kiválasztva ennyiből: %(cnt)s"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "\"%(obj)s\" %(name)s sikeresen törölve."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Változások története: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Bejelentkezés"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
-msgstr "Honlap karbantartás"
+msgstr "Honlap karbantartása"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s adminisztráció"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dátum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Idő:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Keresés"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Újabb hozzáadása"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Nincs ilyen oldal"
@@ -297,42 +314,40 @@ msgstr "Nincs ilyen oldal"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Sajnáljuk, de a kért oldal nem található."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Kezdőlap"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Szerverhiba"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Szerverhiba (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Szerverhiba <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Hiba történt, melyet e-mailben jelentettünk az oldal karbantartójának. A "
-"rendszer remélhetően hamar megjavul. Köszönjük a türelmét."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -355,7 +370,7 @@ msgstr "Az összes %(module_name)s kiválasztása, összesen %(total_count)s db"
 msgid "Clear selection"
 msgstr "Kiválasztás törlése"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -365,62 +380,62 @@ msgid "Welcome,"
 msgstr "Üdvözlöm,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentáció"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Kijelentkezés"
 
 #: templates/admin/base_site.html:4
 msgid "Django site admin"
-msgstr "Django honlap adminisztráció"
+msgstr "Django honlapadminisztráció"
 
 #: templates/admin/base_site.html:7
 msgid "Django administration"
 msgstr "Django adminisztráció"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Új"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Történet"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Megtekintés a honlapon"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] "Kérem javítsa az alábbi hibát."
-msgstr[1] "Kérlem javítsa az alábbi hibákat."
+msgstr[0] "Kérem, javítsa az alábbi hibát."
+msgstr[1] "Kérem, javítsa az alábbi hibákat."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Új %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Szűrő"
 
@@ -437,32 +452,32 @@ msgstr "Prioritás rendezésnél: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Rendezés megfordítása"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
 "related objects, but your account doesn't have permission to delete the "
 "following types of objects:"
 msgstr ""
-"'%(escaped_object)s' %(object_name)s törlése a kapcsolódó objektumok "
+"\"%(escaped_object)s\" %(object_name)s törlése a kapcsolódó objektumok "
 "törlését is eredményezi, de a hozzáférése nem engedi a következő típusú "
 "objektumok törlését:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
-"'%(escaped_object)s' %(object_name)s törlése az alábbi kapcsolódó objektumok "
-"törlését is maga után vonja:"
+"\"%(escaped_object)s\" %(object_name)s törlése az alábbi kapcsolódó "
+"objektumok törlését is maga után vonja:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -471,16 +486,16 @@ msgstr ""
 "Biztos hogy törli a következőt: \"%(escaped_object)s\" (típus: "
 "%(object_name)s)? A összes további kapcsolódó elem is törlődik:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Igen, biztos vagyok benne"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Több elem törlése"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -491,7 +506,7 @@ msgstr ""
 "maga után, de az alábbi objektumtípusok törléséhez nincs megfelelő "
 "jogosultsága:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -500,7 +515,7 @@ msgstr ""
 "A kiválasztott %(objects_name)s törlése az alábbi védett kapcsolódó "
 "objektumok törlését is maga után vonja:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -514,36 +529,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s szerint "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s alkalmazásban elérhető modellek."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Módosítás"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nincs joga szerkeszteni."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Utolsó műveletek"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Az én műveleteim"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nincs elérhető"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Ismeretlen tartalom"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -553,37 +568,31 @@ msgstr ""
 "a megfelelő táblák létre lettek-e hozva, és hogy a megfelelő felhasználó "
 "tudja-e őket olvasni."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Felhasználó:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr "Elfelejtetted a jelszavad vagy felhasználó neved?"
+msgstr "Elfelejtette jelszavát vagy felhasználónevét?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dátum/idő"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Felhasználó"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Művelet"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
-msgstr ""
-"Az objektumnak nincs változási története. Valószínűleg nem ezen a "
-"karbantartó oldalon lett rögzítve."
+msgstr "Honlap karbantartása"
 
 #: templates/admin/pagination.html:10
 msgid "Show all"
@@ -633,65 +642,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Írjon be egy felhasználónevet és jelszót."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
-"Adjon meg egy új jelszót a <strong>%(username)s</strong> nevű felhasználónak."
+"Adjon meg egy új jelszót <strong>%(username)s</strong> nevű felhasználónak."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Jelszó újra"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Írja be a fenti jelszót ellenőrzés céljából."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Törlés"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Újabb %(verbose_name)s hozzáadása"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Törlés"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Törli?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Köszönjük hogy egy kis időt eltöltött ma a honlapunkon."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Jelentkezzen be újra"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Jelszó megváltoztatása"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Sikeres jelszóváltoztatás"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Megváltozott a jelszava."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -699,46 +708,46 @@ msgstr ""
 "Írja be a régi jelszavát biztonsági okokból, majd az újat kétszer, hogy "
 "biztosan ne gépelje el."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Új jelszó"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Jelszavam megváltoztatása"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Jelszó beállítása"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Jelszó beállítása kész"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Jelszava beállításra került.  Most már bejelentkezhet."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Jelszó beállítás megerősítése"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Írja be az új jelszavát"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -746,47 +755,43 @@ msgstr ""
 "Írja be az új jelszavát kétszer, hogy megbizonyosodhassunk annak "
 "helyességéről."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Új jelszó:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Jelszó megerősítése:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
-msgstr "Sikertelen jelszó beállítás"
+msgstr "Jelszó beállítása sikertelen"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
-"A jelszó beállító link érvénytelen. Ennek egyik oka az lehet, hogy már "
-"felhasználták.  Kérem igényeljen új jelszó beállítást."
+"A jelszóbeállító link érvénytelen. Ennek egyik oka az lehet, hogy már "
+"felhasználták.  Kérem indítson új jelszóbeállítást."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Sikeres jelszótörlés"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Az információkat elküldtük e-mailben a megadott címre. Hamarosan meg kell "
-"érkeznie."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Azért kapja ezt az e-mailt, mert jelszavának visszaállítását kérte ezen a "
-"weboldalon: %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -805,36 +810,34 @@ msgstr "Köszönjük, hogy használta honlapunkat!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s csapat"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Elfelejtette a jelszavát? Írja be az e-mail címét, és küldünk egy levelet a "
-"teendőkről."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-mail cím:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Jelszavam törlése"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Minden dátum"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(nincs)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
-msgstr "Kiválasztás %s"
+msgstr "%s kiválasztása"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Válasszon ki egyet a módosításhoz (%s)"
diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo
index 8e853f000d..0f20a86cf2 100644
Binary files a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po
index 9383aef026..6c834ae1a6 100644
--- a/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po
@@ -4,21 +4,22 @@
 # Attila Nagy <>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # János Péter Ronkay <transifex@hangya.net>, 2011.
+# Máté Őry <orymate@iit.bme.hu>, 2012.
 # Szilveszter Farkas <szilveszter.farkas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-19 19:28+0000\n"
-"Last-Translator: Attila Nagy <>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"PO-Revision-Date: 2012-06-29 19:35+0000\n"
+"Last-Translator: Máté Őry <orymate@iit.bme.hu>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -31,11 +32,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Ez az elérhető %s listája. Úgy választhat közülük, hogy rákattint az alábbi "
+"dobozban, és megnyomja a dobozok közti \"Választás\" nyilat."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Írjon a mezőbe az elérhető %s szűréséhez."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -48,7 +51,7 @@ msgstr "Mindet kijelölni"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Kattintson az összes %s kiválasztásához."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
@@ -69,6 +72,8 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Ez a kiválasztott %s listája. Eltávolíthat közülük, ha rákattint, majd a két "
+"doboz közti \"Eltávolítás\" nyílra kattint."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
@@ -77,7 +82,7 @@ msgstr "Összes törlése"
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Kattintson az összes %s eltávolításához."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/ia/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..bad4fecd6a
Binary files /dev/null and b/django/contrib/admin/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ia/LC_MESSAGES/django.po b/django/contrib/admin/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..e58caec446
--- /dev/null
+++ b/django/contrib/admin/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,845 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 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-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: actions.py:48
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr "%(count)d %(items)s delite con successo."
+
+#: actions.py:60 options.py:1347
+#, python-format
+msgid "Cannot delete %(name)s"
+msgstr "Non pote deler %(name)s"
+
+#: actions.py:62 options.py:1349
+msgid "Are you sure?"
+msgstr "Es tu secur?"
+
+#: actions.py:83
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr "Deler le %(verbose_name_plural)s seligite"
+
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
+msgid "All"
+msgstr "Totes"
+
+#: filters.py:238
+msgid "Yes"
+msgstr "Si"
+
+#: filters.py:239
+msgid "No"
+msgstr "No"
+
+#: filters.py:253
+msgid "Unknown"
+msgstr "Incognite"
+
+#: filters.py:308
+msgid "Any date"
+msgstr "Omne data"
+
+#: filters.py:309
+msgid "Today"
+msgstr "Hodie"
+
+#: filters.py:313
+msgid "Past 7 days"
+msgstr "Ultime 7 dies"
+
+#: filters.py:317
+msgid "This month"
+msgstr "Iste mense"
+
+#: filters.py:321
+msgid "This year"
+msgstr "Iste anno"
+
+#: forms.py:9
+#, python-format
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr "Per favor aperi session de novo, perque tu session ha expirate."
+
+#: helpers.py:23
+msgid "Action:"
+msgstr "Action:"
+
+#: models.py:24
+msgid "action time"
+msgstr "hora de action"
+
+#: models.py:27
+msgid "object id"
+msgstr "id de objecto"
+
+#: models.py:28
+msgid "object repr"
+msgstr "repr de objecto"
+
+#: models.py:29
+msgid "action flag"
+msgstr "marca de action"
+
+#: models.py:30
+msgid "change message"
+msgstr "message de cambio"
+
+#: models.py:35
+msgid "log entry"
+msgstr "entrata de registro"
+
+#: models.py:36
+msgid "log entries"
+msgstr "entratas de registro"
+
+#: models.py:45
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr "\"%(object)s\" addite."
+
+#: models.py:47
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr "\"%(object)s\" cambiate - %(changes)s"
+
+#: models.py:52
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr "\"%(object)s\" delite."
+
+#: models.py:54
+msgid "LogEntry Object"
+msgstr "Objecto LogEntry"
+
+#: options.py:156 options.py:172
+msgid "None"
+msgstr "Nulle"
+
+#: options.py:684
+#, python-format
+msgid "Changed %s."
+msgstr "%s cambiate."
+
+#: options.py:684 options.py:694
+msgid "and"
+msgstr "e"
+
+#: options.py:689
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "%(name)s \"%(object)s\" addite."
+
+#: options.py:693
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "%(list)s cambiate pro %(name)s \"%(object)s\"."
+
+#: options.py:698
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "%(name)s \"%(object)s\" delite."
+
+#: options.py:702
+msgid "No fields changed."
+msgstr "Nulle campo cambiate."
+
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"Le %(name)s \"%(obj)s\" ha essite addite con successo. Tu pote modificar lo "
+"de novo hic infra."
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Le %(name)s \"%(obj)s\" ha essite addite con successo."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Le %(name)s \"%(obj)s\" ha essite cambiate con successo."
+
+#: options.py:951 options.py:1211
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+"Es necessari seliger elementos pro poter exequer actiones. Nulle elemento ha "
+"essite cambiate."
+
+#: options.py:970
+msgid "No action selected."
+msgstr "Nulle action seligite."
+
+#: options.py:1050
+#, python-format
+msgid "Add %s"
+msgstr "Adder %s"
+
+#: options.py:1074 options.py:1319
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr "Le objecto %(name)s con le clave primari %(key)r non existe."
+
+#: options.py:1140
+#, python-format
+msgid "Change %s"
+msgstr "Cambiar %s"
+
+#: options.py:1190
+msgid "Database error"
+msgstr "Error in le base de datos"
+
+#: options.py:1253
+#, python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] "%(count)s %(name)s cambiate con successo."
+msgstr[1] "%(count)s %(name)s cambiate con successo."
+
+#: options.py:1280
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] "%(total_count)s seligite"
+msgstr[1] "Tote le %(total_count)s seligite"
+
+#: options.py:1285
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "0 de %(cnt)s seligite"
+
+#: options.py:1335
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Le %(name)s \"%(obj)s\" ha essite delite con successo."
+
+#: options.py:1382
+#, python-format
+msgid "Change history: %s"
+msgstr "Historia de cambiamentos: %s"
+
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
+msgid "Log in"
+msgstr "Aperir session"
+
+#: sites.py:388
+msgid "Site administration"
+msgstr "Administration del sito"
+
+#: sites.py:440
+#, python-format
+msgid "%s administration"
+msgstr "Administration de %s"
+
+#: widgets.py:90
+msgid "Date:"
+msgstr "Data:"
+
+#: widgets.py:91
+msgid "Time:"
+msgstr "Hora:"
+
+#: widgets.py:165
+msgid "Lookup"
+msgstr "Recerca"
+
+#: widgets.py:271
+msgid "Add Another"
+msgstr "Adder un altere"
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
+#: templates/admin/404.html:4 templates/admin/404.html.py:8
+msgid "Page not found"
+msgstr "Pagina non trovate"
+
+#: templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Regrettabilemente, le pagina requestate non poteva esser trovate."
+
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
+msgid "Home"
+msgstr "Initio"
+
+#: templates/admin/500.html:7
+msgid "Server error"
+msgstr "Error del servitor"
+
+#: templates/admin/500.html:11
+msgid "Server error (500)"
+msgstr "Error del servitor (500)"
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr "Error del servitor <em>(500)</em>"
+
+#: templates/admin/500.html:15
+msgid ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr "Exequer le action seligite"
+
+#: templates/admin/actions.html:4
+msgid "Go"
+msgstr "Va"
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr "Clicca hic pro seliger le objectos in tote le paginas"
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr "Seliger tote le %(total_count)s %(module_name)s"
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr "Rader selection"
+
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
+#: templates/admin/base.html:28
+msgid "Welcome,"
+msgstr "Benvenite,"
+
+#: templates/admin/base.html:33
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr "Documentation"
+
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr "Cambiar contrasigno"
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Log out"
+msgstr "Clauder session"
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Administration del sito Django"
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administration de Django"
+
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
+msgid "Add"
+msgstr "Adder"
+
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
+msgid "History"
+msgstr "Historia"
+
+#: templates/admin/change_form.html:33
+#: templates/admin/edit_inline/stacked.html:9
+#: templates/admin/edit_inline/tabular.html:30
+msgid "View on site"
+msgstr "Vider in sito"
+
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Per favor corrige le error sequente."
+msgstr[1] "Per favor corrige le errores sequente."
+
+#: templates/admin/change_list.html:58
+#, python-format
+msgid "Add %(name)s"
+msgstr "Adder %(name)s"
+
+#: templates/admin/change_list.html:78
+msgid "Filter"
+msgstr "Filtro"
+
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr "Remover del ordination"
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr "Prioritate de ordination: %(priority_number)s"
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr "Alternar le ordination"
+
+#: templates/admin/delete_confirmation.html:11
+#: templates/admin/submit_line.html:4
+msgid "Delete"
+msgstr "Deler"
+
+#: templates/admin/delete_confirmation.html:18
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+"Deler le %(object_name)s '%(escaped_object)s' resultarea in le deletion de "
+"objectos associate, me tu conto non ha le permission de deler objectos del "
+"sequente typos:"
+
+#: templates/admin/delete_confirmation.html:26
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+"Deler le %(object_name)s '%(escaped_object)s' necessitarea le deletion del "
+"sequente objectos associate protegite:"
+
+#: templates/admin/delete_confirmation.html:34
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+"Es tu secur de voler deler le %(object_name)s \"%(escaped_object)s\"? Tote "
+"le sequente objectos associate essera delite:"
+
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
+msgid "Yes, I'm sure"
+msgstr "Si, io es secur"
+
+#: templates/admin/delete_selected_confirmation.html:10
+msgid "Delete multiple objects"
+msgstr "Deler plure objectos"
+
+#: templates/admin/delete_selected_confirmation.html:17
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Deler le %(objects_name)s seligite resultarea in le deletion de objectos "
+"associate, ma tu conto non ha le permission de deler objectos del sequente "
+"typos:"
+
+#: templates/admin/delete_selected_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+"Deler le %(objects_name)s seligite necessitarea le deletion del sequente "
+"objectos associate protegite:"
+
+#: templates/admin/delete_selected_confirmation.html:33
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+"Es tu secur de voler deler le %(objects_name)s seligite? Tote le sequente "
+"objectos e le objectos associate a illo essera delite:"
+
+#: templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Per %(filter_title)s "
+
+#: templates/admin/index.html:20
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr ""
+
+#: templates/admin/index.html:39
+msgid "Change"
+msgstr "Cambiar"
+
+#: templates/admin/index.html:49
+msgid "You don't have permission to edit anything."
+msgstr "Tu non ha le permission de modificar alcun cosa."
+
+#: templates/admin/index.html:57
+msgid "Recent Actions"
+msgstr "Actiones recente"
+
+#: templates/admin/index.html:58
+msgid "My Actions"
+msgstr "Mi actiones"
+
+#: templates/admin/index.html:62
+msgid "None available"
+msgstr "Nihil disponibile"
+
+#: templates/admin/index.html:76
+msgid "Unknown content"
+msgstr "Contento incognite"
+
+#: templates/admin/invalid_setup.html:12
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+"Il ha un problema con le installation del base de datos. Assecura te que le "
+"tabellas correcte ha essite create, e que le base de datos es legibile pro "
+"le usator appropriate."
+
+#: templates/admin/login.html:37
+msgid "Password:"
+msgstr "Contrasigno:"
+
+#: templates/admin/login.html:44
+msgid "Forgotten your password or username?"
+msgstr "Contrasigno o nomine de usator oblidate?"
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr "Data/hora"
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr "Usator"
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr "Action"
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Iste objecto non ha un historia de cambiamentos. Illo probabilemente non "
+"esseva addite per medio de iste sito administrative."
+
+#: templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Monstrar toto"
+
+#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Salveguardar"
+
+#: templates/admin/search_form.html:7
+msgid "Search"
+msgstr "Cercar"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] "%(counter)s resultato"
+msgstr[1] "%(counter)s resultatos"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s in total"
+
+#: templates/admin/submit_line.html:5
+msgid "Save as new"
+msgstr "Salveguardar como nove"
+
+#: templates/admin/submit_line.html:6
+msgid "Save and add another"
+msgstr "Salveguardar e adder un altere"
+
+#: templates/admin/submit_line.html:7
+msgid "Save and continue editing"
+msgstr "Salveguardar e continuar le modification"
+
+#: templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+"Primo, specifica un nomine de usator e un contrasigno. Postea, tu potera "
+"modificar plus optiones de usator."
+
+#: templates/admin/auth/user/add_form.html:8
+msgid "Enter a username and password."
+msgstr "Specifica un nomine de usator e un contrasigno."
+
+#: templates/admin/auth/user/change_password.html:31
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr ""
+"Specifica un nove contrasigno pro le usator <strong>%(username)s</strong>."
+
+#: templates/admin/auth/user/change_password.html:38
+msgid "Password"
+msgstr "Contrasigno"
+
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
+msgid "Password (again)"
+msgstr "Contrasigno (repete)"
+
+#: templates/admin/auth/user/change_password.html:45
+msgid "Enter the same password as above, for verification."
+msgstr "Scribe le mesme contrasigno que antea, pro verification."
+
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Remover"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr "Adder un altere %(verbose_name)s"
+
+#: templates/admin/edit_inline/tabular.html:17
+msgid "Delete?"
+msgstr "Deler?"
+
+#: templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Gratias pro haber passate un tempore agradabile con iste sito web."
+
+#: templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Aperir session de novo"
+
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
+msgid "Password change"
+msgstr "Cambio de contrasigno"
+
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
+msgid "Password change successful"
+msgstr "Contrasigno cambiate con successo"
+
+#: templates/registration/password_change_done.html:17
+msgid "Your password was changed."
+msgstr "Tu contrasigno ha essite cambiate."
+
+#: templates/registration/password_change_form.html:26
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Per favor specifica tu ancian contrasigno, pro securitate, e postea "
+"specifica tu nove contrasigno duo vices pro verificar que illo es scribite "
+"correctemente."
+
+#: templates/registration/password_change_form.html:32
+msgid "Old password"
+msgstr "Ancian contrasigno"
+
+#: templates/registration/password_change_form.html:37
+msgid "New password"
+msgstr "Nove contrasigno"
+
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
+msgid "Change my password"
+msgstr "Cambiar mi contrasigno"
+
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
+msgid "Password reset"
+msgstr "Reinitialisar contrasigno"
+
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
+msgid "Password reset complete"
+msgstr "Contrasigno reinitialisate con successo"
+
+#: templates/registration/password_reset_complete.html:17
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr "Tu contrasigno ha essite reinitialisate. Ora tu pote aperir session."
+
+#: templates/registration/password_reset_confirm.html:7
+msgid "Password reset confirmation"
+msgstr "Confirmation de reinitialisation de contrasigno"
+
+#: templates/registration/password_reset_confirm.html:17
+msgid "Enter new password"
+msgstr "Specifica nove contrasigno"
+
+#: templates/registration/password_reset_confirm.html:19
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+"Per favor scribe le nove contrasigno duo vices pro verificar que illo es "
+"scribite correctemente."
+
+#: templates/registration/password_reset_confirm.html:23
+msgid "New password:"
+msgstr "Nove contrasigno:"
+
+#: templates/registration/password_reset_confirm.html:25
+msgid "Confirm password:"
+msgstr "Confirma contrasigno:"
+
+#: templates/registration/password_reset_confirm.html:31
+msgid "Password reset unsuccessful"
+msgstr "Reinitialisation de contrasigno fallite"
+
+#: templates/registration/password_reset_confirm.html:33
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+"Le ligamine pro le reinitialisation del contrasigno esseva invalide, forsan "
+"perque illo ha jam essite usate. Per favor submitte un nove demanda de "
+"reinitialisation del contrasigno."
+
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
+msgid "Password reset successful"
+msgstr "Contrasigno reinitialisate con successo"
+
+#: templates/registration/password_reset_done.html:17
+msgid ""
+"We've emailed you instructions for setting your password to the email "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr "Per favor va al sequente pagina pro eliger un nove contrasigno:"
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr "Tu nomine de usator, in caso que tu lo ha oblidate:"
+
+#: templates/registration/password_reset_email.html:10
+msgid "Thanks for using our site!"
+msgstr "Gratias pro usar nostre sito!"
+
+#: templates/registration/password_reset_email.html:12
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Le equipa de %(site_name)s"
+
+#: templates/registration/password_reset_form.html:17
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Reset my password"
+msgstr "Reinitialisar mi contrasigno"
+
+#: templatetags/admin_list.py:344
+msgid "All dates"
+msgstr "Tote le datas"
+
+#: views/main.py:33
+msgid "(None)"
+msgstr "(Nulle)"
+
+#: views/main.py:76
+#, python-format
+msgid "Select %s"
+msgstr "Selige %s"
+
+#: views/main.py:78
+#, python-format
+msgid "Select %s to change"
+msgstr "Selige %s a modificar"
diff --git a/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..515c3b5ef3
Binary files /dev/null and b/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..867b643698
--- /dev/null
+++ b/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.po
@@ -0,0 +1,182 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2012-04-27 21:43+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
+msgid "Available %s"
+msgstr "%s disponibile"
+
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
+msgstr ""
+"Ecce le lista de %s disponibile. Tu pote seliger alcunes in le quadro "
+"sequente; postea clicca le flecha \"Seliger\" inter le duo quadros."
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into this box to filter down the list of available %s."
+msgstr "Scribe in iste quadro pro filtrar le lista de %s disponibile."
+
+#: static/admin/js/SelectFilter2.js:57
+msgid "Filter"
+msgstr "Filtrar"
+
+#: static/admin/js/SelectFilter2.js:61
+msgid "Choose all"
+msgstr "Seliger totes"
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
+msgstr "Clicca pro seliger tote le %s immediatemente."
+
+#: static/admin/js/SelectFilter2.js:67
+msgid "Choose"
+msgstr "Seliger"
+
+#: static/admin/js/SelectFilter2.js:69
+msgid "Remove"
+msgstr "Remover"
+
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Chosen %s"
+msgstr "Le %s seligite"
+
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
+msgstr ""
+"Ecce le lista de %s seligite. Tu pote remover alcunes per seliger los in le "
+"quadro sequente e cliccar le flecha \"Remover\" inter le duo quadros."
+
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
+msgstr "Remover totes"
+
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr "Clicca pro remover tote le %s seligite immediatemente."
+
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "%(sel)s de %(cnt)s seligite"
+msgstr[1] "%(sel)s de %(cnt)s seligite"
+
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+"Il ha cambiamentos non salveguardate in certe campos modificabile. Si tu "
+"exeque un action, iste cambiamentos essera perdite."
+
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+"Tu ha seligite un action, ma tu non ha salveguardate le cambiamentos in "
+"certe campos. Per favor clicca OK pro salveguardar los. Tu debera re-exequer "
+"le action."
+
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+"Tu ha seligite un action, e tu non ha facite cambiamentos in alcun campo. Tu "
+"probabilemente cerca le button Va e non le button Salveguardar."
+
+#: static/admin/js/calendar.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Januario Februario Martio April Maio Junio Julio Augusto Septembre Octobre "
+"Novembre Decembre"
+
+#: static/admin/js/calendar.js:27
+msgid "S M T W T F S"
+msgstr "D L M M J V S"
+
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr "Monstrar"
+
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr "Celar"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
+msgid "Now"
+msgstr "Ora"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:53
+msgid "Clock"
+msgstr "Horologio"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:81
+msgid "Choose a time"
+msgstr "Selige un hora"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:86
+msgid "Midnight"
+msgstr "Medienocte"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:87
+msgid "6 a.m."
+msgstr "6 a.m."
+
+#: static/admin/js/admin/DateTimeShortcuts.js:88
+msgid "Noon"
+msgstr "Mediedie"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
+msgid "Cancel"
+msgstr "Cancellar"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
+msgid "Today"
+msgstr "Hodie"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:148
+msgid "Calendar"
+msgstr "Calendario"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:195
+msgid "Yesterday"
+msgstr "Heri"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:199
+msgid "Tomorrow"
+msgstr "Deman"
diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo
index ba642033c6..acb0ddd9d3 100644
Binary files a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.po b/django/contrib/admin/locale/id/LC_MESSAGES/django.po
index 4553b86982..663e7e1a7d 100644
--- a/django/contrib/admin/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/id/LC_MESSAGES/django.po
@@ -1,35 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # rodin <romihardiyanto@gmail.com>, 2011.
+#  <romihardiyanto@gmail.com>, 2013.
 #   <romihardiyanto@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-20 12:10+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr "Berhasil menghapus %(count)d %(items)s."
+msgstr "Sukes menghapus %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Tidak dapat menghapus %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Yakin?"
 
@@ -38,162 +40,137 @@ msgstr "Yakin?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Hapus %(verbose_name_plural)s yang dipilih"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Semua"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ya"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Tidak"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Kapanpun"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hari ini"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Tujuh hari terakhir"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Bulan ini"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Tahun ini"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Masukkan nama pengguna dan sandi yang benar untuk akun staf. Perhatikan "
-"besar/kecil huruf pada kedua isian berpengaruh."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Anda harus mengulangi proses masuk karena sesi Anda telah habis."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Nama akun Anda bukanlah alamat email. Cobalah dengan '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Aksi:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "waktu aksi"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id objek"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "representasi objek"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "jenis aksi"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "ganti pesan"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entri pencatatan"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entri pencatatan"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" ditambahkan."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\" diubah - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\" dihapus."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objek LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "None"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s diubah"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "dan"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" ditambahkan."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s untuk %(name)s \"%(object)s\" diubah."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" dihapus."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Tidak ada bidang yang berubah."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" berhasil ditambahkan."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Anda boleh mengubahnya kembali di bawah."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Anda boleh menambahkan %s lagi di bawah."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" berhasil diubah."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,94 +178,133 @@ msgstr ""
 "%(name)s \"%(obj)s\" berhasil ditambahkan. Anda dapat mengeditnya lagi di "
 "bawah ini."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" berhasil ditambahkan."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" berhasil diubah."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 "Objek harus dipilih sebelum dimanipulasi. Tidak ada objek yang berubah."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Tidak ada aksi yang dipilih."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Tambahkan %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objek %(name)s dengan kunci utama %(key)r tidak ada."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Ubah %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Galat basis data"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s berhasil diubah."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s dipilih"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 dari %(cnt)s dipilih"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" berhasil dihapus."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Ubah riwayat: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Masuk"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administrasi situs"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administrasi %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Tanggal:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Waktu:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Cari"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Tambah Lagi"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Laman tidak ditemukan"
@@ -297,42 +313,42 @@ msgstr "Laman tidak ditemukan"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Maaf, laman yang Anda minta tidak ditemukan."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Beranda"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Galat server"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Galat server (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Galat Server <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ada galat yang terjadi dan telah dilaporkan kepada administrator situs "
-"melalui email untuk perbaikan secepatnya. Terima kasih atas pengertian Anda."
+"Galat terjadi dan telah dilaporkan ke administrator situs lewat email untuk "
+"diperbaiki. Terima kasih atas pengertiannya."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -355,7 +371,7 @@ msgstr "Pilih seluruh %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Bersihkan pilihan"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -365,22 +381,22 @@ msgid "Welcome,"
 msgstr "Selamat datang,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Ganti sandi"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Keluar"
 
@@ -392,34 +408,34 @@ msgstr "Admin situs Django"
 msgid "Django administration"
 msgstr "Administrasi Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Tambah"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Riwayat"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Lihat di situs"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Perbaiki galat di bawah ini."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Tambahkan %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -436,12 +452,12 @@ msgstr "Prioritas pengurutan: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Ubah pengurutan"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Hapus"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -452,7 +468,7 @@ msgstr ""
 "yang terkait, tetapi akun Anda tidak memiliki izin untuk menghapus objek "
 "dengan tipe berikut:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -461,7 +477,7 @@ msgstr ""
 "Menghapus %(object_name)s '%(escaped_object)s' memerlukan penghapusan objek "
 "terlindungi yang terkait sebagai berikut:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -470,16 +486,16 @@ msgstr ""
 "Yakin ingin menghapus %(object_name)s \"%(escaped_object)s\"? Semua objek "
 "lain yang terkait juga akan dihapus:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ya, tentu saja"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Hapus beberapa objek sekaligus"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -490,7 +506,7 @@ msgstr ""
 "tetapi akun Anda tidak memiliki izin untuk menghapus objek dengan tipe "
 "berikut:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -499,7 +515,7 @@ msgstr ""
 "Menghapus %(objects_name)s terpilih memerlukan penghapusan objek terlindungi "
 "yang terkait sebagai berikut:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -513,36 +529,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Berdasarkan %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Model yang tersedia pada aplikasi %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Model pada aplikasi %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Ubah"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Anda tidak memiliki izin untuk mengubah apapun."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Aktivitas Terbaru"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Aktivitas Saya"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Tidak ada yang tersedia"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Konten tidak diketahui"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -551,31 +567,27 @@ msgstr ""
 "Ada masalah dengan instalasi basis data Anda. Pastikan tabel yang sesuai "
 "pada basis data telah dibuat dan dapat dibaca oleh pengguna yang benar."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Nama pengguna:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Sandi:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Lupa nama pengguna atau sandi?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Tanggal/waktu"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Pengguna"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Aksi"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -630,64 +642,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Masukkan nama pengguna dan sandi."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Masukkan sandi baru untuk pengguna <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Sandi"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Sandi (ulangi)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Masukkan sandi yang sama dengan di atas, untuk verifikasi."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Hapus"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Tambahkan %(verbose_name)s lagi"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Hapus"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Hapus?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Terima kasih telah menggunakan situs ini hari ini."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Masuk kembali"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Ubah sandi"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Sandi berhasil diubah"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Sandi Anda telah diubah."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -695,46 +707,46 @@ msgstr ""
 "Dengan alasan keamanan, masukkan sandi lama Anda dua kali untuk memastikan "
 "Anda tidak salah mengetikkannya."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Sandi lama"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Sandi baru"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Ubah sandi saya"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Setel ulang sandi"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Sandi telah disetel ulang"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Sandi Anda telah diperbarui. Silakan masuk."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Konfirmasi penyetelan ulang sandi"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Masukkan sandi baru"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -742,19 +754,19 @@ msgstr ""
 "Masukkan sandi baru dua kali untuk memastikan Anda tidak salah "
 "mengetikkannya."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Sandi baru:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Konfirmasi sandi:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Penyetelan ulang sandi gagal"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -763,27 +775,27 @@ msgstr ""
 "tersebut telah dipakai sebelumnya. Ajukan permintaan penyetelan sandi sekali "
 "lagi."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Penyetelan ulang sandi berhasil"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Kami telah mengirimkan panduan untuk menyetel ulang sandi Anda melalui "
-"alamat email yang Anda masukkan. Sesaat lagi Anda akan menerima emailnya."
+"Kami telah mengirimkan email berisi petunjuk untuk menyetel ulang sandi pada "
+"alamat email yang Anda masukkan. Petunjuknya akan sampai dalam beberapa saat."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Anda menerima email ini karena Anda meminta penyetelan ulang sandi akun "
-"pengguna Anda di %(site_name)s."
+"Anda menerima email ini karena Anda meminta penyetelan ulang sandi untuk "
+"akun pengguna di %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -802,36 +814,36 @@ msgstr "Terima kasih telah menggunakan situs kami!"
 msgid "The %(site_name)s team"
 msgstr "Tim %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Lupa sandinya? Masukkan alamat email Anda di bawah ini dan kami akan "
-"mengirimkan panduan untuk mendapatkan sandi baru."
+"Lupa sandinya? Masukkan alamat email Anda di bawah ini agar kami dapat "
+"mengirimkan petunjuk untuk menyetel ulang sandinya."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "Alamat email:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Setel ulang sandi saya"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Semua tanggal"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Tidak ada)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Pilih %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Pilih %s untuk diubah"
diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo
index 8aa8502e28..6766a16860 100644
Binary files a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po
index 9f17214a51..aef012f602 100644
--- a/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/django.mo b/django/contrib/admin/locale/is/LC_MESSAGES/django.mo
index 2a56f80c2a..74b6db2aab 100644
Binary files a/django/contrib/admin/locale/is/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/django.po b/django/contrib/admin/locale/is/LC_MESSAGES/django.po
index a08d274f18..dd5f2296de 100644
--- a/django/contrib/admin/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/is/LC_MESSAGES/django.po
@@ -7,28 +7,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-19 14:41+0000\n"
-"Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Eyddi %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Get ekki eytt %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Ertu viss?"
 
@@ -37,170 +37,175 @@ msgstr "Ertu viss?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Eyða völdum %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Allt"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Já"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nei"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Allar dagsetningar"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Dagurinn í dag"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Síðustu 7 dagar"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Þessi mánuður"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Þetta ár"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Vinsamlegast sláðu inn rétt notandanafn og lykilorð fyrir aðgang "
-"starfsmanns. Athugaðu að há- og lágstafir skipta máli í báðum reitum."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Vinsamlegast skráðu þig inn aftur vegna þess að setan þín rann út. "
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Tölvupóstfangið þitt er ekki notandanafnið þitt. Prófaðu '%s' í staðinn."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Aðgerð:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "tími aðgerðar"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "kenni hlutar"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "framsetning hlutar"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "aðgerðarveifa"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "breyta skilaboði"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "kladdafærsla"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "kladdafærslur"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" bætt við."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Breytti \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Eyddi \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry hlutur"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ekkert"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Breytti %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "og"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Bætti við %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Breytti %(list)s fyrir %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Eyddi %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Engum reitum breytt."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s „%(obj)s“ var bætt við."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Þú getur breytt því aftur að neðan."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Þú getur bætt öðru %s við að neðan."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s „%(obj)s“ hefur verið breytt."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s „%(obj)s“ hefur verið bætt við. Þú getur breytt því aftur að neðan."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s „%(obj)s“ var bætt við."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s „%(obj)s“ hefur verið breytt."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,89 +213,97 @@ msgstr ""
 "Hlutir verða að vera valdir til að framkvæma aðgerðir á þeim. Engu hefur "
 "verið breytt."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Engin aðgerð valin."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Bæta við %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s hlutur með lykilinn %(key)r er ekki til."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Breyta %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Gagnagrunnsvilla"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s var breytt."
 msgstr[1] "%(count)s %(name)s var breytt."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "Allir %(total_count)s  valdir"
 msgstr[1] "Allir %(total_count)s  valdir"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 af %(cnt)s valin"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s „%(obj)s“ var eytt."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Breytingarsaga: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Skrá inn"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Vefstjóri"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s vefstjórn"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dagsetning:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Tími:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Fletta upp"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Bæta við öðru"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Síða fannst ekki"
@@ -299,42 +312,40 @@ msgstr "Síða fannst ekki"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Því miður fannst umbeðin síða ekki."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Heim"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Kerfisvilla"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Kerfisvilla (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Kerfisvilla <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Villa hefur komið upp. Hún hefur verið tilkynnt vefstjórunum með tölvupósti "
-"og verður örugglega löguð fljótlega. Við þökkum þolinmæðina."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -357,7 +368,7 @@ msgstr "Velja alla %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Hreinsa val"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -367,22 +378,22 @@ msgid "Welcome,"
 msgstr "Velkomin(n),"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Skjölun"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Skrá út"
 
@@ -394,35 +405,35 @@ msgstr "Django vefstjóri"
 msgid "Django administration"
 msgstr "Django vefstjórn"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Bæta við"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Saga"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Skoða á vef"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Vinsamlegast leiðréttu villuna hér að neðan:"
 msgstr[1] "Vinsamlegast leiðréttu villurnar hér að neðan:"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Bæta við %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Sía"
 
@@ -439,12 +450,12 @@ msgstr "Forgangur röðunar: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Röðun af/á"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -454,7 +465,7 @@ msgstr ""
 "Eyðing á %(object_name)s „%(escaped_object)s“ hefði í för með sér eyðingu á "
 "tengdum hlutum en þú hefur ekki réttindi til að eyða eftirfarandi hlutum:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -463,7 +474,7 @@ msgstr ""
 "Að eyða %(object_name)s  ' %(escaped_object)s ' þyrfti að eyða eftirfarandi "
 "tengdum hlutum:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -472,16 +483,16 @@ msgstr ""
 "Ertu viss um að þú viljir eyða %(object_name)s „%(escaped_object)s“? Öllu "
 "eftirfarandi verður eytt:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Já ég er viss."
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Eyða mörgum hlutum."
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -491,7 +502,7 @@ msgstr ""
 "Að eyða völdu %(objects_name)s leiðir til þess að skyldum hlutum er eytt, en "
 "þinn aðgangur hefur ekki réttindi til að eyða eftirtöldum hlutum:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -500,7 +511,7 @@ msgstr ""
 "Að eyða völdum %(objects_name)s myndi leiða til þess að eftirtöldum skyldum "
 "hlutum yrði eytt:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -514,36 +525,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Eftir %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Líkön sem eru hluti af %(name)s forritinu."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Breyta"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Þú hefur ekki réttindi til að breyta neinu"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Nýlegar aðgerðir"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mínar aðgerðir"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Engin fáanleg"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Óþekkt innihald"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -552,31 +563,27 @@ msgstr ""
 "Eitthvað er að gagnagrunnsuppsetningu. Gakktu úr skuggum um að allar töflur "
 "séu til staðar og að notandinn hafi aðgang að grunninum."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Notandanafn:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Gleymt notandanafn eða lykilorð?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dagsetning/tími"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Notandi"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Aðgerð"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -632,64 +639,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Sláðu inn notandanafn og lykilorð."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Settu inn nýtt lykilorð fyrir notandann <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Lykilorð (aftur)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Settu inn sama lykilorðið aftur til staðfestingar."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Fjarlægja"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Bæta við öðrum %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Fjarlægja"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Eyða?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Takk fyrir að verja tíma í vefsíðuna í dag."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Skráðu þig inn aftur"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Breyta lykilorði"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Breyting á lykilorði tókst"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Lykilorði þínu var breytt"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -698,46 +705,46 @@ msgstr ""
 "lykilorðið tvisvar inn svo að hægt sé að ganga úr skugga um að þú hafir ekki "
 "gert innsláttarvillu."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Gamalt lykilorð"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Breyta lykilorðinu mínu"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Endurstilla lykilorð"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Endurstilling lykilorðs tókst"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Lykilorðið var endurstillt. Þú getur núna skráð þig inn á vefsvæðið."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Staðfesting endurstillingar lykilorðs"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Settu inn nýtt lykilorð"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -745,19 +752,19 @@ msgstr ""
 "Vinsamlegast settu inn nýja lykilorðið tvisvar til að forðast "
 "innsláttarvillur."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nýtt lykilorð:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Staðfestu lykilorð:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Endurstilling á lykilorði mistókst"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -765,27 +772,23 @@ msgstr ""
 "Endurstilling lykilorðs tókst ekki. Slóðin var ógild. Hugsanlega hefur hún "
 "nú þegar verið notuð. Vinsamlegast biddu um nýja endurstillingu."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Endurstilling á lykilorði tókst"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Við sendum þér leiðbeiningar fyrir endurstillingu lykilorðs. "
-"Leiðbeiningarnar ættu að berast til þín í tölvupósti fljótlega."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Þessi tölvupóstur barst þér þar sem þú baðst um nýtt lykilorð fyrir aðgang "
-"þinn að %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -804,36 +807,34 @@ msgstr "Takk fyrir að nota vefinn okkar!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s hópurinn"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Gleymdir þú lykilorðinu þínu? Sláðu tölvupóstfangið þitt inn að neðan og við "
-"munum senda þér leiðbeiningar fyrir endurstillingu lykilorðs."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Tölvupóstfang:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Endursstilla lykilorðið mitt"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Allar dagsetningar"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ekkert)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Veldu %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Veldu %s til að breyta"
diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo
index 519a61f898..24f2524af3 100644
Binary files a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po
index 3627ee7b0e..ee125c2267 100644
--- a/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-20 00:23+0000\n"
 "Last-Translator: gudbergur <gudbergur@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/django.mo b/django/contrib/admin/locale/it/LC_MESSAGES/django.mo
index e295078229..1b44eec252 100644
Binary files a/django/contrib/admin/locale/it/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/django.po b/django/contrib/admin/locale/it/LC_MESSAGES/django.po
index 73065c6938..038ec99420 100644
--- a/django/contrib/admin/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/it/LC_MESSAGES/django.po
@@ -3,33 +3,33 @@
 # Translators:
 # Denis Darii <sinednx@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nicola Larosa <transifex@teknico.net>, 2011, 2012.
+# Nicola Larosa <transifex@teknico.net>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 11:45+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Cancellati/e con successo %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Impossibile cancellare %(name)s "
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Sei sicuro?"
 
@@ -38,162 +38,139 @@ msgstr "Sei sicuro?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Cancella %(verbose_name_plural)s selezionati/e"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Tutti"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Sì"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "No"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Qualsiasi data"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Oggi"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Ultimi 7 giorni"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Questo mese"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Quest'anno"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Inserisci nome utente e password corretti per un account di staff. Nota che "
+"Inserisci %(username)s e password corretti per un account di staff. Nota che "
 "entrambi i campi distinguono maiuscole e minuscole."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Effettua di nuovo l'accesso, perché la tua sessione è scaduta."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Prova con '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Azione:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "momento dell'azione"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id dell'oggetto"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "rappr. dell'oggetto"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "flag di azione"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "messaggio di modifica"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "voce di log"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "voci di log"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Aggiunto \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Cambiato \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Cancellato \"%(object)s .\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Oggetto LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Nessuno"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s modificato/a."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "e"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Aggiunto/a %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Cambiato %(list)s per %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Cancellato/a %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nessun campo modificato."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "È possibile modificare nuovamente qui sotto."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puoi aggiungere un altro/a %s qui sotto."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" modificato/a correttamente."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,7 +178,44 @@ msgstr ""
 "%(name)s \"%(obj)s\" aggiunto/a correttamente. Puoi modificare ancora qui "
 "sotto."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" è stato inserito correttamente. Puoi aggiungere un "
+"altro %(name)s qui di seguito."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" è stato modificato correttamente. Puoi modificarlo di "
+"nuovo qui di seguito."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" è stato modificato correttamente. Puoi aggiungere un "
+"altro %(name)s qui di seguito."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" modificato/a correttamente."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,89 +223,97 @@ msgstr ""
 "Occorre selezionare degli oggetti per potervi eseguire azioni. Nessun "
 "oggetto è stato cambiato."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nessuna azione selezionata."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Aggiungi %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "L'oggetto %(name)s con chiave primaria %(key)r non esiste."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modifica %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Errore nel database"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s modificato/a correttamente."
 msgstr[1] "%(count)s %(name)s modificati/e correttamente."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s selezionato/a"
 msgstr[1] "Tutti i %(total_count)s selezionati/e"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 di %(cnt)s selezionati/e"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" cancellato/a correttamente."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Tracciato delle modifiche: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Accedi"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Amministrazione sito"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Amministrazione %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Data:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Ora:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Consultazione"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Aggiungi un Altro"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Attualmente:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Modifica:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Pagina non trovata"
@@ -300,42 +322,42 @@ msgstr "Pagina non trovata"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Spiacenti, ma la pagina richiesta non è stata trovata."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Pagina iniziale"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Errore del server"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Errore del server (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Errore del server <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "Si è verificato un errore. Gli amministratori del sito ne sono stati "
-"informati via e-mail e verrà corretto a breve. Grazie per la tua pazienza."
+"informati per email, e vi porranno rimedio a breve. Grazie per la pazienza."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -358,7 +380,7 @@ msgstr "Seleziona tutti/e %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Annulla la selezione"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -368,22 +390,22 @@ msgid "Welcome,"
 msgstr "Benvenuto/a,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Cambia la password"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Annulla l'accesso"
 
@@ -395,35 +417,35 @@ msgstr "Ammin. sito Django"
 msgid "Django administration"
 msgstr "Amministrazione Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Aggiungi"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Storia"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Vedi sul sito"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Correggi l'errore qui sotto."
 msgstr[1] "Correggi gli errori qui sotto."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Aggiungi %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtra"
 
@@ -440,12 +462,12 @@ msgstr "Priorità d'ordinamento: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Abilita/disabilita ordinamento"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Cancella"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -456,7 +478,7 @@ msgstr ""
 "cancellazione di oggetti collegati, ma questo account non ha i permessi per "
 "cancellare gli oggetti dei seguenti tipi:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -465,7 +487,7 @@ msgstr ""
 "La cancellazione di %(object_name)s '%(escaped_object)s' richiederebbe "
 "l'eliminazione dei seguenti oggetti protetti correlati:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +496,16 @@ msgstr ""
 "Sicuro di voler cancellare %(object_name)s \"%(escaped_object)s\"? Tutti i "
 "seguenti oggetti collegati verranno cancellati:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Sì, sono sicuro"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Cancella più oggetti"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -494,7 +516,7 @@ msgstr ""
 "oggetti correlati, ma il tuo account non dispone dell'autorizzazione a "
 "eliminare i seguenti tipi di oggetti:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -503,7 +525,7 @@ msgstr ""
 "Cancellare %(objects_name)s selezionato/a richiederebbe l'eliminazione dei "
 "seguenti oggetti protetti correlati:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -517,36 +539,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Per %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelli disponibili nell'applicazione %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modelli nell'applicazione %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modifica"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Non hai i privilegi per modificare alcunché."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Azioni Recenti"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Azioni Proprie"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nessuna disponibile"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Contenuto sconosciuto"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -556,31 +578,27 @@ msgstr ""
 "appropriate del database siano state create, e che il database sia leggibile "
 "dall'utente appropriato."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Nome utente:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Password:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Hai dimenticato la password o il nome utente?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Data/ora"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Utente"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Azione"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -636,65 +654,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Inserisci il nome utente e password."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Inserisci una nuova password per l'utente <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Password"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Password (di nuovo)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Inserisci la stessa password inserita sopra, come verifica."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Elimina"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Aggiungi un/a altro/a %(verbose_name)s."
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Elimina"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Cancellare?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Grazie per aver speso il tuo tempo prezioso su questo sito oggi."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Accedi di nuovo"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Cambio password"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Cambio password avvenuto correttamente"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "La password è stata cambiata."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -702,46 +720,46 @@ msgstr ""
 "Inserisci la password attuale, per ragioni di sicurezza, e poi la nuova "
 "password due volte, per verificare di averla scritta correttamente."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Password attuale"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nuova password"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Modifica la mia password"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Reimposta la password"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Password reimpostata"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "La tua password è stata impostata. Ora puoi effettuare l'accesso."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Conferma reimpostazione password"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Inserisci la nuova password"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -749,19 +767,19 @@ msgstr ""
 "Inserisci la nuova password due volte, per verificare di averla scritta "
 "correttamente."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nuova password:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Conferma la password:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Password non reimpostata"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -769,27 +787,27 @@ msgstr ""
 "Il link per la reimpostazione della password non era valido, forse perché "
 "era già stato usato. Richiedi una nuova reimpostazione della password."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Password reimpostata correttamente"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Abbiamo inviato le istruzioni per impostare la tua password all'indirizzo e-"
-"mail che hai fornito. Arriveranno a breve."
+"Abbiamo inviato istruzioni per impostare la password all'indirizzo email che "
+"hai indicato. Dovresti riceverle a breve."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Hai ricevuto questa e-mail perché avevi chiesto un reset della password per "
-"l'account utente su %(site_name)s."
+"Ricevi questa mail perché hai richiesto di reimpostare la password del tuo "
+"account utente presso %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -808,36 +826,36 @@ msgstr "Grazie per aver usato il nostro sito!"
 msgid "The %(site_name)s team"
 msgstr "Il team di %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "Password dimenticata? Inserisci il tuo indirizzo email qui sotto, e ti "
-"invieremo per email le istruzioni per impostarne una nuova."
+"invieremo istruzioni per impostarne una nuova."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Indirizzo e-mail:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Indirizzo email:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Reimposta la mia password"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Tutte le date"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Scegli %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Scegli %s da modificare"
diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo
index 329ce00798..9d924e512c 100644
Binary files a/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po
index bb39038519..dfc5829c97 100644
--- a/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo
index e4dc87c223..089d83d986 100644
Binary files a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po
index 5f20b58ae2..efb4cbe909 100644
--- a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po
@@ -8,28 +8,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 13:54+0000\n"
-"Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d 個の %(items)sを削除しました。"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s が削除できません"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "よろしいですか？"
 
@@ -38,256 +38,270 @@ msgstr "よろしいですか？"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "選択された %(verbose_name_plural)s の削除"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "全て"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "はい"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "いいえ"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "不明"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "いつでも"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "今日"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "過去 7 日間"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "今月"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "今年"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"スタッフアカウントの正しいユーザー名とパスワードを入力してください。両方の"
-"フィールドでは大文字と小文字が区別されることに注意してください。"
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr ""
 "再ログインしてください。ログインセッションが有効期間切れしてしまいました。"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "操作:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "操作時刻"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "オブジェクト ID"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "オブジェクトの文字列表現"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "操作種別"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "変更メッセージ"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
-msgstr "ログエントリ"
+msgstr "ログエントリー"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
-msgstr "ログエントリ"
+msgstr "ログエントリー"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" を追加しました。"
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\" を変更しました - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\"を削除しました。"
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "ログエントリー オブジェクト"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "None"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s を変更しました。"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "と"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\"を追加しました。"
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" の %(list)s を変更しました。"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" を削除しました。"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "変更はありませんでした。"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" を追加しました。"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "続けて編集できます。"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "続けて別の %s を追加できます。"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" を変更しました。"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" を追加しました。"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" を変更しました。"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 "操作を実行するには、対象を選択する必要があります。何も変更されませんでした。"
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "操作が選択されていません。"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s を追加"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "主キーが %(key)r である %(name)s オブジェクトは存在しません。"
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s を変更"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "データベースエラー"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s 個の %(name)s を変更しました。"
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s 個選択されました"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s個の内ひとつも選択されていません"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" を削除しました。"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "変更履歴: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "ログイン"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "サイト管理"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s サイト管理"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "日付:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "時刻:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "検索"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "追加"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "ページが見つかりません"
@@ -296,42 +310,40 @@ msgstr "ページが見つかりません"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "申し訳ありませんが、お探しのページは見つかりませんでした。"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "ホーム"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
-msgstr "サーバエラー"
+msgstr "サーバーエラー"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
-msgstr "サーバエラー (500)"
+msgstr "サーバーエラー (500)"
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr "サーバーエラー <em>(500)</em>"
 
 #: templates/admin/500.html:15
-msgid "Server Error <em>(500)</em>"
-msgstr "サーバエラー <em>(500)</em>"
-
-#: templates/admin/500.html:16
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"エラーが発生しました。エラーをサイトの管理者にメールで報告しましたので、近い"
-"うちに修正されるはずです。しばらくお待ちください。"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -354,7 +366,7 @@ msgstr "%(total_count)s個ある%(module_name)s を全て選択"
 msgid "Clear selection"
 msgstr "選択を解除"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -364,22 +376,22 @@ msgid "Welcome,"
 msgstr "ようこそ"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "ドキュメント"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "ログアウト"
 
@@ -391,36 +403,36 @@ msgstr "Django サイト管理"
 msgid "Django administration"
 msgstr "Django 管理サイト"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "追加"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "履歴"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "サイト上で表示"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "下記のエラーを修正してください。"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s を追加"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
-msgstr "フィルタ"
+msgstr "フィルター"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
@@ -435,12 +447,12 @@ msgstr "ソート優先順位: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "昇順降順を切り替えます"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "削除"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -451,7 +463,7 @@ msgstr ""
 "除しようとしましたが、あなたのアカウントには以下のタイプのオブジェクトを削除"
 "するパーミッションがありません:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -460,7 +472,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' を削除するには以下の保護された関連オブ"
 "ジェクトを削除することになります:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -469,16 +481,16 @@ msgstr ""
 "%(object_name)s \"%(escaped_object)s\"を削除しますか？ 関連づけられている以下"
 "のオブジェクトも全て削除されます:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "はい。"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "複数のオブジェクトを削除します"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -488,7 +500,7 @@ msgstr ""
 "選択した %(objects_name)s を削除すると関連するオブジェクトも削除しますが、あ"
 "なたのアカウントは以下のオブジェクト型を削除する権限がありません:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -497,7 +509,7 @@ msgstr ""
 "選択した %(objects_name)s を削除すると以下の保護された関連オブジェクトを削除"
 "することになります:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -511,69 +523,65 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "%(filter_title)s で絞り込む"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s アプリケーションで利用可能なモデル"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "変更"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "変更のためのパーミッションがありません。"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "最近行った操作"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "操作"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "利用不可"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "不明なコンテント"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
 "データベースの設定に問題があるようです。適切なテーブルが作られていること、適"
-"切なユーザでデータベースのデータを読み込めることを確認してください。"
+"切なユーザーでデータベースのデータを読み込めることを確認してください。"
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "ユーザ名:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "パスワード:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr "パスワードまたはユーザ名を忘れましたか？"
+msgstr "パスワードまたはユーザー名を忘れましたか？"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "日付/時刻"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "操作"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -621,72 +629,72 @@ msgid ""
 "First, enter a username and password. Then, you'll be able to edit more user "
 "options."
 msgstr ""
-"まずユーザ名とパスワードを登録してください。その後詳細情報が編集可能になりま"
-"す。"
+"まずユーザー名とパスワードを登録してください。その後詳細情報が編集可能になり"
+"ます。"
 
 #: templates/admin/auth/user/add_form.html:8
 msgid "Enter a username and password."
-msgstr "ユーザ名とパスワードを入力してください。"
+msgstr "ユーザー名とパスワードを入力してください。"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "<strong>%(username)s</strong>さんの新しいパスワードを入力してください。"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "パスワード(確認用)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "確認のため、再度パスワードを入力してください。"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "削除"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "%(verbose_name)s の追加"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "削除"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "削除しますか?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "ご利用ありがとうございました。"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "もう一度ログイン"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "パスワードの変更"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "パスワードを変更しました"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "あなたのパスワードは変更されました"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -694,64 +702,64 @@ msgstr ""
 "セキュリティ上の理由から元のパスワードの入力が必要です。新しいパスワードは正"
 "しく入力したか確認できるように二度入力してください。"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "元のパスワード"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "パスワードの変更"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "パスワードをリセット"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "パスワードがリセットされました"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "パスワードがセットされました。ログインしてください。"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "パスワードリセットの確認"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "新しいパスワードを入力してください"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "確認のために、新しいパスワードを二回入力してください。"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "新しいパスワード:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "新しいパスワード (確認用) :"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "パスワードのリセットに失敗しました"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -759,27 +767,23 @@ msgstr ""
 "パスワードリセットのリンクが不正です。おそらくこのリンクは既に使われていま"
 "す。もう一度パスワードリセットしてください。"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "パスワードをリセットしました"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"登録されているメールアドレスにパスワードリセットの方法を送信しました。まもな"
-"く届くでしょう。"
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"この電子メールは %(site_name)s でユーザーアカウントのパスワードのリセットを要"
-"求したため送信されました。"
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -787,7 +791,7 @@ msgstr "次のページで新しいパスワードを選んでください:"
 
 #: templates/registration/password_reset_email.html:8
 msgid "Your username, in case you've forgotten:"
-msgstr "あなたのユーザ名 (念のため):"
+msgstr "あなたのユーザー名 (念のため):"
 
 #: templates/registration/password_reset_email.html:10
 msgid "Thanks for using our site!"
@@ -798,36 +802,34 @@ msgstr "ご利用ありがとうございました！"
 msgid "The %(site_name)s team"
 msgstr " %(site_name)s チーム"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"パスワードをお忘れですか？メールアドレスを入力してください。パスワードのリ"
-"セット方法をメールでお知らせします。"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "メールアドレス"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "パスワードをリセット"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "いつでも"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(なし)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s を選択"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "変更する %s を選択"
diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo
index 81234f5ade..e18d4f4f82 100644
Binary files a/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po
index 483875a743..1c017a7e57 100644
--- a/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 14:03+0000\n"
-"Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"PO-Revision-Date: 2012-06-04 16:05+0000\n"
+"Last-Translator: Yoichi Fujimoto <wozozo@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -39,7 +39,7 @@ msgstr "使用可能な %s のリストを絞り込むには、このボック
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
-msgstr "フィルタ"
+msgstr "フィルター"
 
 #: static/admin/js/SelectFilter2.js:61
 msgid "Choose all"
diff --git a/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo
index df9e9aa65f..79db909c34 100644
Binary files a/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ka/LC_MESSAGES/django.po b/django/contrib/admin/locale/ka/LC_MESSAGES/django.po
index 64322c5879..a413eb7a53 100644
--- a/django/contrib/admin/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ka/LC_MESSAGES/django.po
@@ -1,34 +1,36 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # avsd05 <avsd05@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-03-01 16:20+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s წარმატებით წაიშალა."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s ვერ იშლება"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "დარწმუნებული ხართ?"
 
@@ -37,162 +39,139 @@ msgstr "დარწმუნებული ხართ?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "არჩეული %(verbose_name_plural)s-ის წაშლა"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "ყველა"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "კი"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "არა"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "გაურკვეველი"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "ნებისმიერი თარიღი"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "დღეს"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "ბოლო 7 დღე"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "მიმდინარე თვე"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "მიმდინარე წელი"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
+"გთხოვთ, შეიყვანოთ სწორი %(username)s და პაროლი პერსონალის ანგარიშისთვის. "
+"იქონიეთ მხედველობაში, რომ ორივე ველი ითვალისწინებს მთავრულს."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "გთხოვთ, შეხვიდეთ კიდევ ერთხელ, რადგანაც თქვენი სესიის დრო ამოიწურა."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"ელ-ფოსტის მისამართი არ არის თქვენი მომხმარებლის სახელი. სცადეთ '%s' მის "
-"ნაცვლად."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "მოქმედება:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "მოქმედების დრო"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "ობიექტის id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "ობიექტის წარმ."
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "მოქმედების დროშა"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "შეცვლის შეტყობინება"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "ლოგის ერთეული"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "ლოგის ერთეულები"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "დამატებულია \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "შეცვლილია \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "წაშლილია \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "ჟურნალის ჩანაწერის ობიექტი"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "არცერთი"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s შეცვლილია."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "და"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "დამატებულია %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "შეცვლილია %(list)s for %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "წაშლილია %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "არცერთი ველი არ შეცვლილა."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" წარმატებით დაემატა."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "თქვენ შეგიძლიათ შეცვალოთ იგი."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "შეგიძლიათ დაამატოთ კიდევ ერთი %s."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" წარმატებით შეიცვალა."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -200,7 +179,44 @@ msgstr ""
 "%(name)s \"%(obj)s\" წარმატებით დაემატა. შეგიძლიათ განაგრძოთ მისი "
 "რედაქტირება."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" წარმატებით იქნა დამატებული. თქვენ შეგიძლიათ დაამატოთ "
+"სხვა %(name)s ქვემოთ."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" წარმატებით დაემატა."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" წარმატებით შეიცვალა. თქვენ შეგიძლიათ ისევ დაარედაქტიროთ "
+"ის ქვემოთ."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" წარმატებით შეიცვალა. თქვენ შეგიძლიათ დაამატოთ სხვა "
+"%(name)s ქვემოთ."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" წარმატებით შეიცვალა."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,87 +224,95 @@ msgstr ""
 "ობიექტებზე მოქმედებების შესასრულებლად ისინი არჩეული უნდა იყოს. არცერთი "
 "ობიექტი არჩეული არ არის."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "მოქმედება არჩეული არ არის."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "დავამატოთ %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s-ის ობიექტი პირველადი გასაღებით %(key)r არ არსებობს."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "შევცვალოთ %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "მონაცემთა ბაზის შეცდომა"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s წარმატებით შეიცვალა."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s-ია არჩეული"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s-დან არცერთი არჩეული არ არის"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" წარმატებით წაიშალა."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "ცვლილებების ისტორია: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "შესვლა"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "საიტის ადმინისტრირება"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s ადმინისტრირება"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "თარიღი;"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "დრო:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "ძიება"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "ახლის დამატება"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "ამჟამად:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "შეცვლა:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "გვერდი ვერ მოიძებნა"
@@ -297,42 +321,42 @@ msgstr "გვერდი ვერ მოიძებნა"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "უკაცრავად, მოთხოვნილი გვერდი ვერ მოიძებნა."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "საწყისი გვერდი"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "სერვერის შეცდომა"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "სერვერის შეცდომა (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "სერვერის შეცდომა <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"სისტემაში მოხდა შეცდომა. იგი გადაგზავნილია საიტის ადმინისტრატორის ელექტრონულ "
-"ფოსტაზე და მალე გამოსწორდება. გმადლობთ მოთმინებისათვის."
+"მოხდა შეცდომა. ინფორმაცია მასზე გადაეცა საიტის ადმინისტრატორებს ელ. ფოსტით "
+"და ის უნდა შესწორდეს უმოკლეს ვადებში. გმადლობთ მოთმინებისთვის."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -355,7 +379,7 @@ msgstr "ყველა %(total_count)s %(module_name)s-ის მონიშ
 msgid "Clear selection"
 msgstr "მონიშვნის გასუფთავება"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -365,22 +389,22 @@ msgid "Welcome,"
 msgstr "კეთილი იყოს თქვენი მობრძანება,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "დოკუმენტაცია"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "გამოსვლა"
 
@@ -392,56 +416,56 @@ msgstr "Django-ს ადმინისტრირების საიტი
 msgid "Django administration"
 msgstr "Django-ს ადმინისტრირება"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "დამატება"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "ისტორია"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "წარმოდგენა საიტზე"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "გთხოვთ, გაასწოროთ შეცდომები."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "დავამატოთ %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "ფილტრი"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "დალაგებიდან მოშორება"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "დალაგების პრიორიტეტი: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "დალაგების გადართვა"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "წავშალოთ"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -452,7 +476,7 @@ msgstr ""
 "დაკავშირებული ობიექტების წაშლას, მაგრამ თქვენ არა გაქვთ შემდეგი ტიპების "
 "ობიექტების წაშლის უფლება:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -461,7 +485,7 @@ msgstr ""
 "%(object_name)s ტიპის '%(escaped_object)s' ობიექტის წაშლა მოითხოვს ასევე "
 "შემდეგი დაკავშირებული ობიექტების წაშლას:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -470,16 +494,16 @@ msgstr ""
 "ნამდვილად გსურთ, წაშალოთ %(object_name)s \"%(escaped_object)s\"? ყველა "
 "ქვემოთ მოყვანილი დაკავშირებული ობიექტი წაშლილი იქნება:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "კი, ნამდვილად"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "რამდენიმე ობიექტის წაშლა"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -489,7 +513,7 @@ msgstr ""
 "%(objects_name)s ტიპის ობიექტის წაშლა ითხოვს ასევე შემდეგი ობიექტების "
 "წაშლას, მაგრამ თქვენ არ გაქვთ ამის ნებართვა:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -498,7 +522,7 @@ msgstr ""
 "არჩეული %(objects_name)s ობიექტის წაშლა მოითხოვს ასევე შემდეგი დაცული "
 "დაკავშირეული ობიექტების წაშლას:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -512,36 +536,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s მიხედვით "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s აპლიკაციაში არსებული მოდელები."
+msgid "Models in the %(name)s application"
+msgstr "მოდელები %(name)s აპლიკაციაში"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "შეცვლა"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "თქვენ არა გაქვთ რედაქტირების უფლება."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "ბოლო მოქმედებები"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "ჩემი მოქმედებები"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "არ არის მისაწვდომი"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "უცნობი შიგთავსი"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -551,31 +575,27 @@ msgstr ""
 "ბაზის შესაბამისი ცხრილები შექმნილია, და მონაცემთა ბაზის წაკითხვა შეუძლია "
 "შესაბამის მომხმარებელს."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "მომხმარებლის სახელი:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "პაროლი:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "დაგავიწყდათ თქვენი პაროლი ან მომხმარებლის სახელი?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "თარიღი/დრო"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "მომხმარებელი"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "მოქმედება"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -630,65 +650,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "შეიყვანეთ მომხმარებლის სახელი და პაროლი"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "შეიყვანეთ ახალი პაროლი მომხმარებლისათვის <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "პაროლი (განმეორებით)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "შეიყვანეთ იგივე პაროლი, დამოწმებისათვის."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "წაშლა"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "კიდევ ერთი %(verbose_name)s-ის დამატება"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "წაშლა"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "წავშალოთ?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "გმადლობთ, რომ დღეს ამ საიტთან მუშაობას დაუთმეთ დრო."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "ხელახლა შესვლა"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "პაროლის შეცვლა"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "პაროლი წარმატებით შეიცვალა"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "თქვენი პაროლი შეიცვალა."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -696,48 +716,48 @@ msgstr ""
 "გთხოვთ, უსაფრთხოების დაცვის მიზნით, შეიყვანოთ თქვენი ძველი პაროლი, შემდეგ კი "
 "ახალი პაროლი ორჯერ, რათა დარწმუნდეთ, რომ იგი შეყვანილია სწორად."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "ძველი პაროლი"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "შევცვალოთ ჩემი პაროლი"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "პაროლის აღდგენა"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "პაროლის აღდგენა დასრულებულია"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "თქვენი პაროლი დაყენებულია. ახლა შეგიძლიათ გადახვიდეთ შემდეგ გვერდზე და "
 "შეხვიდეთ სისტემაში."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "პაროლი შეცვლის დამოწმება"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "შეიყვანეთ ახალი პაროლი:"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -745,19 +765,19 @@ msgstr ""
 "გთხოვთ, შეიყვანეთ თქვენი ახალი პაროლი ორჯერ, რათა დავრწმუნდეთ, რომ იგი "
 "სწორად ჩაბეჭდეთ."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "ახალი პაროლი:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "პაროლის დამოწმება:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "პაროლის აღდგენა წარუმატებლად დასრულდა"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -765,25 +785,27 @@ msgstr ""
 "პაროლის აღდგენის ბმული არასწორი იყო, შესაძლოა იმის გამო, რომ იგი უკვე ყოფილა "
 "გამოყენებული. გთხოვთ, კიდევ ერთხელ სცადოთ პაროლის აღდგენა."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "პაროლის აღდგენა წარმატებით დასრულდა"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"თქვენს მიერ მითითებულ საფოსტო ყუთზე გამოგიგზავნეთ ინსტრუქციები, თუ როგორ "
-"უნდა დააყენოთ თქვენი პაროლი. წერილი მალე უნდა მიიღოთ."
+"ჩვენ გამოვაგზავნეთ მითითებები პაროლის დასაყენებლად ელ. ფოსტის მისამართზე, "
+"რომელიც თქვენ შეიყვანეთ. თქვენ მალე უნდა მიიღოთ ისინი."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
+"თქვენ მიიღეთ ეს წერილი იმიტომ, რომ გააკეთეთ პაროლის თავიდან დაყენების "
+"მოთხოვნა თქვენი მომხმარებლის ანგარიშისთვის %(site_name)s-ზე."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -802,36 +824,36 @@ msgstr "გმადლობთ, რომ იყენებთ ჩვენ
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s საიტის გუნდი"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"დაგავიწყდათ პაროლი? შეიყვანეთ თქვენი ელექტრონული ფოსტის მისამართი ამ ველში, "
-"ჩვენ გამოგიგზავნით ინსტრუქციებს, როგორ დააყენოთ ახალი."
+"დაგავიწყდათ თქვენი პაროლი? შეიყვანეთ თქვენი ელ. ფოსტის მისამართი ქვემოთ და "
+"ჩვენ გამოგიგზავნით მითითებებს ახალი პაროლის დასაყენებლად."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "ელ. ფოსტა:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "ელ. ფოსტის მისამართი:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "აღვადგინოთ ჩემი პაროლი"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "ყველა თარიღი"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
-msgstr ""
+msgstr "(არცერთი)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "ავირჩიოთ %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "აირჩიეთ %s შესაცვლელად"
diff --git a/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.mo
index 455baa1d90..9115102f96 100644
Binary files a/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.po
index 9165f819e8..d41375dcaa 100644
--- a/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.po
@@ -1,6 +1,8 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # avsd05 <avsd05@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
@@ -8,15 +10,15 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"PO-Revision-Date: 2013-03-01 11:40+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -29,11 +31,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"ეს არის მისაწვდომი %s-ის სია. ზოგიერთი მათგანის ასარჩევად,  მონიშვნით ისინი "
+"ქვედა სარკმელში და დააწკაპუნეთ  ორ სარკმელს შორის მდებარე ისარზე \"არჩევა\" ."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "აკრიფეთ ამ სარკმელში მისაწვდომი %s-ის სიის გასაფილტრად."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -46,11 +50,11 @@ msgstr "ავირჩიოთ ყველა"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "დააწკაპუნეთ ერთდროულად ყველა %s-ის ასარჩევად."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "არჩევა"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -67,15 +71,18 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"ეს არის არჩეული %s-ის სია. ზოგიერთი მათგანის მოსაშორებლად,  მონიშვნით ისინი "
+"ქვედა სარკმელში და დააწკაპუნეთ  ორ სარკმელს შორის მდებარე ისარზე \"მოშორება"
+"\" ."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "ყველას მოშორება"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "დააწკაპუნეთ ყველა არჩეული %s-ის ერთდროულად მოსაშორებლად."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo
index f097e1d5d1..03a514a5cd 100644
Binary files a/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/kk/LC_MESSAGES/django.po b/django/contrib/admin/locale/kk/LC_MESSAGES/django.po
index 8049b561ad..6bdf10017a 100644
--- a/django/contrib/admin/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/kk/LC_MESSAGES/django.po
@@ -7,28 +7,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Таңдалған %(count)d %(items)s элемент өшірілді."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s өшіре алмайды"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Сенімдісіз бе?"
 
@@ -37,198 +37,204 @@ msgstr "Сенімдісіз бе?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Таңдалған %(verbose_name_plural)s өшірілді"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Барлығы"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Иә"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Жоқ"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Кез келген күн"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Бүгін"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Өткен 7 күн"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Осы ай"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Осы жыл"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Сіздің сессия уақытыңыз өтіп кентті, өтініш, қайты кіріп көріңіз,"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Сіздің e-mail адресіңіз қолданушы атымен сәйкес келмейді, орнына '%s'-ды "
-"жазып көріңіз."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Әрекет:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "әрекет уақыты"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "объекттің id-i"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "объекттің repr-i"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "әрекет белгісі"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "хабарламаны өзгерту"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "Жорнал жазуы"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "Жорнал жазулары"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s өзгертілді."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "және"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" қосылды."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "\"%(object)s\" %(name)s-нің %(list)s өзгертілді."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" өшірілді."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Ешқандай толтырма өзгермеді."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" сәтті қосылды."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Төменде сіз қайта өзгерте аласыз."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Төменнен басқа %s қоса аласыз."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" сәтті өзгертілді."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" сәтті қосылды. Оны төменде өзгерте аласыз."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" сәтті қосылды."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" сәтті өзгертілді."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 "Бірнәрсені өзгерту үшін бірінші оларды таңдау керек. Ешнәрсе өзгертілмеді."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Ешқандай әрекет таңдалмады."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s қосу"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Бірінші кілті %(key)r бар %(name)s объекті жоқ."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s өзгету"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Мәліметтер базасының қатесі"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -237,7 +243,7 @@ msgstr[0] ""
 "\n"
 "other: %(count)s %(name)s таңдалғандарының барі өзгертілді."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -246,52 +252,60 @@ msgstr[0] ""
 "\n"
 "other: Барлығы %(total_count)s таңдалды"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 of %(cnt)s-ден 0 таңдалды"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" сәтті өшірілді."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Өзгерес тарихы: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Кіру"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Сайт әкімшілігі"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s әкімшілігі"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Күнтізбелік күн:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Уақыт:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Іздеу"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Тағы қосу"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Бет табылмады"
@@ -300,42 +314,40 @@ msgstr "Бет табылмады"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Кешірім сұраймыз, сіздің сұраған бетіңіз табылмады."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Негізгі"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Сервердің қатесі"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Сервердің қатесі (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Сервердің қатесі <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Қате пайда болды, бүл қате e-mail арқылы сайт әкімшілігіне жіберілді және "
-"тез арада түзетіледі. Сізге бізді түсінгеніңіз үшін рахмет."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -358,7 +370,7 @@ msgstr "Осылардың %(total_count)s %(module_name)s барлығын та
 msgid "Clear selection"
 msgstr "Белгілерді өшіру"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -368,22 +380,22 @@ msgid "Welcome,"
 msgstr "Қош келдіңіз,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Құжаттама"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Құпия сөзді өзгерту"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Шығу"
 
@@ -395,36 +407,36 @@ msgstr "Даңғо сайтының әкімі"
 msgid "Django administration"
 msgstr "Даңғо әкімшілігі"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Қосу"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Тарих"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Сайтта көру"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] ""
 "one: Астындағы қатені дұрыстаңыз.\n"
 "other: Астындағы қателерді дұрыстаңыз."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s қосу"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Сүзгіз"
 
@@ -441,12 +453,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Өшіру"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -456,7 +468,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' объектты өшіруы байланысты объекттерін "
 "өшіруді қажет етеді, бырақ сізде осындай объектерді өшіру рұқсаты жоқ:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -465,7 +477,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' объектті өшіру осындай байлансты "
 "объекттерды өшіруді қажет етеді:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +486,16 @@ msgstr ""
 "%(object_name)s \"%(escaped_object)s\" объекттерді өшіруге сенімдісіз бе? "
 "Бұл байланысты элементтер де өшіріледі:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Иә, сенімдімін"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Бірнеше объекттерді өшіру"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +505,7 @@ msgstr ""
 "%(objects_name)s объектты өшіруы байланысты объекттерін өшіруді қажет етеді, "
 "бырақ сізде осындай объектерді өшіру рұқсаты жоқ:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +514,7 @@ msgstr ""
 "Таңдалған %(objects_name)s-ді(ы) өшіру, онымен байланыстағы қорғалған "
 "объектілердің барлығын жояды:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +528,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s бағдарламадағы қол жетімді улгілер."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Өзгетру"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Бірденке түзетуге рұқсатыңыз жоқ."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Соңғы әрекеттер"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Менің әрекеттерім"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Қол жетімдісі жоқ"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Белгісіз мазмұн"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -554,31 +566,27 @@ msgstr ""
 "Дерекқор орнатуыңызда бір қате бар. Дерекқор кестелері дұрыс құрылғаның және "
 "дерекқор көрсетілген дерекқор пайдаланушыда оқұ рұқсаты бар."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Қолданушы аты:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Құпия сөз:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Өшіру/Уақыт"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Қолданушы"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Әрекет"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -632,65 +640,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Пайдаланушының атын және құпия сөзді енгізіңіз."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "<strong>%(username)s</strong> пайдаланушы үшін жаңа құпия сөзді енгізіңіз."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Құпия сөз"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Құпия сөз(қайтадан)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Растау үшін жоғардағыдай құпия сөзді енгізіңіз."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Өшіру"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Тағы басқа %(verbose_name)s кос"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Өшіру"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Өшіру?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Бүгін Веб-торапқа уақыт бөлгеніңіз үшін рахмет."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Қайтадан кіріңіз"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Құпия сөзді өзгерту"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Құпия сөз сәтті өзгертілді"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Құпия сөзіңіз өзгертілді."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -698,64 +706,64 @@ msgstr ""
 "Ескі құпия сөзіңізді енгізіңіз, содан сон сенімді болу үшін жаңа құпия "
 "сөзіңізді екі рет енгізіңіз."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Ескі құпия сөз"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Жаңа құпия сөз"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Құпия сөзімді өзгерту"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Құпия сөзді өзгерту"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Құпия сөзді өзгерту бітті"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Сіздің құпия сөзіңіз енгізілді.  Жүйеге кіруіңізге болады."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Құпия сөзді өзгерту растау"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Жаңа құпия сөзді енгізіңіз"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "Сенімді болу үшін жаңа құпия сөзіңізді екі рет енгізіңіз."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Жаңа құпия сөз:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Құпия сөз (растау):"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Құпия сөзді өзгертуы сәтсіз аяқталды"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -763,27 +771,23 @@ msgstr ""
 "Құпия сөзді өзгерту байланыс дұрыс емес, мүмкін ол осыған дейін "
 "пайдаланылды.  Жаңа құпия сөзді өзгерту сұрау жіберіңіз."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Құпия сөз сәтті өзгертілді"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Енгізген e-mail адреске құпия сөзді өзгерту нұскаларын жібердік. Жақын арада "
-"алуыңыз тиіс."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Сіз %(site_name)s сайтындағы ұяшығыңыздың құпия сөзін өзгертуге сұраныс "
-"жібергендіктен, бұл e-mail-ді алып отырсыз."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -802,36 +806,34 @@ msgstr "Біздің веб-торабын қолданғаныңыз үшін 
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s тобы"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Құпия сөзді ұмытып қалдыңыз ба? Астыға email адресті енгізіңіз, содан кейін "
-"біз оған құпия сөзді өзгерту нұскаларын жібереміз."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-mail адрес:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Құпия сөзді жаңала"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Барлық мерзімдер"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ешнарсе)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s таңда"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s өзгерту үщін таңда"
diff --git a/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.mo
index 828a49a71b..d6810f73f2 100644
Binary files a/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.po
index c9c9529c24..9cc0abdf3b 100644
--- a/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.po
@@ -9,13 +9,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Nurlan Rakhimzhanov <nurlan.rakhimzhanov@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/km/LC_MESSAGES/django.mo b/django/contrib/admin/locale/km/LC_MESSAGES/django.mo
index 9017dee613..b76acd6b1f 100644
Binary files a/django/contrib/admin/locale/km/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/km/LC_MESSAGES/django.po b/django/contrib/admin/locale/km/LC_MESSAGES/django.po
index 5be670310c..ad03433d64 100644
--- a/django/contrib/admin/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/km/LC_MESSAGES/django.po
@@ -6,27 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "តើលោកអ្នកប្រាកដទេ?"
 
@@ -35,160 +35,137 @@ msgstr "តើលោកអ្នកប្រាកដទេ?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr ""
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "ទាំងអស់"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "យល់ព្រម"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "មិនយល់ព្រម"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "មិន​ដឹង"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "កាល​បរិច្ឆេទណាមួយ"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "ថ្ងៃនេះ"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "៧​ថ្ងៃ​កន្លង​មក"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "ខែ​នេះ"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "ឆ្នាំ​នេះ"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr ""
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "អ៊ីមែលរបស់លោកអ្នក មិនអាចធ្វើជា ឈ្មោះសមាជិកបានទេ ។ សូមសាកល្បងជាមួយ '%s'។"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr ""
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "ពេលវេលាប្រតិបត្តិការ"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "លេខ​សំគាល់​កម្មវិធី (object id)"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "object repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "សកម្មភាព"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "ផ្លាស់ប្តូរ"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "កំណត់ហេតុ"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "កំណត់ហេតុ"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr ""
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "បានផ្លាស់ប្តូរ %s"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "និង"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "ពុំមានទិន្នន័យត្រូវបានផ្លាស់ប្តូរ។"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "ឈ្មោះកម្មវិធី %(name)s \"%(obj)s\" បានបញ្ជូលដោយជោគជ័យ​។"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "សូមសាកល្បងកែប្រែម្តងទៀត។"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "លោកអ្នកអាចបន្ថែម  %s ផ្សេងទៀតដូចខាងក្រោម។"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "កម្មវិធីឈ្មោះ %(name)s \"%(obj)s\" ត្រូវបានផ្លាស់ប្តូរដោយជោគជ័យ។"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -196,93 +173,132 @@ msgstr ""
 "ឈ្មោះកម្មវីធី %(name)s \"%(obj)s\" ត្រូវបានបន្ថែមដោយជោគជ័យ។"
 " លោកអ្នកអាចផ្លាស់ប្តូរម្តងទៀតនៅខាងក្រោម។"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "ឈ្មោះកម្មវិធី %(name)s \"%(obj)s\" បានបញ្ជូលដោយជោគជ័យ​។"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "កម្មវិធីឈ្មោះ %(name)s \"%(obj)s\" ត្រូវបានផ្លាស់ប្តូរដោយជោគជ័យ។"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr ""
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "បន្ថែម %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "ផ្លាស់ប្តូរ %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "ទិន្នន័យមូលដ្ឋានមានបញ្ហា"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] ""
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "ឈ្មោះកម្មវិធី %(name)s \"%(obj)s\" ត្រូវបានលប់ដោយជោគជ័យ។"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "សកម្មភាពផ្លាស់ប្តូរកន្លងមក : %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "ពិនិត្យចូល"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "ទំព័រគ្រប់គ្រង"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr ""
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "កាលបរិច្ឆេទ"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "ម៉ោង"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr ""
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr ""
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "ទំព័រ​ដែល​លោកអ្នកចង់​រក​នេះពុំមាន​នៅក្នុងម៉ាស៊ីនរបស់យើងខ្ញុំទេ"
@@ -291,41 +307,40 @@ msgstr "ទំព័រ​ដែល​លោកអ្នកចង់​រក​
 msgid "We're sorry, but the requested page could not be found."
 msgstr "សួមអភ័យទោស ទំព័រ​ដែល​លោកអ្នកចង់​រក​នេះពុំមាន​នឹងក្នុងម៉ាស៊ីនរបស់យើងខ្ញុំទេ"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "គេហទំព័រ"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "ម៉ាស៊ីនផ្តល់សេវាកម្ម​ មានបញ្ហា"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "ម៉ាស៊ីនផ្តល់សេវាកម្ម​ មានបញ្ហា (៥០០)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "ម៉ាស៊ីនផ្តល់សេវាកម្ម​ មានបញ្ហា  <em>(៥០០)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"មានកំហុស។ កំហុសនេះត្រូវបានបញ្ជូនទៅកាន់អ្នកគ្រប់គ្រងគេហទំព័រនេះរួចហើយ។ សូមអភ័យទោសចំពោះបញ្ហានេះ។"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -348,7 +363,7 @@ msgstr ""
 msgid "Clear selection"
 msgstr ""
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -358,22 +373,22 @@ msgid "Welcome,"
 msgstr "សូមស្វាគមន៏"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "ឯកសារ"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "ផ្លាស់ប្តូរពាក្យសំងាត់"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "ចាកចេញ"
 
@@ -385,34 +400,34 @@ msgstr "ទំព័រគ្រប់គ្រងរបស់ Django"
 msgid "Django administration"
 msgstr "ការ​គ្រប់គ្រង​របស់ ​Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "បន្ថែម"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "សកម្មភាព​កន្លង​មក"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "មើលនៅលើគេហទំព័រដោយផ្ទាល់"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] ""
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "បន្ថែម %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "ស្វែងរកជាមួយ"
 
@@ -429,12 +444,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "លប់"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -444,14 +459,14 @@ msgstr ""
 "ការលប់ %(object_name)s '%(escaped_object)s' អាចធ្វើអោយ​កម្មវិធីដែលពាក់​ព័ន្ធបាត់បង់ ។"
 " ក៏ប៉ន្តែលោកអ្នក​ពុំមាន​សិទ្ធិលប់​កម្មវិធី​ប្រភេទនេះទេ។"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -460,16 +475,16 @@ msgstr ""
 "តើលោកអ្នកប្រាកដជាចង់លប់ %(object_name)s \"%(escaped_object)s"
 "\"? ការលប់ %(object_name)s '%(escaped_object)s' អាចធ្វើអោយ​កម្មវិធីដែលពាក់​ព័ន្ធបាត់បង់។"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "ខ្ញុំច្បាស់​ជាចង់លប់"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -477,14 +492,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -496,36 +511,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "ដោយ​  %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "ម៉ូដែល (Models) មាននៅក្នុងកម្មវិធី %(name)s ។"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "ផ្លាស់ប្តូរ"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "លោកអ្នកពុំមានសិទ្ធិ ផ្លាស់​ប្តូរ ទេ។"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "សកម្មភាពបច្ចុប្បន្ន"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "សកម្មភាពរបស់ខ្ញុំ"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "គ្មាន"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr ""
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -534,31 +549,27 @@ msgstr ""
 "មូលដ្ឋាន​ទិន្នន័យ​​​ របស់លោកអ្នក មានបញ្ហា។ តើ លោកអ្នកបាន បង្កើត តារាង​ របស់មូលដ្ឋានទិន្នន័យ​"
 " ហើយឬនៅ? តើ​ លោកអ្នកប្រាកដថាសមាជិកអាចអានមូលដ្ឋានទិន្នន័យនេះ​​បានឬទេ? "
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "ឈ្មោះសមាជិក"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "ពាក្យ​សំងាត់"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Date/time"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "សមាជិក"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "សកម្មភាព"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -611,147 +622,147 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "ពាក្យសំងាត់"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "ពាក្យសំងាត់ (ម្តងទៀត)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "សូមបំពេញពាក្យសំងាត់ដូចខាងលើ ដើម្បីត្រួតពិនិត្យ។ "
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "លប់ចេញ"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "លប់ចេញ"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr ""
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "សូមថ្លែងអំណរគុណ ដែលបានចំណាយ ពេលវេលាដ៏មានតំលៃ របស់លោកអ្នកមកទស្សនាគេហទំព័ររបស់យើងខ្ញុំ"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "ពិនិត្យចូលម្តងទៀត"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "ផ្លាស់ប្តូរពាក្យសំងាត់"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "ពាក្យសំងាត់បានផ្លាស់ប្តូរដោយជោគជ័យ"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "ពាក្យសំងាត់របស់លោកអ្នកបានផ្លាស់ប្តូរហើយ"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 msgstr "សូមបំពេញពាក្យសំងាត់ចាស់របស់លោកអ្នក។ ដើម្បីសុវត្ថភាព សូមបំពេញពាក្យសំងាត់ថ្មីខាងក្រោមពីរដង។"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr ""
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr ""
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "ផ្លាស់ប្តូរពាក្យសំងាត់"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "ពាក្យសំងាត់បានកំណត់សារជាថ្មី"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr ""
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "ពាក្យសំងាត់ថ្មី"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "បំពេញពាក្យសំងាត់ថ្មីម្តងទៀត"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "ពាក្យសំងាត់បានផ្លាស់ប្តូរដោយជោគជ័យ"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -772,34 +783,34 @@ msgstr "សូមអរគុណដែលបានប្រើប្រាស់
 msgid "The %(site_name)s team"
 msgstr "ក្រុមរបស់គេហទំព័រ %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "អ៊ីមែល"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "កំណត់ពាក្យសំងាត់សារជាថ្មី"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "កាលបរិច្ឆេទទាំងអស់"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "ជ្រើសរើស %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "ជ្រើសរើស %s ដើម្បីផ្លាស់ប្តូរ"
diff --git a/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.mo
index e99adb3372..9855b0ab89 100644
Binary files a/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.po
index 0be905586b..4b46f34fe2 100644
--- a/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.po
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo
index e12910deba..e9eb0ae23e 100644
Binary files a/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/kn/LC_MESSAGES/django.po b/django/contrib/admin/locale/kn/LC_MESSAGES/django.po
index fdd0f9e5cc..e8cd66d502 100644
--- a/django/contrib/admin/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/kn/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "ಖಚಿತಪಡಿಸುವಿರಾ? "
 
@@ -36,160 +36,137 @@ msgstr "ಖಚಿತಪಡಿಸುವಿರಾ? "
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr ""
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "ಎಲ್ಲಾ"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "ಹೌದು"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "ಇಲ್ಲ"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "ಗೊತ್ತಿಲ್ಲ(ದ/ದ್ದು)"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "ಯಾವುದೇ ದಿನಾಂಕ"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "ಈದಿನ"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "ಕಳೆದ ೭ ದಿನಗಳು"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "ಈ ತಿಂಗಳು"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "ಈ ವರ್ಷ"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr ""
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "ನಿಮ್ಮ ವಿ-ಅಂಚೆ ವಿಳಾಸವು ನಿಮ್ಮ ಬಳಕೆದಾರ-ಹೆಸರಲ್ಲ; ಬದಲಾಗಿ '%s'  ಪ್ರಯತ್ನಿಸಿ."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr ""
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "ಕ್ರಮದ(ಕ್ರಿಯೆಯ) ಸಮಯ"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "ವಸ್ತುವಿನ ಐಡಿ"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "ವಸ್ತು ಪ್ರಾತಿನಿಧ್ಯ"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "ಕ್ರಮದ(ಕ್ರಿಯೆಯ) ಪತಾಕೆ"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "ಬದಲಾವಣೆಯ ಸಂದೇಶ/ಸಂದೇಶ ಬದಲಿಸಿ"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "ಲಾಗ್ ದಾಖಲೆ"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "ಲಾಗ್ ದಾಖಲೆಗಳು"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr ""
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s ಬದಲಾಯಿಸಲಾಯಿತು."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ಮತ್ತು"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "ಯಾವುದೇ ಅಂಶಗಳು ಬದಲಾಗಲಿಲ್ಲ."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr " %(name)s \"%(obj)s\" ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "ನೀವು ಅದನ್ನು ಕೆಳಗೆ ಮತ್ತೆ ಬದಲಾಯಿಸಬಹುದು."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "ನೀವು ಕೆಳಗೆ ಇನ್ನೊಂದು %s ಸೇರಿಸಬಹುದು."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -197,93 +174,132 @@ msgstr ""
 "%(name)s \"%(obj)s\" ಅನ್ನು  ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು. ನೀವು ಕೆಳಗೆ ಅದನ್ನು ಮತ್ತೆ "
 "ಬದಲಾಯಿಸಬಹುದು."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr " %(name)s \"%(obj)s\" ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr ""
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s ಸೇರಿಸಿ"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s ಅನ್ನು ಬದಲಿಸು"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "ದತ್ತಸಂಚಯದ ದೋಷ"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] ""
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ಯಶಸ್ವಿಯಾಗಿ ಅಳಿಸಲಾಯಿತು."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "ಬದಲಾವಣೆಗಳ ಇತಿಹಾಸ: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "ಒಳಗೆ ಬನ್ನಿ"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "ತಾಣ ನಿರ್ವಹಣೆ"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr ""
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "ದಿನಾಂಕ:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "ಸಮಯ:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr ""
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr ""
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "ಪುಟ ಸಿಗಲಿಲ್ಲ"
@@ -292,42 +308,40 @@ msgstr "ಪುಟ ಸಿಗಲಿಲ್ಲ"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "ಕ್ಷಮಿಸಿ, ನೀವು ಕೇಳಿದ ಪುಟ ಸಿಗಲಿಲ್ಲ"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "ಪ್ರಾರಂಭಸ್ಥಳ(ಮನೆ)"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "ಸರ್ವರ್ ದೋಷ"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "ಸರ್ವರ್ ದೋಷ(೫೦೦)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "ಸರ್ವರ್ ದೋಷ<em>(೫೦೦)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"ಇಲ್ಲಿ ಒಂದು ತಪ್ಪಾಗಿದೆ. ಅದನ್ನು ತಾಣದ ಆಡಳಿತಗಾರರಿಗೆ ವರದಿ ಮಾಡಲಾಗಿದ್ದು ಶೀಘ್ರದ್ದಲ್ಲಿ "
-"ಸರಿಪಡಿಸಲಾಗುವದು. ನಿಮ್ಮ ತಾಳ್ಮೆಗೆ ಧನ್ಯವಾದಗಳು."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -350,7 +364,7 @@ msgstr ""
 msgid "Clear selection"
 msgstr ""
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -360,22 +374,22 @@ msgid "Welcome,"
 msgstr "ಸುಸ್ವಾಗತ."
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "ವಿವರಮಾಹಿತಿ"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "ಹೊರಕ್ಕೆ ಹೋಗಿ"
 
@@ -387,34 +401,34 @@ msgstr "ಜಾಂಗೋ ತಾಣದ ಆಡಳಿತಗಾರರು"
 msgid "Django administration"
 msgstr "ಜಾಂಗೋ ಆಡಳಿತ"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "ಸೇರಿಸಿ"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "ಚರಿತ್ರೆ"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "ತಾಣದಲ್ಲಿ ನೋಡಿ"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] ""
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s ಸೇರಿಸಿ"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "ಸೋಸಕ"
 
@@ -431,12 +445,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "ಅಳಿಸಿಹಾಕಿ"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -447,30 +461,30 @@ msgstr ""
 "ಕಳೆದುಹೋಗುತ್ತವೆ. ಆದರೆ ನಿಮ್ಮ ಖಾತೆಗೆ ಕೆಳಕಂಡ ಬಗೆಗಳ ವಸ್ತುಗಳನ್ನು ತೆಗೆದುಹಾಕಲು "
 "ಅನುಮತಿಯಿಲ್ಲ."
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "ಹೌದು,ನನಗೆ ಖಚಿತವಿದೆ"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -478,14 +492,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -497,36 +511,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "%(filter_title)s ಇಂದ"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s ಅನ್ವಯಾಂಶದಲ್ಲಿ ಮಾಡೆಲ್ಲುಗಳು ಲಭ್ಯ."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "ಬದಲಿಸಿ/ಬದಲಾವಣೆ"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "ಯಾವುದನ್ನೂ ತಿದ್ದಲು ನಿಮಗೆ ಅನುಮತಿ ಇಲ್ಲ ."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "ಇತ್ತೀಚಿನ ಕ್ರಮಗಳು"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "ನನ್ನ ಕ್ರಮಗಳು"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "ಯಾವುದೂ ಲಭ್ಯವಿಲ್ಲ"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr ""
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -535,31 +549,27 @@ msgstr ""
 "ಡಾಟಾಬೇಸನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡುವಾಗ ಏನೋ ತಪ್ಪಾಗಿದೆ. ಸೂಕ್ತ  ಡಾಟಾಬೇಸ್ ಕೋಷ್ಟಕಗಳು ರಚನೆಯಾಗಿ ಅರ್ಹ "
 "ಬಳಕೆದಾರರು ಅವುಗಳನ್ನು ಓದಬಹುದಾಗಿದೆಯೇ ಎಂಬುದನ್ನು ಖಾತರಿ ಪಡಿಸಿಕೊಳ್ಳಿ."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "ಬಳಕೆದಾರನ ಹೆಸರು:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "ಪ್ರವೇಶಪದ:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "ದಿನಾಂಕ/ಸಮಯ"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "ಬಳಕೆದಾರ"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "ಕ್ರಮ(ಕ್ರಿಯೆ)"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -613,64 +623,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "ಪ್ರವೇಶಪದ"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "ಖಚಿತಗೊಳಿಸಲು ಮೇಲಿನ ಪ್ರವೇಶಪದವನ್ನು ಇನ್ನೊಮ್ಮೆ ಬರೆಯಿರಿ."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "ತೆಗೆದು ಹಾಕಿ"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "ತೆಗೆದು ಹಾಕಿ"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr ""
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "ಈದಿನ ತಮ್ಮ ಅತ್ಯಮೂಲ್ಯವಾದ ಸಮಯವನ್ನು ನಮ್ಮ ತಾಣದಲ್ಲಿ ಕಳೆದುದಕ್ಕಾಗಿ ಧನ್ಯವಾದಗಳು."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "ಮತ್ತೆ ಒಳಬನ್ನಿ"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "ಪ್ರವೇಶಪದ ಬದಲಾವಣೆ"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "ಪ್ರವೇಶಪದ ಬದಲಾವಣೆ ಯಶಸ್ವಿ"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "ನಿಮ್ಮ ಪ್ರವೇಶಪದ ಬದಲಾಯಿಸಲಾಗಿದೆ"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -678,84 +688,84 @@ msgstr ""
 "ಭದ್ರತೆಯ ದೃಷ್ಟಿಯಿಂದ ದಯವಿಟ್ಟು ನಿಮ್ಮ ಹಳೆಯ ಪ್ರವೇಶಪದವನ್ನು ಸೂಚಿಸಿರಿ. ಆನಂತರ ನೀವು ಸರಿಯಾಗಿ "
 "ಬರೆದಿದ್ದೀರೆಂದು ನಾವು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು   ಹೊಸ ಪ್ರವೇಶಪದವನ್ನು ಎರಡು ಬಾರಿ ಬರೆಯಿರಿ."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
-msgstr ""
+msgstr "ಹಳೆಯ ಪ್ರವೇಶಪದ"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
-msgstr ""
+msgstr "ಹೊಸ ಪ್ರವೇಶಪದ"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "ನನ್ನ ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "ಪ್ರವೇಶಪದವನ್ನು ಬದಲಿಸುವಿಕೆ"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr ""
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "ಹೊಸ ಪ್ರವೇಶಪದ:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "ಪ್ರವೇಶಪದವನ್ನು ಖಚಿತಪಡಿಸಿ:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "ಪ್ರವೇಶಪದದ ಮರುನಿರ್ಧಾರ ಸಾಧ್ಯವಾಗಿದೆ"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -776,34 +786,34 @@ msgstr "ನಮ್ಮ ತಾಣವನ್ನು ಬಳಸಿದ್ದಕ್ದಾ
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s ತಂಡ"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "ನನ್ನ ಪ್ರವೇಶಪದವನ್ನು ಮತ್ತೆ ನಿರ್ಧರಿಸಿ "
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "ಎಲ್ಲಾ ದಿನಾಂಕಗಳು"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s ಆಯ್ದುಕೊಳ್ಳಿ"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "ಬದಲಾಯಿಸಲು %s ಆಯ್ದುಕೊಳ್ಳಿ"
diff --git a/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.mo
index da0946919d..eb7d37a4e9 100644
Binary files a/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.po
index 724847f8dc..799abdc1f3 100644
--- a/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: karthikbgl <karthikbgl@gmail.com>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo
index 9c0a47cf88..21151609ed 100644
Binary files a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po
index f6ef08e802..0d4a6efd1e 100644
--- a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po
@@ -7,28 +7,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jaehong Kim <mixe@korea.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d개의 %(items)s (을)를 성공적으로 삭제하였습니다."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s를 삭제할 수 없습니다."
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "확실합니까?"
 
@@ -37,166 +37,174 @@ msgstr "확실합니까?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "선택된 %(verbose_name_plural)s (을)를 삭제합니다."
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "모두"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "예"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "아니오"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "알 수 없습니다."
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "언제나"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "오늘"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "지난 7일"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "이번 달"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "이번 해"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "로그인 세션이 끊겼습니다. 다시 로그인 하세요."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "이메일 주소와 사용자명은 다릅니다. '%s'를 사용하세요."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "액션:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "액션 타임"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "오브젝트 아이디"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "오브젝트 표현"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "액션 플래그"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "메시지 변경"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "로그 엔트리"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "로그 엔트리"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "없음"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s (이)가 변경되었습니다."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "또한"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" (을)를 추가하였습니다."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s에 대한 %(name)s \"%(object)s\" (을)를 변경하였습니다."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" (을)를 삭제하였습니다."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "변경된 필드가 없습니다."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "계속해서 편집하실 수 있습니다."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "계속해서 다른 %s (을)를 추가하세요."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" (이)가 변경되었습니다."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다. 계속해서 편집하세요."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" (이)가 변경되었습니다."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -204,87 +212,95 @@ msgstr ""
 "항목들에 액션을 적용하기 위해선 먼저 항목들이 선택되어 있어야 합니다. 아무 항"
 "목도 변경되지 않았습니다."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "액션이 선택되지 않았습니다."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s 추가"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Primary key %(key)r에 대한 오브젝트 %(name)s(이)가 존재하지 않습니다."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s 변경"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "데이터베이스 오류"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s개의 %(name)s(이)가 변경되었습니다."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "모두 %(total_count)s개가 선택되었습니다."
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s 중 아무것도 선택되지 않았습니다."
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\"(이)가 삭제되었습니다."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "변경 히스토리: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "로그인"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "사이트 관리"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s 사이트 관리"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "날짜:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "시각:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "찾아보기"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "하나 더 추가하기"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "해당 페이지가 없습니다."
@@ -293,42 +309,40 @@ msgstr "해당 페이지가 없습니다."
 msgid "We're sorry, but the requested page could not be found."
 msgstr "죄송합니다, 요청하신 페이지를 찾을 수 없습니다."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "홈"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "서버 오류"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "서버 오류 (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "서버 오류 <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"오류가 발생했습니다. 사이트 관리자에게 이메일로 에러를 보고 했습니다. 조속히 "
-"수정하도록 하겠습니다. 고맙습니다."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -351,7 +365,7 @@ msgstr "%(total_count)s개의 %(module_name)s 모두를 선택합니다."
 msgid "Clear selection"
 msgstr "선택을 해제합니다."
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -361,22 +375,22 @@ msgid "Welcome,"
 msgstr "환영합니다,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "문서"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "비밀번호 변경"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "로그아웃"
 
@@ -388,34 +402,34 @@ msgstr "Django 사이트 관리"
 msgid "Django administration"
 msgstr "Django 관리"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "추가"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "히스토리"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "사이트에서 보기"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "아래의 오류를 수정하십시오."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s 추가"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "필터"
 
@@ -432,12 +446,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -448,7 +462,7 @@ msgstr ""
 "하고자 했으나, 지금 사용하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없"
 "습니다. :"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -457,7 +471,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s'를 삭제하려면 다음 보호상태의 연관 오브젝"
 "트를 삭제해야 합니다."
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -466,16 +480,16 @@ msgstr ""
 "정말로 %(object_name)s \"%(escaped_object)s\"(을)를 삭제하시겠습니까? 다음의 "
 "관련 항목들이 모두 삭제됩니다. :"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "네, 확실합니다."
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "여러 개의 오브젝트 삭제"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -485,7 +499,7 @@ msgstr ""
 "연관 오브젝트 삭제로 선택한 %(objects_name)s의 삭제 중, 그러나 당신의 계정은 "
 "다음 오브젝트의 삭제 권한이 없습니다. "
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -493,7 +507,7 @@ msgid ""
 msgstr ""
 "%(objects_name)s를 삭제하려면 다음 보호상태의 오브젝트를 삭제해야 합니다."
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -507,36 +521,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "%(filter_title)s (으)로"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s 어플리케이션으로 이용 가능한 모델"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "변경"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "수정할 권한이 없습니다."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "최근 액션"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "나의 액션"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "이용할 수 없습니다."
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "내용 형식이 지정되지 않았습니다."
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -545,31 +559,27 @@ msgstr ""
 "데이터베이스 설정에 문제가 발생했습니다. 해당 데이터베이스 테이블이 생성되었"
 "는지, 해당 유저가 데이터베이스를 읽어 들일 수 있는지 확인하세요."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "사용자명"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "비밀번호"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "날짜/시간"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "사용자"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "액션"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -623,64 +633,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "유저명과 암호를 입력하세요."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "<strong>%(username)s</strong> 새로운 비밀번호를 입력하세요."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "비밀번호"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "비밀번호 (확인)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "확인을 위해 위와 동일한 비밀번호를 입력하세요. "
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "삭제하기"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "%(verbose_name)s 더 추가하기"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "삭제하기"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "삭제"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "사이트를 이용해 주셔서 고맙습니다."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "다시 로그인하기"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "비밀번호 변경"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "비밀번호를 변경하였습니다."
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "비밀번호가 변경되었습니다."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -688,46 +698,46 @@ msgstr ""
 "보안상 필요하오니 기존에 사용하시던 비밀번호를 입력해 주세요. 새로운 비밀번호"
 "는 정확히 입력했는지 확인할 수 있도록 두 번 입력하시기 바랍니다."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "기존 비밀번호:"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "새 비밀번호:"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "비밀번호 변경"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "비밀번호 초기화"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "비밀번호가 초기화 완료"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "비밀번호가 설정되었습니다. 이제 로그인하세요."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "비밀번호 초기화 확인"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "새 비밀번호 입력"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -735,19 +745,19 @@ msgstr ""
 "새로운 비밀번호를 정확히 입력했는지 확인할 수 있도록두 번 입력하시기 바랍니"
 "다."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "새로운 비밀번호:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "새로운 비밀번호(확인):"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "비밀번호가 초기화를 실패하였습니다."
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -755,24 +765,23 @@ msgstr ""
 "비밀번호 초기화 링크가 이미 사용되어 올바르지 않습니다.비밀번호 초기화을 다"
 "시 해주세요."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "비밀번호가 초기화되었습니다."
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
-msgstr "새로운 비밀번호를 등록하신 이메일로 보내드렸습니다."
+msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"당신의 계정 %(site_name)s에 대한 암호 초기화 요구로 본 e-mail을 받으셨습니다."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -791,36 +800,34 @@ msgstr "사이트를 이용해 주셔서 고맙습니다."
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s 팀"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"비밀번호를 잊으셨나요? 아래에 메일 주소를 입력하시면, 새 비밀번호 설정 방법"
-"을 안내하는 메일을 보내드립니다."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "이메일 주소:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "비밀번호 초기화"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "언제나"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(없음)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s 선택"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "변경할 %s 선택"
diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo
index fb1dd173e0..9eff6a37fe 100644
Binary files a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po
index f398a997c5..c1591f6d4e 100644
--- a/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Jaehong Kim <mixe@korea.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/lb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lb/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..e7ab78d534
Binary files /dev/null and b/django/contrib/admin/locale/lb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/lb/LC_MESSAGES/django.po b/django/contrib/admin/locale/lb/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..2252ee71fa
--- /dev/null
+++ b/django/contrib/admin/locale/lb/LC_MESSAGES/django.po
@@ -0,0 +1,810 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+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-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/django/"
+"language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: actions.py:48
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr ""
+
+#: actions.py:60 options.py:1347
+#, python-format
+msgid "Cannot delete %(name)s"
+msgstr ""
+
+#: actions.py:62 options.py:1349
+msgid "Are you sure?"
+msgstr ""
+
+#: actions.py:83
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr ""
+
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
+msgid "All"
+msgstr ""
+
+#: filters.py:238
+msgid "Yes"
+msgstr "Jo"
+
+#: filters.py:239
+msgid "No"
+msgstr ""
+
+#: filters.py:253
+msgid "Unknown"
+msgstr "Onbekannt"
+
+#: filters.py:308
+msgid "Any date"
+msgstr ""
+
+#: filters.py:309
+msgid "Today"
+msgstr ""
+
+#: filters.py:313
+msgid "Past 7 days"
+msgstr ""
+
+#: filters.py:317
+msgid "This month"
+msgstr ""
+
+#: filters.py:321
+msgid "This year"
+msgstr ""
+
+#: forms.py:9
+#, python-format
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr ""
+
+#: helpers.py:23
+msgid "Action:"
+msgstr ""
+
+#: models.py:24
+msgid "action time"
+msgstr ""
+
+#: models.py:27
+msgid "object id"
+msgstr ""
+
+#: models.py:28
+msgid "object repr"
+msgstr ""
+
+#: models.py:29
+msgid "action flag"
+msgstr ""
+
+#: models.py:30
+msgid "change message"
+msgstr ""
+
+#: models.py:35
+msgid "log entry"
+msgstr ""
+
+#: models.py:36
+msgid "log entries"
+msgstr ""
+
+#: models.py:45
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr ""
+
+#: models.py:47
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr ""
+
+#: models.py:52
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr ""
+
+#: models.py:54
+msgid "LogEntry Object"
+msgstr ""
+
+#: options.py:156 options.py:172
+msgid "None"
+msgstr ""
+
+#: options.py:684
+#, python-format
+msgid "Changed %s."
+msgstr ""
+
+#: options.py:684 options.py:694
+msgid "and"
+msgstr ""
+
+#: options.py:689
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:693
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:698
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:702
+msgid "No fields changed."
+msgstr ""
+
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: options.py:951 options.py:1211
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+
+#: options.py:970
+msgid "No action selected."
+msgstr ""
+
+#: options.py:1050
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: options.py:1074 options.py:1319
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr ""
+
+#: options.py:1140
+#, python-format
+msgid "Change %s"
+msgstr ""
+
+#: options.py:1190
+msgid "Database error"
+msgstr ""
+
+#: options.py:1253
+#, python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] ""
+msgstr[1] ""
+
+#: options.py:1280
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: options.py:1285
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr ""
+
+#: options.py:1335
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: options.py:1382
+#, python-format
+msgid "Change history: %s"
+msgstr ""
+
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
+msgid "Log in"
+msgstr ""
+
+#: sites.py:388
+msgid "Site administration"
+msgstr ""
+
+#: sites.py:440
+#, python-format
+msgid "%s administration"
+msgstr ""
+
+#: widgets.py:90
+msgid "Date:"
+msgstr ""
+
+#: widgets.py:91
+msgid "Time:"
+msgstr ""
+
+#: widgets.py:165
+msgid "Lookup"
+msgstr ""
+
+#: widgets.py:271
+msgid "Add Another"
+msgstr ""
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
+#: templates/admin/404.html:4 templates/admin/404.html.py:8
+msgid "Page not found"
+msgstr ""
+
+#: templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
+msgid "Home"
+msgstr ""
+
+#: templates/admin/500.html:7
+msgid "Server error"
+msgstr ""
+
+#: templates/admin/500.html:11
+msgid "Server error (500)"
+msgstr ""
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr ""
+
+#: templates/admin/500.html:15
+msgid ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Go"
+msgstr ""
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr ""
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr ""
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr ""
+
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
+#, python-format
+msgid "%(name)s"
+msgstr ""
+
+#: templates/admin/base.html:28
+msgid "Welcome,"
+msgstr ""
+
+#: templates/admin/base.html:33
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr ""
+
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr ""
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Log out"
+msgstr ""
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr ""
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr ""
+
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
+msgid "Add"
+msgstr ""
+
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
+msgid "History"
+msgstr ""
+
+#: templates/admin/change_form.html:33
+#: templates/admin/edit_inline/stacked.html:9
+#: templates/admin/edit_inline/tabular.html:30
+msgid "View on site"
+msgstr ""
+
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/admin/change_list.html:58
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
+#: templates/admin/change_list.html:78
+msgid "Filter"
+msgstr ""
+
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr ""
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr ""
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:11
+#: templates/admin/submit_line.html:4
+msgid "Delete"
+msgstr "Läschen"
+
+#: templates/admin/delete_confirmation.html:18
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:26
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:34
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
+msgid "Yes, I'm sure"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:10
+msgid "Delete multiple objects"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:17
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:33
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+
+#: templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr ""
+
+#: templates/admin/index.html:20
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr ""
+
+#: templates/admin/index.html:39
+msgid "Change"
+msgstr "Änner"
+
+#: templates/admin/index.html:49
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: templates/admin/index.html:57
+msgid "Recent Actions"
+msgstr ""
+
+#: templates/admin/index.html:58
+msgid "My Actions"
+msgstr ""
+
+#: templates/admin/index.html:62
+msgid "None available"
+msgstr ""
+
+#: templates/admin/index.html:76
+msgid "Unknown content"
+msgstr ""
+
+#: templates/admin/invalid_setup.html:12
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+
+#: templates/admin/login.html:37
+msgid "Password:"
+msgstr ""
+
+#: templates/admin/login.html:44
+msgid "Forgotten your password or username?"
+msgstr ""
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr ""
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr ""
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr ""
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+
+#: templates/admin/pagination.html:10
+msgid "Show all"
+msgstr ""
+
+#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
+msgid "Save"
+msgstr ""
+
+#: templates/admin/search_form.html:7
+msgid "Search"
+msgstr ""
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr ""
+
+#: templates/admin/submit_line.html:5
+msgid "Save as new"
+msgstr ""
+
+#: templates/admin/submit_line.html:6
+msgid "Save and add another"
+msgstr ""
+
+#: templates/admin/submit_line.html:7
+msgid "Save and continue editing"
+msgstr ""
+
+#: templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+
+#: templates/admin/auth/user/add_form.html:8
+msgid "Enter a username and password."
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:31
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:38
+msgid "Password"
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
+msgid "Password (again)"
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:45
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr ""
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr ""
+
+#: templates/admin/edit_inline/tabular.html:17
+msgid "Delete?"
+msgstr ""
+
+#: templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr ""
+
+#: templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr ""
+
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
+msgid "Password change"
+msgstr ""
+
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
+msgid "Password change successful"
+msgstr ""
+
+#: templates/registration/password_change_done.html:17
+msgid "Your password was changed."
+msgstr ""
+
+#: templates/registration/password_change_form.html:26
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+
+#: templates/registration/password_change_form.html:32
+msgid "Old password"
+msgstr ""
+
+#: templates/registration/password_change_form.html:37
+msgid "New password"
+msgstr ""
+
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
+msgid "Change my password"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
+msgid "Password reset"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
+msgid "Password reset complete"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:17
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:7
+msgid "Password reset confirmation"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:17
+msgid "Enter new password"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:19
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:23
+msgid "New password:"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:25
+msgid "Confirm password:"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:31
+msgid "Password reset unsuccessful"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:33
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
+msgid "Password reset successful"
+msgstr ""
+
+#: templates/registration/password_reset_done.html:17
+msgid ""
+"We've emailed you instructions for setting your password to the email "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:10
+msgid "Thanks for using our site!"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:12
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:17
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Reset my password"
+msgstr ""
+
+#: templatetags/admin_list.py:344
+msgid "All dates"
+msgstr ""
+
+#: views/main.py:33
+msgid "(None)"
+msgstr ""
+
+#: views/main.py:76
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: views/main.py:78
+#, python-format
+msgid "Select %s to change"
+msgstr ""
diff --git a/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..422adcc1fe
Binary files /dev/null and b/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..d2a63fb7d9
--- /dev/null
+++ b/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.po
@@ -0,0 +1,168 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2011-01-19 15:01+0000\n"
+"Last-Translator: Django team\n"
+"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/django/"
+"language/lb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
+msgid "Available %s"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into this box to filter down the list of available %s."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:57
+msgid "Filter"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:61
+msgid "Choose all"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:67
+msgid "Choose"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:69
+msgid "Remove"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Chosen %s"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr ""
+
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+
+#: static/admin/js/calendar.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+
+#: static/admin/js/calendar.js:27
+msgid "S M T W T F S"
+msgstr ""
+
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr ""
+
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
+msgid "Now"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:53
+msgid "Clock"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:81
+msgid "Choose a time"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:86
+msgid "Midnight"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:87
+msgid "6 a.m."
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:88
+msgid "Noon"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
+msgid "Cancel"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
+msgid "Today"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:148
+msgid "Calendar"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:195
+msgid "Yesterday"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:199
+msgid "Tomorrow"
+msgstr ""
diff --git a/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo
index a160406570..d8f30faf4b 100644
Binary files a/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/lt/LC_MESSAGES/django.po b/django/contrib/admin/locale/lt/LC_MESSAGES/django.po
index 04c3761596..e0a4970871 100644
--- a/django/contrib/admin/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/lt/LC_MESSAGES/django.po
@@ -1,37 +1,40 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # lauris <lauris@runbox.com>, 2011.
+# Nikolajus Krauklis <nikolajus@gmail.com>, 2013.
+# Simonas Kazlauskas <simonas@kazlauskas.me>, 2012.
 # Simonas Simas <simonas@kazlauskas.me>, 2012.
 #   <sirexas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-09 11:18+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-23 12:50+0000\n"
+"Last-Translator: Nikolajus Krauklis <nikolajus@gmail.com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Sėkmingai ištrinta %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Ištrinti %(name)s negalima"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Ar esate tikras?"
 
@@ -40,170 +43,183 @@ msgstr "Ar esate tikras?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Ištrinti pasirinktus %(verbose_name_plural)s "
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Visi"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Taip"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ne"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Betkokia data"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Šiandien"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Paskutinės 7 dienos"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Šį mėnesį"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Šiais metais"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Prašome įvesti tinkamą personalo paskyros vartotojo vardą ir slaptažodį. "
+"Prašome įvesti tinkamą personalo paskyros %(username)s ir slaptažodį. "
 "Atminkite, kad abu laukeliai yra jautrūs raidžių dydžiui."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Prisijunkite dar kartą, nes sesijos laikas baigėsi."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Jūsų el. pašto adresas nėra jūsų naudotojo vardas. Vietoje jo bandykite '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Veiksmas:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "veiksmo laikas"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objekto id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objekto repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "veiksmo žymė"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "pakeisti žinutę"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "log įrašas"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "log įrašai"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "„%(object)s“ pridėti."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Pakeisti „%(object)s“ - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "„%(object)s“ ištrinti."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry objektas"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "None"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Pakeistas %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ir"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Įrašyta %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Pakeistas %(list)s šiam %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Pašalinta %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nei vienas laukas nepakeistas"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" pridėtas sėkmingai."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Gali taisyti dar kartą žemiau."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Gali pridėti dar vieną %s žemiau."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" pridėtas sėkmingai. Gali taisytį jį dar kartą žemiau."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" buvo sėkmingai pridėtas. Jūs galite pridėti naują "
+"%(name)s žemiau."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" pridėtas sėkmingai."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" buvo sėkmingai pakeistas.  Jūs galite jį koreguoti "
+"žemiau."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" buvo sėkmingai pakeistas. Jūs galite pridėti naują "
+"%(name)s žemiau."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -211,30 +227,30 @@ msgstr ""
 "Įrašai turi būti pasirinkti, kad būtų galima atlikti veiksmus. Įrašai "
 "pakeisti nebuvo."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Veiksmai atlikti nebuvo."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Pridėti %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Įrašas %(name)s su pirminiu raktu %(key)r neegzistuoja."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Pakeisti %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Duomenų bazės klaida"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -242,7 +258,7 @@ msgstr[0] "%(count)s %(name)s sėkmingai pakeistas."
 msgstr[1] "%(count)s %(name)s sėkmingai pakeisti."
 msgstr[2] "%(count)s %(name)s "
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -250,52 +266,60 @@ msgstr[0] "%(total_count)s pasirinktas"
 msgstr[1] "%(total_count)s pasirinkti"
 msgstr[2] "Visi %(total_count)s pasirinkti"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 iš %(cnt)s pasirinkta"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" sėkmingai ištrintas."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Pakeisti istoriją: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Prisijungti"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Saito administravimas"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s administravimas"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Data:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Laikas:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Paieška"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Pridėti dar viena"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Šiuo metu:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Pakeisti:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Puslapis nerastas"
@@ -304,42 +328,42 @@ msgstr "Puslapis nerastas"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Atsiprašome, bet prašytas puslapis nerastas."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Pradinis"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Serverio klaida"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Serverio klaida (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Serverio klaida <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Įvyko klaida. Apie ją buvo pranešta administratoriams ir turėtų būti greitai "
-"ištaisyta. Dėkojame už kantrybę."
+"Netikėta klaida. Apie ją buvo pranešta administratoriams el. paštu ir ji "
+"turėtų būti greitai sutvarkyta. Dėkui už kantrybę."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -362,7 +386,7 @@ msgstr "Pasirinkti visus %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Atstatyti į pradinę būseną"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -372,22 +396,22 @@ msgid "Welcome,"
 msgstr "Sveiki,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Keisti slaptažodį"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Atsijungti"
 
@@ -399,36 +423,36 @@ msgstr "Django saito administravimas"
 msgid "Django administration"
 msgstr "Django administravimas"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Pridėti"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Istorija"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Matyti saite"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Ištaisykite žemiau esancią klaidą."
 msgstr[1] "Ištaisykite žemiau esancias klaidas."
 msgstr[2] "Ištaisykite žemiau esancias klaidas."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Naujas %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtras"
 
@@ -445,12 +469,12 @@ msgstr "Rikiavimo prioritetas: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Perjungti rikiavimą"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -460,7 +484,7 @@ msgstr ""
 "Trinant %(object_name)s '%(escaped_object)s' turi būti ištrinti ir susiję "
 "objektai, bet tavo vartotojas neturi teisių ištrinti šių objektų:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -469,7 +493,7 @@ msgstr ""
 "Ištrinant %(object_name)s '%(escaped_object)s' būtų ištrinti šie apsaugoti "
 "ir susiję objektai:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -478,16 +502,16 @@ msgstr ""
 "Ar tu esi tikras, kad nori ištrinti %(object_name)s \"%(escaped_object)s\"? "
 "Visi susiję objektai bus ištrinti:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Taip, esu tikras"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Ištrinti kelis objektus"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -497,7 +521,7 @@ msgstr ""
 "Ištrinant pasirinktą %(objects_name)s būtų ištrinti susiję objektai, tačiau "
 "jūsų vartotojas neturi reikalingų teisių ištrinti šiuos objektų tipus:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -506,7 +530,7 @@ msgstr ""
 "Ištrinant pasirinktus %(objects_name)s būtų ištrinti šie apsaugoti ir susiję "
 "objektai:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -520,36 +544,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Pagal %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelis prieinamas %(name)s programoje."
+msgid "Models in the %(name)s application"
+msgstr "%(name)s aplikacijos modeliai"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Pakeisti"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Neturite teisių ką nors keistis."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Paskutiniai Veiksmai"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mano Veiksmai"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nėra prieinamų"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Nežinomas turinys"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -559,31 +583,27 @@ msgstr ""
 "reikalingos lentelės sukurtos ir vartotojas turi teises skaityti duomenų "
 "bazę."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Naudotojo vardas:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Pamiršote slaptažodį ar vartotojo vardą?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Data/laikas"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Naudotojas"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Veiksmas"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -640,64 +660,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Įveskite naudotojo vardą ir slaptažodį."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Įveskite naują slaptažodį naudotojui <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Slaptažodis (dar kartą)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Patikrinimui įvesk tokį patį slaptažodį, kaip viršuje."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Pašalinti"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Pridėti dar viena %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Pašalinti"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Ištrinti?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Dėkui už praleistą laiką šiandien."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Prisijungti dar kartą"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Slaptažodžio keitimas"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Slaptažodis sėkmingai pakeistas"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Jūsų slaptažodis buvo pakeistas."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -705,46 +725,46 @@ msgstr ""
 "Saugumo sumetimais įvesk seną slaptažodį ir tada du kartus naują, kad "
 "įsitikinti, jog nesuklydai rašydamas"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Senas slaptažodis"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Naujas "
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Keisti mano slaptažodį"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Slaptažodžio atstatymas"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Slaptažodžio atstatymas baigtas"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Jūsų slaptažodis buvo išsaugotas. Dabas galite prisijungti."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Slaptažodžio atstatymo patvirtinimas"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Įveskite naują slaptažodį"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -752,19 +772,19 @@ msgstr ""
 "Įveskite naująjį slaptažodį du kartus, taip užtikrinant, jog nesuklydote "
 "rašydami."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Naujasis slaptažodis:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Slaptažodžio patvirtinimas:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Slaptažodžio atstatymas nesėkmingas"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -772,27 +792,27 @@ msgstr ""
 "Slaptažodžio atstatymo nuoroda buvo negaliojanti, nes ja tikriausiai jau "
 "buvo panaudota. Prašykite naujo slaptažodžio pakeitimo."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Slaptažodis sėkmingai atstatytas"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Slaptažodžio atstatymo procedūra išsiųsta į jūsų anksčiau nurodytą el. pašto "
-"adresą. Turėtumėte jį neužilgo gauti."
+"Mes išsiuntėme jums slaptažodžio atstatymo instrukcijas jūsų pateiktų el. "
+"pašto adresu. Turėtumėte jas neilgai trukus gauti."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Jūs gavote šį laišką, nes prašėte slaptažodžio atstatymo savo naudotojo "
-"paskyrai svetainėje %(site_name)s."
+"Jūs gaunate šį laišką nes prašėte paskyros slaptažodžio atkūrimo "
+"%(site_name)s svetainėje."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -811,36 +831,36 @@ msgstr "Dėkui, kad naudojatės mūsų saitu!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s komanda"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Pamiršote slaptažodį? Įveskite savo el. pašto adresą žemiau ir mes jums "
-"atsiųsime naują slaptažodį."
+"Pamiršote slaptažodį? Įveskite savo el. pašto adresą ir mes išsiųsime laišką "
+"su instrukcijomis kaip nustatyti naują slaptažodį."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "El. pašto adresas:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Atstatyti slaptažodį"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Visos datos"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "()"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Pasirinkti %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Pasirinkite %s kurį norite keisti"
diff --git a/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.mo
index ef1bcc8b8e..a79269d5d0 100644
Binary files a/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.po
index 7cca9a1561..7bb9e51d5a 100644
--- a/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.po
@@ -11,15 +11,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-09 16:22+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Simonas Kazlauskas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo
index 9371f633bd..f985292ddf 100644
Binary files a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po
index 5b8fb0d05c..0cc8c6a7e2 100644
--- a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Veiksmīgi izdzēsti %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Vai esat pārliecināts?"
 
@@ -38,195 +38,203 @@ msgstr "Vai esat pārliecināts?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Izdzēst izvēlēto %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Visi"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Jā"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nē"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Jebkurš datums"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Šodien"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Pēdējās 7 dienas"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Šomēnes"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Šogad"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Lūdzu pieslēdzieties vēlreiz, jūsu sesija ir beigusies."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Jūsu e-pasta adrese nav jūsu lietotājvārds. Izmēģiniet '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Darbība:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "darbības laiks"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objekta id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objekta attēlojums"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "darbības atzīme"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "izmaiņas teksts"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "žurnāla ieraksts"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "žurnāla ieraksti"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "nekas"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Izmainīts %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "un"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Pievienots %(name)s \"%(object)s\""
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Izmainīts %(list)s priekš %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Dzēsts %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Lauki nav izmainīti"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" pievienots sekmīgi."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Zemāk varat labot to atkal"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Zemāk varat pievienot vēl vienu %s."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" nomainīts sekmīgi."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" pievienots sekmīgi. Zemāk varat to labot."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" pievienots sekmīgi."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" nomainīts sekmīgi."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr "Lai veiktu darbību, jāizvēlas rindas. Rindas nav izmainītas."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nav izvēlēta darbība."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Pievienot %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s objekts ar primāro atslēgu %(key)r neeksistē."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Labot %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Datubāzes kļūda"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -234,7 +242,7 @@ msgstr[0] "%(count)s %(name)s ir laboti sekmīgi"
 msgstr[1] "%(count)s %(name)s ir sekmīgi rediģēts"
 msgstr[2] "%(count)s %(name)s ir sekmīgi rediģēti."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -242,52 +250,60 @@ msgstr[0] "%(total_count)s izvēlēti"
 msgstr[1] "%(total_count)s izvēlēts"
 msgstr[2] "%(total_count)s izvēlēti"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 no %(cnt)s izvēlēti"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" sekmīgi izdzēsts."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Izmaiņu vēsture: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Pieslēgties"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Lapas administrācija"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s administrācija"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datums:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Laiks:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Pārlūkot"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Pievienot vēl vienu"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Lapa nav atrasta"
@@ -296,42 +312,40 @@ msgstr "Lapa nav atrasta"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Atvainojiet, pieprasītā lapa neeksistē."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Sākums"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Servera kļūda"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Servera kļūda (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Servera kļūda <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ir notikusi kļūda. Tā ir paziņota lapas administratoriem ar e-pasta "
-"starpniecību un visdrīzākajā laikā tiks izlabota. Paldies par sapratni."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -354,7 +368,7 @@ msgstr "Izvēlēties visus %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Atcelt iezīmēto"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -364,22 +378,22 @@ msgid "Welcome,"
 msgstr "Sveicināti,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentācija"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Paroles maiņa"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Atslēgties"
 
@@ -391,36 +405,36 @@ msgstr "Django administrācijas lapa"
 msgid "Django administration"
 msgstr "Django administrācija"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Pievienot"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Vēsture"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Apskatīt lapā"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Lūdzu, izlabojiet kļūdu zemāk."
 msgstr[1] "Lūdzu, izlabojiet kļūdas zemāk."
 msgstr[2] "Lūdzu, izlabojiet kļūdas zemāk."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Pievienot %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrs"
 
@@ -437,12 +451,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -452,14 +466,14 @@ msgstr ""
 "Izdzēšot objektu %(object_name)s '%(escaped_object)s', tiks dzēsti visi "
 "saistītie objekti, bet jums nav tiesību dzēst sekojošus objektu tipus:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -468,16 +482,16 @@ msgstr ""
 "Vai esat pārliecināts, ka vēlaties dzēst %(object_name)s \"%(escaped_object)s"
 "\"? Tiks dzēsti arī sekojoši saistītie objekti:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Jā, esmu pārliecināts"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Dzēst vairākus objektus"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -485,14 +499,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -504,36 +518,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Pēc %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeļi, kas pieejami %(name)s aplikācijā."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Izmainīt"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Jums nav tiesības neko labot."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Nesenās darbības"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Manas darbības"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nav pieejams"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Nezināms saturs"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -542,31 +556,27 @@ msgstr ""
 "Problēma ar datubāzes instalāciju. Pārliecinieties, ka attiecīgās tabulas ir "
 "izveidotas un attiecīgajam lietotājam ir tiesības tai piekļūt."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Lietotāja vārds:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Parole:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datums/laiks"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Lietotājs"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Darbība"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -623,64 +633,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Ievadiet jaunu paroli lietotājam <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Parole"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Parole (vēlreiz)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Pārbaudei atkārtoti ievadiet to pašu paroli kā augstāk."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Dzēst"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Pievienot vēl %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Dzēst"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Dzēst?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Paldies par pavadīto laiku mājas lapā."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Pieslēgties vēlreiz"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Paroles maiņa"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Paroles nomaiņa sekmīga"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Jūsu parole tika nomainīta."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -688,46 +698,46 @@ msgstr ""
 "Drošības nolūkos ievadiet veco paroli un pēc tam ievadiet jauno paroli "
 "divreiz, lai varētu pārbaudīt, ka tā ir uzrakstīta pareizi."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Vecā parole"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Jaunā parole"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Nomainīt manu paroli"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Paroles pārstatīšana(reset)"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Paroles pārstatīšana pabeigta"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Jūsu parole ir uzstādīta. Varat pieslēgties."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Paroles pārstatīšanas apstiprinājums"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Ievadiet jauno paroli"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -735,19 +745,19 @@ msgstr ""
 "Lūdzu ievadiet jauno paroli divreiz, lai varētu pārbaudīt, ka tā ir "
 "uzrakstīta pareizi."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Jaunā parole:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Apstiprināt paroli:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Paroles pārstatīšana nesekmīga"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -755,23 +765,21 @@ msgstr ""
 "Paroles pārstatīšanas saite bija nekorekta, iespējams, tā jau ir izmantota. "
 "Lūdzu pieprasiet paroles pārstatīšanu vēlreiz."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Paroles pārstatīšana sekmīga"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Uz e-pastu aizsūtītas instrukcijas paroles uzstādīšanai. Jums to drīzumā "
-"vajadzētu saņemt."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -792,36 +800,34 @@ msgstr "Paldies par mūsu lapas lietošanu!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s komanda"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Aizmirsāt savu paroli? Ievadiet e-pasta adresi zemāk un saņemsiet e-pastu ar "
-"instrukcijām jaunas paroles uzstādīšanai."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-pasta adrese:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Paroles pārstatīšana"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Visi datumi"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Izvēlēties %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Izvēlēties %s, lai izmainītu"
diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo
index 8211b12da8..27fc77f3f1 100644
Binary files a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po
index 06d1d55d99..7172554a14 100644
--- a/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po
@@ -9,14 +9,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo
index da6a2a4509..c53a805962 100644
Binary files a/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/django.po b/django/contrib/admin/locale/mk/LC_MESSAGES/django.po
index e0f8770c4c..66f19dcf79 100644
--- a/django/contrib/admin/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/mk/LC_MESSAGES/django.po
@@ -8,28 +8,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-12 11:12+0000\n"
-"Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Успешно беа избришани %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Не може да се избрише %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Сигурни сте?"
 
@@ -38,162 +38,137 @@ msgstr "Сигурни сте?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Избриши ги избраните %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Сите"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Да"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Не"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Непознато"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Било кој датум"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Денеска"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Последните 7 дена"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Овој месец"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Оваа година"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Ве молам внесете точно корисничко име и лозинка за административен корисник. "
-"Внимавајте, сите полиња се осетливи на големи и мали букви."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Ве молам најавете се повторно бидејќи вашата сесија е истечена."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Вашата е-пошта не е вашето корисничко име. Пробајте со „%s“."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Акција:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "време на акција"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "идентификационен број на објект"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "репрезентација на објект"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "знакче за акција"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "измени ја пораката"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "ставка во записникот"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "ставки во записникот"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Додадено \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Променето \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Избришано \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Запис во дневник"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ништо"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Изменета %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "и"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Додадено %(name)s „%(object)s“."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Изменето %(list)s за %(name)s „%(object)s“."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Избришан  %(name)s „%(object)s“."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Не беше изменето ниедно поле."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Ставката %(name)s \"%(obj)s\" беше успешно додадена."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Подолу можете повторно да го уредите."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Подолу можете да додате уште еден %s."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" беше успешно изменета."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,7 +176,38 @@ msgstr ""
 "Ставката %(name)s \"%(obj)s\" беше успешно додадена. Подолу можете повторно "
 "да ја уредите."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Ставката %(name)s \"%(obj)s\" беше успешно додадена."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" беше успешно изменета."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,89 +215,97 @@ msgstr ""
 "Мора да се одберат предмети за да се изврши акција врз нив. Ниеден предмет "
 "не беше променет."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Ниедна акција не е одбрана."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Додади %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "објект %(name)s со примарен клуч %(key)r не постои."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Измени %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Грешка во базата на податоци"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s ставка %(name)s беше успешно изменета."
 msgstr[1] "%(count)s ставки %(name)s беа успешно изменети."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s одбран"
 msgstr[1] "Сите %(total_count)s одбрани"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 од %(cnt)s избрани"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Ставаката %(name)s \"%(obj)s\" беше избришана успешно."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Историја на измени: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Најава"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Администрација на сајт"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s администрација"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Датум:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Време:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Побарај"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Додади друго"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Страницата не е најдена"
@@ -300,42 +314,40 @@ msgstr "Страницата не е најдена"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Се извинуваме, но неможе да ја најдеме страницата која ја баравте."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Дома"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Грешка со серверот"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Грешка со серверот (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Грешка со серверот <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Имаше грешка. Истата беше пријавена на администраторите и ќе биде поправена "
-"во брзо време. Ви благодариме за вашето трпение."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -358,7 +370,7 @@ msgstr "Избери ги сите %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Откажи го изборот"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -368,22 +380,22 @@ msgid "Welcome,"
 msgstr "Добредојдовте,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Документација"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Промени лозинка"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Одјава"
 
@@ -395,35 +407,35 @@ msgstr "Џанго администрација на сајт"
 msgid "Django administration"
 msgstr "Џанго администрација"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Додади"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Историја"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Погледни на сајтот"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Ве молам поправете ја грешката подолу."
 msgstr[1] "Ве молам поправете ги грешките подолу."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Додади %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Филтер"
 
@@ -440,12 +452,12 @@ msgstr "Приоритет на сортирање: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Вклучи/исклучи сортирање"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -456,7 +468,7 @@ msgstr ""
 "поврзаните објекти, но со вашата сметка немате доволно привилегии да ги "
 "бришете следните типови на објекти:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -465,7 +477,7 @@ msgstr ""
 "Бришење на %(object_name)s '%(escaped_object)s' ќе резултира со бришење на "
 "следниве заштитени објекти:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +486,16 @@ msgstr ""
 "Сигурне сте дека сакате да ги бришете %(object_name)s „%(escaped_object)s“? "
 "Сите овие ставки ќе бидат избришани:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Да, сигурен сум"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Избриши повеќе ставки"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +505,7 @@ msgstr ""
 "Бришење на избраните %(objects_name)s  ќе резултира со бришење на поврзани "
 "објекти, но немате одобрување да ги избришете следниве типови објекти:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +514,7 @@ msgstr ""
 "Бришење на избраните %(objects_name)s бара бришење на следните поврзани "
 "објекти кои се заштитени:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +528,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Според %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Достапни модели во апликацијата %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Измени"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Немате дозвола ништо да уредува."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Последни акции"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Мои акции"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ништо не е достапно"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Непозната содржина"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -555,31 +567,27 @@ msgstr ""
 "соодветни табели во базата се направени и потврдете дека базата може да биде "
 "прочитана од соодветниот корисник."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Корисник:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Ја заборавивте вашата лозинка или корисничко име?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Датум/час"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Корисник"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Акција"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -635,65 +643,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Внесете корисничко име и лозинка."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Внесете нова лозинка за корисникот <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Лозинка (повторно)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Заради верификација внесете ја истата лозинка како и горе."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Отстрани"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Додадете уште %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Отстрани"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Избриши?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
 "Ви благодариме што денеска поминавте квалитетно време со интернет страницава."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Најавете се повторно"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Измена на лозинка"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Успешна промена на лозинката"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Вашата лозинка беше сменета."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -701,46 +709,46 @@ msgstr ""
 "Заради сигурност ве молам внесете ја вашата стара лозинка и потоа внесете ја "
 "новата двапати за да може да се потврди дека правилно сте ја искуцале."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Стара лозинка"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Промени ја мојата лозинка"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Ресетирање на лозинка"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Ресетирањето на лозинката заврши"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Вашата лозинка беше поставена. Сега можете да се најавите."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Одобрување за ресетирање на лозинка"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Внесете нова лозинка"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -748,19 +756,19 @@ msgstr ""
 "Ве молам внесете ја вашата нова лозинка двапати за да може да бидете сигурни "
 "дека правилно сте ја внеле."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Нова лозинка:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Потврди лозинка:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Неуспеа ресетирањето на лозинката"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -768,27 +776,23 @@ msgstr ""
 "Врската за ресетирање на лозинката беше невалидна, најверојатно бидејќи веќе "
 "била искористена. Ве молам повторно побарајте ресетирање на вашата лозинката."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Успешно е ресетирањето на лозинката"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Ви пративме инструкции за поставување на вашата лозинка на е-пошта која ја "
-"напишавте. Би требало да ја примите за кратко време."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Го добивате овој e-mail затоа што баравте промена на вашата лозинка на "
-"%(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -807,36 +811,34 @@ msgstr "Ви благодариме што го користите овој са
 msgid "The %(site_name)s team"
 msgstr "Тимот на %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Сте ја заборавиле вашата лозинка? Внесете ја вашата е-пошта подолу и ќе ви "
-"пратиме инструкции за поставување на нова."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Е-пошта:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Ресетирај ја мојата лозинка"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Сите датуми"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ништо)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Изберете %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Изберете %s за измена"
diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.mo
index 95dc210335..3e2e54ef6d 100644
Binary files a/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.po
index 6e41394d2c..7fb9b1bb7b 100644
--- a/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-12 11:27+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo
index 8c28d7eb23..7eac738b31 100644
Binary files a/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/django.po b/django/contrib/admin/locale/ml/LC_MESSAGES/django.po
index 53d502399e..4329fb3c39 100644
--- a/django/contrib/admin/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ml/LC_MESSAGES/django.po
@@ -8,28 +8,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-09 17:50+0000\n"
-"Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s വിജയകരമായി ഡിലീറ്റ് ചെയ്തു."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Cannot delete %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "തീര്‍ച്ചയാണോ?"
 
@@ -38,256 +38,270 @@ msgstr "തീര്‍ച്ചയാണോ?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "തെരഞ്ഞെടുത്ത %(verbose_name_plural)s ഡിലീറ്റ് ചെയ്യുക."
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "എല്ലാം"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "അതെ"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "അല്ല"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "അജ്ഞാതം"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "ഏതെങ്കിലും തീയതി"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "ഇന്ന്"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "കഴിഞ്ഞ ഏഴു ദിവസം"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "ഈ മാസം"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "ഈ വര്‍ഷം"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"സ്റ്റാഫ് അക്കൗണ്ടിന്റെ ശരിയായ ഉപയോക്തൃ നാമവും പാസ്‌വേര്‍ഡും നല്കുക. രണ്ടിലേയും ഇംഗ്ലീഷ് "
-"വല്യക്ഷരങ്ങളും ചെറിയക്ഷരങ്ങളും അങ്ങനെത്തന്നെ നല്കാന്‍ ശ്രദ്ധിക്കുക."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "താങ്കളുടെ സെഷന്റെ കാലാവധി കഴിഞ്ഞു. വീണ്ടും ലോഗിന്‍ ചെയ്യണം."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "നിങ്ങളുടെ ഇ-മെയില്‍ അഡ്രസ്സ് അല്ല യൂസര്‍നാമം. പകരം '%s' ഉപയോഗിച്ച് നോക്കുക."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "ആക്ഷന്‍"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "ആക്ഷന്‍ സമയം"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "ഒബ്ജെക്ട് ഐഡി"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "ഒബ്ജെക്ട് സൂചന"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "ആക്ഷന്‍ ഫ്ളാഗ്"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "സന്ദേശം മാറ്റുക"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "ലോഗ് എന്ട്രി"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "ലോഗ് എന്ട്രികള്‍"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" ചേര്‍ത്തു."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\"ല്‍ %(changes)s മാറ്റം വരുത്തി"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\" നീക്കം ചെയ്തു."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "ലോഗ്‌എന്‍ട്രി വസ്തു"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s മാറ്റി."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ഉം"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" ചേര്‍ത്തു."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" ന്റെ %(list)s മാറ്റി."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" ഡിലീറ്റ് ചെയ്തു."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "ഒരു മാറ്റവുമില്ല."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" വിജയകരമായി കൂട്ടിച്ചേര്ത്തു."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "താഴെ നിന്ന് വീണ്ടും മാറ്റം വരുത്താം"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "%s ഒന്നു കൂടി ചേര്‍ക്കാം"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ല്‍ മാറ്റം വരുത്തി."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" കൂട്ടി ചേര്‍ത്തു. താഴെ നിന്നും മാറ്റം വരുത്താം."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" വിജയകരമായി കൂട്ടിച്ചേര്ത്തു."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ല്‍ മാറ്റം വരുത്തി."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr "ആക്ഷന്‍ നടപ്പിലാക്കേണ്ട വകകള്‍ തെരഞ്ഞെടുക്കണം. ഒന്നും മാറ്റിയിട്ടില്ല."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "ആക്ഷനൊന്നും തെരഞ്ഞെടുത്തില്ല."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s ചേര്‍ക്കുക"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(key)r എന്ന പ്രാഥമിക കീ ഉള്ള %(name)s വസ്തു ഒന്നും നിലവിലില്ല."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s മാറ്റാം"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "ഡേറ്റാബേസ് തകരാറാണ്."
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s ല്‍ മാറ്റം വരുത്തി."
 msgstr[1] "%(count)s %(name)s ല്‍ മാറ്റം വരുത്തി."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s തെരഞ്ഞെടുത്തു."
 msgstr[1] "%(total_count)sഉം തെരഞ്ഞെടുത്തു."
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s ല്‍ ഒന്നും തെരഞ്ഞെടുത്തില്ല."
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ഡിലീറ്റ് ചെയ്തു."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "%s ലെ മാറ്റങ്ങള്‍."
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "ലോഗ്-ഇന്‍"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "സൈറ്റ് ഭരണം"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s ഭരണം"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "തീയതി:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "സമയം:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "തിരയുക"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "ഒന്നു കൂടി ചേര്‍ക്കുക"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "പേജ് കണ്ടില്ല"
@@ -296,42 +310,40 @@ msgstr "പേജ് കണ്ടില്ല"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "ക്ഷമിക്കണം, ആവശ്യപ്പെട്ട പേജ് കണ്ടെത്താന്‍ കഴിഞ്ഞില്ല."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "പൂമുഖം"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "സെര്‍വര്‍ തകരാറാണ്"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "സെര്‍വര്‍ തകരാറാണ് (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "സെര്‍വര്‍ തകരാറാണ് <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"എന്തോ തകരാറുണ്ട്. ഉടന്‍ പരിഹരിക്കാനായി സൈറ്റ് നിയന്ത്രകര്‍ക്കു ഇ-മെയില്‍ വഴി രിപ്പോര്‍ട്ട് "
-"ചെയ്തിട്ടുണ്ട്.ദയവായി കാത്തിരിക്കുക."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -354,7 +366,7 @@ msgstr "മുഴുവന്‍ %(total_count)s %(module_name)s ഉം തെ
 msgid "Clear selection"
 msgstr "തെരഞ്ഞെടുത്തത് റദ്ദാക്കുക."
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -364,22 +376,22 @@ msgid "Welcome,"
 msgstr "സ്വാഗതം, "
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "സഹായക്കുറിപ്പുകള്‍"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "പാസ് വേര്‍ഡ് മാറ്റുക."
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "പുറത്ത് കടക്കുക."
 
@@ -391,35 +403,35 @@ msgstr "ജാംഗോ സൈറ്റ് അഡ്മിന്‍"
 msgid "Django administration"
 msgstr "ജാംഗോ ഭരണം"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Add"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "ചരിത്രം"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "View on site"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "ദയവായി താഴെയുള്ള തെറ്റ് പരിഹരിക്കുക."
 msgstr[1] "ദയവായി താഴെയുള്ള തെറ്റുകള്‍ പരിഹരിക്കുക."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Add %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -434,14 +446,14 @@ msgstr "ക്രമീകരണത്തിനുള്ള മുന്‍ഗ
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "ക്രമീകരണം വിപരീത ദിശയിലാക്കുക."
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -452,7 +464,7 @@ msgstr ""
 "വസ്തുക്കളുംഡിലീറ്റ് ആവും. പക്ഷേ നിങ്ങള്‍ക്ക് താഴെ പറഞ്ഞ തരം വസ്തുക്കള്‍ ഡിലീറ്റ് ചെയ്യാനുള്ള അനുമതി "
 "ഇല്ല:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -461,7 +473,7 @@ msgstr ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -470,16 +482,16 @@ msgstr ""
 "%(object_name)s \"%(escaped_object)s\" ഡിലീറ്റ് ചെയ്യണമെന്ന് തീര്‍ച്ചയാണോ?അതുമായി "
 "ബന്ധമുള്ള താഴെപ്പറയുന്ന വസ്തുക്കളെല്ലാം ഡിലീറ്റ് ആവും:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "അതെ, തീര്‍ച്ചയാണ്"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "ഒന്നിലേറെ വസ്തുക്കള്‍ ഡിലീറ്റ് ചെയ്തോളൂ"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -490,7 +502,7 @@ msgstr ""
 "objects, but your account doesn't have permission to delete the following "
 "types of objects:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -499,7 +511,7 @@ msgstr ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -513,36 +525,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " By %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Models available in the %(name)s application."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "മാറ്റുക"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "ഒന്നിലും മാറ്റം വരുത്താനുള്ള അനുമതി ഇല്ല."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "സമീപകാല പ്രവ്രുത്തികള്‍"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "എന്റെ പ്രവ്രുത്തികള്‍"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "ഒന്നും ലഭ്യമല്ല"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "ഉള്ളടക്കം അറിയില്ല."
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -551,31 +563,27 @@ msgstr ""
 "നിങ്ങളുടെ ഡേറ്റാബേസ് ഇന്‍സ്ടാലേഷനില്‍ എന്തോ പിശകുണ്ട്. ശരിയായ ടേബിളുകള്‍ ഉണ്ടെന്നും ഡേറ്റാബേസ് "
 "വായനായോഗ്യമാണെന്നും ഉറപ്പു വരുത്തുക."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "യൂസര്‍ നാമം"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "പാസ് വേര്‍ഡ്"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "രഹസ്യവാക്കോ ഉപയോക്തൃനാമമോ മറന്നുപോയോ?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "തീയതി/സമയം"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "യൂസര്‍"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "ആക്ഷന്‍"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -629,64 +637,64 @@ msgstr "ആദ്യം, യൂസര്‍ നാമവും പാസ് വ
 msgid "Enter a username and password."
 msgstr "Enter a username and password."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "<strong>%(username)s</strong> ന് പുതിയ പാസ് വേര്‍ഡ് നല്കുക."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "പാസ് വേര്‍ഡ്"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "പാസ് വേര്‍ഡ് (വീണ്ടും)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "പാസ് വേര്‍ഡ് മുകളിലെ പോലെ തന്നെ നല്കുക. (ഉറപ്പു വരുത്താനാണ്.)"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "നീക്കം ചെയ്യുക"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "%(verbose_name)s ഒന്നു കൂടി ചേര്‍ക്കുക"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "നീക്കം ചെയ്യുക"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "ഡിലീറ്റ് ചെയ്യട്ടെ?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "ഈ വെബ് സൈറ്റില്‍ കുറെ നല്ല സമയം ചെലവഴിച്ചതിനു നന്ദി."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "വീണ്ടും ലോഗ്-ഇന്‍ ചെയ്യുക."
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "പാസ് വേര്‍ഡ് മാറ്റം"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "പാസ് വേര്‍ഡ് മാറ്റം വിജയിച്ചു"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "നിങ്ങളുടെ പാസ് വേര്‍ഡ് മാറ്റിക്കഴിഞ്ഞു."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -694,46 +702,46 @@ msgstr ""
 "സുരക്ഷയ്ക്കായി നിങ്ങളുടെ പഴയ പാസ് വേര്‍ഡ് നല്കുക. പിന്നെ, പുതിയ പാസ് വേര്‍ഡ് രണ്ട് തവണ നല്കുക. "
 "(ടയ്പ് ചെയ്തതു ശരിയാണെന്ന് ഉറപ്പാക്കാന്‍)"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "പഴയ പാസ് വേര്‍ഡ്"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "പുതിയ പാസ് വേര്‍ഡ്"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "എന്റെ പാസ് വേര്‍ഡ് മാറ്റണം"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍ പൂര്‍ണം"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "നിങ്ങളുടെ പാസ് വേര്‍ഡ് തയ്യാര്‍. ഇനി ലോഗ്-ഇന്‍ ചെയ്യാം."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍ ഉറപ്പാക്കല്‍"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "പുതിയ പാസ് വേര്‍ഡ് നല്കൂ"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -741,19 +749,19 @@ msgstr ""
 "ദയവായി നിങ്ങളുടെ പുതിയ പാസ് വേര്‍ഡ് രണ്ടു തവണ നല്കണം. ശരിയായാണ് ടൈപ്പു ചെയ്തത് എന്നു "
 "ഉറപ്പിക്കാനാണ്."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "പുതിയ പാസ് വേര്‍ഡ്:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "പാസ് വേര്‍ഡ് ഉറപ്പാക്കൂ:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍ പരാജയം"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -761,27 +769,23 @@ msgstr ""
 "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കാന്‍ നല്കിയ ലിങ്ക് യോഗ്യമല്ല. ഒരു പക്ഷേ, അതു മുന്പ് തന്നെ ഉപയോഗിച്ചു "
 "കഴിഞ്ഞതാവാം. പുതിയ ഒരു ലിങ്കിന് അപേക്ഷിക്കൂ."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍ വിജയം"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"നിങ്ങളുടെ പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കാനായി നിര്‍ദ്ദേശങ്ങള്‍ അടങ്ങിയ ഒരു ഈ-മെയില്‍ നിങ്ങള്‍ "
-"നല്കിയവിലാസത്തില്‍ അയച്ചിട്ടുണ്ട്. അത് നിങ്ങള്‍ക്ക് ഉടന്‍ ലഭിക്കേണ്ടതാണ്."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"%(site_name)s ലെ നിങ്ങളുടെ അക്കൗണ്ടിന്റെ പാസ്‌വേര്‍ഡ് മാറ്റാനുള്ള നിങ്ങളുടെ "
-"അഭ്യര്‍ഥനയെത്തുടര്‍ന്നാണു് ഈ ഈ-മെയില്‍ നിങ്ങള്‍ക്ക് ലഭിക്കുന്നത്."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -800,36 +804,34 @@ msgstr "ഞങ്ങളുടെ സൈറ്റ് ഉപയോഗിച്ച
 msgid "The %(site_name)s team"
 msgstr "The %(site_name)s team"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"പാസ് വേര്‍ഡ് മറന്നോ? നിങ്ങളുടെ ഇ-മെയില്‍ വിലാസം നല്കൂ, പുതിയ പാസ് വേര്‍ഡ് സ്ഥാപിക്കാനായി ഞങ്ങള്‍ "
-"നിര്‍ദ്ദേശങ്ങള്‍ ആ വിലാസത്തില്‍ അയക്കാം."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "ഇ-മെയില്‍ വിലാസം:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "എന്റെ പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കൂ"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "എല്ലാ തീയതികളും"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(None)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s തെരഞ്ഞെടുക്കൂ"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "മാറ്റാനുള്ള %s തെരഞ്ഞെടുക്കൂ"
diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo
index 283f38714e..660872c51b 100644
Binary files a/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po
index fdb855b33f..a72d967a52 100644
--- a/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 18:23+0000\n"
 "Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo
index 4161a8c76a..1debd204a8 100644
Binary files a/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/mn/LC_MESSAGES/django.po b/django/contrib/admin/locale/mn/LC_MESSAGES/django.po
index bb149c3212..e08b18d5cc 100644
--- a/django/contrib/admin/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/mn/LC_MESSAGES/django.po
@@ -1,36 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # jargalan <jargalanch@gmail.com>, 2011.
-# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011, 2012.
+# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011-2013.
 # Баясгалан Цэвлээ <bayasaa_7672@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-11 05:37+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-04 07:00+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(items)s ээс   %(count)d-ийг амжилттай устгалаа."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s устгаж чадахгүй."
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Итгэлтэй байна уу?"
 
@@ -39,163 +40,139 @@ msgstr "Итгэлтэй байна уу?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Сонгосон %(verbose_name_plural)s-ийг устга"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Бүх "
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Тийм"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Үгүй"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Тодорхойгүй"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Бүх өдөр"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Өнөөдөр"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Өнгөрсөн долоо хоног"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Энэ сар"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Энэ жил"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Ажилтан эрхтэй хэрэглэгчийн нэвтрэх нэр нууц үгийг зөв оруулна уу. Хоёр "
-"талбарт том жижиг үсэг ялгаатай. "
+"Ажилтан хэрэглэгчийн %(username)s ба нууц үгийг зөв оруулна уу. Хоёр талбарт "
+"том жижигээр үсгээр бичих ялгаатай."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Орсон хуудас тань хүчингүй болсон тул ахин нэвтрэнэ үү."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Цахим шуудангийн хаяг хэрэглэгчийн нэр биш. Оронд нь '%s' -ийг оруулна уу."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Үйлдэл:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "үйлдлийн хугацаа"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "обектийн id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "обектийн хамаарал"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "үйлдэлийн тэмдэг"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "өөрчлөлтийн мэдээлэл"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "лог өгөгдөл"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "лог өгөгдөлүүд"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" нэмсэн."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\"-ийг %(changes)s өөрчилсөн."
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\" устгасан."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Лог бүртгэлийн обект"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Хоосон"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Өөрчлөгдсөн %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ба"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Нэмэгдсэн %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\"-ийн өөрчлөгдсөн %(list)s"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Устгасан %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Өөрчилсөн талбар алга байна."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr " %(name)s \"%(obj)s\" амжилттай нэмэгдлээ."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Доорх хэсэгт үүнийг ахин засварлах боломжтой."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Доорх хэсэгт өөр %s нэмэх боломжтой."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr " %(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. "
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -203,96 +180,141 @@ msgstr ""
 "%(name)s \"%(obj)s\" амжилттай нэмэгдлээ. Доорх хэсэгт үүнийг ахин засварлах "
 "боломжтой."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" амжилттай нэмэгдлээ. Доорх хэсгээс %(name)s өөрийн "
+"нэмэх боломжтой."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr " %(name)s \"%(obj)s\" амжилттай нэмэгдлээ."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. Доорх хэсэгт дахин засах "
+"боломжтой."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. Доорх %(name)s хэсгээс дахин "
+"нэмэх боломжтой."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr " %(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. "
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 "Үйлдэл хийхийн тулд Та ядаж 1-ийг сонгох хэрэгтэй. Өөрчилөлт хийгдсэнгүй."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Үйлдэл сонгоогүй."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s-ийг нэмэх"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s обектийн үндсэн түлхүүр %(key)r олдохгүй байна."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s-ийг өөрчлөх"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Өгөгдлийн сангийн алдаа"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s-ийг амжилттай өөрчиллөө."
 msgstr[1] "%(count)s %(name)s-ийг амжилттай өөрчиллөө."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "Бүгд %(total_count)s сонгогдсон"
 msgstr[1] "Бүгд %(total_count)s сонгогдсон"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s оос 0 сонгосон"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr " %(name)s \"%(obj)s\" амжилттай устгагдлаа."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Өөрчлөлтийн түүх: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Нэвтрэх"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Сайтын удирдлага"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s  удирдлага"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Огноо:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Цаг:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Хайх"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Ахиад нэмэх"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Одоогийнх:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Өөрчилөлт:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Хуудас олдсонгүй."
@@ -301,42 +323,42 @@ msgstr "Хуудас олдсонгүй."
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Уучлаарай, хандахыг хүссэн хуудас тань олдсонгүй."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Нүүр"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Серверийн алдаа"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Серверийн алдаа (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Серверийн алдаа <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Алдаа гарсан байна. Энэ талаар цахим шуудангаар дамжуулан сайтын удирдлагад "
-"мэдэгдэж нэн даруй засах хэрэгтэй. Хүлээцтэй хандсанд баярлалаа."
+"Алдаа гарсан байна. Энэ алдааг сайт хариуцагчид цахим шуудангаар мэдэгдсэн "
+"бөгөөд тэд нэн даруй засах хэрэгтэй. Хүлээцтэй хандсанд баярлалаа."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -359,7 +381,7 @@ msgstr "Бүгдийг сонгох %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Сонгосонг цэвэрлэх"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -369,22 +391,22 @@ msgid "Welcome,"
 msgstr "Тавтай морилно уу"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Баримтжуулалт"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Нууц үг өөрчлөх"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Гарах"
 
@@ -396,35 +418,35 @@ msgstr "Сайтын удирдлага"
 msgid "Django administration"
 msgstr "Удирдлага"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Нэмэх"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Түүх"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Сайтаас харах"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Доорх алдааг засна уу."
 msgstr[1] "Доорх алдаануудыг засна уу."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s нэмэх"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Шүүлтүүр"
 
@@ -441,12 +463,12 @@ msgstr "Эрэмблэх урьтамж: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Эрэмбэлэлтийг харуул"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Устгах"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -456,7 +478,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s'-ийг устгавал холбогдох объект нь устах "
 "ч бүртгэл тань дараах төрлийн объектуудийг устгах зөвшөөрөлгүй байна:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -465,7 +487,7 @@ msgstr ""
 " %(object_name)s обектийг устгаж байна. '%(escaped_object)s' холбоотой "
 "хамгаалагдсан обектуудыг заавал утсгах хэрэгтэй :"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +496,16 @@ msgstr ""
 "Та %(object_name)s \"%(escaped_object)s\"-ийг устгахдаа итгэлтэй байна уу? "
 "Үүнийг устгавал дараах холбогдох зүйлс нь бүгд устана:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Тийм, итгэлтэй байна."
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Олон обектууд устгах"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +515,7 @@ msgstr ""
 "Сонгосон %(objects_name)s обектуудыг устгасанаар хамаатай бүх обкетууд устах "
 "болно. Гэхдээ таньд эрх эдгээр төрлийн обектуудыг утсгах эрх байхгүй байна: "
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +524,7 @@ msgstr ""
 "%(objects_name)s обектуудыг утсгаж байна дараах холбоотой хамгаалагдсан "
 "обектуудыг устгах шаардлагатай:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +538,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s -ээр"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s програмд загварууд байна."
+msgid "Models in the %(name)s application"
+msgstr "%(name)s хэрэглүүр дэх моделууд."
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Өөрчлөх"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Та ямар нэг зүйл засварлах зөвшөөрөлгүй байна."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Сүүлд хийсэн үйлдлүүд"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Миний үйлдлүүд"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Үйлдэл алга"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Тодорхойгүй агуулга"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -555,31 +577,27 @@ msgstr ""
 "зохих хүснэгт үүсгэгдсэн эсэх, өгөгдлийн санг зохих хэрэглэгч унших "
 "боломжтой байгаа эсэхийг шалгаарай."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Хэрэглэгчийн нэр:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Нууц үг:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Таны мартсан нууц үг эсвэл нэрвтэр нэр?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Огноо/цаг"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Хэрэглэгч"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Үйлдэл"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -635,64 +653,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Хэрэглэгчийн нэр ба нууц үгээ оруулна."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "<strong>%(username)s</strong>.хэрэглэгчид шинэ нууц үг оруулна уу."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Нууц үг "
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Нууц үг (ахиад)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Батлахын тулд дээрх нууц үгээ ахин хийнэ үү."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Хасах"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Өөр %(verbose_name)s  нэмэх "
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Хасах"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Устгах уу?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Манай вэб сайтыг ашигласанд баярлалаа."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Ахин нэвтрэх "
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Нууц үгийн өөрчлөлт"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Нууц үгийн өөрчлөлт амжилттай"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Нууц үг тань өөрчлөгдлөө."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -700,46 +718,46 @@ msgstr ""
 "Аюулгүй байдлын үүднээс хуучин нууц үгээ оруулаад шинэ нууц үгээ хоёр удаа "
 "хийнэ үү. Ингэснээр нууц үгээ зөв бичиж байгаа эсэхийг тань шалгах юм."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Хуучин нууц үг"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Шинэ нууц үг"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Нууц үгээ  солих"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Нууц үг шинэчилэх"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Нууц үг шинэчилэх явц дууслаа"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Та нууц үгтэй боллоо. Одоо бүртгэлд нэвтрэх боломжтой."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Нууц үг шинэчилэхийг баталгаажуулах"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Шинэ нууц үг оруулах"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -747,19 +765,19 @@ msgstr ""
 "Шинэ нууц үгээ хоёр удаа оруулна уу. Ингэснээр нууц үгээ зөв бичиж байгаа "
 "эсэхийг тань шалгах юм. "
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Шинэ нууц үг:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Нууц үгээ батлах:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Нууц үг шинэчилэх амжилтгүй боллоо"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -767,27 +785,27 @@ msgstr ""
 "Нууц үг авах холбоос болохгүй байна. Үүнийг аль хэдийнэ хэрэглэснээс болсон "
 "байж болзошгүй.  Шинэ нууц үг авахаар хүсэлт гаргана уу. "
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Нууц үг шинэчилэх амжилттай боллоо"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Таны оруулсан цахим шуудангийн хаягаар нууц үг авах зааварчилгааг илгээлээ. "
-"Энэ зааварчилгаа танд удахгүй очих болно. "
+"Таны оруулсан цахим шуудангийн хаягруу нууц үг сэргээх зааварчилгааг "
+"илгээлээ. Энэ зааварчилгаа танд удахгүй очих болно."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Таны %(site_name)s сайт дах эрхээр нууц үг сэргээх хүсэлт гаргасан учраас "
-"энэ майл танд ирсэн."
+"%(site_name)s сайтанд бүртгүүлсэн эрхийн нууц үгийг сэргээх хүсэлт гаргасан "
+"учир энэ имайл ийг та хүлээн авсан болно. "
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -806,36 +824,36 @@ msgstr "Манай сайтыг хэрэглэсэнд баярлалаа!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s баг"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "Нууц үгээ мартчихсан уу? Доорх хэсэгт цахим шуудангийн хаягаа оруулвал бид "
-"хаягаар тань шинийг авах зааварчилгаа явуулах болно."
+"хаягаар тань нууц үг сэргэх зааварчилгаа явуулах болно."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Цахим шуудангийн хаяг:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "ИМайл хаяг:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Нууц үгээ шинэчлэх"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Бүх огноо"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Хоосон)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s-г сонго"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Өөрчлөх %s-г сонгоно уу"
diff --git a/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.mo
index cd27f5caec..4d3be7a93d 100644
Binary files a/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.po
index 37c9e9e8fe..60f031d50f 100644
--- a/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-15 04:32+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/my/LC_MESSAGES/django.mo b/django/contrib/admin/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..50a7726141
Binary files /dev/null and b/django/contrib/admin/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/my/LC_MESSAGES/django.po b/django/contrib/admin/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..63639bd98b
--- /dev/null
+++ b/django/contrib/admin/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,808 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+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-17 07:10+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: actions.py:48
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr ""
+
+#: actions.py:60 options.py:1347
+#, python-format
+msgid "Cannot delete %(name)s"
+msgstr ""
+
+#: actions.py:62 options.py:1349
+msgid "Are you sure?"
+msgstr ""
+
+#: actions.py:83
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr ""
+
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
+msgid "All"
+msgstr "အားလံုး"
+
+#: filters.py:238
+msgid "Yes"
+msgstr "ဟုတ်"
+
+#: filters.py:239
+msgid "No"
+msgstr "မဟုတ်"
+
+#: filters.py:253
+msgid "Unknown"
+msgstr "အမည်မသိ"
+
+#: filters.py:308
+msgid "Any date"
+msgstr ""
+
+#: filters.py:309
+msgid "Today"
+msgstr "ယနေ့"
+
+#: filters.py:313
+msgid "Past 7 days"
+msgstr ""
+
+#: filters.py:317
+msgid "This month"
+msgstr ""
+
+#: filters.py:321
+msgid "This year"
+msgstr ""
+
+#: forms.py:9
+#, python-format
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr ""
+
+#: helpers.py:23
+msgid "Action:"
+msgstr ""
+
+#: models.py:24
+msgid "action time"
+msgstr ""
+
+#: models.py:27
+msgid "object id"
+msgstr ""
+
+#: models.py:28
+msgid "object repr"
+msgstr ""
+
+#: models.py:29
+msgid "action flag"
+msgstr ""
+
+#: models.py:30
+msgid "change message"
+msgstr ""
+
+#: models.py:35
+msgid "log entry"
+msgstr ""
+
+#: models.py:36
+msgid "log entries"
+msgstr ""
+
+#: models.py:45
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr ""
+
+#: models.py:47
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr ""
+
+#: models.py:52
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr ""
+
+#: models.py:54
+msgid "LogEntry Object"
+msgstr ""
+
+#: options.py:156 options.py:172
+msgid "None"
+msgstr ""
+
+#: options.py:684
+#, python-format
+msgid "Changed %s."
+msgstr ""
+
+#: options.py:684 options.py:694
+msgid "and"
+msgstr "နှင့်"
+
+#: options.py:689
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:693
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:698
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:702
+msgid "No fields changed."
+msgstr ""
+
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: options.py:951 options.py:1211
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+
+#: options.py:970
+msgid "No action selected."
+msgstr ""
+
+#: options.py:1050
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: options.py:1074 options.py:1319
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr ""
+
+#: options.py:1140
+#, python-format
+msgid "Change %s"
+msgstr ""
+
+#: options.py:1190
+msgid "Database error"
+msgstr ""
+
+#: options.py:1253
+#, python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] ""
+
+#: options.py:1280
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] ""
+
+#: options.py:1285
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr ""
+
+#: options.py:1335
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: options.py:1382
+#, python-format
+msgid "Change history: %s"
+msgstr ""
+
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
+msgid "Log in"
+msgstr "ဖွင့်ဝင်"
+
+#: sites.py:388
+msgid "Site administration"
+msgstr ""
+
+#: sites.py:440
+#, python-format
+msgid "%s administration"
+msgstr ""
+
+#: widgets.py:90
+msgid "Date:"
+msgstr ""
+
+#: widgets.py:91
+msgid "Time:"
+msgstr ""
+
+#: widgets.py:165
+msgid "Lookup"
+msgstr ""
+
+#: widgets.py:271
+msgid "Add Another"
+msgstr ""
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
+#: templates/admin/404.html:4 templates/admin/404.html.py:8
+msgid "Page not found"
+msgstr ""
+
+#: templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
+msgid "Home"
+msgstr "ပင်မ"
+
+#: templates/admin/500.html:7
+msgid "Server error"
+msgstr "ဆာဗာအမှားပြ"
+
+#: templates/admin/500.html:11
+msgid "Server error (500)"
+msgstr "ဆာဗာအမှားပြ (၅၀၀)"
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr "ဆာဗာအမှားပြ <em>(၅၀၀)</em>"
+
+#: templates/admin/500.html:15
+msgid ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Go"
+msgstr ""
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr ""
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr ""
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr ""
+
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
+#, python-format
+msgid "%(name)s"
+msgstr ""
+
+#: templates/admin/base.html:28
+msgid "Welcome,"
+msgstr "ကြိုဆို၊ "
+
+#: templates/admin/base.html:33
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr "စာရွက်စာတမ်း"
+
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr ""
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Log out"
+msgstr "ဖွင့်ထွက်"
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr ""
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr ""
+
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
+msgid "Add"
+msgstr ""
+
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
+msgid "History"
+msgstr ""
+
+#: templates/admin/change_form.html:33
+#: templates/admin/edit_inline/stacked.html:9
+#: templates/admin/edit_inline/tabular.html:30
+msgid "View on site"
+msgstr ""
+
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+
+#: templates/admin/change_list.html:58
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
+#: templates/admin/change_list.html:78
+msgid "Filter"
+msgstr "စီစစ်မှု"
+
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr ""
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr ""
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:11
+#: templates/admin/submit_line.html:4
+msgid "Delete"
+msgstr "ပယ်ဖျက်"
+
+#: templates/admin/delete_confirmation.html:18
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:26
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:34
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
+msgid "Yes, I'm sure"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:10
+msgid "Delete multiple objects"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:17
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:33
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+
+#: templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr ""
+
+#: templates/admin/index.html:20
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr ""
+
+#: templates/admin/index.html:39
+msgid "Change"
+msgstr ""
+
+#: templates/admin/index.html:49
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: templates/admin/index.html:57
+msgid "Recent Actions"
+msgstr ""
+
+#: templates/admin/index.html:58
+msgid "My Actions"
+msgstr ""
+
+#: templates/admin/index.html:62
+msgid "None available"
+msgstr ""
+
+#: templates/admin/index.html:76
+msgid "Unknown content"
+msgstr ""
+
+#: templates/admin/invalid_setup.html:12
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+
+#: templates/admin/login.html:37
+msgid "Password:"
+msgstr "စကားဝှက်:"
+
+#: templates/admin/login.html:44
+msgid "Forgotten your password or username?"
+msgstr ""
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr ""
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr ""
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr ""
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+
+#: templates/admin/pagination.html:10
+msgid "Show all"
+msgstr ""
+
+#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
+msgid "Save"
+msgstr ""
+
+#: templates/admin/search_form.html:7
+msgid "Search"
+msgstr ""
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] ""
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr ""
+
+#: templates/admin/submit_line.html:5
+msgid "Save as new"
+msgstr ""
+
+#: templates/admin/submit_line.html:6
+msgid "Save and add another"
+msgstr ""
+
+#: templates/admin/submit_line.html:7
+msgid "Save and continue editing"
+msgstr ""
+
+#: templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+
+#: templates/admin/auth/user/add_form.html:8
+msgid "Enter a username and password."
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:31
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:38
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
+msgid "Password (again)"
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:45
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "ဖယ်ရှား"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr ""
+
+#: templates/admin/edit_inline/tabular.html:17
+msgid "Delete?"
+msgstr ""
+
+#: templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr ""
+
+#: templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr ""
+
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
+msgid "Password change"
+msgstr ""
+
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
+msgid "Password change successful"
+msgstr ""
+
+#: templates/registration/password_change_done.html:17
+msgid "Your password was changed."
+msgstr ""
+
+#: templates/registration/password_change_form.html:26
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+
+#: templates/registration/password_change_form.html:32
+msgid "Old password"
+msgstr ""
+
+#: templates/registration/password_change_form.html:37
+msgid "New password"
+msgstr ""
+
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
+msgid "Change my password"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
+msgid "Password reset"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
+msgid "Password reset complete"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:17
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:7
+msgid "Password reset confirmation"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:17
+msgid "Enter new password"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:19
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:23
+msgid "New password:"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:25
+msgid "Confirm password:"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:31
+msgid "Password reset unsuccessful"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:33
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
+msgid "Password reset successful"
+msgstr ""
+
+#: templates/registration/password_reset_done.html:17
+msgid ""
+"We've emailed you instructions for setting your password to the email "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:10
+msgid "Thanks for using our site!"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:12
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:17
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "အီးမေးလ်လိပ်စာ:"
+
+#: templates/registration/password_reset_form.html:21
+msgid "Reset my password"
+msgstr ""
+
+#: templatetags/admin_list.py:344
+msgid "All dates"
+msgstr ""
+
+#: views/main.py:33
+msgid "(None)"
+msgstr ""
+
+#: views/main.py:76
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: views/main.py:78
+#, python-format
+msgid "Select %s to change"
+msgstr ""
diff --git a/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..2ef84df911
Binary files /dev/null and b/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..b1d8358141
--- /dev/null
+++ b/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.po
@@ -0,0 +1,169 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2013-03-18 11:10+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
+msgid "Available %s"
+msgstr "%s ကိုရယူနိုင်"
+
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into this box to filter down the list of available %s."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:57
+msgid "Filter"
+msgstr "စီစစ်မှု"
+
+#: static/admin/js/SelectFilter2.js:61
+msgid "Choose all"
+msgstr "အားလံုးရွေး"
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:67
+msgid "Choose"
+msgstr "ရွေး"
+
+#: static/admin/js/SelectFilter2.js:69
+msgid "Remove"
+msgstr "ဖယ်ရှား"
+
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Chosen %s"
+msgstr "%s ရွေးပြီး"
+
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
+msgstr "အားလံုးဖယ်ရှား"
+
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr ""
+
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "%(cnt)s မှ %(sel)s ရွေးချယ်ပြီး"
+
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+
+#: static/admin/js/calendar.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+
+#: static/admin/js/calendar.js:27
+msgid "S M T W T F S"
+msgstr ""
+
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr "ပြသ"
+
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr "ဖုံးကွယ်"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
+msgid "Now"
+msgstr "ယခု"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:53
+msgid "Clock"
+msgstr "နာရီ"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:81
+msgid "Choose a time"
+msgstr "အချိန်ရွေးပါ"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:86
+msgid "Midnight"
+msgstr "သန်းခေါင်"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:87
+msgid "6 a.m."
+msgstr "မနက်၆နာရီ"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:88
+msgid "Noon"
+msgstr "မွန်းတည့်"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
+msgid "Cancel"
+msgstr "ပယ်ဖျက်"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
+msgid "Today"
+msgstr "ယနေ့"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:148
+msgid "Calendar"
+msgstr "ပြက္ခဒိန်"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:195
+msgid "Yesterday"
+msgstr "မနေ့"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:199
+msgid "Tomorrow"
+msgstr "မနက်ဖြန်"
diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo
index cd7c24c666..20a111f5fd 100644
Binary files a/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/django.po b/django/contrib/admin/locale/nb/LC_MESSAGES/django.po
index 8cd45e31b8..4f285990ba 100644
--- a/django/contrib/admin/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/nb/LC_MESSAGES/django.po
@@ -1,36 +1,38 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-#   <jonklo@gmail.com>, 2012.
+#  <jonklo@gmail.com>, 2013.
+#   <jonklo@gmail.com>, 2012-2013.
 # jonklo <jonklo@gmail.com>, 2011.
 #   <sigurdga-transifex@sigurdga.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-13 11:19+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-03-06 17:00+0000\n"
+"Last-Translator: jonklo <jonklo@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Slettet %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Kan ikke slette %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
@@ -39,169 +41,179 @@ msgstr "Er du sikker?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Slett valgte %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Alle"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ja"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nei"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Når som helst"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "I dag"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Siste syv dager"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Denne måneden"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "I år"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Vennligst oppgi gyldig brukernavn og passord til en "
+"Vennligst oppgi gyldig %(username)s og passord til en "
 "administrasjonsbrukerkonto. Merk at det er forskjell på små og store "
 "bokstaver."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Økten din har tidsavbrutt, vennligst logg inn igjen."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "E-postadressen er ikke brukernavnet ditt, prøv «%s» isteden."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Handling:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "tid for handling"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objekt-ID"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objekt-repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "handlingsflagg"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "endre melding"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "logginnlegg"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "logginnlegg"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "La til «%(object)s»."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Endret «%(object)s» - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Slettet «%(object)s»."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry-objekt"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ingen"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Endret %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "og"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Opprettet %(name)s «%(object)s»."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Endret %(list)s for %(name)s «%(object)s»."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Slettet %(name)s «%(object)s»."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Ingen felt endret."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s «%(obj)s» ble lagt til."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Du kan redigere videre nedenfor."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Du kan legge til en ny %s nedenfor."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s «%(obj)s» ble endret."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s «%(obj)s» ble lagt til. Du kan redigere videre nedenfor."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" ble lagt til. Du kan legge til en ny %(name)s nedenfor."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s «%(obj)s» ble lagt til."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr "%(name)s \"%(obj)s\" ble endret. Du kan redigere videre nedenfor."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" ble endret. Du kan legge til en ny %(name)s nedenfor."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s «%(obj)s» ble endret."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,89 +221,97 @@ msgstr ""
 "Du må velge objekter for å utføre handlinger på dem. Ingen objekter har "
 "blitt endret."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Ingen handling valgt."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Legg til ny %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s-objekt med primærnøkkelen %(key)r finnes ikke."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Endre %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Databasefeil"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s ble endret."
 msgstr[1] "%(count)s %(name)s ble endret."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s valgt"
 msgstr[1] "Alle %(total_count)s valgt"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 av %(cnt)s valgt"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s «%(obj)s» ble slettet."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Endringshistorikk: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Logg inn"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Nettstedsadministrasjon"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s-administrasjon"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dato:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Tid:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Oppslag"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Legg til ny"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Nåværende:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Endre:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Fant ikke siden"
@@ -300,39 +320,39 @@ msgstr "Fant ikke siden"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Beklager, men siden du spør etter finnes ikke."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Hjem"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Tjenerfeil"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Tjenerfeil (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Tjenerfeil <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "Det har oppstått en feil. Feilen er blitt rapportert til administrator via e-"
 "post, og vil bli fikset snart. Takk for din tålmodighet."
@@ -358,7 +378,7 @@ msgstr "Velg alle %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Nullstill valg"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -368,22 +388,22 @@ msgid "Welcome,"
 msgstr "Velkommen,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -395,35 +415,35 @@ msgstr "Django administrasjonsside"
 msgid "Django administration"
 msgstr "Django-administrasjon"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Legg til"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historikk"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Vis på nettsted"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Vennligst korriger feilen under."
 msgstr[1] "Vennligst korriger feilene under."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Legg til ny %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrering"
 
@@ -440,12 +460,12 @@ msgstr "Sorteringsprioritet: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Slå av og på sortering"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -456,7 +476,7 @@ msgstr ""
 "objekter slettes, men du har ikke tillatelse til å slette følgende "
 "objekttyper:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -465,7 +485,7 @@ msgstr ""
 "Sletting av %(object_name)s «%(escaped_object)s» krever sletting av følgende "
 "beskyttede relaterte objekter:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +494,16 @@ msgstr ""
 "Er du sikker på at du vil slette %(object_name)s «%(escaped_object)s»? Alle "
 "de følgende relaterte objektene vil bli slettet:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ja, jeg er sikker"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Slett flere objekter"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -494,7 +514,7 @@ msgstr ""
 "relaterte objekter, men kontoen din har ikke tillatelse til å slette "
 "følgende objekttyper:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -503,7 +523,7 @@ msgstr ""
 "Sletting av det valgte %(objects_name)s ville kreve sletting av følgende "
 "beskyttede relaterte objekter:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -517,36 +537,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Etter %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeller tilgjengelig i %(name)s-applikasjonen."
+msgid "Models in the %(name)s application"
+msgstr "Modeller i %(name)s-applikasjonen"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Endre"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Du har ikke rettigheter til å redigere noe."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Siste handlinger"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mine handlinger"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ingen tilgjengelige"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Ukjent innhold"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -555,31 +575,27 @@ msgstr ""
 "Noe er galt med databaseinstallasjonen din. Sørg for at databasetabellene er "
 "opprettet og at brukeren har de nødvendige rettighetene."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Passord:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Glemt brukernavnet eller passordet ditt?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dato/tid"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Bruker"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Handling"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -635,64 +651,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Skriv inn brukernavn og passord."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Skriv inn et nytt passord for brukeren <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Passord"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Passord (gjenta)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Fjern"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Legg til ny %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Fjern"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Slette?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Takk for i dag."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Logg inn igjen"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Endre passord"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Passord endret"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Ditt passord ble endret."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -700,65 +716,65 @@ msgstr ""
 "Av sikkerhetsgrunner må du oppgi ditt gamle passord. Deretter oppgir du det "
 "nye passordet ditt to ganger, slik at vi kan kontrollere at det er korrekt."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Endre passord"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Nullstill passord"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Passord nullstilt"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Passordet ditt er satt. Du kan nå logge inn."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Bekreftelse på nullstilt passord"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Oppgi nytt passord"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 "Oppgi det nye passordet to ganger, for å sikre at det er skrevet korrekt."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nytt passord:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Gjenta nytt passord:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Passordet ble ikke nullstilt"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -766,14 +782,14 @@ msgstr ""
 "Nullstillingslenken er ugyldig, kanskje fordi den allerede har vært brukt. "
 "Vennligst nullstill passordet ditt på nytt."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
-msgstr "Passordet ble nullstilt"
+msgstr "Passord-nullstilling klar"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "Vi har sendt deg en e-post med instruksjoner for nullstilling av passord. Du "
@@ -782,11 +798,11 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Du har mottatt denne e-posten fordi du har bedt om nullstilling av passordet "
-"ditt for kontoen på %(site_name)s."
+"Du mottar denne e-posten fordi du har bedt om nullstilling av passordet ditt "
+"på %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -805,36 +821,36 @@ msgstr "Takk for at du bruker siden vår!"
 msgid "The %(site_name)s team"
 msgstr "Hilsen %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "Glemt passordet ditt? Oppgi e-postadressen din under, så sender vi deg en e-"
 "post med instruksjoner for nullstilling av passord."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Nullstill mitt passord"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Alle datoer"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Velg %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Velg %s du ønsker å endre"
diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo
index 0bddd153b7..99f6633f70 100644
Binary files a/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po
index 8152ab1a9a..abb13b9114 100644
--- a/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po
@@ -11,13 +11,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 13:06+0000\n"
 "Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ne/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ne/LC_MESSAGES/django.mo
index 9bbac5361b..76ff7b5a17 100644
Binary files a/django/contrib/admin/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ne/LC_MESSAGES/django.po b/django/contrib/admin/locale/ne/LC_MESSAGES/django.po
index c9ff41e1f0..986a7c461b 100644
--- a/django/contrib/admin/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ne/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "सफलतापूर्वक मेटियो %(count)d %(items)s ।"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s मेट्न सकिएन "
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "के तपाई पक्का हुनुहुन्छ ?"
 
@@ -36,255 +36,271 @@ msgstr "के तपाई पक्का हुनुहुन्छ ?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "%(verbose_name_plural)s छानिएको मेट्नुहोस"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "सबै"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "हो"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "होइन"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "कुनै मिति"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "आज"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "पूर्व ७ दिन"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "यो महिना"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "यो साल"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "कृपया पुन: लगिन गर्नुहोस, किनकी तपाइको अवधि सिद्धिएको छ ।"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "तपाइको ई-मेल ठेगाना तपाईको प्रयोगकर्ता नाम होइन । '%s' हुनसक्छ । "
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "कार्य:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "कार्य समय"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "वस्तु परिचय"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr ""
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "एक्सन फ्ल्याग"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "सन्देश परिवर्तन गर्नुहोस"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "लग"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "लगहरु"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "शुन्य"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s परिवर्तित ।"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "र"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" थपिएको छ ।"
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s को %(list)s फेरियो ।"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" मेटिएको छ ।"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "कुनै फाँट फेरिएन ।"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक परिवर्तन भयो । "
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "तपाई यो पुन: संशोधन गर्न सक्नुहुनेछ ।"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "तपाइ अर्को %s थप्न सक्नुहुनेछ । "
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक परिवर्तन भयो । "
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" सफलतापूर्वक थप भयो ।  तपाई यो पुन: संशोधन गर्न सक्नुहुनेछ ।"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक परिवर्तन भयो । "
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक परिवर्तन भयो । "
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr "कार्य गर्नका निम्ति वस्तु छान्नु पर्दछ । कुनैपनि छस्तु छानिएको छैन । "
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "कार्य छानिएको छैन ।"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s थप्नुहोस"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "प्राइमरी की %(key)r भएको %(name)s अब्जेक्ट"
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s परिवर्तित ।"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "डाटाबेस त्रुटि"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s सफलतापूर्वक परिवर्तन भयो ।"
 msgstr[1] "%(count)s %(name)sहरु सफलतापूर्वक परिवर्तन भयो ।"
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s चयन भयो"
 msgstr[1] "सबै %(total_count)s चयन भयो"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s को ० चयन गरियो"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक मेटियो । "
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "इतिहास फेर्नुहोस : %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "लगिन"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "साइट प्रशासन"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s प्रशासन"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "मिति:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "समय:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "खोज तलास"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "अर्को थप्नुहोस"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "पृष्ठ भेटिएन"
@@ -293,42 +309,40 @@ msgstr "पृष्ठ भेटिएन"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "क्षमापार्थी छौं तर अनुरोध गरिएको पृष्ठ भेटिएन ।"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "गृह"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "सर्भर त्रुटि"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "सर्भर त्रुटि (५००)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "सर्भर त्रुटि <em>(५००)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"त्रुटि भयो । साइट प्रशासकलाई ई-मेलबाट खबर गरिएको छ र चाडैं समाधान हुनेछ ।  धैर्यताको "
-"लागि धन्यवाद ।"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -351,7 +365,7 @@ msgstr "%(total_count)s %(module_name)s सबै छान्नुहोस "
 msgid "Clear selection"
 msgstr "चुनेको कुरा हटाउनुहोस ।"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -361,22 +375,22 @@ msgid "Welcome,"
 msgstr "स्वागतम्"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "विस्तृत विवरण"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "पासवर्ड फेर्नुहोस "
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "लग आउट"
 
@@ -388,35 +402,35 @@ msgstr "ज्याङ्गो साइट प्रशासन"
 msgid "Django administration"
 msgstr "ज्याङ्गो प्रशासन"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "थप्नुहोस "
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "इतिहास"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "साइटमा हेर्नुहोस"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "कृपया तलका त्रुटि सच्याउनुहोस ।"
 msgstr[1] "कृपया तलका त्रुटिहरु सच्याउनुहोस ।"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s थप्नुहोस"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "छान्नुहोस"
 
@@ -433,12 +447,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "मेट्नुहोस"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -446,30 +460,30 @@ msgid ""
 "following types of objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "हुन्छ, म पक्का छु ।"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "वहु वस्तुहरु मेट्नुहोस ।"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -477,14 +491,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -496,36 +510,36 @@ msgstr "%(objects_name)s "
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s द्वारा"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s साधनमा मोडेलहरु उपलब्ध छन्।"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "फेर्नुहोस"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "तपाइलाई केही पनि संपादन गर्ने अनुमति छैन ।"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "हालैका कार्यहरु"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "मेरो कार्यहरु"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "कुनै पनि उपलब्ध छैन ।"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "अज्ञात सामग्री"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -534,31 +548,27 @@ msgstr ""
 "डाटाबेस स्थापनामा केही त्रुटी छ । सम्वद्ध टेबल बनाएको र प्रयोगकर्तालाई डाटाबेसमा अनुमति "
 "भएको छ छैन जाच्नुहोस ।"
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "प्रयोगकर्ता नाम:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "पासवर्ड"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "पासवर्ड अथवा प्रयोगकर्ता नाम भुल्नुभयो ।"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "मिति/समय"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "प्रयोगकर्ता"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "कार्य:"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -612,64 +622,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "प्रयोगकर्ता नाम र पासवर्ड राख्नुहोस।"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "प्रयोगकर्ता <strong>%(username)s</strong> को लागि नयाँ पासवर्ड राख्नुहोस ।"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "पासवर्ड (पुन:)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "प्रमाणिकरणको लागि माथी कै पासवर्ड राख्नुहोस ।"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "हटाउनुहोस"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "अर्को %(verbose_name)s थप्नुहोस ।"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "हटाउनुहोस"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "मेट्नुहुन्छ ?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "वेब साइटमा समय बिताउनु भएकोमा धन्यवाद ।"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "पुन: लगिन गर्नुहोस"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "पासवर्ड फेरबदल"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "पासवर्ड सफलतापूर्वक फेरिएको छ ।"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "तपाइको पासवर्ड फेरिएको छ ।"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -677,87 +687,86 @@ msgstr ""
 "सुरक्षाको निम्ति आफ्नो पुरानो पासवर्ड राख्नुहोस र कृपया दोहर्याएर आफ्नो नयाँ पासवर्ड "
 "राख्नुहोस ताकी प्रमाणीकरण होस । "
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "पुरानो पासवर्ड"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "नयाँ पासवर्ड"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "मेरो पासवर्ड फेर्नुहोस "
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "पासवर्डपून: राख्नुहोस । "
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "पासवर्डपुन: राख्ने कार्य सम्पन्न भयो ।"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "तपाइको पासवर्ड राखियो । कृपया लगिन गर्नुहोस ।"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "पासवर्ड पुनर्स्थापना पुष्टि"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "नयाँ पासवर्ड राख्नुहोस"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "ठीक तरिकाले राखिएको पुष्टि गर्न कृपया नयाँ पासवर्ड दोहोर्याएर राख्नुहोस ।"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "नयाँ पासवर्ड :"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "पासवर्ड पुष्टि:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "पासवर्ड पुन: राख्ने काम असफल भयो ।"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr "पासवर्ड पुनर्स्थापना प्रयोग भइसकेको छ । कृपया नयाँ पासवर्ड रिसेट माग्नुहोस ।"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "सफलतापूर्वक पासवर्ड पुन: राखियो ।"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
-msgstr "पासवर्ड राख्ने प्रकृया हामीले तपाइले प्रदान गरेको ई-मेल ठेगानामा मेल गरेका छौं । "
+msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-" %(site_name)s को लागि तपाइले पासवर्ड पुन: राख्न आग्रह गरेको हुनाले ई-मेल पाउनुहुदैंछ ।"
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -776,35 +785,34 @@ msgstr "हाम्रो साइट प्रयोग गरेकोमा
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s टोली"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"पासवर्ड बिर्सनुभयो ? तल ई-मेल दिनुहोस र हामी नयाँ पासवर्ड हाल्ने प्रकृया पठाइ दिनेछौं ।"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "ई-मेल ठेगाना :"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "मेरो पासवर्ड पुन: राख्नुहोस ।"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "सबै मिति"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(शुन्य)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s छान्नुहोस"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s परिवर्तन गर्न छान्नुहोस ।"
diff --git a/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.mo
index 811d3c264d..c6632507cb 100644
Binary files a/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.po
index ea4de6114e..581f3ac7e3 100644
--- a/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.po
@@ -1,21 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Paras Nath Chaudhary <opnchaudhary@gmail.com>, 2012.
 # Sagar Chalise <chalisesagar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"PO-Revision-Date: 2012-10-01 12:40+0000\n"
+"Last-Translator: Paras Nath Chaudhary <opnchaudhary@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -28,11 +29,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"यो उपलब्ध %s को सुची हो। तपाईंले यी मध्य केही बक्सबाट चयन गरी बक्स बीच्को \"छान्नुहोस "
+"\" तीरमा क्लिक गरी छान्नसक्नुहुन्छ । "
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr " उपलब्ध %s को सुचिबाट छान्न यो बक्समा टाइप गर्नुहोस "
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -40,16 +43,16 @@ msgstr "छान्नुहोस"
 
 #: static/admin/js/SelectFilter2.js:61
 msgid "Choose all"
-msgstr ""
+msgstr "सबै छान्नुहोस "
 
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "एकै क्लिकमा सबै %s छान्नुहोस "
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "छान्नुहोस "
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -58,7 +61,7 @@ msgstr "हटाउनुहोस"
 #: static/admin/js/SelectFilter2.js:75
 #, c-format
 msgid "Chosen %s"
-msgstr ""
+msgstr "छानिएको %s"
 
 #: static/admin/js/SelectFilter2.js:76
 #, c-format
@@ -66,15 +69,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"यो छानिएका %s को सुची हो । तपाईंले यी मध्य केही बक्सबाट चयन गरी बक्स बीच्को "
+"\"हटाउनुहोस\" तीरमा क्लिक गरी हटाउन सक्नुहुन्छ । "
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "सबै हटाउनुहोस "
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "एकै क्लिकमा सबै छानिएका %s हटाउनुहोस ।"
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo
index 5b2b3cf705..db99a38f8b 100644
Binary files a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po b/django/contrib/admin/locale/nl/LC_MESSAGES/django.po
index 39475517ea..45ebdd1127 100644
--- a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/nl/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <bart@dispectu.com>, 2012-2013.
 # Harro van der Klauw <hvdklauw@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Jeffrey Gelens <jeffrey@noppo.pro>, 2011, 2012.
@@ -9,28 +10,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-03 11:13+0000\n"
+"Last-Translator: bartdegoede <bart@dispectu.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s succesvol verwijderd."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s kan niet worden verwijderd "
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Weet u het zeker?"
 
@@ -39,168 +40,182 @@ msgstr "Weet u het zeker?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Verwijder geselecteerde %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Alle"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ja"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nee"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Elke datum"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Vandaag"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Afgelopen zeven dagen"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Deze maand"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Dit jaar"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Voer de correcte gebruikersnaam en wachtwoord voor een stafaccount in. Let "
-"op dat beide velden hoofdlettergevoelig zijn."
+"Voer de correcte %(username)s en wachtwoord voor een stafaccount in. Let op "
+"dat beide velden hoofdlettergevoelig zijn."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Uw sessie is verlopen, meld u opnieuw aan."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Uw e-mailadres is niet uw gebruikersnaam. Probeer '%s' eens."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Actie:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "actietijd"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "object-id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "object-repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "actievlag"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "wijzig bericht"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "logregistratie"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "logregistraties"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Toegevoegd \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Gewijzigd \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Verwijderd \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry Object"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Geen"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s gewijzigd."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "en"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" toegevoegd."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s aangepast voor %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" verwijderd."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Geen velden gewijzigd."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "De %(name)s \"%(obj)s\" is toegevoegd."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "U kunt dit hieronder weer bewerken."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "U kunt hieronder de volgende %s toevoegen."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Het wijzigen van %(name)s \"%(obj)s\" is geslaagd."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "De %(name)s \"%(obj)s\" was toegevoegd. U kunt het hieronder wijzigen."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"De %(name)s \"%(obj)s\" was succesvol gewijzigd. Je kan hieronder een andere "
+"%(name)s toevoegen."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "De %(name)s \"%(obj)s\" is toegevoegd."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"De %(name)s \"%(obj)s\" was succesvol gewijzigd. Je kunt het hieronder "
+"wijzigen."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"De %(name)s \"%(obj)s\" was succesvol gewijzigd. Je kan hieronder een andere "
+"%(name)s toevoegen."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Het wijzigen van %(name)s \"%(obj)s\" is geslaagd."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,89 +223,97 @@ msgstr ""
 "Er moeten items worden geselecteerd om acties op uit te voeren. Geen items "
 "zijn veranderd."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Geen actie geselecteerd."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Toevoegen %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s object met primaire sleutel %(key)r bestaat niet."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Wijzig %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Databasefout"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s is succesvol gewijzigd."
 msgstr[1] "%(count)s %(name)s zijn succesvol gewijzigd."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s geselecteerd"
 msgstr[1] "Alle %(total_count)s geselecteerd"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 van de %(cnt)s geselecteerd"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Gebruiker %(name)s \"%(obj)s\" is verwijderd."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Wijzigingsgeschiedenis: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Inloggen"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Sitebeheer"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s beheer"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Tijd:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Opzoeken"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Voeg nog één toe"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Huidig:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Wijzig:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Pagina niet gevonden"
@@ -299,42 +322,43 @@ msgstr "Pagina niet gevonden"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Onze excuses, maar de gevraagde pagina bestaat niet."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Voorpagina"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Serverfout"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Serverfout (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Serverfout <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Er is een fout opgetreden. Dit is inmiddels doorgegeven aan de sitebeheerder "
-"via e-mail en zal spoedig worden gerepareerd. Bedankt voor uw geduld."
+"Er heeft zich een fout voorgedaan. De fout is via email gemeld aan de "
+"website administrators en zou snel verholpen moeten zijn. Bedankt voor uw "
+"geduld."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -357,7 +381,7 @@ msgstr "Selecteer alle %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Leeg selectie"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -367,22 +391,22 @@ msgid "Welcome,"
 msgstr "Welkom,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Afmelden"
 
@@ -394,35 +418,35 @@ msgstr "Django sitebeheer"
 msgid "Django administration"
 msgstr "Djangobeheer"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Toevoegen"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Geschiedenis"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Toon op site"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Herstel de fout hieronder."
 msgstr[1] "Herstel de fouten hieronder."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s toevoegen"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -439,12 +463,12 @@ msgstr "Sorteer prioriteit: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Sortering aan/uit"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -455,7 +479,7 @@ msgstr ""
 "gerelateerde objecten verwijderen. Echter u heeft geen rechten om de "
 "volgende typen objecten te verwijderen:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -464,7 +488,7 @@ msgstr ""
 "Het verwijderen van %(object_name)s '%(escaped_object)s' vereist het "
 "verwijderen van de volgende gerelateerde objecten:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -473,16 +497,16 @@ msgstr ""
 "Weet u zeker dat u %(object_name)s \"%(escaped_object)s\" wilt verwijderen? "
 "Alle volgende objecten worden verwijderd:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ja, ik weet het zeker"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Verwijder meerdere objecten"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +517,7 @@ msgstr ""
 "verwijderen van gerelateerde objecten, maar uw account heeft geen "
 "toestemming om de volgende soorten objecten te verwijderen:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +526,7 @@ msgstr ""
 "Het verwijderen van de geselecteerde %(objects_name)s vereist het "
 "verwijderen van de volgende beschermde gerelateerde objecten:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +540,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Op %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Beschikbare modellen in de %(name)s toepassing."
+msgid "Models in the %(name)s application"
+msgstr "Modellen in de %(name)s applicatie"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Wijzigen"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "U heeft geen rechten om iets te wijzigen."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Recente acties"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mijn acties"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Geen beschikbaar"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Onbekende inhoud"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -554,31 +578,27 @@ msgstr ""
 "Er is iets mis met de database. Verzeker u ervan dat de benodigde tabellen "
 "zijn aangemaakt en dat de database toegankelijk is voor de juiste gebruiker."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Wachtwoord of gebruikersnaam vergeten?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datum/tijd"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Gebruiker"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Actie"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -634,65 +654,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Voer een gebruikersnaam en wachtwoord in."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Geef een nieuw wachtwoord voor gebruiker <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Wachtwoord (nogmaals)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Vul hetzelfde wachtwoord als hierboven in, ter bevestiging."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Voeg nog een %(verbose_name)s toe"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Verwijderen"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Verwijderen?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Bedankt voor de aanwezigheid op de site vandaag."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Log opnieuw in"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Wachtwoordwijziging"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Wachtwoord wijzigen is geslaagd"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Uw wachtwoord is gewijzigd."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -700,46 +720,46 @@ msgstr ""
 "Vanwege de beveiliging moet u uw oude en twee keer uw nieuwe wachtwoord "
 "invoeren, zodat we kunnen controleren of er geen typefouten zijn gemaakt."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Oud wachtwoord"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Wijzig mijn wachtwoord"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Wachtwoord hersteld"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
-msgstr "Wachtwoord herstellen volooid"
+msgstr "Wachtwoord herstellen voltooid"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Uw wachtwoord is ingesteld. U kunt nu verder gaan en inloggen."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Bevestiging wachtwoord herstellen"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Voer nieuw wachtwoord in"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -747,47 +767,47 @@ msgstr ""
 "Voer het nieuwe wachtwoord twee keer in, zodat we kunnen controleren of er "
 "geen typefouten zijn gemaakt."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nieuw wachtwoord:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Bevestig wachtwoord:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Wachtwoord herstel mislukt"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
-"De link voor het herstellen van het wachtwoord is ongeldig, misschien omdat "
-"de link al eens is gebruikt. Vraag opnieuw het wachtwoord herstellen aan."
+"De link voor het herstellen van het wachtwoord is ongeldig, waarschijnlijk "
+"omdat de link al eens is gebruikt. Vraag opnieuw een wachtwoord aan."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Wachtwoord herstel geslaagd"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"We hebben u de instructies voor het instellen van een nieuw wachtwoord per e-"
-"mail gestuurd. U zou dit spoedig moeten ontvangen."
+"We hebben instructies voor het resetten van uw wachtwoord naar het ingevulde "
+"emailadres gestuurd. U zou ze snel binnen moeten krijgen."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"U heeft deze email ontvangen, omdat u een wachtwoord reset heeft aangevraagd "
-"voor uw gebruikersaccount op %(site_name)s."
+"U ontvangt deze email omdat u heeft verzocht het wachtwoord te resetten voor "
+"uw account op %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -806,36 +826,36 @@ msgstr "Bedankt voor het gebruik van onze site!"
 msgid "The %(site_name)s team"
 msgstr "Het %(site_name)s team"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Uw wachtwoord vergeten? Geef uw e-mailadres op en we sturen u per e-mail de "
-"instructies voor het instellen van een nieuw wachtwoord."
+"Wachtwoord vergeten? Vul uw emailadres hieronder in, en we zullen "
+"instructies voor het opnieuw instellen van uw wachtwoord mailen."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-mailadres:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Emailadres:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Herstel mijn wachtwoord"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Alle data"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Geen)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Selecteer %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Selecteer %s om te wijzigen"
diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo
index 099dd15fd5..9cf3fccb2b 100644
Binary files a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po
index 3e9106c75a..ba83a84fe0 100644
--- a/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po
@@ -12,13 +12,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo
index 7f97ec5177..6b241a3f2d 100644
Binary files a/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/nn/LC_MESSAGES/django.po b/django/contrib/admin/locale/nn/LC_MESSAGES/django.po
index fa7436b833..0306ec0dce 100644
--- a/django/contrib/admin/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/nn/LC_MESSAGES/django.po
@@ -1,35 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <havard@grimelid.com>, 2012.
 # hgrimelid <havard@grimelid.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <odin.omdal@gmail.com>, 2012.
 #   <sigurdga-transifex@sigurdga.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-13 11:23+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Sletta %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Kan ikkje slette %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
@@ -38,166 +40,174 @@ msgstr "Er du sikker?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Slett valgte %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Alle"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ja"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nei"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Når som helst"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "I dag"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
-msgstr "Siste sju dager"
+msgstr "Siste sju dagar"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Denne månaden"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "I år"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Økta har tidsavbrot, logg inn att."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "E-postadressa er ikkje brukarnamnet ditt, prøv '%s' istadenfor."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Handling:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "tid for handling"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objekt-ID"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objekt repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "handlingsflagg"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "endre melding"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "logginnlegg"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "logginnlegg"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "La til «%(object)s»."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Endra «%(object)s» - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Sletta «%(object)s»."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry-objekt"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ingen"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Endra %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "og"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Oppretta %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Endra %(list)s for %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Sletta %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Ingen felt endra."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" vart oppretta."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Du kan redigere vidare nedanfor."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Du kan opprette ny %s nedanfor."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" vart endra."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" vart endra Du kan redigere vidare nedanfor."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" vart oppretta."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" vart endra."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -205,89 +215,97 @@ msgstr ""
 "Objekt må vere valde for at dei skal kunne utførast handlingar på. Ingen "
 "object er endra."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Inga valt handling."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Opprett %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s-objekt med primærnøkkelen %(key)r eksisterer ikkje."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Rediger %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Databasefeil"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s vart endra."
 msgstr[1] "%(count)s %(name)s vart endra."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s valde"
 msgstr[1] "Alle %(total_count)s valde"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "Ingen av %(cnt)s valde"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" vart sletta."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Endringshistorikk: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Logg inn"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Nettstadsadministrasjon"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s-administrasjon"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dato:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Tid:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Oppslag"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Legg til ny"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Fann ikkje sida"
@@ -296,42 +314,40 @@ msgstr "Fann ikkje sida"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Sida du spør etter finst ikkje."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Heim"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Tenarfeil"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Tenarfeil (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Tenarfeil <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Det har oppstått ein feil. Feilen er rapportert til administrator via e-"
-"post, og vil bli fiksa snart. "
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -354,7 +370,7 @@ msgstr "Velg alle %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Nullstill utval"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -364,22 +380,22 @@ msgid "Welcome,"
 msgstr "Velkommen,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -391,35 +407,35 @@ msgstr "Django administrasjonsside"
 msgid "Django administration"
 msgstr "Django-administrasjon"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Opprett"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historikk"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Vis på nettstad"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Korriger feilen under."
 msgstr[1] "Korriger feila under."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Opprett %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrering"
 
@@ -436,12 +452,12 @@ msgstr "Sorteringspriorite: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Slår av eller på sortering"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -451,7 +467,7 @@ msgstr ""
 "Dersom du slettar %(object_name)s '%(escaped_object)s', vil også slette "
 "relaterte objekt, men du har ikkje løyve til å slette følgande objekttypar:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -460,7 +476,7 @@ msgstr ""
 "Sletting av %(object_name)s '%(escaped_object)s' krevar sletting av "
 "følgjande beskytta relaterte objekt:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -469,16 +485,16 @@ msgstr ""
 "Er du sikker på at du vil slette %(object_name)s \"%(escaped_object)s\"? "
 "Alle dei følgjande relaterte objekta vil bli sletta:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ja, eg er sikker"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Slett fleire objekt"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -488,7 +504,7 @@ msgstr ""
 "Sletting av %(objects_name)s vil føre til at relaterte objekt blir sletta, "
 "men kontoen din manglar løyve til å slette følgjande objekttypar:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -497,7 +513,7 @@ msgstr ""
 "Sletting av %(objects_name)s krevar sletting av følgjande beskytta relaterte "
 "objekt:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -511,36 +527,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Etter %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modellar tilgjengeleg i %(name)s-applikasjonen."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Endre"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Du har ikkje løyve til å redigere noko."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Siste handlingar"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mine handlingar"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ingen tilgjengelege"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Ukjent innhald"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -549,31 +565,27 @@ msgstr ""
 "Noko er gale med databaseinstallasjonen din. Syt for at databasetabellane er "
 "oppretta og at brukaren har dei naudsynte løyve."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Brukarnamn:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Passord:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Gløymd brukarnamn eller passord?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dato/tid"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Brukar"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Handling"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -629,64 +641,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Skriv inn nytt brukarnamn og passord."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Skriv inn eit nytt passord for brukaren <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Passord"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Passord (gjenta)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Skriv inn det samme passordet som over, for verifisering."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Fjern"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Legg til ny %(verbose_name)s."
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Fjern"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Slette?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Takk for at du brukte kvalitetstid på nettstaden i dag."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Logg inn att"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Endre passord"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Passord endra"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Passordet ditt vart endret."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -694,46 +706,46 @@ msgstr ""
 "Av sikkerheitsgrunnar må du oppgje det gamle passordet ditt. Oppgje så det "
 "nye passordet ditt to gonger, slik at vi kan kontrollere at det er korrekt."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Gammalt passord"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Endre passord"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Nullstill passord"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Passord nullstilt"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Passordet ditt er sett. Du kan logge inn."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Stadfesting på nullstilt passord"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Oppgje nytt passord"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -741,19 +753,19 @@ msgstr ""
 "Oppgje det nye passordet ditt to gonger, for å sikre at du oppgjev det "
 "korrekt."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nytt passord:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Gjenta nytt passord:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Passordet vart ikkje nullstilt"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -761,27 +773,23 @@ msgstr ""
 "Nullstillingslinken er ugyldig, kanskje fordi den allereie har vore brukt. "
 "Nullstill passordet ditt på nytt."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Passordet vart nullstilt"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Vi har sendt deg ein e-post med instruksjonar for nullstilling av passord. "
-"Du bør motta den om kort tid."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Du mottar denne eposten fordi du ba om å nullstille  passordet for "
-"brukarkontoen din på %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -800,36 +808,34 @@ msgstr "Takk for at du brukar sida vår!"
 msgid "The %(site_name)s team"
 msgstr "Helsing %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Har du gløymt passordet ditt? Oppgje e-postadressa di under, så sender vi "
-"deg ein e-post med instruksjonar for nullstilling av passord."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-postadresse:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Nullstill passordet"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Alle datoar"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Velg %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Velg %s du ønskar å redigere"
diff --git a/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.mo
index e300051b52..b10001e437 100644
Binary files a/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.po
index e952bdad68..3fdc5ed987 100644
--- a/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.po
@@ -3,20 +3,21 @@
 # Translators:
 # hgrimelid <havard@grimelid.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <odin.omdal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: hgrimelid <havard@grimelid.com>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"PO-Revision-Date: 2012-06-03 20:16+0000\n"
+"Last-Translator: velmont <odin.omdal@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -29,11 +30,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Dette er lista over tilgjengelege %s. Du kan velja nokon ved å markera dei i "
+"boksen under og so klikka på «Velg»-pila mellom dei to boksane."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Skriv i dette feltet for å filtrera ned lista av tilgjengelege %s."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -46,11 +49,11 @@ msgstr "Velg alle"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Klikk for å velja alle %s samtidig."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Vel"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -67,15 +70,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Dette er lista over valte %s. Du kan fjerna nokon ved å markera dei i boksen "
+"under og so klikka på «Fjern»-pila mellom dei to boksane."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "Fjern alle"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Klikk for å fjerna alle valte %s samtidig."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/os/LC_MESSAGES/django.mo b/django/contrib/admin/locale/os/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..2af11747f6
Binary files /dev/null and b/django/contrib/admin/locale/os/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/os/LC_MESSAGES/django.po b/django/contrib/admin/locale/os/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..4849583895
--- /dev/null
+++ b/django/contrib/admin/locale/os/LC_MESSAGES/django.po
@@ -0,0 +1,847 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Soslan Khubulov <soslanx@gmail.com>, 2013.
+# Xwybylty Soslan <soslanx@gmail.com>, 2013.
+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-02-28 20:10+0000\n"
+"Last-Translator: Soslan Khubulov <soslanx@gmail.com>\n"
+"Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/"
+"os/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: os\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: actions.py:48
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr "%(count)d %(items)s хафт ӕрцыдысты."
+
+#: actions.py:60 options.py:1347
+#, python-format
+msgid "Cannot delete %(name)s"
+msgstr "Нӕ уайы схафын %(name)s"
+
+#: actions.py:62 options.py:1349
+msgid "Are you sure?"
+msgstr "Ӕцӕг дӕ фӕнды?"
+
+#: actions.py:83
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr "Схафын ӕвзӕрст %(verbose_name_plural)s"
+
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
+msgid "All"
+msgstr "Иууылдӕр"
+
+#: filters.py:238
+msgid "Yes"
+msgstr "О"
+
+#: filters.py:239
+msgid "No"
+msgstr "Нӕ"
+
+#: filters.py:253
+msgid "Unknown"
+msgstr "Ӕнӕбӕрӕг"
+
+#: filters.py:308
+msgid "Any date"
+msgstr "Цыфӕнды бон"
+
+#: filters.py:309
+msgid "Today"
+msgstr "Абон"
+
+#: filters.py:313
+msgid "Past 7 days"
+msgstr "Фӕстаг 7 бон"
+
+#: filters.py:317
+msgid "This month"
+msgstr "Ацы мӕй"
+
+#: filters.py:321
+msgid "This year"
+msgstr "Ацы аз"
+
+#: forms.py:9
+#, python-format
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+"Дӕ хорзӕхӕй, раст кусӕджы аккаунты %(username)s ӕмӕ пароль бафысс. Дӕ сӕры "
+"дар уый, ӕмӕ дыууӕ дӕр гӕнӕн ис стыр ӕмӕ гыццыл дамгъӕ ӕвзарой."
+
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr "Дӕ хорзӕхӕй, ногӕй бахиз, уымӕн ӕмӕ дӕ сессийы рӕстӕг фӕцис."
+
+#: helpers.py:23
+msgid "Action:"
+msgstr "Ми:"
+
+#: models.py:24
+msgid "action time"
+msgstr "мийы рӕстӕг"
+
+#: models.py:27
+msgid "object id"
+msgstr "объекты бӕрӕггӕнӕн"
+
+#: models.py:28
+msgid "object repr"
+msgstr "объекты хуыз"
+
+#: models.py:29
+msgid "action flag"
+msgstr "мийы флаг"
+
+#: models.py:30
+msgid "change message"
+msgstr "фыстӕг фӕивын"
+
+#: models.py:35
+msgid "log entry"
+msgstr "логы иуӕг"
+
+#: models.py:36
+msgid "log entries"
+msgstr "логы иуӕгтӕ"
+
+#: models.py:45
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr "Ӕфтыд ӕрцыд \"%(object)s\"."
+
+#: models.py:47
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr "Ивд ӕрцыд \"%(object)s\" - %(changes)s"
+
+#: models.py:52
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr "Хафт ӕрцыд \"%(object)s.\""
+
+#: models.py:54
+msgid "LogEntry Object"
+msgstr "ЛогыИуӕг Объект"
+
+#: options.py:156 options.py:172
+msgid "None"
+msgstr "Никӕцы"
+
+#: options.py:684
+#, python-format
+msgid "Changed %s."
+msgstr "Ивд %s."
+
+#: options.py:684 options.py:694
+msgid "and"
+msgstr "ӕмӕ"
+
+#: options.py:689
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr "Бафтыдта %(name)s \"%(object)s\"."
+
+#: options.py:693
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr "Changed %(name)s \"%(object)s\"-ы %(list)s."
+
+#: options.py:698
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr "Схафта %(name)s \"%(object)s\"."
+
+#: options.py:702
+msgid "No fields changed."
+msgstr "Ивд бынат нӕй."
+
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" ӕфтыд ӕрцыд. Дӕ бон у бындӕр та йӕ ивай."
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" ӕфтыд ӕрцыд. Дӕ бон у ӕндӕр %(name)s бындӕр бафтауын."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" ӕфтыд ӕрцыд."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr "%(name)s \"%(obj)s\" ивд ӕрцыд. Дӕ бон у бындӕ ӕй ногӕй ивай."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" ивд ӕрцыд. Дӕ бон у ӕндӕр %(name)s бындӕр бафтауын."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ивд ӕрцыд."
+
+#: options.py:951 options.py:1211
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+"Иуӕгтӕ хъуамӕ ӕвзӕрст уой, цӕмӕй цын исты ми бакӕнай. Ницы иуӕг ӕрцыд ивд."
+
+#: options.py:970
+msgid "No action selected."
+msgstr "Ницы ми у ӕвзӕрст."
+
+#: options.py:1050
+#, python-format
+msgid "Add %s"
+msgstr "Бафтауын %s"
+
+#: options.py:1074 options.py:1319
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr "%(key)r фыццаг амонӕнимӕ %(name)s-ы объект нӕй."
+
+#: options.py:1140
+#, python-format
+msgid "Change %s"
+msgstr "Фӕивын %s"
+
+#: options.py:1190
+msgid "Database error"
+msgstr "Бӕрӕгдоны рӕдыд"
+
+#: options.py:1253
+#, python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] "%(count)s %(name)s ивд ӕрцыд."
+msgstr[1] "%(count)s %(name)s ивд ӕрцыдысты."
+
+#: options.py:1280
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] "%(total_count)s у ӕвзӕрст"
+msgstr[1] "%(total_count)s дӕр иууылдӕр сты ӕвзӕрст"
+
+#: options.py:1285
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "%(cnt)s-ӕй 0 у ӕвзӕрст"
+
+#: options.py:1335
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" хафт ӕрцыд."
+
+#: options.py:1382
+#, python-format
+msgid "Change history: %s"
+msgstr "Ивынты истори: %s"
+
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
+msgid "Log in"
+msgstr "Бахизын"
+
+#: sites.py:388
+msgid "Site administration"
+msgstr "Сайты администраци"
+
+#: sites.py:440
+#, python-format
+msgid "%s administration"
+msgstr "%s-ы администраци"
+
+#: widgets.py:90
+msgid "Date:"
+msgstr "Бон:"
+
+#: widgets.py:91
+msgid "Time:"
+msgstr "Рӕстӕг:"
+
+#: widgets.py:165
+msgid "Lookup"
+msgstr "Акӕсын"
+
+#: widgets.py:271
+msgid "Add Another"
+msgstr "Бафтауын ӕндӕр"
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Нырыккон:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Ивд:"
+
+#: templates/admin/404.html:4 templates/admin/404.html.py:8
+msgid "Page not found"
+msgstr "Фарс нӕ зыны"
+
+#: templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Хатыр, фӕлӕ домд фарс нӕ зыны."
+
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
+msgid "Home"
+msgstr "Хӕдзар"
+
+#: templates/admin/500.html:7
+msgid "Server error"
+msgstr "Серверы рӕдыд"
+
+#: templates/admin/500.html:11
+msgid "Server error (500)"
+msgstr "Серверы рӕдыд (500)"
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr "Серверы Рӕдыд <em>(500)</em>"
+
+#: templates/admin/500.html:15
+msgid ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Рӕдыд разынд. Уый тыххӕй сайты администратормӕ электрон фыстӕг ӕрвыст ӕрцыд "
+"ӕмӕ йӕ тагъд сраст кӕндзысты. Бузныг кӕй лӕууыс."
+
+#: templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr "Бакӕнын ӕвзӕрст ми"
+
+#: templates/admin/actions.html:4
+msgid "Go"
+msgstr "Бацӕуын"
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr "Ам ныххӕц цӕмӕй алы фарсы объекттӕ равзарын"
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr "Равзарын %(total_count)s %(module_name)s иууылдӕр"
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr "Ӕвзӕрст асыгъдӕг кӕнын"
+
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
+#: templates/admin/base.html:28
+msgid "Welcome,"
+msgstr "Ӕгас цу,"
+
+#: templates/admin/base.html:33
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr "Документаци"
+
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr "Пароль фӕивын"
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Log out"
+msgstr "Рахизын"
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django сайты админ"
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django администраци"
+
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
+msgid "Add"
+msgstr "Бафтауын"
+
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
+msgid "History"
+msgstr "Истори"
+
+#: templates/admin/change_form.html:33
+#: templates/admin/edit_inline/stacked.html:9
+#: templates/admin/edit_inline/tabular.html:30
+msgid "View on site"
+msgstr "Сайты фенын"
+
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Дӕ хорзӕхӕй, бындӕр цы рӕдыд ис, уый сраст кӕн."
+msgstr[1] "Дӕ хорзӕхӕй, бындӕр цы рӕдыдтытӕ ис, уыдон сраст кӕн."
+
+#: templates/admin/change_list.html:58
+#, python-format
+msgid "Add %(name)s"
+msgstr "Бафтауын %(name)s"
+
+#: templates/admin/change_list.html:78
+msgid "Filter"
+msgstr "Фӕрсудзӕн"
+
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr "Радӕй айсын"
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr "Рады приоритет: %(priority_number)s"
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr "Рад аивын"
+
+#: templates/admin/delete_confirmation.html:11
+#: templates/admin/submit_line.html:4
+msgid "Delete"
+msgstr "Схафын"
+
+#: templates/admin/delete_confirmation.html:18
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+"%(object_name)s '%(escaped_object)s' хафыны тыххӕй баст объекттӕ дӕр хафт "
+"ӕрцӕудзысты, фӕлӕ дӕ аккаунтӕн нӕй бар ацы объекты хуызтӕ хафын:"
+
+#: templates/admin/delete_confirmation.html:26
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+"%(object_name)s '%(escaped_object)s' хафын домы ацы хъахъхъӕд баст объекттӕ "
+"хафын дӕр:"
+
+#: templates/admin/delete_confirmation.html:34
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+"Ӕцӕг дӕ фӕнды %(object_name)s \"%(escaped_object)s\" схафын? Ацы баст иуӕгтӕ "
+"иууылдӕр хафт ӕрцӕудзысты:"
+
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
+msgid "Yes, I'm sure"
+msgstr "О, ӕцӕг мӕ фӕнды"
+
+#: templates/admin/delete_selected_confirmation.html:10
+msgid "Delete multiple objects"
+msgstr "Цалдӕр объекты схафын"
+
+#: templates/admin/delete_selected_confirmation.html:17
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Ӕвзӕрст %(objects_name)s хафыны тыххӕй йемӕ баст объекттӕ дӕр схафт "
+"уыдзысты, фӕлӕ дӕ аккаунтӕн нӕй бар ацы объекты хуызтӕ хафын:"
+
+#: templates/admin/delete_selected_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+"Ӕвзӕрст %(objects_name)s хафын домы ацы хъахъхъӕд баст объекттӕ хафын дӕр:"
+
+#: templates/admin/delete_selected_confirmation.html:33
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+"Ӕцӕг дӕ фӕнды ӕвзӕрст %(objects_name)s схафын? ацы объекттӕ иууылдӕр, ӕмӕ "
+"семӕ баст иуӕгтӕ хафт ӕрцӕудзысты:"
+
+#: templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr "%(filter_title)s-мӕ гӕсгӕ"
+
+#: templates/admin/index.html:20
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr "Моделтӕ %(name)s ӕфтуаны"
+
+#: templates/admin/index.html:39
+msgid "Change"
+msgstr "Фӕивын"
+
+#: templates/admin/index.html:49
+msgid "You don't have permission to edit anything."
+msgstr "Нӕй дын бар исты ивын."
+
+#: templates/admin/index.html:57
+msgid "Recent Actions"
+msgstr "Фӕстаг митӕ"
+
+#: templates/admin/index.html:58
+msgid "My Actions"
+msgstr "Фылдӕр митӕ"
+
+#: templates/admin/index.html:62
+msgid "None available"
+msgstr "Ницы ис"
+
+#: templates/admin/index.html:76
+msgid "Unknown content"
+msgstr "Ӕнӕбӕрӕг мидис"
+
+#: templates/admin/invalid_setup.html:12
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+"Дӕ бӕрӕгдоны цыдӕр раст ӕвӕрд нӕу. Сбӕрӕг кӕн, хъӕугӕ бӕрӕгдоны таблицӕтӕ "
+"конд кӕй сты ӕмӕ амынд архайӕгӕн бӕрӕгдон фӕрсыны бар кӕй ис, уый."
+
+#: templates/admin/login.html:37
+msgid "Password:"
+msgstr "Пароль:"
+
+#: templates/admin/login.html:44
+msgid "Forgotten your password or username?"
+msgstr "Дӕ пароль кӕнӕ дӕ фӕсномыг ферох кодтай?"
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr "Бон/рӕстӕг"
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr "Архайӕг"
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr "Ми"
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr "Ацы объектӕн ивдтыты истори нӕй. Уӕццӕгӕн ацы админӕй ӕфтыд нӕ уыд."
+
+#: templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Иууылдӕр равдисын"
+
+#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
+msgid "Save"
+msgstr "Нывӕрын"
+
+#: templates/admin/search_form.html:7
+msgid "Search"
+msgstr "Агурын"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] "%(counter)s фӕстиуӕг"
+msgstr[1] "%(counter)s фӕстиуӕджы"
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s иумӕ"
+
+#: templates/admin/submit_line.html:5
+msgid "Save as new"
+msgstr "Нывӕрын куыд ног"
+
+#: templates/admin/submit_line.html:6
+msgid "Save and add another"
+msgstr "Нывӕрын ӕмӕ ног бафтауын"
+
+#: templates/admin/submit_line.html:7
+msgid "Save and continue editing"
+msgstr "Нывӕрын ӕмӕ дарддӕр ивын"
+
+#: templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+"Фыццаг бафысс фӕсномыг ӕмӕ пароль. Стӕй дӕ бон уыдзӕн фылдӕр архайӕджы "
+"фадӕттӕ ивын."
+
+#: templates/admin/auth/user/add_form.html:8
+msgid "Enter a username and password."
+msgstr "Бафысс фӕсномыг ӕмӕ пароль."
+
+#: templates/admin/auth/user/change_password.html:31
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr "Бафысс ног пароль архайӕг <strong>%(username)s</strong>-ӕн."
+
+#: templates/admin/auth/user/change_password.html:38
+msgid "Password"
+msgstr "Пароль"
+
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
+msgid "Password (again)"
+msgstr "Пароль (ногӕй)"
+
+#: templates/admin/auth/user/change_password.html:45
+msgid "Enter the same password as above, for verification."
+msgstr "Уӕлдӕр цы пароль бафыстай, уый бафысс, цӕмӕй бӕлвырд уа."
+
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Схафын"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr "Бафтауын ӕндӕр %(verbose_name)s"
+
+#: templates/admin/edit_inline/tabular.html:17
+msgid "Delete?"
+msgstr "Хъӕуы схафын?"
+
+#: templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Бузныг дӕ рӕстӕг абон ацы веб сайтимӕ кӕй арвыстай."
+
+#: templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Ногӕй бахизын"
+
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
+msgid "Password change"
+msgstr "Пароль ивын"
+
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
+msgid "Password change successful"
+msgstr "Пароль ивд ӕрцыд"
+
+#: templates/registration/password_change_done.html:17
+msgid "Your password was changed."
+msgstr "Дӕ пароль ивд ӕрцыд."
+
+#: templates/registration/password_change_form.html:26
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Дӕ хорзӕхӕй, ӕдасдзинады тыххӕй, бафысс дӕ зӕронд пароль ӕмӕ стӕй та дыууӕ "
+"хатт дӕ нӕуӕг пароль, цӕмӕй мах сбӕлвырд кӕнӕм раст ӕй кӕй ныффыстай, уый."
+
+#: templates/registration/password_change_form.html:32
+msgid "Old password"
+msgstr "Зӕронд пароль"
+
+#: templates/registration/password_change_form.html:37
+msgid "New password"
+msgstr "Ног пароль"
+
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
+msgid "Change my password"
+msgstr "Мӕ пароль фӕивын"
+
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
+msgid "Password reset"
+msgstr "Пароль рацаразын"
+
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
+msgid "Password reset complete"
+msgstr "Паролы ног арӕзт ӕххӕст у"
+
+#: templates/registration/password_reset_complete.html:17
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr "Дӕ пароль ӕвӕрд ӕрцыд. Дӕ бон у дарддӕр ацӕуын ӕмӕ бахизын."
+
+#: templates/registration/password_reset_confirm.html:7
+msgid "Password reset confirmation"
+msgstr "Пароль ӕвӕрыны бӕлвырдгӕнӕн"
+
+#: templates/registration/password_reset_confirm.html:17
+msgid "Enter new password"
+msgstr "Бафысс ног пароль"
+
+#: templates/registration/password_reset_confirm.html:19
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+"Дӕ хорзӕхӕй, дӕ ног пароль дыууӕ хатт бафысс, цӕмӕй мах сбӕрӕг кӕнӕм раст ӕй "
+"кӕй ныффыстай, уый."
+
+#: templates/registration/password_reset_confirm.html:23
+msgid "New password:"
+msgstr "Ног пароль:"
+
+#: templates/registration/password_reset_confirm.html:25
+msgid "Confirm password:"
+msgstr "Бӕлвырд пароль:"
+
+#: templates/registration/password_reset_confirm.html:31
+msgid "Password reset unsuccessful"
+msgstr "Пароль ӕвӕрд нӕ ӕрцыд"
+
+#: templates/registration/password_reset_confirm.html:33
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+"Парол ӕвӕрыны ӕрвитӕн раст нӕ уыд. Уӕццӕгӕн уый тыххӕй, ӕмӕ нырид пайдагонд "
+"ӕрцыд. Дӕ хорзӕхӕй, ӕрдом ног пароль ӕвӕрын."
+
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
+msgid "Password reset successful"
+msgstr "Пароль ӕвӕрд ӕрцыд"
+
+#: templates/registration/password_reset_done.html:17
+msgid ""
+"We've emailed you instructions for setting your password to the email "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+"Мах ды цы электрон адрис бацамыдтай, уырдӕм арвыстам дӕ пароль сӕвӕрыны "
+"тыххӕй амынд. Тагъд ӕй хъуамӕ айсай."
+
+#: templates/registration/password_reset_email.html:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+"Ды райстай ацы фыстӕг, уымӕн ӕмӕ %(site_name)s-ы дӕ архайӕджы аккаунтӕн "
+"пароль сӕвӕрын ӕрдомдтай."
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr "Дӕ хорзӕхӕй, ацу ацы фарсмӕ ӕмӕ равзар дӕ ног пароль:"
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr "Дӕ фӕсномыг, кӕд дӕ ферох ис:"
+
+#: templates/registration/password_reset_email.html:10
+msgid "Thanks for using our site!"
+msgstr "Бузныг нӕ сайтӕй нын кӕй пайда кӕныс!"
+
+#: templates/registration/password_reset_email.html:12
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s-ы бал"
+
+#: templates/registration/password_reset_form.html:17
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+"Ферох дӕ ис дӕ пароль? Дӕ пароль бындӕр бафысс, ӕмӕ дӕм мах email-ӕй ног "
+"пароль сывӕрыны амынд арвитдзыстӕм."
+
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Email адрис:"
+
+#: templates/registration/password_reset_form.html:21
+msgid "Reset my password"
+msgstr "Мӕ пароль ногӕй сӕвӕрын"
+
+#: templatetags/admin_list.py:344
+msgid "All dates"
+msgstr "Бонтӕ иууылдӕр"
+
+#: views/main.py:33
+msgid "(None)"
+msgstr "(Никӕцы)"
+
+#: views/main.py:76
+#, python-format
+msgid "Select %s"
+msgstr "Равзарын %s"
+
+#: views/main.py:78
+#, python-format
+msgid "Select %s to change"
+msgstr "Равзарын %s ивынӕн"
diff --git a/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..ed05d6e445
Binary files /dev/null and b/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..4804135bd7
--- /dev/null
+++ b/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.po
@@ -0,0 +1,183 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Soslan Khubulov <soslanx@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2013-02-24 06:21+0000\n"
+"Last-Translator: Soslan Khubulov <soslanx@gmail.com>\n"
+"Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/"
+"os/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: os\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
+msgid "Available %s"
+msgstr "Уӕвӕг %s"
+
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
+msgstr ""
+"Уӕвӕг %s-ты номхыгъд. Дӕ бон у искӕцытӕ дзы рауӕлдай кӕнай, куы сӕ равзарай "
+"бындӕр къӕртты ӕмӕ дыууӕ къӕртты ӕхсӕн \"Равзарын\"-ы ӕгънӕгыл куы ныххӕцай, "
+"уӕд."
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into this box to filter down the list of available %s."
+msgstr "Бафысс ацы къӕртты, уӕвӕг %s-ты номхыгъд фӕрсудзынӕн."
+
+#: static/admin/js/SelectFilter2.js:57
+msgid "Filter"
+msgstr "Фӕрсудзӕн"
+
+#: static/admin/js/SelectFilter2.js:61
+msgid "Choose all"
+msgstr "Равзарын алкӕцыдӕр"
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
+msgstr "Ныххӕц, алы %s равзарынӕн."
+
+#: static/admin/js/SelectFilter2.js:67
+msgid "Choose"
+msgstr "Равзарын"
+
+#: static/admin/js/SelectFilter2.js:69
+msgid "Remove"
+msgstr "Схафын"
+
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Chosen %s"
+msgstr "Ӕвзӕрст %s"
+
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
+msgstr ""
+"Ай у ӕвзӕрст %s-ты номхыгъд. Сӕ хафынӕн сӕ дӕ бон у бындӕр къӕртты равзарын "
+"ӕмӕ дыууӕ ӕгънӕджы ӕхсӕн \"Схфын\"-ыл ныххӕцын."
+
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
+msgstr "Схафын алкӕцыдӕр"
+
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr "Ныххӕц, алы ӕвзӕрст %s схафынӕн."
+
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "%(cnt)s-ӕй %(sel)s ӕвзӕрст"
+msgstr[1] "%(cnt)s-ӕй %(sel)s ӕвзӕрст"
+
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+"Ӕнӕвӕрд ивдтытӕ баззадысты ивыны бынӕтты. Кӕд исты ми саразай, уӕд дӕ "
+"ӕнӕвӕрд ивдтытӕ фесӕфдзысты."
+
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+"Ды равзӕрстай цыдӕр ми, фӕлӕ ивӕн бынӕтты цы фӕивтай, уыдон нӕ бавӕрдтай. Дӕ "
+"хорзӕхӕй, ныххӕц Хорзыл цӕмӕй бавӕрд уой. Стӕй дын хъӕудзӕн ацы ми ногӕй "
+"бакӕнын."
+
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+"Ды равзӕртай цыдӕр ми, фӕлӕ ивӕн бынӕтты ницы баивтай. Уӕццӕгӕн дӕ Ацӕуыны "
+"ӕгънӕг хъӕуы, Бавӕрыны нӕ фӕлӕ."
+
+#: static/admin/js/calendar.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Январь Февраль Мартъи Апрель Июнь Июль Август Сентябрь Октябрь Ноябрь Декабрь"
+
+#: static/admin/js/calendar.js:27
+msgid "S M T W T F S"
+msgstr "Х К Д Ӕ Ц М С"
+
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr "Равдисын"
+
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr "Айсын"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
+msgid "Now"
+msgstr "Ныр"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:53
+msgid "Clock"
+msgstr "Сахат"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:81
+msgid "Choose a time"
+msgstr "Рӕстӕг равзарын"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:86
+msgid "Midnight"
+msgstr "Ӕмбисӕхсӕв"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:87
+msgid "6 a.m."
+msgstr "6 ӕ.р."
+
+#: static/admin/js/admin/DateTimeShortcuts.js:88
+msgid "Noon"
+msgstr "Ӕмбисбон"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
+msgid "Cancel"
+msgstr "Раздӕхын"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
+msgid "Today"
+msgstr "Абон"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:148
+msgid "Calendar"
+msgstr "Къӕлиндар"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:195
+msgid "Yesterday"
+msgstr "Знон"
+
+#: static/admin/js/admin/DateTimeShortcuts.js:199
+msgid "Tomorrow"
+msgstr "Сом"
diff --git a/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo
index a04870949b..f11babf752 100644
Binary files a/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/pa/LC_MESSAGES/django.po b/django/contrib/admin/locale/pa/LC_MESSAGES/django.po
index d67450e287..703a073bf5 100644
--- a/django/contrib/admin/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/pa/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਈਆਂ ਗਈਆਂ।"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਚਾਹੁੰਦੇ ਹੋ?"
 
@@ -36,254 +36,270 @@ msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਚਾਹੁੰਦੇ ਹੋ?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "ਚੁਣੇ %(verbose_name_plural)s ਹਟਾਓ"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "ਸਭ"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "ਨਹੀਂ"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "ਕੋਈ ਵੀ ਮਿਤੀ"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "ਅੱਜ"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "ਪਿਛਲੇ ੭ ਦਿਨ"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "ਇਹ ਮਹੀਨੇ"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "ਇਹ ਸਾਲ"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "ਫੇਰ ਲਾਗਇਨ ਕਰੋ ਜੀ, ਕਿਉਂਕਿ ਤੁਹਾਡੇ ਸ਼ੈਸ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਸੀ।"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "ਤੁਹਾਡਾ ਈਮੇਲ ਐਡਰੈੱਸ ਤੁਹਾਡਾ ਯੂਜ਼ਰ ਨਾਂ ਨਹੀਂ ਹੈ। '%s' ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "ਕਾਰਵਾਈ:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "ਕਾਰਵਾਈ ਸਮਾਂ"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "ਆਬਜੈਕਟ id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "ਆਬਜੈਕਟ repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "ਕਾਰਵਾਈ ਫਲੈਗ"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "ਸੁਨੇਹਾ ਬਦਲੋ"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "ਲਾਗ ਐਂਟਰੀ"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "ਲਾਗ ਐਂਟਰੀਆਂ"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s ਬਦਲਿਆ।"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ਅਤੇ"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" ਸ਼ਾਮਲ ਕੀਤਾ।"
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" ਲਈ %(list)s ਨੂੰ ਬਦਲਿਆ"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" ਹਟਾਇਆ ਗਿਆ।"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "ਕੋਈ ਖੇਤਰ ਨਹੀਂ ਬਦਲਿਆ।"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਇਆ ਗਿਆ ਹੈ।"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "ਤੁਸੀਂ ਇਸ ਨੂੰ ਹੇਠਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "ਤੁਸੀਂ ਇੱਕ ਹੋਰ %s ਹੇਠਾਂ ਜੋੜ ਸਕਦੇ ਹੋ।"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ਨੂੰ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ ਸੀ।"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਜੋੜਿਆ ਗਿਆ ਸੀ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਹੇਠਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਇਆ ਗਿਆ ਹੈ।"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ਨੂੰ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ ਸੀ।"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ ਚੁਣੀ ਗਈ।"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s ਸ਼ਾਮਲ"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s ਬਦਲੋ"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "ਡਾਟਾਬੇਸ ਗਲਤੀ"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ।"
 msgstr[1] "%(count)s %(name)s ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲੇ ਗਏ ਹਨ।"
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s ਚੁਣਿਆ।"
 msgstr[1] "%(total_count)s ਚੁਣੇ"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਇਆ ਗਿਆ ਹੈ।"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "ਅਤੀਤ ਬਦਲੋ: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "ਲਾਗ ਇਨ"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "ਸਾਈਟ ਪਰਬੰਧ"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s ਪਰਸ਼ਾਸ਼ਨ"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "ਮਿਤੀ:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "ਸਮਾਂ:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "ਖੋਜ"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "ਹੋਰ ਸ਼ਾਮਲ"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "ਸਫ਼ਾ ਨਹੀਂ ਲੱਭਿਆ"
@@ -292,39 +308,39 @@ msgstr "ਸਫ਼ਾ ਨਹੀਂ ਲੱਭਿਆ"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "ਸਾਨੂੰ ਅਫਸੋਸ ਹੈ, ਪਰ ਅਸੀਂ ਮੰਗਿਆ ਗਿਆ ਸਫ਼ਾ ਨਹੀਂ ਲੱਭ ਸਕੇ।"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "ਘਰ"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "ਸਰਵਰ ਗਲਤੀ"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "ਸਰਵਰ ਗਲਤੀ (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "ਸਰਵਰ ਗਲਤੀ <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 
 #: templates/admin/actions.html:4
@@ -348,7 +364,7 @@ msgstr "ਸਭ %(total_count)s %(module_name)s ਚੁਣੋ"
 msgid "Clear selection"
 msgstr "ਚੋਣ ਸਾਫ਼ ਕਰੋ"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -358,22 +374,22 @@ msgid "Welcome,"
 msgstr "ਜੀ ਆਇਆਂ ਨੂੰ, "
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "ਡੌਕੂਮੈਂਟੇਸ਼ਨ"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "ਲਾਗ ਆਉਟ"
 
@@ -385,35 +401,35 @@ msgstr "ਡੀਜਾਂਗੋ ਸਾਈਟ ਐਡਮਿਨ"
 msgid "Django administration"
 msgstr "ਡੀਜਾਂਗੋ ਪਰਸ਼ਾਸ਼ਨ"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "ਸ਼ਾਮਲ"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "ਅਤੀਤ"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "ਸਾਈਟ ਉੱਤੇ ਜਾਓ"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "ਹੇਠਾਂ ਦਿੱਤੀ ਗਲਤੀ ਠੀਕ ਕਰੋ ਜੀ।"
 msgstr[1] "ਹੇਠ ਦਿੱਤੀਆਂ ਗਲਤੀਆਂ ਠੀਕ ਕਰੋ ਜੀ।"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s ਸ਼ਾਮਲ"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "ਫਿਲਟਰ"
 
@@ -430,12 +446,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -443,30 +459,30 @@ msgid ""
 "following types of objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "ਹਾਂ, ਮੈਂ ਚਾਹੁੰਦਾ ਹਾਂ"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "ਕਈ ਆਬਜੈਕਟ ਹਟਾਓ"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -474,14 +490,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -493,67 +509,63 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s ਵਲੋਂ "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "ਐਪਲੀਕੇਸ਼ਨ %(name)s ਵਿੱਚ ਉਪਲੱਬਧ ਮਾਡਲ ਹਨ।"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "ਬਦਲੋ"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "ਤੁਹਾਨੂੰ ਕੁਝ ਵੀ ਸੋਧਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "ਤਾਜ਼ਾ ਕਾਰਵਾਈਆਂ"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "ਮੇਰੀਆਂ ਕਾਰਵਾਈਆਂ"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "ਕੋਈ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "ਅਣਜਾਣ ਸਮੱਗਰੀ"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "ਮਿਤੀ/ਸਮਾਂ"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "ਯੂਜ਼ਰ"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "ਕਾਰਵਾਈ"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -605,64 +617,64 @@ msgstr "ਪਹਿਲਾਂ ਆਪਣਾ ਯੂਜ਼ਰ ਨਾਂ ਤੇ ਪਾ
 msgid "Enter a username and password."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "ਯੂਜ਼ਰ <strong>%(username)s</strong> ਲਈ ਨਵਾਂ ਪਾਸਵਰਡ ਦਿਓ।"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "ਪਾਸਵਰਡ (ਫੇਰ)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "ਜਾਂਚ ਲਈ, ਉੱਤੇ ਦਿੱਤਾ ਪਾਸਵਰਡ ਹੀ ਦਿਓ।"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "ਹਟਾਓ"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "%(verbose_name)s ਹੋਰ ਸ਼ਾਮਲ"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "ਹਟਾਓ"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "ਹਟਾਉਣਾ?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "ਅੱਜ ਵੈੱਬਸਾਈਟ ਨੂੰ ਕੁਝ ਚੰਗਾ ਸਮਾਂ ਦੇਣ ਲਈ ਧੰਨਵਾਦ ਹੈ।"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "ਫੇਰ ਲਾਗਇਨ ਕਰੋ"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "ਪਾਸਵਰਡ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -670,65 +682,65 @@ msgstr ""
 "ਸੁਰੱਖਿਆ ਲਈ ਪਹਿਲਾਂ ਆਪਣਾ ਪੁਰਾਣਾ ਪਾਸਵਰਡ ਦਿਉ, ਅਤੇ ਫੇਰ ਆਪਣਾ ਨਵਾਂ ਪਾਸਵਰਡ ਦੋ ਵਰਾ ਦਿਉ ਤਾਂ ਕਿ "
 "ਅਸੀਂ ਜਾਂਚ ਸਕੀਏ ਕਿ ਤੁਸੀਂ ਇਹ ਠੀਕ ਤਰ੍ਹਾਂ ਲਿਖਿਆ ਹੈ।"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "ਪੁਰਾਣਾ ਪਾਸਵਰਡ"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "ਨਵਾਂ ਪਾਸਵਰਡ"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "ਮੇਰਾ ਪਾਸਵਰਡ ਬਦਲੋ"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਜਾਰੀ ਰੱਖ ਕੇ ਹੁਣੇ ਲਾਗਇਨ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰਨ ਪੁਸ਼ਟੀ"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "ਨਵਾਂ ਪਾਸਵਰਡ ਦਿਓ"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 "ਆਪਣਾ ਨਵਾਂ ਪਾਸਵਰਡ ਦੋ ਵਾਰ ਦਿਉ ਤਾਂ ਕਿ ਅਸੀਂ ਜਾਂਚ ਕਰ ਸਕੀਏ ਕਿ ਤੁਸੀਂ ਠੀਕ ਤਰ੍ਹਾਂ ਲਿਖਿਆ ਹੈ।"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "ਨਵਾਂ ਪਾਸਵਰਡ:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰਨ ਅਸਫ਼ਲ"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -736,21 +748,21 @@ msgstr ""
 "ਪਾਸਵਰਡ ਰੀ-ਸੈੱਟ ਲਿੰਕ ਗਲਤ ਹੈ, ਸੰਭਵ ਤੌਰ ਉੱਤੇ ਇਹ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਚੁੱਕਾ ਹੈ। ਨਵਾਂ ਪਾਸਵਰਡ ਰੀ-"
 "ਸੈੱਟ ਲਈ ਬੇਨਤੀ ਭੇਜੋ ਜੀ।"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "ਪਾਸਵਰਡ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -771,36 +783,34 @@ msgstr "ਸਾਡੀ ਸਾਈਟ ਵਰਤਣ ਲਈ ਧੰਨਵਾਦ ਜੀ!
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s ਟੀਮ"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ? ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਹੇਠਾਂ ਦਿਓ ਅਤੇ ਅਸੀਂ ਤੁਹਾਨੂੰ ਨਵੇਂ ਲਈ ਹਦਾਇਤਾਂ ਨਾਲ ਈਮੇਲ ਭੇਜ "
-"ਦੇਵਾਂਗੇ।"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "ਈਮੇਲ ਐਡਰੈੱਸ:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "ਮੇਰਾ ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰੋ"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "ਸਭ ਮਿਤੀਆਂ"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s ਚੁਣੋ"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "ਬਦਲਣ ਲਈ %s ਚੁਣੋ"
diff --git a/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.mo
index 7cf4a4b467..453d8567c5 100644
Binary files a/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.po
index 3a74cfb8c3..e45fc6ae45 100644
--- a/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.po
@@ -9,13 +9,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo
index 7ff6049b56..24112a04ab 100644
Binary files a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po b/django/contrib/admin/locale/pl/LC_MESSAGES/django.po
index 94aad5476e..20871c794b 100644
--- a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/pl/LC_MESSAGES/django.po
@@ -6,33 +6,34 @@
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Karol  <kfuks2@o2.pl>, 2012.
 # konryd <konryd@gmail.com>, 2011.
+#   <ola@sitarska.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-12 00:20+0000\n"
-"Last-Translator: angularcircle <angular.circle@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-06 10:41+0000\n"
+"Last-Translator: ola <ola@sitarska.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Usunięto %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Nie można usunąć %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Jesteś pewien?"
 
@@ -41,199 +42,205 @@ msgstr "Jesteś pewien?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Usuń wybrane %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Wszystko"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Tak"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nie"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Dowolna data"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Ostatnie 7 dni"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Ten miesiąc"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Ten rok"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Proszę podać poprawną nazwę użytkownika i hasło dla konta administratora. "
-"Zauważ, że w obu polach wielkość znaków ma znaczenie."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Twoja sesja wygasła, zaloguj się ponownie."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Podany adres e-mail nie jest Twoją nazwą użytkownika. Spróbuj '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Akcja:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "czas akcji"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id obiektu"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "reprezentacja obiektu"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "flaga akcji"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "zmień wiadomość"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "log"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "logi"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Dodano \" %(object)s \"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Zmieniono \" %(object)s \" - %(changes)s "
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Usunięto \" %(object)s \"."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Obiekt typu LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "brak"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Zmieniono %s"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "i"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Dodano %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Zmieniono %(list)s w %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Usunięto %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Żadne pole nie zmienione."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" dodany pomyślnie."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Możesz ponownie edytować wpis poniżej."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Możesz dodać nowy wpis %s poniżej."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" zostało pomyślnie zmienione."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" dodane pomyślnie. Możesz edytować ponownie wpis poniżej."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" dodany pomyślnie."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" zostało pomyślnie zmienione."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 "Wykonanie akcji wymaga wybrania obiektów. Żaden obiekt nie został zmieniony."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nie wybrano akcji."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Obiekt %(name)s o kluczu głównym %(key)r nie istnieje."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Zmień %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -241,7 +248,7 @@ msgstr[0] "%(count)s %(name)s został pomyślnie zmieniony."
 msgstr[1] "%(count)s %(name)s zostały pomyślnie zmienione."
 msgstr[2] "%(count)s %(name)s zostało pomyślnie zmienionych."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -249,52 +256,60 @@ msgstr[0] "%(total_count)s wybrany"
 msgstr[1] "%(total_count)s wybrane"
 msgstr[2] "%(total_count)s wybranych"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 z %(cnt)s wybranych"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Historia zmian: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Zaloguj się"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administracja stroną"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s - administracja"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Data:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Czas:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Szukaj"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Dodaj kolejny"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Strona nie znaleziona"
@@ -303,42 +318,40 @@ msgstr "Strona nie znaleziona"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Niestety, żądana strona nie została znaleziona."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Początek"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Błąd serwera"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Błąd serwera (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Błąd Serwera <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Wystąpił niespodziewany błąd. Został on zgłoszony e-mailem administratorowi "
-"strony i powinien zostać wkrótce naprawiony. Dziękujemy za cierpliwość."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -361,7 +374,7 @@ msgstr "Wybierz wszystkie %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Wyczyść wybór"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -371,22 +384,22 @@ msgid "Welcome,"
 msgstr "Witaj,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentacja"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Zmiana hasła"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Wyloguj się"
 
@@ -398,36 +411,36 @@ msgstr "Administracja stroną Django"
 msgid "Django administration"
 msgstr "Administracja Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historia"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Pokaż na stronie"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Proszę, popraw poniższy błąd."
 msgstr[1] "Proszę, popraw poniższe błędy."
 msgstr[2] "Proszę, popraw poniższe błędy."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Dodaj %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtr"
 
@@ -444,12 +457,12 @@ msgstr "Priorytet sortowania: %(priority_number)s "
 msgid "Toggle sorting"
 msgstr "Zmień sortowanie"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -460,7 +473,7 @@ msgstr ""
 "zależnych obiektów, lecz nie posiadasz uprawnień do usunięcia następujących "
 "typów obiektów:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -469,7 +482,7 @@ msgstr ""
 "Skasowanie %(object_name)s '%(escaped_object)s'  wymaga usunięcia "
 "następujących chronionych zależnych obiektów:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -478,16 +491,16 @@ msgstr ""
 "Czy chcesz skasować %(object_name)s \"%(escaped_object)s\"? Następujące "
 "zależne obiekty zostaną skasowane:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Tak, na pewno"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Usuwanie wielu obiektów"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -497,7 +510,7 @@ msgstr ""
 "Skasowanie %(objects_name)s spowoduje usunięcie zależnych obiektów, lecz nie "
 "posiadasz uprawnień do usunięcia następujących typów obiektów:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -506,7 +519,7 @@ msgstr ""
 "Skasowanie %(objects_name)s wymaga usunięcia następujących chronionych "
 "zależnych obiektów:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -520,36 +533,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Używając %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modele dostępne w aplikacji %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modele w aplikacji %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Zmień"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nie masz uprawnień by edytować cokolwiek."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Ostatnie akcje"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Moje akcje"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Brak"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Zawartość nieznana"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -559,31 +572,27 @@ msgstr ""
 "tabele zostały utworzone i odpowiedni użytkownik jest uprawniony do ich "
 "odczytu."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Nazwa użytkownika:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Hasło:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Nie pamiętasz swojego hasła, bądź nazwy konta użytkownika?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Data/czas"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Użytkownik"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Akcja"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -640,109 +649,109 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Podaj nazwę użytkownika i hasło."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Podaj nowe hasło dla użytkownika <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Hasło (powtórz)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Podaj powyższe hasło w celu weryfikacji."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Usuń"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Dodaj kolejne %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Usuń"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Usunąć?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Dziękujemy za odwiedzenie serwisu."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Zaloguj się ponownie"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Zmiana hasła"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Hasło zmienione"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Twoje hasło zostało zmienione."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 msgstr "Podaj swoje stare hasło i dwa razy nowe."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Zmień hasło"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Zresetuj hasło"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Hasło zostało zresetowane"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Twoje hasło zostało ustawione. Możesz się teraz zalogować."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Potwierdzenie zresetowania hasła"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Podaj nowe hasło"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -750,19 +759,19 @@ msgstr ""
 "Podaj dwukrotnie nowe hasło, by można było zweryfikować, czy zostało wpisane "
 "poprawnie."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nowe hasło:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Potwierdź hasło:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Zresetowanie hasła nie powiodło się"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -770,27 +779,23 @@ msgstr ""
 "Link do resetowania hasła był niepoprawny, być może dlatego, że został już "
 "raz użyty. Możesz ponownie zażądać zresetowania hasła."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Zresetowanie hasła zakończyło się powodzeniem"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Instrukcje dalszego postępowania zostały wysłane na podany adres e-mail. "
-"Powinieneś otrzymać je niebawem."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Otrzymujesz tę wiadomość w odpowiedzi na prośbę o zresetowanie hasła dla "
-"twojego konta na stronie %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -811,36 +816,34 @@ msgstr "Dziękujemy za skorzystanie naszej strony."
 msgid "The %(site_name)s team"
 msgstr "Zespół %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Zapomniałeś hasła? Podaj swój adres e-mail, a prześlemy Ci instrukcję, jak "
-"ustawić nowe hasło."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Adres e-mail:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Zresetuj moje hasło"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Wszystkie daty"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Brak)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Zaznacz %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Zaznacz %s aby zmienić"
diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo
index afdb8e08da..6ec84e590b 100644
Binary files a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po
index 96714f7fa9..c255576126 100644
--- a/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po
@@ -12,14 +12,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-19 16:08+0000\n"
 "Last-Translator: Roman Barczyński <rombar@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo
index 651cc095ba..4343740423 100644
Binary files a/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/pt/LC_MESSAGES/django.po b/django/contrib/admin/locale/pt/LC_MESSAGES/django.po
index 323e30527e..237a907406 100644
--- a/django/contrib/admin/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/pt/LC_MESSAGES/django.po
@@ -1,35 +1,36 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Bruno Miguel Custódio <bruno@brunomcustodio.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nuno Mariz <nmariz@gmail.com>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011-2012.
 # Paulo Köch <paulo.koch@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Foram removidos com sucesso %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Não é possível remover %(name)s "
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Tem a certeza?"
 
@@ -38,161 +39,137 @@ msgstr "Tem a certeza?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Remover %(verbose_name_plural)s selecionados"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Todos"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Sim"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Não"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Qualquer data"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hoje"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Últimos 7 dias"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Este mês"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Este ano"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Por favor autentique-se novamente, porque a sua sessão expirou."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"O seu endereço de e-mail não é o seu nome de utilizador. Tente usar '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Ação:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "hora da ação"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id do objeto"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr do objeto"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "flag de ação"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "modificar mensagem"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entrada de log"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entradas de log"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "Adicionado \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "Foram modificados \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "Foram removidos \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "Objeto LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Nenhum"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Foi modificado %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "e"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Foram adicionados %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Foram modificados %(list)s para %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Foram removidos %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nenhum campo foi modificado."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Pode editá-lo(a) outra vez abaixo."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Pode adicionar outro %s abaixo."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "O(A) %(name)s \"%(obj)s\" foi modificado(a) com sucesso."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -200,7 +177,44 @@ msgstr ""
 "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso. Pode voltar a "
 "editar novamente abaixo."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"O %(name)s \"%(obj)s\" foi adicionado corretamente. Pode adicionar um novo "
+"%(name)s abaixo."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"O %(name)s \"%(obj)s\" foi modificado corretamente. Pode editá-lo novamente "
+"abaixo."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"O %(name)s \"%(obj)s\" foi modificado corretamente. Pode adicionar um novo "
+"%(name)s abaixo."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "O(A) %(name)s \"%(obj)s\" foi modificado(a) com sucesso."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,89 +222,97 @@ msgstr ""
 "Os itens devem ser selecionados de forma a efectuar ações sobre eles. Nenhum "
 "item foi modificado."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nenhuma ação selecionada."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Adicionar %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "O object %(name)s com a chave primária %(key)r não existe."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Erro de base de dados"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s foi modificado com sucesso."
 msgstr[1] "%(count)s %(name)s foram modificados com sucesso."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s selecionado"
 msgstr[1] "Todos %(total_count)s selecionados"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 de %(cnt)s selecionados"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "O(A) %(name)s \"%(obj)s\" foi removido(a) com sucesso."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Histórico de modificações: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Entrar"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administração do site"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administração de %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Data:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Hora:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Procurar"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Adicionar Outro"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Atualmente:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Modificar:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Página não encontrada"
@@ -299,42 +321,42 @@ msgstr "Página não encontrada"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Pedimos desculpa, mas a página solicitada não foi encontrada."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Início"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Erro do servidor"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Erro do servidor (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Erro do servidor <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ocorreu um erro. Foi reportado aos administradores do site via e-mail e "
-"deverá ser corrigido brevemente. Obrigado pela sua paciência."
+"Ocorreu um erro. Foi enviada uma notificação para os administradores do "
+"site, devendo o mesmo ser corrigido em breve. Obrigado pela atenção."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -357,7 +379,7 @@ msgstr "Selecionar todos %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Remover seleção"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -367,22 +389,22 @@ msgid "Welcome,"
 msgstr "Bem-vindo,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentação"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Modificar palavra-passe"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Sair"
 
@@ -394,57 +416,57 @@ msgstr "Site de administração do Django"
 msgid "Django administration"
 msgstr "Administração do Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "História"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Ver no site"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor corrija o erro abaixo."
 msgstr[1] "Por favor corrija os erros abaixo."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Adicionar %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtro"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "Remover da ordenação"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "Prioridade de ordenação: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "Altenar ordenação"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Remover"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -455,7 +477,7 @@ msgstr ""
 "objetos relacionados, mas a sua conta não tem permissão de remoção dos "
 "seguintes tipos de objetos:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -464,7 +486,7 @@ msgstr ""
 "Remover o %(object_name)s  ' %(escaped_object)s ' exigiria a remoção dos "
 "seguintes objetos protegidos relacionados:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -473,16 +495,16 @@ msgstr ""
 "Tem a certeza que deseja remover %(object_name)s \"%(escaped_object)s\"? "
 "Todos os items relacionados seguintes irão ser removidos:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Sim, tenho a certeza"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Remover múltiplos objetos."
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +515,7 @@ msgstr ""
 "objetos relacionados, mas a sua conta não tem permissão para remover os "
 "seguintes tipos de objetos:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +524,7 @@ msgstr ""
 "Remover o %(objects_name)s selecionado exigiria remover os seguintes objetos "
 "protegidos relacionados:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +538,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Por %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Models disponíveis na aplicação %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modelos na aplicação %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modificar"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Não tem permissão para modificar nada."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Ações Recentes"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "As minhas Ações"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nenhum disponível"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Conteúdo desconhecido"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -555,31 +577,27 @@ msgstr ""
 "as tabelas da base de dados foram criadas apropriadamente e verifique se a "
 "base de dados pode ser lida pelo utilizador definido."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Utilizador:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Palavra-passe:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Esqueceu-se da sua palavra-passe ou utilizador?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Data/hora"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Utilizador"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Ação"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -635,65 +653,66 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Introduza o utilizador e palavra-passe."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
-"Introduza uma nova password para o utilizador <strong>%(username)s</strong>."
+"Introduza uma nova palavra-passe para o utilizador <strong>%(username)s</"
+"strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Palavra-passe (novamente)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Introduza a palavra-passe como acima, para verificação."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Remover"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Adicionar outro %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Remover"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Remover?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Obrigado pela sua visita."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Entrar novamente"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Modificação da palavra-passe"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Palavra-passe modificada com sucesso"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "A sua palavra-passe foi modificada."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -702,46 +721,46 @@ msgstr ""
 "depois introduza a nova duas vezes para que possamos verificar se introduziu "
 "corretamente."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Palavra-passe antiga"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nova palavra-passe"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Modificar a minha palavra-passe"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Palavra-passe de reinicialização"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Reinicialização da palavra-passe concluída"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "A sua palavra-passe foi atribuída.  Pode entrar agora."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmação da reinicialização da palavra-passe"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Introduza a nova palavra-passe"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -749,19 +768,19 @@ msgstr ""
 "Por favor, introduza a sua nova palavra-passe duas vezes para verificarmos "
 "se está correcta."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nova palavra-passe:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirmação da palavra-passe:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Palavra-passe reinicializada sem sucesso"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -770,27 +789,27 @@ msgstr ""
 "porque já foi usado. Por favor requisite uma nova reinicialização da palavra-"
 "passe."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Palavra-passe reinicializada com sucesso"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Foi enviado para o e-mail que submeteu as instruções de configuração da "
-"palavra-passe. Deverá estar a recebê-lo brevemente."
+"Enviámos para o email especificado as instruções para redefinir a sua "
+"palavra-chave. Deverá recebê-las dentro em breve."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Está a receber este e-mail porque pediu uma palavra-passe nova para a sua "
-"conta em %(site_name)s."
+"Está a receber este email porque pediu para redefinir a palavra-chave para o "
+"seu utilizador no site %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -809,36 +828,36 @@ msgstr "Obrigado pela sua visita ao nosso site!"
 msgid "The %(site_name)s team"
 msgstr "A equipa do %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Esqueceu-se da palavra-passe? Introduza o seu e-mail abaixo, e enviaremos as "
-"instruções de configuração de uma nova."
+"Esqueceu-se da sua palavra-chave? Introduza o seu endereço de email e enviar-"
+"lhe-emos instruções para definir uma nova."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Endereço de e-mail:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Endereço de email:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Reinicializar a minha palavra-passe"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Todas as datas"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Nada)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Selecionar %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Selecione %s para modificar"
diff --git a/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.mo
index 576b6dd795..ebf1280355 100644
Binary files a/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.po
index ec41cab53a..f63c1ebb56 100644
--- a/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.po
@@ -2,22 +2,22 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nuno Mariz <nmariz@gmail.com>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011, 2012.
 # Paulo Köch <paulo.koch@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
+"PO-Revision-Date: 2012-04-02 14:38+0000\n"
 "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -30,11 +30,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Esta é a lista de %s disponíveis. Poderá escolher alguns, selecionando-os na "
+"caixa abaixo e clicando na seta \"Escolher\" entre as duas caixas."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Digite nesta caixa para filtrar a lista de %s disponíveis."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -47,11 +49,11 @@ msgstr "Escolher todos"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Clique para escolher todos os %s de uma vez."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Escolher"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -68,15 +70,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Esta é a lista de %s escolhidos. Poderá remover alguns, selecionando-os na "
+"caixa abaixo e clicando na seta \"Remover\" entre as duas caixas."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "Remover todos"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Clique para remover todos os %s escolhidos de uma vez."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo
index 31ecdce35c..dfa87b69bb 100644
Binary files a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po
index 5fa3ff22e7..87cb0876d7 100644
--- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,35 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Eduardo Carvalho <eduardocereto@gmail.com>, 2011.
+#   <dudanogueira@gmail.com>, 2012.
+# Eduardo Carvalho <eduardocereto@gmail.com>, 2011-2012.
+# Guilherme Gondim <semente@taurinus.org>, 2012-2013.
 # Guilherme Gondim <semente+transifex@taurinus.org>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-19 17:00+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-05 12:55+0000\n"
+"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Removido %(count)d %(items)s com sucesso."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Não é possível excluir %(name)s "
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
@@ -38,162 +40,139 @@ msgstr "Tem certeza?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Remover %(verbose_name_plural)s selecionados"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Todos"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Sim"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Não"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Qualquer data"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hoje"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Últimos 7 dias"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Este mês"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Este ano"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Por favor, insira um nome de usuário e senha corretos para uma conta de "
-"equipe. Note que ambos campos são sensíveis a maiúsculas e minúsculas."
+"Por favor, insira um %(username)s e senha corretos para uma conta de equipe. "
+"Note que ambos campos são sensíveis a maiúsculas e minúsculas."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Por favor acesse novamente, pois sua sessão expirou."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Seu endereço de e-mail não é seu nome de usuário. Tente usar '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Ação:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "hora da ação"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id do objeto"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr do objeto"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "flag de ação"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "modificar mensagem"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "entrada de log"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "entradas de log"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Adicionado \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Modificado \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Removido \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objeto LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Nenhum"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Modificado %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "e"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Adicionado %(name)s \"%(object)s\""
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Modificado %(list)s para %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Deletado %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nenhum campo modificado."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\": adicionado com sucesso."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Você pode editar novamente abaixo."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Você pode adicionar outro(a) %s abaixo."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\": modificado com sucesso."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,7 +180,44 @@ msgstr ""
 "%(name)s \"%(obj)s\": adicionado com sucesso. Você pode editar novamente "
 "abaixo."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" adicionado com sucesso. Você pode adicionar um outro "
+"%(name)s abaixo."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\": adicionado com sucesso."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" modificado com sucesso. Você pode editá-lo novamente "
+"abaixo."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" alterado com sucesso. Você pode adicionar um outro "
+"%(name)s abaixo."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\": modificado com sucesso."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,89 +225,97 @@ msgstr ""
 "Os itens devem ser selecionados a fim de executar ações sobre eles. Nenhum "
 "item foi modificado."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nenhuma ação selecionada."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Adicionar %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objeto %(name)s com chave primária %(key)r não existe."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s modificado com sucesso."
 msgstr[1] "%(count)s %(name)s modificados com sucesso."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s selecionado"
 msgstr[1] "Todos %(total_count)s selecionados"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 de %(cnt)s selecionados"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\": excluído com sucesso."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Histórico de modificações: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Acessar"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administração do Site"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administração de %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Data:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Hora:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Olhar"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Adicionar Outro(a)"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Atualmente:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Alterar:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Página não encontrada"
@@ -300,42 +324,42 @@ msgstr "Página não encontrada"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Início"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Erro no servidor"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Erro no servidor (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Erro no Servidor <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Houve um erro. Este foi reportado aos administradores do site através do e-"
-"mail e deve ser corrigido em breve. Obrigado pela compreensão."
+"Houve um erro, que já foi reportado aos administradores do site por email e "
+"deverá ser consertado em breve. Obrigado pela sua paciência."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -358,7 +382,7 @@ msgstr "Selecionar todos %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Limpar seleção"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -368,22 +392,22 @@ msgid "Welcome,"
 msgstr "Bem-vindo(a),"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentação"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Encerrar sessão"
 
@@ -395,35 +419,35 @@ msgstr "Site de administração do Django"
 msgid "Django administration"
 msgstr "Administração do Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Histórico"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Ver no site"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor, corrija o erro abaixo."
 msgstr[1] "Por favor, corrija os erros abaixo."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Adicionar %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtro"
 
@@ -440,12 +464,12 @@ msgstr "Prioridade da ordenação: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Alternar ordenção"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Apagar"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -456,7 +480,7 @@ msgstr ""
 "de objetos relacionados, mas sua conta não tem a permissão para remoção dos "
 "seguintes tipos de objetos:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -465,7 +489,7 @@ msgstr ""
 "Excluir o %(object_name)s  ' %(escaped_object)s ' exigiria excluir os "
 "seguintes objetos protegidos relacionados:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -474,16 +498,16 @@ msgstr ""
 "Você tem certeza que quer remover %(object_name)s \"%(escaped_object)s\"? "
 "Todos os seguintes itens relacionados serão removidos:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Sim, tenho certeza"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Remover múltiplos objetos"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -494,7 +518,7 @@ msgstr ""
 "relacionados, mas sua conta não tem permissão para excluir os seguintes "
 "tipos de objetos:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -503,7 +527,7 @@ msgstr ""
 "Excluir o %(objects_name)s selecionado exigiria excluir os seguintes objetos "
 "relacionados protegidos:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -517,36 +541,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Por %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelos disponíveis na aplicação %(name)s"
+msgid "Models in the %(name)s application"
+msgstr "Modelos na aplicação %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Modificar"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Você não tem permissão para edição."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Ações Recentes"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Minhas Ações"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nenhum disponível"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Conteúdo desconhecido"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -556,31 +580,27 @@ msgstr ""
 "que as tabelas necessárias foram criadas e que o banco de dados pode ser "
 "acessado pelo usuário apropriado."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Usuário:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Senha:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Esqueceu sua senha ou nome de usuário?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Data/hora"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Usuário"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Ação"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -636,64 +656,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Digite um nome de usuário e senha."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Informe uma nova senha para o usuário <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Senha"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Informe a mesma senha digitada acima, para verificação."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Remover"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Adicionar outro(a) %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Remover"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Apagar?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Obrigado por visitar nosso Web site hoje."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Acessar novamente"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Alterar senha"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Senha alterada com sucesso"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Sua senha foi alterada."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -701,46 +721,46 @@ msgstr ""
 "Por favor, informe sua senha antiga, por segurança, e então informe sua nova "
 "senha duas vezes para que possamos verificar se você digitou corretamente."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nova senha"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Alterar minha senha"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Recuperar senha"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Recuperação de senha completa"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Sua senha foi definida. Você pode prosseguir e se autenticar agora."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmação de recuperação de senha"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Insira a nova senha"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -748,19 +768,19 @@ msgstr ""
 "Por favor, informe sua nova senha duas vezes para que possamos verificar se "
 "você a digitou corretamente."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nova senha:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirme a senha:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Recuperação de senha sem sucesso"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -768,27 +788,27 @@ msgstr ""
 "O link para a recuperação de senha era inválido, possivelmente porque jã foi "
 "utilizado. Por favor, solicite uma nova recuperação de senha."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Senha recuperada com sucesso"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Enviamos as instruções de como definir sua nova senha para o e-mail que você "
-"informou. Você deverá recebê-las em breve."
+"Nós te enviamos as instruções para definição da a sua senha para o endereço "
+"de email fornecido. Você receberá a mensagem em breve."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Você está recebendo este e-mail porque você pediu um reset de senha para sua "
-"conta de usuário em %(site_name)s ."
+"Você está recebendo este email porque solicitou a redefinição da senha da "
+"sua conta em %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -807,36 +827,36 @@ msgstr "Obrigado por usar nosso site!"
 msgid "The %(site_name)s team"
 msgstr "Equipe %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Esqueceu sua senha? Digite seu e-mail abaixo e receberá instruções para "
-"definir uma nova."
+"Esqueceu a senha? Forneça o seu endereço de email abaixo e te enviaremos "
+"instruções para definir uma nova."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Endereço de e-mail:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Endereço de email:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Reinicializar minha senha"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Todas as datas"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Selecione %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Selecione %s para modificar"
diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo
index 9bddb74eff..92f5aefb68 100644
Binary files a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po
index 6a5d1a0815..6152c01459 100644
--- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -10,14 +10,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-19 18:12+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo
index 2408f87dad..63937322de 100644
Binary files a/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/django.po b/django/contrib/admin/locale/ro/LC_MESSAGES/django.po
index ba0986c95b..1bccde1b33 100644
--- a/django/contrib/admin/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ro/LC_MESSAGES/django.po
@@ -9,29 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Ionel Cristian Mărieș <ionel.mc@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s eliminate cu succes."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Nu se poate șterge %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Sigur?"
 
@@ -40,165 +40,137 @@ msgstr "Sigur?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Elimină %(verbose_name_plural)s selectate"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Toate"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Da"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nu"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Orice dată"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Astăzi"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Ultimele 7 zile"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Luna aceasta"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Anul acesta"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Vă rog introduceți utilizatorul și parola corecta pentru un cont de "
-"management. Notă: ambele câmpuri iau în considerare capitalizarea "
-"caracterelor."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Autentificațți-vă din nou, deoarece sesiunea dumneavoastră a expirat."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Adresa de email nu este totuna cu numele dumneavoastră de utilizator. "
-"Încercați '%s' în schimb."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Acțiune:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "timp acțiune"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id obiect"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "repr obiect"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "marcaj acțiune"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "schimbă mesaj"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "intrare jurnal"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "intrări jurnal"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "S-au adăugat \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "S-au schimbat \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "S-au șters \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Obiect LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Nimic"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "S-a schimbat %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "și"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "S-a adăugat %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "S-a schimbat %(list)s în %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "S-a șters %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Niciun câmp modificat."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" a fost adăugat cu succes."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Puteți edita din nou mai jos."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puteți adăuga înca un/o %s mai jos."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" a fost modificat(ă) cu succes."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -206,7 +178,38 @@ msgstr ""
 "%(name)s \"%(obj)s\" a fost adăugat(ă) cu succes. Puteți edita din nou mai "
 "jos."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" a fost adăugat cu succes."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" a fost modificat(ă) cu succes."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -214,30 +217,30 @@ msgstr ""
 "Itemii trebuie selectați pentru a putea îndeplini sarcini asupra lor. Niciun "
 "item nu a fost modificat."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nicio acțiune selectată."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Adaugă %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Obiectul %(name)s ce are cheie primară %(key)r nu există."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Schimbă %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Eroare de bază de date"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -245,7 +248,7 @@ msgstr[0] "%(count)s %(name)s s-a modificat cu succes."
 msgstr[1] "%(count)s %(name)s s-au modificat cu succes."
 msgstr[2] "%(count)s de %(name)s s-au modificat cu succes."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -253,52 +256,60 @@ msgstr[0] "%(total_count)s selectat(ă)"
 msgstr[1] "Toate %(total_count)s selectate"
 msgstr[2] "Toate %(total_count)s selectate"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 din %(cnt)s  selectat"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" eliminat(ă) cu succes."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Istoric schimbări: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Autentificare"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administrare site"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administrare %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dată:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Oră:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Căutare"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Mai adăugați"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Pagină inexistentă"
@@ -307,42 +318,40 @@ msgstr "Pagină inexistentă"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ne pare rău, dar pagina solicitată nu a putut fi găsită."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Acasă"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Eroare de server"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Eroare de server (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Eroare server <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"A apărut o eroare. A fost raportată prin e-mail către administrator și ar "
-"trebui să fie rezolvată în scurt timp. Mulţumim pentru înţelegere."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -365,7 +374,7 @@ msgstr "Selectați toate %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Deselectați"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -375,22 +384,22 @@ msgid "Welcome,"
 msgstr "Bun venit,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Documentație"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Deautentificare"
 
@@ -402,36 +411,36 @@ msgstr "Administrare sit Django"
 msgid "Django administration"
 msgstr "Administrare Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Adaugă"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Istoric"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Vizualizează pe sit"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Corectați eroarea de mai jos"
 msgstr[1] "Corectați erorile de mai jos"
 msgstr[2] "Corectați erorile de mai jos"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Adaugă %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtru"
 
@@ -448,12 +457,12 @@ msgstr "Prioritate sortare: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Alternează sortarea"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -464,7 +473,7 @@ msgstr ""
 "obiectelor asociate, însă contul dumneavoastră nu are permisiunea de a "
 "șterge următoarele tipuri de obiecte:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -473,7 +482,7 @@ msgstr ""
 "Ștergerea %(object_name)s '%(escaped_object)s' ar putea necesita și "
 "ștergerea următoarelor obiecte protejate asociate:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -482,16 +491,16 @@ msgstr ""
 "Sigur doriți ștergerea %(object_name)s \"%(escaped_object)s\"? Următoarele "
 "itemuri asociate vor fi șterse:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Da, cu siguranță"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Ștergeți obiecte multiple"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -502,7 +511,7 @@ msgstr ""
 "obiectelor asociate, însă contul dvs. de utilizator nu are permisiunea de a "
 "șterge următoarele tipuri de obiecte:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -511,7 +520,7 @@ msgstr ""
 "Ştergerea %(objects_name)s conform selecției  ar necesita și ștergerea "
 "următoarelor obiecte protejate asociate:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -525,36 +534,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "După %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modele disponibile în aplicația %(name)s"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Schimbă"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nu nicio permisiune de editare."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Acțiuni recente"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Acțiunile mele"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Niciuna"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Conținut necunoscut"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -564,31 +573,27 @@ msgstr ""
 "baza de date au fost create și verificați dacă baza de date poate fi citită "
 "de utilizatorul potrivit."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Utilizator:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Parolă:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Ați uitat parola sau utilizatorul ?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dată/oră"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Utilizator"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Acțiune"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -645,65 +650,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Introduceți un nume de utilizator și o parolă."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Introduceți o parolă nouă pentru utilizatorul <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Parolă (din nou)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Introduceți parola din nou, pentru verificare."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Elimină"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Adăugati încă un/o %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Elimină"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Elimină?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Mulţumiri pentru timpul petrecut astăzi pe sit."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Reautentificare"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Schimbare parolă"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Schimbare reușită a parolei"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Parola a fost schimbată."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -711,48 +716,48 @@ msgstr ""
 "Din motive de securitate, introduceți parola veche, apoi de două ori parola "
 "nouă, pentru a putea verifica dacă ați scris-o corect. "
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Parolă veche"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Parolă nouă"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Schimbă-mi parola"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Resetare parolă"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Resetare completă a parolei"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "Parola dumneavoastră a fost stabilită. Acum puteți continua să vă "
 "autentificați."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Confirmare resetare parolă"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Introduceți parolă nouă"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -760,19 +765,19 @@ msgstr ""
 "Introduceți parola de două ori, pentru a putea verifica dacă ați scris-o "
 "corect."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Parolă nouă:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Confirmare parolă:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Resetare nereușită a parolei"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -780,27 +785,23 @@ msgstr ""
 "Link-ul de resetare a parolei a fost nevalid, probabil din cauză că acesta a "
 "fost deja utilizat. Solicitați o nouă resetare a parolei."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Parolă resetată cu succes"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Vi s-au trimis la adresa de e-mail specificată instrucțiunile pentru a vă "
-"seta parola. Ar trebui să le primiți în curând."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Ați primit acest e-mail deoarece ați solicitat resetarea parolei pentru "
-"contul dumneavoastră de utilizator de la %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -819,36 +820,34 @@ msgstr "Mulțumiri pentru utilizarea sitului nostru!"
 msgid "The %(site_name)s team"
 msgstr "Echipa %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Ați uitat parola? Introduceți adresa dvs. de e-mail mai jos și vă vom "
-"trimite la aceasta instrucțiunile de setare a unei parole noi."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Adresă email:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Resetează-mi parola"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Toate datele"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Nimic)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Selectează %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Selectează %s pentru schimbare"
diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo
index 188980bb38..535ef9e5f6 100644
Binary files a/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po
index 466a403656..67301c8b46 100644
--- a/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po
@@ -12,14 +12,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-10 14:58+0000\n"
 "Last-Translator: Ionel Cristian Mărieș <ionel.mc@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo
index bfa8d8bbef..ac8d904537 100644
Binary files a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po b/django/contrib/admin/locale/ru/LC_MESSAGES/django.po
index 58f41a09fe..d212b5c8c8 100644
--- a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ru/LC_MESSAGES/django.po
@@ -3,36 +3,36 @@
 # Translators:
 # Denis Darii <sinednx@gmail.com>, 2011.
 # Dimmus <dmitri.chudinov@gmail.com>, 2011.
-# Eugene MechanisM <contact@mechanism.name>, 2012.
+# Eugene MechanisM <contact@mechanism.name>, 2012-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Алексей Борискин <sun.void@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-15 09:46+0000\n"
-"Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-04 18:26+0000\n"
+"Last-Translator: Eugene MechanisM <contact@mechanism.name>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Успешно удалены %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Не удается удалить %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
@@ -41,164 +41,139 @@ msgstr "Вы уверены?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Удалить выбранные %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Все"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Да"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Нет"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Любая дата"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Сегодня"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Последние 7 дней"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Этот месяц"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Этот год"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Пожалуйста, введите корректное имя пользователя и пароль учётной записи "
-"администратора. Помните, что оба поля чувствительны к регистру."
+"Пожалуйста, введите корректные %(username)s и пароль для аккаунта. Оба поля "
+"могут быть чувствительны к регистру."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Пожалуйста, войдите снова, поскольку ваша сессия устарела."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Ваш адрес электронной почты не является вашим именем пользователя. "
-"Попробуйте '%s' взамен."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Действие:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "время действия"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "идентификатор объекта"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "представление объекта"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "тип действия"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "сообщение об изменении"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "запись в журнале"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "записи в журнале"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Добавлено \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Изменено \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Удалено \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Запись в журнале"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Нет"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Изменен %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "и"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Добавлен %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Изменены %(list)s для %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Удален %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Ни одно поле не изменено."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" был успешно добавлен."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Ниже вы можете снова его отредактировать."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Ниже вы можете добавить еще один %s."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" был успешно изменен."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -206,7 +181,41 @@ msgstr ""
 "%(name)s \"%(obj)s\" был успешно добавлен. Ниже вы можете снова его "
 "отредактировать."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" успешно добавлен. Ниже вы можете добавить еще %(name)s."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" был успешно добавлен."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" успешно изменен. Ниже вы можете редактировать снова."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" успешно изменен. Ниже вы можете добавить еще %(name)s."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" был успешно изменен."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -214,30 +223,30 @@ msgstr ""
 "Чтобы произвести действия над объектами, необходимо их выбрать. Объекты не "
 "были изменены."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Действие не выбрано."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Добавить %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s с первичным ключом %(key)r не существует."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Изменить %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Ошибка базы данных"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -245,7 +254,7 @@ msgstr[0] "%(count)s %(name)s был успешно изменен."
 msgstr[1] "%(count)s %(name)s были успешно изменены."
 msgstr[2] "%(count)s %(name)s были успешно изменены."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -253,52 +262,60 @@ msgstr[0] "Выбран %(total_count)s"
 msgstr[1] "Выбраны все %(total_count)s"
 msgstr[2] "Выбраны все %(total_count)s"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "Выбрано 0 объектов из %(cnt)s "
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" был успешно удален."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "История изменений: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Войти"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Администрирование сайта"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s администрирование"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Дата:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Время:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Поиск"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Добавить еще"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Сейчас:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Изменить:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Страница не найдена"
@@ -307,39 +324,39 @@ msgstr "Страница не найдена"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "К сожалению, запрашиваемая вами страница не найдена."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Начало"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Ошибка сервера"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Ошибка сервера (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Ошибка сервера <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "Произошла ошибка. О ней сообщено администраторам сайта по электронной почте, "
 "ошибка должна быть вскоре исправлена. Благодарим вас за терпение."
@@ -365,7 +382,7 @@ msgstr "Выбрать все %(module_name)s (%(total_count)s)"
 msgid "Clear selection"
 msgstr "Снять выделение"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -375,22 +392,22 @@ msgid "Welcome,"
 msgstr "Добро пожаловать,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Выйти"
 
@@ -402,36 +419,36 @@ msgstr "Административный сайт Django"
 msgid "Django administration"
 msgstr "Администрирование Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Добавить"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "История"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Смотреть на сайте"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Пожалуйста, исправьте ошибку ниже."
 msgstr[1] "Пожалуйста, исправьте ошибки ниже."
 msgstr[2] "Пожалуйста, исправьте ошибки ниже."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Добавить %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Фильтр"
 
@@ -448,12 +465,12 @@ msgstr "Приоритет сортировки: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Сортировать в другом направлении"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -464,7 +481,7 @@ msgstr ""
 "объектов, но ваша учетная запись не имеет прав для удаления следующих типов "
 "объектов:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -473,7 +490,7 @@ msgstr ""
 "Удаление %(object_name)s '%(escaped_object)s' потребует удаления следующих "
 "связанных защищенных объектов:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -482,16 +499,16 @@ msgstr ""
 "Вы уверены, что хотите удалить %(object_name)s \"%(escaped_object)s\"? Все "
 "следующие связанные объекты также будут удалены:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Да, я уверен"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Удалить несколько объектов"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -501,7 +518,7 @@ msgstr ""
 "Удаление выбранной %(objects_name)s приведет к удалению связанных объектов, "
 "но ваша учетная запись не имеет прав на удаление следующих типов объектов:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -510,7 +527,7 @@ msgstr ""
 "Удаление %(objects_name)s потребует удаления следующих связанных защищенных "
 "объектов:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -524,36 +541,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "%(filter_title)s"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Модели доступны в приложении %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Модели в приложении %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Изменить"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "У вас недостаточно прав для редактирования."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Последние действия"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Мои действия"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Недоступно"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Неизвестный тип"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -563,31 +580,27 @@ msgstr ""
 "таблицы были созданы, и что соответствующему пользователю разрешен к ним "
 "доступ."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Имя:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Пароль:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Забыли свой пароль или имя пользователя?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Дата и время"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Пользователь"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Действие"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -644,64 +657,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Введите имя пользователя и пароль."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Введите новый пароль для пользователя <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Пароль (еще раз)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Введите тот же пароль, что и выше, для подтверждения."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Удалить"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Добавить еще один %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Удалить"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Удалить?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Благодарим вас за время, проведенное на этом сайте."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Войти снова"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Изменение пароля"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Пароль успешно изменен"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Ваш пароль был изменен."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -709,46 +722,46 @@ msgstr ""
 "В целях безопасности, пожалуйста, введите свой старый пароль, затем введите "
 "новый пароль дважды, чтобы мы могли убедиться в правильности написания."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Новый пароль"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Изменить мой пароль"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Восстановление пароля"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Восстановление пароля завершено"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Ваш пароль был сохранен.  Теперь вы можете войти."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Подтверждение восстановления пароля"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Введите новый пароль:"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -756,19 +769,19 @@ msgstr ""
 "Пожалуйста, введите новый пароль дважды, чтобы мы могли убедиться в "
 "правильности написания."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Новый пароль:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Подтвердите пароль:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Ошибка восстановления пароля"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -776,23 +789,23 @@ msgstr ""
 "Неверная ссылка для восстановления пароля. Возможно, ей уже воспользовались. "
 "Пожалуйста, попробуйте восстановить пароль еще раз."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Пароль успешно восстановлен"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Мы отправили инструкцию по восстановлению пароля на адрес электронной почты, "
-"который вы указали. Вы должны ее вскоре получить."
+"Мы отправили инструкцию по восстановлению пароля на указанный вами адрес "
+"электронной почты. Вы должны её вскоре получить."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 "Вы получили это письмо, потому что вы (или кто-то другой) запросили "
@@ -816,36 +829,36 @@ msgstr "Спасибо, что используете наш сайт!"
 msgid "The %(site_name)s team"
 msgstr "Команда сайта %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "Забыли пароль? Введите свой адрес электронной почты ниже, и мы вышлем вам "
 "инструкцию, как установить новый пароль."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "Адрес электронной почты:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Восстановить мой пароль"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Все даты"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ничего)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Выберите %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Выберите %s для изменения"
diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo
index 7b8f31c74e..c44f2de59f 100644
Binary files a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po
index 540fcbb404..e698f2cbdb 100644
--- a/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po
@@ -13,14 +13,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo
index fe08c23109..0d61f6b02a 100644
Binary files a/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/django.po b/django/contrib/admin/locale/sk/LC_MESSAGES/django.po
index 8dd4f6edd8..bd2af9b5d5 100644
--- a/django/contrib/admin/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/sk/LC_MESSAGES/django.po
@@ -2,34 +2,35 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Marian Andre <marian@andre.sk>, 2011, 2012.
+# Juraj Bubniak <translations@jbub.eu>, 2012.
+# Marian Andre <marian@andre.sk>, 2011-2013.
 # Martin Kosír <martin@martinkosir.net>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 15:40+0000\n"
 "Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Úspešne zmazaných %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Nedá sa vymazať %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
@@ -38,164 +39,139 @@ msgstr "Ste si istý?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Zmazať označené %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Všetko"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Áno"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nie"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Ľubovoľný dátum"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Dnes"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Posledných 7 dní"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Tento mesiac"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Tento rok"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Zadajte prosím správne užívateľské meno a heslo pre účet zamestnanca. "
-"Všimnite si, že obe polia sú case-sensitive."
+"Zadajte prosím správne %(username)s a heslo pre účet personálu - \"staff "
+"account\". Obe polia môžu obsahovať veľké a malé písmená."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Vaše prihlásenie vypršalo. Prosím, prihláste sa znovu."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Vaša e-mailová adresa nie je vašim používateľským menom. Skúste namiesto "
-"toho použiť '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Akcia:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "čas akcie"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "identifikátor objektu"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "reprezentácia objektu"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "príznak akcie"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "zmeniť správu"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "položka záznamu"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "položky záznamu"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Pridané \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Zmenené \" %(object)s \" - %(changes)s "
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Odstránené \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objekt LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Žiadne"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Zmenené %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "a"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Pridaný %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Zmenený %(list)s pre %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Zmazaný %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Polia nezmenené."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Nižšie môžete znova robiť úpravy."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Nižšie môžete pridať ďalšie %s."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne zmenený."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -203,7 +179,43 @@ msgstr ""
 "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný. Ďalšie zmeny môžete urobiť "
 "nižšie."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" bol úspešne pridaný. Môžete pridať ďaľší %(name)s "
+"nižšie."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" bol úspešne zmenený. Môžete ho znovu upraviť nižšie."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" bol úspešne zmenený. Môžete pridať ďaľšie %(name)s "
+"nižšie."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne zmenený."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -211,30 +223,30 @@ msgstr ""
 "Položky musia byť vybrané, ak chcete na nich vykonať akcie. Neboli vybrané "
 "žiadne položky."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nebola vybraná žiadna akcia."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Pridať %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objekt %(name)s s primárnym kľúčom %(key)r neexistuje."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Zmeniť %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Chyba databázy"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -242,7 +254,7 @@ msgstr[0] "%(count)s %(name)s bola úspešne zmenená."
 msgstr[1] "%(count)s %(name)s boli úspešne zmenené."
 msgstr[2] "%(count)s %(name)s bolo úspešne zmenených."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -250,52 +262,60 @@ msgstr[0] "%(total_count)s vybraná"
 msgstr[1] "Všetky %(total_count)s vybrané"
 msgstr[2] "Všetkých %(total_count)s vybraných"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 z %(cnt)s vybraných"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Zmeniť históriu: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Prihlásenie"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Správa stránky"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s správa"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Dátum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Čas:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Vyhľadanie"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Pridať ďalší"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Aktuálne:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Zmeniť:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Stránka nenájdená"
@@ -304,42 +324,42 @@ msgstr "Stránka nenájdená"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ľutujeme, ale požadovanú stránku nie je možné nájsť."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Domov"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Chyba servera"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Chyba servera (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Chyba servera <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Vyskytla sa chyba. Bola oznámená správcovi stránky e-mailom a mala by byť "
-"čoskoro opravená. Ďakujeme za pochopenie."
+"Došlo k chybe. Chyba bola nahlásená správcovi webu prostredníctvom e-mailu a "
+"zanedlho by mala byť odstránená. Ďakujeme za vašu trpezlivosť."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -362,7 +382,7 @@ msgstr "Vybrať všetkých %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Zrušiť výber"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -372,22 +392,22 @@ msgid "Welcome,"
 msgstr "Vitajte,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentácia"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Odhlásiť"
 
@@ -399,36 +419,36 @@ msgstr "Správa Django stránky"
 msgid "Django administration"
 msgstr "Správa Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Pridať"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "História"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Pozrieť na stránke"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Prosím, opravte chybu uvedenú nižšie."
 msgstr[1] "Prosím, opravte chyby uvedené nižšie."
 msgstr[2] "Prosím, opravte chyby uvedené nižšie."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Pridať %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrovať"
 
@@ -445,12 +465,12 @@ msgstr "Triedenie priority: %(priority_number)s "
 msgid "Toggle sorting"
 msgstr "Prepnúť triedenie"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -461,7 +481,7 @@ msgstr ""
 "aj odstránenie súvisiacich objektov. Váš účet však nemá oprávnenie na "
 "odstránenie nasledujúcich typov objektov:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -470,7 +490,7 @@ msgstr ""
 "Vymazanie %(object_name)s '%(escaped_object)s' vyžaduje vymazanie "
 "nasledovných súvisiacich chránených objektov:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -479,16 +499,16 @@ msgstr ""
 "Ste si istý, že chcete odstrániť objekt %(object_name)s \"%(escaped_object)s"
 "\"? Všetky nasledujúce súvisiace objekty budú odstránené:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Áno, som si istý"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Zmazať viacero objektov"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -499,7 +519,7 @@ msgstr ""
 "objektov, ale váš účet nemá oprávnenie na vymazanie nasledujúcich typov "
 "objektov:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -508,7 +528,7 @@ msgstr ""
 "Vymazanie označených %(objects_name)s vyžaduje vymazanie nasledujúcich "
 "chránených súvisiacich objektov:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -522,36 +542,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Podľa %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modely dostupné v aplikácii %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modely v %(name)s aplikácii"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Zmeniť"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nemáte právo na vykonávanie zmien."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Posledné akcie"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Moje akcie"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nedostupné"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Neznámy obsah"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -561,31 +581,27 @@ msgstr ""
 "vytvorené potrebné databázové tabuľky a taktiež skontrolujte, či príslušný "
 "používateľ môže databázu čítať."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Meno používateľa:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Heslo:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Zabudli ste heslo alebo používateľské meno?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Dátum a čas"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Používateľ"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Akcia"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -642,64 +658,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Zadajte používateľské meno a heslo."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Zadajte nové heslo pre používateľa <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Heslo (znova)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Odstrániť"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Pridať ďalší %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Odstrániť"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Zmazať?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Ďakujeme za čas strávený na našich stránkach."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Znova sa prihlásiť"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Zmena hesla"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Zmena hesla úspešná"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Vaše heslo bolo zmenené."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -707,65 +723,65 @@ msgstr ""
 "Z bezpečnostných dôvodov zadajte staré heslo a potom nové heslo dvakrát, aby "
 "sme mohli overiť, že ste ho zadali správne."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Zmeniť moje heslo"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Obnovenie hesla"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Obnovenie hesla ukončené"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Vaše heslo bolo nastavené. Môžete pokračovať a prihlásiť sa."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Potvrdenie obnovenia hesla"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Zadajte nové heslo"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 "Zadajte nové heslo dvakrát, aby sme mohli overiť, že ste ho zadali správne."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nové heslo:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Potvrdenie hesla:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Obnova hesla sa nepodarila"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -773,27 +789,27 @@ msgstr ""
 "Odkaz na obnovenie hesla je neplatný, pretože už bol pravdepodobne raz "
 "použitý. Prosím, požiadajte znovu o obnovu hesla."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Obnovenie hesla úspešné"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Na uvedenú e-mailovú adresu sme vám poslali návod na obnovenie hesla. Mali "
-"by ste ho zakrátko dostať."
+"Na e-mailovú adresu, ktorú ste zadali, sme odoslali pokyny pre nastavenie "
+"hesla. Mali by ste ho dostať čoskoro."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Obdržali ste tento e-mail, pretože ste požiadali o obnovu hesla vášho účtu "
-"na %(site_name)s."
+"Tento e-mail ste dostali preto, lebo ste požiadali o obnovenie hesla pre "
+"užívateľský účet na %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -812,36 +828,36 @@ msgstr "Ďakujeme, že používate našu stránku!"
 msgid "The %(site_name)s team"
 msgstr "Tím %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Zabudli ste heslo? Zadajte svoju e-mail adresu a my Vám pošleme inštrukcie "
-"pre nastavenie nového."
+"Zabudli ste heslo? Zadajte svoju e-mailovú adresu a my vám pošleme "
+"inštrukcie pre nastavenie nového hesla."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "E-mailová adresa:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Obnova môjho hesla"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Všetky dátumy"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Žiadne)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Vybrať %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Vybrať \"%s\" na úpravu"
diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.mo
index 7f700a35b0..52f9bcf33a 100644
Binary files a/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.po
index 7799945f20..d20105ef6f 100644
--- a/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.po
@@ -1,7 +1,9 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Dimitris Glezos <glezos@transifex.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Juraj Bubniak <>, 2012.
 # Marian Andre <marian@andre.sk>, 2012.
 # Martin Kosír <martin@martinkosir.net>, 2011.
 msgid ""
@@ -9,15 +11,15 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"PO-Revision-Date: 2012-07-16 12:08+0000\n"
+"Last-Translator: Juraj Bubniak <translations@jbub.eu>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -30,11 +32,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Toto je zoznam dostupných %s. Pre výber je potrebné označiť ich v poli a "
+"následne kliknutím na šípku \"Vybrať\" presunúť."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Píšte do tohto poľa pre vyfiltrovanie dostupných %s."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -47,11 +51,11 @@ msgstr "Vybrať všetko"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Kliknite sem pre vybratie všetkých %s naraz."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Vybrať"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -68,6 +72,8 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Toto je zoznam dostupných %s. Pre vymazanie je potrebné označiť ich v poli a "
+"následne kliknutím na šípku \"Vymazať\" vymazať."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
@@ -76,7 +82,7 @@ msgstr "Odstrániť všetky"
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Kliknite sem pre vymazanie vybratých %s naraz."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo
index 408c6fc175..a83ede71d2 100644
Binary files a/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/django.po b/django/contrib/admin/locale/sl/LC_MESSAGES/django.po
index 1281b96737..f9c71f6f89 100644
--- a/django/contrib/admin/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/sl/LC_MESSAGES/django.po
@@ -1,37 +1,39 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Jure Cuhalev <gandalf@owca.info>, 2011.
+# Jure Cuhalev <gandalf@owca.info>, 2011-2012.
+#  <zejn@kiberpipa.org>, 2013.
 #   <zejn@kiberpipa.org>, 2012.
 # zejn <zejn@kiberpipa.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-15 18:10+0000\n"
 "Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Uspešno izbrisano %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Ni mogoče izbrisati %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Ste prepričani?"
 
@@ -40,169 +42,183 @@ msgstr "Ste prepričani?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Izbriši izbrano: %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Vse"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Da"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ne"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Neznano"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Kadarkoli"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Danes"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Zadnjih 7 dni"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Ta mesec"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Letos"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Prosimo vnesite pravilno uporabniško ime in geslo za priviligiranega "
-"uporabnika. Obe polji ločita med malimi in velikimi črkami."
+"Vnesite veljavno %(username)s  in geslo za račun osebja. Opomba: obe polji "
+"upoštevata velikost črk."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Vaša seja je pretekla; prosimo da se ponovno prijavite."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Vaš e-mail naslov ni vaše uporabniško ime. Poskusite uporabiti '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Dejanje:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "čas dejanja"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id objekta"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "predstavitev objekta"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "zastavica dejanja"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "spremeni sporočilo"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "dnevniški vnos"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "dnevniški vnosi"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Dodan \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Spremenjen \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Izbrisan \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Dnevniški vnos"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Brez vrednosti"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Spremenjen %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "in"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Dodal %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Spremenjeno %(list)s za %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Izbrisan %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nobeno polje ni bilo spremenjeno."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" je bil uspešno dodan."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Vsebino lahko znova uredite spodaj."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Spodaj lahko dodate še en %s."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" je bil uspešno spremenjen."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" je bil uspešno dodan. Ponovno ga lahko uredite spodaj."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" je bil uspešno dodan. Spodaj lahko dodate še kak "
+"%(name)s."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" je bil uspešno dodan."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" je bil uspešno posodobljen. Spodaj ga lahko urejate še "
+"dalje."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" je bil uspešno posodobljen. Spodaj lahko dodate še kak "
+"%(name)s."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" je bil uspešno spremenjen."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -210,30 +226,30 @@ msgstr ""
 "Izbrati morate vnose, nad katerimi želite izvesti operacijo. Noben vnos ni "
 "bil spremenjen."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Brez dejanja."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objekt %(name)s z glavnim ključem %(key)r ne obstaja."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Spremeni %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Napaka v podatkovni bazi"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -242,7 +258,7 @@ msgstr[1] "%(count)s %(name)s sta bila uspešno spremenjena."
 msgstr[2] "%(count)s %(name)s so bili uspešno spremenjeni."
 msgstr[3] "%(count)s %(name)s je bilo uspešno spremenjenih."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -251,52 +267,60 @@ msgstr[1] "%(total_count)s izbrana"
 msgstr[2] "%(total_count)s izbrani"
 msgstr[3] "%(total_count)s izbranih"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 od %(cnt)s izbranih"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" je bil uspešno izbrisan."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Zgodovina sprememb: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Prijavite se"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administracija strani"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administracija %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Ura:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Poizvedba"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Dodaj še enega"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Trenutno:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Spremembe:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Strani ni mogoče najti"
@@ -305,39 +329,39 @@ msgstr "Strani ni mogoče najti"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Opravičujemo se, a zahtevane strani ni mogoče najti."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Domov"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Napaka na strežniku"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Napaka na strežniku (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Napaka na strežniku <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "Prišlo je do nepričakovane napake. Napaka je bila javljena administratorjem "
 "spletne strani in naj bi jo v kratkem odpravili. Hvala za potrpljenje."
@@ -363,7 +387,7 @@ msgstr "Izberi vse %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Počisti izbiro"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -373,22 +397,22 @@ msgid "Welcome,"
 msgstr "Dobrodošli,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Odjava"
 
@@ -400,24 +424,24 @@ msgstr "Django administrativni vmesnik"
 msgid "Django administration"
 msgstr "Django administracija"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Zgodovina"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Poglej na strani"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Prosimo, odpravite sledečo napako."
@@ -425,12 +449,12 @@ msgstr[1] "Prosimo, odpravite sledeči napaki."
 msgstr[2] "Prosimo, odpravite sledeče napake."
 msgstr[3] "Prosimo, odpravite sledeče napake."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Dodaj %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -447,12 +471,12 @@ msgstr "Prioriteta razvrščanja: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Preklopi razvrščanje"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -462,7 +486,7 @@ msgstr ""
 "Izbris %(object_name)s '%(escaped_object)s' bi pomenil izbris povezanih "
 "objektov, vendar nimate dovoljenja za izbris naslednjih tipov objektov:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -471,7 +495,7 @@ msgstr ""
 "Brisanje %(object_name)s '%(escaped_object)s' bi zahtevalo brisanje "
 "naslednjih zaščitenih povezanih objektov:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -480,16 +504,16 @@ msgstr ""
 "Ste prepričani, da želite izbrisati %(object_name)s \"%(escaped_object)s\"? "
 "Vsi naslednji povezani elementi bodo izbrisani:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ja, prepričan sem"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Izbriši več objektov"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -500,7 +524,7 @@ msgstr ""
 "povezanih objektov, vendar vaš račun nima pravic za izbris naslednjih tipov "
 "objektov:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -509,7 +533,7 @@ msgstr ""
 "Brisanje izbranih %(objects_name)s zahteva brisanje naslednjih zaščitenih "
 "povezanih objektov:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -523,36 +547,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " Po %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeli na voljo v aplikaciji %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Model v %(name)s aplikaciji"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Spremeni"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nimate dovoljenja za urejanje."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Zadnja dejanja"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Moja dejanja"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Ni na voljo"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Neznana vsebina"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -562,31 +586,27 @@ msgstr ""
 "ustvarjene prave tabele v podatkovni bazi in da je dostop do branja baze "
 "omogočen pravemu uporabniku."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Uporabniško ime:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Geslo:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Ste pozabili geslo ali uporabniško ime?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datum/čas"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Uporabnik"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Dejanje"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -644,64 +664,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Vnesite uporabniško ime in geslo."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Vpišite novo geslo za uporabnika <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Geslo (ponovno)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Vpišite enako geslo kot zgoraj, da se izognete tipkarskim napakam."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Odstrani"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Dodaj še en %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Odstrani"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Izbrišem?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Hvala, ker ste si danes vzeli nekaj časa za to spletno stran."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Ponovna prijava"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Sprememba gesla"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Sprememba gesla je uspela"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Vaše geslo je bilo spremenjeno."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -709,64 +729,64 @@ msgstr ""
 "Vnesite vaše staro geslo (zaradi varnosti) in nato še dvakrat novo, da se "
 "izognete tipkarskim napakam."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Staro geslo"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Novo geslo"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Spremeni moje geslo"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Ponastavitev gesla"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Ponastavitev gesla zaključena"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Vaše geslo je bilo nastavljeno. Zdaj se lahko prijavite."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Potrdite ponastavitev gesla"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Vpišite novo geslo"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "Vnesite vaše novo geslo dvakrat, da se izognete tipkarskim napakam."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Novo geslo:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Potrditev gesla:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Ponastavitev gesla ni uspela"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -774,14 +794,14 @@ msgstr ""
 "Povezava za ponastavitev gesla ni bila veljavna, morda je bila že "
 "uporabljena. Prosimo zahtevajte novo ponastavitev gesla."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Ponastavitev gesla je uspela"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "Na e-poštni naslov, ki ste ga navedli, smo vam poslali navodila za "
@@ -790,7 +810,7 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 "To e-pošto ste prejeli, ker je ste zahtevali ponastavitev gesla za vaš "
@@ -813,36 +833,36 @@ msgstr "Hvala, ker uporabljate našo stran!"
 msgid "The %(site_name)s team"
 msgstr "Ekipa strani %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Ste pozabili geslo? Vnesite vaš e-mail naslov in poslali vam bomo navodila "
+"Ste pozabili geslo? Vnesite vaš e-poštni naslov in poslali vam bomo navodila "
 "za ponastavitev gesla."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Naslov e-pošte:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "E-poštni naslov:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Ponastavi moje geslo"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Vsi datumi"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(None)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Izberite %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Izberite %s, ki ga želite spremeniti"
diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo
index 2dbd14cb89..5bd5fecf07 100644
Binary files a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po
index 62794f6672..d5b00327fd 100644
--- a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po
@@ -9,16 +9,16 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"PO-Revision-Date: 2012-10-31 19:07+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -37,7 +37,7 @@ msgstr ""
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr "Vpisujte v to polje, da zožite izbor %s."
+msgstr "Z vpisom niza v to polje, zožite izbor %s."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -50,7 +50,7 @@ msgstr "Izberi vse"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr "Kliknite, da bi izbrali vse %s hkrati."
+msgstr "Kliknite za izbor vseh %s hkrati."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
@@ -81,24 +81,23 @@ msgstr "Odstrani vse"
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr "Kliknite, da bi odstranili vse %s hkrati."
+msgstr "Kliknite za odstranitev vseh %s hkrati."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
 msgid_plural "%(sel)s of %(cnt)s selected"
-msgstr[0] "%(sel)s od %(cnt)s izbran"
-msgstr[1] "%(sel)s od %(cnt)s izbrana"
-msgstr[2] "%(sel)s od %(cnt)s izbrani"
-msgstr[3] "%(sel)s od %(cnt)s izbranih"
+msgstr[0] "%(sel)s od %(cnt)s izbranih"
+msgstr[1] "%(sel)s od %(cnt)s izbran"
+msgstr[2] "%(sel)s od %(cnt)s izbrana"
+msgstr[3] "%(sel)s od %(cnt)s izbrani"
 
 #: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
 msgid ""
 "You have unsaved changes on individual editable fields. If you run an "
 "action, your unsaved changes will be lost."
 msgstr ""
-"Na posameznih poljih, ki imajo omogočeno urejanje, imate neshranjene "
-"spremembe. Če boste izvedli dejanje, bodo vaše neshranjene spremembe "
-"izgubljene."
+"Na nekaterih poljih, kjer je omogočeno urejanje, so neshranjene spremembe. V "
+"primeru nadaljevanja bodo neshranjene spremembe trajno izgubljene."
 
 #: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
 msgid ""
@@ -143,15 +142,15 @@ msgstr "Skrij"
 #: static/admin/js/admin/DateTimeShortcuts.js:49
 #: static/admin/js/admin/DateTimeShortcuts.js:85
 msgid "Now"
-msgstr "Sedaj"
+msgstr "Takoj"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:53
 msgid "Clock"
-msgstr "URA"
+msgstr "Ura"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:81
 msgid "Choose a time"
-msgstr "Izberite čas"
+msgstr "Izbor časa"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:86
 msgid "Midnight"
diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo
index 5f63c285cb..2de8e72c5d 100644
Binary files a/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/django.po b/django/contrib/admin/locale/sq/LC_MESSAGES/django.po
index 83e4194d7f..37c01ee2ce 100644
--- a/django/contrib/admin/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/sq/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "U fshinë me sukses %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "S'mund të fshijë %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Jeni i sigurt?"
 
@@ -36,168 +36,180 @@ msgstr "Jeni i sigurt?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Fshiji %(verbose_name_plural)s e përzgjdhur"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Krejt"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Po"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Jo"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "E panjohur"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Çfarëdo date"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Sot"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "7 ditët e shkuara"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Këtë muaj"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Këtë vit"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Ju lutem, hyni sërish, sepse sesioni juaj ka skaduar."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Adresa juaj e-mail nuk është emri juaj i përdoruesit. Provoni '%s' më mirë."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Veprim:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "kohë veprimi"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id objekti"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr ""
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "shenjë veprimi"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "mesazh ndryshimi"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "zë regjistrimi"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "zëra regjistrimi"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "U shtua \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "U ndryshua \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "U fshi \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Asnjë"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Ndryshoi %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr " dhe "
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "U shtua %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "U ndryshua %(list)s për %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "U fshi %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Nuk u ndryshuan fusha."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" u shtua me sukses."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Mund ta përpunoni sërish më poshtë."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Mund të shtoni një tjetër %s më poshtë."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" u ndryshua me sukses."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" u shtua me sukses. Mund ta përpunoni sërish më poshtë."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" u shtua me sukses. Mund të shtoni një tjetër %(name)s  "
+"më poshtë."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" u shtua me sukses."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" u shtua me sukses. Mund ta përpunoni sërish më poshtë."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" u ndryshua me sukses. Mund të shtoni një tjetër "
+"%(name)s më poshtë."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" u ndryshua me sukses."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -205,89 +217,97 @@ msgstr ""
 "Duhen përzgjedhur objekte që të kryhen veprime mbi ta. Nuk u ndryshua ndonjë "
 "objekt."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Pa përzgjedhje veprimi."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Shtoni %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objekti %(name)s me kyç parësor %(key)r nuk ekziston."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Ndrysho %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Gabimi baze të dhënash"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s u ndryshua me sukses."
 msgstr[1] "%(count)s %(name)s u ndryshuan me sukses."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s të përzgjedhur"
 msgstr[1] "Krejt %(total_count)s të përzgjedhurat"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 nga %(cnt)s të përzgjedhur"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" u fshi me sukses."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Ndryshoni historikun: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Hyni"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administrim site-i"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administrim i %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datë:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Kohë:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Kërkim"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Shtoni Një Tjetër"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Tani:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Ndryshim:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Nuk u gjet faqe"
@@ -296,41 +316,41 @@ msgstr "Nuk u gjet faqe"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Na ndjeni, por faqja e kërkuar nuk gjendet dot."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Hyrje"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Gabim shërbyesi"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Gabim shërbyesi (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Gabim Shërbyesi <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Pati një gabim. U është njoftuar përgjegjësve të site-it përmes e-mail-it "
+"Pati një gabim. Iu është njoftuar përgjegjësve të site-it përmes email-it "
 "dhe do të duhej të ndreqej shpejt. Faleminderit për durimin."
 
 #: templates/admin/actions.html:4
@@ -354,7 +374,7 @@ msgstr "Përzgjidhni krejt %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Pastroje përzgjedhjen"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -364,22 +384,22 @@ msgid "Welcome,"
 msgstr "Mirë se vini,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentim"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Ndryshoni fjalëkalimin"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Dilni"
 
@@ -391,57 +411,57 @@ msgstr "Përgjegjësi i site-it Django"
 msgid "Django administration"
 msgstr "Administrim i Django-s"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Shtoni"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historik"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Shiheni në site"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Ju lutem, ndreqni gabimin e mëposhtëm."
 msgstr[1] "Ju lutem, ndreqini gabimet e mëposhtme."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Shto %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtër"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "Hiqe prej renditjeje"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "Përparësi renditjesh: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "Këmbe renditjen"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Fshije"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -452,7 +472,7 @@ msgstr ""
 "objekteve të lidhur me të, por llogaria juaj nuk ka leje për fshirje të "
 "objekteve të llojeve të mëposhtëm:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -461,7 +481,7 @@ msgstr ""
 "Fshirja e %(object_name)s '%(escaped_object)s' do të kërkonte fshirjen e "
 "objekteve vijues, të mbrojtur, të lidhur me të:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -470,16 +490,16 @@ msgstr ""
 "Jeni i sigurt se doni të fshihet %(object_name)s \"%(escaped_object)s\"? "
 "Krejt objektet vijues të lidhur me të do të fshihen:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Po, jam i sigurt"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Fshini disa objekte njëherësh"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -490,7 +510,7 @@ msgstr ""
 "objekteve të lidhur me të, por llogaria juaj nuk ka leje të fshijë llojet "
 "vijuese të objekteve:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -499,7 +519,7 @@ msgstr ""
 "Fshirja e %(objects_name)s të përzgjedhur do të kërkonte fshirjen e "
 "objekteve vijues, të mbrojtur, të lidhur me të:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -513,36 +533,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Nga %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modele të mundshme te zbatimi %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modele te zbatimi %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Ndryshoje"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nuk keni leje për të përpunuar ndonjë gjë."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Veprime Së Fundi"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Veprimet e Mia"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Asnjë i passhëm"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Lëndë e panjohur"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -552,31 +572,27 @@ msgstr ""
 "që janë krijuar tabelat e duhura të bazës së të dhënave, dhe që baza e të "
 "dhënave është e lexueshme nga përdoruesi i duhur."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Emër përdoruesi:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Fjalëkalim:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Harruat fjalëkalimin ose emrin tuaj të përdoruesit?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datë/kohë"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Përdorues"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Veprim"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -632,65 +648,65 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Jepni emër përdoruesi dhe fjalëkalim."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 "Jepni një fjalëkalim të ri për përdoruesin <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Fjalëkalim"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Fjalëkalim (sërish)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Jepni, për verifikim, të njëjtin fjalëkalim si më sipër."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Hiqe"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Shtoni një tjetër %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Hiqe"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Të fshihet?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Faleminderit që shpenzoni pak kohë të çmuar me site-in Web sot."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Hyni sërish"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Ndryshim fjalëkalimi"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Ndryshim i sukseshëm fjalëkalimi"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Fjalëkalimi juaj u ndryshua."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -699,47 +715,47 @@ msgstr ""
 "jepni dy herë fjalëkalimin tuaj të ri, që kështu të mund të verifikojmë se e "
 "shtypët saktë."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Fjalëkalim i vjetër"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Fjalëkalim i ri"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Ndrysho fjalëkalimin tim"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Ricaktim fjalëkalimi"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Ricaktim fjalëkalimi i plotësuar"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "Fjakalimi juaj u caktua. Mund të vazhdoni më tej dhe të bëni hyrjen tani."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Ripohim ricaktimi fjalëkalimi"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Jepni fjalëkalim të ri"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -747,19 +763,19 @@ msgstr ""
 "Ju lutem, jepeni fjalëkalimin tuaj dy herë, që kështu të mund të verifikojmë "
 "që e shtypët saktë."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Fjalëkalim i ri:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Ripohoni fjalëkalimin:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Fjalëkalimi nuk u ricaktua me sukses"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -767,25 +783,27 @@ msgstr ""
 "Lidhja për ricaktimin e fjalëkalimit qe e pavlefshme, ndoshta ngaqë është "
 "përdorur tashmë një herë. Ju lutem, kërkoni një ricaktim të ri fjalëkalimi."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Ndryshim i sukseshëm fjalëkalimi"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Ju dërguam me e-mail udhëzimet për rregullimin e fjalëkalimit tuaj, te "
-"adresa e-mail që keni dhënë. Do të duhej t'ju vinte pas pak."
+"Ju dërguam me email udhëzimet për rregullimin e fjalëkalimit tuaj, te adresa "
+"e-mail që keni dhënë. Do të duhej t'ju vinte pas pak."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
+"Këtë email po e merrni ngaqë kërkuat ricaktim fjalëkalimi për llogarinë tuaj "
+"si përdorues te %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -804,36 +822,36 @@ msgstr "Faleminderit që përdorni site-in tonë!"
 msgid "The %(site_name)s team"
 msgstr "Ekipi i %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Harruat fjalëkalimin tuaj? Jepni më poshtë adresën tuaj e-mail, dhe do t'ju "
-"dërgojmë në të udhëzimet për të caktuar një të ri."
+"Harruat fjalëkalimin tuaj? Jepni më poshtë adresën tuaj email, dhe do t'ju "
+"dërgojmë udhëzimet për të caktuar një të ri."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Adresë e-mail:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Adresë email:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Ricakto fjalëkalimin tim"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Krejt datat"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
-msgstr ""
+msgstr "(Asnjë)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Përzgjidhni %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Përzgjidhni %s për ta ndryshuar"
diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo
index 22fb9cb77d..63f96cc105 100644
Binary files a/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po
index c4f9c0a606..384b3c9952 100644
--- a/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po
@@ -2,20 +2,21 @@
 #
 # Translators:
 # Besnik <besnik@programeshqip.org>, 2011.
+#   <besnik@programeshqip.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"PO-Revision-Date: 2012-12-02 11:31+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -28,15 +29,18 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"Kjo është lista e %s të passhme. Mund të zgjidhni disa duke i përzgjedhur te "
+"kutiza më poshtë e mandej duke klikuar mbi shigjetën \"Zgjidhe\" mes dy "
+"kutizave."
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Shkruani brenda kutizës që të filtrohet lista e %s të passhme."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
-msgstr "Filtër"
+msgstr "Filtro"
 
 #: static/admin/js/SelectFilter2.js:61
 msgid "Choose all"
@@ -45,11 +49,11 @@ msgstr "Zgjidheni krejt"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Klikoni që të zgjidhen krejt %s njëherësh."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Zgjidhni"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -66,15 +70,18 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Kjo është lista e %s të passhme. Mund të hiqni disa duke i përzgjedhur te "
+"kutiza më poshtë e mandej duke klikuar mbi shigjetën \"Hiqe\" mes dy "
+"kutizave."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "Hiqi krejt"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Klikoni që të hiqen krejt %s e zgjedhura njëherësh."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
@@ -106,11 +113,9 @@ msgid ""
 "fields. You're probably looking for the Go button rather than the Save "
 "button."
 msgstr ""
-"You have selected an action, and you haven't made any changes on individual "
-"fields. You're probably looking for the Go button rather than the Save "
-"button.Keni përzgjedhur një veprim, dhe nuk keni bërë ndonjë ndryshim te "
-"fusha individuale. Ndoshta po kërkonit për butonin Shko, në vend se të "
-"butonit Ruaje."
+".Keni përzgjedhur një veprim, dhe nuk keni bërë ndonjë ndryshim te fusha "
+"individuale. Ndoshta po kërkonit për butonin Shko, në vend se të butonit "
+"Ruaje."
 
 #: static/admin/js/calendar.js:26
 msgid ""
diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo
index f17e8ac4b9..9756cc2d86 100644
Binary files a/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/django.po b/django/contrib/admin/locale/sr/LC_MESSAGES/django.po
index 6e1cff07a9..a21df88b53 100644
--- a/django/contrib/admin/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/sr/LC_MESSAGES/django.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Успешно обрисано: %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Несуспело брисање %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Да ли сте сигурни?"
 
@@ -38,162 +38,137 @@ msgstr "Да ли сте сигурни?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Бриши означене објекте класе %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Сви"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Да"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Не"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Непознато"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Сви датуми"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Данас"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Последњих 7 дана"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Овај месец"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Ова година"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Унесите тачно корисничко име и лозинку за налог члана посаде. Обе вредности "
-"препознају велика и мала слова."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Пријавите се поново пошто је ваша сесија истекла."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Ваша имејл адреса није ваше корисничко име. Пробајте са „%s“."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Радња:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "време радње"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id објекта"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "опис објекта"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "ознака радње"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "опис измене"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "запис у логовима"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "записи у логовима"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Додат објекат класе „%(object)s“."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Промењен објекат класе „%(object)s“ - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Уклоњен објекат класе „%(object)s“."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Објекат уноса лога"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ништа"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Измењена поља %s"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "и"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Сачуван објекат „%(object)s“ класе %(name)s."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Измењена поља %(list)s објеката „%(object)s“ класе %(name)s ."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Обрисан објекат „%(object)s“ класе %(name)s."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Без измена у пољима."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Објекат „%(obj)s“ класе %(name)s сачуван је успешно."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Доле можете поново да уносите измене."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Доле можете да додате нови објекат класе %s"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Објекат „%(obj)s“ класе %(name)s измењен је успешно."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,7 +176,38 @@ msgstr ""
 "Објекат „%(obj)s“ класе %(name)s додат је успешно. Доле можете унети додатне "
 "измене."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Објекат „%(obj)s“ класе %(name)s сачуван је успешно."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Објекат „%(obj)s“ класе %(name)s измењен је успешно."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,30 +215,30 @@ msgstr ""
 "Потребно је изабрати објекте да би се извршила акција над њима. Ниједан "
 "објекат није промењен."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Није изабрана ниједна акција."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Додај објекат класе %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Објекат класе %(name)s са примарним кључем %(key)r не постоји."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Измени објекат класе %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Грешка у бази података"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -240,7 +246,7 @@ msgstr[0] "Успешно промењен %(count)s %(name)s."
 msgstr[1] "Успешно промењена %(count)s %(name)s."
 msgstr[2] "Успешно промењених %(count)s %(name)s."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -248,52 +254,60 @@ msgstr[0] "%(total_count)s изабран"
 msgstr[1] "Сва %(total_count)s изабрана"
 msgstr[2] "Свих %(total_count)s изабраних"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 од %(cnt)s изабрано"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Објекат „%(obj)s“ класе %(name)s успешно је обрисан."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Историјат измена: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Пријава"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Администрација система"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Администрација %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Датум:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Време:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Претражи"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Додај још један"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Страница није пронађена"
@@ -302,42 +316,40 @@ msgstr "Страница није пронађена"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Жао нам је, тражена страница није пронађена."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Почетна"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Грешка на серверу"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Грешка на серверу (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Грешка на серверу <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Дошло је до грешке. Администратор сајта је обавештен имејлом и грешка ће "
-"бити ускоро отклоњена. Хвала на стрпљењу."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -360,7 +372,7 @@ msgstr "Изабери све %(module_name)s од %(total_count)s укупно.
 msgid "Clear selection"
 msgstr "Поништи избор"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -370,22 +382,22 @@ msgid "Welcome,"
 msgstr "Добродошли,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Документација"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Промена лозинке"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Одјава"
 
@@ -397,36 +409,36 @@ msgstr "Django администрација сајта"
 msgid "Django administration"
 msgstr "Django администрација"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Додај"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Историјат"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Преглед на сајту"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Исправите наведену грешку."
 msgstr[1] "Исправите наведене грешке."
 msgstr[2] "Исправите наведене грешке."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Додај објекат класе %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Филтер"
 
@@ -443,12 +455,12 @@ msgstr "Приоритет сортирања: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Укључи/искључи сортирање"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -459,7 +471,7 @@ msgstr ""
 "који су повезани са овим објектом, али ваш налог нема дозволе за брисање "
 "следећих типова објеката:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -468,7 +480,7 @@ msgstr ""
 "Да би избрисали изабран %(object_name)s „%(escaped_object)s“ потребно је "
 "брисати и следеће заштићене повезане објекте:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -477,16 +489,16 @@ msgstr ""
 "Да сигурни да желите да обришете %(object_name)s „%(escaped_object)s“? "
 "Следећи објекти који су у вези са овим објектом ће такође бити обрисани:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Да, сигуран сам"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Брисање више објеката"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -497,7 +509,7 @@ msgstr ""
 "повезане објекте, међутим ваш налог нема дозволе за брисање следећих типова "
 "објеката:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -506,7 +518,7 @@ msgstr ""
 "Да би избрисали изабране %(objects_name)s потребно је брисати и следеће "
 "заштићене повезане објекте:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -520,36 +532,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Модели доступни у апликацији %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Измени"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Немате дозволе да уносите било какве измене."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Последње радње"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Моје радње"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Нема података"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Непознат садржај"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -558,31 +570,27 @@ msgstr ""
 "Нешто није уреду са вашом базом података. Проверите да ли постоје "
 "одговарајуће табеле и да ли одговарајући корисник има приступ бази."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Корисник:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Заборавили сте лозинку или корисничко име?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Датум/време"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Корисник"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Радња"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -639,64 +647,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Унесите корисничко име и лозинку"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Унесите нову лозинку за корисника <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Лозинка (поновите)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Ради провере тачности поново унесите лозинку коју сте унели горе."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Обриши"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Додај још један објекат класе %(verbose_name)s."
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Обриши"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Брисање?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Хвала што сте данас провели време на овом сајту."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Поновна пријава"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Измена лозинке"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Успешна измена лозинке"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Ваша лозинка је измењена."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -704,46 +712,46 @@ msgstr ""
 "Из безбедносних разлога прво унесите своју стару лозинку, а нову затим "
 "унесите два пута да бисмо могли да проверимо да ли сте је правилно унели."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Стара лозинка"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Измени моју лозинку"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Ресетовање лозинке"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Ресетовање лозинке успешно"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Ваша лозинка је постављена.  Можете се пријавити."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Потврда ресетовања лозинке"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Унесите нову лозинку"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -751,19 +759,19 @@ msgstr ""
 "Унесите нову лозинку два пута како бисмо могли да проверимо да ли сте је "
 "правилно унели."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Нова лозинка:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Потврда лозинке:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Ресетовање лозинке неуспешно"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -771,27 +779,23 @@ msgstr ""
 "Линк за ресетовање лозинке није важећи, вероватно зато што је већ "
 "искоришћен.  Поново затражите ресетовање лозинке."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Ресетовање лозинке успешно."
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Послали смо упутства за постављање нове лозинке на имејл адресу коју сте нам "
-"дали. Упутства ћете добити ускоро."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Овај имејл сте добији јер сте тражили промену лозинке за Ваш налог на сајту "
-"%(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -810,36 +814,34 @@ msgstr "Хвала што користите наш сајт!"
 msgid "The %(site_name)s team"
 msgstr "Екипа сајта %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Заборавили сте лозинку? Унесите своју имејл адресу доле и послаћемо вам "
-"упутства за постављање нове."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Имејл адреса:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Ресетуј моју лозинку"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Сви датуми"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ништа)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Одабери објекат класе %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Одабери објекат класе %s за измену"
diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo
index 2d7d64ffac..443accfdd3 100644
Binary files a/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po
index ec4e2c954f..864255706b 100644
--- a/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po
@@ -10,14 +10,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo
index 5c91607fa4..c3badae2c6 100644
Binary files a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po
index f8053c87e3..2df2200dfc 100644
--- a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Uspešno obrisano: %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Nesuspelo brisanje %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Da li ste sigurni?"
 
@@ -38,162 +38,137 @@ msgstr "Da li ste sigurni?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Briši označene objekte klase %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Svi"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Da"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ne"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Svi datumi"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Danas"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Poslednjih 7 dana"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Ovaj mesec"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Ova godina"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Unesite tačno korisničko ime i lozinku za nalog člana posade. Obe vrednosti "
-"prepoznaju velika i mala slova."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Prijavite se ponovo pošto je vaša sesija istekla."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Vaša imejl adresa nije vaše korisničko ime. Probajte sa „%s“."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Radnja:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "vreme radnje"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id objekta"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "opis objekta"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "oznaka radnje"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "opis izmene"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "zapis u logovima"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "zapisi u logovima"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Dodat objekat klase „%(object)s“."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Promenjen objekat klase „%(object)s“ - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Uklonjen objekat klase „%(object)s“."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Objekat unosa loga"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ništa"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Izmenjena polja %s"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "i"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Sačuvan objekat „%(object)s“ klase %(name)s."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Izmenjena polja %(list)s objekata „%(object)s“ klase %(name)s ."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Obrisan objekat „%(object)s“ klase %(name)s."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Bez izmena u poljima."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspešno."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Dole možete ponovo da unosite izmene."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Dole možete da dodate novi objekat klase %s"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Objekat „%(obj)s“ klase %(name)s izmenjen je uspešno."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -201,7 +176,38 @@ msgstr ""
 "Objekat „%(obj)s“ klase %(name)s dodat je uspešno. Dole možete uneti dodatne "
 "izmene."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspešno."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Objekat „%(obj)s“ klase %(name)s izmenjen je uspešno."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,30 +215,30 @@ msgstr ""
 "Potrebno je izabrati objekte da bi se izvršila akcija nad njima. Nijedan "
 "objekat nije promenjen."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Nije izabrana nijedna akcija."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Dodaj objekat klase %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Objekat klase %(name)s sa primarnim ključem %(key)r ne postoji."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Izmeni objekat klase %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Greška u bazi podataka"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -240,7 +246,7 @@ msgstr[0] "Uspešno promenjen %(count)s %(name)s."
 msgstr[1] "Uspešno promenjena %(count)s %(name)s."
 msgstr[2] "Uspešno promenjenih %(count)s %(name)s."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -248,52 +254,60 @@ msgstr[0] "%(total_count)s izabran"
 msgstr[1] "Sva %(total_count)s izabrana"
 msgstr[2] "Svih %(total_count)s izabranih"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 od %(cnt)s izabrano"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Objekat „%(obj)s“ klase %(name)s uspešno je obrisan."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Istorijat izmena: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Prijava"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Administracija sistema"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administracija %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Vreme:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Pretraži"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Dodaj još jedan"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Stranica nije pronađena"
@@ -302,42 +316,40 @@ msgstr "Stranica nije pronađena"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Žao nam je, tražena stranica nije pronađena."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Početna"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Greška na serveru"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Greška na serveru (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Greška na serveru <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Došlo je do greške. Administrator sajta je obavešten imejlom i greška će "
-"biti uskoro otklonjena. Hvala na strpljenju."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -360,7 +372,7 @@ msgstr "Izaberi sve %(module_name)s od %(total_count)s ukupno."
 msgid "Clear selection"
 msgstr "Poništi izbor"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -370,22 +382,22 @@ msgid "Welcome,"
 msgstr "Dobrodošli,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Promena lozinke"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Odjava"
 
@@ -397,36 +409,36 @@ msgstr "Django administracija sajta"
 msgid "Django administration"
 msgstr "Django administracija"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Istorijat"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Pregled na sajtu"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Ispravite navedenu grešku."
 msgstr[1] "Ispravite navedene greške."
 msgstr[2] "Ispravite navedene greške."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Dodaj objekat klase %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filter"
 
@@ -443,12 +455,12 @@ msgstr "Prioritet sortiranja: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Uključi/isključi sortiranje"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -459,7 +471,7 @@ msgstr ""
 "objekata koji su povezani sa ovim objektom, ali vaš nalog nema dozvole za "
 "brisanje sledećih tipova objekata:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -468,7 +480,7 @@ msgstr ""
 "Da bi izbrisali izabran %(object_name)s „%(escaped_object)s“ potrebno je "
 "brisati i sledeće zaštićene povezane objekte:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -477,16 +489,16 @@ msgstr ""
 "Da sigurni da želite da obrišete %(object_name)s „%(escaped_object)s“? "
 "Sledeći objekti koji su u vezi sa ovim objektom će takođe biti obrisani:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Da, siguran sam"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Brisanje više objekata"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -497,7 +509,7 @@ msgstr ""
 "povezane objekte, međutim vaš nalog nema dozvole za brisanje sledećih tipova "
 "objekata:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -506,7 +518,7 @@ msgstr ""
 "Da bi izbrisali izabrane %(objects_name)s potrebno je brisati i sledeće "
 "zaštićene povezane objekte:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -520,36 +532,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeli dostupni u aplikaciji %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Izmeni"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Nemate dozvole da unosite bilo kakve izmene."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Poslednje radnje"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Moje radnje"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Nema podataka"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Nepoznat sadržaj"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -558,31 +570,27 @@ msgstr ""
 "Nešto nije uredu sa vašom bazom podataka. Proverite da li postoje "
 "odgovarajuće tabele i da li odgovarajući korisnik ima pristup bazi."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Korisnik:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Zaboravili ste lozinku ili korisničko ime?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datum/vreme"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Korisnik"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Radnja"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -639,64 +647,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Unesite korisničko ime i lozinku"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Unesite novu lozinku za korisnika <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Lozinka (ponovite)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Radi provere tačnosti ponovo unesite lozinku koju ste uneli gore."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Obriši"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Dodaj još jedan objekat klase %(verbose_name)s."
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Obriši"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Brisanje?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Hvala što ste danas proveli vreme na ovom sajtu."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Ponovna prijava"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Izmena lozinke"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Uspešna izmena lozinke"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Vaša lozinka je izmenjena."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -704,46 +712,46 @@ msgstr ""
 "Iz bezbednosnih razloga prvo unesite svoju staru lozinku, a novu zatim "
 "unesite dva puta da bismo mogli da proverimo da li ste je pravilno uneli."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Stara lozinka"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Izmeni moju lozinku"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Resetovanje lozinke"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Resetovanje lozinke uspešno"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Vaša lozinka je postavljena.  Možete se prijaviti."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Potvrda resetovanja lozinke"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Unesite novu lozinku"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -751,19 +759,19 @@ msgstr ""
 "Unesite novu lozinku dva puta kako bismo mogli da proverimo da li ste je "
 "pravilno uneli."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nova lozinka:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Potvrda lozinke:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Resetovanje lozinke neuspešno"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -771,27 +779,23 @@ msgstr ""
 "Link za resetovanje lozinke nije važeći, verovatno zato što je već "
 "iskorišćen.  Ponovo zatražite resetovanje lozinke."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Resetovanje lozinke uspešno."
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Poslali smo uputstva za postavljanje nove lozinke na imejl adresu koju ste "
-"nam dali. Uputstva ćete dobiti uskoro."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Ovaj imejl ste dobiji jer ste tražili promenu lozinke za Vaš nalog na sajtu "
-"%(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -810,36 +814,34 @@ msgstr "Hvala što koristite naš sajt!"
 msgid "The %(site_name)s team"
 msgstr "Ekipa sajta %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Zaboravili ste lozinku? Unesite svoju imejl adresu dole i poslaćemo vam "
-"uputstva za postavljanje nove."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Imejl adresa:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Resetuj moju lozinku"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Svi datumi"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ništa)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Odaberi objekat klase %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Odaberi objekat klase %s za izmenu"
diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo
index 3c51e1f60e..4394d7f65c 100644
Binary files a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po
index 607dd2064c..226af8fe44 100644
--- a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po
@@ -10,14 +10,14 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo
index f7d85e71cc..042616856f 100644
Binary files a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po
index b27fe184c6..3f5dd79a6b 100644
--- a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po
@@ -1,36 +1,38 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Andreas Pelme <andreas@pelme.se>, 2011, 2012.
+# Alex Nordlund <deep.alexander@gmail.com>, 2012.
+# Andreas Pelme <andreas@pelme.se>, 2011-2013.
 # cvitan <tome@cvitan.com>, 2011.
+#   <cybjit@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # sorl <mikko@aino.se>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-06 08:53+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Tog bort %(count)d %(items)s"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Kan inte ta bort %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
@@ -39,258 +41,278 @@ msgstr "Är du säker?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Tag bort markerade %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Alla"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ja"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Nej"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Okänt"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Alla datum"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Idag"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Senaste 7 dagarna"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Denna månad"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Detta år"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Ange ett giltigt användarnamn och lösenord för ett personalkonto. Notera att "
-"båda fälten är skiftlägeskänsliga."
+"Ange %(username)s och lösenord för ett personalkonto. Notera att båda fälten "
+"är skiftlägeskänsliga."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Var god logga in igen, eftersom din session har förfallit."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Åtgärd:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "händelsetid"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "objektets id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "objektets beskrivning"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "händelseflagga"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "ändra meddelande"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "loggpost"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "loggposter"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Lade till \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Ändrade \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Tog bort \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry-Objekt"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Inget"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Ändrade %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "och"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Lade till %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Ändrade %(list)s på %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Tog bort %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Inga fält ändrade."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" lades till."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Du kan ändra det igen nedanför."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Du kan lägga till ytterligare %s nedanför."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" ändrades."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" lades till. Du kan redigera objektet igen nedanför."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" lades till. Du kan lägga till ytterligare %(name)s "
+"nedan."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" lades till."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr "%(name)s \"%(obj)s\" ändrades. Du kan ändra det igen nedan."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" ändrades."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 "Poster måste väljas för att genomföra åtgärder. Inga poster har ändrats."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Inga åtgärder valda."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Lägg till %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s-objekt med primärnyckel %(key)r finns inte."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Ändra %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Databasfel"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s ändrades."
 msgstr[1] "%(count)s %(name)s ändrades."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s vald"
 msgstr[1] "Alla %(total_count)s valda"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 av %(cnt)s valda"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" togs bort."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Ändringshistorik: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Logga in"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Webbplatsadministration"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Administration av %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Datum:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Tid:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Uppslag"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Lägg till ytterligare"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Nuvarande:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Ändra:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Sidan kunde inte hittas"
@@ -299,42 +321,43 @@ msgstr "Sidan kunde inte hittas"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Vi beklagar men den begärda sidan hittades inte."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Hem"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Serverfel"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Serverfel (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Serverfel <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ett fel har uppstått. Administratören har meddelats via e-post och felet bör "
-"vara åtgärdat inom kort. Tack för visat tålamod."
+"Det har uppstått ett fel. Det har rapporterats till "
+"webbplatsadministratörerna via e-post och bör bli rättat omgående. Tack för "
+"ditt tålamod."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -357,7 +380,7 @@ msgstr "Välj alla %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Rensa urval"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -367,22 +390,22 @@ msgid "Welcome,"
 msgstr "Välkommen,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Logga ut"
 
@@ -394,35 +417,35 @@ msgstr "Django webbplatsadministration"
 msgid "Django administration"
 msgstr "Django-administration"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Lägg till"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historik"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Visa på webbplats"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Rätta till felet nedan."
 msgstr[1] "Rätta till felen nedan."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Lägg till %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrera"
 
@@ -439,12 +462,12 @@ msgstr "Sorteringsprioritet: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Ändra sorteringsordning"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -455,7 +478,7 @@ msgstr ""
 "relaterade objekt togs bort, men ditt konto har inte rättigheter att ta bort "
 "följande objekttyper:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -464,7 +487,7 @@ msgstr ""
 "Borttagning av %(object_name)s '%(escaped_object)s'  kräver borttagning av "
 "följande skyddade relaterade objekt:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -473,16 +496,16 @@ msgstr ""
 "Är du säker på att du vill ta bort %(object_name)s \"%(escaped_object)s\"? "
 "Följande relaterade objekt kommer att tas bort:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ja, jag är säker"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Tog bort %(name)s \"%(object)s\"."
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -493,7 +516,7 @@ msgstr ""
 "relaterade objekt, men ditt konto har inte behörighet att ta bort följande "
 "typer av objekt:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -502,7 +525,7 @@ msgstr ""
 "Borttagning av valda %(objects_name)s skulle kräva borttagning av följande "
 "skyddade objekt:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -516,36 +539,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " På %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modeller tillgängliga i applikationen %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Modeller i applikationen %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Ändra"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Du har inte rättigheter att redigera något."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Senaste Händelser"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Mina händelser"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Inga tillgängliga"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Okänt innehåll"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -554,31 +577,27 @@ msgstr ""
 "Någonting är fel med din databasinstallation. Se till att de rätta "
 "databastabellerna har skapats och att databasen är läsbar av rätt användare."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Användarnamn:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Har du glömt lösenordet eller användarnamnet?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Datum tid"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Användare"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Händelse"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -634,64 +653,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Mata in användarnamn och lösenord."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Ange nytt lösenord för användare <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Lösenord (igen)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Fyll i samma lösenord som ovan för verifiering."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Tag bort"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Lägg till ytterligare %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Tag bort"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Radera?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Tack för att du spenderade lite kvalitetstid med webbplatsen idag."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Logga in igen"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Ändra lösenord"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Lösenordet ändrades"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Ditt lösenord har ändrats."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -699,46 +718,46 @@ msgstr ""
 "Var god fyll i ditt gamla lösenord för säkerhets skull och skriv sedan in "
 "ditt nya lösenord två gånger så vi kan kontrollera att du skrev det rätt."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Ändra mitt lösenord"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Nollställ lösenord"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Nollställning av lösenord klar"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Ditt lösenord har ändrats.  Du kan nu logga in."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Bekräftelse av lösenordsnollställning"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Fyll i lösenord"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -746,19 +765,19 @@ msgstr ""
 "Var god fyll i ditt nya lösenord två gånger så vi kan kontrollera att du "
 "skrev det rätt."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nytt lösenord:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Bekräfta lösenord:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Lösenordsnollställning misslyckad"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -766,14 +785,14 @@ msgstr ""
 "Länken för lösenordsnollställning var felaktig, möjligen därför att den "
 "redan använts.  Var god skicka en ny nollställningsförfrågan."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Lösenordsnollställning lyckades"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "Vi har skickat ett e-postmeddelande med instruktioner för att ändra ditt "
@@ -782,7 +801,7 @@ msgstr ""
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 "Du får detta e-postmeddelande för att du har begärt återställning av ditt "
@@ -805,36 +824,36 @@ msgstr "Tack för att du använder vår webbplats!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s-teamet"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "Glömt ditt lösenord? Fyll i din e-postadress nedan så skickar vi ett e-"
 "postmeddelande med instruktioner för hur du ställer in ett nytt."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-postadress:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "E-postaddress:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Nollställ mitt lösenord"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Alla datum"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Välj %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Välj %s att ändra"
diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo
index e30e056ac8..1d73271202 100644
Binary files a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po
index b8e0d87416..d2e76d3705 100644
--- a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po
@@ -12,13 +12,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/sw/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sw/LC_MESSAGES/django.mo
index 3ab5b11a9b..f65a78429a 100644
Binary files a/django/contrib/admin/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/sw/LC_MESSAGES/django.po b/django/contrib/admin/locale/sw/LC_MESSAGES/django.po
index 04f64bb13f..e65b9db1fe 100644
--- a/django/contrib/admin/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/sw/LC_MESSAGES/django.po
@@ -5,285 +5,304 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-16 19:56+0000\n"
-"Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
-msgstr "Umefuta %(items)s %(count)d kwa mafanikio."
+msgstr "Umefanikiwa kufuta %(items)s %(count)d."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Huwezi kufuta %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Una uhakika?"
 
 #: actions.py:83
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
-msgstr ""
+msgstr "Futa %(verbose_name_plural)s teule"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "yote"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Ndiyo"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Hapana"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Haijulikani"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Tarehe yoyote"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Leo"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Siku 7 zilizopita"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "mwezi huu"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Mwaka huu"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Tafadhali ingia tena, kwani kipindi chako cha matumizi kimekwisha."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Anuani yako ya baruapepe si jina lako la mtumiaji. Badala yake jaribu '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Tendo"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "muda wa tendo"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
-msgstr ""
+msgstr "Kitambulisho cha kitu"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
-msgstr ""
+msgstr "`repr` ya kitu"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
-msgstr ""
+msgstr "bendera ya tendo"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "badilisha ujumbe"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
-msgstr ""
+msgstr "ingizo kwenye kumbukumbu"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
-msgstr ""
+msgstr "maingizo kwenye kumbukumbu"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Kuongezwa kwa \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Kubadilishwa kwa \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Kufutwa kwa \"%(object)s\"."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "Kitu cha Ingizo la Kumbukumbu"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Hakuna"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
-msgstr ""
+msgstr "Mabadiliko ya %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "na"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
-msgstr ""
+msgstr "Ingizo la \"%(object)s\" %(name)s "
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
-msgstr ""
+msgstr "Mabadiliko %(list)s kwa \"%(object)s\\v %(name)s."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
-msgstr ""
+msgstr "Kumefutwa \"%(object)s\" %(name)s."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
-msgstr "Hakuna sehemu zilizobadilishwa"
+msgstr "Hakuna uga uliobadilishwa."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "unaweza kuhariri tena hapo chini."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Unaweza kuongeza tena %s hapo chini."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
+"Ingizo la \"%(obj)s\" %(name)s limefanyika kwa mafanikio. Unaweza "
+"kuhariritena hapo chini."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "Ingizo la \"%(obj)s\" %(name)s limefanyika kwa mafanikio."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Mabadiliko ya \"%(obj)s\" %(name)s yamefanikiwa."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
+"Nilazima kuchagua vitu ili kufanyia kitu fulani. Hakuna kitu "
+"kilichochaguliwa."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Hakuna tendo lililochaguliwa"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
-msgstr "ongeza %s"
+msgstr "Ongeza %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
-msgstr ""
+msgstr "Hakuna %(name)s yenye `primary key` %(key)r."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Badilisha %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
-msgstr ""
+msgstr "Hitilafu katika hifadhidata"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "mabadiliko ya %(name)s %(count)s yamefanikiwa."
+msgstr[1] "mabadiliko ya %(name)s %(count)s yamefanikiwa."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(total_count)s kuchaguliwa"
+msgstr[1] "%(total_count)s (kila kitu) kuchaguliwa"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
-msgstr ""
+msgstr "Vilivyo chaguliwa ni 0 kati ya %(cnt)s"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr "Ufutaji wa \"%(obj)s\" %(name)s umefanikiwa."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Badilisha historia: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Ingia"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Utawala wa tovuti"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "utawala %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Tarehe"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Saa"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
-msgstr ""
+msgstr "`Lookup`"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Ongeza"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Ukurasa haujapatikana"
@@ -292,39 +311,39 @@ msgstr "Ukurasa haujapatikana"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Samahani, ukurasa uliohitajika haukupatikana."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Sebule"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Hitilafu ya seva"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Hitilafu ya seva (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Hitilafu ya seva <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 
 #: templates/admin/actions.html:4
@@ -348,7 +367,7 @@ msgstr "Chagua kila %(module_name)s, (%(total_count)s). "
 msgid "Clear selection"
 msgstr "Safisha chaguo"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -358,22 +377,22 @@ msgid "Welcome,"
 msgstr "Karibu"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Nyaraka"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Badilisha nenosiri"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Toka"
 
@@ -385,35 +404,35 @@ msgstr "Utawala wa tovuti ya django"
 msgid "Django administration"
 msgstr "Utawala wa Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Ongeza"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Historia"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Ona kwenye tovuti"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Tafadhali sahihisha kosa lifuatalo"
 msgstr[1] "Tafadhali sahihisha makosa yafuatayo "
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Ongeza %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Chuja"
 
@@ -424,136 +443,149 @@ msgstr "Ondoa katika upangaji"
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "Kipaumbele katika mpangilio: %(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "Geuza mpangilio"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Futa"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
 "related objects, but your account doesn't have permission to delete the "
 "following types of objects:"
 msgstr ""
+"Kufutwa kwa '%(escaped_object)s' %(object_name)s  kutasababisha kufutwa kwa "
+"vitu vinavyohuisana, lakini akaunti yako haina ruhusa ya kufuta vitu vya "
+"aina zifuatazo:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
+"Kufuta '%(escaped_object)s' %(object_name)s  kutahitaji kufuta vitu "
+"vifuatavyo ambavyo vinavyohuisana na vimelindwa:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
+"Una uhakika kuwa unataka kufuta \"%(escaped_object)s\" %(object_name)s ? "
+"Vitu vyote vinavyohuisana kati ya vifuatavyo vitafutwa:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Ndiyo, Nina uhakika"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Futa viumbile mbalimbali"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
 "objects, but your account doesn't have permission to delete the following "
 "types of objects:"
 msgstr ""
+"Kufutwa kwa %(objects_name)s chaguliwa kutasababisha kufutwa kwa "
+"vituvinavyohusiana, lakini akaunti yako haina ruhusa ya kufuta vitu vya "
+"vifuatavyo:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
+"Kufutwa kwa %(objects_name)s kutahitaji kufutwa kwa vitu vifuatavyo vyenye "
+"uhusiano na vilivyolindwa:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
 "following objects and their related items will be deleted:"
 msgstr ""
+"Una uhakika kuwa unataka kufuta %(objects_name)s chaguliwa ? Vitu vyote kati "
+"ya vifuatavyo vinavyohusiana vitafutwa:"
 
 #: templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
 msgstr " Kwa %(filter_title)s"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
+msgid "Models in the %(name)s application"
 msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Badilisha"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Huna ruhusa ya kuhariri chochote"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Matendo ya hivi karibuni"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Matendo yangu"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Hakuna kilichopatikana"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Maudhui hayajulikani"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
+"Kuna tatizo limetokea katika usanikishaji wako wa hifadhidata. Hakikisha "
+"kuwa majedwali sahihi ya hifadhidata yameundwa, na hakikisha hifadhidata "
+"inaweza kusomwana mtumiaji sahihi."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Jina la mtumiaji"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "nenosiri"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Umesahau jina na nenosiri lako?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Tarehe/saa"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Mtumiaji"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Tendo"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -609,64 +641,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Ingiza jina la mtumiaji na nenosiri."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "ingiza nenosiri la mtumiaji <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Nenosiri"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Nenosiri (tena)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Ingiza nenosiri linalofanana na la juu, kwa uthibitisho."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Ondoa"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Ongeza %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Ondoa"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Futa?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Ahsante kwa kutumia muda wako katika Tovuti yetu leo. "
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "ingia tena"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Badilisha nenosiri"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Ubadilishaji wa nenosiri umefanikiwa"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Nenosiri lako lilibadilishwa"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -675,46 +707,46 @@ msgstr ""
 "nenosiri jipya mara mbili ili tuweze kuthibitisha kuwa umelichapisha kwa "
 "usahihi."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Nenosiri la zamani"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Nenosiri jipya"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Badilisha nenosiri langu"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Kuseti upya nenosiri"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Kuseti upya nenosiri kumekamilika"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Nenosiri lako limesetiwa. Unaweza kuendelea na kuingia sasa."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Uthibitisho wa kuseti upya nenosiri"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Ingiza nenosiri"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -722,19 +754,19 @@ msgstr ""
 "Tafadhali ingiza nenosiri mara mbili ili tuweze kuthibitisha kuwa "
 "umelichapisha kwa usahihi."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Nenosiri jipya"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Thibitisha nenosiri"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Kuseti upya nenosiri hakujafanikiwa"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -742,27 +774,23 @@ msgstr ""
 "Kiungo cha kuseti upya nenosiri ni batili, inawezekana ni kwa sababu kiungo "
 "hicho tayari kimetumika. tafadhali omba upya kuseti nenosiri"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Kuseti upya nenosiri kumefaninikiwa"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Tumekutumia maelekezo ya kuseti nenosiri lako kwenda anuani ya barua pepe "
-"uliyotupatia. Unatakiwa kuipata ndani ya muda mfupi. "
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Unapokea baruapepe hii kwa sababu umeomba kuseti upya nenosiri lako kwa "
-"ajili ya akaunti ya %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -781,36 +809,34 @@ msgstr "Ahsante kwa kutumia tovui yetu!"
 msgid "The %(site_name)s team"
 msgstr "timu ya %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Umesahau nenosiri lako? Ingiza anuani yako ya baruapepe hapo chini "
-"nasitutakutumia maelekezo ya kuseti nenosiri jipya."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Anuani ya Baruapepe"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Seti upya nenosiri langu"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Tarehe zote"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Hakuna)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Chagua %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Chaguo %s kwa mabadilisho"
diff --git a/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.mo
index 274e6a9c2d..4797dd9400 100644
Binary files a/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.po
index 02df4a608d..f640a86a6a 100644
--- a/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.po
@@ -6,20 +6,20 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
+"PO-Revision-Date: 2012-07-06 17:25+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
 msgid "Available %s"
-msgstr ""
+msgstr "vilivyomo: %s"
 
 #: static/admin/js/SelectFilter2.js:46
 #, c-format
@@ -31,7 +31,7 @@ msgstr ""
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "Chapisha katika kisanduku hiki ili kuchuja orodha ya %s iliyopo."
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -39,16 +39,16 @@ msgstr "Chuja"
 
 #: static/admin/js/SelectFilter2.js:61
 msgid "Choose all"
-msgstr ""
+msgstr "Chagua kila kitu"
 
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "Bofya kuchagua kila %s kwa pamoja."
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "Chagua"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -57,7 +57,7 @@ msgstr "Ondoa"
 #: static/admin/js/SelectFilter2.js:75
 #, c-format
 msgid "Chosen %s"
-msgstr ""
+msgstr "Chaguo la %s"
 
 #: static/admin/js/SelectFilter2.js:76
 #, c-format
@@ -65,15 +65,18 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"Hii ni orodha ya %s uliyochagua. Unaweza kuondoa baadhi vitu kwa kuvichagua "
+"katika kisanduku hapo chini kisha kubofya mshale wa \"Ondoa\" kati ya "
+"visanduku viwili."
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr "Onda yote"
+msgstr "Ondoa yote"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "Bofya ili kuondoa %s chaguliwa kwa pamoja."
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
@@ -86,6 +89,8 @@ msgid ""
 "You have unsaved changes on individual editable fields. If you run an "
 "action, your unsaved changes will be lost."
 msgstr ""
+"Umeacha kuhifadhi mabadiliko katika uga zinazoharirika. Ikiwa utafanya tendo "
+"lingine, mabadiliko ambayo hayajahifadhiwa yatapotea."
 
 #: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
 msgid ""
@@ -93,6 +98,8 @@ msgid ""
 "individual fields yet. Please click OK to save. You'll need to re-run the "
 "action."
 msgstr ""
+"Umechagua tendo, lakini bado hujahifadhi mabadiliko yako katika uga husika. "
+"Tafadali bofya Sawa ukitaka kuhifadhi. Utahitajika kufanya upya kitendo "
 
 #: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
 msgid ""
@@ -100,6 +107,8 @@ msgid ""
 "fields. You're probably looking for the Go button rather than the Save "
 "button."
 msgstr ""
+"Umechagua tendo, lakini bado hujahifadhi mabadiliko yako katika uga husika.  "
+"Inawezekana unatafuta kitufe cha Nenda badala ya Hifadhi"
 
 #: static/admin/js/calendar.js:26
 msgid ""
@@ -141,11 +150,11 @@ msgstr "Usiku wa manane"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:87
 msgid "6 a.m."
-msgstr ""
+msgstr "Saa 12 alfajiri"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:88
 msgid "Noon"
-msgstr "Saa 6 mchana"
+msgstr "Adhuhuri"
 
 #: static/admin/js/admin/DateTimeShortcuts.js:92
 #: static/admin/js/admin/DateTimeShortcuts.js:204
diff --git a/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo
index 7fc115b8b0..34dbd90af1 100644
Binary files a/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ta/LC_MESSAGES/django.po b/django/contrib/admin/locale/ta/LC_MESSAGES/django.po
index 9d97361b80..641ac0b0cf 100644
--- a/django/contrib/admin/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ta/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "உறுதியாக சொல்கிறீர்களா?"
 
@@ -36,255 +36,271 @@ msgstr "உறுதியாக சொல்கிறீர்களா?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr ""
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "அனைத்தும்"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "ஆம்"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "இல்லை"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "எந்த தேதியும்"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "இன்று"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "கடந்த 7 நாட்களில்"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "இந்த மாதம்"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "இந்த வருடம்"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr ""
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "உங்கள் மின் அஞ்சல் முகவரி உங்கள் பயனர் பெயராக இல்லை. '%s'யை முயற்சி செய்யவும்."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr ""
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "செயல் நேரம்"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "பொருள் அடையாளம்"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "பொருள் உருவகித்தம்"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "செயர்குறி"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "செய்தியை மாற்று"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "புகுபதிவு உள்ளீடு"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "புகுபதிவு உள்ளீடுகள்"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr ""
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s மாற்றபட்டுள்ளது."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "மற்றும்"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "எந்த புலமும் மாறவில்லை."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாகச் சேர்க்கப்பட்டது."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "நீங்கள் மறுபடியும் தொகுக்க முடியும். "
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "நீங்கள் மற்ற %s யை கீழே சேர்க்க முடியும்."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாக மாற்றப்பட்டது."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" வெற்றிகரமாக சேர்க்கப்பட்டுள்ளது. நீங்கள் கீழே தொகுக்க முடியும்."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாகச் சேர்க்கப்பட்டது."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாக மாற்றப்பட்டது."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr ""
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s யை சேர்க்க"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s யை மாற்று"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "தகவல்சேமிப்பு  பிழை"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாக அழிக்கப்பட்டுள்ளது."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "வரலாற்றை மாற்று: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "உள்ளே போ"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "இணைய மேலான்மை"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr ""
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "தேதி:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "நேரம்:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr ""
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr ""
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "பக்கத்தைக் காணவில்லை"
@@ -293,42 +309,40 @@ msgstr "பக்கத்தைக் காணவில்லை"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "நீங்கள் விரும்பிய பக்கத்தை காண இயலவில்லை,அதற்காக நாங்கள் வருந்துகிறோம்."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "வீடு"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "சேவகன் பிழை"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "சேவையகம் தவறு(500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "சேவையகம் பிழை<em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"தவறு ஏற்பட்டுள்ளதுவலைத்தள நிர்வாகிக்கு மின்னஞ்சல் அனுப்பப்பட்டுள்ளது. விரைவில் சரி "
-"செய்யப்படும். உங்களது பொறுமைக்கு நன்றி"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -351,7 +365,7 @@ msgstr ""
 msgid "Clear selection"
 msgstr ""
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -361,22 +375,22 @@ msgid "Welcome,"
 msgstr "நல்வரவு,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "ஆவனமாக்கம்"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "கடவுச்சொல்லை மாற்று"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "வெளியேறு"
 
@@ -388,35 +402,35 @@ msgstr "டிஜாங்ஙோ தள நிர்வாகி"
 msgid "Django administration"
 msgstr "டிஜாங்ஙோ நிர்வாகம் "
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "சேர்க்க"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "வரலாறு"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "தளத்தில் பார்"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "கீழே உள்ள தவறுயைத் திருத்துக"
 msgstr[1] "கீழே உள்ள தவறுகளைத் திருத்துக"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s சேர்க்க"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "வடிகட்டி"
 
@@ -433,12 +447,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -448,14 +462,14 @@ msgstr ""
 "நீக்கும் '%(escaped_object)s' ஆனது %(object_name)s தொடர்புடைய மற்றவற்றையும் நீக்கும். "
 "ஆனால்  அதை நீக்குவதற்குரிய  உரிமை  உங்களுக்கு  இல்லை"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -464,16 +478,16 @@ msgstr ""
 "நீங்கள் இந்த \"%(escaped_object)s\" %(object_name)s நீக்குவதில் நிச்சயமா?தொடர்புடைய "
 "மற்றவையும் நீக்கப்படும். "
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "ஆம், எனக்கு உறுதி"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -481,14 +495,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -500,36 +514,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "%(filter_title)s ஆல்"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "செயலியில் கிடைக்கக் கூடிய  %(name)s  மாதிரிகள்"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "மாற்றுக"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "உங்களுக்கு மாற்றுவதற்குரிய உரிமையில்லை"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "தற்போதைய செயல்கள்"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "எனது செயல்கள்"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "எதுவும் கிடைக்கவில்லை"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr ""
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -539,31 +553,27 @@ msgstr ""
 "தகவல்சேமிப்பு அட்டவணையைதயாரிக்கவும். மேலும் பயனர் படிக்கும்  படியான தகவல்சேமிப்பகத்தை "
 "உருவாக்கவும்."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "பயனர் பெயர்:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "கடவுச்சொல்:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "தேதி/நேரம் "
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "பயனர்"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "செயல்"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -618,64 +628,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "கடவுச்சொல்(மறுபடியும்)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "மேலே அதே கடவுச்சொல்லை உள்ளிடவும், சரிபார்ப்பதற்காக ."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "அழிக்க"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "அழிக்க"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr ""
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "வலைத்தளத்தில் உங்களது பொன்னான நேரத்தை செலவழித்தமைக்கு மிகுந்த நன்றி"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "மீண்டும் உள்ளே பதிவு செய்யவும்"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "கடவுச்சொல் மாற்று"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "வெற்றிகரமாக கடவுச்சொல் மாற்றபட்டது"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "உங்களுடைய கடவுச்சொல் மாற்றபட்டது"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -683,84 +693,84 @@ msgstr ""
 "பாதுகாப்பு காரணங்களுக்காக , முதலில் உங்களது பழைய கடவுச்சொல்லை உள்ளிடுக. அதன் பிறகு "
 "புதிய கடவுச்சொல்லை இரு முறை உள்ளிடுக.  இது உங்களது உள்ளிடுதலை சரிபார்க்க உதவும். "
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr ""
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr ""
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "கடவுச் சொல்லை மாற்றவும்"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "கடவுச்சொல்லை மாற்றியமை"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr ""
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "புதிய கடவுச்சொல்:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "கடவுச்சொலின் மாற்றத்தை உறுதிப்படுத்து:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "கடவுச்சொல் மாற்றியமைத்தல் வெற்றி"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -781,34 +791,34 @@ msgstr "எங்களது வலைத்தளத்தை பயன் ப
 msgid "The %(site_name)s team"
 msgstr "இந்த %(site_name)s -இன்  குழு"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "மின்அஞ்சல் முகவரி:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "எனது கடவுச்சொல்லை மாற்றியமை"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "அனைத்து தேதியும்"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s யை தேர்ந்தெடு"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s யை மாற்ற தேர்ந்தெடு"
diff --git a/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.mo
index d10cfd570e..bc474c7e82 100644
Binary files a/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.po
index cdb0045769..8079c28b39 100644
--- a/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.po
@@ -9,13 +9,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/te/LC_MESSAGES/django.mo b/django/contrib/admin/locale/te/LC_MESSAGES/django.mo
index 440d2f9b1a..49d0322aac 100644
Binary files a/django/contrib/admin/locale/te/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/te/LC_MESSAGES/django.po b/django/contrib/admin/locale/te/LC_MESSAGES/django.po
index dfe98cf62e..91e313c367 100644
--- a/django/contrib/admin/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/te/LC_MESSAGES/django.po
@@ -1,36 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # bhaskar teja yerneni <prudhviy@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Veeven  <veeven@gmail.com>, 2011.
-# ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011.
+# ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>, 2011,2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-03-01 20:10+0000\n"
 "Last-Translator: ప్రవీణ్ ఇళ్ళ <mail2ipn@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s జయప్రదముగా తీసేవేయబడినది."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
-msgstr ""
+msgstr "%(name)s తొలగించుట వీలుకాదు"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "మీరు కచ్చితంగా ఉన్నారా?"
 
@@ -39,166 +40,174 @@ msgstr "మీరు కచ్చితంగా ఉన్నారా?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "ఎంచుకోన్న %(verbose_name_plural)s తీసివేయుము "
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "అన్నీ"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "అవును"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "కాదు"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "తెలియనది"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "ఏ రోజైన"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "ఈ రోజు"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "గత  7 రోజుల గా"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "ఈ నెల"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "ఈ  సంవత్సరం"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "దయచేసి మళ్ళీ  లాగ్ ఇన్ అవ్వండి ఎందుకంటే మీ భాగము  ముగిసింది ."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "మీ ఇటపా మీ వినియొగదారి నామము కాదు . '%s' ఇచ్చి చూడండి "
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "చర్య:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "పని సమయము "
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "వస్తువు"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "వస్తువు"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "పని ఫ్లాగ్"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "సందేశము ని మార్చంది"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "లాగ్ ఎంట్రీ"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "లాగ్ ఎంట్రీలు"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "వొకటీ లేదు"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr " %s మార్చబడిండి"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "మరియు"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" జతచేయబడినది."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" కొరకు %(list)s మార్చబడినది."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" తొలగిబడినది"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "క్షేత్రములు  ఏమి మార్చబడలేదు"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\"జయప్రదంగా కలపబడ్డడి"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "మీరు మళ్ళీ దీనినీ  క్రింద మార్చవచ్చు"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "మీరు ఇంకొక %s ని  క్రింద జత చేయొచ్చు"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" జయప్రదంగా మార్చబడిండి"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" జయప్రదంగా కలపబడ్డడి. మీరు మళ్ళీ దీనినీ  క్రింద మార్చవచ్చు"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\"జయప్రదంగా కలపబడ్డడి"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" జయప్రదంగా మార్చబడిండి"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -206,89 +215,97 @@ msgstr ""
 "అంశములపయి తదుపరి చర్య తీసుకోనటకు వాటిని ఎంపిక చేసుకోవలెను. ప్రస్తుతం ఎటువంటి అంశములు "
 "మార్చబడలేదు."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "మీరు ఎటువంటి చర్య తీసుకొనలేదు "
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%sని జత చేయండి "
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(key)r ప్రధాన కీ గా వున్న  %(name)s అంశం ఏమి లేదు."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%sని మార్చుము"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "దత్తాంశస్థానము పొరబాటు "
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s జయప్రదముగా మార్చబడినవి."
 msgstr[1] "%(count)s %(name)s జయప్రదముగా మార్చబడినవి."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s ఎంపికయినది."
 msgstr[1] "అన్ని %(total_count)s ఎంపికయినవి."
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 of %(cnt)s ఎంపికయినవి."
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" జయప్రదంగా తీసివేయబడ్డడి"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "చరిత్రం మార్చు: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "ప్రవేశించండి"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "సైట్ నిర్వాహన"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s నిర్వాహన"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "తారీఖు:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "సమయం:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "అంశ శోధన."
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "మరివొక కలుపు"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "పుట  దొరకలేదు"
@@ -297,44 +314,44 @@ msgstr "పుట  దొరకలేదు"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "క్షమించండి మీరు కోరిన పుట దొరకలేడు"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "నివాసము"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "సర్వర్ పొరబాటు"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "సర్వర్ పొరబాటు (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "సర్వర్ పొరబాటు <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr "పొరబాటు  జరిగింది . దానిని  నిర్వాహనాధికారులు కి ఈ మెయిల్  చేయబడ్డడి,మీ ఓపిక కి ధన్యవాదములు"
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
-msgstr ""
+msgstr "ఎంచుకున్న చర్యను నడుపు"
 
 #: templates/admin/actions.html:4
 msgid "Go"
@@ -351,9 +368,9 @@ msgstr ""
 
 #: templates/admin/actions.html:13
 msgid "Clear selection"
-msgstr ""
+msgstr "ఎంపికను తుడిచివేయి"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -363,22 +380,22 @@ msgid "Welcome,"
 msgstr "సుస్వాగతం"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "పత్రికీకరణ"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "పాస్ వర్డ్ మార్చుకోండి"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "లాగ్ ఔట్"
 
@@ -390,35 +407,35 @@ msgstr "డ్జాంగొ యొక్క నిర్వాహనదార
 msgid "Django administration"
 msgstr "డ్జాంగొ నిర్వాహన"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "చేర్చు"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "చరిత్ర"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "సైట్ లో చూడండి"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "క్రింద ఉన్న తప్పు  సరిదిద్దుకోండి"
 msgstr[1] "క్రింద ఉన్న తప్పులు  సరిదిద్దుకోండి"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s జత చేయు"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "వడపోత"
 
@@ -435,12 +452,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -448,30 +465,30 @@ msgid ""
 "following types of objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "అవును "
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -479,14 +496,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -498,67 +515,63 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr ""
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "మొడల్ లు %(name)s లో  దొరికే అప్ప్లికేషన్"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "మార్చు"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "మీకు ఏది మార్చటానికి అధికారము లేదు"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "ఇటీవలి చర్యలు"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "నా చర్యలు"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "ఏమి  దొరకలేదు"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "తెలియని విషయం"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "వాడుకరిపేరు:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "సంకేతపదం:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "మీ సంకేతపదం లేదా వాడుకరిపేరును మర్చిపోయారా?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "తేదీ/సమయం"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "వాడుకరి"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "చర్య"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -610,64 +623,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "ఒక వాడుకరిపేరు మరియు సంకేతపదాన్ని ప్రవేశపెట్టండి."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "సంకేతపదం (మళ్ళీ)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "పైన ఇచ్చిన సంకేతపదాన్నే మళ్ళీ ఇవ్వండి, సరిచూత కోసం."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "తొలగించు"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "తొలగించు"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "తొలగించాలా?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "మళ్ళీ ప్రవేశించండి"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "అనుమతి పదం మార్పు"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "అనుమతి పదం  మార్పు జయప్రదమైండి "
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "మీ    అనుమతి పదం మార్చబడిండి"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -675,46 +688,46 @@ msgstr ""
 "దయచేసి  రక్షన కోసము, మీ పాత  అనుమతి పదం ఇవ్వండి  ,  కొత్త అనుమతి పదం రెండు సార్లు ఇవ్వండి , "
 "ఎం దుకంటే మీరు తప్పు ఇస్తే  సరిచేయటానికి "
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "పాత  సంకేతపదం"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "నా సంకేతపదాన్ని మార్చు"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "అనుమతి పదం తిరిగి అమర్చు"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "అనుమతి పదం తిరిగి మార్చు సంపూర్ణమైనది"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "మీ అనుమతి పదం మర్చుబడినది. మీరు ఇప్పుదు లాగ్ ఇన్ అవ్వచ్చు."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "అనుమతి పదం తిరిగి మార్చు ఖాయం చెయండి"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "కొత్త అనుమతి పదం ప్రవేశపెటండి"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -722,39 +735,39 @@ msgstr ""
 "దయచేసి  రక్షన కోసము, మీ పాత  అనుమతి పదం ఇవ్వండి  ,  కొత్త  అనుమతి పదం  రెండు సార్లు ఇవ్వండి , "
 "ఎం దుకంటే మీరు తప్పు ఇస్తే  సరిచేయటానికి "
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "కొత్త సంకేతపదం:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "సంకేతపదాన్ని నిర్ధారించండి:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "సంకేతపదపు మార్పు విఫలమైంది"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "సంకేతపదపు మార్పు విజయవంతం"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
@@ -775,34 +788,34 @@ msgstr "మా సైటుని ఉపయోగించుకున్నం
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s జట్టు"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "ఈమెయిలు చిరునామా:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "అనుమతిపదం తిరిగి అమర్చు"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "అన్నీ  తేదీలు"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s ని ఎన్నుకోండి"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "%s ని మార్చటానికి  ఎన్నుకోండి"
diff --git a/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.mo
index 71e1d4ed98..0b7326efb8 100644
Binary files a/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po
index 2c129a2324..c30619ca87 100644
--- a/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/th/LC_MESSAGES/django.mo b/django/contrib/admin/locale/th/LC_MESSAGES/django.mo
index 81fd83b7e7..7a63e8fb42 100644
Binary files a/django/contrib/admin/locale/th/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/th/LC_MESSAGES/django.po b/django/contrib/admin/locale/th/LC_MESSAGES/django.po
index cfa7f21c2e..f534a34cf2 100644
--- a/django/contrib/admin/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/th/LC_MESSAGES/django.po
@@ -1,35 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Kowit Charoenratchatabhan <kowito@gmail.com>, 2011, 2012.
+# Kowit Charoenratchatabhan <kowito@gmail.com>, 2011-2013.
+# Piti Ongmongkolkul <piti118@gmail.com>, 2012.
 # Suteepat Damrongyingsupab <monkeycrew_topza@hotmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-09 03:16+0000\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-03-04 22:30+0000\n"
+"Last-Translator: Kowit Charoenratchatabhan <kowit.s.c@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s ถูกลบเรียบร้อยแล้ว"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "ไม่สามารถลบ %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "แน่ใจหรือ"
 
@@ -38,166 +40,174 @@ msgstr "แน่ใจหรือ"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "ลบ %(verbose_name_plural)s ที่เลือก"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "ทั้งหมด"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "ใช่"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "ไม่ใช่"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "ไม่รู้"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "วันไหนก็ได้"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "วันนี้"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "สัปดาห์ที่แล้ว"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "เดือนนี้"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "ปีนี้"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
-msgstr "โปรดกรอกชื่อผู้ใช้ และรหัสผ่าน ของบัญชี staff ให้ถูกต้อง และอักษรตัวเล็ก-ใหญ่มีผลต่างกัน"
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr "กรุณาใส่  %(username)s และรหัสผ่านให้ถูกต้อง มีการแยกแยะตัวพิมพ์ใหญ่-เล็ก"
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "กรุณาลงชื่อเข้าใช้อีกครั้ง, เนื่องจากคุณไม่ได้ใช้งานนานเกินไป"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "ที่อยู่อีเมลไม่ใช่ชื่อผู้ใช้ของคุณ ลองใช้ '%s' แทน"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "คำสั่ง :"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "เวลาลงมือ"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "อ็อบเจ็กต์ไอดี"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "object repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "action flag"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "เปลี่ยนข้อความ"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "log entry"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "log entries"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" ถูกเพิ่ม"
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\" ถูกเปลี่ยน - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\" ถูกลบ"
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "อ็อบเจ็กต์ LogEntry"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "ไม่มี"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s เปลี่ยนแล้ว"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "และ"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "เพิ่ม %(name)s \"%(object)s\" แล้ว"
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "เปลี่ยน %(list)s สำหรับ %(name)s \"%(object)s\" แล้ว"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "ลบ %(name)s \"%(object)s\" แล้ว"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "ไม่มีฟิลด์ใดถูกเปลี่ยน"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "สามารถแก้ไขเพิ่มเติมได้ที่ด้านล่าง"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "คุณสามารถเพิ่ม %s ได้อีกที่ด้านล่าง"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว แก้ไขได้อีกที่ด้านล่าง"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว เพิ่ม  %(name)s ได้อีกที่ด้านล่าง"
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว แก้ไขได้อีกที่ด้านล่าง"
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว เพิ่ม %(name)s ได้อีกที่ด้านล่าง"
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -205,87 +215,95 @@ msgstr ""
 "ไม่มีรายการใดถูกเปลี่ยน\n"
 "รายการจะต้องถูกเลือกก่อนเพื่อที่จะทำตามคำสั่งได้"
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "ไม่มีคำสั่งที่ถูกเลือก"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "เพิ่ม %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "Primary key %(key)r ของอ็อบเจ็กต์ %(name)s ไม่มีอยู่"
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "เปลี่ยน %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "เกิดความผิดพลาดที่ฐานข้อมูล"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(name)s จำนวน %(count)s  อันได้ถูกเปลี่ยนแปลงเรียบร้อยแล้ว."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s ได้ถูกเลือก"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "เลือก 0 จาก %(cnt)s"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "ลบ %(name)s \"%(obj)s\" เรียบร้อยแล้ว"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "เปลี่ยนแปลงประวัติ: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "เข้าสู่ระบบ"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "การจัดการไซต์"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s การจัดการ"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "วันที่ :"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "เวลา :"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "ดูที่"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "เพิ่มอีก"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "ปัจจุบัน:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "เปลี่ยนเป็น:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "ไม่พบหน้านี้"
@@ -294,42 +312,42 @@ msgstr "ไม่พบหน้านี้"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "เสียใจด้วย ไม่พบหน้าที่ต้องการ"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "หน้าหลัก"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "เซิร์ฟเวอร์ขัดข้อง"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "เซิร์ฟเวอร์ขัดข้อง (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "เซิร์ฟเวอร์ขัดข้อง <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
 "เกิดเหตุขัดข้องขี้น ทางเราได้รายงานไปยังผู้ดูแลระบบแล้ว และจะดำเนินการแก้ไขอย่างเร่งด่วน "
-"ขอบคุณที่รายงานความผิดพลาด"
+"ขอบคุณสำหรับการรายงานความผิดพลาด"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -352,7 +370,7 @@ msgstr "เลือกทั้งหมด %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "เคลียร์ตัวเลือก"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -362,22 +380,22 @@ msgid "Welcome,"
 msgstr "ยินดีต้อนรับ,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "เอกสารประกอบ"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
@@ -389,34 +407,34 @@ msgstr "ผู้ดูแลระบบ Django"
 msgid "Django administration"
 msgstr "การจัดการ Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "เพิ่ม"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "ประวัติ"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "ดูที่หน้าเว็บ"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "โปรดแก้ไขข้อผิดพลาดด้านล่าง"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "เพิ่ม %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "ตัวกรอง"
 
@@ -433,12 +451,12 @@ msgstr "ลำดับการ sorting: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "เปิด/ปิด sorting"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -448,7 +466,7 @@ msgstr ""
 "กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ "
 "แต่บัญชีของคุณไม่สามารถทำการลบข้อมูลชนิดนี้ได้"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -456,7 +474,7 @@ msgid ""
 msgstr ""
 "การลบ %(object_name)s '%(escaped_object)s' จำเป็นจะต้องลบอ็อบเจ็กต์ที่เกี่ยวข้องต่อไปนี้:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -465,16 +483,16 @@ msgstr ""
 "คุณแน่ใจหรือที่จะลบ %(object_name)s \"%(escaped_object)s\"?"
 "ข้อมูลที่เกี่ยวข้องทั้งหมดจะถูกลบไปด้วย:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "ใช่, ฉันแน่ใจ"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "ลบหลายอ็อบเจ็กต์"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -484,14 +502,14 @@ msgstr ""
 "การลบ %(objects_name)s ที่เลือก จะทำให้อ็อบเจ็กต์ที่เกี่ยวข้องถูกลบไปด้วย "
 "แต่บัญชีของคุณไม่มีสิทธิ์ที่จะลบอ็อบเจ็กต์ชนิดนี้"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr "การลบ %(objects_name)s ที่ถูกเลือก จำเป็นจะต้องลบอ็อบเจ็กต์ที่เกี่ยวข้องต่อไปนี้:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -505,36 +523,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " โดย %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "โมเดลใช้ได้ในแอป %(name)s ."
+msgid "Models in the %(name)s application"
+msgstr "โมเดลในแอป %(name)s"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "เปลี่ยนแปลง"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "คุณไม่สิทธิ์ในการเปลี่ยนแปลงข้อมูลใดๆ ได้"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "คำสั่งที่ผ่านมา"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "คำสั่งของฉัน"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "ไม่ว่าง"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "ไม่ทราบเนื้อหา"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -543,31 +561,27 @@ msgstr ""
 "มีสิ่งผิดปกติเกิดขึ้นกับการติดตั้งฐานข้อมูล กรุณาตรวจสอบอีกครั้งว่าฐานข้อมูลได้ถูกติดตั้งแล้ว "
 "หรือฐานข้อมูลสามารถอ่านและเขียนได้โคยผู้ใช้นี้"
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "ชื่อผู้ใช้:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "ลืมรหัสผ่านหรือชื่อผู้ใช้ของคุณหรือไม่"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "วันที่/เวลา"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "ผู้ใช้"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "คำสั่ง"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -618,64 +632,64 @@ msgstr "ขั้นตอนแรก ใส่ชื่อผู้ใช้
 msgid "Enter a username and password."
 msgstr "กรุณาใส่ชื่อผู้ใช้และรหัสผ่าน"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "ใส่รหัสผ่านใหม่สำหรับผู้ใช้ <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "รหัสผ่าน (อีกครั้ง)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "ถอดออก"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "เพิ่ม %(verbose_name)s อีก"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "ถอดออก"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "ลบ?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "ขอบคุณที่สละเวลาอันมีค่าให้กับเว็บไซต์ของเราในวันนี้"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "เข้าสู่ระบบอีกครั้ง"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "เปลี่ยนรหัสผ่านสำเร็จ"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "รหัสผ่านของคุณถูกเปลี่ยนไปแล้ว"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -683,85 +697,85 @@ msgstr ""
 "กรุณาใส่รหัสผ่านเดิม ด้วยเหตุผลทางด้านการรักษาความปลอดภัย "
 "หลังจากนั้นให้ใส่รหัสผ่านใหม่อีกสองครั้ง เพื่อตรวจสอบว่าคุณได้พิมพ์รหัสอย่างถูกต้อง"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "รหัสผ่านเก่า"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "รหัสผ่านใหม่"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "เปลี่ยนรหัสผ่านของฉัน"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "ตั้งค่ารหัสผ่านใหม่"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "ตั้งค่ารหัสผ่านใหม่เรียบร้อย"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "รหัสผ่านของคุณได้รับการตั้งค่าแล้ว คุณสามารถเข้าสู่ระบบได้ทันที"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "การยืนยันตั้งค่ารหัสผ่านใหม่"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "ใส่รหัสผ่านใหม่"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "กรุณาใส่รหัสผ่านใหม่สองครั้ง เพื่อตรวจสอบว่าคุณได้พิมพ์รหัสอย่างถูกต้อง"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "รหัสผ่านใหม่:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "ยืนยันรหัสผ่าน:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "การตั้งค่ารหัสผ่านใหม่ ไม่สำเร็จ"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
 "การตั้งรหัสผ่านใหม่ไม่สำเร็จ เป็นเพราะว่าหน้านี้ได้ถูกใช้งานไปแล้ว กรุณาทำการตั้งรหัสผ่านใหม่อีกครั้ง"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "การตั้งค่ารหัสผ่านใหม่เรียบร้อย"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr "เราได้ส่งอีเมลวิธีการตั้งรหัสผ่าน ไปที่อีเมลที่คุณให้ไว้เรียบร้อยแล้ว และคุณจะได้รับเร็วๆ นี้"
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 "คุณได้รับอีเมล์ฉบับนี้ เนื่องจากคุณส่งคำร้องขอเปลี่ยนรหัสผ่านสำหรับบัญชีผู้ใช้ของคุณที่ %(site_name)s."
@@ -783,34 +797,34 @@ msgstr "ขอบคุณสำหรับการใช้งานเว็
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s ทีม"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
-msgstr "ลืมรหัสผ่าน? กรุณาใส่อีเมลด้านล่าง ทางเราจะทำการส่งวิธีการในการตั้งรหัสผ่านใหม่ไปให้"
+msgstr "ลืมรหัสผ่าน? กรุณาใส่อีเมลด้านล่าง เราจะส่งวิธีการในการตั้งรหัสผ่านใหม่ไปให้คุณทางอีเมล"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "อีเมลของคุณ"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "อีเมล:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "ตั้งรหัสผ่านของฉันใหม่"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "ทุกวัน"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(ว่างเปล่า)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "เลือก %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "เลือก %s เพื่อเปลี่ยนแปลง"
diff --git a/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.mo
index 99108bb5b0..fc374c354d 100644
Binary files a/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.po
index c59417b3f4..82cbb6b1de 100644
--- a/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-09 03:31+0000\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Kowit Charoenratchatabhan <kowit.s.c@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo
index bf69124052..5025f2bcc9 100644
Binary files a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po
index fac9073763..661b16de9f 100644
--- a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po
@@ -1,36 +1,39 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Gökmen Görgen <gokmen@alageek.com>, 2012.
+# Translators:
+# Caner Başaran <basaran.caner@gmail.com>, 2012.
+#   <cihadgundogdu@gmail.com>, 2012.
+# Gökmen Görgen <gokmen@alageek.com>, 2012-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Metin Amiroff <amiroff@gmail.com>, 2011, 2012.
+# Metin Amiroff <amiroff@gmail.com>, 2011-2012.
 # Murat Sahin <martinamca@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-10 14:31+0000\n"
-"Last-Translator: Metin Amiroff <amiroff@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-02-24 17:30+0000\n"
+"Last-Translator: Gökmen Görgen <gokmen@alageek.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d adet %(items)s başarıyla silindi."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s silinemedi"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Emin misiniz?"
 
@@ -39,169 +42,181 @@ msgstr "Emin misiniz?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Seçili %(verbose_name_plural)s nesnelerini sil"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Tümü"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Evet"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Hayır"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Herhangi bir tarih"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Bugün"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
-msgstr "7 gün içinde"
+msgstr "Son 7 gün"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Bu ay"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Bu yıl"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Lütfen yönetici hesap için kullanıcı adı ve parolanızı doğru giriniz. İkisi "
-"de küçük harfe duyarlıdır."
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Oturumunuzun süresi geçti. Lütfen tekrar giriş yapın."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "E-posta adresiniz kullanıcı adınız değil. '%s' kullanın."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "İşlem:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "işlem zamanı"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "nesne no"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "nesne kodu"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "işlem adı"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "mesajı değiştir"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
-msgstr "log kaydı"
+msgstr "log girdisi"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
-msgstr "log kayıtları"
+msgstr "log girdileri"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "\"%(object)s\" eklendi."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "\"%(object)s\" değiştirildi - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "\"%(object)s\" silindi."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry Nesnesi"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Hiç biri"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s değiştirildi."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "ve"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" eklenmiştir."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s %(name)s \"%(object)s\" ile değiştirildi."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" silinmiştir."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Hiçbir alan değiştirilmedi."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "\"%(obj)s\" isimli %(name)s eklendi."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Tekrar düzenleyebilirsiniz."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Yeni bir %s ekleyebilirsiniz."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "\"%(obj)s\" isimli %(name)s değiştirildi."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "\"%(obj)s\" isimli %(name)s eklendi. Aşağıda tekrar düzenleyebilirsiniz."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" başarıyla eklendi. Aşağıda başka %(name)s "
+"ekleyebilirsiniz."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "\"%(obj)s\" isimli %(name)s eklendi."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" başarıyla değiştirildi. Aşağıda tekrar "
+"düzenleyebilirsiniz."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" başarıyla değiştirildi. Aşağıda başka %(name)s "
+"ekleyebilirsiniz."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "\"%(obj)s\" isimli %(name)s değiştirildi."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -209,87 +224,95 @@ msgstr ""
 "İşlemlerin uygulanabilmesi için bir veya daha fazla nesne seçilmelidir. "
 "Herhangi bir değişiklik gerçekleştirilmedi."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "İşlem seçimi yapılmamış. Lütfen bir işlem seçiniz."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s ekle"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(key)r birincil anahtarına sahip %(name)s nesnesi mevcut değil."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s değiştir"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Veritabanı hatası"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s adet %(name)s başarıyla değiştirildi."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "Toplam %(total_count)s nesne seçili"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s nesne arasından seçim yapılmamış"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "\"%(obj)s\" isimli %(name)s silindi."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "%s için değişiklik geçmişi:"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Giriş yap"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Site yönetimi"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s yönetimi"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Tarih:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Saat:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Arama"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Yenisini Ekle"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "Şu anda:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Değiştirin:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Sayfa bulunamadı"
@@ -298,42 +321,42 @@ msgstr "Sayfa bulunamadı"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Üzgünüz, aradığınız sayfa bulunamadı."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Anasayfa"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Sunucu hatası"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Sunucu hatası (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Sunucu Hatası <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Bir hata oluştu. Hata, e-posta ile site yöneticisine bildirildi ve kısa süre "
-"içinde çözülecktir. Sabrınız için teşekkürler."
+"Bir hata oluştu. Site yöneticilerine e-posta ile rapor edildi ve kısa süre "
+"içinde düzeltilecek. Sabrınız için teşekkür ederiz."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -356,7 +379,7 @@ msgstr "Tüm %(total_count)s %(module_name)s nesnelerini seç"
 msgid "Clear selection"
 msgstr "Seçimi kaldır"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -366,22 +389,22 @@ msgid "Welcome,"
 msgstr "Hoşgeldiniz,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Dokümantasyon"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Şifre değiştir"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Çık"
 
@@ -393,34 +416,34 @@ msgstr "Django site yöneticisi"
 msgid "Django administration"
 msgstr "Django yönetimi"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Yeni"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Geçmiş"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Sitede görüntüle"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Lütfen aşağıdaki hataları düzeltin."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Yeni %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Filtrele"
 
@@ -437,12 +460,12 @@ msgstr "Sıralama önceliği: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Sıralama tercihi"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -453,7 +476,7 @@ msgstr ""
 "nesnelerin silinmesini gerektiriyor, ancak aşağıdaki nesneleri silme "
 "yetkiniz yok."
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -462,7 +485,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' silinmesi aşağıda gösterilen ilişkili "
 "nesnelerin de silinmesini gerektirir:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -471,16 +494,16 @@ msgstr ""
 "\"%(escaped_object)s\" isimli %(object_name)s nesnesini silmek "
 "istediğinizden emin misiniz? Aşağıdaki bağlantılı öğeler silinecek:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Evet, eminim"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Birden fazla nesneyi sil"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -490,7 +513,7 @@ msgstr ""
 "Seçili %(objects_name)s nesnelerinin silinmesi hesabınızın silme yetkisine "
 "sahip olmadığı aşağıda gösterilen nesnelerin de silinmesini gerektirir:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -499,7 +522,7 @@ msgstr ""
 "Seçili %(objects_name)s nesnelerinin silinmesi aşağıda gösterilen ilişkili "
 "nesnelerin silinmesini de gerektirir:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -513,36 +536,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " %(filter_title)s filtresi"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s uygulamasındaki modeller."
+msgid "Models in the %(name)s application"
+msgstr "%(name)s uygulamasındaki modeller"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Düzenle"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Düzenleme yapmaya yetkiniz yok."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "İşlem Geçmişi"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "İşlemlerim"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "İşlem geçmişi bulunamadı"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Bilinmeyen içerik"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -552,31 +575,27 @@ msgstr ""
 "tablolarının kurulu olduğundan ve veritabanının ilgili kullanıcı tarafından "
 "okunabilir olduğundan emin olun."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Kullanıcı adı:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Şifre:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Kullanıcı adını veya parolanı mı unuttun?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Tarih/saat"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Kullanıcı"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "İşlem"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -631,64 +650,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Kullanıcı adı ve şifre girin."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "<strong>%(username)s</strong> için yeni şifre girin."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Şifre"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Şifre (tekrar)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Onaylamak için, yukarıdaki şifrenin aynısını girin."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Sil"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Yeni bir %(verbose_name)s ekle"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Sil"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Silinsin Mi?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Web sitesinde bugün geçirdiğiniz zaman için teşekkür ederiz."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Tekrar giriş yap"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Şifre değişimi"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Şifre değişimi başarılı"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Şifreniz değiştirildi."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -696,65 +715,65 @@ msgstr ""
 "Güvenliğiniz için, lütfen eski şifrenizi girin, sonra yeni şifrenizi iki "
 "kere girerek doğru yazdığınızdan emin olun."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Eski şifre"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Yeni şifre"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Şifremi değiştir"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Şifreyi sıfırla"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Şifre sıfırlama tamamlandı"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Şifreniz atanmıştır. Şimdi sisteme giriş yapabilirsiniz."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Şifre sıfırlama onayı"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Yeni şifreyi girin"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 "Lütfen yeni şifrenizi iki kere girin, böylece doğru yazdığınızdan emin olun."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Yeni şifre:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Şifreyi onayla:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Şifre sıfırlaması başarısız oldu"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -763,26 +782,26 @@ msgstr ""
 "kullanılmış olduğu içindir. Lütfen yeni bir şifre sıfırlama talebinde "
 "bulunun."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Şifre başarıyla sıfırlandı"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Yeni şifrenizi alabilmeniz için gereken talimatları belirtmiş olduğunuz e-"
-"posta adresinize gönderilmiştir, kısa süre içinde size ulaşacaktır."
+"Şifrenizin ayarlanması ile ilgili talimatlar belirtmiş olduğunuz email "
+"adresine gönderildi. Yakın zamanda ulaşması beklenir."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Bu e-postayı %(site_name)s adresindeki kullanıcı hesabınızın şifresini "
+"Bu postayı %(site_name)s sitesindeki kullanıcı hesabınıza ait şifrenizi "
 "sıfırlama talebinde bulunduğunuz için alıyorsunuz."
 
 #: templates/registration/password_reset_email.html:4
@@ -802,36 +821,36 @@ msgstr "Sitemizi kullandığınız için teşekkürler!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s Ekibi"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Şifrenizi mı unuttunuz? E-posta adresinizi aşağıya girin, yenisini almanız "
-"için gereken talimatları e-posta adresinize gönderilsin."
+"Şifrenizi mi unuttunuz? Aşağıdaki alana e-posta adresinizi girin, yeni "
+"şifreniz için gereken talimatları göndereceğiz."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
 msgstr "E-posta adresi:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Şifremi sıfırla"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Tüm tarihler"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Yok)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s seç"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Değiştirilecek %s nesnesini seçin"
diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo
index 6e088109c4..d443dadc3d 100644
Binary files a/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po
index a074b2cd3e..d5d0e9303a 100644
--- a/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 20:12+0000\n"
 "Last-Translator: Murat Çorlu <muratcorlu@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/tt/LC_MESSAGES/django.mo b/django/contrib/admin/locale/tt/LC_MESSAGES/django.mo
index 550dfd1541..81ec0f5c21 100644
Binary files a/django/contrib/admin/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/tt/LC_MESSAGES/django.po b/django/contrib/admin/locale/tt/LC_MESSAGES/django.po
index a48d2f6001..17d54e6e9a 100644
--- a/django/contrib/admin/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/tt/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s уңышлы рәвештә бетерелгән."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s бетереп булмады"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Сез инанып карар кылдыгызмы?"
 
@@ -36,162 +36,137 @@ msgstr "Сез инанып карар кылдыгызмы?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Сайланган %(verbose_name_plural)s бетерергә"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Барысы"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Әйе"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Юк"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Билгесез"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Теләсә нинди көн һәм вакыт"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Бүген"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Соңгы 7 көн"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Бу ай"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Бу ел"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Сезнең эш сеансыгыз искергән, зинһар, яңадан керегез."
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Сезнең логин - электрон почта адресыгыз түгел. Аның урынына '%s' кертеп "
-"карагыз."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Гамәл:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "гамәл вакыты"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "объект идентификаторы"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "объект фаразы"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "гамәл тибы"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "үзгәрү белдерүе"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "журнал язмасы"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "журнал язмалары"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Юк"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s үзгәртелгән."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "һәм"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" өстәлгән."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" өчен %(list)s үзгәртелгән."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" бетерелгән."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Үзгәртелгән кырлар юк."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" үңышлы рәвештә өстәлгән."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Астарак сез аны тагын бер кат төзәтә аласыз."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Астарак сез тагын бер %s өсти аласыз."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" уңышлы рәвештә үзгәртелгән."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -199,7 +174,38 @@ msgstr ""
 "%(name)s \"%(obj)s\" үңышлы рәвештә өстәлгән. Астарак сез аны тагын бер кат "
 "төзәтә аласыз."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" үңышлы рәвештә өстәлгән."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" уңышлы рәвештә үзгәртелгән."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -207,87 +213,95 @@ msgstr ""
 "Элементар өстеннән гамәл кылу өчен алар сайланган булырга тиеш. Элементлар "
 "үзгәртелмәгән."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Гамәл сайланмаган."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s өстәргә"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(key)r беренчел ачкыч белән булган %(name)s юк."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s үзгәртергә"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Бирелмәләр базасы хатасы"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s уңышлы рәвештә үзгәртелгән."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s сайланган"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "Барлык %(cnt)s объектан 0 сайланган"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" уңышлы рәвештә бетерелгән."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Үзгәртү тарихы: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Керергә"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Сайт идарәсе"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s идарә итү"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Көн:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Вакыт:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Эзләү"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Тагын өстәргә"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Сәхифә табылмаган"
@@ -296,42 +310,40 @@ msgstr "Сәхифә табылмаган"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Кызганычка каршы, соралган сәхифә табылмады."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Башбит"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Сервер хатасы"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Сервер хатасы (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Сервер хатасы <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Хата килеп чыкты. Аның хакта сайт идарәчеләренә хат җибәрелде, аны тиздән "
-"төзәтергә тиешләр. Сабыр булуыгыз өчен рәхмәт."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -354,7 +366,7 @@ msgstr "Бөтен %(total_count)s %(module_name)s сайларга"
 msgid "Clear selection"
 msgstr "Сайланганлыкны алырга"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -364,22 +376,22 @@ msgid "Welcome,"
 msgstr "Рәхим итегез,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Серсүзне үзгәртергә"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Чыгарга"
 
@@ -391,34 +403,34 @@ msgstr "Django сайты идарәсе"
 msgid "Django administration"
 msgstr "Django идарәсе"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Өстәргә"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Тарих"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Сайтта карарга"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Зинһар, биредәге хаталарны төзәтегез."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s өстәргә"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Филтер"
 
@@ -435,12 +447,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Бетерергә"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -451,7 +463,7 @@ msgstr ""
 "объектларның бетерелүенә китерә ала, әмма сезнең хисап язмагызның киләсе "
 "объект тибларын бетерү өчен хокуклары җитми:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -460,7 +472,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' бетерүе киләсе сакланган объектларның "
 "бетерелүен таләп итә:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -469,16 +481,16 @@ msgstr ""
 "Сез инанып %(object_name)s \"%(escaped_object)s\" бетерергә телисезме? "
 "Барлык киләсе бәйләнгән объектлар да бетерелер:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Әйе, мин инандым"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Берничә объектны бетерергә"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -489,7 +501,7 @@ msgstr ""
 "бетерелүенә китерә ала, әмма сезнең хисап язмагызның киләсе объект тибларын "
 "бетерү өчен хокуклары җитми:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -498,7 +510,7 @@ msgstr ""
 "%(objects_name)s бетерүе киләсе аның белән бәйләнгән сакланган объектларның "
 "бетерелүен таләп итә:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -512,36 +524,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "%(filter_title)s буенча"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Модельлар белән %(name)s кушымтасында файдалана аласыз"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Үзгәртергә"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Төзәтү өчен хокукларыгыз җитми."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Соңгы гамәлләр"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Минем гамәлләр"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Тарих юк"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Билгесез тип"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -550,31 +562,27 @@ msgstr ""
 "Сезнең бирелмәләр базасы дөрес итем көйләнмәгән. Тиешле җәдвәлләр төзелгәнен "
 "һәм тиешле кулланучының хокуклары җитәрлек булуын тикшерегез."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Логин:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Серсүз:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Көн һәм вакыт"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Кулланучы"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Гамәл"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -629,64 +637,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Логин һәм серсүзне кертегез."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "<strong>%(username)s</strong> кулланучы өчен яңа серсүзне кертегез."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Серсүз"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Серсүз (тагын бер тапкыр)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Тикшерү өчен шул ук серсүзне яңадан кертегез."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Бетерергә"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Тагын бер %(verbose_name)s өстәргә"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Бетерергә"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Бетерергә?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Сайтыбызда үткәргән вакыт өчен рәхмәт."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Тагын керергә"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Серсүзне үзгәртү"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Серсүз уңышлы рәвештә үзгәртелгән"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Серсүзегез үзгәртелгән."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -694,64 +702,64 @@ msgstr ""
 "Хәвефсезлек сәбәпле, зинһар, үзегезнең иске серсүзне кертегез, аннан яңа "
 "серсүзне ике тапкыр кертегез (дөрес язылышын тикшерү өчен)."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Иске серсүз"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Яңа серсүз"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Серсүземне үзгәртергә"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Серсүзне торгызу"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Серсүзне торгызу тәмамланган"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Серсүзегез үзгәртелгән. Сез хәзер керә аласыз."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Серсүзне торгызу раслау"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Яңа серсүзне кертегез:"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "Зинһар, тикшерү өчен яңа серсүзегезне ике тапкыр кертегез."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Яңа серсуз:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Серсүзне раслагыз:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Серсүзне торгызу хатасы"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -759,27 +767,23 @@ msgstr ""
 "Серсүзне торгызу өчен сылтама хаталы. Бәлки аның белән инде кулланганнар. "
 "Зинһар, серсүзне тагын бер тапкыр торгызып карагыз."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Серсүз уңышлы рәвештә торгызылган"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Без серсүзне торгызу кулланмасын сезнең электрон почта адресына җибәрдек. Ул "
-"тиздән килергә тиеш."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Сезгә бу хат %(site_name)s сайтында серсүзне торгызу таләп иткән өчен "
-"җибәрелгән."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -798,36 +802,34 @@ msgstr "Безнең сайтны куллану өчен рәхмәт!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s сайтының төркеме"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Серсүзне оныттыгыз? Электрон почта адресыгызны кертегез һәм без серсүзне "
-"торгызу кулланмасын җибәрербез."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Электрон почта адресы:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Серсүземне торгызырга"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Бөтен көннәр"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Юк)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s сайлагыз"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Үзгәртү өчен %s сайлагыз"
diff --git a/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.mo
index d433bab044..307410fbed 100644
Binary files a/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.po
index f43a0c6582..cc26e16613 100644
--- a/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/udm/LC_MESSAGES/django.mo b/django/contrib/admin/locale/udm/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..e1070cc7f3
Binary files /dev/null and b/django/contrib/admin/locale/udm/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/udm/LC_MESSAGES/django.po b/django/contrib/admin/locale/udm/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..8b1a8312e9
--- /dev/null
+++ b/django/contrib/admin/locale/udm/LC_MESSAGES/django.po
@@ -0,0 +1,806 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+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-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Udmurt (http://www.transifex.com/projects/p/django/language/"
+"udm/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: udm\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: actions.py:48
+#, python-format
+msgid "Successfully deleted %(count)d %(items)s."
+msgstr ""
+
+#: actions.py:60 options.py:1347
+#, python-format
+msgid "Cannot delete %(name)s"
+msgstr ""
+
+#: actions.py:62 options.py:1349
+msgid "Are you sure?"
+msgstr ""
+
+#: actions.py:83
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr ""
+
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
+msgid "All"
+msgstr ""
+
+#: filters.py:238
+msgid "Yes"
+msgstr "Бен"
+
+#: filters.py:239
+msgid "No"
+msgstr ""
+
+#: filters.py:253
+msgid "Unknown"
+msgstr "Тодымтэ"
+
+#: filters.py:308
+msgid "Any date"
+msgstr ""
+
+#: filters.py:309
+msgid "Today"
+msgstr ""
+
+#: filters.py:313
+msgid "Past 7 days"
+msgstr ""
+
+#: filters.py:317
+msgid "This month"
+msgstr ""
+
+#: filters.py:321
+msgid "This year"
+msgstr ""
+
+#: forms.py:9
+#, python-format
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
+msgstr ""
+
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr ""
+
+#: helpers.py:23
+msgid "Action:"
+msgstr ""
+
+#: models.py:24
+msgid "action time"
+msgstr ""
+
+#: models.py:27
+msgid "object id"
+msgstr ""
+
+#: models.py:28
+msgid "object repr"
+msgstr ""
+
+#: models.py:29
+msgid "action flag"
+msgstr ""
+
+#: models.py:30
+msgid "change message"
+msgstr ""
+
+#: models.py:35
+msgid "log entry"
+msgstr ""
+
+#: models.py:36
+msgid "log entries"
+msgstr ""
+
+#: models.py:45
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr ""
+
+#: models.py:47
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr ""
+
+#: models.py:52
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr ""
+
+#: models.py:54
+msgid "LogEntry Object"
+msgstr ""
+
+#: options.py:156 options.py:172
+msgid "None"
+msgstr ""
+
+#: options.py:684
+#, python-format
+msgid "Changed %s."
+msgstr ""
+
+#: options.py:684 options.py:694
+msgid "and"
+msgstr ""
+
+#: options.py:689
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:693
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:698
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr ""
+
+#: options.py:702
+msgid "No fields changed."
+msgstr ""
+
+#: options.py:807 options.py:860
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: options.py:951 options.py:1211
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+
+#: options.py:970
+msgid "No action selected."
+msgstr ""
+
+#: options.py:1050
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: options.py:1074 options.py:1319
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr ""
+
+#: options.py:1140
+#, python-format
+msgid "Change %s"
+msgstr ""
+
+#: options.py:1190
+msgid "Database error"
+msgstr ""
+
+#: options.py:1253
+#, python-format
+msgid "%(count)s %(name)s was changed successfully."
+msgid_plural "%(count)s %(name)s were changed successfully."
+msgstr[0] ""
+
+#: options.py:1280
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] ""
+
+#: options.py:1285
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr ""
+
+#: options.py:1335
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: options.py:1382
+#, python-format
+msgid "Change history: %s"
+msgstr ""
+
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
+msgid "Log in"
+msgstr ""
+
+#: sites.py:388
+msgid "Site administration"
+msgstr ""
+
+#: sites.py:440
+#, python-format
+msgid "%s administration"
+msgstr ""
+
+#: widgets.py:90
+msgid "Date:"
+msgstr ""
+
+#: widgets.py:91
+msgid "Time:"
+msgstr ""
+
+#: widgets.py:165
+msgid "Lookup"
+msgstr ""
+
+#: widgets.py:271
+msgid "Add Another"
+msgstr ""
+
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
+#: templates/admin/404.html:4 templates/admin/404.html.py:8
+msgid "Page not found"
+msgstr ""
+
+#: templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
+msgid "Home"
+msgstr ""
+
+#: templates/admin/500.html:7
+msgid "Server error"
+msgstr ""
+
+#: templates/admin/500.html:11
+msgid "Server error (500)"
+msgstr ""
+
+#: templates/admin/500.html:14
+msgid "Server Error <em>(500)</em>"
+msgstr ""
+
+#: templates/admin/500.html:15
+msgid ""
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Run the selected action"
+msgstr ""
+
+#: templates/admin/actions.html:4
+msgid "Go"
+msgstr ""
+
+#: templates/admin/actions.html:11
+msgid "Click here to select the objects across all pages"
+msgstr ""
+
+#: templates/admin/actions.html:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr ""
+
+#: templates/admin/actions.html:13
+msgid "Clear selection"
+msgstr ""
+
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
+#, python-format
+msgid "%(name)s"
+msgstr ""
+
+#: templates/admin/base.html:28
+msgid "Welcome,"
+msgstr ""
+
+#: templates/admin/base.html:33
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Documentation"
+msgstr ""
+
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Change password"
+msgstr ""
+
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
+msgid "Log out"
+msgstr ""
+
+#: templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr ""
+
+#: templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr ""
+
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
+msgid "Add"
+msgstr ""
+
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
+msgid "History"
+msgstr ""
+
+#: templates/admin/change_form.html:33
+#: templates/admin/edit_inline/stacked.html:9
+#: templates/admin/edit_inline/tabular.html:30
+msgid "View on site"
+msgstr ""
+
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+
+#: templates/admin/change_list.html:58
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
+#: templates/admin/change_list.html:78
+msgid "Filter"
+msgstr ""
+
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr ""
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr ""
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:11
+#: templates/admin/submit_line.html:4
+msgid "Delete"
+msgstr "Ӵушоно"
+
+#: templates/admin/delete_confirmation.html:18
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
+"related objects, but your account doesn't have permission to delete the "
+"following types of objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:26
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:34
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
+"All of the following related items will be deleted:"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
+msgid "Yes, I'm sure"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:10
+msgid "Delete multiple objects"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:17
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:25
+#, python-format
+msgid ""
+"Deleting the selected %(objects_name)s would require deleting the following "
+"protected related objects:"
+msgstr ""
+
+#: templates/admin/delete_selected_confirmation.html:33
+#, python-format
+msgid ""
+"Are you sure you want to delete the selected %(objects_name)s? All of the "
+"following objects and their related items will be deleted:"
+msgstr ""
+
+#: templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr ""
+
+#: templates/admin/index.html:20
+#, python-format
+msgid "Models in the %(name)s application"
+msgstr ""
+
+#: templates/admin/index.html:39
+msgid "Change"
+msgstr "Тупатъяно"
+
+#: templates/admin/index.html:49
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: templates/admin/index.html:57
+msgid "Recent Actions"
+msgstr ""
+
+#: templates/admin/index.html:58
+msgid "My Actions"
+msgstr ""
+
+#: templates/admin/index.html:62
+msgid "None available"
+msgstr ""
+
+#: templates/admin/index.html:76
+msgid "Unknown content"
+msgstr ""
+
+#: templates/admin/invalid_setup.html:12
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+
+#: templates/admin/login.html:37
+msgid "Password:"
+msgstr ""
+
+#: templates/admin/login.html:44
+msgid "Forgotten your password or username?"
+msgstr ""
+
+#: templates/admin/object_history.html:23
+msgid "Date/time"
+msgstr ""
+
+#: templates/admin/object_history.html:24
+msgid "User"
+msgstr ""
+
+#: templates/admin/object_history.html:25
+msgid "Action"
+msgstr ""
+
+#: templates/admin/object_history.html:39
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+
+#: templates/admin/pagination.html:10
+msgid "Show all"
+msgstr ""
+
+#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3
+msgid "Save"
+msgstr ""
+
+#: templates/admin/search_form.html:7
+msgid "Search"
+msgstr ""
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(counter)s result"
+msgid_plural "%(counter)s results"
+msgstr[0] ""
+
+#: templates/admin/search_form.html:9
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr ""
+
+#: templates/admin/submit_line.html:5
+msgid "Save as new"
+msgstr ""
+
+#: templates/admin/submit_line.html:6
+msgid "Save and add another"
+msgstr ""
+
+#: templates/admin/submit_line.html:7
+msgid "Save and continue editing"
+msgstr ""
+
+#: templates/admin/auth/user/add_form.html:6
+msgid ""
+"First, enter a username and password. Then, you'll be able to edit more user "
+"options."
+msgstr ""
+
+#: templates/admin/auth/user/add_form.html:8
+msgid "Enter a username and password."
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:31
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:38
+msgid "Password"
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
+msgid "Password (again)"
+msgstr ""
+
+#: templates/admin/auth/user/change_password.html:45
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr ""
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr ""
+
+#: templates/admin/edit_inline/tabular.html:17
+msgid "Delete?"
+msgstr ""
+
+#: templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr ""
+
+#: templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr ""
+
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
+msgid "Password change"
+msgstr ""
+
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
+msgid "Password change successful"
+msgstr ""
+
+#: templates/registration/password_change_done.html:17
+msgid "Your password was changed."
+msgstr ""
+
+#: templates/registration/password_change_form.html:26
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+
+#: templates/registration/password_change_form.html:32
+msgid "Old password"
+msgstr ""
+
+#: templates/registration/password_change_form.html:37
+msgid "New password"
+msgstr ""
+
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
+msgid "Change my password"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
+msgid "Password reset"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
+msgid "Password reset complete"
+msgstr ""
+
+#: templates/registration/password_reset_complete.html:17
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:7
+msgid "Password reset confirmation"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:17
+msgid "Enter new password"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:19
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:23
+msgid "New password:"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:25
+msgid "Confirm password:"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:31
+msgid "Password reset unsuccessful"
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:33
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
+msgid "Password reset successful"
+msgstr ""
+
+#: templates/registration/password_reset_done.html:17
+msgid ""
+"We've emailed you instructions for setting your password to the email "
+"address you submitted. You should be receiving it shortly."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:10
+msgid "Thanks for using our site!"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:12
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:17
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid "Reset my password"
+msgstr ""
+
+#: templatetags/admin_list.py:344
+msgid "All dates"
+msgstr ""
+
+#: views/main.py:33
+msgid "(None)"
+msgstr ""
+
+#: views/main.py:76
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: views/main.py:78
+#, python-format
+msgid "Select %s to change"
+msgstr ""
diff --git a/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..26dcca16ed
Binary files /dev/null and b/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..77aaf06dad
--- /dev/null
+++ b/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.po
@@ -0,0 +1,167 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2011-01-19 15:01+0000\n"
+"Last-Translator: Django team\n"
+"Language-Team: Udmurt (http://www.transifex.com/projects/p/django/language/"
+"udm/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: udm\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
+msgid "Available %s"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may choose some by selecting them in "
+"the box below and then clicking the \"Choose\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into this box to filter down the list of available %s."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:57
+msgid "Filter"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:61
+msgid "Choose all"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:61
+#, c-format
+msgid "Click to choose all %s at once."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:67
+msgid "Choose"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:69
+msgid "Remove"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Chosen %s"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of chosen %s. You may remove some by selecting them in the "
+"box below and then clicking the \"Remove\" arrow between the two boxes."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:80
+#, c-format
+msgid "Click to remove all chosen %s at once."
+msgstr ""
+
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] ""
+
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+
+#: static/admin/js/calendar.js:26
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+
+#: static/admin/js/calendar.js:27
+msgid "S M T W T F S"
+msgstr ""
+
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr ""
+
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
+msgid "Now"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:53
+msgid "Clock"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:81
+msgid "Choose a time"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:86
+msgid "Midnight"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:87
+msgid "6 a.m."
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:88
+msgid "Noon"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
+msgid "Cancel"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
+msgid "Today"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:148
+msgid "Calendar"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:195
+msgid "Yesterday"
+msgstr ""
+
+#: static/admin/js/admin/DateTimeShortcuts.js:199
+msgid "Tomorrow"
+msgstr ""
diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo
index 1d152947ec..1b0cb8dbcc 100644
Binary files a/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/django.po b/django/contrib/admin/locale/uk/LC_MESSAGES/django.po
index a75a1f0793..72d63807bd 100644
--- a/django/contrib/admin/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/uk/LC_MESSAGES/django.po
@@ -3,35 +3,35 @@
 # Translators:
 # Boryslav Larin <brabadu@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Sergey Lysach <sergikoff88@gmail.com>, 2011, 2012.
+# Sergey Lysach <sergikoff88@gmail.com>, 2011-2013.
 # Sergiy Kuzmenko <s.kuzmenko@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:34+0100\n"
-"PO-Revision-Date: 2012-03-11 16:08+0000\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-12 18:22+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Успішно видалено %(count)d %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Не можу видалити %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Ви впевнені?"
 
@@ -40,165 +40,139 @@ msgstr "Ви впевнені?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Видалити обрані %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Всі"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Так"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Ні"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Будь-яка дата"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Сьогодні"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "Останні 7 днів"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Цього місяця"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Цього року"
 
 #: forms.py:9
-msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
-msgstr ""
-"Будь ласка, введіть коректне ім'я користувача та пароль облікового запису "
-"адміністратора. Зверніть увагу, що обидва поля чутливі до регістру."
-
-#: forms.py:18
-msgid "Please log in again, because your session has expired."
-msgstr ""
-"Будь ласка, увійдіть знову, ваша сесія закінчилася. Не хвилюйтесь: все, що "
-"ви додавали збережено."
-
-#: forms.py:37
 #, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
+msgid ""
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"Ваша e-mail адреса не є вашим ім'ям користувача. Замість спробуйте '%s'"
+"Будь ласка, введіть правильні %(username)s і пароль для облікового запису "
+"персоналу. Зауважте, що обидва поля можуть бути чутливі до регістру."
 
-#: helpers.py:20
+#: forms.py:19
+msgid "Please log in again, because your session has expired."
+msgstr "Будь ласка, увійдіть знову, ваша сесія закінчилася."
+
+#: helpers.py:23
 msgid "Action:"
 msgstr "Дія:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "час дії"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "id об'єкту"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "представлення об'єкту(repr)"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "прапор дії"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "змінити повідомлення"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "реєстрування записів"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "реєстрування записів"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "Додано \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "Змінено \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "Видалено \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "Запис у журналі"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Ніщо"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "Змінено %s."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "та"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Додано %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Змінено %(list)s для %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Видалено %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Поля не змінені."
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" було додано успішно."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Ви можете редагувати це знову внизу."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Ви можете додати інший %s внизу."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" був успішно змінений."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -206,37 +180,74 @@ msgstr ""
 "%(name)s \"%(obj)s\"  був успішно доданий. Ви модете редагувати його знову "
 "внизу."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" було успішно додано. Ви можете додати ще одну %(name)s "
+"нижче."
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" було додано успішно."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+"%(name)s \"%(obj)s\" було успішно змінено. Ви можете знову відредагувати її "
+"нижче."
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+"%(name)s \"%(obj)s\" було успішно змінено. Ви можете додати ще одну %(name)s "
+"нижче."
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" був успішно змінений."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 "Для виконання дії необхідно обрати елемент. Жодний елемент не був змінений."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Жодних дій не обрано."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Додати %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s об'єкт з первинним ключем %(key)r не існує."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Змінити %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Помилка бази даних"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -244,7 +255,7 @@ msgstr[0] "%(count)s %(name)s був успішно змінений."
 msgstr[1] "%(count)s %(name)s були успішно змінені."
 msgstr[2] "%(count)s %(name)s було успішно змінено."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
@@ -252,52 +263,60 @@ msgstr[0] "%(total_count)s обраний"
 msgstr[1] "%(total_count)s обрані"
 msgstr[2] "Усі %(total_count)s обрано"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 з %(cnt)s обрано"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" був видалений успішно."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Історія змін: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Увійти"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Адміністрування сайта"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "Адміністрування %s"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Дата:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Час:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
-msgstr "Вийти"
+msgstr "Пошук"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Додати інше"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "В даний час:"
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "Змінено:"
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Сторінка не знайдена"
@@ -306,42 +325,43 @@ msgstr "Сторінка не знайдена"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ми шкодуємо, але сторінка яку ви запросили, не знайдена."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Домівка"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Помилка сервера"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Помилка сервера (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Помилка сервера <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Виникла помилка. Про неї було повідомлено адміністраторам сайту e-mail'ом і "
-"вона повинна бути незабаром виправлена. Дякуємо за ваше терпіння."
+"Виникла помилка. Адміністратор сайту буде повідомлений про неї по "
+"електронній пошті і вона повинна бути виправлена ​​найближчим часом. Дякуємо "
+"за ваше терпіння."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -364,7 +384,7 @@ msgstr "Обрати всі %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Скинути вибір"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "Додати %(name)s"
@@ -374,22 +394,22 @@ msgid "Welcome,"
 msgstr "Вітаємо,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Документація"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Вийти"
 
@@ -401,36 +421,36 @@ msgstr "Django сайт адміністрування"
 msgid "Django administration"
 msgstr "Django адміністрування"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Додати"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Історія"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Дивитися на сайті"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Будь ласка, виправте помилку нижче."
 msgstr[1] "Будь ласка, виправте помилки нижче."
 msgstr[2] "Будь ласка, виправте помилки нижче."
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Додати %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Відфільтрувати"
 
@@ -447,12 +467,12 @@ msgstr "Пріорітет сортування: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "Сортувати в іншому напрямку"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -463,7 +483,7 @@ msgstr ""
 "пов'язаних об'єктів, але ваш реєстраційний запис не має дозволу видаляти "
 "наступні типи об'єктів:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -472,7 +492,7 @@ msgstr ""
 "Видалення %(object_name)s '%(escaped_object)s' вимагатиме видалення "
 "наступних пов'язаних об'єктів:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -481,16 +501,16 @@ msgstr ""
 "Ви впевнені що хочете видалити %(object_name)s \"%(escaped_object)s\"? Всі "
 "пов'язані записи, що перелічені, будуть видалені:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Так, я впевнений"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Видалити кілька об'єктів"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -500,7 +520,7 @@ msgstr ""
 "Видалення обраних %(objects_name)s вимагатиме видалення пов'язаних об'єктів, "
 "але ваш обліковий запис не має прав для видалення таких типів об'єктів:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -509,7 +529,7 @@ msgstr ""
 "Видалення обраних %(objects_name)s вимагатиме видалення наступних захищених "
 "пов'язаних об'єктів:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -523,36 +543,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "За %(filter_title)s"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Моделі, що є в наявності у прикладній системі %(name)s."
+msgid "Models in the %(name)s application"
+msgstr "Моделі у %(name)s додатку"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Змінити"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "У вас немає дозволу редагувати будь-що."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Недавні дії"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Мої дії"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Немає"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Невідомий зміст"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -561,31 +581,27 @@ msgstr ""
 "Щось не так з інсталяцією бази даних. Перевірте, що таблиці бази даних "
 "створено і база даних може бути прочитана відповідним користувачем."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Користувач:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Пароль:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "Забули пароль або ім'я користувача?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Дата/час"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Користувач"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Дія"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -642,64 +658,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Введіть ім'я користувача і пароль."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Введіть новий пароль для користувача <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
-msgstr "Зміна пароля"
+msgstr "Пароль (знову)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Повторіть пароль для перевірки."
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Видалити"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Додати ще %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Видалити"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Видалити?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Дякуємо за час, проведений сьогодні на сайті."
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Увійти знову"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Зміна паролю"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Зміна паролю успішна"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Ваш пароль було змінено."
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -707,46 +723,46 @@ msgstr ""
 "Будь ласка введіть ваш старий пароль, задля безпеки, потім введіть ваш новий "
 "пароль двічі, щоб ми могли перевірити, що ви ввели його правильно"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Старий пароль"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Новий пароль"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Змінити мій пароль"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Перевстановлення паролю"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Пароль перевстановлено"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Пароль встановлено. Ви можете увійти зараз."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Підтвердження перевстановлення паролю"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Новий пароль"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -754,19 +770,19 @@ msgstr ""
 "Будь ласка, введіть ваш старий пароль, задля безпеки, потім введіть ваш "
 "новий пароль двічі, щоб ми могли перевірити, що ви ввели його правильно."
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Новий пароль:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Підтвердіть пароль:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Пароль не перевстановлено"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -774,27 +790,27 @@ msgstr ""
 "Посилання на перевстановлення паролю було помилковим. Можливо тому, що воно "
 "було вже використано. Будь ласка, замовте нове перевстановлення паролю."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Пароль перевстановлено успішно"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Ми надіслали інструкції по встановленню нового паролю поштою на адресу, яку "
-"ви вказали. Незабаром ви повинні його отримати."
+"На електронну адресу, яку ви ввели, ми надіслали вам листа з інструкціями "
+"щодо встановлення пароля. Ви повинні отримати його найближчим часом."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Ви отримали цей лист тому що замовили перевстановлення паролю для Вашого "
-"облікового запису на %(site_name)s."
+"Ви отримали цей лист, тому що ви зробили запит на перевстановлення пароля "
+"для облікового запису користувача на %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -813,36 +829,36 @@ msgstr "Дякуємо за користування нашим сайтом!"
 msgid "The %(site_name)s team"
 msgstr "Команда сайту %(site_name)s "
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Забули свій пароль? Введіть свою e-mail адресу і ми надішлемо інструкції для "
-"встановлення нового паролю по e-mail."
+"Забули пароль? Введіть свою email-адресу нижче і ми вишлемо інструкції по "
+"встановленню нового."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-mail адреса:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "Email адреса:"
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Перевстановіть мій пароль"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Всі дати"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(None)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Вибрати %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Виберіть %s щоб змінити"
diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo
index 39e5572e08..95b3a6763e 100644
Binary files a/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po
index 17e2c388c8..210ab72452 100644
--- a/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po
@@ -8,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-11 16:41+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/ur/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ur/LC_MESSAGES/django.mo
index a8cd8e73ca..e8560c1bae 100644
Binary files a/django/contrib/admin/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/ur/LC_MESSAGES/django.po b/django/contrib/admin/locale/ur/LC_MESSAGES/django.po
index cad4d8df74..05268b92f5 100644
--- a/django/contrib/admin/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/ur/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "%(count)d %(items)s کو کامیابی سے مٹا دیا گیا۔"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "%(name)s نہیں مٹایا جا سکتا"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "آپ کو یقین ھے؟"
 
@@ -36,161 +36,137 @@ msgstr "آپ کو یقین ھے؟"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "منتخب شدہ %(verbose_name_plural)s مٹائیں"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "تمام"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "ھاں"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "نھیں"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "کوئی تاریخ"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "آج"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "گزشتہ سات دن"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "یہ مھینہ"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "یہ سال"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "براہ مھربانی دوباہ اندر جائیں، کیونکہ آپ کی نشست کی مدت ختم ھو چکی ھے۔"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"آپ کے برقی خط کا پتہ آپ کا نام صارف نھیں ھے۔ اس کی بجائے '%s' کی کوشش کریں۔"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "کاروائی:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "کاروائی کا وقت"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "شے کا شناختی نمبر"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "شے کا نمائندہ"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "کاروائی کا پرچم"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "پیغام تبدیل کریں"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "لاگ کا اندراج"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "لاگ کے اندراج"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "کوئی نھیں"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s تبدیل کریں۔"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "اور"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" کا اضافہ کیا گیا۔"
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" %(list)s کی تبدیلی کی گئی۔"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" مٹایا گیا۔۔"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "کوئی خانہ تبدیل نھیں کیا گیا۔"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" کا کامیابی سے اضافہ کیا گیا۔"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "آپ اس کو نیچے دوبارہ تبدیل کر سکتے ھیں۔"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "آپ نیچے مزید %s درج کر سکتے ھیں۔"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" کی تبدیلی کامیابی سے ھو گئی۔"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -198,7 +174,38 @@ msgstr ""
 "%(name)s \"%(obj)s\" کا کامیابی سے اضافہ کیا گیا۔ نیچے آپ دوبارہ اسے مدوّن کر "
 "سکتے ھیں۔"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" کا کامیابی سے اضافہ کیا گیا۔"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" کی تبدیلی کامیابی سے ھو گئی۔"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -206,89 +213,97 @@ msgstr ""
 "اشیاء پر کاروائی سرانجام دینے کے لئے ان کا منتخب ھونا ضروری ھے۔ کوئی شے "
 "تبدیل نھیں کی گئی۔"
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "کوئی کاروائی منتخب نھیں کی گئی۔"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "%s کا اضافہ کریں"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "%(name)s شے %(key)r پرائمری کلید کے ساتھ موجود نھیں ھے۔"
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "%s تبدیل کریں"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "ڈیٹا بیس کی خرابی"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s کامیابی سے تبدیل کیا گیا تھا۔"
 msgstr[1] "%(count)s %(name)s کامیابی سے تبدیل کیے گئے تھے۔"
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "%(total_count)s منتخب کیا گیا۔"
 msgstr[1] "تمام %(total_count)s منتخب کئے گئے۔"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s میں سے 0 منتخب کیا گیا۔"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" کامیابی سے مٹایا گیا تھا۔"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "%s کی تبدیلی کا تاریخ نامہ"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "اندر جائیں"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "سائٹ کی انتظامیہ"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s کی انتظامیہ"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "تاریخ:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "وقت:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "ڈھونڈیں"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "اور اضافہ کریں"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "صفحہ نھیں ملا"
@@ -297,42 +312,40 @@ msgstr "صفحہ نھیں ملا"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "ھم معذرت خواہ ھیں، مطلوبہ صفحہ نھیں مل سکا۔"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "گھر"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "سرور کی خرابی"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "سرور کی خرابی (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "سرور کی خرابی <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"کوئی خرابی ھے۔ اس کے بارے میں سائٹ کے منتظم کو بذریعہ برقی خط آگاہ کر دیا "
-"جائے گا۔ اور عنقریب یہ درست ھو جائے گی۔ آپ کے تعاون کا شکریہ۔"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -355,7 +368,7 @@ msgstr "تمام %(total_count)s %(module_name)s منتخب کریں"
 msgid "Clear selection"
 msgstr "انتخاب صاف کریں"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -365,22 +378,22 @@ msgid "Welcome,"
 msgstr "خوش آمدید،"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "طریق استعمال"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "لفظ اجازت تبدیل کریں"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "باہر جائیں"
 
@@ -392,35 +405,35 @@ msgstr "منتظم برائے جینگو سائٹ"
 msgid "Django administration"
 msgstr "انتظامیہ برائے جینگو سائٹ"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "اضافہ"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "تاریخ نامہ"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "سائٹ پر مشاھدہ کریں"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "براہ کرم نیچے غلطی درست کریں۔"
 msgstr[1] "براہ کرم نیچے غلطیاں درست کریں۔"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "%(name)s کا اضافہ کریں"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "چھانٹیں"
 
@@ -437,12 +450,12 @@ msgstr ""
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "مٹائیں"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -453,7 +466,7 @@ msgstr ""
 "سکتی ھیں، مگر آپ کے کھاتے کو اشیاء کی مندرجہ ذیل اقسام مٹانے کا حق حاصل نھیں "
 "ھے۔"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -462,7 +475,7 @@ msgstr ""
 "%(object_name)s '%(escaped_object)s' کو مٹانے کے لئے مندرجہ ذیل محفوظ متعلقہ "
 "اشیاء کو مٹانے کی ضرورت پڑ سکتی ھے۔"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -471,16 +484,16 @@ msgstr ""
 "واقعی آپ %(object_name)s \"%(escaped_object)s\" کو مٹانا چاہتے ھیں۔ مندرجہ "
 "ذیل تمام متعلقہ اجزاء مٹ جائیں گے۔"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "ھاں، مجھے یقین ھے"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "متعدد اشیاء مٹائیں"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -490,7 +503,7 @@ msgstr ""
 "منتخب شدہ %(objects_name)s کو مٹانے کے نتیجے میں متعلقہ اشیاء مٹ سکتی ھیں، "
 "لیکن آپ کے کھاتے کو اشیاء کی مندرجہ ذیل اقسام کو مٹانے کا حق حاصل نھیں ھے۔"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -499,7 +512,7 @@ msgstr ""
 "منتخب شدہ %(objects_name)s کو مٹانے کے لئے مندرجہ ذیل محفوظ شدہ اشیاء کو "
 "مٹانے کی ضرورت پڑ سکتی ھے۔"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -513,36 +526,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "از %(filter_title)s"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "%(name)s ایپلیکیشن میں دستیاب ماڈلز"
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "تدوین"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "آپ کو کوئی چیز مدوّن کرنے کا حق نھیں ھے۔"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "حالیہ کاروائیاں"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "میری کاروائیاں"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "کچھ دستیاب نھیں"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "نامعلوم مواد"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -552,31 +565,27 @@ msgstr ""
 "ٹیبل بنائے گئے تھے، اور یقین کر لیں کہ ڈیٹ بیس مناسب صارف کے پڑھے جانے کے "
 "قابل ھے۔"
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "نام صاف:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "لفظ اجازت:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "تاریخ/وقت"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "صارف"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "کاروائی"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -632,64 +641,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "نام صارف اور لفظ اجازت درج کریں۔"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "صارف <strong>%(username)s</strong> کے لئے نیا لفظ اجازت درج کریں۔"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "لفظ اجازت"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "لفظ اجازت (دوبارہ)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "توثیق کے لئے ویسا ہی لفظ اجازت درج کریں جیسا اوپر کیا۔"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "خارج کریں"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "دوسرا %(verbose_name)s درج کریں"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "خارج کریں"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "مٹاؤں؟"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "ویب سائٹ پر آج کچھ معیاری وقت خرچ کرنے کے لئے شکریہ۔"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "دوبارہ اندر جائیں"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "لفظ اجازت کی تبدیلی"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "لفظ اجازت کی تبدیلی کامیابی سے ھوگئی"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "آپ کا لفظ اجازت تبدیل کر دیا گیا تھا۔"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -697,48 +706,48 @@ msgstr ""
 "براہ کرم سیکیورٹی کی خاطر اپنا پرانا لفظ اجازت درج کریں اور پھر اپنا نیا لفظ "
 "اجازت دو مرتبہ درج کریں تاکہ ھم توثیق کر سکیں کہ آپ نے اسے درست درج کیا ھے۔"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "پرانا لفظ اجازت"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "نیا لفظ اجازت"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "میرا لفظ تبدیل کریں"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "لفظ اجازت کی دوبارہ ترتیب"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "لفظ اجازت کی دوبارہ ترتیب مکمل ھو گئی"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 "آپ کا لفظ اجازت مرتب کر دیا گیا ھے۔ آپ کو آگے بڑھنے اور اندر جانے کی اجازت "
 "ھے۔"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "لفظ اجازت دوبارہ مرتب کرنے کی توثیق"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "نیا لفظ اجازت درج کریں"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -746,19 +755,19 @@ msgstr ""
 "براہ مھربانی اپنا نیا لفظ اجازت دو مرتبہ درج کریں تاکہ تاکہ ھم تصدیق کر سکیں "
 "کہ تم نے اسے درست درج کیا ھے۔"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "نیا لفظ اجازت:"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "لفظ اجازت کی توثیق:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "لفظ اجازت کی دوبارہ ترتیب ناکام ھو گئی۔"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -766,27 +775,23 @@ msgstr ""
 "لفظ اجازت دوبارہ مرتب کرنے کا رابطہ (لنک) غلط تھا، غالباً یہ پہلے ھی استعمال "
 "کیا چکا تھا۔ براہ مھربانی نیا لفظ اجازت مرتب کرنے کی درخواست کریں۔"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "لفظ اجازت کی دوبارہ ترتیب کامیاب ھو گئی۔"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"ھم نے اس پتے پر جو آپ نے پیش کیا ھے لفظ اجازت مرتب کرنے کی ھدایات بذریعہ "
-"برقی خط بھیج دی ھیں۔ آپ کو عنقریب موصول ھو جائیں گی۔"
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"You're receiving this e-mail because you requested a password reset for your "
-"user account at %(site_name)s."
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -805,36 +810,34 @@ msgstr "ھماری سائٹ استعمال کرنے کے لئے شکریہ"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s کی ٹیم"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"اپنا لفظ اجازت بھول گئے ھیں؟ نیچے اپنا برقی خط کا پتہ درج کریں ھم نیا لفظ "
-"اجازت مرتب کرنے کی ھدایات بذریعہ برقی خط بھیج دیں گے۔"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "برقی خط کا پتہ:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "میرا لفظ اجازت دوبارہ مرتب کریں"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "تمام تاریخیں"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(None)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "%s منتخب کریں"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "تبدیل کرنے کے لئے %s منتخب کریں"
diff --git a/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.mo
index e8896b1504..d8b94086bf 100644
Binary files a/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po
index 22441bcad0..bd238fb8a3 100644
--- a/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo b/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo
index 43c1e46a03..39a8766feb 100644
Binary files a/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/vi/LC_MESSAGES/django.po b/django/contrib/admin/locale/vi/LC_MESSAGES/django.po
index 2edfe6adc0..f4241bb8a0 100644
--- a/django/contrib/admin/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/vi/LC_MESSAGES/django.po
@@ -1,36 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Dimitris Glezos <glezos@indifex.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Tran  <hongdiepkien@gmail.com>, 2011.
-# Tran Van <vantxm@yahoo.co.uk>, 2011.
+# Tran Van <vantxm@yahoo.co.uk>, 2011, 2012.
 # Vuong Nguyen <autalpha@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Vuong Nguyen <autalpha@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Đã xóa thành công %(count)d %(items)s ."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "Không thể xóa %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "Bạn có chắc chắn không?"
 
@@ -39,160 +40,137 @@ msgstr "Bạn có chắc chắn không?"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Xóa các %(verbose_name_plural)s đã chọn"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "Tất cả"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "Có"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "Không"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "Chưa xác định"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "Bất kì ngày nào"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "Hôm nay"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "7 ngày trước"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "Tháng này"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "Năm nay"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "Hãy đăng nhập lại vì giao dịch của bạn đã hết hiệu lực"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Địa chỉ email của bạn không phải là tên đăng nhập. Hãy thử '%s'."
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "Hoạt động:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "Thời gian tác động"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "Mã đối tượng"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "đối tượng repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "hiệu hành động"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "thay đổi tin nhắn"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "đăng nhập"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "mục đăng nhập"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "Đối tượng \"%(object)s.\" đã được xoá."
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "Không"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s đã được thay đổi."
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "và"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" đã được thêm vào."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(list)s for %(name)s \"%(object)s\" đã được thay đổi."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" đã bị xóa."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "Không có trường nào thay đổi"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" được thêm vào thành công."
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "Bạn có thể sửa lại dưới đây."
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "Bạn có thể thêm vào %s dưới đây."
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" đã được thay đổi thành công."
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -200,7 +178,38 @@ msgstr ""
 "%(name)s \"%(obj)s\" đã được thêm vào thành công. Bạn có thể sửa lại dưới "
 "đây."
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" được thêm vào thành công."
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr ""
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" đã được thay đổi thành công."
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
@@ -208,87 +217,95 @@ msgstr ""
 "Mục tiêu phải được chọn mới có thể thực hiện hành động trên chúng. Không có "
 "mục tiêu nào đã được thay đổi."
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "Không có hoạt động nào được lựa chọn."
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "Thêm %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr " đối tượng %(name)s  với khóa chính %(key)r không tồn tại."
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "Thay đổi %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "Cơ sở dữ liệu bị lỗi"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] " %(count)s  %(name)s đã được thay đổi thành công."
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "Tất cả %(total_count)s đã được chọn"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "0 của %(cnt)s được chọn"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" đã được xóa thành công."
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "Lịch sử thay đổi: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "Đăng nhập"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "Site quản trị hệ thống."
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s quản trị"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "Ngày:"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "Giờ:"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "Tìm"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "Thêm vào"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr ""
+
+#: widgets.py:317
+msgid "Change:"
+msgstr ""
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "Không tìm thấy trang nào"
@@ -297,42 +314,40 @@ msgstr "Không tìm thấy trang nào"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Xin lỗi bạn! Trang mà bạn yêu cầu không tìm thấy."
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "Trang chủ"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "Lỗi máy chủ"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "Lỗi máy chủ (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "Lỗi máy chủ <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Xảy ra lỗi. Lỗi này sẽ được gửi tới quản trị hệ thống qua email và sẽ sớm "
-"được sửa chữa. Xin cảm ơn về sựu kiên nhẫn của bạn."
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -355,7 +370,7 @@ msgstr "Hãy chọn tất cả %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "Xóa lựa chọn"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -365,22 +380,22 @@ msgid "Welcome,"
 msgstr "Chào mừng bạn,"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "Tài liệu"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "Thay đổi mật khẩu"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "Thoát"
 
@@ -392,34 +407,34 @@ msgstr "Trang web admin Django"
 msgid "Django administration"
 msgstr "Trang quản trị cho Django"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "Thêm vào"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "Bản ghi nhớ"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "Xem trên trang web"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Hãy sửa lỗi sai dưới đây"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "Thêm vào %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "Bộ lọc"
 
@@ -430,18 +445,18 @@ msgstr ""
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "Sắp xếp theo:%(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -451,7 +466,7 @@ msgstr ""
 "Xóa %(object_name)s '%(escaped_object)s' sẽ làm mất những dữ liệu có liên "
 "quan. Tài khoản của bạn không được cấp quyển xóa những dữ liệu đi kèm theo."
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -460,7 +475,7 @@ msgstr ""
 "Xóa các %(object_name)s  ' %(escaped_object)s ' sẽ bắt buộc xóa các đối "
 "tượng được bảo vệ sau đây:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -469,16 +484,16 @@ msgstr ""
 "Bạn có chắc là muốn xóa %(object_name)s \"%(escaped_object)s\"?Tất cả những "
 "dữ liệu đi kèm dưới đây cũng sẽ bị mất:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "Có, tôi chắc chắn."
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "Xóa nhiều đối tượng"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -488,7 +503,7 @@ msgstr ""
 "Xóa các %(objects_name)s sẽ bắt buộc xóa các đối tượng liên quan, nhưng tài "
 "khoản của bạn không có quyền xóa các loại đối tượng sau đây:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
@@ -497,7 +512,7 @@ msgstr ""
 "Xóa các %(objects_name)s sẽ bắt buộc xóa các đối tượng đã được bảo vệ sau "
 "đây:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -511,36 +526,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr "Bởi %(filter_title)s "
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Models đã có trong ứng dụng %(name)s."
+msgid "Models in the %(name)s application"
+msgstr ""
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "Thay đổi"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "Bạn không được cấp quyền chỉnh sửa bất cứ cái gì."
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "Các hoạt động gần đây"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "Hoạt động của tôi"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "Không có sẵn"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "Không biết nội dung"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -550,31 +565,27 @@ msgstr ""
 "liệu được tạo phù hợp và dữ liệu có thể được đọc bởi những người sử dụng phù "
 "hợp."
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "Tên đăng nhập:"
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "Bạn quên mật khẩu hoặc tài khoản?"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "Ngày/giờ"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "Người dùng"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "Hành động"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -629,64 +640,64 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr "Điền tên đăng nhập và mật khẩu."
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Hãy nhập mật khẩu mới cho người sử dụng <strong>%(username)s</strong>."
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "Nhập lại mật khẩu"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "Nhập dãy mật mã trên để xác minh lại"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "Gỡ bỏ"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Thêm một %(verbose_name)s "
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "Gỡ bỏ"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "Bạn muốn xóa?"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Cảm ơn bạn đã dành thời gian với website này"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "Đăng nhập lại"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "Thay đổi mật khẩu"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "Mật khẩu được thay đổi thành công"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "Mật khẩu của bạn đã được thay đổi"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -694,46 +705,46 @@ msgstr ""
 "Hãy nhập lại mật khẩu cũ và sau đó nhập mật khẩu mới hai lần để chúng tôi có "
 "thể kiểm tra lại xem bạn đã gõ chính xác hay chưa."
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "Mật khẩu cũ"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "Thay đổi mật khẩu"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "Lập lại mật khẩu"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "Hoàn thành việc lập lại mật khẩu"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Mật khẩu của bạn đã được lập lại.  Bạn hãy thử đăng nhập."
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "Xác nhận việc lập lại mật khẩu"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "Nhập mật khẩu mới"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -741,19 +752,19 @@ msgstr ""
 "Hãy nhập mật khẩu mới hai lần để chúng tôi có thể kiểm tra xem bạn đã gõ "
 "chính xác chưa"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "Mật khẩu mới"
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "Nhập lại mật khẩu:"
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "Lập lại mật khẩu không thành công"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -761,27 +772,23 @@ msgstr ""
 "Liên kết đặt lại mật khẩu không hợp lệ, có thể vì nó đã được sử dụng. Xin "
 "vui lòng yêu cầu đặt lại mật khẩu mới."
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "Lấy lại mật khẩu thành công"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"Chúng tôi vừa gửi cho bạn những hướng dẫn để bạn lập lại mất khẩu tới địa "
-"chỉ email bạn đã đăng kí. Bạn sẽ nhận được nó trong chốc lát."
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
-"Bạn nhận được email này bởi vì bạn đã yêu cầu lập lại mật khẩu cho tài khoản "
-"của bạn tại %(site_name)s"
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -800,36 +807,34 @@ msgstr "Cảm ơn bạn đã sử dụng website của chúng tôi!"
 msgid "The %(site_name)s team"
 msgstr "Đội của %(site_name)s"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"Quên mật khẩu? Nhập địa chỉ email của bạn vào bên dưới, chúng tôi sẽ gửi "
-"những hướng dẫn để làm lại mật khẩu mới."
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "Địa chỉ email:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr ""
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "Làm lại mật khẩu"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "Tất cả các ngày"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(Không)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "Chọn %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "Chọn %s để thay đổi"
diff --git a/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.mo
index 5c9262c50c..2ae24e9800 100644
Binary files a/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.po
index bfa98c6a1b..2a38b5cbfe 100644
--- a/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
 "PO-Revision-Date: 2012-03-08 10:42+0000\n"
 "Last-Translator: Vuong Nguyen <autalpha@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
diff --git a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo
index 75c809d4f8..672c4b9323 100644
Binary files a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po
index 19cd17eb43..85a8c87774 100644
--- a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po
@@ -5,32 +5,33 @@
 # Lele Long <schemacs@gmail.com>, 2011.
 # slene <vslene@gmail.com>, 2011.
 # Ziang Song <songziang@gmail.com>, 2012.
+# 磊 施 <leiarix@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 16:48+0000\n"
-"Last-Translator: Ziang Song <songziang@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "成功删除了 %(count)d 个 %(items)s"
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "无法删除 %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "你确定吗？"
 
@@ -39,254 +40,270 @@ msgstr "你确定吗？"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "删除所选的 %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "全部"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "是"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "否"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "未知"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "任意日期"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "今天"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "过去7天"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "本月"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "今年"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
-"请输入正确的用户名和密码来登陆您的管理账户。请注意用户名和密码均为大小写相"
-"关。"
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "请重新登录，因为你的会话已经过期。"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "你的 e-mail 地址不是你的用户名。换 '%s' 试试。"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "动作"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "动作时间"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "对象id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "对象表示"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "动作标志"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "修改消息"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "日志记录"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "日志记录"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr "已经添加了 \"%(object)s\"."
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr "修改了 \"%(object)s\" - %(changes)s"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr "删除了 \"%(object)s.\""
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
 msgstr "LogEntry对象"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "无"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "已修改 %s 。"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "和"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "已添加 %(name)s \"%(object)s\"."
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "已变更 %(list)s for %(name)s \"%(object)s\"."
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "已删除 %(name)s \"%(object)s\"."
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "没有字段被修改。"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" 添加成功。"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "你可以在下面再次编辑它。"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "你可以在下面增加另一个 %s 。"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" 修改成功。"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr ""
+" %(name)s \"%(obj)s\" 已经成功添加。你可以在下面添加另外的 %(name)s  。"
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" 添加成功。"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr " %(name)s \"%(obj)s\" 已经成功进行变更。你可以在下面再次编辑它。"
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr ""
+" %(name)s \"%(obj)s\" 已经成功进行变更。你可以在下面添加其它的 %(name)s。"
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" 修改成功。"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr "条目必须选中以对其进行操作。没有任何条目被更改。"
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "未选择动作"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "增加 %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "具有主键 %(key)r 的对象 %(name)s 不存在。"
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "修改 %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "数据库错误"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "总共 %(count)s 个 %(name)s 变更成功。"
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "选中了 %(total_count)s 个"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s 个中 0 个被选"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" 删除成功。"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "变更历史： %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "登录"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "站点管理"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s 管理"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "日期："
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "时间："
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "查询"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "添加另一个"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "当前："
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "更改："
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "页面没有找到"
@@ -295,42 +312,42 @@ msgstr "页面没有找到"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "很报歉，请求页面无法找到。"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "首页"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "服务器错误"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "服务器错误(500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "服务器错误 <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"发生了一个错误。系统已将错误通过电子邮件报告给了站点管理员，相信问题应该会很"
-"快得到解决。感谢您的耐心。"
+"有一个错误。已经通过电子邮件通知网站管理员，不久以后应该可以修复。谢谢你的参"
+"与。"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -353,7 +370,7 @@ msgstr "选中所有的 %(total_count)s 个 %(module_name)s"
 msgid "Clear selection"
 msgstr "清除选中"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -363,22 +380,22 @@ msgid "Welcome,"
 msgstr "欢迎，"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "文档"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "注销"
 
@@ -390,34 +407,34 @@ msgstr "Django 站点管理员"
 msgid "Django administration"
 msgstr "Django 管理"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "增加"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "历史"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "在站点上查看"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "请修正下面的错误。"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "增加 %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "过滤器"
 
@@ -434,12 +451,12 @@ msgstr "排序优先级: %(priority_number)s"
 msgid "Toggle sorting"
 msgstr "正逆序切换"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "删除"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -449,7 +466,7 @@ msgstr ""
 "删除 %(object_name)s  '%(escaped_object)s' 会导致删除相关的对象，但你的帐号无"
 "权删除下列类型的对象："
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -457,7 +474,7 @@ msgid ""
 msgstr ""
 "要删除 %(object_name)s '%(escaped_object)s', 将要求删除以下受保护的相关对象:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -466,16 +483,16 @@ msgstr ""
 "你确认想要删除 %(object_name)s \"%(escaped_object)s\"？ 下列所有相关的项目都"
 "将被删除："
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "是的，我确定"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "删除多个对象"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -485,14 +502,14 @@ msgstr ""
 "要删除所选的 %(objects_name)s 结果会删除相关对象, 但你的账户没有权限删除这类"
 "对象:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr "要删除所选的 %(objects_name)s, 将要求删除以下受保护的相关对象:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -506,36 +523,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " 以 %(filter_title)s"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "模型在 %(name)s 应用中可用。"
+msgid "Models in the %(name)s application"
+msgstr "在应用程序 %(name)s 中的模型"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "修改"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "你无权修改任何东西。"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "最近动作"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "我的动作"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "无可用的"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "未知内容"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -544,31 +561,27 @@ msgstr ""
 "你的数据库安装有误。确保已经创建了相应的数据库表，并确保数据库可被相关的用户"
 "读取。"
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "用户名："
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "密码："
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
 msgstr "忘记了您的密码或用户名？"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "日期/时间"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "用户"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "动作"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -619,64 +632,64 @@ msgstr "首先，输入一个用户名和密码。然后，你就可以编辑更
 msgid "Enter a username and password."
 msgstr "输入用户名和"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "为用户 <strong>%(username)s</strong> 输入一个新的密码。"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "密码"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "密码(重复)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "为了校验，输入与上面相同的密码。"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "删除"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "添加另一个 %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "删除"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "删除？"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "感谢您今天在本站花费了一些宝贵时间。"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "重新登录"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "密码修改"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "密码修改成功"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "你的密码已修改。"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -684,88 +697,88 @@ msgstr ""
 "请输入你的旧密码，为了安全起见，接着要输入两遍新密码，以便我们校验你输入的是"
 "否正确。"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "旧密码"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "新密码"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "修改我的密码"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "密码重设"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "完成密码重设"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "你的口令己经设置。现在你可以继续进行登录。"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "密码重设确认"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "输入新密码"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "请输入两遍新密码，以便我们校验你输入的是否正确。"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "新密码："
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "确认密码："
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "密码重设失败"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr "密码重置链接无效，可能是因为它已使用。可以请求一次新的密码重置。"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "密码重设成功"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
-"我们已经按你所提交的电子邮箱地址发送了密码设置说明。你应该很快就能收到这封邮"
-"件。"
+"我们已经使用你提供的电子邮件地址发送了电子邮件，以便你设置密码。不久之后你应"
+"当可以收到这封邮件。"
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
-msgstr "因为你要求重置 %(site_name)s 上的账户密码, 所以收到了这封邮件."
+msgstr "你收到这封邮件是因为你请求重置你在网站 %(site_name)s上的用户账户密码。"
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -784,36 +797,36 @@ msgstr "感谢使用我们的站点！"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s 团队"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
-"忘记了你的密码？请在下面输入你的 e-mail 地址，我们将把新密码设置说明通过邮件"
-"发送给你。"
+"忘记你的密码了？在下面输入你的电子邮件地址，我们将发送一封设置新密码的邮件给"
+"你。"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "E-mail 地址："
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "电子邮件地址："
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "重设我的密码"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "所有日期"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
 msgstr "(None)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "选择 %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "选择 %s 来修改"
diff --git a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.mo
index b7bc24068d..06b9634fd2 100644
Binary files a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.po
index dba8c6112b..1af8c79a9b 100644
--- a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -2,6 +2,7 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Kevin Shi <leiarix@gmail.com>, 2012.
 # Lele Long <schemacs@gmail.com>, 2011.
 # slene <vslene@gmail.com>, 2011.
 # Ziang Song <songziang@gmail.com>, 2012.
@@ -9,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 19:18+0000\n"
-"Last-Translator: Ziang Song <songziang@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2012-07-20 01:51+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -31,11 +32,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"这是可用的%s列表。你可以在选择框下面进行选择，然后点击两选框之间的“选择”箭"
+"头。"
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "在此框中键入以过滤可用的%s列表"
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
diff --git a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo
index 55d2797155..df89744529 100644
Binary files a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po
index c5cb28097b..25b5e37ffc 100644
--- a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,35 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <ilay@ilay.tw>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # ming hsien tzang <tzangms@gmail.com>, 2011.
 # tcc <tcchou@tcchou.org>, 2011.
+#   <yyc1217@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:35+0100\n"
-"PO-Revision-Date: 2012-03-08 12:29+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"PO-Revision-Date: 2013-01-02 08:52+0000\n"
+"Last-Translator: yyc1217 <yyc1217@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "成功的刪除了 %(count)d 個 %(items)s."
 
-#: actions.py:60 options.py:1295
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr "無法刪除 %(name)s"
 
-#: actions.py:62 options.py:1297
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr "你確定嗎？"
 
@@ -38,252 +40,268 @@ msgstr "你確定嗎？"
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "刪除所選的 %(verbose_name_plural)s"
 
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
 msgid "All"
 msgstr "全部"
 
-#: filters.py:232
+#: filters.py:238
 msgid "Yes"
 msgstr "是"
 
-#: filters.py:233
+#: filters.py:239
 msgid "No"
 msgstr "否"
 
-#: filters.py:247
+#: filters.py:253
 msgid "Unknown"
 msgstr "未知"
 
-#: filters.py:306
+#: filters.py:308
 msgid "Any date"
 msgstr "任何日期"
 
-#: filters.py:307
+#: filters.py:309
 msgid "Today"
 msgstr "今天"
 
-#: filters.py:311
+#: filters.py:313
 msgid "Past 7 days"
 msgstr "過去 7 天"
 
-#: filters.py:315
+#: filters.py:317
 msgid "This month"
 msgstr "本月"
 
-#: filters.py:319
+#: filters.py:321
 msgid "This year"
 msgstr "今年"
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
-#: forms.py:18
+#: forms.py:19
 msgid "Please log in again, because your session has expired."
 msgstr "請重新登入, 因為你的 session 已過期。"
 
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "你的電子郵件地址不是你的使用者名稱。試著改用 '%s'。"
-
-#: helpers.py:20
+#: helpers.py:23
 msgid "Action:"
 msgstr "動作:"
 
-#: models.py:19
+#: models.py:24
 msgid "action time"
 msgstr "動作時間"
 
-#: models.py:22
+#: models.py:27
 msgid "object id"
 msgstr "物件 id"
 
-#: models.py:23
+#: models.py:28
 msgid "object repr"
 msgstr "物件 repr"
 
-#: models.py:24
+#: models.py:29
 msgid "action flag"
 msgstr "動作旗標"
 
-#: models.py:25
+#: models.py:30
 msgid "change message"
 msgstr "變更訊息"
 
-#: models.py:30
+#: models.py:35
 msgid "log entry"
 msgstr "紀錄項目"
 
-#: models.py:31
+#: models.py:36
 msgid "log entries"
 msgstr "紀錄項目"
 
-#: models.py:40
+#: models.py:45
 #, python-format
 msgid "Added \"%(object)s\"."
-msgstr ""
+msgstr "\"%(object)s\" 已新增。"
 
-#: models.py:42
+#: models.py:47
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
-msgstr ""
+msgstr "\"%(object)s\" - %(changes)s 已變更。"
 
-#: models.py:44
+#: models.py:52
 #, python-format
 msgid "Deleted \"%(object)s.\""
-msgstr ""
+msgstr "\"%(object)s\" 已刪除。"
 
-#: models.py:46
+#: models.py:54
 msgid "LogEntry Object"
-msgstr ""
+msgstr "紀錄項目"
 
-#: options.py:150 options.py:166
+#: options.py:156 options.py:172
 msgid "None"
 msgstr "None"
 
-#: options.py:671
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr "%s 已變更。"
 
-#: options.py:671 options.py:681
+#: options.py:684 options.py:694
 msgid "and"
 msgstr "和"
 
-#: options.py:676
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" 以新增。"
 
-#: options.py:680
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" 的 %(list)s 已變更。"
 
-#: options.py:685
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "%(name)s \"%(object)s\" 已刪除。"
 
-#: options.py:689
+#: options.py:702
 msgid "No fields changed."
 msgstr "沒有欄位被變更。"
 
-#: options.py:772
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" 已成功新增。"
-
-#: options.py:776 options.py:824
-msgid "You may edit it again below."
-msgstr "你可以在下面再次編輯。"
-
-#: options.py:788 options.py:837
-#, python-format
-msgid "You may add another %s below."
-msgstr "你可以在下面新增另一個 %s。"
-
-#: options.py:822
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" 已成功變更。"
-
-#: options.py:830
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" 新增成功。你可以在下面再次編輯它。"
 
-#: options.py:899 options.py:1159
+#: options.py:835
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may add another "
+"%(name)s below."
+msgstr "%(name)s \"%(obj)s\" 新增成功。你可以在下方加入其他 %(name)s 。"
+
+#: options.py:839
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" 已成功新增。"
+
+#: options.py:853
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
+"below."
+msgstr "%(name)s \"%(obj)s\" 變更成功。你可以在下方再次編輯。"
+
+#: options.py:867
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
+"%(name)s below."
+msgstr "%(name)s \"%(obj)s\" 變更成功。你可以在下方加入其他 %(name)s 。"
+
+#: options.py:873
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" 已成功變更。"
+
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr "必須要有項目被選到才能對它們進行動作。沒有項目變更。"
 
-#: options.py:918
+#: options.py:970
 msgid "No action selected."
 msgstr "沒有動作被選。"
 
-#: options.py:998
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr "新增 %s"
 
-#: options.py:1023 options.py:1267
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "主鍵 %(key)r 的 %(name)s 物件不存在。"
 
-#: options.py:1089
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr "變更 %s"
 
-#: options.py:1138
+#: options.py:1190
 msgid "Database error"
 msgstr "資料庫錯誤"
 
-#: options.py:1201
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "共 %(count)s %(name)s 已變更成功。"
 
-#: options.py:1228
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] "全部 %(total_count)s 個被選"
 
-#: options.py:1233
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr "%(cnt)s 中 0 個被選"
 
-#: options.py:1283
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" 已成功刪除。"
 
-#: options.py:1330
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr "變更歷史: %s"
 
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
 msgid "Log in"
 msgstr "登入"
 
-#: sites.py:380
+#: sites.py:388
 msgid "Site administration"
 msgstr "網站管理"
 
-#: sites.py:432
+#: sites.py:440
 #, python-format
 msgid "%s administration"
 msgstr "%s 管理"
 
-#: widgets.py:87
+#: widgets.py:90
 msgid "Date:"
 msgstr "日期"
 
-#: widgets.py:87
+#: widgets.py:91
 msgid "Time:"
 msgstr "時間"
 
-#: widgets.py:161
+#: widgets.py:165
 msgid "Lookup"
 msgstr "查詢"
 
-#: widgets.py:267
+#: widgets.py:271
 msgid "Add Another"
 msgstr "新增其它"
 
+#: widgets.py:316
+msgid "Currently:"
+msgstr "目前："
+
+#: widgets.py:317
+msgid "Change:"
+msgstr "變動："
+
 #: templates/admin/404.html:4 templates/admin/404.html.py:8
 msgid "Page not found"
 msgstr "頁面沒有找到"
@@ -292,42 +310,42 @@ msgstr "頁面沒有找到"
 msgid "We're sorry, but the requested page could not be found."
 msgstr "很抱歉，請求頁面無法找到。"
 
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
 msgid "Home"
 msgstr "首頁"
 
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
 msgid "Server error"
 msgstr "伺服器錯誤"
 
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
 msgid "Server error (500)"
 msgstr "伺服器錯誤 (500)"
 
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
 msgid "Server Error <em>(500)</em>"
 msgstr "伺服器錯誤 <em>(500)</em>"
 
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
 msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"存在一個錯誤。它已經透過電子郵件回報給網站管理員了，並且應該很快被改正。謝謝"
-"你的關心。"
+"存在一個錯誤。已透過電子郵件回報給網站管理員，並且應該很快就會被修正。謝謝你"
+"的關心。"
 
 #: templates/admin/actions.html:4
 msgid "Run the selected action"
@@ -350,7 +368,7 @@ msgstr "選擇全部 %(total_count)s %(module_name)s"
 msgid "Clear selection"
 msgstr "清除選擇"
 
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
@@ -360,22 +378,22 @@ msgid "Welcome,"
 msgstr "歡迎，"
 
 #: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Documentation"
 msgstr "文件"
 
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Change password"
 msgstr "變更密碼"
 
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
 msgid "Log out"
 msgstr "登出"
 
@@ -387,56 +405,56 @@ msgstr "Django 網站管理"
 msgid "Django administration"
 msgstr "Django 管理"
 
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
 msgid "Add"
 msgstr "新增"
 
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
 msgid "History"
 msgstr "歷史"
 
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
 #: templates/admin/edit_inline/stacked.html:9
 #: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr "在網站上檢視"
 
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "請更正下面的錯誤。"
 
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
 #, python-format
 msgid "Add %(name)s"
 msgstr "新增 %(name)s"
 
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
 msgid "Filter"
 msgstr "過濾器"
 
 #: templates/admin/change_list_results.html:17
 msgid "Remove from sorting"
-msgstr ""
+msgstr "從排序中移除"
 
 #: templates/admin/change_list_results.html:18
 #, python-format
 msgid "Sorting priority: %(priority_number)s"
-msgstr ""
+msgstr "優先排序：%(priority_number)s"
 
 #: templates/admin/change_list_results.html:19
 msgid "Toggle sorting"
-msgstr ""
+msgstr "切換排序"
 
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -446,7 +464,7 @@ msgstr ""
 "刪除 %(object_name)s '%(escaped_object)s' 會把相關的物件也刪除，不過你的帳號"
 "並沒有刪除以下型態物件的權限:"
 
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
@@ -454,7 +472,7 @@ msgid ""
 msgstr ""
 "要刪除 %(object_name)s '%(escaped_object)s', 將要求刪除下面受保護的相關物件:"
 
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -463,16 +481,16 @@ msgstr ""
 "你確定想要刪除 %(object_name)s \"%(escaped_object)s\"？以下所有的相關項目都會"
 "被刪除:"
 
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr "是的，我確定"
 
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
 msgid "Delete multiple objects"
 msgstr "刪除多個物件"
 
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -482,14 +500,14 @@ msgstr ""
 "要刪除所選的 %(objects_name)s, 結果會刪除相關物件, 但你的帳號無權刪除下面物件"
 "型態:"
 
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr "要刪除所選的 %(objects_name)s, 將要求刪除下面受保護的相關物件:"
 
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -502,36 +520,36 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr " 以 %(filter_title)s"
 
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "模型在 %(name)s 應用中可用。"
+msgid "Models in the %(name)s application"
+msgstr "%(name)s 應用程式中的Model"
 
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
 msgid "Change"
 msgstr "變更"
 
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
 msgid "You don't have permission to edit anything."
 msgstr "你沒有編輯任何東西的權限。"
 
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
 msgid "Recent Actions"
 msgstr "最近的動作"
 
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
 msgid "My Actions"
 msgstr "我的動作"
 
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
 msgid "None available"
 msgstr "無可用的"
 
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
 msgid "Unknown content"
 msgstr "未知內容"
 
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -540,31 +558,27 @@ msgstr ""
 "你的資料庫安裝有錯誤。確定資料庫表格已經建立，並確定資料庫可被合適的使用者讀"
 "取。"
 
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr "使用者名稱："
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
 msgid "Password:"
 msgstr "密碼："
 
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
 msgid "Forgotten your password or username?"
-msgstr ""
+msgstr "忘了你的密碼或是使用者名稱？"
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
 msgid "Date/time"
 msgstr "日期/時間"
 
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
 msgid "User"
 msgstr "使用者"
 
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
 msgid "Action"
 msgstr "動作"
 
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -615,64 +629,64 @@ msgstr "首先，輸入一個使用者名稱和密碼。然後你可以編輯更
 msgid "Enter a username and password."
 msgstr "輸入一個使用者名稱和密碼。"
 
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "為使用者<strong>%(username)s</strong>輸入一個新的密碼。"
 
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
 msgid "Password"
 msgstr "密碼"
 
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
 msgid "Password (again)"
 msgstr "密碼(重複)"
 
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
 msgid "Enter the same password as above, for verification."
 msgstr "為檢查用，請輸入與上面相同的密碼。"
 
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
+msgstr "移除"
+
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "新增其它 %(verbose_name)s"
 
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
-msgstr "移除"
-
 #: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr "刪除？"
 
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "感謝你今天花了重要的時間停留在本網站。"
 
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
 msgid "Log in again"
 msgstr "重新登入"
 
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
 msgid "Password change"
 msgstr "密碼變更"
 
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
 msgid "Password change successful"
 msgstr "密碼成功地變更"
 
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
 msgid "Your password was changed."
 msgstr "你的密碼已變更。"
 
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -680,87 +694,86 @@ msgstr ""
 "為了安全上的考慮，請輸入你的舊密碼，再輸入新密碼兩次，讓我們核驗你已正確地輸"
 "入。"
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
 msgid "Old password"
 msgstr "舊的密碼"
 
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
 msgid "New password"
 msgstr "新的密碼"
 
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
 msgid "Change my password"
 msgstr "變更我的密碼"
 
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
 msgid "Password reset"
 msgstr "密碼重設"
 
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
 msgid "Password reset complete"
 msgstr "密碼重設成功"
 
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "你的密碼已設置，現在可以繼續登入。"
 
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
 msgid "Password reset confirmation"
 msgstr "密碼重設確認"
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
 msgid "Enter new password"
 msgstr "輸入新的密碼"
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "請輸入你的新密碼兩次, 這樣我們才能檢查你的輸入是否正確。"
 
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
 msgid "New password:"
 msgstr "新密碼："
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
 msgid "Confirm password:"
 msgstr "確認密碼："
 
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
 msgid "Password reset unsuccessful"
 msgstr "密碼重設失敗"
 
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr "密碼重設連結無效，可能因為他已使用。請重新請求密碼重設。"
 
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
 msgid "Password reset successful"
 msgstr "密碼成功地重設"
 
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
 msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
 "address you submitted. You should be receiving it shortly."
-msgstr ""
-"我們已經寄出設定你的密碼操作指示到你提供的電子郵件位址。請你儘快收取信件。"
+msgstr "我們已經寄出設定密碼操作指示到你提供的電子郵件位址。請你儘快收取信件。"
 
 #: templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
-msgstr ""
+msgstr "這封電子郵件來自 %(site_name)s，因為你要求為帳號重新設定密碼。"
 
 #: templates/registration/password_reset_email.html:4
 msgid "Please go to the following page and choose a new password:"
@@ -779,36 +792,36 @@ msgstr "感謝使用本網站！"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s 團隊"
 
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
 msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 "忘記你的密碼? 請在下面輸入你的電子郵件位址, 然後我們會寄出設定新密碼的操作指"
 "示。"
 
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
-msgstr "電子郵件地址:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
+msgstr "電子信箱："
 
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
 msgid "Reset my password"
 msgstr "重設我的密碼"
 
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
 msgid "All dates"
 msgstr "所有日期"
 
-#: views/main.py:31
+#: views/main.py:33
 msgid "(None)"
-msgstr ""
+msgstr "(無)"
 
-#: views/main.py:74
+#: views/main.py:76
 #, python-format
 msgid "Select %s"
 msgstr "選擇 %s"
 
-#: views/main.py:76
+#: views/main.py:78
 #, python-format
 msgid "Select %s to change"
 msgstr "選擇 %s 來變更"
diff --git a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.mo
index cd70b7c0db..beb86fd7b7 100644
Binary files a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.mo differ
diff --git a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.po
index 86ec84c20d..1a618f7fe9 100644
--- a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.po
@@ -1,21 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <ilay@ilay.tw>, 2012.
 # tcc <tcchou@tcchou.org>, 2011.
+#   <yyc1217@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 10:42+0000\n"
-"Last-Translator: tcc <tcchou@tcchou.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"PO-Revision-Date: 2012-09-20 05:46+0000\n"
+"Last-Translator: yyc1217 <yyc1217@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -28,11 +30,13 @@ msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
+"可用的 %s 列表。你可以在下方的方框內選擇後，點擊兩個方框中的\"選取\"箭頭以選"
+"取。"
 
 #: static/admin/js/SelectFilter2.js:53
 #, c-format
 msgid "Type into this box to filter down the list of available %s."
-msgstr ""
+msgstr "輸入到這個方框以過濾可用的 %s 列表。"
 
 #: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
@@ -45,11 +49,11 @@ msgstr "全部選擇"
 #: static/admin/js/SelectFilter2.js:61
 #, c-format
 msgid "Click to choose all %s at once."
-msgstr ""
+msgstr "點擊以一次選取所有的 %s"
 
 #: static/admin/js/SelectFilter2.js:67
 msgid "Choose"
-msgstr ""
+msgstr "選取"
 
 #: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
@@ -66,15 +70,17 @@ msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
+"選取的 %s 列表。你可以在下方的方框內選擇後，點擊兩個方框中的\"移除\"箭頭以移"
+"除。"
 
 #: static/admin/js/SelectFilter2.js:80
 msgid "Remove all"
-msgstr ""
+msgstr "全部移除"
 
 #: static/admin/js/SelectFilter2.js:80
 #, c-format
 msgid "Click to remove all chosen %s at once."
-msgstr ""
+msgstr "點擊以一次移除所有選取的 %s"
 
 #: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py
index b697d7bdc8..f3be6530bf 100644
--- a/django/contrib/admin/models.py
+++ b/django/contrib/admin/models.py
@@ -4,6 +4,7 @@ from django.db import models
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.admin.util import quote
+from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext, ugettext_lazy as _
 from django.utils.encoding import smart_text
 from django.utils.encoding import python_2_unicode_compatible
@@ -72,5 +73,6 @@ class LogEntry(models.Model):
         This is relative to the Django admin index page.
         """
         if self.content_type and self.object_id:
-            return "%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, quote(self.object_id))
+            url_name = 'admin:%s_%s_change' % (self.content_type.app_label, self.content_type.model)
+            return reverse(url_name, args=(quote(self.object_id),))
         return None
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 1827d40159..b35f100fda 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1,15 +1,15 @@
 import copy
 from functools import update_wrapper, partial
-import warnings
 
 from django import forms
 from django.conf import settings
-from django.forms.formsets import all_valid
+from django.forms.formsets import all_valid, DELETION_FIELD_NAME
 from django.forms.models import (modelform_factory, modelformset_factory,
     inlineformset_factory, BaseInlineFormSet)
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.admin import widgets, helpers
-from django.contrib.admin.util import quote, unquote, flatten_fieldsets, get_deleted_objects, model_format_dict
+from django.contrib.admin.util import (unquote, flatten_fieldsets, get_deleted_objects,
+    model_format_dict, NestedObjects)
 from django.contrib.admin.templatetags.admin_static import static
 from django.contrib import messages
 from django.views.decorators.csrf import csrf_protect
@@ -29,6 +29,7 @@ from django.utils.datastructures import SortedDict
 from django.utils.html import escape, escapejs
 from django.utils.safestring import mark_safe
 from django.utils import six
+from django.utils.deprecation import RenameMethodsBase
 from django.utils.text import capfirst, get_text_list
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext
@@ -38,6 +39,7 @@ HORIZONTAL, VERTICAL = 1, 2
 # returns the <ul> class for a given radio_admin field
 get_ul_class = lambda x: 'radiolist%s' % ((x == HORIZONTAL) and ' inline' or '')
 
+
 class IncorrectLookupParameters(Exception):
     pass
 
@@ -62,7 +64,14 @@ FORMFIELD_FOR_DBFIELD_DEFAULTS = {
 
 csrf_protect_m = method_decorator(csrf_protect)
 
-class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
+
+class RenameBaseModelAdminMethods(forms.MediaDefiningClass, RenameMethodsBase):
+    renamed_methods = (
+        ('queryset', 'get_queryset', PendingDeprecationWarning),
+    )
+
+
+class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)):
     """Functionality common to both ModelAdmin and InlineAdmin."""
 
     raw_id_fields = ()
@@ -150,11 +159,24 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
                 })
             if 'choices' not in kwargs:
                 kwargs['choices'] = db_field.get_choices(
-                    include_blank = db_field.blank,
+                    include_blank=db_field.blank,
                     blank_choice=[('', _('None'))]
                 )
         return db_field.formfield(**kwargs)
 
+    def get_field_queryset(self, db, db_field, request):
+        """
+        If the ModelAdmin specifies ordering, the queryset should respect that
+        ordering.  Otherwise don't specify the queryset, let the field decide
+        (returns None in that case).
+        """
+        related_admin = self.admin_site._registry.get(db_field.rel.to, None)
+        if related_admin is not None:
+            ordering = related_admin.get_ordering(request)
+            if ordering is not None and ordering != ():
+                return db_field.rel.to._default_manager.using(db).order_by(*ordering).complex_filter(db_field.rel.limit_choices_to)
+        return None
+
     def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
         """
         Get a form Field for a ForeignKey.
@@ -169,6 +191,10 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
             })
             kwargs['empty_label'] = db_field.blank and _('None') or None
 
+        queryset = self.get_field_queryset(db, db_field, request)
+        if queryset is not None:
+            kwargs['queryset'] = queryset
+
         return db_field.formfield(**kwargs)
 
     def formfield_for_manytomany(self, db_field, request=None, **kwargs):
@@ -188,6 +214,10 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
         elif db_field.name in (list(self.filter_vertical) + list(self.filter_horizontal)):
             kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
 
+        queryset = self.get_field_queryset(db, db_field, request)
+        if queryset is not None:
+            kwargs['queryset'] = queryset
+
         return db_field.formfield(**kwargs)
 
     def _declared_fieldsets(self):
@@ -216,12 +246,12 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
         """
         return self.prepopulated_fields
 
-    def queryset(self, request):
+    def get_queryset(self, request):
         """
         Returns a QuerySet of all model instances that can be edited by the
         admin site. This is used by changelist_view.
         """
-        qs = self.model._default_manager.get_query_set()
+        qs = self.model._default_manager.get_queryset()
         # TODO: this should be handled by some parameter to the ChangeList.
         ordering = self.get_ordering(request)
         if ordering:
@@ -246,7 +276,7 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
             parts.pop()
 
         # Special case -- foo__id__exact and foo__id queries are implied
-        # if foo has been specificially included in the lookup list; so
+        # if foo has been specifically included in the lookup list; so
         # drop __id if it is the last part. However, first we need to find
         # the pk attribute name.
         rel_name = None
@@ -254,7 +284,7 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
             try:
                 field, _, _, _ = model._meta.get_field_by_name(part)
             except FieldDoesNotExist:
-                # Lookups on non-existants fields are ok, since they're ignored
+                # Lookups on non-existent fields are ok, since they're ignored
                 # later.
                 return True
             if hasattr(field, 'rel'):
@@ -276,7 +306,7 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
     def has_add_permission(self, request):
         """
         Returns True if the given request has permission to add an object.
-        Can be overriden by the user in subclasses.
+        Can be overridden by the user in subclasses.
         """
         opts = self.opts
         return request.user.has_perm(opts.app_label + '.' + opts.get_add_permission())
@@ -287,7 +317,7 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
         Django model instance, the default implementation doesn't examine the
         `obj` parameter.
 
-        Can be overriden by the user in subclasses. In such case it should
+        Can be overridden by the user in subclasses. In such case it should
         return True if the given request has permission to change the `obj`
         model instance. If `obj` is None, this should return True if the given
         request has permission to change *any* object of the given type.
@@ -301,7 +331,7 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)):
         Django model instance, the default implementation doesn't examine the
         `obj` parameter.
 
-        Can be overriden by the user in subclasses. In such case it should
+        Can be overridden by the user in subclasses. In such case it should
         return True if the given request has permission to delete the `obj`
         model instance. If `obj` is None, this should return True if the given
         request has permission to delete *any* object of the given type.
@@ -370,7 +400,7 @@ class ModelAdmin(BaseModelAdmin):
                 return self.admin_site.admin_view(view)(*args, **kwargs)
             return update_wrapper(wrapper, view)
 
-        info = self.model._meta.app_label, self.model._meta.module_name
+        info = self.model._meta.app_label, self.model._meta.model_name
 
         urlpatterns = patterns('',
             url(r'^$',
@@ -448,7 +478,7 @@ class ModelAdmin(BaseModelAdmin):
             # Take the custom ModelForm's Meta.exclude into account only if the
             # ModelAdmin doesn't define its own.
             exclude.extend(self.form._meta.exclude)
-        # if exclude is an empty list we pass None to be consistant with the
+        # if exclude is an empty list we pass None to be consistent with the
         # default on modelform_factory
         exclude = exclude or None
         defaults = {
@@ -473,12 +503,12 @@ class ModelAdmin(BaseModelAdmin):
         returned if no match is found (or the object_id failed validation
         against the primary key field).
         """
-        queryset = self.queryset(request)
+        queryset = self.get_queryset(request)
         model = queryset.model
         try:
             object_id = model._meta.pk.to_python(object_id)
             return queryset.get(pk=object_id)
-        except (model.DoesNotExist, ValidationError):
+        except (model.DoesNotExist, ValidationError, ValueError):
             return None
 
     def get_changelist_form(self, request, **kwargs):
@@ -571,7 +601,7 @@ class ModelAdmin(BaseModelAdmin):
         Return a dictionary mapping the names of all actions for this
         ModelAdmin to a tuple of (callable, name, description) for each action.
         """
-        # If self.actions is explicitally set to None that means that we don't
+        # If self.actions is explicitly set to None that means that we don't
         # want *any* actions enabled on this page.
         from django.contrib.admin.views.main import IS_POPUP_VAR
         if self.actions is None or IS_POPUP_VAR in request.GET:
@@ -782,54 +812,32 @@ class ModelAdmin(BaseModelAdmin):
             form_template = self.change_form_template
 
         return TemplateResponse(request, form_template or [
-            "admin/%s/%s/change_form.html" % (app_label, opts.object_name.lower()),
+            "admin/%s/%s/change_form.html" % (app_label, opts.model_name),
             "admin/%s/change_form.html" % app_label,
             "admin/change_form.html"
         ], context, current_app=self.admin_site.name)
 
-    def response_add(self, request, obj, post_url_continue='../%s/',
-                     continue_editing_url=None, add_another_url=None,
-                     hasperm_url=None, noperm_url=None):
+    def response_add(self, request, obj, post_url_continue=None):
         """
         Determines the HttpResponse for the add_view stage.
-
-        :param request: HttpRequest instance.
-        :param obj: Object just added.
-        :param post_url_continue: Deprecated/undocumented.
-        :param continue_editing_url: URL where user will be redirected after
-                                     pressing 'Save and continue editing'.
-        :param add_another_url: URL where user will be redirected after
-                                pressing 'Save and add another'.
-        :param hasperm_url: URL to redirect after a successful object creation
-                            when the user has change permissions.
-        :param noperm_url: URL to redirect after a successful object creation
-                           when the user has no change permissions.
         """
-        if post_url_continue != '../%s/':
-            warnings.warn("The undocumented 'post_url_continue' argument to "
-                          "ModelAdmin.response_add() is deprecated, use the new "
-                          "*_url arguments instead.", DeprecationWarning,
-                          stacklevel=2)
         opts = obj._meta
-        pk_value = obj.pk
-        app_label = opts.app_label
-        model_name = opts.module_name
-        site_name = self.admin_site.name
+        pk_value = obj._get_pk_val()
 
         msg_dict = {'name': force_text(opts.verbose_name), 'obj': force_text(obj)}
-
         # Here, we distinguish between different save types by checking for
         # the presence of keys in request.POST.
         if "_continue" in request.POST:
             msg = _('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % msg_dict
-            self.message_user(request, msg)
-            if continue_editing_url is None:
-                continue_editing_url = 'admin:%s_%s_change' % (app_label, model_name)
-            url = reverse(continue_editing_url, args=(quote(pk_value),),
-                          current_app=site_name)
+            self.message_user(request, msg, messages.SUCCESS)
+            if post_url_continue is None:
+                post_url_continue = reverse('admin:%s_%s_change' %
+                                            (opts.app_label, opts.model_name),
+                                            args=(pk_value,),
+                                            current_app=self.admin_site.name)
             if "_popup" in request.POST:
-                url += "?_popup=1"
-            return HttpResponseRedirect(url)
+                post_url_continue += "?_popup=1"
+            return HttpResponseRedirect(post_url_continue)
 
         if "_popup" in request.POST:
             return HttpResponse(
@@ -839,103 +847,76 @@ class ModelAdmin(BaseModelAdmin):
                 (escape(pk_value), escapejs(obj)))
         elif "_addanother" in request.POST:
             msg = _('The %(name)s "%(obj)s" was added successfully. You may add another %(name)s below.') % msg_dict
-            self.message_user(request, msg)
-            if add_another_url is None:
-                add_another_url = 'admin:%s_%s_add' % (app_label, model_name)
-            url = reverse(add_another_url, current_app=site_name)
-            return HttpResponseRedirect(url)
+            self.message_user(request, msg, messages.SUCCESS)
+            return HttpResponseRedirect(request.path)
         else:
             msg = _('The %(name)s "%(obj)s" was added successfully.') % msg_dict
-            self.message_user(request, msg)
+            self.message_user(request, msg, messages.SUCCESS)
+            return self.response_post_save_add(request, obj)
 
-            # Figure out where to redirect. If the user has change permission,
-            # redirect to the change-list page for this object. Otherwise,
-            # redirect to the admin index.
-            if self.has_change_permission(request, None):
-                if hasperm_url is None:
-                    hasperm_url = 'admin:%s_%s_changelist' % (app_label, model_name)
-                url = reverse(hasperm_url, current_app=site_name)
-            else:
-                if noperm_url is None:
-                    noperm_url = 'admin:index'
-                url = reverse(noperm_url, current_app=site_name)
-            return HttpResponseRedirect(url)
-
-    def response_change(self, request, obj, continue_editing_url=None,
-                        save_as_new_url=None, add_another_url=None,
-                        hasperm_url=None, noperm_url=None):
+    def response_change(self, request, obj):
         """
         Determines the HttpResponse for the change_view stage.
-
-        :param request: HttpRequest instance.
-        :param obj: Object just modified.
-        :param continue_editing_url: URL where user will be redirected after
-                                     pressing 'Save and continue editing'.
-        :param save_as_new_url: URL where user will be redirected after pressing
-                                'Save as new' (when applicable).
-        :param add_another_url: URL where user will be redirected after pressing
-                                'Save and add another'.
-        :param hasperm_url: URL to redirect after a successful object edition when
-                            the user has change permissions.
-        :param noperm_url: URL to redirect after a successful object edition when
-                           the user has no change permissions.
         """
-        opts = obj._meta
+        opts = self.model._meta
 
-        app_label = opts.app_label
-        model_name = opts.module_name
-        site_name = self.admin_site.name
-        verbose_name = opts.verbose_name
-        # Handle proxy models automatically created by .only() or .defer().
-        # Refs #14529
-        if obj._deferred:
-            opts_ = opts.proxy_for_model._meta
-            verbose_name = opts_.verbose_name
-            model_name = opts_.module_name
-
-        msg_dict = {'name': force_text(verbose_name), 'obj': force_text(obj)}
+        pk_value = obj._get_pk_val()
 
+        msg_dict = {'name': force_text(opts.verbose_name), 'obj': force_text(obj)}
         if "_continue" in request.POST:
             msg = _('The %(name)s "%(obj)s" was changed successfully. You may edit it again below.') % msg_dict
-            self.message_user(request, msg)
-            if continue_editing_url is None:
-                continue_editing_url = 'admin:%s_%s_change' % (app_label, model_name)
-            url = reverse(continue_editing_url, args=(quote(obj.pk),),
-                          current_app=site_name)
-            if "_popup" in request.POST:
-                url += "?_popup=1"
-            return HttpResponseRedirect(url)
+            self.message_user(request, msg, messages.SUCCESS)
+            if "_popup" in request.REQUEST:
+                return HttpResponseRedirect(request.path + "?_popup=1")
+            else:
+                return HttpResponseRedirect(request.path)
         elif "_saveasnew" in request.POST:
             msg = _('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % msg_dict
-            self.message_user(request, msg)
-            if save_as_new_url is None:
-                save_as_new_url = 'admin:%s_%s_change' % (app_label, model_name)
-            url = reverse(save_as_new_url, args=(quote(obj.pk),),
-                          current_app=site_name)
-            return HttpResponseRedirect(url)
+            self.message_user(request, msg, messages.SUCCESS)
+            return HttpResponseRedirect(reverse('admin:%s_%s_change' %
+                                        (opts.app_label, opts.model_name),
+                                        args=(pk_value,),
+                                        current_app=self.admin_site.name))
         elif "_addanother" in request.POST:
             msg = _('The %(name)s "%(obj)s" was changed successfully. You may add another %(name)s below.') % msg_dict
-            self.message_user(request, msg)
-            if add_another_url is None:
-                add_another_url = 'admin:%s_%s_add' % (app_label, model_name)
-            url = reverse(add_another_url, current_app=site_name)
-            return HttpResponseRedirect(url)
+            self.message_user(request, msg, messages.SUCCESS)
+            return HttpResponseRedirect(reverse('admin:%s_%s_add' %
+                                        (opts.app_label, opts.model_name),
+                                        current_app=self.admin_site.name))
         else:
             msg = _('The %(name)s "%(obj)s" was changed successfully.') % msg_dict
-            self.message_user(request, msg)
-            # Figure out where to redirect. If the user has change permission,
-            # redirect to the change-list page for this object. Otherwise,
-            # redirect to the admin index.
-            if self.has_change_permission(request, None):
-                if hasperm_url is None:
-                    hasperm_url = 'admin:%s_%s_changelist' % (app_label,
-                                                              model_name)
-                url = reverse(hasperm_url, current_app=site_name)
-            else:
-                if noperm_url is None:
-                    noperm_url = 'admin:index'
-                url = reverse(noperm_url, current_app=site_name)
-            return HttpResponseRedirect(url)
+            self.message_user(request, msg, messages.SUCCESS)
+            return self.response_post_save_change(request, obj)
+
+    def response_post_save_add(self, request, obj):
+        """
+        Figure out where to redirect after the 'Save' button has been pressed
+        when adding a new object.
+        """
+        opts = self.model._meta
+        if self.has_change_permission(request, None):
+            post_url = reverse('admin:%s_%s_changelist' %
+                               (opts.app_label, opts.model_name),
+                               current_app=self.admin_site.name)
+        else:
+            post_url = reverse('admin:index',
+                               current_app=self.admin_site.name)
+        return HttpResponseRedirect(post_url)
+
+    def response_post_save_change(self, request, obj):
+        """
+        Figure out where to redirect after the 'Save' button has been pressed
+        when editing an existing object.
+        """
+        opts = self.model._meta
+        if self.has_change_permission(request, None):
+            post_url = reverse('admin:%s_%s_changelist' %
+                               (opts.app_label, opts.model_name),
+                               current_app=self.admin_site.name)
+        else:
+            post_url = reverse('admin:index',
+                               current_app=self.admin_site.name)
+        return HttpResponseRedirect(post_url)
 
     def response_action(self, request, queryset):
         """
@@ -983,7 +964,7 @@ class ModelAdmin(BaseModelAdmin):
                 # Reminder that something needs to be selected or nothing will happen
                 msg = _("Items must be selected in order to perform "
                         "actions on them. No items have been changed.")
-                self.message_user(request, msg)
+                self.message_user(request, msg, messages.WARNING)
                 return None
 
             if not select_across:
@@ -1001,11 +982,11 @@ class ModelAdmin(BaseModelAdmin):
                 return HttpResponseRedirect(request.get_full_path())
         else:
             msg = _("No action selected.")
-            self.message_user(request, msg)
+            self.message_user(request, msg, messages.WARNING)
             return None
 
     @csrf_protect_m
-    @transaction.commit_on_success
+    @transaction.atomic
     def add_view(self, request, form_url='', extra_context=None):
         "The 'add' admin view for this model."
         model = self.model
@@ -1034,7 +1015,7 @@ class ModelAdmin(BaseModelAdmin):
                 formset = FormSet(data=request.POST, files=request.FILES,
                                   instance=new_object,
                                   save_as_new="_saveasnew" in request.POST,
-                                  prefix=prefix, queryset=inline.queryset(request))
+                                  prefix=prefix, queryset=inline.get_queryset(request))
                 formsets.append(formset)
             if all_valid(formsets) and form_validated:
                 self.save_model(request, new_object, form, False)
@@ -1060,7 +1041,7 @@ class ModelAdmin(BaseModelAdmin):
                 if prefixes[prefix] != 1 or not prefix:
                     prefix = "%s-%s" % (prefix, prefixes[prefix])
                 formset = FormSet(instance=self.model(), prefix=prefix,
-                                  queryset=inline.queryset(request))
+                                  queryset=inline.get_queryset(request))
                 formsets.append(formset)
 
         adminForm = helpers.AdminForm(form, list(self.get_fieldsets(request)),
@@ -1092,7 +1073,7 @@ class ModelAdmin(BaseModelAdmin):
         return self.render_change_form(request, context, form_url=form_url, add=True)
 
     @csrf_protect_m
-    @transaction.commit_on_success
+    @transaction.atomic
     def change_view(self, request, object_id, form_url='', extra_context=None):
         "The 'change' admin view for this model."
         model = self.model
@@ -1108,7 +1089,7 @@ class ModelAdmin(BaseModelAdmin):
 
         if request.method == 'POST' and "_saveasnew" in request.POST:
             return self.add_view(request, form_url=reverse('admin:%s_%s_add' %
-                                    (opts.app_label, opts.module_name),
+                                    (opts.app_label, opts.model_name),
                                     current_app=self.admin_site.name))
 
         ModelForm = self.get_form(request, obj)
@@ -1130,7 +1111,7 @@ class ModelAdmin(BaseModelAdmin):
                     prefix = "%s-%s" % (prefix, prefixes[prefix])
                 formset = FormSet(request.POST, request.FILES,
                                   instance=new_object, prefix=prefix,
-                                  queryset=inline.queryset(request))
+                                  queryset=inline.get_queryset(request))
 
                 formsets.append(formset)
 
@@ -1150,7 +1131,7 @@ class ModelAdmin(BaseModelAdmin):
                 if prefixes[prefix] != 1 or not prefix:
                     prefix = "%s-%s" % (prefix, prefixes[prefix])
                 formset = FormSet(instance=obj, prefix=prefix,
-                                  queryset=inline.queryset(request))
+                                  queryset=inline.get_queryset(request))
                 formsets.append(formset)
 
         adminForm = helpers.AdminForm(form, self.get_fieldsets(request, obj),
@@ -1235,7 +1216,7 @@ class ModelAdmin(BaseModelAdmin):
         if (actions and request.method == 'POST' and
                 'index' in request.POST and '_save' not in request.POST):
             if selected:
-                response = self.response_action(request, queryset=cl.get_query_set(request))
+                response = self.response_action(request, queryset=cl.get_queryset(request))
                 if response:
                     return response
                 else:
@@ -1243,7 +1224,7 @@ class ModelAdmin(BaseModelAdmin):
             else:
                 msg = _("Items must be selected in order to perform "
                         "actions on them. No items have been changed.")
-                self.message_user(request, msg)
+                self.message_user(request, msg, messages.WARNING)
                 action_failed = True
 
         # Actions with confirmation
@@ -1251,7 +1232,7 @@ class ModelAdmin(BaseModelAdmin):
                 helpers.ACTION_CHECKBOX_NAME in request.POST and
                 'index' not in request.POST and '_save' not in request.POST):
             if selected:
-                response = self.response_action(request, queryset=cl.get_query_set(request))
+                response = self.response_action(request, queryset=cl.get_queryset(request))
                 if response:
                     return response
                 else:
@@ -1288,7 +1269,7 @@ class ModelAdmin(BaseModelAdmin):
                                     changecount) % {'count': changecount,
                                                     'name': name,
                                                     'obj': force_text(obj)}
-                    self.message_user(request, msg)
+                    self.message_user(request, msg, messages.SUCCESS)
 
                 return HttpResponseRedirect(request.get_full_path())
 
@@ -1331,13 +1312,13 @@ class ModelAdmin(BaseModelAdmin):
         context.update(extra_context or {})
 
         return TemplateResponse(request, self.change_list_template or [
-            'admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()),
+            'admin/%s/%s/change_list.html' % (app_label, opts.model_name),
             'admin/%s/change_list.html' % app_label,
             'admin/change_list.html'
         ], context, current_app=self.admin_site.name)
 
     @csrf_protect_m
-    @transaction.commit_on_success
+    @transaction.atomic
     def delete_view(self, request, object_id, extra_context=None):
         "The 'delete' admin view for this model."
         opts = self.model._meta
@@ -1365,13 +1346,17 @@ class ModelAdmin(BaseModelAdmin):
             self.log_deletion(request, obj, obj_display)
             self.delete_model(request, obj)
 
-            self.message_user(request, _('The %(name)s "%(obj)s" was deleted successfully.') % {'name': force_text(opts.verbose_name), 'obj': force_text(obj_display)})
+            self.message_user(request, _(
+                'The %(name)s "%(obj)s" was deleted successfully.') % {
+                                       'name': force_text(opts.verbose_name),
+                                       'obj': force_text(obj_display)},
+                              messages.SUCCESS)
 
             if not self.has_change_permission(request, None):
                 return HttpResponseRedirect(reverse('admin:index',
                                                     current_app=self.admin_site.name))
             return HttpResponseRedirect(reverse('admin:%s_%s_changelist' %
-                                        (opts.app_label, opts.module_name),
+                                        (opts.app_label, opts.model_name),
                                         current_app=self.admin_site.name))
 
         object_name = force_text(opts.verbose_name)
@@ -1394,7 +1379,7 @@ class ModelAdmin(BaseModelAdmin):
         context.update(extra_context or {})
 
         return TemplateResponse(request, self.delete_confirmation_template or [
-            "admin/%s/%s/delete_confirmation.html" % (app_label, opts.object_name.lower()),
+            "admin/%s/%s/delete_confirmation.html" % (app_label, opts.model_name),
             "admin/%s/delete_confirmation.html" % app_label,
             "admin/delete_confirmation.html"
         ], context, current_app=self.admin_site.name)
@@ -1402,15 +1387,21 @@ class ModelAdmin(BaseModelAdmin):
     def history_view(self, request, object_id, extra_context=None):
         "The 'history' admin view for this model."
         from django.contrib.admin.models import LogEntry
+        # First check if the user can see this history.
         model = self.model
+        obj = get_object_or_404(model, pk=unquote(object_id))
+
+        if not self.has_change_permission(request, obj):
+            raise PermissionDenied
+
+        # Then get the history for this object.
         opts = model._meta
         app_label = opts.app_label
         action_list = LogEntry.objects.filter(
-            object_id = unquote(object_id),
-            content_type__id__exact = ContentType.objects.get_for_model(model).id
+            object_id=unquote(object_id),
+            content_type__id__exact=ContentType.objects.get_for_model(model).id
         ).select_related().order_by('action_time')
-        # If no history was found, see whether this object even exists.
-        obj = get_object_or_404(model, pk=unquote(object_id))
+
         context = {
             'title': _('Change history: %s') % force_text(obj),
             'action_list': action_list,
@@ -1421,7 +1412,7 @@ class ModelAdmin(BaseModelAdmin):
         }
         context.update(extra_context or {})
         return TemplateResponse(request, self.object_history_template or [
-            "admin/%s/%s/object_history.html" % (app_label, opts.object_name.lower()),
+            "admin/%s/%s/object_history.html" % (app_label, opts.model_name),
             "admin/%s/object_history.html" % app_label,
             "admin/object_history.html"
         ], context, current_app=self.admin_site.name)
@@ -1494,7 +1485,44 @@ class InlineModelAdmin(BaseModelAdmin):
             "max_num": self.max_num,
             "can_delete": can_delete,
         }
+
         defaults.update(kwargs)
+        base_model_form = defaults['form']
+
+        class DeleteProtectedModelForm(base_model_form):
+            def hand_clean_DELETE(self):
+                """
+                We don't validate the 'DELETE' field itself because on
+                templates it's not rendered using the field information, but
+                just using a generic "deletion_field" of the InlineModelAdmin.
+                """
+                if self.cleaned_data.get(DELETION_FIELD_NAME, False):
+                    using = router.db_for_write(self._meta.model)
+                    collector = NestedObjects(using=using)
+                    collector.collect([self.instance])
+                    if collector.protected:
+                        objs = []
+                        for p in collector.protected:
+                            objs.append(
+                                # Translators: Model verbose name and instance representation, suitable to be an item in a list
+                                _('%(class_name)s %(instance)s') % {
+                                    'class_name': p._meta.verbose_name,
+                                    'instance': p}
+                            )
+                        msg_dict = {'class_name': self._meta.model._meta.verbose_name,
+                                    'instance': self.instance,
+                                    'related_objects': get_text_list(objs, _('and'))}
+                        msg = _("Deleting %(class_name)s %(instance)s would require "
+                                "deleting the following protected related objects: "
+                                "%(related_objects)s") % msg_dict
+                        raise ValidationError(msg)
+
+            def is_valid(self):
+                result = super(DeleteProtectedModelForm, self).is_valid()
+                self.hand_clean_DELETE()
+                return result
+
+        defaults['form'] = DeleteProtectedModelForm
         return inlineformset_factory(self.parent_model, self.model, **defaults)
 
     def get_fieldsets(self, request, obj=None):
@@ -1504,8 +1532,8 @@ class InlineModelAdmin(BaseModelAdmin):
         fields = list(form.base_fields) + list(self.get_readonly_fields(request, obj))
         return [(None, {'fields': fields})]
 
-    def queryset(self, request):
-        queryset = super(InlineModelAdmin, self).queryset(request)
+    def get_queryset(self, request):
+        queryset = super(InlineModelAdmin, self).get_queryset(request)
         if not self.has_change_permission(request):
             queryset = queryset.none()
         return queryset
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index 185417015a..414d1b4f72 100644
--- a/django/contrib/admin/sites.py
+++ b/django/contrib/admin/sites.py
@@ -2,7 +2,7 @@ from functools import update_wrapper
 from django.http import Http404, HttpResponseRedirect
 from django.contrib.admin import ModelAdmin, actions
 from django.contrib.admin.forms import AdminAuthenticationForm
-from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.contrib.auth import logout as auth_logout, REDIRECT_FIELD_NAME
 from django.contrib.contenttypes import views as contenttype_views
 from django.views.decorators.csrf import csrf_protect
 from django.db.models.base import ModelBase
@@ -129,7 +129,7 @@ class AdminSite(object):
 
     def get_action(self, name):
         """
-        Explicitally get a registered global action wheather it's enabled or
+        Explicitly get a registered global action whether it's enabled or
         not. Raises KeyError for invalid names.
         """
         return self._global_actions[name]
@@ -193,6 +193,8 @@ class AdminSite(object):
         cacheable=True.
         """
         def inner(request, *args, **kwargs):
+            if LOGIN_FORM_KEY in request.POST and request.user.is_authenticated():
+                auth_logout(request)
             if not self.has_permission(request):
                 if request.path == reverse('admin:logout',
                                            current_app=self.name):
@@ -247,7 +249,7 @@ class AdminSite(object):
         # Add in each model's views.
         for model, model_admin in six.iteritems(self._registry):
             urlpatterns += patterns('',
-                url(r'^%s/%s/' % (model._meta.app_label, model._meta.module_name),
+                url(r'^%s/%s/' % (model._meta.app_label, model._meta.model_name),
                     include(model_admin.urls))
             )
         return urlpatterns
@@ -351,7 +353,7 @@ class AdminSite(object):
                 # Check whether user has any perm for this module.
                 # If so, add the module to the model_list.
                 if True in perms.values():
-                    info = (app_label, model._meta.module_name)
+                    info = (app_label, model._meta.model_name)
                     model_dict = {
                         'name': capfirst(model._meta.verbose_name_plural),
                         'object_name': model._meta.object_name,
@@ -407,7 +409,7 @@ class AdminSite(object):
                     # Check whether user has any perm for this module.
                     # If so, add the module to the model_list.
                     if True in perms.values():
-                        info = (app_label, model._meta.module_name)
+                        info = (app_label, model._meta.model_name)
                         model_dict = {
                             'name': capfirst(model._meta.verbose_name_plural),
                             'object_name': model._meta.object_name,
diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css
index 5ac4032c15..1439b5d675 100644
--- a/django/contrib/admin/static/admin/css/base.css
+++ b/django/contrib/admin/static/admin/css/base.css
@@ -424,7 +424,8 @@ textarea {
     vertical-align: top !important;
 }
 
-input[type=text], input[type=password], textarea, select, .vTextField {
+input[type=text], input[type=password], input[type=email], input[type=url], input[type=number],
+textarea, select, .vTextField {
     border: 1px solid #ccc;
 }
 
diff --git a/django/contrib/admin/static/admin/css/changelists.css b/django/contrib/admin/static/admin/css/changelists.css
index 3c1a8c16a9..28021d02bd 100644
--- a/django/contrib/admin/static/admin/css/changelists.css
+++ b/django/contrib/admin/static/admin/css/changelists.css
@@ -32,6 +32,10 @@
     padding-right: 1em;
 }
 
+#changelist-form .results {
+  overflow-x: auto;
+}
+
 #changelist .toplinks {
     border-bottom: 1px solid #ccc !important;
 }
diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css
index efec04b670..4885f62566 100644
--- a/django/contrib/admin/static/admin/css/forms.css
+++ b/django/contrib/admin/static/admin/css/forms.css
@@ -65,6 +65,7 @@ form ul.inline li {
     padding: 3px 10px 0 0;
     float: left;
     width: 8em;
+    word-wrap: break-word;
 }
 
 .aligned ul label {
diff --git a/django/contrib/admin/static/admin/css/login.css b/django/contrib/admin/static/admin/css/login.css
index 8872ade70b..a91de117b4 100644
--- a/django/contrib/admin/static/admin/css/login.css
+++ b/django/contrib/admin/static/admin/css/login.css
@@ -29,17 +29,20 @@ body.login {
 }
 
 .login .form-row label {
-    float: left;
-    width: 9em;
     padding-right: 0.5em;
     line-height: 2em;
-    text-align: right;
     font-size: 1em;
+    clear: both;
     color: #333;
 }
 
 .login .form-row #id_username, .login .form-row #id_password {
-    width: 14em;
+    clear: both;
+    padding: 6px;
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
 }
 
 .login span.help {
diff --git a/django/contrib/admin/static/admin/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css
index 3b19353e6f..d61cd3a218 100644
--- a/django/contrib/admin/static/admin/css/widgets.css
+++ b/django/contrib/admin/static/admin/css/widgets.css
@@ -1,18 +1,18 @@
 /* SELECTOR (FILTER INTERFACE) */
 
 .selector {
-    width: 580px;
+    width: 840px;
     float: left;
 }
 
 .selector select {
-    width: 270px;
+    width: 400px;
     height: 17.2em;
 }
 
 .selector-available, .selector-chosen {
     float: left;
-    width: 270px;
+    width: 400px;
     text-align: center;
     margin-bottom: 5px;
 }
@@ -48,7 +48,7 @@
 }
 
 .selector .selector-available input {
-    width: 230px;
+    width: 360px;
 }
 
 .selector ul.selector-chooser {
diff --git a/django/contrib/admin/static/admin/js/actions.js b/django/contrib/admin/static/admin/js/actions.js
index 8494970aa1..1992a702c2 100644
--- a/django/contrib/admin/static/admin/js/actions.js
+++ b/django/contrib/admin/static/admin/js/actions.js
@@ -9,7 +9,7 @@
 			} else {
 				reset();
 			}
-			$(actionCheckboxes).attr("checked", checked)
+			$(actionCheckboxes).prop("checked", checked)
 				.parent().parent().toggleClass(options.selectedClass, checked);
 		},
 		updateCounter = function() {
@@ -19,7 +19,7 @@
 				sel: sel,
 				cnt: _actions_icnt
 			}, true));
-			$(options.allToggle).attr("checked", function() {
+			$(options.allToggle).prop("checked", function() {
 				if (sel == actionCheckboxes.length) {
 					value = true;
 					showQuestion();
@@ -64,7 +64,7 @@
 			}
 		});
 		$(options.allToggle).show().click(function() {
-			checker($(this).attr("checked"));
+			checker($(this).prop("checked"));
 			updateCounter();
 		});
 		$("div.actions span.question a").click(function(event) {
@@ -74,7 +74,7 @@
 		});
 		$("div.actions span.clear a").click(function(event) {
 			event.preventDefault();
-			$(options.allToggle).attr("checked", false);
+			$(options.allToggle).prop("checked", false);
 			clearAcross();
 			checker(0);
 			updateCounter();
@@ -85,14 +85,14 @@
 			var target = event.target ? event.target : event.srcElement;
 			if (lastChecked && $.data(lastChecked) != $.data(target) && event.shiftKey === true) {
 				var inrange = false;
-				$(lastChecked).attr("checked", target.checked)
+				$(lastChecked).prop("checked", target.checked)
 					.parent().parent().toggleClass(options.selectedClass, target.checked);
 				$(actionCheckboxes).each(function() {
 					if ($.data(this) == $.data(lastChecked) || $.data(this) == $.data(target)) {
 						inrange = (inrange) ? false : true;
 					}
 					if (inrange) {
-						$(this).attr("checked", target.checked)
+						$(this).prop("checked", target.checked)
 							.parent().parent().toggleClass(options.selectedClass, target.checked);
 					}
 				});
diff --git a/django/contrib/admin/static/admin/js/actions.min.js b/django/contrib/admin/static/admin/js/actions.min.js
index 6b1947cefe..4d2c5f7f1c 100644
--- a/django/contrib/admin/static/admin/js/actions.min.js
+++ b/django/contrib/admin/static/admin/js/actions.min.js
@@ -1,6 +1,6 @@
-(function(a){a.fn.actions=function(n){var b=a.extend({},a.fn.actions.defaults,n),e=a(this),g=false,k=function(c){c?i():j();a(e).attr("checked",c).parent().parent().toggleClass(b.selectedClass,c)},f=function(){var c=a(e).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},true));a(b.allToggle).attr("checked",function(){if(c==e.length){value=true;i()}else{value=false;l()}return value})},i=
+(function(a){a.fn.actions=function(n){var b=a.extend({},a.fn.actions.defaults,n),e=a(this),g=false,k=function(c){c?i():j();a(e).prop("checked",c).parent().parent().toggleClass(b.selectedClass,c)},f=function(){var c=a(e).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},true));a(b.allToggle).prop("checked",function(){if(c==e.length){value=true;i()}else{value=false;l()}return value})},i=
 function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()},m=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},j=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()},l=function(){j();a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)};a(b.counterContainer).show();
-a(this).filter(":checked").each(function(){a(this).parent().parent().toggleClass(b.selectedClass);f();a(b.acrossInput).val()==1&&m()});a(b.allToggle).show().click(function(){k(a(this).attr("checked"));f()});a("div.actions span.question a").click(function(c){c.preventDefault();a(b.acrossInput).val(1);m()});a("div.actions span.clear a").click(function(c){c.preventDefault();a(b.allToggle).attr("checked",false);l();k(0);f()});lastChecked=null;a(e).click(function(c){if(!c)c=window.event;var d=c.target?
-c.target:c.srcElement;if(lastChecked&&a.data(lastChecked)!=a.data(d)&&c.shiftKey===true){var h=false;a(lastChecked).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(e).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(d))h=h?false:true;h&&a(this).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);lastChecked=d;f()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){g=
+a(this).filter(":checked").each(function(){a(this).parent().parent().toggleClass(b.selectedClass);f();a(b.acrossInput).val()==1&&m()});a(b.allToggle).show().click(function(){k(a(this).prop("checked"));f()});a("div.actions span.question a").click(function(c){c.preventDefault();a(b.acrossInput).val(1);m()});a("div.actions span.clear a").click(function(c){c.preventDefault();a(b.allToggle).prop("checked",false);l();k(0);f()});lastChecked=null;a(e).click(function(c){if(!c)c=window.event;var d=c.target?
+c.target:c.srcElement;if(lastChecked&&a.data(lastChecked)!=a.data(d)&&c.shiftKey===true){var h=false;a(lastChecked).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(e).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(d))h=h?false:true;h&&a(this).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);lastChecked=d;f()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){g=
 true});a('form#changelist-form button[name="index"]').click(function(){if(g)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});a('form#changelist-form input[name="_save"]').click(function(){var c=false;a("div.actions select option:selected").each(function(){if(a(this).val())c=true});if(c)return g?confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")):
 confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."))})};a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"}})(django.jQuery);
diff --git a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
index 3ecc06f098..671af9bd78 100644
--- a/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
+++ b/django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
@@ -6,6 +6,8 @@ var DateTimeShortcuts = {
     calendars: [],
     calendarInputs: [],
     clockInputs: [],
+    dismissClockFunc: [],
+    dismissCalendarFunc: [],
     calendarDivName1: 'calendarbox', // name of calendar <div> that gets toggled
     calendarDivName2: 'calendarin',  // name of <div> that contains calendar
     calendarLinkName: 'calendarlink',// name of the link that is used to toggle
@@ -39,6 +41,7 @@ var DateTimeShortcuts = {
     addClock: function(inp) {
         var num = DateTimeShortcuts.clockInputs.length;
         DateTimeShortcuts.clockInputs[num] = inp;
+        DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; };
 
         // Shortcut links (clock icon and "Now" link)
         var shortcuts_span = document.createElement('span');
@@ -76,7 +79,7 @@ var DateTimeShortcuts = {
         clock_box.className = 'clockbox module';
         clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num);
         document.body.appendChild(clock_box);
-        addEvent(clock_box, 'click', DateTimeShortcuts.cancelEventPropagation);
+        addEvent(clock_box, 'click', cancelEventPropagation);
 
         quickElement('h2', clock_box, gettext('Choose a time'));
         var time_list = quickElement('ul', clock_box, '');
@@ -118,11 +121,11 @@ var DateTimeShortcuts = {
 
         // Show the clock box
         clock_box.style.display = 'block';
-        addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });
+        addEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);
     },
     dismissClock: function(num) {
        document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none';
-       window.document.onclick = null;
+       removeEvent(document, 'click', DateTimeShortcuts.dismissClockFunc[num]);
     },
     handleClockQuicklink: function(num, val) {
        DateTimeShortcuts.clockInputs[num].value = val;
@@ -134,6 +137,7 @@ var DateTimeShortcuts = {
         var num = DateTimeShortcuts.calendars.length;
 
         DateTimeShortcuts.calendarInputs[num] = inp;
+        DateTimeShortcuts.dismissCalendarFunc[num] = function() { DateTimeShortcuts.dismissCalendar(num); return true; };
 
         // Shortcut links (calendar icon and "Today" link)
         var shortcuts_span = document.createElement('span');
@@ -174,7 +178,7 @@ var DateTimeShortcuts = {
         cal_box.className = 'calendarbox module';
         cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num);
         document.body.appendChild(cal_box);
-        addEvent(cal_box, 'click', DateTimeShortcuts.cancelEventPropagation);
+        addEvent(cal_box, 'click', cancelEventPropagation);
 
         // next-prev links
         var cal_nav = quickElement('div', cal_box, '');
@@ -241,11 +245,11 @@ var DateTimeShortcuts = {
         cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px';
 
         cal_box.style.display = 'block';
-        addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; });
+        addEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]);
     },
     dismissCalendar: function(num) {
         document.getElementById(DateTimeShortcuts.calendarDivName1+num).style.display = 'none';
-        window.document.onclick = null;
+        removeEvent(document, 'click', DateTimeShortcuts.dismissCalendarFunc[num]);
     },
     drawPrev: function(num) {
         DateTimeShortcuts.calendars[num].drawPreviousMonth();
@@ -277,11 +281,6 @@ var DateTimeShortcuts = {
        DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]);
        DateTimeShortcuts.calendarInputs[num].focus();
        DateTimeShortcuts.dismissCalendar(num);
-    },
-    cancelEventPropagation: function(e) {
-        if (!e) e = window.event;
-        e.cancelBubble = true;
-        if (e.stopPropagation) e.stopPropagation();
     }
 }
 
diff --git a/django/contrib/admin/static/admin/js/calendar.js b/django/contrib/admin/static/admin/js/calendar.js
index c95a95db1b..8e38c41c68 100644
--- a/django/contrib/admin/static/admin/js/calendar.js
+++ b/django/contrib/admin/static/admin/js/calendar.js
@@ -1,26 +1,8 @@
 /*
 calendar.js - Calendar functions by Adrian Holovaty
+depends on core.js for utility functions like removeChildren or quickElement
 */
 
-function removeChildren(a) { // "a" is reference to an object
-    while (a.hasChildNodes()) a.removeChild(a.lastChild);
-}
-
-// quickElement(tagType, parentReference, textInChildNode, [, attribute, attributeValue ...]);
-function quickElement() {
-    var obj = document.createElement(arguments[0]);
-    if (arguments[2] != '' && arguments[2] != null) {
-        var textNode = document.createTextNode(arguments[2]);
-        obj.appendChild(textNode);
-    }
-    var len = arguments.length;
-    for (var i = 3; i < len; i += 2) {
-        obj.setAttribute(arguments[i], arguments[i+1]);
-    }
-    arguments[1].appendChild(obj);
-    return obj;
-}
-
 // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions
 var CalendarNamespace = {
     monthsOfYear: gettext('January February March April May June July August September October November December').split(' '),
diff --git a/django/contrib/admin/static/admin/js/collapse.js b/django/contrib/admin/static/admin/js/collapse.js
index 889e1a5dfc..3b1f31bd23 100644
--- a/django/contrib/admin/static/admin/js/collapse.js
+++ b/django/contrib/admin/static/admin/js/collapse.js
@@ -10,15 +10,15 @@
 			}
 		});
 		// Add toggle to anchor tag
-		$("fieldset.collapse a.collapse-toggle").toggle(
-			function() { // Show
+		$("fieldset.collapse a.collapse-toggle").click(function(ev) {
+			if ($(this).closest("fieldset").hasClass("collapsed")) {
+				// Show
 				$(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset", [$(this).attr("id")]);
-				return false;
-			},
-			function() { // Hide
+			} else {
+				// Hide
 				$(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", [$(this).attr("id")]);
-				return false;
 			}
-		);
+			return false;
+		});
 	});
 })(django.jQuery);
diff --git a/django/contrib/admin/static/admin/js/collapse.min.js b/django/contrib/admin/static/admin/js/collapse.min.js
index 5bf26ec104..b32fbc3472 100644
--- a/django/contrib/admin/static/admin/js/collapse.min.js
+++ b/django/contrib/admin/static/admin/js/collapse.min.js
@@ -1,2 +1,2 @@
-(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){a(b).find("div.errors").length==0&&a(b).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser'+c+'" class="collapse-toggle" href="#">'+gettext("Show")+"</a>)")});a("fieldset.collapse a.collapse-toggle").toggle(function(){a(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset",[a(this).attr("id")]);return false},function(){a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset",
-[a(this).attr("id")]);return false})})})(django.jQuery);
+(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){0==a(b).find("div.errors").length&&a(b).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser'+c+'" class="collapse-toggle" href="#">'+gettext("Show")+"</a>)")});a("fieldset.collapse a.collapse-toggle").click(function(){a(this).closest("fieldset").hasClass("collapsed")?a(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset",[a(this).attr("id")]):a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset",
+[a(this).attr("id")]);return!1})})})(django.jQuery);
diff --git a/django/contrib/admin/static/admin/js/core.js b/django/contrib/admin/static/admin/js/core.js
index ab776509ba..4cc4ca4f63 100644
--- a/django/contrib/admin/static/admin/js/core.js
+++ b/django/contrib/admin/static/admin/js/core.js
@@ -29,6 +29,12 @@ function removeEvent(obj, evType, fn) {
     }
 }
 
+function cancelEventPropagation(e) {
+    if (!e) e = window.event;
+    e.cancelBubble = true;
+    if (e.stopPropagation) e.stopPropagation();
+}
+
 // quickElement(tagType, parentReference, textInChildNode, [, attribute, attributeValue ...]);
 function quickElement() {
     var obj = document.createElement(arguments[0]);
@@ -44,6 +50,11 @@ function quickElement() {
     return obj;
 }
 
+// "a" is reference to an object
+function removeChildren(a) {
+    while (a.hasChildNodes()) a.removeChild(a.lastChild);
+}
+
 // ----------------------------------------------------------------------------
 // Cross-browser xmlhttp object
 // from http://jibbering.com/2002/4/httprequest.html
diff --git a/django/contrib/admin/static/admin/js/inlines.js b/django/contrib/admin/static/admin/js/inlines.js
index 4dc9459ff3..0bfcd34124 100644
--- a/django/contrib/admin/static/admin/js/inlines.js
+++ b/django/contrib/admin/static/admin/js/inlines.js
@@ -22,8 +22,8 @@
     var updateElementIndex = function(el, prefix, ndx) {
       var id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))");
       var replacement = prefix + "-" + ndx;
-      if ($(el).attr("for")) {
-        $(el).attr("for", $(el).attr("for").replace(id_regex, replacement));
+      if ($(el).prop("for")) {
+        $(el).prop("for", $(el).prop("for").replace(id_regex, replacement));
       }
       if (el.id) {
         el.id = el.id.replace(id_regex, replacement);
@@ -32,9 +32,9 @@
         el.name = el.name.replace(id_regex, replacement);
       }
     };
-    var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").attr("autocomplete", "off");
+    var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off");
     var nextIndex = parseInt(totalForms.val(), 10);
-    var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").attr("autocomplete", "off");
+    var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off");
     // only show the add button if we are allowed to add more items,
         // note that max_num = None translates to a blank string.
     var showAddButton = maxForms.val() === '' || (maxForms.val()-totalForms.val()) > 0;
@@ -43,7 +43,7 @@
     });
     if ($this.length && showAddButton) {
       var addButton;
-      if ($this.attr("tagName") == "TR") {
+      if ($this.prop("tagName") == "TR") {
         // If forms are laid out as table rows, insert the
         // "add" button in a new table row:
         var numCols = this.eq(-1).children().length;
diff --git a/django/contrib/admin/static/admin/js/inlines.min.js b/django/contrib/admin/static/admin/js/inlines.min.js
index d48ee0a098..b89aedd4cc 100644
--- a/django/contrib/admin/static/admin/js/inlines.min.js
+++ b/django/contrib/admin/static/admin/js/inlines.min.js
@@ -1,5 +1,5 @@
-(function(b){b.fn.formset=function(d){var a=b.extend({},b.fn.formset.defaults,d),c=b(this),d=c.parent(),i=function(a,e,g){var d=RegExp("("+e+"-(\\d+|__prefix__))"),e=e+"-"+g;b(a).attr("for")&&b(a).attr("for",b(a).attr("for").replace(d,e));a.id&&(a.id=a.id.replace(d,e));a.name&&(a.name=a.name.replace(d,e))},f=b("#id_"+a.prefix+"-TOTAL_FORMS").attr("autocomplete","off"),g=parseInt(f.val(),10),e=b("#id_"+a.prefix+"-MAX_NUM_FORMS").attr("autocomplete","off"),f=""===e.val()||0<e.val()-f.val();c.each(function(){b(this).not("."+
-a.emptyCssClass).addClass(a.formCssClass)});if(c.length&&f){var h;"TR"==c.attr("tagName")?(c=this.eq(-1).children().length,d.append('<tr class="'+a.addCssClass+'"><td colspan="'+c+'"><a href="javascript:void(0)">'+a.addText+"</a></tr>"),h=d.find("tr:last a")):(c.filter(":last").after('<div class="'+a.addCssClass+'"><a href="javascript:void(0)">'+a.addText+"</a></div>"),h=c.filter(":last").next().find("a"));h.click(function(d){d.preventDefault();var f=b("#id_"+a.prefix+"-TOTAL_FORMS"),d=b("#"+a.prefix+
+(function(b){b.fn.formset=function(d){var a=b.extend({},b.fn.formset.defaults,d),c=b(this),d=c.parent(),i=function(a,e,g){var d=RegExp("("+e+"-(\\d+|__prefix__))"),e=e+"-"+g;b(a).prop("for")&&b(a).prop("for",b(a).prop("for").replace(d,e));a.id&&(a.id=a.id.replace(d,e));a.name&&(a.name=a.name.replace(d,e))},f=b("#id_"+a.prefix+"-TOTAL_FORMS").prop("autocomplete","off"),g=parseInt(f.val(),10),e=b("#id_"+a.prefix+"-MAX_NUM_FORMS").prop("autocomplete","off"),f=""===e.val()||0<e.val()-f.val();c.each(function(){b(this).not("."+
+a.emptyCssClass).addClass(a.formCssClass)});if(c.length&&f){var h;"TR"==c.prop("tagName")?(c=this.eq(-1).children().length,d.append('<tr class="'+a.addCssClass+'"><td colspan="'+c+'"><a href="javascript:void(0)">'+a.addText+"</a></tr>"),h=d.find("tr:last a")):(c.filter(":last").after('<div class="'+a.addCssClass+'"><a href="javascript:void(0)">'+a.addText+"</a></div>"),h=c.filter(":last").next().find("a"));h.click(function(d){d.preventDefault();var f=b("#id_"+a.prefix+"-TOTAL_FORMS"),d=b("#"+a.prefix+
 "-empty"),c=d.clone(true);c.removeClass(a.emptyCssClass).addClass(a.formCssClass).attr("id",a.prefix+"-"+g);c.is("tr")?c.children(":last").append('<div><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></div>"):c.is("ul")||c.is("ol")?c.append('<li><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></li>"):c.children(":first").append('<span><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></span>");c.find("*").each(function(){i(this,
 a.prefix,f.val())});c.insertBefore(b(d));b(f).val(parseInt(f.val(),10)+1);g=g+1;e.val()!==""&&e.val()-f.val()<=0&&h.parent().hide();c.find("a."+a.deleteCssClass).click(function(d){d.preventDefault();d=b(this).parents("."+a.formCssClass);d.remove();g=g-1;a.removed&&a.removed(d);d=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(d.length);(e.val()===""||e.val()-d.length>0)&&h.parent().show();for(var c=0,f=d.length;c<f;c++){i(b(d).get(c),a.prefix,c);b(d.get(c)).find("*").each(function(){i(this,
 a.prefix,c)})}});a.added&&a.added(c)})}return this};b.fn.formset.defaults={prefix:"form",addText:"add another",deleteText:"remove",addCssClass:"add-row",deleteCssClass:"delete-row",emptyCssClass:"empty-row",formCssClass:"dynamic-form",added:null,removed:null};b.fn.tabularFormset=function(d){var a=b(this),c=function(){b(a.selector).not(".add-row").removeClass("row1 row2").filter(":even").addClass("row1").end().filter(":odd").addClass("row2")};a.formset({prefix:d.prefix,addText:d.addText,formCssClass:"dynamic-"+
diff --git a/django/contrib/admin/static/admin/js/jquery.init.js b/django/contrib/admin/static/admin/js/jquery.init.js
index dd4605c368..22a4c8bfd3 100644
--- a/django/contrib/admin/static/admin/js/jquery.init.js
+++ b/django/contrib/admin/static/admin/js/jquery.init.js
@@ -3,6 +3,5 @@
  * namespace (i.e. this preserves pre-existing values for both window.$ and
  * window.jQuery).
  */
-var django = {
-    "jQuery": jQuery.noConflict(true)
-};
+var django = django || {};
+django.jQuery = jQuery.noConflict(true);
diff --git a/django/contrib/admin/static/admin/js/jquery.js b/django/contrib/admin/static/admin/js/jquery.js
index fff6776433..e2c203fe97 100644
--- a/django/contrib/admin/static/admin/js/jquery.js
+++ b/django/contrib/admin/static/admin/js/jquery.js
@@ -1,25 +1,37 @@
 /*!
- * jQuery JavaScript Library v1.4.2
+ * jQuery JavaScript Library v1.9.1
  * http://jquery.com/
  *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
  * Includes Sizzle.js
  * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
  *
- * Date: Sat Feb 13 22:33:48 2010 -0500
+ * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2013-2-4
  */
 (function( window, undefined ) {
 
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context );
-	},
+// Can't do this because several apps including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through "use strict" call chains. (#13335)
+// Support: Firefox 18+
+//"use strict";
+var
+	// The deferred used on DOM ready
+	readyList,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// Support: IE<9
+	// For `typeof node.method` instead of `node.method !== undefined`
+	core_strundefined = typeof undefined,
+
+	// Use the correct document accordingly with window argument (sandbox)
+	document = window.document,
+	location = window.location,
 
 	// Map over jQuery in case of overwrite
 	_jQuery = window.jQuery,
@@ -27,112 +39,142 @@ var jQuery = function( selector, context ) {
 	// Map over the $ in case of overwrite
 	_$ = window.$,
 
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
+	// [[Class]] -> type pairs
+	class2type = {},
 
-	// A central reference to the root jQuery(document)
-	rootjQuery,
+	// List of deleted data cache ids, so we can reuse them
+	core_deletedIds = [],
 
-	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
-
-	// Is it a simple selector
-	isSimple = /^.[^:#\[\.,]*$/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-
-	// Used for trimming whitespace
-	rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-	
-	// Has the ready events already been bound?
-	readyBound = false,
-	
-	// The functions to execute on DOM ready
-	readyList = [],
-
-	// The ready event handler
-	DOMContentLoaded,
+	core_version = "1.9.1",
 
 	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwnProperty = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	indexOf = Array.prototype.indexOf;
+	core_concat = core_deletedIds.concat,
+	core_push = core_deletedIds.push,
+	core_slice = core_deletedIds.slice,
+	core_indexOf = core_deletedIds.indexOf,
+	core_toString = class2type.toString,
+	core_hasOwn = class2type.hasOwnProperty,
+	core_trim = core_version.trim,
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Used for matching numbers
+	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
+
+	// Used for splitting on whitespace
+	core_rnotwhite = /\S+/g,
+
+	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
+
+	// Matches dashed string for camelizing
+	rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([\da-z])/gi,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	},
+
+	// The ready event handler
+	completed = function( event ) {
+
+		// readyState === "complete" is good enough for us to call the dom ready in oldIE
+		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
+			detach();
+			jQuery.ready();
+		}
+	},
+	// Clean-up method for dom ready events
+	detach = function() {
+		if ( document.addEventListener ) {
+			document.removeEventListener( "DOMContentLoaded", completed, false );
+			window.removeEventListener( "load", completed, false );
+
+		} else {
+			document.detachEvent( "onreadystatechange", completed );
+			window.detachEvent( "onload", completed );
+		}
+	};
 
 jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
-		var match, elem, ret, doc;
+	// The current version of jQuery being used
+	jquery: core_version,
 
-		// Handle $(""), $(null), or $(undefined)
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
 		if ( !selector ) {
 			return this;
 		}
 
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-		
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = "body";
-			this.length = 1;
-			return this;
-		}
-
 		// Handle HTML strings
 		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			match = quickExpr.exec( selector );
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
 
-			// Verify a match, and that no context was specified for #id
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
 			if ( match && (match[1] || !context) ) {
 
 				// HANDLE: $(html) -> $(array)
 				if ( match[1] ) {
-					doc = (context ? context.ownerDocument || context : document);
+					context = context instanceof jQuery ? context[0] : context;
 
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
+					// scripts is true for back-compat
+					jQuery.merge( this, jQuery.parseHTML(
+						match[1],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
 
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
 
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
 						}
-
-					} else {
-						ret = buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
 					}
-					
-					return jQuery.merge( this, selector );
-					
-				// HANDLE: $("#id")
+
+					return this;
+
+				// HANDLE: $(#id)
 				} else {
 					elem = document.getElementById( match[2] );
 
-					if ( elem ) {
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
 						// Handle the case where IE and Opera return items
 						// by name instead of ID
 						if ( elem.id !== match[2] ) {
@@ -149,30 +191,29 @@ jQuery.fn = jQuery.prototype = {
 					return this;
 				}
 
-			// HANDLE: $("TAG")
-			} else if ( !context && /^\w+$/.test( selector ) ) {
-				this.selector = selector;
-				this.context = document;
-				selector = document.getElementsByTagName( selector );
-				return jQuery.merge( this, selector );
-
 			// HANDLE: $(expr, $(...))
 			} else if ( !context || context.jquery ) {
-				return (context || rootjQuery).find( selector );
+				return ( context || rootjQuery ).find( selector );
 
 			// HANDLE: $(expr, context)
 			// (which is just equivalent to: $(context).find(expr)
 			} else {
-				return jQuery( context ).find( selector );
+				return this.constructor( context ).find( selector );
 			}
 
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+
 		// HANDLE: $(function)
 		// Shortcut for document ready
 		} else if ( jQuery.isFunction( selector ) ) {
 			return rootjQuery.ready( selector );
 		}
 
-		if (selector.selector !== undefined) {
+		if ( selector.selector !== undefined ) {
 			this.selector = selector.selector;
 			this.context = selector.context;
 		}
@@ -183,9 +224,6 @@ jQuery.fn = jQuery.prototype = {
 	// Start with an empty selector
 	selector: "",
 
-	// The current version of jQuery being used
-	jquery: "1.4.2",
-
 	// The default length of a jQuery object is 0
 	length: 0,
 
@@ -195,7 +233,7 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	toArray: function() {
-		return slice.call( this, 0 );
+		return core_slice.call( this );
 	},
 
 	// Get the Nth element in the matched element set OR
@@ -207,33 +245,20 @@ jQuery.fn = jQuery.prototype = {
 			this.toArray() :
 
 			// Return just the object
-			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
 	},
 
 	// Take an array of elements and push it onto the stack
 	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = jQuery();
+	pushStack: function( elems ) {
 
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-		
-		} else {
-			jQuery.merge( ret, elems );
-		}
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
 
 		// Add the old object onto the stack (as a reference)
 		ret.prevObject = this;
-
 		ret.context = this.context;
 
-		if ( name === "find" ) {
-			ret.selector = this.selector + (this.selector ? " " : "") + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
 		// Return the newly-formed element set
 		return ret;
 	},
@@ -244,29 +269,16 @@ jQuery.fn = jQuery.prototype = {
 	each: function( callback, args ) {
 		return jQuery.each( this, callback, args );
 	},
-	
+
 	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
+		// Add the callback
+		jQuery.ready.promise().done( fn );
 
 		return this;
 	},
-	
-	eq: function( i ) {
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, +i + 1 );
+
+	slice: function() {
+		return this.pushStack( core_slice.apply( this, arguments ) );
 	},
 
 	first: function() {
@@ -277,9 +289,10 @@ jQuery.fn = jQuery.prototype = {
 		return this.eq( -1 );
 	},
 
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
+	eq: function( i ) {
+		var len = this.length,
+			j = +i + ( i < 0 ? len : 0 );
+		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
 	},
 
 	map: function( callback ) {
@@ -287,14 +300,14 @@ jQuery.fn = jQuery.prototype = {
 			return callback.call( elem, i, elem );
 		}));
 	},
-	
+
 	end: function() {
-		return this.prevObject || jQuery(null);
+		return this.prevObject || this.constructor(null);
 	},
 
 	// For internal use only.
 	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
+	push: core_push,
 	sort: [].sort,
 	splice: [].splice
 };
@@ -303,8 +316,11 @@ jQuery.fn = jQuery.prototype = {
 jQuery.fn.init.prototype = jQuery.fn;
 
 jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
+	var src, copyIsArray, copy, name, options, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
 
 	// Handle a deep copy situation
 	if ( typeof target === "boolean" ) {
@@ -338,10 +354,15 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 				}
 
-				// Recurse if we're merging object literal values or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
-					var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
-						: jQuery.isArray(copy) ? [] : {};
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
 
 					// Never move original objects, clone them
 					target[ name ] = jQuery.extend( deep, clone, copy );
@@ -360,90 +381,60 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 jQuery.extend({
 	noConflict: function( deep ) {
-		window.$ = _$;
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
 
-		if ( deep ) {
+		if ( deep && window.jQuery === jQuery ) {
 			window.jQuery = _jQuery;
 		}
 
 		return jQuery;
 	},
-	
+
 	// Is the DOM ready to be used? Set to true once it occurs.
 	isReady: false,
-	
-	// Handle when the DOM is ready
-	ready: function() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 13 );
-			}
 
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
 
-			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn, i = 0;
-				while ( (fn = readyList[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Reset the list of functions
-				readyList = null;
-			}
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.triggerHandler ) {
-				jQuery( document ).triggerHandler( "ready" );
-			}
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
 		}
 	},
-	
-	bindReady: function() {
-		if ( readyBound ) {
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
 			return;
 		}
 
-		readyBound = true;
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			return jQuery.ready();
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( !document.body ) {
+			return setTimeout( jQuery.ready );
 		}
 
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
 
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", DOMContentLoaded);
-			
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
+		}
 
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
 
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
+		// Trigger any bound ready events
+		if ( jQuery.fn.trigger ) {
+			jQuery( document ).trigger("ready").off("ready");
 		}
 	},
 
@@ -451,117 +442,200 @@ jQuery.extend({
 	// Since version 1.3, DOM methods and functions like alert
 	// aren't supported. They return false on IE (#2968).
 	isFunction: function( obj ) {
-		return toString.call(obj) === "[object Function]";
+		return jQuery.type(obj) === "function";
 	},
 
-	isArray: function( obj ) {
-		return toString.call(obj) === "[object Array]";
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	isWindow: function( obj ) {
+		return obj != null && obj == obj.window;
+	},
+
+	isNumeric: function( obj ) {
+		return !isNaN( parseFloat(obj) ) && isFinite( obj );
+	},
+
+	type: function( obj ) {
+		if ( obj == null ) {
+			return String( obj );
+		}
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ core_toString.call(obj) ] || "object" :
+			typeof obj;
 	},
 
 	isPlainObject: function( obj ) {
 		// Must be an Object.
 		// Because of IE, we also have to check the presence of the constructor property.
 		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) {
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
 			return false;
 		}
-		
-		// Not own constructor property must be Object
-		if ( obj.constructor
-			&& !hasOwnProperty.call(obj, "constructor")
-			&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!core_hasOwn.call(obj, "constructor") &&
+				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
 			return false;
 		}
-		
+
 		// Own properties are enumerated firstly, so to speed up,
 		// if last one is own, then all properties are own.
-	
+
 		var key;
 		for ( key in obj ) {}
-		
-		return key === undefined || hasOwnProperty.call( obj, key );
+
+		return key === undefined || core_hasOwn.call( obj, key );
 	},
 
 	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
+		var name;
+		for ( name in obj ) {
 			return false;
 		}
 		return true;
 	},
-	
+
 	error: function( msg ) {
-		throw msg;
+		throw new Error( msg );
 	},
-	
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
+
+	// data: string of html
+	// context (optional): If specified, the fragment will be created in this context, defaults to document
+	// keepScripts (optional): If true, will include scripts passed in the html string
+	parseHTML: function( data, context, keepScripts ) {
+		if ( !data || typeof data !== "string" ) {
 			return null;
 		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-		
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-			.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
-			.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
-
-			// Try to use the native JSON parser first
-			return window.JSON && window.JSON.parse ?
-				window.JSON.parse( data ) :
-				(new Function("return " + data))();
-
-		} else {
-			jQuery.error( "Invalid JSON: " + data );
+		if ( typeof context === "boolean" ) {
+			keepScripts = context;
+			context = false;
 		}
+		context = context || document;
+
+		var parsed = rsingleTag.exec( data ),
+			scripts = !keepScripts && [];
+
+		// Single tag
+		if ( parsed ) {
+			return [ context.createElement( parsed[1] ) ];
+		}
+
+		parsed = jQuery.buildFragment( [ data ], context, scripts );
+		if ( scripts ) {
+			jQuery( scripts ).remove();
+		}
+		return jQuery.merge( [], parsed.childNodes );
+	},
+
+	parseJSON: function( data ) {
+		// Attempt to parse using the native JSON parser first
+		if ( window.JSON && window.JSON.parse ) {
+			return window.JSON.parse( data );
+		}
+
+		if ( data === null ) {
+			return data;
+		}
+
+		if ( typeof data === "string" ) {
+
+			// Make sure leading/trailing whitespace is removed (IE can't handle it)
+			data = jQuery.trim( data );
+
+			if ( data ) {
+				// Make sure the incoming data is actual JSON
+				// Logic borrowed from http://json.org/json2.js
+				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+					.replace( rvalidtokens, "]" )
+					.replace( rvalidbraces, "")) ) {
+
+					return ( new Function( "return " + data ) )();
+				}
+			}
+		}
+
+		jQuery.error( "Invalid JSON: " + data );
+	},
+
+	// Cross-browser xml parsing
+	parseXML: function( data ) {
+		var xml, tmp;
+		if ( !data || typeof data !== "string" ) {
+			return null;
+		}
+		try {
+			if ( window.DOMParser ) { // Standard
+				tmp = new DOMParser();
+				xml = tmp.parseFromString( data , "text/xml" );
+			} else { // IE
+				xml = new ActiveXObject( "Microsoft.XMLDOM" );
+				xml.async = "false";
+				xml.loadXML( data );
+			}
+		} catch( e ) {
+			xml = undefined;
+		}
+		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		return xml;
 	},
 
 	noop: function() {},
 
-	// Evalulates a script in a global context
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
 	globalEval: function( data ) {
-		if ( data && rnotwhite.test(data) ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-
-			if ( jQuery.support.scriptEval ) {
-				script.appendChild( document.createTextNode( data ) );
-			} else {
-				script.text = data;
-			}
-
-			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
+		if ( data && jQuery.trim( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
 		}
 	},
 
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
 	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
 	},
 
 	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction(object);
+	each: function( obj, callback, args ) {
+		var value,
+			i = 0,
+			length = obj.length,
+			isArray = isArraylike( obj );
 
 		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
 						break;
 					}
 				}
 			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
+				for ( i in obj ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
 						break;
 					}
 				}
@@ -569,51 +643,77 @@ jQuery.extend({
 
 		// A special, fast, case for the most common use of each
 		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
 						break;
 					}
 				}
 			} else {
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+				for ( i in obj ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
 			}
 		}
 
-		return object;
+		return obj;
 	},
 
-	trim: function( text ) {
-		return (text || "").replace( rtrim, "" );
-	},
+	// Use native String.trim function wherever possible
+	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
+		function( text ) {
+			return text == null ?
+				"" :
+				core_trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				( text + "" ).replace( rtrim, "" );
+		},
 
 	// results is for internal usage only
-	makeArray: function( array, results ) {
+	makeArray: function( arr, results ) {
 		var ret = results || [];
 
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// The extra typeof function check is to prevent crashes
-			// in Safari 2 (See: #3039)
-			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
-				push.call( ret, array );
+		if ( arr != null ) {
+			if ( isArraylike( Object(arr) ) ) {
+				jQuery.merge( ret,
+					typeof arr === "string" ?
+					[ arr ] : arr
+				);
 			} else {
-				jQuery.merge( ret, array );
+				core_push.call( ret, arr );
 			}
 		}
 
 		return ret;
 	},
 
-	inArray: function( elem, array ) {
-		if ( array.indexOf ) {
-			return array.indexOf( elem );
-		}
+	inArray: function( elem, arr, i ) {
+		var len;
 
-		for ( var i = 0, length = array.length; i < length; i++ ) {
-			if ( array[ i ] === elem ) {
-				return i;
+		if ( arr ) {
+			if ( core_indexOf ) {
+				return core_indexOf.call( arr, elem, i );
+			}
+
+			len = arr.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+				// Skip accessing in sparse arrays
+				if ( i in arr && arr[ i ] === elem ) {
+					return i;
+				}
 			}
 		}
 
@@ -621,13 +721,14 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		var i = first.length, j = 0;
+		var l = second.length,
+			i = first.length,
+			j = 0;
 
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
+		if ( typeof l === "number" ) {
+			for ( ; j < l; j++ ) {
 				first[ i++ ] = second[ j ];
 			}
-		
 		} else {
 			while ( second[j] !== undefined ) {
 				first[ i++ ] = second[ j++ ];
@@ -640,12 +741,17 @@ jQuery.extend({
 	},
 
 	grep: function( elems, callback, inv ) {
-		var ret = [];
+		var retVal,
+			ret = [],
+			i = 0,
+			length = elems.length;
+		inv = !!inv;
 
 		// Go through the array, only saving the items
 		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			if ( !inv !== !callback( elems[ i ], i ) ) {
+		for ( ; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
 				ret.push( elems[ i ] );
 			}
 		}
@@ -655,194 +761,577 @@ jQuery.extend({
 
 	// arg is for internal usage only
 	map: function( elems, callback, arg ) {
-		var ret = [], value;
+		var value,
+			i = 0,
+			length = elems.length,
+			isArray = isArraylike( elems ),
+			ret = [];
 
 		// Go through the array, translating each of the items to their
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			value = callback( elems[ i ], i, arg );
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
 
-			if ( value != null ) {
-				ret[ ret.length ] = value;
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( i in elems ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
 			}
 		}
 
-		return ret.concat.apply( [], ret );
+		// Flatten any nested arrays
+		return core_concat.apply( [], ret );
 	},
 
 	// A global GUID counter for objects
 	guid: 1,
 
-	proxy: function( fn, proxy, thisObject ) {
-		if ( arguments.length === 2 ) {
-			if ( typeof proxy === "string" ) {
-				thisObject = fn;
-				fn = thisObject[ proxy ];
-				proxy = undefined;
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		var args, proxy, tmp;
 
-			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
-				thisObject = proxy;
-				proxy = undefined;
-			}
+		if ( typeof context === "string" ) {
+			tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
 		}
 
-		if ( !proxy && fn ) {
-			proxy = function() {
-				return fn.apply( thisObject || this, arguments );
-			};
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
 		}
 
+		// Simulated bind
+		args = core_slice.call( arguments, 2 );
+		proxy = function() {
+			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
+		};
+
 		// Set the guid of unique handler to the same of original handler, so it can be removed
-		if ( fn ) {
-			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-		}
+		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
 
-		// So proxy can be declared as an argument
 		return proxy;
 	},
 
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
+	// Multifunctional method to get and set values of a collection
+	// The value/s can optionally be executed if it's a function
+	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
+		var i = 0,
+			length = elems.length,
+			bulk = key == null;
 
-		var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-			/(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
-			/(msie) ([\w.]+)/.exec( ua ) ||
-			!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
-		  	[];
+		// Sets many values
+		if ( jQuery.type( key ) === "object" ) {
+			chainable = true;
+			for ( i in key ) {
+				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+			}
 
-		return { browser: match[1] || "", version: match[2] || "0" };
+		// Sets one value
+		} else if ( value !== undefined ) {
+			chainable = true;
+
+			if ( !jQuery.isFunction( value ) ) {
+				raw = true;
+			}
+
+			if ( bulk ) {
+				// Bulk operations run against the entire set
+				if ( raw ) {
+					fn.call( elems, value );
+					fn = null;
+
+				// ...except when executing function values
+				} else {
+					bulk = fn;
+					fn = function( elem, key, value ) {
+						return bulk.call( jQuery( elem ), value );
+					};
+				}
+			}
+
+			if ( fn ) {
+				for ( ; i < length; i++ ) {
+					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
+				}
+			}
+		}
+
+		return chainable ?
+			elems :
+
+			// Gets
+			bulk ?
+				fn.call( elems ) :
+				length ? fn( elems[0], key ) : emptyGet;
 	},
 
-	browser: {}
+	now: function() {
+		return ( new Date() ).getTime();
+	}
 });
 
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
 
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
+		readyList = jQuery.Deferred();
 
-if ( indexOf ) {
-	jQuery.inArray = function( elem, array ) {
-		return indexOf.call( array, elem );
-	};
+		// Catch cases where $(document).ready() is called after the browser event has already occurred.
+		// we once tried to use readyState "interactive" here, but it caused issues like the one
+		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			setTimeout( jQuery.ready );
+
+		// Standards-based browsers support DOMContentLoaded
+		} else if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", completed, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", completed, false );
+
+		// If IE event model is used
+		} else {
+			// Ensure firing before onload, maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", completed );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", completed );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var top = false;
+
+			try {
+				top = window.frameElement == null && document.documentElement;
+			} catch(e) {}
+
+			if ( top && top.doScroll ) {
+				(function doScrollCheck() {
+					if ( !jQuery.isReady ) {
+
+						try {
+							// Use the trick by Diego Perini
+							// http://javascript.nwbox.com/IEContentLoaded/
+							top.doScroll("left");
+						} catch(e) {
+							return setTimeout( doScrollCheck, 50 );
+						}
+
+						// detach all dom ready events
+						detach();
+
+						// and execute any waiting functions
+						jQuery.ready();
+					}
+				})();
+			}
+		}
+	}
+	return readyList.promise( obj );
+};
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+function isArraylike( obj ) {
+	var length = obj.length,
+		type = jQuery.type( obj );
+
+	if ( jQuery.isWindow( obj ) ) {
+		return false;
+	}
+
+	if ( obj.nodeType === 1 && length ) {
+		return true;
+	}
+
+	return type === "array" || type !== "function" &&
+		( length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
 }
 
 // All jQuery objects should point back to these
 rootjQuery = jQuery(document);
+// String to Object options format cache
+var optionsCache = {};
 
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+	var object = optionsCache[ options ] = {};
+	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
+		object[ flag ] = true;
+	});
+	return object;
 }
 
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
 
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch( error ) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		( optionsCache[ options ] || createOptions( options ) ) :
+		jQuery.extend( {}, options );
 
-	// and execute any waiting functions
-	jQuery.ready();
-}
+	var // Flag to know if list is currently firing
+		firing,
+		// Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list was already fired
+		fired,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = !options.once && [],
+		// Fire callbacks
+		fire = function( data ) {
+			memory = options.memory && data;
+			fired = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			firing = true;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+					memory = false; // To prevent further calls using add
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( stack ) {
+					if ( stack.length ) {
+						fire( stack.shift() );
+					}
+				} else if ( memory ) {
+					list = [];
+				} else {
+					self.disable();
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					// First, we save the current length
+					var start = list.length;
+					(function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							var type = jQuery.type( arg );
+							if ( type === "function" ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && type !== "string" ) {
+								// Inspect recursively
+								add( arg );
+							}
+						});
+					})( arguments );
+					// Do we need to add the callbacks to the
+					// current firing batch?
+					if ( firing ) {
+						firingLength = list.length;
+					// With memory, if we're not firing then
+					// we should call right away
+					} else if ( memory ) {
+						firingStart = start;
+						fire( memory );
+					}
+				}
+				return this;
+			},
+			// Remove a callback from the list
+			remove: function() {
+				if ( list ) {
+					jQuery.each( arguments, function( _, arg ) {
+						var index;
+						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+							list.splice( index, 1 );
+							// Handle firing indexes
+							if ( firing ) {
+								if ( index <= firingLength ) {
+									firingLength--;
+								}
+								if ( index <= firingIndex ) {
+									firingIndex--;
+								}
+							}
+						}
+					});
+				}
+				return this;
+			},
+			// Check if a given callback is in the list.
+			// If no argument is given, return whether or not list has callbacks attached.
+			has: function( fn ) {
+				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
+			},
+			// Remove all callbacks from the list
+			empty: function() {
+				list = [];
+				return this;
+			},
+			// Have the list do nothing anymore
+			disable: function() {
+				list = stack = memory = undefined;
+				return this;
+			},
+			// Is it disabled?
+			disabled: function() {
+				return !list;
+			},
+			// Lock the list in its current state
+			lock: function() {
+				stack = undefined;
+				if ( !memory ) {
+					self.disable();
+				}
+				return this;
+			},
+			// Is it locked?
+			locked: function() {
+				return !stack;
+			},
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				args = args || [];
+				args = [ context, args.slice ? args.slice() : args ];
+				if ( list && ( !fired || stack ) ) {
+					if ( firing ) {
+						stack.push( args );
+					} else {
+						fire( args );
+					}
+				}
+				return this;
+			},
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
 
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
+	return self;
+};
+jQuery.extend({
+
+	Deferred: function( func ) {
+		var tuples = [
+				// action, add listener, listener list, final state
+				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks("memory") ]
+			],
+			state = "pending",
+			promise = {
+				state: function() {
+					return state;
+				},
+				always: function() {
+					deferred.done( arguments ).fail( arguments );
+					return this;
+				},
+				then: function( /* fnDone, fnFail, fnProgress */ ) {
+					var fns = arguments;
+					return jQuery.Deferred(function( newDefer ) {
+						jQuery.each( tuples, function( i, tuple ) {
+							var action = tuple[ 0 ],
+								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							deferred[ tuple[1] ](function() {
+								var returned = fn && fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise()
+										.done( newDefer.resolve )
+										.fail( newDefer.reject )
+										.progress( newDefer.notify );
+								} else {
+									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+								}
+							});
+						});
+						fns = null;
+					}).promise();
+				},
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				}
+			},
+			deferred = {};
+
+		// Keep pipe for back-compat
+		promise.pipe = promise.then;
+
+		// Add list-specific methods
+		jQuery.each( tuples, function( i, tuple ) {
+			var list = tuple[ 2 ],
+				stateString = tuple[ 3 ];
+
+			// promise[ done | fail | progress ] = list.add
+			promise[ tuple[1] ] = list.add;
+
+			// Handle state
+			if ( stateString ) {
+				list.add(function() {
+					// state = [ resolved | rejected ]
+					state = stateString;
+
+				// [ reject_list | resolve_list ].disable; progress_list.lock
+				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+			}
+
+			// deferred[ resolve | reject | notify ]
+			deferred[ tuple[0] ] = function() {
+				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+				return this;
+			};
+			deferred[ tuple[0] + "With" ] = list.fireWith;
 		});
-	} else {
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-	}
 
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
-	}
-}
+		// Make the deferred a promise
+		promise.promise( deferred );
 
-// Mutifunctional method to get and set values to a collection
-// The value/s can be optionally by executed if its a function
-function access( elems, key, value, exec, fn, pass ) {
-	var length = elems.length;
-	
-	// Setting many attributes
-	if ( typeof key === "object" ) {
-		for ( var k in key ) {
-			access( elems, k, key[k], exec, fn, value );
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
 		}
-		return elems;
-	}
-	
-	// Setting one attribute
-	if ( value !== undefined ) {
-		// Optionally, function values get executed if exec is true
-		exec = !pass && exec && jQuery.isFunction(value);
-		
-		for ( var i = 0; i < length; i++ ) {
-			fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( subordinate /* , ..., subordinateN */ ) {
+		var i = 0,
+			resolveValues = core_slice.call( arguments ),
+			length = resolveValues.length,
+
+			// the count of uncompleted subordinates
+			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+			// Update function for both resolve and progress values
+			updateFunc = function( i, contexts, values ) {
+				return function( value ) {
+					contexts[ i ] = this;
+					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
+					if( values === progressValues ) {
+						deferred.notifyWith( contexts, values );
+					} else if ( !( --remaining ) ) {
+						deferred.resolveWith( contexts, values );
+					}
+				};
+			},
+
+			progressValues, progressContexts, resolveContexts;
+
+		// add listeners to Deferred subordinates; treat others as resolved
+		if ( length > 1 ) {
+			progressValues = new Array( length );
+			progressContexts = new Array( length );
+			resolveContexts = new Array( length );
+			for ( ; i < length; i++ ) {
+				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+					resolveValues[ i ].promise()
+						.done( updateFunc( i, resolveContexts, resolveValues ) )
+						.fail( deferred.reject )
+						.progress( updateFunc( i, progressContexts, progressValues ) );
+				} else {
+					--remaining;
+				}
+			}
 		}
-		
-		return elems;
+
+		// if we're not waiting on anything, resolve the master
+		if ( !remaining ) {
+			deferred.resolveWith( resolveContexts, resolveValues );
+		}
+
+		return deferred.promise();
 	}
-	
-	// Getting an attribute
-	return length ? fn( elems[0], key ) : undefined;
-}
+});
+jQuery.support = (function() {
 
-function now() {
-	return (new Date).getTime();
-}
-(function() {
+	var support, all, a,
+		input, select, fragment,
+		opt, eventName, isSupported, i,
+		div = document.createElement("div");
 
-	jQuery.support = {};
+	// Setup
+	div.setAttribute( "className", "t" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
 
-	var root = document.documentElement,
-		script = document.createElement("script"),
-		div = document.createElement("div"),
-		id = "script" + now();
-
-	div.style.display = "none";
-	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
-	var all = div.getElementsByTagName("*"),
-		a = div.getElementsByTagName("a")[0];
-
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return;
+	// Support tests won't run in some limited or non-browser environments
+	all = div.getElementsByTagName("*");
+	a = div.getElementsByTagName("a")[ 0 ];
+	if ( !all || !a || !all.length ) {
+		return {};
 	}
 
-	jQuery.support = {
+	// First batch of tests
+	select = document.createElement("select");
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName("input")[ 0 ];
+
+	a.style.cssText = "top:1px;float:left;opacity:.5";
+	support = {
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+		getSetAttribute: div.className !== "t",
+
 		// IE strips leading whitespace when .innerHTML is used
 		leadingWhitespace: div.firstChild.nodeType === 3,
 
@@ -855,8 +1344,8 @@ function now() {
 		htmlSerialize: !!div.getElementsByTagName("link").length,
 
 		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
-		style: /red/.test( a.getAttribute("style") ),
+		// (IE uses .cssText instead)
+		style: /top/.test( a.getAttribute("style") ),
 
 		// Make sure that URLs aren't manipulated
 		// (IE normalizes it by default)
@@ -865,246 +1354,481 @@ function now() {
 		// Make sure that element opacity exists
 		// (IE uses filter instead)
 		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55$/.test( a.style.opacity ),
+		opacity: /^0.5/.test( a.style.opacity ),
 
 		// Verify style float existence
 		// (IE uses styleFloat instead of cssFloat)
 		cssFloat: !!a.style.cssFloat,
 
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: div.getElementsByTagName("input")[0].value === "on",
+		// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+		checkOn: !!input.value,
 
 		// Make sure that a selected-by-default option has a working selected property.
 		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
+		optSelected: opt.selected,
 
-		parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
+		// Tests for enctype support on a form (#6743)
+		enctype: !!document.createElement("form").enctype,
+
+		// Makes sure cloning an html5 element does not cause problems
+		// Where outerHTML is undefined, this still works
+		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
+
+		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
+		boxModel: document.compatMode === "CSS1Compat",
 
 		// Will be defined later
 		deleteExpando: true,
-		checkClone: false,
-		scriptEval: false,
 		noCloneEvent: true,
-		boxModel: null
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableMarginRight: true,
+		boxSizingReliable: true,
+		pixelPosition: false
 	};
 
-	script.type = "text/javascript";
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Support: IE<9
 	try {
-		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
-	} catch(e) {}
-
-	root.insertBefore( script, root.firstChild );
-
-	// Make sure that the execution of code works by injecting a script
-	// tag with appendChild/createTextNode
-	// (IE doesn't support this, fails, and uses .text instead)
-	if ( window[ id ] ) {
-		jQuery.support.scriptEval = true;
-		delete window[ id ];
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
 	}
 
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete script.test;
-	
-	} catch(e) {
-		jQuery.support.deleteExpando = false;
-	}
+	// Check if we can trust getAttribute("value")
+	input = document.createElement("input");
+	input.setAttribute( "value", "" );
+	support.input = input.getAttribute( "value" ) === "";
 
-	root.removeChild( script );
+	// Check if an input maintains its value after becoming a radio
+	input.value = "t";
+	input.setAttribute( "type", "radio" );
+	support.radioValue = input.value === "t";
 
-	if ( div.attachEvent && div.fireEvent ) {
-		div.attachEvent("onclick", function click() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			jQuery.support.noCloneEvent = false;
-			div.detachEvent("onclick", click);
-		});
-		div.cloneNode(true).fireEvent("onclick");
-	}
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	input.setAttribute( "checked", "t" );
+	input.setAttribute( "name", "t" );
 
-	div = document.createElement("div");
-	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
+	fragment = document.createDocumentFragment();
+	fragment.appendChild( input );
 
-	var fragment = document.createDocumentFragment();
-	fragment.appendChild( div.firstChild );
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
 
 	// WebKit doesn't clone checked state correctly in fragments
-	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
 
-	// Figure out if the W3C box model works as expected
-	// document.body must exist before we can do this
+	// Support: IE<9
+	// Opera does not clone events (and typeof div.attachEvent === undefined).
+	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
+	if ( div.attachEvent ) {
+		div.attachEvent( "onclick", function() {
+			support.noCloneEvent = false;
+		});
+
+		div.cloneNode( true ).click();
+	}
+
+	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
+	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP), test/csp.php
+	for ( i in { submit: true, change: true, focusin: true }) {
+		div.setAttribute( eventName = "on" + i, "t" );
+
+		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
+	}
+
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	// Run tests that need a body at doc ready
 	jQuery(function() {
-		var div = document.createElement("div");
-		div.style.width = div.style.paddingLeft = "1px";
+		var container, marginDiv, tds,
+			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
+			body = document.getElementsByTagName("body")[0];
 
-		document.body.appendChild( div );
-		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
-		document.body.removeChild( div ).style.display = 'none';
+		if ( !body ) {
+			// Return for frameset docs that don't have a body
+			return;
+		}
 
-		div = null;
+		container = document.createElement("div");
+		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
+
+		body.appendChild( container ).appendChild( div );
+
+		// Support: IE8
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+		tds = div.getElementsByTagName("td");
+		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
+		isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+		tds[ 0 ].style.display = "";
+		tds[ 1 ].style.display = "none";
+
+		// Support: IE8
+		// Check if empty table cells still have offsetWidth/Height
+		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+
+		// Check box-sizing and margin behavior
+		div.innerHTML = "";
+		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
+		support.boxSizing = ( div.offsetWidth === 4 );
+		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
+
+		// Use window.getComputedStyle because jsdom on node.js will break without it.
+		if ( window.getComputedStyle ) {
+			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
+			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
+
+			// Check if div with explicit width and no margin-right incorrectly
+			// gets computed margin-right based on width of container. (#3333)
+			// Fails in WebKit before Feb 2011 nightlies
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			marginDiv = div.appendChild( document.createElement("div") );
+			marginDiv.style.cssText = div.style.cssText = divReset;
+			marginDiv.style.marginRight = marginDiv.style.width = "0";
+			div.style.width = "1px";
+
+			support.reliableMarginRight =
+				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
+		}
+
+		if ( typeof div.style.zoom !== core_strundefined ) {
+			// Support: IE<8
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			div.innerHTML = "";
+			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
+			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+
+			// Support: IE6
+			// Check if elements with layout shrink-wrap their children
+			div.style.display = "block";
+			div.innerHTML = "<div></div>";
+			div.firstChild.style.width = "5px";
+			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+
+			if ( support.inlineBlockNeedsLayout ) {
+				// Prevent IE 6 from affecting layout for positioned elements #11048
+				// Prevent IE from shrinking the body in IE 7 mode #12869
+				// Support: IE<8
+				body.style.zoom = 1;
+			}
+		}
+
+		body.removeChild( container );
+
+		// Null elements to avoid leaks in IE
+		container = div = tds = marginDiv = null;
 	});
 
-	// Technique from Juriy Zaytsev
-	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-	var eventSupported = function( eventName ) { 
-		var el = document.createElement("div"); 
-		eventName = "on" + eventName; 
+	// Null elements to avoid leaks in IE
+	all = select = fragment = opt = a = input = null;
 
-		var isSupported = (eventName in el); 
-		if ( !isSupported ) { 
-			el.setAttribute(eventName, "return;"); 
-			isSupported = typeof el[eventName] === "function"; 
-		} 
-		el = null; 
-
-		return isSupported; 
-	};
-	
-	jQuery.support.submitBubbles = eventSupported("submit");
-	jQuery.support.changeBubbles = eventSupported("change");
-
-	// release memory in IE
-	root = script = div = all = a = null;
+	return support;
 })();
 
-jQuery.props = {
-	"for": "htmlFor",
-	"class": "className",
-	readonly: "readOnly",
-	maxlength: "maxLength",
-	cellspacing: "cellSpacing",
-	rowspan: "rowSpan",
-	colspan: "colSpan",
-	tabindex: "tabIndex",
-	usemap: "useMap",
-	frameborder: "frameBorder"
-};
-var expando = "jQuery" + now(), uuid = 0, windowData = {};
+var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+function internalData( elem, name, data, pvt /* Internal Use Only */ ){
+	if ( !jQuery.acceptData( elem ) ) {
+		return;
+	}
+
+	var thisCache, ret,
+		internalKey = jQuery.expando,
+		getByName = typeof name === "string",
+
+		// We have to handle DOM nodes and JS objects differently because IE6-7
+		// can't GC object references properly across the DOM-JS boundary
+		isNode = elem.nodeType,
+
+		// Only DOM nodes need the global jQuery cache; JS object data is
+		// attached directly to the object so GC can occur automatically
+		cache = isNode ? jQuery.cache : elem,
+
+		// Only defining an ID for JS objects if its cache already exists allows
+		// the code to shortcut on the same path as a DOM node with no cache
+		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+
+	// Avoid doing any more work than we need to when trying to get data on an
+	// object that has no data at all
+	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
+		return;
+	}
+
+	if ( !id ) {
+		// Only DOM nodes need a new unique ID for each element since their data
+		// ends up in the global cache
+		if ( isNode ) {
+			elem[ internalKey ] = id = core_deletedIds.pop() || jQuery.guid++;
+		} else {
+			id = internalKey;
+		}
+	}
+
+	if ( !cache[ id ] ) {
+		cache[ id ] = {};
+
+		// Avoids exposing jQuery metadata on plain JS objects when the object
+		// is serialized using JSON.stringify
+		if ( !isNode ) {
+			cache[ id ].toJSON = jQuery.noop;
+		}
+	}
+
+	// An object can be passed to jQuery.data instead of a key/value pair; this gets
+	// shallow copied over onto the existing cache
+	if ( typeof name === "object" || typeof name === "function" ) {
+		if ( pvt ) {
+			cache[ id ] = jQuery.extend( cache[ id ], name );
+		} else {
+			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+		}
+	}
+
+	thisCache = cache[ id ];
+
+	// jQuery data() is stored in a separate object inside the object's internal data
+	// cache in order to avoid key collisions between internal data and user-defined
+	// data.
+	if ( !pvt ) {
+		if ( !thisCache.data ) {
+			thisCache.data = {};
+		}
+
+		thisCache = thisCache.data;
+	}
+
+	if ( data !== undefined ) {
+		thisCache[ jQuery.camelCase( name ) ] = data;
+	}
+
+	// Check for both converted-to-camel and non-converted data property names
+	// If a data property was specified
+	if ( getByName ) {
+
+		// First Try to find as-is property data
+		ret = thisCache[ name ];
+
+		// Test for null|undefined property data
+		if ( ret == null ) {
+
+			// Try to find the camelCased property
+			ret = thisCache[ jQuery.camelCase( name ) ];
+		}
+	} else {
+		ret = thisCache;
+	}
+
+	return ret;
+}
+
+function internalRemoveData( elem, name, pvt ) {
+	if ( !jQuery.acceptData( elem ) ) {
+		return;
+	}
+
+	var i, l, thisCache,
+		isNode = elem.nodeType,
+
+		// See jQuery.data for more information
+		cache = isNode ? jQuery.cache : elem,
+		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+	// If there is already no cache entry for this object, there is no
+	// purpose in continuing
+	if ( !cache[ id ] ) {
+		return;
+	}
+
+	if ( name ) {
+
+		thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+		if ( thisCache ) {
+
+			// Support array or space separated string names for data keys
+			if ( !jQuery.isArray( name ) ) {
+
+				// try the string as a key before any manipulation
+				if ( name in thisCache ) {
+					name = [ name ];
+				} else {
+
+					// split the camel cased version by spaces unless a key with the spaces exists
+					name = jQuery.camelCase( name );
+					if ( name in thisCache ) {
+						name = [ name ];
+					} else {
+						name = name.split(" ");
+					}
+				}
+			} else {
+				// If "name" is an array of keys...
+				// When data is initially created, via ("key", "val") signature,
+				// keys will be converted to camelCase.
+				// Since there is no way to tell _how_ a key was added, remove
+				// both plain key and camelCase key. #12786
+				// This will only penalize the array argument path.
+				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
+			}
+
+			for ( i = 0, l = name.length; i < l; i++ ) {
+				delete thisCache[ name[i] ];
+			}
+
+			// If there is no data left in the cache, we want to continue
+			// and let the cache object itself get destroyed
+			if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
+				return;
+			}
+		}
+	}
+
+	// See jQuery.data for more information
+	if ( !pvt ) {
+		delete cache[ id ].data;
+
+		// Don't destroy the parent cache unless the internal data object
+		// had been the only thing left in it
+		if ( !isEmptyDataObject( cache[ id ] ) ) {
+			return;
+		}
+	}
+
+	// Destroy the cache
+	if ( isNode ) {
+		jQuery.cleanData( [ elem ], true );
+
+	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
+		delete cache[ id ];
+
+	// When all else fails, null
+	} else {
+		cache[ id ] = null;
+	}
+}
 
 jQuery.extend({
 	cache: {},
-	
-	expando:expando,
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
 
 	// The following elements throw uncatchable exceptions if you
 	// attempt to add expando properties to them.
 	noData: {
 		"embed": true,
-		"object": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
 		"applet": true
 	},
 
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
 	data: function( elem, name, data ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-			return;
-		}
-
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ], cache = jQuery.cache, thisCache;
-
-		if ( !id && typeof name === "string" && data === undefined ) {
-			return null;
-		}
-
-		// Compute a unique ID for the element
-		if ( !id ) { 
-			id = ++uuid;
-		}
-
-		// Avoid generating a new cache unless none exists and we
-		// want to manipulate it.
-		if ( typeof name === "object" ) {
-			elem[ expando ] = id;
-			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
-
-		} else if ( !cache[ id ] ) {
-			elem[ expando ] = id;
-			cache[ id ] = {};
-		}
-
-		thisCache = cache[ id ];
-
-		// Prevent overriding the named cache with undefined values
-		if ( data !== undefined ) {
-			thisCache[ name ] = data;
-		}
-
-		return typeof name === "string" ? thisCache[ name ] : thisCache;
+		return internalData( elem, name, data );
 	},
 
 	removeData: function( elem, name ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-			return;
+		return internalRemoveData( elem, name );
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return internalData( elem, name, data, true );
+	},
+
+	_removeData: function( elem, name ) {
+		return internalRemoveData( elem, name, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		// Do not set data on non-element because it will not be cleared (#8335).
+		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
+			return false;
 		}
 
-		elem = elem == window ?
-			windowData :
-			elem;
+		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
 
-		var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
-
-		// If we want to remove a specific section of the element's data
-		if ( name ) {
-			if ( thisCache ) {
-				// Remove the section of cache data
-				delete thisCache[ name ];
-
-				// If we've removed all the data, remove the element's cache
-				if ( jQuery.isEmptyObject(thisCache) ) {
-					jQuery.removeData( elem );
-				}
-			}
-
-		// Otherwise, we want to remove all of the element's data
-		} else {
-			if ( jQuery.support.deleteExpando ) {
-				delete elem[ jQuery.expando ];
-
-			} else if ( elem.removeAttribute ) {
-				elem.removeAttribute( jQuery.expando );
-			}
-
-			// Completely remove the data cache
-			delete cache[ id ];
-		}
+		// nodes accept data unless otherwise specified; rejection can be conditional
+		return !noData || noData !== true && elem.getAttribute("classid") === noData;
 	}
 });
 
 jQuery.fn.extend({
 	data: function( key, value ) {
-		if ( typeof key === "undefined" && this.length ) {
-			return jQuery.data( this[0] );
+		var attrs, name,
+			elem = this[0],
+			i = 0,
+			data = null;
 
-		} else if ( typeof key === "object" ) {
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = jQuery.data( elem );
+
+				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+					attrs = elem.attributes;
+					for ( ; i < attrs.length; i++ ) {
+						name = attrs[i].name;
+
+						if ( !name.indexOf( "data-" ) ) {
+							name = jQuery.camelCase( name.slice(5) );
+
+							dataAttr( elem, name, data[ name ] );
+						}
+					}
+					jQuery._data( elem, "parsedAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
 			return this.each(function() {
 				jQuery.data( this, key );
 			});
 		}
 
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
+		return jQuery.access( this, function( value ) {
 
-		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
-			if ( data === undefined && this.length ) {
-				data = jQuery.data( this[0], key );
+			if ( value === undefined ) {
+				// Try to fetch any internally stored data first
+				return elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
 			}
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-		} else {
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
+
+			this.each(function() {
 				jQuery.data( this, key, value );
 			});
-		}
+		}, null, value, arguments.length > 1, null, true );
 	},
 
 	removeData: function( key ) {
@@ -1113,146 +1837,269 @@ jQuery.fn.extend({
 		});
 	}
 });
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		if ( !elem ) {
-			return;
-		}
 
-		type = (type || "fx") + "queue";
-		var q = jQuery.data( elem, type );
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
 
-		// Speed up dequeue by getting out quickly if this is just a lookup
-		if ( !data ) {
-			return q || [];
-		}
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
 
-		if ( !q || jQuery.isArray(data) ) {
-			q = jQuery.data( elem, type, jQuery.makeArray(data) );
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+					data === "false" ? false :
+					data === "null" ? null :
+					// Only convert to a number if it doesn't change the string
+					+data + "" === data ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+						data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
 
 		} else {
-			q.push( data );
+			data = undefined;
 		}
+	}
 
-		return q;
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	var name;
+	for ( name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		var queue;
+
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			queue = jQuery._data( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !queue || jQuery.isArray(data) ) {
+					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+				} else {
+					queue.push( data );
+				}
+			}
+			return queue || [];
+		}
 	},
 
 	dequeue: function( elem, type ) {
 		type = type || "fx";
 
-		var queue = jQuery.queue( elem, type ), fn = queue.shift();
+		var queue = jQuery.queue( elem, type ),
+			startLength = queue.length,
+			fn = queue.shift(),
+			hooks = jQuery._queueHooks( elem, type ),
+			next = function() {
+				jQuery.dequeue( elem, type );
+			};
 
 		// If the fx queue is dequeued, always remove the progress sentinel
 		if ( fn === "inprogress" ) {
 			fn = queue.shift();
+			startLength--;
 		}
 
+		hooks.cur = fn;
 		if ( fn ) {
+
 			// Add a progress sentinel to prevent the fx queue from being
 			// automatically dequeued
 			if ( type === "fx" ) {
-				queue.unshift("inprogress");
+				queue.unshift( "inprogress" );
 			}
 
-			fn.call(elem, function() {
-				jQuery.dequeue(elem, type);
-			});
+			// clear up the last queue stop function
+			delete hooks.stop;
+			fn.call( elem, next, hooks );
 		}
+
+		if ( !startLength && hooks ) {
+			hooks.empty.fire();
+		}
+	},
+
+	// not intended for public consumption - generates a queueHooks object, or returns the current one
+	_queueHooks: function( elem, type ) {
+		var key = type + "queueHooks";
+		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+			empty: jQuery.Callbacks("once memory").add(function() {
+				jQuery._removeData( elem, type + "queue" );
+				jQuery._removeData( elem, key );
+			})
+		});
 	}
 });
 
 jQuery.fn.extend({
 	queue: function( type, data ) {
+		var setter = 2;
+
 		if ( typeof type !== "string" ) {
 			data = type;
 			type = "fx";
+			setter--;
 		}
 
-		if ( data === undefined ) {
+		if ( arguments.length < setter ) {
 			return jQuery.queue( this[0], type );
 		}
-		return this.each(function( i, elem ) {
-			var queue = jQuery.queue( this, type, data );
 
-			if ( type === "fx" && queue[0] !== "inprogress" ) {
-				jQuery.dequeue( this, type );
-			}
-		});
+		return data === undefined ?
+			this :
+			this.each(function() {
+				var queue = jQuery.queue( this, type, data );
+
+				// ensure a hooks for this queue
+				jQuery._queueHooks( this, type );
+
+				if ( type === "fx" && queue[0] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			});
 	},
 	dequeue: function( type ) {
 		return this.each(function() {
 			jQuery.dequeue( this, type );
 		});
 	},
-
 	// Based off of the plugin by Clint Helfers, with permission.
 	// http://blindsignals.com/index.php/2009/07/jquery-delay/
 	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
 		type = type || "fx";
 
-		return this.queue( type, function() {
-			var elem = this;
-			setTimeout(function() {
-				jQuery.dequeue( elem, type );
-			}, time );
+		return this.queue( type, function( next, hooks ) {
+			var timeout = setTimeout( next, time );
+			hooks.stop = function() {
+				clearTimeout( timeout );
+			};
 		});
 	},
-
 	clearQueue: function( type ) {
 		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, obj ) {
+		var tmp,
+			count = 1,
+			defer = jQuery.Deferred(),
+			elements = this,
+			i = this.length,
+			resolve = function() {
+				if ( !( --count ) ) {
+					defer.resolveWith( elements, [ elements ] );
+				}
+			};
+
+		if ( typeof type !== "string" ) {
+			obj = type;
+			type = undefined;
+		}
+		type = type || "fx";
+
+		while( i-- ) {
+			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+			if ( tmp && tmp.empty ) {
+				count++;
+				tmp.empty.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( obj );
 	}
 });
-var rclass = /[\n\t]/g,
-	rspace = /\s+/,
+var nodeHook, boolHook,
+	rclass = /[\t\r\n]/g,
 	rreturn = /\r/g,
-	rspecialurl = /href|src|style/,
-	rtype = /(button|input)/i,
-	rfocusable = /(button|input|object|select|textarea)/i,
-	rclickable = /^(a|area)$/i,
-	rradiocheck = /radio|checkbox/;
+	rfocusable = /^(?:input|select|textarea|button|object)$/i,
+	rclickable = /^(?:a|area)$/i,
+	rboolean = /^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,
+	ruseDefault = /^(?:checked|selected)$/i,
+	getSetAttribute = jQuery.support.getSetAttribute,
+	getSetInput = jQuery.support.input;
 
 jQuery.fn.extend({
 	attr: function( name, value ) {
-		return access( this, name, value, true, jQuery.attr );
+		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
 	},
 
-	removeAttr: function( name, fn ) {
-		return this.each(function(){
-			jQuery.attr( this, name, "" );
-			if ( this.nodeType === 1 ) {
-				this.removeAttribute( name );
-			}
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	},
+
+	prop: function( name, value ) {
+		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
 		});
 	},
 
 	addClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class")) );
+		var classes, elem, cur, clazz, j,
+			i = 0,
+			len = this.length,
+			proceed = typeof value === "string" && value;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call( this, j, this.className ) );
 			});
 		}
 
-		if ( value && typeof value === "string" ) {
-			var classNames = (value || "").split( rspace );
+		if ( proceed ) {
+			// The disjunction here is for better compressibility (see removeClass)
+			classes = ( value || "" ).match( core_rnotwhite ) || [];
 
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					" "
+				);
 
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className ) {
-						elem.className = value;
-
-					} else {
-						var className = " " + elem.className + " ", setClass = elem.className;
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								setClass += " " + classNames[c];
-							}
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
 						}
-						elem.className = jQuery.trim( setClass );
 					}
+					elem.className = jQuery.trim( cur );
+
 				}
 			}
 		}
@@ -1261,30 +2108,36 @@ jQuery.fn.extend({
 	},
 
 	removeClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.removeClass( value.call(this, i, self.attr("class")) );
+		var classes, elem, cur, clazz, j,
+			i = 0,
+			len = this.length,
+			proceed = arguments.length === 0 || typeof value === "string" && value;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, this.className ) );
 			});
 		}
+		if ( proceed ) {
+			classes = ( value || "" ).match( core_rnotwhite ) || [];
 
-		if ( (value && typeof value === "string") || value === undefined ) {
-			var classNames = (value || "").split(rspace);
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					""
+				);
 
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 && elem.className ) {
-					if ( value ) {
-						var className = (" " + elem.className + " ").replace(rclass, " ");
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[c] + " ", " ");
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
 						}
-						elem.className = jQuery.trim( className );
-
-					} else {
-						elem.className = "";
 					}
+					elem.className = value ? jQuery.trim( cur ) : "";
 				}
 			}
 		}
@@ -1293,44 +2146,52 @@ jQuery.fn.extend({
 	},
 
 	toggleClass: function( value, stateVal ) {
-		var type = typeof value, isBool = typeof stateVal === "boolean";
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
 
 		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
 			});
 		}
 
 		return this.each(function() {
 			if ( type === "string" ) {
 				// toggle individual class names
-				var className, i = 0, self = jQuery(this),
+				var className,
+					i = 0,
+					self = jQuery( this ),
 					state = stateVal,
-					classNames = value.split( rspace );
+					classNames = value.match( core_rnotwhite ) || [];
 
 				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
+					// check each className given, space separated list
 					state = isBool ? state : !self.hasClass( className );
 					self[ state ? "addClass" : "removeClass" ]( className );
 				}
 
-			} else if ( type === "undefined" || type === "boolean" ) {
+			// Toggle whole class name
+			} else if ( type === core_strundefined || type === "boolean" ) {
 				if ( this.className ) {
 					// store className if set
-					jQuery.data( this, "__className__", this.className );
+					jQuery._data( this, "__className__", this.className );
 				}
 
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
+				// If the element has a class name or if we're passed "false",
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
 			}
 		});
 	},
 
 	hasClass: function( selector ) {
-		var className = " " + selector + " ";
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+		var className = " " + selector + " ",
+			i = 0,
+			l = this.length;
+		for ( ; i < l; i++ ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
 				return true;
 			}
 		}
@@ -1339,95 +2200,60 @@ jQuery.fn.extend({
 	},
 
 	val: function( value ) {
-		if ( value === undefined ) {
-			var elem = this[0];
+		var ret, hooks, isFunction,
+			elem = this[0];
 
+		if ( !arguments.length ) {
 			if ( elem ) {
-				if ( jQuery.nodeName( elem, "option" ) ) {
-					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
 				}
 
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type === "select-one";
-
-					// Nothing was selected
-					if ( index < 0 ) {
-						return null;
-					}
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
-
-						if ( option.selected ) {
-							// Get the specifc value for the option
-							value = jQuery(option).val();
-
-							// We don't need an array for one selects
-							if ( one ) {
-								return value;
-							}
-
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-
-					return values;
-				}
-
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
-					return elem.getAttribute("value") === null ? "on" : elem.value;
-				}
-				
-
-				// Everything else, we just grab the value
-				return (elem.value || "").replace(rreturn, "");
+				ret = elem.value;
 
+				return typeof ret === "string" ?
+					// handle most common string cases
+					ret.replace(rreturn, "") :
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
 			}
 
-			return undefined;
+			return;
 		}
 
-		var isFunction = jQuery.isFunction(value);
+		isFunction = jQuery.isFunction( value );
 
-		return this.each(function(i) {
-			var self = jQuery(this), val = value;
+		return this.each(function( i ) {
+			var val,
+				self = jQuery(this);
 
 			if ( this.nodeType !== 1 ) {
 				return;
 			}
 
 			if ( isFunction ) {
-				val = value.call(this, i, self.val());
-			}
-
-			// Typecast each time if the value is a Function and the appended
-			// value is therefore different each time.
-			if ( typeof val === "number" ) {
-				val += "";
-			}
-
-			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
-				this.checked = jQuery.inArray( self.val(), val ) >= 0;
-
-			} else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(val);
-
-				jQuery( "option", this ).each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					this.selectedIndex = -1;
-				}
-
+				val = value.call( this, i, self.val() );
 			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
 				this.value = val;
 			}
 		});
@@ -1435,212 +2261,535 @@ jQuery.fn.extend({
 });
 
 jQuery.extend({
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
-		height: true,
-		offset: true
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				// attributes.value is undefined in Blackberry 4.7 but
+				// uses .value. See #6932
+				var val = elem.attributes.value;
+				return !val || val.specified ? elem.value : elem.text;
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+							// Don't return options that are disabled or in a disabled optgroup
+							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
+							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var values = jQuery.makeArray( value );
+
+				jQuery(elem).find("option").each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
 	},
-		
-	attr: function( elem, name, value, pass ) {
-		// don't set attributes on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
-		}
 
-		if ( pass && name in jQuery.attrFn ) {
-			return jQuery(elem)[name](value);
-		}
+	attr: function( elem, name, value ) {
+		var hooks, notxml, ret,
+			nType = elem.nodeType;
 
-		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined;
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
-
-		// Only do all the following if this is a node (faster for style)
-		if ( elem.nodeType === 1 ) {
-			// These attributes require special treatment
-			var special = rspecialurl.test( name );
-
-			// Safari mis-reports the default selected property of an option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name === "selected" && !jQuery.support.optSelected ) {
-				var parent = elem.parentNode;
-				if ( parent ) {
-					parent.selectedIndex;
-	
-					// Make sure that it also works with optgroups, see #5701
-					if ( parent.parentNode ) {
-						parent.parentNode.selectedIndex;
-					}
-				}
-			}
-
-			// If applicable, access the attribute via the DOM 0 way
-			if ( name in elem && notxml && !special ) {
-				if ( set ) {
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-						jQuery.error( "type property can't be changed" );
-					}
-
-					elem[ name ] = value;
-				}
-
-				// browsers index elements by id/name on forms, give priority to attributes.
-				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
-					return elem.getAttributeNode( name ).nodeValue;
-				}
-
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				if ( name === "tabIndex" ) {
-					var attributeNode = elem.getAttributeNode( "tabIndex" );
-
-					return attributeNode && attributeNode.specified ?
-						attributeNode.value :
-						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							undefined;
-				}
-
-				return elem[ name ];
-			}
-
-			if ( !jQuery.support.style && notxml && name === "style" ) {
-				if ( set ) {
-					elem.style.cssText = "" + value;
-				}
-
-				return elem.style.cssText;
-			}
-
-			if ( set ) {
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
-			}
-
-			var attr = !jQuery.support.hrefNormalized && notxml && special ?
-					// Some attributes require a special call on IE
-					elem.getAttribute( name, 2 ) :
-					elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
-		}
-
-		// elem is actually elem.style ... set the style
-		// Using attr for specific style information is now deprecated. Use style instead.
-		return jQuery.style( elem, name, value );
-	}
-});
-var rnamespaces = /\.(.*)$/,
-	fcleanup = function( nm ) {
-		return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
-			return "\\" + ch;
-		});
-	};
-
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code originated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function( elem, types, handler, data ) {
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
 			return;
 		}
 
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
-			elem = window;
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === core_strundefined ) {
+			return jQuery.prop( elem, name, value );
 		}
 
-		var handleObjIn, handleObj;
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
 
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( notxml ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
 		}
 
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+
+			} else if ( hooks && notxml && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, value + "" );
+				return value;
+			}
+
+		} else if ( hooks && notxml && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+
+			// In IE9+, Flash objects don't have .getAttribute (#12945)
+			// Support: IE9+
+			if ( typeof elem.getAttribute !== core_strundefined ) {
+				ret =  elem.getAttribute( name );
+			}
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret == null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var name, propName,
+			i = 0,
+			attrNames = value && value.match( core_rnotwhite );
+
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( (name = attrNames[i++]) ) {
+				propName = jQuery.propFix[ name ] || name;
+
+				// Boolean attributes get special treatment (#10870)
+				if ( rboolean.test( name ) ) {
+					// Set corresponding property to false for boolean attributes
+					// Also clear defaultChecked/defaultSelected (if appropriate) for IE<8
+					if ( !getSetAttribute && ruseDefault.test( name ) ) {
+						elem[ jQuery.camelCase( "default-" + name ) ] =
+							elem[ propName ] = false;
+					} else {
+						elem[ propName ] = false;
+					}
+
+				// See #9699 for explanation of this approach (setting first, then removal)
+				} else {
+					jQuery.attr( elem, name, "" );
+				}
+
+				elem.removeAttribute( getSetAttribute ? name : propName );
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to default in case type is set after value during creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		}
+	},
+
+	propFix: {
+		tabindex: "tabIndex",
+		readonly: "readOnly",
+		"for": "htmlFor",
+		"class": "className",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		cellpadding: "cellPadding",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		usemap: "useMap",
+		frameborder: "frameBorder",
+		contenteditable: "contentEditable"
+	},
+
+	prop: function( elem, name, value ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
 		}
 
-		// Init the element's event structure
-		var elemData = jQuery.data( elem );
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
 
-		// If no elemData is found then we must be trying to bind to one of the
-		// banned noData elements
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				return ( elem[ name ] = value );
+			}
+
+		} else {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+				return ret;
+
+			} else {
+				return elem[ name ];
+			}
+		}
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				var attributeNode = elem.getAttributeNode("tabindex");
+
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		}
+	}
+});
+
+// Hook for boolean attributes
+boolHook = {
+	get: function( elem, name ) {
+		var
+			// Use .prop to determine if this attribute is understood as boolean
+			prop = jQuery.prop( elem, name ),
+
+			// Fetch it accordingly
+			attr = typeof prop === "boolean" && elem.getAttribute( name ),
+			detail = typeof prop === "boolean" ?
+
+				getSetInput && getSetAttribute ?
+					attr != null :
+					// oldIE fabricates an empty string for missing boolean attributes
+					// and conflates checked/selected into attroperties
+					ruseDefault.test( name ) ?
+						elem[ jQuery.camelCase( "default-" + name ) ] :
+						!!attr :
+
+				// fetch an attribute node for properties not recognized as boolean
+				elem.getAttributeNode( name );
+
+		return detail && detail.value !== false ?
+			name.toLowerCase() :
+			undefined;
+	},
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+			// IE<8 needs the *property* name
+			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+		// Use defaultChecked and defaultSelected for oldIE
+		} else {
+			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+		}
+
+		return name;
+	}
+};
+
+// fix oldIE value attroperty
+if ( !getSetInput || !getSetAttribute ) {
+	jQuery.attrHooks.value = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			return jQuery.nodeName( elem, "input" ) ?
+
+				// Ignore the value *property* by using defaultValue
+				elem.defaultValue :
+
+				ret && ret.specified ? ret.value : undefined;
+		},
+		set: function( elem, value, name ) {
+			if ( jQuery.nodeName( elem, "input" ) ) {
+				// Does not return so that setAttribute is also used
+				elem.defaultValue = value;
+			} else {
+				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
+				return nodeHook && nodeHook.set( elem, value, name );
+			}
+		}
+	};
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			return ret && ( name === "id" || name === "name" || name === "coords" ? ret.value !== "" : ret.specified ) ?
+				ret.value :
+				undefined;
+		},
+		set: function( elem, value, name ) {
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				elem.setAttributeNode(
+					(ret = elem.ownerDocument.createAttribute( name ))
+				);
+			}
+
+			ret.value = value += "";
+
+			// Break association with cloned elements by also using setAttribute (#9646)
+			return name === "value" || value === elem.getAttribute( name ) ?
+				value :
+				undefined;
+		}
+	};
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		get: nodeHook.get,
+		set: function( elem, value, name ) {
+			nodeHook.set( elem, value === "" ? false : value, name );
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		});
+	});
+}
+
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !jQuery.support.hrefNormalized ) {
+	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				var ret = elem.getAttribute( name, 2 );
+				return ret == null ? undefined : ret;
+			}
+		});
+	});
+
+	// href/src property should get the full normalized URL (#10299/#12915)
+	jQuery.each([ "href", "src" ], function( i, name ) {
+		jQuery.propHooks[ name ] = {
+			get: function( elem ) {
+				return elem.getAttribute( name, 4 );
+			}
+		};
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Note: IE uppercases css property names, but if we were to .toLowerCase()
+			// .cssText, that would destroy case senstitivity in URL's, like in "background"
+			return elem.style.cssText || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = value + "" );
+		}
+	};
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		}
+	});
+}
+
+// IE6/7 call enctype encoding
+if ( !jQuery.support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+// Radios and checkboxes getter/setter
+if ( !jQuery.support.checkOn ) {
+	jQuery.each([ "radio", "checkbox" ], function() {
+		jQuery.valHooks[ this ] = {
+			get: function( elem ) {
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				return elem.getAttribute("value") === null ? "on" : elem.value;
+			}
+		};
+	});
+}
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
+	});
+});
+var rformElems = /^(?:input|select|textarea)$/i,
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|contextmenu)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+
+function returnTrue() {
+	return true;
+}
+
+function returnFalse() {
+	return false;
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	global: {},
+
+	add: function( elem, types, handler, data, selector ) {
+		var tmp, events, t, handleObjIn,
+			special, eventHandle, handleObj,
+			handlers, type, namespaces, origType,
+			elemData = jQuery._data( elem );
+
+		// Don't attach events to noData or text/comment nodes (but allow plain objects)
 		if ( !elemData ) {
 			return;
 		}
 
-		var events = elemData.events = elemData.events || {},
-			eventHandle = elemData.handle, eventHandle;
-
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function() {
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
-					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
 		}
 
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native events in IE.
-		eventHandle.elem = elem;
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		if ( !(events = elemData.events) ) {
+			events = elemData.events = {};
+		}
+		if ( !(eventHandle = elemData.handle) ) {
+			eventHandle = elemData.handle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
+					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+			eventHandle.elem = elem;
+		}
 
 		// Handle multiple events separated by a space
 		// jQuery(...).bind("mouseover mouseout", fn);
-		types = types.split(" ");
+		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
 
-		var type, i = 0, namespaces;
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
 
-		while ( (type = types[ i++ ]) ) {
-			handleObj = handleObjIn ?
-				jQuery.extend({}, handleObjIn) :
-				{ handler: handler, data: data };
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
 
-			// Namespaced event handlers
-			if ( type.indexOf(".") > -1 ) {
-				namespaces = type.split(".");
-				type = namespaces.shift();
-				handleObj.namespace = namespaces.slice(0).sort().join(".");
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
 
-			} else {
-				namespaces = [];
-				handleObj.namespace = "";
-			}
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend({
+				type: type,
+				origType: origType,
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+				namespace: namespaces.join(".")
+			}, handleObjIn );
 
-			handleObj.type = type;
-			handleObj.guid = handler.guid;
-
-			// Get the current list of functions bound to this event
-			var handlers = events[ type ],
-				special = jQuery.event.special[ type ] || {};
-
-			// Init the event handler queue
-			if ( !handlers ) {
+			// Init the event handler queue if we're the first
+			if ( !(handlers = events[ type ]) ) {
 				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
 
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
+				// Only use addEventListener/attachEvent if the special events handler returns false
 				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
 					// Bind the global event handler to the element
 					if ( elem.addEventListener ) {
@@ -1651,19 +2800,23 @@ jQuery.event = {
 					}
 				}
 			}
-			
-			if ( special.add ) { 
-				special.add.call( elem, handleObj ); 
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
 
 				if ( !handleObj.handler.guid ) {
 					handleObj.handler.guid = handler.guid;
 				}
 			}
 
-			// Add the function to the element's handler list
-			handlers.push( handleObj );
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
 
-			// Keep track of which events have been used, for global triggering
+			// Keep track of which events have ever been used, for event optimization
 			jQuery.event.global[ type ] = true;
 		}
 
@@ -1671,280 +2824,206 @@ jQuery.event = {
 		elem = null;
 	},
 
-	global: {},
-
 	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, pos ) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+		var j, handleObj, tmp,
+			origCount, t, events,
+			special, handlers, type,
+			namespaces, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+		if ( !elemData || !(events = elemData.events) ) {
 			return;
 		}
 
-		var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			elemData = jQuery.data( elem ),
-			events = elemData && elemData.events;
+		// Once for each type.namespace in types; type may be omitted
+		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
 
-		if ( !elemData || !events ) {
-			return;
-		}
-
-		// types is actually an event object here
-		if ( types && types.type ) {
-			handler = types.handler;
-			types = types.type;
-		}
-
-		// Unbind all events for the element
-		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
-			types = types || "";
-
-			for ( type in events ) {
-				jQuery.event.remove( elem, type + types );
-			}
-
-			return;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).unbind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		while ( (type = types[ i++ ]) ) {
-			origType = type;
-			handleObj = null;
-			all = type.indexOf(".") < 0;
-			namespaces = [];
-
-			if ( !all ) {
-				// Namespaced event handlers
-				namespaces = type.split(".");
-				type = namespaces.shift();
-
-				namespace = new RegExp("(^|\\.)" + 
-					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)")
-			}
-
-			eventType = events[ type ];
-
-			if ( !eventType ) {
-				continue;
-			}
-
-			if ( !handler ) {
-				for ( var j = 0; j < eventType.length; j++ ) {
-					handleObj = eventType[ j ];
-
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						jQuery.event.remove( elem, origType, handleObj.handler, j );
-						eventType.splice( j--, 1 );
-					}
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
 				}
-
 				continue;
 			}
 
 			special = jQuery.event.special[ type ] || {};
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+			handlers = events[ type ] || [];
+			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
 
-			for ( var j = pos || 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
+			// Remove matching events
+			origCount = j = handlers.length;
+			while ( j-- ) {
+				handleObj = handlers[ j ];
 
-				if ( handler.guid === handleObj.guid ) {
-					// remove the given handler for the given type
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						if ( pos == null ) {
-							eventType.splice( j--, 1 );
-						}
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					( !handler || handler.guid === handleObj.guid ) &&
+					( !tmp || tmp.test( handleObj.namespace ) ) &&
+					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					handlers.splice( j, 1 );
 
-						if ( special.remove ) {
-							special.remove.call( elem, handleObj );
-						}
+					if ( handleObj.selector ) {
+						handlers.delegateCount--;
 					}
-
-					if ( pos != null ) {
-						break;
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
 					}
 				}
 			}
 
-			// remove generic event handler if no more handlers exist
-			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					removeEvent( elem, type, elemData.handle );
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( origCount && !handlers.length ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
 				}
 
-				ret = null;
 				delete events[ type ];
 			}
 		}
 
 		// Remove the expando if it's no longer used
 		if ( jQuery.isEmptyObject( events ) ) {
-			var handle = elemData.handle;
-			if ( handle ) {
-				handle.elem = null;
-			}
-
-			delete elemData.events;
 			delete elemData.handle;
 
-			if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem );
-			}
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery._removeData( elem, "events" );
 		}
 	},
 
-	// bubbling is internal
-	trigger: function( event, data, elem /*, bubbling */ ) {
-		// Event object or event type
-		var type = event.type || event,
-			bubbling = arguments[3];
+	trigger: function( event, data, elem, onlyHandlers ) {
+		var handle, ontype, cur,
+			bubbleType, special, tmp, i,
+			eventPath = [ elem || document ],
+			type = core_hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
 
-		if ( !bubbling ) {
-			event = typeof event === "object" ?
-				// jQuery.Event object
-				event[expando] ? event :
-				// Object literal
-				jQuery.extend( jQuery.Event(type), event ) :
-				// Just the event type (string)
-				jQuery.Event(type);
+		cur = tmp = elem = elem || document;
 
-			if ( type.indexOf("!") >= 0 ) {
-				event.type = type = type.slice(0, -1);
-				event.exclusive = true;
-			}
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
 
-			// Handle a global trigger
-			if ( !elem ) {
-				// Don't bubble custom events when global (to avoid too much overhead)
-				event.stopPropagation();
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
 
-				// Only trigger if we've ever bound an event for it
-				if ( jQuery.event.global[ type ] ) {
-					jQuery.each( jQuery.cache, function() {
-						if ( this.events && this.events[type] ) {
-							jQuery.event.trigger( event, data, this.handle.elem );
-						}
-					});
-				}
-			}
+		if ( type.indexOf(".") >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+		ontype = type.indexOf(":") < 0 && "on" + type;
 
-			// Handle triggering a single element
+		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+		event = event[ jQuery.expando ] ?
+			event :
+			new jQuery.Event( type, typeof event === "object" && event );
 
-			// don't do events on text and comment nodes
-			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-				return undefined;
-			}
+		event.isTrigger = true;
+		event.namespace = namespaces.join(".");
+		event.namespace_re = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+			null;
 
-			// Clean up in case it is reused
-			event.result = undefined;
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
 			event.target = elem;
-
-			// Clone the incoming data, if any
-			data = jQuery.makeArray( data );
-			data.unshift( event );
 		}
 
-		event.currentTarget = elem;
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data == null ?
+			[ event ] :
+			jQuery.makeArray( data, [ event ] );
 
-		// Trigger the event, it is assumed that "handle" is a function
-		var handle = jQuery.data( elem, "handle" );
-		if ( handle ) {
-			handle.apply( elem, data );
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
 		}
 
-		var parent = elem.parentNode || elem.ownerDocument;
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
 
-		// Trigger an inline bound script
-		try {
-			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
-				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
-					event.result = false;
-				}
+			bubbleType = special.delegateType || type;
+			if ( !rfocusMorph.test( bubbleType + type ) ) {
+				cur = cur.parentNode;
+			}
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push( cur );
+				tmp = cur;
 			}
 
-		// prevent IE from throwing an error for some elements with some event types, see #3533
-		} catch (e) {}
-
-		if ( !event.isPropagationStopped() && parent ) {
-			jQuery.event.trigger( event, data, parent, true );
-
-		} else if ( !event.isDefaultPrevented() ) {
-			var target = event.target, old,
-				isClick = jQuery.nodeName(target, "a") && type === "click",
-				special = jQuery.event.special[ type ] || {};
-
-			if ( (!special._default || special._default.call( elem, event ) === false) && 
-				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
-
-				try {
-					if ( target[ type ] ) {
-						// Make sure that we don't accidentally re-trigger the onFOO events
-						old = target[ "on" + type ];
-
-						if ( old ) {
-							target[ "on" + type ] = null;
-						}
-
-						jQuery.event.triggered = true;
-						target[ type ]();
-					}
-
-				// prevent IE from throwing an error for some elements with some event types, see #3533
-				} catch (e) {}
-
-				if ( old ) {
-					target[ "on" + type ] = old;
-				}
-
-				jQuery.event.triggered = false;
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( tmp === (elem.ownerDocument || document) ) {
+				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
 			}
 		}
-	},
 
-	handle: function( event ) {
-		var all, handlers, namespaces, namespace, events;
+		// Fire handlers on the event path
+		i = 0;
+		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
 
-		event = arguments[0] = jQuery.event.fix( event || window.event );
-		event.currentTarget = this;
+			event.type = i > 1 ?
+				bubbleType :
+				special.bindType || type;
 
-		// Namespaced event handlers
-		all = event.type.indexOf(".") < 0 && !event.exclusive;
+			// jQuery handler
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
 
-		if ( !all ) {
-			namespaces = event.type.split(".");
-			event.type = namespaces.shift();
-			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
+			// Native handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
+				event.preventDefault();
+			}
 		}
+		event.type = type;
 
-		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
 
-		if ( events && handlers ) {
-			// Clone the handlers to prevent manipulation
-			handlers = handlers.slice(0);
+			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
+				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
 
-			for ( var j = 0, l = handlers.length; j < l; j++ ) {
-				var handleObj = handlers[ j ];
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
 
-				// Filter the functions by class
-				if ( all || namespace.test( handleObj.namespace ) ) {
-					// Pass in a reference to the handler function itself
-					// So that we can later remove it
-					event.handler = handleObj.handler;
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
-	
-					var ret = handleObj.handler.apply( this, arguments );
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					tmp = elem[ ontype ];
 
-					if ( ret !== undefined ) {
-						event.result = ret;
-						if ( ret === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
+					if ( tmp ) {
+						elem[ ontype ] = null;
 					}
 
-					if ( event.isImmediatePropagationStopped() ) {
-						break;
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					try {
+						elem[ type ]();
+					} catch ( e ) {
+						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
+						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
+					}
+					jQuery.event.triggered = undefined;
+
+					if ( tmp ) {
+						elem[ ontype ] = tmp;
 					}
 				}
 			}
@@ -1953,1802 +3032,2563 @@ jQuery.event = {
 		return event.result;
 	},
 
-	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event );
+
+		var i, ret, handleObj, matched, j,
+			handlerQueue = [],
+			args = core_slice.call( arguments ),
+			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
+			special = jQuery.event.special[ event.type ] || {};
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[0] = event;
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers
+		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+		// Run delegates first; they may want to stop propagation beneath us
+		i = 0;
+		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+			event.currentTarget = matched.elem;
+
+			j = 0;
+			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+
+				// Triggered event must either 1) have no namespace, or
+				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+
+					event.handleObj = handleObj;
+					event.data = handleObj.data;
+
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+							.apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						if ( (event.result = ret) === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	handlers: function( event, handlers ) {
+		var sel, handleObj, matches, i,
+			handlerQueue = [],
+			delegateCount = handlers.delegateCount,
+			cur = event.target;
+
+		// Find delegate handlers
+		// Black-hole SVG <use> instance trees (#13180)
+		// Avoid non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+
+			for ( ; cur != this; cur = cur.parentNode || this ) {
+
+				// Don't check non-elements (#13208)
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
+					matches = [];
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+
+						// Don't conflict with Object.prototype properties (#13203)
+						sel = handleObj.selector + " ";
+
+						if ( matches[ sel ] === undefined ) {
+							matches[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( matches[ sel ] ) {
+							matches.push( handleObj );
+						}
+					}
+					if ( matches.length ) {
+						handlerQueue.push({ elem: cur, handlers: matches });
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( delegateCount < handlers.length ) {
+			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+		}
+
+		return handlerQueue;
+	},
 
 	fix: function( event ) {
-		if ( event[ expando ] ) {
+		if ( event[ jQuery.expando ] ) {
 			return event;
 		}
 
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = event;
-		event = jQuery.Event( originalEvent );
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop, copy,
+			type = event.type,
+			originalEvent = event,
+			fixHook = this.fixHooks[ type ];
 
-		for ( var i = this.props.length, prop; i; ) {
-			prop = this.props[ --i ];
+		if ( !fixHook ) {
+			this.fixHooks[ type ] = fixHook =
+				rmouseEvent.test( type ) ? this.mouseHooks :
+				rkeyEvent.test( type ) ? this.keyHooks :
+				{};
+		}
+		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = new jQuery.Event( originalEvent );
+
+		i = copy.length;
+		while ( i-- ) {
+			prop = copy[ i ];
 			event[ prop ] = originalEvent[ prop ];
 		}
 
-		// Fix target property, if necessary
+		// Support: IE<9
+		// Fix target property (#1925)
 		if ( !event.target ) {
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+			event.target = originalEvent.srcElement || document;
 		}
 
-		// check if target is a textnode (safari)
+		// Support: Chrome 23+, Safari?
+		// Target should not be a text node (#504, #13143)
 		if ( event.target.nodeType === 3 ) {
 			event.target = event.target.parentNode;
 		}
 
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement ) {
-			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
-		}
+		// Support: IE<9
+		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
+		event.metaKey = !!event.metaKey;
 
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement, body = document.body;
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
-		}
-
-		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) {
-			event.which = event.charCode || event.keyCode;
-		}
-
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey ) {
-			event.metaKey = event.ctrlKey;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button !== undefined ) {
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-		}
-
-		return event;
+		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
 	},
 
-	// Deprecated, use jQuery.guid instead
-	guid: 1E8,
+	// Includes some event props shared by KeyEvent and MouseEvent
+	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
 
-	// Deprecated, use jQuery.proxy instead
-	proxy: jQuery.proxy,
+	fixHooks: {},
 
-	special: {
-		ready: {
-			// Make sure the ready event is setup
-			setup: jQuery.bindReady,
-			teardown: jQuery.noop
-		},
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
 
-		live: {
-			add: function( handleObj ) {
-				jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); 
-			},
-
-			remove: function( handleObj ) {
-				var remove = true,
-					type = handleObj.origType.replace(rnamespaces, "");
-				
-				jQuery.each( jQuery.data(this, "events").live || [], function() {
-					if ( type === this.origType.replace(rnamespaces, "") ) {
-						remove = false;
-						return false;
-					}
-				});
-
-				if ( remove ) {
-					jQuery.event.remove( this, handleObj.origType, liveHandler );
-				}
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
 			}
 
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
+			var body, eventDoc, doc,
+				button = original.button,
+				fromElement = original.fromElement;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add relatedTarget, if necessary
+			if ( !event.relatedTarget && fromElement ) {
+				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	special: {
+		load: {
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+		click: {
+			// For checkbox, fire native event so checked state will be right
+			trigger: function() {
+				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
+					this.click();
+					return false;
+				}
+			}
+		},
+		focus: {
+			// Fire native event if possible so blur/focus sequence is correct
+			trigger: function() {
+				if ( this !== document.activeElement && this.focus ) {
+					try {
+						this.focus();
+						return false;
+					} catch ( e ) {
+						// Support: IE<9
+						// If we error on focus to hidden element (#1486, #12518),
+						// let .trigger() run the handlers
+					}
+				}
+			},
+			delegateType: "focusin"
+		},
+		blur: {
+			trigger: function() {
+				if ( this === document.activeElement && this.blur ) {
+					this.blur();
+					return false;
+				}
+			},
+			delegateType: "focusout"
 		},
 
 		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( this.setInterval ) {
-					this.onbeforeunload = eventHandle;
-				}
+			postDispatch: function( event ) {
 
-				return false;
-			},
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
+				// Even when returnValue equals to undefined Firefox will still show alert
+				if ( event.result !== undefined ) {
+					event.originalEvent.returnValue = event.result;
 				}
 			}
 		}
+	},
+
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{ type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
 	}
 };
 
-var removeEvent = document.removeEventListener ?
+jQuery.removeEvent = document.removeEventListener ?
 	function( elem, type, handle ) {
-		elem.removeEventListener( type, handle, false );
-	} : 
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
 	function( elem, type, handle ) {
-		elem.detachEvent( "on" + type, handle );
+		var name = "on" + type;
+
+		if ( elem.detachEvent ) {
+
+			// #8545, #7054, preventing memory leaks for custom events in IE6-8
+			// detachEvent needed property on element, by name of that event, to properly expose it to GC
+			if ( typeof elem[ name ] === core_strundefined ) {
+				elem[ name ] = null;
+			}
+
+			elem.detachEvent( name, handle );
+		}
 	};
 
-jQuery.Event = function( src ) {
+jQuery.Event = function( src, props ) {
 	// Allow instantiation without the 'new' keyword
-	if ( !this.preventDefault ) {
-		return new jQuery.Event( src );
+	if ( !(this instanceof jQuery.Event) ) {
+		return new jQuery.Event( src, props );
 	}
 
 	// Event object
 	if ( src && src.type ) {
 		this.originalEvent = src;
 		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+
 	// Event type
 	} else {
 		this.type = src;
 	}
 
-	// timeStamp is buggy for some events on Firefox(#3843)
-	// So we won't rely on the native value
-	this.timeStamp = now();
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
 
 	// Mark it as fixed
-	this[ expando ] = true;
+	this[ jQuery.expando ] = true;
 };
 
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
-
 // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
 // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
 jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse,
 
+	preventDefault: function() {
 		var e = this.originalEvent;
+
+		this.isDefaultPrevented = returnTrue;
 		if ( !e ) {
 			return;
 		}
-		
-		// if preventDefault exists run it on the original event
+
+		// If preventDefault exists, run it on the original event
 		if ( e.preventDefault ) {
 			e.preventDefault();
+
+		// Support: IE
+		// Otherwise set the returnValue property of the original event to false
+		} else {
+			e.returnValue = false;
 		}
-		// otherwise set the returnValue property of the original event to false (IE)
-		e.returnValue = false;
 	},
 	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
-
 		var e = this.originalEvent;
+
+		this.isPropagationStopped = returnTrue;
 		if ( !e ) {
 			return;
 		}
-		// if stopPropagation exists run it on the original event
+		// If stopPropagation exists, run it on the original event
 		if ( e.stopPropagation ) {
 			e.stopPropagation();
 		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
+
+		// Support: IE
+		// Set the cancelBubble property of the original event to true
 		e.cancelBubble = true;
 	},
 	stopImmediatePropagation: function() {
 		this.isImmediatePropagationStopped = returnTrue;
 		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
+	}
 };
 
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function( event ) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-
-	// Firefox sometimes assigns relatedTarget a XUL element
-	// which we cannot access the parentNode property of
-	try {
-		// Traverse up the tree
-		while ( parent && parent !== this ) {
-			parent = parent.parentNode;
-		}
-
-		if ( parent !== this ) {
-			// set the correct event type
-			event.type = event.data;
-
-			// handle event if we actually just moused on to a non sub-element
-			jQuery.event.handle.apply( this, arguments );
-		}
-
-	// assuming we've left the element since we most likely mousedover a xul element
-	} catch(e) { }
-},
-
-// In case of event delegation, we only need to rename the event.type,
-// liveHandler will take care of the rest.
-delegate = function( event ) {
-	event.type = event.data;
-	jQuery.event.handle.apply( this, arguments );
-};
-
-// Create mouseenter and mouseleave events
+// Create mouseenter/leave events using mouseover/out and event-time checks
 jQuery.each({
 	mouseenter: "mouseover",
 	mouseleave: "mouseout"
 }, function( orig, fix ) {
 	jQuery.event.special[ orig ] = {
-		setup: function( data ) {
-			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
-		},
-		teardown: function( data ) {
-			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj;
+
+			// For mousenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
 		}
 	};
 });
 
-// submit delegation
+// IE submit delegation
 if ( !jQuery.support.submitBubbles ) {
 
 	jQuery.event.special.submit = {
-		setup: function( data, namespaces ) {
-			if ( this.nodeName.toLowerCase() !== "form" ) {
-				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
-
-					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
-						return trigger( "submit", this, arguments );
-					}
-				});
-	 
-				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
-
-					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
-						return trigger( "submit", this, arguments );
-					}
-				});
-
-			} else {
+		setup: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
 				return false;
 			}
+
+			// Lazy-add a submit handler when a descendant form may potentially be submitted
+			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+				// Node name check avoids a VML-related crash in IE (#9807)
+				var elem = e.target,
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
+					jQuery.event.add( form, "submit._submit", function( event ) {
+						event._submit_bubble = true;
+					});
+					jQuery._data( form, "submitBubbles", true );
+				}
+			});
+			// return undefined since we don't need an event listener
+		},
+
+		postDispatch: function( event ) {
+			// If form was submitted by the user, bubble the event up the tree
+			if ( event._submit_bubble ) {
+				delete event._submit_bubble;
+				if ( this.parentNode && !event.isTrigger ) {
+					jQuery.event.simulate( "submit", this.parentNode, event, true );
+				}
+			}
 		},
 
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialSubmit" );
+		teardown: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
 		}
 	};
-
 }
 
-// change delegation, happens here so we have bind.
+// IE change delegation and checkbox/radio fix
 if ( !jQuery.support.changeBubbles ) {
 
-	var formElems = /textarea|input|select/i,
-
-	changeFilters,
-
-	getVal = function( elem ) {
-		var type = elem.type, val = elem.value;
-
-		if ( type === "radio" || type === "checkbox" ) {
-			val = elem.checked;
-
-		} else if ( type === "select-multiple" ) {
-			val = elem.selectedIndex > -1 ?
-				jQuery.map( elem.options, function( elem ) {
-					return elem.selected;
-				}).join("-") :
-				"";
-
-		} else if ( elem.nodeName.toLowerCase() === "select" ) {
-			val = elem.selectedIndex;
-		}
-
-		return val;
-	},
-
-	testChange = function testChange( e ) {
-		var elem = e.target, data, val;
-
-		if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
-			return;
-		}
-
-		data = jQuery.data( elem, "_change_data" );
-		val = getVal(elem);
-
-		// the current data will be also retrieved by beforeactivate
-		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery.data( elem, "_change_data", val );
-		}
-		
-		if ( data === undefined || val === data ) {
-			return;
-		}
-
-		if ( data != null || val ) {
-			e.type = "change";
-			return jQuery.event.trigger( e, arguments[1], elem );
-		}
-	};
-
 	jQuery.event.special.change = {
-		filters: {
-			focusout: testChange, 
 
-			click: function( e ) {
-				var elem = e.target, type = elem.type;
+		setup: function() {
 
-				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
-					return testChange.call( this, e );
+			if ( rformElems.test( this.nodeName ) ) {
+				// IE doesn't fire change on a check/radio until blur; trigger it on click
+				// after a propertychange. Eat the blur-change in special.change.handle.
+				// This still fires onchange a second time for check/radio after blur.
+				if ( this.type === "checkbox" || this.type === "radio" ) {
+					jQuery.event.add( this, "propertychange._change", function( event ) {
+						if ( event.originalEvent.propertyName === "checked" ) {
+							this._just_changed = true;
+						}
+					});
+					jQuery.event.add( this, "click._change", function( event ) {
+						if ( this._just_changed && !event.isTrigger ) {
+							this._just_changed = false;
+						}
+						// Allow triggered, simulated change events (#11500)
+						jQuery.event.simulate( "change", this, event, true );
+					});
 				}
-			},
-
-			// Change has to be called before submit
-			// Keydown will be called before keypress, which is used in submit-event delegation
-			keydown: function( e ) {
-				var elem = e.target, type = elem.type;
-
-				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
-					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
-					type === "select-multiple" ) {
-					return testChange.call( this, e );
-				}
-			},
-
-			// Beforeactivate happens also before the previous element is blurred
-			// with this event you can't trigger a change event, but you can store
-			// information/focus[in] is not needed anymore
-			beforeactivate: function( e ) {
-				var elem = e.target;
-				jQuery.data( elem, "_change_data", getVal(elem) );
-			}
-		},
-
-		setup: function( data, namespaces ) {
-			if ( this.type === "file" ) {
 				return false;
 			}
+			// Delegated event; lazy-add a change handler on descendant inputs
+			jQuery.event.add( this, "beforeactivate._change", function( e ) {
+				var elem = e.target;
 
-			for ( var type in changeFilters ) {
-				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
-			}
-
-			return formElems.test( this.nodeName );
+				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
+					jQuery.event.add( elem, "change._change", function( event ) {
+						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+							jQuery.event.simulate( "change", this.parentNode, event, true );
+						}
+					});
+					jQuery._data( elem, "changeBubbles", true );
+				}
+			});
 		},
 
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialChange" );
+		handle: function( event ) {
+			var elem = event.target;
 
-			return formElems.test( this.nodeName );
+			// Swallow native change events from checkbox/radio, we already triggered them above
+			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+				return event.handleObj.handler.apply( this, arguments );
+			}
+		},
+
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
+
+			return !rformElems.test( this.nodeName );
 		}
 	};
-
-	changeFilters = jQuery.event.special.change.filters;
-}
-
-function trigger( type, elem, args ) {
-	args[0].type = type;
-	return jQuery.event.handle.apply( elem, args );
 }
 
 // Create "bubbling" focus and blur events
-if ( document.addEventListener ) {
+if ( !jQuery.support.focusinBubbles ) {
 	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0,
+			handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				this.addEventListener( orig, handler, true );
-			}, 
-			teardown: function() { 
-				this.removeEventListener( orig, handler, true );
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
 			}
 		};
-
-		function handler( e ) { 
-			e = jQuery.event.fix( e );
-			e.type = fix;
-			return jQuery.event.handle.call( this, e );
-		}
 	});
 }
 
-jQuery.each(["bind", "one"], function( i, name ) {
-	jQuery.fn[ name ] = function( type, data, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" ) {
-			for ( var key in type ) {
-				this[ name ](key, data, type[key], fn);
+jQuery.fn.extend({
+
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var type, origFn;
+
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) {
+				// ( types-Object, data )
+				data = data || selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
 			}
 			return this;
 		}
-		
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
-			data = undefined;
-		}
 
-		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
-			jQuery( this ).unbind( event, handler );
-			return fn.apply( this, arguments );
-		}) : fn;
-
-		if ( type === "unload" && name !== "one" ) {
-			this.one( type, data, fn );
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.add( this[i], type, handler, data );
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
 			}
 		}
-
-		return this;
-	};
-});
-
-jQuery.fn.extend({
-	unbind: function( type, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" && !type.preventDefault ) {
-			for ( var key in type ) {
-				this.unbind(key, type[key]);
-			}
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.remove( this[i], type, fn );
-			}
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
 		}
 
-		return this;
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
+		return this.each( function() {
+			jQuery.event.add( this, types, fn, data, selector );
+		});
 	},
-	
+	one: function( types, selector, data, fn ) {
+		return this.on( types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
 	delegate: function( selector, types, data, fn ) {
-		return this.live( types, data, fn, selector );
+		return this.on( types, selector, data, fn );
 	},
-	
 	undelegate: function( selector, types, fn ) {
-		if ( arguments.length === 0 ) {
-				return this.unbind( "live" );
-		
-		} else {
-			return this.die( types, null, fn, selector );
-		}
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
 	},
-	
+
 	trigger: function( type, data ) {
 		return this.each(function() {
 			jQuery.event.trigger( type, data, this );
 		});
 	},
-
 	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			var event = jQuery.Event( type );
-			event.preventDefault();
-			event.stopPropagation();
-			jQuery.event.trigger( event, data, this[0] );
-			return event.result;
+		var elem = this[0];
+		if ( elem ) {
+			return jQuery.event.trigger( type, data, elem, true );
 		}
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments, i = 1;
-
-		// link all the functions, so any of them can unbind this click handler
-		while ( i < args.length ) {
-			jQuery.proxy( fn, args[ i++ ] );
-		}
-
-		return this.click( jQuery.proxy( fn, function( event ) {
-			// Figure out which function to execute
-			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-			// Make sure that clicks stop
-			event.preventDefault();
-
-			// and execute the function
-			return args[ lastToggle ].apply( this, arguments ) || false;
-		}));
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
 	}
 });
+/*!
+ * Sizzle CSS Selector Engine
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://sizzlejs.com/
+ */
+(function( window, undefined ) {
 
-var liveMap = {
-	focus: "focusin",
-	blur: "focusout",
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-};
+var i,
+	cachedruns,
+	Expr,
+	getText,
+	isXML,
+	compile,
+	hasDuplicate,
+	outermostContext,
 
-jQuery.each(["live", "die"], function( i, name ) {
-	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
-		var type, i = 0, match, namespaces, preType,
-			selector = origSelector || this.selector,
-			context = origSelector ? this : jQuery( this.context );
+	// Local document vars
+	setDocument,
+	document,
+	docElem,
+	documentIsXML,
+	rbuggyQSA,
+	rbuggyMatches,
+	matches,
+	contains,
+	sortOrder,
 
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
-			data = undefined;
-		}
+	// Instance-specific data
+	expando = "sizzle" + -(new Date()),
+	preferredDoc = window.document,
+	support = {},
+	dirruns = 0,
+	done = 0,
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
 
-		types = (types || "").split(" ");
+	// General-purpose constants
+	strundefined = typeof undefined,
+	MAX_NEGATIVE = 1 << 31,
 
-		while ( (type = types[ i++ ]) != null ) {
-			match = rnamespaces.exec( type );
-			namespaces = "";
-
-			if ( match )  {
-				namespaces = match[0];
-				type = type.replace( rnamespaces, "" );
-			}
-
-			if ( type === "hover" ) {
-				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
-				continue;
-			}
-
-			preType = type;
-
-			if ( type === "focus" || type === "blur" ) {
-				types.push( liveMap[ type ] + namespaces );
-				type = type + namespaces;
-
-			} else {
-				type = (liveMap[ type ] || type) + namespaces;
-			}
-
-			if ( name === "live" ) {
-				// bind live handler
-				context.each(function(){
-					jQuery.event.add( this, liveConvert( type, selector ),
-						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
-				});
-
-			} else {
-				// unbind live handler
-				context.unbind( liveConvert( type, selector ), fn );
+	// Array methods
+	arr = [],
+	pop = arr.pop,
+	push = arr.push,
+	slice = arr.slice,
+	// Use a stripped-down indexOf if we can't use a native one
+	indexOf = arr.indexOf || function( elem ) {
+		var i = 0,
+			len = this.length;
+		for ( ; i < len; i++ ) {
+			if ( this[i] === elem ) {
+				return i;
 			}
 		}
-		
-		return this;
-	}
-});
+		return -1;
+	},
 
-function liveHandler( event ) {
-	var stop, elems = [], selectors = [], args = arguments,
-		related, match, handleObj, elem, j, i, l, data,
-		events = jQuery.data( this, "events" );
 
-	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
-	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
-		return;
-	}
+	// Regular expressions
 
-	event.liveFired = this;
+	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+	// http://www.w3.org/TR/css3-syntax/#characters
+	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
 
-	var live = events.live.slice(0);
+	// Loosely modeled on CSS identifier characters
+	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = characterEncoding.replace( "w", "w#" ),
 
-	for ( j = 0; j < live.length; j++ ) {
-		handleObj = live[j];
+	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
+	operators = "([*^$|!~]?=)",
+	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
+		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
 
-		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
-			selectors.push( handleObj.selector );
+	// Prefer arguments quoted,
+	//   then not containing pseudos/brackets,
+	//   then attribute selectors/non-parenthetical expressions,
+	//   then anything else
+	// These preferences are here to reduce the number of selectors
+	//   needing tokenize in the PSEUDO preFilter
+	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
 
-		} else {
-			live.splice( j--, 1 );
-		}
-	}
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
 
-	match = jQuery( event.target ).closest( selectors, event.currentTarget );
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
+	rpseudo = new RegExp( pseudos ),
+	ridentifier = new RegExp( "^" + identifier + "$" ),
 
-	for ( i = 0, l = match.length; i < l; i++ ) {
-		for ( j = 0; j < live.length; j++ ) {
-			handleObj = live[j];
+	matchExpr = {
+		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
+		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
+		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		// For use in libraries implementing .is()
+		// We use this for POS matching in `select`
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+	},
 
-			if ( match[i].selector === handleObj.selector ) {
-				elem = match[i].elem;
-				related = null;
+	rsibling = /[\x20\t\r\n\f]*[+~]/,
 
-				// Those two events require additional checking
-				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
-					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
-				}
+	rnative = /^[^{]+\{\s*\[native code/,
 
-				if ( !related || related !== elem ) {
-					elems.push({ elem: elem, handleObj: handleObj });
-				}
-			}
-		}
-	}
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
 
-	for ( i = 0, l = elems.length; i < l; i++ ) {
-		match = elems[i];
-		event.currentTarget = match.elem;
-		event.data = match.handleObj.data;
-		event.handleObj = match.handleObj;
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
 
-		if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) {
-			stop = false;
-			break;
-		}
-	}
+	rescape = /'|\\/g,
+	rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
 
-	return stop;
-}
-
-function liveConvert( type, selector ) {
-	return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
-}
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( fn ) {
-		return fn ? this.bind( name, fn ) : this.trigger( name );
+	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = /\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,
+	funescape = function( _, escaped ) {
+		var high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		return high !== high ?
+			escaped :
+			// BMP codepoint
+			high < 0 ?
+				String.fromCharCode( high + 0x10000 ) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
 	};
 
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
-});
-
-// Prevent memory leaks in IE
-// Window isn't included so as not to unbind existing unload events
-// More info:
-//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-if ( window.attachEvent && !window.addEventListener ) {
-	window.attachEvent("onunload", function() {
-		for ( var id in jQuery.cache ) {
-			if ( jQuery.cache[ id ].handle ) {
-				// Try/Catch is to handle iframes being unloaded, see #4280
-				try {
-					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
-				} catch(e) {}
-			}
+// Use a stripped-down slice if we can't use a native one
+try {
+	slice.call( preferredDoc.documentElement.childNodes, 0 )[0].nodeType;
+} catch ( e ) {
+	slice = function( i ) {
+		var elem,
+			results = [];
+		while ( (elem = this[i++]) ) {
+			results.push( elem );
 		}
+		return results;
+	};
+}
+
+/**
+ * For feature detection
+ * @param {Function} fn The function to test for native support
+ */
+function isNative( fn ) {
+	return rnative.test( fn + "" );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *	deleting the oldest entry
+ */
+function createCache() {
+	var cache,
+		keys = [];
+
+	return (cache = function( key, value ) {
+		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		if ( keys.push( key += " " ) > Expr.cacheLength ) {
+			// Only keep the most recent entries
+			delete cache[ keys.shift() ];
+		}
+		return (cache[ key ] = value);
 	});
 }
-/*!
- * Sizzle CSS Selector Engine - v1.0
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
  */
-(function(){
+function markFunction( fn ) {
+	fn[ expando ] = true;
+	return fn;
+}
 
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-	done = 0,
-	toString = Object.prototype.toString,
-	hasDuplicate = false,
-	baseHasDuplicate = true;
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+	var div = document.createElement("div");
 
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-//   Thus far that includes Google Chrome.
-[0, 0].sort(function(){
-	baseHasDuplicate = false;
-	return 0;
-});
-
-var Sizzle = function(selector, context, results, seed) {
-	results = results || [];
-	var origContext = context = context || document;
-
-	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
-		return [];
+	try {
+		return fn( div );
+	} catch (e) {
+		return false;
+	} finally {
+		// release memory in IE
+		div = null;
 	}
-	
+}
+
+function Sizzle( selector, context, results, seed ) {
+	var match, elem, m, nodeType,
+		// QSA vars
+		i, groups, old, nid, newContext, newSelector;
+
+	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+		setDocument( context );
+	}
+
+	context = context || document;
+	results = results || [];
+
 	if ( !selector || typeof selector !== "string" ) {
 		return results;
 	}
 
-	var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context),
-		soFar = selector;
-	
-	// Reset the position of the chunker regexp (start from head)
-	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
-		soFar = m[3];
-		
-		parts.push( m[1] );
-		
-		if ( m[2] ) {
-			extra = m[3];
+	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
+		return [];
+	}
+
+	if ( !documentIsXML && !seed ) {
+
+		// Shortcuts
+		if ( (match = rquickExpr.exec( selector )) ) {
+			// Speed-up: Sizzle("#ID")
+			if ( (m = match[1]) ) {
+				if ( nodeType === 9 ) {
+					elem = context.getElementById( m );
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE, Opera, and Webkit return items
+						// by name instead of ID
+						if ( elem.id === m ) {
+							results.push( elem );
+							return results;
+						}
+					} else {
+						return results;
+					}
+				} else {
+					// Context is not a document
+					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+						contains( context, elem ) && elem.id === m ) {
+						results.push( elem );
+						return results;
+					}
+				}
+
+			// Speed-up: Sizzle("TAG")
+			} else if ( match[2] ) {
+				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
+				return results;
+
+			// Speed-up: Sizzle(".CLASS")
+			} else if ( (m = match[3]) && support.getByClassName && context.getElementsByClassName ) {
+				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
+				return results;
+			}
+		}
+
+		// QSA path
+		if ( support.qsa && !rbuggyQSA.test(selector) ) {
+			old = true;
+			nid = expando;
+			newContext = context;
+			newSelector = nodeType === 9 && selector;
+
+			// qSA works strangely on Element-rooted queries
+			// We can work around this by specifying an extra ID on the root
+			// and working up from there (Thanks to Andrew Dupont for the technique)
+			// IE 8 doesn't work on object elements
+			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+				groups = tokenize( selector );
+
+				if ( (old = context.getAttribute("id")) ) {
+					nid = old.replace( rescape, "\\$&" );
+				} else {
+					context.setAttribute( "id", nid );
+				}
+				nid = "[id='" + nid + "'] ";
+
+				i = groups.length;
+				while ( i-- ) {
+					groups[i] = nid + toSelector( groups[i] );
+				}
+				newContext = rsibling.test( selector ) && context.parentNode || context;
+				newSelector = groups.join(",");
+			}
+
+			if ( newSelector ) {
+				try {
+					push.apply( results, slice.call( newContext.querySelectorAll(
+						newSelector
+					), 0 ) );
+					return results;
+				} catch(qsaError) {
+				} finally {
+					if ( !old ) {
+						context.removeAttribute("id");
+					}
+				}
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Detect xml
+ * @param {Element|Object} elem An element or a document
+ */
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+	var doc = node ? node.ownerDocument || node : preferredDoc;
+
+	// If no document and documentElement is available, return
+	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+		return document;
+	}
+
+	// Set our document
+	document = doc;
+	docElem = doc.documentElement;
+
+	// Support tests
+	documentIsXML = isXML( doc );
+
+	// Check if getElementsByTagName("*") returns only elements
+	support.tagNameNoComments = assert(function( div ) {
+		div.appendChild( doc.createComment("") );
+		return !div.getElementsByTagName("*").length;
+	});
+
+	// Check if attributes should be retrieved by attribute nodes
+	support.attributes = assert(function( div ) {
+		div.innerHTML = "<select></select>";
+		var type = typeof div.lastChild.getAttribute("multiple");
+		// IE8 returns a string for some attributes even when not present
+		return type !== "boolean" && type !== "string";
+	});
+
+	// Check if getElementsByClassName can be trusted
+	support.getByClassName = assert(function( div ) {
+		// Opera can't find a second classname (in 9.6)
+		div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
+		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
+			return false;
+		}
+
+		// Safari 3.2 caches class attributes and doesn't catch changes
+		div.lastChild.className = "e";
+		return div.getElementsByClassName("e").length === 2;
+	});
+
+	// Check if getElementById returns elements by name
+	// Check if getElementsByName privileges form controls or returns elements by ID
+	support.getByName = assert(function( div ) {
+		// Inject content
+		div.id = expando + 0;
+		div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
+		docElem.insertBefore( div, docElem.firstChild );
+
+		// Test
+		var pass = doc.getElementsByName &&
+			// buggy browsers will return fewer than the correct 2
+			doc.getElementsByName( expando ).length === 2 +
+			// buggy browsers will return more than the correct 0
+			doc.getElementsByName( expando + 0 ).length;
+		support.getIdNotName = !doc.getElementById( expando );
+
+		// Cleanup
+		docElem.removeChild( div );
+
+		return pass;
+	});
+
+	// IE6/7 return modified attributes
+	Expr.attrHandle = assert(function( div ) {
+		div.innerHTML = "<a href='#'></a>";
+		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
+			div.firstChild.getAttribute("href") === "#";
+	}) ?
+		{} :
+		{
+			"href": function( elem ) {
+				return elem.getAttribute( "href", 2 );
+			},
+			"type": function( elem ) {
+				return elem.getAttribute("type");
+			}
+		};
+
+	// ID find and filter
+	if ( support.getIdNotName ) {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
+				var m = context.getElementById( id );
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		};
+		Expr.filter["ID"] = function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				return elem.getAttribute("id") === attrId;
+			};
+		};
+	} else {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
+				var m = context.getElementById( id );
+
+				return m ?
+					m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+		Expr.filter["ID"] =  function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+				return node && node.value === attrId;
+			};
+		};
+	}
+
+	// Tag
+	Expr.find["TAG"] = support.tagNameNoComments ?
+		function( tag, context ) {
+			if ( typeof context.getElementsByTagName !== strundefined ) {
+				return context.getElementsByTagName( tag );
+			}
+		} :
+		function( tag, context ) {
+			var elem,
+				tmp = [],
+				i = 0,
+				results = context.getElementsByTagName( tag );
+
+			// Filter out possible comments
+			if ( tag === "*" ) {
+				while ( (elem = results[i++]) ) {
+					if ( elem.nodeType === 1 ) {
+						tmp.push( elem );
+					}
+				}
+
+				return tmp;
+			}
+			return results;
+		};
+
+	// Name
+	Expr.find["NAME"] = support.getByName && function( tag, context ) {
+		if ( typeof context.getElementsByName !== strundefined ) {
+			return context.getElementsByName( name );
+		}
+	};
+
+	// Class
+	Expr.find["CLASS"] = support.getByClassName && function( className, context ) {
+		if ( typeof context.getElementsByClassName !== strundefined && !documentIsXML ) {
+			return context.getElementsByClassName( className );
+		}
+	};
+
+	// QSA and matchesSelector support
+
+	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+	rbuggyMatches = [];
+
+	// qSa(:focus) reports false when true (Chrome 21),
+	// no need to also add to buggyMatches since matches checks buggyQSA
+	// A support test would require too much code (would include document ready)
+	rbuggyQSA = [ ":focus" ];
+
+	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( div ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explictly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// http://bugs.jquery.com/ticket/12359
+			div.innerHTML = "<select><option selected=''></option></select>";
+
+			// IE8 - Some boolean attributes are not treated correctly
+			if ( !div.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+		});
+
+		assert(function( div ) {
+
+			// Opera 10-12/IE8 - ^= $= *= and empty values
+			// Should not select anything
+			div.innerHTML = "<input type='hidden' i=''/>";
+			if ( div.querySelectorAll("[i^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":enabled").length ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Opera 10-11 does not throw on post-comma invalid pseudos
+			div.querySelectorAll("*,:x");
+			rbuggyQSA.push(",.*:");
+		});
+	}
+
+	if ( (support.matchesSelector = isNative( (matches = docElem.matchesSelector ||
+		docElem.mozMatchesSelector ||
+		docElem.webkitMatchesSelector ||
+		docElem.oMatchesSelector ||
+		docElem.msMatchesSelector) )) ) {
+
+		assert(function( div ) {
+			// Check to see if it's possible to do matchesSelector
+			// on a disconnected node (IE 9)
+			support.disconnectedMatch = matches.call( div, "div" );
+
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( div, "[s!='']:x" );
+			rbuggyMatches.push( "!=", pseudos );
+		});
+	}
+
+	rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
+	rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
+
+	// Element contains another
+	// Purposefully does not implement inclusive descendent
+	// As in, an element does not contain itself
+	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
+		function( a, b ) {
+			var adown = a.nodeType === 9 ? a.documentElement : a,
+				bup = b && b.parentNode;
+			return a === bup || !!( bup && bup.nodeType === 1 && (
+				adown.contains ?
+					adown.contains( bup ) :
+					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+			));
+		} :
+		function( a, b ) {
+			if ( b ) {
+				while ( (b = b.parentNode) ) {
+					if ( b === a ) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
+	// Document order sorting
+	sortOrder = docElem.compareDocumentPosition ?
+	function( a, b ) {
+		var compare;
+
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( (compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b )) ) {
+			if ( compare & 1 || a.parentNode && a.parentNode.nodeType === 11 ) {
+				if ( a === doc || contains( preferredDoc, a ) ) {
+					return -1;
+				}
+				if ( b === doc || contains( preferredDoc, b ) ) {
+					return 1;
+				}
+				return 0;
+			}
+			return compare & 4 ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition ? -1 : 1;
+	} :
+	function( a, b ) {
+		var cur,
+			i = 0,
+			aup = a.parentNode,
+			bup = b.parentNode,
+			ap = [ a ],
+			bp = [ b ];
+
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// Parentless nodes are either documents or disconnected
+		} else if ( !aup || !bup ) {
+			return a === doc ? -1 :
+				b === doc ? 1 :
+				aup ? -1 :
+				bup ? 1 :
+				0;
+
+		// If the nodes are siblings, we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+		}
+
+		// Otherwise we need full lists of their ancestors for comparison
+		cur = a;
+		while ( (cur = cur.parentNode) ) {
+			ap.unshift( cur );
+		}
+		cur = b;
+		while ( (cur = cur.parentNode) ) {
+			bp.unshift( cur );
+		}
+
+		// Walk down the tree looking for a discrepancy
+		while ( ap[i] === bp[i] ) {
+			i++;
+		}
+
+		return i ?
+			// Do a sibling check if the nodes have a common ancestor
+			siblingCheck( ap[i], bp[i] ) :
+
+			// Otherwise nodes in our document sort first
+			ap[i] === preferredDoc ? -1 :
+			bp[i] === preferredDoc ? 1 :
+			0;
+	};
+
+	// Always assume the presence of duplicates if sort doesn't
+	// pass them to our comparison function (as in Google Chrome).
+	hasDuplicate = false;
+	[0, 0].sort( sortOrder );
+	support.detectDuplicates = hasDuplicate;
+
+	return document;
+};
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	// Make sure that attribute selectors are quoted
+	expr = expr.replace( rattributeQuotes, "='$1']" );
+
+	// rbuggyQSA always contains :focus, so no need for an existence check
+	if ( support.matchesSelector && !documentIsXML && (!rbuggyMatches || !rbuggyMatches.test(expr)) && !rbuggyQSA.test(expr) ) {
+		try {
+			var ret = matches.call( elem, expr );
+
+			// IE 9's matchesSelector returns false on disconnected nodes
+			if ( ret || support.disconnectedMatch ||
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
+				return ret;
+			}
+		} catch(e) {}
+	}
+
+	return Sizzle( expr, document, null, [elem] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+	// Set document vars if needed
+	if ( ( context.ownerDocument || context ) !== document ) {
+		setDocument( context );
+	}
+	return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+	var val;
+
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	if ( !documentIsXML ) {
+		name = name.toLowerCase();
+	}
+	if ( (val = Expr.attrHandle[ name ]) ) {
+		return val( elem );
+	}
+	if ( documentIsXML || support.attributes ) {
+		return elem.getAttribute( name );
+	}
+	return ( (val = elem.getAttributeNode( name )) || elem.getAttribute( name ) ) && elem[ name ] === true ?
+		name :
+		val && val.specified ? val.value : null;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+// Document sorting and removing duplicates
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		i = 1,
+		j = 0;
+
+	// Unless we *know* we can detect duplicates, assume their presence
+	hasDuplicate = !support.detectDuplicates;
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		for ( ; (elem = results[i]); i++ ) {
+			if ( elem === results[ i - 1 ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	return results;
+};
+
+function siblingCheck( a, b ) {
+	var cur = b && a,
+		diff = cur && ( ~b.sourceIndex || MAX_NEGATIVE ) - ( ~a.sourceIndex || MAX_NEGATIVE );
+
+	// Use IE sourceIndex if available on both nodes
+	if ( diff ) {
+		return diff;
+	}
+
+	// Check if b follows a
+	if ( cur ) {
+		while ( (cur = cur.nextSibling) ) {
+			if ( cur === b ) {
+				return -1;
+			}
+		}
+	}
+
+	return a ? 1 : -1;
+}
+
+// Returns a function to use in pseudos for input types
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+// Returns a function to use in pseudos for buttons
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+// Returns a function to use in pseudos for positionals
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( !nodeType ) {
+		// If no nodeType, this is expected to be an array
+		for ( ; (node = elem[i]); i++ ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		// Use textContent for elements
+		// innerText usage removed for consistency of new lines (see #11153)
+		if ( typeof elem.textContent === "string" ) {
+			return elem.textContent;
+		} else {
+			// Traverse its children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				ret += getText( elem );
+			}
+		}
+	} else if ( nodeType === 3 || nodeType === 4 ) {
+		return elem.nodeValue;
+	}
+	// Do not include comment or processing instruction nodes
+
+	return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	find: {},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( runescape, funescape );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1].slice( 0, 3 ) === "nth" ) {
+				// nth-* requires argument
+				if ( !match[3] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[3] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var excess,
+				unquoted = !match[5] && match[2];
+
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			// Accept quoted arguments as-is
+			if ( match[4] ) {
+				match[2] = match[4];
+
+			// Strip excess characters from unquoted arguments
+			} else if ( unquoted && rpseudo.test( unquoted ) &&
+				// Get excess from tokenize (recursively)
+				(excess = tokenize( unquoted, true )) &&
+				// advance to the next closing parenthesis
+				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+				// excess is a negative index
+				match[0] = match[0].slice( 0, excess );
+				match[2] = unquoted.slice( 0, excess );
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+
+		"TAG": function( nodeName ) {
+			if ( nodeName === "*" ) {
+				return function() { return true; };
+			}
+
+			nodeName = nodeName.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+			};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.slice( -check.length ) === check :
+					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, what, argument, first, last ) {
+			var simple = type.slice( 0, 3 ) !== "nth",
+				forward = type.slice( -4 ) !== "last",
+				ofType = what === "of-type";
+
+			return first === 1 && last === 0 ?
+
+				// Shortcut for :nth-*(n)
+				function( elem ) {
+					return !!elem.parentNode;
+				} :
+
+				function( elem, context, xml ) {
+					var cache, outerCache, node, diff, nodeIndex, start,
+						dir = simple !== forward ? "nextSibling" : "previousSibling",
+						parent = elem.parentNode,
+						name = ofType && elem.nodeName.toLowerCase(),
+						useCache = !xml && !ofType;
+
+					if ( parent ) {
+
+						// :(first|last|only)-(child|of-type)
+						if ( simple ) {
+							while ( dir ) {
+								node = elem;
+								while ( (node = node[ dir ]) ) {
+									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+										return false;
+									}
+								}
+								// Reverse direction for :only-* (if we haven't yet done so)
+								start = dir = type === "only" && !start && "nextSibling";
+							}
+							return true;
+						}
+
+						start = [ forward ? parent.firstChild : parent.lastChild ];
+
+						// non-xml :nth-child(...) stores cache data on `parent`
+						if ( forward && useCache ) {
+							// Seek `elem` from a previously-cached index
+							outerCache = parent[ expando ] || (parent[ expando ] = {});
+							cache = outerCache[ type ] || [];
+							nodeIndex = cache[0] === dirruns && cache[1];
+							diff = cache[0] === dirruns && cache[2];
+							node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+								// Fallback to seeking `elem` from the start
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								// When found, cache indexes on `parent` and break
+								if ( node.nodeType === 1 && ++diff && node === elem ) {
+									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+									break;
+								}
+							}
+
+						// Use previously-cached element index if available
+						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
+							diff = cache[1];
+
+						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+						} else {
+							// Use the same loop as above to seek `elem` from the start
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
+									// Cache the index of each encountered element
+									if ( useCache ) {
+										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+									}
+
+									if ( node === elem ) {
+										break;
+									}
+								}
+							}
+						}
+
+						// Incorporate the offset, then check against cycle size
+						diff -= last;
+						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+					}
+				};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf.call( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		// Potentially complex pseudos
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		// "Whether an element is represented by a :lang() selector
+		// is based solely on the element's language value
+		// being equal to the identifier C,
+		// or beginning with the identifier C immediately followed by "-".
+		// The matching of C against the element's language value is performed case-insensitively.
+		// The identifier C does not have to be a valid language name."
+		// http://www.w3.org/TR/selectors/#lang-pseudo
+		"lang": markFunction( function( lang ) {
+			// lang value must be a valid identifider
+			if ( !ridentifier.test(lang || "") ) {
+				Sizzle.error( "unsupported lang: " + lang );
+			}
+			lang = lang.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				var elemLang;
+				do {
+					if ( (elemLang = documentIsXML ?
+						elem.getAttribute("xml:lang") || elem.getAttribute("lang") :
+						elem.lang) ) {
+
+						elemLang = elemLang.toLowerCase();
+						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+					}
+				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				return false;
+			};
+		}),
+
+		// Miscellaneous
+		"target": function( elem ) {
+			var hash = window.location && window.location.hash;
+			return hash && hash.slice( 1 ) === elem.id;
+		},
+
+		"root": function( elem ) {
+			return elem === docElem;
+		},
+
+		"focus": function( elem ) {
+			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		// Boolean properties
+		"enabled": function( elem ) {
+			return elem.disabled === false;
+		},
+
+		"disabled": function( elem ) {
+			return elem.disabled === true;
+		},
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		// Contents
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
+			//   not comment, processing instructions, or others
+			// Thanks to Diego Perini for the nodeName shortcut
+			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		// Element/input types
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"text": function( elem ) {
+			var attr;
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+			// use getAttribute instead to test this case
+			return elem.nodeName.toLowerCase() === "input" &&
+				elem.type === "text" &&
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
+		},
+
+		// Position-in-collection
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 0;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 1;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+	Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+	Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+function tokenize( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( tokens = [] );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			matched = match.shift();
+			tokens.push( {
+				value: matched,
+				// Cast descendant combinators to space
+				type: match[0].replace( rtrim, " " )
+			} );
+			soFar = soFar.slice( matched.length );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+				matched = match.shift();
+				tokens.push( {
+					value: matched,
+					type: type,
+					matches: match
+				} );
+				soFar = soFar.slice( matched.length );
+			}
+		}
+
+		if ( !matched ) {
 			break;
 		}
 	}
 
-	if ( parts.length > 1 && origPOS.exec( selector ) ) {
-		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			set = posProcess( parts[0] + parts[1], context );
-		} else {
-			set = Expr.relative[ parts[0] ] ?
-				[ context ] :
-				Sizzle( parts.shift(), context );
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+}
 
-			while ( parts.length ) {
-				selector = parts.shift();
-
-				if ( Expr.relative[ selector ] ) {
-					selector += parts.shift();
-				}
-				
-				set = posProcess( selector, set );
-			}
-		}
-	} else {
-		// Take a shortcut and set the context if the root selector is an ID
-		// (but not if it'll be faster if the inner selector is an ID)
-		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
-				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-			var ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
-		}
-
-		if ( context ) {
-			var ret = seed ?
-				{ expr: parts.pop(), set: makeArray(seed) } :
-				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
-
-			if ( parts.length > 0 ) {
-				checkSet = makeArray(set);
-			} else {
-				prune = false;
-			}
-
-			while ( parts.length ) {
-				var cur = parts.pop(), pop = cur;
-
-				if ( !Expr.relative[ cur ] ) {
-					cur = "";
-				} else {
-					pop = parts.pop();
-				}
-
-				if ( pop == null ) {
-					pop = context;
-				}
-
-				Expr.relative[ cur ]( checkSet, pop, contextXML );
-			}
-		} else {
-			checkSet = parts = [];
-		}
+function toSelector( tokens ) {
+	var i = 0,
+		len = tokens.length,
+		selector = "";
+	for ( ; i < len; i++ ) {
+		selector += tokens[i].value;
 	}
+	return selector;
+}
 
-	if ( !checkSet ) {
-		checkSet = set;
-	}
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		checkNonElements = base && dir === "parentNode",
+		doneName = done++;
 
-	if ( !checkSet ) {
-		Sizzle.error( cur || selector );
-	}
-
-	if ( toString.call(checkSet) === "[object Array]" ) {
-		if ( !prune ) {
-			results.push.apply( results, checkSet );
-		} else if ( context && context.nodeType === 1 ) {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
-					results.push( set[i] );
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( elem.nodeType === 1 || checkNonElements ) {
+					return matcher( elem, context, xml );
 				}
 			}
-		} else {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
-					results.push( set[i] );
-				}
-			}
-		}
-	} else {
-		makeArray( checkSet, results );
-	}
+		} :
 
-	if ( extra ) {
-		Sizzle( extra, origContext, results, seed );
-		Sizzle.uniqueSort( results );
-	}
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			var data, cache, outerCache,
+				dirkey = dirruns + " " + doneName;
 
-	return results;
-};
-
-Sizzle.uniqueSort = function(results){
-	if ( sortOrder ) {
-		hasDuplicate = baseHasDuplicate;
-		results.sort(sortOrder);
-
-		if ( hasDuplicate ) {
-			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[i-1] ) {
-					results.splice(i--, 1);
-				}
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.matches = function(expr, set){
-	return Sizzle(expr, null, null, set);
-};
-
-Sizzle.find = function(expr, context, isXML){
-	var set, match;
-
-	if ( !expr ) {
-		return [];
-	}
-
-	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
-		var type = Expr.order[i], match;
-		
-		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			var left = match[1];
-			match.splice(1,1);
-
-			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace(/\\/g, "");
-				set = Expr.find[ type ]( match, context, isXML );
-				if ( set != null ) {
-					expr = expr.replace( Expr.match[ type ], "" );
-					break;
-				}
-			}
-		}
-	}
-
-	if ( !set ) {
-		set = context.getElementsByTagName("*");
-	}
-
-	return {set: set, expr: expr};
-};
-
-Sizzle.filter = function(expr, set, inplace, not){
-	var old = expr, result = [], curLoop = set, match, anyFound,
-		isXMLFilter = set && set[0] && isXML(set[0]);
-
-	while ( expr && set.length ) {
-		for ( var type in Expr.filter ) {
-			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				var filter = Expr.filter[ type ], found, item, left = match[1];
-				anyFound = false;
-
-				match.splice(1,1);
-
-				if ( left.substr( left.length - 1 ) === "\\" ) {
-					continue;
-				}
-
-				if ( curLoop === result ) {
-					result = [];
-				}
-
-				if ( Expr.preFilter[ type ] ) {
-					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
-					if ( !match ) {
-						anyFound = found = true;
-					} else if ( match === true ) {
-						continue;
+			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			if ( xml ) {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						if ( matcher( elem, context, xml ) ) {
+							return true;
+						}
 					}
 				}
-
-				if ( match ) {
-					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
-						if ( item ) {
-							found = filter( item, match, i, curLoop );
-							var pass = not ^ !!found;
-
-							if ( inplace && found != null ) {
-								if ( pass ) {
-									anyFound = true;
-								} else {
-									curLoop[i] = false;
-								}
-							} else if ( pass ) {
-								result.push( item );
-								anyFound = true;
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
+							if ( (data = cache[1]) === true || data === cachedruns ) {
+								return data === true;
+							}
+						} else {
+							cache = outerCache[ dir ] = [ dirkey ];
+							cache[1] = matcher( elem, context, xml ) || cachedruns;
+							if ( cache[1] === true ) {
+								return true;
 							}
 						}
 					}
 				}
-
-				if ( found !== undefined ) {
-					if ( !inplace ) {
-						curLoop = result;
-					}
-
-					expr = expr.replace( Expr.match[ type ], "" );
-
-					if ( !anyFound ) {
-						return [];
-					}
-
-					break;
-				}
 			}
-		}
+		};
+}
 
-		// Improper expression
-		if ( expr === old ) {
-			if ( anyFound == null ) {
-				Sizzle.error( expr );
-			} else {
-				break;
-			}
-		}
-
-		old = expr;
-	}
-
-	return curLoop;
-};
-
-Sizzle.error = function( msg ) {
-	throw "Syntax error, unrecognized expression: " + msg;
-};
-
-var Expr = Sizzle.selectors = {
-	order: [ "ID", "NAME", "TAG" ],
-	match: {
-		ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-		CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,
-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
-	},
-	leftMatch: {},
-	attrMap: {
-		"class": "className",
-		"for": "htmlFor"
-	},
-	attrHandle: {
-		href: function(elem){
-			return elem.getAttribute("href");
-		}
-	},
-	relative: {
-		"+": function(checkSet, part){
-			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !/\W/.test(part),
-				isPartStrNotTag = isPartStr && !isTag;
-
-			if ( isTag ) {
-				part = part.toLowerCase();
-			}
-
-			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
-				if ( (elem = checkSet[i]) ) {
-					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
-						elem || false :
-						elem === part;
-				}
-			}
-
-			if ( isPartStrNotTag ) {
-				Sizzle.filter( part, checkSet, true );
-			}
-		},
-		">": function(checkSet, part){
-			var isPartStr = typeof part === "string";
-
-			if ( isPartStr && !/\W/.test(part) ) {
-				part = part.toLowerCase();
-
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
-					if ( elem ) {
-						var parent = elem.parentNode;
-						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
-					}
-				}
-			} else {
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
-					if ( elem ) {
-						checkSet[i] = isPartStr ?
-							elem.parentNode :
-							elem.parentNode === part;
-					}
-				}
-
-				if ( isPartStr ) {
-					Sizzle.filter( part, checkSet, true );
-				}
-			}
-		},
-		"": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
-
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
-		},
-		"~": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
-
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
-		}
-	},
-	find: {
-		ID: function(match, context, isXML){
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				return m ? [m] : [];
-			}
-		},
-		NAME: function(match, context){
-			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [], results = context.getElementsByName(match[1]);
-
-				for ( var i = 0, l = results.length; i < l; i++ ) {
-					if ( results[i].getAttribute("name") === match[1] ) {
-						ret.push( results[i] );
-					}
-				}
-
-				return ret.length === 0 ? null : ret;
-			}
-		},
-		TAG: function(match, context){
-			return context.getElementsByTagName(match[1]);
-		}
-	},
-	preFilter: {
-		CLASS: function(match, curLoop, inplace, result, not, isXML){
-			match = " " + match[1].replace(/\\/g, "") + " ";
-
-			if ( isXML ) {
-				return match;
-			}
-
-			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
-				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
-						if ( !inplace ) {
-							result.push( elem );
-						}
-					} else if ( inplace ) {
-						curLoop[i] = false;
-					}
-				}
-			}
-
-			return false;
-		},
-		ID: function(match){
-			return match[1].replace(/\\/g, "");
-		},
-		TAG: function(match, curLoop){
-			return match[1].toLowerCase();
-		},
-		CHILD: function(match){
-			if ( match[1] === "nth" ) {
-				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
-					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
-					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
-				// calculate the numbers (first)n+(last) including if they are negative
-				match[2] = (test[1] + (test[2] || 1)) - 0;
-				match[3] = test[3] - 0;
-			}
-
-			// TODO: Move to normal caching system
-			match[0] = done++;
-
-			return match;
-		},
-		ATTR: function(match, curLoop, inplace, result, not, isXML){
-			var name = match[1].replace(/\\/g, "");
-			
-			if ( !isXML && Expr.attrMap[name] ) {
-				match[1] = Expr.attrMap[name];
-			}
-
-			if ( match[2] === "~=" ) {
-				match[4] = " " + match[4] + " ";
-			}
-
-			return match;
-		},
-		PSEUDO: function(match, curLoop, inplace, result, not){
-			if ( match[1] === "not" ) {
-				// If we're dealing with a complex expression, or a simple one
-				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
-					match[3] = Sizzle(match[3], null, null, curLoop);
-				} else {
-					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-					if ( !inplace ) {
-						result.push.apply( result, ret );
-					}
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
 					return false;
 				}
-			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
-				return true;
 			}
-			
-			return match;
-		},
-		POS: function(match){
-			match.unshift( true );
-			return match;
-		}
-	},
-	filters: {
-		enabled: function(elem){
-			return elem.disabled === false && elem.type !== "hidden";
-		},
-		disabled: function(elem){
-			return elem.disabled === true;
-		},
-		checked: function(elem){
-			return elem.checked === true;
-		},
-		selected: function(elem){
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			elem.parentNode.selectedIndex;
-			return elem.selected === true;
-		},
-		parent: function(elem){
-			return !!elem.firstChild;
-		},
-		empty: function(elem){
-			return !elem.firstChild;
-		},
-		has: function(elem, i, match){
-			return !!Sizzle( match[3], elem ).length;
-		},
-		header: function(elem){
-			return /h\d/i.test( elem.nodeName );
-		},
-		text: function(elem){
-			return "text" === elem.type;
-		},
-		radio: function(elem){
-			return "radio" === elem.type;
-		},
-		checkbox: function(elem){
-			return "checkbox" === elem.type;
-		},
-		file: function(elem){
-			return "file" === elem.type;
-		},
-		password: function(elem){
-			return "password" === elem.type;
-		},
-		submit: function(elem){
-			return "submit" === elem.type;
-		},
-		image: function(elem){
-			return "image" === elem.type;
-		},
-		reset: function(elem){
-			return "reset" === elem.type;
-		},
-		button: function(elem){
-			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
-		},
-		input: function(elem){
-			return /input|select|textarea|button/i.test(elem.nodeName);
-		}
-	},
-	setFilters: {
-		first: function(elem, i){
-			return i === 0;
-		},
-		last: function(elem, i, match, array){
-			return i === array.length - 1;
-		},
-		even: function(elem, i){
-			return i % 2 === 0;
-		},
-		odd: function(elem, i){
-			return i % 2 === 1;
-		},
-		lt: function(elem, i, match){
-			return i < match[3] - 0;
-		},
-		gt: function(elem, i, match){
-			return i > match[3] - 0;
-		},
-		nth: function(elem, i, match){
-			return match[3] - 0 === i;
-		},
-		eq: function(elem, i, match){
-			return match[3] - 0 === i;
-		}
-	},
-	filter: {
-		PSEUDO: function(elem, match, i, array){
-			var name = match[1], filter = Expr.filters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
-			} else if ( name === "not" ) {
-				var not = match[3];
-
-				for ( var i = 0, l = not.length; i < l; i++ ) {
-					if ( not[i] === elem ) {
-						return false;
-					}
-				}
-
-				return true;
-			} else {
-				Sizzle.error( "Syntax error, unrecognized expression: " + name );
-			}
-		},
-		CHILD: function(elem, match){
-			var type = match[1], node = elem;
-			switch (type) {
-				case 'only':
-				case 'first':
-					while ( (node = node.previousSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-					if ( type === "first" ) { 
-						return true; 
-					}
-					node = elem;
-				case 'last':
-					while ( (node = node.nextSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-					return true;
-				case 'nth':
-					var first = match[2], last = match[3];
-
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-					
-					var doneName = match[0],
-						parent = elem.parentNode;
-	
-					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
-						var count = 0;
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								node.nodeIndex = ++count;
-							}
-						} 
-						parent.sizcache = doneName;
-					}
-					
-					var diff = elem.nodeIndex - last;
-					if ( first === 0 ) {
-						return diff === 0;
-					} else {
-						return ( diff % first === 0 && diff / first >= 0 );
-					}
-			}
-		},
-		ID: function(elem, match){
-			return elem.nodeType === 1 && elem.getAttribute("id") === match;
-		},
-		TAG: function(elem, match){
-			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
-		},
-		CLASS: function(elem, match){
-			return (" " + (elem.className || elem.getAttribute("class")) + " ")
-				.indexOf( match ) > -1;
-		},
-		ATTR: function(elem, match){
-			var name = match[1],
-				result = Expr.attrHandle[ name ] ?
-					Expr.attrHandle[ name ]( elem ) :
-					elem[ name ] != null ?
-						elem[ name ] :
-						elem.getAttribute( name ),
-				value = result + "",
-				type = match[2],
-				check = match[4];
-
-			return result == null ?
-				type === "!=" :
-				type === "=" ?
-				value === check :
-				type === "*=" ?
-				value.indexOf(check) >= 0 :
-				type === "~=" ?
-				(" " + value + " ").indexOf(check) >= 0 :
-				!check ?
-				value && result !== false :
-				type === "!=" ?
-				value !== check :
-				type === "^=" ?
-				value.indexOf(check) === 0 :
-				type === "$=" ?
-				value.substr(value.length - check.length) === check :
-				type === "|=" ?
-				value === check || value.substr(0, check.length + 1) === check + "-" :
-				false;
-		},
-		POS: function(elem, match, i, array){
-			var name = match[2], filter = Expr.setFilters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			}
-		}
-	}
-};
-
-var origPOS = Expr.match.POS;
-
-for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){
-		return "\\" + (num - 0 + 1);
-	}));
+			return true;
+		} :
+		matchers[0];
 }
 
-var makeArray = function(array, results) {
-	array = Array.prototype.slice.call( array, 0 );
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
 
-	if ( results ) {
-		results.push.apply( results, array );
-		return results;
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
 	}
-	
-	return array;
-};
 
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
-	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+	return newUnmatched;
+}
 
-// Provide a fallback method if it does not work
-} catch(e){
-	makeArray = function(array, results) {
-		var ret = results || [];
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
 
-		if ( toString.call(array) === "[object Array]" ) {
-			Array.prototype.push.apply( ret, array );
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
 		} else {
-			if ( typeof array.length === "number" ) {
-				for ( var i = 0, l = array.length; i < l; i++ ) {
-					ret.push( array[i] );
-				}
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
 			} else {
-				for ( var i = 0; array[i]; i++ ) {
-					ret.push( array[i] );
-				}
+				push.apply( results, matcherOut );
 			}
 		}
-
-		return ret;
-	};
+	});
 }
 
-var sortOrder;
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
 
-if ( document.documentElement.compareDocumentPosition ) {
-	sortOrder = function( a, b ) {
-		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.compareDocumentPosition ? -1 : 1;
-		}
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf.call( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+		} ];
 
-		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-} else if ( "sourceIndex" in document.documentElement ) {
-	sortOrder = function( a, b ) {
-		if ( !a.sourceIndex || !b.sourceIndex ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.sourceIndex ? -1 : 1;
-		}
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
 
-		var ret = a.sourceIndex - b.sourceIndex;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-} else if ( document.createRange ) {
-	sortOrder = function( a, b ) {
-		if ( !a.ownerDocument || !b.ownerDocument ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.ownerDocument ? -1 : 1;
-		}
-
-		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
-		aRange.setStart(a, 0);
-		aRange.setEnd(a, 0);
-		bRange.setStart(b, 0);
-		bRange.setEnd(b, 0);
-		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-}
-
-// Utility function for retreiving the text value of an array of DOM nodes
-function getText( elems ) {
-	var ret = "", elem;
-
-	for ( var i = 0; elems[i]; i++ ) {
-		elem = elems[i];
-
-		// Get the text from text nodes and CDATA nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
-			ret += elem.nodeValue;
-
-		// Traverse everything else, except comment nodes
-		} else if ( elem.nodeType !== 8 ) {
-			ret += getText( elem.childNodes );
-		}
-	}
-
-	return ret;
-}
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
-	// We're going to inject a fake input element with a specified name
-	var form = document.createElement("div"),
-		id = "script" + (new Date).getTime();
-	form.innerHTML = "<a name='" + id + "'/>";
-
-	// Inject it into the root element, check its status, and remove it quickly
-	var root = document.documentElement;
-	root.insertBefore( form, root.firstChild );
-
-	// The workaround has to do additional checks after a getElementById
-	// Which slows things down for other browsers (hence the branching)
-	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function(match, context, isXML){
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
-			}
-		};
-
-		Expr.filter.ID = function(elem, match){
-			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-			return elem.nodeType === 1 && node && node.nodeValue === match;
-		};
-	}
-
-	root.removeChild( form );
-	root = form = null; // release memory in IE
-})();
-
-(function(){
-	// Check to see if the browser returns only elements
-	// when doing getElementsByTagName("*")
-
-	// Create a fake element
-	var div = document.createElement("div");
-	div.appendChild( document.createComment("") );
-
-	// Make sure no comments are found
-	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function(match, context){
-			var results = context.getElementsByTagName(match[1]);
-
-			// Filter out possible comments
-			if ( match[1] === "*" ) {
-				var tmp = [];
-
-				for ( var i = 0; results[i]; i++ ) {
-					if ( results[i].nodeType === 1 ) {
-						tmp.push( results[i] );
-					}
-				}
-
-				results = tmp;
-			}
-
-			return results;
-		};
-	}
-
-	// Check to see if an attribute returns normalized href attributes
-	div.innerHTML = "<a href='#'></a>";
-	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
-			div.firstChild.getAttribute("href") !== "#" ) {
-		Expr.attrHandle.href = function(elem){
-			return elem.getAttribute("href", 2);
-		};
-	}
-
-	div = null; // release memory in IE
-})();
-
-if ( document.querySelectorAll ) {
-	(function(){
-		var oldSizzle = Sizzle, div = document.createElement("div");
-		div.innerHTML = "<p class='TEST'></p>";
-
-		// Safari can't handle uppercase or unicode characters when
-		// in quirks mode.
-		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
-			return;
-		}
-	
-		Sizzle = function(query, context, extra, seed){
-			context = context || document;
-
-			// Only use querySelectorAll on non-XML documents
-			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && context.nodeType === 9 && !isXML(context) ) {
-				try {
-					return makeArray( context.querySelectorAll(query), extra );
-				} catch(e){}
-			}
-		
-			return oldSizzle(query, context, extra, seed);
-		};
-
-		for ( var prop in oldSizzle ) {
-			Sizzle[ prop ] = oldSizzle[ prop ];
-		}
-
-		div = null; // release memory in IE
-	})();
-}
-
-(function(){
-	var div = document.createElement("div");
-
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
-	// Opera can't find a second classname (in 9.6)
-	// Also, make sure that getElementsByClassName actually exists
-	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
-		return;
-	}
-
-	// Safari caches class attributes, doesn't catch changes (in 3.2)
-	div.lastChild.className = "e";
-
-	if ( div.getElementsByClassName("e").length === 1 ) {
-		return;
-	}
-	
-	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function(match, context, isXML) {
-		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
-			return context.getElementsByClassName(match[1]);
-		}
-	};
-
-	div = null; // release memory in IE
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-		if ( elem ) {
-			elem = elem[dir];
-			var match = false;
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 && !isXML ){
-					elem.sizcache = doneName;
-					elem.sizset = i;
-				}
-
-				if ( elem.nodeName.toLowerCase() === cur ) {
-					match = elem;
-					break;
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-		if ( elem ) {
-			elem = elem[dir];
-			var match = false;
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 ) {
-					if ( !isXML ) {
-						elem.sizcache = doneName;
-						elem.sizset = i;
-					}
-					if ( typeof cur !== "string" ) {
-						if ( elem === cur ) {
-							match = true;
-							break;
-						}
-
-					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
-						match = elem;
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
 						break;
 					}
 				}
-
-				elem = elem[dir];
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && toSelector( tokens.slice( 0, i - 1 ) ).replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && toSelector( tokens )
+				);
 			}
-
-			checkSet[i] = match;
+			matchers.push( matcher );
 		}
 	}
+
+	return elementMatcher( matchers );
 }
 
-var contains = document.compareDocumentPosition ? function(a, b){
-	return !!(a.compareDocumentPosition(b) & 16);
-} : function(a, b){
-	return a !== b && (a.contains ? a.contains(b) : true);
-};
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	// A counter to specify which element is currently being matched
+	var matcherCachedRuns = 0,
+		bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, expandContext ) {
+			var elem, j, matcher,
+				setMatched = [],
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				outermost = expandContext != null,
+				contextBackup = outermostContext,
+				// We must always have either seed elements or context
+				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
+				// Use integer dirruns iff this is the outermost matcher
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
 
-var isXML = function(elem){
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833) 
-	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
+			if ( outermost ) {
+				outermostContext = context !== document && context;
+				cachedruns = matcherCachedRuns;
+			}
 
-var posProcess = function(selector, context){
-	var tmpSet = [], later = "", match,
-		root = context.nodeType ? [context] : context;
-
-	// Position selectors must be done after the filter
-	// And so must :not(positional) so we move all PSEUDOs to the end
-	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
-		later += match[0];
-		selector = selector.replace( Expr.match.PSEUDO, "" );
-	}
-
-	selector = Expr.relative[selector] ? selector + "*" : selector;
-
-	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet );
-	}
-
-	return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = getText;
-jQuery.isXMLDoc = isXML;
-jQuery.contains = contains;
-
-return;
-
-window.Sizzle = Sizzle;
-
-})();
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
-	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	slice = Array.prototype.slice;
-
-// Implement the identical functionality for filter and not
-var winnow = function( elements, qualifier, keep ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return !!qualifier.call( elem, i, elem ) === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return (elem === qualifier) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-	});
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var ret = this.pushStack( "", "find", selector ), length = 0;
-
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
-
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( var n = length; n < ret.length; n++ ) {
-					for ( var r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
+			// Add elements passing elementMatchers directly to results
+			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
+			for ( ; (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					j = 0;
+					while ( (matcher = elementMatchers[j++]) ) {
+						if ( matcher( elem, context, xml ) ) {
+							results.push( elem );
 							break;
 						}
 					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+						cachedruns = ++matcherCachedRuns;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// Apply set filters to unmatched elements
+			matchedCount += i;
+			if ( bySet && i !== matchedCount ) {
+				j = 0;
+				while ( (matcher = setMatchers[j++]) ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !group ) {
+			group = tokenize( selector );
+		}
+		i = group.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( group[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+	}
+	return cached;
+};
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function select( selector, context, results, seed ) {
+	var i, tokens, token, type, find,
+		match = tokenize( selector );
+
+	if ( !seed ) {
+		// Try to minimize operations if there is only one group
+		if ( match.length === 1 ) {
+
+			// Take a shortcut and set the context if the root selector is an ID
+			tokens = match[0] = match[0].slice( 0 );
+			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+					context.nodeType === 9 && !documentIsXML &&
+					Expr.relative[ tokens[1].type ] ) {
+
+				context = Expr.find["ID"]( token.matches[0].replace( runescape, funescape ), context )[0];
+				if ( !context ) {
+					return results;
+				}
+
+				selector = selector.slice( tokens.shift().value.length );
+			}
+
+			// Fetch a seed set for right-to-left matching
+			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+			while ( i-- ) {
+				token = tokens[i];
+
+				// Abort if we hit a combinator
+				if ( Expr.relative[ (type = token.type) ] ) {
+					break;
+				}
+				if ( (find = Expr.find[ type ]) ) {
+					// Search, expanding context for leading sibling combinators
+					if ( (seed = find(
+						token.matches[0].replace( runescape, funescape ),
+						rsibling.test( tokens[0].type ) && context.parentNode || context
+					)) ) {
+
+						// If seed is empty or no tokens remain, we can return early
+						tokens.splice( i, 1 );
+						selector = seed.length && toSelector( tokens );
+						if ( !selector ) {
+							push.apply( results, slice.call( seed, 0 ) );
+							return results;
+						}
+
+						break;
+					}
 				}
 			}
 		}
+	}
 
+	// Compile and execute a filtering function
+	// Provide `match` to avoid retokenization if we modified the selector above
+	compile( selector, match )(
+		seed,
+		context,
+		documentIsXML,
+		results,
+		rsibling.test( selector )
+	);
+	return results;
+}
+
+// Deprecated
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Easy API for creating new setFilters
+function setFilters() {}
+Expr.filters = setFilters.prototype = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+// Initialize with the default document
+setDocument();
+
+// Override sizzle attribute retrieval
+Sizzle.attr = jQuery.attr;
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})( window );
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prev(?:Until|All))/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	rneedsContext = jQuery.expr.match.needsContext,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var i, ret, self,
+			len = this.length;
+
+		if ( typeof selector !== "string" ) {
+			self = this;
+			return this.pushStack( jQuery( selector ).filter(function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			}) );
+		}
+
+		ret = [];
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, this[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
 		return ret;
 	},
 
 	has: function( target ) {
-		var targets = jQuery( target );
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
 		return this.filter(function() {
-			for ( var i = 0, l = targets.length; i < l; i++ ) {
+			for ( i = 0; i < len; i++ ) {
 				if ( jQuery.contains( this, targets[i] ) ) {
 					return true;
 				}
@@ -3757,71 +5597,62 @@ jQuery.fn.extend({
 	},
 
 	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
+		return this.pushStack( winnow(this, selector, false) );
 	},
 
 	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
+		return this.pushStack( winnow(this, selector, true) );
 	},
-	
+
 	is: function( selector ) {
-		return !!selector && jQuery.filter( selector, this ).length > 0;
+		return !!selector && (
+			typeof selector === "string" ?
+				// If this is a positional/relative selector, check membership in the returned set
+				// so $("p:first").is("p:last") won't return true for a doc with two "p".
+				rneedsContext.test( selector ) ?
+					jQuery( selector, this.context ).index( this[0] ) >= 0 :
+					jQuery.filter( selector, this ).length > 0 :
+				this.filter( selector ).length > 0 );
 	},
 
 	closest: function( selectors, context ) {
-		if ( jQuery.isArray( selectors ) ) {
-			var ret = [], cur = this[0], match, matches = {}, selector;
+		var cur,
+			i = 0,
+			l = this.length,
+			ret = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
 
-			if ( cur && selectors.length ) {
-				for ( var i = 0, l = selectors.length; i < l; i++ ) {
-					selector = selectors[i];
+		for ( ; i < l; i++ ) {
+			cur = this[i];
 
-					if ( !matches[selector] ) {
-						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
-							jQuery( selector, context || this.context ) :
-							selector;
-					}
-				}
-
-				while ( cur && cur.ownerDocument && cur !== context ) {
-					for ( selector in matches ) {
-						match = matches[selector];
-
-						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
-							ret.push({ selector: selector, elem: cur });
-							delete matches[selector];
-						}
-					}
-					cur = cur.parentNode;
-				}
-			}
-
-			return ret;
-		}
-
-		var pos = jQuery.expr.match.POS.test( selectors ) ? 
-			jQuery( selectors, context || this.context ) : null;
-
-		return this.map(function( i, cur ) {
-			while ( cur && cur.ownerDocument && cur !== context ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
-					return cur;
+			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
 				}
 				cur = cur.parentNode;
 			}
-			return null;
-		});
+		}
+
+		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
 	},
-	
+
 	// Determine the position of an element within
 	// the matched set of elements
 	index: function( elem ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
 		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
 		// Locate the position of the desired element
 		return jQuery.inArray(
 			// If it receives a jQuery object, the first element is used
@@ -3830,24 +5661,28 @@ jQuery.fn.extend({
 
 	add: function( selector, context ) {
 		var set = typeof selector === "string" ?
-				jQuery( selector, context || this.context ) :
-				jQuery.makeArray( selector ),
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
 			all = jQuery.merge( this.get(), set );
 
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
+		return this.pushStack( jQuery.unique(all) );
 	},
 
-	andSelf: function() {
-		return this.add( this.prevObject );
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter(selector)
+		);
 	}
 });
 
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
 }
 
 jQuery.each({
@@ -3862,10 +5697,10 @@ jQuery.each({
 		return jQuery.dir( elem, "parentNode", until );
 	},
 	next: function( elem ) {
-		return jQuery.nth( elem, 2, "nextSibling" );
+		return sibling( elem, "nextSibling" );
 	},
 	prev: function( elem ) {
-		return jQuery.nth( elem, 2, "previousSibling" );
+		return sibling( elem, "previousSibling" );
 	},
 	nextAll: function( elem ) {
 		return jQuery.dir( elem, "nextSibling" );
@@ -3880,7 +5715,7 @@ jQuery.each({
 		return jQuery.dir( elem, "previousSibling", until );
 	},
 	siblings: function( elem ) {
-		return jQuery.sibling( elem.parentNode.firstChild, elem );
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
 	},
 	children: function( elem ) {
 		return jQuery.sibling( elem.firstChild );
@@ -3888,12 +5723,12 @@ jQuery.each({
 	contents: function( elem ) {
 		return jQuery.nodeName( elem, "iframe" ) ?
 			elem.contentDocument || elem.contentWindow.document :
-			jQuery.makeArray( elem.childNodes );
+			jQuery.merge( [], elem.childNodes );
 	}
 }, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
 		var ret = jQuery.map( this, fn, until );
-		
+
 		if ( !runtil.test( name ) ) {
 			selector = until;
 		}
@@ -3902,13 +5737,13 @@ jQuery.each({
 			ret = jQuery.filter( selector, ret );
 		}
 
-		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
 
-		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+		if ( this.length > 1 && rparentsprev.test( name ) ) {
 			ret = ret.reverse();
 		}
 
-		return this.pushStack( ret, name, slice.call(arguments).join(",") );
+		return this.pushStack( ret );
 	};
 });
 
@@ -3918,11 +5753,15 @@ jQuery.extend({
 			expr = ":not(" + expr + ")";
 		}
 
-		return jQuery.find.matches(expr, elems);
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
 	},
-	
+
 	dir: function( elem, dir, until ) {
-		var matched = [], cur = elem[dir];
+		var matched = [],
+			cur = elem[ dir ];
+
 		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
 			if ( cur.nodeType === 1 ) {
 				matched.push( cur );
@@ -3932,19 +5771,6 @@ jQuery.extend({
 		return matched;
 	},
 
-	nth: function( cur, result, dir, elem ) {
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] ) {
-			if ( cur.nodeType === 1 && ++num === result ) {
-				break;
-			}
-		}
-
-		return cur;
-	},
-
 	sibling: function( n, elem ) {
 		var r = [];
 
@@ -3957,54 +5783,101 @@ jQuery.extend({
 		return r;
 	}
 });
-var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+
+	// Can't pass null or undefined to indexOf in Firefox 4
+	// Set to 0 to skip string check
+	qualifier = qualifier || 0;
+
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem ) {
+			return ( elem === qualifier ) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem ) {
+		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
+	});
+}
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+		safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
+		}
+	}
+	return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
 	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
-	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
 	rtagName = /<([\w:]+)/,
 	rtbody = /<tbody/i,
 	rhtml = /<|&#?\w+;/,
-	rnocache = /<script|<object|<embed|<option|<style/i,
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,  // checked="checked" or checked (html5)
-	fcloseTag = function( all, front, tag ) {
-		return rselfClosing.test( tag ) ?
-			all :
-			front + "></" + tag + ">";
-	},
+	rnoInnerhtml = /<(?:script|style|link)/i,
+	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /^$|\/(?:java|ecma)script/i,
+	rscriptTypeMasked = /^true\/(.*)/,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+
+	// We have to close these tags to support XHTML (#13200)
 	wrapMap = {
 		option: [ 1, "<select multiple='multiple'>", "</select>" ],
 		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		area: [ 1, "<map>", "</map>" ],
+		param: [ 1, "<object>", "</object>" ],
 		thead: [ 1, "<table>", "</table>" ],
 		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
 		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	};
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+		// unless wrapped in a div with non-breaking characters in front of it.
+		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
+	},
+	safeFragment = createSafeFragment( document ),
+	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
 
 wrapMap.optgroup = wrapMap.option;
 wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
 wrapMap.th = wrapMap.td;
 
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
 jQuery.fn.extend({
-	text: function( text ) {
-		if ( jQuery.isFunction(text) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.text( text.call(this, i, self.text()) );
-			});
-		}
-
-		if ( typeof text !== "object" && text !== undefined ) {
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-		}
-
-		return jQuery.text( this );
+	text: function( value ) {
+		return jQuery.access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+		}, null, value, arguments.length );
 	},
 
 	wrapAll: function( html ) {
@@ -4030,7 +5903,7 @@ jQuery.fn.extend({
 				}
 
 				return elem;
-			}).append(this);
+			}).append( this );
 		}
 
 		return this;
@@ -4044,7 +5917,8 @@ jQuery.fn.extend({
 		}
 
 		return this.each(function() {
-			var self = jQuery( this ), contents = self.contents();
+			var self = jQuery( this ),
+				contents = self.contents();
 
 			if ( contents.length ) {
 				contents.wrapAll( html );
@@ -4056,8 +5930,10 @@ jQuery.fn.extend({
 	},
 
 	wrap: function( html ) {
-		return this.each(function() {
-			jQuery( this ).wrapAll( html );
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function(i) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
 		});
 	},
 
@@ -4071,7 +5947,7 @@ jQuery.fn.extend({
 
 	append: function() {
 		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
 				this.appendChild( elem );
 			}
 		});
@@ -4079,179 +5955,145 @@ jQuery.fn.extend({
 
 	prepend: function() {
 		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
 				this.insertBefore( elem, this.firstChild );
 			}
 		});
 	},
 
 	before: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
+		return this.domManip( arguments, false, function( elem ) {
+			if ( this.parentNode ) {
 				this.parentNode.insertBefore( elem, this );
-			});
-		} else if ( arguments.length ) {
-			var set = jQuery(arguments[0]);
-			set.push.apply( set, this.toArray() );
-			return this.pushStack( set, "before", arguments );
-		}
+			}
+		});
 	},
 
 	after: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
+		return this.domManip( arguments, false, function( elem ) {
+			if ( this.parentNode ) {
 				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		} else if ( arguments.length ) {
-			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery(arguments[0]).toArray() );
-			return set;
-		}
+			}
+		});
 	},
-	
+
 	// keepData is for internal use only--do not document
 	remove: function( selector, keepData ) {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length > 0 ) {
 				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
+					jQuery.cleanData( getAll( elem ) );
 				}
 
 				if ( elem.parentNode ) {
-					 elem.parentNode.removeChild( elem );
+					if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
+						setGlobalEval( getAll( elem, "script" ) );
+					}
+					elem.parentNode.removeChild( elem );
 				}
 			}
 		}
-		
+
 		return this;
 	},
 
 	empty: function() {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
 			// Remove element nodes and prevent memory leaks
 			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
+				jQuery.cleanData( getAll( elem, false ) );
 			}
 
 			// Remove any remaining nodes
 			while ( elem.firstChild ) {
 				elem.removeChild( elem.firstChild );
 			}
+
+			// If this is a select, ensure that it displays empty (#12336)
+			// Support: IE<9
+			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+				elem.options.length = 0;
+			}
 		}
-		
+
 		return this;
 	},
 
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function() {
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var html = this.outerHTML, ownerDocument = this.ownerDocument;
-				if ( !html ) {
-					var div = ownerDocument.createElement("div");
-					div.appendChild( this.cloneNode(true) );
-					html = div.innerHTML;
-				}
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
 
-				return jQuery.clean([html.replace(rinlinejQuery, "")
-					// Handle the case in IE 8 where action=/test/> self-closes a tag
-					.replace(/=([^="'>\s]+\/)>/g, '="$1">')
-					.replace(rleadingWhitespace, "")], ownerDocument)[0];
-			} else {
-				return this.cloneNode(true);
-			}
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
 		});
-
-		// Copy the events from the original to the clone
-		if ( events === true ) {
-			cloneCopyEvent( this, ret );
-			cloneCopyEvent( this.find("*"), ret.find("*") );
-		}
-
-		// Return the cloned set
-		return ret;
 	},
 
 	html: function( value ) {
-		if ( value === undefined ) {
-			return this[0] && this[0].nodeType === 1 ?
-				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null;
+		return jQuery.access( this, function( value ) {
+			var elem = this[0] || {},
+				i = 0,
+				l = this.length;
 
-		// See if we can take a shortcut and just use innerHTML
-		} else if ( typeof value === "string" && !rnocache.test( value ) &&
-			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
-			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
-
-			value = value.replace(rxhtmlTag, fcloseTag);
-
-			try {
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					// Remove element nodes and prevent memory leaks
-					if ( this[i].nodeType === 1 ) {
-						jQuery.cleanData( this[i].getElementsByTagName("*") );
-						this[i].innerHTML = value;
-					}
-				}
-
-			// If using innerHTML throws an exception, use the fallback method
-			} catch(e) {
-				this.empty().append( value );
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					undefined;
 			}
 
-		} else if ( jQuery.isFunction( value ) ) {
-			this.each(function(i){
-				var self = jQuery(this), old = self.html();
-				self.empty().append(function(){
-					return value.call( this, i, old );
-				});
-			});
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
 
-		} else {
-			this.empty().append( value );
-		}
+				value = value.replace( rxhtmlTag, "<$1></$2>" );
 
-		return this;
+				try {
+					for (; i < l; i++ ) {
+						// Remove element nodes and prevent memory leaks
+						elem = this[i] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch(e) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
 	},
 
 	replaceWith: function( value ) {
-		if ( this[0] && this[0].parentNode ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
-				});
-			}
+		var isFunc = jQuery.isFunction( value );
 
-			if ( typeof value !== "string" ) {
-				value = jQuery(value).detach();
-			}
-
-			return this.each(function() {
-				var next = this.nextSibling, parent = this.parentNode;
-
-				jQuery(this).remove();
-
-				if ( next ) {
-					jQuery(next).before( value );
-				} else {
-					jQuery(parent).append( value );
-				}
-			});
-		} else {
-			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		// Make sure that the elements are removed from the DOM before they are inserted
+		// this can help fix replacing a parent with child elements
+		if ( !isFunc && typeof value !== "string" ) {
+			value = jQuery( value ).not( this ).detach();
 		}
+
+		return this.domManip( [ value ], true, function( elem ) {
+			var next = this.nextSibling,
+				parent = this.parentNode;
+
+			if ( parent ) {
+				jQuery( this ).remove();
+				parent.insertBefore( elem, next );
+			}
+		});
 	},
 
 	detach: function( selector ) {
@@ -4259,129 +6101,227 @@ jQuery.fn.extend({
 	},
 
 	domManip: function( args, table, callback ) {
-		var results, first, value = args[0], scripts = [], fragment, parent;
+
+		// Flatten any nested arrays
+		args = core_concat.apply( [], args );
+
+		var first, node, hasScripts,
+			scripts, doc, fragment,
+			i = 0,
+			l = this.length,
+			set = this,
+			iNoClone = l - 1,
+			value = args[0],
+			isFunction = jQuery.isFunction( value );
 
 		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback, true );
-			});
-		}
-
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call(this, i, table ? self.html() : undefined);
+		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
+			return this.each(function( index ) {
+				var self = set.eq( index );
+				if ( isFunction ) {
+					args[0] = value.call( this, index, table ? self.html() : undefined );
+				}
 				self.domManip( args, table, callback );
 			});
 		}
 
-		if ( this[0] ) {
-			parent = value && value.parentNode;
+		if ( l ) {
+			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
+			first = fragment.firstChild;
 
-			// If we're in a fragment, just use that instead of building a new one
-			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
-				results = { fragment: parent };
-
-			} else {
-				results = buildFragment( args, this, scripts );
-			}
-			
-			fragment = results.fragment;
-			
 			if ( fragment.childNodes.length === 1 ) {
-				first = fragment = fragment.firstChild;
-			} else {
-				first = fragment.firstChild;
+				fragment = first;
 			}
 
 			if ( first ) {
 				table = table && jQuery.nodeName( first, "tr" );
+				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+				hasScripts = scripts.length;
+
+				// Use the original fragment for the last item instead of the first because it can end up
+				// being emptied incorrectly in certain situations (#8070).
+				for ( ; i < l; i++ ) {
+					node = fragment;
+
+					if ( i !== iNoClone ) {
+						node = jQuery.clone( node, true, true );
+
+						// Keep references to cloned scripts for later restoration
+						if ( hasScripts ) {
+							jQuery.merge( scripts, getAll( node, "script" ) );
+						}
+					}
 
-				for ( var i = 0, l = this.length; i < l; i++ ) {
 					callback.call(
-						table ?
-							root(this[i], first) :
+						table && jQuery.nodeName( this[i], "table" ) ?
+							findOrAppend( this[i], "tbody" ) :
 							this[i],
-						i > 0 || results.cacheable || this.length > 1  ?
-							fragment.cloneNode(true) :
-							fragment
+						node,
+						i
 					);
 				}
-			}
 
-			if ( scripts.length ) {
-				jQuery.each( scripts, evalScript );
+				if ( hasScripts ) {
+					doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+					// Reenable scripts
+					jQuery.map( scripts, restoreScript );
+
+					// Evaluate executable scripts on first document insertion
+					for ( i = 0; i < hasScripts; i++ ) {
+						node = scripts[ i ];
+						if ( rscriptType.test( node.type || "" ) &&
+							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
+
+							if ( node.src ) {
+								// Hope ajax is available...
+								jQuery.ajax({
+									url: node.src,
+									type: "GET",
+									dataType: "script",
+									async: false,
+									global: false,
+									"throws": true
+								});
+							} else {
+								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
+							}
+						}
+					}
+				}
+
+				// Fix #11809: Avoid leaking memory
+				fragment = first = null;
 			}
 		}
 
 		return this;
-
-		function root( elem, cur ) {
-			return jQuery.nodeName(elem, "table") ?
-				(elem.getElementsByTagName("tbody")[0] ||
-				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-				elem;
-		}
 	}
 });
 
-function cloneCopyEvent(orig, ret) {
-	var i = 0;
-
-	ret.each(function() {
-		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
-			return;
-		}
-
-		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
-
-		if ( events ) {
-			delete curData.handle;
-			curData.events = {};
-
-			for ( var type in events ) {
-				for ( var handler in events[ type ] ) {
-					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-				}
-			}
-		}
-	});
+function findOrAppend( elem, tag ) {
+	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
 }
 
-function buildFragment( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults,
-		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+	var attr = elem.getAttributeNode("type");
+	elem.type = ( attr && attr.specified ) + "/" + elem.type;
+	return elem;
+}
+function restoreScript( elem ) {
+	var match = rscriptTypeMasked.exec( elem.type );
+	if ( match ) {
+		elem.type = match[1];
+	} else {
+		elem.removeAttribute("type");
+	}
+	return elem;
+}
 
-	// Only cache "small" (1/2 KB) strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var elem,
+		i = 0;
+	for ( ; (elem = elems[i]) != null; i++ ) {
+		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
+	}
+}
 
-		cacheable = true;
-		cacheresults = jQuery.fragments[ args[0] ];
-		if ( cacheresults ) {
-			if ( cacheresults !== 1 ) {
-				fragment = cacheresults;
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
+
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
+
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
 			}
 		}
 	}
 
-	if ( !fragment ) {
-		fragment = doc.createDocumentFragment();
-		jQuery.clean( args, doc, fragment, scripts );
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
 	}
-
-	if ( cacheable ) {
-		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
 }
 
-jQuery.fragments = {};
+function fixCloneNodeIssues( src, dest ) {
+	var nodeName, e, data;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 copies events bound via attachEvent when using cloneNode.
+	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
+		data = jQuery._data( dest );
+
+		for ( e in data.events ) {
+			jQuery.removeEvent( dest, e, data.handle );
+		}
+
+		// Event data gets referenced instead of copied if the expando gets copied too
+		dest.removeAttribute( jQuery.expando );
+	}
+
+	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
+	if ( nodeName === "script" && dest.text !== src.text ) {
+		disableScript( dest ).text = src.text;
+		restoreScript( dest );
+
+	// IE6-10 improperly clones children of object elements using classid.
+	// IE10 throws NoModificationAllowedError if parent is null, #12132.
+	} else if ( nodeName === "object" ) {
+		if ( dest.parentNode ) {
+			dest.outerHTML = src.outerHTML;
+		}
+
+		// This path appears unavoidable for IE9. When cloning an object
+		// element in IE9, the outerHTML strategy above is not sufficient.
+		// If the src has innerHTML and the destination does not,
+		// copy the src.innerHTML into the dest.innerHTML. #10324
+		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
+			dest.innerHTML = src.innerHTML;
+		}
+
+	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+
+		dest.defaultChecked = dest.checked = src.checked;
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.defaultSelected = dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+}
 
 jQuery.each({
 	appendTo: "append",
@@ -4391,1519 +6331,3029 @@ jQuery.each({
 	replaceAll: "replaceWith"
 }, function( name, original ) {
 	jQuery.fn[ name ] = function( selector ) {
-		var ret = [], insert = jQuery( selector ),
-			parent = this.length === 1 && this[0].parentNode;
-		
-		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
-			
-		} else {
-			for ( var i = 0, l = insert.length; i < l; i++ ) {
-				var elems = (i > 0 ? this.clone(true) : this).get();
-				jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
-				ret = ret.concat( elems );
-			}
-		
-			return this.pushStack( ret, name, insert.selector );
+		var elems,
+			i = 0,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone(true);
+			jQuery( insert[i] )[ original ]( elems );
+
+			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+			core_push.apply( ret, elems.get() );
 		}
+
+		return this.pushStack( ret );
 	};
 });
 
-jQuery.extend({
-	clean: function( elems, context, fragment, scripts ) {
-		context = context || document;
+function getAll( context, tag ) {
+	var elems, elem,
+		i = 0,
+		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
+			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
+			undefined;
 
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" ) {
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+	if ( !found ) {
+		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
+			if ( !tag || jQuery.nodeName( elem, tag ) ) {
+				found.push( elem );
+			} else {
+				jQuery.merge( found, getAll( elem, tag ) );
+			}
+		}
+	}
+
+	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+		jQuery.merge( [ context ], found ) :
+		found;
+}
+
+// Used in buildFragment, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( manipulation_rcheckableType.test( elem.type ) ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var destElements, node, clone, i, srcElements,
+			inPage = jQuery.contains( elem.ownerDocument, elem );
+
+		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+			clone = elem.cloneNode( true );
+
+		// IE<=8 does not properly clone detached, unknown element nodes
+		} else {
+			fragmentDiv.innerHTML = elem.outerHTML;
+			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
 		}
 
-		var ret = [];
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
 
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
+			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+			destElements = getAll( clone );
+			srcElements = getAll( elem );
+
+			// Fix all IE cloning issues
+			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[i] ) {
+					fixCloneNodeIssues( node, destElements[i] );
+				}
 			}
+		}
 
-			if ( !elem ) {
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			if ( deepDataAndEvents ) {
+				srcElements = srcElements || getAll( elem );
+				destElements = destElements || getAll( clone );
+
+				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
+					cloneCopyEvent( node, destElements[i] );
+				}
+			} else {
+				cloneCopyEvent( elem, clone );
+			}
+		}
+
+		// Preserve script evaluation history
+		destElements = getAll( clone, "script" );
+		if ( destElements.length > 0 ) {
+			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+		}
+
+		destElements = srcElements = node = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	buildFragment: function( elems, context, scripts, selection ) {
+		var j, elem, contains,
+			tmp, tag, tbody, wrap,
+			l = elems.length,
+
+			// Ensure a safe fragment
+			safe = createSafeFragment( context ),
+
+			nodes = [],
+			i = 0;
+
+		for ( ; i < l; i++ ) {
+			elem = elems[ i ];
+
+			if ( elem || elem === 0 ) {
+
+				// Add nodes directly
+				if ( jQuery.type( elem ) === "object" ) {
+					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+				// Convert non-html into a text node
+				} else if ( !rhtml.test( elem ) ) {
+					nodes.push( context.createTextNode( elem ) );
+
+				// Convert html into DOM nodes
+				} else {
+					tmp = tmp || safe.appendChild( context.createElement("div") );
+
+					// Deserialize a standard representation
+					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
+					wrap = wrapMap[ tag ] || wrapMap._default;
+
+					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
+
+					// Descend through wrappers to the right content
+					j = wrap[0];
+					while ( j-- ) {
+						tmp = tmp.lastChild;
+					}
+
+					// Manually add leading whitespace removed by IE
+					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
+					}
+
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !jQuery.support.tbody ) {
+
+						// String was a <table>, *may* have spurious <tbody>
+						elem = tag === "table" && !rtbody.test( elem ) ?
+							tmp.firstChild :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !rtbody.test( elem ) ?
+								tmp :
+								0;
+
+						j = elem && elem.childNodes.length;
+						while ( j-- ) {
+							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
+								elem.removeChild( tbody );
+							}
+						}
+					}
+
+					jQuery.merge( nodes, tmp.childNodes );
+
+					// Fix #12392 for WebKit and IE > 9
+					tmp.textContent = "";
+
+					// Fix #12392 for oldIE
+					while ( tmp.firstChild ) {
+						tmp.removeChild( tmp.firstChild );
+					}
+
+					// Remember the top-level container for proper cleanup
+					tmp = safe.lastChild;
+				}
+			}
+		}
+
+		// Fix #11356: Clear elements from fragment
+		if ( tmp ) {
+			safe.removeChild( tmp );
+		}
+
+		// Reset defaultChecked for any radios and checkboxes
+		// about to be appended to the DOM in IE 6/7 (#8060)
+		if ( !jQuery.support.appendChecked ) {
+			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+		}
+
+		i = 0;
+		while ( (elem = nodes[ i++ ]) ) {
+
+			// #4087 - If origin and destination elements are the same, and this is
+			// that element, do not do anything
+			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
 				continue;
 			}
 
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
-				elem = context.createTextNode( elem );
+			contains = jQuery.contains( elem.ownerDocument, elem );
 
-			} else if ( typeof elem === "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(rxhtmlTag, fcloseTag);
+			// Append to fragment
+			tmp = getAll( safe.appendChild( elem ), "script" );
 
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
-					wrap = wrapMap[ tag ] || wrapMap._default,
-					depth = wrap[0],
-					div = context.createElement("div");
+			// Preserve script evaluation history
+			if ( contains ) {
+				setGlobalEval( tmp );
+			}
 
-				// Go to html and back, then peel off extra wrappers
-				div.innerHTML = wrap[1] + elem + wrap[2];
-
-				// Move to the right depth
-				while ( depth-- ) {
-					div = div.lastChild;
+			// Capture executables
+			if ( scripts ) {
+				j = 0;
+				while ( (elem = tmp[ j++ ]) ) {
+					if ( rscriptType.test( elem.type || "" ) ) {
+						scripts.push( elem );
+					}
 				}
+			}
+		}
 
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( !jQuery.support.tbody ) {
+		tmp = null;
 
-					// String was a <table>, *may* have spurious <tbody>
-					var hasBody = rtbody.test(elem),
-						tbody = tag === "table" && !hasBody ?
-							div.firstChild && div.firstChild.childNodes :
+		return safe;
+	},
 
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !hasBody ?
-								div.childNodes :
-								[];
+	cleanData: function( elems, /* internal */ acceptData ) {
+		var elem, type, id, data,
+			i = 0,
+			internalKey = jQuery.expando,
+			cache = jQuery.cache,
+			deleteExpando = jQuery.support.deleteExpando,
+			special = jQuery.event.special;
 
-					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
-						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-							tbody[ j ].parentNode.removeChild( tbody[ j ] );
+		for ( ; (elem = elems[i]) != null; i++ ) {
+
+			if ( acceptData || jQuery.acceptData( elem ) ) {
+
+				id = elem[ internalKey ];
+				data = id && cache[ id ];
+
+				if ( data ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
 						}
 					}
 
-				}
+					// Remove cache only if it was not already removed by jQuery.event.remove
+					if ( cache[ id ] ) {
 
-				// IE completely kills leading whitespace when innerHTML is used
-				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-				}
+						delete cache[ id ];
 
-				elem = div.childNodes;
-			}
+						// IE does not allow us to delete expando properties from nodes,
+						// nor does it have a removeAttribute function on Document nodes;
+						// we must handle all of these cases
+						if ( deleteExpando ) {
+							delete elem[ internalKey ];
 
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				ret = jQuery.merge( ret, elem );
-			}
-		}
-
-		if ( fragment ) {
-			for ( var i = 0; ret[i]; i++ ) {
-				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
-					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-				
-				} else {
-					if ( ret[i].nodeType === 1 ) {
-						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
-					}
-					fragment.appendChild( ret[i] );
-				}
-			}
-		}
-
-		return ret;
-	},
-	
-	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache,
-			special = jQuery.event.special,
-			deleteExpando = jQuery.support.deleteExpando;
-		
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			id = elem[ jQuery.expando ];
-			
-			if ( id ) {
-				data = cache[ id ];
-				
-				if ( data.events ) {
-					for ( var type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
+						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
+							elem.removeAttribute( internalKey );
 
 						} else {
-							removeEvent( elem, type, data.handle );
+							elem[ internalKey ] = null;
 						}
+
+						core_deletedIds.push( id );
 					}
 				}
-				
-				if ( deleteExpando ) {
-					delete elem[ jQuery.expando ];
-
-				} else if ( elem.removeAttribute ) {
-					elem.removeAttribute( jQuery.expando );
-				}
-				
-				delete cache[ id ];
 			}
 		}
 	}
 });
-// exclude the following css properties to add px
-var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-	ralpha = /alpha\([^)]*\)/,
-	ropacity = /opacity=([^)]*)/,
-	rfloat = /float/i,
-	rdashAlpha = /-([a-z])/ig,
-	rupper = /([A-Z])/g,
-	rnumpx = /^-?\d+(?:px)?$/i,
-	rnum = /^-?\d/,
+var iframe, getStyles, curCSS,
+	ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity\s*=\s*([^)]*)/,
+	rposition = /^(top|right|bottom|left)$/,
+	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rmargin = /^margin/,
+	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
+	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
+	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
+	elemdisplay = { BODY: "block" },
 
-	cssShow = { position: "absolute", visibility: "hidden", display:"block" },
-	cssWidth = [ "Left", "Right" ],
-	cssHeight = [ "Top", "Bottom" ],
-
-	// cache check for defaultView.getComputedStyle
-	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
-	// normalize float css property
-	styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn.css = function( name, value ) {
-	return access( this, name, value, true, function( elem, name, value ) {
-		if ( value === undefined ) {
-			return jQuery.curCSS( elem, name );
-		}
-		
-		if ( typeof value === "number" && !rexclude.test(name) ) {
-			value += "px";
-		}
-
-		jQuery.style( elem, name, value );
-	});
-};
-
-jQuery.extend({
-	style: function( elem, name, value ) {
-		// don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
-		}
-
-		// ignore negative width and height values #1599
-		if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
-			value = undefined;
-		}
-
-		var style = elem.style || elem, set = value !== undefined;
-
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" ) {
-			if ( set ) {
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				style.zoom = 1;
-
-				// Set the alpha filter to set the opacity
-				var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
-				var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
-				style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
-			}
-
-			return style.filter && style.filter.indexOf("opacity=") >= 0 ?
-				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
-				"";
-		}
-
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
-
-		name = name.replace(rdashAlpha, fcamelCase);
-
-		if ( set ) {
-			style[ name ] = value;
-		}
-
-		return style[ name ];
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: 0,
+		fontWeight: 400
 	},
 
-	css: function( elem, name, force, extra ) {
-		if ( name === "width" || name === "height" ) {
-			var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
+	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
 
-			function getWH() {
-				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+// return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( style, name ) {
 
-				if ( extra === "border" ) {
-					return;
+	// shortcut for names that are not vendor prefixed
+	if ( name in style ) {
+		return name;
+	}
+
+	// check for vendor prefixed names
+	var capName = name.charAt(0).toUpperCase() + name.slice(1),
+		origName = name,
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in style ) {
+			return name;
+		}
+	}
+
+	return origName;
+}
+
+function isHidden( elem, el ) {
+	// isHidden might be called from jQuery#filter function;
+	// in that case, element will be second argument
+	elem = el || elem;
+	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+}
+
+function showHide( elements, show ) {
+	var display, elem, hidden,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		values[ index ] = jQuery._data( elem, "olddisplay" );
+		display = elem.style.display;
+		if ( show ) {
+			// Reset the inline display of this element to learn if it is
+			// being hidden by cascaded rules or not
+			if ( !values[ index ] && display === "none" ) {
+				elem.style.display = "";
+			}
+
+			// Set elements which have been overridden with display: none
+			// in a stylesheet to whatever the default browser style is
+			// for such an element
+			if ( elem.style.display === "" && isHidden( elem ) ) {
+				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
+			}
+		} else {
+
+			if ( !values[ index ] ) {
+				hidden = isHidden( elem );
+
+				if ( display && display !== "none" || !hidden ) {
+					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
+				}
+			}
+		}
+	}
+
+	// Set the display of most of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+			elem.style.display = show ? values[ index ] || "" : "none";
+		}
+	}
+
+	return elements;
+}
+
+jQuery.fn.extend({
+	css: function( name, value ) {
+		return jQuery.access( this, function( elem, name, value ) {
+			var len, styles,
+				map = {},
+				i = 0;
+
+			if ( jQuery.isArray( name ) ) {
+				styles = getStyles( elem );
+				len = name.length;
+
+				for ( ; i < len; i++ ) {
+					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
 				}
 
-				jQuery.each( which, function() {
-					if ( !extra ) {
-						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					}
-
-					if ( extra === "margin" ) {
-						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
-					} else {
-						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-					}
-				});
+				return map;
 			}
 
-			if ( elem.offsetWidth !== 0 ) {
-				getWH();
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	},
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		var bool = typeof state === "boolean";
+
+		return this.each(function() {
+			if ( bool ? state : isHidden( this ) ) {
+				jQuery( this ).show();
 			} else {
-				jQuery.swap( elem, props, getWH );
+				jQuery( this ).hide();
 			}
+		});
+	}
+});
 
-			return Math.max(0, Math.round(val));
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
 		}
-
-		return jQuery.curCSS( elem, name, force );
 	},
 
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style, filter;
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"columnCount": true,
+		"fillOpacity": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
 
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
-			ret = ropacity.test(elem.currentStyle.filter || "") ?
-				(parseFloat(RegExp.$1) / 100) + "" :
-				"";
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
 
-			return ret === "" ?
-				"1" :
-				ret;
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
 		}
 
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( value == null || type === "number" && isNaN( value ) ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+			// but it would mean to define eight (for every problematic property) identical functions
+			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var num, val, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
 		}
 
-		if ( !force && style && style[ name ] ) {
-			ret = style[ name ];
-
-		} else if ( getComputedStyle ) {
-
-			// Only "float" is needed here
-			if ( rfloat.test( name ) ) {
-				name = "float";
-			}
-
-			name = name.replace( rupper, "-$1" ).toLowerCase();
-
-			var defaultView = elem.ownerDocument.defaultView;
-
-			if ( !defaultView ) {
-				return null;
-			}
-
-			var computedStyle = defaultView.getComputedStyle( elem, null );
-
-			if ( computedStyle ) {
-				ret = computedStyle.getPropertyValue( name );
-			}
-
-			// We should always get a number back from opacity
-			if ( name === "opacity" && ret === "" ) {
-				ret = "1";
-			}
-
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(rdashAlpha, fcamelCase);
-
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
-
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-			// If we're not dealing with a regular pixel number
-			// but a number that has a weird ending, we need to convert it to pixels
-			if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-				// Remember the original values
-				var left = style.left, rsLeft = elem.runtimeStyle.left;
-
-				// Put in the new values to get a computed value out
-				elem.runtimeStyle.left = elem.currentStyle.left;
-				style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
-				ret = style.pixelLeft + "px";
-
-				// Revert the changed values
-				style.left = left;
-				elem.runtimeStyle.left = rsLeft;
-			}
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
 		}
 
-		return ret;
+		//convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Return, converting to number if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
+		}
+		return val;
 	},
 
 	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
+	swap: function( elem, options, callback, args ) {
+		var ret, name,
+			old = {};
 
 		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
+		for ( name in options ) {
 			old[ name ] = elem.style[ name ];
 			elem.style[ name ] = options[ name ];
 		}
 
-		callback.call( elem );
+		ret = callback.apply( elem, args || [] );
 
 		// Revert the old values
-		for ( var name in options ) {
+		for ( name in options ) {
 			elem.style[ name ] = old[ name ];
 		}
+
+		return ret;
 	}
 });
 
+// NOTE: we've included the "window" in window.getComputedStyle
+// because jsdom on node.js will break without it.
+if ( window.getComputedStyle ) {
+	getStyles = function( elem ) {
+		return window.getComputedStyle( elem, null );
+	};
+
+	curCSS = function( elem, name, _computed ) {
+		var width, minWidth, maxWidth,
+			computed = _computed || getStyles( elem ),
+
+			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
+			style = elem.style;
+
+		if ( computed ) {
+
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+
+			// A tribute to the "awesome hack by Dean Edwards"
+			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
+			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+				// Remember the original values
+				width = style.width;
+				minWidth = style.minWidth;
+				maxWidth = style.maxWidth;
+
+				// Put in the new values to get a computed value out
+				style.minWidth = style.maxWidth = style.width = ret;
+				ret = computed.width;
+
+				// Revert the changed values
+				style.width = width;
+				style.minWidth = minWidth;
+				style.maxWidth = maxWidth;
+			}
+		}
+
+		return ret;
+	};
+} else if ( document.documentElement.currentStyle ) {
+	getStyles = function( elem ) {
+		return elem.currentStyle;
+	};
+
+	curCSS = function( elem, name, _computed ) {
+		var left, rs, rsLeft,
+			computed = _computed || getStyles( elem ),
+			ret = computed ? computed[ name ] : undefined,
+			style = elem.style;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && style[ name ] ) {
+			ret = style[ name ];
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		// but not position css attributes, as those are proportional to the parent element instead
+		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
+		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rs = elem.runtimeStyle;
+			rsLeft = rs && rs.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				rs.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				rs.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+		// If we already have the right measurement, avoid augmentation
+		4 :
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+		// both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// at this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+			// at this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// at this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var valueIsBorderBox = true,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		styles = getStyles( elem ),
+		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test(val) ) {
+			return val;
+		}
+
+		// we need the check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+// Try to determine the default display value of an element
+function css_defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+			// Use the already-created iframe if possible
+			iframe = ( iframe ||
+				jQuery("<iframe frameborder='0' width='0' height='0'/>")
+				.css( "cssText", "display:block !important" )
+			).appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
+			doc.write("<!doctype html><html><body>");
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return display;
+}
+
+// Called ONLY from within css_defaultDisplay
+function actualDisplay( name, doc ) {
+	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+		display = jQuery.css( elem[0], "display" );
+	elem.remove();
+	return display;
+}
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+				// certain elements can have dimension info if we invisibly show them
+				// however, it must have a current display style that would benefit from this
+				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
+					jQuery.swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, name, extra );
+					}) :
+					getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var styles = extra && getStyles( elem );
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				) : 0
+			);
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+			// if value === "", then remove inline opacity #12685
+			if ( ( value >= 1 || value === "" ) &&
+					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+					style.removeAttribute ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there is no filter style applied in a css rule or unset inline opacity, we are done
+				if ( value === "" || currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+// These hooks cannot be added until DOM ready because the support test
+// for it is not run until after DOM ready
+jQuery(function() {
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+					// Work around by temporarily setting element display to inline-block
+					return jQuery.swap( elem, { "display": "inline-block" },
+						curCSS, [ elem, "marginRight" ] );
+				}
+			}
+		};
+	}
+
+	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+	// getComputedStyle returns percent when specified for top/left/bottom/right
+	// rather than make the css module depend on the offset module, we just check for it here
+	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
+		jQuery.each( [ "top", "left" ], function( i, prop ) {
+			jQuery.cssHooks[ prop ] = {
+				get: function( elem, computed ) {
+					if ( computed ) {
+						computed = curCSS( elem, prop );
+						// if curCSS returns percentage, fallback to offset
+						return rnumnonpx.test( computed ) ?
+							jQuery( elem ).position()[ prop ] + "px" :
+							computed;
+					}
+				}
+			};
+		});
+	}
+
+});
+
 if ( jQuery.expr && jQuery.expr.filters ) {
 	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth, height = elem.offsetHeight,
-			skip = elem.nodeName.toLowerCase() === "tr";
-
-		return width === 0 && height === 0 && !skip ?
-			true :
-			width > 0 && height > 0 && !skip ?
-				false :
-				jQuery.curCSS(elem, "display") === "none";
+		// Support: Opera <= 12.12
+		// Opera reports offsetWidths and offsetHeights less than zero on some elements
+		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
+			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
 	};
 
 	jQuery.expr.filters.visible = function( elem ) {
 		return !jQuery.expr.filters.hidden( elem );
 	};
 }
-var jsc = now(),
-	rscript = /<script(.|\s)*?\/script>/gi,
-	rselectTextarea = /select|textarea/i,
-	rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
-	jsre = /=\?(&|$)/,
-	rquery = /\?/,
-	rts = /(\?|&)_=.*?(&|$)/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-	r20 = /%20/g,
 
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load;
+// These hooks are used by animate to expand properties
+jQuery.each({
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split(" ") : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+});
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
 
 jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( typeof url !== "string" ) {
-			return _load.call( this, url );
-
-		// Don't do a request if no elements are being requested
-		} else if ( !this.length ) {
-			return this;
-		}
-
-		var off = url.indexOf(" ");
-		if ( off >= 0 ) {
-			var selector = url.slice(off, url.length);
-			url = url.slice(0, off);
-		}
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params ) {
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = null;
-
-			// Otherwise, build a param string
-			} else if ( typeof params === "object" ) {
-				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
-				type = "POST";
-			}
-		}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			complete: function( res, status ) {
-				// If successful, inject the HTML into all the matched elements
-				if ( status === "success" || status === "notmodified" ) {
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div />")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(res.responseText.replace(rscript, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						res.responseText );
-				}
-
-				if ( callback ) {
-					self.each( callback, [res.responseText, status, res] );
-				}
-			}
-		});
-
-		return this;
-	},
-
 	serialize: function() {
-		return jQuery.param(this.serializeArray());
+		return jQuery.param( this.serializeArray() );
 	},
 	serializeArray: function() {
-		return this.map(function() {
-			return this.elements ? jQuery.makeArray(this.elements) : this;
+		return this.map(function(){
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
 		})
-		.filter(function() {
-			return this.name && !this.disabled &&
-				(this.checked || rselectTextarea.test(this.nodeName) ||
-					rinput.test(this.type));
+		.filter(function(){
+			var type = this.type;
+			// Use .is(":disabled") so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !manipulation_rcheckableType.test( type ) );
 		})
-		.map(function( i, elem ) {
-			var val = jQuery(this).val();
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
 
 			return val == null ?
 				null :
-				jQuery.isArray(val) ?
-					jQuery.map( val, function( val, i ) {
-						return { name: elem.name, value: val };
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
 					}) :
-					{ name: elem.name, value: val };
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
 		}).get();
 	}
 });
 
+//Serialize an array of form elements or a set of
+//key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		});
+
+	} else {
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+});
+
+jQuery.fn.hover = function( fnOver, fnOut ) {
+	return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+};
+var
+	// Document location
+	ajaxLocParts,
+	ajaxLocation,
+	ajax_nonce = jQuery.now(),
+
+	ajax_rquery = /\?/,
+	rhash = /#.*$/,
+	rts = /([?&])_=[^&]*/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = "*/".concat("*");
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		var dataType,
+			i = 0,
+			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
+
+		if ( jQuery.isFunction( func ) ) {
+			// For each dataType in the dataTypeExpression
+			while ( (dataType = dataTypes[i++]) ) {
+				// Prepend if requested
+				if ( dataType[0] === "+" ) {
+					dataType = dataType.slice( 1 ) || "*";
+					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+
+				// Otherwise append
+				} else {
+					(structure[ dataType ] = structure[ dataType ] || []).push( func );
+				}
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+	var inspected = {},
+		seekingTransport = ( structure === transports );
+
+	function inspect( dataType ) {
+		var selected;
+		inspected[ dataType ] = true;
+		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+				options.dataTypes.unshift( dataTypeOrTransport );
+				inspect( dataTypeOrTransport );
+				return false;
+			} else if ( seekingTransport ) {
+				return !( selected = dataTypeOrTransport );
+			}
+		});
+		return selected;
+	}
+
+	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var deep, key,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+
+	return target;
+}
+
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	var selector, response, type,
+		self = this,
+		off = url.indexOf(" ");
+
+	if ( off >= 0 ) {
+		selector = url.slice( off, url.length );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax({
+			url: url,
+
+			// if "type" variable is undefined, then "GET" method will be used
+			type: type,
+			dataType: "html",
+			data: params
+		}).done(function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		}).complete( callback && function( jqXHR, status ) {
+			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+		});
+	}
+
+	return this;
+};
+
 // Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
-	jQuery.fn[o] = function( f ) {
-		return this.bind(o, f);
+jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
+	jQuery.fn[ type ] = function( fn ){
+		return this.on( type, fn );
+	};
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			url: url,
+			type: method,
+			dataType: type,
+			data: data,
+			success: callback
+		});
 	};
 });
 
 jQuery.extend({
 
-	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = null;
-		}
-
-		return jQuery.ajax({
-			type: "GET",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get(url, null, callback, "script");
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get(url, data, callback, "json");
-	},
-
-	post: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = {};
-		}
-
-		return jQuery.ajax({
-			type: "POST",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
-	},
-
-	ajaxSettings: {
-		url: location.href,
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		/*
-		timeout: 0,
-		data: null,
-		username: null,
-		password: null,
-		traditional: false,
-		*/
-		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7 (can't request local files),
-		// so we use the ActiveXObject when it is available
-		// This function can be overriden by calling jQuery.ajaxSetup
-		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
-			function() {
-				return new window.XMLHttpRequest();
-			} :
-			function() {
-				try {
-					return new window.ActiveXObject("Microsoft.XMLHTTP");
-				} catch(e) {}
-			},
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			script: "text/javascript, application/javascript",
-			json: "application/json, text/javascript",
-			text: "text/plain",
-			_default: "*/*"
-		}
-	},
+	// Counter for holding the number of active queries
+	active: 0,
 
 	// Last-Modified header cache for next request
 	lastModified: {},
 	etag: {},
 
-	ajax: function( origSettings ) {
-		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
-		
-		var jsonp, status, data,
-			callbackContext = origSettings && origSettings.context || s,
-			type = s.type.toUpperCase();
+	ajaxSettings: {
+		url: ajaxLocation,
+		type: "GET",
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		processData: true,
+		async: true,
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
 
-		// convert data if not already a string
+		accepts: {
+			"*": allTypes,
+			text: "text/plain",
+			html: "text/html",
+			xml: "application/xml, text/xml",
+			json: "application/json, text/javascript"
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
+
+		// Data converters
+		// Keys separate source (or catchall "*") and destination types with a single space
+		converters: {
+
+			// Convert anything to text
+			"* text": window.String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			url: true,
+			context: true
+		}
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		return settings ?
+
+			// Building a settings object
+			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+			// Extending ajaxSettings
+			ajaxExtend( jQuery.ajaxSettings, target );
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Cross-domain detection vars
+			parts,
+			// Loop variable
+			i,
+			// URL without anti-cache param
+			cacheURL,
+			// Response headers as string
+			responseHeadersString,
+			// timeout handle
+			timeoutTimer,
+
+			// To know if global events are to be dispatched
+			fireGlobals,
+
+			transport,
+			// Response headers
+			responseHeaders,
+			// Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events is callbackContext if it is a DOM node or jQuery collection
+			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
+				jQuery( callbackContext ) :
+				jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks("once memory"),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// The jqXHR state
+			state = 0,
+			// Default abort message
+			strAbort = "canceled",
+			// Fake xhr
+			jqXHR = {
+				readyState: 0,
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while ( (match = rheaders.exec( responseHeadersString )) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match == null ? null : match;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					var lname = name.toLowerCase();
+					if ( !state ) {
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Status-dependent callbacks
+				statusCode: function( map ) {
+					var code;
+					if ( map ) {
+						if ( state < 2 ) {
+							for ( code in map ) {
+								// Lazy-add the new callback in a way that preserves old ones
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
+						} else {
+							// Execute the appropriate callbacks
+							jqXHR.always( map[ jqXHR.status ] );
+						}
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					var finalText = statusText || strAbort;
+					if ( transport ) {
+						transport.abort( finalText );
+					}
+					done( 0, finalText );
+					return this;
+				}
+			};
+
+		// Attach deferreds
+		deferred.promise( jqXHR ).complete = completeDeferred.add;
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// Handle falsy url in the settings object (#10093: consistency with old signature)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Alias method option to type as per ticket #12004
+		s.type = options.method || options.type || s.method || s.type;
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
+
+		// A cross-domain request is in order when we have a protocol:host:port mismatch
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
+		}
+
+		// Convert data if not already a string
 		if ( s.data && s.processData && typeof s.data !== "string" ) {
 			s.data = jQuery.param( s.data, s.traditional );
 		}
 
-		// Handle JSONP Parameter Callbacks
-		if ( s.dataType === "jsonp" ) {
-			if ( type === "GET" ) {
-				if ( !jsre.test( s.url ) ) {
-					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-				}
-			} else if ( !s.data || !jsre.test(s.data) ) {
-				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-			}
-			s.dataType = "json";
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( state === 2 ) {
+			return jqXHR;
 		}
 
-		// Build temporary JSONP function
-		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
-			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
-
-			// Replace the =? sequence both in the query string and the data
-			if ( s.data ) {
-				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-			}
-
-			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
-			// We need to make sure
-			// that a JSONP style response is executed properly
-			s.dataType = "script";
-
-			// Handle JSONP-style loading
-			window[ jsonp ] = window[ jsonp ] || function( tmp ) {
-				data = tmp;
-				success();
-				complete();
-				// Garbage collect
-				window[ jsonp ] = undefined;
-
-				try {
-					delete window[ jsonp ];
-				} catch(e) {}
-
-				if ( head ) {
-					head.removeChild( script );
-				}
-			};
-		}
-
-		if ( s.dataType === "script" && s.cache === null ) {
-			s.cache = false;
-		}
-
-		if ( s.cache === false && type === "GET" ) {
-			var ts = now();
-
-			// try replacing _= if it is there
-			var ret = s.url.replace(rts, "$1_=" + ts + "$2");
-
-			// if nothing was replaced, add timestamp to the end
-			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
-		}
-
-		// If data is available, append data to url for get requests
-		if ( s.data && type === "GET" ) {
-			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
-		}
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
 
 		// Watch for a new set of requests
-		if ( s.global && ! jQuery.active++ ) {
-			jQuery.event.trigger( "ajaxStart" );
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger("ajaxStart");
 		}
 
-		// Matches an absolute URL, and saves the domain
-		var parts = rurl.exec( s.url ),
-			remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
 
-		// If we're requesting a remote document
-		// and trying to load JSON or Script with a GET
-		if ( s.dataType === "script" && type === "GET" && remote ) {
-			var head = document.getElementsByTagName("head")[0] || document.documentElement;
-			var script = document.createElement("script");
-			script.src = s.url;
-			if ( s.scriptCharset ) {
-				script.charset = s.scriptCharset;
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Save the URL in case we're toying with the If-Modified-Since
+		// and/or If-None-Match header later on
+		cacheURL = s.url;
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
 			}
 
-			// Handle Script loading
-			if ( !jsonp ) {
-				var done = false;
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+				s.url = rts.test( cacheURL ) ?
+
+					// If there is already a '_' parameter, set its value
+					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
+
+					// Otherwise add one to the end
+					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
+			}
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			if ( jQuery.lastModified[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+			}
+			if ( jQuery.etag[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+			// Abort if not done already and return
+			return jqXHR.abort();
+		}
+
+		// aborting is no longer a cancellation
+		strAbort = "abort";
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout(function() {
+					jqXHR.abort("timeout");
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch ( e ) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		// Callback for when everything is done
+		function done( status, nativeStatusText, responses, headers ) {
+			var isSuccess, success, error, response, modified,
+				statusText = nativeStatusText;
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			// Get response data
+			if ( responses ) {
+				response = ajaxHandleResponses( s, jqXHR, responses );
+			}
+
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					modified = jqXHR.getResponseHeader("Last-Modified");
+					if ( modified ) {
+						jQuery.lastModified[ cacheURL ] = modified;
+					}
+					modified = jqXHR.getResponseHeader("etag");
+					if ( modified ) {
+						jQuery.etag[ cacheURL ] = modified;
+					}
+				}
+
+				// if no content
+				if ( status === 204 ) {
+					isSuccess = true;
+					statusText = "nocontent";
+
+				// if not modified
+				} else if ( status === 304 ) {
+					isSuccess = true;
+					statusText = "notmodified";
+
+				// If we have data, let's convert it
+				} else {
+					isSuccess = ajaxConvert( s, response );
+					statusText = isSuccess.state;
+					success = isSuccess.data;
+					error = isSuccess.error;
+					isSuccess = !error;
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if ( status || !statusText ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+					[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger("ajaxStop");
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	}
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+	var firstDataType, ct, finalDataType, type,
+		contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields;
+
+	// Fill responseXXX fields
+	for ( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+	var conv2, current, conv, tmp,
+		converters = {},
+		i = 0,
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice(),
+		prev = dataTypes[ 0 ];
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
+	}
+
+	// Convert to each sequential dataType, tolerating list modification
+	for ( ; (current = dataTypes[++i]); ) {
+
+		// There's only work to do if current dataType is non-auto
+		if ( current !== "*" ) {
+
+			// Convert response if prev dataType is non-auto and differs from current
+			if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split(" ");
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.splice( i--, 0, current );
+								}
+
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s["throws"] ) {
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						}
+					}
+				}
+			}
+
+			// Update prev for next iteration
+			prev = current;
+		}
+	}
+
+	return { state: "success", data: response };
+}
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /(?:java|ecma)script/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || jQuery("head")[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement("script");
+
+				script.async = true;
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
 
 				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function() {
-					if ( !done && (!this.readyState ||
-							this.readyState === "loaded" || this.readyState === "complete") ) {
-						done = true;
-						success();
-						complete();
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
 
 						// Handle memory leak in IE
 						script.onload = script.onreadystatechange = null;
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
+
+						// Remove the script
+						if ( script.parentNode ) {
+							script.parentNode.removeChild( script );
+						}
+
+						// Dereference the script
+						script = null;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
 						}
 					}
 				};
-			}
 
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709 and #4378).
-			head.insertBefore( script, head.firstChild );
+				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
+				// Use native DOM manipulation to avoid our domManip AJAX trickery
+				head.insertBefore( script, head.firstChild );
+			},
 
-			// We handle everything using the script element injection
-			return undefined;
-		}
-
-		var requestDone = false;
-
-		// Create the request object
-		var xhr = s.xhr();
-
-		if ( !xhr ) {
-			return;
-		}
-
-		// Open the socket
-		// Passing null username, generates a login popup on Opera (#2865)
-		if ( s.username ) {
-			xhr.open(type, s.url, s.async, s.username, s.password);
-		} else {
-			xhr.open(type, s.url, s.async);
-		}
-
-		// Need an extra try/catch for cross domain requests in Firefox 3
-		try {
-			// Set the correct header, if data is being sent
-			if ( s.data || origSettings && origSettings.contentType ) {
-				xhr.setRequestHeader("Content-Type", s.contentType);
-			}
-
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( s.ifModified ) {
-				if ( jQuery.lastModified[s.url] ) {
-					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
-				}
-
-				if ( jQuery.etag[s.url] ) {
-					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
-				}
-			}
-
-			// Set header so the called script knows that it's an XMLHttpRequest
-			// Only send the header if it's not a remote XHR
-			if ( !remote ) {
-				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-			}
-
-			// Set the Accepts header for the server, depending on the dataType
-			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-				s.accepts[ s.dataType ] + ", */*" :
-				s.accepts._default );
-		} catch(e) {}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-
-			// close opended socket
-			xhr.abort();
-			return false;
-		}
-
-		if ( s.global ) {
-			trigger("ajaxSend", [xhr, s]);
-		}
-
-		// Wait for a response to come back
-		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
-			// The request was aborted
-			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
-				// Opera doesn't call onreadystatechange before this point
-				// so we simulate the call
-				if ( !requestDone ) {
-					complete();
-				}
-
-				requestDone = true;
-				if ( xhr ) {
-					xhr.onreadystatechange = jQuery.noop;
-				}
-
-			// The transfer is complete and the data is available, or the request timed out
-			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
-				requestDone = true;
-				xhr.onreadystatechange = jQuery.noop;
-
-				status = isTimeout === "timeout" ?
-					"timeout" :
-					!jQuery.httpSuccess( xhr ) ?
-						"error" :
-						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
-							"notmodified" :
-							"success";
-
-				var errMsg;
-
-				if ( status === "success" ) {
-					// Watch for, and catch, XML document parse errors
-					try {
-						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xhr, s.dataType, s );
-					} catch(err) {
-						status = "parsererror";
-						errMsg = err;
-					}
-				}
-
-				// Make sure that the request was successful or notmodified
-				if ( status === "success" || status === "notmodified" ) {
-					// JSONP handles its own success callback
-					if ( !jsonp ) {
-						success();
-					}
-				} else {
-					jQuery.handleError(s, xhr, status, errMsg);
-				}
-
-				// Fire the complete handlers
-				complete();
-
-				if ( isTimeout === "timeout" ) {
-					xhr.abort();
-				}
-
-				// Stop memory leaks
-				if ( s.async ) {
-					xhr = null;
+			abort: function() {
+				if ( script ) {
+					script.onload( undefined, true );
 				}
 			}
 		};
-
-		// Override the abort handler, if we can (IE doesn't allow it, but that's OK)
-		// Opera doesn't fire onreadystatechange at all on abort
-		try {
-			var oldAbort = xhr.abort;
-			xhr.abort = function() {
-				if ( xhr ) {
-					oldAbort.call( xhr );
-				}
-
-				onreadystatechange( "abort" );
-			};
-		} catch(e) { }
-
-		// Timeout checker
-		if ( s.async && s.timeout > 0 ) {
-			setTimeout(function() {
-				// Check to see if the request is still happening
-				if ( xhr && !requestDone ) {
-					onreadystatechange( "timeout" );
-				}
-			}, s.timeout);
-		}
-
-		// Send the data
-		try {
-			xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
-		} catch(e) {
-			jQuery.handleError(s, xhr, null, e);
-			// Fire the complete handlers
-			complete();
-		}
-
-		// firefox 1.5 doesn't fire statechange for sync requests
-		if ( !s.async ) {
-			onreadystatechange();
-		}
-
-		function success() {
-			// If a local callback was specified, fire it and pass it the data
-			if ( s.success ) {
-				s.success.call( callbackContext, data, status, xhr );
-			}
-
-			// Fire the global callback
-			if ( s.global ) {
-				trigger( "ajaxSuccess", [xhr, s] );
-			}
-		}
-
-		function complete() {
-			// Process result
-			if ( s.complete ) {
-				s.complete.call( callbackContext, xhr, status);
-			}
-
-			// The request was completed
-			if ( s.global ) {
-				trigger( "ajaxComplete", [xhr, s] );
-			}
-
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-		}
-		
-		function trigger(type, args) {
-			(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
-		}
-
-		// return XMLHttpRequest to allow aborting the request etc.
-		return xhr;
-	},
-
-	handleError: function( s, xhr, status, e ) {
-		// If a local callback was specified, fire it
-		if ( s.error ) {
-			s.error.call( s.context || s, xhr, status, e );
-		}
-
-		// Fire the global callback
-		if ( s.global ) {
-			(s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
-		}
-	},
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( xhr ) {
-		try {
-			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !xhr.status && location.protocol === "file:" ||
-				// Opera returns 0 when status is 304
-				( xhr.status >= 200 && xhr.status < 300 ) ||
-				xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
-		} catch(e) {}
-
-		return false;
-	},
-
-	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xhr, url ) {
-		var lastModified = xhr.getResponseHeader("Last-Modified"),
-			etag = xhr.getResponseHeader("Etag");
-
-		if ( lastModified ) {
-			jQuery.lastModified[url] = lastModified;
-		}
-
-		if ( etag ) {
-			jQuery.etag[url] = etag;
-		}
-
-		// Opera returns 0 when status is 304
-		return xhr.status === 304 || xhr.status === 0;
-	},
-
-	httpData: function( xhr, type, s ) {
-		var ct = xhr.getResponseHeader("content-type") || "",
-			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
-			data = xml ? xhr.responseXML : xhr.responseText;
-
-		if ( xml && data.documentElement.nodeName === "parsererror" ) {
-			jQuery.error( "parsererror" );
-		}
-
-		// Allow a pre-filtering function to sanitize the response
-		// s is checked to keep backwards compatibility
-		if ( s && s.dataFilter ) {
-			data = s.dataFilter( data, type );
-		}
-
-		// The filter can actually parse the response
-		if ( typeof data === "string" ) {
-			// Get the JavaScript object, if JSON is used.
-			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
-				data = jQuery.parseJSON( data );
-
-			// If the type is "script", eval it in global context
-			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
-				jQuery.globalEval( data );
-			}
-		}
-
-		return data;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a, traditional ) {
-		var s = [];
-		
-		// Set traditional to true for jQuery <= 1.3.2 behavior.
-		if ( traditional === undefined ) {
-			traditional = jQuery.ajaxSettings.traditional;
-		}
-		
-		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray(a) || a.jquery ) {
-			// Serialize the form elements
-			jQuery.each( a, function() {
-				add( this.name, this.value );
-			});
-			
-		} else {
-			// If traditional, encode the "old" way (the way 1.3.2 or older
-			// did it), otherwise encode params recursively.
-			for ( var prefix in a ) {
-				buildParams( prefix, a[prefix] );
-			}
-		}
-
-		// Return the resulting serialization
-		return s.join("&").replace(r20, "+");
-
-		function buildParams( prefix, obj ) {
-			if ( jQuery.isArray(obj) ) {
-				// Serialize array item.
-				jQuery.each( obj, function( i, v ) {
-					if ( traditional || /\[\]$/.test( prefix ) ) {
-						// Treat each array item as a scalar.
-						add( prefix, v );
-					} else {
-						// If array item is non-scalar (array or object), encode its
-						// numeric index to resolve deserialization ambiguity issues.
-						// Note that rack (as of 1.0.0) can't currently deserialize
-						// nested arrays properly, and attempting to do so may cause
-						// a server error. Possible fixes are to modify rack's
-						// deserialization algorithm or to provide an option or flag
-						// to force array serialization to be shallow.
-						buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v );
-					}
-				});
-					
-			} else if ( !traditional && obj != null && typeof obj === "object" ) {
-				// Serialize object item.
-				jQuery.each( obj, function( k, v ) {
-					buildParams( prefix + "[" + k + "]", v );
-				});
-					
-			} else {
-				// Serialize scalar item.
-				add( prefix, obj );
-			}
-		}
-
-		function add( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction(value) ? value() : value;
-			s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
-		}
 	}
 });
-var elemdisplay = {},
-	rfxtypes = /toggle|show|hide/,
-	rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
-	timerId,
-	fxAttrs = [
-		// height animations
-		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
-		// width animations
-		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
-		// opacity animations
-		[ "opacity" ]
-	];
+var oldCallbacks = [],
+	rjsonp = /(=)\?(?=&|$)|\?\?/;
 
-jQuery.fn.extend({
-	show: function( speed, callback ) {
-		if ( speed || speed === 0) {
-			return this.animate( genFx("show", 3), speed, callback);
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-
-				this[i].style.display = old || "";
-
-				if ( jQuery.css(this[i], "display") === "none" ) {
-					var nodeName = this[i].nodeName, display;
-
-					if ( elemdisplay[ nodeName ] ) {
-						display = elemdisplay[ nodeName ];
-
-					} else {
-						var elem = jQuery("<" + nodeName + " />").appendTo("body");
-
-						display = elem.css("display");
-
-						if ( display === "none" ) {
-							display = "block";
-						}
-
-						elem.remove();
-
-						elemdisplay[ nodeName ] = display;
-					}
-
-					jQuery.data(this[i], "olddisplay", display);
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( var j = 0, k = this.length; j < k; j++ ) {
-				this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
-			}
-
-			return this;
-		}
-	},
-
-	hide: function( speed, callback ) {
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, callback);
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-				if ( !old && old !== "none" ) {
-					jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( var j = 0, k = this.length; j < k; j++ ) {
-				this[j].style.display = "none";
-			}
-
-			return this;
-		}
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2 ) {
-		var bool = typeof fn === "boolean";
-
-		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments );
-
-		} else if ( fn == null || bool ) {
-			this.each(function() {
-				var state = bool ? fn : jQuery(this).is(":hidden");
-				jQuery(this)[ state ? "show" : "hide" ]();
-			});
-
-		} else {
-			this.animate(genFx("toggle", 3), fn, fn2);
-		}
-
-		return this;
-	},
-
-	fadeTo: function( speed, to, callback ) {
-		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete );
-		}
-
-		return this[ optall.queue === false ? "each" : "queue" ](function() {
-			var opt = jQuery.extend({}, optall), p,
-				hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
-				self = this;
-
-			for ( p in prop ) {
-				var name = p.replace(rdashAlpha, fcamelCase);
-
-				if ( p !== name ) {
-					prop[ name ] = prop[ p ];
-					delete prop[ p ];
-					p = name;
-				}
-
-				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
-					return opt.complete.call(this);
-				}
-
-				if ( ( p === "height" || p === "width" ) && this.style ) {
-					// Store display property
-					opt.display = jQuery.css(this, "display");
-
-					// Make sure that nothing sneaks out
-					opt.overflow = this.style.overflow;
-				}
-
-				if ( jQuery.isArray( prop[p] ) ) {
-					// Create (if needed) and add to specialEasing
-					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
-					prop[p] = prop[p][0];
-				}
-			}
-
-			if ( opt.overflow != null ) {
-				this.style.overflow = "hidden";
-			}
-
-			opt.curAnim = jQuery.extend({}, prop);
-
-			jQuery.each( prop, function( name, val ) {
-				var e = new jQuery.fx( self, opt, name );
-
-				if ( rfxtypes.test(val) ) {
-					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
-
-				} else {
-					var parts = rfxnum.exec(val),
-						start = e.cur(true) || 0;
-
-					if ( parts ) {
-						var end = parseFloat( parts[2] ),
-							unit = parts[3] || "px";
-
-						// We need to compute starting value
-						if ( unit !== "px" ) {
-							self.style[ name ] = (end || 1) + unit;
-							start = ((end || 1) / e.cur(true)) * start;
-							self.style[ name ] = start + unit;
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] ) {
-							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
-						}
-
-						e.custom( start, end, unit );
-
-					} else {
-						e.custom( start, val, "" );
-					}
-				}
-			});
-
-			// For JS strict compliance
-			return true;
-		});
-	},
-
-	stop: function( clearQueue, gotoEnd ) {
-		var timers = jQuery.timers;
-
-		if ( clearQueue ) {
-			this.queue([]);
-		}
-
-		this.each(function() {
-			// go in reverse order so anything added to the queue during the loop is ignored
-			for ( var i = timers.length - 1; i >= 0; i-- ) {
-				if ( timers[i].elem === this ) {
-					if (gotoEnd) {
-						// force the next step to be the last
-						timers[i](true);
-					}
-
-					timers.splice(i, 1);
-				}
-			}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if ( !gotoEnd ) {
-			this.dequeue();
-		}
-
-		return this;
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
+		this[ callback ] = true;
+		return callback;
 	}
-
 });
 
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show", 1),
-	slideUp: genFx("hide", 1),
-	slideToggle: genFx("toggle", 1),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, callback ) {
-		return this.animate( props, speed, callback );
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var callbackName, overwritten, responseContainer,
+		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+			"url" :
+			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+		);
+
+	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+		// Get callback name, remembering preexisting value associated with it
+		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+			s.jsonpCallback() :
+			s.jsonpCallback;
+
+		// Insert callback into url or form data
+		if ( jsonProp ) {
+			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+		} else if ( s.jsonp !== false ) {
+			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+		}
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( callbackName + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Install callback
+		overwritten = window[ callbackName ];
+		window[ callbackName ] = function() {
+			responseContainer = arguments;
+		};
+
+		// Clean-up function (fires after converters)
+		jqXHR.always(function() {
+			// Restore preexisting value
+			window[ callbackName ] = overwritten;
+
+			// Save back as free
+			if ( s[ callbackName ] ) {
+				// make sure that re-using the options doesn't screw things around
+				s.jsonpCallback = originalSettings.jsonpCallback;
+
+				// save the callback name for future use
+				oldCallbacks.push( callbackName );
+			}
+
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+				overwritten( responseContainer[ 0 ] );
+			}
+
+			responseContainer = overwritten = undefined;
+		});
+
+		// Delegate to script
+		return "script";
+	}
+});
+var xhrCallbacks, xhrSupported,
+	xhrId = 0,
+	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+	xhrOnUnloadAbort = window.ActiveXObject && function() {
+		// Abort all pending requests
+		var key;
+		for ( key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( undefined, true );
+		}
 	};
-});
 
-jQuery.extend({
-	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? speed : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
-		};
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
 
-		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject("Microsoft.XMLHTTP");
+	} catch( e ) {}
+}
 
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function() {
-			if ( opt.queue !== false ) {
-				jQuery(this).dequeue();
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Determine support properties
+xhrSupported = jQuery.ajaxSettings.xhr();
+jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = jQuery.support.ajax = !!xhrSupported;
+
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var handle, i,
+						xhr = s.xhr();
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+						headers["X-Requested-With"] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( err ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+						var status, responseHeaders, statusText, responses;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occurred
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									if ( xhrOnUnloadAbort ) {
+										delete xhrCallbacks[ handle ];
+									}
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									responses = {};
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+
+									// When requesting binary data, IE6-9 will throw an exception
+									// on any attempt to access responseText (#11426)
+									if ( typeof xhr.responseText === "string" ) {
+										responses.text = xhr.responseText;
+									}
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					if ( !s.async ) {
+						// if we're in sync mode we fire the callback
+						callback();
+					} else if ( xhr.readyState === 4 ) {
+						// (IE6 & IE7) if it's in cache and has been
+						// retrieved directly we need to fire the callback
+						setTimeout( callback );
+					} else {
+						handle = ++xhrId;
+						if ( xhrOnUnloadAbort ) {
+							// Create the active xhrs callbacks list if needed
+							// and attach the unload handler
+							if ( !xhrCallbacks ) {
+								xhrCallbacks = {};
+								jQuery( window ).unload( xhrOnUnloadAbort );
+							}
+							// Add to list of active xhrs callbacks
+							xhrCallbacks[ handle ] = callback;
+						}
+						xhr.onreadystatechange = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback( undefined, true );
+					}
+				}
+			};
+		}
+	});
+}
+var fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
+	rrun = /queueHooks$/,
+	animationPrefilters = [ defaultPrefilter ],
+	tweeners = {
+		"*": [function( prop, value ) {
+			var end, unit,
+				tween = this.createTween( prop, value ),
+				parts = rfxnum.exec( value ),
+				target = tween.cur(),
+				start = +target || 0,
+				scale = 1,
+				maxIterations = 20;
+
+			if ( parts ) {
+				end = +parts[2];
+				unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+
+				// We need to compute starting value
+				if ( unit !== "px" && start ) {
+					// Iteratively approximate from a nonzero starting point
+					// Prefer the current property, because this process will be trivial if it uses the same units
+					// Fallback to end or a simple constant
+					start = jQuery.css( tween.elem, prop, true ) || end || 1;
+
+					do {
+						// If previous iteration zeroed out, double until we get *something*
+						// Use a string for doubling factor so we don't accidentally see scale as unchanged below
+						scale = scale || ".5";
+
+						// Adjust and apply
+						start = start / scale;
+						jQuery.style( tween.elem, prop, start + unit );
+
+					// Update scale, tolerating zero or NaN from tween.cur()
+					// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+					} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+				}
+
+				tween.unit = unit;
+				tween.start = start;
+				// If a +=/-= token was provided, we're doing a relative animation
+				tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
 			}
-			if ( jQuery.isFunction( opt.old ) ) {
-				opt.old.call( this );
+			return tween;
+		}]
+	};
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout(function() {
+		fxNow = undefined;
+	});
+	return ( fxNow = jQuery.now() );
+}
+
+function createTweens( animation, props ) {
+	jQuery.each( props, function( prop, value ) {
+		var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+			index = 0,
+			length = collection.length;
+		for ( ; index < length; index++ ) {
+			if ( collection[ index ].call( animation, prop, value ) ) {
+
+				// we're done with this property
+				return;
 			}
-		};
+		}
+	});
+}
 
-		return opt;
-	},
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = animationPrefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+			// don't match elem in the :animated selector
+			delete tick.elem;
+		}),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
 
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
 		},
-		swing: function( p, n, firstNum, diff ) {
-			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		animation = deferred.promise({
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, { specialEasing: {} }, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+					// if we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// resolve when we played the last frame
+				// otherwise, reject
+				if ( gotoEnd ) {
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		}),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			return result;
+		}
+	}
+
+	createTweens( animation, props );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		})
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+function propFilter( props, specialEasing ) {
+	var value, name, index, easing, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// not quite $.extend, this wont overwrite keys already present.
+			// also - reusing 'index' from above because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.split(" ");
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			tweeners[ prop ] = tweeners[ prop ] || [];
+			tweeners[ prop ].unshift( callback );
 		}
 	},
 
-	timers: [],
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			animationPrefilters.unshift( callback );
+		} else {
+			animationPrefilters.push( callback );
+		}
+	}
+});
 
-	fx: function( elem, options, prop ) {
-		this.options = options;
+function defaultPrefilter( elem, props, opts ) {
+	/*jshint validthis:true */
+	var prop, index, length,
+		value, dataShow, toggle,
+		tween, hooks, oldfire,
+		anim = this,
+		style = elem.style,
+		orig = {},
+		handled = [],
+		hidden = elem.nodeType && isHidden( elem );
+
+	// handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always(function() {
+			// doing this makes sure that the complete handler will be called
+			// before this completes
+			anim.always(function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			});
+		});
+	}
+
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		if ( jQuery.css( elem, "display" ) === "inline" &&
+				jQuery.css( elem, "float" ) === "none" ) {
+
+			// inline-level elements accept inline-block;
+			// block-level elements need to be inline with layout
+			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
+				style.display = "inline-block";
+
+			} else {
+				style.zoom = 1;
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		if ( !jQuery.support.shrinkWrapBlocks ) {
+			anim.always(function() {
+				style.overflow = opts.overflow[ 0 ];
+				style.overflowX = opts.overflow[ 1 ];
+				style.overflowY = opts.overflow[ 2 ];
+			});
+		}
+	}
+
+
+	// show/hide pass
+	for ( index in props ) {
+		value = props[ index ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ index ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+				continue;
+			}
+			handled.push( index );
+		}
+	}
+
+	length = handled.length;
+	if ( length ) {
+		dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
+		if ( "hidden" in dataShow ) {
+			hidden = dataShow.hidden;
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done(function() {
+				jQuery( elem ).hide();
+			});
+		}
+		anim.done(function() {
+			var prop;
+			jQuery._removeData( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		});
+		for ( index = 0 ; index < length ; index++ ) {
+			prop = handled[ index ];
+			tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
+			orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
+				}
+			}
+		}
+	}
+}
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
 		this.elem = elem;
 		this.prop = prop;
+		this.easing = easing || "swing";
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
 
-		if ( !options.orig ) {
-			options.orig = {};
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
 		}
-	}
+		this.now = ( this.end - this.start ) * eased + this.start;
 
-});
-
-jQuery.fx.prototype = {
-	// Simple function for setting a style value
-	update: function() {
 		if ( this.options.step ) {
 			this.options.step.call( this.elem, this.now, this );
 		}
 
-		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-
-		// Set display property to block for height/width animations
-		if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
-			this.elem.style.display = "block";
-		}
-	},
-
-	// Get the current size
-	cur: function( force ) {
-		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
-			return this.elem[ this.prop ];
-		}
-
-		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
-		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
-	},
-
-	// Start an animation from one number to another
-	custom: function( from, to, unit ) {
-		this.startTime = now();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || "px";
-		this.now = this.start;
-		this.pos = this.state = 0;
-
-		var self = this;
-		function t( gotoEnd ) {
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			timerId = setInterval(jQuery.fx.tick, 13);
-		}
-	},
-
-	// Simple 'show' function
-	show: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
-
-		// Start by showing the element
-		jQuery( this.elem ).show();
-	},
-
-	// Simple 'hide' function
-	hide: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function( gotoEnd ) {
-		var t = now(), done = true;
-
-		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			this.options.curAnim[ this.prop ] = true;
-
-			for ( var i in this.options.curAnim ) {
-				if ( this.options.curAnim[i] !== true ) {
-					done = false;
-				}
-			}
-
-			if ( done ) {
-				if ( this.options.display != null ) {
-					// Reset the overflow
-					this.elem.style.overflow = this.options.overflow;
-
-					// Reset the display
-					var old = jQuery.data(this.elem, "olddisplay");
-					this.elem.style.display = old ? old : this.options.display;
-
-					if ( jQuery.css(this.elem, "display") === "none" ) {
-						this.elem.style.display = "block";
-					}
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( this.options.hide ) {
-					jQuery(this.elem).hide();
-				}
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( this.options.hide || this.options.show ) {
-					for ( var p in this.options.curAnim ) {
-						jQuery.style(this.elem, p, this.options.orig[p]);
-					}
-				}
-
-				// Execute the complete function
-				this.options.complete.call( this.elem );
-			}
-
-			return false;
-
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
 		} else {
-			var n = t - this.startTime;
-			this.state = n / this.options.duration;
-
-			// Perform the easing function, defaults to swing
-			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
-			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
-			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
-			this.now = this.start + ((this.end - this.start) * this.pos);
-
-			// Perform the next step of the animation
-			this.update();
+			Tween.propHooks._default.set( this );
 		}
-
-		return true;
+		return this;
 	}
 };
 
-jQuery.extend( jQuery.fx, {
-	tick: function() {
-		var timers = jQuery.timers;
+Tween.prototype.init.prototype = Tween.prototype;
 
-		for ( var i = 0; i < timers.length; i++ ) {
-			if ( !timers[i]() ) {
-				timers.splice(i--, 1);
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			if ( tween.elem[ tween.prop ] != null &&
+				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+				return tween.elem[ tween.prop ];
 			}
-		}
 
-		if ( !timers.length ) {
-			jQuery.fx.stop();
-		}
-	},
-		
-	stop: function() {
-		clearInterval( timerId );
-		timerId = null;
-	},
-	
-	speeds: {
-		slow: 600,
- 		fast: 200,
- 		// Default speed
- 		_default: 400
-	},
-
-	step: {
-		opacity: function( fx ) {
-			jQuery.style(fx.elem, "opacity", fx.now);
+			// passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails
+			// so, simple values such as "10px" are parsed to Float.
+			// complex values such as "rotate(1rad)" are returned as is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
 		},
-
-		_default: function( fx ) {
-			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
+		set: function( tween ) {
+			// use step hook for back compat - use cssHook if its there - use .style if its
+			// available and use plain properties where available
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
 			} else {
-				fx.elem[ fx.prop ] = fx.now;
+				tween.elem[ tween.prop ] = tween.now;
 			}
 		}
 	}
+};
+
+// Remove in 2.0 - this supports IE8's panic based approach
+// to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
 });
 
+jQuery.fn.extend({
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// animate to the value specified
+			.end().animate({ opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+				doAnimation.finish = function() {
+					anim.stop( true );
+				};
+				// Empty animations, or finishing resolves immediately
+				if ( empty || jQuery._data( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each(function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each(function() {
+			var index,
+				data = jQuery._data( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// enable finishing flag on private data
+			data.finish = true;
+
+			// empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.cur && hooks.cur.finish ) {
+				hooks.cur.finish.call( this );
+			}
+
+			// look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// turn off finishing flag
+			delete data.finish;
+		});
+	}
+});
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		attrs = { height: type },
+		i = 0;
+
+	// if we include width, step value is 1 to do all cssExpand values,
+	// if we don't include width, step value is 2 to skip over Left and Right
+	includeWidth = includeWidth? 1 : 0;
+	for( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show"),
+	slideUp: genFx("hide"),
+	slideToggle: genFx("toggle"),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p*Math.PI ) / 2;
+	}
+};
+
+jQuery.timers = [];
+jQuery.fx = Tween.prototype.init;
+jQuery.fx.tick = function() {
+	var timer,
+		timers = jQuery.timers,
+		i = 0;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	if ( timer() && jQuery.timers.push( timer ) ) {
+		jQuery.fx.start();
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+	// Default speed
+	_default: 400
+};
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
 if ( jQuery.expr && jQuery.expr.filters ) {
 	jQuery.expr.filters.animated = function( elem ) {
 		return jQuery.grep(jQuery.timers, function( fn ) {
@@ -5911,174 +9361,81 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 		}).length;
 	};
 }
-
-function genFx( type, num ) {
-	var obj = {};
-
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
-		obj[ this ] = type;
-	});
-
-	return obj;
-}
-if ( "getBoundingClientRect" in document.documentElement ) {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) { 
-			return this.each(function( i ) {
+jQuery.fn.offset = function( options ) {
+	if ( arguments.length ) {
+		return options === undefined ?
+			this :
+			this.each(function( i ) {
 				jQuery.offset.setOffset( this, options, i );
 			});
-		}
+	}
 
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
+	var docElem, win,
+		box = { top: 0, left: 0 },
+		elem = this[ 0 ],
+		doc = elem && elem.ownerDocument;
 
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
+	if ( !doc ) {
+		return;
+	}
 
-		var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
-			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
-			left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+	docElem = doc.documentElement;
 
-		return { top: top, left: left };
+	// Make sure it's not a disconnected DOM node
+	if ( !jQuery.contains( docElem, elem ) ) {
+		return box;
+	}
+
+	// If we don't have gBCR, just use 0,0 rather than error
+	// BlackBerry 5, iOS 3 (original iPhone)
+	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
+		box = elem.getBoundingClientRect();
+	}
+	win = getWindow( doc );
+	return {
+		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
+		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
 	};
-
-} else {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) { 
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		jQuery.offset.initialize();
-
-		var offsetParent = elem.offsetParent, prevOffsetParent = elem,
-			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
-			body = doc.body, defaultView = doc.defaultView,
-			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop, left = elem.offsetLeft;
-
-		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-				break;
-			}
-
-			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
-			top  -= elem.scrollTop;
-			left -= elem.scrollLeft;
-
-			if ( elem === offsetParent ) {
-				top  += elem.offsetTop;
-				left += elem.offsetLeft;
-
-				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-				}
-
-				prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
-			}
-
-			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-			}
-
-			prevComputedStyle = computedStyle;
-		}
-
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
-			top  += body.offsetTop;
-			left += body.offsetLeft;
-		}
-
-		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-			top  += Math.max( docElem.scrollTop, body.scrollTop );
-			left += Math.max( docElem.scrollLeft, body.scrollLeft );
-		}
-
-		return { top: top, left: left };
-	};
-}
+};
 
 jQuery.offset = {
-	initialize: function() {
-		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0,
-			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
 
-		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
-
-		container.innerHTML = html;
-		body.insertBefore( container, body.firstChild );
-		innerDiv = container.firstChild;
-		checkDiv = innerDiv.firstChild;
-		td = innerDiv.nextSibling.firstChild.firstChild;
-
-		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
-		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
-
-		checkDiv.style.position = "fixed", checkDiv.style.top = "20px";
-		// safari subtracts parent border width here which is 5px
-		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
-		checkDiv.style.position = checkDiv.style.top = "";
-
-		innerDiv.style.overflow = "hidden", innerDiv.style.position = "relative";
-		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
-
-		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
-
-		body.removeChild( container );
-		body = container = innerDiv = checkDiv = table = td = null;
-		jQuery.offset.initialize = jQuery.noop;
-	},
-
-	bodyOffset: function( body ) {
-		var top = body.offsetTop, left = body.offsetLeft;
-
-		jQuery.offset.initialize();
-
-		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.curCSS(body, "marginTop",  true) ) || 0;
-			left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0;
-		}
-
-		return { top: top, left: left };
-	},
-	
 	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
 		// set position first, in-case top/left are set even on static elem
-		if ( /static/.test( jQuery.curCSS( elem, "position" ) ) ) {
+		if ( position === "static" ) {
 			elem.style.position = "relative";
 		}
-		var curElem   = jQuery( elem ),
+
+		var curElem = jQuery( elem ),
 			curOffset = curElem.offset(),
-			curTop    = parseInt( jQuery.curCSS( elem, "top",  true ), 10 ) || 0,
-			curLeft   = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0;
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
 
 		if ( jQuery.isFunction( options ) ) {
 			options = options.call( elem, i, curOffset );
 		}
 
-		var props = {
-			top:  (options.top  - curOffset.top)  + curTop,
-			left: (options.left - curOffset.left) + curLeft
-		};
-		
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
 		if ( "using" in options ) {
 			options.using.call( elem, props );
 		} else {
@@ -6089,152 +9446,152 @@ jQuery.offset = {
 
 
 jQuery.fn.extend({
+
 	position: function() {
-		if ( !this[0] ) {
-			return null;
+		if ( !this[ 0 ] ) {
+			return;
 		}
 
-		var elem = this[0],
+		var offsetParent, offset,
+			parentOffset = { top: 0, left: 0 },
+			elem = this[ 0 ];
 
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
+		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
+		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+			// we assume that getBoundingClientRect is available when computed position is fixed
+			offset = elem.getBoundingClientRect();
+		} else {
+			// Get *real* offsetParent
+			offsetParent = this.offsetParent();
 
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+			// Get correct offsets
+			offset = this.offset();
+			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+				parentOffset = offsetParent.offset();
+			}
 
-		// Subtract element margins
+			// Add offsetParent borders
+			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+		}
+
+		// Subtract parent offsets and element margins
 		// note: when an element has margin: auto the offsetLeft and marginLeft
 		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.curCSS(elem, "marginTop",  true) ) || 0;
-		offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0;
-
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth",  true) ) || 0;
-		parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0;
-
-		// Subtract the two offsets
 		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
+			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
 		};
 	},
 
 	offsetParent: function() {
 		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+			var offsetParent = this.offsetParent || document.documentElement;
+			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
 				offsetParent = offsetParent.offsetParent;
 			}
-			return offsetParent;
+			return offsetParent || document.documentElement;
 		});
 	}
 });
 
 
 // Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
-	var method = "scroll" + name;
+jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+	var top = /Y/.test( prop );
 
-	jQuery.fn[ method ] = function(val) {
-		var elem = this[0], win;
-		
-		if ( !elem ) {
-			return null;
-		}
+	jQuery.fn[ method ] = function( val ) {
+		return jQuery.access( this, function( elem, method, val ) {
+			var win = getWindow( elem );
 
-		if ( val !== undefined ) {
-			// Set the scroll offset
-			return this.each(function() {
-				win = getWindow( this );
+			if ( val === undefined ) {
+				return win ? (prop in win) ? win[ prop ] :
+					win.document.documentElement[ method ] :
+					elem[ method ];
+			}
 
-				if ( win ) {
-					win.scrollTo(
-						!i ? val : jQuery(win).scrollLeft(),
-						 i ? val : jQuery(win).scrollTop()
-					);
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : jQuery( win ).scrollLeft(),
+					top ? val : jQuery( win ).scrollTop()
+				);
 
-				} else {
-					this[ method ] = val;
-				}
-			});
-		} else {
-			win = getWindow( elem );
-
-			// Return the scroll offset
-			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
-				jQuery.support.boxModel && win.document.documentElement[ method ] ||
-					win.document.body[ method ] :
-				elem[ method ];
-		}
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length, null );
 	};
 });
 
 function getWindow( elem ) {
-	return ("scrollTo" in elem && elem.document) ?
+	return jQuery.isWindow( elem ) ?
 		elem :
 		elem.nodeType === 9 ?
 			elem.defaultView || elem.parentWindow :
 			false;
 }
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+		// margin is only for outerHeight, outerWidth
+		jQuery.fn[ funcName ] = function( margin, value ) {
+			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
 
-	var type = name.toLowerCase();
+			return jQuery.access( this, function( elem, type, value ) {
+				var doc;
 
-	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function() {
-		return this[0] ?
-			jQuery.css( this[0], type, false, "padding" ) :
-			null;
-	};
+				if ( jQuery.isWindow( elem ) ) {
+					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+					// isn't a whole lot we can do. See pull request at this URL for discussion:
+					// https://github.com/jquery/jquery/pull/764
+					return elem.document.documentElement[ "client" + name ];
+				}
 
-	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function( margin ) {
-		return this[0] ?
-			jQuery.css( this[0], type, false, margin ? "margin" : "border" ) :
-			null;
-	};
+				// Get document width or height
+				if ( elem.nodeType === 9 ) {
+					doc = elem.documentElement;
 
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		var elem = this[0];
-		if ( !elem ) {
-			return size == null ? null : this;
-		}
-		
-		if ( jQuery.isFunction( size ) ) {
-			return this.each(function( i ) {
-				var self = jQuery( this );
-				self[ type ]( size.call( this, i, self[ type ]() ) );
-			});
-		}
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+					return Math.max(
+						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+						elem.body[ "offset" + name ], doc[ "offset" + name ],
+						doc[ "client" + name ]
+					);
+				}
 
-		return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window?
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
-			elem.document.body[ "client" + name ] :
-
-			// Get document width or height
-			(elem.nodeType === 9) ? // is it a document
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					elem.documentElement["client" + name],
-					elem.body["scroll" + name], elem.documentElement["scroll" + name],
-					elem.body["offset" + name], elem.documentElement["offset" + name]
-				) :
-
-				// Get or set width or height on the element
-				size === undefined ?
-					// Get width or height on the element
-					jQuery.css( elem, type ) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, typeof size === "string" ? size : size + "px" );
-	};
+				return value === undefined ?
+					// Get width or height on the element, requesting but not forcing parseFloat
+					jQuery.css( elem, type, extra ) :
 
+					// Set width or height on the element
+					jQuery.style( elem, type, value, extra );
+			}, type, chainable ? margin : undefined, chainable, null );
+		};
+	});
 });
+// Limit scope pollution from any deprecated API
+// (function() {
+
+// })();
 // Expose jQuery to the global object
 window.jQuery = window.$ = jQuery;
 
-})(window);
+// Expose jQuery as an AMD module, but only for AMD loaders that
+// understand the issues with loading multiple versions of jQuery
+// in a page that all might call define(). The loader will indicate
+// they have special allowances for multiple jQuery versions by
+// specifying define.amd.jQuery = true. Register as a named module,
+// since jQuery can be concatenated with other files that may use define,
+// but not use a proper concatenation script that understands anonymous
+// AMD modules. A named AMD is safest and most robust way to register.
+// Lowercase jquery is used because AMD module names are derived from
+// file names, and jQuery is normally delivered in a lowercase file name.
+// Do this after creating the global so that if an AMD module wants to call
+// noConflict to hide this version of jQuery, it will work.
+if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+	define( "jquery", [], function () { return jQuery; } );
+}
+
+})( window );
diff --git a/django/contrib/admin/static/admin/js/jquery.min.js b/django/contrib/admin/static/admin/js/jquery.min.js
index 7c24308023..006e953102 100644
--- a/django/contrib/admin/static/admin/js/jquery.min.js
+++ b/django/contrib/admin/static/admin/js/jquery.min.js
@@ -1,154 +1,5 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
-e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
-j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
-"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
-true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
-c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
-L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
-"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
-a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
-d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
-a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
-!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
-true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
-parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
-s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
-applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
-else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
-a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
-w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
-cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
-i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
-" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
-this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
-e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
-c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
-a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
-function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
-k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
-C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
-null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
-e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
-f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
-if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
-"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
-a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
-isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
-{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
-if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
-e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
-"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
-d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
-!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
-toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
-u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
-function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
-if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
-t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
-g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
-for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
-1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
-relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
-l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
-h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
-CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
-g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
-text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
-setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
-h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
-m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
-"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
-h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
-!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
-h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
-q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
-if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
-(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
-function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
-gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
-c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
-{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
-"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
-d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
-a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
-1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
-a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
-""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
-this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
-u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
-1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
-return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
-""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
-c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
-c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
-function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
-Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
-"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
-a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
-a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
-"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
-serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
-function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
-global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
-e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
-"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
-false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
-false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
-c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
-d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
-g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
-1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
-"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
-if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
-this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
-"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
-animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
-j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
-this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
-"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
-c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
-this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
-this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
-e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
-c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
-function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
-this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
-k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
-f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
-c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
-d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
-"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
-e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
+/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
+return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
+}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
\ No newline at end of file
diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html
index 83a9c48ee1..9d1b917b61 100644
--- a/django/contrib/admin/templates/admin/auth/user/change_password.html
+++ b/django/contrib/admin/templates/admin/auth/user/change_password.html
@@ -19,7 +19,7 @@
 {% endblock %}
 {% endif %}
 {% block content %}<div id="content-main">
-<form action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
+<form action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
 <div>
 {% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
 {% if form.errors %}
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html
index 7bbd73a464..63d4419fae 100644
--- a/django/contrib/admin/templates/admin/base.html
+++ b/django/contrib/admin/templates/admin/base.html
@@ -1,4 +1,4 @@
-{% load admin_static %}<!DOCTYPE html>
+{% load admin_static %}{% load firstof from future %}<!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>
 <title>{% block title %}{% endblock %}</title>
@@ -26,7 +26,7 @@
         {% if user.is_active and user.is_staff %}
         <div id="user-tools">
             {% trans 'Welcome,' %}
-            <strong>{% filter force_escape %}{% firstof user.get_short_name user.get_username %}{% endfilter %}</strong>.
+            <strong>{% firstof user.get_short_name user.get_username %}</strong>.
             {% block userlinks %}
                 {% url 'django-admindocs-docroot' as docsroot %}
                 {% if docsroot %}
@@ -53,7 +53,7 @@
     {% block messages %}
         {% if messages %}
         <ul class="messagelist">{% for message in messages %}
-          <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+          <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message|capfirst }}</li>
         {% endfor %}</ul>
         {% endif %}
     {% endblock messages %}
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html
index 48846960b3..daf37753dc 100644
--- a/django/contrib/admin/templates/admin/change_form.html
+++ b/django/contrib/admin/templates/admin/change_form.html
@@ -35,7 +35,7 @@
   </ul>
 {% endif %}{% endif %}
 {% endblock %}
-<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
+<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
 <div>
 {% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
 {% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %}
diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html
index e3d4b2549a..636869895d 100644
--- a/django/contrib/admin/templates/admin/change_list_results.html
+++ b/django/contrib/admin/templates/admin/change_list_results.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n admin_static %}{% load cycle from future %}
 {% if result_hidden_fields %}
 <div class="hiddenfields">{# DIV for HTML validation #}
 {% for item in result_hidden_fields %}{{ item }}{% endfor %}
diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html
index 71a62ba71a..ca853bc989 100644
--- a/django/contrib/admin/templates/admin/edit_inline/tabular.html
+++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static admin_modify %}
+{% load i18n admin_static admin_modify %}{% load cycle from future %}
 <div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
   <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
 {{ inline_admin_formset.formset.management_form }}
diff --git a/django/contrib/admin/templates/registration/password_reset_done.html b/django/contrib/admin/templates/registration/password_reset_done.html
index 7584c8393a..98471041b5 100644
--- a/django/contrib/admin/templates/registration/password_reset_done.html
+++ b/django/contrib/admin/templates/registration/password_reset_done.html
@@ -14,6 +14,8 @@
 
 <h1>{% trans 'Password reset successful' %}</h1>
 
-<p>{% trans "We've emailed you instructions for setting your password to the email address you submitted. You should be receiving it shortly." %}</p>
+<p>{% trans "We've emailed you instructions for setting your password. You should be receiving them shortly." %}</p>
+
+<p>{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
 
 {% endblock %}
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index ce435dea81..18a45a006f 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -12,10 +12,9 @@ from django.db import models
 from django.utils import formats
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from django.utils import six
 from django.utils.text import capfirst
 from django.utils.translation import ugettext as _
-from django.utils.encoding import smart_text, force_text
+from django.utils.encoding import force_text
 from django.template import Library
 from django.template.loader import get_template
 from django.template.context import Context
@@ -112,12 +111,13 @@ def result_headers(cl):
                 # Not sortable
                 yield {
                     "text": text,
+                    "class_attrib": format_html(' class="column-{0}"', field_name),
                     "sortable": False,
                 }
                 continue
 
         # OK, it is sortable if we got this far
-        th_classes = ['sortable']
+        th_classes = ['sortable', 'column-{0}'.format(field_name)]
         order_type = ''
         new_order_type = 'asc'
         sort_priority = 0
@@ -292,6 +292,8 @@ def date_hierarchy(cl):
     """
     if cl.date_hierarchy:
         field_name = cl.date_hierarchy
+        field = cl.opts.get_field_by_name(field_name)[0]
+        dates_or_datetimes = 'datetimes' if isinstance(field, models.DateTimeField) else 'dates'
         year_field = '%s__year' % field_name
         month_field = '%s__month' % field_name
         day_field = '%s__day' % field_name
@@ -304,8 +306,8 @@ def date_hierarchy(cl):
 
         if not (year_lookup or month_lookup or day_lookup):
             # select appropriate start level
-            date_range = cl.query_set.aggregate(first=models.Min(field_name),
-                                                last=models.Max(field_name))
+            date_range = cl.queryset.aggregate(first=models.Min(field_name),
+                                               last=models.Max(field_name))
             if date_range['first'] and date_range['last']:
                 if date_range['first'].year == date_range['last'].year:
                     year_lookup = date_range['first'].year
@@ -323,7 +325,8 @@ def date_hierarchy(cl):
                 'choices': [{'title': capfirst(formats.date_format(day, 'MONTH_DAY_FORMAT'))}]
             }
         elif year_lookup and month_lookup:
-            days = cl.query_set.filter(**{year_field: year_lookup, month_field: month_lookup}).dates(field_name, 'day')
+            days = cl.queryset.filter(**{year_field: year_lookup, month_field: month_lookup})
+            days = getattr(days, dates_or_datetimes)(field_name, 'day')
             return {
                 'show': True,
                 'back': {
@@ -336,11 +339,12 @@ def date_hierarchy(cl):
                 } for day in days]
             }
         elif year_lookup:
-            months = cl.query_set.filter(**{year_field: year_lookup}).dates(field_name, 'month')
+            months = cl.queryset.filter(**{year_field: year_lookup})
+            months = getattr(months, dates_or_datetimes)(field_name, 'month')
             return {
-                'show' : True,
+                'show': True,
                 'back': {
-                    'link' : link({}),
+                    'link': link({}),
                     'title': _('All dates')
                 },
                 'choices': [{
@@ -349,7 +353,7 @@ def date_hierarchy(cl):
                 } for month in months]
             }
         else:
-            years = cl.query_set.dates(field_name, 'year')
+            years = getattr(cl.queryset, dates_or_datetimes)(field_name, 'year')
             return {
                 'show': True,
                 'choices': [{
diff --git a/django/contrib/admin/templatetags/admin_urls.py b/django/contrib/admin/templatetags/admin_urls.py
index 90e81b0ef3..bca95d92ae 100644
--- a/django/contrib/admin/templatetags/admin_urls.py
+++ b/django/contrib/admin/templatetags/admin_urls.py
@@ -1,4 +1,3 @@
-from django.core.urlresolvers import reverse
 from django import template
 from django.contrib.admin.util import quote
 
@@ -6,7 +5,7 @@ register = template.Library()
 
 @register.filter
 def admin_urlname(value, arg):
-    return 'admin:%s_%s_%s' % (value.app_label, value.module_name, arg)
+    return 'admin:%s_%s_%s' % (value.app_label, value.model_name, arg)
 
 
 @register.filter
diff --git a/django/contrib/admin/templatetags/log.py b/django/contrib/admin/templatetags/log.py
index 463e0792f0..f70ee2731d 100644
--- a/django/contrib/admin/templatetags/log.py
+++ b/django/contrib/admin/templatetags/log.py
@@ -16,8 +16,8 @@ class AdminLogNode(template.Node):
         else:
             user_id = self.user
             if not user_id.isdigit():
-                user_id = context[self.user].id
-            context[self.varname] = LogEntry.objects.filter(user__id__exact=user_id).select_related('content_type', 'user')[:int(self.limit)]
+                user_id = context[self.user].pk
+            context[self.varname] = LogEntry.objects.filter(user__pk__exact=user_id).select_related('content_type', 'user')[:int(self.limit)]
         return ''
 
 @register.tag
diff --git a/django/contrib/admin/tests.py b/django/contrib/admin/tests.py
index 7c62c1a22f..badf45b580 100644
--- a/django/contrib/admin/tests.py
+++ b/django/contrib/admin/tests.py
@@ -1,5 +1,7 @@
+import os
+
 from django.test import LiveServerTestCase
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 from django.utils.unittest import SkipTest
 from django.utils.translation import ugettext as _
 
@@ -8,12 +10,10 @@ class AdminSeleniumWebDriverTestCase(LiveServerTestCase):
 
     @classmethod
     def setUpClass(cls):
+        if not os.environ.get('DJANGO_SELENIUM_TESTS', False):
+            raise SkipTest('Selenium tests not requested')
         try:
-            # Import and start the WebDriver class.
-            module, attr = cls.webdriver_class.rsplit('.', 1)
-            mod = import_module(module)
-            WebDriver = getattr(mod, attr)
-            cls.selenium = WebDriver()
+            cls.selenium = import_by_path(cls.webdriver_class)()
         except Exception as e:
             raise SkipTest('Selenium webdriver "%s" not installed or not '
                            'operational: %s' % (cls.webdriver_class, str(e)))
@@ -45,6 +45,20 @@ class AdminSeleniumWebDriverTestCase(LiveServerTestCase):
             timeout
         )
 
+    def wait_page_loaded(self):
+        """
+        Block until page has started to load.
+        """
+        from selenium.common.exceptions import TimeoutException
+        try:
+            # Wait for the next page to be loaded
+            self.wait_loaded_tag('body')
+        except TimeoutException:
+            # IE7 occasionnally returns an error "Internet Explorer cannot
+            # display the webpage" and doesn't load the next page. We just
+            # ignore it.
+            pass
+
     def admin_login(self, username, password, login_url='/admin/'):
         """
         Helper function to log into the admin.
@@ -57,8 +71,7 @@ class AdminSeleniumWebDriverTestCase(LiveServerTestCase):
         login_text = _('Log in')
         self.selenium.find_element_by_xpath(
             '//input[@value="%s"]' % login_text).click()
-        # Wait for the next page to be loaded.
-        self.wait_loaded_tag('body')
+        self.wait_page_loaded()
 
     def get_css_value(self, selector, attribute):
         """
diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
index a85045c515..97858e688e 100644
--- a/django/contrib/admin/util.py
+++ b/django/contrib/admin/util.py
@@ -88,8 +88,7 @@ def flatten_fieldsets(fieldsets):
     field_names = []
     for name, opts in fieldsets:
         for field in opts['fields']:
-            # type checking feels dirty, but it seems like the best way here
-            if type(field) == tuple:
+            if isinstance(field, (list, tuple)):
                 field_names.extend(field)
             else:
                 field_names.append(field)
@@ -117,7 +116,7 @@ def get_deleted_objects(objs, opts, user, admin_site, using):
             admin_url = reverse('%s:%s_%s_change'
                                 % (admin_site.name,
                                    opts.app_label,
-                                   opts.object_name.lower()),
+                                   opts.model_name),
                                 None, (quote(obj._get_pk_val()),))
             p = '%s.%s' % (opts.app_label,
                            opts.get_delete_permission())
@@ -155,6 +154,9 @@ class NestedObjects(Collector):
             if source_attr:
                 self.add_edge(getattr(obj, source_attr), obj)
             else:
+                if obj._meta.proxy:
+                    # Take concrete model's instance to avoid mismatch in edges
+                    obj = obj._meta.concrete_model(pk=obj.pk)
                 self.add_edge(None, obj)
         try:
             return super(NestedObjects, self).collect(objs, source_attr=source_attr, **kwargs)
diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py
index 733f89d06f..a02bb7a316 100644
--- a/django/contrib/admin/validation.py
+++ b/django/contrib/admin/validation.py
@@ -6,7 +6,7 @@ from django.forms.models import (BaseModelForm, BaseModelFormSet, fields_for_mod
 from django.contrib.admin import ListFilter, FieldListFilter
 from django.contrib.admin.util import get_fields_from_path, NotRelationField
 from django.contrib.admin.options import (flatten_fieldsets, BaseModelAdmin,
-    HORIZONTAL, VERTICAL)
+    ModelAdmin, HORIZONTAL, VERTICAL)
 
 
 __all__ = ['validate']
@@ -388,12 +388,14 @@ def check_formfield(cls, model, opts, label, field):
             raise ImproperlyConfigured("'%s.%s' refers to field '%s' that "
                 "is missing from the form." % (cls.__name__, label, field))
     else:
-        fields = fields_for_model(model)
-        try:
-            fields[field]
-        except KeyError:
-            raise ImproperlyConfigured("'%s.%s' refers to field '%s' that "
-                "is missing from the form." % (cls.__name__, label, field))
+        get_form_is_overridden = hasattr(cls, 'get_form') and cls.get_form != ModelAdmin.get_form
+        if not get_form_is_overridden:
+            fields = fields_for_model(model)
+            try:
+                fields[field]
+            except KeyError:
+                raise ImproperlyConfigured("'%s.%s' refers to field '%s' that "
+                    "is missing from the form." % (cls.__name__, label, field))
 
 def fetch_attr(cls, model, opts, label, field):
     try:
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index 5033ba98bc..050d4776d0 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -1,4 +1,6 @@
 import operator
+import sys
+import warnings
 from functools import reduce
 
 from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
@@ -6,7 +8,9 @@ from django.core.paginator import InvalidPage
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models.fields import FieldDoesNotExist
+from django.utils import six
 from django.utils.datastructures import SortedDict
+from django.utils.deprecation import RenameMethodsBase
 from django.utils.encoding import force_str, force_text
 from django.utils.translation import ugettext, ugettext_lazy
 from django.utils.http import urlencode
@@ -33,14 +37,20 @@ IGNORED_PARAMS = (
 EMPTY_CHANGELIST_VALUE = ugettext_lazy('(None)')
 
 
-class ChangeList(object):
+class RenameChangeListMethods(RenameMethodsBase):
+    renamed_methods = (
+        ('get_query_set', 'get_queryset', PendingDeprecationWarning),
+    )
+
+
+class ChangeList(six.with_metaclass(RenameChangeListMethods)):
     def __init__(self, request, model, list_display, list_display_links,
             list_filter, date_hierarchy, search_fields, list_select_related,
             list_per_page, list_max_show_all, list_editable, model_admin):
         self.model = model
         self.opts = model._meta
         self.lookup_opts = self.opts
-        self.root_query_set = model_admin.queryset(request)
+        self.root_queryset = model_admin.get_queryset(request)
         self.list_display = list_display
         self.list_display_links = list_display_links
         self.list_filter = list_filter
@@ -70,7 +80,7 @@ class ChangeList(object):
         else:
             self.list_editable = list_editable
         self.query = request.GET.get(SEARCH_VAR, '')
-        self.query_set = self.get_query_set(request)
+        self.queryset = self.get_queryset(request)
         self.get_results(request)
         if self.is_popup:
             title = ugettext('Select %s')
@@ -79,15 +89,37 @@ class ChangeList(object):
         self.title = title % force_text(self.opts.verbose_name)
         self.pk_attname = self.lookup_opts.pk.attname
 
-    def get_filters(self, request):
-        lookup_params = self.params.copy() # a dictionary of the query string
-        use_distinct = False
+    @property
+    def root_query_set(self):
+        warnings.warn("`ChangeList.root_query_set` is deprecated, "
+                      "use `root_queryset` instead.",
+                      PendingDeprecationWarning, 2)
+        return self.root_queryset
 
+    @property
+    def query_set(self):
+        warnings.warn("`ChangeList.query_set` is deprecated, "
+                      "use `queryset` instead.",
+                      PendingDeprecationWarning, 2)
+        return self.queryset
+
+    def get_filters_params(self, params=None):
+        """
+        Returns all params except IGNORED_PARAMS
+        """
+        if not params:
+            params = self.params
+        lookup_params = params.copy() # a dictionary of the query string
         # Remove all the parameters that are globally and systematically
         # ignored.
         for ignored in IGNORED_PARAMS:
             if ignored in lookup_params:
                 del lookup_params[ignored]
+        return lookup_params
+
+    def get_filters(self, request):
+        lookup_params = self.get_filters_params()
+        use_distinct = False
 
         # Normalize the types of keys
         for key, value in lookup_params.items():
@@ -142,7 +174,7 @@ class ChangeList(object):
                                 lookup_needs_distinct(self.lookup_opts, key))
             return filter_specs, bool(filter_specs), lookup_params, use_distinct
         except FieldDoesNotExist as e:
-            raise IncorrectLookupParameters(e)
+            six.reraise(IncorrectLookupParameters, IncorrectLookupParameters(e), sys.exc_info()[2])
 
     def get_query_string(self, new_params=None, remove=None):
         if new_params is None: new_params = {}
@@ -158,28 +190,27 @@ class ChangeList(object):
                     del p[k]
             else:
                 p[k] = v
-        return '?%s' % urlencode(p)
+        return '?%s' % urlencode(sorted(p.items()))
 
     def get_results(self, request):
-        paginator = self.model_admin.get_paginator(request, self.query_set, self.list_per_page)
+        paginator = self.model_admin.get_paginator(request, self.queryset, self.list_per_page)
         # Get the number of objects, with admin filters applied.
         result_count = paginator.count
 
         # Get the total number of objects, with no admin filters applied.
-        # Perform a slight optimization: Check to see whether any filters were
-        # given. If not, use paginator.hits to calculate the number of objects,
-        # because we've already done paginator.hits and the value is cached.
-        if not self.query_set.query.where:
-            full_result_count = result_count
+        # Perform a slight optimization:
+        # full_result_count is equal to paginator.count if no filters
+        # were applied
+        if self.get_filters_params():
+            full_result_count = self.root_queryset.count()
         else:
-            full_result_count = self.root_query_set.count()
-
+            full_result_count = result_count
         can_show_all = result_count <= self.list_max_show_all
         multi_page = result_count > self.list_per_page
 
         # Get the list of objects to display on this page.
         if (self.show_all and can_show_all) or not multi_page:
-            result_list = self.query_set._clone()
+            result_list = self.queryset._clone()
         else:
             try:
                 result_list = paginator.page(self.page_num+1).object_list
@@ -297,13 +328,13 @@ class ChangeList(object):
                 ordering_fields[idx] = 'desc' if pfx == '-' else 'asc'
         return ordering_fields
 
-    def get_query_set(self, request):
+    def get_queryset(self, request):
         # First, we collect all the declared list filters.
         (self.filter_specs, self.has_filters, remaining_lookup_params,
          use_distinct) = self.get_filters(request)
 
         # Then, we let every list filter modify the queryset to its liking.
-        qs = self.root_query_set
+        qs = self.root_queryset
         for filter_spec in self.filter_specs:
             new_qs = filter_spec.queryset(request, qs)
             if new_qs is not None:
@@ -379,6 +410,6 @@ class ChangeList(object):
     def url_for_result(self, result):
         pk = getattr(result, self.pk_attname)
         return reverse('admin:%s_%s_change' % (self.opts.app_label,
-                                               self.opts.module_name),
+                                               self.opts.model_name),
                        args=(quote(pk),),
                        current_app=self.model_admin.admin_site.name)
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index 1e6277fb87..4b79401dbc 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -147,7 +147,7 @@ class ForeignKeyRawIdWidget(forms.TextInput):
             # The related object is registered with the same AdminSite
             related_url = reverse('admin:%s_%s_changelist' %
                                     (rel_to._meta.app_label,
-                                    rel_to._meta.module_name),
+                                    rel_to._meta.model_name),
                                     current_app=self.admin_site.name)
 
             params = self.url_parameters()
@@ -213,17 +213,6 @@ class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
         if value:
             return value.split(',')
 
-    def _has_changed(self, initial, data):
-        if initial is None:
-            initial = []
-        if data is None:
-            data = []
-        if len(initial) != len(data):
-            return True
-        for pk1, pk2 in zip(initial, data):
-            if force_text(pk1) != force_text(pk2):
-                return True
-        return False
 
 class RelatedFieldWidgetWrapper(forms.Widget):
     """
@@ -258,7 +247,7 @@ class RelatedFieldWidgetWrapper(forms.Widget):
 
     def render(self, name, value, *args, **kwargs):
         rel_to = self.rel.to
-        info = (rel_to._meta.app_label, rel_to._meta.object_name.lower())
+        info = (rel_to._meta.app_label, rel_to._meta.model_name)
         self.widget.choices = self.choices
         output = [self.widget.render(name, value, *args, **kwargs)]
         if self.can_add_related:
@@ -279,9 +268,6 @@ class RelatedFieldWidgetWrapper(forms.Widget):
     def value_from_datadict(self, data, files, name):
         return self.widget.value_from_datadict(data, files, name)
 
-    def _has_changed(self, initial, data):
-        return self.widget._has_changed(initial, data)
-
     def id_for_label(self, id_):
         return self.widget.id_for_label(id_)
 
diff --git a/django/contrib/admindocs/locale/af/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/af/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..e387d5db1a
Binary files /dev/null and b/django/contrib/admindocs/locale/af/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/af/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/af/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..d70e3bdf86
--- /dev/null
+++ b/django/contrib/admindocs/locale/af/LC_MESSAGES/django.po
@@ -0,0 +1,184 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2011-01-19 15:09+0000\n"
+"Last-Translator: Django team\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"
+
+#: views.py:58 views.py:60 views.py:62
+msgid "tag:"
+msgstr ""
+
+#: views.py:93 views.py:95 views.py:97
+msgid "filter:"
+msgstr ""
+
+#: views.py:156 views.py:158 views.py:160
+msgid "view:"
+msgstr ""
+
+#: views.py:188
+#, python-format
+msgid "App %r not found"
+msgstr ""
+
+#: views.py:195
+#, python-format
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr ""
+
+#: views.py:207
+#, python-format
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr ""
+
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
+msgid "model:"
+msgstr ""
+
+#: views.py:222 views.py:254
+#, python-format
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr ""
+
+#: views.py:226 views.py:259
+#, python-format
+msgid "all %s"
+msgstr ""
+
+#: views.py:231 views.py:264
+#, python-format
+msgid "number of %s"
+msgstr ""
+
+#: views.py:269
+#, python-format
+msgid "Fields on %s objects"
+msgstr ""
+
+#: views.py:361
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Tuisblad"
+
+#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
+#: templates/admin_doc/missing_docutils.html:7
+#: templates/admin_doc/model_detail.html:15
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: templates/admin_doc/template_tag_index.html:8
+#: templates/admin_doc/view_detail.html:7
+#: templates/admin_doc/view_index.html:8
+msgid "Documentation"
+msgstr "Dokumentasie"
+
+#: templates/admin_doc/bookmarklets.html:8
+msgid "Bookmarklets"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:11
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:15
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:25
+msgid "Documentation for this page"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:26
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:29
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:32
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:35
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+msgid "Models"
+msgstr ""
+
+#: templates/admin_doc/template_detail.html:8
+msgid "Templates"
+msgstr ""
+
+#: templates/admin_doc/template_filter_index.html:9
+msgid "Filters"
+msgstr ""
+
+#: templates/admin_doc/template_tag_index.html:9
+msgid "Tags"
+msgstr ""
+
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
+msgid "Views"
+msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boole (Eder waar of vals)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Veld van type: %(field_type)s "
diff --git a/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo
index 3e0b6fd26d..20cbe56865 100644
Binary files a/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po
index 591b407905..aac9d0ecda 100644
--- a/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po
@@ -2,79 +2,92 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Ossama Khayat <okhayat@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Arabic (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-11-27 17:00+0000\n"
+"Last-Translator: Ossama Khayat <okhayat@gmail.com>\n"
+"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"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "وسم:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "مرشّح"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "عرض:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "التطبيق %r غير موجود"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "النموذج %(model_name)r غير موجود في التطبيق %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "العنصر `%(app_label)s.%(data_type)s` المرتبط"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "نموذج:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "عناصر `%(app_label)s.%(object_name)s` مرتبطة"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "كل %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "عدد %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "الحقول في عناصر %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "يبدو أن %s ليس عنصر urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "الرئيسية"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +97,18 @@ msgstr "يبدو أن %s ليس عنصر urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "الرئيسية"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "الوثائق"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "أوامر المفضلة"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "أوامر مفضلة الوثائق"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,60 +127,69 @@ msgstr ""
 "(تحدث إلى مسؤول النظم إذا لم تكن متأكدا ما إذا كان كمبيوتر يعتبر \"داخليا\")."
 "</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "الوثائق لهذه الصفحة"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "ينتقل بك من أي صفحة إلى وثائق العرض الذي أنشأ هذه الصفحة."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "أظهر معرف الكائن"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "عرض نوع البيانات والمعرف الفريد للصفحات التي تمثل كائناً واحداً."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "عدّل هذا العنصر (النافذة الحالية)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "ينتقل بك إلى صفحة الإدارة للصفحات التي تمثل عنصراً واحداً."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "عدّل هذا العنصر (نافذة جديدة)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "كما سبق، لكن يفتح صفحة الإدارة في نافذة جديدة."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "النماذج"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "القوالب"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "الفلاتر"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "الوسوم"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "ثنائي (إما True أو False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "حقل نوع: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo
index c1912f486f..14af1b6300 100644
Binary files a/django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/az/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/az/LC_MESSAGES/django.po
index 1ea6a41dad..b8679a6f00 100644
--- a/django/contrib/admindocs/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/az/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "teq:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "süzgəc:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "baxış:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r adlı tətbiqetməni tapa bilmədik"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "%(model_name)r modelini %(app_label)r tətbiqetməsində tapa bilmədik"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "bağlı \"%(app_label)s.%(data_type)s\" obyekti"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "bağlı \"%(app_label)s.%(object_name)s\" obyektləri"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "bütün %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s-in sayı"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s obyektlərindəki sahələr"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s urlpattern obyekti deyil"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Ev"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s urlpattern obyekti deyil"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Ev"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Sənədləşmə"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Əlfəcinciklər (Bookmarklets)"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Sənədləşmə əlfəcincikləri (bookmarklets)"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -127,21 +127,21 @@ msgstr ""
 "tələb edir. (kompüterinizin \"daxili\" olmasından əmin deyilsinizsə,\n"
 "sistem administratoru ilə danışın).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Bu səhifənin sənədləşməsi"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "Hər hansı səhifəni əmələ gətirən funksiyanın sənədləşməsini göstərir."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Obyekt ID göstər"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -149,41 +149,50 @@ msgstr ""
 "Tək obyekt kimi özünü aparan səhifələrin məzmun tipini və xüsusi ID-ni "
 "göstərir."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Bu obyekti redaktə et (cari pəncərədə)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Özünü tək obyekt kimi aparan səhifənin admin üçün redaktə səhifəsinə aparır"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Bu obyekti redaktə et (yeni pəncərədə)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Yuxarıdakı kimi, ancaq admin səhifəsini yeni pəncərədə açır."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Bul (ya Doğru, ya Yalan)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Sahənin tipi: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/be/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..2942392568
Binary files /dev/null and b/django/contrib/admindocs/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/be/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..421175c414
--- /dev/null
+++ b/django/contrib/admindocs/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,195 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: views.py:58 views.py:60 views.py:62
+msgid "tag:"
+msgstr "цэтлік:"
+
+#: views.py:93 views.py:95 views.py:97
+msgid "filter:"
+msgstr "сіта:"
+
+#: views.py:156 views.py:158 views.py:160
+msgid "view:"
+msgstr "прагляд:"
+
+#: views.py:188
+#, python-format
+msgid "App %r not found"
+msgstr "Праґраму «%r» не знайшлі"
+
+#: views.py:195
+#, python-format
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "Мадэль %(model_name)r у праґраме «%(app_label)r» не знайшлі"
+
+#: views.py:207
+#, python-format
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "залежны аб’ект «%(app_label)s.%(data_type)s»"
+
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
+msgid "model:"
+msgstr "мадэль:"
+
+#: views.py:222 views.py:254
+#, python-format
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "залежныя аб’екты «%(app_label)s.%(object_name)s»"
+
+#: views.py:226 views.py:259
+#, python-format
+msgid "all %s"
+msgstr "усе %s"
+
+#: views.py:231 views.py:264
+#, python-format
+msgid "number of %s"
+msgstr "колькасьць %s"
+
+#: views.py:269
+#, python-format
+msgid "Fields on %s objects"
+msgstr "Палі аб’ектаў %s"
+
+#: views.py:361
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s не падобны да аб’екта «шаблён спасылкі» — «urlpattern»"
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Пачатак"
+
+#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
+#: templates/admin_doc/missing_docutils.html:7
+#: templates/admin_doc/model_detail.html:15
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: templates/admin_doc/template_tag_index.html:8
+#: templates/admin_doc/view_detail.html:7
+#: templates/admin_doc/view_index.html:8
+msgid "Documentation"
+msgstr "Дакумэнтацыя"
+
+#: templates/admin_doc/bookmarklets.html:8
+msgid "Bookmarklets"
+msgstr "Закладкі"
+
+#: templates/admin_doc/bookmarklets.html:11
+msgid "Documentation bookmarklets"
+msgstr "Закладкі дакумэнтацыі"
+
+#: templates/admin_doc/bookmarklets.html:15
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Каб паставіць закладку, перацягніце спасылку на паліцу "
+"закладак\n"
+"або пстрыкніце па спасылцы праваю кнопкаю і дадайце яе да закладак. Цяпер\n"
+"можна абраць закладку зь якое пажадаеце бачыны.  Уважце: пэўныя закладкі\n"
+"патрабуюць, каб пляцоўка праглядалася з «унутранага» кампутара (калі ня "
+"ведаеце,\n"
+"ці «ўнутраны» ваш кампутар, запытайцеся сыстэмнага спраўніка).</p>\n"
+
+#: templates/admin_doc/bookmarklets.html:25
+msgid "Documentation for this page"
+msgstr "Дакумэнтацыя па бачыне"
+
+#: templates/admin_doc/bookmarklets.html:26
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr "Накіроўвае з хоць-якое бачыны да прагляду, які стварае гэтую бачыну."
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr "Паказаць азначальнік аб’екта"
+
+#: templates/admin_doc/bookmarklets.html:29
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Паказвае непаўторны азначальнік і від зьмесьціва бачыны, якая ёсьць адным "
+"аб’ектам."
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr "Правіць аб’ект (у гэтым вакне)"
+
+#: templates/admin_doc/bookmarklets.html:32
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Накіроўвае да бачыны кіраваць бачынамі, якія ёсьць адным аб’ектам."
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr "Правіць аб’ект (у новым вакне)"
+
+#: templates/admin_doc/bookmarklets.html:35
+msgid "As above, but opens the admin page in a new window."
+msgstr "Тое самае, што й вышэй, але адчыняе бачыну ў новым вакне."
+
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+msgid "Models"
+msgstr "Мадэлі"
+
+#: templates/admin_doc/template_detail.html:8
+msgid "Templates"
+msgstr "Шаблёны"
+
+#: templates/admin_doc/template_filter_index.html:9
+msgid "Filters"
+msgstr "Сіты"
+
+#: templates/admin_doc/template_tag_index.html:9
+msgid "Tags"
+msgstr "Цэтлікі"
+
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
+msgid "Views"
+msgstr "Прагляды"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Ляґічнае («сапраўдна» або «не сапраўдна»)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Палі віду: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/bg/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/bg/LC_MESSAGES/django.mo
index 41340a284f..bdc01a9b5e 100644
Binary files a/django/contrib/admindocs/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/bg/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/bg/LC_MESSAGES/django.po
index 534e9e5465..48b14607e6 100644
--- a/django/contrib/admindocs/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/bg/LC_MESSAGES/django.po
@@ -8,74 +8,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "етикет:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "филтър:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "изглед:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Приложението %r липсва"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Моделът %(model_name)r не е намерен в приложение %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "свързания '%(app_label)s.%(data_type)s' обект"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "модел:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "свързаните '%(app_label)s.%(object_name)s' обекти"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "всички %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "брой %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Полета на %s обекти"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s не прилича на обект от тип urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Начало"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s не прилича на обект от тип urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Начало"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bookmarklet-и за документация"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +128,11 @@ msgstr ""
 "като \"вътрешен\" (приказвайте с администратора ако не сте сигурни дали\n"
 "компютърът ви е \"вътрешен\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Документация за тази страница"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,11 +140,11 @@ msgstr ""
 "Препраща Ви от която и да е страница към документацията за изгледа, който я "
 "е генерирал."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Покажи ID на обекта"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -152,42 +152,51 @@ msgstr ""
 "Показва типа на съдържанието и ID-то на страници, които представляват "
 "единичен обект."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Редактирай този обект (в този прозорец)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Препраща към администраторска страница за страници, които представляват "
 "единичен обект.  "
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Редактирай този обект (в нов прозорец)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Като горното, но отваря администраторската страница в нов прозорец."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Модели"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Шаблони"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Филтри"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Етикети"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Прегледи"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (True или False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Поле от тип: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/bn/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/bn/LC_MESSAGES/django.mo
index cc17bd72f4..fa0b36e409 100644
Binary files a/django/contrib/admindocs/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/bn/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/bn/LC_MESSAGES/django.po
index e98b2aa670..ae0717bd95 100644
--- a/django/contrib/admindocs/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/bn/LC_MESSAGES/django.po
@@ -1,79 +1,94 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+#  <anubhab91@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <rafi.tahmid@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2013-02-08 15:20+0000\n"
+"Last-Translator: anubhab91 <anubhab91@gmail.com>\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ট্যাগঃ"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "ফিল্টারঃ"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ভিউঃ"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r এ্যপটি পাওয়া যায়নি"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "%(app_label)r এ্যপে %(model_name)r মডেলটি পাওয়া যায়নি"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "`%(app_label)s.%(data_type)s` সম্পর্কিত অবজেক্ট"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "মডেলঃ"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "`%(app_label)s.%(object_name)s` সম্পর্কিত অবজেক্ট সমূহ"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "সকল %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s সংখ্যা"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s অবজেক্টে ফিল্ডগুলো"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ইউআরএল -এর মত নয়"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "নীড়পাতা"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +98,18 @@ msgstr "%s ইউআরএল -এর মত নয়"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "নীড়পাতা"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "সহায়িকা"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "বুকমার্কলেট"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "সহায়িকা বুকমার্কলেট"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -124,60 +127,69 @@ msgstr ""
 "দেখতে হবে (আপনার প্রশাসনের কাছ থেকে জানুন যে আপনার কম্পিউটার \"internal\" কিনা)।"
 "</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "এই পাতার সহায়িকা"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "যেকোন পাতা থেকে ভিউ সহায়িকাতে নিয়ে যান।"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "অবজেক্ট আইডি দেখান"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "কনটেন্ট-টাইপ এবং একক আইডি দেখায়, যা কিনা একটি নির্দিষ্ট অবজেক্টকে বোঝায়।"
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "এই অবজেক্টটি সম্পাদন করুন (বর্তমান উইন্ডো)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "প্রশাসন পাতায় নিয়ে যান, যা কিনা একটি নির্দিষ্ট পাতা অবজেক্টকে বোঝায়।"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "এই অবজেক্টটি সম্পাদন করুন (নতুন উইন্ডো)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "উপরের মতই, কিন্তু নতুন উইন্ডোতে খুলুন।"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "মডেলগুলো"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "টেমপ্লেটগুলো"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "ফিল্টারগুলো"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "ট্যাগগুলো"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "ভিউগুলো"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "বুলিয়ান (হয় True অথবা False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "ফিল্ডের ধরণ: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/br/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..4f42c2dc79
Binary files /dev/null and b/django/contrib/admindocs/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/br/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..2717ef14d3
--- /dev/null
+++ b/django/contrib/admindocs/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,185 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: views.py:58 views.py:60 views.py:62
+msgid "tag:"
+msgstr ""
+
+#: views.py:93 views.py:95 views.py:97
+msgid "filter:"
+msgstr ""
+
+#: views.py:156 views.py:158 views.py:160
+msgid "view:"
+msgstr ""
+
+#: views.py:188
+#, python-format
+msgid "App %r not found"
+msgstr ""
+
+#: views.py:195
+#, python-format
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr ""
+
+#: views.py:207
+#, python-format
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr ""
+
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
+msgid "model:"
+msgstr ""
+
+#: views.py:222 views.py:254
+#, python-format
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr ""
+
+#: views.py:226 views.py:259
+#, python-format
+msgid "all %s"
+msgstr ""
+
+#: views.py:231 views.py:264
+#, python-format
+msgid "number of %s"
+msgstr "niver a %s"
+
+#: views.py:269
+#, python-format
+msgid "Fields on %s objects"
+msgstr ""
+
+#: views.py:361
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Degemer"
+
+#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
+#: templates/admin_doc/missing_docutils.html:7
+#: templates/admin_doc/model_detail.html:15
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: templates/admin_doc/template_tag_index.html:8
+#: templates/admin_doc/view_detail.html:7
+#: templates/admin_doc/view_index.html:8
+msgid "Documentation"
+msgstr "Teuliadoù"
+
+#: templates/admin_doc/bookmarklets.html:8
+msgid "Bookmarklets"
+msgstr "Sinedoù"
+
+#: templates/admin_doc/bookmarklets.html:11
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:15
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:25
+msgid "Documentation for this page"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:26
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:29
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:32
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:35
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+msgid "Models"
+msgstr ""
+
+#: templates/admin_doc/template_detail.html:8
+msgid "Templates"
+msgstr ""
+
+#: templates/admin_doc/template_filter_index.html:9
+msgid "Filters"
+msgstr "Siloù"
+
+#: templates/admin_doc/template_tag_index.html:9
+msgid "Tags"
+msgstr "Tikedennoù"
+
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
+msgid "Views"
+msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boulean (gwir pe gaou)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Seurt maezienn : %(field_type)s"
diff --git a/django/contrib/admindocs/locale/bs/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/bs/LC_MESSAGES/django.mo
index ffd475785f..741269368a 100644
Binary files a/django/contrib/admindocs/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/bs/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/bs/LC_MESSAGES/django.po
index 6988ec5ff8..692c877fcd 100644
--- a/django/contrib/admindocs/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/bs/LC_MESSAGES/django.po
@@ -6,75 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "pogled:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikacija %r nije pronađena"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r nije pronađen u aplikaciji %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "povezani objekti klase `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "klase `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "svi povezani objekti %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "broj povezanih objekata %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Polja u povezanim objektima %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ne izgleda kao urlpattern objekat"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Početna"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s ne izgleda kao urlpattern objekat"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Početna"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarkleti"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bookmarkleti dokumentacije"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +126,11 @@ msgstr ""
 "označeni kao „interni“ (pitajte administratora vašeg sistema ukoliko niste\n"
 "sigurni da li je vaš računar „interni“).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentacija za ovu stranicu"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,11 +138,11 @@ msgstr ""
 "Vodi od bilo koje stranice do dokumentacije za pogled koji generiše tu "
 "stranicu."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Prikaži ID objekta"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,42 +150,51 @@ msgstr ""
 "Prikazuje content-type i jedinstveni ID za stranicu koja predstavlja jedan "
 "objekat."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Izmjeni ovaj objekat (u ovom prozoru)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Vodi u administracioni stranicu za stranice koje prestavljaju jedan objekat"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Izmjeni ovaj objekat (novi prozor)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Isto kao prethodni, ali otvara administracionu stranicu u novom prozoru."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Bulova vrijednost (True ili False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Polje tipa: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.mo
index b60afe14ee..a679e99b45 100644
Binary files a/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.po
index 0503d0c60d..0bd0aac36a 100644
--- a/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ca/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-29 23:55+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etiqueta:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtre:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vista:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "No s'ha pogut trobar l'aplicació %r"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "El model %(model_name)r no s'ha trobat a l'aplicació %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "l'objecte relacionat `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "objectes relacionats `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "tots %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "nombre de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Camps en objectes %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s no sembla ser un objecte 'urlpattern'"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Inici"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s no sembla ser un objecte 'urlpattern'"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Inici"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentació"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "'Bookmarklets'"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "'Bookmarklets' de documentació"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -127,22 +127,22 @@ msgstr ""
 "amb el vostre administrador de sistemes si no esteu segurs si el vostre "
 "ordinador és \"intern\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentació d'aquesta pàgina"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Us porta des de qualsevol pàgina a la documentació de la vista que la genera."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Mostra l'ID de l'objecte"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,42 +150,51 @@ msgstr ""
 "Mostra el 'content-type' (tipus de contingut) i l'ID inequívoc de les "
 "pàgines que representen un únic objecte."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Editar aquest objecte (finestra actual)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "El porta a la pàgina d'administració de pàgines que representen un únic "
 "objecte."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Editar aquest objecte (nova finestra)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Com abans, però obre la pàgina d'administració en una nova finestra."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Models"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Plantilles"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtres"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Vistes"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Booleà (Cert o Fals)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Camp del tipus: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/cs/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/cs/LC_MESSAGES/django.mo
index fc76f617f4..a75c8e8da0 100644
Binary files a/django/contrib/admindocs/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/cs/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/cs/LC_MESSAGES/django.po
index dbec0ee295..504aa51bff 100644
--- a/django/contrib/admindocs/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/cs/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtr:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "pohled (view):"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikace %r nenalezena"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r v aplikaci %(app_label)r nenalezen"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "související položka `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "související položky `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "Vše: %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "Počet: %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Pole položek typu %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "Objekt %s patrně není typu urlpattern."
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Domů"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "Objekt %s patrně není typu urlpattern."
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Domů"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentace"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklety"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentační bookmarklety"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +128,11 @@ msgstr ""
 "\"\"interní\" (promluvte si s vaším správcem, jestli si nejste jisti,\n"
 "zda je váš počítač \"interní\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentace k této stránce"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,52 +140,61 @@ msgstr ""
 "Z libovolné stránky otevře dokumentaci pohledu (view), který generoval tuto "
 "stránku."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Ukázat id položky"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "Zobrazí content-type a unikátní ID stránek reprezentujících jedinou položku."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Upravit tuto položku (ve stávajícím okně)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Přepne do administračního rozhraní stránek reprezentujících jedinou položku."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Upravit tuto položku (v novém okně)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Jako výše, ale otevře prostředí správy v novém okně."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modely"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Šablony"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtry"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tagy"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Pravdivost (buď Ano (True), nebo Ne (False))"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Pole typu: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/cy/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/cy/LC_MESSAGES/django.mo
index febe593046..fa9a8a8489 100644
Binary files a/django/contrib/admindocs/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/cy/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/cy/LC_MESSAGES/django.po
index 10384c5138..9a2ff0ce74 100644
--- a/django/contrib/admindocs/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/cy/LC_MESSAGES/django.po
@@ -6,74 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr ""
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr ""
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr ""
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr ""
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr ""
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr ""
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr ""
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr ""
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr ""
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr ""
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Adref"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +96,18 @@ msgstr ""
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Adref"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dogfennaeth"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Dalennau gofnod"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dogfennaeth dalennau gofnod"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -117,21 +118,21 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dogfennaeth er mwyn y dudalen yma"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Dangos ID gwrthrych"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -139,42 +140,51 @@ msgstr ""
 "Yn dangos y fath-cynnwys a'r ID unigryw ar gyfer tudalennau sy'n "
 "cynrychioligwrthrych sengl."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Golygu'r gwrthrych yma (ffenestr cyfoes)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Yn neidio i'r dudalen weinyddiad ar gyfer tudalennau sy'n cynrychioli "
 "gwrthrych sengl."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Golygu'r gwrthrych yma (ffenestr newydd)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Fel uwchben, ond yn agor y dudalen weinyddiad mewn ffenestr newydd."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
diff --git a/django/contrib/admindocs/locale/da/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/da/LC_MESSAGES/django.mo
index 94bb1f3dd9..2c42ace5e8 100644
Binary files a/django/contrib/admindocs/locale/da/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/da/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/da/LC_MESSAGES/django.po
index ae3c7ae6b4..9b1f37c237 100644
--- a/django/contrib/admindocs/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/da/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Christian Joergensen <christian@gmta.info>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Applikationen %r blev ikke fundet"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modellen %(model_name)r ikke fundet i applikationen %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "det relaterede `%(app_label)s.%(data_type)s`-objekt"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "relaterede `%(app_label)s.%(object_name)s`-objekter"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "alle %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "antal %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Felter på %s-objekter"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ser ikke ud til at være et urlpattern-objekt"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Hjem"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s ser ikke ud til at være et urlpattern-objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Hjem"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentations-bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -125,11 +125,11 @@ msgstr ""
 "en computer der opfattes som \"intern\" (tal med din systemadministrator,\n"
 "hvis du ikke er sikker på om din computer er \"intern\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentation for denne side"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -137,11 +137,11 @@ msgstr ""
 "Bringer dig fra en hvilken som helst side til dokumentationen for det view, "
 "der genererer den pågældende side."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Vis objekt-ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -149,42 +149,51 @@ msgstr ""
 "Viser indholdstypen og det unikke ID for sider, der repræsenterer et enkelt "
 "objekt."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Rediger dette objekt (i det aktuelle vindue)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Springer til administrationssiden for sider, der repræsenterer et enkelt "
 "objekt."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Rediger dette objekt (i nyt vindue)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Som ovenfor, men åbner administrationssiden i et nyt vindue."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modeller"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Skabeloner"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtre"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Mærker"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Visninger"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolsk (enten True eller False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Felt af type: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/de/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/de/LC_MESSAGES/django.mo
index 00587c7c10..a2716f3f25 100644
Binary files a/django/contrib/admindocs/locale/de/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/de/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/de/LC_MESSAGES/django.po
index dcd551e68a..df6cafd395 100644
--- a/django/contrib/admindocs/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/de/LC_MESSAGES/django.po
@@ -1,79 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-14 06:39+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "Schlagwort:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "Filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "Ansicht:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Anwendung %r nicht gefunden"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modell %(model_name)r wurde nicht in Anwendung %(app_label)r gefunden"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "Das verknüpfte `%(app_label)s.%(data_type)s` Objekt"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "Modell:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "verknüpftes `%(app_label)s.%(object_name)s` Objekt"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "Alle %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "Anzahl von %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Felder am %s Objekt"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ist scheinbar kein urlpattern-Objekt"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Start"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s ist scheinbar kein urlpattern-Objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Start"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentations-Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -127,11 +127,11 @@ msgstr ""
 "Rechnern beschränkt. Falls nicht klar ist, ob ein Rechner als 'intern'\n"
 "bewertet wird, bitte den Administrator fragen.</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentation für diese Seite"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -139,11 +139,11 @@ msgstr ""
 "Springt von jeder Seite zu der Dokumentation für den View, der diese Seite "
 "erzeugt."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Objekt-ID anzeigen"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -151,43 +151,52 @@ msgstr ""
 "Zeigt den Content-Type und die eindeutige ID für Seiten, die ein einzelnes "
 "Objekt repräsentieren."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Dieses Objekt ändern (Aktives Fenster)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Springt zu der Administrationsseite für dieses Objekt, wenn diese Seite ein "
 "Objekt repräsentiert."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Dieses Objekt ändern (Neues Fenster)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Wie zuvor, aber öffnet die Administrationsseite in einem neuen Fenster."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Models"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Templates"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filter"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tags"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolescher Wert (True oder False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Feldtyp: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/el/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/el/LC_MESSAGES/django.mo
index b95a114619..6624aba56b 100644
Binary files a/django/contrib/admindocs/locale/el/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/el/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/el/LC_MESSAGES/django.po
index da6a149285..b6eaf3bf20 100644
--- a/django/contrib/admindocs/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/el/LC_MESSAGES/django.po
@@ -8,75 +8,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Yorgos Pagles <y.pagles@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ετικέτα:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "φίλτρο:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "προβολή:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Δε βρέθηκε η εφαρμογή %r"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 "Το μοντέλο %(model_name)r δεν μπορεί να βρεθεί στην εφαρμογή %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "το συσχετισμένο `%(app_label)s.%(data_type)s`  αντικείμενο"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "μοντέλο:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "συσχετισμένα `%(app_label)s.%(object_name)s` αντικείμενα"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "όλα %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "πλήθος number of %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Πεδία στα αντικείμενα %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "Το %s δε φαίνεται να είναι ένα αντικείμενο urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Αρχική"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -86,30 +98,18 @@ msgstr "Το %s δε φαίνεται να είναι ένα αντικείμε
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Αρχική"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Τεκμηρίωση"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Σελιδοδείκτες"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Σελιδοδείκτες τεκμηρίωσης"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -130,11 +130,11 @@ msgstr ""
 "Απευθυνθείτε στον διαχειριστή σας αν δεν γνωρίζεται αν ο υπολογιστής σας "
 "θερείται \"εσωτερικός\".</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Τεκμηρίωση για αυτήν τη σελίδα"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -142,11 +142,11 @@ msgstr ""
 "Μεταπήδηση από οποιαδήποτε σελίδα στην τεκμηρίωση για το view που "
 "δημιούργησε τη σελίδα αυτή."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Εμφάνιση ID αντικειμένου"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -154,43 +154,52 @@ msgstr ""
 "Εμφάνιση του content-type και του μοναδικού αναγνωριστικού για τις σελίδες "
 "που αντιπροσωπεύουν ένα μοναδικό αντικείμενο."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Επεξεργασία αυτού του αντικειμένου (τρέχον παράθυρο)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Αν η σελίδα αναπαριστά ένα και μοναδικό αντικείμενο τότε οδηγεί στην "
 "αντίστοιχη σελίδα διαχείρισης."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Επεξεργασία αυτού του αντικειμένου (νέο παράθυρο)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Όπως και παραπάνω, αλλά άνοιγμα της σελίδας διαχείρισης σε νέο παράθυρο."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (Είτε Αληθές ή Ψευδές)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Είδος πεδίου: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.mo
index 4a5c340c0f..6c452c7392 100644
Binary files a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
index f58586f414..c95904e30a 100644
--- a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
@@ -1,74 +1,77 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-22 09:28+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
-#: views.py:58 views.py:60 views.py:62
+#: views.py:59 views.py:61 views.py:63
 msgid "tag:"
-msgstr ""
+msgstr "tag:"
 
-#: views.py:93 views.py:95 views.py:97
+#: views.py:94 views.py:96 views.py:98
 msgid "filter:"
-msgstr ""
+msgstr "filter:"
 
-#: views.py:156 views.py:158 views.py:160
+#: views.py:157 views.py:159 views.py:161
 msgid "view:"
-msgstr ""
+msgstr "view:"
 
-#: views.py:188
+#: views.py:189
 #, python-format
 msgid "App %r not found"
-msgstr ""
+msgstr "App %r not found"
 
-#: views.py:195
+#: views.py:196
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
-msgstr ""
+msgstr "Model %(model_name)r not found in app %(app_label)r"
 
-#: views.py:207
+#: views.py:208
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
-msgstr ""
+msgstr "the related `%(app_label)s.%(data_type)s` object"
 
-#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
-#: views.py:264
+#: views.py:208 views.py:227 views.py:232 views.py:246 views.py:260
+#: views.py:265
 msgid "model:"
-msgstr ""
+msgstr "model:"
 
-#: views.py:222 views.py:254
+#: views.py:223 views.py:255
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
-msgstr ""
+msgstr "related `%(app_label)s.%(object_name)s` objects"
 
-#: views.py:226 views.py:259
+#: views.py:227 views.py:260
 #, python-format
 msgid "all %s"
-msgstr ""
+msgstr "all %s"
 
-#: views.py:231 views.py:264
+#: views.py:232 views.py:265
 #, python-format
 msgid "number of %s"
-msgstr ""
+msgstr "number of %s"
 
-#: views.py:269
+#: views.py:270
 #, python-format
 msgid "Fields on %s objects"
-msgstr ""
+msgstr "Fields on %s objects"
 
-#: views.py:361
+#: views.py:362
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
-msgstr ""
+msgstr "%s does not appear to be a urlpattern object"
 
 #: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
 #: templates/admin_doc/missing_docutils.html:6
@@ -80,7 +83,7 @@ msgstr ""
 #: templates/admin_doc/view_detail.html:6
 #: templates/admin_doc/view_index.html:7
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
@@ -92,15 +95,15 @@ msgstr ""
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
 msgid "Documentation"
-msgstr ""
+msgstr "Documentation"
 
 #: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
-msgstr ""
+msgstr "Bookmarklets"
 
 #: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Documentation bookmarklets"
 
 #: templates/admin_doc/bookmarklets.html:15
 msgid ""
@@ -112,70 +115,81 @@ msgid ""
 "as \"internal\" (talk to your system administrator if you aren't sure if\n"
 "your computer is \"internal\").</p>\n"
 msgstr ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
 
 #: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
-msgstr ""
+msgstr "Documentation for this page"
 
 #: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
 
 #: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
-msgstr ""
+msgstr "Show object ID"
 
 #: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
 
 #: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
-msgstr ""
+msgstr "Edit this object (current window)"
 
 #: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
+msgstr "Jumps to the admin page for pages that represent a single object."
 
 #: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
-msgstr ""
+msgstr "Edit this object (new window)"
 
 #: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
-msgstr ""
+msgstr "As above, but opens the admin page in a new window."
 
 #: templates/admin_doc/model_detail.html:16
 #: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "Models"
 
 #: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "Templates"
 
 #: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "Filters"
 
 #: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #: templates/admin_doc/view_detail.html:8
 #: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "Views"
 
 #: tests/__init__.py:23
 msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boolean (Either True or False)"
 
 #: tests/__init__.py:33
 #, python-format
 msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Field of type: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/en_GB/LC_MESSAGES/django.mo
index 11b86c95b5..19090ba545 100644
Binary files a/django/contrib/admindocs/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en_GB/LC_MESSAGES/django.po
index 62a267f2b1..180b62a4a4 100644
--- a/django/contrib/admindocs/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/en_GB/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: jon_atkinson <jon@jonatkinson.co.uk>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "App %r not found"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r not found in app %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "the related `%(app_label)s.%(data_type)s` object"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "related `%(app_label)s.%(object_name)s` objects"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "all %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "number of %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Fields on %s objects"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s does not appear to be a urlpattern object"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Home"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s does not appear to be a urlpattern object"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Home"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentation"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Documentation bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -125,11 +125,11 @@ msgstr ""
 "as \"internal\" (talk to your system administrator if you aren't sure if\n"
 "your computer is \"internal\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentation for this page"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -137,11 +137,11 @@ msgstr ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Show object ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -149,40 +149,49 @@ msgstr ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Edit this object (current window)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Jumps to the admin page for pages that represent a single object."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Edit this object (new window)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "As above, but opens the admin page in a new window."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Models"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Templates"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filters"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tags"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (Either True or False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Field of type: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.mo
index 18f3fa6398..4b1d21c7df 100644
Binary files a/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.po
index b7fc215b6c..35dcced549 100644
--- a/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/eo/LC_MESSAGES/django.po
@@ -5,74 +5,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etikedo:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtro:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vido:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikaĵo %r netrovita"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modelo %(model_name)r netrovita en aplikaĵo %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "la rilatita `%(app_label)s.%(data_type)s` objekto"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modelo:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "rilatitaj `%(app_label)s.%(object_name)s` objektoj"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "ĉiuj %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "nombro da %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Kampoj en %s objektoj"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ne ŝajnas esti URLmotiva objekto"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Ĉefpaĝo"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -82,30 +94,18 @@ msgstr "%s ne ŝajnas esti URLmotiva objekto"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Ĉefpaĝo"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentaro"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Legosignetoj"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentaraj legosignetoj"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -125,22 +125,22 @@ msgstr ""
 "ke\n"
 "via komputilo estas \"interna\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentaro por tiu paĝo"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Sendas vin el ajna paĝo, al la dokumentado de la vido kiu generis tiun paĝon."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Montri objektan identigilon"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -148,40 +148,49 @@ msgstr ""
 "Montri la enhavan tipon kaj unikan identigilon por paĝoj kiu reprezentas "
 "ununuran objekton."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Redakti tiun objekton (nuna fenestro)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Forsendas al la administradan paĝon kiu reprezentas ununuran objekton."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Redakti tiun objekton (nova fenestro)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Kiel supre, sed montras la administradan paĝon en nova fenestro."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modeloj"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Ŝablonoj"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtriloj"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Etikedoj"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Vidoj"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Bulea (Vera aŭ Malvera)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Tipo de kampo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo
index 694734e2c1..7860a448c8 100644
Binary files a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po
index 699230210f..a2df3c2668 100644
--- a/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/es/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-14 19:06+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Dimitris Glezos <glezos@transifex.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etiqueta:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtro:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vista:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplicación %r no encontrada"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 "El modelo %(model_name)r no se ha encontrado en la aplicación %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "el objeto relacionado `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modelo:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "los objetos relacionados `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "todo %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "número de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Campos en %s objetos"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s no parece ser un objeto urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Inicio"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s no parece ser un objeto urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Inicio"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bookmarklets de documentación"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -127,22 +127,22 @@ msgstr ""
 "el sitio desde un ordenador señalado como \"interno\" (hable\n"
 "con su administrador de sistemas si no está seguro si el suyo lo es).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentación para esta página"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Lleva desde cualquier página a la documentación de la vista que la genera."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Mostrar ID de objeto"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,43 +150,52 @@ msgstr ""
 "Muestra el tipo de contenido e ID único de las páginas que representan un "
 "simple objeto."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Editar este objeto (ventana actual)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Lleva a la página de administración de páginas que representan un único "
 "objeto."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Editar este objeto (nueva ventana)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Como antes, pero abre la página de administración en una nueva ventana."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modelos"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Plantillas"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtros"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Vistas"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (Verdadero o Falso)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo de tipo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.mo
index fd466d4ccd..0ab3617ad3 100644
Binary files a/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.po
index 12f9b222fd..a3add66be3 100644
--- a/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/es_AR/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-16 01:43+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etiqueta:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtrar:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ver:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplicación %r no encontrada"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modelo %(model_name)r no encontrado en aplicación %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "el objeto `%(app_label)s.%(data_type)s` relacionado"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modelo:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "objetos `%(app_label)s.%(object_name)s` relacionados"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "todos los %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "número de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Campos en objetos %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s no parece ser un objeto urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Inicio"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s no parece ser un objeto urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Inicio"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bookmarklets de documentación"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -127,22 +127,22 @@ msgstr ""
 "con su administrador de sistemas si no está seguro de si el suyo lo es).</"
 "p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentación de esta página"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Le lleva desde cualquier página a la documentación de la vista que la genera."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Mostrar ID de objeto"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,42 +150,51 @@ msgstr ""
 "Muestra el tipo de contenido e ID unívoco de las páginas que representan un "
 "único objeto."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Editar este objeto (ventana actual)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Le lleva a la página de administración de páginas que representan un único "
 "objeto."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Editar este objeto (nueva ventana)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Ídem, pero abre la página de administración en una nueva ventana."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modelos"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Plantillas"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtros"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Vistas"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (Verdadero o Falso)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo tipo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/es_MX/LC_MESSAGES/django.mo
index 6ca11c0417..547f1d10ef 100644
Binary files a/django/contrib/admindocs/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/es_MX/LC_MESSAGES/django.po
index 61fc8ec4c7..92e34a3a22 100644
--- a/django/contrib/admindocs/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/es_MX/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-06 19:32+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etiqueta:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtro:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ver:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplicación %r no encontrada"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modelo %(model_name)r no encontrado en aplicación %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "el objeto `%(app_label)s.%(data_type)s` relacionado"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modelo:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "objetos `%(app_label)s.%(object_name)s` relacionados"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "todos los %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "número de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Campos en objetos %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s no parece ser un objeto urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Inicio"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s no parece ser un objeto urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Inicio"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bookmarklets de documentación"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -125,22 +125,22 @@ msgstr ""
 "esté viendo el sitio desde un equipo señalado como \"interno\" (hable con su "
 "administrador de sistemas si no está seguro de si el suyo lo es).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentación de esta página"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Le lleva desde cualquier página a la documentación de la vista que la genera."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Mostrar ID de objeto"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -148,43 +148,52 @@ msgstr ""
 "Muestra el tipo de contenido e ID único de las páginas que representan un "
 "único objeto."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Editar este objeto (ventana actual)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Le lleva a la página de administración de páginas que representan un único "
 "objeto."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Editar este objeto (nueva ventana)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Como el anterior, pero abre la página de administración en una ventana nueva"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modelos"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Plantillas"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtros"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Vistas"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (Verdadero o Falso)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo tipo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/et/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/et/LC_MESSAGES/django.mo
index 4d66bc126a..eb5691c65a 100644
Binary files a/django/contrib/admindocs/locale/et/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/et/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/et/LC_MESSAGES/django.po
index 74f7220e98..8e11ff0b4e 100644
--- a/django/contrib/admindocs/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/et/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "lipik:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtreeri:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vaade:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Rakendust %r ei leitud"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Mudelit %(model_name)r ei leitud rakendusest %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "seotud `%(app_label)s.%(data_type)s` objekt"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "mudel:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "seotud `%(app_label)s.%(object_name)s` objektid"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "kõik %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s arv"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Objekti %s väljad"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ei tundu olevat urlpattern objekt"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Kodu"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s ei tundu olevat urlpattern objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Kodu"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Järjehoidjandid"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentatsiooni järjehoidjandid"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +126,11 @@ msgstr ""
 "(konsulteerige süsteemiadministraatoriga, kui te ei tea, mida tähendab "
 "\"sisemine\")</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Selle lehekülje dokumentatsioon"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,11 +138,11 @@ msgstr ""
 "Suunab teid suvalisel lehel asudes selle vaate dokumentatsioonile, mis antud "
 "lehe genereerib."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Näita objekti ID-d"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,41 +150,50 @@ msgstr ""
 "Näitab sisutüüpi ning unikaalset ID'd lehtedel, mis esitavad mingit kindlat "
 "objekti."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Muuda seda objekti (samas aknas)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Suunab administreeimislehele lehtedelt, mis esitavad mingit kindlat objekti."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Muuda seda objekti (uues aknas)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Sama, mis üleval, kuid avab admin. lehe uues aknas."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Tõeväärtus (Kas tõene või väär)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Lahter tüüpi: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.mo
index b364234cb5..2ba1272c37 100644
Binary files a/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.po
index a998b920dd..b4fee92a00 100644
--- a/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/eu/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 18:30+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etiketa:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtroa:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "bista:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r aplikazio ez da aurkitu"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "%(model_name)r modeloa ez da aurkitu %(app_label)r aplikazioan"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "erlazionatutako `%(app_label)s.%(data_type)s` objektua"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modeloa:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "erlazionatutako `%(app_label)s.%(object_name)s` objektuak"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "%s dena"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s zenbakia"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s objetuaren eremuak"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ez dirudi  url heredu objetua"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Hasiera"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s ez dirudi  url heredu objetua"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Hasiera"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentazioa"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Markadoreak"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentazio markadoreak"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,22 +126,22 @@ msgstr ""
 "argitzeko)\n"
 ".</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Web orri honen dokumentazioa"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Edozein orritik, orria sortzen duen bistaren dokumentaziora eramango zaitu."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Objetuaren ID erakutsi"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -149,40 +149,49 @@ msgstr ""
 "Objetu bakarra erakusten duten orrietan, eduki mota (content-type) eta "
 "orriaren ID bakarra erakutsi, ."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Objetu hau aldatu ( leiho honetan)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Objetu bakarra erakusten orrietan, adminiztrazio gunera joan."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Objetu hau aldatu (leiho berrian)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Goian bezala, baina kudeaketa guena leiho berri batean irekiko da."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Ereduak"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Txantiloiak"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Etiketak"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Bistak"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolearra (egia ala gezurra)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Eremuaren mota: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/fa/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/fa/LC_MESSAGES/django.mo
index 1f98f3c0b3..f87f57ab17 100644
Binary files a/django/contrib/admindocs/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/fa/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/fa/LC_MESSAGES/django.po
index 251671242b..f89e41ad9a 100644
--- a/django/contrib/admindocs/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/fa/LC_MESSAGES/django.po
@@ -1,80 +1,92 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Nikneshan <ali@nikneshan.com>, 2011.
+# Ali Nikneshan <ali@nikneshan.com>, 2011, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "برچسب:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "فیلتر"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "نمایش:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "برنامهٔ %r یافت نشد"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "مدل %(model_name)r در برنامهٔ %(app_label)r یافت نشد"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "شیء «%(app_label)s.%(data_type)s» مرتبط"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "مدل:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "اشیاء «%(app_label)s.%(object_name)s» مرتبط"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "همهٔ %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "تعداد %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "فیلدهای شیء %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "به نظر نمی رسد %s یک شیء از نوع urlpattern باشد"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "آغازه"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "به نظر نمی رسد %s یک شیء از نوع urlpattern باشد
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "آغازه"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "مستندات"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklet ها"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "مستندات bookmarklet ها"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -117,63 +117,81 @@ msgid ""
 "as \"internal\" (talk to your system administrator if you aren't sure if\n"
 "your computer is \"internal\").</p>\n"
 msgstr ""
+"\n"
+" <p class=\"help\"> برای نصب بوکمارکلت ها لینک را روی بوکمارک تولبار خود "
+"بکشید\n"
+" و یا روی لینک کلیک راست کنید و add را انتخاب نمایید. اکنون شما می توانیدو "
+"بوکمارکلت را از هر صحفه ای در سایت انتخاب نمایید.\n"
+" توجه داشته باشید بعضی از این بوکمارکلت ها لازم است از کامپیوتری که داخلی "
+"تعریف شده دیده شوند. (اگر مطمئن نیستید با مدیر شبکه خود در این باره صحبت "
+"کنید.)</p>\n"
+"\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "مستندات این صفحه"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "شما را از هر صفحه‌ای که باشید به مستندات نمایی که صفحه را ایجاد کرده می‌برد"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "نمایش مشخصهٔ شیء"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "نمایش محتوا و مشخصهٔ منحصر به فرد برای صفحاتی که یک شیء را نمایش می‌دهند."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "ویرایش این شیء (پنجرهٔ کنونی)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "پرش به صفحهٔ مدیر برای صفحاتی که یک شیء را نمایش می‌دهند."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "ویرایش این شیء (پنجرهٔ جدید)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "مانند بالا، اما صفحهٔ مدیر را در پنجرهٔ جدیدی باز می‌کند."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "مدل ها"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "قالب ها"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "فیلترها"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "تگ ها"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "نمایش ها"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "بولی (درست یا غلط)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "فیلد با نوع: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo
index ebdbf8a2c0..66526ef294 100644
Binary files a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po
index ec981f54d4..a5cdc5acb9 100644
--- a/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/fi/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tagi:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "suodatin:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "näkymä:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Sovellusta %r ei löydy"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Sovelluksesta %(app_label)r ei löydy mallia %(model_name)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "tähän liittyvä `%(app_label)s.%(data_type)s`-kohde"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "malli:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "tähän liittyvät `%(app_label)s.%(object_name)s`-kohteet"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "kaikki %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s-kohteiden lukumäärä"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s-kohteiden kentät"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ei näytä olevan urlpattern-olio"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Etusivu"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s ei näytä olevan urlpattern-olio"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Etusivu"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Ohjeita"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Kirjanmerkkiset"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Ohjeiden kirjanmerkkiset"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -125,21 +125,21 @@ msgstr ""
 "\" määritellyltä tietokoneelta (kysy lisätietoja verkkonne ylläpitäjältä).</"
 "p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Tämän sivun ohjeita"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "Näyttää ohjeet, jotka koskevat ko. sivun luonutta näkymää."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Näytä kohteen tunniste"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -147,41 +147,50 @@ msgstr ""
 "Näyttää yksittäistä kohdetta vastaavilla sivuilla kohteen tyypin ja "
 "tunnisteen."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Muokkaa tätä kohdetta (tässä ikkunassa)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Siirtyy yksittäistä kohdetta vastaavalta sivulta kohteen ylläpitosivulle."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Muokkaa tätä kohdetta (uudessa ikkunassa)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Kuten yllä, mutta avaa ylläpitosivun uuteen ikkunaan."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Totuusarvo: joko tosi (True) tai epätosi (False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Kenttä tyyppiä: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.mo
index 62f988ea2c..c6200491da 100644
Binary files a/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.po
index 87418918af..d7276cbeda 100644
--- a/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/fr/LC_MESSAGES/django.po
@@ -1,81 +1,93 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-#   <claude@2xlibre.net>, 2011.
+#   <claude@2xlibre.net>, 2011-2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "mot-clé :"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtre :"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vue :"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "L'application %r n'a pas été trouvée"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 "Le modèle %(model_name)r n'a pas été trouvé dans l'application %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "l'objet « %(app_label)s.%(data_type)s » en relation"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modèle :"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "les objets « %(app_label)s.%(object_name)s » en relation"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "tous les %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "nombre de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Champs sur les objets %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ne semble pas être un objet urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Accueil"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s ne semble pas être un objet urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Accueil"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentation"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Signets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Documentation des signets"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +128,11 @@ msgstr ""
 "administrateur\n"
 "système si vous n'êtes pas sûr que votre ordinateur le soit).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentation pour cette page"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,11 +140,11 @@ msgstr ""
 "Vous envoie de n'importe quelle page vers la documentation de la vue qui a "
 "généré cette page."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Afficher l'identifiant de l'objet"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -152,42 +152,51 @@ msgstr ""
 "Affiche le content-type et l'identifiant unique pour les pages qui "
 "représentent un objet unique."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Modifier cet objet (fenêtre actuelle)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Renvoie à la page d'administration qui représente un objet seul."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Modifier cet objet (nouvelle fenêtre)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Comme ci-dessus, mais ouvre la page d'administration dans une nouvelle "
 "fenêtre."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modèles"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Templates"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtres"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Vues"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Booléen (True ou False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Champ de type : %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.mo
index 8079c9b30b..1ccc4ebdcf 100644
Binary files a/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.po
index 4560c6dfc4..c99cbe676f 100644
--- a/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-16 12:08+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "clib:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "scag:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "radharc:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Ní bhfuarthas feidhmchlár %r "
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Ní bhfuarthas samhail %(model_name)r  i bhfeidhmclár %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "An oibiacht gaolmhara `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "samhail:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "Oibiachtí gaolmhara `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "gach %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "líon %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Réimse ar oibiachtí %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "Feiceann sé nach bhfuil %s oibiacht urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Baile"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "Feiceann sé nach bhfuil %s oibiacht urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Baile"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Doiciméadúchán"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Leabharmharcín"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Leabharmharcín doiciméadúchán"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +128,11 @@ msgstr ""
 "ar an suíomh ó ríomhaire inmheánach\n"
 "(leabhar le do riarthóir córais muna bhfuil tú cinnte).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Doiciméadúchán le hadhaigh an leathanach seo"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,11 +140,11 @@ msgstr ""
 "Tógann se tusa ón aon leathanach go dtí an doiciméadúchán le hadhaigh an "
 "radharc a rinne an leathanach."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Taispéain oibiacht ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -152,42 +152,51 @@ msgstr ""
 "Taispéain an content-type agus ID uathúil le leathanaigh le hadhaigh "
 "oibiacht amháin."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Cuir in eagar an oibiacht seo (fuinneog láthair)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Léimeann go dtí an leathanach riaracháin le leathainaigh le hadhaigh "
 "oibiacht amháin."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Cuir in eagar an oibiacht seo (fuinneog nua)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Mar thuas, ach osclaíonn sé an leathanach riarachán if fuinneog nua"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Samhla"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Teimpléid"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Scagairí"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Clibeanna"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Radharcanna"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boole"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Réimse de Cineál: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/gl/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/gl/LC_MESSAGES/django.mo
index a6b2a2aee6..4d1094ad19 100644
Binary files a/django/contrib/admindocs/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/gl/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/gl/LC_MESSAGES/django.po
index 647db92293..a54e6b0976 100644
--- a/django/contrib/admindocs/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/gl/LC_MESSAGES/django.po
@@ -2,79 +2,92 @@
 #
 # Translators:
 # fonso <fonzzo@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2013-01-07 11:32+0000\n"
 "Last-Translator: fonso <fonzzo@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etiqueta:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtro:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vista:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Non se atopou a aplicación %r"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "O modelo %(model_name)r non se atopou na aplicación %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "o obxecto relacionado `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modelo:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "os obxectos relacionados `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "todos os %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "número de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Campos dos obxectos %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s non semella ser un obxecto urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Inicio"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +97,18 @@ msgstr "%s non semella ser un obxecto urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Inicio"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bookmarklets de documentación"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,21 +127,21 @@ msgstr ""
 "designado coma \"interno\" (fale co administrador do sistema se\n"
 "non está seguro de que o seu ordenador é \"interno\" .</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentación para esta páxina"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "Salta á documentación para a vista que xera a páxina."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Amosar ID do obxecto"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -148,42 +149,51 @@ msgstr ""
 "Amosa o tipo de contido e a ID única para páxinas que representan un obxecto "
 "determinado."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Editar este obxecto (nesta fiestra)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Salta á páxina de administración para páxina que representan un obxecto "
 "determinado."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Editar este obxecto (nunha nova fiestra)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Como enriba, pero abre a páxina de administración nunha nova fiestra."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "Modelos"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "Patróns"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "Etiquetas"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "Vistas"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Valor booleano (verdadeiro ou falso)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo do tipo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo
index 43a8b7f46a..0e4f9ccd0e 100644
Binary files a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po
index 041a86dd49..e50cbebfc2 100644
--- a/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/he/LC_MESSAGES/django.po
@@ -2,78 +2,91 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "תג:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "סינון:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ה־view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "יישום %r לא נמצא"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "מודל %(model_name)r לא נמצא ביישום %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "אוביקטי `%(app_label)s.%(data_type)s` קשורים"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "מודל:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "אובייקטי `%(app_label)s.%(object_name)s` קשורים"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "כל %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "מספר %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "שדות באובייקטי %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "לא נראה ש-%s הוא אובייקט urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "דף הבית"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +96,18 @@ msgstr "לא נראה ש-%s הוא אובייקט urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "דף הבית"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "תיעוד"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "ייסומניות"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "ייסומוניות תיעוד"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -124,60 +125,69 @@ msgstr ""
 "כ\"פנימי\" (יש לדבר עם מנהל המערכת שלך אם אינך בטוח/ה\n"
 "שהמחשב מסווג ככזה).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "תיעוד לדף זה"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "מקפיץ אותך מכל עמוד לתיעוד התצוגה שייצרה אותו."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "הצג מזהה אובייקט"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "מציג את סוג התוכן והמזהה הייחודי לעמודים המייצגים אובייקט בודד."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "עריכת אובייקט זה (בחלון הנוכחי)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "קופץ לעמוד הניהול לעמודים אשר מייצגים אובייקטים בודד."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "עריכת אובייקט זה (בחלון חדש)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "כנ\"ל, אך דף הניהול ייפתח בחלון חדש."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "מודלים"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "תבניות"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "Filters"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "תגים"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "בוליאני (אמת או שקר)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "שדה מסוג: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/hi/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/hi/LC_MESSAGES/django.mo
index e6da25a44d..200d8a3496 100644
Binary files a/django/contrib/admindocs/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/hi/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/hi/LC_MESSAGES/django.po
index 2092a5d23b..49f7864cec 100644
--- a/django/contrib/admindocs/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/hi/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-04 14:36+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "टैग:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "छन्नी:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "दृष्टि:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r अनुप्रयोग लापता है"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "%(model_name)r मॉडल %(app_label)r अनुप्रयोग में लापता है"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "`%(app_label)s.%(data_type)s` संबंधित वस्तु"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "मॉडल :"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "`%(app_label)s.%(object_name)s` संबंधित वस्तु"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "सभी %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s संख्या"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s वस्तु पर क्षेत्र"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s सही यू.आऱ.एल प्रतिरूप वस्तु नहीं है"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "गृह"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s सही यू.आऱ.एल प्रतिरूप वस्
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "गृह"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "दस्तावेज़ीकरण"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "बुकमार्कलेट्स"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "प्रलेखन बुकमार्कलेट्स"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,21 +126,21 @@ msgstr ""
 "कि आपका कंप्यूटर \"आंतरिक\" है)  रूप में निर्दिष्ट कंप्यूटर से\n"
 "साइट को देखना चाहते है.</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "इस पृष्ठ की प्रलेखन"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "दृश्य जो उस पृष्ठ को उत्पन्न करता है के प्रलेखन के लिए किसी भी पृष्ठ पर जा सकते है."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "वस्तु आइ.डी दिखाओ"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -148,40 +148,49 @@ msgstr ""
 "पृष्ठों के लिए सामग्री प्रकार और अनोखी आईडी जो एक एकल वस्तु का प्रतिनिधित्व करते हैं को "
 "दर्शाते है."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "इस वस्तु को संपादन करें (इस खिडकी में)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "पृष्ठों के लिए एडमिन प्रष्ट जो एक एकल वस्तु का प्रतिनिधित्व करते हैं से जाये. "
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "इस वस्तु को संपादन करें (नये खिडकी में)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "जैसा कि ऊपर में,लेकिन एक नई विंडों में एडमिन पृष्ठ को खोलता है."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "मॉडल"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "प्रारूप"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "फ़िल्टर्स"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "टैग्स"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "दृश्य"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "बूलियन (सही अथ‌वा गलत)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "फील्ड के प्रकार: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.mo
index 5803808c0e..5d191f1974 100644
Binary files a/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.po
index 8778b8293e..187672f2d7 100644
--- a/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/hr/LC_MESSAGES/django.po
@@ -1,80 +1,93 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <aljosa.mohorovic@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: aljosa <aljosa.mohorovic@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "prikaz:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikacija %r nije pronađena"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r nije pronađen u aplikaciji %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "povezani `%(app_label)s.%(data_type)s` objekt"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "povezani `%(app_label)s.%(object_name)s` objekti"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "svi %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "broj %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Polja na %s objektima"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "izgleda da %s nije urlpattern objekt"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Početna"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +97,18 @@ msgstr "izgleda da %s nije urlpattern objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Početna"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentacija bookmarklets-a"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +129,11 @@ msgstr ""
 "sigurni\n"
 "je li vaše računalo \"internal\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentacija za ovu stranicu"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,11 +141,11 @@ msgstr ""
 "Preusmjeri te sa bilo koje stranice na dokumentaciju za taj prikaz (view) "
 "koji generira stranicu."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Prikaži ID objekta"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -152,42 +153,51 @@ msgstr ""
 "Prikazuje tip sadržaja (content-type) i jedinstveni ID za stranice koje "
 "predstavljaju pojedinačan objekt."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Uredi objekt (u trenutnom prozoru)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Preusmjeri na admin stranicu za stranice koje predstavljaju pojedinačan "
 "objekt."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Uredi objekt (u novom prozoru)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Isto kao prethodno, ali otvara admin stranicu u novom prozoru."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "Modeli"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "Predlošci"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "Filteri"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "Tagovi"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (True ili False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Polje tipa: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/hu/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/hu/LC_MESSAGES/django.mo
index 17d1f9309a..f1cc10dbf2 100644
Binary files a/django/contrib/admindocs/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/hu/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/hu/LC_MESSAGES/django.po
index 7b4c1ae55d..e9388c71be 100644
--- a/django/contrib/admindocs/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/hu/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-19 19:31+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Attila Nagy <>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "címke:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "szűrő:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "nézet:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r alkalmazás nem található"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 "%(model_name)r modell nem található a következő alkalmazásban: %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "a kapcsolódó '%(app_label)s.%(data_type)s' objektum"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modell:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "kapcsolódó '%(app_label)s.%(object_name)s' objektumok"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "minden %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s mennyisége"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Mezők %s objektumokban"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s nem tűnik egy urlpattern objektumnak."
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Kezdőlap"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s nem tűnik egy urlpattern objektumnak."
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Kezdőlap"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentáció"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Könyvjelzők"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentum könyvjelzők"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +126,11 @@ msgstr ""
 "könyvjelzők között néhány oldal csak \"belső\" gépekről nézhető meg.\n"
 "(Kérdezze meg rendszergazdáját, hogy az Ön gépe \"belső\" gép-e.).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Az oldal dokumentációja"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,11 +138,11 @@ msgstr ""
 "Bármely oldalról annak a nézetnek a dokumentációjára ugrik, amely a kérdéses "
 "oldalt generálta."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Az objektum ID mutatása"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,40 +150,49 @@ msgstr ""
 "Az objektum által reprezentált oldalak 'content-type' és 'unique ID' "
 "értékeit mutatja."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Objektum szerkesztése (aktuális ablakban)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Az objektumhoz tartozó oldalak adminisztrációjához ugrik."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Objektum szerkesztése (új ablakban)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Mint fentebb, de az adminisztrációs oldalt új ablakban nyitja meg."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modellek"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Sablonok"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Szűrők"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Címkék"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Nézetek"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Logikai (True vagy False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Mezőtípus: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ia/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..c5d141e669
Binary files /dev/null and b/django/contrib/admindocs/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ia/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..52894bfa3f
--- /dev/null
+++ b/django/contrib/admindocs/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,198 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: views.py:58 views.py:60 views.py:62
+msgid "tag:"
+msgstr "etiquetta:"
+
+#: views.py:93 views.py:95 views.py:97
+msgid "filter:"
+msgstr "filtro:"
+
+#: views.py:156 views.py:158 views.py:160
+msgid "view:"
+msgstr "visualisation:"
+
+#: views.py:188
+#, python-format
+msgid "App %r not found"
+msgstr "Application %r non trovate"
+
+#: views.py:195
+#, python-format
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "Modello %(model_name)r non trovate in application %(app_label)r"
+
+#: views.py:207
+#, python-format
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "le objecto `%(app_label)s.%(data_type)s` connexe"
+
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
+msgid "model:"
+msgstr "modello:"
+
+#: views.py:222 views.py:254
+#, python-format
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "objectos `%(app_label)s.%(object_name)s` connexe"
+
+#: views.py:226 views.py:259
+#, python-format
+msgid "all %s"
+msgstr "tote le %s"
+
+#: views.py:231 views.py:264
+#, python-format
+msgid "number of %s"
+msgstr "numero de %s"
+
+#: views.py:269
+#, python-format
+msgid "Fields on %s objects"
+msgstr "Campos sur %s objectos"
+
+#: views.py:361
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s non pare esser un objecto urlpattern"
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Initio"
+
+#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
+#: templates/admin_doc/missing_docutils.html:7
+#: templates/admin_doc/model_detail.html:15
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: templates/admin_doc/template_tag_index.html:8
+#: templates/admin_doc/view_detail.html:7
+#: templates/admin_doc/view_index.html:8
+msgid "Documentation"
+msgstr "Documentation"
+
+#: templates/admin_doc/bookmarklets.html:8
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
+
+#: templates/admin_doc/bookmarklets.html:11
+msgid "Documentation bookmarklets"
+msgstr "Documentation bookmarklets"
+
+#: templates/admin_doc/bookmarklets.html:15
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Pro installar bookmarklets, trahe le ligamine a tu barra "
+"de marcapaginas, o clicca sur le ligamine con le button dextre e adde lo a "
+"vostre marcapaginas. Ora vos pote seliger le bookmarklet ab omne pagina in "
+"le sito.  Nota que alcunes de iste bookmarklets necessita visualisar le sito "
+"ab un computer destinate a esser \"interne\" (contacta vostre administrator "
+"de systema si vos non es secur si vostre computator es \"interne\").</p>\n"
+
+#: templates/admin_doc/bookmarklets.html:25
+msgid "Documentation for this page"
+msgstr "Documentation pro iste pagina"
+
+#: templates/admin_doc/bookmarklets.html:26
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Transporta vos ab omne pagina al documentation pro le visualisation que "
+"genera ille pagina."
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr "Monstrar le ID del objecto"
+
+#: templates/admin_doc/bookmarklets.html:29
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Monstrar le typo de contento e le ID unic pro paginas que representa un sol "
+"objecto."
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr "Modificar iste objecto (fenestra actual)"
+
+#: templates/admin_doc/bookmarklets.html:32
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+"Transporta vos al pagina administrative pro le paginas que representa un sol "
+"objecto."
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr "Modificar iste objecto (nove fenestra)"
+
+#: templates/admin_doc/bookmarklets.html:35
+msgid "As above, but opens the admin page in a new window."
+msgstr "Idem, ma aperi le pagina administrative in un nove fenestra."
+
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+msgid "Models"
+msgstr "Modellos"
+
+#: templates/admin_doc/template_detail.html:8
+msgid "Templates"
+msgstr "Patronos"
+
+#: templates/admin_doc/template_filter_index.html:9
+msgid "Filters"
+msgstr "Filtros"
+
+#: templates/admin_doc/template_tag_index.html:9
+msgid "Tags"
+msgstr "Etiquettas"
+
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
+msgid "Views"
+msgstr "Visualisationes"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (ver o false)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo de typo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/id/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/id/LC_MESSAGES/django.mo
index d2a8e637b2..588078ab7f 100644
Binary files a/django/contrib/admindocs/locale/id/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/id/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/id/LC_MESSAGES/django.po
index a72b2da6d7..cabca062ce 100644
--- a/django/contrib/admindocs/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/id/LC_MESSAGES/django.po
@@ -8,74 +8,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-06 20:02+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikasi %r tidak ditemukan"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r tidak ditemukan di aplikasi %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "objek `%(app_label)s.%(data_type)s` yang terkait"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "obyek `%(app_label)s.%(object_name)s` yang terkait"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "semua %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "jumlah %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Bidang dalam objek %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s bukan berupa objek urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Beranda"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s bukan berupa objek urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Beranda"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklet"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bookmarklet dokumentasi"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -127,11 +127,11 @@ msgstr ""
 "sistem Anda apabila tidak yakin apakah komputer Anda termasuk komputer\n"
 "\"internal\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentasi untuk laman ini"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -139,11 +139,11 @@ msgstr ""
 "Buka dari laman apa saja ke laman dokumentasi untuk view yang menghasilkan "
 "laman tersebut."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Tampilkan ID objek"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -151,40 +151,49 @@ msgstr ""
 "Tampilkan tipe-konten dan ID unik untuk laman yang mewakili sebuah objek "
 "tunggal."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Edit objek ini (pada jendela ini)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Buka laman admin pada laman yang mewakili sebuah objek tunggal."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Edit objek ini (pada jendela baru)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Sama seperti di atas, tetapi laman halaman admin di jendela baru."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Model"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Templat"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filter"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tag"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "View"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (nilai True atau False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Jenis bidang: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/is/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/is/LC_MESSAGES/django.mo
index fb05a0311d..b43af366d1 100644
Binary files a/django/contrib/admindocs/locale/is/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/is/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/is/LC_MESSAGES/django.po
index 9cbe644ce0..b1ebdc768e 100644
--- a/django/contrib/admindocs/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/is/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-19 14:46+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "merki:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "sía:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "skoða:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Forrit %r fannst ekki"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Líkanið %(model_name)r finnst ekki í forritinu %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "tengdi `%(app_label)s.%(data_type)s` hluturinn"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "líkan:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "tengdir `%(app_label)s.%(object_name)s` hlutir"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "allt %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "fjöldi af %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Svæði í %s hlutnum"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s virðist ekki vera urlpattern hlutur"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Heim"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s virðist ekki vera urlpattern hlutur"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Heim"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Skjölun"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bókamerklar"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Skjölunarbókamerklar"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -129,11 +129,11 @@ msgstr ""
 "skráð sem \"internal\" (hafðu samband við kerfisstjórann ef þú ert óviss "
 "hvort tölvan þín er \"internal\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Skjölun þessarar síðu"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -141,52 +141,61 @@ msgstr ""
 "Sendir þig af hvaða síðu sem er á skjölun þess framsetningarlags sem myndar "
 "hana."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Sýna kenni hlutar"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "Sýnir efnistag og sérkenni síða sem gefa tiltekna mynd af stökum hlut."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Breyta þessum hlut (í þessum glugga)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Stekkur á stjórnunarsíðuna fyrir þær síður sem gefa tiltekna mynd af stökum "
 "hlut."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Breyta þessum hlut (nýr gluggi)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Eins og að ofan en opnar stjórnunarsíðuna í nýjum glugga."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Módel"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Sniðmát"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Síur"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tögg"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Ásýndir"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boole-gildi (True eða False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Reitur af gerð: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/it/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/it/LC_MESSAGES/django.mo
index 11a8b96e25..290548b06a 100644
Binary files a/django/contrib/admindocs/locale/it/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/it/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/it/LC_MESSAGES/django.po
index 6b2d6e0fa2..6a7bc556fc 100644
--- a/django/contrib/admindocs/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/it/LC_MESSAGES/django.po
@@ -2,79 +2,91 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nicola Larosa <transifex@teknico.net>, 2011.
+# Nicola Larosa <transifex@teknico.net>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtro:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Appl. %r non trovata"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modello %(model_name)r non trovato nell'appl. %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "l'oggetto `%(app_label)s.%(data_type)s` collegato"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modello:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "oggetti `%(app_label)s.%(object_name)s` collegati"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "tutti %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "numero di %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Campi sugli oggetti %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s non sembra essere un oggetto urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Pagina iniziale"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s non sembra essere un oggetto urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Pagina iniziale"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklet"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bookmarklet alla documentazione"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +128,11 @@ msgstr ""
 "computer designato come \"interno\" (chiedi al tuo amministratore di \n"
 "sistema se non sei sicuro che il tuo computer sia \"interno\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentazione per questa pagina"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,11 +140,11 @@ msgstr ""
 "Porta da qualsiasi pagina alla documentazione della view che genera quella "
 "pagina."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Mostra l'ID dell'oggetto"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -152,43 +152,52 @@ msgstr ""
 "Mostra il content-type e l'ID univoco di pagine che rappresentano un singolo "
 "oggetto."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Modifica quest'oggetto (nella finestra attuale)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Porta alla pagina amministrativa di pagine che rappresentano un singolo "
 "oggetto."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Modifica quest'oggetto (in una nuova finestra)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Come sopra, ma apre la pagina di amministrazione in una nuova finestra."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modelli"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Template"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtri"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tag"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "View"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (True o False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo di tipo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.mo
index 03f0645019..9d7965bd9b 100644
Binary files a/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.po
index e9c0b5e601..b671de1e2d 100644
--- a/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ja/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-12 19:52+0000\n"
-"Last-Translator: Fandekasp <lemaire.adrien@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Yoichi Fujimoto <wozozo@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "タグ"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
-msgstr "フィルタ"
+msgstr "フィルター"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ビュー"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "アプリケーション %r が見つかりません"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 "モデル %(model_name)r が %(app_label)r アプリケーションに見つかりません"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "`%(app_label)s.%(data_type)s` (関連オブジェクト)"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "モデル :"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "`%(app_label)s.%(object_name)s` (関連オブジェクト)"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "全ての %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s の数"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s のフィールド"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s はurlpatternオブジェクトでは無いようです"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "ホーム"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s はurlpatternオブジェクトでは無いようです"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "ホーム"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "ドキュメント"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "ブックマークレット"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "ドキュメントへのブックマークレット"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -123,66 +123,75 @@ msgstr ""
 "マークツールバーにドラッグするか、\n"
 "リンクを右クリックしてブックマークに追加してください。これで\n"
 "サイトのどのページからでもブックマークレットを選択可能になりました。\n"
-"ブックマークレットによっては、内部ネットワークにあるコンピュータからこのサイ"
-"トを\n"
+"ブックマークレットによっては、内部ネットワークにあるコンピューターからこのサ"
+"イトを\n"
 "参照していなければならないことがあります。内部ネットワークにあるかどうか不明"
 "な場合は、システム管理者に確認してください。</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "このページのドキュメント"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "各ページから、ページを生成したビューのドキュメントにジャンプします。"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "オブジェクト ID を表示"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "単一のオブジェクトを表示するページのコンテンツタイプと一意な IDを表示します。"
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "オブジェクトを (現在のウィンドウで) 編集"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "単一のオブジェクトを表示するページの管理ページへジャンプします。"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "オブジェクトを (新しいウィンドウで) 編集"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "上と同じですが、新しいウィンドウで管理ページを開きます。"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "モデル"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "テンプレート"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr "フィルタ"
+msgstr "フィルター"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "タグ"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "ビュー"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "ブール値 (真: True または偽: False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "タイプが %(field_type)s のフィールド"
diff --git a/django/contrib/admindocs/locale/ka/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ka/LC_MESSAGES/django.mo
index 5b3586e665..fd1b3bd630 100644
Binary files a/django/contrib/admindocs/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ka/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ka/LC_MESSAGES/django.po
index d5db3ae6fb..9fbec1e4e3 100644
--- a/django/contrib/admindocs/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ka/LC_MESSAGES/django.po
@@ -1,79 +1,93 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2013-03-01 08:40+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ტეგი:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "ფილტრი:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "წარმოდგენა:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "აპლიკაცია %r ვერ მოიძებნა"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "მოდელი %(model_name)r ვერ მოიძებნა აპლიკაციაში %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "`%(app_label)s.%(data_type)s` დაკავშირებული ობიექტი"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "მოდელი:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "`%(app_label)s.%(object_name)s` დაკავშირებული ობიექტები"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "ყველა %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s - რაოდენობა"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s ობიექტების ველები"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s არ არის urlpattern-ის შესაბამისი ობიექტი"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "საწყისი გვერდი"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +97,18 @@ msgstr "%s არ არის urlpattern-ის შესაბამისი
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "საწყისი გვერდი"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "დოკუმენტაცია"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "სანიშნები"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "დოკუმენტაციის სანიშნები"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +128,11 @@ msgstr ""
 "ადმინისტრატორს, თუ არ ხართ დარწმუნებული, რომ თქვენი კომპიუტერი არის\n"
 "\"შიდა\" კომპიუტერი).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "ამ გვერდის დოკუმენტაცია"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,51 +140,60 @@ msgstr ""
 "გადასვლა ნებისმიერი გვერდიდან იმ წარმოდგენის დოკუმენტაციაზე, რომელიც ამ "
 "გვერდს აგენერირებს."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "ობიექტის ID-ის ჩვენება"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "ერთი ობიექტის ამსახველი გვერდის content-type-ის და უნიკალური ID-ის ჩვენება."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "შევცვალოთ ეს ობიექტი (იმავე ფანჯარაში)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "ერთი ობიექტის ამსახველი გვერდების ადმინისტრირებაზე გადასვლა."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "შევცვალოთ ეს ობიექტი (ახალ ფანჯარაში)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "იგივე, ოღონდ ხსნის ადმინისტრირების გვერდს ახალ ფანჯარაში."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "მოდელები"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "შაბლონები"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "ფილტრები"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "ტეგები"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "წარმოდგენები"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "ლოგიკური (True ან False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "ველის ტიპი: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/kk/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/kk/LC_MESSAGES/django.mo
index d38f37de40..6f3ad44beb 100644
Binary files a/django/contrib/admindocs/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/kk/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/kk/LC_MESSAGES/django.po
index 4c1c6a4b91..6666fb7557 100644
--- a/django/contrib/admindocs/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/kk/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "тег:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "сүзгіш:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "көрініс:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r app табылмады"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "%(app_label)r app ішінен %(model_name)r үлгісі табылмады"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "байланысты `%(app_label)s.%(data_type)s` объект"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "модель:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "байланысты `%(app_label)s.%(object_name)s` объекттер"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "барлық %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s саны"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Объекттердің жолақ саны %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s  urlpattern объектке ұқсамайды"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Негізгі"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s  urlpattern объектке ұқсамайды"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Негізгі"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Букмарклеттер"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Құжаттама букмарклеттері"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -118,60 +118,69 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Бұл бетке арналған документация"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "нысан ID'ді көрсет"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Бұл объектты өзгерт (ағымдағы терезеде)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Бұл объектты өзгерт (жаңа терезеде)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Үстіндегідей, бірақ admin бетті жаңа терезеде ашады."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (True немесе False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Жолақтын түрі: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/km/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/km/LC_MESSAGES/django.mo
index 8725cbedde..e5a95f4024 100644
Binary files a/django/contrib/admindocs/locale/km/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/km/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/km/LC_MESSAGES/django.po
index 8120408ce8..4b0a2bac24 100644
--- a/django/contrib/admindocs/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/km/LC_MESSAGES/django.po
@@ -6,73 +6,85 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ប្រភេទ:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "ពាក្យស្វែងរក"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "មើល"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "ស្វែងរក App %r មិនឃើញ ។"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr ""
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "ទាំងអស់ %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "ចំនួន​នៃ​%s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "ទិន្នន័យអំពី %s កម្មវិធី"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ហាក់បីដូចជា URL ដែល​ត្រឹមត្រូវទេ"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "គេហទំព័រ"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -82,30 +94,18 @@ msgstr "%s ហាក់បីដូចជា URL ដែល​ត្រឹមត
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "គេហទំព័រ"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "ឯកសារ"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "កំរងចំណាំ"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "កំរងចំណាំអំពីឯកសារ"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -119,11 +119,11 @@ msgstr ""
 "<p class=\"help\">ដើម្បីតំលើងកំរងចំណាំ សូមទាញយកអត្ថបទភ្ជាប់ទៅ​កាន់​"
 "របាឧបករណ៍ ឬក៏ចុចខាងស្តាំលើអត្ថបទភ្ជាប់ហើយ​បញ្ជូលទៅក្នុងកំរងចំណាំរបស់លោកអ្នក។</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "ឯកសារសំរាប់ទំព័រនេះ"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -131,11 +131,11 @@ msgstr ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "បង្ហាញលេខសំគាល់កម្មវិធី"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -143,40 +143,49 @@ msgstr ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "កែប្រែកម្មវិធីនេះ(វីនដូវកំពុងប្រើ)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "បង្វែរទៅកាន់​ ទំព័រគ្រប់គ្រង សំរាប់ទំព័រណាដែលតំណាងអោយកម្មវិធីតែមួយ។"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "កែប្រែកម្មវិធីនេះ(វីនដូវថ្មី)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "ដូចខាងលើ តែបើកនៅទំព័រវីនដូវថ្មី"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (អាច​ជា True រឺ False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
diff --git a/django/contrib/admindocs/locale/kn/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/kn/LC_MESSAGES/django.mo
index 875d5f4c63..78a75f2235 100644
Binary files a/django/contrib/admindocs/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/kn/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/kn/LC_MESSAGES/django.po
index 2e81bddaff..d751958e3f 100644
--- a/django/contrib/admindocs/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/kn/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ಟ್ಯಾಗ್:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "ಸೋಸಕ:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ನೋಟ:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r ಅನ್ವಯಾಂಶ ಸಿಗಲಿಲ್ಲ"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "ಮಾಡೆಲ್:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr ""
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "ಎಲ್ಲಾ %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s ಗಳ ಸಂಖ್ಯೆ"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s ವಸ್ತುಗಳ ಅಂಶಗಳು"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s  URL ಸ್ವರೂಪದ್ದಾಗಿ ತೋರುವದಿಲ್ಲ."
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "ಪ್ರಾರಂಭಸ್ಥಳ(ಮನೆ)"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s  URL ಸ್ವರೂಪದ್ದಾಗಿ ತೋರುವದಿಲ್
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "ಪ್ರಾರಂಭಸ್ಥಳ(ಮನೆ)"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "ವಿವರಮಾಹಿತಿ"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "ಚಿಕ್ಕ ಪುಟಗುರುತುಗಳು"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "ಮಾಹಿತಿಯ ಚಿಕ್ಕ ಪುಟಗುರುತುಗಳು"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,62 +126,71 @@ msgstr ""
 "(  ನಿಮ್ಮ ಗಣಕವು \"internal\" ಹೌದೇ ಅಲ್ಲವೇ ಎಂದು ಗೊತ್ತಿಲ್ಲದಿದ್ದರೆ , ಗಣಕದ ಆಡಳಿತಗಾರರನ್ನು "
 "ಕೇಳಿರಿ).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "ಈ ಪುಟದ ಬಗೆಗಿನ ಮಾಹಿತಿ"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "ನಿಮ್ಮನ್ನು ಯಾವುದೇ ಪುಟದಿಂದ ಆ ಪುಟವನ್ನು ಸೃಷ್ಟಿಸುವ ನೋಟದ ಮಾಹಿತಿಪುಟಕ್ಕೆ ಕೊಂಡೊಯ್ಯುವದು"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "ವಸ್ತುವಿನ ಐಡಿ ತೋರಿಸಿ"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "ಏಕೈಕ ವಸ್ತುವನ್ನು ಪ್ರತಿನಿಧಿಸುವ ಪುಟಗಳ ವಿಶಿಷ್ಠ ಐಡಿ ಮತ್ತು ಒಳವಿಷಯಬಗೆಯನ್ನು ತೋರಿಸುತ್ತದೆ."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "ಈ ವಸ್ತುವನ್ನು ಬದಲಿಸಿ(ಈಗಿನ ಕಿಟಕಿಯಲ್ಲಿ)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "ಏಕೈಕ ವಸ್ತುವನ್ನು ಪ್ರತಿನಿಧಿಸುವ ಪುಟಗಳಿಗಾಗಿ ಆಡಳಿತಪುಟಕ್ಕೆ ಒಯ್ಯುತ್ತದೆ"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "ಈ ವಸ್ತುವನ್ನು ಬದಲಿಸಿ(ಹೊಸ ಕಿಟಕಿಯಲ್ಲಿ)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "ಮೇಲಿನಂತೆ, ಆದರೆ ಆಡಳಿತಪುಟವನ್ನು ಹೊಸ ಕಿಟಕಿಯಲ್ಲಿ ತೆರೆಯುವದು."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "ಬೂಲಿಯನ್ (ಹೌದು ಅಥವ ಅಲ್ಲ)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "ಕ್ಷೇತ್ರದ ಬಗೆ: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ko/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ko/LC_MESSAGES/django.mo
index 77f71c9cb2..765691f6b6 100644
Binary files a/django/contrib/admindocs/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ko/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ko/LC_MESSAGES/django.po
index 573cb16ed4..4cb2608078 100644
--- a/django/contrib/admindocs/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ko/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "태그:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "필터:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "뷰:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "어플리케이션 %r (이)가 없습니다."
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "모델 %(model_name)r (이)가 어플리케이션 %(app_label)r 에 없습니다."
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "`%(app_label)s.%(data_type)s` 관련 오브젝트"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "모델:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "`%(app_label)s.%(object_name)s` 관련 오브젝트(들)"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "모든 %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s 의 수"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s 오브젝트의 필드"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s (은)는 url 패턴의 오브젝트가 아닙니다."
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "홈"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s (은)는 url 패턴의 오브젝트가 아닙니다."
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "홈"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "문서"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "북마크릿"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "문서 북마크릿"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,60 +126,69 @@ msgstr ""
 "(내부 네트워크가 있는지 불명확한 경우 시스템 관리자에게 확인하시기 바랍니다.)"
 "</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "이 페이지의 문서"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "각 페이지로에서 해당 페이지를 생성한 뷰의 문서로 갑니다."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "오브젝트 아이디 표시"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "단일 오브젝트 페이지의 고유 아이디와 컨텐츠 타입을 표시합니다."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "오브젝트 편집(현재 창)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "단일 오브젝트 페이지의 관리 페이지로 이동"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "오브젝트 편집(새로운 창)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "위와 동일하며, 새로운 창에서 관리 페이지를 엽니다."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "boolean(참 또는 거짓)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "%(field_type)s 형식 필드"
diff --git a/django/contrib/admindocs/locale/lt/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/lt/LC_MESSAGES/django.mo
index 13a2cb4730..d2819ab669 100644
Binary files a/django/contrib/admindocs/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/lt/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/lt/LC_MESSAGES/django.po
index 97be05f3cc..0733b806ca 100644
--- a/django/contrib/admindocs/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/lt/LC_MESSAGES/django.po
@@ -8,75 +8,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-09 15:11+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Simonas Kazlauskas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "žyme:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtras:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vaizdas:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Programa %r nerasta"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modelis %(model_name)r programoje %(app_label)r nerastas"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "susijęs `%(app_label)s.%(data_type)s` objektas"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modelis:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "susiję`%(app_label)s.%(object_name)s` objektai"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "visi %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s skaičius"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Objekto %s laukai"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s neatrodo kaip urlpattern objektas"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Pradinis"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -86,30 +98,18 @@ msgstr "%s neatrodo kaip urlpattern objektas"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Pradinis"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Greitosios žymės"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Doumentacijos greitosios žymės"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -130,11 +130,11 @@ msgstr ""
 "(pasitarkite su administratorium, jei nežinai ar tavo kompiuteris yra "
 "vidinis).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Šio puslapio dokumentacija"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -142,51 +142,60 @@ msgstr ""
 "Pereina iš bet kurio puslapio į jo view funkcijos dokumentaciją, kuri "
 "sukūria tą puslapį"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Parodyti objekto ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "Parodyti content-type ir unikalų puslapių ID, kuris parodo vieną objektą."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Redaguoti šį objektą (einamajame lange)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Pereina į administravimo puslapį, kuris parodo vieną objektą."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Redaguoti šį objektą (naujame lange)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Kaip ir viršuje, bet administravimo puslapį atidaro naujame lange."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modeliai"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Šablonai"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtrai"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Gairės"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Rodiniai"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Loginė reikšmė (True arba False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Lauko tipas: %(field_type)s "
diff --git a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo
index 05e5d1f7e5..e105109b75 100644
Binary files a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po
index ccd776115d..22f5301b79 100644
--- a/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/lv/LC_MESSAGES/django.po
@@ -6,75 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tags:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtrs:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "skats:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Lietotne %r netika atrasta"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modelis  %(model_name)r lietotnē %(app_label)r nav atrasts"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "saistītais `%(app_label)s.%(data_type)s` objekts"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modelis:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "saistītie `%(app_label)s.%(object_name)s` objekti"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "visi %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s skaits"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Lauki %s objektiem"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s nav urlpattern objekts"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Sākums"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s nav urlpattern objekts"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Sākums"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentācija"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Grāmatzīmes"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentācijas grāmatzīmes"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,61 +128,70 @@ msgstr ""
 "(ja ir neskaidrības, vai dators ir \"iekšējais\", runājiet ar sistēmas "
 "administratoru).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentācija šai lapai"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Pārvieto no jebkuras lapas uz tā skata dokumentāciju, kas ģenerē šo lapu."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Parādīt objekta ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "Parāda content-type un unikālo ID lapām, kas atbilst vienam objektam."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Labot šo objektu (pašreizējā logā)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Pārvieto uz admininstrācijas lapu tām lapām, kas attēlo vienu objektu."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Labot šo objektu (jaunā logā)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Tāpat kā augstāk, tikai atver administrācijas lapu jaunā logā."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (True vai False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Lauks ar tipu: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.mo
index e55a49d200..d2154ac08a 100644
Binary files a/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.po
index 47f05aa465..b3a96e75d9 100644
--- a/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/mk/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-15 11:40+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "таг:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "филтер:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "поглед:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Не е најдена апликацијата %r"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Моделот %(model_name)r не е најден во апликацијата %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "поврзаниот `%(app_label)s.%(data_type)s` објект"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "модел:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "поврзани `%(app_label)s.%(object_name)s` објекти"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "сите %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "број на %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Полиња на %s објекти"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s не изгледа дека е url објект"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Дома"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s не изгледа дека е url објект"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Дома"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Документација"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Обележувачи"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Обележувачи на документација"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +128,11 @@ msgstr ""
 "сајтот од компјутер кој е означен како „внатрешен“ (разговарајте со вашиот \n"
 "администратор ако не сте сигурни).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Документација за оваа страница"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,11 +140,11 @@ msgstr ""
 "Ве носи од било која страница од документацијата до погледот кој ја генерира "
 "таа страница."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Прикажи идентификационен број на објектот"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -152,41 +152,50 @@ msgstr ""
 "Го прикажува типот на содржината и уникатниот идентификационен број за "
 "страници  кои претставуваат единечен објект."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Уреди го овој објект (во овој прозорец)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Скокнува до админ страницата за страници кои претставуваат единечен објект."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Уреди го овој објект (во нов прозорец)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Како погоре, но ја отвара админ страницата во нов прозорец."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Модели"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Шаблони (темплејти)"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Филтри"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Тагови"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Погледи (вјуа)"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Логичка (или точно или неточно)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Поле од тип: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ml/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ml/LC_MESSAGES/django.mo
index b0d480320c..32deb5e3a8 100644
Binary files a/django/contrib/admindocs/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ml/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ml/LC_MESSAGES/django.po
index fed4ba068d..21af206310 100644
--- a/django/contrib/admindocs/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ml/LC_MESSAGES/django.po
@@ -2,78 +2,91 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Rajeesh Nair <rajeeshrnair@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ടാഗ്:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "അരിപ്പ:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "വ്യൂ"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r എന്ന App കണ്ടില്ല."
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "%(app_label)r എന്ന Appല്‍ %(model_name)r എന്ന മാത്രുക കണ്ടില്ല."
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "ബന്ധപ്പെട്ട `%(app_label)s.%(data_type)s` വസ്തു"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "മാത്രുക:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "ബന്ധപ്പെട്ട `%(app_label)s.%(object_name)s` വസ്തുക്കള്‍"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "%s എല്ലാം"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%sന്റെ എണ്ണം"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s വസ്തുക്കളിലെ വിവരങ്ങള്‍"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s വിലാസ മാത്രുക (urlpattern object) ആണെന്ന് തോന്നുന്നില്ല."
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "പൂമുഖം"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +96,18 @@ msgstr "%s വിലാസ മാത്രുക (urlpattern object) ആണെ
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "പൂമുഖം"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "സഹായക്കുറിപ്പുകള്‍"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "ബുക്ക് മാര്‍ക്കുകള്‍"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "സഹായക്കുറിപ്പുകളുടെ ബുക്ക്മാര്‍ക്കുകള്‍"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,61 +127,70 @@ msgstr ""
 "നിങ്ങളുടെ കംപ്യൂട്ടര്‍ അത്തരത്തില്‍ പെട്ടതാണോ എന്നറിയാന്‍ സിസ്റ്റം അഡ്മിനിസ്ട്രേട്ടറെ ബന്ധപ്പെടുക.</"
 "p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "ഈ പേജിന്റെ സഹായക്കുറിപ്പുകള്‍"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "ഏതു പേജില്‍ നിന്നും അതിന്റെ ഉദ്ഭവമായ വ്യൂവിന്റെ സഹായക്കുറിപ്പിലേക്കു ചാടാന്‍"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "വസ്തുവിന്റെ ഐഡി കാണിക്കുക."
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "ഒറ്റ വസ്തുവിനെ പ്രതിനിധീകരിക്കുന്ന പേജുകളുടെ ഉള്ളടക്കത്തിന്റെ തരവും തനതായ IDയും കാണിക്കുന്നു."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "ഈ വസ്തുവില് മാറ്റം വരുത്തുക (ഇതേ വിന്‍ഡോ)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "ഒറ്റ വസ്തുവിനെ പ്രതിനിധീകരിക്കുന്ന പേജുകള്‍ക്കുള്ള അഡ്മിന്‍ പേജിലേക്ക് ചാടുന്നു."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "ഈ വസ്തുവില് മാറ്റം വരുത്തുക (പുതിയ വിന്‍ഡോ)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "മുകളിലേതു പോലെ, പക്ഷെ, അഡ്മിന്‍ പേജ് പുതിയ വിന്ഡോവിലാണ് തുറക്കുക."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "മോഡലുകള്‍"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "ടെമ്പ്‌ലേറ്റുകള്‍"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "ഫില്‍ട്ടറുകള്‍"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "ടാഗുകള്‍"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "വ്യൂകള്‍"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "ശരിയോ തെറ്റോ (True അഥവാ False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "%(field_type)s എന്ന തരത്തിലുള്ള കളം (ഫീല്‍ഡ്)"
diff --git a/django/contrib/admindocs/locale/mn/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/mn/LC_MESSAGES/django.mo
index 7e2ca091d0..9196184637 100644
Binary files a/django/contrib/admindocs/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/mn/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/mn/LC_MESSAGES/django.po
index e63cae4a05..7e48d18236 100644
--- a/django/contrib/admindocs/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/mn/LC_MESSAGES/django.po
@@ -2,79 +2,91 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011, 2012.
+# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-15 12:32+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "шошго:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "шүүлтүүр:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "харах:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r програм олдсонгүй"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "  %(app_label)r програмд %(model_name)r модел олдсонгүй"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "холбогдох `%(app_label)s.%(data_type)s`объект"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "модел:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "холбогдох `%(app_label)s.%(object_name)s` объектууд"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "бүх %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s-ийн тоо"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr " %s объектийн нөхөх хэсгүүд"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s нь url хэлбэрийн объект биш байна"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Админ эхлэл"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s нь url хэлбэрийн объект биш байна"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Админ эхлэл"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Баримтжуулалт"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklet-ууд"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Мookmarklet-уудын баримтжуулалт"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +126,11 @@ msgstr ""
 " сайт руу орох шаардлагатай болдог (компьютер тань \"дотоод\" мөн\n"
 " эсэхийг мэдэхгүй байгаа бол системийн удирдлагаасаа асууна уу).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Энэ хуудасны баримтжуулалт"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,11 +138,11 @@ msgstr ""
 "Таныг ямар ч хамаагүй хуудаснаас тухайн хуудсыг гаргаж байгаа "
 "баримтжуулалтанд аваачна."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Объектийн ID-ийг харуулах"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,40 +150,49 @@ msgstr ""
 "Нэг объект харуулж буй хуудаснуудын агуулгын төрөл болоод давтагдахгүй ID-"
 "ийг харуулна."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Энэ объектийг засварлах (одоо хэрэглэж буй цонх)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Нэг объект харуулж буй хуудаснуудын удирдлагын хуудсанд аваачна."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Энэ объектийг засварлах (шинэ цонх)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Дээрхийн нэгэн адил ч удирдлагын хуудсыг шинэ цонхонд нээнэ."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Моделууд"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Загварууд"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Шүүлтүүрүүд"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Таг-ууд"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "View-үүд"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (Үнэн худлын аль нэг нь)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Талбарийн төрөл нь : %(field_type)s"
diff --git a/django/contrib/admindocs/locale/my/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..4b77159df6
Binary files /dev/null and b/django/contrib/admindocs/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/my/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..78788e65e8
--- /dev/null
+++ b/django/contrib/admindocs/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,186 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2013-03-18 11:10+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: views.py:58 views.py:60 views.py:62
+msgid "tag:"
+msgstr "အမည်:"
+
+#: views.py:93 views.py:95 views.py:97
+msgid "filter:"
+msgstr "စီစစ်မှု:"
+
+#: views.py:156 views.py:158 views.py:160
+msgid "view:"
+msgstr "ကြည့်ရှု:"
+
+#: views.py:188
+#, python-format
+msgid "App %r not found"
+msgstr "%r အပ်ပရိုဂရမ်ရှာမတွေ့"
+
+#: views.py:195
+#, python-format
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "%(app_label)r အပ်ပရိုဂရမ်တွင် %(model_name)r မော်ဒယ်ရှာမတွေ့"
+
+#: views.py:207
+#, python-format
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "ဆက်နွယ်သော `%(app_label)s.%(data_type)s` အရာဝတ္ထု"
+
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
+msgid "model:"
+msgstr "မော်ဒယ်:"
+
+#: views.py:222 views.py:254
+#, python-format
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "ဆက်နွယ်သော `%(app_label)s.%(object_name)s` အရာဝတ္ထုများ"
+
+#: views.py:226 views.py:259
+#, python-format
+msgid "all %s"
+msgstr "%s အားလံုး"
+
+#: views.py:231 views.py:264
+#, python-format
+msgid "number of %s"
+msgstr "%s အရေအတွက်"
+
+#: views.py:269
+#, python-format
+msgid "Fields on %s objects"
+msgstr ""
+
+#: views.py:361
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "ပင်မ"
+
+#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
+#: templates/admin_doc/missing_docutils.html:7
+#: templates/admin_doc/model_detail.html:15
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: templates/admin_doc/template_tag_index.html:8
+#: templates/admin_doc/view_detail.html:7
+#: templates/admin_doc/view_index.html:8
+msgid "Documentation"
+msgstr "စာရွက်စာတမ်း"
+
+#: templates/admin_doc/bookmarklets.html:8
+msgid "Bookmarklets"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:11
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:15
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:25
+msgid "Documentation for this page"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:26
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:29
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:32
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:35
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+msgid "Models"
+msgstr "မော်ဒယ်များ"
+
+#: templates/admin_doc/template_detail.html:8
+msgid "Templates"
+msgstr "ပံုစံပြားများ"
+
+#: templates/admin_doc/template_filter_index.html:9
+msgid "Filters"
+msgstr "စီစစ်မှုများ"
+
+#: templates/admin_doc/template_tag_index.html:9
+msgid "Tags"
+msgstr "အမည်များ"
+
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
+msgid "Views"
+msgstr "ကြည့်ရှုခြင်းများ"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
diff --git a/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.mo
index f1e662c4ce..9f05b1b354 100644
Binary files a/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.po
index fb31a58c39..0a7889f7f7 100644
--- a/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/nb/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-12 14:15+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Fant ikke applikasjonen %r"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Fant ikke modellen %(model_name)r i applikasjonen %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "det relaterte `%(app_label)s.%(data_type)s`-objektet"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modell:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "relaterte `%(app_label)s.%(object_name)s`-objekter"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "alle %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "antall %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Felter på %s-objekter"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ser ikke ut til å være et urlpattern-objekt"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Hjem"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s ser ikke ut til å være et urlpattern-objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Hjem"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bokmerker"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentasjonsbokmerker"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -125,11 +125,11 @@ msgstr ""
 "(kontakt din systemadministrator hvis du er usikker på om maskinen din er "
 "\"intern\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentasjon for denne siden"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -137,11 +137,11 @@ msgstr ""
 "Hopp fra hvilken som helst side til dokumentasjonen for visningsfunksjonen "
 "som genererte den siden."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Vis objekt-ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -149,41 +149,50 @@ msgstr ""
 "Viser \"content-type\" og en unik ID for sider som representerer et enkelt "
 "objekt."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Rediger dette objektet (nåværende vindu)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Hopper til administrasjonssiden for sider som representerer et enkelt objekt."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Rediger dette objektet (nytt vindu)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Samme som over, men åpner administrasjonssiden i et nytt vindu."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modeller"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Maler"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filter"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tags"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolsk (True eller False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Felt av typen: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ne/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ne/LC_MESSAGES/django.mo
index 8e146292a3..b64f6aab5f 100644
Binary files a/django/contrib/admindocs/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ne/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ne/LC_MESSAGES/django.po
index 72d6acc5d9..86c0d49a90 100644
--- a/django/contrib/admindocs/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ne/LC_MESSAGES/django.po
@@ -1,78 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Paras Nath Chaudhary <opnchaudhary@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-07 03:49+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Paras Nath Chaudhary <opnchaudhary@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
-msgstr "ट्याग"
+msgstr "ट्याग:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr ""
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
-msgstr ""
+msgstr "धृस्य :"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
-msgstr ""
+msgstr "App  %r भेटिएन "
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
-msgstr ""
+msgstr "%(model_name)r नमुना %(app_label)r appमा   भेटिएन"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
-msgstr ""
+msgstr "`%(app_label)s.%(data_type)s` संबंधित बस्तु "
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
-msgstr ""
+msgstr "नमुना :"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
-msgstr ""
+msgstr "`%(app_label)s.%(object_name)s` संबंधित बस्तु "
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "सबै  %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
-msgstr ""
+msgstr "%sको संख्या"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr ""
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr ""
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "गृह "
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -82,30 +95,18 @@ msgstr ""
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr ""
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
-msgstr ""
+msgstr "प्रलेखन"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -116,60 +117,69 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
-msgstr ""
+msgstr "यो पृस्ठको लागी प्रलेखन"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
-msgstr ""
+msgstr "बस्तुको पहिचान  देखाउनुहोस "
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "नमुनाहरु "
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "ट्यागहरु "
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "धृस्यहरु "
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "बुलियन (True अथवा False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "फाँटको प्रकार: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.mo
index 268ef6fbfc..3ea5384a12 100644
Binary files a/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.po
index 261d36b771..de2c11a0c9 100644
--- a/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/nl/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-17 23:02+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jeffrey Gelens <jeffrey@noppo.pro>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Toepassing %r niet gevonden"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r niet gevonden in toepassing %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "het gerelateerde `%(app_label)s.%(data_type)s` object"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "gerelateerde `%(app_label)s.%(object_name)s` objecten"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "alle %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "aantal %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Velden van %s objecten"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s lijkt geen urlpattern-object te zijn"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Voorpagina"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s lijkt geen urlpattern-object te zijn"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Voorpagina"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Documentatie bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -129,11 +129,11 @@ msgstr ""
 "(Raadpleeg uw systeembeheerder of uw computer zich op het interne netwerk "
 "bevind).<p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentatie voor deze pagina"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -141,11 +141,11 @@ msgstr ""
 "Springt vanuit elke pagina naar de documentatie voor de view die gegenereerd "
 "wordt door die pagina."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Toon object-ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -153,41 +153,50 @@ msgstr ""
 "Toont het content-type en unieke ID voor pagina's die een enkel object "
 "voorstellen."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Bewerk dit object (huidig venster)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Gaat naar de beheerpagina voor pagina's die een enkel object weergeven."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Bewerk dit object (nieuw venster)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Zoals hierboven, maar opent de beheerpagina in een nieuw venster."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modellen"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Templates"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filters"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tags"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (True danwel False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Veld van type: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/nn/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/nn/LC_MESSAGES/django.mo
index ba5b24bf4d..af23fc27b3 100644
Binary files a/django/contrib/admindocs/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/nn/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/nn/LC_MESSAGES/django.po
index 4f3853bf79..a5878f7e2b 100644
--- a/django/contrib/admindocs/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/nn/LC_MESSAGES/django.po
@@ -6,75 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Kunne ikkje finne applikasjonen %r"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 "Kunne ikkje finne modellen %(model_name)r i applikasjonen %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "det relaterte `%(app_label)s.%(data_type)s`-objektet"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modell:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "relaterte `%(app_label)s.%(object_name)s`-objekt"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "alle %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "tal på %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Felt på %s-objekt"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ser ikkje ut til å vere eit urlpattern-objekt"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Heim"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s ser ikkje ut til å vere eit urlpattern-objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Heim"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bokmerke"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokumentasjonsbokmerke"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -125,11 +125,11 @@ msgstr ""
 "(kontakt systemadministratoren din dersom du er usikker på om maskina di er "
 "\"intern\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentasjon for denne sida"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -137,11 +137,11 @@ msgstr ""
 "Hopp frå kva som helst side til dokumentasjonen for visingsfunksjonen som "
 "genererte sida."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Vis objekt-ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -149,41 +149,50 @@ msgstr ""
 "Viser \"content-type\" og ein unik ID for sider som representerar eit enkelt "
 "objekt."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Endre dette objektet (noverande vindauge)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Hoppar til administrasjonssida for sider som representerer eit enkelt objekt."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Endre dette objektet (nytt vindauge)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Samme som over, men opnar administrasjonssida i eit nytt vindauge."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolsk (True eller False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Felt av typen: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/os/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/os/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..c1ce0f387f
Binary files /dev/null and b/django/contrib/admindocs/locale/os/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/os/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/os/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..077ac60cd8
--- /dev/null
+++ b/django/contrib/admindocs/locale/os/LC_MESSAGES/django.po
@@ -0,0 +1,195 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Xwybylty Soslan <soslanx@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2013-03-19 07:30+0000\n"
+"Last-Translator: Soslan Khubulov <soslanx@gmail.com>\n"
+"Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/"
+"os/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: os\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: views.py:58 views.py:60 views.py:62
+msgid "tag:"
+msgstr "тӕг:"
+
+#: views.py:93 views.py:95 views.py:97
+msgid "filter:"
+msgstr "фӕрсудзӕн:"
+
+#: views.py:156 views.py:158 views.py:160
+msgid "view:"
+msgstr "хуыз:"
+
+#: views.py:188
+#, python-format
+msgid "App %r not found"
+msgstr "Ӕфтуан %r нӕ разынд"
+
+#: views.py:195
+#, python-format
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr "Модел %(model_name)r ӕфтуан %(app_label)r-ы мидӕг нӕ разынд"
+
+#: views.py:207
+#, python-format
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr "хӕстӕг `%(app_label)s.%(data_type)s` объект"
+
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
+msgid "model:"
+msgstr "модел"
+
+#: views.py:222 views.py:254
+#, python-format
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr "хӕстӕг `%(app_label)s.%(object_name)s` объекттӕ"
+
+#: views.py:226 views.py:259
+#, python-format
+msgid "all %s"
+msgstr "%s иууылдӕр"
+
+#: views.py:231 views.py:264
+#, python-format
+msgid "number of %s"
+msgstr "%s нымӕц"
+
+#: views.py:269
+#, python-format
+msgid "Fields on %s objects"
+msgstr "%s объектты быдыртӕ"
+
+#: views.py:361
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s url-ы хуызӕгы объект нӕу"
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Хӕдзар"
+
+#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
+#: templates/admin_doc/missing_docutils.html:7
+#: templates/admin_doc/model_detail.html:15
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: templates/admin_doc/template_tag_index.html:8
+#: templates/admin_doc/view_detail.html:7
+#: templates/admin_doc/view_index.html:8
+msgid "Documentation"
+msgstr "Документаци"
+
+#: templates/admin_doc/bookmarklets.html:8
+msgid "Bookmarklets"
+msgstr "Букмарклеттӕ"
+
+#: templates/admin_doc/bookmarklets.html:11
+msgid "Documentation bookmarklets"
+msgstr "Документацийы букмарклеттӕ"
+
+#: templates/admin_doc/bookmarklets.html:15
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Букмарклеттӕ сӕвӕрынӕн, рахӕсс ӕрвитӕн дӕ сӕрмагондты\n"
+"панелмӕ кӕнӕ мысты рахиз ӕгънӕгӕй ныххӕц ӕрвитӕныл ӕмӕ йӕ дӕ\n"
+"сӕрмагондтӕмбахӕсс. Ныр дӕ бон у букмарклет сайты кӕцы фӕнды фарсӕй дӕр\n"
+"равзарын. Уый зон ӕмӕ ацы букмарклеттӕй кӕцыдӕртӕ домынц цӕмӕй\n"
+"ды сайтмӕ кӕсай ахӕм компьютерӕй, кӕцы арӕзт уыд куыд \"мидӕггаг\"\n"
+"(бадзур дӕ системон администратормӕ, кӕд ӕй нӕ зоныс \"мидӕггаг\" у дӕ\n"
+"компьютер, ӕви нӕ).</p>\n"
+
+#: templates/admin_doc/bookmarklets.html:25
+msgid "Documentation for this page"
+msgstr "Ацы фарсы документаци"
+
+#: templates/admin_doc/bookmarklets.html:26
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr "Цыфӕнды фарсӕй дӕ уыцы фарс цы хуыз фӕлдисы, уый документацимӕ ӕрвиты."
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr "Объекты бӕрӕггӕнӕн равдисын"
+
+#: templates/admin_doc/bookmarklets.html:29
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Иунӕг объекттӕн нывонд фӕрстӕн ӕвдисы мидисы хуыз ӕмӕ юникалон бӕрӕггӕнӕн."
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr "Ацы объект фӕивын (ацы рудзынгы)"
+
+#: templates/admin_doc/bookmarklets.html:32
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Иунӕг объектӕн нывонд фӕрсты админы фарсмӕ ӕрвиты."
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr "Ацы объект фӕивын (ног рудзынгы)"
+
+#: templates/admin_doc/bookmarklets.html:35
+msgid "As above, but opens the admin page in a new window."
+msgstr "Куыд уӕлдӕр, фӕлӕ админы фарс ног рудзынгы кӕны."
+
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+msgid "Models"
+msgstr "Моделтӕ"
+
+#: templates/admin_doc/template_detail.html:8
+msgid "Templates"
+msgstr "Хуызӕгтӕ"
+
+#: templates/admin_doc/template_filter_index.html:9
+msgid "Filters"
+msgstr "Фӕрсудзӕнтӕ"
+
+#: templates/admin_doc/template_tag_index.html:9
+msgid "Tags"
+msgstr "Тӕгтӕ"
+
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
+msgid "Views"
+msgstr "Хуызтӕ"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Булон (Бӕлвырд кӕнӕ Мӕнг)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Быдыры хуыз: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/pa/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/pa/LC_MESSAGES/django.mo
index 41b4011dcd..8371d3a942 100644
Binary files a/django/contrib/admindocs/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/pa/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/pa/LC_MESSAGES/django.po
index 3dc0e8d3e2..33714b6521 100644
--- a/django/contrib/admindocs/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/pa/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ਟੈਗ:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "ਫਿਲਟਰ:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ਵੇਖੋ:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ %r ਨਹੀਂ ਲੱਭੀ"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "ਮਾਡਲ:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "ਸਬੰਧਿਤ `%(app_label)s.%(object_name)s` ਆਬਜੈਕਟ"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "ਸਭ %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s ਦੀ ਗਿਣਤੀ"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s ਆਬਜੈਕਟ ਉੱਤੇ ਖੇਤਰ"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr ""
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "ਘਰ"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr ""
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "ਘਰ"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "ਡੌਕੂਮੈਂਟੇਸ਼ਨ"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "ਬੁੱਕਮਾਰਕਲਿਟ"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "ਡੌਕੂਮੈਟੇਸ਼ਨ ਬੁੱਕਮਾਰਕਲਿਟ"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -117,60 +117,69 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "ਇਹ ਸਫ਼ੇ ਲਈ ਡੌਕੂਮੈਂਟੇਸ਼ਨ"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "ਆਬਜੈਕਟ ID ਵੇਖੋ"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "ਇਹ ਆਬਜੈਕਟ ਸੋਧੋ (ਮੌਜੂਦਾ ਵਿੰਡੋ)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "ਇਹ ਆਬਜੈਕਟ ਸੋਧੋ (ਨਵੀਂ ਵਿੰਡੋ)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "ਖੇਤਰ ਦੀ ਕਿਸਮ: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo
index c85ff111f2..5edc6e8fc5 100644
Binary files a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po
index 58b3b81e40..64f4334d2b 100644
--- a/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/pl/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-21 12:49+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: angularcircle <angular.circle@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtr:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "widok:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikacja %r nie została znaleziona"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r nie został znaleziony w aplikacji %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "powiązany obiekt `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "powiązane obiekty `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "wszystkie %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "liczba %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Pola obiektów %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s nie jest obiektem urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Początek"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s nie jest obiektem urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Początek"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentacja"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Zakładki"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Zakładki Dokumentacji"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -127,11 +127,11 @@ msgstr ""
 "\"wewnętrznego\" (skontaktuj się z administratorem systemu, jeśli nie jesteś "
 "pewien, czy ten komputer jest \"wewnętrznym\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentacja dla tej strony"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -139,53 +139,62 @@ msgstr ""
 "Przekierowuje z dowolnej strony do dokumentacji dla widoku, który ją "
 "generuje."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Pokaż ID obiektu"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "Pokazuje typ i unikalne ID dla stron, które reprezentują pojedynczy obiekt."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Edytuj ten obiekt (bieżące okno)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Przeskok do panelu administratora dla stron reprezentujących pojedynczy "
 "obiekt."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Edytuj ten obiekt (nowe okno)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Jak wyżej, tyle że otwiera nowe okno."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modele"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Szablony"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtry"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tagi"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Widoki"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Wartość logiczna (True, False - prawda lub fałsz)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Pole typu: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.mo
index bdb3443628..57b5fe29e1 100644
Binary files a/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.po
index e5da7f79d2..a6122db83d 100644
--- a/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/pt/LC_MESSAGES/django.po
@@ -1,80 +1,93 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Bruno Miguel Custódio <bruno@brunomcustodio.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nuno Mariz <nmariz@gmail.com>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Bruno Miguel Custódio <bruno@brunomcustodio.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtro:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "A aplicação %r não encontrada"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "O Model %(model_name)r não foi encontrado na aplicação %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "o objeto `%(app_label)s.%(data_type)s` relacionado"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "os objetos `%(app_label)s.%(object_name)s` relacionados"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "todos %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "número de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Campos nos objetos %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s não parece ser um objeto urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Início"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +97,18 @@ msgstr "%s não parece ser um objeto urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Início"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentação"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Documentação dos bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,22 +129,22 @@ msgstr ""
 "por \"internal\" (entre em contacto com o seu administrador de sistema se \n"
 "não tiver a certeza se o seu computador é \"internal\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentação desta página"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Vai de qualquer página para a documentação da view que gera essa página."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Mostrar o ID do objeto"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -151,41 +152,50 @@ msgstr ""
 "Mostra o tipo de conteúdo e o ID único para as páginas que representam um "
 "único objeto."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Editar este objeto (janela actual)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Vai para a página de admin para as páginas que representam um único objeto."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Editar este objeto (nova janela)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Tal como acima, mas abre a página de admin numa nova janela."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "Models"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "Templates"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (Pode ser True ou False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo do tipo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/pt_BR/LC_MESSAGES/django.mo
index ad49b2a083..f42572b355 100644
Binary files a/django/contrib/admindocs/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/pt_BR/LC_MESSAGES/django.po
index fb26a948a8..f3afe81f92 100644
--- a/django/contrib/admindocs/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-19 18:28+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtro:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplicação %r não encontrada"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r não encontrado na aplicação %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "o objeto `%(app_label)s.%(data_type)s` relacionado"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "objetos `%(app_label)s.%(object_name)s` relacionados"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "todos %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "número de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Campos nos objetos %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s não aparenta ser um objeto urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Início"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s não aparenta ser um objeto urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Início"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentação"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Itens de bookmark"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Documentação de itens de bookmark"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,62 +126,71 @@ msgstr ""
 "como \"interno\" (converse com seu administrador de sistemas se você não\n"
 "souber se seu computador é \"interno\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentação para esta página"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Leva você de qualquer página para a documentação da view que gera tal página."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Mostar ID de objeto"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "Mostra o tipo de conteúdo e ID único para páginas que representam um objeto."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Editar este objeto (janela atual)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Vai para a página de administração que representa um objeto."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Editar este objeto (nova janela)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Como acima, mas abre a página de administração em uma nova janela."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Models"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Templates"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtros"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tags"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Views"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (Verdadeiro ou Falso)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo do tipo: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ro/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ro/LC_MESSAGES/django.mo
index d4a6db3cc4..1adc23473c 100644
Binary files a/django/contrib/admindocs/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ro/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ro/LC_MESSAGES/django.po
index 052f371a10..4505b7540b 100644
--- a/django/contrib/admindocs/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ro/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtru:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "cod de afișare:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Applicația %r negăsită"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modelul %(model_name)r nu a fost găsit în aplicația %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "obiectul înrudit `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "obiectele înrudite `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "toate %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "numărul de %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Câmpuri în %s obiecte"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s nu pare a fi un obiect urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Acasă"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s nu pare a fi un obiect urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Acasă"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Documentație"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Semne de carte"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Semne de carte pentru documentație"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -129,11 +129,11 @@ msgstr ""
 "caz că nu știți\n"
 "dacă acest calculator este \"intern\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Documentație pentru pagina aceasta"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -141,11 +141,11 @@ msgstr ""
 "Vă trimite de la orice pagină către documentația pentru codul de afișare "
 "care generează acea pagină."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Arată ID-ul obiectului"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -153,42 +153,51 @@ msgstr ""
 "Arată tipul de conținut și ID-ul unic pentru paginile ce reprezintă un "
 "singur obiect."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Modifică acest obiect (în fereastra curentă)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Sare la pagina de administrare pentru pagini ce reprezintă un singur obiect."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Modifică acest obiect (într-o fereastra nouă)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "La fel ca mai sus, dar deschide pagina de administrare într-o fereastră nouă"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (adevărat sau fals)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Câmp de tip: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.mo
index 5813fd833b..32e6cceb0e 100644
Binary files a/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.po
index 0d195ec7ea..3bc98716db 100644
--- a/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ru/LC_MESSAGES/django.po
@@ -8,75 +8,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-07 15:12+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "тег:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "фильтр:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "view:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Приложение %r не найдено"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Модель %(model_name)r не найдена в приложении %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "зависимый `%(app_label)s.%(data_type)s` объект"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "модель:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "связанные объекты `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "все %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "количество %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Поля объектов типа %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s не похож на объект urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Начало"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -86,30 +98,18 @@ msgstr "%s не похож на объект urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Начало"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Закладки"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Закладки документации"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +128,11 @@ msgstr ""
 "у своего системного администратора, если не уверены, является ли ваш\n"
 "компьютер \"внутренним\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Документация для данной страницы"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,11 +140,11 @@ msgstr ""
 "Перенаправляет вас с любой страницы к документации для view, который "
 "генерирует эту страницу."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Показать идентификатор объекта"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -152,42 +152,51 @@ msgstr ""
 "Показывает content-type и уникальный ID для страниц, представляющих один "
 "объект."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Редактировать данный объект (в текущем окне)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Перейдет на административную страницу для страниц, представляющих один "
 "объект."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Редактировать данный объект (в новом окне)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "То же, что и выше, но откроет административную страницу в новом окне."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Модели"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Фильтры"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "View"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Логическое (True или False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Поле типа %(field_type)s"
diff --git a/django/contrib/admindocs/locale/sk/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sk/LC_MESSAGES/django.mo
index 6a32d30210..2b27b04577 100644
Binary files a/django/contrib/admindocs/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/sk/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sk/LC_MESSAGES/django.po
index 25ae6f5061..2128072bb4 100644
--- a/django/contrib/admindocs/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/sk/LC_MESSAGES/django.po
@@ -2,79 +2,92 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Juraj Bubniak <translations@jbub.eu>, 2012.
 # Marian Andre <marian@andre.sk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: Juraj Bubniak <translations@jbub.eu>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "značka:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "pohľad:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikácia %r nenájdená"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r sa nenachádza v aplikácii %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "súvisiaci objekt `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "súvisiace objekty `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "všetky %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "počet %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Polia objektov %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s nevyzerá ako urlpattern objekt"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Domov"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +97,18 @@ msgstr "%s nevyzerá ako urlpattern objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Domov"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentácia"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Záložky"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Záložky dokumentácie"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +127,11 @@ msgstr ""
 "istý, že váš počítač je \"interný\", oslovte svojho systémového správcu).</"
 "p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentácia k tejto stránke"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,11 +139,11 @@ msgstr ""
 "Nasmeruje vás z ľubovoľnej stránky do dokumentácie, kde je popísané, ako sa "
 "táto stránka generuje."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Zobraziť identifikátor objektu"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,41 +151,50 @@ msgstr ""
 "Zobrazí content-type a jedinečný identifikátor pre stránky, ktoré "
 "reprezentujú samostatný objekt."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Upraviť tento objekt (aktuálne okno)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Skočí na stránku správy pre stránky, ktoré reprezentujú samostatný objekt."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Upraviť tento objekt (nové okno)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Ako predtým, ale otvorí stránku správy v novom okne."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modely"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Šablóny"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtre"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tagy"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Zobrazenia"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Logická hodnota (buď True alebo False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Pole typu: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.mo
index 031439185a..ecf40ca80e 100644
Binary files a/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.po
index d0c3d87262..b6b5814e30 100644
--- a/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/sl/LC_MESSAGES/django.po
@@ -1,80 +1,93 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Gašper Žejn <zejn@kiberpipa.org>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 #   <zejn@kiberpipa.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-05 19:52+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-31 20:26+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
-msgstr "značka:"
+msgstr "oznaka:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "pogled:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
-msgstr "Aplikacije %r ni mogoče najti"
+msgstr "Programa %r ni mogoče najti"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
-msgstr "Modela %(model_name)r ni v aplikaciji %(app_label)r"
+msgstr "Modela %(model_name)r ni v programu %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
-msgstr "povezani `%(app_label)s.%(data_type)s` objekt"
+msgstr "povezani predmet `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
-msgstr "povezani `%(app_label)s.%(object_name)s` objekti"
+msgstr "povezani predmeti `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "vse %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "število %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
-msgstr "Polja na %s objektih"
+msgstr "Polja na predmetih %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
-msgstr "%s ne izgleda veljaven urlpattern objekt"
+msgstr "Predmet %s ni videti veljaven predmet urlpattern"
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Domov"
 
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
@@ -85,30 +98,18 @@ msgstr "%s ne izgleda veljaven urlpattern objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Domov"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
-msgstr "Zaznamkice"
+msgstr "Apleti zaznamkov"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
-msgstr "Dokumentacijske zaznamkice"
+msgstr "Dokumentacijski apleti zaznamkov"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -119,72 +120,78 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 "\n"
-"<p class=\"help\">Za inštalacijo zaznamkic povlečite povezavo v orodno "
-"vrstico\n"
-"z zaznamki, ali kliknite z desno miškino tipko na povezavo in jo dodajte med "
-"zaznamke. Zdaj lahko izberete zaznamkico s katerekoli strani tega spletnega "
-"mesta. Opomba: nekatere izmed teh strani lahko gledate le z računalnika, ki "
-"je označen kot \"notranji\" (v kolikor niste prepričani, če je vaš "
-"računalnik označen kot \"notranji\" se obrnite na sistemskega "
-"administratorja).</p>\n"
+"<p class=\"help\">Aplete zaznamkov je mogoče namestiti z vleko\n"
+"povezave v orodno vrstico z zaznamki, ali pa z desnim klikom na povezavo\n"
+"Zaznamek je mogoče izbrati s katerekoli strani tega spletnega mesta.\n"
+"Opomba: nekatere strani si je mogoče ogledati le le z računalnika, ki je\n"
+"označen kot \"notranji\" računalnik (za več podrobnosti o tem, se obrnite\n"
+"na skrbnika).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentacija te strani"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
-msgstr ""
-"Skok na stran z dokumentacijo za pogled (view), ki generira trenutno stran."
+msgstr "Skok na stran z dokumentacijo za pogled, ki gustvarja trenutno stran."
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr "Pokaži ID predmeta"
 
 #: templates/admin_doc/bookmarklets.html:29
-msgid "Show object ID"
-msgstr "Pokaži ID objekta"
-
-#: templates/admin_doc/bookmarklets.html:30
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
-"Pokaže content-type in unikatni ID za strani, ki predstavljajo en objekt."
+"Pokaže vrsto content-type in enoznačni ID za strani, ki predstavljajo en "
+"predmet."
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr "Uredi predmet (v trenutnem oknu)"
 
 #: templates/admin_doc/bookmarklets.html:32
-msgid "Edit this object (current window)"
-msgstr "Uredi objekt (v trenutnem oknu)"
-
-#: templates/admin_doc/bookmarklets.html:33
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-"Skok na administracijsko stran za vse strani, ki predstavljajo en objekt."
+msgstr "Skok na skrbniško stran vseh strani, ki predstavljajo en predmet."
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr "Uredi ta predmet (v novem oknu)"
 
 #: templates/admin_doc/bookmarklets.html:35
-msgid "Edit this object (new window)"
-msgstr "Uredi ta objekt (v novem oknu)"
-
-#: templates/admin_doc/bookmarklets.html:36
 msgid "As above, but opens the admin page in a new window."
-msgstr "Kot zgoraj, le da odpre administracijsko stran v novem oknu."
+msgstr "Kot zgoraj, le da odpre skrbniško stran v novem oknu."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modeli"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Predloge"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtri"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr "Značke"
+msgstr "Oznake"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Pogledi"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolova vrednost (PRAV ali NAPAK)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Polje vrste: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.mo
index 5d888bf1be..31f019629e 100644
Binary files a/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.po
index 281efd1d16..b7c2f5393f 100644
--- a/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/sq/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-11-25 11:03+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etiketë:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtër:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "parje:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Nuk u gjet zbatimi %r"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Nuk u gjet modeli %(model_name)r në zbatimin %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "objekti i afërt `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "objektet e afërta `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "krejt %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "numër i %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Fusha te objektet %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s nuk duket të jetë një objekt urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Hyrje"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s nuk duket të jetë një objekt urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Hyrje"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentim"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "\"Bookmarklet\"-e"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "\"Bookmarklet\"-e Dokumentimi"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -129,63 +129,72 @@ msgstr ""
 "sigurt\n"
 "në është a jo \"i brendshëm\" kompjuteri juaj).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentim për këtë faqe"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "Ju kalon nga cilado faqe te dokumenti që prodhon atë faqe, për ta parë."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Shfaq ID objekti"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "Shfaq lloj lënde dhe ID unike për faqet që përfaqësojnë një objekt të vetëm."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Përpunojeni këtë objekt (dritarja e tanishme)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Kalon te faqja e përgjegjësit për faqet që përfaqësojnë një objekt të vetëm."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Përpunojeni këtë objekt (dritare e re)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Si më sipër, por hap faqen e përgjegjësit në një dritare të re."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "Modele"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "Gjedhe"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "Filtra"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "Etiketa"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "Parje"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Buleane (Ose True, ose False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Fushë e llojit: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/sr/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sr/LC_MESSAGES/django.mo
index be8846a78d..9f334d5e5c 100644
Binary files a/django/contrib/admindocs/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/sr/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sr/LC_MESSAGES/django.po
index b93dcbc92c..5734c47548 100644
--- a/django/contrib/admindocs/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/sr/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-17 05:22+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "таг:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "филтер:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "вју:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Апликација %r није пронађена"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Модел %(model_name)r није пронађен у апликацији %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "повезани објекти класе `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "модел:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "класе `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "сви повезани објекти %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "број повезаних објеката %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Поља у повезаним објектима %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s не изгледа као „urlpattern“ објекат"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Почетна"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s не изгледа као „urlpattern“ објекат"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Почетна"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Документација"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Букмарклети"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Букмарклети документације"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +126,11 @@ msgstr ""
 "означени као „интерни“ (питајте администратора вашег система уколико нисте\n"
 "сигурни да ли је ваш рачунар „интерни“).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Документација за ову страницу"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,11 +138,11 @@ msgstr ""
 "Води од било које странице до документаицје погледа који је генерисао ту "
 "страницу."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Прикажи ID објекта"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,42 +150,51 @@ msgstr ""
 "Приказује content-type и јединствени ID за страницу која преставља један "
 "објекат."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Измени овај објекат (у овом прозору)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Води у администрациони страницу за странице које престављају један објекат"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Измени овај објекат (нови прозор)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Исто као претходни, али отвара администрациону страницу у новом прозору."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Модели"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Шаблони"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Филтери"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Тагови"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Вјуеви"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Булова вредност (True или False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Поње типа: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.mo
index c05ec188c4..bea2c76431 100644
Binary files a/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.po
index 74d9b596b0..714bcb892b 100644
--- a/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-02 21:00+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tag:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vju:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Aplikacija %r nije pronađena"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Model %(model_name)r nije pronađen u aplikaciji %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "povezani objekti klase `%(app_label)s.%(data_type)s`"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "klase `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "svi povezani objekti %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "broj povezanih objekata %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Polja u povezanim objektima %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ne izgleda kao „urlpattern“ objekat"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Početna"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s ne izgleda kao „urlpattern“ objekat"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Početna"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bukmarkleti"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Bukmarkleti dokumentacije"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +126,11 @@ msgstr ""
 "označeni kao „interni“ (pitajte administratora vašeg sistema ukoliko niste\n"
 "sigurni da li je vaš računar „interni“).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentacija za ovu stranicu"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,11 +138,11 @@ msgstr ""
 "Vodi od bilo koje stranice do dokumentaicje pogleda koji je generisao tu "
 "stranicu."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Prikaži ID objekta"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,42 +150,51 @@ msgstr ""
 "Prikazuje content-type i jedinstveni ID za stranicu koja prestavlja jedan "
 "objekat."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Izmeni ovaj objekat (u ovom prozoru)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Vodi u administracioni stranicu za stranice koje prestavljaju jedan objekat"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Izmeni ovaj objekat (novi prozor)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 "Isto kao prethodni, ali otvara administracionu stranicu u novom prozoru."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modeli"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Šabloni"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filteri"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tagovi"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Vjuevi"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Bulova vrednost (True ili False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Ponje tipa: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/sv/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sv/LC_MESSAGES/django.mo
index 2ade62117f..fb773acff9 100644
Binary files a/django/contrib/admindocs/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/sv/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sv/LC_MESSAGES/django.po
index 3d6757915d..fbe2d029d0 100644
--- a/django/contrib/admindocs/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/sv/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-06 20:05+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "tagg:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filter:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "vy:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Applikation %r hittades inte"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Modell %(model_name)r hittades inte i applikation %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "det relaterade `%(app_label)s.%(data_type)s`-objektet"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "modell:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "relaterade `%(app_label)s.%(object_name)s`-objekt"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "alla %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "antal %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Fält på %s objekt"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s verkar inte vara ett urlpattern-objekt"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Hem"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s verkar inte vara ett urlpattern-objekt"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Hem"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Smarta bokmärken"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Smarta bokmärken för dokumentation"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,11 +126,11 @@ msgstr ""
 "sidan från en dator som är \"intern\" (kontakta din systemadministratör\n"
 "om du inte är säker på om din dator är \"intern\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Dokumentation för denna sida"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -138,11 +138,11 @@ msgstr ""
 "Förflyttar dig från valfri sida till dokumentationen för vyn som genererar "
 "den sidan."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Visa objektets ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -150,42 +150,51 @@ msgstr ""
 "Visa innehållstypen och det unika ID-numret för sidor som representerar ett "
 "enskilt objekt."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Redigera detta objekt (aktuellt fönster)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Hoppar till administrationssidan för sidor som representerar ett enskilt "
 "objekt."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Redigera detta objekt (nytt fönster)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Som ovan, men öppnar administrationssidan i ett nytt fönster."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modeller"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Mallar"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filter"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Taggar"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Vyer"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolesk (antingen True eller False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Fält av typ: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/sw/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sw/LC_MESSAGES/django.mo
index d1ba384af6..56af82a652 100644
Binary files a/django/contrib/admindocs/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/sw/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sw/LC_MESSAGES/django.po
index 70a4033d83..7a3bd4c7f0 100644
--- a/django/contrib/admindocs/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/sw/LC_MESSAGES/django.po
@@ -5,73 +5,85 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2011-01-19 15:09+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: machaku <bmachaku@gmail.com>\n"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
-msgstr ""
+msgstr "tagi"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
-msgstr ""
+msgstr "chujio"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
-msgstr ""
+msgstr "muonekano"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
-msgstr ""
+msgstr "Programu %r haijapatikana"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
-msgstr ""
+msgstr "Modeli %(model_name)r haijapatikana katika programu %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
-msgstr ""
+msgstr "`%(app_label)s.%(data_type)s` kinachohusiana"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
-msgstr ""
+msgstr "modeli"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
-msgstr ""
+msgstr "`%(app_label)s.%(object_name)s` vinavyohusiana"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
-msgstr ""
+msgstr "kila %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
-msgstr ""
+msgstr "idadi ya %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
-msgstr ""
+msgstr "Uga zilizopo katika %s "
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
-msgstr ""
+msgstr "%s haionekani kuwa ni kitu cha urlpattern"
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Sebule"
 
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
@@ -82,30 +94,18 @@ msgstr ""
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr ""
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
-msgstr ""
+msgstr "Waraka"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
-msgstr ""
+msgstr "Vialamisho"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Vialamisho vya waraka"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -115,61 +115,84 @@ msgid ""
 "as \"internal\" (talk to your system administrator if you aren't sure if\n"
 "your computer is \"internal\").</p>\n"
 msgstr ""
+"\n"
+"<p class=\"help\">Kusanikisha vialamisho, kokota kiungo hadi upau wako wa\n"
+"maalamisho, or bofya-kulia kiungo hicho na kiongeze kwenye maalamisho yako. "
+"Sasa unaweza\n"
+"kuchagua kialamisho kutokea ukurasa wowote katika tovuti hii.  Kumbuka "
+"baadhi ya vialamisho \n"
+"vitakuhitaji kuvitumia kwa kutumia kompyuta iliyoteuliwa kama \"internal\"\n"
+"(ongea na utawala wa mfumo kama huna uhakika kuwa kompyuta yako ni  "
+"\"internal\") \n"
+
+#: templates/admin_doc/bookmarklets.html:25
+msgid "Documentation for this page"
+msgstr "Nyaraka kwa ajili ya ukurasa huu"
 
 #: templates/admin_doc/bookmarklets.html:26
-msgid "Documentation for this page"
-msgstr ""
-
-#: templates/admin_doc/bookmarklets.html:27
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
+"Inakurusha kutoka ukurasa wowote hadi kwenye waraka wa mounekano unaozalisha "
+"ukurasa huo."
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr "Onesha Utambulisho wa kitu"
 
 #: templates/admin_doc/bookmarklets.html:29
-msgid "Show object ID"
-msgstr ""
-
-#: templates/admin_doc/bookmarklets.html:30
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
+"inaonesha aina ya maudhui na utambulisho wa kipekee wa kurasa "
+"zinazowakilisha kitu kimoja."
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr "Hariri kitu hiki (dirisha la sasa)"
 
 #: templates/admin_doc/bookmarklets.html:32
-msgid "Edit this object (current window)"
-msgstr ""
-
-#: templates/admin_doc/bookmarklets.html:33
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
+msgstr "Ruka hadi ukurasa wa utawala kwa kurasa zinazowakilisha kitu kimoja"
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr "Hariri kitu hiki (dirisha jipya)"
 
 #: templates/admin_doc/bookmarklets.html:35
-msgid "Edit this object (new window)"
-msgstr ""
-
-#: templates/admin_doc/bookmarklets.html:36
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
+"Kama hapo juu, lakini hufungua ukurasa wa utawala katika dirisha jipya."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "Modeli"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "Templeti"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "Chujio"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "Tagi"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "Mionekano"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Buleani (Aidha Kweli au Si kweli)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Uga wa aina %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ta/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ta/LC_MESSAGES/django.mo
index 9265bb3442..4c77a114f4 100644
Binary files a/django/contrib/admindocs/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ta/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ta/LC_MESSAGES/django.po
index af28ad007f..11958540b9 100644
--- a/django/contrib/admindocs/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ta/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ஒட்டு:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "வடிகட்டி:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "நோற்றமிடு:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "பக்கம் %r இல்லை"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "மாதிரி:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr ""
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "அனைத்து %s "
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "எண்ணிக்கை %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "புலத்தின் %s பொருள்"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s -ல் urlpattern தோன்றுவதில்லை"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "வீடு"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s -ல் urlpattern தோன்றுவதில்லை"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "வீடு"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "ஆவனமாக்கம்"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "புத்தகக்குறிகள்"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "ஆவணமாக்கக் குறியீடுகள்"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -124,62 +124,71 @@ msgstr ""
 " ஒருசில புத்தகக்குறிகளை செயல்படுத்தமுடியும்\n"
 "  உங்களுக்கு, கணிணி  \"internal\" என உறுதி செய்ய கணிணிமேளாலரை அணுகவும்.</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "இந்த பக்கத்திற்கான ஆவணம்"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 "எந்த ஒரு பக்கத்திலிருந்தும் ஆவணப்பக்கத்தை பார்வையிடுதல், அந்த பக்கத்தை உருவாக்குகிறது."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "object ID-ஐ காட்டு"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "ஒரே object-ஐ குறிக்கும் பக்கங்களின் பொருளடக்க வகை மற்றும் unique ID-ஐ   காட்டுகிறது."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "இதை திருத்துக (தற்போதைய சாளரம்)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "ஒரே object-ஐ குறிக்கும் பக்கங்களைக் காண மேலாளர் பக்கத்திற்கு செல்க."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "இதை திருத்துக. (புதிய சாளரம்)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "மேளாலர் பக்கத்தை முன்பு கண்டதுபோல், ஆனால் புதிய சாளரத்தில் திறக்கிறது."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "பூலியன் (சரி அல்லது தவறு)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
diff --git a/django/contrib/admindocs/locale/te/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/te/LC_MESSAGES/django.mo
index bec4e2820b..f5163dbb6f 100644
Binary files a/django/contrib/admindocs/locale/te/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/te/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/te/LC_MESSAGES/django.po
index 185aa858a8..7a0a3d603e 100644
--- a/django/contrib/admindocs/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/te/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "టాగ్:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "వడపోత:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "దర్శనం:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%rఎప్ప్ దొరకలేడు"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "సంబంధించిన `%(app_label)s.%(data_type)s` అంశము"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "మొడల్:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "సంబంధించిన `%(app_label)s.%(object_name)s` వస్తువులు"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "ఆన్నీ  %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s సంఖ్య"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s వస్తువులలో ఫీల్డ్స్   "
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s యు ఆర్ యల్  నిర్మాణక్రమ అంశము లా లేదు "
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "నివాసము"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s యు ఆర్ యల్  నిర్మాణక్రమ అం
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "నివాసము"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "పత్రికీకరణ"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "నిర్దుష్ట గుర్తులు "
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "పత్రికీకరణ యొక్క నిర్దుష్ట గుర్తులు "
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -118,60 +118,69 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "ఈ పొరటుకు పత్రికీకరణ"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "వస్తువు ఇడి చూడండి"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "వస్తువు ని మార్చండి (ప్రస్తుత విండొ)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "వస్తువు ని మార్చండి(కొత్త విండొ) "
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "బూలియన్ (అవునా లేక కాదా)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
diff --git a/django/contrib/admindocs/locale/th/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/th/LC_MESSAGES/django.mo
index a65edb866d..f1755920e2 100644
Binary files a/django/contrib/admindocs/locale/th/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/th/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/th/LC_MESSAGES/django.po
index 24903f9149..5bc7797bb1 100644
--- a/django/contrib/admindocs/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/th/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-09 06:17+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Vichai Vongvorakul <vongvichai@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ป้ายกำกับ:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "ตัวกรอง:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ดู:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "ไม่พบแอป %r "
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "ไม่พบโมเดล %(model_name)r ในแอป %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "ความสัมพันธ์`%(app_label)s.%(data_type)s` อ็อบเจ็กต์"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "โมเดล:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "ความสัมพันธ์`%(app_label)s.%(object_name)s` อ็อบเจ็กต์"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "ทั้งหมด %s "
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "จำนวนของ %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "ฟิลด์บน %s อ็อบเจ็กต์"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s ดูเหมือนจะไม่ใช่ urlpattern อ็อบเจ็กต์"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "หน้าหลัก"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s ดูเหมือนจะไม่ใช่ urlpattern อ็อ
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "หน้าหลัก"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "เอกสารประกอบ"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Documentation bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -125,60 +125,69 @@ msgstr ""
 "as \"internal\" (talk to your system administrator if you aren't sure if\n"
 "your computer is \"internal\").</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "เอกสารสำหรับหน้านี้"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "ย้ายจากทุกหน้าไปที่วิวที่สร้างหน้านั้นขึ้นมา"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "แสดงอ็อบเจ็กต์ไอดี"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "แสดง content-type และ unique ID เพื่อแสดงอ็อบเจ็กต์เพียงอย่างเดียว."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "แก้ไขออปเจ็กนี้ (ในหน้าต่างปัจจุบัน)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "ไปที่หน้าแอดมินเพื่อแสดงอ็อบเจ็กต์เพียงอย่างเดียว."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "แก้ไขออปเจ็กนี้ (หน้าใหม่)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "เหมือนด้านบน แต่เปิดหน้าต่างผู้ดูแลระบบในหน้าต่างใหม่"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Models"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Templates"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filters"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Tags:"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "View"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "ตรรกะแบบบูลหมายถึง ค่า\"จริง\" (True) หรือ \"ไม่จริง \" (False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "ฟิลด์ข้อมูล: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo
index babb65192a..586cd46c74 100644
Binary files a/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.po
index 3a4b6bfbf8..f0e7cc442f 100644
--- a/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/tr/LC_MESSAGES/django.po
@@ -7,74 +7,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 20:34+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Murat Çorlu <muratcorlu@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "etiket:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "filtre:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "görünüm:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r uygulaması bulunamadı"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "%(app_label)r uygulamasında %(model_name)r modeli bulunamadı"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "İlgili `%(app_label)s.%(data_type)s` nesnesi"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "ilgili `%(app_label)s.%(object_name)s` nesneleri"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "tüm %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s sayısı"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s nesnesindeki alanlar"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s geçerli bir adres kalıbı değil"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Anasayfa"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +96,18 @@ msgstr "%s geçerli bir adres kalıbı değil"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Anasayfa"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Dokümantasyon"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Kısayollar"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Dokümantasyon kısayolları"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -126,61 +126,70 @@ msgstr ""
 "istemciler \n"
 "tarafından kullanılabilir.</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Bu sayfa için dokümantasyon"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "Sizi, bu sayfayı üreten betiğin dokümantasyonuna yönlendirir."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Nesne numarasını göster"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 "Tek bir nesneyi temsil eden sayfaların içerik türünü ve numarasını gösterir."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Nesneyi düzenle (aynı pencerede)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Tek bir nesneyi temsil eden sayfaların yönetim sayfasını gösterir."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Nesneyi düzenle (yeni pencerede)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Yukarıdaki gibi, ancak yönetim sayfasını yeni bir pencerede açar."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Modeller"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Filtreler"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Etiketler"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Görünümler"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Mantıksal (True ya da False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Alan türü: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/tt/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/tt/LC_MESSAGES/django.mo
index f5bc58e504..57434da925 100644
Binary files a/django/contrib/admindocs/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/tt/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/tt/LC_MESSAGES/django.po
index a93f20a512..6021261c34 100644
--- a/django/contrib/admindocs/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/tt/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "билге:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "фильтр:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "күрсәтелеш:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "%r кушымтасы табылмаган"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "%(model_name)r моделе %(app_label)r кушымтасында табылмаган"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "бәйләнгән '%(app_label)s.%(data_type)s' объект"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "модель:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "бәйләнгән '%(app_label)s.%(object_name)s' объектлар"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "бөтен %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s саны"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s объектлары өчен кырлар"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s urlpattern объектына ошамаган"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Өй"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s urlpattern объектына ошамаган"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Өй"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Кыстыргычлар"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Документация кыстыргычлары"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -121,11 +121,11 @@ msgstr ""
 "күчерегез я тычканның уң төймәсенә чирттереп кыстыргычлар исемлегенә кушыгыз."
 "</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Бу сәхифә өчен документация"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -133,50 +133,59 @@ msgstr ""
 "Теләсә нинди сәхифәдән сезне ул сәхифәне төзи торган view документациясенә "
 "җибәрә."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Объект идентификаторын күрсәтергә"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "Бер объектны күрсәтә торган сәхифәнең content-type һәм ID күрсәтә."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Бу объектны төзәтергә (шушы тәрәзәдә)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Бер объектны күрсәтә торган сәхифәнең идарә сәхифәсенә җибәрә."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Бу объектны төзәтергә (яңа тәрәзәдә)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Өстәге кебек, тик идарә сәхифәсен яңа тәрәзәдә ача."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Логик (True яисә False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "%(field_type)s типтагы кыр"
diff --git a/django/contrib/admindocs/locale/udm/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/udm/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..6ce0e0a7f6
Binary files /dev/null and b/django/contrib/admindocs/locale/udm/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/udm/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/udm/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..293be8558a
--- /dev/null
+++ b/django/contrib/admindocs/locale/udm/LC_MESSAGES/django.po
@@ -0,0 +1,184 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2011-01-19 15:09+0000\n"
+"Last-Translator: Django team\n"
+"Language-Team: Udmurt (http://www.transifex.com/projects/p/django/language/"
+"udm/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: udm\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: views.py:58 views.py:60 views.py:62
+msgid "tag:"
+msgstr ""
+
+#: views.py:93 views.py:95 views.py:97
+msgid "filter:"
+msgstr ""
+
+#: views.py:156 views.py:158 views.py:160
+msgid "view:"
+msgstr ""
+
+#: views.py:188
+#, python-format
+msgid "App %r not found"
+msgstr ""
+
+#: views.py:195
+#, python-format
+msgid "Model %(model_name)r not found in app %(app_label)r"
+msgstr ""
+
+#: views.py:207
+#, python-format
+msgid "the related `%(app_label)s.%(data_type)s` object"
+msgstr ""
+
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
+msgid "model:"
+msgstr ""
+
+#: views.py:222 views.py:254
+#, python-format
+msgid "related `%(app_label)s.%(object_name)s` objects"
+msgstr ""
+
+#: views.py:226 views.py:259
+#, python-format
+msgid "all %s"
+msgstr ""
+
+#: views.py:231 views.py:264
+#, python-format
+msgid "number of %s"
+msgstr ""
+
+#: views.py:269
+#, python-format
+msgid "Fields on %s objects"
+msgstr ""
+
+#: views.py:361
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
+#: templates/admin_doc/missing_docutils.html:7
+#: templates/admin_doc/model_detail.html:15
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: templates/admin_doc/template_tag_index.html:8
+#: templates/admin_doc/view_detail.html:7
+#: templates/admin_doc/view_index.html:8
+msgid "Documentation"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:8
+msgid "Bookmarklets"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:11
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:15
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:25
+msgid "Documentation for this page"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:26
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:28
+msgid "Show object ID"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:29
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:31
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:32
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:34
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: templates/admin_doc/bookmarklets.html:35
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+msgid "Models"
+msgstr ""
+
+#: templates/admin_doc/template_detail.html:8
+msgid "Templates"
+msgstr ""
+
+#: templates/admin_doc/template_filter_index.html:9
+msgid "Filters"
+msgstr ""
+
+#: templates/admin_doc/template_tag_index.html:9
+msgid "Tags"
+msgstr ""
+
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
+msgid "Views"
+msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "True яке False"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "%(field_type)s типъем бусы"
diff --git a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo
index 4bbf3bc0bd..f8bcd1f545 100644
Binary files a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po
index 503c763b74..111cc0986a 100644
--- a/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/uk/LC_MESSAGES/django.po
@@ -7,75 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-11 17:21+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "тег:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "відфільтрувати:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "переглянути:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Прикладна система(app) %r не знайдена"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Модель %(model_name)r не знайдено в прикладній системі %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "пов'язаний `%(app_label)s.%(data_type)s` об'єкт"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "модель:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "пов'язані з `%(app_label)s.%(object_name)s` об'єкти"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "всі %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "кількість з %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Поля об'єктів %s"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s не є об'єктом urlpattern"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Домівка"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -85,30 +97,18 @@ msgstr "%s не є об'єктом urlpattern"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "Домівка"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "Документація"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "Інтерактивні закладки"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "Інтерактивні закладки документації"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -128,11 +128,11 @@ msgstr ""
 "впевнені,\n"
 "що сайт і ваш комп'ютер є в одній внутрішній мережі).</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "Документація для цієї сторінки"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -140,11 +140,11 @@ msgstr ""
 "Перекидає вас з будь-якої сторінки в документацію для функції, що "
 "сгенерувала цю сторінку."
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Показати ID об'єкту"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -152,42 +152,51 @@ msgstr ""
 "Показує content-type та унікальний ID для сторінок, які являють собою єдиний "
 "об'єкт."
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Редагувати цей об'єкт (поточне вікно)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "Перекидає до адміністраторської сторінки для сторінок, що відображають "
 "окремий об'єкт."
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Редагувати цей об'єкт (нове вікно)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Як і вище, але відкриває сторінку адміністрування у новому вікні."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr "Моделі"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr "Шаблони"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr "Фільтри"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr "Відображення"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Булеве значення (True або False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Тип поля: %(field_type)s"
diff --git a/django/contrib/admindocs/locale/ur/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ur/LC_MESSAGES/django.mo
index 6e59bfbdf0..ade2636306 100644
Binary files a/django/contrib/admindocs/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/ur/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ur/LC_MESSAGES/django.po
index ac62ebcc55..f6686d8b1f 100644
--- a/django/contrib/admindocs/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/ur/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "ٹیگ :"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "فلٹر:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "ویو:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "ایپلیکیشن %r نہیں ملی"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "ماڈل %(model_name)r ایپ %(app_label)r میں نہیں ملا"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "متعلقہ `%(app_label)s.%(data_type)s`اوبجیکٹ"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "model:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "متعلقہ `%(app_label)s.%(object_name)s` اوبجیکٹس"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "تمام %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%sکی تعداد "
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s اوبجیکٹ پر فیلڈز"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s بطور urlpattern ظاہر نہیں ہو رہا۔"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "صفحۂ اول"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr "%s بطور urlpattern ظاہر نہیں ہو رہا۔"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "صفحۂ اول"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "طریق استعمال"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "بک مارک لیٹس"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "طریق استعمال کے بک مارک لیٹس"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -127,11 +127,11 @@ msgstr ""
 "کمپیوٹر \"internal\" ہے تو اپنے\n"
 "سسٹم کے منتظم سے رابطہ کریں)۔ </p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "اس صفحے کا طریق استعمال"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
@@ -139,11 +139,11 @@ msgstr ""
 "آپ کو لے جاتا ہے کسی بھی صفحے سے طریق استعمال کی طرف اس ویو کے لئے جو اس "
 "صفحے کو بناتا ہے۔"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "اوبجیکٹ کی آئی ڈی دکھائیں"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
@@ -151,42 +151,51 @@ msgstr ""
 "مضمون کی قسم اور منفرد آئی ڈی دکھاتا ہے ان صفحوں کے لئے جو سنگل اوبجیکٹ کی "
 "نمائندگی کرتے ہیں۔"
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "اس اوبجیکٹ کو ایڈٹ کریں (موجودہ ونڈو)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "منتظم کے صفحے کی طرف جمپ کرتا ھے ان صفحوں کے لئے سنگل اوبجیکٹ کی نمائندگی "
 "کرتے ہیں۔"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "اس اوبجیکٹ کو ایڈٹ کریں (نئی ونڈو)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "اوپر کی طرح ھے۔ لیکن منتظم کے صفحے کو نئی ونڈو میں کھولتا ھے۔"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "بولین (True یا False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "%(field_type)s قسم کا خانہ"
diff --git a/django/contrib/admindocs/locale/vi/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/vi/LC_MESSAGES/django.mo
index c66d8c2d9d..6d8f7858c6 100644
Binary files a/django/contrib/admindocs/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/vi/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/vi/LC_MESSAGES/django.po
index 079ea99d79..57dd9af43c 100644
--- a/django/contrib/admindocs/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/vi/LC_MESSAGES/django.po
@@ -6,74 +6,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "Nhãn:"
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "Lọc:"
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "Xem:"
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "Ứng dụng %r không tìm thấy"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "Mẫu %(model_name)r không tìm thấy trong ứng dụng %(app_label)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "mẫu:"
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "liên quan tới đối tượng `%(app_label)s.%(object_name)s`"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "Tất cả %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "số của %s"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr ""
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr ""
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "Trang chủ"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +95,18 @@ msgstr ""
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr ""
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
-msgstr ""
+msgstr "Tài liệu"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -117,60 +117,69 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "Hiện ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "Sửa lại đối tượng này (ở cửa sổ hiện tại)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "Sửa lại đối tượng này (trong cửa sổ mới)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "Như trên nhưng mở trang quản trị ở một cửa sổ mới."
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
 msgstr ""
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
 msgstr ""
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
 msgstr ""
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
 msgstr ""
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
 msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (hoặc là Đúng hoặc là Sai)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Trường thuộc dạng: %(field_type)s "
diff --git a/django/contrib/admindocs/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/zh_CN/LC_MESSAGES/django.mo
index 5a49de49fe..1401ea1793 100644
Binary files a/django/contrib/admindocs/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/zh_CN/LC_MESSAGES/django.po
index f054928a46..dbdeec03af 100644
--- a/django/contrib/admindocs/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/zh_CN/LC_MESSAGES/django.po
@@ -2,78 +2,91 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Kevin Shi <leiarix@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "标签："
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "过滤器："
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "视图："
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "应用 %r 没有找到"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "在应用 %(app_label)r 里找不到模型 %(model_name)r"
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "相关的 `%(app_label)s.%(data_type)s` 对象"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "模型："
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "相关的 `%(app_label)s.%(object_name)s` 对象"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "所有 %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s 的数量"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s 对象的字段"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s 似乎不是一个 urlpattern 对象"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "首页"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -83,30 +96,18 @@ msgstr "%s 似乎不是一个 urlpattern 对象"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "首页"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "文档"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "书签"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "文档书签"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -123,60 +124,69 @@ msgstr ""
 "被指定为\"内部\"的计算机上查看（如果不确定你的计算机\n"
 "是否为\"内部\"的，不妨跟你的系统管理员沟通一下）。</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "关于本页面的文档"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "从任何页面跳转到生成该页面的 view 文档。"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "显示对象 ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "为那些展现单个对象的页面，显示 content-type 和唯一 ID。"
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "编辑该对象(当前窗口)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "跳转到用于展现单个对象的页面的管理页。"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "编辑该对象(新窗口)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "同上，但在新窗口中打开管理页面。"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "模型"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "模板"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "过滤器"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "标签"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "视图"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "布尔值（真或假）"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "字段类型：%(field_type)s"
diff --git a/django/contrib/admindocs/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/zh_TW/LC_MESSAGES/django.mo
index 2055e5b197..498a006c0e 100644
Binary files a/django/contrib/admindocs/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/admindocs/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/zh_TW/LC_MESSAGES/django.po
index 9f4cebb98e..aebabd3060 100644
--- a/django/contrib/admindocs/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/zh_TW/LC_MESSAGES/django.po
@@ -3,78 +3,91 @@
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # quantum9876 <quantum9876@gmail.com>, 2011.
+#   <yyc1217@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-02-14 13:06+0000\n"
-"Last-Translator: quantum9876 <quantum9876@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"PO-Revision-Date: 2012-10-22 08:46+0000\n"
+"Last-Translator: yyc1217 <yyc1217@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
 msgid "tag:"
 msgstr "標籤："
 
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
 msgid "filter:"
 msgstr "過濾器："
 
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
 msgid "view:"
 msgstr "視圖："
 
-#: views.py:187
+#: views.py:188
 #, python-format
 msgid "App %r not found"
 msgstr "應用程式 %r 没有找到"
 
-#: views.py:194
+#: views.py:195
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr "未在%(app_label)r 找到模組 %(model_name)r "
 
-#: views.py:206
+#: views.py:207
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "有關 `%(app_label)s.%(data_type)s` 的物件"
 
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
 msgid "model:"
 msgstr "模型："
 
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "有關 `%(app_label)s.%(object_name)s` 的物件"
 
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
 #, python-format
 msgid "all %s"
 msgstr "所有 %s"
 
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
 #, python-format
 msgid "number of %s"
 msgstr "%s 的数量"
 
-#: views.py:268
+#: views.py:269
 #, python-format
 msgid "Fields on %s objects"
 msgstr "%s 物件的欄位"
 
-#: views.py:360
+#: views.py:361
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s 似乎不是一個 urlpattern 物件"
 
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr "首頁"
+
 #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
 #: templates/admin_doc/missing_docutils.html:7
 #: templates/admin_doc/model_detail.html:15
@@ -84,30 +97,18 @@ msgstr "%s 似乎不是一個 urlpattern 物件"
 #: templates/admin_doc/template_tag_index.html:8
 #: templates/admin_doc/view_detail.html:7
 #: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr "首頁"
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr "文件"
 
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
 msgid "Bookmarklets"
 msgstr "書籤"
 
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
 msgid "Documentation bookmarklets"
 msgstr "文件 bookmarklets"
 
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -123,60 +124,69 @@ msgstr ""
 "些 bookmarklet 要求你必須是從被稱為 \"內部\" 的電腦來檢視網站的 (如果你不確定"
 "你的電腦是否在 \"內部\"，那就和你的系統管理員談談)。</p>\n"
 
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
 msgid "Documentation for this page"
 msgstr "本頁面的文件"
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr "讓你跳到用來產生該頁面之檢視的任何一頁文件。"
 
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
 msgid "Show object ID"
 msgstr "顯示物件 ID"
 
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr "顯示用來表示單一物件的頁面 content-type 與唯一 ID。"
 
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
 msgid "Edit this object (current window)"
 msgstr "編輯此物件 (目前視窗)"
 
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "跳到用來表示單一物件的管理頁面。"
 
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
 msgid "Edit this object (new window)"
 msgstr "編輯此物件 (新視窗)"
 
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
 msgid "As above, but opens the admin page in a new window."
 msgstr "同上，但在新視窗裡開啟管理頁面。"
 
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
 msgid "Models"
-msgstr ""
+msgstr "模型"
 
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
 msgid "Templates"
-msgstr ""
+msgstr "模版"
 
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
 msgid "Filters"
-msgstr ""
+msgstr "過濾器"
 
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
-msgstr ""
+msgstr "標籤"
 
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Views"
-msgstr ""
+msgstr "視圖"
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr "布林值 (True 或 False)"
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "欄位型態： %(field_type)s"
diff --git a/django/contrib/admindocs/templates/admin_doc/template_filter_index.html b/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
index 1878e806f4..687ebbcfec 100644
--- a/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
+++ b/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n %}
+{% load i18n %}{% load firstof from future %}
 
 {% block coltype %}colSM{% endblock %}
 {% block breadcrumbs %}
@@ -22,7 +22,7 @@
     <h2>{% firstof library.grouper "Built-in filters" %}</h2>
     {% if library.grouper %}<p class="small quiet">To use these filters, put <code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %}</code> in your template before using the filter.</p><hr />{% endif %}
     {% for filter in library.list|dictsort:"name" %}
-    <h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ filter.name }}">{{ filter.name }}</h3>
+    <h3 id="{{ library.grouper|default:"built_in" }}-{{ filter.name }}">{{ filter.name }}</h3>
     {{ filter.title }}
     {{ filter.body }}
     {% if not forloop.last %}<hr />{% endif %}
@@ -43,7 +43,7 @@
     <h2>{% firstof library.grouper "Built-in filters" %}</h2>
     <ul>
     {% for filter in library.list|dictsort:"name" %}
-        <li><a href="#{{ library.grouper|default_if_none:"built_in" }}-{{ filter.name }}">{{ filter.name }}</a></li>
+        <li><a href="#{{ library.grouper|default:"built_in" }}-{{ filter.name }}">{{ filter.name }}</a></li>
     {% endfor %}
     </ul>
 </div>
diff --git a/django/contrib/admindocs/templates/admin_doc/template_tag_index.html b/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
index 568b118826..c0fb243a99 100644
--- a/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
+++ b/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n %}
+{% load i18n %}{% load firstof from future %}
 
 {% block coltype %}colSM{% endblock %}
 {% block breadcrumbs %}
@@ -22,7 +22,7 @@
     <h2>{% firstof library.grouper "Built-in tags" %}</h2>
     {% if library.grouper %}<p class="small quiet">To use these tags, put <code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %}</code> in your template before using the tag.</p><hr />{% endif %}
     {% for tag in library.list|dictsort:"name" %}
-    <h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ tag.name }}">{{ tag.name }}</h3>
+    <h3 id="{{ library.grouper|default:"built_in" }}-{{ tag.name }}">{{ tag.name }}</h3>
     <h4>{{ tag.title|striptags }}</h4>
     {{ tag.body }}
     {% if not forloop.last %}<hr />{% endif %}
@@ -43,7 +43,7 @@
     <h2>{% firstof library.grouper "Built-in tags" %}</h2>
     <ul>
     {% for tag in library.list|dictsort:"name" %}
-        <li><a href="#{{ library.grouper|default_if_none:"built_in" }}-{{ tag.name }}">{{ tag.name }}</a></li>
+        <li><a href="#{{ library.grouper|default:"built_in" }}-{{ tag.name }}">{{ tag.name }}</a></li>
     {% endfor %}
     </ul>
 </div>
diff --git a/django/contrib/admindocs/tests/__init__.py b/django/contrib/admindocs/tests/__init__.py
index aa5bd6a8dc..2a67f83bcb 100644
--- a/django/contrib/admindocs/tests/__init__.py
+++ b/django/contrib/admindocs/tests/__init__.py
@@ -1,36 +1 @@
-from __future__ import absolute_import, unicode_literals
-
-from django.contrib.admindocs import views
-from django.db.models import fields as builtin_fields
-from django.utils import unittest
-from django.utils.translation import ugettext as _
-
-from . import fields
-
-
-class TestFieldType(unittest.TestCase):
-    def setUp(self):
-        pass
-
-    def test_field_name(self):
-        self.assertRaises(AttributeError,
-            views.get_readable_field_data_type, "NotAField"
-        )
-
-    def test_builtin_fields(self):
-        self.assertEqual(
-            views.get_readable_field_data_type(builtin_fields.BooleanField()),
-            _('Boolean (Either True or False)')
-        )
-
-    def test_custom_fields(self):
-        self.assertEqual(
-            views.get_readable_field_data_type(fields.CustomField()),
-            'A custom field type'
-        )
-        self.assertEqual(
-            views.get_readable_field_data_type(fields.DescriptionLackingField()),
-            _('Field of type: %(field_type)s') % {
-                'field_type': 'DescriptionLackingField'
-            }
-        )
+from .test_fields import TestFieldType
diff --git a/django/contrib/admindocs/tests/fields.py b/django/contrib/admindocs/tests/fields.py
deleted file mode 100644
index e59498afb5..0000000000
--- a/django/contrib/admindocs/tests/fields.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.db import models
-
-class CustomField(models.Field):
-    description = "A custom field type"
-
-class DescriptionLackingField(models.Field):
-    pass
diff --git a/django/contrib/admindocs/tests/test_fields.py b/django/contrib/admindocs/tests/test_fields.py
new file mode 100644
index 0000000000..c048f20287
--- /dev/null
+++ b/django/contrib/admindocs/tests/test_fields.py
@@ -0,0 +1,42 @@
+from __future__ import absolute_import, unicode_literals
+
+from django.contrib.admindocs import views
+from django.db import models
+from django.db.models import fields
+from django.utils import unittest
+from django.utils.translation import ugettext as _
+
+
+class CustomField(models.Field):
+    description = "A custom field type"
+
+class DescriptionLackingField(models.Field):
+    pass
+
+
+class TestFieldType(unittest.TestCase):
+    def setUp(self):
+        pass
+
+    def test_field_name(self):
+        self.assertRaises(AttributeError,
+            views.get_readable_field_data_type, "NotAField"
+        )
+
+    def test_builtin_fields(self):
+        self.assertEqual(
+            views.get_readable_field_data_type(fields.BooleanField()),
+            _('Boolean (Either True or False)')
+        )
+
+    def test_custom_fields(self):
+        self.assertEqual(
+            views.get_readable_field_data_type(CustomField()),
+            'A custom field type'
+        )
+        self.assertEqual(
+            views.get_readable_field_data_type(DescriptionLackingField()),
+            _('Field of type: %(field_type)s') % {
+                'field_type': 'DescriptionLackingField'
+            }
+        )
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py
index cb0c116416..6b1bea15f3 100644
--- a/django/contrib/admindocs/views.py
+++ b/django/contrib/admindocs/views.py
@@ -62,7 +62,7 @@ def template_tag_index(request):
             for key in metadata:
                 metadata[key] = utils.parse_rst(metadata[key], 'tag', _('tag:') + tag_name)
             if library in template.builtins:
-                tag_library = None
+                tag_library = ''
             else:
                 tag_library = module_name.split('.')[-1]
             tags.append({
@@ -97,7 +97,7 @@ def template_filter_index(request):
             for key in metadata:
                 metadata[key] = utils.parse_rst(metadata[key], 'filter', _('filter:') + filter_name)
             if library in template.builtins:
-                tag_library = None
+                tag_library = ''
             else:
                 tag_library = module_name.split('.')[-1]
             filters.append({
@@ -189,7 +189,7 @@ def model_detail(request, app_label, model_name):
         raise Http404(_("App %r not found") % app_label)
     model = None
     for m in models.get_models(app_mod):
-        if m._meta.object_name.lower() == model_name:
+        if m._meta.model_name == model_name:
             model = m
             break
     if model is None:
@@ -224,12 +224,12 @@ def model_detail(request, app_label, model_name):
         fields.append({
             'name': "%s.all" % field.name,
             "data_type": 'List',
-            'verbose': utils.parse_rst(_("all %s") % verbose , 'model', _('model:') + opts.module_name),
+            'verbose': utils.parse_rst(_("all %s") % verbose , 'model', _('model:') + opts.model_name),
         })
         fields.append({
             'name'      : "%s.count" % field.name,
             'data_type' : 'Integer',
-            'verbose'   : utils.parse_rst(_("number of %s") % verbose , 'model', _('model:') + opts.module_name),
+            'verbose'   : utils.parse_rst(_("number of %s") % verbose , 'model', _('model:') + opts.model_name),
         })
 
     # Gather model methods.
@@ -243,7 +243,7 @@ def model_detail(request, app_label, model_name):
                 continue
             verbose = func.__doc__
             if verbose:
-                verbose = utils.parse_rst(utils.trim_docstring(verbose), 'model', _('model:') + opts.module_name)
+                verbose = utils.parse_rst(utils.trim_docstring(verbose), 'model', _('model:') + opts.model_name)
             fields.append({
                 'name': func_name,
                 'data_type': get_return_data_type(func_name),
@@ -257,12 +257,12 @@ def model_detail(request, app_label, model_name):
         fields.append({
             'name'      : "%s.all" % accessor,
             'data_type' : 'List',
-            'verbose'   : utils.parse_rst(_("all %s") % verbose , 'model', _('model:') + opts.module_name),
+            'verbose'   : utils.parse_rst(_("all %s") % verbose , 'model', _('model:') + opts.model_name),
         })
         fields.append({
             'name'      : "%s.count" % accessor,
             'data_type' : 'Integer',
-            'verbose'   : utils.parse_rst(_("number of %s") % verbose , 'model', _('model:') + opts.module_name),
+            'verbose'   : utils.parse_rst(_("number of %s") % verbose , 'model', _('model:') + opts.model_name),
         })
     return render_to_response('admin_doc/model_detail.html', {
         'root_path': urlresolvers.reverse('admin:index'),
diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py
index 99348d3ae5..ef9066657d 100644
--- a/django/contrib/auth/__init__.py
+++ b/django/contrib/auth/__init__.py
@@ -1,8 +1,8 @@
 import re
 
-from django.core.exceptions import ImproperlyConfigured, PermissionDenied
-from django.utils.importlib import import_module
 from django.contrib.auth.signals import user_logged_in, user_logged_out, user_login_failed
+from django.core.exceptions import ImproperlyConfigured, PermissionDenied
+from django.utils.module_loading import import_by_path
 
 SESSION_KEY = '_auth_user_id'
 BACKEND_SESSION_KEY = '_auth_user_backend'
@@ -10,19 +10,7 @@ REDIRECT_FIELD_NAME = 'next'
 
 
 def load_backend(path):
-    i = path.rfind('.')
-    module, attr = path[:i], path[i + 1:]
-    try:
-        mod = import_module(module)
-    except ImportError as e:
-        raise ImproperlyConfigured('Error importing authentication backend %s: "%s"' % (path, e))
-    except ValueError:
-        raise ImproperlyConfigured('Error importing authentication backends. Is AUTHENTICATION_BACKENDS a correctly defined list or tuple?')
-    try:
-        cls = getattr(mod, attr)
-    except AttributeError:
-        raise ImproperlyConfigured('Module "%s" does not define a "%s" authentication backend' % (module, attr))
-    return cls()
+    return import_by_path(path)()
 
 
 def get_backends():
diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py
index d15a387a7e..409078fa02 100644
--- a/django/contrib/auth/admin.py
+++ b/django/contrib/auth/admin.py
@@ -83,9 +83,15 @@ class UserAdmin(admin.ModelAdmin):
              self.admin_site.admin_view(self.user_change_password))
         ) + super(UserAdmin, self).get_urls()
 
+    def lookup_allowed(self, lookup, value):
+        # See #20078: we don't want to allow any lookups involving passwords.
+        if lookup.startswith('password'):
+            return False
+        return super(UserAdmin, self).lookup_allowed(lookup, value)
+
     @sensitive_post_parameters()
     @csrf_protect_m
-    @transaction.commit_on_success
+    @transaction.atomic
     def add_view(self, request, form_url='', extra_context=None):
         # It's an error for a user to have add permission but NOT change
         # permission for users. If we allowed such users to add users, they
@@ -118,7 +124,7 @@ class UserAdmin(admin.ModelAdmin):
     def user_change_password(self, request, id, form_url=''):
         if not self.has_change_permission(request):
             raise PermissionDenied
-        user = get_object_or_404(self.queryset(request), pk=id)
+        user = get_object_or_404(self.get_queryset(request), pk=id)
         if request.method == 'POST':
             form = self.change_password_form(user, request.POST)
             if form.is_valid():
@@ -153,7 +159,7 @@ class UserAdmin(admin.ModelAdmin):
             'admin/auth/user/change_password.html',
             context, current_app=self.admin_site.name)
 
-    def response_add(self, request, obj, **kwargs):
+    def response_add(self, request, obj, post_url_continue=None):
         """
         Determines the HttpResponse for the add_view stage. It mostly defers to
         its superclass implementation but is customized because the User model
@@ -166,7 +172,8 @@ class UserAdmin(admin.ModelAdmin):
         # * We are adding a user in a popup
         if '_addanother' not in request.POST and '_popup' not in request.POST:
             request.POST['_continue'] = 1
-        return super(UserAdmin, self).response_add(request, obj, **kwargs)
+        return super(UserAdmin, self).response_add(request, obj,
+                                                   post_url_continue)
 
 admin.site.register(Group, GroupAdmin)
 admin.site.register(User, UserAdmin)
diff --git a/django/contrib/auth/backends.py b/django/contrib/auth/backends.py
index db99c94838..05e9bfd721 100644
--- a/django/contrib/auth/backends.py
+++ b/django/contrib/auth/backends.py
@@ -8,12 +8,12 @@ class ModelBackend(object):
     Authenticates against django.contrib.auth.models.User.
     """
 
-    # TODO: Model, login attribute name and password attribute name should be
-    # configurable.
-    def authenticate(self, username=None, password=None):
+    def authenticate(self, username=None, password=None, **kwargs):
+        UserModel = get_user_model()
+        if username is None:
+            username = kwargs.get(UserModel.USERNAME_FIELD)
         try:
-            UserModel = get_user_model()
-            user = UserModel.objects.get_by_natural_key(username)
+            user = UserModel._default_manager.get_by_natural_key(username)
             if user.check_password(password):
                 return user
         except UserModel.DoesNotExist:
@@ -64,7 +64,7 @@ class ModelBackend(object):
     def get_user(self, user_id):
         try:
             UserModel = get_user_model()
-            return UserModel.objects.get(pk=user_id)
+            return UserModel._default_manager.get(pk=user_id)
         except UserModel.DoesNotExist:
             return None
 
diff --git a/django/contrib/auth/context_processors.py b/django/contrib/auth/context_processors.py
index 3d17fe2754..b8ead73eb4 100644
--- a/django/contrib/auth/context_processors.py
+++ b/django/contrib/auth/context_processors.py
@@ -2,14 +2,14 @@
 # the template system can understand.
 
 class PermLookupDict(object):
-    def __init__(self, user, module_name):
-        self.user, self.module_name = user, module_name
+    def __init__(self, user, app_label):
+        self.user, self.app_label = user, app_label
 
     def __repr__(self):
         return str(self.user.get_all_permissions())
 
     def __getitem__(self, perm_name):
-        return self.user.has_perm("%s.%s" % (self.module_name, perm_name))
+        return self.user.has_perm("%s.%s" % (self.app_label, perm_name))
 
     def __iter__(self):
         # To fix 'item in perms.someapp' and __getitem__ iteraction we need to
@@ -17,7 +17,7 @@ class PermLookupDict(object):
         raise TypeError("PermLookupDict is not iterable.")
 
     def __bool__(self):
-        return self.user.has_module_perms(self.module_name)
+        return self.user.has_module_perms(self.app_label)
 
     def __nonzero__(self):      # Python 2 compatibility
         return type(self).__bool__(self)
@@ -27,8 +27,8 @@ class PermWrapper(object):
     def __init__(self, user):
         self.user = user
 
-    def __getitem__(self, module_name):
-        return PermLookupDict(self.user, module_name)
+    def __getitem__(self, app_label):
+        return PermLookupDict(self.user, app_label)
 
     def __iter__(self):
         # I am large, I contain multitudes.
@@ -41,8 +41,8 @@ class PermWrapper(object):
         if '.' not in perm_name:
             # The name refers to module.
             return bool(self[perm_name])
-        module_name, perm_name = perm_name.split('.', 1)
-        return self[module_name][perm_name]
+        app_label, perm_name = perm_name.split('.', 1)
+        return self[app_label][perm_name]
 
 
 def auth(request):
diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
index 4e2f476cec..42abde2f19 100644
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import warnings
+
 from django import forms
 from django.forms.util import flatatt
 from django.template import loader
@@ -57,6 +59,9 @@ class ReadOnlyPasswordHashField(forms.Field):
         # render an input field.
         return initial
 
+    def _has_changed(self, initial, data):
+        return False
+
 
 class UserCreationForm(forms.ModelForm):
     """
@@ -89,7 +94,7 @@ class UserCreationForm(forms.ModelForm):
         # but it sets a nicer error message than the ORM. See #13147.
         username = self.cleaned_data["username"]
         try:
-            User.objects.get(username=username)
+            User._default_manager.get(username=username)
         except User.DoesNotExist:
             return username
         raise forms.ValidationError(self.error_messages['duplicate_username'])
@@ -150,17 +155,13 @@ class AuthenticationForm(forms.Form):
     error_messages = {
         'invalid_login': _("Please enter a correct %(username)s and password. "
                            "Note that both fields may be case-sensitive."),
-        'no_cookies': _("Your Web browser doesn't appear to have cookies "
-                        "enabled. Cookies are required for logging in."),
         'inactive': _("This account is inactive."),
     }
 
     def __init__(self, request=None, *args, **kwargs):
         """
-        If request is passed in, the form will validate that cookies are
-        enabled. Note that the request (a HttpRequest object) must have set a
-        cookie with the key TEST_COOKIE_NAME and value TEST_COOKIE_VALUE before
-        running this validation.
+        The 'request' parameter is set for custom auth use by subclasses.
+        The form data comes in via the standard 'data' kwarg.
         """
         self.request = request
         self.user_cache = None
@@ -169,7 +170,8 @@ class AuthenticationForm(forms.Form):
         # Set the label for the "username" field.
         UserModel = get_user_model()
         self.username_field = UserModel._meta.get_field(UserModel.USERNAME_FIELD)
-        self.fields['username'].label = capfirst(self.username_field.verbose_name)
+        if not self.fields['username'].label:
+            self.fields['username'].label = capfirst(self.username_field.verbose_name)
 
     def clean(self):
         username = self.cleaned_data.get('username')
@@ -185,12 +187,11 @@ class AuthenticationForm(forms.Form):
                     })
             elif not self.user_cache.is_active:
                 raise forms.ValidationError(self.error_messages['inactive'])
-        self.check_for_test_cookie()
         return self.cleaned_data
 
     def check_for_test_cookie(self):
-        if self.request and not self.request.session.test_cookie_worked():
-            raise forms.ValidationError(self.error_messages['no_cookies'])
+        warnings.warn("check_for_test_cookie is deprecated; ensure your login "
+                "view is CSRF-protected.", DeprecationWarning)
 
     def get_user_id(self):
         if self.user_cache:
@@ -202,31 +203,8 @@ class AuthenticationForm(forms.Form):
 
 
 class PasswordResetForm(forms.Form):
-    error_messages = {
-        'unknown': _("That email address doesn't have an associated "
-                     "user account. Are you sure you've registered?"),
-        'unusable': _("The user account associated with this email "
-                      "address cannot reset the password."),
-    }
     email = forms.EmailField(label=_("Email"), max_length=254)
 
-    def clean_email(self):
-        """
-        Validates that an active user exists with the given email address.
-        """
-        UserModel = get_user_model()
-        email = self.cleaned_data["email"]
-        self.users_cache = UserModel.objects.filter(email__iexact=email)
-        if not len(self.users_cache):
-            raise forms.ValidationError(self.error_messages['unknown'])
-        if not any(user.is_active for user in self.users_cache):
-            # none of the filtered users are active
-            raise forms.ValidationError(self.error_messages['unknown'])
-        if any((user.password == UNUSABLE_PASSWORD)
-               for user in self.users_cache):
-            raise forms.ValidationError(self.error_messages['unusable'])
-        return email
-
     def save(self, domain_override=None,
              subject_template_name='registration/password_reset_subject.txt',
              email_template_name='registration/password_reset_email.html',
@@ -237,7 +215,14 @@ class PasswordResetForm(forms.Form):
         user.
         """
         from django.core.mail import send_mail
-        for user in self.users_cache:
+        UserModel = get_user_model()
+        email = self.cleaned_data["email"]
+        users = UserModel._default_manager.filter(email__iexact=email)
+        for user in users:
+            # Make sure that no email is sent to a user that actually has
+            # a password marked as unusable
+            if user.password == UNUSABLE_PASSWORD:
+                continue
             if not domain_override:
                 current_site = get_current_site(request)
                 site_name = current_site.name
diff --git a/django/contrib/auth/handlers/modwsgi.py b/django/contrib/auth/handlers/modwsgi.py
index 5ee4d609f7..f14afcf290 100644
--- a/django/contrib/auth/handlers/modwsgi.py
+++ b/django/contrib/auth/handlers/modwsgi.py
@@ -18,14 +18,14 @@ def check_password(environ, username, password):
 
     try:
         try:
-            user = UserModel.objects.get_by_natural_key(username)
+            user = UserModel._default_manager.get_by_natural_key(username)
         except UserModel.DoesNotExist:
             return None
         if not user.is_active:
             return None
         return user.check_password(password)
     finally:
-        db.close_connection()
+        db.close_old_connections()
 
 def groups_for_user(environ, username):
     """
@@ -37,15 +37,11 @@ def groups_for_user(environ, username):
 
     try:
         try:
-            user = UserModel.objects.get_by_natural_key(username)
+            user = UserModel._default_manager.get_by_natural_key(username)
         except UserModel.DoesNotExist:
             return []
-        try:
-            if not user.is_active:
-                return []
-        except AttributeError as e:
-            # a custom user may not support is_active
+        if not user.is_active:
             return []
         return [force_bytes(group.name) for group in user.groups.all()]
     finally:
-        db.close_connection()
+        db.close_old_connections()
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
index c628059d34..092cccedde 100644
--- a/django/contrib/auth/hashers.py
+++ b/django/contrib/auth/hashers.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import base64
+import binascii
 import hashlib
 
 from django.dispatch import receiver
@@ -8,10 +9,11 @@ from django.conf import settings
 from django.test.signals import setting_changed
 from django.utils import importlib
 from django.utils.datastructures import SortedDict
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_str
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.crypto import (
     pbkdf2, constant_time_compare, get_random_string)
+from django.utils.module_loading import import_by_path
 from django.utils.translation import ugettext_noop as _
 
 
@@ -84,13 +86,7 @@ def load_hashers(password_hashers=None):
     if not password_hashers:
         password_hashers = settings.PASSWORD_HASHERS
     for backend in password_hashers:
-        try:
-            mod_path, cls_name = backend.rsplit('.', 1)
-            mod = importlib.import_module(mod_path)
-            hasher_cls = getattr(mod, cls_name)
-        except (AttributeError, ImportError, ValueError):
-            raise ImproperlyConfigured("hasher not found: %s" % backend)
-        hasher = hasher_cls()
+        hasher = import_by_path(backend)()
         if not getattr(hasher, 'algorithm'):
             raise ImproperlyConfigured("hasher doesn't specify an "
                                        "algorithm name: %s" % backend)
@@ -132,8 +128,14 @@ def identify_hasher(encoded):
     get_hasher() to return hasher. Raises ValueError if
     algorithm cannot be identified, or if hasher is not loaded.
     """
-    if len(encoded) == 32 and '$' not in encoded:
+    # Ancient versions of Django created plain MD5 passwords and accepted
+    # MD5 passwords with an empty salt.
+    if ((len(encoded) == 32 and '$' not in encoded) or
+            (len(encoded) == 37 and encoded.startswith('md5$$'))):
         algorithm = 'unsalted_md5'
+    # Ancient versions of Django accepted SHA1 passwords with an empty salt.
+    elif len(encoded) == 46 and encoded.startswith('sha1$$'):
+        algorithm = 'unsalted_sha1'
     else:
         algorithm = encoded.split('$', 1)[0]
     return get_hasher(algorithm)
@@ -256,7 +258,7 @@ class PBKDF2SHA1PasswordHasher(PBKDF2PasswordHasher):
     digest = hashlib.sha1
 
 
-class BCryptPasswordHasher(BasePasswordHasher):
+class BCryptSHA256PasswordHasher(BasePasswordHasher):
     """
     Secure password hashing using the bcrypt algorithm (recommended)
 
@@ -265,7 +267,8 @@ class BCryptPasswordHasher(BasePasswordHasher):
     this library depends on native C code and might cause portability
     issues.
     """
-    algorithm = "bcrypt"
+    algorithm = "bcrypt_sha256"
+    digest = hashlib.sha256
     library = ("py-bcrypt", "bcrypt")
     rounds = 12
 
@@ -275,6 +278,18 @@ class BCryptPasswordHasher(BasePasswordHasher):
 
     def encode(self, password, salt):
         bcrypt = self._load_library()
+        # Need to reevaluate the force_bytes call once bcrypt is supported on
+        # Python 3
+
+        # Hash the password prior to using bcrypt to prevent password truncation
+        #   See: https://code.djangoproject.com/ticket/20138
+        if self.digest is not None:
+            # We use binascii.hexlify here because Python3 decided that a hex encoded
+            #   bytestring is somehow a unicode.
+            password = binascii.hexlify(self.digest(force_bytes(password)).digest())
+        else:
+            password = force_bytes(password)
+
         data = bcrypt.hashpw(password, salt)
         return "%s$%s" % (self.algorithm, data)
 
@@ -282,6 +297,16 @@ class BCryptPasswordHasher(BasePasswordHasher):
         algorithm, data = encoded.split('$', 1)
         assert algorithm == self.algorithm
         bcrypt = self._load_library()
+
+        # Hash the password prior to using bcrypt to prevent password truncation
+        #   See: https://code.djangoproject.com/ticket/20138
+        if self.digest is not None:
+            # We use binascii.hexlify here because Python3 decided that a hex encoded
+            #   bytestring is somehow a unicode.
+            password = binascii.hexlify(self.digest(force_bytes(password)).digest())
+        else:
+            password = force_bytes(password)
+
         return constant_time_compare(data, bcrypt.hashpw(password, data))
 
     def safe_summary(self, encoded):
@@ -296,6 +321,25 @@ class BCryptPasswordHasher(BasePasswordHasher):
         ])
 
 
+class BCryptPasswordHasher(BCryptSHA256PasswordHasher):
+    """
+    Secure password hashing using the bcrypt algorithm
+
+    This is considered by many to be the most secure algorithm but you
+    must first install the py-bcrypt library.  Please be warned that
+    this library depends on native C code and might cause portability
+    issues.
+
+    This hasher does not first hash the password which means it is subject to
+    the 72 character bcrypt password truncation, most use cases should prefer
+    the BCryptSha512PasswordHasher.
+
+    See: https://code.djangoproject.com/ticket/20138
+    """
+    algorithm = "bcrypt"
+    digest = None
+
+
 class SHA1PasswordHasher(BasePasswordHasher):
     """
     The SHA1 password hashing algorithm (not recommended)
@@ -352,14 +396,48 @@ class MD5PasswordHasher(BasePasswordHasher):
         ])
 
 
+class UnsaltedSHA1PasswordHasher(BasePasswordHasher):
+    """
+    Very insecure algorithm that you should *never* use; stores SHA1 hashes
+    with an empty salt.
+
+    This class is implemented because Django used to accept such password
+    hashes. Some older Django installs still have these values lingering
+    around so we need to handle and upgrade them properly.
+    """
+    algorithm = "unsalted_sha1"
+
+    def salt(self):
+        return ''
+
+    def encode(self, password, salt):
+        assert salt == ''
+        hash = hashlib.sha1(force_bytes(password)).hexdigest()
+        return 'sha1$$%s' % hash
+
+    def verify(self, password, encoded):
+        encoded_2 = self.encode(password, '')
+        return constant_time_compare(encoded, encoded_2)
+
+    def safe_summary(self, encoded):
+        assert encoded.startswith('sha1$$')
+        hash = encoded[6:]
+        return SortedDict([
+            (_('algorithm'), self.algorithm),
+            (_('hash'), mask_hash(hash)),
+        ])
+
+
 class UnsaltedMD5PasswordHasher(BasePasswordHasher):
     """
-    I am an incredibly insecure algorithm you should *never* use;
-    stores unsalted MD5 hashes without the algorithm prefix.
+    Incredibly insecure algorithm that you should *never* use; stores unsalted
+    MD5 hashes without the algorithm prefix, also accepts MD5 hashes with an
+    empty salt.
 
-    This class is implemented because Django used to store passwords
-    this way. Some older Django installs still have these values
-    lingering around so we need to handle and upgrade them properly.
+    This class is implemented because Django used to store passwords this way
+    and to accept such password hashes. Some older Django installs still have
+    these values lingering around so we need to handle and upgrade them
+    properly.
     """
     algorithm = "unsalted_md5"
 
@@ -367,9 +445,12 @@ class UnsaltedMD5PasswordHasher(BasePasswordHasher):
         return ''
 
     def encode(self, password, salt):
+        assert salt == ''
         return hashlib.md5(force_bytes(password)).hexdigest()
 
     def verify(self, password, encoded):
+        if len(encoded) == 37 and encoded.startswith('md5$$'):
+            encoded = encoded[5:]
         encoded_2 = self.encode(password, '')
         return constant_time_compare(encoded, encoded_2)
 
@@ -395,7 +476,7 @@ class CryptPasswordHasher(BasePasswordHasher):
     def encode(self, password, salt):
         crypt = self._load_library()
         assert len(salt) == 2
-        data = crypt.crypt(password, salt)
+        data = crypt.crypt(force_str(password), salt)
         # we don't need to store the salt, but Django used to do this
         return "%s$%s$%s" % (self.algorithm, '', data)
 
@@ -403,7 +484,7 @@ class CryptPasswordHasher(BasePasswordHasher):
         crypt = self._load_library()
         algorithm, salt, data = encoded.split('$', 2)
         assert algorithm == self.algorithm
-        return constant_time_compare(data, crypt.crypt(password, data))
+        return constant_time_compare(data, crypt.crypt(force_str(password), data))
 
     def safe_summary(self, encoded):
         algorithm, salt, data = encoded.split('$', 2)
diff --git a/django/contrib/auth/locale/af/LC_MESSAGES/django.mo b/django/contrib/auth/locale/af/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..3f328353c1
Binary files /dev/null and b/django/contrib/auth/locale/af/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/af/LC_MESSAGES/django.po b/django/contrib/auth/locale/af/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..94fc110b59
--- /dev/null
+++ b/django/contrib/auth/locale/af/LC_MESSAGES/django.po
@@ -0,0 +1,279 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2011-01-19 15:33+0000\n"
+"Last-Translator: Django team\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"
+
+#: admin.py:41
+msgid "Personal info"
+msgstr ""
+
+#: admin.py:42
+msgid "Permissions"
+msgstr ""
+
+#: admin.py:44
+msgid "Important dates"
+msgstr ""
+
+#: admin.py:126
+msgid "Password changed successfully."
+msgstr ""
+
+#: admin.py:136
+#, python-format
+msgid "Change password: %s"
+msgstr ""
+
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
+msgid "A user with that username already exists."
+msgstr ""
+
+#: forms.py:68 forms.py:269 forms.py:329
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: forms.py:70 forms.py:115
+msgid "Username"
+msgstr ""
+
+#: forms.py:72 forms.py:116
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:75 forms.py:119
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
+msgid "Password"
+msgstr "Wagwoord"
+
+#: forms.py:79
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:81
+msgid "Enter the same password as above, for verification."
+msgstr "Vul dieselfde wagwoord in as hierbo, for bevestiging."
+
+#: forms.py:122
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:151
+#, python-format
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: forms.py:153
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
+#: forms.py:155
+msgid "This account is inactive."
+msgstr ""
+
+#: forms.py:206
+msgid ""
+"That email address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+
+#: forms.py:208 tests/forms.py:374
+msgid ""
+"The user account associated with this email address cannot reset the "
+"password."
+msgstr ""
+
+#: forms.py:211
+msgid "Email"
+msgstr ""
+
+#: forms.py:271
+msgid "New password"
+msgstr "Nuwe wagwoord"
+
+#: forms.py:273
+msgid "New password confirmation"
+msgstr ""
+
+#: forms.py:302
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: forms.py:305
+msgid "Old password"
+msgstr "Ou wagwoord"
+
+#: forms.py:333
+msgid "Password (again)"
+msgstr "Wagwoord (weer)"
+
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:242
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
+msgid "salt"
+msgstr ""
+
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
+msgid "hash"
+msgstr ""
+
+#: hashers.py:293
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:295
+msgid "checksum"
+msgstr ""
+
+#: models.py:72 models.py:121
+msgid "name"
+msgstr ""
+
+#: models.py:74
+msgid "codename"
+msgstr ""
+
+#: models.py:78
+msgid "permission"
+msgstr ""
+
+#: models.py:79 models.py:123
+msgid "permissions"
+msgstr ""
+
+#: models.py:128
+msgid "group"
+msgstr ""
+
+#: models.py:129 models.py:301
+msgid "groups"
+msgstr ""
+
+#: models.py:200
+msgid "password"
+msgstr ""
+
+#: models.py:201
+msgid "last login"
+msgstr ""
+
+#: models.py:298
+msgid "superuser status"
+msgstr ""
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr ""
+
+#: models.py:377
+msgid "username"
+msgstr ""
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr ""
+
+#: models.py:384
+msgid "last name"
+msgstr ""
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr ""
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr ""
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr ""
+
+#: models.py:400
+msgid "user"
+msgstr ""
+
+#: models.py:401
+msgid "users"
+msgstr ""
+
+#: views.py:94
+msgid "Logged out"
+msgstr ""
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo
index 04b69f2ce2..b73ef9ce50 100644
Binary files a/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ar/LC_MESSAGES/django.po b/django/contrib/auth/locale/ar/LC_MESSAGES/django.po
index ecc719a23b..980b4f1520 100644
--- a/django/contrib/auth/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ar/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,197 +30,231 @@ msgstr "الصلاحيات"
 msgid "Important dates"
 msgstr "تواريخ مهمة"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "تم تغيير كلمة المرور بنجاح."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "غيّر كلمة المرور: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "هناك مستخدم موجود مسبقاً بهذا الاسم."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "حقلا كلمتي المرور غير متطابقين."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "اسم المستخدم"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "مطلوب. 30 حرف أو أقل. يتكوّن من حروف، وأرقام، والرموز @/./+/-/_ فقط."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "هذه القيمة يجب أن تحتوي الأحرف، والأرقام، والرموز @/./+/-/_ فقط."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "تأكيد كلمة المرور"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "أدخل كلمة المرور ذاتها التي أعلاه لتأكيدها."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"رجاءً أدخل اسم مستخدم وكلمة مرور صحيحين، وانتبه إلى أن كلا الحقلين حساس لحالة "
-"الأحرف."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "يبدو بأن الكوكيز غير مفعله في متصفحك، الكوكيز مطلوبة للتمكن من الدخول."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "هذا الحساب غير نشط."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"عنوان البريد الإلكتروني هذا ليس مرتبط بأي حساب مستخدم. أأنت متأكد أنك قمت "
-"بالتسجيل؟"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "عنوان بريد إلكتروني"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "كلمة المرور الجديدة"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "تأكيد كلمة المرور الجديدة"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "كلمة مرورك القديمة غير صحيحة. رجاءً أدخلها مرة أخرى."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "كلمة المرور القديمة"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "كلمة المرور (مجدداً)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "الاسم"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "الاسم الرمزي"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "الصلاحية"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "الصلاحيات"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "مجموعة"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "المجموعات"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "كلمة المرور"
+
+#: models.py:201
+msgid "last login"
+msgstr "آخر دخول"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "حالة المستخدم الخارق"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"حدد بأن هذا المستخدم يمتلك كافة الصلاحيات دون الحاجة لتحديدها له تصريحا."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr "صلاحيات المستخدم"
+
+#: models.py:377
 msgid "username"
 msgstr "اسم المستخدم"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "مطلوب. 30 حرف أو أقل. يتكوّن من حروف، وأرقام، والرموز @/./+/-/_ فقط."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
 msgid "first name"
 msgstr "الاسم الأول"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "الاسم الأخير"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "عنوان البريد الإلكتروني"
+#: models.py:385
+msgid "email address"
+msgstr ""
 
-#: models.py:238
-msgid "password"
-msgstr "كلمة المرور"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "حالة الطاقم"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "يحدد ما إذا كان المستخدم يستطيع الدخول إلى موقع الإدارة هذا."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "نشط"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -228,51 +262,22 @@ msgstr ""
 "يحدد ما إذا كان المستخدم سيُعامل على أنّه نشط. أزل تحديد ها الخيار بدلاً من حذف "
 "الحسابات."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "حالة المستخدم الخارق"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"حدد بأن هذا المستخدم يمتلك كافة الصلاحيات دون الحاجة لتحديدها له تصريحا."
-
-#: models.py:248
-msgid "last login"
-msgstr "آخر دخول"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "تاريخ الانضمام"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "صلاحيات المستخدم"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "مستخدم"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "المستخدمين"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "تم الخروج"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "أدخل عنوان بريد إلكتروني صحيح."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/az/LC_MESSAGES/django.mo b/django/contrib/auth/locale/az/LC_MESSAGES/django.mo
index 61346dcb68..d9dd0c1939 100644
Binary files a/django/contrib/auth/locale/az/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/az/LC_MESSAGES/django.po b/django/contrib/auth/locale/az/LC_MESSAGES/django.po
index 78ffb4e824..cf55166c55 100644
--- a/django/contrib/auth/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/az/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,65 +29,72 @@ msgstr "İcazələr"
 msgid "Important dates"
 msgstr "Vacib tarixlər"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Parol uğurla dəyişdirildi"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Parolu dəyiş: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Bu istifadəçi adı altında başqa istifadəçi var."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Parollar üst-üstə düşmədi."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "İstifadəçi adı"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Vacibdir. 30 simvoldan az olmalıdır. Yalnız hərf, rəqəm və @/./+/-/_ "
 "simvollarından istifadə etmək olar."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Yalnız hərf, rəqəm və @/./+/-/_ simvollarından istifadə etmək olar."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Parol"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Parolun təsdiqi"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Yuxarıdakı parolu daxil edin ki, dəqiqliyinə əmin olaq."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Düzgün istifadəçi adı və parolu daxil edin. Nəzərə alın ki, hər iki sahə "
-"üçün böyük-kiçik hərflərdə fərq var."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,139 +102,164 @@ msgstr ""
 "Sizin brauzerdə kukilər (cookie) aktiv deyil. Daxil olmaq üçün onlar aktiv "
 "olmağı vacibdir."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Bu hesab qeyri-aktivdir."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Bu e-poçt ünvanı heç bir hesaba bağlı deyil. Qeydiyyatdan keçdiyinizə "
-"əminsinizmi?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Bu e-poçt ünvanı ilə qeydiyyatdan keçmiş hesab parolu sıfırlaya bilməz."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-poçt"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Yeni parol"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Yeni parolun təsdiqi"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Köhnə parolu səhv daxil etdiniz. Bir daha cəhd etməyinizi xahiş edirik."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Köhnə parol"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Parol (bir daha)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ad"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kod adı"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "icazə"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "icazələr"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "qrup"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "qruplar"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "parol"
+
+#: models.py:201
+msgid "last login"
+msgstr "son dəfə daxil olub"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "superistifadəçi statusu"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "İstifadəçiyə bütün icazələri verir."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr "səlahiyyətləri"
+
+#: models.py:377
 msgid "username"
 msgstr "istifadəçi adı"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Vacibdir. 30 simvola bərabər və ya az olmalıdır. Yalnız hərf, rəqəm və @/./"
 "+/-/_ simvollarından istifadə etmək olar."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
 msgid "first name"
 msgstr "ad"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "soyad"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-poçt ünvanı"
+#: models.py:385
+msgid "email address"
+msgstr ""
 
-#: models.py:238
-msgid "password"
-msgstr "parol"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "admin statusu"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "İstifadəçinin admin panelinə daxil olub, olmayacağını təyin edir."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "Aktiv"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -235,50 +267,22 @@ msgstr ""
 "İstifadəçinin aktiv və ya qeyri-aktiv olmasını təyin edir. Hesabları silmək "
 "əvəzinə bundan istifadə edin."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "superistifadəçi statusu"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr "İstifadəçiyə bütün icazələri verir."
-
-#: models.py:248
-msgid "last login"
-msgstr "son dəfə daxil olub"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "qoşulub"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "səlahiyyətləri"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "istifadəçi"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "istifadəçilər"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Çıxdınız"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "düzgün e-poçt ünvanını daxil edin."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/be/LC_MESSAGES/django.mo b/django/contrib/auth/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..01d5ac5c00
Binary files /dev/null and b/django/contrib/auth/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/be/LC_MESSAGES/django.po b/django/contrib/auth/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..90e5258414
--- /dev/null
+++ b/django/contrib/auth/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,294 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: admin.py:41
+msgid "Personal info"
+msgstr "Асабістыя зьвесткі"
+
+#: admin.py:42
+msgid "Permissions"
+msgstr "Дазволы"
+
+#: admin.py:44
+msgid "Important dates"
+msgstr "Важныя даты"
+
+#: admin.py:126
+msgid "Password changed successfully."
+msgstr "Пароль зьмянілі."
+
+#: admin.py:136
+#, python-format
+msgid "Change password: %s"
+msgstr "Зьмяніць пароль: %s"
+
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
+msgid "A user with that username already exists."
+msgstr "Карыстальнік з такім іменем ужо існуе."
+
+#: forms.py:68 forms.py:269 forms.py:329
+msgid "The two password fields didn't match."
+msgstr "Не супадаюць паролі ў двух палях."
+
+#: forms.py:70 forms.py:115
+msgid "Username"
+msgstr "Імя карыстальніка"
+
+#: forms.py:72 forms.py:116
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+"Абавязковае поле. Да трыццаці знакаў. Толькі лічбы, літары ды знакі «@», "
+"«.» (кропка), «+», «-», «_»."
+
+#: forms.py:75 forms.py:119
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+"Дазваляюцца толькі літары, лічбы ды знакі «@», «.» (кропка), «+», «-», «_»."
+
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
+msgid "Password"
+msgstr "Пароль"
+
+#: forms.py:79
+msgid "Password confirmation"
+msgstr "Пацьвердзіце пароль"
+
+#: forms.py:81
+msgid "Enter the same password as above, for verification."
+msgstr "Дзеля пэўнасьці набярыце такі самы пароль яшчэ раз."
+
+#: forms.py:122
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Паролі не захоўваюцца ў такім выглядзе, як іх набралі, таму ўбачыць пароль "
+"карыстальніка нельга, але яго можна зьмяніць <a href=\"password/\">тут</a>."
+
+#: forms.py:151
+#, python-format
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: forms.py:153
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Падобна, што сеціўны аглядальнік не дазваляе сьляды («кукі»). Але каб "
+"увайсьці, трэба дазволіць «сьляды»."
+
+#: forms.py:155
+msgid "This account is inactive."
+msgstr "Рахунак ня дзейнічае."
+
+#: forms.py:206
+msgid ""
+"That email address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+
+#: forms.py:208 tests/forms.py:374
+msgid ""
+"The user account associated with this email address cannot reset the "
+"password."
+msgstr ""
+
+#: forms.py:211
+msgid "Email"
+msgstr ""
+
+#: forms.py:271
+msgid "New password"
+msgstr "Новы пароль"
+
+#: forms.py:273
+msgid "New password confirmation"
+msgstr "Пацьвердзіце новы пароль"
+
+#: forms.py:302
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Пазначылі неадпаведны стары пароль. Набярыце яго зноўку."
+
+#: forms.py:305
+msgid "Old password"
+msgstr "Стары пароль"
+
+#: forms.py:333
+msgid "Password (again)"
+msgstr "Пароль (яшчэ раз)"
+
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
+msgid "algorithm"
+msgstr "альґарытм"
+
+#: hashers.py:242
+msgid "iterations"
+msgstr "паўтарэньні"
+
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
+msgid "salt"
+msgstr "соль"
+
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
+msgid "hash"
+msgstr "скарот"
+
+#: hashers.py:293
+msgid "work factor"
+msgstr "множнік працы"
+
+#: hashers.py:295
+msgid "checksum"
+msgstr "кантрольная сума"
+
+#: models.py:72 models.py:121
+msgid "name"
+msgstr "назва"
+
+#: models.py:74
+msgid "codename"
+msgstr "найменьне"
+
+#: models.py:78
+msgid "permission"
+msgstr "дазвол"
+
+#: models.py:79 models.py:123
+msgid "permissions"
+msgstr "дазволы"
+
+#: models.py:128
+msgid "group"
+msgstr "суполка"
+
+#: models.py:129 models.py:301
+msgid "groups"
+msgstr "суполкі"
+
+#: models.py:200
+msgid "password"
+msgstr "пароль"
+
+#: models.py:201
+msgid "last login"
+msgstr "апошні раз уваходзіў"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "становішча спраўніка"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Паказвае, ці мае карыстальнік усе дазволы без таго, каб іх яўна прызначаць."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"Суполкі, у якія ўваходзіць карыстальнік. Карыстальнік атрымае дазволы, якія "
+"мае кожная ягоная суполка."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "дазволы карыстальніка"
+
+#: models.py:377
+msgid "username"
+msgstr "імя карыстальніка"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Абавязковае поле. Да трыццаці знакаў. Лічбы, літары ды знакі «@», "
+"«.» (кропка), «+», «-», «_»."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "імя"
+
+#: models.py:384
+msgid "last name"
+msgstr "прозьвішча"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "становішча"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Паказвае, ці можа карыстальнік ўваходзіць на кіраўнічую пляцоўку."
+
+#: models.py:389
+msgid "active"
+msgstr "дзейны"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Паказвае, ці трэба ставіцца да карыстальніка як да дзейнага. Замест таго "
+"каб, каб выдаляць рахунак, зраіце карыстальніка нядзейным."
+
+#: models.py:392
+msgid "date joined"
+msgstr "калі далучылі"
+
+#: models.py:400
+msgid "user"
+msgstr "карыстальнік"
+
+#: models.py:401
+msgid "users"
+msgstr "карыстальнікі"
+
+#: views.py:94
+msgid "Logged out"
+msgstr "Не ўвайшоў"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Узнавіць пароль на %(site_name)s"
diff --git a/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo
index 707f064d68..75592edc2f 100644
Binary files a/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/bg/LC_MESSAGES/django.po b/django/contrib/auth/locale/bg/LC_MESSAGES/django.po
index e3c896a861..70bb628712 100644
--- a/django/contrib/auth/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/bg/LC_MESSAGES/django.po
@@ -2,22 +2,23 @@
 #
 # Translators:
 # Boris Chervenkov <office@sentido.bg>, 2012.
+#   <grgkostadinov@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Todor Lubenov <tlubenov@gmail.com>, 2011.
+# Todor Lubenov <tlubenov@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Todor Lubenov <tlubenov@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,63 +32,73 @@ msgstr "Права"
 msgid "Important dates"
 msgstr "Важни дати"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Паролата беше променена успешно.  "
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Промени парола: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Потребител с това потребителско име вече съществува.  "
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Двете полета за паролата не съвпадат.  "
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Потребител"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Задължително. 30 знака или по-малко. Букви, цифри и @/./+/-/_ ."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Тази стойност може да съдържа само букви, цифри и  @/./+/-/_ символи."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Парола"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Потвърждение на паролата"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Въведете същата парола още веднъж за проверка.  "
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Ние не запаметяваме паролите в чист вид, така че няма как да видите паролата "
+"на този потребител. Можете да промените паролата чрез <a href=\"password/"
+"\">този формуляр</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Въведете правилно потребителско име и парола. И двете полета правят разлика "
-"между малки и големи букви!"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,149 +106,108 @@ msgstr ""
 "Браузърът, който използвате не поддържа cookies, а те са необходими за да "
 "можете да се впишете.  "
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Този профил е неактивен."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Няма обвързан потребителски профил с този email адрес. Сигурни ли сте, че "
-"сте се регистрирали?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Потребителският профил, свързан с този email адрес, не може да променя "
-"паролата."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Email адрес"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Нова парола"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "потвърждение на нова паролата"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Въвели сте погрешна стара парола. Въведете я отново.  "
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Стара парола"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Парола (отново)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "алгоритъм"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "повторения"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "'salt'"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "хеш"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "работен фактор"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "чексума"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "име"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "код"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "право"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "права"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "група"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "групи"
 
-#: models.py:232
-msgid "username"
-msgstr "потребител"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Задължително. 30 знака или по-малко. Букви, цифри и символи @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "собствено име"
-
-#: models.py:236
-msgid "last name"
-msgstr "фамилно име"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "email адрес"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "парола"
 
-#: models.py:239
-msgid "staff status"
-msgstr "статус на персонал"
+#: models.py:201
+msgid "last login"
+msgstr "последно вписване"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Указва дали този потребител има достъп до административния панел."
-
-#: models.py:242
-msgid "active"
-msgstr "активен"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Указва дали този потребител трябва да се третира като активен. Премахнете на "
-"избора на това, вместо да триете профила."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "статут на супер-потребител"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -245,40 +215,79 @@ msgstr ""
 "Указва, че този потребител има всички права (без да има нужда да се "
 "изброяват изрично)."
 
-#: models.py:248
-msgid "last login"
-msgstr "последно вписване"
-
-#: models.py:249
-msgid "date joined"
-msgstr "дата на регистриране"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
+"Групата, към която този потребител принадлежи. Този потребител ще получи "
+"правата на всяка група, към която принадлежи."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "права на потребител"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "потребител"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Задължително. 30 знака или по-малко. Букви, цифри и символи @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "собствено име"
+
+#: models.py:384
+msgid "last name"
+msgstr "фамилно име"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "статус на персонал"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Указва дали този потребител има достъп до административния панел."
+
+#: models.py:389
+msgid "active"
+msgstr "активен"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Указва дали този потребител трябва да се третира като активен. Премахнете на "
+"избора на това, вместо да триете профила."
+
+#: models.py:392
+msgid "date joined"
+msgstr "дата на регистриране"
+
+#: models.py:400
 msgid "user"
 msgstr "потребител"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "потребители"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Извън системата"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Въведете валиден email адрес.  "
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo
index a1894906d4..e12a555f33 100644
Binary files a/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/bn/LC_MESSAGES/django.po b/django/contrib/auth/locale/bn/LC_MESSAGES/django.po
index a6031a9b21..c8921ef637 100644
--- a/django/contrib/auth/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/bn/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,244 +29,252 @@ msgstr "অনুমোদন"
 msgid "Important dates"
 msgstr "গুরুত্বপূর্ণ তারিখ"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "পাসওয়ার্ড বদল সফল হয়েছে।"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "পাসওয়ার্ড বদলানঃ %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "এই সদস্যনামে একজন সদস্য আছেন।"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "পাসওয়ার্ড দুটো মেলেনি।"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "সদস্যনাম"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "পাসওয়ার্ড"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "পাসওয়ার্ড নিশ্চিত করুন"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr "অনুগ্রহপূর্বক সঠিক সদস্যনাম ও পাসওয়ার্ড প্রবেশ করান।"
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "আপনার ব্রাউজার কুকি গ্রহণে সক্ষম নয়। লগইন করার জন্য কুকি আবশ্যক।"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "এই একাউন্টটি কার্যকর নয়।"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"এই ইমেইল ঠিকানা কোন সদস্য একাউন্টের সাথে সম্পর্কিত নয়। আপনি কি নিবন্ধন করেছেন?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "ইমেইল"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "নতুন পাসওয়ার্ড"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "নতুন পাসওয়ার্ড নিশ্চিতকরণ"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "আপনার পুরনো পাসওয়ার্ড ঠিকভাবে প্রবেশ করানো হয়নি। অনুগ্রহপূর্বক সঠিক পাসওয়ার্ড দিন।"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "পুরনো পাসওয়ার্ড"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "পাসওয়ার্ড (পুনরায়)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "নাম"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "কোডনাম"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "অনুমোদন"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "অনুমোদন"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "দল"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "দল সমূহ"
 
-#: models.py:232
-msgid "username"
-msgstr "সদস্যনাম"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr "প্রথম নাম"
-
-#: models.py:236
-msgid "last name"
-msgstr "শেষ নাম"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "ইমেইল ঠিকানা"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "পাসওয়ার্ড"
 
-#: models.py:239
-msgid "staff status"
-msgstr "স্টাফ মর্যাদা"
+#: models.py:201
+msgid "last login"
+msgstr "সর্বশেষ প্রবেশ"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "সদস্যকে প্রশাসন সাইটে প্রবেশাধিকার প্রদান।"
-
-#: models.py:242
-msgid "active"
-msgstr "সচল"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr "সদস্যকে সচল হিসেবে নির্ধারণ করুন। একাউন্ট মুছে ফেলার বদলে এটি ব্যবহার করুন।"
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "সুপারইউজার মর্যাদা"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "সদস্যকে সকল ধরণের অনুমতি প্রদান করে।"
 
-#: models.py:248
-msgid "last login"
-msgstr "সর্বশেষ প্রবেশ"
-
-#: models.py:249
-msgid "date joined"
-msgstr "যোগদানের তারিখ"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "সদস্যের অনুমোদন সমূহ"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "সদস্যনাম"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "প্রথম নাম"
+
+#: models.py:384
+msgid "last name"
+msgstr "শেষ নাম"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "স্টাফ মর্যাদা"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "সদস্যকে প্রশাসন সাইটে প্রবেশাধিকার প্রদান।"
+
+#: models.py:389
+msgid "active"
+msgstr "সচল"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr "সদস্যকে সচল হিসেবে নির্ধারণ করুন। একাউন্ট মুছে ফেলার বদলে এটি ব্যবহার করুন।"
+
+#: models.py:392
+msgid "date joined"
+msgstr "যোগদানের তারিখ"
+
+#: models.py:400
 msgid "user"
 msgstr "সদস্য"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "সদস্যগণ"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "প্রস্থান সম্পন্ন"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "বৈধ ইমেইল ঠিকানা দিন।"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/br/LC_MESSAGES/django.mo b/django/contrib/auth/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..c109abd1e4
Binary files /dev/null and b/django/contrib/auth/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/br/LC_MESSAGES/django.po b/django/contrib/auth/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..62924c1712
--- /dev/null
+++ b/django/contrib/auth/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,280 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: admin.py:41
+msgid "Personal info"
+msgstr ""
+
+#: admin.py:42
+msgid "Permissions"
+msgstr ""
+
+#: admin.py:44
+msgid "Important dates"
+msgstr ""
+
+#: admin.py:126
+msgid "Password changed successfully."
+msgstr ""
+
+#: admin.py:136
+#, python-format
+msgid "Change password: %s"
+msgstr ""
+
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
+msgid "A user with that username already exists."
+msgstr ""
+
+#: forms.py:68 forms.py:269 forms.py:329
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: forms.py:70 forms.py:115
+msgid "Username"
+msgstr ""
+
+#: forms.py:72 forms.py:116
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:75 forms.py:119
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
+msgid "Password"
+msgstr "Ger-tremen"
+
+#: forms.py:79
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:81
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: forms.py:122
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:151
+#, python-format
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: forms.py:153
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
+#: forms.py:155
+msgid "This account is inactive."
+msgstr ""
+
+#: forms.py:206
+msgid ""
+"That email address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+
+#: forms.py:208 tests/forms.py:374
+msgid ""
+"The user account associated with this email address cannot reset the "
+"password."
+msgstr ""
+
+#: forms.py:211
+msgid "Email"
+msgstr ""
+
+#: forms.py:271
+msgid "New password"
+msgstr "Ger-tremen nevez"
+
+#: forms.py:273
+msgid "New password confirmation"
+msgstr "Kadarnaat ar ger-tremen nevez"
+
+#: forms.py:302
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: forms.py:305
+msgid "Old password"
+msgstr "Ger-tremen kozh"
+
+#: forms.py:333
+msgid "Password (again)"
+msgstr "Ger-tremen (adarre)"
+
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:242
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
+msgid "salt"
+msgstr ""
+
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
+msgid "hash"
+msgstr ""
+
+#: hashers.py:293
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:295
+msgid "checksum"
+msgstr ""
+
+#: models.py:72 models.py:121
+msgid "name"
+msgstr "anv"
+
+#: models.py:74
+msgid "codename"
+msgstr ""
+
+#: models.py:78
+msgid "permission"
+msgstr ""
+
+#: models.py:79 models.py:123
+msgid "permissions"
+msgstr ""
+
+#: models.py:128
+msgid "group"
+msgstr "strollad"
+
+#: models.py:129 models.py:301
+msgid "groups"
+msgstr "strolladoù"
+
+#: models.py:200
+msgid "password"
+msgstr "ger-tremen"
+
+#: models.py:201
+msgid "last login"
+msgstr "kevreet da ziwezhañ"
+
+#: models.py:298
+msgid "superuser status"
+msgstr ""
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr ""
+
+#: models.py:377
+msgid "username"
+msgstr ""
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "anv-bihan"
+
+#: models.py:384
+msgid "last name"
+msgstr "anv-familh"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr ""
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr ""
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr ""
+
+#: models.py:400
+msgid "user"
+msgstr "implijer"
+
+#: models.py:401
+msgid "users"
+msgstr "implijerien"
+
+#: views.py:94
+msgid "Logged out"
+msgstr "Digevreet"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo
index ef52506798..f40e6cb6d3 100644
Binary files a/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/bs/LC_MESSAGES/django.po b/django/contrib/auth/locale/bs/LC_MESSAGES/django.po
index e9333957db..e7ce096d0f 100644
--- a/django/contrib/auth/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/bs/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,66 +30,73 @@ msgstr "Dozvole"
 msgid "Important dates"
 msgstr "Važni datumi"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Lozinka uspješno izmjenjena."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Izmjeni lozinku: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Korisnik sa tim korisničkim imenom već postoji."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Dva polja za lozinku se nisu poklopila."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Korisnik"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Neophodno. Najviše 30 slovnih mesta. Samo slova, brojke i  @/./+/-/_ only."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Ova vrijednost može sadržati samo slova, brojke i  digits and @/./+/-/_ "
 "znamenke."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Lozinka"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Potvrda lozinke"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Radi provjere tačnosti ponovo unesite lozinku koju ste unijeli gore."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Unesite tačno korisničko ime i lozinku. Pazite na razliku izmjeđu malih i "
-"velikih slova u oba polja"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -97,149 +104,108 @@ msgstr ""
 "Izgleda da su kolačići isključeni u vašem browser-u. Oni moraju biti "
 "uključeni da bi ste se prijavili."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Ovaj nalog je neaktivan."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Ta email adresa nije u vezi ni sa jednim nalogom. Da li ste sigurni da ste "
-"se već registrovali?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Email adresa"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Potvrda nove lozinke"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaša stara lozinka nije pravilno unesena. Unesite je ponovo."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Stara lozinka"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Lozinka (ponovite)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ime"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "šifra dozvole"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "dozvola"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "dozvole"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupa"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupe"
 
-#: models.py:232
-msgid "username"
-msgstr "korisničko ime"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Neophodno. Najviše 30 slovnih mesta. Slova, brojke i  @/./+/-/_ karakteri"
-
-#: models.py:235
-msgid "first name"
-msgstr "ime"
-
-#: models.py:236
-msgid "last name"
-msgstr "prezime"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "email adresa"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "lozinka"
 
-#: models.py:239
-msgid "staff status"
-msgstr "status člana uredništva"
+#: models.py:201
+msgid "last login"
+msgstr "posljednja prijava"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Označava da li korisnik može da se prijavi na ovaj sajt za administraciju."
-
-#: models.py:242
-msgid "active"
-msgstr "aktivan"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Označava da li se korisnik smatra aktivnim. Uklnote izbor sa ovog polja "
-"umjesto da brišete nalog."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "status administratora"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -247,40 +213,79 @@ msgstr ""
 "Označava da li korisnik ima sve dozvole bez dodjeljivanja pojedinačnih "
 "dozvola."
 
-#: models.py:248
-msgid "last login"
-msgstr "posljednja prijava"
-
-#: models.py:249
-msgid "date joined"
-msgstr "datum registracije"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "korisničke dozvole"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "korisničko ime"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Neophodno. Najviše 30 slovnih mesta. Slova, brojke i  @/./+/-/_ karakteri"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "ime"
+
+#: models.py:384
+msgid "last name"
+msgstr "prezime"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "status člana uredništva"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Označava da li korisnik može da se prijavi na ovaj sajt za administraciju."
+
+#: models.py:389
+msgid "active"
+msgstr "aktivan"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Označava da li se korisnik smatra aktivnim. Uklnote izbor sa ovog polja "
+"umjesto da brišete nalog."
+
+#: models.py:392
+msgid "date joined"
+msgstr "datum registracije"
+
+#: models.py:400
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "korisnici"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Odjavljen"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Unesite važeću email adresu."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo
index 70bd4b2893..45afa523cf 100644
Binary files a/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po
index feb060f0d5..7a0ebdb12b 100644
--- a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po
@@ -1,22 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Antoni Aloy <aaloy@apsl.net>, 2012-2013.
 # Carles Barrobés <carles@barrobes.com>, 2011, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-10 18:53+0000\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,48 +31,56 @@ msgstr "Permisos"
 msgid "Important dates"
 msgstr "Dates importants"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Contrasenya canviada amb èxit"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Canviar contrasenya: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "No s'ha establert la clau."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Format de clau incorrecta o algorisme de hash desconegut."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Ja existeix un usuari amb aquest nom."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Els dos camps de contrasenya no coincideixen."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Obligatori. 30 o menys caràcters. Només lletres, dígits i @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Aquest valor ha de contenir només lletres, números i @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Contrasenya"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Confirmació de contrasenya"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -81,15 +90,16 @@ msgstr ""
 "veure la contrasenya d'aquest usuari, però la podeu canviar fent servir <a "
 "href=\"password/\">aquest formulari</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en "
-"compte que tots dos camps son sensibles a majúscules i minúscules."
+"SSi us plau, introduïu un %(username)s i clau. Observeu que ambdós camps "
+"poden ser sensibles a majúscules."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -97,150 +107,113 @@ msgstr ""
 "El vostre navegador no sembla tenir les galetes ('cookies') activades. "
 "Aquestes són necessàries per iniciar la sessió."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Aquest compte està inactiu"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Aquesta adreça de correu no té associat cap compte d'usuari. Esteu segurs "
-"que s'ha registrat?"
+"Aquesta adreça de correu no té associat cap compte d'usuari. Està segur "
+"d'haver-se enregistrat?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"El compte d'usuari associat a aquesta adreça de correu no pot reinicialitzar "
-"la contrasenya."
+"L'usuari associat a aquesta adreça de correu electrònic no pot restablir la "
+"clau."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "Correu electrònic"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Contrasenya nova confirmada"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "La vostra antiga contrasenya no és correcta. Si us plau, introduïu-la de nou."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Contrasenya antiga"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Contrasenya (de nou)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algorisme"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iteracions"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "sal"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "factor de treball"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "suma de comprovació"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nom"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nom en clau"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permís"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grup"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grups"
 
-#: models.py:232
-msgid "username"
-msgstr "nom d'usuari"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Obligatori. 30 o menys caràcters. Només lletres, números i @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "nom propi"
-
-#: models.py:236
-msgid "last name"
-msgstr "cognoms"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "adreça de correu electrònic"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "contrasenya"
 
-#: models.py:239
-msgid "staff status"
-msgstr "membre del personal"
+#: models.py:201
+msgid "last login"
+msgstr "últim inici de sessió"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Designa si l'usuari pot entrar al lloc administratiu."
-
-#: models.py:242
-msgid "active"
-msgstr "actiu"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho "
-"enlloc d'esborrar comptes d'usuari."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "estat de superusuari"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -248,15 +221,7 @@ msgstr ""
 "Designa que aquest usuari té tots els permisos sense assignar-los "
 "explícitament."
 
-#: models.py:248
-msgid "last login"
-msgstr "últim inici de sessió"
-
-#: models.py:249
-msgid "date joined"
-msgstr "data d'incorporació"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -264,26 +229,71 @@ msgstr ""
 "Els grups als quals pertany aquest usuari. A un usuari se li concediran tots "
 "els permisos de cadascun dels seus grups."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "permisos de l'usuari"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "nom d'usuari"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Obligatori. 30 o menys caràcters. Només lletres, números i @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Introdueix un nom d'usuari vàlid"
+
+#: models.py:383
+msgid "first name"
+msgstr "nom propi"
+
+#: models.py:384
+msgid "last name"
+msgstr "cognoms"
+
+#: models.py:385
+msgid "email address"
+msgstr "adreça de correu electrònic"
+
+#: models.py:386
+msgid "staff status"
+msgstr "membre del personal"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Designa si l'usuari pot entrar al lloc administratiu."
+
+#: models.py:389
+msgid "active"
+msgstr "actiu"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho "
+"enlloc d'esborrar comptes d'usuari."
+
+#: models.py:392
+msgid "date joined"
+msgstr "data d'incorporació"
+
+#: models.py:400
 msgid "user"
 msgstr "usuari"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "usuaris"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Sessió finalitzada"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Introduïu una adreça de correu vàlida."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo
index 14f27d293c..6de0a69e31 100644
Binary files a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po
index c1234ca45c..39bc602dcb 100644
--- a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po
@@ -2,21 +2,21 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Vlada Macek <macek@sandbox.cz>, 2011, 2012.
+# Vlada Macek <macek@sandbox.cz>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-17 13:06+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,49 +30,60 @@ msgstr "Oprávnění"
 msgid "Important dates"
 msgstr "Důležitá data"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Změna hesla byla úspěšná."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Heslo pro uživatele %s: změnit"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Heslo nenastaveno."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Neplatný formát hesla nebo neplatný hashovací algoritmus."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Uživatel s tímto jménem již existuje."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Hesla se neshodují."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
-"Požadováno. 30 znaků nebo méně. Pouze písmena, číslice a znaky @/./+/-/_."
+"Požadováno. 30 znaků nebo méně. Pouze písmena bez diakritiky (háčků a "
+"čárek), číslice a znaky @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Hodnota může obsahovat pouze písmena, číslice a znaky @/./+/-/_."
+msgstr ""
+"Hodnota může obsahovat pouze písmena bez diakritiky (háčků a čárek), číslice "
+"a znaky @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Heslo"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Potvrzení hesla"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Pro ověření vložte stejné heslo znovu."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -81,15 +92,16 @@ msgstr ""
 "Hesla se neukládají přímo a tak je nelze zobrazit. Je ale možné je změnit "
 "pomocí <a href=\"password/\">tohoto formuláře</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Vložte správné uživatelské jméno a heslo (u obou položek se rozlišují malá a "
-"velká písmena)."
+"Zadejte správnou hodnotu pole %(username)s a heslo. Pozor, obě pole mohou "
+"rozlišovat malá a velká písmena."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -97,163 +109,118 @@ msgstr ""
 "Váš prohlížeč zřejmě nemá povoleno přijímat cookies, které jsou ale potřeba "
 "pro přihlášení."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Tento účet je neaktivní."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"K této e-mailové adrese není přiřazen žádný uživatelský účet. Určitě jste "
-"zde registrováni?"
+"S touto e-mailovou adresou není spojen žádný účet. Určitě jste registrován"
+"(a)?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr "Účtu spojeném s touto e-mailovou adresou nelze obnovit heslo."
+msgstr ""
+"Uživatelský účet spojený s touto e-mailovou adresou nemůže obnovovat heslo."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "E-mail"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nové heslo"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Potvrzení nového hesla"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaše současné heslo nebylo vloženo správně. Zkuste to znovu."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Současné heslo"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmus"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterace"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "hodnota salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "faktor práce"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "kontrolní součet"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "název"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kódový název"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "oprávnění"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "oprávnění"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "skupina"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "skupiny"
 
-#: models.py:232
-msgid "username"
-msgstr "uživatelské jméno"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Požadováno. 30 znaků nebo méně. Pouze písmena, číslice a znaky @/./+/-/_."
-
-#: models.py:235
-msgid "first name"
-msgstr "křestní jméno"
-
-#: models.py:236
-msgid "last name"
-msgstr "příjmení"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mailová adresa"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "heslo"
 
-#: models.py:239
-msgid "staff status"
-msgstr "administrační přístup"
+#: models.py:201
+msgid "last login"
+msgstr "poslední přihlášení"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Určuje, zda se uživatel může přihlásit do správy tohoto webu."
-
-#: models.py:242
-msgid "active"
-msgstr "aktivní"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Určuje, zda bude uživatel považován za aktivního. Použijte tuto možnost "
-"místo odstranění účtů."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "superuživatel"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Určuje, že uživatel má veškerá oprávnění bez jejich explicitního přiřazení."
 
-#: models.py:248
-msgid "last login"
-msgstr "poslední přihlášení"
-
-#: models.py:249
-msgid "date joined"
-msgstr "datum registrace"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -261,26 +228,73 @@ msgstr ""
 "Skupiny, do kterých tento uživatel patří. Uživatel dostane všechna oprávnění "
 "udělená každé z jeho skupin."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "uživatelská oprávnění"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "uživatelské jméno"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Požadováno. 30 znaků nebo méně. Pouze písmena bez diakritiky (háčků a "
+"čárek), číslice a znaky @/./+/-/_."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Zadejte platné uživatelské jméno"
+
+#: models.py:383
+msgid "first name"
+msgstr "křestní jméno"
+
+#: models.py:384
+msgid "last name"
+msgstr "příjmení"
+
+#: models.py:385
+msgid "email address"
+msgstr "e-mailová adresa"
+
+#: models.py:386
+msgid "staff status"
+msgstr "administrační přístup"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Určuje, zda se uživatel může přihlásit do správy tohoto webu."
+
+#: models.py:389
+msgid "active"
+msgstr "aktivní"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Určuje, zda bude uživatel považován za aktivního. Použijte tuto možnost "
+"místo odstranění účtů."
+
+#: models.py:392
+msgid "date joined"
+msgstr "datum registrace"
+
+#: models.py:400
 msgid "user"
 msgstr "uživatel"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "uživatelé"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Odhlášeno"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Vložte platnou e-mailovou adresu."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo b/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo
index 185e91d775..c447e06a13 100644
Binary files a/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/cy/LC_MESSAGES/django.po b/django/contrib/auth/locale/cy/LC_MESSAGES/django.po
index 714e7af34d..faf547369b 100644
--- a/django/contrib/auth/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/cy/LC_MESSAGES/django.po
@@ -6,16 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,242 +30,251 @@ msgstr "Hawliau"
 msgid "Important dates"
 msgstr "Dyddiadau pwysig"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr ""
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr ""
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr ""
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr ""
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr ""
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr ""
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr ""
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "enw"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "enw arwyddol"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr ""
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr ""
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr ""
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr ""
 
-#: models.py:232
-msgid "username"
-msgstr "enw defnyddiwr"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr "enw cyntaf"
-
-#: models.py:236
-msgid "last name"
-msgstr "enw olaf"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "cyfeiriad e-bost"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "cyfrinair"
 
-#: models.py:239
-msgid "staff status"
-msgstr "statws staff"
+#: models.py:201
+msgid "last login"
+msgstr "mewngofnod olaf"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Dylunio ai'r defnyddiwr yn gally mewngofnodi i'r safle weinyddiad yma."
-
-#: models.py:242
-msgid "active"
-msgstr "gweithredol"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "statws defnyddiwr swper"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:248
-msgid "last login"
-msgstr "mewngofnod olaf"
-
-#: models.py:249
-msgid "date joined"
-msgstr "Dyddiad"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr ""
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "enw defnyddiwr"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "enw cyntaf"
+
+#: models.py:384
+msgid "last name"
+msgstr "enw olaf"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "statws staff"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Dylunio ai'r defnyddiwr yn gally mewngofnodi i'r safle weinyddiad yma."
+
+#: models.py:389
+msgid "active"
+msgstr "gweithredol"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "Dyddiad"
+
+#: models.py:400
 msgid "user"
 msgstr ""
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr ""
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr ""
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Rhowch cyfeiriad e-bost ddilys."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/da/LC_MESSAGES/django.mo b/django/contrib/auth/locale/da/LC_MESSAGES/django.mo
index e3d263d9e6..1a86594f73 100644
Binary files a/django/contrib/auth/locale/da/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/da/LC_MESSAGES/django.po b/django/contrib/auth/locale/da/LC_MESSAGES/django.po
index 153798dd54..737c3e113d 100644
--- a/django/contrib/auth/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/da/LC_MESSAGES/django.po
@@ -2,22 +2,22 @@
 #
 # Translators:
 # Christian Joergensen <christian@gmta.info>, 2012.
-# Erik Wognsen <r4mses@gmail.com>, 2011, 2012.
+# Erik Wognsen <r4mses@gmail.com>, 2011-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-12 21:16+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-13 04:31+0000\n"
 "Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,67 +31,76 @@ msgstr "Rettigheder"
 msgid "Important dates"
 msgstr "Vigtige datoer"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Adgangskoden blev ændret."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Skift adgangskode: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Ingen adgangskode valgt."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Ugyldigt adgangskodeformat eller hashing-algoritme."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "En bruger med dette brugernavn findes allerede."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "De to adgangskoder var ikke identiske."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Brugernavn"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Påkrævet. Højst 30 tegn. Kun  bogstaver og cifre samt @/./+/-/_"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Dette felt må kun indeholde bogstaver og cifre samt disse tegn: @/./+/-/_"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Adgangskode"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Bekræftelse af adgangskode"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Indtast den samme adgangskode som ovenfor for verifikation."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
-"Rå passwords gemmes ikke, så det er ikke muligt at se denne brugers "
-"password, men du kan ændre passwordet ved hjælp af <a href=\"password/"
+"Rå adgangskoder gemmes ikke, så det er ikke muligt at se denne brugers "
+"adgangskode, men du kan ændre adgangskoden ved hjælp af <a href=\"password/"
 "\">denne formular</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Indtast venligst et korrekt brugernavn og adgangskode. Bemærk, at begge "
-"felter er versalfølsomme."
+"Indtast venligst et korrekt %(username)s og adgangskode. Bemærk at begge "
+"felter kan være versalfølsomme."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -99,166 +108,120 @@ msgstr ""
 "Din browser ser ud til ikke at have cookies aktiveret. Cookies er påkrævet "
 "for at kunne logge ind."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Denne konto er inaktiv."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Den e-mail-adresse er ikke tilknyttet en konto. Er du sikker på at du har "
-"registreret dig?"
+"Den e-mail-adresse er ikke knyttet til en brugerkonto. Er du sikker på, du "
+"har registreret dig?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Kontoen, der er tilknyttet denne e-mail-adresse, kan ikke nulstille "
+"Den brugerkonto, der er tilknyttet denne e-mail-adresse, kan ikke nulstille "
 "adgangskoden."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "E-mail"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Bekræftelse af ny adgangskode"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Din gamle adgangskode blev ikke indtastet korrekt. Indtast den venligst igen."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Gammel adgangskode"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Adgangskode (igen)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritme"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterationer"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "work factor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "tjeksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "navn"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kodenavn"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "rettighed"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "rettigheder"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "gruppe"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupper"
 
-#: models.py:232
-msgid "username"
-msgstr "brugernavn"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Påkrævet. Højst 30 tegn. Kun  bogstaver og cifre samt disse tegn: @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "fornavn"
-
-#: models.py:236
-msgid "last name"
-msgstr "efternavn"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail-adresse"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "adgangskode"
 
-#: models.py:239
-msgid "staff status"
-msgstr "admin-status"
+#: models.py:201
+msgid "last login"
+msgstr "sidst logget ind"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Bestemmer om brugeren kan logge ind på dette administrationswebsite."
-
-#: models.py:242
-msgid "active"
-msgstr "aktiv"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Bestemmer om brugeren skal behandles som aktiv. Fravælg dette frem for at "
-"slette en konto."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "superbrugerstatus"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Bestemmer at denne bruger har alle rettigheder uden at tildele dem eksplicit."
 
-#: models.py:248
-msgid "last login"
-msgstr "sidst logget ind"
-
-#: models.py:249
-msgid "date joined"
-msgstr "dato for registrering"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -266,27 +229,73 @@ msgstr ""
 "Grupperne som denne bruger hører til. En bruger får alle rettigheder givet "
 "til hver af hans/hendes grupper."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "rettigheder"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "brugernavn"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Påkrævet. Højst 30 tegn. Kun  bogstaver og cifre samt disse tegn: @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Indtast et gyldigt brugernavn."
+
+#: models.py:383
+msgid "first name"
+msgstr "fornavn"
+
+#: models.py:384
+msgid "last name"
+msgstr "efternavn"
+
+#: models.py:385
+msgid "email address"
+msgstr "e-mail-adresse"
+
+#: models.py:386
+msgid "staff status"
+msgstr "admin-status"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Bestemmer om brugeren kan logge ind på dette administrationswebsite."
+
+#: models.py:389
+msgid "active"
+msgstr "aktiv"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Bestemmer om brugeren skal behandles som aktiv. Fravælg dette frem for at "
+"slette en konto."
+
+#: models.py:392
+msgid "date joined"
+msgstr "dato for registrering"
+
+#: models.py:400
 msgid "user"
 msgstr "bruger"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "brugere"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Logget ud"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Indtast en gyldig e-mail-adresse."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr "Password nulstillet på %(site_name)s"
+msgstr "Adgangskode nulstillet på %(site_name)s"
diff --git a/django/contrib/auth/locale/de/LC_MESSAGES/django.mo b/django/contrib/auth/locale/de/LC_MESSAGES/django.mo
index 9f35986506..42586df9ad 100644
Binary files a/django/contrib/auth/locale/de/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/de/LC_MESSAGES/django.po b/django/contrib/auth/locale/de/LC_MESSAGES/django.po
index 2fd9414202..01d5edc1a4 100644
--- a/django/contrib/auth/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/de/LC_MESSAGES/django.po
@@ -3,21 +3,21 @@
 # Translators:
 # André Hagenbruch <ahagenbruch@googlemail.com>, 2011.
 #   <florian@apolloner.eu>, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-14 05:19+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-23 13:25+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,50 +31,58 @@ msgstr "Berechtigungen"
 msgid "Important dates"
 msgstr "Wichtige Daten"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Passwort erfolgreich geändert."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Passwort ändern: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Kein Passwort gesetzt."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Ungültiges Passwortformat oder unbekannter Hashing-Algorithmus."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzername ist bereits vergeben."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Die beiden Passwörter sind nicht identisch."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Benutzername"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Erforderlich. 30 Zeichen oder weniger. Nur alphanumerische Zeichen "
 "(Buchstaben, Ziffern und @/./+/-/_) sind erlaubt."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Dieser Wert darf nur Buchstaben, Ziffern und @/./+/-/_ enthalten."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Passwort"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Passwort bestätigen"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -84,15 +92,16 @@ msgstr ""
 "Möglichkeit das Passwort dieses Benutzers anzuschauen, allerdings kann das "
 "Passwort über <a href=\"password/\">dieses Formular</a> geändert werden."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder "
+"Bitte einen gültigen %(username)s und ein Passwort eingeben. Beide Felder "
 "berücksichtigen die Groß-/Kleinschreibung."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -100,152 +109,111 @@ msgstr ""
 "Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für "
 "die Anmeldung zwingend erforderlich."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Dieser Benutzer ist inaktiv."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit "
-"dieser Adresse registriert haben?"
+"Diese E-Mail-Adresse ist keinem Benutzer zugeordnet. Sicher, dass es die "
+"richtige ist?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Mit dem zu dieser E-Mail-Adresse gehörenden Benutzerkonto kann das Passwort "
-"nicht zurückgesetzt werden."
+"Der Benutzer mit dieser E-Mail-Adresse kann das Passwort nicht zurücksetzen."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "E-Mail-Adresse"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Neues Passwort bestätigen"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Das alte Passwort war falsch. Bitte neu eingeben."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "Algorithmus"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "Iterationen"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "Salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "Hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "Arbeitsfaktor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "Prüfsumme"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "Name"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "Codename"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "Berechtigung"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "Gruppe"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "Gruppen"
 
-#: models.py:232
-msgid "username"
-msgstr "Benutzername"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Erforderlich. 30 Zeichen oder weniger. Nur alphanumerische Zeichen "
-"(Buchstaben, Ziffern und @/./+/-/_) sind erlaubt."
-
-#: models.py:235
-msgid "first name"
-msgstr "Vorname"
-
-#: models.py:236
-msgid "last name"
-msgstr "Nachname"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "E-Mail-Adresse"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "Passwort"
 
-#: models.py:239
-msgid "staff status"
-msgstr "Redakteur-Status"
+#: models.py:201
+msgid "last login"
+msgstr "Letzte Anmeldung"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann."
-
-#: models.py:242
-msgid "active"
-msgstr "Aktiv"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Legt fest, ob dieser Benutzer aktiv ist. Kann deaktiviert werden, anstatt "
-"Benutzer zu löschen."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "Administrator-Status"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -253,15 +221,7 @@ msgstr ""
 "Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln "
 "zuweisen zu müssen."
 
-#: models.py:248
-msgid "last login"
-msgstr "Letzte Anmeldung"
-
-#: models.py:249
-msgid "date joined"
-msgstr "Mitglied seit"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -269,26 +229,74 @@ msgstr ""
 "Die Gruppen, denen der Benutzer angehört. Ein Benutzer bekommt alle "
 "Berechtigungen seiner zugeteilten Gruppen."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "Berechtigungen"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "Benutzername"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Erforderlich. 30 Zeichen oder weniger. Nur alphanumerische Zeichen "
+"(Buchstaben, Ziffern und @/./+/-/_) sind erlaubt."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Bitte einen gültigen Benutzernamen eingeben."
+
+#: models.py:383
+msgid "first name"
+msgstr "Vorname"
+
+#: models.py:384
+msgid "last name"
+msgstr "Nachname"
+
+#: models.py:385
+msgid "email address"
+msgstr "E-Mail-Adresse"
+
+#: models.py:386
+msgid "staff status"
+msgstr "Redakteur-Status"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann."
+
+#: models.py:389
+msgid "active"
+msgstr "Aktiv"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Legt fest, ob dieser Benutzer aktiv ist. Kann deaktiviert werden, anstatt "
+"Benutzer zu löschen."
+
+#: models.py:392
+msgid "date joined"
+msgstr "Mitglied seit"
+
+#: models.py:400
 msgid "user"
 msgstr "Benutzer"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "Benutzer"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Abgemeldet"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Bitte eine gültige E-Mail-Adresse eingeben."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/el/LC_MESSAGES/django.mo b/django/contrib/auth/locale/el/LC_MESSAGES/django.mo
index 3cc36d2383..47b83f98b4 100644
Binary files a/django/contrib/auth/locale/el/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/el/LC_MESSAGES/django.po b/django/contrib/auth/locale/el/LC_MESSAGES/django.po
index 767e36ec06..5564497a29 100644
--- a/django/contrib/auth/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/el/LC_MESSAGES/django.po
@@ -1,6 +1,8 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# Apostolis Bessas <mpessas+txc@transifex.com>, 2013.
 # Dimitris Glezos <glezos@indifex.com>, 2011, 2012.
 # glogiotatidis <seadog@sealabs.net>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
@@ -9,16 +11,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Dimitris Glezos <glezos@indifex.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-02-23 21:50+0000\n"
+"Last-Translator: Apostolos Mpessas <mpessas+txc@transifex.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,68 +34,75 @@ msgstr "Δικαιώματα"
 msgid "Important dates"
 msgstr "Σημαντικές ημερομηνίες"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Ο κωδικός πρόσβασης αλλάχτηκε με επιτυχία."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Αλλαγή κωδικού πρόσβασης: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Αυτό το όνομα χρήστη χρησιμοποιείται ήδη."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Τα δύο πεδία κωδικού χρήστη δεν ταιριάζουν."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Απαραίτητο. Πρέπει να αποτελείται από 30 ή λιγότερους χαρακτήρες. Μπορείτε "
 "να χρησιμοποιήσετε μόνο γράμματα, αριθμούς και τους χαρακτήρες @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Αυτή η τιμή μπορεί να περιέχει μόνο γράμματα, αριθμούς και τους χαρακτήρες "
 "@/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Κωδικός χρήστη"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Επιβεβαίωση κωδικού χρήστη"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Εισάγετε τον ίδιο κωδικό χρήστη όπως παραπάνω, για λόγους επιβεβαίωσης."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Παρακαλούμε εισάγετε ένα σωστό όνομα χρήστη και κωδικό χρήστη. Να σημειωθεί "
-"ότι και τα δύο πεδία κάνουν διάκριση μεταξύ πεζών και κεφαλαίων."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -101,137 +110,165 @@ msgstr ""
 "Ο πλοηγητής σας δεν φαίνεται να έχει ενεργοποιημένα τα αρχεία cookie. Τα "
 "αρχεία cookie απαιτούνται για να συνδεθείτε."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Αυτός ο λογαριασμός είναι ανενεργός."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Αυτή η διεύθυνση e-mail δεν αντιστοιχεί σε κάποιον λογαριασμό χρήστη. Είστε "
-"σίγουρος ότι έχετε γραφτεί;"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Νέο συνθηματικό"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Επιβεβαίωση νέου συνθηματικού"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Το παλιό συνθηματικό σας δόθηκε λανθασμένα. Παρακαλώ δοκιμάστε ξανά."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Παλιό συνθηματικό"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Συνθηματικό (ξανά)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "όνομα"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "κωδικό όνομα"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "δικαίωμα"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "διακαιώματα"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "ομάδα"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "ομάδες"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "συνθηματικό"
+
+#: models.py:201
+msgid "last login"
+msgstr "τελευταία σύνδεση"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "κατάσταση υπερχρήστη"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Υποδηλώνει ότι ο συγκεκριμένος χρήστης έχει όλα τα δικαιώματα χωρίς να "
+"χρειάζεται να τα παραχωρήσετε ξεχωριστά."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr "δικαιώματα χρήστη"
+
+#: models.py:377
 msgid "username"
 msgstr "όνομα χρήστη"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Απαραίτητα. 30 ή λιγότεροι χαρακτήρες. Γράμματα, αριθμοί και οι χαρακτήρες "
 "@/./+/-/_."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Εισάφετε ένα έγκυρο όνομα χρήστη."
+
+#: models.py:383
 msgid "first name"
 msgstr "όνομα"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "επώνυμο"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "ηλεκτρονική διεύθυνση"
+#: models.py:385
+msgid "email address"
+msgstr ""
 
-#: models.py:238
-msgid "password"
-msgstr "συνθηματικό"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "Κατάσταση προσωπικού"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "Ορίζει αν ο χρήστης μπορεί να συνδεθεί στο χώρο διαχείρισης."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "ενεργό"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -240,52 +277,22 @@ msgstr ""
 "την επεπιλογή αυτής της επιλογής αντί του να πραγματοποιήσετε διαγραφή του "
 "χρήστη."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "κατάσταση υπερχρήστη"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Υποδηλώνει ότι ο συγκεκριμένος χρήστης έχει όλα τα δικαιώματα χωρίς να "
-"χρειάζεται να τα παραχωρήσετε ξεχωριστά."
-
-#: models.py:248
-msgid "last login"
-msgstr "τελευταία σύνδεση"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "ημερομηνία σύνδεσης"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "δικαιώματα χρήστη"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "χρήστης"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "χρήστες"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Έγινε αποσύνδεση"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.mo b/django/contrib/auth/locale/en/LC_MESSAGES/django.mo
index 4a5c340c0f..91fc85a68f 100644
Binary files a/django/contrib/auth/locale/en/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
index 9b0cab8372..c2e2cdaef7 100644
--- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
@@ -1,275 +1,300 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: admin.py:41
 msgid "Personal info"
-msgstr ""
+msgstr "Personal info"
 
 #: admin.py:42
 msgid "Permissions"
-msgstr ""
+msgstr "Permissions"
 
 #: admin.py:44
 msgid "Important dates"
-msgstr ""
+msgstr "Important dates"
 
-#: admin.py:126
+#: admin.py:132
 msgid "Password changed successfully."
-msgstr ""
+msgstr "Password changed successfully."
 
-#: admin.py:136
+#: admin.py:142
 #, python-format
 msgid "Change password: %s"
-msgstr ""
+msgstr "Change password: %s"
 
-#: forms.py:31 tests/forms.py:249 tests/forms.py:254
+#: forms.py:33 tests/forms.py:261 tests/forms.py:266 tests/forms.py:407
 msgid "No password set."
-msgstr ""
+msgstr "No password set."
 
-#: forms.py:37 tests/forms.py:259 tests/forms.py:265
+#: forms.py:39 tests/forms.py:271 tests/forms.py:277
 msgid "Invalid password format or unknown hashing algorithm."
-msgstr ""
+msgstr "Invalid password format or unknown hashing algorithm."
 
-#: forms.py:65
+#: forms.py:72
 msgid "A user with that username already exists."
-msgstr ""
+msgstr "A user with that username already exists."
 
-#: forms.py:66 forms.py:257 forms.py:317
+#: forms.py:73 forms.py:254 forms.py:314
 msgid "The two password fields didn't match."
-msgstr ""
+msgstr "The two password fields didn't match."
 
-#: forms.py:68 forms.py:113
+#: forms.py:75 forms.py:120
 msgid "Username"
-msgstr ""
+msgstr "Username"
 
-#: forms.py:70 forms.py:114
+#: forms.py:77 forms.py:121
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
+msgstr "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 
-#: forms.py:73 forms.py:117
+#: forms.py:80 forms.py:124
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
+msgstr "This value may contain only letters, numbers and @/./+/-/_ characters."
 
-#: forms.py:75 forms.py:119 forms.py:140 forms.py:319
+#: forms.py:82 forms.py:126 forms.py:153 forms.py:316
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
-#: forms.py:77
+#: forms.py:84
 msgid "Password confirmation"
-msgstr ""
+msgstr "Password confirmation"
 
-#: forms.py:79
+#: forms.py:86
 msgid "Enter the same password as above, for verification."
-msgstr ""
+msgstr "Enter the same password as above, for verification."
 
-#: forms.py:120
+#: forms.py:127
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
 
-#: forms.py:143
+#: forms.py:156
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 
-#: forms.py:145
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-
-#: forms.py:147
+#: forms.py:158
 msgid "This account is inactive."
-msgstr ""
+msgstr "This account is inactive."
 
-#: forms.py:196
-msgid ""
-"That email address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr ""
-
-#: forms.py:198 tests/forms.py:347
-msgid ""
-"The user account associated with this email address cannot reset the "
-"password."
-msgstr ""
-
-#: forms.py:201
+#: forms.py:206
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
-#: forms.py:259
+#: forms.py:256
 msgid "New password"
-msgstr ""
+msgstr "New password"
 
-#: forms.py:261
+#: forms.py:258
 msgid "New password confirmation"
-msgstr ""
+msgstr "New password confirmation"
+
+#: forms.py:287
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Your old password was entered incorrectly. Please enter it again."
 
 #: forms.py:290
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr ""
-
-#: forms.py:293
 msgid "Old password"
-msgstr ""
+msgstr "Old password"
 
-#: forms.py:321
+#: forms.py:318
 msgid "Password (again)"
-msgstr ""
+msgstr "Password (again)"
 
-#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
-#: hashers.py:412
+#: hashers.py:243 hashers.py:317 hashers.py:365 hashers.py:393 hashers.py:426
+#: hashers.py:459 hashers.py:493
 msgid "algorithm"
-msgstr ""
+msgstr "algorithm"
 
-#: hashers.py:242
+#: hashers.py:244
 msgid "iterations"
-msgstr ""
+msgstr "iterations"
 
-#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
+#: hashers.py:245 hashers.py:319 hashers.py:366 hashers.py:394 hashers.py:494
 msgid "salt"
-msgstr ""
+msgstr "salt"
 
-#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
+#: hashers.py:246 hashers.py:367 hashers.py:395 hashers.py:427 hashers.py:460
+#: hashers.py:495
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:293
+#: hashers.py:318
 msgid "work factor"
-msgstr ""
+msgstr "work factor"
 
-#: hashers.py:295
+#: hashers.py:320
 msgid "checksum"
-msgstr ""
+msgstr "checksum"
 
 #: models.py:72 models.py:121
 msgid "name"
-msgstr ""
+msgstr "name"
 
 #: models.py:74
 msgid "codename"
-msgstr ""
+msgstr "codename"
 
 #: models.py:78
 msgid "permission"
-msgstr ""
+msgstr "permission"
 
 #: models.py:79 models.py:123
 msgid "permissions"
-msgstr ""
+msgstr "permissions"
 
 #: models.py:128
 msgid "group"
-msgstr ""
+msgstr "group"
 
-#: models.py:129 models.py:317
+#: models.py:129 models.py:301
 msgid "groups"
-msgstr ""
+msgstr "groups"
 
-#: models.py:232
+#: models.py:200
 msgid "password"
-msgstr ""
+msgstr "password"
 
-#: models.py:233
+#: models.py:201
 msgid "last login"
-msgstr ""
+msgstr "last login"
 
 #: models.py:298
-msgid "username"
-msgstr ""
+msgid "superuser status"
+msgstr "superuser status"
 
 #: models.py:299
 msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:302
-msgid "Enter a valid username."
-msgstr ""
-
-#: models.py:304
-msgid "first name"
-msgstr ""
-
-#: models.py:305
-msgid "last name"
-msgstr ""
-
-#: models.py:306
-msgid "email address"
-msgstr ""
-
-#: models.py:307
-msgid "staff status"
-msgstr ""
-
-#: models.py:308
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-
-#: models.py:310
-msgid "active"
-msgstr ""
-
-#: models.py:311
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:313
-msgid "superuser status"
-msgstr ""
-
-#: models.py:314
-msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
 
-#: models.py:316
-msgid "date joined"
-msgstr ""
-
-#: models.py:318
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 
-#: models.py:322
+#: models.py:306
 msgid "user permissions"
-msgstr ""
+msgstr "user permissions"
 
-#: models.py:331
+#: models.py:377
+msgid "username"
+msgstr "username"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Enter a valid username."
+
+#: models.py:383
+msgid "first name"
+msgstr "first name"
+
+#: models.py:384
+msgid "last name"
+msgstr "last name"
+
+#: models.py:385
+msgid "email address"
+msgstr "email address"
+
+#: models.py:386
+msgid "staff status"
+msgstr "staff status"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Designates whether the user can log into this admin site."
+
+#: models.py:389
+msgid "active"
+msgstr "active"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+
+#: models.py:392
+msgid "date joined"
+msgstr "date joined"
+
+#: models.py:400
 msgid "user"
-msgstr ""
+msgstr "user"
 
-#: models.py:332
+#: models.py:401
 msgid "users"
-msgstr ""
+msgstr "users"
 
-#: views.py:97
+#: views.py:89
 msgid "Logged out"
-msgstr ""
+msgstr "Logged out"
 
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr ""
+msgstr "Password reset on %(site_name)s"
+
+#: tests/forms.py:325
+#, fuzzy
+msgid "Enter a valid email address."
+msgstr "Enter a valid username."
+
+#~ msgid ""
+#~ "Your Web browser doesn't appear to have cookies enabled. Cookies are "
+#~ "required for logging in."
+#~ msgstr ""
+#~ "Your Web browser doesn't appear to have cookies enabled. Cookies are "
+#~ "required for logging in."
+
+#~ msgid ""
+#~ "That email address doesn't have an associated user account. Are you sure "
+#~ "you've registered?"
+#~ msgstr ""
+#~ "That email address doesn't have an associated user account. Are you sure "
+#~ "you've registered?"
+
+#~ msgid ""
+#~ "The user account associated with this email address cannot reset the "
+#~ "password."
+#~ msgstr ""
+#~ "The user account associated with this email address cannot reset the "
+#~ "password."
diff --git a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo
index 57c6798442..d8eb740e77 100644
Binary files a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po
index 01b378e9af..bf926f2064 100644
--- a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-12 21:52+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,48 +31,56 @@ msgstr "Permissions"
 msgid "Important dates"
 msgstr "Important dates"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Password changed successfully."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Change password: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "A user with that username already exists."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "The two password fields didn't match."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Username"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "This value may contain only letters, numbers and @/./+/-/_ characters."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Password"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Password confirmation"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Enter the same password as above, for verification."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -82,15 +90,14 @@ msgstr ""
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,166 +105,116 @@ msgstr ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "This account is inactive."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"The user account associated with this e-mail address cannot reset the "
-"password."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "New password"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "New password confirmation"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Your old password was entered incorrectly. Please enter it again."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Old password"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algorithm"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterations"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "work factor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "name"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "codename"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permission"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permissions"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "group"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "groups"
 
-#: models.py:232
-msgid "username"
-msgstr "username"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-
-#: models.py:235
-msgid "first name"
-msgstr "first name"
-
-#: models.py:236
-msgid "last name"
-msgstr "last name"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail address"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "password"
 
-#: models.py:239
-msgid "staff status"
-msgstr "staff status"
-
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Designates whether the user can log into this admin site."
-
-#: models.py:242
-msgid "active"
-msgstr "active"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-
-#: models.py:245
-msgid "superuser status"
-msgstr "superuser status"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-
-#: models.py:248
+#: models.py:201
 msgid "last login"
 msgstr "last login"
 
-#: models.py:249
-msgid "date joined"
-msgstr "date joined"
+#: models.py:298
+msgid "superuser status"
+msgstr "superuser status"
 
-#: models.py:251
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -265,26 +222,72 @@ msgstr ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "user permissions"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "username"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "first name"
+
+#: models.py:384
+msgid "last name"
+msgstr "last name"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "staff status"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Designates whether the user can log into this admin site."
+
+#: models.py:389
+msgid "active"
+msgstr "active"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+
+#: models.py:392
+msgid "date joined"
+msgstr "date joined"
+
+#: models.py:400
 msgid "user"
 msgstr "user"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "users"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Logged out"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Enter a valid e-mail address."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/eo/LC_MESSAGES/django.mo b/django/contrib/auth/locale/eo/LC_MESSAGES/django.mo
index 90ae466653..a9e4b542c2 100644
Binary files a/django/contrib/auth/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/eo/LC_MESSAGES/django.po b/django/contrib/auth/locale/eo/LC_MESSAGES/django.po
index 762f68c7c4..cce7e6f924 100644
--- a/django/contrib/auth/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/eo/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Baptiste  <baptiste+transifex@darthenay.fr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -28,64 +29,74 @@ msgstr "Permesoj"
 msgid "Important dates"
 msgstr "Gravaj datoj"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Pasvorto suksese ŝanĝita."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Ŝanĝi pasvorton: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Uzanto kun sama salutnomo jam ekzistas."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "La du pasvotaj kampoj ne kongruas."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Salutnomo"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Petita. 30 karakteroj aŭ malpli. Literoj, ciferoj kaj @/./+/-/_ nure."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Ĉi-tiu valoro povas enhavi nur literoj, ciferoj kaj la @/./+/-/_ karakteroj."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Pasvorto"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Pasvorta konfirmo"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Entajpu la saman pasvorton kiel supre, por konfirmo."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Pasvortoj ne estas krude entenita, do ne eblas vidi la pasvorton de tiu "
+"uzanto, sed vi povas ŝanĝi la pasvorton uzante <a href=\"password/\">tiu "
+"formalaro</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Bonvolu tajpi ĝustan salutnomon kaj pasvorton. Notu ke ambaŭ kampoj estas "
-"usklecodistingaj."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,139 +104,166 @@ msgstr ""
 "Ŝajnas ke via retumilo ne havas kuketoj enŝaltitaj. Kuketoj estas postulitaj "
 "por ensaluti."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Ĉi-tiu konto ne estas aktiva."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Ĉi-tiu retpoŝtadreso ne havas asociigita uzanta konto. Ĉu vi certas ke vi "
-"registris?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"La uzanta konto asociita kun ĉi tiu retpoŝta adreso ne povas rekomencigi la "
-"pasvorton."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Retpoŝtadreso"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Nova pasvorto por konfirmo"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Via malnova pasvorto estis nekorekte tajpita. Bonvolu denove entajpi ĝin."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Malnova pasvorto"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Pasvorto (denove)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "algoritmo"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "iteracioj"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "salo"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "haketo"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "laborfaktoro"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "kontrolsumo"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nomo"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kodnomo"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permeso"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permesoj"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupo"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupoj"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "pasvorto"
+
+#: models.py:201
+msgid "last login"
+msgstr "lasta ensaluto"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "ĉefuzanta statuso"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Indikas ke tiu uzanto havas ĉiujn permesojn, sen eksplicite asigni ilin."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"La grupoj en kiu tiu uzanto apartenas. Uzanto akiros ĉiuj permesoj donita al "
+"ĉiuj de lia/ŝia grupo."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "uzantaj permesoj"
+
+#: models.py:377
 msgid "username"
 msgstr "salutnomo"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Petita. 30 karakteroj aŭ malpli. Literoj, nombroj kaj @/./+/-/_ karakteroj"
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
 msgid "first name"
 msgstr "persona nomo"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "famalia nomo"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "retpoŝtadreso"
+#: models.py:385
+msgid "email address"
+msgstr ""
 
-#: models.py:238
-msgid "password"
-msgstr "pasvorto"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "personara statuso"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indikas ĉu la uzanto povas saluti en ĉi-tiu administranta retejo."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "aktiva"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -233,51 +271,22 @@ msgstr ""
 "Indikas ĉu tiu uzanto devus esti traktita kiel aktiva. Malselekti tion ĉi "
 "anstataŭ forigi kontojn."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "ĉefuzanta statuso"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Indikas ke tiu uzanto havas ĉiujn permesojn, sen eksplicite asigni ilin."
-
-#: models.py:248
-msgid "last login"
-msgstr "lasta ensaluto"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "dato aliĝita"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "uzantaj permesoj"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "uzanto"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "uzantoj"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Adiaŭita"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Entajpu validan retpoŝtadreson."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo
index 1b83a90b18..a17659b06e 100644
Binary files a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.po b/django/contrib/auth/locale/es/LC_MESSAGES/django.po
index 6db9da6b30..114c883500 100644
--- a/django/contrib/auth/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/es/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Antoni Aloy <aaloy@apsl.net>, 2012-2013.
 # Antoni Aloy <antoni.aloy@trespams.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2011.
@@ -9,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-13 19:49+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-10 18:54+0000\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,49 +33,57 @@ msgstr "Permisos"
 msgid "Important dates"
 msgstr "Fechas importantes"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "La contraseña se ha cambiado con éxito."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambiar contraseña: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "No se ha establecido la clave"
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Formato de clave incorrecto o algoritmo de hash desconocido"
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con este nombre."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Las dos contraseñas no coinciden."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Requerido. 30 caracteres o menos. Letras, dígitos y @/./+/-/_ solamente."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Este valor puede contener sólo letras, números y @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Contraseña"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Contraseña (confirmación)"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Introduzca la misma contraseña que arriba, para verificación."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -84,15 +93,16 @@ msgstr ""
 "contraseña del usuario, pero se puede cambiar la contraseña mediante <a href="
 "\"password/\">este formulario</a> ."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Por favor, introduzca un nombre de usuario y contraseña correctos. Note que "
-"ambos campos son sensibles a mayúsculas/minúsculas."
+"Por favor, introduce un %(username)s y clave correctos. Observa que ambos "
+"campos pueden ser sensibles a mayúsculas."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -100,151 +110,114 @@ msgstr ""
 "Su navegador no parece tener las cookies habilitadas. Las cookies se "
 "necesitan para poder ingresar."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Esta cuenta está inactiva."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Esta dirección de correo electrónico no tiene una cuenta de usuario "
-"asociada. ¿Está seguro de que se ha registrado?"
+"Esta dirección de correo no tiene asociada cuenta de usuario. ¿Estás seguro "
+"que te has registrado?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"La cuenta de usuario asociada a esta dirección de correo electrónico no se "
-"puede restablecer la contraseña."
+"La cuenta de usuario asociada a esta dirección de correo no puede "
+"restablecer su clave."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "Correo electrónico"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Contraseña nueva (confirmación):"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Su contraseña antigua es incorrecta. Por favor, vuelva a introducirla "
 "correctamente."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Contraseña antigua"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmo"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iteraciones"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "sal"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "función resumen"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "factor trabajo"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "suma de verificación"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nombre"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nombre en código"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupo"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:232
-msgid "username"
-msgstr "nombre de usuario"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Requerido. 30 caracteres o menos. Letras, números y @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "nombre propio"
-
-#: models.py:236
-msgid "last name"
-msgstr "apellidos"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "dirección de correo electrónico"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "contraseña"
 
-#: models.py:239
-msgid "staff status"
-msgstr "es staff"
+#: models.py:201
+msgid "last login"
+msgstr "último inicio de sesión"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si el usuario puede entrar en este sitio de administración."
-
-#: models.py:242
-msgid "active"
-msgstr "activo"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Indica si el usuario puede ser tratado como activo. Desmarque esta opción en "
-"lugar de borrar la cuenta."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "es superusuario"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -252,15 +225,7 @@ msgstr ""
 "Indica que este usuario tiene todos los permisos sin asignárselos "
 "explícitamente."
 
-#: models.py:248
-msgid "last login"
-msgstr "último inicio de sesión"
-
-#: models.py:249
-msgid "date joined"
-msgstr "fecha de alta"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -268,26 +233,71 @@ msgstr ""
 "Los grupos a los que este usuario pertenece. Un usuario obtendrá todos los "
 "permisos concedidos a cada uno sus grupos."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "permisos de usuario"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "nombre de usuario"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Requerido. 30 caracteres o menos. Letras, números y @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Introduce un nombre de usuario válido"
+
+#: models.py:383
+msgid "first name"
+msgstr "nombre propio"
+
+#: models.py:384
+msgid "last name"
+msgstr "apellidos"
+
+#: models.py:385
+msgid "email address"
+msgstr "dirección de correo electrónico"
+
+#: models.py:386
+msgid "staff status"
+msgstr "es staff"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica si el usuario puede entrar en este sitio de administración."
+
+#: models.py:389
+msgid "active"
+msgstr "activo"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Indica si el usuario puede ser tratado como activo. Desmarque esta opción en "
+"lugar de borrar la cuenta."
+
+#: models.py:392
+msgid "date joined"
+msgstr "fecha de alta"
+
+#: models.py:400
 msgid "user"
 msgstr "usuario"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "usuarios"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Sesión terminada"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una dirección de correo electrónico válida."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo
index d068cd8ac0..1b2d84d493 100644
Binary files a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po
index 04fb9d18b3..2a846311d1 100644
--- a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po
@@ -1,22 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Ramiro Morales <cramm0@gmail.com>, 2012.
+# Ramiro Morales <cramm0@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-20 20:59+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-02-18 15:01+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,51 +31,59 @@ msgstr "Permisos"
 msgid "Important dates"
 msgstr "Fechas importantes"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Cambio de contraseña exitoso"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambiar contraseña: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "No se ha establecido una contraseña."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Formato de contraseña inválido o algoritmo de hashing desconocido."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Los dos campos de contraseñas no coinciden entre si."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obligatorio. Longitud máxima 30 caracteres alfanuméricos (letras, dígitos y "
 "@/./+/-/_) solamente."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Este valor solo puede contener letras, números y @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Contraseña"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Confirmación de contraseña"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Para verificación, introduzca la misma contraseña que introdujo arriba."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -84,15 +93,16 @@ msgstr ""
 "contraseña de este usuario, pero puede modificarla usando <a href=\"password/"
 "\">este formulario</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Por favor introduzca un nombre de usuario y una contraseña correctos. Note "
-"que ambos campos son sensibles a mayúsculas/minúsculas."
+"Por favor introduzca un %(username)s y una contraseña correctos. Tenga en "
+"cuenta que ambos campos son sensibles a mayúsculas/minúsculas."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -100,153 +110,114 @@ msgstr ""
 "Su navegador Web aparenta no estar configurado para aceptar cookies. Las "
 "cookies son un requerimiento para poder ingresar."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Esta cuenta está inactiva"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Esa dirección de correo electrónico no está asociada a ninguna cuenta de "
-"usuario. ¿Está seguro de que ya se ha registrado?"
+"La dirección de email provista no está asociada a ninguna cuenta de usuario. "
+"¿Está seguro de que se ha registrado?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"La cuenta de usuario asociada a esta dirección de e-mail no puede "
-"reinicializar la contraseña."
+"La cuenta de usuario asociada con esta dirección de email no puede "
+"restablecer la contraseña."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: forms.py:211
+msgid "Email"
+msgstr "Email"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Confirmación de contraseña nueva"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "La antigua contraseña introducida es incorrecta. Por favor introdúzcala "
 "nuevamente."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Contraseña antigua"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmo"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iteraciones"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "work fator"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "suma de verificación"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nombre"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nombre en código"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupo"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:232
-msgid "username"
-msgstr "nombre de usuario"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Obligatorio. Longitud máxima de 30 caracteres alfanuméricos (letras, dígitos "
-"y @/./+/-/_)."
-
-#: models.py:235
-msgid "first name"
-msgstr "nombre"
-
-#: models.py:236
-msgid "last name"
-msgstr "apellido"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "dirección de correo electrónico"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "contraseña"
 
-#: models.py:239
-msgid "staff status"
-msgstr "es staff"
+#: models.py:201
+msgid "last login"
+msgstr "último ingreso"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si el usuario puede ingresar a este sitio de administración."
-
-#: models.py:242
-msgid "active"
-msgstr "activo"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Indica si el usuario debe ser tratado como un usuario activo. Desactive este "
-"campo en lugar de eliminar usuarios."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "es superusuario"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -254,15 +225,7 @@ msgstr ""
 "Indica que este usuario posee todos los permisos sin que sea necesario "
 "asignarle los mismos en forma explícita."
 
-#: models.py:248
-msgid "last login"
-msgstr "último ingreso"
-
-#: models.py:249
-msgid "date joined"
-msgstr "fecha de creación"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -270,27 +233,74 @@ msgstr ""
 "Grupos a los cuales pertenece este usuario. Un usuario obtiene todos los "
 "permisos otorgados a cada uno de los grupos a los cuales pertenece."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "permisos de usuario"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "nombre de usuario"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Obligatorio. Longitud máxima de 30 caracteres alfanuméricos (letras, dígitos "
+"y @/./+/-/_)."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Introduzca un nombre de usuario válido."
+
+#: models.py:383
+msgid "first name"
+msgstr "nombre"
+
+#: models.py:384
+msgid "last name"
+msgstr "apellido"
+
+#: models.py:385
+msgid "email address"
+msgstr "Dirección de email"
+
+#: models.py:386
+msgid "staff status"
+msgstr "es staff"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica si el usuario puede ingresar a este sitio de administración."
+
+#: models.py:389
+msgid "active"
+msgstr "activo"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Indica si el usuario debe ser tratado como un usuario activo. Desactive este "
+"campo en lugar de eliminar usuarios."
+
+#: models.py:392
+msgid "date joined"
+msgstr "fecha de creación"
+
+#: models.py:400
 msgid "user"
 msgstr "usuario"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "usuarios"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Sesión cerrada"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una dirección de correo electrónico válida"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr "Reinicio de conotrseña en %(site_name)s"
+msgstr "Reinicio de contraseña en %(site_name)s"
diff --git a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo
index 6ce78d19df..d1d86966c5 100644
Binary files a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po
index 446b91be47..356beb2e01 100644
--- a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: jairtrejo <jairtrejo@gmail.com>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,50 +29,58 @@ msgstr "Permisos"
 msgid "Important dates"
 msgstr "Fechas importantes"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Cambio de contraseña exitoso"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambiar contraseña: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Los dos campos de contraseñas no coinciden entre si."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obligatorio. Longitud máxima 30 caracteres alfanuméricos (letras, dígitos y "
 "@/./+/-/_) solamente."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Este valor solo puede contener letras, números y @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Contraseña"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Confirmación de contraseña"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Para verificar, introduzca la misma contraseña que introdujo arriba."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -80,17 +88,16 @@ msgid ""
 msgstr ""
 "Las contraseñas no se almacenan en texto plano, así que no hay manera de ver "
 "la contraseña del usuario, pero se puede cambiar la contraseña mediante <a "
-"href=\"password/\">este formulario</ a>."
+"href=\"password/\">este formulario</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Por favor introduzca un nombre de usuario y una contraseña correctos. Note "
-"que ambos campos son sensibles a mayúsculas/minúsculas."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,153 +105,110 @@ msgstr ""
 "Su navegador aparenta no estar configurado para aceptar cookies. Las cookies "
 "son un requerimiento para poder ingresar."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Esta cuenta está inactiva."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Esa dirección de correo electrónico no está asociada a ninguna cuenta de "
-"usuario. ¿Está seguro de que ya se ha registrado?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"La cuenta de usuario asociada a esta dirección de correo electrónico no "
-"puede restablecer la contraseña."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Confirmación de contraseña nueva"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "La antigua contraseña introducida es incorrecta. Por favor introdúzcala "
 "nuevamente."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Contraseña antigua"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmo"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "repeticiones"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "factor trabajo"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nombre"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nombre código"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupo"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:232
-msgid "username"
-msgstr "nombre de usuario"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Obligatorio. Longitud máxima de 30 caracteres alfanuméricos (letras, dígitos "
-"y @/./+/-/_)."
-
-#: models.py:235
-msgid "first name"
-msgstr "nombre"
-
-#: models.py:236
-msgid "last name"
-msgstr "apellido"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "dirección de correo electrónico"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "contraseña"
 
-#: models.py:239
-msgid "staff status"
-msgstr "es staff"
+#: models.py:201
+msgid "last login"
+msgstr "último ingreso"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si el usuario puede ingresar a este sitio de administración."
-
-#: models.py:242
-msgid "active"
-msgstr "activo"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Indica si el usuario debe ser tratado como un usuario activo. Desactive este "
-"campo en lugar de eliminar usuarios."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "es superusuario"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -252,15 +216,7 @@ msgstr ""
 "Indica que este usuario posee todos los permisos sin que sea necesario "
 "asignarle los mismos en forma explícita."
 
-#: models.py:248
-msgid "last login"
-msgstr "último ingreso"
-
-#: models.py:249
-msgid "date joined"
-msgstr "fecha de creación"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -268,26 +224,73 @@ msgstr ""
 "Los grupos a los que pertenece este usuario. Un usuario obtendrá todos los "
 "permisos concedidos para cada uno de su grupo."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "permisos de usuario"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "nombre de usuario"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Obligatorio. Longitud máxima de 30 caracteres alfanuméricos (letras, dígitos "
+"y @/./+/-/_)."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "nombre"
+
+#: models.py:384
+msgid "last name"
+msgstr "apellido"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "es staff"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica si el usuario puede ingresar a este sitio de administración."
+
+#: models.py:389
+msgid "active"
+msgstr "activo"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Indica si el usuario debe ser tratado como un usuario activo. Desactive este "
+"campo en lugar de eliminar usuarios."
+
+#: models.py:392
+msgid "date joined"
+msgstr "fecha de creación"
+
+#: models.py:400
 msgid "user"
 msgstr "usuario"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "usuarios"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Sesión cerrada"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una dirección de correo electrónico válida."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/et/LC_MESSAGES/django.mo b/django/contrib/auth/locale/et/LC_MESSAGES/django.mo
index cb0c463b73..06fdf18576 100644
Binary files a/django/contrib/auth/locale/et/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/et/LC_MESSAGES/django.po b/django/contrib/auth/locale/et/LC_MESSAGES/django.po
index b7b95bd070..0d972b3987 100644
--- a/django/contrib/auth/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/et/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,66 +30,73 @@ msgstr "Õigused"
 msgid "Important dates"
 msgstr "Tähtsad kuupäevad"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Salasõna edukalt muudetud."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Muuda salasõna: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Sama kasutajatunnusega kasutaja on juba olemas."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Kaks sisestatud parooli ei olnud identsed."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Kasutajatunnus"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Nõutav. 30 märki või vähem. Ainult tähed, numbrid ja /./+/-/_ tähemärgid."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "See väärtust võib sisaldada ainult tähti, numbreid ja/./+/-/_ tähemärke."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Salasõna"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Salasõna kinnitus"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Sisestage sama salasõna uuesti veendumaks, et sisestamisel ei tekkinud vigu"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Palun sisestage korrektne kasutajatunnus ja salasõna. Mõlemad väljad on "
-"tõstutundlikud."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -97,136 +104,162 @@ msgstr ""
 "Teie veebibrauser ei aktsepteeri küpsiseid, aga küpsised on sisselogimiseks "
 "vajalikud."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "See konto ei ole aktiivne."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Selle e-posti aadressiga ei ole seotud ühtegi kasutajakontot. Veenduge, et "
-"olete registreerunud."
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-posti aadress"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Uus salasõna"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Uue salasõna kinnitus"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Te sisestasite oma vana parooli vigaselt. Palun sisestage see uuesti."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Vana salasõna"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Salasõna (uuesti)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nimi"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "koodnimi"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "õigus"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "õigused"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupp"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupid"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "salasõna"
+
+#: models.py:201
+msgid "last login"
+msgstr "viimane sisenemine"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "superkasutaja staatus"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "Määrab, kas see kasutaja omab automaatselt ja alati kõiki õigus."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr "kasutajaõigused"
+
+#: models.py:377
 msgid "username"
 msgstr "kasutajatunnus"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Nõutav. 30 märki või vähem. Tähted, numbreid ja/./+/-/_ tähemärgid."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
 msgid "first name"
 msgstr "eesnimi"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "perenimi"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-posti aadress"
+#: models.py:385
+msgid "email address"
+msgstr ""
 
-#: models.py:238
-msgid "password"
-msgstr "salasõna"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "personalistaatus"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Määrab, kas kasutaja saab sisse logida sellesse admininistreerimisliidesesse."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "aktiivne"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -234,50 +267,22 @@ msgstr ""
 "Määrab, kas see konto on aktiivne. Kustutamise asemel lihtsalt deaktiveerige "
 "konto."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "superkasutaja staatus"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr "Määrab, kas see kasutaja omab automaatselt ja alati kõiki õigus."
-
-#: models.py:248
-msgid "last login"
-msgstr "viimane sisenemine"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "liitumise kuupäev"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "kasutajaõigused"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "kasutaja"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "kasutajad"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Välja logitud"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Sisestage korrektne e-posti aadress:"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo b/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo
index 73cf300feb..151847cc9d 100644
Binary files a/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/eu/LC_MESSAGES/django.po b/django/contrib/auth/locale/eu/LC_MESSAGES/django.po
index e92d150c10..221056e308 100644
--- a/django/contrib/auth/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/eu/LC_MESSAGES/django.po
@@ -1,22 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Aitzol Naberan <anaberan@codesyntax.com>, 2011, 2012.
+# Aitzol Naberan <anaberan@codesyntax.com>, 2011-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 18:38+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-07 13:41+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,50 +30,58 @@ msgstr "Baimenak"
 msgid "Important dates"
 msgstr "Data garrantzitsuak"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Ondo aldatu da pasahitza."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Pasahitza aldatu: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Pasahitza ezarri gabe."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Pasahitz formatu baliogabea edo hash algoritmo ezezaguna."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Erabiltzaile izen hori ez dago eskuragarri."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Pasahitzak ez datoz bat."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Beharrezkoa. 30 karaktere edo gutxiago. Hizki, zenbaki eta @/./+/-/_ "
 "bakarrik."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Hizki, zenbaki eta @/./+/-/_ karaktereak bakarrik izan ditzazke"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Pasahitza"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Pasahitza berretsi"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Idatzi berriro pasahitza."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -82,15 +90,16 @@ msgstr ""
 "Pasahitzak zifratuta gordetzen direnez ez dago erabiltzaile pasahitza "
 "ikusterik, baina pasahitza aldatu dezakezu <a href=\"password/\">hemen</a>"
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Mesedez idatzi erabiltzaile izen eta pasahitz egokiak. Maiskula eta "
-"minuskulak ondo bereiztu."
+"Mesedez idatzi %(username)s eta pasahitz egokiak. Maiskula eta minuskulak "
+"ondo bereiztu."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,153 +107,112 @@ msgstr ""
 "Zure nabigatzaileak ez ditu cookiak onartzen. Cookia-k beharrezkoak dira "
 "sisteman sartzeko."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Kontu hau az dago aktibo."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"E-mail helbide horrek ez du lotutako erabiltzailerik. Ziur al zaude "
+"Helbide elektroniko honek ez dauka erabiltzailerik esleituta. Ziur zaude "
 "erregistratu duzula?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 "E-mail helbide honekin lotutako erabiltzaile kontuan ezin da pasahitza "
 "berrezarri."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "Eposta"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Pasahitz berria berretsi"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Zure pasahitz zaharra ez da zuzena. Idatzi ezazu berriro."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Pasahitz zaharra"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Pasahitza (berriro)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmoak"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "begiztak"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "work factor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "izena"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kode izena"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "baimena"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "baimenak"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "taldea"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "taldeak"
 
-#: models.py:232
-msgid "username"
-msgstr "erabiltzaile izena"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Beharrezkoa. 30 karaktere edo gutxiago. Hizki, zenbaki eta @/./+/-/_ "
-"karaktereak"
-
-#: models.py:235
-msgid "first name"
-msgstr "izena"
-
-#: models.py:236
-msgid "last name"
-msgstr "abizena"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail helbidea"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "pasahitza"
 
-#: models.py:239
-msgid "staff status"
-msgstr "Arduradun egoera"
+#: models.py:201
+msgid "last login"
+msgstr "azken sarrera"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Erabiltzaileak kudeaketa gune honetan sartzeko baimena duen edo ez "
-"adierazten du."
-
-#: models.py:242
-msgid "active"
-msgstr "Aktiboa"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Erabiltzaile bat aktibo gisa tratatu edo ez zehazten du. Ezgaitu hau kontuak "
-"ezabatu beharrean."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "Erabiltzaile nagusia"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -252,15 +220,7 @@ msgstr ""
 "Erabiltzaileari baimen guztiak esleitzeko banan-banan aukeratu behar izan "
 "gabe."
 
-#: models.py:248
-msgid "last login"
-msgstr "azken sarrera"
-
-#: models.py:249
-msgid "date joined"
-msgstr "erregistro eguna"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -268,26 +228,75 @@ msgstr ""
 "Erabiltzailea zein taldetakoa den. Erabiltzaileak taldeari emandako baimen "
 "guztiak jasoko ditu."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "Erabiltzailearen baimenak"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "erabiltzaile izena"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Beharrezkoa. 30 karaktere edo gutxiago. Hizki, zenbaki eta @/./+/-/_ "
+"karaktereak"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Sartu baleko erabiltzaile izen bat."
+
+#: models.py:383
+msgid "first name"
+msgstr "izena"
+
+#: models.py:384
+msgid "last name"
+msgstr "abizena"
+
+#: models.py:385
+msgid "email address"
+msgstr "e-mail helbidea"
+
+#: models.py:386
+msgid "staff status"
+msgstr "Arduradun egoera"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Erabiltzaileak kudeaketa gune honetan sartzeko baimena duen edo ez "
+"adierazten du."
+
+#: models.py:389
+msgid "active"
+msgstr "Aktiboa"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Erabiltzaile bat aktibo gisa tratatu edo ez zehazten du. Ezgaitu hau kontuak "
+"ezabatu beharrean."
+
+#: models.py:392
+msgid "date joined"
+msgstr "erregistro eguna"
+
+#: models.py:400
 msgid "user"
 msgstr "Erabiltzailea"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "Erabiltzaileak"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Sesiotik kanpo"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "e-mail helbide zuzena idatzi."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo
index d3320078ca..31cfe39c18 100644
Binary files a/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/fa/LC_MESSAGES/django.po b/django/contrib/auth/locale/fa/LC_MESSAGES/django.po
index 6376f30ef3..29d1dde5a7 100644
--- a/django/contrib/auth/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/fa/LC_MESSAGES/django.po
@@ -1,22 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Nikneshan <ali@nikneshan.com>, 2011.
+# Ali Nikneshan <ali@nikneshan.com>, 2011-2012.
+# Alireza Savand <alireza.savand@gmail.com>, 2012-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-11 08:28+0000\n"
+"Last-Translator: Alireza Savand <alireza.savand@gmail.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,64 +31,76 @@ msgstr "اجازه‌ها"
 msgid "Important dates"
 msgstr "تاریخ‌های مهم"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "گذرواژه با موفقیت تغییر یافت."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "تغییر گذرواژه: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "هیچ رمزی انتخاب نشده است."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "رمز نامعتبر یا الگوریتم رمزنگاری ناشناس"
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "کاربری با این نام کاربری وجود دارد."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "دو فیلد گذرواژه با هم مطابقت ندارند."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "نام کاربری"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "الزامی. ۳۰ حرف یا کمتر. فقط حروف الفبا (ارقام، الفبا و علائم @/./+/-/_)."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "این مقدار فقط باید حاوی حروف، اعداد و یا علائم @/./+/-/_ باشد."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "گذرواژه"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "تصدیق گذرواژه"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "همان گذرواژهٔ بالایی را برای اطمینان دوباره وارد کنید."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"کلمات عبور نگهداری نمی شوند، لذا روشی برای مشاهده کلمه عبور کاربر وجود "
+"ندارد. ولی شما می توانید کلمه عبور را بوسیله <a href=\"password/\">این فرم</"
+"a> عوض کنید."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"لطفاً نام کاربری و گذرواژه صحیح را وارد کنید. توجه کنید که هر دو مقدار به "
-"حروف کوچک و بزرگ (انگلیسی) حساس هستند."
+"لطفا %(username)s و گذرواژه‌ی را برای حساب کارکنان وارد کنید.\n"
+"توجه داشته باشید که هر دو میتوانند به کوچکی و بزرگی حروف حساس باشند."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,134 +108,165 @@ msgstr ""
 "به نطر می رسد مرورگر شما کوکی‌ها را قبول نمی‌کند. کوکی‌ها برای ورود به وبگاه "
 "لازم هستند."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "این حساب غیرفعال است."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
-msgstr "این پست الکترونیکی در سیستم حساب ندارد. آیا مطمئن هستید که عضو شده‌اید؟"
+msgstr "این آدرس ایمیل به حسابی متصل نیست. آیا شما ثبت نام کرده اید؟"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr ""
+msgstr "کاربری که به این آدرس ایمیل متسل است نمیتواند رمز خود را ریست کند"
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "پست الکترونیکی"
+#: forms.py:211
+msgid "Email"
+msgstr "ایمیل"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "گذرواژهٔ جدید"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "تصدیق گذرواژهٔ جدید"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "گذرواژهٔ قدیمی شما اشتباه بود. لطفاً دوباره وارد کنید."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "گذرواژهٔ قدیمی"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "گذرواژه (تکرار)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "الگوریتم"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "تکرار"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "عامل کار"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "نام"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "نام کد"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "اجازه"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "اجازه‌ها"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "گروه"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "گروه‌ها"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "گذرواژه"
+
+#: models.py:201
+msgid "last login"
+msgstr "آخرین ورود"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "ابرکاربر"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"نشان می‌دهد که آیا این کاربر دسترسی نامحدود به کلیهٔ بخشهای وبگاه مدیریت دارد."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"گروه های این کاربر به آن تعلق دارد. کاربر تمامی دسترسیهای اعطا شده به هر یک "
+"از / گروه خود را دریافت کنید."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "اجازه‌های کاربر"
+
+#: models.py:377
 msgid "username"
 msgstr "نام کاربری"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "الزامی. 30 حرف یا کمتر. فقط حروف الفبا (ارقام، الفبا و علائم @/./+/-/_ )."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "یک نام کاربری معتبر وارد کنید"
+
+#: models.py:383
 msgid "first name"
 msgstr "نام"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "نام خانوادگی"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "نشانی پست الکترونیکی"
+#: models.py:385
+msgid "email address"
+msgstr "آدرس ایمیل"
 
-#: models.py:238
-msgid "password"
-msgstr "گذرواژه"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "وضعیت کارمندی"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "تعبیه شده برای اینکه در وبگاه مدیریت، کاربر بتواند یا نتواند وارد شود."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "فعال"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -230,52 +274,23 @@ msgstr ""
 "برای نشان دادن اینکه آیا باید با این کاربر به عنوان کاربر فعال رفتار کرد "
 "تعبیه شده است. به جای حذف کاربر تیک را بردارید."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "ابرکاربر"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"نشان می‌دهد که آیا این کاربر دسترسی نامحدود به کلیهٔ بخشهای وبگاه مدیریت دارد."
-
-#: models.py:248
-msgid "last login"
-msgstr "آخرین ورود"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "تاریخ پیوستن"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "اجازه‌های کاربر"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "کاربر"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "کاربرها"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "خارج شدید"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "یک نشانی پست الکترونیکی معتبر وارد کنید."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr ""
+msgstr "بازیابی کلمه عبور بر روی %(site_name)s"
diff --git a/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo
index 6f4b3fcfb7..4323e0ee26 100644
Binary files a/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/fi/LC_MESSAGES/django.po b/django/contrib/auth/locale/fi/LC_MESSAGES/django.po
index eed4406846..af6373eb95 100644
--- a/django/contrib/auth/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/fi/LC_MESSAGES/django.po
@@ -3,20 +3,21 @@
 # Translators:
 # Antti Kaihola <akaihol+transifex@ambitone.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <klaus.dahlen@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: nanook <klaus.dahlen@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,204 +31,244 @@ msgstr "Oikeudet"
 msgid "Important dates"
 msgstr "Tärkeät päivämäärät"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Salasana muutettu onnistuneesti."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Vaihda salasana: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Salasanaa ei ole asetettu."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Tuntematon salasanamuoto tai tuntematon hajakoodausalgoritmi."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Käyttäjätunnus on jo rekisteröity."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Salasanat eivät täsmää."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 " Vaaditaan. Enintään 30 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat "
 "sallittuja."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Tässä voidaan käyttää vain kirjaimia, numeroita ja @/./+/-/_ merkkejä."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Salasana"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Salasanan vahvistaminen"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Syötä sama salasana tarkistuksen vuoksi toistamiseen."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Salasanoja ei tallenneta selkokielisinä, joten tämän käyttäjän salasanaa on "
+"mahdoton nähdä, mutta voit vaihtaa salasanan käyttämällä <a href=\"password/"
+"\">tätä lomaketta</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Käyttäjätunnus tai salasana ei kelpaa. Huomaa, että isot ja pienet kirjaimet "
-"ovat merkitseviä."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "Selaimesi ei näytä sallivan evästeitä. Sisäänkirjautuminen vaatii evästeen."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Tämä käyttäjätili ei ole voimassa."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Sähköpostiosoitetta vastaavaa käyttäjätunnusta ei löydy. Oletko varmasti jo "
+"Sähköpostiosoitetta vastaavaa käyttäjätiliä ei löydy. Oletko varmasti  "
 "rekisteröitynyt?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Tätä sähköpostiosoitetta vastaavalla käyttäjätilillä ei ole oikeutta nollata "
-"salasanaa."
+"Tähän sähköpostiosoitteeseen liitetty käyttäjätili ei voi nollata salasanaa."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "Sähköposti"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Uusi salasana uudelleen"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vanha salasana on virheellinen. Yritä uudelleen."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Vanha salasana"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Salasana toistamiseen"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "algoritmi"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "iteraatioita"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "suola"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "tiiviste"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "työmäärä"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "tarkistussumma"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nimi"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "tunniste"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "oikeus"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "oikeudet"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "ryhmä"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "ryhmät"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "salasana"
+
+#: models.py:201
+msgid "last login"
+msgstr "viimeisin kirjautuminen"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "pääkäyttäjä"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Antaa käyttäjälle kaikki oikeudet ilman, että niitä täytyy erikseen luetella."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"Käyttäjäryhmät joihin tämä käyttäjä kuuluu. Käyttäjä saa käyttöoikeudet "
+"kaikista käyttäjäryhmistä, joihin hän kuuluu."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "käyttäjän oikeudet"
+
+#: models.py:377
 msgid "username"
 msgstr "käyttäjätunnus"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 " Vaaditaan. Enintään 30 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat "
 "sallittuja."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Syötä kelvollinen käyttäjätunnus."
+
+#: models.py:383
 msgid "first name"
 msgstr "etunimi"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "sukunimi"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "sähköposti"
+#: models.py:385
+msgid "email address"
+msgstr "sähköpostiosoite"
 
-#: models.py:238
-msgid "password"
-msgstr "salasana"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "ylläpitäjä"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "Määrittää, pääseekö käyttäjä tähän sivuston ylläpito-osioon."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "voimassa"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -235,51 +276,22 @@ msgstr ""
 "Määrää, voiko käyttäjä kirjautua sisään. Tällä voi estää käyttäjätilin "
 "käytön poistamatta sitä."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "pääkäyttäjä"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Antaa käyttäjälle kaikki oikeudet ilman, että niitä täytyy erikseen luetella."
-
-#: models.py:248
-msgid "last login"
-msgstr "viimeisin kirjautuminen"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "liittynyt"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "käyttäjän oikeudet"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "käyttäjä"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "käyttäjät"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Kirjautunut ulos"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Syötä kelvollinen sähköpostiosoite."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo
index 3913b3aa85..f3941a9c1e 100644
Binary files a/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/fr/LC_MESSAGES/django.po b/django/contrib/auth/locale/fr/LC_MESSAGES/django.po
index 50c5929205..336e3ba9f3 100644
--- a/django/contrib/auth/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/fr/LC_MESSAGES/django.po
@@ -1,22 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-#   <claude@2xlibre.net>, 2011, 2012.
+#   <claude@2xlibre.net>, 2011-2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-17 09:26+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,52 +30,61 @@ msgstr "Permissions"
 msgid "Important dates"
 msgstr "Dates importantes"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Mot de passe modifié avec succès"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Modifier le mot de passe : %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Aucun mot de passe défini."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+"Format de mot de passe non valide ou algorithme de hachage non reconnu."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Un utilisateur avec ce nom existe déjà."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Requis. 30 caractères maximum. Uniquement des lettres, nombres et les "
 "caractères « @ », « . », « + », « - » et « _ »."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Cette valeur peut uniquement contenir des lettres, nombres et les caractères "
 "« @ », « . », « + », « - » et « _ »."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Mot de passe"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Confirmation du mot de passe"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Saisissez le même mot de passe que précédemment, pour vérification."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -85,16 +94,17 @@ msgstr ""
 "d'afficher le mot de passe de cet utilisateur, mais il est possible de le "
 "changer en utilisant <a href=\"password/\">ce formulaire</a>. "
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Saisissez un nom d'utilisateur et un mot de passe valide. Remarquez que "
-"chacun de ces champs est sensible à la casse (différenciation des majuscules/"
+"Saisissez un %(username)s et un mot de passe valides. Remarquez que chacun "
+"de ces champs est sensible à la casse (différenciation des majuscules/"
 "minuscules)."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -102,151 +112,112 @@ msgstr ""
 "Votre navigateur ne semble pas avoir activé les cookies. Les cookies sont "
 "nécessaires pour se connecter."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Ce compte est inactif."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Cette adresse électronique ne correspond à aucun compte utilisateur. Êtes-"
-"vous sûr de vous être enregistré ?"
+"Cette adresse électronique ne correspond à aucun compte existant. Vous êtes-"
+"vous vraiment enregistré ?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Le compte associé à cette adresse électronique ne peut pas réinitialiser son "
+"Le compte associé à cette adresse électronique ne peut pas réinitialiser le "
 "mot de passe."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "Courriel"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Votre ancien mot de passe est incorrect. Veuillez le rectifier."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Mot de passe (à nouveau)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algorithme"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "itérations"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salage"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "empreinte"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "facteur travail"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "somme de contrôle"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nom"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nom de code"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permission"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permissions"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "groupe"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "groupes"
 
-#: models.py:232
-msgid "username"
-msgstr "nom d'utilisateur"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Requis. 30 caractères maximum. Uniquement des lettres, nombres et les "
-"caractères « @ », « . », « + », « - » et « _ »."
-
-#: models.py:235
-msgid "first name"
-msgstr "prénom"
-
-#: models.py:236
-msgid "last name"
-msgstr "nom"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "adresse électronique"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "mot de passe"
 
-#: models.py:239
-msgid "staff status"
-msgstr "statut équipe"
+#: models.py:201
+msgid "last login"
+msgstr "dernière connexion"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Précise si l'utilisateur peut se connecter à ce site d'administration."
-
-#: models.py:242
-msgid "active"
-msgstr "actif"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Précise si l'utilisateur doit être considéré comme actif. Décochez ceci "
-"plutôt que de supprimer le compte."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "statut super-utilisateur"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -254,15 +225,7 @@ msgstr ""
 "Précise que l'utilisateur possède toutes les permissions sans les assigner "
 "explicitement."
 
-#: models.py:248
-msgid "last login"
-msgstr "dernière connexion"
-
-#: models.py:249
-msgid "date joined"
-msgstr "date d'inscription"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -270,27 +233,74 @@ msgstr ""
 "Les groupes dont fait partie cet utilisateur. Celui-ci obtient tous les "
 "droits de tous ses groupes."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "permissions de l'utilisateur"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "nom d'utilisateur"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Requis. 30 caractères maximum. Uniquement des lettres, nombres et les "
+"caractères « @ », « . », « + », « - » et « _ »."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Saisissez un nom d'utilisateur valable."
+
+#: models.py:383
+msgid "first name"
+msgstr "prénom"
+
+#: models.py:384
+msgid "last name"
+msgstr "nom"
+
+#: models.py:385
+msgid "email address"
+msgstr "adresse électronique"
+
+#: models.py:386
+msgid "staff status"
+msgstr "statut équipe"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Précise si l'utilisateur peut se connecter à ce site d'administration."
+
+#: models.py:389
+msgid "active"
+msgstr "actif"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Précise si l'utilisateur doit être considéré comme actif. Décochez ceci "
+"plutôt que de supprimer le compte."
+
+#: models.py:392
+msgid "date joined"
+msgstr "date d'inscription"
+
+#: models.py:400
 msgid "user"
 msgstr "utilisateur"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "utilisateurs"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Déconnecté"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Entrez une adresse de courriel valide."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr "Mot de passe réinitialisé sur %(site_name)s"
+msgstr "Réinitialisation du mot de passe sur %(site_name)s"
diff --git a/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo
index 501e56b814..734b9aafb9 100644
Binary files a/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ga/LC_MESSAGES/django.po b/django/contrib/auth/locale/ga/LC_MESSAGES/django.po
index 14f0eccfd8..d7de99d159 100644
--- a/django/contrib/auth/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ga/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-16 12:17+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,52 +31,60 @@ msgstr "Ceada"
 msgid "Important dates"
 msgstr "Dáta tábhactach"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Focal faire aithraithe rathúil"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Athraigh focal faire: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "In ann do úsáideoir leis an ainm úsáideora."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Níl an dá focla faire comhoiriúnigh"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Ainm úsaideoir"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Riachtanach. 30 carachtair nó níos lú. Litreacha, digite agus @/./+/-/_ "
 "amháin."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Cathaigh litreacha, digite agus na carachtair @/./+/-/_ amhain le hadhaigh "
 "an méid seo."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Focal faire"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Focal faire deimhniú"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Iontráíl an focal faire céanna mar thuas, le fíorúchán."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -86,15 +94,14 @@ msgstr ""
 "an úsaideora a fheiceáil, ach is féidir leat athrú ar an focal faire leis <a "
 "href=\"password/\">an bhfoirm seo</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Le do thoil, iontráil aihm úsaideora agus focal faire ceart. Bí cúramach go "
-"bhfuil an beirt acu cásíogair."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -102,154 +109,109 @@ msgstr ""
 "Feictear nach bhfuil do brabhsálaí réidh le cuaiche a glacadh. Tá cuaiche ag "
 "teastail le logáil isteach."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Tá an cuntas seo neamhghníomhach."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Níl cuntas in éineacht leis an r-phost sin. An bhfuil tú cinnte go bhfuil tú "
-"cláraithe?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Ní féidir leis an cuntas úsáideora a bhaineann leis an seoladh r-phoist a "
-"athshocrú an focal faire."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "R-phost"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Focal faire nua"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Deimnhiú focal faire nua"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Cuireadh do sean-focal faire isteach go mícheart. Iontráil isteach é arís."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Sean-focal faire "
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Focal faire (arís)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algartam"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "atriallta"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salann"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "haiseáil"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "fachtóir oibre"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "suim sheiceála"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ainm"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "Ainm cód"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "cead"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "ceada"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grúpa"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grúpa"
 
-#: models.py:232
-msgid "username"
-msgstr "Ainm úsáideoir"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Riachtanach. 30 carachtair nó níos lú. Litreacha, digite agus na carachtair "
-"@/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "ainm baiste"
-
-#: models.py:236
-msgid "last name"
-msgstr "sloinne"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "seoladh r-phost"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "focal faire"
 
-#: models.py:239
-msgid "staff status"
-msgstr "stádas foirne"
+#: models.py:201
+msgid "last login"
+msgstr "logáil deirneach"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Sainigh an bhfuil cead ag an úsáideoir logáil isteach go dtí an suíomh "
-"riaracháin seo."
-
-#: models.py:242
-msgid "active"
-msgstr "gníomhach"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Sainíonn an bhfuil an úsáideoir gníomhach. Míroghnaigh seo in aineonn de "
-"scriseadh cuntasí."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "stádas forúsáideoir"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -257,15 +219,7 @@ msgstr ""
 "Sainíonn go bhfuil gach ceada ag an úsáideoir seo gan iad a cur le go "
 "díreach."
 
-#: models.py:248
-msgid "last login"
-msgstr "logáil deirneach"
-
-#: models.py:249
-msgid "date joined"
-msgstr "Dáta teacht isteach"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -273,26 +227,75 @@ msgstr ""
 "Na grúpaí a mbaineann leis an úsáideoir seo. Gheobhaidh úsáideor na ceadanna "
 "a deonaíodh do gach ceann den a  grúpa."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "ceada úsáideoira"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "Ainm úsáideoir"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Riachtanach. 30 carachtair nó níos lú. Litreacha, digite agus na carachtair "
+"@/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "ainm baiste"
+
+#: models.py:384
+msgid "last name"
+msgstr "sloinne"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "stádas foirne"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Sainigh an bhfuil cead ag an úsáideoir logáil isteach go dtí an suíomh "
+"riaracháin seo."
+
+#: models.py:389
+msgid "active"
+msgstr "gníomhach"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Sainíonn an bhfuil an úsáideoir gníomhach. Míroghnaigh seo in aineonn de "
+"scriseadh cuntasí."
+
+#: models.py:392
+msgid "date joined"
+msgstr "Dáta teacht isteach"
+
+#: models.py:400
 msgid "user"
 msgstr "úsáideoir"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "úsáideora"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Logáilte amach"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Cuir isteach seoladh ríomhphoist bhailí."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo
index 57c6460b71..98a4ab29b6 100644
Binary files a/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/gl/LC_MESSAGES/django.po b/django/contrib/auth/locale/gl/LC_MESSAGES/django.po
index 8b111b5c2a..073fb035eb 100644
--- a/django/contrib/auth/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/gl/LC_MESSAGES/django.po
@@ -3,22 +3,23 @@
 # Translators:
 # fasouto <fsoutomoure@gmail.com>, 2011.
 # fonso <fonzzo@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-07 11:41+0000\n"
+"Last-Translator: fonso <fonzzo@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,65 +33,77 @@ msgstr "Permisos"
 msgid "Important dates"
 msgstr "Datas importantes"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "O contrasinal cambiouse correctamente."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambiar contrasinal: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Non se configurou ningún contrasinal."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Formato de contrasinal inválido ou algoritmo de hash descoñecido."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Xa existe un usuario con ese nome de usuario."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Os dous campos de contrasinal non coinciden."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Usuario"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Requirido. 30 caracteres ou menos. Soamente letras, díxitos e @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Este valor soamente pode conter letras, números e os caracteres @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Contrasinal"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Confirmación do contrasinal"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Insira o mesmo contrasinal ca enriba para verificalo."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Non se gardan os contrasinais sen cifrar, de maneira que non se pode ver o "
+"contrasinal deste usuario, pero pode modificar o contrasinal mediante <a "
+"href=\"password/\">este formulario</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Insira un nome de usuario e un contrasinal correctos. Teña en conta que nos "
-"dous campos se distingue entre maiúsculas e minúsculas."
+"Por favor, insira un %(username)s e contrasinal correctos. Teña en conta que "
+"ambos os dous campos poden distinguir maiúsculas e minúsculas."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,136 +111,169 @@ msgstr ""
 "Semella que o seu navegador non acepta 'cookies'. Requírense 'cookies' para "
 "iniciar sesión."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Esta conta está inactiva."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Este enderezo de correo electrónico non ten unha conta de usuario asociada. "
-"Está seguro de que está rexistrado?"
+"Esta dirección de correo electrónico non ten unha conta de usuario asociada. "
+"Está seguro de que se rexistrou?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
+"A conta de usuario asociada con este enderezo de correo electrónico non pode "
+"restablecer o contrasinal."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "Correo electrónico"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Confirmación do novo contrasinal"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Inseriu incorrectamente o seu contrasinal actual. Por favor, insírao de novo."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Contrasinal antigo"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Contrasinal (outra vez)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "algoritmo"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "iteracións"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "sal"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "factor de traballo"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "suma de verificación"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nome"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "código"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupo"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "contrasinal"
+
+#: models.py:201
+msgid "last login"
+msgstr "última sesión"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "estatus de superusuario"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Indica que este usuario ten todos os permisos sen asignarllos explicitamente."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"Os grupos aos que pertence este usuario. Un/ha usuario/a recibirá todos os "
+"permisos outorgados a cada un dos seus grupos."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "permisos de usuario"
+
+#: models.py:377
 msgid "username"
 msgstr "nome de usuario"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Requirido. 30 caracteres ou menos.  Letras, díxitos e @/./+/-/_."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Insira un nome de usuario válido."
+
+#: models.py:383
 msgid "first name"
 msgstr "nome"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "apelidos"
 
-#: models.py:237
-msgid "e-mail address"
+#: models.py:385
+msgid "email address"
 msgstr "enderezo de correo electrónico"
 
-#: models.py:238
-msgid "password"
-msgstr "contrasinal"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "membro do persoal"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indica se o usuario pode entrar neste sitio de administración."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "activo"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -235,51 +281,22 @@ msgstr ""
 "Determina se este usuario se debe considerar activo. Deseleccione isto en "
 "vez de borrar contas de usuario."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "estatus de superusuario"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Indica que este usuario ten todos os permisos sen asignarllos explicitamente."
-
-#: models.py:248
-msgid "last login"
-msgstr "última sesión"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "data de rexistro"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "permisos de usuario"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "usuario"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "usuarios"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Rematou a sesión"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Insira un enderezo de correo electrónico válido."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/he/LC_MESSAGES/django.mo b/django/contrib/auth/locale/he/LC_MESSAGES/django.mo
index b05d48f194..a85afd483d 100644
Binary files a/django/contrib/auth/locale/he/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/he/LC_MESSAGES/django.po b/django/contrib/auth/locale/he/LC_MESSAGES/django.po
index 78126c84b3..aef3f68422 100644
--- a/django/contrib/auth/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/he/LC_MESSAGES/django.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,220 +31,185 @@ msgstr "הרשאות"
 msgid "Important dates"
 msgstr "תאריכים חשובים"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "הסיסמה שונתה בהצלחה."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "שינוי סיסמה: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "לא נקבעה סיסמה."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "תחביר סיסמה בלתי-חוקי או אלגוריתם גיבוב לא ידוע."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "משתמש עם שם משתמש זה קיים כבר"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "שני שדות הסיסמה אינם זהים."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "שם משתמש"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות ו-@/./+/-/_ בלבד."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "ערך זה יכול להכיל אותיות, ספרות והתווים @/./+/-/_ בלבד."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "סיסמה"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "אימות סיסמה"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "יש להזין את אותה סיסמה שוב,לאימות."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"הסיסמאות אינן נשמרות באופן חשוף, כך שאין דרך לראות את סיסמת המשתמש, ניתן "
+"לשנות את הסיסמה בעזרת  <a href=\"password/\">טופס זה</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "נראה שעוגיות לא מאופשרות בדפדפן שלך. הן נדרשות כדי להתחבר."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "חשבון זה אינו פעיל."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
-msgstr "כתובת דואר אלקטרוני זו אינה משוייכת למשתמש. בטוח שנרשמת ?"
+msgstr "כתובת הדוא\"ל הזו אינה משוייכת לחשבון משתמש. האם בטוח שנרשמת ?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr "החשבון מחובר לדוא\"ל זה לא יכול להחליף את הסיסמה."
+msgstr "חשבון המשתמש המשוייך לכתובת דוא\"ל זו אינו יכול לאפס את הסיסמה."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "כתובת דוא\"ל"
+#: forms.py:211
+msgid "Email"
+msgstr "דוא\"ל"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "אימות סיסמה חדשה"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "סיסמתך הישנה הוזנה בצורה שגויה. נא להזינה שוב."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "סיסמה ישנה"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "סיסמה (שוב)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "אלגוריתם"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "חזרות"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "גיבוב"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "work factor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "סיכום ביקורת"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "שם"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "שם קוד"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "הרשאה"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "הרשאות"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "קבוצה"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "קבוצות"
 
-#: models.py:232
-msgid "username"
-msgstr "שם משתמש"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות והתווים @/./+/-/_ בלבד."
-
-#: models.py:235
-msgid "first name"
-msgstr "שם פרטי"
-
-#: models.py:236
-msgid "last name"
-msgstr "שם משפחה"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "כתובת דוא\"ל"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "סיסמה"
 
-#: models.py:239
-msgid "staff status"
-msgstr "סטטוס איש צוות"
+#: models.py:201
+msgid "last login"
+msgstr "כניסה אחרונה"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "מציין האם המשתמש יכול להתחבר לאתר הניהול."
-
-#: models.py:242
-msgid "active"
-msgstr "פעיל"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות "
-"משתמשים."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "סטטוס משתמש על"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "מציין שלמשתמש זה יש את כל ההרשאות ללא הצורך המפורש בהענקתן."
 
-#: models.py:248
-msgid "last login"
-msgstr "כניסה אחרונה"
-
-#: models.py:249
-msgid "date joined"
-msgstr "תאריך הצטרפות"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -252,26 +217,71 @@ msgstr ""
 "הקבוצות שמשתמש זה שייך אליהן. משתמש יקבל את כל ההרשאות המוקצות לקבוצה שלו/"
 "שלה."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "הרשאות משתמש"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "שם משתמש"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות והתווים @/./+/-/_ בלבד."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "נא להזין שם משתמש חוקי."
+
+#: models.py:383
+msgid "first name"
+msgstr "שם פרטי"
+
+#: models.py:384
+msgid "last name"
+msgstr "שם משפחה"
+
+#: models.py:385
+msgid "email address"
+msgstr "כתובת דוא\"ל"
+
+#: models.py:386
+msgid "staff status"
+msgstr "סטטוס איש צוות"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "מציין האם המשתמש יכול להתחבר לאתר הניהול."
+
+#: models.py:389
+msgid "active"
+msgstr "פעיל"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות "
+"משתמשים."
+
+#: models.py:392
+msgid "date joined"
+msgstr "תאריך הצטרפות"
+
+#: models.py:400
 msgid "user"
 msgstr "משתמש"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "משתמשים"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "יצאת מהמערכת"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "יש להזין כתובת דוא\"ל חוקית."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo
index 9d441af4e9..654cd0f4de 100644
Binary files a/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/hi/LC_MESSAGES/django.po b/django/contrib/auth/locale/hi/LC_MESSAGES/django.po
index 1e9de07176..4c713a9f37 100644
--- a/django/contrib/auth/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/hi/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <alok.kumar@gmail.com>, 2013.
 # Chandan kumar <chandankumar.093047@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Sandeep Satavlekar <sandysat@gmail.com>, 2011.
@@ -8,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-15 14:00+0000\n"
-"Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-09 10:31+0000\n"
+"Last-Translator: alkuma <alok.kumar@gmail.com>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,48 +32,56 @@ msgstr "अनुमतियाँ"
 msgid "Important dates"
 msgstr "महत्त्वपूर्ण तिथियाँ"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "शब्दकूट बदली कामयाब"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "शब्दकूट बदलें: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "कोई कूटशब्द नहीं।"
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "अवैध कूटशब्द प्रारूप या अज्ञात द्रुतान्वेषण कलन विधि"
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "इस नाम के साथ प्रवोक्ता अस्तित्व है"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "यह दो शब्दकूट क्षेत्रों का मेल नहीं होता "
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "प्रवोक्ता नाम"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "जरूरी है | 30 या कम | केवल वर्णों, अक्षर, अंक और @/./+/-/_ |"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "यह मूल्य केवल अक्षर, संख्या और @/./+/-/_ हो सकते हैं |"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "कूटशब्द"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "कूटशब्द पुष्टि"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "सत्याप्ती के लिए ऊपर दर्ज किए शब्दकूट को फिर से प्रवेश करें"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -82,162 +91,122 @@ msgstr ""
 "तरीका नहीं है, लेकिन आप <a href=\"password/\"> इस प्रपत्र</a> का उपयोग करते हुए "
 "कूटशब्द बदल सकते हैं."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"एक सही उपयोगकर्ता नाम और  कूटशब्द दर्ज करें. कृपया ध्यान दें कि दोनों क्षेत्र मामले के प्रति "
-"संवेदनशील होते हैं."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr "कृपया सही %(username)s व कूटशब्द भरें। भरते समय लघु और दीर्घ अक्षरों का ध्यान रखें।"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "ऐसा लग रहा हैं की आप के वेब-ब्राउज़र में कुकीज़ सक्षम नहीं हैं | प्रवेश हेतु कुकीज़ आवश्यक हैं |"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "यस खाता सुस्त है"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
-msgstr ""
-"उस इ-मेल पते से जुड़ा कोई उपयोगकर्ता खता नहीं हैं | क्या आप को यकीन हैं की आप  ने पंजीकरण "
-"किया हैं?"
+msgstr "इस डाक पते का कोई खाता यहाँ नहीं है। आपने पंजीकरण तो किया है न?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr "इस ई - मेल पते के साथ जुड़े उपयोगकर्ता खाता पासवर्ड को रीसेट नहीं कर सकते है."
+msgstr "इस डाक पते से जुड़े प्रयोक्ता कूटशब्द नहीं बदल सकते हैं"
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "ईमेल"
+#: forms.py:211
+msgid "Email"
+msgstr "डाक पता"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "नया शब्दकूट"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "नया शब्दकूट पुष्टि"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "आपने पुराना शब्दकूट गलत दर्ज किया है । कृपया फिर से दर्ज करें"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "पुराना शब्दकूट"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "शब्दकूट (दुबारा)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "अलगोरिथम"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "पुनरूक्तियाँ"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "साल्ट"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "हैश"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "कार्य फ़ैक्टर"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "चेकसम"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "नाम"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "कोडनेम"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "अनुमति"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "अनुमतियाँ"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "वर्ग"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "वर्गों"
 
-#: models.py:232
-msgid "username"
-msgstr "प्रयोक्ता नाम"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "जरूरी है | 30 या कम वर्णों | केवल  अक्षर, संख्या और @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "पहला नाम"
-
-#: models.py:236
-msgid "last name"
-msgstr "आखिरी नाम"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "ईमेल पता"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "शब्दकूट"
 
-#: models.py:239
-msgid "staff status"
-msgstr "कर्मचारी स्थिति"
+#: models.py:201
+msgid "last login"
+msgstr "पिछला लॉगिन"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "तय करता हैं की उपयोगकर्ता इस साईट प्रशासन में प्रवेश कर सकता हैं या नहीं |"
-
-#: models.py:242
-msgid "active"
-msgstr "सक्रिय"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"निर्दिष्ट करता है कि क्या इस उपयोगकर्ता को सक्रिय माना जाना चाहिए.खातों को हटाने की  "
-"बजाय इस अचयनित करे."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "सर्वोच्च प्रयोक्ता स्थिति"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -245,15 +214,7 @@ msgstr ""
 "निर्दिष्ट करता है कि जो इस उपयोगकर्ता के पास सभी अनुमतियाँ उन्हें बिना बताए स्पष्ट रूप से "
 "निर्धारित है."
 
-#: models.py:248
-msgid "last login"
-msgstr "पिछला लॉगिन"
-
-#: models.py:249
-msgid "date joined"
-msgstr "तिथि भरती"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -261,26 +222,71 @@ msgstr ""
 "समूह के अंतर्गत यह उपयोगकर्ता आता है. उपयोगकर्ता उसकी / उसके समूह के प्रत्येक के लिए दी गई "
 "अनुमति प्राप्त होगा."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "प्रयोक्ता अनुमतियाँ"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "प्रयोक्ता नाम"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "जरूरी है | 30 या कम वर्णों | केवल  अक्षर, संख्या और @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "वैध प्रयोक्ता नाम भरें"
+
+#: models.py:383
+msgid "first name"
+msgstr "पहला नाम"
+
+#: models.py:384
+msgid "last name"
+msgstr "आखिरी नाम"
+
+#: models.py:385
+msgid "email address"
+msgstr "डाक पता"
+
+#: models.py:386
+msgid "staff status"
+msgstr "कर्मचारी स्थिति"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "तय करता हैं की उपयोगकर्ता इस साईट प्रशासन में प्रवेश कर सकता हैं या नहीं |"
+
+#: models.py:389
+msgid "active"
+msgstr "सक्रिय"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"निर्दिष्ट करता है कि क्या इस उपयोगकर्ता को सक्रिय माना जाना चाहिए.खातों को हटाने की  "
+"बजाय इस अचयनित करे."
+
+#: models.py:392
+msgid "date joined"
+msgstr "तिथि भरती"
+
+#: models.py:400
 msgid "user"
 msgstr "उपभोक्ता"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "उपभोक्ताऐं"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "लाग्ड आउट "
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "मान्य ईमेल पता भरें"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo
index a4e3bfb259..cf82f40365 100644
Binary files a/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/hr/LC_MESSAGES/django.po b/django/contrib/auth/locale/hr/LC_MESSAGES/django.po
index e2e295ce66..4414ed5b84 100644
--- a/django/contrib/auth/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/hr/LC_MESSAGES/django.po
@@ -1,24 +1,27 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <aljosa.mohorovic@gmail.com>, 2012-2013.
 # Bojan Mihelač <bmihelac@mihelac.org>, 2012.
+# Davor Lučić <r.dav.lc@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <senko.rasic@dobarkod.hr>, 2012.
 #   <zlatko.masek@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-22 17:16+0000\n"
-"Last-Translator: zmasek <zlatko.masek@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-14 18:37+0000\n"
+"Last-Translator: aljosa <aljosa.mohorovic@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,51 +35,59 @@ msgstr "Privilegije"
 msgid "Important dates"
 msgstr "Važni datumi"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Lozinka uspješno promijenjena."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Promijeni lozinku: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Lozinka nije postavljena."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Neispravan format lozinke ili nepoznati hashing algoritam."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Korisnik sa navedenim imenom već postoji."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Dva polja za lozinku nisu jednaka."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obavezan unos. 30 alfanumeričkih znakova ili manje. Samo slova, brojevi i "
 "@/./+/-/_ znakovi."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Ova vrijednost može sadržavati samo slova, brojeve i @/./+/-/_ znakove."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Lozinka"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Potvrda lozinke"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Unesite istu lozinku, za potvrdu."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -86,15 +97,16 @@ msgstr ""
 "lozinku ovog korisnika, ali je možete promjeniti koristeći <a href="
 "\"password/\">ovaj obrazac</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Molim unesite ispravno korisničko ime i lozinku. Uzmite u obzir da oba polja "
-"razlikuju velika/mala slova."
+"Unesite ispravno %(username)s i lozinku. Imajte na umu da oba polja mogu "
+"biti velika i mala slova."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -102,150 +114,111 @@ msgstr ""
 "Izgleda da Vaš browser ne podržava kolačiće (cookies). Kolačići su potrebni "
 "da bi se prijavili."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Ovaj korisnički račun nije aktivan."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Za navedenu e-mail adresu ne postoji korisnički račun. Jeste li sigurni da "
-"ste registrirani?"
+"E-mail adresa nije vezana uz nijedan korisnički račun. Da li ste sigurni da "
+"ste se registrirali?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Nije moguće resetirati lozinku za korisnika povezanim sa ovom e-mail adresom."
+"Korisnički račun povezan s ovom e-mail adresom ne može resetirati lozinku."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "E-mail"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Potvrda nove lozinke"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaša stara lozinka je pogrešno unesena. Molim unesite ponovo."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Stara lozinka"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Lozinka (unesi ponovo)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritam"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iteracije"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "slučajna vrijednost"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "količina rada"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "zbroj za provjeru"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ime"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kodno ime"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "privilegija"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "privilegije"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupa"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupe"
 
-#: models.py:232
-msgid "username"
-msgstr "korisničko ime"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Obavezan unos. 30 alfanumeričkih znakova ili manje. Samo slova, brojevi i "
-"@/./+/-/_ dozvoljeni."
-
-#: models.py:235
-msgid "first name"
-msgstr "ime"
-
-#: models.py:236
-msgid "last name"
-msgstr "prezime"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail adresa"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "lozinka"
 
-#: models.py:239
-msgid "staff status"
-msgstr "status osoblja"
+#: models.py:201
+msgid "last login"
+msgstr "posljednja prijava"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Određuje može li se korisnik prijaviti na ove stranice administracije."
-
-#: models.py:242
-msgid "active"
-msgstr "aktivan"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Određuje treba li se ovaj korisnik tretirati kao aktivan korisnik. Koristite "
-"ovu opciju umjesto brisanja korisničkih računa."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "superuser status"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -253,15 +226,7 @@ msgstr ""
 "Određuje da ovaj korisnik ima sve privilegije te uklanja potrebu da se "
 "privilegije unose eksplicitno/ručno."
 
-#: models.py:248
-msgid "last login"
-msgstr "posljednja prijava"
-
-#: models.py:249
-msgid "date joined"
-msgstr "datum učlanjenja"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -269,26 +234,73 @@ msgstr ""
 "Grupe kojima ovaj korisnik pripada. Korisnik će imati sve privilegije grupa "
 "kojima pripada."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "privilegije korisnika"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "korisničko ime"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Obavezan unos. 30 alfanumeričkih znakova ili manje. Samo slova, brojevi i "
+"@/./+/-/_ dozvoljeni."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Unesite ispravno korisničko ime."
+
+#: models.py:383
+msgid "first name"
+msgstr "ime"
+
+#: models.py:384
+msgid "last name"
+msgstr "prezime"
+
+#: models.py:385
+msgid "email address"
+msgstr "e-mail adresa"
+
+#: models.py:386
+msgid "staff status"
+msgstr "status osoblja"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Određuje može li se korisnik prijaviti na ove stranice administracije."
+
+#: models.py:389
+msgid "active"
+msgstr "aktivan"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Određuje treba li se ovaj korisnik tretirati kao aktivan korisnik. Koristite "
+"ovu opciju umjesto brisanja korisničkih računa."
+
+#: models.py:392
+msgid "date joined"
+msgstr "datum učlanjenja"
+
+#: models.py:400
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "korisnici"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Niste logirani"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Unesite ispravnu e-mail adresu."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo
index 2a1daf9c01..3989054315 100644
Binary files a/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/hu/LC_MESSAGES/django.po b/django/contrib/auth/locale/hu/LC_MESSAGES/django.po
index 135bb61763..07965da629 100644
--- a/django/contrib/auth/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/hu/LC_MESSAGES/django.po
@@ -2,21 +2,22 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Máté Őry <orymate@iit.bme.hu>, 2012.
 # Szilveszter Farkas <szilveszter.farkas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-19 20:32+0000\n"
-"Last-Translator: istvanf <istvan.farkas@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Máté Őry <orymate@iit.bme.hu>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,50 +31,58 @@ msgstr "jogosultságok"
 msgid "Important dates"
 msgstr "Fontos dátumok"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Sikeres jelszóváltoztatás."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Jelszó megváltoztatása: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Létezik már egy felhasználó ezzel a névvel."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "A két jelszó mező tartalma nem egyezik meg."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Felhasználó"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Kötelező. Legfeljebb 30 karakter. Betűk, számok és @/./+/-/_ karakterek."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Ez az érték csak betűket, számokat és @/./+/-/_ karaktereket tartalmazhat."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Jelszó"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Jelszó megerősítése"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Írja be a fenti jelszót ellenőrzés céljából."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -83,15 +92,14 @@ msgstr ""
 "megtekinteni, azonban <a href=\"password/\">ezzel az űrlappal</a> a jelszó "
 "megváltoztatható."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Írjon be egy helyes felhasználónevet és jelszót. Mindkét mező kisbetű-"
-"nagybetű érzékeny."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -99,151 +107,108 @@ msgstr ""
 "A böngészője úgy tűnik nem támogatja a cookie-kat. A cookie-k engedélyezése "
 "szükséges a bejelentkezéshez."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Ez a fiók inaktív."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Ehhez az e-mail címhez nem tartozik felhasználói fiók. Biztos benne, hogy "
-"regisztrált?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Az ehhez az e-mail címhez tartozó felhasználói fiók jelszavát nem lehet "
-"újragenerálni."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail cím"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Új jelszó"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Új jelszó megerősítése"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "A régi jelszó hibásan lett megadva. Írja be újra."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Jelszó újra"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmus"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterációk"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "erősség"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "ellenőrző összeg"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "név"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kódnév"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "jogosultság"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "jogosultságok"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "csoport"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "csoportok"
 
-#: models.py:232
-msgid "username"
-msgstr "felhasználónév"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Kötelező. Legfeljebb 30 karakter. Betűk, számok és @/./+/-/_ karakterek."
-
-#: models.py:235
-msgid "first name"
-msgstr "keresztnév"
-
-#: models.py:236
-msgid "last name"
-msgstr "vezetéknév"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail cím"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "jelszó"
 
-#: models.py:239
-msgid "staff status"
-msgstr "személyzet státusz"
+#: models.py:201
+msgid "last login"
+msgstr "utolsó bejelentkezés"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Megadja, hogy a felhasználó bejelentkezhet-e erre az adminisztrációs oldalra."
-
-#: models.py:242
-msgid "active"
-msgstr "aktív"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Megadja, hogy a felhasználó aktív-e. Állítsa át ezt az értéket a fiók "
-"törlése helyett."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "rendszergazda státusz"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -251,15 +216,7 @@ msgstr ""
 "Megadja, hogy ez a felhasználó rendelkezik-e minden jogosultsággal anélkül, "
 "hogy azt külön meg kellene adni."
 
-#: models.py:248
-msgid "last login"
-msgstr "utolsó bejelentkezés"
-
-#: models.py:249
-msgid "date joined"
-msgstr "csatlakozás dátuma"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -267,26 +224,73 @@ msgstr ""
 "A csoportok, amelyekhez a felhasználó tartozik. A felhasználó minden egyes "
 "csoportja jogosultságaival rendelkezni fog."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "felhasználói jogosultságok"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "felhasználónév"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Kötelező. Legfeljebb 30 karakter. Betűk, számok és @/./+/-/_ karakterek."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "keresztnév"
+
+#: models.py:384
+msgid "last name"
+msgstr "vezetéknév"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "személyzet státusz"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Megadja, hogy a felhasználó bejelentkezhet-e erre az adminisztrációs oldalra."
+
+#: models.py:389
+msgid "active"
+msgstr "aktív"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Megadja, hogy a felhasználó aktív-e. Állítsa át ezt az értéket a fiók "
+"törlése helyett."
+
+#: models.py:392
+msgid "date joined"
+msgstr "csatlakozás dátuma"
+
+#: models.py:400
 msgid "user"
 msgstr "felhasználó"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "felhasználók"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Kijelentkezve"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Írjon be egy érvényes e-mail címet."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ia/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..55eb462066
Binary files /dev/null and b/django/contrib/auth/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ia/LC_MESSAGES/django.po b/django/contrib/auth/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..1b3e0ad71b
--- /dev/null
+++ b/django/contrib/auth/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,295 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:41
+msgid "Personal info"
+msgstr "Information personal"
+
+#: admin.py:42
+msgid "Permissions"
+msgstr "Permissiones"
+
+#: admin.py:44
+msgid "Important dates"
+msgstr "Datas importante"
+
+#: admin.py:126
+msgid "Password changed successfully."
+msgstr "Le cambio del contrasigno ha succedite."
+
+#: admin.py:136
+#, python-format
+msgid "Change password: %s"
+msgstr "Cambia contrasigno: %s"
+
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
+msgid "A user with that username already exists."
+msgstr "Un usator con iste nomine de usator jam existe."
+
+#: forms.py:68 forms.py:269 forms.py:329
+msgid "The two password fields didn't match."
+msgstr "Le duo campos de contrasigno non es identic."
+
+#: forms.py:70 forms.py:115
+msgid "Username"
+msgstr "Nomine de usator"
+
+#: forms.py:72 forms.py:116
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+"Obligatori. 30 characteres o minus. Litteras, cifras e @/./+/-/_ solmente."
+
+#: forms.py:75 forms.py:119
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+"Iste valor pote continer solmente litteras, numeros e le characteres @/./+/-/"
+"_."
+
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
+msgid "Password"
+msgstr "Contrasigno"
+
+#: forms.py:79
+msgid "Password confirmation"
+msgstr "Confirma contrasigno"
+
+#: forms.py:81
+msgid "Enter the same password as above, for verification."
+msgstr "Repete le contrasigno pro verification."
+
+#: forms.py:122
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Le contrasignos non es immagazinate in forma de texto simple, dunque il non "
+"es possibile vider le contrasigno de iste usator, ma tu pote cambiar le "
+"contrasigno con <a href=\"password/\">iste formulario</a>."
+
+#: forms.py:151
+#, python-format
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: forms.py:153
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Vostre navigator del web non pare haber le \"cookies\" activate. Cookies es "
+"necessari pro aperir session."
+
+#: forms.py:155
+msgid "This account is inactive."
+msgstr "Iste conto es inactive."
+
+#: forms.py:206
+msgid ""
+"That email address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+
+#: forms.py:208 tests/forms.py:374
+msgid ""
+"The user account associated with this email address cannot reset the "
+"password."
+msgstr ""
+
+#: forms.py:211
+msgid "Email"
+msgstr ""
+
+#: forms.py:271
+msgid "New password"
+msgstr "Nove contrasigno"
+
+#: forms.py:273
+msgid "New password confirmation"
+msgstr "Confirma nove contrasigno"
+
+#: forms.py:302
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Le ancian contrasigno non es correcte. Per favor scribe lo de novo."
+
+#: forms.py:305
+msgid "Old password"
+msgstr "Ancian contrasigno"
+
+#: forms.py:333
+msgid "Password (again)"
+msgstr "Contrasigno (de novo)"
+
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
+msgid "algorithm"
+msgstr "algorithmo"
+
+#: hashers.py:242
+msgid "iterations"
+msgstr "iterationes"
+
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
+msgid "salt"
+msgstr "sal"
+
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:293
+msgid "work factor"
+msgstr "factor de labor"
+
+#: hashers.py:295
+msgid "checksum"
+msgstr "summa de controlo"
+
+#: models.py:72 models.py:121
+msgid "name"
+msgstr "nomine"
+
+#: models.py:74
+msgid "codename"
+msgstr "nomine de codice"
+
+#: models.py:78
+msgid "permission"
+msgstr "permission"
+
+#: models.py:79 models.py:123
+msgid "permissions"
+msgstr "permissiones"
+
+#: models.py:128
+msgid "group"
+msgstr "gruppo"
+
+#: models.py:129 models.py:301
+msgid "groups"
+msgstr "gruppos"
+
+#: models.py:200
+msgid "password"
+msgstr "contrasigno"
+
+#: models.py:201
+msgid "last login"
+msgstr "ultime session"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "stato de superusator"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Indica que iste usator ha tote le permissiones sin assignar los "
+"explicitemente."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"Le gruppos al quales iste usator pertine. Un usator obtene tote le "
+"permissiones concedite a cata un de su gruppos."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "permissiones de usator"
+
+#: models.py:377
+msgid "username"
+msgstr "nomine de usator"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Obligatori. 30 characteres o minus. Litteras, numeros e characteres @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "prenomine"
+
+#: models.py:384
+msgid "last name"
+msgstr "nomine de familia"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "stato de personal"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica si le usator pote aperir session in iste sito administrative."
+
+#: models.py:389
+msgid "active"
+msgstr "active"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Indica si iste usator debe esser tractate como active. Dismarca isto in vice "
+"de deler contos."
+
+#: models.py:392
+msgid "date joined"
+msgstr "data de inscription"
+
+#: models.py:400
+msgid "user"
+msgstr "usator"
+
+#: models.py:401
+msgid "users"
+msgstr "usatores"
+
+#: views.py:94
+msgid "Logged out"
+msgstr "Session claudite"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Reinitialisation del contrasigno in %(site_name)s"
diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.mo b/django/contrib/auth/locale/id/LC_MESSAGES/django.mo
index 5e63874331..0b1f97579d 100644
Binary files a/django/contrib/auth/locale/id/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.po b/django/contrib/auth/locale/id/LC_MESSAGES/django.po
index edde418fb9..fd99a63367 100644
--- a/django/contrib/auth/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/id/LC_MESSAGES/django.po
@@ -3,21 +3,21 @@
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # rodin <romihardiyanto@gmail.com>, 2011.
-#   <romihardiyanto@gmail.com>, 2011, 2012.
+#   <romihardiyanto@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,50 +31,58 @@ msgstr "Hak akses"
 msgid "Important dates"
 msgstr "Tanggal penting"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Sandi berhasil diubah."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Ganti sandi: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Belum ada sandi yang disetel."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Format sandi tidak valid atau algoritma hash yang tidak dikenal."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Seorang pengguna dengan nama pengguna tersebut sudah ada."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Dua bidang sandi tidak cocok."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Username"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Wajib. 30 karakter atau kurang dalam kombinasi huruf, angka, dan karakter "
 "@/./+/-/_ ."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Nilai ini hanya boleh berisi huruf, angka, dan karakter @/./+/-/_ ."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Sandi"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Konfirmasi sandi"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Masukkan sandi yang sama dengan di atas, untuk verifikasi."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -84,15 +92,14 @@ msgstr ""
 "pengguna ini, namun Anda dapat mengganti sandi tersebut lewat <a href="
 "\"password/\">formulir ini</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Masukkan nama pengguna dan sandi yang benar. Huruf besar/kecil pada bidang "
-"ini berpengaruh."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -100,151 +107,112 @@ msgstr ""
 "Tampaknya peramban Anda disetel untuk tidak menerima kuki. Kuki diperlukan "
 "untuk proses masuk."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Akun ini tidak aktif."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Alamat email tersebut tidak terkait dengan akun apapun. Anda yakin sudah "
+"Tidak ada akun pengguna yang terkait dengan alamat email ini. Yakin sudah "
 "terdaftar?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 "Akun pengguna yang terkait dengan alamat email ini tidak dapat menyetel "
 "ulang sandi."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "Email"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Sandi baru"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Konfirmasi sandi baru"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Sandi lama Anda yang dimasukkan salah. Masukkan sekali lagi."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Sandi lama"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Sandi (ulangi)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritme"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterasi"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "garam"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "faktor kerja"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "ceksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nama"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "namasandi"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "hak akses"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "hak akses"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grup"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grup"
 
-#: models.py:232
-msgid "username"
-msgstr "nama pengguna"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Wajib. 30 karakter atau kurang dalam kombinasi huruf, angka, karakter @/./"
-"+/-/_ "
-
-#: models.py:235
-msgid "first name"
-msgstr "nama depan"
-
-#: models.py:236
-msgid "last name"
-msgstr "nama belakang"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "alamat email"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "sandi"
 
-#: models.py:239
-msgid "staff status"
-msgstr "status staf"
+#: models.py:201
+msgid "last login"
+msgstr "masuk terakhir"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Menentukan apakah pengguna berhak masuk ke situs administrasi ini."
-
-#: models.py:242
-msgid "active"
-msgstr "aktif"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Menentukan apakah pengguna dianggap aktif. Hapus pilihan ini tanpa perlu "
-"menghapus akunnya."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "status superuser"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -252,15 +220,7 @@ msgstr ""
 "Menentukan apakah pengguna memiliki semua hak akses tanpa perlu diberikan "
 "secara manual."
 
-#: models.py:248
-msgid "last login"
-msgstr "masuk terakhir"
-
-#: models.py:249
-msgid "date joined"
-msgstr "tanggal daftar"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -268,26 +228,73 @@ msgstr ""
 "Grup tempat pengguna ini dikelompokkan. Pengguna akan mendapatkan semua hak "
 "akses yang diberikan pada grupnya."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "hak akses pengguna"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "nama pengguna"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Wajib. 30 karakter atau kurang dalam kombinasi huruf, angka, karakter @/./"
+"+/-/_ "
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Masukkan nama pengguna yang valid."
+
+#: models.py:383
+msgid "first name"
+msgstr "nama depan"
+
+#: models.py:384
+msgid "last name"
+msgstr "nama belakang"
+
+#: models.py:385
+msgid "email address"
+msgstr "alamat email"
+
+#: models.py:386
+msgid "staff status"
+msgstr "status staf"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Menentukan apakah pengguna berhak masuk ke situs administrasi ini."
+
+#: models.py:389
+msgid "active"
+msgstr "aktif"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Menentukan apakah pengguna dianggap aktif. Hapus pilihan ini tanpa perlu "
+"menghapus akunnya."
+
+#: models.py:392
+msgid "date joined"
+msgstr "tanggal daftar"
+
+#: models.py:400
 msgid "user"
 msgstr "pengguna"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "pengguna"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Keluar"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Masukkan alamat email yang valid."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/is/LC_MESSAGES/django.mo b/django/contrib/auth/locale/is/LC_MESSAGES/django.mo
index ee320ceb0d..f75e99853d 100644
Binary files a/django/contrib/auth/locale/is/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/is/LC_MESSAGES/django.po b/django/contrib/auth/locale/is/LC_MESSAGES/django.po
index dd1cb70f44..2315073c0f 100644
--- a/django/contrib/auth/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/is/LC_MESSAGES/django.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-19 14:55+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,52 +31,60 @@ msgstr "Réttindi"
 msgid "Important dates"
 msgstr "Mikilvægar dagsetningar"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Breyting á lykilorði tókst."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Breyta lykilorði: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Notandi með þetta notendanafn er nú þegar til."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Lykilorðin tvö pössuðu ekki saman."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Notandanafn"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Nauðsynlegt að fylla út. 30 stafir eða færri. Bókstafir (ekki broddstafir), "
 "tölustafir og @/./+/-/_ aðeins leyft."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Þessi reitur má aðeins innihalda bókstafi (ekki broddstafi), tölustafi og "
 "@/./+/-/_ táknin"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Lykilorð"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Staðfesting lykilorðs"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Settu inn sama lykilorðið aftur til staðfestingar."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -86,15 +94,14 @@ msgstr ""
 "notanda, en þú getur breytt lykilorðinu með <a href=\"password/\">þessu "
 "eyðublaði</a> ."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Vinsamlegast sláðu inn rétt notandanafn og lykilorð. Athugaðu að báðir "
-"reitirnir þurfa að vera stafréttir."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -102,152 +109,108 @@ msgstr ""
 "Vafri þinn virðist ekki vera stilltur til að leyfa dúsur (cookies). Dúsur "
 "eru nauðsynlegar fyrir innskráningu."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Þessi reikningur er óvirkur."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Þetta netfang hefur engan tengdan notandareikning. Ertu viss um að þú hafi "
-"skráð þig?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Notandareikningur sem tengdur er við þetta póstfang getur ekki endursett "
-"lykilorð."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Netfang"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Nýtt lykilorð (endurtekið)"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Gamla lykilorðið var vitlaust. Vinsamlegast reyndu aftur."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Gamalt lykilorð"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Lykilorð (aftur)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algrím"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "ítranir"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hashtafla"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "vinnustuðull"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "varsumma"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nafn"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "vinnuheiti"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "réttindi"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "réttindi"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "hópur"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "hópar"
 
-#: models.py:232
-msgid "username"
-msgstr "notandanafn"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Nauðsynlegt að fylla út. 30 stafir eða færri. Bókstafir (ekki broddstafir), "
-"tölustafir og @/./+/-/_ aðeins leyft."
-
-#: models.py:235
-msgid "first name"
-msgstr "skírnarnafn"
-
-#: models.py:236
-msgid "last name"
-msgstr "eftirnafn"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "tölvupóstfang"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "lykilorð"
 
-#: models.py:239
-msgid "staff status"
-msgstr "staða starfsmanns"
+#: models.py:201
+msgid "last login"
+msgstr "síðasta innskráning"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Segir til um hvort notandinn getur skráð sig inn á þetta stjórnunarsvæði."
-
-#: models.py:242
-msgid "active"
-msgstr "virkur"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Til marks um að notandinn sé virku. Taktu hakið úr þessum möguleika til að "
-"eyða aðgangi."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "staða ofurnotanda"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -255,15 +218,7 @@ msgstr ""
 "Til marks um að notandinn hafi öll réttindi án þess að taka þau sérstaklega "
 "fram."
 
-#: models.py:248
-msgid "last login"
-msgstr "síðasta innskráning"
-
-#: models.py:249
-msgid "date joined"
-msgstr "skráning dags."
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -271,26 +226,74 @@ msgstr ""
 "Hópar sem þessi notandi tilheyrir. Notandi fær allan aðgangsrétt sem fylgir "
 "hverjum hóp sem hann/hún er skráð(ur) í."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "réttindi"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "notandanafn"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Nauðsynlegt að fylla út. 30 stafir eða færri. Bókstafir (ekki broddstafir), "
+"tölustafir og @/./+/-/_ aðeins leyft."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "skírnarnafn"
+
+#: models.py:384
+msgid "last name"
+msgstr "eftirnafn"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "staða starfsmanns"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Segir til um hvort notandinn getur skráð sig inn á þetta stjórnunarsvæði."
+
+#: models.py:389
+msgid "active"
+msgstr "virkur"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Til marks um að notandinn sé virku. Taktu hakið úr þessum möguleika til að "
+"eyða aðgangi."
+
+#: models.py:392
+msgid "date joined"
+msgstr "skráning dags."
+
+#: models.py:400
 msgid "user"
 msgstr "notandi"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "notendur"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Útskráð(ur)"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Sláðu inn gilt tölvupóstfang."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/it/LC_MESSAGES/django.mo b/django/contrib/auth/locale/it/LC_MESSAGES/django.mo
index 32ab19c535..21f4637891 100644
Binary files a/django/contrib/auth/locale/it/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/it/LC_MESSAGES/django.po b/django/contrib/auth/locale/it/LC_MESSAGES/django.po
index cc3838e791..9fc2c3adbc 100644
--- a/django/contrib/auth/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/it/LC_MESSAGES/django.po
@@ -3,21 +3,21 @@
 # Translators:
 # Federico Capoano <federico.capoano@teletu.it>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nicola Larosa <transifex@teknico.net>, 2011, 2012.
+# Nicola Larosa <transifex@teknico.net>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 09:15+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,48 +31,56 @@ msgstr "Permessi"
 msgid "Important dates"
 msgstr "Date importanti"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "La password è stata cambiata correttamente."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambia la password: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Nessuna password impostata."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Formato di password non valido o algoritmo di hash sconosciuto."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Un utente con questo nome è già presente."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "I due campi password non corrispondono."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Nome utente"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_ ."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Questo valore può contenere solo lettere, cifre e @/./+/-/_ ."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Password"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Conferma password"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Inserisci la stessa password inserita sopra, come verifica."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -82,15 +90,16 @@ msgstr ""
 "la password di questo utente, ma è possibile modificare la password usando "
 "<a href=\"password/\">questa form</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Inserisci nome utente e password corretti. In entrambi i campi le maiuscole "
+"Inserisci %(username)s e password corretti. In entrambi i campi le maiuscole "
 "sono significative."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,150 +107,113 @@ msgstr ""
 "Il browser web sembra non avere i cookie abilitati. I cookie sono necessari "
 "per poter accedere."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Questo account non è attivo."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 "Questo indirizzo email non è associato ad alcun account utente. Sei sicuro "
-"di esserti registrato?"
+"d'esserti registrato?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"L'account utente associato con quest'indirizzo email non può resettare la "
+"L'account utente associato a questo indirizzo email non può reimpostare la "
 "password."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr "Email"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nuova password"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Conferma nuova password"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "La password attuale non è stata inserita correttamente: va inserita di nuovo."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Password attuale"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Password (di nuovo)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmo"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterazioni"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "work factor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nome"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nome in codice"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permesso"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permessi"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "gruppo"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "gruppi"
 
-#: models.py:232
-msgid "username"
-msgstr "nome utente"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "nome"
-
-#: models.py:236
-msgid "last name"
-msgstr "cognome"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "indirizzo e-mail"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "password"
 
-#: models.py:239
-msgid "staff status"
-msgstr "privilegi di staff"
+#: models.py:201
+msgid "last login"
+msgstr "ultimo accesso"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica se l'utente può accedere a questo sito di amministrazione."
-
-#: models.py:242
-msgid "active"
-msgstr "attivo"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Stabilisce se l'utente debba essere considerato attivo. Deseleziona qui, "
-"piuttosto che cancellare gli account."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "privilegi di superutente"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -249,15 +221,7 @@ msgstr ""
 "Stabilisce che l'utente ha tutti i privilegi, senza che siano stati "
 "assegnati esplicitamente."
 
-#: models.py:248
-msgid "last login"
-msgstr "ultimo accesso"
-
-#: models.py:249
-msgid "date joined"
-msgstr "iscritto in data"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -265,26 +229,71 @@ msgstr ""
 "I gruppi cui l'utente appartiene. Un utente otterrà tutte le autorizzazioni "
 "concesse a ciascuno dei suoi gruppi."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "privilegi utente"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "nome utente"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Inserisci un nome utente valido."
+
+#: models.py:383
+msgid "first name"
+msgstr "nome"
+
+#: models.py:384
+msgid "last name"
+msgstr "cognome"
+
+#: models.py:385
+msgid "email address"
+msgstr "indirizzo email"
+
+#: models.py:386
+msgid "staff status"
+msgstr "privilegi di staff"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica se l'utente può accedere a questo sito di amministrazione."
+
+#: models.py:389
+msgid "active"
+msgstr "attivo"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Stabilisce se l'utente debba essere considerato attivo. Deseleziona qui, "
+"piuttosto che cancellare gli account."
+
+#: models.py:392
+msgid "date joined"
+msgstr "iscritto in data"
+
+#: models.py:400
 msgid "user"
 msgstr "utente"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "utenti"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Accesso annullato"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Inserisci un indirizzo e-mail valido."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo
index 1d0047c2ce..a8fb718317 100644
Binary files a/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ja/LC_MESSAGES/django.po b/django/contrib/auth/locale/ja/LC_MESSAGES/django.po
index 609de123d8..2c5cd575a1 100644
--- a/django/contrib/auth/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ja/LC_MESSAGES/django.po
@@ -1,22 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Shinya Okano <tokibito@gmail.com>, 2012.
+# Shinya Okano <tokibito@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 14:16+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-02-20 06:52+0000\n"
 "Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,67 +31,75 @@ msgstr "パーミッション"
 msgid "Important dates"
 msgstr "重要な日程"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "パスワードを変更しました"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "パスワードの変更: %s"
 
-#: forms.py:62
-msgid "A user with that username already exists."
-msgstr "同じユーザ名が既に登録済みです。"
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
+msgid "A user with that username already exists."
+msgstr "同じユーザー名が既に登録済みです。"
+
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "確認用パスワードが一致しません。"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
-msgstr "ユーザ名"
+msgstr "ユーザー名"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "この項目は必須です。半角アルファベット、半角数字、@/./+/-/_ で30文字以下にし"
 "てください。"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "半角の英数字および次の記号 @/./+/-/_ 以外は使用できません。"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "パスワード"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "パスワードの確認"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "確認のため、再度パスワードを入力してください。"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
-"生のパスワードが格納されているので、このユーザのパスワードは参照できません"
-"が、 <a href=\"password/\">このフォーム</a> を使用してパスワードを変更できま"
-"す 。"
+"生のパスワードが格納されていないので、このユーザーのパスワードは参照できませ"
+"んが、 <a href=\"password/\">このフォーム</a> を使用してパスワードを変更でき"
+"ます 。"
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,163 +107,114 @@ msgstr ""
 "お使いのブラウザはクッキーを有効にしていないようです。ログインにはクッキーが"
 "必要です。"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "アカウントが無効です。"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
-msgstr "メールアドレスの一致するユーザはいません。本当に登録しましたか？"
+msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"この電子メールアドレスに関連付けられたユーザーアカウントはパスワードをリセッ"
-"トすることはできません。"
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "メールアドレス"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "新しいパスワード(確認用)"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "元のパスワードが間違っています。もう一度入力してください。"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "元のパスワード"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "パスワード(確認用)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "アルゴリズム"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "イテレーション"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "ソルト"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "ハッシュ"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "ワークファクター"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "チェックサム"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "名前"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "コード名"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "パーミッション"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "パーミッション"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "グループ"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "グループ"
 
-#: models.py:232
-msgid "username"
-msgstr "ユーザ名"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"この項目は必須です。半角アルファベット、半角数字、次の記号 @/./+/-/_ で30文字"
-"以下にしてください。"
-
-#: models.py:235
-msgid "first name"
-msgstr "名"
-
-#: models.py:236
-msgid "last name"
-msgstr "姓"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "メールアドレス"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "パスワード"
 
-#: models.py:239
-msgid "staff status"
-msgstr "スタッフ権限"
+#: models.py:201
+msgid "last login"
+msgstr "最終ログイン"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
-
-#: models.py:242
-msgid "active"
-msgstr "有効"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"ユーザがアクティブかどうかを示します。アカウントを消す代わりに選択を解除して"
-"ください。"
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
-msgstr "スーパーユーザ権限"
+msgstr "スーパーユーザー権限"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "全ての権限を持っているとみなされます。"
 
-#: models.py:248
-msgid "last login"
-msgstr "最終ログイン"
-
-#: models.py:249
-msgid "date joined"
-msgstr "登録日"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -262,26 +222,73 @@ msgstr ""
 "このユーザーが所属するグループ。ユーザーはグループのそれぞれに付与されている"
 "すべての権限を持ちます。"
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
-msgstr "ユーザパーミッション"
+msgstr "ユーザーパーミッション"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "ユーザー名"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"この項目は必須です。半角アルファベット、半角数字、次の記号 @/./+/-/_ で30文字"
+"以下にしてください。"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "名"
+
+#: models.py:384
+msgid "last name"
+msgstr "姓"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "スタッフ権限"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "ユーザーが管理サイトにログイン可能かどうかを示します。"
+
+#: models.py:389
+msgid "active"
+msgstr "有効"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"ユーザーがアクティブかどうかを示します。アカウントを消す代わりに選択を解除し"
+"てください。"
+
+#: models.py:392
+msgid "date joined"
+msgstr "登録日"
+
+#: models.py:400
 msgid "user"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "ログアウト"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "有効なメールアドレスを入力してください。"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo
index e76672632d..d532a7e49d 100644
Binary files a/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ka/LC_MESSAGES/django.po b/django/contrib/auth/locale/ka/LC_MESSAGES/django.po
index d6f5fdb985..ac9db9e81d 100644
--- a/django/contrib/auth/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ka/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-03-01 16:20+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,204 +31,248 @@ msgstr "უფლებები"
 msgid "Important dates"
 msgstr "მნიშვნელოვანი თარიღები"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "პაროლი წარმატებით შეიცვალა."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "შევცვალოთ პაროლი: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "არ არის დაყენებული პაროლი."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "არასწორი პაროლის ფორმატი ან უცნობი ჰეშირების ალგორითმი."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "მომხმარებელი ამ სახელით უკვე არსებობს."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "პაროლის ორი ველი ერთმანეთს არ ემთხვევა."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "მომხმარებელი"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "აუცილებელია. 30-მდე სიმბოლო. მხოლოდ ლათინური ასოები, ციფრები და შემდეგი "
 "სიმბოლოები: @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "დასაშვებია მხოლოდ ლათინური ასოები, ციფრები და შემდეგი სიმბოლოები: @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "პაროლი"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "პაროლის დამოწმება"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "შეიყვანეთ იგივე პაროლი, დამოწმებისათვის."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"დაუმუშავებელი პაროლები არ ინახება, ასე რომ, არ არსებობს ამ მომხმარებლის "
+"პაროლის ნახვის საშუალება, მაგრამ თქვენ შეგიძლიათ შეცვალოთ პაროლი <a href="
+"\"password/\">ამ ფორმის</a> მეშვეობით."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"გთხოვთ, შეიყვანოთ სწორი მომხმარებლის სახელი და პაროლი. გაითვალისწინეთ, რომ "
-"ორივე ველი დამოკიდებულია რეგისტრზე."
+"გთხოვთ, შეიყვანოთ სწორი %(username)s და პაროლი. იქონიეთ მხედველობაში, რომ "
+"ორივე ველი ითვალისწინებს მთავრულს."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "თქვენი ბროუზერი არ ღებულობს cookie-ებს. Cookie საჭიროა საიტზე შესასვლელად."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "თქვენი ანგარიში არააქტიურია."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"ელ.ფოსტის ეს მისამართი არ შეესაბამება არცერთ მომხმარებელს. ნამდვილად ხართ "
-"დარეგისტრირებული?"
+"ამ ელ. ფოსტის მისამართს არ გააჩნია ასოცირებული მომხმარებლის ანგარიში. "
+"დარწმუნებული ხართ, რომ დარეგისტრირდით?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
+"ამ ელ. ფოსტასთან ასოცირებულ მომხმარებლის ანგარიშს არ გააჩნია პაროლის თავიდან "
+"დაყენების უფლება."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "ელ. ფოსტა"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "ახალი პაროლის დამოწმება"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "თქვენი ძველი პაროლი შეყვანილია არასწორად. გთხოვთ, შეიყვანოთ ხელახლა."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "ძველი პაროლი"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "პაროლი (განმეორებით)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "ალგორითმი"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "იტერაციები"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "მარილი"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "ჰეში"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "სამუშაო ფაქტორი"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "საკონტროლო ჯამი"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "სახელი"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "კოდური სახელი"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "უფლება"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "უფლებები"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "ჯგუფი"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "ჯგუფები"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "პაროლი"
+
+#: models.py:201
+msgid "last login"
+msgstr "ბოლო შესვლა"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "სუპერმომხმარებლის სტატუსი"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "განსაზღვრავს, რომ ამ მომხმარებელს აქვს ყველა უფლება."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"ჯგუფები, რომლებსაც მიეკუთვნება ეს მომხმარებელი. მომხმარებელს ენიჭება მისი "
+"ყოველი ჯგუფის ყველა უფლება."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "მომხმარებლის უფლებები"
+
+#: models.py:377
 msgid "username"
 msgstr "მომხმარებლის სახელი"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "აუცილებელია. 30-მდე სიმბოლო. მხოლოდ ლათინური ასოები, ციფრები და შემდეგი "
 "სიმბოლოები: @/./+/-/_."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "შეიყვანეთ სწორი მომხმარებლის სახელი."
+
+#: models.py:383
 msgid "first name"
 msgstr "სახელი"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "გვარი"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "ელ. ფოსტა"
+#: models.py:385
+msgid "email address"
+msgstr "ელ. ფოსტის მისამართი"
 
-#: models.py:238
-msgid "password"
-msgstr "პაროლი"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "თანამშრომლობის სტატუსი"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "განსაზღვრავს, აქვს თუ არა მომხმარებელს ადმინისტრირების საიტზე შესვლის უფლება."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "აქტიურია"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -234,51 +280,23 @@ msgstr ""
 "განსაზღვრავს, რომ მომხმარებელი გააქტიურებულია. მომხმარებლის წაშლის მაგივრად "
 "გადანიშნეთ ეს დროშა."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "სუპერმომხმარებლის სტატუსი"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr "განსაზღვრავს, რომ ამ მომხმარებელს აქვს ყველა უფლება."
-
-#: models.py:248
-msgid "last login"
-msgstr "ბოლო შესვლა"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "გაწევრიანების თარიღი"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "მომხმარებლის უფლებები"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "მომხმარებელი"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "მომხმარებლები"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "გამოსული ხართ"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "შეიყვანეთ სწორი ელ. ფოსტის მისამართი."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr ""
+msgstr "პაროლის თავიდან დაყენება %(site_name)s-ზე"
diff --git a/django/contrib/auth/locale/kk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/kk/LC_MESSAGES/django.mo
index 26287a0c63..5d2fba3985 100644
Binary files a/django/contrib/auth/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/kk/LC_MESSAGES/django.po b/django/contrib/auth/locale/kk/LC_MESSAGES/django.po
index 702966f811..6c220e9fd6 100644
--- a/django/contrib/auth/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/kk/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,64 +30,71 @@ msgstr "Рұқсаттар"
 msgid "Important dates"
 msgstr "Маңызды даталар"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Құпия сөз ойдағыдай өзгертілді."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Құпия сөзді өзгерту: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Осындай атаумен қолданушы бар."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Енгізілген құпия сөздер бірдей емес."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Қолданушы атауы"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Міндетті. 30 немесе одан кем символ. Тек әріптер, цифрлар және @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Бұл мән тек әріптерді, цифрлерді және @/./+/-/_ құрайды."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Құпия сөз"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Құпия сөз құптамасы"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Тексеру үшін құпия сөзді үстіндегідей енгізіңіз."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Дұрыс қолданушы атауын және құпия сөзді енгізіңіз. Жолақтын екеуі де үлкен-"
-"кішілігін ескерілетін болғанын байқаңыз."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,186 +102,184 @@ msgstr ""
 "Cіздің веб-шолғышыңызде cookies доғарылған сияқты. Кіру үшін Сookies-ті қосу "
 "керек."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Бұл тіркелгі белсенді емес."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"e-mail адреске сәйкес келетін тіркелгі жоқ. Тіркелгендігіңізге сенімдісіз бе?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Бұл email адреспен байланыстырылған пайдаланушы құпия сөзді өзгерте алмайды."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Жаңа құпия сөз"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Жаңа құпия сөз құптамасы"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ескі құпия сөз қате енгізілді. Қайтадан енгізіңіз."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Ескі құпия сөз"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Құпия сөз (қайтадан)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "атау"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "кодтық атау"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "рұқсат"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "рұқсаттар"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "топ"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "топтар"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "құпия сөз"
+
+#: models.py:201
+msgid "last login"
+msgstr "соңғы кіруі"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "әкімші мәртебесі"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "Бұл қолданушының бүкіл рұқсаттарымен тағайындалатындығын білдіреді."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr "қолданушы рұқсаттары"
+
+#: models.py:377
 msgid "username"
 msgstr "Қолданушы атауы"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Міндетті. 30 немесе одан кем символ. Тек әріптер, цифрлар және @/./+/-/_."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
 msgid "first name"
 msgstr "аты"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "жөні"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail адрес"
+#: models.py:385
+msgid "email address"
+msgstr ""
 
-#: models.py:238
-msgid "password"
-msgstr "құпия сөз"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "қызметкер мәртебесі"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "Қолданушының басқарушы сайтына кіре алатындығын білдіреді."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "белсенді"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 "Қолданушы белсенді болуын білдіреді. Тіркілгіні өшірмей мынаны алып тастаңыз."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "әкімші мәртебесі"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr "Бұл қолданушының бүкіл рұқсаттарымен тағайындалатындығын білдіреді."
-
-#: models.py:248
-msgid "last login"
-msgstr "соңғы кіруі"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "тіркелген күн-айы"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "қолданушы рұқсаттары"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "қолданушы"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "қолданушылар"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Шығу орындалды"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Дұрыс e-mail адресті енгізіңіз."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/km/LC_MESSAGES/django.mo b/django/contrib/auth/locale/km/LC_MESSAGES/django.mo
index 4b981d7e11..8b1aee541c 100644
Binary files a/django/contrib/auth/locale/km/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/km/LC_MESSAGES/django.po b/django/contrib/auth/locale/km/LC_MESSAGES/django.po
index 4e8c15c320..e72bb39546 100644
--- a/django/contrib/auth/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/km/LC_MESSAGES/django.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -28,61 +28,70 @@ msgstr "ការអនុញ្ញាត"
 msgid "Important dates"
 msgstr "កាលបរិច្ឆេទសំខាន់"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "ឈ្មោះជាសមាជិក"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "ពាក្យសំងាត់"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr ""
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "សូមបំពេញពាក្យសំងាត់ដូចខាងលើ ដើម្បីត្រួតពិនិត្យ។ "
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr "សូមបំពេញ ឈ្មោះសមាជិក និង ពាក្យសំងាត់ ។ "
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -90,182 +99,182 @@ msgstr ""
 "កម្មវិធីសំរាប់មើលគេហទំព័រនេះហាក់បីដូចជាមិនទាន់បានទទួលយកគុគី ។ ចាំបាច់ត្រូវកំណត់អោយ​"
 "កម្មវិធីសំរាប់មើលគេហទំព័រទទួល​យក គុគី ដើម្បីពិនិត្យចូល ។"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "ឈ្មោះសមាជិកនេះ​លែងដំណើរការ"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
-msgstr "អ៊ីមែល នេះ មិនមាន​នៅក្នុង​ទិន្នន័យ​របស់​យើង​ខ្ញុំ​ទេ។"
+msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr ""
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr ""
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "ពាក្យសំងាត់ (ម្តងទៀត)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ឈ្មោះ"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "ឈ្មោះលេខកូត"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "អនុញ្ញាត"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "អនុញ្ញាត"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "ក្រុម"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "ក្រុម"
 
-#: models.py:232
-msgid "username"
-msgstr "ឈ្មោះជាសមាជិក"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr "នាម"
-
-#: models.py:236
-msgid "last name"
-msgstr "គោត្តនាម"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "អ៊ីមែល"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "ពាក្យសំងាត់"
 
-#: models.py:239
-msgid "staff status"
-msgstr "ស្ថានភាពបុគ្គលិក"
+#: models.py:201
+msgid "last login"
+msgstr "ការពិនិត្យចូលកន្លងមក"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "កំណត់អោយសមាជិកអាចចូលមកប្រើប្រាស់ទំព័រគ្រប់គ្រងនេះ។"
-
-#: models.py:242
-msgid "active"
-msgstr "សកម្ម"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "ស្ថានភាពអ្នកគ្រងគ្រង"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "កំណត់អោយសមាជិកនេះមានសិទ្ធិទាំងអស់។"
 
-#: models.py:248
-msgid "last login"
-msgstr "ការពិនិត្យចូលកន្លងមក"
-
-#: models.py:249
-msgid "date joined"
-msgstr "កាលបរិច្ឆេទចូលរួម"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "ការអនុញ្ញាតអោយសមាជិក"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "ឈ្មោះជាសមាជិក"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "នាម"
+
+#: models.py:384
+msgid "last name"
+msgstr "គោត្តនាម"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "ស្ថានភាពបុគ្គលិក"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "កំណត់អោយសមាជិកអាចចូលមកប្រើប្រាស់ទំព័រគ្រប់គ្រងនេះ។"
+
+#: models.py:389
+msgid "active"
+msgstr "សកម្ម"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "កាលបរិច្ឆេទចូលរួម"
+
+#: models.py:400
 msgid "user"
 msgstr "សមាជិក"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "សមាជិក"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "ចាកចេញ"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "សូមបំពេញអ៊ីមែល"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo
index 55341e3f9d..75e28014a7 100644
Binary files a/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/kn/LC_MESSAGES/django.po b/django/contrib/auth/locale/kn/LC_MESSAGES/django.po
index c753241a86..86fd031772 100644
--- a/django/contrib/auth/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/kn/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: karthikbgl <karthikbgl@gmail.com>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,205 +30,177 @@ msgstr "ಅನುಮತಿಗಳು"
 msgid "Important dates"
 msgstr "ಮಹತ್ವದ ದಿನಾಂಕಗಳು"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "ಪಾಸ್ವರ್ಡ್ ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "ಪಾಸ್ವರ್ಡ್ ಬದಲಾಯಿಸಲು: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "ಆ ಬಳಕೆದಾರಹೆಸರು ಒಂದು ಬಳಕೆದಾರ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "ಎರಡು ಪ್ರವೇಶಪದ ಕ್ಷೇತ್ರಗಳ ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "ಬಳಕೆದಾರ-ಹೆಸರು"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "ಪ್ರವೇಶಪದ"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "ಪಾಸ್ವರ್ಡ್ ಖಚಿತತೆ"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "ಖಚಿತಗೊಳಿಸಲು ಮೇಲಿನ ಪ್ರವೇಶಪದವನ್ನು ಇನ್ನೊಮ್ಮೆ ಬರೆಯಿರಿ."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"ದಯವಿಟ್ಟು ಸರಿಯಾದ ಬಳಕೆದಾರ-ಪದ ಮತ್ತು  ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ .ಎರಡೂ ಇಂಗ್ಲೀಷಿನ  ಸಣ್ಣ ಮತ್ತು "
-"ದೊಡ್ಡ ಅಕ್ಷರ ಸಂವೇದಿ  ಎಂಬುದನ್ನು ಗಮನದಲ್ಲಿಡಿ"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "ನಿಮ್ಮ ಜಾಲವೀಕ್ಷಕದಲ್ಲಿ ಕುಕೀಗಳು ಸಕ್ರಿಯಗೊಳಿಸಲ್ಪಟ್ಟಂತಿಲ್ಲ. ಒಳಬರಲು ಕುಕೀಗಳು ಅಗತ್ಯ. "
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "ಈ ಖಾತೆಯು ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "ಹೊಸ ಪ್ರವೇಶಪದ"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "ಹೊಸ ಪ್ರವೇಶಪದ ಖಚಿತತೆ"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "ನಿಮ್ಮ ಹಳೆಯ ಪ್ರವೇಶಪದ ತಪ್ಪಾಗಿ ಪ್ರವೇಶಿಸಲಾಗಿದೆ ಮತ್ತೆ ದಯವಿಟ್ಟು ನಮೂದಿಸಿ"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "ಹಳೆಯ ಪ್ರವೇಶಪದ"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ಹೆಸರು"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "ಸಾಂಕೇತಿಕ ಹೆಸರು"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "ಅನುಮತಿ"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "ಅನುಮತಿಗಳು"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "ಗುಂಪು"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "ಗುಂಪುಗಳು"
 
-#: models.py:232
-msgid "username"
-msgstr "ಬಳಕೆದಾರ-ಹೆಸರು"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr "ಮೊದಲ ಹೆಸರು"
-
-#: models.py:236
-msgid "last name"
-msgstr "ಕೊನೆಯ ಹೆಸರು"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "ಪ್ರವೇಶಪದ"
 
-#: models.py:239
-msgid "staff status"
-msgstr "ಸಿಬ್ಬಂದಿ ಸ್ಥಿತಿ"
+#: models.py:201
+msgid "last login"
+msgstr "ಕಡೇ ಸಾರಿ ಒಳಬಂದದ್ದು"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "ಬಲಕೆದಾರರು ಈ ಆಡಳಿತ ತಾಣಕ್ಕೆ  ಪ್ರವೇಶಪಡೆಯಬಹುದೇ ಎಂಬುದನ್ನು ತಿಳಿಸುತ್ತದೆ."
-
-#: models.py:242
-msgid "active"
-msgstr "ಸಕ್ರಿಯ"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "ಮಹಾಬಳಕೆದಾರನ ಸ್ಧಿತಿ"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -236,40 +208,75 @@ msgstr ""
 "ಈ ಸದಸ್ಯರು ಸುವ್ಯಕ್ತವಾಗಿ  ನೀಡದಿದ್ದರೂ ಎಲ್ಲಾ ಅನುಮತಿಗಳನ್ನು ಪಡೆದಿರುವರು ಎಂಬುದನ್ನು "
 "ಸೂಚಿಸುತ್ತದೆ."
 
-#: models.py:248
-msgid "last login"
-msgstr "ಕಡೇ ಸಾರಿ ಒಳಬಂದದ್ದು"
-
-#: models.py:249
-msgid "date joined"
-msgstr "ಸೇರಿದ ದಿನಾಂಕ"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "ಬಳಕೆದಾರ ಅನುಮತಿಗಳು"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "ಬಳಕೆದಾರ-ಹೆಸರು"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "ಮೊದಲ ಹೆಸರು"
+
+#: models.py:384
+msgid "last name"
+msgstr "ಕೊನೆಯ ಹೆಸರು"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "ಸಿಬ್ಬಂದಿ ಸ್ಥಿತಿ"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "ಬಲಕೆದಾರರು ಈ ಆಡಳಿತ ತಾಣಕ್ಕೆ  ಪ್ರವೇಶಪಡೆಯಬಹುದೇ ಎಂಬುದನ್ನು ತಿಳಿಸುತ್ತದೆ."
+
+#: models.py:389
+msgid "active"
+msgstr "ಸಕ್ರಿಯ"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "ಸೇರಿದ ದಿನಾಂಕ"
+
+#: models.py:400
 msgid "user"
 msgstr "ಬಳಕೆದಾರ"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "ಬಳಕೆದಾರರು"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "ಹೊರಬರಲಾಗಿದೆ"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "ಕ್ರಮಬದ್ಧ ವಿ-ವಿಳಾಸವೊಂದನ್ನು ಇಲ್ಲಿ ಬರೆಯಿರಿ"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo
index 47a7bbcb90..5fc73b7ef9 100644
Binary files a/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po
index bf5d9beb5b..6723af9907 100644
--- a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,62 +29,71 @@ msgstr "권한"
 msgid "Important dates"
 msgstr "중요한 일정"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "비밀번호가 변경되었습니다."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "비밀번호 변경: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "해당 사용자명은 이미 존재합니다."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "비밀번호가 일치하지 않습니다."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "사용자명"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "필수항목입니다. 30자 이내로 입력하세요. (알파벳, 숫자, @/./+/-/_만 가능)"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "알파벳, 숫자 및 @/./+/-/_만 가능합니다."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "비밀번호"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "비밀번호 확인"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "확인을 위해 위와 동일한 비밀번호를 입력하세요. "
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr "사용자명과 비밀번호를 입력하세요. (대소문자 구별)"
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,135 +101,162 @@ msgstr ""
 "사용하시는 브라우저가 쿠키를 허용하지 않습니다.로그인하기 위해서는 쿠키 사용"
 "이 필요합니다."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "이 계정은 유효하지 않습니다."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"이메일주소와 일치하는 사용자가 없습니다.이 이메일주소로 등록하셨습니까?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "이메일 주소"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "새 비밀번호:"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "새 비밀번호 확인:"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "기존 비밀번호를 잘못 입력하셨습니다. 다시 입력해 주세요."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "기존 비밀번호:"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "비밀번호 (확인)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "이름"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "코드명"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "허가"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "허가"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "그룹"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "그룹"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "비밀번호"
+
+#: models.py:201
+msgid "last login"
+msgstr "마지막 로그인"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "최상위 사용자 권한"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "해당 사용자에게 모든 권한을 허가합니다."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr "사용자 권한"
+
+#: models.py:377
 msgid "username"
 msgstr "사용자명"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "필수항목입니다. 30자 이내로 입력하세요. (알파벳, 숫자, @/./+/-/_만 가능)"
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
 msgid "first name"
 msgstr "이름"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "성"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "이메일 주소"
+#: models.py:385
+msgid "email address"
+msgstr ""
 
-#: models.py:238
-msgid "password"
-msgstr "비밀번호"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "스태프 권한"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "사용자가 관리사이트에 로그인이 가능한지를 나타냅니다."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "활성"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -228,50 +264,22 @@ msgstr ""
 "사용자가 'Django 관리'에 로그인이 가능한지를 나타냅니다.계정을 삭제하는 대신 "
 "이것을 선택 해제하세요."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "최상위 사용자 권한"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr "해당 사용자에게 모든 권한을 허가합니다."
-
-#: models.py:248
-msgid "last login"
-msgstr "마지막 로그인"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "등록일"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "사용자 권한"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "사용자"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "사용자(들)"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "로그 아웃"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "올바른 이메일 주소를 입력하세요."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo b/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo
index ddc88484be..49475620e9 100644
Binary files a/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/lt/LC_MESSAGES/django.po b/django/contrib/auth/locale/lt/LC_MESSAGES/django.po
index 98bc68886f..5bc32294fb 100644
--- a/django/contrib/auth/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/lt/LC_MESSAGES/django.po
@@ -1,24 +1,28 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # lauris <lauris@runbox.com>, 2011.
+#   <naktinis@gmail.com>, 2012.
+# Nikolajus Krauklis <nikolajus@gmail.com>, 2013.
+# Simonas Kazlauskas <simonas@kazlauskas.me>, 2012.
 # Simonas Simas <simonas@kazlauskas.me>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-09 16:03+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-02-23 12:40+0000\n"
+"Last-Translator: Nikolajus Krauklis <nikolajus@gmail.com>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,50 +36,58 @@ msgstr "Leidimai"
 msgid "Important dates"
 msgstr "Svarbios datos"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Slaptažodis pakeistas sėkmingai."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Pakeisti slaptažodį: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Slaptažodis nenustatytas"
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Neteisingas slaptažodžio formatas arba nežinomas maišos algoritmas."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Jau egzistuoja vartotojas su tokiu vardu."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Slaptažodžio laukai nesutapo"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Vartotojo vardas"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Privalomas. 30 arba mažiau simbolių. Raidės, skaičiai bei @/./+/-/_ "
 "simboliai."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Ši reikšmė gali turėti tik raides, skaičius  ir @/./+/-/_ simbolius."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Slaptažodžio patvirtinimas"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Patikrinimui įvesk tokį patį slaptažodį, kaip viršuje."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -85,15 +97,16 @@ msgstr ""
 "vartotojo slaptažodį nėra. Tiesa galite slaptažodį pakeisti naudodamiesi <a "
 "href=\"password/\">šia forma</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Įveskite teisingą vartotojo vardą ir slaptažodį. Abiejuose laukuose "
-"didžiosios mažosios raidės skiriasi"
+"Įveskite teisingą %(username)s ir slaptažodį. Abiejuose laukuose didžiosios "
+"mažosios raidės skiriasi."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -101,164 +114,117 @@ msgstr ""
 "Atrodo, jūsų naršyklė nepriima sausainėlių(cookies). Sausainėliai yra "
 "reikalingi norint prisijungti."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Ši paskyra yra neaktyvi."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Šis emailas nėra registruotas sistemoje. Ar esi tikras, kad tu "
-"užsiregistravęs?"
+"Šis el. pašto adresas neturi susieto vartotojo. Ar esate įsitikinę, kad "
+"esate užsiregistravę?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Vartotojas susietas su šiuo el. pašto adresu negali atkurti slaptažodžio."
+"Vartotojas susietas su šiuo el. pašto adresu negali atstatyti slaptažodžio."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "El. paštas"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Naujo slaptažodžio patvirtinimas"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Blogai įvestas senas slaptažodis. Bandykite dar kartą."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Senas slaptažodis"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Slaptažodis (dar kartą)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmas"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iteracijos"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "druska"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "maiša"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "darbo faktorius"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "kontrolinė suma"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "vardas"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kodinis vardas"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "leidimas"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "leidimai"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupė"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupės"
 
-#: models.py:232
-msgid "username"
-msgstr "vartotojo vardas"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Privalomas. 30 arba mažiau simbolių. Raidės, skaičiai bei @/./+/-/_ "
-"simboliai."
-
-#: models.py:235
-msgid "first name"
-msgstr "vardas"
-
-#: models.py:236
-msgid "last name"
-msgstr "pavardė"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mailo adresas"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "slaptažodis"
 
-#: models.py:239
-msgid "staff status"
-msgstr "personalo statusas"
+#: models.py:201
+msgid "last login"
+msgstr "paskutinį kartą prisijungęs"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Nurodo ar vartotojas gali prisijungti prie administravimo puslapio."
-
-#: models.py:242
-msgid "active"
-msgstr "aktyvus"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Nurodo ar vartotojas yra aktyvuotas. Užuot pašalinę vartotoją, galite nuimti "
-"šią žymę."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "supervartotojo statusas"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Pažymi, kad šis vartotojas turi visas teises be specialių nustatymų."
 
-#: models.py:248
-msgid "last login"
-msgstr "paskutinį kartą prisijungęs"
-
-#: models.py:249
-msgid "date joined"
-msgstr "data, kada prisijungė"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -266,26 +232,73 @@ msgstr ""
 "Grupės, kurioms šis vartotojas priklauso. Vartotojas gaus visas teises, "
 "kurios yra suteiktos jo grupėms."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "vartotojo leidimai"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "vartotojo vardas"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Privalomas. 30 arba mažiau simbolių. Raidės, skaičiai bei @/./+/-/_ "
+"simboliai."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Įveskite teisingą vartotojo vardą."
+
+#: models.py:383
+msgid "first name"
+msgstr "vardas"
+
+#: models.py:384
+msgid "last name"
+msgstr "pavardė"
+
+#: models.py:385
+msgid "email address"
+msgstr "El. pašto adresas"
+
+#: models.py:386
+msgid "staff status"
+msgstr "personalo statusas"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Nurodo ar vartotojas gali prisijungti prie administravimo puslapio."
+
+#: models.py:389
+msgid "active"
+msgstr "aktyvus"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Nurodo ar vartotojas yra aktyvuotas. Užuot pašalinę vartotoją, galite nuimti "
+"šią žymę."
+
+#: models.py:392
+msgid "date joined"
+msgstr "data, kada prisijungė"
+
+#: models.py:400
 msgid "user"
 msgstr "vartotojas"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "vartotojai"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Atsijungęs"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Įvesk tinkamą e-mailą."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo
index a84588b1df..8fe3f5dbac 100644
Binary files a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po
index 57b90defd3..8780912bd9 100644
--- a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,63 +30,70 @@ msgstr "Tiesības"
 msgid "Important dates"
 msgstr "Svarīgi datumi"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Paroles nomainīta sekmīgi."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Paroles maiņa: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Lietotājs ar šādu lietotāja vārdu jau eksistē."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Paroles lauki nesakrita."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Lietotāja vārds"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un  @/./+/-/_ ."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Šī vērtība var saturēt tikai burtus, ciparus un @/./+/-/_ simbolus"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Parole"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Paroles apstiprinājums"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Pārbaudei atkārtoti ievadiet to pašu paroli kā augstāk."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Lūdzu ievadiet lietotājvārdu un paroli. Ievērojiet, ka abi lauki ir "
-"reģistrjūtīgi."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,186 +101,184 @@ msgstr ""
 "Izskatās, ka izmantotajam pārlūkam nav ieslēgtas sīkdatnes (cookies). Tās ir "
 "obligātas, lai pieslēgtos."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Šis konts nav aktīvs."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Šim e-pastam nav registrēta lietotāja konta. Vai tiešām esat "
-"piereģistrējušies?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-pasts"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Jaunā parole"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Jaunās parole vēlreiz"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Jūsu iepriekšējā parole netika ievadīta korekti. Lūdzu ievadiet to atkārtoti."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Vecā parole"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Parole (vēlreiz)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nosaukums"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kods"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "tiesība"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "tiesības"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupa"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupas"
 
-#: models.py:232
-msgid "username"
-msgstr "lietotāja vārds"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un @/./+/-/_ simboli"
-
-#: models.py:235
-msgid "first name"
-msgstr "vārds"
-
-#: models.py:236
-msgid "last name"
-msgstr "uzvārds"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-pasta adrese"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "parole"
 
-#: models.py:239
-msgid "staff status"
-msgstr "personāla statuss"
+#: models.py:201
+msgid "last login"
+msgstr "pēdējoreiz pieslēdzies"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Atzīmējiet, ja vēlaties, lai lietotājs var pieslēgties administrācijas lapā."
-
-#: models.py:242
-msgid "active"
-msgstr "aktīvs"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr "Nosaka, vai lietotājs ir aktīvs. Atceliet šo konta dzēšanas vietā."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "superlietotāja statuss"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Lietotājam ir visas tiesības arī bez to atsevišķas piešķiršanas."
 
-#: models.py:248
-msgid "last login"
-msgstr "pēdējoreiz pieslēdzies"
-
-#: models.py:249
-msgid "date joined"
-msgstr "datums, kad pievienojies"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "lietotāja tiesības"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "lietotāja vārds"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un @/./+/-/_ simboli"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "vārds"
+
+#: models.py:384
+msgid "last name"
+msgstr "uzvārds"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "personāla statuss"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Atzīmējiet, ja vēlaties, lai lietotājs var pieslēgties administrācijas lapā."
+
+#: models.py:389
+msgid "active"
+msgstr "aktīvs"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr "Nosaka, vai lietotājs ir aktīvs. Atceliet šo konta dzēšanas vietā."
+
+#: models.py:392
+msgid "date joined"
+msgstr "datums, kad pievienojies"
+
+#: models.py:400
 msgid "user"
 msgstr "lietotājs"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "lietotāji"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Atslēdzies"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Ievadiet korektu e-pasta adresi."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo
index 7b0de9ab55..e12300cb9e 100644
Binary files a/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/mk/LC_MESSAGES/django.po b/django/contrib/auth/locale/mk/LC_MESSAGES/django.po
index 6d01ba4c8f..a467919f66 100644
--- a/django/contrib/auth/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/mk/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-12 11:21+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,49 +30,57 @@ msgstr "Привилегии"
 msgid "Important dates"
 msgstr "Важни датуми"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Успешна промена на лозинката."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Промени лозинка: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Веќе постои корисник со тоа корисничко име."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Двете полиња со лозинките не се совпаѓаат."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Корисник"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Задолжително. 30 или помалку знаци. Единствено букви, бројки и  @/./+/-/_ ."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Оваа вредност смее да содржи само букви, бројки и @/./+/-/_ знаци."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Лозинка"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Потврда на лозинка"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Заради верификација внесете ја истата лозинка како и горе."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -82,15 +90,14 @@ msgstr ""
 "видите лозинката на овој корисник, но можете да ја смените лозинката со "
 "користење на <a href=\"password/\">оваа форма</a> ."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Ве молам внесете точно корисничко име и лозинка. Имајте на ум дека и во "
-"двете полиња се битни големите и малите букви."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,151 +105,109 @@ msgstr ""
 "Не изгледа дека вашиот прелистувач има овозможено колачиња. Колачињата се "
 "потребни за да се најавите."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Оваа сметка е неактивна."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Нема регистрирано корисник со оваа адреса за е-пошта. Сигурни ли сте дека "
-"сте регистрирани?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Корисничка сметка поврзана со оваа e-mail адреса не може да ја ресетира на "
-"лозинката."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Е-пошта"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Потврда за нова лозинка"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Не ја внесовте точно вашата стара лозинка. Ве молам внесете ја повторно."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Стара лозинка"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Лозинка (повторно)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "алгоритам"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "повторувања"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "случаен клуч"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "хеш"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "фактор на работа"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "проверка"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "име"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "кодно име"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "привилегија"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "привилегии"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "група"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "групи"
 
-#: models.py:232
-msgid "username"
-msgstr "корисничко име"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Задолжително. 30 или помалку знаци. Букви, бројки и  @/./+/-/_ знаци"
-
-#: models.py:235
-msgid "first name"
-msgstr "име"
-
-#: models.py:236
-msgid "last name"
-msgstr "презиме"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "е-пошта"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "лозинка"
 
-#: models.py:239
-msgid "staff status"
-msgstr "статус на администраторите"
+#: models.py:201
+msgid "last login"
+msgstr "последна најава"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Означува дали корисникот може да се логира во сајтот за администрација."
-
-#: models.py:242
-msgid "active"
-msgstr "активен"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Означува дали корисникот треба да биде активен. Одштиклирајте го ова наместо "
-"да бришете корисници."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "статус на суперкорисник"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -250,15 +215,7 @@ msgstr ""
 "Означува дека овој корисник ги има сите привилегии без експлицитно да се "
 "доделуваат сите."
 
-#: models.py:248
-msgid "last login"
-msgstr "последна најава"
-
-#: models.py:249
-msgid "date joined"
-msgstr "датум на зачленување"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -266,26 +223,72 @@ msgstr ""
 "Групите на кои овој корисник припаѓа. Корисникот ќе ги добие сите привилегии "
 "доделени на секоја од неговите / нејзините групи."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "кориснички привилегии"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "корисничко име"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Задолжително. 30 или помалку знаци. Букви, бројки и  @/./+/-/_ знаци"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "име"
+
+#: models.py:384
+msgid "last name"
+msgstr "презиме"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "статус на администраторите"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Означува дали корисникот може да се логира во сајтот за администрација."
+
+#: models.py:389
+msgid "active"
+msgstr "активен"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Означува дали корисникот треба да биде активен. Одштиклирајте го ова наместо "
+"да бришете корисници."
+
+#: models.py:392
+msgid "date joined"
+msgstr "датум на зачленување"
+
+#: models.py:400
 msgid "user"
 msgstr "корисник"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "корисници"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Одјавен"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Внесeте правилна адреса за е-пошта."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo
index 3d0b986715..9ab6273043 100644
Binary files a/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ml/LC_MESSAGES/django.po b/django/contrib/auth/locale/ml/LC_MESSAGES/django.po
index 3e861a5e4a..cf3c60de6e 100644
--- a/django/contrib/auth/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ml/LC_MESSAGES/django.po
@@ -1,21 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <david.forgoz@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Rajeesh Nair <rajeeshrnair@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,252 +31,263 @@ msgstr "അനുമതികള്‍"
 msgid "Important dates"
 msgstr "പ്രധാന തീയതികള്‍"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "പാസ് വേര്‍ഡ് മാറ്റിയിരിക്കുന്നു."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "പാസ് വേര്‍ഡ് മാറ്റുക: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "രഹസ്യവാക്ക് ക്രമീകരിച്ചിട്ടില്ല"
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "ആ പേരുള്ള ഒരു ഉപയോക്താവ് നിലവിലുണ്ട്."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
-msgstr "പാസ് വേര്‍ഡ് നല്കിയ കള്ളികള്‍ രണ്ടും തമ്മില്‍ സാമ്യമില്ല."
+msgstr "പാസ്‌വേര്‍ഡ് നല്കിയ കള്ളികള്‍ രണ്ടും തമ്മില്‍ സാമ്യമില്ല."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "യൂസര്‍ നാമം (ഉപയോക്ത്രു നാമം)"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "നിര്‍ബന്ധം. 30 ഓ അതില്‍ കുറവോ ചിഹ്നങ്ങള്‍. അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും "
 "മാത്രം."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും മാത്രം."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
-msgstr "പാസ് വേര്‍ഡ്"
+msgstr "പാസ്‌വേര്‍ഡ്"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
-msgstr "പാസ് വേര്‍ഡ് ഉറപ്പാക്കല്‍"
+msgstr "പാസ്‌വേര്‍ഡ് ഉറപ്പാക്കല്‍"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
-msgstr "പാസ് വേര്‍ഡ് മുകളിലെ പോലെ തന്നെ നല്കുക. (ഉറപ്പു വരുത്താനാണ്.)"
+msgstr "പാസ്‌വേര്‍ഡ് മുകളിലെ പോലെ തന്നെ നല്കുക. (ഉറപ്പു വരുത്താനാണ്.)"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"പാസ്‌വേര്‍ഡുകള്‍ അതേപടി സൂക്ഷിച്ചു വെക്കാത്തതുകൊണ്ട്  ഈ യൂസറുടെ പാസ്‌വേര്‍ഡ് കാണാന്‍ കഴിയില്ല, പകരം <a "
+"href=\"password/\">ഈ ഫോമു</a>പയോഗിച്ച് നിലവിലുള്ള പാസ്‌വേര്‍ഡ് മാറ്റാവുന്നതാണ്."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"ദയവായി ശരിയായ യൂസര്‍നാമവും പാസ്വേര്ഡും നല്കുക. ഇംഗ്ളീഷ് അക്ഷരങ്ങള്‍ വല്യക്ഷരമാണോ അല്ലയോ എന്നത് "
-"ശ്രദ്ധിക്കണം"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
-"നിങ്ങളുടെ വെബ്-ബ്രൗസറിലെ കുക്കീസൊന്നും പ്രവര്‍ത്തിക്കുന്നില്ല. ഇതിലേക്ക് പ്രവേശിക്കാന്‍ അവ ആവശ്യമാണ്."
+"നിങ്ങളുടെ വെബ്-ബ്രൗസറിലെ കുക്കീസൊന്നും പ്രവര്‍ത്തിക്കുന്നില്ല. ഇതിലേക്ക് പ്രവേശിക്കാന്‍ കുക്കീസ് "
+"ആവശ്യമാണ്."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "ഈ അക്കൗണ്ട് മരവിപ്പിച്ചതാണ്."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"ആ ഇ-മെയിലുമായി ബന്ധപ്പെട്ട യൂസര് അക്കൗണ്ടൊന്നും നിലവിലില്ല. രജിസ്റ്റര്‍ ചെയ്തെന്നു തീര്‍ച്ചയാണോ?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "ഇ-മെയില്‍"
+#: forms.py:211
+msgid "Email"
+msgstr "ഈമെയിൽ"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
-msgstr "പുതിയ പാസ് വേര്‍ഡ്"
+msgstr "പുതിയ പാസ്‌വേര്‍ഡ്"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
-msgstr "പുതിയ പാസ് വേര്‍ഡ് ഉറപ്പാക്കല്‍"
+msgstr "പുതിയ പാസ്‌വേര്‍ഡ് ഉറപ്പാക്കല്‍"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "നിങ്ങളുടെ പഴയ പാസ് വേര്‍ഡ് തെറ്റായാണ് നല്കിയത്. തിരുത്തുക."
+msgstr "നിങ്ങളുടെ പഴയ പാസ്‌വേര്‍ഡ് തെറ്റായാണ് നല്കിയത്. തിരുത്തുക."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
-msgstr "പഴയ പാസ് വേര്‍ഡ്"
+msgstr "പഴയ പാസ്‌വേര്‍ഡ്"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
-msgstr "പാസ് വേര്‍ഡ് (വീണ്ടും)"
+msgstr "പാസ്‌വേര്‍ഡ് (വീണ്ടും)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "അല്‍ഗോരിതം"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "പുനരാവൃത്തികള്‍"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "സോള്‍ട്ട്"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "ഹാഷ്"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "വര്‍ക്ക് ഫാക്ടര്‍"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "ചെക്‍സം"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "പേര്"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "കോഡ്-നാമം"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "അനുമതി"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "അനുമതികള്‍"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "ഗ്രൂപ്പ്"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "ഗ്രൂപ്പുകള്‍"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "പാസ്‌വേര്‍ഡ്"
+
+#: models.py:201
+msgid "last login"
+msgstr "അവസാനമായി ലോഗിന്‍ ചെയ്തതു"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "സൂപ്പര്‍-യൂസര്‍ പദവി"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "ഈ ഉപയോക്താവിന് എടുത്തു പറയാതെ തന്നെ എല്ലാ അനുമതികളും ലഭിക്കുന്നതാണെന്ന് വ്യക്തമാക്കുന്നു"
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"ഈ യൂസര്‍ ഉള്‍പ്പെടുന്ന ഗ്രൂപ്പുകള്‍. ഒരു യൂസര്‍ക്ക് അയാളുടെ/അവരുടെ ഓരോ ഗ്രൂപ്പിന്റേയും മുഴുവന്‍ അനുമതികളും "
+"ലഭിക്കും."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "യൂസര്‍ (ഉപയോക്താവ്)നുള്ള അനുമതികള്‍"
+
+#: models.py:377
 msgid "username"
 msgstr "യൂസര്‍ നാമം (ഉപയോക്ത്രു നാമം)"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "നിര്‍ബന്ധം. 30 ഓ അതില്‍ കുറവോ ചിഹ്നങ്ങള്‍. അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും "
 "മാത്രം."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "തെറ്റായ ഉപഭോക്തൃ നാമം"
+
+#: models.py:383
 msgid "first name"
 msgstr "പേര് - ആദ്യഭാഗം"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "പേര് - അന്ത്യഭാഗം"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "ഇ-മെയില്‍ വിലാസം"
+#: models.py:385
+msgid "email address"
+msgstr "ഈമെയിൽ വിലാസം"
 
-#: models.py:238
-msgid "password"
-msgstr "പാസ് വേര്‍ഡ്"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "സ്റ്റാഫ് പദവി"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
-msgstr "ഈ യൂസര്‍ക്ക് ഈ അഡ്മിന് സൈറ്റിലേക്ക് പ്രവേശിക്കാമോ എന്നു വ്യക്തമാക്കാന്‍"
+msgstr "ഈ യൂസര്‍ക്ക് ഈ അഡ്മിന്‍ സൈറ്റിലേക്ക് പ്രവേശിക്കാമോ എന്നു വ്യക്തമാക്കാന്‍"
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "സജീവം"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 "ഈ യൂസര്‍ സജീവമാണോയെന്ന് വ്യക്തമാക്കുന്നു. അക്കൗണ്ട് ഡിലീറ്റ് ചെയ്യുന്നതിനു പകരം ഇത് ഒഴിവാക്കുക."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "സൂപ്പര്‍-യൂസര്‍ പദവി"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr "ഈ ഉപയോക്താവിന് എടുത്തു പറയാതെ തന്നെ എല്ലാ അനുമതികളും ലഭിക്കുന്നതാണെന്ന് വ്യക്തമാക്കുന്നു"
-
-#: models.py:248
-msgid "last login"
-msgstr "അവസാനമായി ലോഗിന്‍ ചെയ്തതു"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "ചേര്‍ന്ന തീയതി"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "യൂസര്‍ (ഉപയോക്താവ്)നുള്ള അനുമതികള്‍"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "യൂസര്‍ (ഉപയോക്താവ്)"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "യൂസേര്‍സ് (ഉപയോക്താക്കള്‍)"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "ലോഗ്-ഔട്ട് ചെയ്തു (പുറത്തിറങ്ങി)"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "ശരിയായ ഇ-മെയില്‍ വിലാസം നല്കുക."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr ""
+msgstr "%(site_name)s ലെ പാസ്‌വേര്‍ഡ് മാറ്റിയിരിക്കുന്നു"
diff --git a/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo
index 48110d2044..c9be474d50 100644
Binary files a/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/mn/LC_MESSAGES/django.po b/django/contrib/auth/locale/mn/LC_MESSAGES/django.po
index 6c81782244..55ad0a283f 100644
--- a/django/contrib/auth/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/mn/LC_MESSAGES/django.po
@@ -2,21 +2,21 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011, 2012.
+# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-18 02:26+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,50 +30,58 @@ msgstr "Эрхүүд"
 msgid "Important dates"
 msgstr "Чухал огноо"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Нууц үг амжилттай өөрчлөгдлөө."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Нууц үг өөрчлөх: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Нууц үг тохируулаагүй."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Нууц үгийн буруу формат эсвэл үл мэдэгдэх хаш алгоритм байна."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Ийм хэрэглэгчийн нэртэй хэрэглэгч өмнө нь бүртгүүлсэн байна."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Хоёр нууц үг зөрж байна."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Хэрэглэгчийн нэр"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Заавал. 30 ба түүнээс бага үсэгтэй. Зөвхөн латин үсэг, тоо болон @/./+/-/_ "
 "тэмдэгтүүдийг зөвшөөрнө."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Энэ утга дотор зөвхөн үсэг, тоо болон @/./+/-/_ тэмдэгтүүд байж болно."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Нууц үг "
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Нууц үгийн баталгаа"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Батлахын тулд дээрх нууц үгээ ахин хийнэ үү."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -83,15 +91,16 @@ msgstr ""
 "боломжгүй юм. Гэхдээ та нууц үгийг <a href=\"password/\">цонхоор</a> өөрчлөх "
 "боломжтой."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Хэрэглэгчийн нэр, нууц үгээ зөв оруулна уу. Том жижиг үсгийн ялгааг гаргах "
-"хэрэгтэй."
+"Зөв %(username)s, нууц үг оруулна уу. Том жижиг үсэг ялгаатай болхын "
+"анхаарна уу."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -99,165 +108,117 @@ msgstr ""
 "Та вэб хөтчөө cookie ажиллахаар тохируулаагүй юм шиг байна. Нэвтрэхэд cookie "
 "шаардлагатай байдаг."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Энэ бүртгэл идэвхгүй байна."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Цахим шуудангийн энэ хаягт хэрэглэгчийн бүртгэл байхгүй байна. Та "
-"бүртгүүлсэн гэдэгтээ итгэлтэй байна уу?"
+"Энэ цахим шуудангийн хаягаар бүртгүүлсэн хэрэглэгчийн бүртгэл байхгүй байна. "
+"Та бүртгүүлсэн гэдэгтээ итгэлтэй байна уу?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Энэ email хаягаар бүртгүүлсэн хэрэглэгчийн нууц үгийг сэргээх боломжгүй."
+"Энэ цахим хаягаар бүртгүүлсэн хэрэглэгчийн нууц үгийг сэргээх боломжгүй."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Цахим шуудан"
+#: forms.py:211
+msgid "Email"
+msgstr "Цахим хаяг"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Шинэ нууц үг"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Шинэ нууц үгийн баталгаа"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Хуучин нууц үгээ буруу оруулсан байна. Ахин оруулна уу."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Хуучин нууц үг"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Нууц үг (ахиад)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "Алгоритм"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "давталтууд"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "давс"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "хаш"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "ажлын байгуулагч"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "нэр"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "Код"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "зөвшөөрөл"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "зөвшөөрлүүд"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "бүлэг "
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "бүлгүүд"
 
-#: models.py:232
-msgid "username"
-msgstr "хэрэглэгчийн нэр"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Заавал. 30 болон түүнээс бага тэмдэгт. Үсэг, тоо болон @/./+/-/_ тэмдэгтүүд "
-"ашиглана уу."
-
-#: models.py:235
-msgid "first name"
-msgstr "нэр"
-
-#: models.py:236
-msgid "last name"
-msgstr "овог"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "цахим шуудангийн хаяг"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "нууц үг"
 
-#: models.py:239
-msgid "staff status"
-msgstr "Хэрэглэгчдийн төлөв"
+#: models.py:201
+msgid "last login"
+msgstr "сүүлд нэвтэрсэн"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Уг удирдлагын сайт руу хэрэглэгч нэвтрэх боломжтой эсэхийг тодорхойлно."
-
-#: models.py:242
-msgid "active"
-msgstr "идэвхтэй"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Энэ хэрэглэгчийг идэвхтэй болгох эсэхийг тодорхойлно. Бүртгэлийг нь устгахын "
-"оронд сонгохгүй байхад л хангалттай."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "Удирдлагын төлөв"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Энэ хэрэглэгчид бүх зөвшөөрөл байгааг ил тод харуулалгүй тодорхойлно. "
 
-#: models.py:248
-msgid "last login"
-msgstr "сүүлд нэвтэрсэн"
-
-#: models.py:249
-msgid "date joined"
-msgstr "бүртгүүлсэн огноо"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -265,26 +226,74 @@ msgstr ""
 "Бүлэгүүд энэ хэрэглэгчийнхээс тусдаа. Хэрэглэгчид нь сонгосон бүлэгт "
 "олгогдсон бүх эрх зөвшөөрөгдөх болно."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "хэрэглэгчийн эрхүүд"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "хэрэглэгчийн нэр"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Заавал. 30 болон түүнээс бага тэмдэгт. Үсэг, тоо болон @/./+/-/_ тэмдэгтүүд "
+"ашиглана уу."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Зөв нэвтрэх нэр оруулна уу."
+
+#: models.py:383
+msgid "first name"
+msgstr "нэр"
+
+#: models.py:384
+msgid "last name"
+msgstr "овог"
+
+#: models.py:385
+msgid "email address"
+msgstr "цахим хаяг"
+
+#: models.py:386
+msgid "staff status"
+msgstr "Хэрэглэгчдийн төлөв"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Уг удирдлагын сайт руу хэрэглэгч нэвтрэх боломжтой эсэхийг тодорхойлно."
+
+#: models.py:389
+msgid "active"
+msgstr "идэвхтэй"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Энэ хэрэглэгчийг идэвхтэй болгох эсэхийг тодорхойлно. Бүртгэлийг нь устгахын "
+"оронд сонгохгүй байхад л хангалттай."
+
+#: models.py:392
+msgid "date joined"
+msgstr "бүртгүүлсэн огноо"
+
+#: models.py:400
 msgid "user"
 msgstr "хэрэглэгч "
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "хэрэглэгчид"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Гарсан"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Хүчинтэй цахим шуудангийн хаяг оруул"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/my/LC_MESSAGES/django.mo b/django/contrib/auth/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..5af0c7acf9
Binary files /dev/null and b/django/contrib/auth/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/my/LC_MESSAGES/django.po b/django/contrib/auth/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..7b9ec4e10d
--- /dev/null
+++ b/django/contrib/auth/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,281 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-03-17 07:00+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin.py:41
+msgid "Personal info"
+msgstr "ကိုယ်ရေးအချက်အလက်"
+
+#: admin.py:42
+msgid "Permissions"
+msgstr "ခွင့်ပြုချက်များ"
+
+#: admin.py:44
+msgid "Important dates"
+msgstr "အရေးကြီးနေ့စွဲများ"
+
+#: admin.py:126
+msgid "Password changed successfully."
+msgstr ""
+
+#: admin.py:136
+#, python-format
+msgid "Change password: %s"
+msgstr ""
+
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
+msgid "A user with that username already exists."
+msgstr ""
+
+#: forms.py:68 forms.py:269 forms.py:329
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: forms.py:70 forms.py:115
+msgid "Username"
+msgstr "အသံုးပြုသူနာမည်"
+
+#: forms.py:72 forms.py:116
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:75 forms.py:119
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: forms.py:79
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:81
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: forms.py:122
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:151
+#, python-format
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: forms.py:153
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
+#: forms.py:155
+msgid "This account is inactive."
+msgstr ""
+
+#: forms.py:206
+msgid ""
+"That email address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+
+#: forms.py:208 tests/forms.py:374
+msgid ""
+"The user account associated with this email address cannot reset the "
+"password."
+msgstr ""
+
+#: forms.py:211
+msgid "Email"
+msgstr "အီးမေးလ်"
+
+#: forms.py:271
+msgid "New password"
+msgstr ""
+
+#: forms.py:273
+msgid "New password confirmation"
+msgstr ""
+
+#: forms.py:302
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: forms.py:305
+msgid "Old password"
+msgstr ""
+
+#: forms.py:333
+msgid "Password (again)"
+msgstr ""
+
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
+msgid "algorithm"
+msgstr "ပံုသေနည်း"
+
+#: hashers.py:242
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
+msgid "salt"
+msgstr ""
+
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
+msgid "hash"
+msgstr ""
+
+#: hashers.py:293
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:295
+msgid "checksum"
+msgstr ""
+
+#: models.py:72 models.py:121
+msgid "name"
+msgstr "နာမည်"
+
+#: models.py:74
+msgid "codename"
+msgstr ""
+
+#: models.py:78
+msgid "permission"
+msgstr ""
+
+#: models.py:79 models.py:123
+msgid "permissions"
+msgstr ""
+
+#: models.py:128
+msgid "group"
+msgstr "အုပ်စု"
+
+#: models.py:129 models.py:301
+msgid "groups"
+msgstr "အုပ်စုများ"
+
+#: models.py:200
+msgid "password"
+msgstr ""
+
+#: models.py:201
+msgid "last login"
+msgstr ""
+
+#: models.py:298
+msgid "superuser status"
+msgstr ""
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr ""
+
+#: models.py:377
+msgid "username"
+msgstr ""
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr ""
+
+#: models.py:384
+msgid "last name"
+msgstr ""
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr ""
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr ""
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr ""
+
+#: models.py:400
+msgid "user"
+msgstr ""
+
+#: models.py:401
+msgid "users"
+msgstr ""
+
+#: views.py:94
+msgid "Logged out"
+msgstr ""
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo
index 225e5c53ae..0ac115ffaf 100644
Binary files a/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/nb/LC_MESSAGES/django.po b/django/contrib/auth/locale/nb/LC_MESSAGES/django.po
index 94d0bef6ce..33afd5047c 100644
--- a/django/contrib/auth/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/nb/LC_MESSAGES/django.po
@@ -2,22 +2,22 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-#   <jonklo@gmail.com>, 2012.
+#   <jonklo@gmail.com>, 2012-2013.
 #   <sigurdga-transifex@sigurdga.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-12 14:54+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-09 23:06+0000\n"
+"Last-Translator: jonklo <jonklo@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,48 +31,56 @@ msgstr "Rettigheter"
 msgid "Important dates"
 msgstr "Viktige datoer"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Passordet er endret."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Endre passord: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Passord ikke satt."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Ugyldig passordformat eller ukjent hash-algoritme."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Det eksisterer allerede en bruker med dette brukernavnet."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "De to passordfeltene er ikke like."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Brukernavn"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Verdien kan kun inneholde bokstaver, tall og @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Passord"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Passordbekreftelse"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -82,15 +90,16 @@ msgstr ""
 "passord på. Du kan endre passordet med <a href=\"password/\">dette skjemaet</"
 "a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Skriv inn korrekt brukernavn og passord. Merk at det er forskjell på små og "
-"store bokstaver."
+"Vennligst oppgi korrekt %(username)s og passord. Merk at det kan være "
+"forskjell på små og store bokstaver."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,163 +107,119 @@ msgstr ""
 "Din nettleser ser ikke ut til å støtte informasjonskapsler (cookies). "
 "Informasjonskapsler er påkrevet for å logge inn."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Denne kontoen er inaktiv."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 "Den oppgitte e-postadressen er ikke registrert hos oss. Er du sikker på at "
 "du er registrert?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 "Brukerkontoen assosiert med denne e-postadressen kan ikke nullstille "
 "passordet."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "E-post"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nytt passord"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Bekreft nytt passord"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ditt gamle passord er galt. Vennligst prøv igjen."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Passord (gjenta)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritme"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterasjoner"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "arbeidsfaktor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "sjekksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "navn"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kodenavn"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "rettighet"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "rettigheter"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "gruppe"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupper"
 
-#: models.py:232
-msgid "username"
-msgstr "brukernavn"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Påkrevet. 30 tegn eller færre. Bokstaver, tall og @/./+/-/_."
-
-#: models.py:235
-msgid "first name"
-msgstr "fornavn"
-
-#: models.py:236
-msgid "last name"
-msgstr "etternavn"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-postadresse"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "passord"
 
-#: models.py:239
-msgid "staff status"
-msgstr "administrasjonsstatus"
+#: models.py:201
+msgid "last login"
+msgstr "siste innlogging"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Angir at brukeren kan logge inn på denne administrasjonssiden."
-
-#: models.py:242
-msgid "active"
-msgstr "aktiv"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Angir at denne brukeren er aktiv. Avmerk denne i stedet for å slette kontoen."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "superbruker"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Angir at denne brukeren har alle rettigheter uten å eksplisitt sette dem."
 
-#: models.py:248
-msgid "last login"
-msgstr "siste innlogging"
-
-#: models.py:249
-msgid "date joined"
-msgstr "registrert"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -262,26 +227,70 @@ msgstr ""
 "Gruppene denne brukeren er tilknyttet. En bruker vil ha alle rettigheter "
 "tilhørende gruppene han/hun er medlem av."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "Brukerrettigheter"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "brukernavn"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Påkrevet. 30 tegn eller færre. Bokstaver, tall og @/./+/-/_."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Oppgi et gyldig brukernavn"
+
+#: models.py:383
+msgid "first name"
+msgstr "fornavn"
+
+#: models.py:384
+msgid "last name"
+msgstr "etternavn"
+
+#: models.py:385
+msgid "email address"
+msgstr "e-postadresse"
+
+#: models.py:386
+msgid "staff status"
+msgstr "administrasjonsstatus"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Angir at brukeren kan logge inn på denne administrasjonssiden."
+
+#: models.py:389
+msgid "active"
+msgstr "aktiv"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Angir at denne brukeren er aktiv. Avmerk denne i stedet for å slette kontoen."
+
+#: models.py:392
+msgid "date joined"
+msgstr "registrert"
+
+#: models.py:400
 msgid "user"
 msgstr "bruker"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "brukere"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Logget ut"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Oppgi en gyldig e-postadresse."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ne/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ne/LC_MESSAGES/django.mo
index dbe00a573b..be24a84396 100644
Binary files a/django/contrib/auth/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ne/LC_MESSAGES/django.po b/django/contrib/auth/locale/ne/LC_MESSAGES/django.po
index 5a0419cf8c..382748f7c0 100644
--- a/django/contrib/auth/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ne/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Sagar Chalise <chalisesagar@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,242 +29,251 @@ msgstr "अनुमति"
 msgid "Important dates"
 msgstr "महत्वपूर्ण मितिहरु"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "पासवर्ड सफलतापूर्वक फेरिएको छ ।"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "पासवर्ड फेर्नुहोस : %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr ""
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "पासवर्ड पुष्टि"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
-msgstr ""
+msgstr "प्रमाणिकरणको लागि माथी कै पासवर्ड राख्नुहोस ।"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr ""
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "ई-मेल"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "नयाँ पासवर्ड"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "नयाँ पासवर्ड पुष्टि"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "तपाईको पुरानो पासवर्ड गलत भयो । कृपया पुन: हाल्नुहोस ।  "
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "पुरानो पासवर्ड"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "पासवर्ड (पुन:)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "नाम"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr ""
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "अनुमति"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "अनुमति"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "समुह"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "समुहहरु"
 
-#: models.py:232
-msgid "username"
-msgstr ""
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr "नाम"
-
-#: models.py:236
-msgid "last name"
-msgstr "थर"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "ई-मेल ठेगाना"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "पासवर्ड"
 
-#: models.py:239
-msgid "staff status"
+#: models.py:201
+msgid "last login"
 msgstr ""
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-
-#: models.py:242
-msgid "active"
-msgstr ""
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr ""
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:248
-msgid "last login"
-msgstr ""
-
-#: models.py:249
-msgid "date joined"
-msgstr "दर्ता भएको मिति"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr ""
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "प्रयोगकर्ता नाम"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "नाम"
+
+#: models.py:384
+msgid "last name"
+msgstr "थर"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr ""
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr ""
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "दर्ता भएको मिति"
+
+#: models.py:400
 msgid "user"
-msgstr ""
+msgstr "प्रयोगकर्ता"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
-msgstr ""
+msgstr "प्रयोगकर्ता"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr ""
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr ""
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo
index 9539861339..501fc77b73 100644
Binary files a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po
index c37ee8e515..07060388b9 100644
--- a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po
@@ -1,6 +1,9 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+#   <bart@dispectu.com>, 2012-2013.
+# Erik Romijn <eromijn@solidlinks.nl>, 2013.
 # Harro van der Klauw <hvdklauw@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Jeffrey Gelens <jeffrey@noppo.pro>, 2011, 2012.
@@ -9,16 +12,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-03-19 15:55+0000\n"
+"Last-Translator: erikr <eromijn@solidlinks.nl>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,50 +35,58 @@ msgstr "Rechten"
 msgid "Important dates"
 msgstr "Belangrijke datums"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Wachtwoord wijzigen is geslaagd."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Wijzig wachtwoord: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Er is geen wachtwoord ingesteld."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Ongeldig wachtwoord formaat of onbekend hashing algoritme."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Een gebruiker met deze gebruikersnaam bestaat al."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "De twee ingevulde wachtwoorden zijn niet gelijk."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Vereist. 30 tekens of minder. Alleen letters, cijfers en @/,/+/-/_ tekens "
 "zijn toegestaan."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Dit veld mag alleen letters, cijfers en @/,/+/-/_ tekens bevatten."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Bevestiging wachtwoord"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Vul hetzelfde wachtwoord als hierboven in, ter bevestiging."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -85,15 +96,16 @@ msgstr ""
 "wachtwoord niet zien. Je kunt hem aanpassen via <a href=\"password/\">dit "
 "formulier</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Voer een correcte gebruikersnaam en wachtwoord in. Let op, de velden zijn "
-"hoofdletter-gevoelig."
+"Voer een correcte %(username)s en wachtwoord in. Let op dat beide velden "
+"hoofdlettergevoelig zijn."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -101,150 +113,114 @@ msgstr ""
 "Het lijkt erop dat uw browser geen cookies accepteert. Om in te loggen "
 "moeten cookies worden geaccepteerd."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Dit account is inactief."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Dat e-mailadres heeft geen gerelateerd gebruikersaccount. Weet u zeker dat u "
-"zich heeft geregistreerd?"
+"Dat emailadres heeft geen geassocieerd gebruikersaccount. Weet je zeker dat "
+"je je hebt geregistreerd?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"De gebruiker gekoppeld aan dit e-mail adres kan het wachtwoord niet resetten."
+"Het gebruikersaccount dat met dit emailadres wordt geassocieerd kan het "
+"wachtwoord niet resetten."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr "Email"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Nieuw wachtwoord bevestigen"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Uw oude wachtwoord is niet correct ingevoerd. Voert u het alstublieft "
 "opnieuw in."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Oud wachtwoord"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Wachtwoord (nogmaals)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritme"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iteraties"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "arbeidsfactor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "naam"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "codenaam"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "recht"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "rechten"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "groep"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "groepen"
 
-#: models.py:232
-msgid "username"
-msgstr "gebruikersnaam"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Vereist. 30 tekens of minder. Letters, cijfers en /./+/-/_ tekens."
-
-#: models.py:235
-msgid "first name"
-msgstr "voornaam"
-
-#: models.py:236
-msgid "last name"
-msgstr "achternaam"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mailadres"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "wachtwoord"
 
-#: models.py:239
-msgid "staff status"
-msgstr "stafstatus"
+#: models.py:201
+msgid "last login"
+msgstr "laatste inlog"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Bepaalt of de gebruiker kan inloggen op deze beheersite."
-
-#: models.py:242
-msgid "active"
-msgstr "actief"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Bepaalt of deze gebruiker als actief dient te worden behandeld. U kunt dit "
-"uitvinken in plaats van een gebruiker te verwijderen."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "supergebruikerstatus"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -252,15 +228,7 @@ msgstr ""
 "Bepaalt dat deze gebruiker alle rechten heeft, zonder deze expliciet toe te "
 "wijzen."
 
-#: models.py:248
-msgid "last login"
-msgstr "laatste inlog"
-
-#: models.py:249
-msgid "date joined"
-msgstr "datum toegetreden"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -268,26 +236,71 @@ msgstr ""
 "De groepen waar deze gebruiker toe behoord. Een gebruiker zal alle rechten "
 "krijgen van zijn/haar groepen."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "gebruikersrechten"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "gebruikersnaam"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Vereist. 30 tekens of minder. Letters, cijfers en /./+/-/_ tekens."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Vul een geldige gebruikersnaam in."
+
+#: models.py:383
+msgid "first name"
+msgstr "voornaam"
+
+#: models.py:384
+msgid "last name"
+msgstr "achternaam"
+
+#: models.py:385
+msgid "email address"
+msgstr "emailadres"
+
+#: models.py:386
+msgid "staff status"
+msgstr "stafstatus"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Bepaalt of de gebruiker kan inloggen op deze beheersite."
+
+#: models.py:389
+msgid "active"
+msgstr "actief"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Bepaalt of deze gebruiker als actief dient te worden behandeld. U kunt dit "
+"uitvinken in plaats van een gebruiker te verwijderen."
+
+#: models.py:392
+msgid "date joined"
+msgstr "datum toegetreden"
+
+#: models.py:400
 msgid "user"
 msgstr "gebruiker"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "gebruikers"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Afmelden"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Geef een geldig e-mailadres op."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo
index b2ab918409..c942a032aa 100644
Binary files a/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/nn/LC_MESSAGES/django.po b/django/contrib/auth/locale/nn/LC_MESSAGES/django.po
index bbe6cf8a0b..3c28fc6a0d 100644
--- a/django/contrib/auth/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/nn/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,63 +29,70 @@ msgstr "Løyve"
 msgid "Important dates"
 msgstr "Viktige datoar"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Passordet er endra."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Endre passord: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Det eksisterar allereie ein brukar med dette brukernamnet."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Dei to passordfelta er ikkje like."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Nødvendig. 30 teikn eller færre. Berre bokstavar, tall @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Feltet kan berre innehalde bokstavar, nummer og @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Passord"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Stadfesting av passord"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Skriv inn det samme passordet som over, for verifisering."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Gje korrekt brukarnamn og passord. Merk at det er forskjell på små og store "
-"bokstavar."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,185 +100,183 @@ msgstr ""
 "Nettlesaren din ser ikkje ut til å støtte informasjonskapslar (cookies). "
 "Informasjonskapslar er nødvendige for å logge inn."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Denne kontoen er inaktiv."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Den oppgitte e-postadressa er ikkje registrert hos oss. Er du sikker på at "
-"du er registrert?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-post"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nytt passord"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Stadfest nytt passord"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Det gamle passordet er feil. Prøv omatt."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Gammalt passord"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Passord (gjenta)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "namn"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kodenamn"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "løyve"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "løyve"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "gruppe"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupper"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "passord"
+
+#: models.py:201
+msgid "last login"
+msgstr "siste innlogging"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "superbrukar"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "Angir at denne brukaren har alle løyve utan å eksplisitt sette dei."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr "Brukerløyve"
+
+#: models.py:377
 msgid "username"
 msgstr "brukarnamn"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Nødvendig. 30 teikn eller færre. Berre bokstavar, tall @/./+/-/_."
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
 msgid "first name"
 msgstr "fornamn"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "etternamn"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-postadresse"
+#: models.py:385
+msgid "email address"
+msgstr ""
 
-#: models.py:238
-msgid "password"
-msgstr "passord"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "administrasjonsstatus"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "Angir at brukaren kan logge inn på denne administrasjonssida."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "aktiv"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 "Angir at denne brukaren er aktiv. Avmerk denne i staden for å slette kontoen."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "superbrukar"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr "Angir at denne brukaren har alle løyve utan å eksplisitt sette dei."
-
-#: models.py:248
-msgid "last login"
-msgstr "siste innlogging"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "registrert"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "Brukerløyve"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "brukar"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "brukarar"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Logga ut"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Oppgje ei gyldig e-postadresse."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/os/LC_MESSAGES/django.mo b/django/contrib/auth/locale/os/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..d461512414
Binary files /dev/null and b/django/contrib/auth/locale/os/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/os/LC_MESSAGES/django.po b/django/contrib/auth/locale/os/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..58b38fa0cd
--- /dev/null
+++ b/django/contrib/auth/locale/os/LC_MESSAGES/django.po
@@ -0,0 +1,284 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Xwybylty Soslan <soslanx@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-03-22 17:50+0000\n"
+"Last-Translator: Soslan Khubulov <soslanx@gmail.com>\n"
+"Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/"
+"os/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: os\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:41
+msgid "Personal info"
+msgstr "Персоналон инфо"
+
+#: admin.py:42
+msgid "Permissions"
+msgstr "Бартӕ"
+
+#: admin.py:44
+msgid "Important dates"
+msgstr "Ахсджиаг бонтӕ"
+
+#: admin.py:126
+msgid "Password changed successfully."
+msgstr "Пароль ивд ӕрцыд."
+
+#: admin.py:136
+#, python-format
+msgid "Change password: %s"
+msgstr ""
+
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Ницы пароль уыд ӕвӕрд."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
+msgid "A user with that username already exists."
+msgstr ""
+
+#: forms.py:68 forms.py:269 forms.py:329
+msgid "The two password fields didn't match."
+msgstr ""
+
+#: forms.py:70 forms.py:115
+msgid "Username"
+msgstr "Фӕсномыг"
+
+#: forms.py:72 forms.py:116
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+"Ӕнӕмӕнг. 30 кӕнӕ цъусдӕр нысаны. Ӕрмӕст дамгъӕтӕ, нымӕцтӕ ӕмӕ @/./+/-/_."
+
+#: forms.py:75 forms.py:119
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Ам хъуамӕ уой ӕрмӕст дамгъӕтӕ, нымӕцтӕ ӕмӕ ахӕм нысӕнттӕ: @/./+/-/_."
+
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
+msgid "Password"
+msgstr "Пароль"
+
+#: forms.py:79
+msgid "Password confirmation"
+msgstr "Паролы бӕлвырдгӕнӕн"
+
+#: forms.py:81
+msgid "Enter the same password as above, for verification."
+msgstr "Уӕлдӕр цы пароль бафыстай, уый бафысс, цӕмӕй бӕлвырд уа."
+
+#: forms.py:122
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:151
+#, python-format
+msgid ""
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
+
+#: forms.py:153
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+
+#: forms.py:155
+msgid "This account is inactive."
+msgstr ""
+
+#: forms.py:206
+msgid ""
+"That email address doesn't have an associated user account. Are you sure "
+"you've registered?"
+msgstr ""
+
+#: forms.py:208 tests/forms.py:374
+msgid ""
+"The user account associated with this email address cannot reset the "
+"password."
+msgstr ""
+
+#: forms.py:211
+msgid "Email"
+msgstr "Электрон пост"
+
+#: forms.py:271
+msgid "New password"
+msgstr "Ног пароль"
+
+#: forms.py:273
+msgid "New password confirmation"
+msgstr ""
+
+#: forms.py:302
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr ""
+
+#: forms.py:305
+msgid "Old password"
+msgstr "Зӕронд пароль"
+
+#: forms.py:333
+msgid "Password (again)"
+msgstr "Пароль (ногӕй)"
+
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:242
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
+msgid "salt"
+msgstr ""
+
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
+msgid "hash"
+msgstr "хӕш"
+
+#: hashers.py:293
+msgid "work factor"
+msgstr "куысты фактор"
+
+#: hashers.py:295
+msgid "checksum"
+msgstr "бӕлвырдсуммӕ"
+
+#: models.py:72 models.py:121
+msgid "name"
+msgstr "ном"
+
+#: models.py:74
+msgid "codename"
+msgstr ""
+
+#: models.py:78
+msgid "permission"
+msgstr "бар"
+
+#: models.py:79 models.py:123
+msgid "permissions"
+msgstr "бартӕ"
+
+#: models.py:128
+msgid "group"
+msgstr "къорд"
+
+#: models.py:129 models.py:301
+msgid "groups"
+msgstr "къордтӕ"
+
+#: models.py:200
+msgid "password"
+msgstr "пароль"
+
+#: models.py:201
+msgid "last login"
+msgstr "фӕстаг бахызт"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "хистӕр архайӕджы статус"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+
+#: models.py:306
+msgid "user permissions"
+msgstr "архайӕджы бартӕ"
+
+#: models.py:377
+msgid "username"
+msgstr "фӕсномыг"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Ӕнӕмӕнг. 30 кӕнӕ цъусдӕр нысаны. Ӕрмӕст дамгъӕтӕ, нымӕцтӕ ӕмӕ ахӕм нысӕнттӕ: "
+"@/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Раст фӕсномыг бафысс"
+
+#: models.py:383
+msgid "first name"
+msgstr "ном"
+
+#: models.py:384
+msgid "last name"
+msgstr "мыггаг"
+
+#: models.py:385
+msgid "email address"
+msgstr "электрон посты адрис"
+
+#: models.py:386
+msgid "staff status"
+msgstr "куысты уавӕр"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr "активон"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "баиуы бон"
+
+#: models.py:400
+msgid "user"
+msgstr "архайӕг"
+
+#: models.py:401
+msgid "users"
+msgstr "архайджытӕ"
+
+#: views.py:94
+msgid "Logged out"
+msgstr "Рахизын"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo
index 3a4b3ae3ae..62f9cce4d6 100644
Binary files a/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/pa/LC_MESSAGES/django.po b/django/contrib/auth/locale/pa/LC_MESSAGES/django.po
index a4511de2cd..60672ab5bc 100644
--- a/django/contrib/auth/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/pa/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,243 +29,251 @@ msgstr "ਅਧਿਕਾਰ"
 msgid "Important dates"
 msgstr "ਖਾਸ ਮਿਤੀਆਂ"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "ਪਾਸਵਰਡ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "ਉਸ ਯੂਜ਼ਰ ਨਾਂ ਨਾਲ ਯੂਜ਼ਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "ਦੋਵੇਂ ਪਾਸਵਰਡ ਖੇਤਰ ਮਿਲਦੇ ਨਹੀਂ ਹਨ।"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @/./+/-/_ ਹੀ।"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "ਜਾਂਚ ਲਈ, ਉੱਤੇ ਦਿੱਤਾ ਪਾਸਵਰਡ ਹੀ ਦਿਓ।"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"ਠੀਕ ਯੂਜ਼ਰ ਨਾਂ ਤੇ ਪਾਸਵਰਡ ਦਿਉ ਜੀ। ਯਾਦ ਰੱਖੋ ਕਿ ਦੋਵੇਂ ਖੇਤਰਾਂ ਅੱਖਰ ਆਕਾਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ ਹਨ।"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "ਤੁਹਾਡੇ ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਉੱਤੇ ਕੂਕੀਜ਼ ਚਾਲੂ ਨਹੀਂ ਜਾਪਦੇ ਹਨ। ਲਾਗਇਨ ਕਰਨ ਲਈ ਕੂਕੀਜ਼ ਚਾਹੀਦੇ ਹਨ।"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "ਇਹ ਅਕਾਊਂਟ ਗ਼ੈਰ-ਸਰਗਰਮ ਹੈ।"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "ਈਮੇਲ"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "ਨਵਾਂ ਪਾਸਵਰਡ"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "ਨਵਾਂ ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "ਤੁਹਾਡਾ ਪੁਰਾਣਾ ਪਾਸਵਰਡ ਗਲਤ ਦਿੱਤਾ ਗਿਆ ਸੀ। ਇਸ ਨੂੰ ਫੇਰ ਦਿਉ ਜੀ।"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "ਪੁਰਾਣਾ ਪਾਸਵਰਡ"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "ਪਾਸਵਰਡ (ਫੇਰ)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ਨਾਂ"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "ਕੋਡ-ਨਾਂ"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "ਅਧਿਕਾਰ"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "ਅਧਿਕਾਰ"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "ਗਰੁੱਪ"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "ਗਰੁੱਪ"
 
-#: models.py:232
-msgid "username"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @//+/-/_ ਹੀ।"
-
-#: models.py:235
-msgid "first name"
-msgstr "ਪਹਿਲਾਂ ਨਾਂ"
-
-#: models.py:236
-msgid "last name"
-msgstr "ਆਖਰੀ ਨਾਂ"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: models.py:239
-msgid "staff status"
-msgstr "ਸਟਾਫ ਹਾਲਤ"
+#: models.py:201
+msgid "last login"
+msgstr "ਆਖਰੀ ਲਾਗਇਨ"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-
-#: models.py:242
-msgid "active"
-msgstr "ਸਰਗਰਮ"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "ਸੁਪਰਯੂਜ਼ਰ ਹਾਲਤ"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:248
-msgid "last login"
-msgstr "ਆਖਰੀ ਲਾਗਇਨ"
-
-#: models.py:249
-msgid "date joined"
-msgstr "ਜੁਆਇੰਨ ਕਰਨ ਦੀ ਮਿਤੀ"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "ਯੂਜ਼ਰ ਅਧਿਕਾਰ"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @//+/-/_ ਹੀ।"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "ਪਹਿਲਾਂ ਨਾਂ"
+
+#: models.py:384
+msgid "last name"
+msgstr "ਆਖਰੀ ਨਾਂ"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "ਸਟਾਫ ਹਾਲਤ"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr "ਸਰਗਰਮ"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "ਜੁਆਇੰਨ ਕਰਨ ਦੀ ਮਿਤੀ"
+
+#: models.py:400
 msgid "user"
 msgstr "ਯੂਜ਼ਰ"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "ਯੂਜ਼ਰ"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "ਲਾਗ ਆਉਟ ਕੀਤਾ"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "ਠੀਕ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo
index d2e28b782e..1dac92ca33 100644
Binary files a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po
index f5204b98bc..e086b2ec05 100644
--- a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-22 12:51+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Roman Barczyński <rombar@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -33,48 +33,56 @@ msgstr "Uprawnienia"
 msgid "Important dates"
 msgstr "Ważne daty"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Hasło zostało zmienione pomyślnie."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Zmień hasło: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Użytkownik o tej nazwie już istnieje."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Hasła się nie zgadzają."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "To pole może zawierać tylko litery, cyfry i znaki @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Hasło"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Potwierdzenie hasła"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Podaj powyższe hasło w celu weryfikacji."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -84,15 +92,14 @@ msgstr ""
 "użytkownika, ale możesz zmienić hasło używając <a href=\"password/\">tego "
 "formularza</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Proszę wpisać poprawną nazwę użytkownika i hasło. Uwaga: wielkość liter ma "
-"znaczenie."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -100,149 +107,108 @@ msgstr ""
 "Twoja przeglądarka nie chce akceptować ciasteczek. Są one wymagane do "
 "zalogowania się."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "To konto jest nieaktywne."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Ten adres e-mail nie ma przypisanego konta. Jesteś pewien, że "
-"zarejestrowałeś się?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Użytkownik, którego konto powiązane jest z tym adresem e-mail nie może "
-"zresetować hasła."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Nowe hasło (powtórz)"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Podane stare hasło jest niepoprawne. Proszę podać je jeszcze raz."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Hasło (powtórz)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algorytm"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iteracje"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "sól"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "work factor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "suma kontrolna"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nazwa"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nazwa kodowa"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "uprawnienie"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "uprawnienia"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupa"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupy"
 
-#: models.py:232
-msgid "username"
-msgstr "użytkownik"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_."
-
-#: models.py:235
-msgid "first name"
-msgstr "imię"
-
-#: models.py:236
-msgid "last name"
-msgstr "nazwisko"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "adres e-mail"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "hasło"
 
-#: models.py:239
-msgid "staff status"
-msgstr "w zespole"
+#: models.py:201
+msgid "last login"
+msgstr "ostatnio zalogowany"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Oznacza czy użytkownik może zalogować się do panelu admina."
-
-#: models.py:242
-msgid "active"
-msgstr "aktywny"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Oznacza czy użytkownika należy uważać za aktywnego. Odznacz to, zamiast "
-"usuwać konta."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "status administratora"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -250,15 +216,7 @@ msgstr ""
 "Oznacza, że ten użytkownik ma wszystkie uprawnienia bez jawnego "
 "przypisywania ich."
 
-#: models.py:248
-msgid "last login"
-msgstr "ostatnio zalogowany"
-
-#: models.py:249
-msgid "date joined"
-msgstr "data przyłączenia"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -266,26 +224,71 @@ msgstr ""
 "Grupy do których należy użytkownik. Użytkownik otrzyma wszystkie uprawnienia "
 "przypisane do którejkolwiek z jego/jej grup."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "uprawnienia użytkownika"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "użytkownik"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "imię"
+
+#: models.py:384
+msgid "last name"
+msgstr "nazwisko"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "w zespole"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Oznacza czy użytkownik może zalogować się do panelu admina."
+
+#: models.py:389
+msgid "active"
+msgstr "aktywny"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Oznacza czy użytkownika należy uważać za aktywnego. Odznacz to, zamiast "
+"usuwać konta."
+
+#: models.py:392
+msgid "date joined"
+msgstr "data przyłączenia"
+
+#: models.py:400
 msgid "user"
 msgstr "użytkownik"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "użytkownicy"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Wylogowany"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Wprowadź poprawny adres e-mail."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo
index bb926371df..27a233e6c7 100644
Binary files a/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/pt/LC_MESSAGES/django.po b/django/contrib/auth/locale/pt/LC_MESSAGES/django.po
index 28841d7e32..54e616c5c6 100644
--- a/django/contrib/auth/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/pt/LC_MESSAGES/django.po
@@ -1,22 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Bruno Miguel Custódio <bruno@brunomcustodio.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nuno Mariz <nmariz@gmail.com>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Bruno Miguel Custódio <bruno@brunomcustodio.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,64 +31,74 @@ msgstr "Permissões"
 msgid "Important dates"
 msgstr "Datas importantes"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Palavra-passe modificada com sucesso."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Modificar a palavra-passe: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Nenhuma palavra-chave definida."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Formato de palavra-chave inválido ou função de mistura desconhecida."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Já existe um utilizador com esse nome."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Os dois campos da palavra-passe não coincidem."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Utilizador"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obrigatório. 30 carateres ou menos. Apenas letras, dígitos e @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Este valor apenas deverá conter letras, números e carateres @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Confirmação da palavra-passe"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Introduza a palavra-passe como acima, para verificação."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Não são guardadas palavras-passe sem encriptação, portanto não é possível "
+"visualizar a password deste utilizador, mas poderá modificar a palavra-passe "
+"através <a href=\"password/\">deste formulário</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Por favor introduza o utilizador e palavra-passe corretos. Note que ambos os "
-"casos diferenciam maiúsculas e minúsculas."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,151 +106,114 @@ msgstr ""
 "Aparentemente que o seu browser não está configurado para aceitar cookies. "
 "Os cookies são necessários para poder entrar."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Esta conta não está activa."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Esse e-mail não tem nenhuma conta de utilizador associada. Tem a certeza que "
-"já se registou?"
+"O endereço de email especificado não está associado a nenhuma conta. Tem a "
+"certeza que efectuou o registo?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
+"O utilizador associado a este endereço de email não pode redefinir a palavra-"
+"chave."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr "Email"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nova palavra-passe"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Confirmação da nova palavra-passe"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "A sua palavra-passe antiga foi introduzida incorretamente. Por favor tente "
 "novamente."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Palavra-passe antiga"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Palavra-passe (novamente)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "algoritmo"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "iterações"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "fator trabalho"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "verificação"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nome"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nome de código"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permissão"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permissões"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupo"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:232
-msgid "username"
-msgstr "utilizador"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Obrigatório. 30 carateres ou menos. Apenas letras, números e carateres @/./"
-"+/-/_."
-
-#: models.py:235
-msgid "first name"
-msgstr "primeiro nome"
-
-#: models.py:236
-msgid "last name"
-msgstr "último nome"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "endereço de e-mail"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "palavra-passe"
 
-#: models.py:239
-msgid "staff status"
-msgstr "status de equipa"
+#: models.py:201
+msgid "last login"
+msgstr "última entrada"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Define se o utilizador pode usar a administração do site."
-
-#: models.py:242
-msgid "active"
-msgstr "ativo"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Defina se este utilizador deva ser tratado como ativo. Não selecione em vez "
-"de remover as contas."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "Status de superuser"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -247,41 +221,82 @@ msgstr ""
 "Define se este utilizador tem todas as permissões sem explicitamente as "
 "atribuir."
 
-#: models.py:248
-msgid "last login"
-msgstr "última entrada"
-
-#: models.py:249
-msgid "date joined"
-msgstr "data de registo"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
+"Os grupos este utilizador pertence. Um utilizador terá todas as permissões "
+"concedidas a cada um do seu grupo."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "permissões do utilizador"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "utilizador"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Obrigatório. 30 carateres ou menos. Apenas letras, números e carateres @/./"
+"+/-/_."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Introduza um nome de utilizador válido."
+
+#: models.py:383
+msgid "first name"
+msgstr "primeiro nome"
+
+#: models.py:384
+msgid "last name"
+msgstr "último nome"
+
+#: models.py:385
+msgid "email address"
+msgstr "endereço de email"
+
+#: models.py:386
+msgid "staff status"
+msgstr "status de equipa"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Define se o utilizador pode usar a administração do site."
+
+#: models.py:389
+msgid "active"
+msgstr "ativo"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Defina se este utilizador deva ser tratado como ativo. Não selecione em vez "
+"de remover as contas."
+
+#: models.py:392
+msgid "date joined"
+msgstr "data de registo"
+
+#: models.py:400
 msgid "user"
 msgstr "utilizador"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "utilizadores"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Saiu"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Introduza um endereço de e-mail válido."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr ""
+msgstr "Redefinição de palavra-passe em %(site_name)s"
diff --git a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo
index e6fac83eb9..e877557877 100644
Binary files a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po
index ba8ad0dabb..7096c1a2a1 100644
--- a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <dudanogueira@gmail.com>, 2012.
 # Guilherme Gondim <semente+transifex@taurinus.org>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Sandro  <sandrossv@hotmail.com>, 2011.
@@ -8,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-19 18:11+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-17 12:33+0000\n"
+"Last-Translator: dudanogueira <dudanogueira@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,50 +32,58 @@ msgstr "Permissões"
 msgid "Important dates"
 msgstr "Datas importantes"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Senha modificada com sucesso."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Alterar senha: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Nenhuma senha definida."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Formato de senha inválido ou algoritmo de hash desconhecido."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Um usuário com este nome de usuário já existe."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Os dois campos de senha não combinam."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Usuário"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obrigatório. 30 caracteres ou menos. Somente letras, dígitos e @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Este valor deve conter apenas letras, números e os caracteres @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Senha"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Confirmação de senha"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Informe a mesma senha digitada acima, para verificação."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -84,15 +93,16 @@ msgstr ""
 "a senha do usuário, mas você pode alterá-la usando <a href=\"password/"
 "\">este formulário</a> ."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Por favor, entre com um usuário e senha corretos. Note que ambos os campos "
-"diferenciam maiúsculas e minúsculas."
+"Por favor, entre com um %(username)s  e senha corretos. Note que ambos os "
+"campos diferenciam maiúsculas e minúsculas."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -100,153 +110,113 @@ msgstr ""
 "Seu navegador Web não parece estar com os cookies habilitados. Cookies são "
 "requeridos para acessar."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Esta conta está inativa."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Este endereço de e-mail não está associado com uma conta de usuário. Você "
-"tem certeza que está registrado?"
+"Este endereço de email não possui nenhuma conta associada. Você tem certeza "
+"que se registrou?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"A conta de usuário associada a este endereço de e-mail não pode redefinir a "
-"senha."
+"A conta de usuário associada à este email não permite a redefinição de senha."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr "Email"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nova senha"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Confirmação da nova senha"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "A senha antiga foi digitada incorretamente. Por favor, informe a senha "
 "novamente."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritmo"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterações"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "work factor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nome"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "apelido"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permissão"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permissões"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupo"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:232
-msgid "username"
-msgstr "usuário"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Obrigatório. 30 caracteres ou menos. Letras, números e os caracteres @/./+/-/"
-"_"
-
-#: models.py:235
-msgid "first name"
-msgstr "primeiro nome"
-
-#: models.py:236
-msgid "last name"
-msgstr "último nome"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "endereço de e-mail"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "senha"
 
-#: models.py:239
-msgid "staff status"
-msgstr "membro da equipe"
+#: models.py:201
+msgid "last login"
+msgstr "último login"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica que usuário consegue acessar este site de administração."
-
-#: models.py:242
-msgid "active"
-msgstr "ativo"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Indica que o usuário será tratado como ativo. Ao invés de excluir contas de "
-"usuário, desmarque isso."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "status de superusuário"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -254,15 +224,7 @@ msgstr ""
 "Indica que este usuário tem todas as permissões sem atribuí-las "
 "explicitamente."
 
-#: models.py:248
-msgid "last login"
-msgstr "último login"
-
-#: models.py:249
-msgid "date joined"
-msgstr "data de registro"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -270,26 +232,73 @@ msgstr ""
 "Os grupos que este usuário pertence. Um usuário terá todas as permissões "
 "concedidas a cada um de seus dos grupos."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "permissões do usuário"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "usuário"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Obrigatório. 30 caracteres ou menos. Letras, números e os caracteres @/./+/-/"
+"_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Informe um usuário válido."
+
+#: models.py:383
+msgid "first name"
+msgstr "primeiro nome"
+
+#: models.py:384
+msgid "last name"
+msgstr "último nome"
+
+#: models.py:385
+msgid "email address"
+msgstr "endereço de email"
+
+#: models.py:386
+msgid "staff status"
+msgstr "membro da equipe"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica que usuário consegue acessar este site de administração."
+
+#: models.py:389
+msgid "active"
+msgstr "ativo"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Indica que o usuário será tratado como ativo. Ao invés de excluir contas de "
+"usuário, desmarque isso."
+
+#: models.py:392
+msgid "date joined"
+msgstr "data de registro"
+
+#: models.py:400
 msgid "user"
 msgstr "usuário"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "usuários"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Sessão encerrada"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Informe um endereço de e-mail válido."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo
index 6ebc82279c..27fe84056f 100644
Binary files a/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ro/LC_MESSAGES/django.po b/django/contrib/auth/locale/ro/LC_MESSAGES/django.po
index 1f0496dcba..7c644d8e7c 100644
--- a/django/contrib/auth/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ro/LC_MESSAGES/django.po
@@ -8,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,65 +32,72 @@ msgstr "Permisiuni"
 msgid "Important dates"
 msgstr "Date importante"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Parolă schimbată cu succes."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Schimbă parola: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Un utilizator cu acest nume de utilizator există deja."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Cele două câmpuri pentru parole nu coincid."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obligatoriu. 30 de caractere sau mai puține. Numai litere, cifre și @/./+/-/"
 "_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Această valoare poate conține numai litere, cifre şi @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Parolă"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Confirmare parolă"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Introduceți aceeași parolă, pentru verificare."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Introduceți un nume de utilizator și o parolă corectă. Ambele câmpuri sunt "
-"sensibile la majuscule."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -98,151 +105,108 @@ msgstr ""
 "Navigatorul dumneavoastră nu pare să aibă activat suportul pentru cookies. "
 "Acesta este necesar pentru autentificare."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Acest cont este inactiv."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Adresa de e-mail nu are asociat un cont de utilizator. Sigur v-ați "
-"înregistrat?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Parolă nouă"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Confirmarea parolă nouă"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Parola veche a fost introdusă greșit. Introduceți-o din nou."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Parolă veche"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Parolă (din nou)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "nume"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "nume de cod"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "permisiune"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "permisiuni"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grup"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupuri"
 
-#: models.py:232
-msgid "username"
-msgstr "nume utilizator"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Obligatoriu. 30 de caractere sau mai puține. Numai litere, numere și @/./+/-/"
-"_."
-
-#: models.py:235
-msgid "first name"
-msgstr "Prenume"
-
-#: models.py:236
-msgid "last name"
-msgstr "Nume"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "adresă email"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "parolă"
 
-#: models.py:239
-msgid "staff status"
-msgstr "stare autorizare"
+#: models.py:201
+msgid "last login"
+msgstr "ultima autentificare"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Marchează dacă utilizatorul se poate autentifica în acest site de "
-"administrare."
-
-#: models.py:242
-msgid "active"
-msgstr "activ"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Marchează dacă acest utilizator trebuie tratat ca activ sau nu. Deselectați "
-"în loc de a șterge conturi."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "stare superutilizator"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -250,40 +214,81 @@ msgstr ""
 "Marchează daca acest utilizator are toate permisiunile,  fără a le mai "
 "selecta explicit."
 
-#: models.py:248
-msgid "last login"
-msgstr "ultima autentificare"
-
-#: models.py:249
-msgid "date joined"
-msgstr "data înscrierii"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "permisiuni utilizator"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "nume utilizator"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Obligatoriu. 30 de caractere sau mai puține. Numai litere, numere și @/./+/-/"
+"_."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "Prenume"
+
+#: models.py:384
+msgid "last name"
+msgstr "Nume"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "stare autorizare"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Marchează dacă utilizatorul se poate autentifica în acest site de "
+"administrare."
+
+#: models.py:389
+msgid "active"
+msgstr "activ"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Marchează dacă acest utilizator trebuie tratat ca activ sau nu. Deselectați "
+"în loc de a șterge conturi."
+
+#: models.py:392
+msgid "date joined"
+msgstr "data înscrierii"
+
+#: models.py:400
 msgid "user"
 msgstr "utilizator"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "utilizatori"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Deautentificat"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Introduceți o adresă de e-mail validă."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo
index adcb2ed84f..ce355dc742 100644
Binary files a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po
index 9fbca0a277..40af902c19 100644
--- a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po
@@ -1,24 +1,24 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Eugene MechanisM <contact@mechanism.name>, 2012.
+# Eugene MechanisM <contact@mechanism.name>, 2012-2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Алексей Борискин <sun.void@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-04 18:27+0000\n"
+"Last-Translator: Eugene MechanisM <contact@mechanism.name>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,50 +32,58 @@ msgstr "Права"
 msgid "Important dates"
 msgstr "Важные даты"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Пароль успешно изменен."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Изменение пароля: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Пароль не задан."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Неизвестный формат пароля или алгоритм хеширования."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Пользователь с таким именем уже существует."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Два поля с паролями не совпадают."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Обязательное поле. Введите 30 символов или менее. Используйте только буквы, "
 "цифры и знаки из набора @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Значение должно состоять только из букв, цифр и знаков @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Пароль"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Подтверждение пароля"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Введите тот же пароль, что и выше, для подтверждения."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -85,180 +93,133 @@ msgstr ""
 "этого пользователя. Но вы можете изменить пароль используя <a href="
 "\"password/\">эту форму</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Пожалуйста, введите верные имя пользователя и пароль. Помните, оба поля "
+"Пожалуйста, введите корректные %(username)s и пароль. Оба поля могут быть "
 "чувствительны к регистру."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "У вашего браузера не включены cookies. Cookies необходимы для входа."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Эта учетная запись отключена."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 "Этот адрес электронной почты не связан ни с одной учетной записью. Вы "
 "уверены, что зарегистрированы?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Аккаунт пользователя ассоциированного с этим e-mail адресом не может "
-"сбрасывать пароль."
+"Настройки учётной записи пользователя, связанной с этим адресом электронной "
+"почты, запрещают восстановление пароля."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "Адрес электронной почты"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Новый пароль"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Подтверждение нового пароля"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ваш старый пароль введен неправильно. Пожалуйста, введите его снова."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Пароль (еще раз)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "алгоритм"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "итерации"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "соль"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "хэш"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "рабочий фактор"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "контрольная сумма"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "имя"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "кодовое название"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "право"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "права"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "группа"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "группы"
 
-#: models.py:232
-msgid "username"
-msgstr "имя пользователя"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Обязательное поле. Введите 30 символов или менее. Используйте только буквы, "
-"цифры и знаки из набора @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "имя"
-
-#: models.py:236
-msgid "last name"
-msgstr "фамилия"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "адрес электронной почты"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "пароль"
 
-#: models.py:239
-msgid "staff status"
-msgstr "статус персонала"
+#: models.py:201
+msgid "last login"
+msgstr "последний вход"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Отметьте, если пользователь может входить в административную часть сайта."
-
-#: models.py:242
-msgid "active"
-msgstr "активный"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Отметьте, если пользователь должен считаться активным. Уберите эту отметку "
-"вместо удаления аккаунта."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "статус суперпользователя"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Указывает, что пользователь имеет все права без явного их назначения."
 
-#: models.py:248
-msgid "last login"
-msgstr "последний вход"
-
-#: models.py:249
-msgid "date joined"
-msgstr "дата регистрации"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -266,26 +227,74 @@ msgstr ""
 "Группы, к которым принадлежит пользователь. Пользователь будет иметь все "
 "права, указанные в каждой его/её группе."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "права пользователя"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "имя пользователя"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Обязательное поле. Введите 30 символов или менее. Используйте только буквы, "
+"цифры и знаки из набора @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Введите правильное имя пользователя."
+
+#: models.py:383
+msgid "first name"
+msgstr "имя"
+
+#: models.py:384
+msgid "last name"
+msgstr "фамилия"
+
+#: models.py:385
+msgid "email address"
+msgstr "адрес электронной почты"
+
+#: models.py:386
+msgid "staff status"
+msgstr "статус персонала"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Отметьте, если пользователь может входить в административную часть сайта."
+
+#: models.py:389
+msgid "active"
+msgstr "активный"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Отметьте, если пользователь должен считаться активным. Уберите эту отметку "
+"вместо удаления учётной записи."
+
+#: models.py:392
+msgid "date joined"
+msgstr "дата регистрации"
+
+#: models.py:400
 msgid "user"
 msgstr "пользователь"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "пользователи"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Не авторизован"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Введите правильный адрес электронной почты."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo
index 6182992b80..acdc19fc5b 100644
Binary files a/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/sk/LC_MESSAGES/django.po b/django/contrib/auth/locale/sk/LC_MESSAGES/django.po
index 993ccfcf13..326b9e1118 100644
--- a/django/contrib/auth/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sk/LC_MESSAGES/django.po
@@ -2,21 +2,23 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Juraj Bubniak <>, 2012.
+# Juraj Bubniak <translations@jbub.eu>, 2012.
 # Marian Andre <marian@andre.sk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-19 15:18+0000\n"
+"Last-Translator: Juraj Bubniak <translations@jbub.eu>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,211 +32,186 @@ msgstr "Práva"
 msgid "Important dates"
 msgstr "Dôležité dátumy"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Heslo úspešne zmenené."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Zmeniť heslo: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Žiadne heslo."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Neplatný formát hesla alebo neznámy hašovací algoritmus."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Používateľ s takým používateľským menom už existuje."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Heslo a jeho potvrdenie sa nezhodujú."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Používateľské meno"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Povinné. 30 znakov alebo menej. Iba písmená, čísla a @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Táto hodnota môže obsahovať len písmená, číslice a znaky @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Heslo"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Potvrdenie hesla"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Heslá v pôvodnom tvare nie sú ukladané, takže neexistuje spôsob zobraziť "
+"heslo užívateľa. Môžete ho však zmeniť pomocou <a href=\"password/\">tohoto "
+"formulára</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Prosím, zadajte správne používateľské meno a heslo. Rešpektujte malé a veľké "
-"písmená."
+"Zadajte prosím správne %(username)s a heslo. Všimnite si, že obe polia môžu "
+"obsahovať veľké a malé písmená."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "Váš prehliadač nemá povolené cookies. Cookies sú potrebné pre prihlásenie."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Tento účet je neaktívny."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Táto e-mail adresa nemá priradený žiadny používateľský účet. Ste si istý, že "
-"ste sa zaregistrovali?"
+"Táto e-mailová adresa nemá pridružený užívateľský účet. Ste si istí, že ste "
+"sa zaregistrovali?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Používateľský účet spojený s touto e-mailovou adresu nemôže obnoviť heslo."
+"Užívateľský účet pridružený k tejto e-mailovej adrese nemože obnoviť heslo."
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "E-mail"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nové heslo"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Potvrdenie nového hesla"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Nezadali ste správne svoje staré heslo. Napíšte ho znovu, prosím."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Heslo (znova)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "algoritmus"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "iterácie"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "faktor práce"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "kontrolný súčet"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "meno"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kódové meno"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "oprávnenie"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "oprávnenia"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "skupina"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "skupiny"
 
-#: models.py:232
-msgid "username"
-msgstr "používateľské meno"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Povinné. 30 znakov alebo menej. Len písmená, číslice a znaky @/./+/-/_."
-
-#: models.py:235
-msgid "first name"
-msgstr "krstné meno"
-
-#: models.py:236
-msgid "last name"
-msgstr "priezvisko"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mailová adresa"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "heslo"
 
-#: models.py:239
-msgid "staff status"
-msgstr "postavenie zamestnanca"
+#: models.py:201
+msgid "last login"
+msgstr "naposledy prihlásený"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Určuje, či sa používateľ môže prihlásiť do správy stránok."
-
-#: models.py:242
-msgid "active"
-msgstr "aktívny"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Určuje, či je účet aktívny. Odškrtnite, ak chcete vypnúť používateľský účet."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "status superpoužívateľa"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -242,40 +219,79 @@ msgstr ""
 "Určuje, či používateľ získava automaticky všetky práva aj bez priameho "
 "priradenia."
 
-#: models.py:248
-msgid "last login"
-msgstr "naposledy prihlásený"
-
-#: models.py:249
-msgid "date joined"
-msgstr "dátum registrácie"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
+"Skupiny do ktorých užívateľ patrí. Užívateľ dostane všetky povolenia do "
+"každej z jeho skupín."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "používateľské oprávnenia"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "používateľské meno"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Povinné. 30 znakov alebo menej. Len písmená, číslice a znaky @/./+/-/_."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Zadajte platné užívateľské meno."
+
+#: models.py:383
+msgid "first name"
+msgstr "krstné meno"
+
+#: models.py:384
+msgid "last name"
+msgstr "priezvisko"
+
+#: models.py:385
+msgid "email address"
+msgstr "e-mailová adresa"
+
+#: models.py:386
+msgid "staff status"
+msgstr "postavenie zamestnanca"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Určuje, či sa používateľ môže prihlásiť do správy stránok."
+
+#: models.py:389
+msgid "active"
+msgstr "aktívny"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Určuje, či je účet aktívny. Odškrtnite, ak chcete vypnúť používateľský účet."
+
+#: models.py:392
+msgid "date joined"
+msgstr "dátum registrácie"
+
+#: models.py:400
 msgid "user"
 msgstr "používateľ"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "používatelia"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Odhlásený"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Zadajte platnú e-mailovú adresu."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo
index 522b2f8129..daf283aa93 100644
Binary files a/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/sl/LC_MESSAGES/django.po b/django/contrib/auth/locale/sl/LC_MESSAGES/django.po
index 55507e5ae9..a420a751ba 100644
--- a/django/contrib/auth/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sl/LC_MESSAGES/django.po
@@ -1,23 +1,27 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Jure Cuhalev <gandalf@owca.info>, 2012.
+# Jure Čuhalev <gandalf@owca.info>, 2012.
+#  <zejn@kiberpipa.org>, 2013.
 #   <zejn@kiberpipa.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:36+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-02-15 18:00+0000\n"
 "Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,263 +35,270 @@ msgstr "Dovoljenja"
 msgid "Important dates"
 msgstr "Pomembni datumi"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
-msgstr "Geslo je bilo uspešno spremenjeno."
+msgstr "Geslo je uspešno spremenjeno."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Spremeni geslo: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Geslo ni nastavljeno."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Neveljavna oblika gesla ali neznan algoritem razpršila."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Uporabnik s tem uporabniškim imenom že obstaja."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Gesli se ne ujemata."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
-"Zahtevano. 30 znakov ali manj. Samo alfanumerični znaki ali naslednji znaki "
-"@/./+/-/_."
+"Polje je obvezno. Vpisanih mora biti do 30 znakov, ti pa so lahko črke, "
+"številke in znaki @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-"Ta vrednost sme vsebovati le črke, števila ali kateri znak izmed @/./+/-/_."
+msgstr "Ta vrednost lahko vsebuje le črke, števila in znake @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Geslo"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Potrditev gesla"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
-msgstr "Vpišite enako geslo kot zgoraj, da se izognete tipkarskim napakam."
+msgstr "Ponovno vpišite izbrano geslo za overitev."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
-"Gesla se ne shranjujejo v berljivi obliki, zato ne morete videti gesla tega "
-"uporabnika, lahko pa geslo spremenite s pomočjo <a href=\"password/\">tega "
+"Gesla se ne shranjujejo v berljivi obliki, zato gesla tega uporabnika ni "
+"mogoče videti. Geslo lahko spremenite s pomočjo <a href=\"password/\">tega "
 "obrazca</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Prosimo, vnesite veljavno uporabniško ime in geslo. Opomba: obe polji "
-"upoštevata velikost črk."
+"Vnesite veljavno %(username)s in geslo. Opomba: obe polji upoštevata "
+"velikost črk."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
-"Izgleda, da vaš brskalnik nima omogočenih piškotkov. Piškotki so potrebni za "
-"prijavo."
+"Videti je, da brskalnik nima omogočenih piškotkov. Piškotki so nujni za "
+"overjanje prijave."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
-msgstr "Ta uporabniški račun ni aktiven."
+msgstr "Ta uporabniški račun ni dejaven."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Tega e-mail naslova ni mogoče pripisati nobenemu uporabniku. Ali ste "
-"prepričani, da ste registrirani?"
+"Tega elektronskega naslova ni mogoče pripisati nobenemu uporabniku. Ali ste "
+"prepričani, da ste že vpisani?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr "Uporabnik s tem e-poštnim naslovom ne more ponastaviti gesla."
+msgstr ""
+"Uporabnik s tem elektronskim naslovom nima dovoljen za ponastavitev gesla."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-poštni naslov"
+#: forms.py:211
+msgid "Email"
+msgstr "Elektronski naslov"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Novo geslo"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Potrditev novega gesla"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "Vaše staro geslo ni pravilno. Prosim, poskusite ponovno."
+msgstr "Vaše staro geslo ni vneseno pravilno. Poskusite znova."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Staro geslo"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
-msgstr "Geslo (ponovno)"
+msgstr "Geslo (znova)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritem"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr "iteracij"
+msgstr "ponovitev"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "naključna vrednost"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr "zgoščena vsota"
+msgstr "razpršilo"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "faktor obremenitve"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr "preverjevalna vsota"
+msgstr "nadzorna vsota"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ime"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kodno ime"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "dovoljenje"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "dovoljenja"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "skupina"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "skupine"
 
-#: models.py:232
-msgid "username"
-msgstr "uporabniško ime"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Zahtevano. 30 znakov ali manj. Samo alfanumerični znaki in kateri znak izmed "
-"@/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "ime"
-
-#: models.py:236
-msgid "last name"
-msgstr "priimek"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail naslov"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "geslo"
 
-#: models.py:239
-msgid "staff status"
-msgstr "status osebja"
-
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Določi, če se sme uporabnik prijaviti v to administracijsko stran."
-
-#: models.py:242
-msgid "active"
-msgstr "aktiven"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Določi, če se uporabnik smatra za aktivega. Odstranite to možnost namesto da "
-"brišete račune."
-
-#: models.py:245
-msgid "superuser status"
-msgstr "status superuporabnika"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Uporabnik bo imel vse pravice brez da bi mu morali posamično dodeljevati "
-"pravice."
-
-#: models.py:248
+#: models.py:201
 msgid "last login"
 msgstr "zadnja prijava"
 
-#: models.py:249
-msgid "date joined"
-msgstr "registriran od"
+#: models.py:298
+msgid "superuser status"
+msgstr "stanje skrbnika"
 
-#: models.py:251
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "Uporabnik bo imel skrbniška dovoljenja."
+
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
-"Skupine, katerih član je ta uporabnik. Uporabnik pridobi vse pravice, "
-"povezane z vsako skupino."
+"Skupine, katerih član je ta uporabnik. Uporabnik pridobi vsa dovoljenja, "
+"povezana s to skupino."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "uporabniška dovoljenja"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "uporabniško ime"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Polje je obvezno. Vpisanih mora biti do 30 znakov, ti pa so lahko črke, "
+"številke in znaki @/./+/-/_."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Vnesite veljavno uporabniško ime."
+
+#: models.py:383
+msgid "first name"
+msgstr "ime"
+
+#: models.py:384
+msgid "last name"
+msgstr "priimek"
+
+#: models.py:385
+msgid "email address"
+msgstr "elektronski naslov"
+
+#: models.py:386
+msgid "staff status"
+msgstr "stanje osebja"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Določi, ali se sme uporabnik prijaviti kot skrbnik."
+
+#: models.py:389
+msgid "active"
+msgstr "dejaven"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Določi, ali je uporabnik dejaven. Možnost je priročna in preprečuje brisanje "
+"računov."
+
+#: models.py:392
+msgid "date joined"
+msgstr "vpisan od"
+
+#: models.py:400
 msgid "user"
 msgstr "uporabnik"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "uporabniki"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Odjavljen"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Vnesite veljaven e-mail."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr "Geslo na %(site_name)s je bilo ponastavljeno."
+msgstr "Geslo na %(site_name)s je ponastavljeno."
diff --git a/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo
index f7d1abacfe..04bd5ff232 100644
Binary files a/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/sq/LC_MESSAGES/django.po b/django/contrib/auth/locale/sq/LC_MESSAGES/django.po
index 9248543866..60db57590d 100644
--- a/django/contrib/auth/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sq/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Besnik <besnik@programeshqip.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-02-20 08:30+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,66 +30,76 @@ msgstr "Leje"
 msgid "Important dates"
 msgstr "Të dhëna të rëndësishme"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Fjalëkalimi u ndryshua me sukses."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Ndryshoni fjalëkalimin: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Nuk ka fjalëkalim të caktuar."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Format i pavlefshëm fjalëkalimi ose algoritëm i panjohur hashi."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Ka tashmë një emër të tillë përdoruesi."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Dy fushat për fjalëkalim nuk u përputhën."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Emër përdoruesi"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "E domosdoshme. 30 ose më pak shenja. Vetëm shkronja, shifra dhe shenjat @/./"
 "+/-/_ ."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Kjo vlerë mund të përmbajë vetëm shkronja, numra dhe shenja si @/./+/-/_ ."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Fjalëkalim"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Ripohim fjalëkalimi"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
-msgstr "Jepni të njëjtin fjalëkalim si më sipër, për verifikim."
+msgstr "Jepni, për verifikim, të njëjtin fjalëkalim si më sipër."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Fjalëkalimet shqeto nuk depozitohenm ndaj nuk ka ndonjë mënyrë si të shihet "
+"fjalëkalimi i këtij përdoruesi, por mund ta ndryshoni fjalëkalimin duke "
+"përdorur <a href=\"password/\">këtë formular</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Ju lutem, jepni një emër përdoruesi dhe fjalëkalim të saktë. Mbani parasysh "
-"që për të dyja fushat luan rol shkrimi me të madhe apo me të vogël."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -96,136 +107,169 @@ msgstr ""
 "Shfletuesi juaj Web nuk duket se i ka të aktivizuara \"cookie\"-t. \"Cookie"
 "\"-t janë të domosdoshme për hyrjen."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Kjo llogari nuk është aktive."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Kësaj adrese e-mail nuk i përshoqërohet ndonjë llogari përdoruesi. Jeni i "
+"Kësaj adrese email nuk i përshoqërohet ndonjë llogari përdoruesi. Jeni i "
 "sigurt se jeni regjistruar?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
+"Llogaria e përdoruesit të përshoqëruar me këtë adres email nuk mund të "
+"kryejë ricaktim të fjalëkalimit."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr "Email"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Fjalëkalim i ri"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Ripohim fjalëkalimi të ri"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Fjalëkalimi juaj i vjetër u dha pasaktësisht. Ju lutem, jepeni sërish."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Fjalëkalim i vjetër"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Fjalëkalim (sërish)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "algoritëm"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "përsëritje"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "kripë"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "emër"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "emër i koduar"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "leje"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "leje"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grup"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupe"
 
-#: models.py:232
+#: models.py:200
+msgid "password"
+msgstr "fjalëkalim"
+
+#: models.py:201
+msgid "last login"
+msgstr "hyrja e fundit"
+
+#: models.py:298
+msgid "superuser status"
+msgstr "gjendje superpërdoruesi"
+
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Përcakton që ky përdorues ka krejt lejet, pa ia akorduar ato shprehimisht."
+
+#: models.py:302
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
+"Grupet ku bën pjesë ky përdorues. Një përdorues përfiton krejt lejet e dhëna "
+"për secilin grup të tij/saj."
+
+#: models.py:306
+msgid "user permissions"
+msgstr "leje përdoruesi"
+
+#: models.py:377
 msgid "username"
 msgstr "emër përdoruesi"
 
-#: models.py:233
+#: models.py:378
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "E domosdoshme. 30 ose më pak shenja. Shkronja, numra dhe shenjat @/./+/-/_"
 
-#: models.py:235
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Jepni emër përdoruesi të vlefshëm."
+
+#: models.py:383
 msgid "first name"
 msgstr "emër"
 
-#: models.py:236
+#: models.py:384
 msgid "last name"
 msgstr "mbiemër"
 
-#: models.py:237
-msgid "e-mail address"
-msgstr "adresë e-mail"
+#: models.py:385
+msgid "email address"
+msgstr "adresë email"
 
-#: models.py:238
-msgid "password"
-msgstr "fjalëkalim"
-
-#: models.py:239
+#: models.py:386
 msgid "staff status"
 msgstr "vend në ekip"
 
-#: models.py:240
+#: models.py:387
 msgid "Designates whether the user can log into this admin site."
 msgstr "Përcakton nëse mund të hyjë ose jo përdoruesi te ky site administrimi."
 
-#: models.py:242
+#: models.py:389
 msgid "active"
 msgstr "veprues"
 
-#: models.py:243
+#: models.py:390
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -233,52 +277,23 @@ msgstr ""
 "Përcakton nëse ky përdorues do të duhej trajtuar si aktiv. Çpërzgjidhni "
 "këtë, në vend se të fshihni llogarira."
 
-#: models.py:245
-msgid "superuser status"
-msgstr "gjendje superpërdoruesi"
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Përcakton që ky përdorues ka krejt lejet, pa ia akorduar ato shprehimisht."
-
-#: models.py:248
-msgid "last login"
-msgstr "hyrja e fundit"
-
-#: models.py:249
+#: models.py:392
 msgid "date joined"
 msgstr "datë anëtarësimi"
 
-#: models.py:251
-msgid ""
-"The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
-msgstr ""
-
-#: models.py:255
-msgid "user permissions"
-msgstr "leje përdoruesi"
-
-#: models.py:260
+#: models.py:400
 msgid "user"
 msgstr "përdorues"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "përdoruesa"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "I dalë"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Jepni një adresë e-mail të vlefshme."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr ""
+msgstr "Ricaktim fjalëkalimi për te %(site_name)s"
diff --git a/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo
index 8f00079553..ec971cc7ed 100644
Binary files a/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/sr/LC_MESSAGES/django.po b/django/contrib/auth/locale/sr/LC_MESSAGES/django.po
index 8ff0d7cf77..62b509298a 100644
--- a/django/contrib/auth/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sr/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,50 +31,58 @@ msgstr "Дозволе"
 msgid "Important dates"
 msgstr "Важни датуми"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Лозинка успешно измењена."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Измени лозинку: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Корисник са тим корисничким именом већ постоји."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Два поља за лозинке се нису поклопила."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Корисник"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Неопходно. Највише 30 словних места. Само алфанумерички знаци (слова, бројке "
 "и @/./+/-/_)."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Ова вредност може садржати само слова, бројке и @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Лозинка"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Потврда лозинке"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Ради провере тачности поново унесите лозинку коју сте унели горе."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -83,15 +91,14 @@ msgstr ""
 "Лозинке у изворном облику се не чувају, тако да се не могу видети, али се "
 "могу променити <a href=\"password/\">овде</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Унесите тачно корисничко име и лозинку. Пазите на разлику између малих и "
-"великих слова у оба поља."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -99,165 +106,115 @@ msgstr ""
 "Изгледа да су колачићи искључени у вашем браузеру. Они морају бити укључени "
 "да би сте се пријавили."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Овај налог је неактиван."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Та имејл адреса није у вези ни са једним налогом. Да ли сте сигурни да сте "
-"се већ регистровали?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr "Корисник са овом имејл адресом није у могућности да ресетује лозинку."
+msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Имејл адреса"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Потврда нове лозинке"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ваша стара лознка није правилно унесена. Унесите је поново."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Стара лозинка"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Лозинка (поновите)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "алгоритам"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "итерације"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "зачин"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "хеш"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "фактор рада"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "сума за проверу"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "име"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "шифра дозволе"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "дозвола"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "дозволе"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "група"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "групе"
 
-#: models.py:232
-msgid "username"
-msgstr "корисничко име"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Неопходно. Највише 30 словних места. Само алфанумерички знаци (слова, бројке "
-"и @/./+/-/_)."
-
-#: models.py:235
-msgid "first name"
-msgstr "име"
-
-#: models.py:236
-msgid "last name"
-msgstr "презиме"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "имејл адреса"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "лозинка"
 
-#: models.py:239
-msgid "staff status"
-msgstr "статус члана посаде"
+#: models.py:201
+msgid "last login"
+msgstr "последња пријава"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Означава да ли корисник може да се пријави на овај сајт за администрацију."
-
-#: models.py:242
-msgid "active"
-msgstr "активан"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Означава да ли се корисник сматра активним. Деселектујте ово уместо да "
-"бришете налог."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "статус администратора"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Означава да ли корисник има све дозволе без додељивања појединачних дозвола."
 
-#: models.py:248
-msgid "last login"
-msgstr "последња пријава"
-
-#: models.py:249
-msgid "date joined"
-msgstr "датум регистрације"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -265,26 +222,74 @@ msgstr ""
 "Групе којима корисник припада. Корисник ће добити све дозволе група у којим "
 "се налази."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "корисничке дозволе"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "корисничко име"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Неопходно. Највише 30 словних места. Само алфанумерички знаци (слова, бројке "
+"и @/./+/-/_)."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "име"
+
+#: models.py:384
+msgid "last name"
+msgstr "презиме"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "статус члана посаде"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Означава да ли корисник може да се пријави на овај сајт за администрацију."
+
+#: models.py:389
+msgid "active"
+msgstr "активан"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Означава да ли се корисник сматра активним. Деселектујте ово уместо да "
+"бришете налог."
+
+#: models.py:392
+msgid "date joined"
+msgstr "датум регистрације"
+
+#: models.py:400
 msgid "user"
 msgstr "корисник"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "корисници"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Одјављен"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Унесите важећу имејл адресу."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo
index 7daf326c40..a81c96ce23 100644
Binary files a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po
index 6122d8a565..858cf700be 100644
--- a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,50 +31,58 @@ msgstr "Dozvole"
 msgid "Important dates"
 msgstr "Važni datumi"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Lozinka uspešno izmenjena."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Izmeni lozinku: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Korisnik sa tim korisničkim imenom već postoji."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Dva polja za lozinke se nisu poklopila."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Korisnik"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Neophodno. Najviše 30 slovnih mesta. Samo alfanumerički znaci (slova, brojke "
 "i @/./+/-/_)."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Ova vrednost može sadržati samo slova, brojke i @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Lozinka"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Potvrda lozinke"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Radi provere tačnosti ponovo unesite lozinku koju ste uneli gore."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -83,15 +91,14 @@ msgstr ""
 "Lozinke u izvornom obliku se ne čuvaju, tako da se ne mogu videti, ali se "
 "mogu promeniti <a href=\"password/\">ovde</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Unesite tačno korisničko ime i lozinku. Pazite na razliku između malih i "
-"velikih slova u oba polja."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -99,150 +106,108 @@ msgstr ""
 "Izgleda da su kolačići isključeni u vašem brauzeru. Oni moraju biti "
 "uključeni da bi ste se prijavili."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Ovaj nalog je neaktivan."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Ta imejl adresa nije u vezi ni sa jednim nalogom. Da li ste sigurni da ste "
-"se već registrovali?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr "Korisnik sa ovom imejl adresom nije u mogućnosti da resetuje lozinku."
+msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Imejl adresa"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Potvrda nove lozinke"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaša stara loznka nije pravilno unesena. Unesite je ponovo."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Stara lozinka"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Lozinka (ponovite)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritam"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iteracije"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "začin"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "heš"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "faktor rada"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "suma za proveru"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ime"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "šifra dozvole"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "dozvola"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "dozvole"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupa"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupe"
 
-#: models.py:232
-msgid "username"
-msgstr "korisničko ime"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Neophodno. Najviše 30 slovnih mesta. Samo alfanumerički znaci (slova, brojke "
-"i @/./+/-/_)."
-
-#: models.py:235
-msgid "first name"
-msgstr "ime"
-
-#: models.py:236
-msgid "last name"
-msgstr "prezime"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "imejl adresa"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "lozinka"
 
-#: models.py:239
-msgid "staff status"
-msgstr "status člana posade"
+#: models.py:201
+msgid "last login"
+msgstr "poslednja prijava"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-"Označava da li korisnik može da se prijavi na ovaj sajt za administraciju."
-
-#: models.py:242
-msgid "active"
-msgstr "aktivan"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Označava da li se korisnik smatra aktivnim. Deselektujte ovo umesto da "
-"brišete nalog."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "status administratora"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -250,15 +215,7 @@ msgstr ""
 "Označava da li korisnik ima sve dozvole bez dodeljivanja pojedinačnih "
 "dozvola."
 
-#: models.py:248
-msgid "last login"
-msgstr "poslednja prijava"
-
-#: models.py:249
-msgid "date joined"
-msgstr "datum registracije"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -266,26 +223,74 @@ msgstr ""
 "Grupe kojima korisnik pripada. Korisnik će dobiti sve dozvole grupa u kojim "
 "se nalazi."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "korisničke dozvole"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "korisničko ime"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Neophodno. Najviše 30 slovnih mesta. Samo alfanumerički znaci (slova, brojke "
+"i @/./+/-/_)."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "ime"
+
+#: models.py:384
+msgid "last name"
+msgstr "prezime"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "status člana posade"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Označava da li korisnik može da se prijavi na ovaj sajt za administraciju."
+
+#: models.py:389
+msgid "active"
+msgstr "aktivan"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Označava da li se korisnik smatra aktivnim. Deselektujte ovo umesto da "
+"brišete nalog."
+
+#: models.py:392
+msgid "date joined"
+msgstr "datum registracije"
+
+#: models.py:400
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "korisnici"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Odjavljen"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Unesite važeću imejl adresu."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo
index 2f02ca3b39..6ad75e0595 100644
Binary files a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po
index a3ec335b8f..693b5820a4 100644
--- a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po
@@ -1,23 +1,25 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Andreas Pelme <andreas@pelme.se>, 2011, 2012.
+# Alex Nordlund <deep.alexander@gmail.com>, 2012.
+# Andreas Pelme <andreas@pelme.se>, 2011-2013.
+#   <cybjit@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Samuel Linde <samuel@linde.im>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-06 08:43+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,50 +33,58 @@ msgstr "Rättigheter"
 msgid "Important dates"
 msgstr "Viktiga datum"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Lösenordet ändrades."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Ändra lösenord: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Inget lösenord angivet."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Ogiltigt lösenordsformat eller okänd hashalgoritm."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "En användare med det användarnamnet finns redan."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "De två lösenordsfälten stämde inte överens."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Användarnamn"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obligatoriskt. 30 tecken eller färre. Endast bokstäver, siffror och @/./+/-/"
 "_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Detta värde får endast innehålla bokstäver, siffror och @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Lösenord"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Lösenordsbekräftelse"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Fyll i samma lösenord som ovan för verifiering."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -84,15 +94,16 @@ msgstr ""
 "lösenord, men du kan ändra lösenordet med <a href=\"password/\">detta "
 "formulär</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Var god ange ett korrekt användarnamn och lösenord. Tänk på att skilja "
-"mellan gemener och versaler."
+"Ange ett korrekt %(username)s och lösenord. Observera att båda fälten är "
+"skiftlägeskänsliga."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -100,147 +111,110 @@ msgstr ""
 "Din webbläsare verkar inte tillåta cookies. Cookies behövs för att kunna "
 "logga in."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Detta konto är inaktivt."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 "Den e-postadressen är inte associerad med något användarkonto. Är du säker "
 "på att du har registrerat dig?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr "Användarkontot med denna e-postadress kan inte återställa lösenordet."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-postadress"
+#: forms.py:211
+msgid "Email"
+msgstr "E-postaddress"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Bekräfta nytt lösenord"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ditt gamla lösenord var felaktigt ifyllt. Var vänlig fyll i det igen."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Lösenord (igen)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritm"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterationer"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "arbetsfaktor"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "kontrollsumma"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "namn"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "kodnamn"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "rättighet"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "rättigheter"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grupp"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "grupper"
 
-#: models.py:232
-msgid "username"
-msgstr "användarnamn"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Obligatorisk. 30 tecken eller färre. Bokstäver, siffror och @/./+/-/_."
-
-#: models.py:235
-msgid "first name"
-msgstr "förnamn"
-
-#: models.py:236
-msgid "last name"
-msgstr "efternamn"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-postadress"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "lösenord"
 
-#: models.py:239
-msgid "staff status"
-msgstr "personalstatus"
+#: models.py:201
+msgid "last login"
+msgstr "senaste inloggning"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Avgör om användaren kan logga in på denna adminsida."
-
-#: models.py:242
-msgid "active"
-msgstr "aktiv"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Anger om användaren skall betraktas som aktiv. Avmarkera detta istället för "
-"att ta bort konton."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "superanvändare"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -248,15 +222,7 @@ msgstr ""
 "Anger att denna användare har alla rättigheter utan att uttryckligen "
 "tilldela dem."
 
-#: models.py:248
-msgid "last login"
-msgstr "senaste inloggning"
-
-#: models.py:249
-msgid "date joined"
-msgstr "registreringsdatum"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -264,26 +230,71 @@ msgstr ""
 "De grupper som användaren är medlem i. En användare får tillgång till alla "
 "rättigheter som hans/hennes grupper har."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "användarättigheter"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "användarnamn"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Obligatorisk. 30 tecken eller färre. Bokstäver, siffror och @/./+/-/_."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Ange ett giltigt användarnamn."
+
+#: models.py:383
+msgid "first name"
+msgstr "förnamn"
+
+#: models.py:384
+msgid "last name"
+msgstr "efternamn"
+
+#: models.py:385
+msgid "email address"
+msgstr "e-postaddress"
+
+#: models.py:386
+msgid "staff status"
+msgstr "personalstatus"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Avgör om användaren kan logga in på denna adminsida."
+
+#: models.py:389
+msgid "active"
+msgstr "aktiv"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Anger om användaren skall betraktas som aktiv. Avmarkera detta istället för "
+"att ta bort konton."
+
+#: models.py:392
+msgid "date joined"
+msgstr "registreringsdatum"
+
+#: models.py:400
 msgid "user"
 msgstr "användare"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "användare"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Utloggad"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Fyll i en giltig e-postadress."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/sw/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sw/LC_MESSAGES/django.mo
index 3e90250144..a95069c50c 100644
Binary files a/django/contrib/auth/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/sw/LC_MESSAGES/django.po b/django/contrib/auth/locale/sw/LC_MESSAGES/django.po
index 86c32b6cd2..2e7d604ba0 100644
--- a/django/contrib/auth/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sw/LC_MESSAGES/django.po
@@ -1,20 +1,21 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# machaku  <bmachaku@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -28,242 +29,263 @@ msgstr "Ruhusa"
 msgid "Important dates"
 msgstr "Tarehe muhimu"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Nenosiri limebadilishwa kwa mafanikio"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Badilish nenosiri: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Hakuna nenosiri lililowekwa."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Muundo batili wa nenosiri au algorithm ya kuhash isiyojulikana"
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Mtumiaji mwenye jina la mtumiaji hilo tayari yupo."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Sehemu mbili za nenosiri hazikufanana"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Jina la mtumiaji"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Inahitajika. vibambo 30 au pungufu. Herufi, Tarakimu na @/./+/-/_ tu. "
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Thamani hii inaweza kuwa na herufi, tarakimu na vibambo @/./+/-/_ tu"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Nenosiri"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Uthibitisho wa nenosiri"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Ingiza nenosiri linalofanana na la juu, kwa uthibitisho"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"Manenosiri ghafi hayahifadhiwi, hivyo hakuna namna ya kuona nenosiri la "
+"mtumiaji huyu, ila unaweza kubadilisha nenosiri kwa kutumia <a href="
+"\"password/\">fomu hii</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
+"Inaonekana kuwa kivinjari chako cha wavuti hakiruhusu kuki. Kuki "
+"zinahitajika ili kuingia."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
-msgstr ""
+msgstr "Akaunti hii si hai."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
+"Anuani hiyo ya barua pepe haina akaunti inayoendana nayo. Una hakika "
+"Umejisajili?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
+"Akaunti ya mtumiaji inayohusika na barua pepe hii haiwezi kuwekwa nenosiri "
+"upya."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "Baruapepe"
+#: forms.py:211
+msgid "Email"
+msgstr "Barua pepe"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Nenosiri jipya"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Uthibitisho wa nenosiri jipya"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Nenosiri lako la zamani liliingizwa isivyo sahihi. Tafadhali liingize tena."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Nenosiri la zamani"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Nenosiri (tena)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "alogarithimu"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "mizunguko"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "kazi inayohitajika"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "jina"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
-msgstr ""
+msgstr "jina la msimbo"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "ruhusa"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "ruhusa"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "kundi"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "makundi"
 
-#: models.py:232
-msgid "username"
-msgstr "jina la mtumiaji"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr "jina la kwanza"
-
-#: models.py:236
-msgid "last name"
-msgstr "jina la mwisho"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "anuani ya baruapepe"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "nenosiri"
 
-#: models.py:239
-msgid "staff status"
-msgstr ""
-
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-
-#: models.py:242
-msgid "active"
-msgstr ""
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
-msgid "superuser status"
-msgstr ""
-
-#: models.py:246
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-
-#: models.py:248
+#: models.py:201
 msgid "last login"
 msgstr "kuingia kwa mara ya mwisho"
 
-#: models.py:249
-msgid "date joined"
-msgstr "tarehe ya kujiunga"
+#: models.py:298
+msgid "superuser status"
+msgstr "hadhi ya mtumiaji wa juu"
 
-#: models.py:251
+#: models.py:299
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr "Teua mtumiaji huyu kuwa na ruhusa zote pasipo kuziainisha wazi."
+
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
+"Vikundi ambavyo mtumiaji huyu yupo. Mtumiaji atapata ruhusa zote "
+"zinazotolewa kwa kila mwanakundi hili."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "ruhusa za mtumiaji"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "jina la mtumiaji"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Inatakiwa. vibambo 30 au pungufu. Herufi, namba na vibambo @ / / + /-/_ ."
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Ingiza halali Jina la mtumiaji "
+
+#: models.py:383
+msgid "first name"
+msgstr "jina la kwanza"
+
+#: models.py:384
+msgid "last name"
+msgstr "jina la mwisho"
+
+#: models.py:385
+msgid "email address"
+msgstr "anuani ya barua pepe"
+
+#: models.py:386
+msgid "staff status"
+msgstr "hadhi ya utawala"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Teua kama mtumiaji anaweza kuingia katika tovuti ya utawala."
+
+#: models.py:389
+msgid "active"
+msgstr "hai"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr " "
+
+#: models.py:392
+msgid "date joined"
+msgstr "tarehe ya kujiunga"
+
+#: models.py:400
 msgid "user"
 msgstr "mtumiaji"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "watumiaji"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
-msgstr ""
-
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Ingiza anuani ya baruapepe iliyo sahihi"
+msgstr "Umetoka"
 
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
diff --git a/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo
index 398dd6f1f6..eede2ed4fd 100644
Binary files a/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ta/LC_MESSAGES/django.po b/django/contrib/auth/locale/ta/LC_MESSAGES/django.po
index a2f48ebebd..bdd334cc87 100644
--- a/django/contrib/auth/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ta/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -29,245 +29,252 @@ msgstr "அனுமதிகள்"
 msgid "Important dates"
 msgstr "முக்கியமான தேதிகள்"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "பயனர்ப்பெயர்"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr ""
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "மேலே அதே கடவுச்சொல்லை உள்ளிடவும், சரிபார்ப்பதற்காக ."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"தயவுசெய்து சரியான பயனர்ப்பெயர் மற்றும் கடவுச்சொல்லை உள்ளிடவும். இரண்டும் எழுத்துவகையைச் "
-"சார்ந்தது."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 " உங்கள் இணைய உலாவியில்  குக்கிகள்  செயலாக்கம் பெறவில்லை. உள்நுழைவதற்கு குக்கிகள் அவசியம்."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "இந்த கணக்கு செயல்பட துவங்கவில்லை"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr ""
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr ""
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "கடவுச்சொல்(மறுபடியும்)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "பெயர்"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "குறிமுறை பெயர்"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "அனுமதி"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "அனுமதிகள்"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "குழு"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "குழுக்கள்"
 
-#: models.py:232
-msgid "username"
-msgstr "பயனர் பெயர்"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr "முதல் பெயர்"
-
-#: models.py:236
-msgid "last name"
-msgstr "கடைசி பெயர்"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "மின்னஞ்சல் முகவரி"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "கடவுச்சொல்"
 
-#: models.py:239
-msgid "staff status"
-msgstr "பணியாளர் நிலை"
+#: models.py:201
+msgid "last login"
+msgstr "கடைசி உள்நுழைவு"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "பயனர், 'மேலாளலர்' பக்கத்தில் நுழைவதை முடிவு செய்கிறது"
-
-#: models.py:242
-msgid "active"
-msgstr "செயல்படும்"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "மேலாளர் இருப்பு நிலை"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "இந்த பயனருக்கு எல்லா அங்கீகாரங்களும் வழங்கப்படவில்லை."
 
-#: models.py:248
-msgid "last login"
-msgstr "கடைசி உள்நுழைவு"
-
-#: models.py:249
-msgid "date joined"
-msgstr "சேர்ந்த தேதி"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "பயனர் அனுமதிகள்"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "பயனர் பெயர்"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "முதல் பெயர்"
+
+#: models.py:384
+msgid "last name"
+msgstr "கடைசி பெயர்"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "பணியாளர் நிலை"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "பயனர், 'மேலாளலர்' பக்கத்தில் நுழைவதை முடிவு செய்கிறது"
+
+#: models.py:389
+msgid "active"
+msgstr "செயல்படும்"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "சேர்ந்த தேதி"
+
+#: models.py:400
 msgid "user"
 msgstr "பயனர்"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "பயனர்கள்"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "வெளியே வந்துவீட்டீர்"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "முறையான e முகவரிகள் மட்டும் எழுதவும்"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/te/LC_MESSAGES/django.mo b/django/contrib/auth/locale/te/LC_MESSAGES/django.mo
index bb99e5d0d3..676d25c92c 100644
Binary files a/django/contrib/auth/locale/te/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/te/LC_MESSAGES/django.po b/django/contrib/auth/locale/te/LC_MESSAGES/django.po
index 191e2ca967..ab62545bb4 100644
--- a/django/contrib/auth/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/te/LC_MESSAGES/django.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
 "Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,242 +31,251 @@ msgstr "అనుమతులు"
 msgid "Important dates"
 msgstr "ముఖ్యమైన తేదీలు"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "సంకేతపదాన్ని విజయవంతంగా మార్చారు."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "సంకేతపదాన్ని మార్చుకోండి: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "ఈ నామముతొ ఇంకొ వినియొగదారి ఉన్నరు"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "ఈ రెండు అనుమతి పదాలు అసమానమైనంగ ఉన్నాయి"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "వాడుకరిపేరు"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "సంకేపదపు నిర్ధారణ"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "ఇందాక ఇచ్చిన అనుమతిపదం మళ్ళీ ఇవ్వండి పరిశీలన కోసము"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr "దయచేసి సరైన  వినియొగదారి నామము అనుమతి పదం ఇవ్వండి"
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "ఈ ఖాతా అచేతనమైనది"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "ఇటపా అడ్రస్  "
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "కొత్త సంకేతపదపు నిర్ధారణ"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "పాత  సంకేతపదం"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "సంకేతపదం (మళ్ళీ)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "పేరు"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "సంహితనామము"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "అనుమతి"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "అనుమతులు"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "గుంపు"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "గుంపులు"
 
-#: models.py:232
-msgid "username"
-msgstr "వాడుకరిపేరు"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr "మొదటి పేరు"
-
-#: models.py:236
-msgid "last name"
-msgstr "ఇంటి పేరు"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "ఇటపా"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "సంకేతపదం"
 
-#: models.py:239
-msgid "staff status"
-msgstr "ఉద్యోగస్తుల  స్థితి"
+#: models.py:201
+msgid "last login"
+msgstr "చివరి ప్రవేశం"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-
-#: models.py:242
-msgid "active"
-msgstr "క్రియాశీలం"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr ""
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:248
-msgid "last login"
-msgstr "చివరి ప్రవేశం"
-
-#: models.py:249
-msgid "date joined"
-msgstr "చేరిన తేదీ"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "వాడుకరి అనుమతులు"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "వాడుకరిపేరు"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "మొదటి పేరు"
+
+#: models.py:384
+msgid "last name"
+msgstr "ఇంటి పేరు"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "ఉద్యోగస్తుల  స్థితి"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr "క్రియాశీలం"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "చేరిన తేదీ"
+
+#: models.py:400
 msgid "user"
 msgstr "వాడుకరి"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "వాడుకరులు"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "నిష్క్రమించారు"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "సరైన ఇటపా ఇవ్వండి"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/th/LC_MESSAGES/django.mo b/django/contrib/auth/locale/th/LC_MESSAGES/django.mo
index 878bb3a1f6..2254d3a40c 100644
Binary files a/django/contrib/auth/locale/th/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/th/LC_MESSAGES/django.po b/django/contrib/auth/locale/th/LC_MESSAGES/django.po
index c17722eae3..d83c20039b 100644
--- a/django/contrib/auth/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/th/LC_MESSAGES/django.po
@@ -1,22 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Kowit Charoenratchatabhan <kowito@gmail.com>, 2012.
+# Kowit Charoenratchatabhan <kowito@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-09 04:27+0000\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-03-04 22:30+0000\n"
+"Last-Translator: Kowit Charoenratchatabhan <kowit.s.c@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,49 +31,57 @@ msgstr "สิทธิ์"
 msgid "Important dates"
 msgstr "วันที่ที่สำคัญ"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "เปลี่ยนรหัสผ่านสำเร็จแล้ว"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "เปลี่ยนรหัสผ่าน: %s "
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "ไม่ได้ตั้งค่ารหัสผ่าน"
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "รูปแบบรหัสผ่านไม่ถูกต้อง หรือไม่รู้จักแฮชอัลกอริทึมนี้"
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "ชื่อผู้ใช้นั้นได้ถูกใช้ไปแล้ว"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "รหัสผ่านไม่ตรงกัน"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "ชื่อผู้ใช้"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "จำเป็น ต้องการไม่เกิน 30 ตัวอักษร ต้องเป็นตัวอักษรตัวเลขและเครื่องหมาย @/./+/-/_ เท่านั้น"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "ค่านี้ต้องเป็นตัวอักษรตัวเลขและเครื่องหมาย @/./+/-/_ เท่านั้น"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "ยืนยันรหัสผ่าน"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -81,194 +90,195 @@ msgstr ""
 "รหัสผ่านที่ดิบจะไม่เก็บไว้ เพื่อไม่ให้มีวิธีการดูรหัสผ่านของผู้ใช้นี้ แต่คุณสามารถเปลี่ยนรหัสผ่านโดยใช้ <a "
 "href=\"password/\">แบบฟอร์มนี้</a> ."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr "กรุณาใส่ชื่อผู้ใช้และรหัสผ่านให้ถูกต้อง มีการแยกแยะตัวพิมพ์ใหญ่-เล็ก"
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr "กรุณาใส่  %(username)s  และรหัสผ่านที่ถูกต้อง มีการแยกแยะตัวพิมพ์ใหญ่-เล็ก"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "เว็บเบราเซอร์ของคุณไม่สามารถใช้งานระบบคุกกี้ได้ จำเป็นต้องใช้ระบบคุกกี้ในการเข้าสู่ระบบ"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "บัญชีนี้ไม่ทำงาน"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "อีเมลนี้ไม่ตรงกับบัญชีใดๆในระบบ คุณแน่ใจหรือว่าคุณได้ลงทะเบียนแล้ว"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr "บัญชีผู้ใช้ที่เกี่ยวข้องกับที่อยู่อีเมล์นี้ไม่สามารถตั้งค่ารหัสผ่าน"
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "อีเมล"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "รหัสผ่านใหม่"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "ยืนยันการตั้งรหัสผ่านใหม่"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "ใส่รหัสผ่านเก่าผิด กรุณาใส่รหัสผ่านอีกครั้ง"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "รหัสผ่านเก่า"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "รหัสผ่าน (อีกครั้ง)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algorithm"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterations"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "salt"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "ปัจจัยการทำงาน"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "checksum"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ชื่อ"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "รหัสชื่อ"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "สิทธิ์"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "สิทธิ์"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "กลุ่ม"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "กลุ่ม"
 
-#: models.py:232
-msgid "username"
-msgstr "ชื่อผู้ใช้"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "จำเป็น ต้องการไม่เกิน 30 ตัวอักษร ต้องเป็นตัวอักษรตัวเลขและตัวอักษร @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "ชื่อ"
-
-#: models.py:236
-msgid "last name"
-msgstr "นามสกุล"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "อีเมล"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "รหัสผ่าน"
 
-#: models.py:239
-msgid "staff status"
-msgstr "สถานะของพนักงาน"
+#: models.py:201
+msgid "last login"
+msgstr "เข้าสู่ระบบครั้งสุดท้าย"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "กำหนดผู้ที่จะเข้ามาใช้งานในส่วนของผู้ดูแลระบบ"
-
-#: models.py:242
-msgid "active"
-msgstr "ใช้งานได้"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr "กำหนดให้ผู้ใช้มีสถานะที่สามารถเข้ามาใช้งานได้ เลือกออกแทนที่จะลบชื่อผู้ใช้ทิ้งไป "
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "สถานะผู้ใช้พิเศษ"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "กำหนดสิทธิ์ทุกอย่างให้ผู้ใช้ โดยไม่ต้องการมอบหมายอย่างเป็นทางการ"
 
-#: models.py:248
-msgid "last login"
-msgstr "เข้าสู่ระบบครั้งสุดท้าย"
-
-#: models.py:249
-msgid "date joined"
-msgstr "วันที่เข้าร่วม"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr "กลุ่มที่ผู้ใช้อยู่ ผู้ใช้จะได้รับสิทธิ์ทั้งหมดที่กลุ่มของเขาได้รับ"
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "สิทธิ์ของผู้ใช้"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "ชื่อผู้ใช้"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "จำเป็น ต้องการไม่เกิน 30 ตัวอักษร ต้องเป็นตัวอักษรตัวเลขและตัวอักษร @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "กรุณาใส่ชื่อผู้ใช้ที่ถูกต้อง"
+
+#: models.py:383
+msgid "first name"
+msgstr "ชื่อ"
+
+#: models.py:384
+msgid "last name"
+msgstr "นามสกุล"
+
+#: models.py:385
+msgid "email address"
+msgstr "ที่อยู่อีเมล"
+
+#: models.py:386
+msgid "staff status"
+msgstr "สถานะของพนักงาน"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "กำหนดผู้ที่จะเข้ามาใช้งานในส่วนของผู้ดูแลระบบ"
+
+#: models.py:389
+msgid "active"
+msgstr "ใช้งานได้"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr "กำหนดให้ผู้ใช้มีสถานะที่สามารถเข้ามาใช้งานได้ เลือกออกแทนที่จะลบชื่อผู้ใช้ทิ้งไป "
+
+#: models.py:392
+msgid "date joined"
+msgstr "วันที่เข้าร่วม"
+
+#: models.py:400
 msgid "user"
 msgstr "ผู้ใช้"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "ผู้ใช้"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "ออกจากระบบ"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "กรุณาใส่อีเมลที่ถูกต้อง"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo
index 073d58abcd..16b852335a 100644
Binary files a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po
index 93da0a30bf..833f0e35ee 100644
--- a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po
@@ -1,6 +1,8 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# Gökmen Görgen <gokmen@alageek.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Metin Amiroff <amiroff@gmail.com>, 2012.
 # Murat Çorlu <muratcorlu@gmail.com>, 2012.
@@ -9,16 +11,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-10 14:44+0000\n"
-"Last-Translator: Metin Amiroff <amiroff@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-02-23 14:50+0000\n"
+"Last-Translator: Gökmen Görgen <gokmen@alageek.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -32,50 +34,58 @@ msgstr "İzinler"
 msgid "Important dates"
 msgstr "Önemli tarihler"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Şifre başarı ile değiştirildi."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Şifre değiştir: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Şifre tanımlanmadı."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Yanlış şifre formatı veya bilinmeyen şifreleme algoritması."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Bu isimde bir kullanıcı zaten mevcuttur."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "İki şifre alanı uyuşmuyor."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Zorunlu alan. 30 karakter ya da az olmalı. Harf, rakam ve @/./+/-/_ "
 "karakterleri kullanılabilir."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Bu değer sadece harf, rakam ve @/./+/-/_ karakterlerini içerebilir."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Şifre"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Şifre onayı"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Onaylamak için, yukarıdaki şifrenin aynısını girin."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -85,15 +95,16 @@ msgstr ""
 "yoktur, fakat <a href=\"password/\">buradaki form</a> aracılığıyla şifreyi "
 "değiştirebilirsiniz."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Lütfen geçerli bir kullanıcı adı ve şifre girin. Tüm alanlar büyük/küçük "
-"harf duyarlıdır."
+"Lütfen %(username)s için geçerli parolayı giriniz. Tüm alanlar büyük/küçük "
+"harfe duyarlıdır."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -101,149 +112,112 @@ msgstr ""
 "Web tarayıcınızın çerezleri desteklemediği görülüyor. Çerezler giriş için "
 "gerekli."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Bu hesap aktif değil."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Bu e-posta hesabıyla ilişkili kullanıcı bulunmuyor. Kayıtlı olduğunuzdan "
-"emin misiniz?"
+"Belirtilen eposta adresi ile ilişkili kullanıcı hesabı bulunmamaktadır. "
+"Kayıt olduğunuzdan emin misiniz?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr "BU e-posta adresi ile ilişkilendirilmiş hesabın parolası resetlenemez."
+msgstr ""
+"Belirtilen eposta adresi ile ilişkili olan kullanıcı hesabının şifreyi "
+"sıfırlama yetkisi bulunmamaktadır."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-posta adresi"
+#: forms.py:211
+msgid "Email"
+msgstr "Eposta"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Yeni şifre"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Yeni şifre tekrarı"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Eski şifreniz hatalı. Lütfen tekrar girin."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Eski şifre"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Şifre (tekrar)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "algoritma"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "iterasyonlar"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "tuz"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "hash"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "iş faktörü"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "sağlama"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "isim"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "takma ad"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "izin"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "izinler"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "grup"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "gruplar"
 
-#: models.py:232
-msgid "username"
-msgstr "kullanıcı adı"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-"Zorunlu alan. 30 karakter ya da az olmalı. Harf, rakam ve @/./+/-/_ "
-"karakterleri kullanılabilir"
-
-#: models.py:235
-msgid "first name"
-msgstr "isim"
-
-#: models.py:236
-msgid "last name"
-msgstr "soyisim"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-posta adresi"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "şifre"
 
-#: models.py:239
-msgid "staff status"
-msgstr "yönetici"
+#: models.py:201
+msgid "last login"
+msgstr "son ziyaret"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Kullanıcının yönetim (admin) paneline girip giremeyeceğini belirler."
-
-#: models.py:242
-msgid "active"
-msgstr "aktif"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Kullanıcının aktif olup olmadığını belirler. Kullanıcı hesabını silmek "
-"yerine bu işareti kaldırın."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "süper kullanıcı"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -251,15 +225,7 @@ msgstr ""
 "Kullanıcıya ayrı ayrı izin atamasına gerek kalmadan tüm hakların verilip "
 "verilmeyeceğini belirler."
 
-#: models.py:248
-msgid "last login"
-msgstr "son ziyaret"
-
-#: models.py:249
-msgid "date joined"
-msgstr "kayıt tarihi"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -267,26 +233,73 @@ msgstr ""
 "Bu kullanıcının bağlı olduğu gruplar. Bir kullanıcı bağlı bulunduğu gruba "
 "atanan tüm yetkilere sahip olur."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "kullanıcı izinleri"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "kullanıcı adı"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Zorunlu alan. 30 karakter ya da az olmalı. Harf, rakam ve @/./+/-/_ "
+"karakterleri kullanılabilir"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Geçerli bir kullanıcı adı giriniz."
+
+#: models.py:383
+msgid "first name"
+msgstr "isim"
+
+#: models.py:384
+msgid "last name"
+msgstr "soyisim"
+
+#: models.py:385
+msgid "email address"
+msgstr "eposta adresi"
+
+#: models.py:386
+msgid "staff status"
+msgstr "yönetici"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Kullanıcının yönetim (admin) paneline girip giremeyeceğini belirler."
+
+#: models.py:389
+msgid "active"
+msgstr "aktif"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Kullanıcının aktif olup olmadığını belirler. Kullanıcı hesabını silmek "
+"yerine bu işareti kaldırın."
+
+#: models.py:392
+msgid "date joined"
+msgstr "kayıt tarihi"
+
+#: models.py:400
 msgid "user"
 msgstr "kullanıcı"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "kullanıcılar"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Çıkış yapıldı"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Geçerli bir e-posta adresi girin."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/tt/LC_MESSAGES/django.mo b/django/contrib/auth/locale/tt/LC_MESSAGES/django.mo
index 9f329d07c8..882ada9f20 100644
Binary files a/django/contrib/auth/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/tt/LC_MESSAGES/django.po b/django/contrib/auth/locale/tt/LC_MESSAGES/django.po
index 27d0cadeb5..6019669461 100644
--- a/django/contrib/auth/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/tt/LC_MESSAGES/django.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
 "PO-Revision-Date: 2011-01-19 15:33+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -28,244 +28,251 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr ""
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Серсүз"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr ""
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Тикшерү өчен шул ук серсүзне яңадан кертегез."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Зинһар, дөрес логин һәм серсүзне кертегез. Кырлар регистр исәпкә алуын "
-"исегездә тотыгыз."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr ""
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Яңа серсүз"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Иске серсүз"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Серсүз (тагын бер тапкыр)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr ""
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr ""
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr ""
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr ""
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr ""
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr ""
 
-#: models.py:232
-msgid "username"
-msgstr ""
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr ""
-
-#: models.py:236
-msgid "last name"
-msgstr ""
-
-#: models.py:237
-msgid "e-mail address"
-msgstr ""
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr ""
 
-#: models.py:239
-msgid "staff status"
+#: models.py:201
+msgid "last login"
 msgstr ""
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-
-#: models.py:242
-msgid "active"
-msgstr ""
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr ""
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:248
-msgid "last login"
-msgstr ""
-
-#: models.py:249
-msgid "date joined"
-msgstr ""
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr ""
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr ""
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr ""
+
+#: models.py:384
+msgid "last name"
+msgstr ""
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr ""
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr ""
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr ""
+
+#: models.py:400
 msgid "user"
 msgstr ""
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr ""
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr ""
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr ""
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo
index 95eec4e9a8..1ca3c6a129 100644
Binary files a/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/uk/LC_MESSAGES/django.po b/django/contrib/auth/locale/uk/LC_MESSAGES/django.po
index b9cd9e42ec..07cc0995c0 100644
--- a/django/contrib/auth/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/uk/LC_MESSAGES/django.po
@@ -2,22 +2,23 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Sergey Lysach <sergikoff88@gmail.com>, 2011, 2012.
+# michael  <qotsaman@gmail.com>, 2012.
+# Sergey Lysach <sergikoff88@gmail.com>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-11 16:52+0000\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2013-01-12 17:46+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,52 +32,60 @@ msgstr "Дозволи"
 msgid "Important dates"
 msgstr "Важливі дати"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Пароль успішно змінено."
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Змінити пароль: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "Пароль не встановлено."
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "Невірний формат пароля або невідомий алгоритм хешування."
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Користувач з таким ім'ям вже існує."
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Паролі у двох полях не співпадають."
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Користувач"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Обов'язкове поле. 30 або менше символів . Тільки букви, цифри, а також "
 "символи: @/./+/-/_"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Значення цього поля може складатися лише з літер, цифр, а також з символів: "
 "@/./+/-/_"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Пароль"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Підтвердження паролю"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Повторіть пароль для перевірки."
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
@@ -86,15 +95,16 @@ msgstr ""
 "переглянути пароль цього користувача, але ви можете змінити пароль за "
 "допомогою <a href=\"password/\">цієї форми</a>."
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"Будь-ласка введіть правильне ім'я та пароль. Зауважте, що обидва поля "
-"розрізняють великі і маленькі літери."
+"Будь-ласка введіть правильні %(username)s та пароль. Зауважте, що обидва "
+"поля чутливі до регістру."
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -102,167 +112,119 @@ msgstr ""
 "Схоже, що у вашому браузері на увімкнені cookies. Cookies необхідні для "
 "входу."
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Цей запис користувача не активний."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Ця e-mail адреса не пов'язана з користувацьким запитом. Ви впевнені, що ви "
-"реєструвалися?"
+"Ця адреса електронної пошти не пов'язана з жодним обліковим записом "
+"користувача. Ви впевнені, що зареєструвалися?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
-"Акаунт користувача, пов'язаний з цією адресою електронної пошти не може "
-"скидувати пароль."
+"Обліковий запис користувача, пов'язаний з цією email-адресою не може скинути "
+"пароль."
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr "Email"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Новий пароль"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Новий пароль (підтвердження):"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Старий пароль було введено неправильно. Будь ласка, введіть його знову."
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Старий пароль"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
-msgstr "Зміна пароля"
+msgstr "Пароль (ще раз)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr "алгоритм"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr "ітерації"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr "сіль"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr "хеш"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr "робочий фактор"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr "контрольна сума"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "ім'я"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "код"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "дозвіл"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "дозволи"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "група"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "групи"
 
-#: models.py:232
-msgid "username"
-msgstr "ім'я користувача"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-" \n"
-"Обов'язкове поле. 30 або менше символів. Тільки букви, цифри, а також "
-"символи: @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "ім'я"
-
-#: models.py:236
-msgid "last name"
-msgstr "прізвище"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail адреса"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "пароль"
 
-#: models.py:239
-msgid "staff status"
-msgstr "статус персоналу"
+#: models.py:201
+msgid "last login"
+msgstr "останній вхід"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Визначає, чи може користувач увійти до цього сайту адміністрування."
-
-#: models.py:242
-msgid "active"
-msgstr "активний"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Визначає, чи можна цього користувача вважати діючим. Заберіть галочку, "
-"замість відалення запису користувача."
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "статус суперкористувача"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Визначає, що цей користувач має всі дозволи без їх точного зазначення."
 
-#: models.py:248
-msgid "last login"
-msgstr "останній вхід"
-
-#: models.py:249
-msgid "date joined"
-msgstr "дата приєднання"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
@@ -270,26 +232,74 @@ msgstr ""
 "Групи, до котрих належить користувач. Користувач отримає всі дозволи, що "
 "вказані в кожній з його/її груп."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "дозволи користувача"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "ім'я користувача"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+" \n"
+"Обов'язкове поле. 30 або менше символів. Тільки букви, цифри, а також "
+"символи: @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "Введіть правильне імя користувача."
+
+#: models.py:383
+msgid "first name"
+msgstr "ім'я"
+
+#: models.py:384
+msgid "last name"
+msgstr "прізвище"
+
+#: models.py:385
+msgid "email address"
+msgstr "email адреса"
+
+#: models.py:386
+msgid "staff status"
+msgstr "статус персоналу"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Визначає, чи може користувач увійти до цього сайту адміністрування."
+
+#: models.py:389
+msgid "active"
+msgstr "активний"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+"Визначає, чи можна цього користувача вважати діючим. Заберіть галочку, "
+"замість відалення запису користувача."
+
+#: models.py:392
+msgid "date joined"
+msgstr "дата приєднання"
+
+#: models.py:400
 msgid "user"
 msgstr "користувач"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "користувачі"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Вихід"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Уведіть коректну e-mail адресу."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo
index fb3f0b5f1a..0d24cbb920 100644
Binary files a/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/ur/LC_MESSAGES/django.po b/django/contrib/auth/locale/ur/LC_MESSAGES/django.po
index 90c82aaf70..c346bffa16 100644
--- a/django/contrib/auth/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ur/LC_MESSAGES/django.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
 "PO-Revision-Date: 2011-01-19 15:33+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -28,244 +28,251 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr ""
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "لفظ اجازت"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr ""
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "توثیق کے لئے ویسا ہی لفظ اجازت درج کریں جیسا اوپر کیا۔"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
 msgstr ""
-"براہ کرم درست نام صارف اور لفظ اجازت درج کریں۔ یاد رھے دونوں خانے چھوٹے بڑے "
-"حروف کی شناخت کے لئے حساس ھیں۔"
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr ""
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "نیا لفظ اجازت"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "پرانا لفظ اجازت"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "لفظ اجازت (دوبارہ)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
 msgstr ""
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
 msgstr ""
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
 msgstr ""
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
 msgstr ""
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr ""
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr ""
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr ""
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr ""
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr ""
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr ""
 
-#: models.py:232
-msgid "username"
-msgstr ""
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
-
-#: models.py:235
-msgid "first name"
-msgstr ""
-
-#: models.py:236
-msgid "last name"
-msgstr ""
-
-#: models.py:237
-msgid "e-mail address"
-msgstr ""
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr ""
 
-#: models.py:239
-msgid "staff status"
+#: models.py:201
+msgid "last login"
 msgstr ""
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr ""
-
-#: models.py:242
-msgid "active"
-msgstr ""
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr ""
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:248
-msgid "last login"
-msgstr ""
-
-#: models.py:249
-msgid "date joined"
-msgstr ""
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr ""
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr ""
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr ""
+
+#: models.py:384
+msgid "last name"
+msgstr ""
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr ""
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models.py:389
+msgid "active"
+msgstr ""
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr ""
+
+#: models.py:400
 msgid "user"
 msgstr ""
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr ""
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr ""
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "برقی خط کا درست پتہ درج کریں۔"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo
index 1114ec8e94..e5268ce6cc 100644
Binary files a/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/vi/LC_MESSAGES/django.po b/django/contrib/auth/locale/vi/LC_MESSAGES/django.po
index 52b8e1b3a2..b5f71e7a74 100644
--- a/django/contrib/auth/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/vi/LC_MESSAGES/django.po
@@ -3,20 +3,21 @@
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Tran  <hongdiepkien@gmail.com>, 2011.
+# Tran Van <vantxm@yahoo.co.uk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Tran <hongdiepkien@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: Tran Van <vantxm@yahoo.co.uk>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,245 +31,254 @@ msgstr "Quyền"
 msgid "Important dates"
 msgstr "Những ngày quan trọng"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "Mật khẩu thay đổi thành công"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "Thay đổi mật khẩu: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "Tên đăng nhập đã được sử dụng"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "Hai trường mật khẩu không giống nhau"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "Tên đăng nhập"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chỉ là chữ cái, chữ số và @/./+/-/_."
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Giá trị này có thể chứa chữ cái, số và ký tự @/./+/-/_."
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "Xác nhận mật khẩu"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "Nhập dãy mật mã trên để xác minh lại"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr "Hãy nhập đúng tên đăng nhập và mật khẩu. Chú ý chữ hoa, chữ thường."
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "Trình duyệt web của bạn không bật cookie. Cookies được yêu cầu để đăng nhập"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "Tài khoản này chưa được kích hoạt."
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"Không tìm thấy địa chỉ email này trong các tài khoản đã có. Bạn có chắc là "
-"đã đăng kí không?"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr ""
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "Xác nhận mật khẩu mới"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Mật khẩu cũ không chính xác. Hãy nhập lại lần nữa"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "Mật khẩu cũ"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "Nhập lại mật khẩu"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "thuật toán"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "lặp lại"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
 msgstr ""
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "băm"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
 msgstr ""
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "kiểm tra"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "Tên"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "tên mã"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "cho phép"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "cho phép"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "Nhóm"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "Các nhóm"
 
-#: models.py:232
-msgid "username"
-msgstr "Tên đăng nhập"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chữ cái, số và ký tự @/./+/-/_"
-
-#: models.py:235
-msgid "first name"
-msgstr "Tên"
-
-#: models.py:236
-msgid "last name"
-msgstr "Họ"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "Địa chỉ email"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "Mật khẩu"
 
-#: models.py:239
-msgid "staff status"
-msgstr "tình trạng nhân viên"
+#: models.py:201
+msgid "last login"
+msgstr "Lần cuối đăng nhập"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "Chỉ định người dùng nào được phép truy cập vào trang admin."
-
-#: models.py:242
-msgid "active"
-msgstr "Kích hoạt"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr ""
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:248
-msgid "last login"
-msgstr "Lần cuối đăng nhập"
-
-#: models.py:249
-msgid "date joined"
-msgstr "Ngày tham gia"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
 msgstr ""
+"Các nhóm người dùng này thuộc về. Người dùng sẽ nhận được tất cả các quyền "
+"được cấp cho mỗi nhóm của mình."
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "quyền của người sử dụng"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "Tên đăng nhập"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chữ cái, số và ký tự @/./+/-/_"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:383
+msgid "first name"
+msgstr "Tên"
+
+#: models.py:384
+msgid "last name"
+msgstr "Họ"
+
+#: models.py:385
+msgid "email address"
+msgstr ""
+
+#: models.py:386
+msgid "staff status"
+msgstr "tình trạng nhân viên"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "Chỉ định người dùng nào được phép truy cập vào trang admin."
+
+#: models.py:389
+msgid "active"
+msgstr "Kích hoạt"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr ""
+
+#: models.py:392
+msgid "date joined"
+msgstr "Ngày tham gia"
+
+#: models.py:400
 msgid "user"
 msgstr "Người dùng"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "người sử dụng"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "Đã thoát"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "Hãy nhập địa chỉ email hợp lệ."
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo
index 9cbb40d4c6..01ff558d07 100644
Binary files a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po
index 52b3422324..ea366f60e8 100644
--- a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po
@@ -3,21 +3,23 @@
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Lele Long <schemacs@gmail.com>, 2011.
+# pylemon  <leeway1985@gmail.com>, 2012.
 # Ziang Song <songziang@gmail.com>, 2011.
+# 磊 施 <leiarix@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: Ziang Song <songziang@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -31,242 +33,253 @@ msgstr "权限"
 msgid "Important dates"
 msgstr "重要日期"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "密码修改成功。"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
 msgstr "修改密码：%s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "密码未设置。"
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "不可用的密码格式或未知的哈希算法。"
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "已存在一位使用该名字的用户。"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
 msgstr "两个密码字段不一致。"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "用户名"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "该值只能包含字母、数字和字符@/./+/-/_ 。"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "密码"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "密码确认"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "为了校验，输入与上面相同的密码。"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"原始密码不会存储到数据库，因此没有办法看到这个用户的密码，但您可以使用<a "
+"href=\"password/\">这个表单</a>来更改密码。"
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr "请输入正确的用户名和密码。请注意两者都是大小写敏感的。"
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "你的浏览器好象不允许使用cookie。登录需要使用启用cookie。"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "该帐号未激活。"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
-msgstr "该电子邮件地址没有关联任何用户帐号。你确定已经注册过了？"
+msgstr "电子邮件地址没有同用户账户关联。你确定你已经注册了吗？"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr "和这封电子邮件相关的账户不能重置密码。"
+msgstr "同此电子邮件地址关联的用户账户不能重置密码。"
 
-#: forms.py:196
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:211
+msgid "Email"
+msgstr "电子邮件"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "新密码"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "新密码确认"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "你的旧密码不正确。请重新输入。"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "旧密码"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "密码(重复)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "算法"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "迭代次数"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "盐"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "哈希"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "加密因子"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "校验和"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "名称"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "代码名称"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "权限"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "权限"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "组"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "组"
 
-#: models.py:232
-msgid "username"
-msgstr "用户名"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。"
-
-#: models.py:235
-msgid "first name"
-msgstr "名字"
-
-#: models.py:236
-msgid "last name"
-msgstr "姓氏"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "e-mail 地址"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "密码"
 
-#: models.py:239
-msgid "staff status"
-msgstr "职员状态"
+#: models.py:201
+msgid "last login"
+msgstr "上次登录"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "指明用户是否可以登录到这个管理站点。"
-
-#: models.py:242
-msgid "active"
-msgstr "有效"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr "指明用户是否被认为活跃的。以反选代替删除帐号。"
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "超级用户状态"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "指明该用户缺省拥有所有权限。"
 
-#: models.py:248
-msgid "last login"
-msgstr "上次登录"
-
-#: models.py:249
-msgid "date joined"
-msgstr "加入日期"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
-msgstr ""
+msgstr "这个用户所属的组。一个用户将得到他/她所在的每一个组的所有权限。"
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "用户权限"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "用户名"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "输入一个可用的用户名"
+
+#: models.py:383
+msgid "first name"
+msgstr "名字"
+
+#: models.py:384
+msgid "last name"
+msgstr "姓氏"
+
+#: models.py:385
+msgid "email address"
+msgstr "电子邮件地址"
+
+#: models.py:386
+msgid "staff status"
+msgstr "职员状态"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "指明用户是否可以登录到这个管理站点。"
+
+#: models.py:389
+msgid "active"
+msgstr "有效"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr "指明用户是否被认为活跃的。以反选代替删除帐号。"
+
+#: models.py:392
+msgid "date joined"
+msgstr "加入日期"
+
+#: models.py:400
 msgid "user"
 msgstr "用户"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "用户"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "退出登录"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "输入一个有效的 e-mail 地址。"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo
index 1eda1f9e92..655b415f8a 100644
Binary files a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po
index b69d16e111..00f21a0d37 100644
--- a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,22 +1,24 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <ilay@ilay.tw>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # tcc <tcchou@tcchou.org>, 2011.
+#   <yyc1217@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:07+0000\n"
-"Last-Translator: tcc <tcchou@tcchou.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"PO-Revision-Date: 2012-12-16 08:51+0000\n"
+"Last-Translator: yyc1217 <yyc1217@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:41
 msgid "Personal info"
@@ -30,243 +32,254 @@ msgstr "權限"
 msgid "Important dates"
 msgstr "重要日期"
 
-#: admin.py:125
+#: admin.py:126
 msgid "Password changed successfully."
 msgstr "密碼修改成功"
 
-#: admin.py:135
+#: admin.py:136
 #, python-format
 msgid "Change password: %s"
-msgstr "密碼變更: %s"
+msgstr "修改密碼: %s"
 
-#: forms.py:62
+#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+msgid "No password set."
+msgstr "無設定密碼。"
+
+#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr "無效的密碼格式或不知名的雜湊演算法。"
+
+#: forms.py:67
 msgid "A user with that username already exists."
 msgstr "一個相同名稱的使用者已經存在。"
 
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:68 forms.py:269 forms.py:329
 msgid "The two password fields didn't match."
-msgstr "兩個密碼欄位不同。"
+msgstr "兩個密碼欄位不相符。"
 
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:70 forms.py:115
 msgid "Username"
 msgstr "使用者名稱"
 
-#: forms.py:67 forms.py:111
+#: forms.py:72 forms.py:116
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。"
 
-#: forms.py:70 forms.py:114
+#: forms.py:75 forms.py:119
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "這資料值只能包含字母、數字和 @/./+/-/_ 字元。"
 
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
 msgid "Password"
 msgstr "密碼"
 
-#: forms.py:74
+#: forms.py:79
 msgid "Password confirmation"
 msgstr "密碼確認"
 
-#: forms.py:76
+#: forms.py:81
 msgid "Enter the same password as above, for verification."
 msgstr "為檢查用，請輸入與上面相同的密碼。"
 
-#: forms.py:117
+#: forms.py:122
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
 msgstr ""
+"原始密碼尚未儲存，因此無法存取此帳號的密碼，但你可以透過<a href=\"password/"
+"\">這個表單</a>來變更密碼。"
 
-#: forms.py:143
+#: forms.py:151
+#, python-format
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr "請輸入有效的使用者名稱與密碼。請注意兩個欄位都有分大小寫"
+"Please enter a correct %(username)s and password. Note that both fields may "
+"be case-sensitive."
+msgstr ""
 
-#: forms.py:145
+#: forms.py:153
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "你的Web瀏覽器好像不允許使用cookie。登入時需要使用cookie。"
 
-#: forms.py:147
+#: forms.py:155
 msgid "This account is inactive."
 msgstr "這個帳戶未啟用"
 
-#: forms.py:191
+#: forms.py:206
 msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
 "you've registered?"
-msgstr "這個電子郵件地址沒有和任何使用者帳號有關聯。你確定你已經註冊了？"
+msgstr "這個電子郵件地址無對應的使用者帳號。你確定你已經註冊了？"
 
-#: forms.py:193
+#: forms.py:208 tests/forms.py:374
 msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
 "password."
-msgstr ""
+msgstr "這個電子郵件地址對應的使用者帳號無法重設密碼。"
 
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:211
+msgid "Email"
 msgstr "電子信箱"
 
-#: forms.py:253
+#: forms.py:271
 msgid "New password"
 msgstr "新密碼"
 
-#: forms.py:255
+#: forms.py:273
 msgid "New password confirmation"
 msgstr "新密碼確認"
 
-#: forms.py:284
+#: forms.py:302
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "你的舊密碼不正確。請重新輸入。"
 
-#: forms.py:287
+#: forms.py:305
 msgid "Old password"
 msgstr "舊密碼"
 
-#: forms.py:312
+#: forms.py:333
 msgid "Password (again)"
 msgstr "密碼(重複)"
 
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
 msgid "algorithm"
-msgstr ""
+msgstr "演算法"
 
-#: hashers.py:219
+#: hashers.py:242
 msgid "iterations"
-msgstr ""
+msgstr "迭代"
 
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
 msgid "salt"
-msgstr ""
+msgstr "隨機值"
 
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
 msgid "hash"
-msgstr ""
+msgstr "哈希碼"
 
-#: hashers.py:270
+#: hashers.py:293
 msgid "work factor"
-msgstr ""
+msgstr "作用因素"
 
-#: hashers.py:272
+#: hashers.py:295
 msgid "checksum"
-msgstr ""
+msgstr "校驗"
 
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
 msgid "name"
 msgstr "名稱"
 
-#: models.py:68
+#: models.py:74
 msgid "codename"
 msgstr "代碼"
 
-#: models.py:72
+#: models.py:78
 msgid "permission"
 msgstr "權限"
 
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
 msgid "permissions"
 msgstr "權限"
 
-#: models.py:120
+#: models.py:128
 msgid "group"
 msgstr "群組"
 
-#: models.py:121 models.py:250
+#: models.py:129 models.py:301
 msgid "groups"
 msgstr "群組"
 
-#: models.py:232
-msgid "username"
-msgstr "使用者名稱"
-
-#: models.py:233
-msgid ""
-"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。"
-
-#: models.py:235
-msgid "first name"
-msgstr "名字"
-
-#: models.py:236
-msgid "last name"
-msgstr "姓氏"
-
-#: models.py:237
-msgid "e-mail address"
-msgstr "電子郵件地址"
-
-#: models.py:238
+#: models.py:200
 msgid "password"
 msgstr "密碼"
 
-#: models.py:239
-msgid "staff status"
-msgstr "工作人員狀態"
+#: models.py:201
+msgid "last login"
+msgstr "上次登入"
 
-#: models.py:240
-msgid "Designates whether the user can log into this admin site."
-msgstr "指定是否使用者可以登入此管理網站。"
-
-#: models.py:242
-msgid "active"
-msgstr "有效"
-
-#: models.py:243
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr "指定使用者是否有效。請取消選擇而不是刪除帳號。"
-
-#: models.py:245
+#: models.py:298
 msgid "superuser status"
 msgstr "超級使用者狀態"
 
-#: models.py:246
+#: models.py:299
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "指定是否使用者可以登入到這個管理網站"
 
-#: models.py:248
-msgid "last login"
-msgstr "上次登入"
-
-#: models.py:249
-msgid "date joined"
-msgstr "加入日期"
-
-#: models.py:251
+#: models.py:302
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of his/her group."
-msgstr ""
+msgstr "此為帳號可加入的群組。其所屬的群組將授予該帳號對應的權限。"
 
-#: models.py:255
+#: models.py:306
 msgid "user permissions"
 msgstr "使用者權限"
 
-#: models.py:260
+#: models.py:377
+msgid "username"
+msgstr "使用者名稱"
+
+#: models.py:378
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。"
+
+#: models.py:381
+msgid "Enter a valid username."
+msgstr "輸入有效帳號。"
+
+#: models.py:383
+msgid "first name"
+msgstr "名字"
+
+#: models.py:384
+msgid "last name"
+msgstr "姓氏"
+
+#: models.py:385
+msgid "email address"
+msgstr "電子信箱"
+
+#: models.py:386
+msgid "staff status"
+msgstr "工作人員狀態"
+
+#: models.py:387
+msgid "Designates whether the user can log into this admin site."
+msgstr "指定是否使用者可以登入此管理網站。"
+
+#: models.py:389
+msgid "active"
+msgstr "有效"
+
+#: models.py:390
+msgid ""
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
+msgstr "指定使用者是否有效。請取消選擇而不是刪除帳號。"
+
+#: models.py:392
+msgid "date joined"
+msgstr "加入日期"
+
+#: models.py:400
 msgid "user"
 msgstr "使用者"
 
-#: models.py:261
+#: models.py:401
 msgid "users"
 msgstr "使用者"
 
-#: views.py:93
+#: views.py:94
 msgid "Logged out"
 msgstr "登出"
 
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr "輸入有效的電子郵件地址。"
-
 #: templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
-msgstr ""
+msgstr "在 %(site_name)s 進行密碼重置"
diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py
index ce5d57fa79..685e50d498 100644
--- a/django/contrib/auth/management/__init__.py
+++ b/django/contrib/auth/management/__init__.py
@@ -12,12 +12,13 @@ from django.core import exceptions
 from django.core.management.base import CommandError
 from django.db import DEFAULT_DB_ALIAS, router
 from django.db.models import get_models, signals
+from django.utils.encoding import DEFAULT_LOCALE_ENCODING
 from django.utils import six
 from django.utils.six.moves import input
 
 
 def _get_permission_codename(action, opts):
-    return '%s_%s' % (action, opts.object_name.lower())
+    return '%s_%s' % (action, opts.model_name)
 
 
 def _get_all_permissions(opts, ctype):
@@ -133,11 +134,8 @@ def get_system_username():
         # (a very restricted chroot environment, for example).
         return ''
     if not six.PY3:
-        default_locale = locale.getdefaultlocale()[1]
-        if not default_locale:
-            return ''
         try:
-            result = result.decode(default_locale)
+            result = result.decode(DEFAULT_LOCALE_ENCODING)
         except UnicodeDecodeError:
             # UnicodeDecodeError - preventive treatment for non-latin Windows.
             return ''
@@ -174,7 +172,7 @@ def get_default_username(check_db=True):
     # Don't return the default username if it is already taken.
     if check_db and default_username:
         try:
-            auth_app.User.objects.get(username=default_username)
+            auth_app.User._default_manager.get(username=default_username)
         except auth_app.User.DoesNotExist:
             pass
         else:
diff --git a/django/contrib/auth/management/commands/changepassword.py b/django/contrib/auth/management/commands/changepassword.py
index ff38836a95..3240b0f992 100644
--- a/django/contrib/auth/management/commands/changepassword.py
+++ b/django/contrib/auth/management/commands/changepassword.py
@@ -33,7 +33,7 @@ class Command(BaseCommand):
         UserModel = get_user_model()
 
         try:
-            u = UserModel.objects.using(options.get('database')).get(**{
+            u = UserModel._default_manager.using(options.get('database')).get(**{
                     UserModel.USERNAME_FIELD: username
                 })
         except UserModel.DoesNotExist:
diff --git a/django/contrib/auth/management/commands/createsuperuser.py b/django/contrib/auth/management/commands/createsuperuser.py
index 216d56d730..ac2835d6b3 100644
--- a/django/contrib/auth/management/commands/createsuperuser.py
+++ b/django/contrib/auth/management/commands/createsuperuser.py
@@ -1,6 +1,7 @@
 """
 Management utility to create superusers.
 """
+from __future__ import unicode_literals
 
 import getpass
 import sys
@@ -11,6 +12,7 @@ from django.contrib.auth.management import get_default_username
 from django.core import exceptions
 from django.core.management.base import BaseCommand, CommandError
 from django.db import DEFAULT_DB_ALIAS
+from django.utils.encoding import force_str
 from django.utils.six.moves import input
 from django.utils.text import capfirst
 
@@ -79,12 +81,14 @@ class Command(BaseCommand):
             try:
 
                 # Get a username
+                verbose_field_name = self.username_field.verbose_name
                 while username is None:
                     if not username:
-                        input_msg = capfirst(self.username_field.verbose_name)
+                        input_msg = capfirst(verbose_field_name)
                         if default_username:
-                            input_msg += " (leave blank to use '%s')" % default_username
-                        raw_value = input(input_msg + ': ')
+                            input_msg = "%s (leave blank to use '%s')" % (
+                                input_msg, default_username)
+                        raw_value = input(force_str('%s: ' % input_msg))
 
                     if default_username and raw_value == '':
                         raw_value = default_username
@@ -95,19 +99,19 @@ class Command(BaseCommand):
                         username = None
                         continue
                     try:
-                        self.UserModel.objects.db_manager(database).get_by_natural_key(username)
+                        self.UserModel._default_manager.db_manager(database).get_by_natural_key(username)
                     except self.UserModel.DoesNotExist:
                         pass
                     else:
                         self.stderr.write("Error: That %s is already taken." %
-                                self.username_field.verbose_name)
+                                verbose_field_name)
                         username = None
 
                 for field_name in self.UserModel.REQUIRED_FIELDS:
                     field = self.UserModel._meta.get_field(field_name)
                     user_data[field_name] = options.get(field_name)
                     while user_data[field_name] is None:
-                        raw_value = input(capfirst(field.verbose_name + ': '))
+                        raw_value = input(force_str('%s: ' % capfirst(field.verbose_name)))
                         try:
                             user_data[field_name] = field.clean(raw_value, None)
                         except exceptions.ValidationError as e:
@@ -118,7 +122,7 @@ class Command(BaseCommand):
                 while password is None:
                     if not password:
                         password = getpass.getpass()
-                        password2 = getpass.getpass('Password (again): ')
+                        password2 = getpass.getpass(force_str('Password (again): '))
                         if password != password2:
                             self.stderr.write("Error: Your passwords didn't match.")
                             password = None
@@ -134,6 +138,6 @@ class Command(BaseCommand):
 
         user_data[self.UserModel.USERNAME_FIELD] = username
         user_data['password'] = password
-        self.UserModel.objects.db_manager(database).create_superuser(**user_data)
+        self.UserModel._default_manager.db_manager(database).create_superuser(**user_data)
         if verbosity >= 1:
             self.stdout.write("Superuser created successfully.")
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 7d62810923..5709d25d7f 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -263,22 +263,15 @@ def _user_get_all_permissions(user, obj):
     permissions = set()
     for backend in auth.get_backends():
         if hasattr(backend, "get_all_permissions"):
-            if obj is not None:
-                permissions.update(backend.get_all_permissions(user, obj))
-            else:
-                permissions.update(backend.get_all_permissions(user))
+            permissions.update(backend.get_all_permissions(user, obj))
     return permissions
 
 
 def _user_has_perm(user, perm, obj):
     for backend in auth.get_backends():
         if hasattr(backend, "has_perm"):
-            if obj is not None:
-                if backend.has_perm(user, perm, obj):
-                    return True
-            else:
-                if backend.has_perm(user, perm):
-                    return True
+            if backend.has_perm(user, perm, obj):
+                return True
     return False
 
 
@@ -318,11 +311,7 @@ class PermissionsMixin(models.Model):
         permissions = set()
         for backend in auth.get_backends():
             if hasattr(backend, "get_group_permissions"):
-                if obj is not None:
-                    permissions.update(backend.get_group_permissions(self,
-                                                                     obj))
-                else:
-                    permissions.update(backend.get_group_permissions(self))
+                permissions.update(backend.get_group_permissions(self, obj))
         return permissions
 
     def get_all_permissions(self, obj=None):
@@ -427,7 +416,7 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin):
         SiteProfileNotAvailable if this site does not allow profiles.
         """
         warnings.warn("The use of AUTH_PROFILE_MODULE to define user profiles has been deprecated.",
-            PendingDeprecationWarning)
+            DeprecationWarning, stacklevel=2)
         if not hasattr(self, '_profile_cache'):
             from django.conf import settings
             if not getattr(settings, 'AUTH_PROFILE_MODULE', False):
@@ -461,7 +450,7 @@ class User(AbstractUser):
 
     Username, password and email are required. Other fields are optional.
     """
-    class Meta:
+    class Meta(AbstractUser.Meta):
         swappable = 'AUTH_USER_MODEL'
 
 
@@ -473,8 +462,8 @@ class AnonymousUser(object):
     is_staff = False
     is_active = False
     is_superuser = False
-    _groups = EmptyManager()
-    _user_permissions = EmptyManager()
+    _groups = EmptyManager(Group)
+    _user_permissions = EmptyManager(Permission)
 
     def __init__(self):
         pass
diff --git a/django/contrib/auth/tests/__init__.py b/django/contrib/auth/tests/__init__.py
index 038c8980d9..2e35e33d7f 100644
--- a/django/contrib/auth/tests/__init__.py
+++ b/django/contrib/auth/tests/__init__.py
@@ -1,29 +1,16 @@
-from django.contrib.auth.tests.custom_user import *
-from django.contrib.auth.tests.auth_backends import *
-from django.contrib.auth.tests.basic import *
-from django.contrib.auth.tests.context_processors import *
-from django.contrib.auth.tests.decorators import *
-from django.contrib.auth.tests.forms import *
-from django.contrib.auth.tests.remote_user import *
-from django.contrib.auth.tests.management import *
-from django.contrib.auth.tests.models import *
-from django.contrib.auth.tests.handlers import *
-from django.contrib.auth.tests.hashers import *
-from django.contrib.auth.tests.signals import *
-from django.contrib.auth.tests.tokens import *
-from django.contrib.auth.tests.views import *
+from django.contrib.auth.tests.test_custom_user import *
+from django.contrib.auth.tests.test_auth_backends import *
+from django.contrib.auth.tests.test_basic import *
+from django.contrib.auth.tests.test_context_processors import *
+from django.contrib.auth.tests.test_decorators import *
+from django.contrib.auth.tests.test_forms import *
+from django.contrib.auth.tests.test_remote_user import *
+from django.contrib.auth.tests.test_management import *
+from django.contrib.auth.tests.test_models import *
+from django.contrib.auth.tests.test_handlers import *
+from django.contrib.auth.tests.test_hashers import *
+from django.contrib.auth.tests.test_signals import *
+from django.contrib.auth.tests.test_tokens import *
+from django.contrib.auth.tests.test_views import *
 
 # The password for the fixture data users is 'password'
-
-from django.dispatch import receiver
-from django.test.signals import setting_changed
-
-
-@receiver(setting_changed)
-def user_model_swapped(**kwargs):
-    if kwargs['setting'] == 'AUTH_USER_MODEL':
-        from django.db.models.manager import ensure_default_manager
-        from django.contrib.auth.models import User
-        # Reset User manager
-        setattr(User, 'objects', User._default_manager)
-        ensure_default_manager(User)
diff --git a/django/contrib/auth/tests/hashers.py b/django/contrib/auth/tests/hashers.py
deleted file mode 100644
index d867a57d98..0000000000
--- a/django/contrib/auth/tests/hashers.py
+++ /dev/null
@@ -1,147 +0,0 @@
-from __future__ import unicode_literals
-
-from django.conf.global_settings import PASSWORD_HASHERS as default_hashers
-from django.contrib.auth.hashers import (is_password_usable, 
-    check_password, make_password, PBKDF2PasswordHasher, load_hashers,
-    PBKDF2SHA1PasswordHasher, get_hasher, identify_hasher, UNUSABLE_PASSWORD)
-from django.utils import unittest
-from django.utils.unittest import skipUnless
-
-
-try:
-    import crypt
-except ImportError:
-    crypt = None
-
-try:
-    import bcrypt
-except ImportError:
-    bcrypt = None
-
-
-class TestUtilsHashPass(unittest.TestCase):
-
-    def setUp(self):
-        load_hashers(password_hashers=default_hashers)
-
-    def test_simple(self):
-        encoded = make_password('letmein')
-        self.assertTrue(encoded.startswith('pbkdf2_sha256$'))
-        self.assertTrue(is_password_usable(encoded))
-        self.assertTrue(check_password('letmein', encoded))
-        self.assertFalse(check_password('letmeinz', encoded))
-
-    def test_pkbdf2(self):
-        encoded = make_password('letmein', 'seasalt', 'pbkdf2_sha256')
-        self.assertEqual(encoded, 
-'pbkdf2_sha256$10000$seasalt$FQCNpiZpTb0zub+HBsH6TOwyRxJ19FwvjbweatNmK/Y=')
-        self.assertTrue(is_password_usable(encoded))
-        self.assertTrue(check_password('letmein', encoded))
-        self.assertFalse(check_password('letmeinz', encoded))
-        self.assertEqual(identify_hasher(encoded).algorithm, "pbkdf2_sha256")
-
-    def test_sha1(self):
-        encoded = make_password('letmein', 'seasalt', 'sha1')
-        self.assertEqual(encoded, 
-'sha1$seasalt$fec3530984afba6bade3347b7140d1a7da7da8c7')
-        self.assertTrue(is_password_usable(encoded))
-        self.assertTrue(check_password('letmein', encoded))
-        self.assertFalse(check_password('letmeinz', encoded))
-        self.assertEqual(identify_hasher(encoded).algorithm, "sha1")
-
-    def test_md5(self):
-        encoded = make_password('letmein', 'seasalt', 'md5')
-        self.assertEqual(encoded, 
-                         'md5$seasalt$f5531bef9f3687d0ccf0f617f0e25573')
-        self.assertTrue(is_password_usable(encoded))
-        self.assertTrue(check_password('letmein', encoded))
-        self.assertFalse(check_password('letmeinz', encoded))
-        self.assertEqual(identify_hasher(encoded).algorithm, "md5")
-
-    def test_unsalted_md5(self):
-        encoded = make_password('letmein', 'seasalt', 'unsalted_md5')
-        self.assertEqual(encoded, '0d107d09f5bbe40cade3de5c71e9e9b7')
-        self.assertTrue(is_password_usable(encoded))
-        self.assertTrue(check_password('letmein', encoded))
-        self.assertFalse(check_password('letmeinz', encoded))
-        self.assertEqual(identify_hasher(encoded).algorithm, "unsalted_md5")
-
-    @skipUnless(crypt, "no crypt module to generate password.")
-    def test_crypt(self):
-        encoded = make_password('letmein', 'ab', 'crypt')
-        self.assertEqual(encoded, 'crypt$$abN/qM.L/H8EQ')
-        self.assertTrue(is_password_usable(encoded))
-        self.assertTrue(check_password('letmein', encoded))
-        self.assertFalse(check_password('letmeinz', encoded))
-        self.assertEqual(identify_hasher(encoded).algorithm, "crypt")
-
-    @skipUnless(bcrypt, "py-bcrypt not installed")
-    def test_bcrypt(self):
-        encoded = make_password('letmein', hasher='bcrypt')
-        self.assertTrue(is_password_usable(encoded))
-        self.assertTrue(encoded.startswith('bcrypt$'))
-        self.assertTrue(check_password('letmein', encoded))
-        self.assertFalse(check_password('letmeinz', encoded))
-        self.assertEqual(identify_hasher(encoded).algorithm, "bcrypt")
-
-    def test_unusable(self):
-        encoded = make_password(None)
-        self.assertFalse(is_password_usable(encoded))
-        self.assertFalse(check_password(None, encoded))
-        self.assertFalse(check_password(UNUSABLE_PASSWORD, encoded))
-        self.assertFalse(check_password('', encoded))
-        self.assertFalse(check_password('letmein', encoded))
-        self.assertFalse(check_password('letmeinz', encoded))
-        self.assertRaises(ValueError, identify_hasher, encoded)
-
-    def test_bad_algorithm(self):
-        def doit():
-            make_password('letmein', hasher='lolcat')
-        self.assertRaises(ValueError, doit)
-        self.assertRaises(ValueError, identify_hasher, "lolcat$salt$hash")
-
-    def test_bad_encoded(self):
-        self.assertFalse(is_password_usable('letmein_badencoded'))
-        self.assertFalse(is_password_usable(''))
-
-    def test_low_level_pkbdf2(self):
-        hasher = PBKDF2PasswordHasher()
-        encoded = hasher.encode('letmein', 'seasalt')
-        self.assertEqual(encoded, 
-'pbkdf2_sha256$10000$seasalt$FQCNpiZpTb0zub+HBsH6TOwyRxJ19FwvjbweatNmK/Y=')
-        self.assertTrue(hasher.verify('letmein', encoded))
-
-    def test_low_level_pbkdf2_sha1(self):
-        hasher = PBKDF2SHA1PasswordHasher()
-        encoded = hasher.encode('letmein', 'seasalt')
-        self.assertEqual(encoded, 
-'pbkdf2_sha1$10000$seasalt$91JiNKgwADC8j2j86Ije/cc4vfQ=')
-        self.assertTrue(hasher.verify('letmein', encoded))
-
-    def test_upgrade(self):
-        self.assertEqual('pbkdf2_sha256', get_hasher('default').algorithm)
-        for algo in ('sha1', 'md5'):
-            encoded = make_password('letmein', hasher=algo)
-            state = {'upgraded': False}
-            def setter(password):
-                state['upgraded'] = True
-            self.assertTrue(check_password('letmein', encoded, setter))
-            self.assertTrue(state['upgraded'])
-
-    def test_no_upgrade(self):
-        encoded = make_password('letmein')
-        state = {'upgraded': False}
-        def setter():
-            state['upgraded'] = True
-        self.assertFalse(check_password('WRONG', encoded, setter))
-        self.assertFalse(state['upgraded'])
-
-    def test_no_upgrade_on_incorrect_pass(self):
-        self.assertEqual('pbkdf2_sha256', get_hasher('default').algorithm)
-        for algo in ('sha1', 'md5'):
-            encoded = make_password('letmein', hasher=algo)
-            state = {'upgraded': False}
-            def setter():
-                state['upgraded'] = True
-            self.assertFalse(check_password('WRONG', encoded, setter))
-            self.assertFalse(state['upgraded'])
diff --git a/django/contrib/auth/tests/auth_backends.py b/django/contrib/auth/tests/test_auth_backends.py
similarity index 88%
rename from django/contrib/auth/tests/auth_backends.py
rename to django/contrib/auth/tests/test_auth_backends.py
index 71f18d32cf..bb97c54a11 100644
--- a/django/contrib/auth/tests/auth_backends.py
+++ b/django/contrib/auth/tests/test_auth_backends.py
@@ -4,7 +4,7 @@ from datetime import date
 from django.conf import settings
 from django.contrib.auth.models import User, Group, Permission, AnonymousUser
 from django.contrib.auth.tests.utils import skipIfCustomUser
-from django.contrib.auth.tests.custom_user import ExtensionUser, CustomPermissionsUser
+from django.contrib.auth.tests.test_custom_user import ExtensionUser, CustomPermissionsUser, CustomUser
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.contrib.auth import authenticate
@@ -34,7 +34,7 @@ class BaseModelBackendTest(object):
         ContentType.objects.clear_cache()
 
     def test_has_perm(self):
-        user = self.UserModel.objects.get(pk=self.user.pk)
+        user = self.UserModel._default_manager.get(pk=self.user.pk)
         self.assertEqual(user.has_perm('auth.test'), False)
         user.is_staff = True
         user.save()
@@ -53,14 +53,14 @@ class BaseModelBackendTest(object):
         self.assertEqual(user.has_perm('auth.test'), False)
 
     def test_custom_perms(self):
-        user = self.UserModel.objects.get(pk=self.user.pk)
+        user = self.UserModel._default_manager.get(pk=self.user.pk)
         content_type = ContentType.objects.get_for_model(Group)
         perm = Permission.objects.create(name='test', content_type=content_type, codename='test')
         user.user_permissions.add(perm)
         user.save()
 
         # reloading user to purge the _perm_cache
-        user = self.UserModel.objects.get(pk=self.user.pk)
+        user = self.UserModel._default_manager.get(pk=self.user.pk)
         self.assertEqual(user.get_all_permissions() == set(['auth.test']), True)
         self.assertEqual(user.get_group_permissions(), set([]))
         self.assertEqual(user.has_module_perms('Group'), False)
@@ -71,7 +71,7 @@ class BaseModelBackendTest(object):
         perm = Permission.objects.create(name='test3', content_type=content_type, codename='test3')
         user.user_permissions.add(perm)
         user.save()
-        user = self.UserModel.objects.get(pk=self.user.pk)
+        user = self.UserModel._default_manager.get(pk=self.user.pk)
         self.assertEqual(user.get_all_permissions(), set(['auth.test2', 'auth.test', 'auth.test3']))
         self.assertEqual(user.has_perm('test'), False)
         self.assertEqual(user.has_perm('auth.test'), True)
@@ -81,7 +81,7 @@ class BaseModelBackendTest(object):
         group.permissions.add(perm)
         group.save()
         user.groups.add(group)
-        user = self.UserModel.objects.get(pk=self.user.pk)
+        user = self.UserModel._default_manager.get(pk=self.user.pk)
         exp = set(['auth.test2', 'auth.test', 'auth.test3', 'auth.test_group'])
         self.assertEqual(user.get_all_permissions(), exp)
         self.assertEqual(user.get_group_permissions(), set(['auth.test_group']))
@@ -93,7 +93,7 @@ class BaseModelBackendTest(object):
 
     def test_has_no_object_perm(self):
         """Regressiontest for #12462"""
-        user = self.UserModel.objects.get(pk=self.user.pk)
+        user = self.UserModel._default_manager.get(pk=self.user.pk)
         content_type = ContentType.objects.get_for_model(Group)
         perm = Permission.objects.create(name='test', content_type=content_type, codename='test')
         user.user_permissions.add(perm)
@@ -106,7 +106,7 @@ class BaseModelBackendTest(object):
 
     def test_get_all_superuser_permissions(self):
         "A superuser has all permissions. Refs #14795"
-        user = self.UserModel.objects.get(pk=self.superuser.pk)
+        user = self.UserModel._default_manager.get(pk=self.superuser.pk)
         self.assertEqual(len(user.get_all_permissions()), len(Permission.objects.all()))
 
 
@@ -151,13 +151,13 @@ class ExtensionUserModelBackendTest(BaseModelBackendTest, TestCase):
     UserModel = ExtensionUser
 
     def create_users(self):
-        self.user = ExtensionUser.objects.create_user(
+        self.user = ExtensionUser._default_manager.create_user(
             username='test',
             email='test@example.com',
             password='test',
             date_of_birth=date(2006, 4, 25)
         )
-        self.superuser = ExtensionUser.objects.create_superuser(
+        self.superuser = ExtensionUser._default_manager.create_superuser(
             username='test2',
             email='test2@example.com',
             password='test',
@@ -178,18 +178,36 @@ class CustomPermissionsUserModelBackendTest(BaseModelBackendTest, TestCase):
     UserModel = CustomPermissionsUser
 
     def create_users(self):
-        self.user = CustomPermissionsUser.objects.create_user(
+        self.user = CustomPermissionsUser._default_manager.create_user(
             email='test@example.com',
             password='test',
             date_of_birth=date(2006, 4, 25)
         )
-        self.superuser = CustomPermissionsUser.objects.create_superuser(
+        self.superuser = CustomPermissionsUser._default_manager.create_superuser(
             email='test2@example.com',
             password='test',
             date_of_birth=date(1976, 11, 8)
         )
 
 
+@override_settings(AUTH_USER_MODEL='auth.CustomUser')
+class CustomUserModelBackendAuthenticateTest(TestCase):
+    """
+    Tests that the model backend can accept a credentials kwarg labeled with
+    custom user model's USERNAME_FIELD.
+    """
+
+    def test_authenticate(self):
+        test_user = CustomUser._default_manager.create_user(
+            email='test@example.com',
+            password='test',
+            date_of_birth=date(2006, 4, 25)
+        )
+        authenticated_user = authenticate(email='test@example.com', password='test')
+        self.assertEqual(test_user, authenticated_user)
+
+
+
 class TestObj(object):
     pass
 
@@ -245,7 +263,7 @@ class RowlevelBackendTest(TestCase):
     """
     Tests for auth backend that supports object level permissions
     """
-    backend = 'django.contrib.auth.tests.auth_backends.SimpleRowlevelBackend'
+    backend = 'django.contrib.auth.tests.test_auth_backends.SimpleRowlevelBackend'
 
     def setUp(self):
         self.curr_auth = settings.AUTHENTICATION_BACKENDS
@@ -286,7 +304,7 @@ class AnonymousUserBackendTest(TestCase):
     Tests for AnonymousUser delegating to backend.
     """
 
-    backend = 'django.contrib.auth.tests.auth_backends.SimpleRowlevelBackend'
+    backend = 'django.contrib.auth.tests.test_auth_backends.SimpleRowlevelBackend'
 
     def setUp(self):
         self.curr_auth = settings.AUTHENTICATION_BACKENDS
@@ -330,7 +348,7 @@ class InActiveUserBackendTest(TestCase):
     """
     Tests for a inactive user
     """
-    backend = 'django.contrib.auth.tests.auth_backends.SimpleRowlevelBackend'
+    backend = 'django.contrib.auth.tests.test_auth_backends.SimpleRowlevelBackend'
 
     def setUp(self):
         self.curr_auth = settings.AUTHENTICATION_BACKENDS
@@ -368,7 +386,7 @@ class PermissionDeniedBackendTest(TestCase):
     """
     Tests that other backends are not checked once a backend raises PermissionDenied
     """
-    backend = 'django.contrib.auth.tests.auth_backends.PermissionDeniedBackend'
+    backend = 'django.contrib.auth.tests.test_auth_backends.PermissionDeniedBackend'
 
     def setUp(self):
         self.user1 = User.objects.create_user('test', 'test@example.com', 'test')
diff --git a/django/contrib/auth/tests/basic.py b/django/contrib/auth/tests/test_basic.py
similarity index 64%
rename from django/contrib/auth/tests/basic.py
rename to django/contrib/auth/tests/test_basic.py
index 2c807cca51..6b1dd3af05 100644
--- a/django/contrib/auth/tests/basic.py
+++ b/django/contrib/auth/tests/test_basic.py
@@ -1,15 +1,72 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+
 import locale
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.management.commands import createsuperuser
 from django.contrib.auth.models import User, AnonymousUser
-from django.contrib.auth.tests.custom_user import CustomUser
+from django.contrib.auth.tests.test_custom_user import CustomUser
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management import call_command
+from django.dispatch import receiver
 from django.test import TestCase
+from django.test.signals import setting_changed
 from django.test.utils import override_settings
-from django.utils.six import StringIO
+from django.utils import translation
+from django.utils.encoding import force_str
+from django.utils.six import binary_type, PY3, StringIO
+
+
+@receiver(setting_changed)
+def user_model_swapped(**kwargs):
+    if kwargs['setting'] == 'AUTH_USER_MODEL':
+        from django.db.models.manager import ensure_default_manager
+        from django.contrib.auth.models import User
+        # Reset User manager
+        setattr(User, 'objects', User._default_manager)
+        ensure_default_manager(User)
+
+
+def mock_inputs(inputs):
+    """
+    Decorator to temporarily replace input/getpass to allow interactive
+    createsuperuser.
+    """
+    def inner(test_func):
+        def wrapped(*args):
+            class mock_getpass:
+                @staticmethod
+                def getpass(prompt=b'Password: ', stream=None):
+                    if not PY3:
+                        # getpass on Windows only supports prompt as bytestring (#19807)
+                        assert isinstance(prompt, binary_type)
+                    return inputs['password']
+
+            def mock_input(prompt):
+                # prompt should be encoded in Python 2. This line will raise an
+                # Exception if prompt contains unencoded non-ascii on Python 2.
+                prompt = str(prompt)
+                assert str('__proxy__') not in prompt
+                response = ''
+                for key, val in inputs.items():
+                    if force_str(key) in prompt.lower():
+                        response = val
+                        break
+                return response
+
+            old_getpass = createsuperuser.getpass
+            old_input = createsuperuser.input
+            createsuperuser.getpass = mock_getpass
+            createsuperuser.input = mock_input
+            try:
+                test_func(*args)
+            finally:
+                createsuperuser.getpass = old_getpass
+                createsuperuser.input = old_input
+        return wrapped
+    return inner
 
 
 @skipIfCustomUser
@@ -103,17 +160,17 @@ class BasicTestCase(TestCase):
         self.assertEqual(u.email, 'joe2@somewhere.org')
         self.assertFalse(u.has_usable_password())
 
-        new_io = StringIO()
         call_command("createsuperuser",
             interactive=False,
             username="joe+admin@somewhere.org",
             email="joe@somewhere.org",
-            stdout=new_io
+            verbosity=0
         )
         u = User.objects.get(username="joe+admin@somewhere.org")
         self.assertEqual(u.email, 'joe@somewhere.org')
         self.assertFalse(u.has_usable_password())
 
+    @mock_inputs({'password': "nopasswd"})
     def test_createsuperuser_nolocale(self):
         """
         Check that createsuperuser does not break when no locale is set. See
@@ -121,39 +178,51 @@ class BasicTestCase(TestCase):
         """
 
         old_getdefaultlocale = locale.getdefaultlocale
-        old_getpass = createsuperuser.getpass
         try:
             # Temporarily remove locale information
             locale.getdefaultlocale = lambda: (None, None)
 
-            # Temporarily replace getpass to allow interactive code to be used
-            # non-interactively
-            class mock_getpass:
-                pass
-            mock_getpass.getpass = staticmethod(lambda p=None: "nopasswd")
-            createsuperuser.getpass = mock_getpass
-
             # Call the command in this new environment
-            new_io = StringIO()
             call_command("createsuperuser",
                 interactive=True,
                 username="nolocale@somewhere.org",
                 email="nolocale@somewhere.org",
-                stdout=new_io
+                verbosity=0
             )
 
         except TypeError:
             self.fail("createsuperuser fails if the OS provides no information about the current locale")
 
         finally:
-            # Re-apply locale and getpass information
-            createsuperuser.getpass = old_getpass
+            # Re-apply locale information
             locale.getdefaultlocale = old_getdefaultlocale
 
         # If we were successful, a user should have been created
         u = User.objects.get(username="nolocale@somewhere.org")
         self.assertEqual(u.email, 'nolocale@somewhere.org')
 
+    @mock_inputs({
+        'password': "nopasswd",
+        'uživatel': 'foo',  # username (cz)
+        'email': 'nolocale@somewhere.org'})
+    def test_createsuperuser_non_ascii_verbose_name(self):
+        # Aliased so the string doesn't get extracted
+        from django.utils.translation import ugettext_lazy as ulazy
+        username_field = User._meta.get_field('username')
+        old_verbose_name = username_field.verbose_name
+        username_field.verbose_name = ulazy('uživatel')
+        new_io = StringIO()
+        try:
+            call_command("createsuperuser",
+                interactive=True,
+                stdout=new_io
+            )
+        finally:
+            username_field.verbose_name = old_verbose_name
+
+        command_output = new_io.getvalue().strip()
+        self.assertEqual(command_output, 'Superuser created successfully.')
+
     def test_get_user_model(self):
         "The current user model can be retrieved"
         self.assertEqual(get_user_model(), User)
@@ -176,3 +245,13 @@ class BasicTestCase(TestCase):
         "The current user model must point to an installed model"
         with self.assertRaises(ImproperlyConfigured):
             get_user_model()
+
+    @skipIfCustomUser
+    def test_user_verbose_names_translatable(self):
+        "Default User model verbose names are translatable (#19945)"
+        with translation.override('en'):
+            self.assertEqual(User._meta.verbose_name, 'user')
+            self.assertEqual(User._meta.verbose_name_plural, 'users')
+        with translation.override('es'):
+            self.assertEqual(User._meta.verbose_name, 'usuario')
+            self.assertEqual(User._meta.verbose_name_plural, 'usuarios')
diff --git a/django/contrib/auth/tests/context_processors.py b/django/contrib/auth/tests/test_context_processors.py
similarity index 97%
rename from django/contrib/auth/tests/context_processors.py
rename to django/contrib/auth/tests/test_context_processors.py
index f846a828dd..9e56cfce85 100644
--- a/django/contrib/auth/tests/context_processors.py
+++ b/django/contrib/auth/tests/test_context_processors.py
@@ -63,9 +63,10 @@ class PermWrapperTests(TestCase):
 
 @skipIfCustomUser
 @override_settings(
+    TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',),
     TEMPLATE_DIRS=(
-            os.path.join(os.path.dirname(upath(__file__)), 'templates'),
-        ),
+        os.path.join(os.path.dirname(upath(__file__)), 'templates'),
+    ),
     USE_TZ=False,                           # required for loading the fixture
     PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),
 )
diff --git a/django/contrib/auth/tests/custom_user.py b/django/contrib/auth/tests/test_custom_user.py
similarity index 84%
rename from django/contrib/auth/tests/custom_user.py
rename to django/contrib/auth/tests/test_custom_user.py
index 7e042e4895..0d324f0953 100644
--- a/django/contrib/auth/tests/custom_user.py
+++ b/django/contrib/auth/tests/test_custom_user.py
@@ -42,7 +42,7 @@ class CustomUser(AbstractBaseUser):
     is_admin = models.BooleanField(default=False)
     date_of_birth = models.DateField()
 
-    objects = CustomUserManager()
+    custom_objects = CustomUserManager()
 
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['date_of_birth']
@@ -88,7 +88,7 @@ class CustomUser(AbstractBaseUser):
 class ExtensionUser(AbstractUser):
     date_of_birth = models.DateField()
 
-    objects = UserManager()
+    custom_objects = UserManager()
 
     REQUIRED_FIELDS = AbstractUser.REQUIRED_FIELDS + ['date_of_birth']
 
@@ -112,7 +112,7 @@ class CustomPermissionsUser(AbstractBaseUser, PermissionsMixin):
     email = models.EmailField(verbose_name='email address', max_length=255, unique=True)
     date_of_birth = models.DateField()
 
-    objects = CustomPermissionsUserManager()
+    custom_objects = CustomPermissionsUserManager()
 
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['date_of_birth']
@@ -136,7 +136,7 @@ class IsActiveTestUser1(AbstractBaseUser):
     """
     username = models.CharField(max_length=30, unique=True)
 
-    objects = BaseUserManager()
+    custom_objects = BaseUserManager()
 
     USERNAME_FIELD = 'username'
 
@@ -144,3 +144,25 @@ class IsActiveTestUser1(AbstractBaseUser):
         app_label = 'auth'
 
     # the is_active attr is provided by AbstractBaseUser
+
+
+class CustomUserNonUniqueUsername(AbstractBaseUser):
+    "A user with a non-unique username"
+    username = models.CharField(max_length=30)
+
+    USERNAME_FIELD = 'username'
+
+    class Meta:
+        app_label = 'auth'
+
+
+class CustomUserBadRequiredFields(AbstractBaseUser):
+    "A user with a non-unique username"
+    username = models.CharField(max_length=30, unique=True)
+    date_of_birth = models.DateField()
+
+    USERNAME_FIELD = 'username'
+    REQUIRED_FIELDS = ['username', 'date_of_birth']
+
+    class Meta:
+        app_label = 'auth'
diff --git a/django/contrib/auth/tests/decorators.py b/django/contrib/auth/tests/test_decorators.py
similarity index 85%
rename from django/contrib/auth/tests/decorators.py
rename to django/contrib/auth/tests/test_decorators.py
index be99e7abb6..6d6d335354 100644
--- a/django/contrib/auth/tests/decorators.py
+++ b/django/contrib/auth/tests/test_decorators.py
@@ -1,5 +1,6 @@
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.tests.views import AuthViewsTestCase
+from django.contrib.auth.tests.test_views import AuthViewsTestCase
 from django.contrib.auth.tests.utils import skipIfCustomUser
 
 
@@ -27,14 +28,16 @@ class LoginRequiredTestCase(AuthViewsTestCase):
             pass
         login_required(normal_view)
 
-    def testLoginRequired(self, view_url='/login_required/', login_url='/login/'):
+    def testLoginRequired(self, view_url='/login_required/', login_url=None):
         """
         Check that login_required works on a simple view wrapped in a
         login_required decorator.
         """
+        if login_url is None:
+            login_url = settings.LOGIN_URL
         response = self.client.get(view_url)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(login_url in response['Location'])
+        self.assertTrue(login_url in response.url)
         self.login()
         response = self.client.get(view_url)
         self.assertEqual(response.status_code, 200)
diff --git a/django/contrib/auth/tests/forms.py b/django/contrib/auth/tests/test_forms.py
similarity index 86%
rename from django/contrib/auth/tests/forms.py
rename to django/contrib/auth/tests/test_forms.py
index a9f894905a..2c8f6e4faf 100644
--- a/django/contrib/auth/tests/forms.py
+++ b/django/contrib/auth/tests/test_forms.py
@@ -4,10 +4,10 @@ import os
 from django.contrib.auth.models import User
 from django.contrib.auth.forms import (UserCreationForm, AuthenticationForm,
     PasswordChangeForm, SetPasswordForm, UserChangeForm, PasswordResetForm,
-    ReadOnlyPasswordHashWidget)
+    ReadOnlyPasswordHashField, ReadOnlyPasswordHashWidget)
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.core import mail
-from django.forms.fields import Field, EmailField
+from django.forms.fields import Field, CharField
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils.encoding import force_text
@@ -138,6 +138,14 @@ class AuthenticationFormTest(TestCase):
         self.assertTrue(form.is_valid())
         self.assertEqual(form.non_field_errors(), [])
 
+    def test_username_field_label(self):
+
+        class CustomAuthenticationForm(AuthenticationForm):
+            username = CharField(label="Name", max_length=75)
+
+        form = CustomAuthenticationForm()
+        self.assertEqual(form['username'].label, "Name")
+
 
 @skipIfCustomUser
 @override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
@@ -314,37 +322,48 @@ class PasswordResetFormTest(TestCase):
         data = {'email': 'not valid'}
         form = PasswordResetForm(data)
         self.assertFalse(form.is_valid())
-        self.assertEqual(form['email'].errors,
-                         [force_text(EmailField.default_error_messages['invalid'])])
+        self.assertEqual(form['email'].errors, [_('Enter a valid email address.')])
 
     def test_nonexistant_email(self):
-        # Test nonexistant email address
+        # Test nonexistant email address. This should not fail because it would
+        # expose information about registered users.
         data = {'email': 'foo@bar.com'}
         form = PasswordResetForm(data)
-        self.assertFalse(form.is_valid())
-        self.assertEqual(form.errors,
-                         {'email': [force_text(form.error_messages['unknown'])]})
+        self.assertTrue(form.is_valid())
+        self.assertEqual(len(mail.outbox), 0)
 
+    @override_settings(
+        TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',),
+        TEMPLATE_DIRS=(
+            os.path.join(os.path.dirname(upath(__file__)), 'templates'),
+        ),
+    )
     def test_cleaned_data(self):
         # Regression test
         (user, username, email) = self.create_dummy_user()
         data = {'email': email}
         form = PasswordResetForm(data)
         self.assertTrue(form.is_valid())
+        form.save(domain_override='example.com')
         self.assertEqual(form.cleaned_data['email'], email)
+        self.assertEqual(len(mail.outbox), 1)
 
+    @override_settings(
+        TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',),
+        TEMPLATE_DIRS=(
+            os.path.join(os.path.dirname(upath(__file__)), 'templates'),
+        ),
+    )
     def test_custom_email_subject(self):
-        template_path = os.path.join(os.path.dirname(upath(__file__)), 'templates')
-        with self.settings(TEMPLATE_DIRS=(template_path,)):
-            data = {'email': 'testclient@example.com'}
-            form = PasswordResetForm(data)
-            self.assertTrue(form.is_valid())
-            # Since we're not providing a request object, we must provide a
-            # domain_override to prevent the save operation from failing in the
-            # potential case where contrib.sites is not installed. Refs #16412.
-            form.save(domain_override='example.com')
-            self.assertEqual(len(mail.outbox), 1)
-            self.assertEqual(mail.outbox[0].subject, 'Custom password reset on example.com')
+        data = {'email': 'testclient@example.com'}
+        form = PasswordResetForm(data)
+        self.assertTrue(form.is_valid())
+        # Since we're not providing a request object, we must provide a
+        # domain_override to prevent the save operation from failing in the
+        # potential case where contrib.sites is not installed. Refs #16412.
+        form.save(domain_override='example.com')
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual(mail.outbox[0].subject, 'Custom password reset on example.com')
 
     def test_bug_5605(self):
         # bug #5605, preserve the case of the user name (before the @ in the
@@ -361,7 +380,8 @@ class PasswordResetFormTest(TestCase):
         user.is_active = False
         user.save()
         form = PasswordResetForm({'email': email})
-        self.assertFalse(form.is_valid())
+        self.assertTrue(form.is_valid())
+        self.assertEqual(len(mail.outbox), 0)
 
     def test_unusable_password(self):
         user = User.objects.create_user('testuser', 'test@example.com', 'test')
@@ -371,12 +391,13 @@ class PasswordResetFormTest(TestCase):
         user.set_unusable_password()
         user.save()
         form = PasswordResetForm(data)
-        self.assertFalse(form.is_valid())
-        self.assertEqual(form["email"].errors,
-                         [_("The user account associated with this email address cannot reset the password.")])
+        # The form itself is valid, but no email is sent
+        self.assertTrue(form.is_valid())
+        form.save()
+        self.assertEqual(len(mail.outbox), 0)
 
 
-class ReadOnlyPasswordHashWidgetTest(TestCase):
+class ReadOnlyPasswordHashTest(TestCase):
 
     def test_bug_19349_render_with_none_value(self):
         # Rendering the widget with value set to None
@@ -384,3 +405,7 @@ class ReadOnlyPasswordHashWidgetTest(TestCase):
         widget = ReadOnlyPasswordHashWidget()
         html = widget.render(name='password', value=None, attrs={})
         self.assertIn(_("No password set."), html)
+
+    def test_readonly_field_has_changed(self):
+        field = ReadOnlyPasswordHashField()
+        self.assertFalse(field._has_changed('aaa', 'bbb'))
diff --git a/django/contrib/auth/tests/handlers.py b/django/contrib/auth/tests/test_handlers.py
similarity index 96%
rename from django/contrib/auth/tests/handlers.py
rename to django/contrib/auth/tests/test_handlers.py
index 04ab46f75b..41063aaf4a 100644
--- a/django/contrib/auth/tests/handlers.py
+++ b/django/contrib/auth/tests/test_handlers.py
@@ -42,7 +42,7 @@ class ModWsgiHandlerTestCase(TransactionTestCase):
         with custom user installed
         """
 
-        CustomUser.objects.create_user('test@example.com', '1990-01-01', 'test')
+        CustomUser._default_manager.create_user('test@example.com', '1990-01-01', 'test')
 
         # User not in database
         self.assertTrue(check_password({}, 'unknown', '') is None)
diff --git a/django/contrib/auth/tests/test_hashers.py b/django/contrib/auth/tests/test_hashers.py
new file mode 100644
index 0000000000..9253fcbc43
--- /dev/null
+++ b/django/contrib/auth/tests/test_hashers.py
@@ -0,0 +1,180 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.conf.global_settings import PASSWORD_HASHERS as default_hashers
+from django.contrib.auth.hashers import (is_password_usable,
+    check_password, make_password, PBKDF2PasswordHasher, load_hashers,
+    PBKDF2SHA1PasswordHasher, get_hasher, identify_hasher, UNUSABLE_PASSWORD)
+from django.utils import unittest
+from django.utils.unittest import skipUnless
+
+
+try:
+    import crypt
+except ImportError:
+    crypt = None
+
+try:
+    import bcrypt
+except ImportError:
+    bcrypt = None
+
+
+class TestUtilsHashPass(unittest.TestCase):
+
+    def setUp(self):
+        load_hashers(password_hashers=default_hashers)
+
+    def test_simple(self):
+        encoded = make_password('lètmein')
+        self.assertTrue(encoded.startswith('pbkdf2_sha256$'))
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+
+    def test_pkbdf2(self):
+        encoded = make_password('lètmein', 'seasalt', 'pbkdf2_sha256')
+        self.assertEqual(encoded,
+            'pbkdf2_sha256$10000$seasalt$CWWFdHOWwPnki7HvkcqN9iA2T3KLW1cf2uZ5kvArtVY=')
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+        self.assertEqual(identify_hasher(encoded).algorithm, "pbkdf2_sha256")
+
+    def test_sha1(self):
+        encoded = make_password('lètmein', 'seasalt', 'sha1')
+        self.assertEqual(encoded,
+            'sha1$seasalt$cff36ea83f5706ce9aa7454e63e431fc726b2dc8')
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+        self.assertEqual(identify_hasher(encoded).algorithm, "sha1")
+
+    def test_md5(self):
+        encoded = make_password('lètmein', 'seasalt', 'md5')
+        self.assertEqual(encoded,
+                         'md5$seasalt$3f86d0d3d465b7b458c231bf3555c0e3')
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+        self.assertEqual(identify_hasher(encoded).algorithm, "md5")
+
+    def test_unsalted_md5(self):
+        encoded = make_password('lètmein', '', 'unsalted_md5')
+        self.assertEqual(encoded, '88a434c88cca4e900f7874cd98123f43')
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+        self.assertEqual(identify_hasher(encoded).algorithm, "unsalted_md5")
+        # Alternate unsalted syntax
+        alt_encoded = "md5$$%s" % encoded
+        self.assertTrue(is_password_usable(alt_encoded))
+        self.assertTrue(check_password('lètmein', alt_encoded))
+        self.assertFalse(check_password('lètmeinz', alt_encoded))
+
+    def test_unsalted_sha1(self):
+        encoded = make_password('lètmein', '', 'unsalted_sha1')
+        self.assertEqual(encoded, 'sha1$$6d138ca3ae545631b3abd71a4f076ce759c5700b')
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+        self.assertEqual(identify_hasher(encoded).algorithm, "unsalted_sha1")
+        # Raw SHA1 isn't acceptable
+        alt_encoded = encoded[6:]
+        self.assertFalse(check_password('lètmein', alt_encoded))
+
+    @skipUnless(crypt, "no crypt module to generate password.")
+    def test_crypt(self):
+        encoded = make_password('lètmei', 'ab', 'crypt')
+        self.assertEqual(encoded, 'crypt$$ab1Hv2Lg7ltQo')
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(check_password('lètmei', encoded))
+        self.assertFalse(check_password('lètmeiz', encoded))
+        self.assertEqual(identify_hasher(encoded).algorithm, "crypt")
+
+    @skipUnless(bcrypt, "py-bcrypt not installed")
+    def test_bcrypt_sha256(self):
+        encoded = make_password('lètmein', hasher='bcrypt_sha256')
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(encoded.startswith('bcrypt_sha256$'))
+        self.assertTrue(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+        self.assertEqual(identify_hasher(encoded).algorithm, "bcrypt_sha256")
+
+        # Verify that password truncation no longer works
+        password = ('VSK0UYV6FFQVZ0KG88DYN9WADAADZO1CTSIVDJUNZSUML6IBX7LN7ZS3R5'
+                    'JGB3RGZ7VI7G7DJQ9NI8BQFSRPTG6UWTTVESA5ZPUN')
+        encoded = make_password(password, hasher='bcrypt_sha256')
+        self.assertTrue(check_password(password, encoded))
+        self.assertFalse(check_password(password[:72], encoded))
+
+    @skipUnless(bcrypt, "py-bcrypt not installed")
+    def test_bcrypt(self):
+        encoded = make_password('lètmein', hasher='bcrypt')
+        self.assertTrue(is_password_usable(encoded))
+        self.assertTrue(encoded.startswith('bcrypt$'))
+        self.assertTrue(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+        self.assertEqual(identify_hasher(encoded).algorithm, "bcrypt")
+
+    def test_unusable(self):
+        encoded = make_password(None)
+        self.assertFalse(is_password_usable(encoded))
+        self.assertFalse(check_password(None, encoded))
+        self.assertFalse(check_password(UNUSABLE_PASSWORD, encoded))
+        self.assertFalse(check_password('', encoded))
+        self.assertFalse(check_password('lètmein', encoded))
+        self.assertFalse(check_password('lètmeinz', encoded))
+        self.assertRaises(ValueError, identify_hasher, encoded)
+
+    def test_bad_algorithm(self):
+        def doit():
+            make_password('lètmein', hasher='lolcat')
+        self.assertRaises(ValueError, doit)
+        self.assertRaises(ValueError, identify_hasher, "lolcat$salt$hash")
+
+    def test_bad_encoded(self):
+        self.assertFalse(is_password_usable('lètmein_badencoded'))
+        self.assertFalse(is_password_usable(''))
+
+    def test_low_level_pkbdf2(self):
+        hasher = PBKDF2PasswordHasher()
+        encoded = hasher.encode('lètmein', 'seasalt')
+        self.assertEqual(encoded,
+            'pbkdf2_sha256$10000$seasalt$CWWFdHOWwPnki7HvkcqN9iA2T3KLW1cf2uZ5kvArtVY=')
+        self.assertTrue(hasher.verify('lètmein', encoded))
+
+    def test_low_level_pbkdf2_sha1(self):
+        hasher = PBKDF2SHA1PasswordHasher()
+        encoded = hasher.encode('lètmein', 'seasalt')
+        self.assertEqual(encoded,
+            'pbkdf2_sha1$10000$seasalt$oAfF6vgs95ncksAhGXOWf4Okq7o=')
+        self.assertTrue(hasher.verify('lètmein', encoded))
+
+    def test_upgrade(self):
+        self.assertEqual('pbkdf2_sha256', get_hasher('default').algorithm)
+        for algo in ('sha1', 'md5'):
+            encoded = make_password('lètmein', hasher=algo)
+            state = {'upgraded': False}
+            def setter(password):
+                state['upgraded'] = True
+            self.assertTrue(check_password('lètmein', encoded, setter))
+            self.assertTrue(state['upgraded'])
+
+    def test_no_upgrade(self):
+        encoded = make_password('lètmein')
+        state = {'upgraded': False}
+        def setter():
+            state['upgraded'] = True
+        self.assertFalse(check_password('WRONG', encoded, setter))
+        self.assertFalse(state['upgraded'])
+
+    def test_no_upgrade_on_incorrect_pass(self):
+        self.assertEqual('pbkdf2_sha256', get_hasher('default').algorithm)
+        for algo in ('sha1', 'md5'):
+            encoded = make_password('lètmein', hasher=algo)
+            state = {'upgraded': False}
+            def setter():
+                state['upgraded'] = True
+            self.assertFalse(check_password('WRONG', encoded, setter))
+            self.assertFalse(state['upgraded'])
diff --git a/django/contrib/auth/tests/management.py b/django/contrib/auth/tests/test_management.py
similarity index 85%
rename from django/contrib/auth/tests/management.py
rename to django/contrib/auth/tests/test_management.py
index 976c0c4972..687a5c31cb 100644
--- a/django/contrib/auth/tests/management.py
+++ b/django/contrib/auth/tests/test_management.py
@@ -9,6 +9,8 @@ from django.contrib.auth.tests import CustomUser
 from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.core.management import call_command
 from django.core.management.base import CommandError
+from django.core.management.validation import get_validation_errors
+from django.db.models.loading import get_app
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils import six
@@ -125,7 +127,7 @@ class CreatesuperuserManagementCommandTestCase(TestCase):
             email="joe@somewhere.org",
             stdout=new_io
         )
-        u = User.objects.get(username="joe+admin@somewhere.org")
+        u = User._default_manager.get(username="joe+admin@somewhere.org")
         self.assertEqual(u.email, 'joe@somewhere.org')
         self.assertFalse(u.has_usable_password())
 
@@ -145,7 +147,7 @@ class CreatesuperuserManagementCommandTestCase(TestCase):
         )
         command_output = new_io.getvalue().strip()
         self.assertEqual(command_output, 'Superuser created successfully.')
-        u = CustomUser.objects.get(email="joe@somewhere.org")
+        u = CustomUser._default_manager.get(email="joe@somewhere.org")
         self.assertEqual(u.date_of_birth, date(1976, 4, 1))
 
         # created password should be unusable
@@ -167,7 +169,23 @@ class CreatesuperuserManagementCommandTestCase(TestCase):
                 skip_validation=True
             )
 
-        self.assertEqual(CustomUser.objects.count(), 0)
+        self.assertEqual(CustomUser._default_manager.count(), 0)
+
+
+class CustomUserModelValidationTestCase(TestCase):
+    @override_settings(AUTH_USER_MODEL='auth.CustomUserBadRequiredFields')
+    def test_username_not_in_required_fields(self):
+        "USERNAME_FIELD should not appear in REQUIRED_FIELDS."
+        new_io = StringIO()
+        get_validation_errors(new_io, get_app('auth'))
+        self.assertIn("The field named as the USERNAME_FIELD should not be included in REQUIRED_FIELDS on a swappable User model.", new_io.getvalue())
+
+    @override_settings(AUTH_USER_MODEL='auth.CustomUserNonUniqueUsername')
+    def test_username_non_unique(self):
+        "A non-unique USERNAME_FIELD should raise a model validation error."
+        new_io = StringIO()
+        get_validation_errors(new_io, get_app('auth'))
+        self.assertIn("The USERNAME_FIELD must be unique. Add unique=True to the field parameters.", new_io.getvalue())
 
 
 class PermissionDuplicationTestCase(TestCase):
@@ -186,7 +204,7 @@ class PermissionDuplicationTestCase(TestCase):
         # check duplicated default permission
         models.Permission._meta.permissions = [
            ('change_permission', 'Can edit permission (duplicate)')]
-        self.assertRaisesRegexp(CommandError,
+        six.assertRaisesRegex(self, CommandError,
             "The permission codename 'change_permission' clashes with a "
             "builtin permission for model 'auth.Permission'.",
             create_permissions, models, [], verbosity=0)
@@ -197,7 +215,7 @@ class PermissionDuplicationTestCase(TestCase):
             ('other_one', 'Some other permission'),
             ('my_custom_permission', 'Some permission with duplicate permission code'),
         ]
-        self.assertRaisesRegexp(CommandError,
+        six.assertRaisesRegex(self, CommandError,
             "The permission codename 'my_custom_permission' is duplicated for model "
             "'auth.Permission'.",
             create_permissions, models, [], verbosity=0)
diff --git a/django/contrib/auth/tests/models.py b/django/contrib/auth/tests/test_models.py
similarity index 83%
rename from django/contrib/auth/tests/models.py
rename to django/contrib/auth/tests/test_models.py
index ca65dee71b..8ac0599e6b 100644
--- a/django/contrib/auth/tests/models.py
+++ b/django/contrib/auth/tests/test_models.py
@@ -1,3 +1,5 @@
+import warnings
+
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import (Group, User, SiteProfileNotAvailable,
@@ -17,21 +19,27 @@ class ProfileTestCase(TestCase):
 
         # calling get_profile without AUTH_PROFILE_MODULE set
         del settings.AUTH_PROFILE_MODULE
-        with six.assertRaisesRegex(self, SiteProfileNotAvailable,
-                "You need to set AUTH_PROFILE_MODULE in your project"):
-            user.get_profile()
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            with six.assertRaisesRegex(self, SiteProfileNotAvailable,
+                    "You need to set AUTH_PROFILE_MODULE in your project"):
+                user.get_profile()
 
         # Bad syntax in AUTH_PROFILE_MODULE:
         settings.AUTH_PROFILE_MODULE = 'foobar'
-        with six.assertRaisesRegex(self, SiteProfileNotAvailable,
-                "app_label and model_name should be separated by a dot"):
-            user.get_profile()
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            with six.assertRaisesRegex(self, SiteProfileNotAvailable,
+                    "app_label and model_name should be separated by a dot"):
+                user.get_profile()
 
         # module that doesn't exist
         settings.AUTH_PROFILE_MODULE = 'foo.bar'
-        with six.assertRaisesRegex(self, SiteProfileNotAvailable,
-                "Unable to load the profile model"):
-            user.get_profile()
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            with six.assertRaisesRegex(self, SiteProfileNotAvailable,
+                    "Unable to load the profile model"):
+                user.get_profile()
 
 
 @skipIfCustomUser
@@ -129,6 +137,6 @@ class IsActiveTestCase(TestCase):
         user.is_active = False
         # there should be no problem saving - but the attribute is not saved
         user.save()
-        user_fetched = UserModel.objects.get(pk=user.pk)
+        user_fetched = UserModel._default_manager.get(pk=user.pk)
         # the attribute is always true for newly retrieved instance
         self.assertEqual(user_fetched.is_active, True)
diff --git a/django/contrib/auth/tests/remote_user.py b/django/contrib/auth/tests/test_remote_user.py
similarity index 98%
rename from django/contrib/auth/tests/remote_user.py
rename to django/contrib/auth/tests/test_remote_user.py
index 0e59b291a8..dae61afed5 100644
--- a/django/contrib/auth/tests/remote_user.py
+++ b/django/contrib/auth/tests/test_remote_user.py
@@ -137,7 +137,7 @@ class RemoteUserNoCreateTest(RemoteUserTest):
     """
 
     backend =\
-        'django.contrib.auth.tests.remote_user.RemoteUserNoCreateBackend'
+        'django.contrib.auth.tests.test_remote_user.RemoteUserNoCreateBackend'
 
     def test_unknown_user(self):
         num_users = User.objects.count()
@@ -174,7 +174,7 @@ class RemoteUserCustomTest(RemoteUserTest):
     """
 
     backend =\
-        'django.contrib.auth.tests.remote_user.CustomRemoteUserBackend'
+        'django.contrib.auth.tests.test_remote_user.CustomRemoteUserBackend'
     # REMOTE_USER strings with email addresses for the custom backend to
     # clean.
     known_user = 'knownuser@example.com'
diff --git a/django/contrib/auth/tests/signals.py b/django/contrib/auth/tests/test_signals.py
similarity index 100%
rename from django/contrib/auth/tests/signals.py
rename to django/contrib/auth/tests/test_signals.py
diff --git a/django/contrib/auth/tests/tokens.py b/django/contrib/auth/tests/test_tokens.py
similarity index 100%
rename from django/contrib/auth/tests/tokens.py
rename to django/contrib/auth/tests/test_tokens.py
diff --git a/django/contrib/auth/tests/views.py b/django/contrib/auth/tests/test_views.py
similarity index 88%
rename from django/contrib/auth/tests/views.py
rename to django/contrib/auth/tests/test_views.py
index 6040a2f5b5..7cbf72327e 100644
--- a/django/contrib/auth/tests/views.py
+++ b/django/contrib/auth/tests/test_views.py
@@ -1,3 +1,4 @@
+import itertools
 import os
 import re
 
@@ -46,11 +47,13 @@ class AuthViewsTestCase(TestCase):
             'password': password,
             })
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['Location'].endswith(settings.LOGIN_REDIRECT_URL))
+        self.assertTrue(response.url.endswith(settings.LOGIN_REDIRECT_URL))
         self.assertTrue(SESSION_KEY in self.client.session)
 
-    def assertContainsEscaped(self, response, text, **kwargs):
-        return self.assertContains(response, escape(force_text(text)), **kwargs)
+    def assertFormError(self, response, error):
+        """Assert that error is found in response.context['form'] errors"""
+        form_errors = list(itertools.chain(*response.context['form'].errors.values()))
+        self.assertIn(force_text(error), form_errors)
 
 
 @skipIfCustomUser
@@ -83,11 +86,12 @@ class AuthViewNamedURLTests(AuthViewsTestCase):
 class PasswordResetTest(AuthViewsTestCase):
 
     def test_email_not_found(self):
-        "Error is raised if the provided email address isn't currently registered"
+        """If the provided email is not registered, don't raise any error but
+        also don't send any email."""
         response = self.client.get('/password_reset/')
         self.assertEqual(response.status_code, 200)
         response = self.client.post('/password_reset/', {'email': 'not_a_real_email@email.com'})
-        self.assertContainsEscaped(response, PasswordResetForm.error_messages['unknown'])
+        self.assertEqual(response.status_code, 302)
         self.assertEqual(len(mail.outbox), 0)
 
     def test_email_found(self):
@@ -105,6 +109,7 @@ class PasswordResetTest(AuthViewsTestCase):
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual("staffmember@example.com", mail.outbox[0].from_email)
 
+    @override_settings(ALLOWED_HOSTS=['adminsite.com'])
     def test_admin_reset(self):
         "If the reset view is marked as being for admin, the HTTP_HOST header is used for a domain override."
         response = self.client.post('/admin_password_reset/',
@@ -214,7 +219,7 @@ class PasswordResetTest(AuthViewsTestCase):
         url, path = self._test_confirm_start()
         response = self.client.post(path, {'new_password1': 'anewpassword',
                                            'new_password2': 'x'})
-        self.assertContainsEscaped(response, SetPasswordForm.error_messages['password_mismatch'])
+        self.assertFormError(response, SetPasswordForm.error_messages['password_mismatch'])
 
 
 @override_settings(AUTH_USER_MODEL='auth.CustomUser')
@@ -248,7 +253,7 @@ class ChangePasswordTest(AuthViewsTestCase):
             'username': 'testclient',
             'password': password,
         })
-        self.assertContainsEscaped(response, AuthenticationForm.error_messages['invalid_login'] % {
+        self.assertFormError(response, AuthenticationForm.error_messages['invalid_login'] % {
                 'username': User._meta.get_field('username').verbose_name
             })
 
@@ -262,7 +267,7 @@ class ChangePasswordTest(AuthViewsTestCase):
             'new_password1': 'password1',
             'new_password2': 'password1',
         })
-        self.assertContainsEscaped(response, PasswordChangeForm.error_messages['password_incorrect'])
+        self.assertFormError(response, PasswordChangeForm.error_messages['password_incorrect'])
 
     def test_password_change_fails_with_mismatched_passwords(self):
         self.login()
@@ -271,7 +276,7 @@ class ChangePasswordTest(AuthViewsTestCase):
             'new_password1': 'password1',
             'new_password2': 'donuts',
         })
-        self.assertContainsEscaped(response, SetPasswordForm.error_messages['password_mismatch'])
+        self.assertFormError(response, SetPasswordForm.error_messages['password_mismatch'])
 
     def test_password_change_succeeds(self):
         self.login()
@@ -281,7 +286,7 @@ class ChangePasswordTest(AuthViewsTestCase):
             'new_password2': 'password1',
         })
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['Location'].endswith('/password_change/done/'))
+        self.assertTrue(response.url.endswith('/password_change/done/'))
         self.fail_login()
         self.login(password='password1')
 
@@ -293,13 +298,13 @@ class ChangePasswordTest(AuthViewsTestCase):
             'new_password2': 'password1',
         })
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['Location'].endswith('/password_change/done/'))
+        self.assertTrue(response.url.endswith('/password_change/done/'))
 
     def test_password_change_done_fails(self):
         with self.settings(LOGIN_URL='/login/'):
             response = self.client.get('/password_change/done/')
             self.assertEqual(response.status_code, 302)
-            self.assertTrue(response['Location'].endswith('/login/?next=/password_change/done/'))
+            self.assertTrue(response.url.endswith('/login/?next=/password_change/done/'))
 
 
 @skipIfCustomUser
@@ -336,7 +341,7 @@ class LoginTest(AuthViewsTestCase):
                 'password': password,
             })
             self.assertEqual(response.status_code, 302)
-            self.assertFalse(bad_url in response['Location'],
+            self.assertFalse(bad_url in response.url,
                              "%s should be blocked" % bad_url)
 
         # These URLs *should* still pass the security check
@@ -357,9 +362,17 @@ class LoginTest(AuthViewsTestCase):
                     'password': password,
             })
             self.assertEqual(response.status_code, 302)
-            self.assertTrue(good_url in response['Location'],
+            self.assertTrue(good_url in response.url,
                             "%s should be allowed" % good_url)
 
+    def test_login_form_contains_request(self):
+        # 15198
+        response = self.client.post('/custom_requestauth_login/', {
+            'username': 'testclient',
+            'password': 'password',
+        }, follow=True)
+        # the custom authentication form used by this login asserts
+        # that a request is passed to the form successfully.
 
 @skipIfCustomUser
 class LoginURLSettings(AuthViewsTestCase):
@@ -376,7 +389,7 @@ class LoginURLSettings(AuthViewsTestCase):
         settings.LOGIN_URL = login_url
         response = self.client.get('/login_required/')
         self.assertEqual(response.status_code, 302)
-        return response['Location']
+        return response.url
 
     def test_standard_login_url(self):
         login_url = '/login/'
@@ -444,11 +457,11 @@ class LogoutTest(AuthViewsTestCase):
         self.login()
         response = self.client.get('/logout/next_page/')
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['Location'].endswith('/somewhere/'))
+        self.assertTrue(response.url.endswith('/somewhere/'))
 
         response = self.client.get('/logout/next_page/?next=/login/')
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['Location'].endswith('/login/'))
+        self.assertTrue(response.url.endswith('/login/'))
 
         self.confirm_logged_out()
 
@@ -457,7 +470,7 @@ class LogoutTest(AuthViewsTestCase):
         self.login()
         response = self.client.get('/logout/next_page/')
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['Location'].endswith('/somewhere/'))
+        self.assertTrue(response.url.endswith('/somewhere/'))
         self.confirm_logged_out()
 
     def test_logout_with_redirect_argument(self):
@@ -465,7 +478,7 @@ class LogoutTest(AuthViewsTestCase):
         self.login()
         response = self.client.get('/logout/?next=/login/')
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['Location'].endswith('/login/'))
+        self.assertTrue(response.url.endswith('/login/'))
         self.confirm_logged_out()
 
     def test_logout_with_custom_redirect_argument(self):
@@ -473,7 +486,7 @@ class LogoutTest(AuthViewsTestCase):
         self.login()
         response = self.client.get('/logout/custom_query/?follow=/somewhere/')
         self.assertEqual(response.status_code, 302)
-        self.assertTrue(response['Location'].endswith('/somewhere/'))
+        self.assertTrue(response.url.endswith('/somewhere/'))
         self.confirm_logged_out()
 
     def test_security_check(self, password='password'):
@@ -492,7 +505,7 @@ class LogoutTest(AuthViewsTestCase):
             self.login()
             response = self.client.get(nasty_url)
             self.assertEqual(response.status_code, 302)
-            self.assertFalse(bad_url in response['Location'],
+            self.assertFalse(bad_url in response.url,
                              "%s should be blocked" % bad_url)
             self.confirm_logged_out()
 
@@ -512,6 +525,21 @@ class LogoutTest(AuthViewsTestCase):
             self.login()
             response = self.client.get(safe_url)
             self.assertEqual(response.status_code, 302)
-            self.assertTrue(good_url in response['Location'],
+            self.assertTrue(good_url in response.url,
                             "%s should be allowed" % good_url)
             self.confirm_logged_out()
+
+@skipIfCustomUser
+class ChangelistTests(AuthViewsTestCase):
+    urls = 'django.contrib.auth.tests.urls_admin'
+
+    # #20078 - users shouldn't be allowed to guess password hashes via
+    # repeated password__startswith queries.
+    def test_changelist_disallows_password_lookups(self):
+        # Make me a superuser before loging in.
+        User.objects.filter(username='testclient').update(is_staff=True, is_superuser=True)
+        self.login()
+
+        # A lookup that tries to filter on password isn't OK
+        with self.assertRaises(SuspiciousOperation):
+            response = self.client.get('/admin/auth/user/?password__startswith=sha1$')
diff --git a/django/contrib/auth/tests/urls.py b/django/contrib/auth/tests/urls.py
index 4b498ceaf0..51b05be648 100644
--- a/django/contrib/auth/tests/urls.py
+++ b/django/contrib/auth/tests/urls.py
@@ -1,14 +1,20 @@
 from django.conf.urls import patterns, url
 from django.contrib.auth import context_processors
+from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.urls import urlpatterns
-from django.contrib.auth.views import password_reset
+from django.contrib.auth.views import password_reset, login
 from django.contrib.auth.decorators import login_required
 from django.contrib.messages.api import info
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpRequest
 from django.shortcuts import render_to_response
 from django.template import Template, RequestContext
 from django.views.decorators.cache import never_cache
 
+class CustomRequestAuthenticationForm(AuthenticationForm):
+    def __init__(self, request, *args, **kwargs):
+        assert isinstance(request, HttpRequest)
+        super(CustomRequestAuthenticationForm, self).__init__(request, *args, **kwargs)
+
 @never_cache
 def remote_user_auth_view(request):
     "Dummy view for remote user tests"
@@ -49,6 +55,9 @@ def auth_processor_messages(request):
 def userpage(request):
     pass
 
+def custom_request_auth_login(request):
+    return login(request, authentication_form=CustomRequestAuthenticationForm)
+
 # special urls for auth test cases
 urlpatterns = urlpatterns + patterns('',
     (r'^logout/custom_query/$', 'django.contrib.auth.views.logout', dict(redirect_field_name='follow')),
@@ -65,6 +74,7 @@ urlpatterns = urlpatterns + patterns('',
     (r'^auth_processor_perms/$', auth_processor_perms),
     (r'^auth_processor_perm_in_perms/$', auth_processor_perm_in_perms),
     (r'^auth_processor_messages/$', auth_processor_messages),
+    (r'^custom_request_auth_login/$', custom_request_auth_login),
     url(r'^userpage/(.+)/$', userpage, name="userpage"),
 )
 
diff --git a/django/contrib/auth/tests/urls_admin.py b/django/contrib/auth/tests/urls_admin.py
new file mode 100644
index 0000000000..14a38e40d3
--- /dev/null
+++ b/django/contrib/auth/tests/urls_admin.py
@@ -0,0 +1,18 @@
+"""
+Test URLs for auth admins.
+"""
+
+from django.conf.urls import patterns, include
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin, GroupAdmin
+from django.contrib.auth.models import User, Group
+from django.contrib.auth.urls import urlpatterns
+
+# Create a silo'd admin site for just the user/group admins.
+site = admin.AdminSite(name='auth_test_admin')
+site.register(User, UserAdmin)
+site.register(Group, GroupAdmin)
+
+urlpatterns = urlpatterns + patterns('',
+    (r'^admin/', include(site.urls)),
+)
diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py
index 8514345d00..8a554b0ad8 100644
--- a/django/contrib/auth/views.py
+++ b/django/contrib/auth/views.py
@@ -35,7 +35,7 @@ def login(request, template_name='registration/login.html',
     redirect_to = request.REQUEST.get(redirect_field_name, '')
 
     if request.method == "POST":
-        form = authentication_form(data=request.POST)
+        form = authentication_form(request, data=request.POST)
         if form.is_valid():
 
             # Ensure the user-originating redirection url is safe.
@@ -45,15 +45,10 @@ def login(request, template_name='registration/login.html',
             # Okay, security check complete. Log the user in.
             auth_login(request, form.get_user())
 
-            if request.session.test_cookie_worked():
-                request.session.delete_test_cookie()
-
             return HttpResponseRedirect(redirect_to)
     else:
         form = authentication_form(request)
 
-    request.session.set_test_cookie()
-
     current_site = get_current_site(request)
 
     context = {
@@ -200,7 +195,7 @@ def password_reset_confirm(request, uidb36=None, token=None,
         post_reset_redirect = reverse('django.contrib.auth.views.password_reset_complete')
     try:
         uid_int = base36_to_int(uidb36)
-        user = UserModel.objects.get(pk=uid_int)
+        user = UserModel._default_manager.get(pk=uid_int)
     except (ValueError, OverflowError, UserModel.DoesNotExist):
         user = None
 
diff --git a/django/contrib/comments/__init__.py b/django/contrib/comments/__init__.py
index 1798c1adb5..007b77ad7b 100644
--- a/django/contrib/comments/__init__.py
+++ b/django/contrib/comments/__init__.py
@@ -1,3 +1,4 @@
+import warnings
 from django.conf import settings
 from django.core import urlresolvers
 from django.core.exceptions import ImproperlyConfigured
@@ -5,6 +6,8 @@ from django.contrib.comments.models import Comment
 from django.contrib.comments.forms import CommentForm
 from django.utils.importlib import import_module
 
+warnings.warn("django.contrib.comments is deprecated and will be removed before Django 1.8.", PendingDeprecationWarning)
+
 DEFAULT_COMMENTS_APP = 'django.contrib.comments'
 
 def get_comment_app():
diff --git a/django/contrib/comments/admin.py b/django/contrib/comments/admin.py
index a651baaadf..bca638182c 100644
--- a/django/contrib/comments/admin.py
+++ b/django/contrib/comments/admin.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.comments.models import Comment
-from django.utils.translation import ugettext_lazy as _, ungettext
+from django.utils.translation import ugettext_lazy as _, ungettext, ungettext_lazy
 from django.contrib.comments import get_model
 from django.contrib.comments.views.moderation import perform_flag, perform_approve, perform_delete
 
@@ -52,17 +52,20 @@ class CommentsAdmin(admin.ModelAdmin):
 
     def flag_comments(self, request, queryset):
         self._bulk_flag(request, queryset, perform_flag,
-                        lambda n: ungettext('flagged', 'flagged', n))
+                        ungettext_lazy('%d comment was successfully flagged',
+                                       '%d comments were successfully flagged'))
     flag_comments.short_description = _("Flag selected comments")
 
     def approve_comments(self, request, queryset):
         self._bulk_flag(request, queryset, perform_approve,
-                        lambda n: ungettext('approved', 'approved', n))
+                        ungettext_lazy('%d comment was successfully approved',
+                                       '%d comments were successfully approved'))
     approve_comments.short_description = _("Approve selected comments")
 
     def remove_comments(self, request, queryset):
         self._bulk_flag(request, queryset, perform_delete,
-                        lambda n: ungettext('removed', 'removed', n))
+                        ungettext_lazy('%d comment was successfully removed',
+                                       '%d comments were successfully removed'))
     remove_comments.short_description = _("Remove selected comments")
 
     def _bulk_flag(self, request, queryset, action, done_message):
@@ -75,10 +78,7 @@ class CommentsAdmin(admin.ModelAdmin):
             action(request, comment)
             n_comments += 1
 
-        msg = ungettext('1 comment was successfully %(action)s.',
-                        '%(count)s comments were successfully %(action)s.',
-                        n_comments)
-        self.message_user(request, msg % {'count': n_comments, 'action': done_message(n_comments)})
+        self.message_user(request, done_message % n_comments)
 
 # Only register the default admin if the model is the built-in comment model
 # (this won't be true if there's a custom comment app).
diff --git a/django/contrib/comments/locale/ar/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ar/LC_MESSAGES/django.mo
index cf1a9d1122..b71c0fdf6b 100644
Binary files a/django/contrib/comments/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ar/LC_MESSAGES/django.po b/django/contrib/comments/locale/ar/LC_MESSAGES/django.po
index 233803e59b..d29e4b5ed5 100644
--- a/django/contrib/comments/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ar/LC_MESSAGES/django.po
@@ -7,27 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+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"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "محتوى"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "ميتاداتا"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "لا يوجد"
@@ -37,11 +37,11 @@ msgstr[3] "عليها علامة"
 msgstr[4] "عليها علامة"
 msgstr[5] "عليها علامة"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "تعليم التعليقات المحددة"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "اعتُمد"
@@ -51,11 +51,11 @@ msgstr[3] "اعتُمدت"
 msgstr[4] "اعتُمدت"
 msgstr[5] "اعتُمدت"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "اعتماد التعليقات المحددة"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "أزيل"
@@ -65,11 +65,11 @@ msgstr[3] "أزيلت"
 msgstr[4] "أزيل"
 msgstr[5] "أزيل"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "احذف التعليقات المحددة"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -80,12 +80,12 @@ msgstr[3] "تعليقات %(count)s %(action)s."
 msgstr[4] "تعليق %(count)s %(action)s."
 msgstr[5] "تعليقات %(count)s %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "تعليقات %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "آخر التعليقات على %(site_name)s"
@@ -126,56 +126,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "إن كتبت أي شيء في هذا الحقل فسيُعتبر تعليقك غير مرغوب به"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "نوع البيانات"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "معرف العنصر"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "مستخدم"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "اسم المستخدم"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "عنوان البريد الإلكتروني للمستخدم"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "عنوان URL للمستخدم"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "تعليق"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "تاريخ ووقت الإرسال"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "عنوان IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "عام"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "أزل اختيار هذا المربّع كي تُزيل التعليق نهائياً من الموقع."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "محذوف"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -183,24 +183,24 @@ msgstr ""
 "انتق هذا المربع إذا كان التعليق غير لائق، سيتم عرض الرسالة \"تم حذف هذا "
 "التعليق\" بدلا منه."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "تعليقات"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "كتب هذا التعليق مستخدم مُسجّل ولذا كان اسمهللقراءة فقط."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 "كتب هذا التعليق مستخدم مُسجّل ولذا كان عنوان بريده الالكتروني للقراءة فقط."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -215,19 +215,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "علم"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "التاريخ"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "علَم التعليق"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "أعلام التعليقات"
 
diff --git a/django/contrib/comments/locale/az/LC_MESSAGES/django.mo b/django/contrib/comments/locale/az/LC_MESSAGES/django.mo
index 0540e5a00c..8660648ee0 100644
Binary files a/django/contrib/comments/locale/az/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/az/LC_MESSAGES/django.po b/django/contrib/comments/locale/az/LC_MESSAGES/django.po
index f143ec2c8f..d6fb6db99e 100644
--- a/django/contrib/comments/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/az/LC_MESSAGES/django.po
@@ -6,59 +6,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Məzmun"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Meta-məlumat"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 "one: işarələndi\n"
 "other: işarələndilər"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Seçilmiş şərhləri işarələ"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] ""
 "one: təsdiq olundu\n"
 "other: təsdiq olundular"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Seçilmiş şərhləri təsdiq et"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] ""
 "one: silindi\n"
 "other: silindilər"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Seçilmiş şərhləri sil"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -66,12 +66,12 @@ msgstr[0] ""
 "one: Şərh uğurla %(action)s.\n"
 "other: %(count)s şərh uğurlar %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s şərhləri"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s üzrə son şərhlər"
@@ -109,56 +109,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Bu sahəyə nəsə yazsanız, şərhiniz spam kimi qiymətləndiriləcək."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "məzmunun tipi"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "obyektin ID-si"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "istifadəçi"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "istifadəçinin adı"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "istifadəçinin e-poçt ünvanı"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "istifadəçinin URL-ni"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "şərh"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "yazılma tarix/vaxtı"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP ünvanı"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "hamı görür"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Şərhi saytdan yox etmək üçün buradakı quşu yığışdırın."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "yığışdırılıb"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -166,11 +166,11 @@ msgstr ""
 "Əgər şərh qeyri-uyğundursa, bura quş qoyun və şərhin yerinə \"Bu şərh "
 "yığışdırılıb\" yazısı çıxacaq."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "şərhlər"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -178,7 +178,7 @@ msgstr ""
 "Bu şərh daxil olmuş istifadəçi adından yazılmışdır, buna görə də onun adını "
 "dəyişmək mümkün deyil."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -186,7 +186,7 @@ msgstr ""
 "Bu şərh daxil olmuş istifadəçi adından yazılmışdır, buna görə də onun e-poçt "
 "ünvanını dəyişmək mümkün deyil."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -201,19 +201,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "işarələ"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "tarix"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "şərh işarəsi"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "şərh işarələri"
 
diff --git a/django/contrib/comments/locale/be/LC_MESSAGES/django.mo b/django/contrib/comments/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..fc86eb8622
Binary files /dev/null and b/django/contrib/comments/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/be/LC_MESSAGES/django.po b/django/contrib/comments/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..14fb0cfe54
--- /dev/null
+++ b/django/contrib/comments/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,315 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-01 10:41+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: admin.py:25
+msgid "Content"
+msgstr "Зьмесьціва"
+
+#: admin.py:28
+msgid "Metadata"
+msgstr "Зьвесткі"
+
+#: admin.py:55
+msgid "flagged"
+msgid_plural "flagged"
+msgstr[0] "Пазначылі"
+msgstr[1] "пазначылі"
+msgstr[2] "Пазначылі"
+msgstr[3] "Пазначылі"
+
+#: admin.py:56
+msgid "Flag selected comments"
+msgstr "Пазначыць абраныя выказваньні"
+
+#: admin.py:60
+msgid "approved"
+msgid_plural "approved"
+msgstr[0] "Ухвалілі"
+msgstr[1] "Ухвалілі"
+msgstr[2] "Ухвалілі"
+msgstr[3] "Ухвалілі"
+
+#: admin.py:61
+msgid "Approve selected comments"
+msgstr "Ухваліць абраныя выказваньні"
+
+#: admin.py:65
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] "Прыбралі"
+msgstr[1] "Прыбралі"
+msgstr[2] "Прыбралі"
+msgstr[3] "Прыбралі"
+
+#: admin.py:66
+msgid "Remove selected comments"
+msgstr "Прыбраць абраныя выказваньні"
+
+#: admin.py:78
+#, python-format
+msgid "1 comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] "%(action)s %(count)s заўвагу."
+msgstr[1] "%(action)s %(count)s заўвагі."
+msgstr[2] "%(action)s %(count)s заўвагаў."
+msgstr[3] "%(action)s %(count)s заўвагаў."
+
+#: feeds.py:14
+#, python-format
+msgid "%(site_name)s comments"
+msgstr "Выказваньні на %(site_name)s"
+
+#: feeds.py:20
+#, python-format
+msgid "Latest comments on %(site_name)s"
+msgstr "Найноўшыя выказваньні на %(site_name)s"
+
+#: forms.py:96
+msgid "Name"
+msgstr "Імя"
+
+#: forms.py:97
+msgid "Email address"
+msgstr "Адрас эл. пошты"
+
+#: forms.py:98
+msgid "URL"
+msgstr "Сеціўная спасылка"
+
+#: forms.py:99
+msgid "Comment"
+msgstr "Выказваньне"
+
+#: forms.py:177
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "Сачыце за сваімі словамі! Тут нельга казаць «%s»."
+msgstr[1] "Сачыце за сваімі словамі! Тут нельга казаць «%s»."
+msgstr[2] "Сачыце за сваімі словамі! Тут нельга казаць «%s»."
+msgstr[3] "Сачыце за сваімі словамі! Тут нельга казаць «%s»."
+
+#: forms.py:181 templates/comments/preview.html:16
+msgid "and"
+msgstr "і"
+
+#: forms.py:186
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+"Калі напісаць нешта ў гэтым полі, выказваньне будзе лічыцца лухтою (спамам)."
+
+#: models.py:23
+msgid "content type"
+msgstr "від зьмесьціва"
+
+#: models.py:25
+msgid "object ID"
+msgstr "нумар аб’екта"
+
+#: models.py:53 models.py:177
+msgid "user"
+msgstr "карыстальнік"
+
+#: models.py:55
+msgid "user's name"
+msgstr "імя карыстальніка"
+
+#: models.py:56
+msgid "user's email address"
+msgstr "эл. пошта карыстальніка"
+
+#: models.py:57
+msgid "user's URL"
+msgstr "сеціўная спасылка карыстальніка"
+
+#: models.py:59 models.py:79 models.py:178
+msgid "comment"
+msgstr "выкавзаньне"
+
+#: models.py:62
+msgid "date/time submitted"
+msgstr "час і дата выказваньня"
+
+#: models.py:63
+msgid "IP address"
+msgstr "Адрас IP"
+
+#: models.py:64
+msgid "is public"
+msgstr "бачнае"
+
+#: models.py:65
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr "Прыбярыце гэтую птушачку, каб выказваньне зьнікла з пляцоўкі."
+
+#: models.py:67
+msgid "is removed"
+msgstr "прыбралі"
+
+#: models.py:68
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Абярыце, калі выказваньне не да месца або не адпавядае правілам. Замест яго "
+"будзе надпіс «Выказваньне прыбралі»."
+
+#: models.py:80
+msgid "comments"
+msgstr "выказваньні"
+
+#: models.py:124
+msgid ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
+msgstr ""
+"Выказваньне пакінуў карыстальнік, які апазнаўся, таму ягонае імя нельга "
+"зьмяняць."
+
+#: models.py:134
+msgid ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
+msgstr ""
+"Выказваньне пакінуў карыстальнік, які апазнаўся, таму ягоны адрас эл. пошты "
+"нельга зьмяняць."
+
+#: models.py:160
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"%(date)s, аўтар — %(user)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+
+#: models.py:179
+msgid "flag"
+msgstr "пазнака"
+
+#: models.py:180
+msgid "date"
+msgstr "дата"
+
+#: models.py:190
+msgid "comment flag"
+msgstr "пазнака выказваньня"
+
+#: models.py:191
+msgid "comment flags"
+msgstr "пазнакі выказваньняў"
+
+#: templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "Ухваліць выказваньне"
+
+#: templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr "Ці сапраўды зрабіць выказваньне бачным?"
+
+#: templates/comments/approve.html:12
+msgid "Approve"
+msgstr "Ухваліць"
+
+#: templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "Дзякуем, што ўхвалілі"
+
+#: templates/comments/approved.html:7 templates/comments/deleted.html:7
+#: templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr ""
+"Мы ўдзячныя, што вы дапамагаеце палепшыць якасьць размовы на нашай пляцоўцы"
+
+#: templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "Прыбраць выказваньне"
+
+#: templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr "Ці сапраўды прыбраць выказваньне?"
+
+#: templates/comments/delete.html:12
+msgid "Remove"
+msgstr "Прыбраць"
+
+#: templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "Дзякуем, што прыбралі"
+
+#: templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr "Пазначыць выказваньне"
+
+#: templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr "Ці сапраўды пазначыць выказваньне?"
+
+#: templates/comments/flag.html:12
+msgid "Flag"
+msgstr "Пазначыць"
+
+#: templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr "Дзякуем, што пазначылі"
+
+#: templates/comments/form.html:17 templates/comments/preview.html:32
+msgid "Post"
+msgstr "Даслаць"
+
+#: templates/comments/form.html:18 templates/comments/preview.html:33
+msgid "Preview"
+msgstr "Прагледзець"
+
+#: templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr "Дзякуем, што выказаліся"
+
+#: templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr "Мы ўдзячныя за вашае выказваньне"
+
+#: templates/comments/preview.html:4 templates/comments/preview.html.py:13
+msgid "Preview your comment"
+msgstr "Прагледзець выказваньне"
+
+#: templates/comments/preview.html:11
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "Выпраўце памылку ніжэй"
+msgstr[1] "Выпраўце памылкі ніжэй"
+msgstr[2] "Выпраўце памылкі ніжэй"
+msgstr[3] "Выпраўце памылкі ніжэй"
+
+#: templates/comments/preview.html:16
+msgid "Post your comment"
+msgstr "Дашліце выказваньне"
+
+#: templates/comments/preview.html:16
+msgid "or make changes"
+msgstr "або выпраўце яго"
diff --git a/django/contrib/comments/locale/bg/LC_MESSAGES/django.mo b/django/contrib/comments/locale/bg/LC_MESSAGES/django.mo
index 59e1cb5306..f626a1bb85 100644
Binary files a/django/contrib/comments/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/bg/LC_MESSAGES/django.po b/django/contrib/comments/locale/bg/LC_MESSAGES/django.po
index e690c2a29b..7bbab9fe02 100644
--- a/django/contrib/comments/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/bg/LC_MESSAGES/django.po
@@ -8,68 +8,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Благодаря за маркирането"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Метаданни"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "маркиран"
 msgstr[1] "маркирани"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Маркирай избраните коментари"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "одобрен"
 msgstr[1] "одобрени"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Одобри избраните коментари"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "отстранен"
 msgstr[1] "отстранени"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Премахване на избраните коментари"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s коментар беше успешно %(action)s."
 msgstr[1] "%(count)s коментари бяха успешно %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s коментари"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Последни коментари  на %(site_name)s"
@@ -106,56 +106,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Ако въведете нещо в това поле, вашия коментар ще се третира като спам"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "тип на съдържанието"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID на обекта"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "потребител"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "потребителско име"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "email адрес на потребителя"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL адрес на потребителя"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "коментар"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "дата и час на подаване"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP адрес"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "е публичен"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Махнете отметката от това поле, за да премахнете коментара от сайта."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "е премахнат"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -163,11 +163,11 @@ msgstr ""
 "Щракнете тук ако коментарът е неподходящ. Вместо съдържанието на коментара, "
 "ще се покаже надписът \"Този коментар беше премахнат.\""
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "коментари"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -175,7 +175,7 @@ msgstr ""
 "Този коментар е публикуван от регистриран потребител, затова името не може "
 "да бъде редактирано."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -183,7 +183,7 @@ msgstr ""
 "Този коментар е публикуван от регистриран потребител, затова email адресът "
 "не може да бъде редактиран."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -198,19 +198,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "маркиране"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "дата"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "отбелязване на коментар"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "отбелязване на коментари"
 
diff --git a/django/contrib/comments/locale/bn/LC_MESSAGES/django.mo b/django/contrib/comments/locale/bn/LC_MESSAGES/django.mo
index b91e5f6cdc..96c2e25b5b 100644
Binary files a/django/contrib/comments/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/bn/LC_MESSAGES/django.po b/django/contrib/comments/locale/bn/LC_MESSAGES/django.po
index 9d07301cf6..118a229094 100644
--- a/django/contrib/comments/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/bn/LC_MESSAGES/django.po
@@ -1,73 +1,75 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+#  <anubhab91@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-02-14 13:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-02-20 15:10+0000\n"
+"Last-Translator: anubhab91 <anubhab91@gmail.com>\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "কনটেন্ট"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "মেটাডাটা"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ফ্ল্যাগ করা হয়েছে"
+msgstr[1] "ফ্ল্যাগ করা হয়েছে"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
-msgstr ""
+msgstr "চয়িত মন্তব্যগুলোকে ফ্ল্যাগ করুন"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "অনুমোদিত"
+msgstr[1] "অনুমোদিত"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
-msgstr ""
-
-#: admin.py:52
-msgid "removed"
-msgid_plural "removed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: admin.py:53
-msgid "Remove selected comments"
-msgstr ""
+msgstr "চিহ্নিত মন্তব্যগুলি অনুমোদন করুন"
 
 #: admin.py:65
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] "মুছে ফেলা হয়েছে"
+msgstr[1] "মুছে ফেলা হয়েছে"
+
+#: admin.py:66
+msgid "Remove selected comments"
+msgstr "চয়িত মন্তব্যগুলি মুছে ফেলুন"
+
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr ""
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr ""
@@ -104,56 +106,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "আপনি যদি এখানে কোনকিছু লিখেন তবে আপনার মন্তব্যকে স্প্যাম হিসেবে ধরা হবে"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "কনটেন্ট টাইপ"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "অবজেক্ট আইডি"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "সদস্য"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "সদস্যের নাম"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "সদস্যের ইমেইল ঠিকানা"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "সদস্যের ইউআরএল (URL)"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "মন্তব্য"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "দাখিলের তারিখ/সময়"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "আইপি ঠিকানা"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "সার্বজনীন"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "সাইট থেকে মন্তব্য মুছে ফেলতে এখানে আনচেক করুন।"
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "মোছা হয়েছে"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -161,24 +163,24 @@ msgstr ""
 "এই বাক্সে চেক করুন যদি মন্তব্যটি যথাযথ না হয়। মন্তব্যের পরিবর্তে \"মন্তব্যদি মুছে ফেলা "
 "হয়েছে\" দেখানো হবে।"
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr ""
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "এই মন্তব্যটি একজন নিবন্ধনকৃত সদস্য করেছেন, সেজন্যই নামটি শুধুমাত্র পড়ার যোগ্য।"
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 "এই মন্তব্যটি একজন নিবন্ধনকৃত সদস্য করেছেন, সেজন্যই ইমেইল ঠিকানা শুধুমাত্র পড়ার যোগ্য।"
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -193,75 +195,75 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
-msgstr ""
+msgstr "পতাকা"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
-msgstr ""
+msgstr "তারিখ"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
-msgstr ""
+msgstr "মন্তব্য পতাকা"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
-msgstr ""
+msgstr "মন্তব্য পতাকাসমূহ"
 
 #: templates/comments/approve.html:4
 msgid "Approve a comment"
-msgstr ""
+msgstr "একটি মন্তব্য অনুমোদন করুন"
 
 #: templates/comments/approve.html:7
 msgid "Really make this comment public?"
-msgstr ""
+msgstr "সত্যিই কি এই মন্তব্যকে সাধারণের জন্য উন্মুক্ত করতে চান?"
 
 #: templates/comments/approve.html:12
 msgid "Approve"
-msgstr ""
+msgstr "অনুমোদন"
 
 #: templates/comments/approved.html:4
 msgid "Thanks for approving"
-msgstr ""
+msgstr "অনুমোদন করার জন্য ধন্যবাদ"
 
 #: templates/comments/approved.html:7 templates/comments/deleted.html:7
 #: templates/comments/flagged.html:7
 msgid ""
 "Thanks for taking the time to improve the quality of discussion on our site"
-msgstr ""
+msgstr "আমাদের সাইটের উন্নতিকল্পে আলোচনায় যোগ দেওয়ার জন্য আপনাকে সাধুবাদ জানাই"
 
 #: templates/comments/delete.html:4
 msgid "Remove a comment"
-msgstr ""
+msgstr "একটি মন্তব্য মুছে ফেলুন"
 
 #: templates/comments/delete.html:7
 msgid "Really remove this comment?"
-msgstr ""
+msgstr "সত্যিই কি এই মন্তব্যকে উড়িয়ে দিতে চান?"
 
 #: templates/comments/delete.html:12
 msgid "Remove"
-msgstr ""
+msgstr "মুছে ফেলুন"
 
 #: templates/comments/deleted.html:4
 msgid "Thanks for removing"
-msgstr ""
+msgstr "মুছে ফেলার জন্য ধন্যবাদ"
 
 #: templates/comments/flag.html:4
 msgid "Flag this comment"
-msgstr ""
+msgstr "এই মন্তব্যকে পতাকাচিহ্নিত করুন"
 
 #: templates/comments/flag.html:7
 msgid "Really flag this comment?"
-msgstr ""
+msgstr "সত্যিই কি এই মন্তব্যকে পতাকাচিহ্নিত করতে চান?"
 
 #: templates/comments/flag.html:12
 msgid "Flag"
-msgstr ""
+msgstr "পতাকা"
 
 #: templates/comments/flagged.html:4
 msgid "Thanks for flagging"
-msgstr ""
+msgstr "পতাকাচিহ্নিত করার জন্য ধন্যবাদ"
 
 #: templates/comments/form.html:17 templates/comments/preview.html:32
 msgid "Post"
@@ -269,19 +271,19 @@ msgstr ""
 
 #: templates/comments/form.html:18 templates/comments/preview.html:33
 msgid "Preview"
-msgstr ""
+msgstr "প্রাকদর্শন"
 
 #: templates/comments/posted.html:4
 msgid "Thanks for commenting"
-msgstr ""
+msgstr "মন্তব্য লেখার জন্য ধন্যবাদ"
 
 #: templates/comments/posted.html:7
 msgid "Thank you for your comment"
-msgstr ""
+msgstr "আপনার মতামতের জন্য ধন্যবাদ"
 
 #: templates/comments/preview.html:4 templates/comments/preview.html.py:13
 msgid "Preview your comment"
-msgstr ""
+msgstr "আপনার মন্তব্যকে প্রাকদর্শন করুন"
 
 #: templates/comments/preview.html:11
 msgid "Please correct the error below"
diff --git a/django/contrib/comments/locale/br/LC_MESSAGES/django.mo b/django/contrib/comments/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..bf37cd0522
Binary files /dev/null and b/django/contrib/comments/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/br/LC_MESSAGES/django.po b/django/contrib/comments/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..dc9ba23a7e
--- /dev/null
+++ b/django/contrib/comments/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,290 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-29 18:35+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: admin.py:25
+msgid "Content"
+msgstr "Danvez"
+
+#: admin.py:28
+msgid "Metadata"
+msgstr "Metaroadennoù"
+
+#: admin.py:55
+msgid "flagged"
+msgid_plural "flagged"
+msgstr[0] "merket"
+msgstr[1] "merket"
+
+#: admin.py:56
+msgid "Flag selected comments"
+msgstr "Merkañ an evezhiadennoù diuzet"
+
+#: admin.py:60
+msgid "approved"
+msgid_plural "approved"
+msgstr[0] "aprouet"
+msgstr[1] "aprouet"
+
+#: admin.py:61
+msgid "Approve selected comments"
+msgstr "Aprouiñ an evezhiadennoù diuzet"
+
+#: admin.py:65
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] "dilamet"
+msgstr[1] "dilamet"
+
+#: admin.py:66
+msgid "Remove selected comments"
+msgstr "Dilemel an evezhiadennoù diuzet"
+
+#: admin.py:78
+#, python-format
+msgid "1 comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: feeds.py:14
+#, python-format
+msgid "%(site_name)s comments"
+msgstr ""
+
+#: feeds.py:20
+#, python-format
+msgid "Latest comments on %(site_name)s"
+msgstr ""
+
+#: forms.py:96
+msgid "Name"
+msgstr "Anv"
+
+#: forms.py:97
+msgid "Email address"
+msgstr "Chomlec'h postel"
+
+#: forms.py:98
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:99
+msgid "Comment"
+msgstr "Evezhiadenn"
+
+#: forms.py:177
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms.py:181 templates/comments/preview.html:16
+msgid "and"
+msgstr ""
+
+#: forms.py:186
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+
+#: models.py:23
+msgid "content type"
+msgstr "seurt danvez"
+
+#: models.py:25
+msgid "object ID"
+msgstr ""
+
+#: models.py:53 models.py:177
+msgid "user"
+msgstr "implijer"
+
+#: models.py:55
+msgid "user's name"
+msgstr ""
+
+#: models.py:56
+msgid "user's email address"
+msgstr "chomlec'h postel an implijer"
+
+#: models.py:57
+msgid "user's URL"
+msgstr "URL an implijer"
+
+#: models.py:59 models.py:79 models.py:178
+msgid "comment"
+msgstr "danvez"
+
+#: models.py:62
+msgid "date/time submitted"
+msgstr "deiziad/eur kaset"
+
+#: models.py:63
+msgid "IP address"
+msgstr "Chomlec'h IP"
+
+#: models.py:64
+msgid "is public"
+msgstr "zo foran"
+
+#: models.py:65
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+
+#: models.py:67
+msgid "is removed"
+msgstr "zo bet dilamet"
+
+#: models.py:68
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: models.py:80
+msgid "comments"
+msgstr "evezhiadennoù"
+
+#: models.py:124
+msgid ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
+msgstr ""
+
+#: models.py:134
+msgid ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
+msgstr ""
+
+#: models.py:160
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: models.py:179
+msgid "flag"
+msgstr "merker"
+
+#: models.py:180
+msgid "date"
+msgstr "deiziad"
+
+#: models.py:190
+msgid "comment flag"
+msgstr ""
+
+#: models.py:191
+msgid "comment flags"
+msgstr ""
+
+#: templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "aprouiñ un evezhiadenn"
+
+#: templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr ""
+
+#: templates/comments/approve.html:12
+msgid "Approve"
+msgstr "Aprouiñ"
+
+#: templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "Trugarez da vezañ aprouet"
+
+#: templates/comments/approved.html:7 templates/comments/deleted.html:7
+#: templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr ""
+
+#: templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "Diverkañ un evezhiadenn"
+
+#: templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr ""
+
+#: templates/comments/delete.html:12
+msgid "Remove"
+msgstr "Dilemel"
+
+#: templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "Trugarez evit an diverkadenn-mañ"
+
+#: templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr ""
+
+#: templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr ""
+
+#: templates/comments/flag.html:12
+msgid "Flag"
+msgstr ""
+
+#: templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr ""
+
+#: templates/comments/form.html:17 templates/comments/preview.html:32
+msgid "Post"
+msgstr "Kas"
+
+#: templates/comments/form.html:18 templates/comments/preview.html:33
+msgid "Preview"
+msgstr "Rakwelet"
+
+#: templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr ""
+
+#: templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr ""
+
+#: templates/comments/preview.html:4 templates/comments/preview.html.py:13
+msgid "Preview your comment"
+msgstr "Rakwelet hoc'h evezhiadenn"
+
+#: templates/comments/preview.html:11
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/comments/preview.html:16
+msgid "Post your comment"
+msgstr ""
+
+#: templates/comments/preview.html:16
+msgid "or make changes"
+msgstr ""
diff --git a/django/contrib/comments/locale/bs/LC_MESSAGES/django.mo b/django/contrib/comments/locale/bs/LC_MESSAGES/django.mo
index c93942d623..90e6a3f7c7 100644
Binary files a/django/contrib/comments/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/bs/LC_MESSAGES/django.po b/django/contrib/comments/locale/bs/LC_MESSAGES/django.po
index edc731c0c7..6b0703c169 100644
--- a/django/contrib/comments/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/bs/LC_MESSAGES/django.po
@@ -7,60 +7,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Filip Dupanović <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Sadržaj"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metapodaci"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "označen"
 msgstr[1] "označena"
 msgstr[2] "označena"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Označite izabrane komentare"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "odobren"
 msgstr[1] "odobrena"
 msgstr[2] "odobrena"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Odobri izabrane komentare"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "izbrisan"
 msgstr[1] "izbrisana"
 msgstr[2] "izbrisan"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Obriši izabrane komentare"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -68,12 +68,12 @@ msgstr[0] "%(count)s komentar je uspješno %(action)s."
 msgstr[1] "%(count)s komentara su uspješno %(action)s."
 msgstr[2] "%(count)s komentara su uspješno %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Komentari na %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Najnoviji komentari na %(site_name)s"
@@ -111,56 +111,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Ako unesete bilo šta u ovo polje, Vaš komentar će se smatrati spamom"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tip sadržaja"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID objekta"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "korisnikovo ime"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "korisnikova email adresa"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "korisnikov URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "datum/vrijeme unosa"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP adresa"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "javno dostupan"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Uklonite izbor ovog polja da bi se komentar izbrisao sa stranice."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "uklonjen"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -168,25 +168,25 @@ msgstr ""
 "Obilježite ovo polje ukoliko je komentar neprikladan. Prikazat će se poruka "
 "\"Komentar je ukonjen\" umjesto komentara."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentari"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 "Ovaj komentar je postavio prijavljeni korisnik i ime se ne može mijenjati."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 "Ovaj komentar je postavio prijavljeni korisnik i email se ne može mijenjati."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -201,19 +201,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "oznaka"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "oznaka komentara"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "oznake komentara"
 
diff --git a/django/contrib/comments/locale/ca/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ca/LC_MESSAGES/django.mo
index 44e54c8429..57645466b8 100644
Binary files a/django/contrib/comments/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ca/LC_MESSAGES/django.po b/django/contrib/comments/locale/ca/LC_MESSAGES/django.po
index daa152b19b..073ee235a3 100644
--- a/django/contrib/comments/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ca/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Contingut"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadades"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "marcat"
 msgstr[1] "marcats"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marcar els comentaris seleccionats"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprovat"
 msgstr[1] "aprovats"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Aprovar els comentaris seleccionats"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "eliminat"
 msgstr[1] "eliminats"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Eliminar els comentaris seleccionats"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 comentari ha estat %(action)s satisfactòriament."
 msgstr[1] "%(count)s comentaris han estat %(action)s satisfactòriament."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "comentaris de %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Últims comentaris a %(site_name)s."
@@ -107,58 +107,58 @@ msgstr ""
 "Si entreu qualsevol cosa en aquest camp el vostre comentari es tractarà com "
 "a spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tipus de contingut"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID de l'objecte"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "usuari"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nom de l'usuari"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "adreça de correu electrònic de l'usuari"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL de l'usuari"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comentari"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/hora d'enviament"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Adreça IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "és públic"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Desmarqueu aquesta casella per fer desaparèixer aquest comentari del lloc "
 "web de forma efectiva."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "està eliminat"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -166,11 +166,11 @@ msgstr ""
 "Marqueu aquesta casella si el comentari no és apropiat. En lloc seu es "
 "mostrarà \"Aquest comentari ha estat eliminat\" "
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comentaris"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -178,7 +178,7 @@ msgstr ""
 "Aquest comentari va ser publicat per un usuari autentificat, per això el seu "
 "nom no es pot modificar."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -186,7 +186,7 @@ msgstr ""
 "Aquest comentari va ser publicat per un usuari autentificat, per això la "
 "seva adreça de correu electrònic no es pot modificar."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -201,19 +201,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marcar"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "data"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "marca del comentari"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "marques del comentari"
 
diff --git a/django/contrib/comments/locale/cs/LC_MESSAGES/django.mo b/django/contrib/comments/locale/cs/LC_MESSAGES/django.mo
index c442b20fcb..0fa05b4d36 100644
Binary files a/django/contrib/comments/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/cs/LC_MESSAGES/django.po b/django/contrib/comments/locale/cs/LC_MESSAGES/django.po
index 468286e8fb..8d6e81cfc5 100644
--- a/django/contrib/comments/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/cs/LC_MESSAGES/django.po
@@ -6,59 +6,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Obsah"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "označen"
 msgstr[1] "označeny"
 msgstr[2] "označeno"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Označit vybrané komentáře"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "schválen"
 msgstr[1] "schváleny"
 msgstr[2] "schváleno"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Schválit vybrané komentáře"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "odebrán"
 msgstr[1] "odebrány"
 msgstr[2] "odebráno"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Odebrat vybrané komentáře"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -66,12 +66,12 @@ msgstr[0] "1 komentář byl úspěšně %(action)s."
 msgstr[1] "%(count)s komentáře byly úspěšně %(action)s."
 msgstr[2] "%(count)s komentářů bylo úspěšně %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Komentáře z webu %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Poslední komentáře na webu %(site_name)s"
@@ -109,57 +109,57 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Jestliže do tohoto pole cokoli zadáte, bude komentář považován za spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "typ obsahu"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID položky"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "uživatel"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "jméno uživatele"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "e-mailová adresa uživatele"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL uživatele"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentář"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "datum a čas byly zaslané"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Adresa IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "je veřejný"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Pokud zrušíte zaškrtnutí tohoto políčka, komentář se na stránce nezobrazí."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "je odebrán"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -167,25 +167,25 @@ msgstr ""
 "Zaškrtněte, pokud je komentář nevhodný. Místo něj bude zobrazena zpráva "
 "\"Tento komentář byl odebrán\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentář"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 "Tento komentář zaslal přihlášený uživatel, jméno tedy není možné změnit."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 "Tento komentář zaslal přihlášený uživatel, e-mail tedy není možné změnit."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -200,19 +200,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "značka"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "značka komentáře"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "značky komentáře"
 
diff --git a/django/contrib/comments/locale/cy/LC_MESSAGES/django.mo b/django/contrib/comments/locale/cy/LC_MESSAGES/django.mo
index 556cc97dab..da547d0002 100644
Binary files a/django/contrib/comments/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/cy/LC_MESSAGES/django.po b/django/contrib/comments/locale/cy/LC_MESSAGES/django.po
index f94214cde8..fd0c1b92b4 100644
--- a/django/contrib/comments/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/cy/LC_MESSAGES/django.po
@@ -6,26 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr ""
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr ""
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
@@ -33,11 +34,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] ""
@@ -45,11 +46,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr ""
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] ""
@@ -57,11 +58,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr ""
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -70,12 +71,12 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr ""
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr ""
@@ -114,78 +115,78 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "math cynnwys"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID gwrthrych"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr ""
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr ""
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr ""
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr ""
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "sylw"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "dyddiad/amser wedi ymostwng"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "cyfeiriad IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "yn gyhoeddus"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "wedi diddymu"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr ""
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -200,19 +201,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr ""
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/da/LC_MESSAGES/django.mo b/django/contrib/comments/locale/da/LC_MESSAGES/django.mo
index 45d3d20b21..4a8385ffce 100644
Binary files a/django/contrib/comments/locale/da/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/da/LC_MESSAGES/django.po b/django/contrib/comments/locale/da/LC_MESSAGES/django.po
index b57fcfbde3..416eb57a6a 100644
--- a/django/contrib/comments/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/da/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Indhold"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "Markeret"
 msgstr[1] "Markeret"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marker valgte kommentarer"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "Godkendt"
 msgstr[1] "Godkendt"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Godkend valgte kommentarer"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "fjernet"
 msgstr[1] "fjernet"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Fjern valgte kommentarer"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 kommentar blev %(action)s"
 msgstr[1] "%(count)s kommentarer blev %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "kommentarer på %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Seneste kommentarer på %(site_name)s"
@@ -106,57 +106,57 @@ msgstr ""
 "Hvis du indtaster noget i dette felt, vil din kommentar blive betragtet som "
 "spam."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "indholdstype"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objekt-ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "bruger"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "brugerens navn"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "brugerens e-mail-adresse"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "brugerens URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "kommentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "dato/tidspunkt for oprettelse"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "er offentlig"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Hvis du fjerner afkrydsningen her, bliver din kommentar slettet fra sitet."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "er fjernet"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -164,11 +164,11 @@ msgstr ""
 "Afkryds denne boks, hvis kommentaren er upassende. Beskeden \"Denne "
 "kommentar er blevet fjernet\" vil blive vist i stedet."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "kommentarer"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -176,7 +176,7 @@ msgstr ""
 "Denne kommentar blev indsendt af en autenticeret bruger; derfor er navnet "
 "skrivebeskyttet."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -184,7 +184,7 @@ msgstr ""
 "Denne kommentar blev indsendt af en autenticeret bruger; derfor er e-mail-"
 "adressen skrivebeskyttet."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -199,19 +199,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "Flag"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dato"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "kommentarflag"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "kommentarflag"
 
diff --git a/django/contrib/comments/locale/de/LC_MESSAGES/django.mo b/django/contrib/comments/locale/de/LC_MESSAGES/django.mo
index f224093adc..4305cc972d 100644
Binary files a/django/contrib/comments/locale/de/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/de/LC_MESSAGES/django.po b/django/contrib/comments/locale/de/LC_MESSAGES/django.po
index 28f204954e..f20d522d07 100644
--- a/django/contrib/comments/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/de/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Inhalt"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "markiert"
 msgstr[1] "markiert"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Ausgewählte Kommentare markieren"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "freigegeben"
 msgstr[1] "freigegeben"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Ausgewählte Kommentare freigeben"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "entfernt"
 msgstr[1] "entfernt"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Ausgewählte Kommentare entfernen"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 Kommentar wurde erfolgreich %(action)s."
 msgstr[1] "%(count)s Kommentare wurden erfolgreich %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s-Kommentare"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Die neuesten Kommentare auf %(site_name)s"
@@ -106,56 +106,56 @@ msgstr ""
 "Wenn Sie irgendetwas in dieses Feld eintragen, wird der Kommentar als Spam "
 "betrachtet"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "Inhaltstyp"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "Objekt-ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "Benutzer"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "Benutzername"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "E-Mail-Adresse"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "Kommentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "Datum/Zeit Erstellung"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-Adresse"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "ist öffentlich"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Deaktivieren, um den Kommentar sofort von der Website zu entfernen."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "ist gelöscht"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -163,11 +163,11 @@ msgstr ""
 "Hier einen Haken setzen, wenn der Kommentar unpassend ist. Stattdessen wird "
 "dann \"Dieser Kommentar wurde entfernt\" Meldung angezeigt."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "Kommentare"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "%(text)s"
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -187,7 +187,7 @@ msgstr ""
 "\n"
 "%(text)s"
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -202,19 +202,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "Markierung"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "Datum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "Kommentar-Markierung"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "Kommentar-Markierungen"
 
diff --git a/django/contrib/comments/locale/el/LC_MESSAGES/django.mo b/django/contrib/comments/locale/el/LC_MESSAGES/django.mo
index 55f56dc2f4..dc493a5b1c 100644
Binary files a/django/contrib/comments/locale/el/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/el/LC_MESSAGES/django.po b/django/contrib/comments/locale/el/LC_MESSAGES/django.po
index 1630a1799c..e0d62c53f3 100644
--- a/django/contrib/comments/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/el/LC_MESSAGES/django.po
@@ -8,68 +8,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Yorgos Pagles <y.pagles@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Περιεχόμενο"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Μεταδεδομένα"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "επισημασμένο"
 msgstr[1] "επισημασμένα"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Επισημανση των επιλεγμένων σχολίων"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "εγκρίθηκε"
 msgstr[1] "εγκρίθηκαν"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Έγκριση των συγκεκριμένων σχολίων"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "αφαιρέθηκε"
 msgstr[1] "αφαιρέθηκαν"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Αφαίρεση των επιλεγμένων σχολίων"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] "Πραγματοποιήθκε επιτυχημένα %(action)s στα %(count)s σχόλια."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Σχόλια στο %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Τελευταία σχόλια στο %(site_name)s"
@@ -108,57 +108,57 @@ msgstr ""
 "Αφήστε αυτό το πεδίο κενό. Αν εισάγετε κάτι τότε το σχόλιο θα θεωρηθεί spam "
 "και δεν θα εμφανιστεί."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "τύπος περιεχομένου"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID αντικειμένου"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "χρήστης"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "όνομα χρήστη"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "ηλεκτρονική διεύθυνση χρήστη"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "διεύθυνση ιστοτόπου χρήστη"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "σχόλιο"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "ημερομηνία/ώρα υποβολής"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "διεύθυνση IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "είναι δημόσιο"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Απεπιλέξτε αυτή την επιλογή για να κάνετε το σχόλιο να μην εμφανίζεται."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "είναι διαγραμμένο"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -166,11 +166,11 @@ msgstr ""
 "Επιλέξτε αυτή την επιλογή εάν το σχόλιο είναι ανάρμοστο. Ένα μήνυμα \"Αυτό "
 "το σχόλιο διαγράφηκε\" θα εμφανιστεί στη θέση του."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "σχόλια"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -178,7 +178,7 @@ msgstr ""
 "Αυτό το σχόλιο πραγματοποιήθκε από πιστοποιημένο χρήστη και για τον λόγο "
 "αυτό δεν είναι είναι δυνατή η επεξεργασία του ονόματός του."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -187,7 +187,7 @@ msgstr ""
 "αυτό δεν είναι είναι δυνατή η επεξεργασία της διεύθυνσης του ηλεκτρονικού "
 "του ταχυδρομείου."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -202,19 +202,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "επισήμανση"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "ημερομηνία"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "επισήμανση σχολίου"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "επισημάνσεις σχολίου"
 
diff --git a/django/contrib/comments/locale/en/LC_MESSAGES/django.mo b/django/contrib/comments/locale/en/LC_MESSAGES/django.mo
index b0f81e1e0d..6a6f6e70b6 100644
Binary files a/django/contrib/comments/locale/en/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/en/LC_MESSAGES/django.po b/django/contrib/comments/locale/en/LC_MESSAGES/django.po
index b41b89011a..980c499dae 100644
--- a/django/contrib/comments/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/en/LC_MESSAGES/django.po
@@ -1,175 +1,182 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-02-14 13:24+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: admin.py:25
 msgid "Content"
-msgstr ""
+msgstr "Content"
 
 #: admin.py:28
 msgid "Metadata"
-msgstr ""
+msgstr "Metadata"
 
 #: admin.py:55
-msgid "flagged"
-msgid_plural "flagged"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, python-format
+msgid "%d comment was successfully flagged"
+msgid_plural "%d comments were successfully flagged"
+msgstr[0] "1 comment was successfully %(action)s."
+msgstr[1] "%(count)s comments were successfully %(action)s."
 
-#: admin.py:56
+#: admin.py:57
 msgid "Flag selected comments"
-msgstr ""
-
-#: admin.py:60
-msgid "approved"
-msgid_plural "approved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "Flag selected comments"
 
 #: admin.py:61
+#, fuzzy, python-format
+msgid "%d comment was successfully approved"
+msgid_plural "%d comments were successfully approved"
+msgstr[0] "1 comment was successfully %(action)s."
+msgstr[1] "%(count)s comments were successfully %(action)s."
+
+#: admin.py:63
 msgid "Approve selected comments"
-msgstr ""
+msgstr "Approve selected comments"
 
-#: admin.py:65
-msgid "removed"
-msgid_plural "removed"
-msgstr[0] ""
-msgstr[1] ""
+#: admin.py:67
+#, fuzzy, python-format
+msgid "%d comment was successfully removed"
+msgid_plural "%d comments were successfully removed"
+msgstr[0] "1 comment was successfully %(action)s."
+msgstr[1] "%(count)s comments were successfully %(action)s."
 
-#: admin.py:66
+#: admin.py:69
 msgid "Remove selected comments"
-msgstr ""
-
-#: admin.py:78
-#, python-format
-msgid "1 comment was successfully %(action)s."
-msgid_plural "%(count)s comments were successfully %(action)s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr "Remove selected comments"
 
 #: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
-msgstr ""
+msgstr "%(site_name)s comments"
 
 #: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
-msgstr ""
+msgstr "Latest comments on %(site_name)s"
 
 #: forms.py:96
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
 #: forms.py:97
 msgid "Email address"
-msgstr ""
+msgstr "Email address"
 
 #: forms.py:98
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: forms.py:99
 msgid "Comment"
-msgstr ""
+msgstr "Comment"
 
 #: forms.py:177
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Watch your mouth! The word %s is not allowed here."
+msgstr[1] "Watch your mouth! The words %s are not allowed here."
 
 #: forms.py:181 templates/comments/preview.html:16
 msgid "and"
-msgstr ""
+msgstr "and"
 
 #: forms.py:186
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
+"If you enter anything in this field your comment will be treated as spam"
 
 #: models.py:23
 msgid "content type"
-msgstr ""
+msgstr "content type"
 
 #: models.py:25
 msgid "object ID"
-msgstr ""
+msgstr "object ID"
 
 #: models.py:53 models.py:177
 msgid "user"
-msgstr ""
+msgstr "user"
 
 #: models.py:55
 msgid "user's name"
-msgstr ""
+msgstr "user's name"
 
 #: models.py:56
 msgid "user's email address"
-msgstr ""
+msgstr "user's email address"
 
 #: models.py:57
 msgid "user's URL"
-msgstr ""
+msgstr "user's URL"
 
 #: models.py:59 models.py:79 models.py:178
 msgid "comment"
-msgstr ""
+msgstr "comment"
 
 #: models.py:62
 msgid "date/time submitted"
-msgstr ""
+msgstr "date/time submitted"
 
 #: models.py:63
 msgid "IP address"
-msgstr ""
+msgstr "IP address"
 
 #: models.py:64
 msgid "is public"
-msgstr ""
+msgstr "is public"
 
 #: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
+"Uncheck this box to make the comment effectively disappear from the site."
 
 #: models.py:67
 msgid "is removed"
-msgstr ""
+msgstr "is removed"
 
 #: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
 
 #: models.py:80
 msgid "comments"
-msgstr ""
+msgstr "comments"
 
 #: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
 
 #: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
 
 #: models.py:160
 #, python-format
@@ -180,107 +187,128 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
 #: models.py:179
 msgid "flag"
-msgstr ""
+msgstr "flag"
 
 #: models.py:180
 msgid "date"
-msgstr ""
+msgstr "date"
 
 #: models.py:190
 msgid "comment flag"
-msgstr ""
+msgstr "comment flag"
 
 #: models.py:191
 msgid "comment flags"
-msgstr ""
+msgstr "comment flags"
 
 #: templates/comments/approve.html:4
 msgid "Approve a comment"
-msgstr ""
+msgstr "Approve a comment"
 
 #: templates/comments/approve.html:7
 msgid "Really make this comment public?"
-msgstr ""
+msgstr "Really make this comment public?"
 
 #: templates/comments/approve.html:12
 msgid "Approve"
-msgstr ""
+msgstr "Approve"
 
 #: templates/comments/approved.html:4
 msgid "Thanks for approving"
-msgstr ""
+msgstr "Thanks for approving"
 
 #: templates/comments/approved.html:7 templates/comments/deleted.html:7
 #: templates/comments/flagged.html:7
 msgid ""
 "Thanks for taking the time to improve the quality of discussion on our site"
 msgstr ""
+"Thanks for taking the time to improve the quality of discussion on our site"
 
 #: templates/comments/delete.html:4
 msgid "Remove a comment"
-msgstr ""
+msgstr "Remove a comment"
 
 #: templates/comments/delete.html:7
 msgid "Really remove this comment?"
-msgstr ""
+msgstr "Really remove this comment?"
 
 #: templates/comments/delete.html:12
 msgid "Remove"
-msgstr ""
+msgstr "Remove"
 
 #: templates/comments/deleted.html:4
 msgid "Thanks for removing"
-msgstr ""
+msgstr "Thanks for removing"
 
 #: templates/comments/flag.html:4
 msgid "Flag this comment"
-msgstr ""
+msgstr "Flag this comment"
 
 #: templates/comments/flag.html:7
 msgid "Really flag this comment?"
-msgstr ""
+msgstr "Really flag this comment?"
 
 #: templates/comments/flag.html:12
 msgid "Flag"
-msgstr ""
+msgstr "Flag"
 
 #: templates/comments/flagged.html:4
 msgid "Thanks for flagging"
-msgstr ""
+msgstr "Thanks for flagging"
 
 #: templates/comments/form.html:17 templates/comments/preview.html:32
 msgid "Post"
-msgstr ""
+msgstr "Post"
 
 #: templates/comments/form.html:18 templates/comments/preview.html:33
 msgid "Preview"
-msgstr ""
+msgstr "Preview"
 
 #: templates/comments/posted.html:4
 msgid "Thanks for commenting"
-msgstr ""
+msgstr "Thanks for commenting"
 
 #: templates/comments/posted.html:7
 msgid "Thank you for your comment"
-msgstr ""
+msgstr "Thank you for your comment"
 
 #: templates/comments/preview.html:4 templates/comments/preview.html.py:13
 msgid "Preview your comment"
-msgstr ""
+msgstr "Preview your comment"
 
 #: templates/comments/preview.html:11
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Please correct the error below"
+msgstr[1] "Please correct the errors below"
 
 #: templates/comments/preview.html:16
 msgid "Post your comment"
-msgstr ""
+msgstr "Post your comment"
 
 #: templates/comments/preview.html:16
 msgid "or make changes"
-msgstr ""
+msgstr "or make changes"
+
+#~ msgid "flagged"
+#~ msgid_plural "flagged"
+#~ msgstr[0] "flagged"
+#~ msgstr[1] "flagged"
+
+#~ msgid "approved"
+#~ msgid_plural "approved"
+#~ msgstr[0] "approved"
+#~ msgstr[1] "approved"
+
+#~ msgid "removed"
+#~ msgid_plural "removed"
+#~ msgstr[0] "removed"
+#~ msgstr[1] "removed"
diff --git a/django/contrib/comments/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/comments/locale/en_GB/LC_MESSAGES/django.mo
index 2ac552176e..10d308bcaf 100644
Binary files a/django/contrib/comments/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/comments/locale/en_GB/LC_MESSAGES/django.po
index 2f935ea163..1cb20745ad 100644
--- a/django/contrib/comments/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/en_GB/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Content"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "flagged"
 msgstr[1] "flagged"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Flag selected comments"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "approved"
 msgstr[1] "approved"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Approve selected comments"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "removed"
 msgstr[1] "removed"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Remove selected comments"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] "%(count)s comments were successfully %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s comments"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Latest comments on %(site_name)s"
@@ -105,57 +105,57 @@ msgid ""
 msgstr ""
 "If you enter anything in this field your comment will be treated as spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "content type"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "object ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "user"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "user's name"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "user's email address"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "user's URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comment"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "date/time submitted"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP address"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "is public"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Uncheck this box to make the comment effectively disappear from the site."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "is removed"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -163,11 +163,11 @@ msgstr ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comments"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -175,7 +175,7 @@ msgstr ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -183,7 +183,7 @@ msgstr ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -198,19 +198,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "flag"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "date"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "comment flag"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "comment flags"
 
diff --git a/django/contrib/comments/locale/eo/LC_MESSAGES/django.mo b/django/contrib/comments/locale/eo/LC_MESSAGES/django.mo
index d403bdf862..aa1ee954b1 100644
Binary files a/django/contrib/comments/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/eo/LC_MESSAGES/django.po b/django/contrib/comments/locale/eo/LC_MESSAGES/django.po
index 3f7cb3bd18..ffb9096c7a 100644
--- a/django/contrib/comments/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/eo/LC_MESSAGES/django.po
@@ -5,68 +5,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Enhavo"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadatumo"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "markita"
 msgstr[1] "markitaj"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marki elektitajn komentojn"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprobita"
 msgstr[1] "aprobitaj"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Aprobi elektitajn komentojn"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "forigita"
 msgstr[1] "forigitaj"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Forigi elektitajn komentojn"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 komento estis suksese %(action)s."
 msgstr[1] "%(count)s komentoj estis suksese %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s komentoj"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Lastaj komentoj ĉe %(site_name)s"
@@ -104,58 +104,58 @@ msgid ""
 msgstr ""
 "Se vi enigas ion-ajn en ĉi-tiu kampo, via komento estos traktita kiel spamo"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "enhava tipo"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objekta identigaĵo"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "uzanto"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "uzanta nomo"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "uzanta retpoŝtadreso"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "uzanta URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komento"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "dato kaj horo transsenditaj"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-adreso"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "estas publika"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Malŝaltu ĉi-tiun markobutonon por definitive malaperigi la komenton el la "
 "retejo."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "estas forigita"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -163,11 +163,11 @@ msgstr ""
 "Ŝaltu ĉi-tiun markobutonon se la komento estas nekonvena. La mesaĝo \"Ĉi-tiu "
 "komento estis forigita\" estos montrita anstataŭe."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentoj"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -175,7 +175,7 @@ msgstr ""
 "Ĉi-tiu komento estis afiŝita de aŭtentigita uzanto, do tiel la nomo estas "
 "nurlega."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -183,7 +183,7 @@ msgstr ""
 "Ĉi-tiu komento estis afiŝita de aŭtentigita uzanto, do tiel la nomo kaj "
 "retpoŝtadreo estas nurlegaj."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -198,19 +198,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marko"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dato"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "komenta marko"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "komentaj markoj"
 
diff --git a/django/contrib/comments/locale/es/LC_MESSAGES/django.mo b/django/contrib/comments/locale/es/LC_MESSAGES/django.mo
index 101ba9d5ef..cda9b60a2b 100644
Binary files a/django/contrib/comments/locale/es/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/es/LC_MESSAGES/django.po b/django/contrib/comments/locale/es/LC_MESSAGES/django.po
index ebff367f46..5a15db6158 100644
--- a/django/contrib/comments/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/es/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Marc Garcia <garcia.marc@gmail.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "contenido"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "metadatos"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "marcado"
 msgstr[1] "marcados"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marcar los comentarios seleccionados"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprobado"
 msgstr[1] "aprobados"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "aprobar los comentarios seleccionados"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "eliminado"
 msgstr[1] "eliminados"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Eliminar los comentarios seleccionados"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 comentarios ha sido %(action)s satisfactoriamente."
 msgstr[1] "%(count)s comentarios han sido %(action)s satisfactoriamente."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "comentarios de %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Últimos comentarios en %(site_name)s"
@@ -105,58 +105,58 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Si introduce algo en este campo su comentario será tratado como spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID de objeto"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "usuario"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nombre del usuario"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "dirección de correo electrónico del usuario"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL del usuario"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comentario"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "fecha/hora de envío"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "es público"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Desmarque esta casilla para hacer desaparecer el comentario del sitio web de "
 "forma efectiva."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "está eliminado"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -164,11 +164,11 @@ msgstr ""
 "Marque esta opción si el comentario es inapropiado. En su lugar se mostrará "
 "el mensaje \"Este comentario ha sido eliminado\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comentarios"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -176,7 +176,7 @@ msgstr ""
 "Este comentario ha sido enviado por un usuario autentificado: de modo que su "
 "nombre no es modificable."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -184,7 +184,7 @@ msgstr ""
 "Este comentario ha sido colocado por un usuario autentificado: de modo que "
 "su dirección de correo electrónico no es modificable."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -199,19 +199,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marcar"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "fecha"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "marca de comentario"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "marcas de comentario"
 
diff --git a/django/contrib/comments/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/comments/locale/es_AR/LC_MESSAGES/django.mo
index d174eab3de..0ae4766617 100644
Binary files a/django/contrib/comments/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/comments/locale/es_AR/LC_MESSAGES/django.po
index 85827a3628..e6971abfe9 100644
--- a/django/contrib/comments/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/es_AR/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Contenido"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "marcado"
 msgstr[1] "marcados"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marcar comentarios seleccionados"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprobado"
 msgstr[1] "aprobados"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Aprobar comentario seleccionado"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "eliminado"
 msgstr[1] "eliminados"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Eliminar comentarios seleccionados"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "un comentario fue %(action)s satisfactoriamente."
 msgstr[1] "%(count)s comentarios fueron %(action)s satisfactoriamente"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "comentarios en %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Últimos comentarios en %(site_name)s."
@@ -104,56 +104,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Si introduce algo en este campo su comentario será tratado como spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID de objeto"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "usuario"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nombre de usuario"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "dirección de correo electrónico del usuario"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL del usuario"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comentario"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "fecha/hora de envío"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "es público"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "desmarque este ítem para que el comentario desaparezca del sitio."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "se ha eliminado"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -161,11 +161,11 @@ msgstr ""
 "Marque este ítem si el comentario es inapropiado. En su lugar se mostrará un "
 "mensaje \"Este comentario ha sido eliminado\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comentarios"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -173,7 +173,7 @@ msgstr ""
 "Este comentario ha sido enviado por un usuario identificado, por lo tanto el "
 "nombre no puede modificarse."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -181,7 +181,7 @@ msgstr ""
 "Este comentario ha sido enviado por un usuario identificado, por lo tanto la "
 "dirección de correo electrónico no puede modificarse."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -196,19 +196,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marca"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "fecha"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "marca de comentario"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "marcas de comentario"
 
diff --git a/django/contrib/comments/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/comments/locale/es_MX/LC_MESSAGES/django.mo
index c5bff802b9..d7c92d6e29 100644
Binary files a/django/contrib/comments/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/comments/locale/es_MX/LC_MESSAGES/django.po
index 44c580631f..451da9f538 100644
--- a/django/contrib/comments/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/es_MX/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Contenido"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "marcado"
 msgstr[1] "marcados"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marcar comentarios seleccionados"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprobado"
 msgstr[1] "aprobados"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Aprobar comentario seleccionado"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "eliminado"
 msgstr[1] "eliminados"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Eliminar comentarios seleccionados"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] "%(count)s comentarios fueron %(action)s satisfactoriamente."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "comentarios en %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Últimos comentarios en %(site_name)s "
@@ -104,56 +104,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Si introduce algo en este campo su comentario será tratado como spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID de objeto"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "usuario"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nombre de usuario"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "dirección de correo electrónico del usuario"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL del usuario"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comentario"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "fecha/hora de envío"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "es público"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Desactive esta casilla para hacer el comentario desaparezca del sitio."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "se ha eliminado"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -161,11 +161,11 @@ msgstr ""
 "Marque esta casilla si el comentario es inapropiado. En su lugar se mostrará "
 "un mensaje \"Este comentario ha sido eliminado\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comentarios"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -173,7 +173,7 @@ msgstr ""
 "Este comentario ha sido enviado por un usuario identificado, por lo tanto el "
 "nombre no puede modificarse."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -181,7 +181,7 @@ msgstr ""
 "Este comentario ha sido enviado por un usuario identificado, por lo tanto la "
 "dirección de correo electrónico no puede modificarse."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -196,19 +196,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marca"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "fecha"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "marca de comentario"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "marcas de comentario"
 
diff --git a/django/contrib/comments/locale/et/LC_MESSAGES/django.mo b/django/contrib/comments/locale/et/LC_MESSAGES/django.mo
index 4098d1066d..67e9ef44a5 100644
Binary files a/django/contrib/comments/locale/et/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/et/LC_MESSAGES/django.po b/django/contrib/comments/locale/et/LC_MESSAGES/django.po
index fd2656e6a7..be43a10246 100644
--- a/django/contrib/comments/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/et/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Sisu"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Meta-andmed"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "märgistatud"
 msgstr[1] "märgistatud"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Märgista valitud kommentaarid"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "heaks kiidetud"
 msgstr[1] "heaks kiidetud"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Kiida heaks valitud kommentaarid"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "eemaldatud"
 msgstr[1] "eemaldatud"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Eemalda valitud kommentaarid"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s comments were successfully %(action)s."
 msgstr[1] "%(count)s comments were successfully %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Saidi %(site_name)s kommentaarid"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Viimased kommentaarid saidil %(site_name)s"
@@ -105,56 +105,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Kui sisestate sellesse lahtrisse midagi, loetakse kommentaar rämpsuks"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "sisutüüp"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objekti ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "kasutaja"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "kasutaja pärisnimi"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "kasutaja e-posti aadress"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "kasutaja URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "kommentaar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "loomise kuupäev/kellaaeg"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP aadress"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "on avalik"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Eemaldage siit linnuke, et varjata kommentaar saidilt."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "on eemaldatud"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -162,11 +162,11 @@ msgstr ""
 "Märkige siia linnuke, kui see kommentaar on ebasobiv. Kommentaari asemel "
 "kuvatakse kirja \"Kommentaar on kustutatud\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "kommentaarid"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -174,7 +174,7 @@ msgstr ""
 "Selle kommentaari postitas sisselogitud kasutaja, mistõttu ei ole nimetus "
 "muudetav."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -182,7 +182,7 @@ msgstr ""
 "Selle kommentaari postitas sisselogitud kasutaja, mistõttu ei ole e-posti "
 "aadress muudetav."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -197,19 +197,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "märge"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "kuupäev"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "kommentaari märge"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "kommentaari märked"
 
diff --git a/django/contrib/comments/locale/eu/LC_MESSAGES/django.mo b/django/contrib/comments/locale/eu/LC_MESSAGES/django.mo
index ced675423d..68ea84e57a 100644
Binary files a/django/contrib/comments/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/eu/LC_MESSAGES/django.po b/django/contrib/comments/locale/eu/LC_MESSAGES/django.po
index d2f4fa72fe..3689aaeaa4 100644
--- a/django/contrib/comments/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/eu/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Edukia"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metada"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "markaduna"
 msgstr[1] "markadunak"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Markatu aukeratutako iruzkinak"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "onartua"
 msgstr[1] "onartuak"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Onartu aukeratutako iruzkinak"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "ezabatua"
 msgstr[1] "ezabatuak"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Ezabatu aukeratutako iruzkinak"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] "%(count)s iruzkin ondo %(action)s dira."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s guneko iruzkinak"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s guneko azken iruzkinak"
@@ -106,56 +106,56 @@ msgid ""
 msgstr ""
 "Eremu honetan zerbait idazten baduzu zure iruzkina spam gisa tratatuko da."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "eduki mota"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objetuaren ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "Erabiltzailea"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "erabiltzailearen izena"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "erabiltzailearen eposta helbidea"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "erabiltzailearen URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "iruzkina"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/hordua bidalia"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP helbidea"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "publikoa"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Markatu kutxa hau iruzkina webgunetik desagertarazteko."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "ezabatua"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -163,11 +163,11 @@ msgstr ""
 "Markatu kutxa hau komentario ezegokia bada. \"Komentario hau ezabatua izan da"
 "\" mezua erakutsiko da bere ordez."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "iruzkinak"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -175,7 +175,7 @@ msgstr ""
 "Iruzkin hau autentikatutako erabiltzaile batek egin du. Hori dela eta, izena "
 "irakurtzeko moduan dago bakarrik. "
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -183,7 +183,7 @@ msgstr ""
 "Iruzkin hau autentikatutako erabiltzaile batek egin du. Hori dela eta, "
 "eposta irakurtzeko moduan dago bakarrik. "
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -198,19 +198,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marka"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "data"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "iruzkin marka"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "iruzkin markak"
 
diff --git a/django/contrib/comments/locale/fa/LC_MESSAGES/django.mo b/django/contrib/comments/locale/fa/LC_MESSAGES/django.mo
index 1875673134..5ff3c5bfb9 100644
Binary files a/django/contrib/comments/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/fa/LC_MESSAGES/django.po b/django/contrib/comments/locale/fa/LC_MESSAGES/django.po
index b3dd7e1577..8adc006d10 100644
--- a/django/contrib/comments/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/fa/LC_MESSAGES/django.po
@@ -1,72 +1,74 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Ali Nikneshan <ali@nikneshan.com>, 2012.
+# Arash Fazeli <arash_fazeli77@yahoo.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-02-14 13:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-11 08:27+0000\n"
+"Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "محتوا"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "فوق داده"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
-msgstr[0] ""
+msgstr[0] "پرچم دار"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
-msgstr ""
+msgstr "نشان‌گذاری نظرات انتخاب شده"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
-msgstr[0] ""
+msgstr[0] "تایید شده"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
-msgstr ""
-
-#: admin.py:52
-msgid "removed"
-msgid_plural "removed"
-msgstr[0] ""
-
-#: admin.py:53
-msgid "Remove selected comments"
-msgstr ""
+msgstr "تایید نظرات انتخاب شده"
 
 #: admin.py:65
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] "حذف شده"
+
+#: admin.py:66
+msgid "Remove selected comments"
+msgstr "حذف نظر های انتخاب شده"
+
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
-msgstr[0] ""
+msgstr[0] "%(count)s کامنت با موفقیت %(action)s شدند."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
-msgstr ""
+msgstr "نظرات %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
-msgstr ""
+msgstr "آخرین نظرات در  %(site_name)s"
 
 #: forms.py:96
 msgid "Name"
@@ -99,72 +101,74 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "اگر چیزی در این فیلد وارد کنید، نظر شما به عنوان اسپم شناخته خواهد شد"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "نوع محتوا"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "مشخصهٔ شیء"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "کاربر"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "نام کاربر"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "نشانی پست الکترونیکی کاربر"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "نشانی اینترنتی کاربر"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "نظر"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "تاریخ/زمان فرستاده شد"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "نشانی IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "عمومی است"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "تیک این جعبه را بردارید تا نظر به طور کارا از وبگاه ناپدید شود."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "حذف شده است"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
+"اگر نظر نامناسب است این جا علامت بزنید. پیغام \"این نظر حذف شد\" به جای آن "
+"نمایش داده می شود."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
-msgstr ""
+msgstr "نظرات"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "این نظر توسط یک کاربر ثبت‌شده فرستاده شده و لذا نامش فقط-خواندنی است."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -172,7 +176,7 @@ msgstr ""
 "این نظر توسط یک کاربر ثبت‌شده فرستاده شده و لذا پست الکترونیکی‌اش فقط-خواندنی "
 "است."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -187,105 +191,105 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
-msgstr ""
+msgstr "علامت گذاری "
 
-#: models.py:171
+#: models.py:180
 msgid "date"
-msgstr ""
+msgstr "تاریخ"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
-msgstr ""
+msgstr "علامت گذاری نظر"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
-msgstr ""
+msgstr "علامت گذاری های نظر"
 
 #: templates/comments/approve.html:4
 msgid "Approve a comment"
-msgstr ""
+msgstr "تایید یک نظر"
 
 #: templates/comments/approve.html:7
 msgid "Really make this comment public?"
-msgstr ""
+msgstr "واقعا این نظر به صورت عمومی نمایش داده شود؟"
 
 #: templates/comments/approve.html:12
 msgid "Approve"
-msgstr ""
+msgstr "تایید"
 
 #: templates/comments/approved.html:4
 msgid "Thanks for approving"
-msgstr ""
+msgstr "ممنون از تایید."
 
 #: templates/comments/approved.html:7 templates/comments/deleted.html:7
 #: templates/comments/flagged.html:7
 msgid ""
 "Thanks for taking the time to improve the quality of discussion on our site"
-msgstr ""
+msgstr "ممنون از وقتی که برای افزایش کیفیت بحث در سایت ما گذاشتید."
 
 #: templates/comments/delete.html:4
 msgid "Remove a comment"
-msgstr ""
+msgstr "حذف یک نظر"
 
 #: templates/comments/delete.html:7
 msgid "Really remove this comment?"
-msgstr ""
+msgstr "واقعا این نظر حذف شود؟"
 
 #: templates/comments/delete.html:12
 msgid "Remove"
-msgstr ""
+msgstr "حذف"
 
 #: templates/comments/deleted.html:4
 msgid "Thanks for removing"
-msgstr ""
+msgstr "ممنون از حذف"
 
 #: templates/comments/flag.html:4
 msgid "Flag this comment"
-msgstr ""
+msgstr "علامت گذاری این نظر"
 
 #: templates/comments/flag.html:7
 msgid "Really flag this comment?"
-msgstr ""
+msgstr "واقعا این نظر علامت گذاری شود؟"
 
 #: templates/comments/flag.html:12
 msgid "Flag"
-msgstr ""
+msgstr "علامت گذاری "
 
 #: templates/comments/flagged.html:4
 msgid "Thanks for flagging"
-msgstr ""
+msgstr "ممنون از علامت گذاری "
 
 #: templates/comments/form.html:17 templates/comments/preview.html:32
 msgid "Post"
-msgstr ""
+msgstr "پست"
 
 #: templates/comments/form.html:18 templates/comments/preview.html:33
 msgid "Preview"
-msgstr ""
+msgstr "پیش نمایش"
 
 #: templates/comments/posted.html:4
 msgid "Thanks for commenting"
-msgstr ""
+msgstr "برای اظهار نظر"
 
 #: templates/comments/posted.html:7
 msgid "Thank you for your comment"
-msgstr ""
+msgstr "با تشکر از نظر شما"
 
 #: templates/comments/preview.html:4 templates/comments/preview.html.py:13
 msgid "Preview your comment"
-msgstr ""
+msgstr "پیش نمایش نظر شما"
 
 #: templates/comments/preview.html:11
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
-msgstr[0] ""
+msgstr[0] "لطفا خطاهای زیر را تصحیح"
 
 #: templates/comments/preview.html:16
 msgid "Post your comment"
-msgstr ""
+msgstr "نظر خود را ارسال کنید"
 
 #: templates/comments/preview.html:16
 msgid "or make changes"
-msgstr ""
+msgstr "و یا تغییر ایجاد کنید."
diff --git a/django/contrib/comments/locale/fi/LC_MESSAGES/django.mo b/django/contrib/comments/locale/fi/LC_MESSAGES/django.mo
index d0cacc4e86..c8adefe40f 100644
Binary files a/django/contrib/comments/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/fi/LC_MESSAGES/django.po b/django/contrib/comments/locale/fi/LC_MESSAGES/django.po
index 505eea0f89..e52ed18c7c 100644
--- a/django/contrib/comments/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/fi/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Sisältö"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metatieto"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "merkitty"
 msgstr[1] "merkitty"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Merkitse valitut kommentit"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "hyväksytty"
 msgstr[1] "hyväksytty"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Hyväksy valitut kommentit"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "poistettu"
 msgstr[1] "poistettu"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Poista valitut kommentit"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 kommentti %(count)s onnistuneesti."
 msgstr[1] "%(count)s kommenttia %(action)s onnistuneesti."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Kommentit sivustolle %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Sivuston %(site_name)s viimeisimmät kommentit"
@@ -105,56 +105,56 @@ msgid ""
 msgstr ""
 "Jos syötät tähän kenttään jotain, kommenttisi luokitellaan roskapostiksi"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "sisältötyyppi"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "kohteen tunniste"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "käyttäjä"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "käyttäjän nimi"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "käyttäjän sähköpostiosoite"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "käyttäjän URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "kommentti"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "lähettämishetki"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-osoite"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "on julkinen"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Piilottaaksesi kommentin näkymästä sivustolta, poista tämä ruksi."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "on poistettu"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -162,11 +162,11 @@ msgstr ""
 "Rastita jos kommentti on asiaankuulumaton. Kommentin tilalla näytetään\n"
 "viesti \"Tämä kommentti on poistettu\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "kommentit"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -174,7 +174,7 @@ msgstr ""
 "Kommentin lähettäjän nimeä ei voi muuttaa, koska lähettäjä on kirjautunut "
 "käyttäjä."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -182,7 +182,7 @@ msgstr ""
 "Kommentin lähettäjän sähköpostiosoitetta ei voi muuttaa, koska lähettäjä on "
 "kirjautunut käyttäjä."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -197,19 +197,19 @@ msgstr ""
 " \\n\n"
 " http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "merkintä"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "päivä"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "kommentin merkintä"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "kommenttien merkinnät"
 
diff --git a/django/contrib/comments/locale/fr/LC_MESSAGES/django.mo b/django/contrib/comments/locale/fr/LC_MESSAGES/django.mo
index 06dd3bccaa..730424d952 100644
Binary files a/django/contrib/comments/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/fr/LC_MESSAGES/django.po b/django/contrib/comments/locale/fr/LC_MESSAGES/django.po
index 7cff910acb..ff1ac9e664 100644
--- a/django/contrib/comments/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/fr/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Contenu"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "marqué"
 msgstr[1] "marqués"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marquer les commentaires sélectionnés"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "approuvé"
 msgstr[1] "approuvés"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Approuver les commentaires sélectionnés"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "supprimé"
 msgstr[1] "supprimés"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Masquer les commentaires sélectionnés"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 commentaire a été %(action)s avec succès."
 msgstr[1] "%(count)s commentaires ont été %(action)ss avec succès."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Commentaires sur %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Derniers commentaires sur %(site_name)s"
@@ -108,57 +108,57 @@ msgstr ""
 "Si vous saisissez quelque chose dans ce champ, votre commentaire sera "
 "considéré comme étant indésirable"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "type de contenu"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID de l'objet"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "utilisateur"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nom de l'utilisateur"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "adresse électronique de l'utilisateur"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL de l'utilisateur"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "commentaire"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "date et heure soumises"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "adresse IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "est public"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Décochez cette case pour faire vraiment disparaître ce commentaire du site."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "est masqué"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -166,11 +166,11 @@ msgstr ""
 "Cochez cette case si le commentaire est inadéquat. Un message type « Ce "
 "commentaire a été supprimé » sera affiché en lieu et place de celui-ci."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "commentaires"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -178,7 +178,7 @@ msgstr ""
 "Ce commentaire a été posté par un utilisateur authentifié, le nom est donc "
 "en lecture seule."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -186,7 +186,7 @@ msgstr ""
 "Ce commentaire a été posté par un utilisateur authentifié et le courriel est "
 "donc en lecture seule"
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -201,19 +201,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "indicateur"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "date"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "indicateur de commentaire"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "indicateurs de commentaire"
 
diff --git a/django/contrib/comments/locale/ga/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ga/LC_MESSAGES/django.mo
index 4d9430961e..1f29ae1b24 100644
Binary files a/django/contrib/comments/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ga/LC_MESSAGES/django.po b/django/contrib/comments/locale/ga/LC_MESSAGES/django.po
index 6463e62302..d7cd749aa5 100644
--- a/django/contrib/comments/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ga/LC_MESSAGES/django.po
@@ -7,27 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Inneachar"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Meiteashonraí"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "bratach curtha leis "
@@ -36,11 +36,11 @@ msgstr[2] "bratach curtha leis "
 msgstr[3] "bratach curtha leis "
 msgstr[4] "bratach curtha leis "
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Bratach nótaí tráchta roghnaithe"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "ceadaithe"
@@ -49,11 +49,11 @@ msgstr[2] "ceadaithe"
 msgstr[3] "ceadaithe"
 msgstr[4] "ceadaithe"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Cheadú nótaí tráchta roghnaithe"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "bhaint"
@@ -62,11 +62,11 @@ msgstr[2] "bhaint"
 msgstr[3] "bhaint"
 msgstr[4] "bhaint"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Bain nótaí tráchta roghnaithe"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -76,12 +76,12 @@ msgstr[2] "Bhí %(count)s nótaí tráchta %(action)s go rathúil."
 msgstr[3] "Bhí %(count)s nótaí tráchta %(action)s go rathúil."
 msgstr[4] "Bhí %(count)s nótaí tráchta %(action)s go rathúil."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s nótaí"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Nótaí tráchtaí is déanaí ar %(site_name)s"
@@ -122,56 +122,56 @@ msgid ""
 msgstr ""
 "Má cuireann tú aon rud sa réimse seo, beidh do nóta déileálfar mar spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tíopa inneachar "
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "oibiacht ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "úsáideoir"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "Ainm úsáideoir"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "seoladh r-phost an t-úsáideoir"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL an t-úsáideora"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "trácht"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "Dáta/am curtha isteach"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Seol IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "poiblí"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Díthiceáil an bosca seo chun an nóta a thógáil as an suíomh."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "Scrioste"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -179,11 +179,11 @@ msgstr ""
 "Seic an bosca seo dá bbéadh an nóta tráchta seo míchuí. Taispeantar \"Bhí an "
 "nóta tráchta scrioste\" in áit an nóta tráchta seo."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "nótaí tráchta"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -191,7 +191,7 @@ msgstr ""
 "Bhí an nóta tráchta póstailte trí uaire trí úsáideoir fíordheimhnithe mar "
 "sin tá an ainm léamh-amhain."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -199,7 +199,7 @@ msgstr ""
 "Bhí an nóta tráchta póstailte trí úsáideoir fíordeimhnite mar sin tá an r-"
 "phost léamh amháin."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -214,19 +214,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "brat"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dáta"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "brat nóta tráchta"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "bratacha nótaí tráchta"
 
diff --git a/django/contrib/comments/locale/gl/LC_MESSAGES/django.mo b/django/contrib/comments/locale/gl/LC_MESSAGES/django.mo
index b25d17d110..9885a75516 100644
Binary files a/django/contrib/comments/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/gl/LC_MESSAGES/django.po b/django/contrib/comments/locale/gl/LC_MESSAGES/django.po
index c46db56d26..829b404a91 100644
--- a/django/contrib/comments/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/gl/LC_MESSAGES/django.po
@@ -8,68 +8,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: fonso <fonzzo@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Contido"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "con indicador"
 msgstr[1] "con indicador"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Poñer un indicador"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprobado"
 msgstr[1] "aprobados"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Aprobar os comentarios seleccionados"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "eliminado"
 msgstr[1] "eliminados"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Eliminar os comentarios seleccionados"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] "%(count)s comentarios foron %(action)s con éxito."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Comentarios en %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Últimos comentarios en %(site_name)s"
@@ -107,58 +107,58 @@ msgid ""
 msgstr ""
 "Se insire calquera cousa neste campo o seu comentario será tratado coma spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tipo de contido"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID do obxecto"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "usuario"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nome de usuario"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "enderedo electrónico do usuario"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL do usuario"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comentario"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/hora do envío"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Enderezo IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "é público"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Desmarque esta casilla para eliminar o comentario definitivamente deste "
 "sitio."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "está borrado"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -166,11 +166,11 @@ msgstr ""
 "Marque esta caixa se o comentario non é apropiado. Verase a mensaxe \"Este "
 "comentario foi borrado\" no canto do seu contido."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comentarios"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -178,7 +178,7 @@ msgstr ""
 "Este comentario foi publicado por un usuario identificado e polo tanto o "
 "nome é de só lectura."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -186,7 +186,7 @@ msgstr ""
 "Este comentario foi publicado por un usuario identificado e polo tanto o "
 "enderezo de correo electrónico é de só lectura."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -201,19 +201,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "indicador"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "data"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "indicador de comentarios"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "indicadores de comentarios"
 
diff --git a/django/contrib/comments/locale/he/LC_MESSAGES/django.mo b/django/contrib/comments/locale/he/LC_MESSAGES/django.mo
index 80e102f74a..fdbd124556 100644
Binary files a/django/contrib/comments/locale/he/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/he/LC_MESSAGES/django.po b/django/contrib/comments/locale/he/LC_MESSAGES/django.po
index 0719ce42c5..3567e8e59c 100644
--- a/django/contrib/comments/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/he/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "תוכן"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "מטא־נתונים"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "סומנה"
 msgstr[1] "סומנו"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "סמן תגובות שנבחרו"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "אושרה"
 msgstr[1] "אושרו"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "אשר תגובות שנבחרו"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "הוסרה"
 msgstr[1] "הוסרו"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "הסר תגובות שנבחרו"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "תגובה אחת %(action)s בהצלחה"
 msgstr[1] "%(count)s תגובות %(action)s בהצלחה"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "תגובות עבור %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "התגובות האחרונות על %(site_name)s"
@@ -104,56 +104,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "אם יוזן משהו בשדה זה תגובתך תטופל כספאם"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "סוג תוכן"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "מזהה אובייקט"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "משתמש"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "שם משתמש"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "כתובת דוא\"ל משתמש"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "אתר המשתמש"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "תגובה"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "תאריך/שעת הגשה"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "כתובת IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "פומבי "
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "ביטול סימון התיבה יעלים בפועל את התגובה מהאתר"
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "האם הוסר"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -161,23 +161,23 @@ msgstr ""
 "יש לסמן תיבה זו עבור תגובה לא נאותה. הודעת \"תגובה זו נמחקה\" תוצג במקום "
 "התגובה."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "תגובות"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "הודעה זו נשלחה ע\"י משתמש מחובר לכן השם אינו ניתן לשינוי."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr "הודעה זו נשלחה ע\"י משתמש מחובר לכן כתובת הדוא\"ל אינה ניתנת לשינוי."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -192,19 +192,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "סימן"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "תאריך"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "סמן הערה"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "סמני הערה"
 
diff --git a/django/contrib/comments/locale/hi/LC_MESSAGES/django.mo b/django/contrib/comments/locale/hi/LC_MESSAGES/django.mo
index 29b3a1aee8..358fcf827f 100644
Binary files a/django/contrib/comments/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/hi/LC_MESSAGES/django.po b/django/contrib/comments/locale/hi/LC_MESSAGES/django.po
index 490b065036..2dd003a03a 100644
--- a/django/contrib/comments/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/hi/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Sandeep Satavlekar <sandysat@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "विषय सूची"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "मेटाडाटा"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "झंडी ऊंचायी"
 msgstr[1] "झंडी ऊंचायी"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "चयनित टिप्पणियों के लिए झंडी ऊंचाओ"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "स्वीकृत"
 msgstr[1] "स्वीकृत"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "चयनित टिप्पणियों को स्वीकार करो"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "हटाया"
 msgstr[1] "हटाया"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "चयनित टिप्पणियाँ हटाएँ"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s टिप्पणि सफलतापूर्वक %(action)s"
 msgstr[1] "%(count)s टिप्पणियाँ सफलतापूर्वक %(action)s"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s टिप्पणियाँ "
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s पर नवीनतम टिप्पणियाँ"
@@ -107,56 +107,56 @@ msgstr ""
 "अगर आप इस क्षेत्र में कुछ भी दर्ज करते हो तो आप की टिप्पणी के साथ spam के जैसा सुलुख किया "
 "जायेगा"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "विषय-सूची प्रकार"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "वस्तु आइ डी"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "उपभोक्ता"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "प्रयोक्ता नाम"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "प्रयोक्ता ईमेल पता"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "प्रयोक्ता यू.आर.एल"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "टिप्पणी"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "तिथि/समय निवेदित"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "आइ.पि पता"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "सार्वजनिक है"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "इस टिप्पणी को प्रभावी रूप से साइट से गायब करने के लिए यह बॉक्स को अनचेक करें."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "हटाया गया"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -164,11 +164,11 @@ msgstr ""
 "अगर टिप्पणी अनुचित है तो इस बॉक्स को चेक करें. एक \"यह टिप्पणी हटा दी गयी हैं\" संदेश "
 "प्रदर्शित किया जाएगा."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "टिप्पणियाँ"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -176,7 +176,7 @@ msgstr ""
 "इस टिप्पणी को किसी प्राधिकृत उपयोगकर्ता द्वारा पोस्ट किया गया था और इसीलिए इस नाम "
 "को केवल पढ़ने के लिए है."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -184,7 +184,7 @@ msgstr ""
 "इस टिप्पणी को किसी प्राधिकृत उपयोगकर्ता द्वारा पोस्ट किया गया था और इसीलिए यह ईमेल "
 "केवल पढ़ने के लिए है."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -199,19 +199,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "झंडा"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "तिथि"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "टिप्पणी झंडा"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "टिप्पणी झंडे"
 
diff --git a/django/contrib/comments/locale/hr/LC_MESSAGES/django.mo b/django/contrib/comments/locale/hr/LC_MESSAGES/django.mo
index fce773b718..2c2a09eb91 100644
Binary files a/django/contrib/comments/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/hr/LC_MESSAGES/django.po b/django/contrib/comments/locale/hr/LC_MESSAGES/django.po
index 5799e47351..27b64e4273 100644
--- a/django/contrib/comments/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/hr/LC_MESSAGES/django.po
@@ -6,60 +6,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Sadržaj"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "oznaka"
 msgstr[1] "oznake"
 msgstr[2] "oznake"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Označi ovaj komentar"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "odobreno"
 msgstr[1] "odobrene"
 msgstr[2] "odobrene"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Odobri odabrane komentare"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "uklonjeno"
 msgstr[1] "uklonjena"
 msgstr[2] "uklonjena"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Ukloni odabrane komentare"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -67,12 +67,12 @@ msgstr[0] "%(count)s komentar je uspješno %(action)s."
 msgstr[1] "%(count)s komentara su uspješno %(action)s."
 msgstr[2] "%(count)s komentara su uspješno %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "komentari za %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Najnoviji komentari na %(site_name)s"
@@ -110,56 +110,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Ako unesete nešto u ovo polje vaš komentar biti će tretiran kao spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tip sadržaja"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID objekta"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "korisničko ime"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "e-mail adresa korisnika"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "korisnikov URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "datum/vrijeme unosa"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP adresa"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "javno dostupno"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Uklonite oznaku da bi komentar nestao sa stranica."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "uklonjeno"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -167,11 +167,11 @@ msgstr ""
 "Uključite ako je komentar neprikladan. Umjesto komentara biti će prikazana "
 "poruka \"Komentar je uklonjen.\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentari"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -180,7 +180,7 @@ msgstr ""
 "\n"
 "%(text)s"
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "%(text)s"
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -205,19 +205,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "oznaka"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "oznaka za komentar"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "oznake komentara"
 
diff --git a/django/contrib/comments/locale/hu/LC_MESSAGES/django.mo b/django/contrib/comments/locale/hu/LC_MESSAGES/django.mo
index e492258c52..46125d43dc 100644
Binary files a/django/contrib/comments/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/hu/LC_MESSAGES/django.po b/django/contrib/comments/locale/hu/LC_MESSAGES/django.po
index 4be4d8786e..e42066892c 100644
--- a/django/contrib/comments/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/hu/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Szilveszter Farkas <szilveszter.farkas@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Tartalom"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "megjelölve"
 msgstr[1] "megjelölve"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Kiválasztott hozzászólások megjelölése"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "jóváhagyva"
 msgstr[1] "jóváhagyva"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Kiválasztott hozzászólások jóváhagyása"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "törölve"
 msgstr[1] "törölve"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Kiválasztott hozzászólások törlése"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s hozzászólás sikeresen %(action)s."
 msgstr[1] "%(count)s hozzászólás sikeresen %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s hozzászólások"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s legfrissebb hozzászólásai"
@@ -107,58 +107,58 @@ msgstr ""
 "Ha bármit begépel ebbe a mezőbe, akkor azt szemétként fogja kezelni a "
 "rendszer"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tartalom típusa"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objektum ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "felhasználó"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "felhasználó neve"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "felhasználó e-mail címe"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "felhasználó URL-je"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "megjegyzés"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "dátum/idő beállítva"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP cím"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "publikus"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Vegye ki a pipát a jelölőnégyzetből, hogy eltűntesse a hozzászólást az "
 "oldalról."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "eltávolítva"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -166,11 +166,11 @@ msgstr ""
 "Jelöld be a négyzetet, ha a megjegyzés nem megfelelő. Az \"Ezt a megjegyzést "
 "törölték\" üzenet fog megjelenni helyette."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "hozzászólások"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -178,7 +178,7 @@ msgstr ""
 "Ezt a hozzászólást egy hitelesített felhasználó küldte be, ezért a név csak "
 "olvasható."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -186,7 +186,7 @@ msgstr ""
 "Ezt a hozzászólást egy hitelesített felhasználó küldte be, ezért az e-mail "
 "csak olvasható."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -201,19 +201,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "megjelölés"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dátum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "hozzászólás megjelölés"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "hozzászólás megjelölés"
 
diff --git a/django/contrib/comments/locale/ia/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..8c728c4ce2
Binary files /dev/null and b/django/contrib/comments/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ia/LC_MESSAGES/django.po b/django/contrib/comments/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..06e863102b
--- /dev/null
+++ b/django/contrib/comments/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,306 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-09-19 23:34+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:25
+msgid "Content"
+msgstr "Contento"
+
+#: admin.py:28
+msgid "Metadata"
+msgstr "Metadatos"
+
+#: admin.py:55
+msgid "flagged"
+msgid_plural "flagged"
+msgstr[0] "marcate"
+msgstr[1] "marcate"
+
+#: admin.py:56
+msgid "Flag selected comments"
+msgstr "Marcar le commentos seligite"
+
+#: admin.py:60
+msgid "approved"
+msgid_plural "approved"
+msgstr[0] "approbate"
+msgstr[1] "approbate"
+
+#: admin.py:61
+msgid "Approve selected comments"
+msgstr "Approbar le commentos seligite"
+
+#: admin.py:65
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] "removite"
+msgstr[1] "removite"
+
+#: admin.py:66
+msgid "Remove selected comments"
+msgstr "Remover le commentos seligite"
+
+#: admin.py:78
+#, python-format
+msgid "1 comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] "1 commento ha essite %(action)s con successo."
+msgstr[1] "%(count)s commentos ha essite %(action)s con successo."
+
+#: feeds.py:14
+#, python-format
+msgid "%(site_name)s comments"
+msgstr "Commentos de %(site_name)s"
+
+#: feeds.py:20
+#, python-format
+msgid "Latest comments on %(site_name)s"
+msgstr "Ultime commentos in %(site_name)s"
+
+#: forms.py:96
+msgid "Name"
+msgstr "Nomine"
+
+#: forms.py:97
+msgid "Email address"
+msgstr "Adresse de e-mail"
+
+#: forms.py:98
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:99
+msgid "Comment"
+msgstr "Commento"
+
+#: forms.py:177
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "Le parola %s non es permittite hic."
+msgstr[1] "Le parolas %s non es permittite hic."
+
+#: forms.py:181 templates/comments/preview.html:16
+msgid "and"
+msgstr "e"
+
+#: forms.py:186
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+"Si tu insere qualcosa in iste campo, tu commento essera tractate como spam."
+
+#: models.py:23
+msgid "content type"
+msgstr "typo de contento"
+
+#: models.py:25
+msgid "object ID"
+msgstr "ID del objecto"
+
+#: models.py:53 models.py:177
+msgid "user"
+msgstr "usator"
+
+#: models.py:55
+msgid "user's name"
+msgstr "nomine del usator"
+
+#: models.py:56
+msgid "user's email address"
+msgstr "adresse de e-mail del usator"
+
+#: models.py:57
+msgid "user's URL"
+msgstr "URL del usator"
+
+#: models.py:59 models.py:79 models.py:178
+msgid "comment"
+msgstr "commento"
+
+#: models.py:62
+msgid "date/time submitted"
+msgstr "data/hora de submission"
+
+#: models.py:63
+msgid "IP address"
+msgstr "adresse IP"
+
+#: models.py:64
+msgid "is public"
+msgstr "es public"
+
+#: models.py:65
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+"Dismarca iste quadro pro facer le commento effectivemente disparer de iste "
+"sito."
+
+#: models.py:67
+msgid "is removed"
+msgstr "es removite"
+
+#: models.py:68
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Marca iste quadro si le commento es inappropriate. Un message \"iste "
+"commento ha essite removite\" essera monstrate in su loco."
+
+#: models.py:80
+msgid "comments"
+msgstr "commentos"
+
+#: models.py:124
+msgid ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
+msgstr ""
+"Iste commento ha essite publicate per un usator authenticate e dunque le "
+"nomine es immodificabile."
+
+#: models.py:134
+msgid ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
+msgstr ""
+"Iste commento ha essite publicate per un usator authenticate e dunque le "
+"adresse de e-mail es immodificabile."
+
+#: models.py:160
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"Publicate per %(user)s le %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+
+#: models.py:179
+msgid "flag"
+msgstr "marca"
+
+#: models.py:180
+msgid "date"
+msgstr "data"
+
+#: models.py:190
+msgid "comment flag"
+msgstr "marcation de commento"
+
+#: models.py:191
+msgid "comment flags"
+msgstr "marcationes de commento"
+
+#: templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "Approbar un commento"
+
+#: templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr "Es tu secur de voler render iste commento public?"
+
+#: templates/comments/approve.html:12
+msgid "Approve"
+msgstr "Approbar"
+
+#: templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "Gratias pro approbar"
+
+#: templates/comments/approved.html:7 templates/comments/deleted.html:7
+#: templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr ""
+"Gratias pro prender le tempore pro meliorar le qualitate del discussion in "
+"nostre sito"
+
+#: templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "Remover un commento"
+
+#: templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr "Es tu secur de voler remover iste commento?"
+
+#: templates/comments/delete.html:12
+msgid "Remove"
+msgstr "Remover"
+
+#: templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "Gratias pro remover"
+
+#: templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr "Marcar iste commento"
+
+#: templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr "Es tu secur de voler marcar iste commento?"
+
+#: templates/comments/flag.html:12
+msgid "Flag"
+msgstr "Marcar"
+
+#: templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr "Gratias pro marcar"
+
+#: templates/comments/form.html:17 templates/comments/preview.html:32
+msgid "Post"
+msgstr "Publicar"
+
+#: templates/comments/form.html:18 templates/comments/preview.html:33
+msgid "Preview"
+msgstr "Previsualisar"
+
+#: templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr "Gratias pro commentar"
+
+#: templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr "Gratias pro tu commento"
+
+#: templates/comments/preview.html:4 templates/comments/preview.html.py:13
+msgid "Preview your comment"
+msgstr "Previsualisar tu commento"
+
+#: templates/comments/preview.html:11
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "Per favor corrige le error sequente"
+msgstr[1] "Per favor corrige le errores sequente"
+
+#: templates/comments/preview.html:16
+msgid "Post your comment"
+msgstr "Publicar tu commento"
+
+#: templates/comments/preview.html:16
+msgid "or make changes"
+msgstr "o facer modificationes"
diff --git a/django/contrib/comments/locale/id/LC_MESSAGES/django.mo b/django/contrib/comments/locale/id/LC_MESSAGES/django.mo
index f47d6479dc..d58452d3a8 100644
Binary files a/django/contrib/comments/locale/id/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/id/LC_MESSAGES/django.po b/django/contrib/comments/locale/id/LC_MESSAGES/django.po
index 55a5553867..812f7a2de0 100644
--- a/django/contrib/comments/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/id/LC_MESSAGES/django.po
@@ -7,64 +7,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Isi"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "ditandai"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Tandai komentar terpilih"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "disetujui"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Setujui komentar terpilih"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "dihapus"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Hapus komentar terpilih"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s komentar berhasil %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "komentar pada %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Komentar terbaru pada %(site_name)s"
@@ -100,57 +100,57 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Jika Anda mengisi bidang ini, komentar Anda akan dianggap sebagai spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tipe konten"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID objek"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "pengguna"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nama pengguna"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "alamat email pengguna"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL pengguna"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "tanggal/waktu dikirim"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "alamat IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "untuk umum"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Hapus centang pada kotak ini agar komentar tidak ditampilkan pada situs."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "telah dihapus"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -158,11 +158,11 @@ msgstr ""
 "Centang kotak ini jika komentar tidak pantas. Pesan \"Komentar ini telah "
 "dihapus\" akan ditampilkan sebagai penggantinya."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentar"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -170,7 +170,7 @@ msgstr ""
 "Komentar ini dikirim oleh seorang pengguna terautentikasi sehingga nama "
 "pengguna tidak dapat diubah."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -178,7 +178,7 @@ msgstr ""
 "Komentar ini dikirim oleh seorang pengguna terautentikasi sehingga alamat "
 "email tidak dapat diubah."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -193,19 +193,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "tanda"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "tanggal"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "tanda komentar"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "tanda komentar"
 
diff --git a/django/contrib/comments/locale/is/LC_MESSAGES/django.mo b/django/contrib/comments/locale/is/LC_MESSAGES/django.mo
index 14dc6e4836..63e0411685 100644
Binary files a/django/contrib/comments/locale/is/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/is/LC_MESSAGES/django.po b/django/contrib/comments/locale/is/LC_MESSAGES/django.po
index 721c2dd4a5..1918df3193 100644
--- a/django/contrib/comments/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/is/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Innihald"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Hengigögn"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "flaggað"
 msgstr[1] "flaggað"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Flagga valdar athugasemdir"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "samþykkt"
 msgstr[1] "samþykkt"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Samþykkja valdar athugasemdir"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "fjarlægð"
 msgstr[1] "fjarlægðar"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Fjarlægja valdar athugasemdir"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] "Það tókst að %(action)s %(count)s athugasemdum."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s: athugasemdir"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Nýjustu athugasemdir á %(site_name)s"
@@ -107,56 +107,56 @@ msgstr ""
 "Ef þú skrifar eitthvað hérna verður athugasemdin sjálfkrafa meðhöndluð sem "
 "ruslpóstur"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "efnistag"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "kenni hlutar"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "notandi"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nafn notanda"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "netfang notanda"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "veffang notanda"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "athugasemd"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "innsent dags/tími"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP tala"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "er öllum sýnilegt"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Taktu hakið úr til að fjarlægja athugasemdina af vefsíðunni."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "hefur verið fjarlægt"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -164,11 +164,11 @@ msgstr ""
 "Hakaðu við þennan reit ef athugasemdin er óviðeigandi. Skilaboðin „Þessi "
 "athugasemd hefur verið fjarlægð“ birtist í staðinn."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "athugasemdir"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -176,7 +176,7 @@ msgstr ""
 "Athugasemdin var send inn af innskráðum notanda og því er ekki hægt að "
 "breyta nafninu."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -184,7 +184,7 @@ msgstr ""
 "Athugasemdin var send inn af innskráðum notanda og því er ekki hægt að "
 "breyta netfanginu."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -199,19 +199,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "flagga"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dagsetning"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "flagg athugasemdar"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "flögg athugasemdar"
 
diff --git a/django/contrib/comments/locale/it/LC_MESSAGES/django.mo b/django/contrib/comments/locale/it/LC_MESSAGES/django.mo
index 6bd794ccf9..7a81e75d94 100644
Binary files a/django/contrib/comments/locale/it/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/it/LC_MESSAGES/django.po b/django/contrib/comments/locale/it/LC_MESSAGES/django.po
index 70b89cf27a..73192f7d35 100644
--- a/django/contrib/comments/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/it/LC_MESSAGES/django.po
@@ -7,56 +7,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Contenuto"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadati"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "segnalato"
 msgstr[1] "segnalati"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Segnala i commenti selezionati"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "approvato"
 msgstr[1] "approvati"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Approva i commenti selezionati"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "eliminato"
 msgstr[1] "eliminati"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Elimina i commenti selezionati"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -64,12 +64,12 @@ msgstr[0] "Ad 1 commento è stata applicata con successo l'azione %(action)s."
 msgstr[1] ""
 "A %(count)s commenti è stata applicata con successo l'azione %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "commenti su %(site_name)s "
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Commenti più recenti su %(site_name)s"
@@ -107,57 +107,57 @@ msgid ""
 msgstr ""
 "Se inserisci qualcosa in questo campo, il tuo commento verrà considerato spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "content type"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID dell'oggetto"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "utente"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nome utente"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "indirizzo email utente"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL utente"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "commento"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/ora di inserimento"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "indirizzo IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "è pubblico"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Deseleziona questa casella per far sparire del tutto il commento dal sito."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "è eliminato"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -165,11 +165,11 @@ msgstr ""
 "Seleziona la casella se il commento è inappropriato. Verrà sostituito dal "
 "messaggio \"Questo commento è stato rimosso\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "commenti"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -177,7 +177,7 @@ msgstr ""
 "Questo commento è stato inserito da un utente autenticato e quindi il nome "
 "non è modificabile."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -185,7 +185,7 @@ msgstr ""
 "Questo commento è stato inserito da un utente autenticato e quindi l'email "
 "non è modificabile."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -200,19 +200,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "Segnala"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "data"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "segnalazione commento"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "segnalazioni commenti"
 
diff --git a/django/contrib/comments/locale/ja/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ja/LC_MESSAGES/django.mo
index 7f11a538d2..e8600c3a4f 100644
Binary files a/django/contrib/comments/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ja/LC_MESSAGES/django.po b/django/contrib/comments/locale/ja/LC_MESSAGES/django.po
index 5c0b8456a6..50605ab479 100644
--- a/django/contrib/comments/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ja/LC_MESSAGES/django.po
@@ -6,64 +6,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-02-14 13:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-04 16:06+0000\n"
+"Last-Translator: Yoichi Fujimoto <wozozo@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "内容"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "にフラグが付きました"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "選択したコメントにフラグを付ける"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "は承認されました"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "選択したコメントを承認する"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "は削除されました"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "コメントを削除する"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s個のコメント%(action)s。"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s のコメント"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s の最新コメント"
@@ -99,57 +99,57 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "このフィールドに入力するとコメントはスパム扱いされます"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "コンテンツタイプ"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "オブジェクト ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "名前"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "メールアドレス"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "コメント"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "コメント投稿日時"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP アドレス"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "は公開中です"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "手っ取り早くコメントをサイトから消すにはここのチェックを外してください。"
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "は削除されました"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -157,11 +157,11 @@ msgstr ""
 "コメントが不適切な場合はチェックを入れてください。「コメントは削除されまし"
 "た」と表示されるようになります。"
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "コメント"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -169,7 +169,7 @@ msgstr ""
 "このコメントは認証済みユーザーによって投稿されたため、名前は読み取り専用で"
 "す。"
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -177,7 +177,7 @@ msgstr ""
 "このコメントは認証済みユーザーによって投稿されたため、メールアドレスは読み取"
 "り専用です。"
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -192,19 +192,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "フラグ"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "フラグを付けた日時"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "コメントフラグ"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "コメントフラグ"
 
diff --git a/django/contrib/comments/locale/ka/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ka/LC_MESSAGES/django.mo
index cc00e60f0e..850becbe3b 100644
Binary files a/django/contrib/comments/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ka/LC_MESSAGES/django.po b/django/contrib/comments/locale/ka/LC_MESSAGES/django.po
index 0c11d77dde..afedc53e59 100644
--- a/django/contrib/comments/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ka/LC_MESSAGES/django.po
@@ -7,64 +7,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "კონტენტი"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "მეტა-მონაცემები"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "დროშა"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "არჩეულ კომენტარებზე დროშის დასმა"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "დამტკიცებულია"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "არჩეული კომენტარების დამტკიცება"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "წაშლილია"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "არჩეული კომენტარების წაშლა"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "წარმატებით %(action)s %(count)s კომენტარი"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s-ის კომენტარები"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "ბოლო კომენტარები %(site_name)s-ზე"
@@ -100,56 +100,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "თუ თვენ შეიყვანთ რამეს ამ ველში, თქვენი კომენტარი სპამად აღიქმება"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "კონტენტის ტიპი"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ობიექტის ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "მომხმარებელი"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "მომხმარებლის სახელი"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "მომხმარებლის ელ. ფოსტა"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "მომხმარებლის URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "კომენტარი"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "გაგზავნის თარიღი და დრო"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-მისამართი"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "საყოველთაოა"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "გადანიშნეთ ეს დროშა, რათა კომენტარი რეალურად გაქრეს საიტიდან."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "წაშლილია"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -157,11 +157,11 @@ msgstr ""
 "მონიშნეთ ეს დროშა, თუ კომენტარი შეუსაბამოა. მის ნაცვლად გაჩნდება "
 "შეტყობინება: \"კომენტარი წაშლილია\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "კომენტარები"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -169,7 +169,7 @@ msgstr ""
 "ეს კომენტარი გამოგზავნილია აუდენტიფიცირებული მომხმარებლის მიერ, და ამიტომ "
 "სახელის შეცვლა შეუძლებელია."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -177,7 +177,7 @@ msgstr ""
 "ეს კომენტარი გამოგზავნილია აუდენტიფიცირებული მომხმარებლის მიერ, და ამიტომ "
 "ელ. ფოსტის შეცვლა შეუძლებელია."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -192,19 +192,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "დროშა"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "თარიღი"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "კომენტარის დროშა"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "კომენტარის დროშები"
 
diff --git a/django/contrib/comments/locale/kk/LC_MESSAGES/django.mo b/django/contrib/comments/locale/kk/LC_MESSAGES/django.mo
index a0681a531b..4ec3c83f0b 100644
Binary files a/django/contrib/comments/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/kk/LC_MESSAGES/django.po b/django/contrib/comments/locale/kk/LC_MESSAGES/django.po
index 6f7c0d52fc..d8e04f9b12 100644
--- a/django/contrib/comments/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/kk/LC_MESSAGES/django.po
@@ -7,53 +7,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Мазмұн"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Метадата"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "белгіленген"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Таңдалған коментарийлерді белгілеу"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "Расталған"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Таңдалған аңғартпаларды бекіту"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "өшірілген"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Таңдалған аңғартпаларды өшіру"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -61,12 +61,12 @@ msgstr[0] ""
 "one: 1 аңғартпа ойдағыдай %(action)s.\n"
 "other: %(count)s аңғартпа ойдағыдай %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s аңғартпалары"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Соңғы %(site_name)s аңғартпалары"
@@ -107,56 +107,56 @@ msgstr ""
 "Егер сіз бұл жолаққа қандай да бір нарсені енгізсеңіз, сіздің коментариіңіз "
 "спам ретінде белгіленеді."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "мазмұн түрі"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "нысан ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "пайдаланушы"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "пайдаланушының есімі"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "пайдаланушының email адресі"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "пайдаланушының URLі"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "аңғартпа"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "жіберілген күні/уықыты"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP адрес"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "ашық"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Анғартпаның сайттан жоғалуы үшін құсбелгіні алып тастаңыз."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "өшірілген"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -164,23 +164,23 @@ msgstr ""
 "Анғартпа дұрыс болмаса құсбелгігі қойыңыз. Орнына  \"Бұл анғартпа өшірілді\" "
 "деген хабар көрінеді."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "анғартпалар"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "Бұл аңғартпа пайдаланушы орналастырған үшін аты өзгертілмейді."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr "Бұл аңғартпа пайдаланушы орналастырған үшін email өзгертілмейді."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -195,19 +195,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "жалауша"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "мерзім"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "Аңғартпа жалаушасы"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "Аңғартпа жалаушалары"
 
diff --git a/django/contrib/comments/locale/km/LC_MESSAGES/django.mo b/django/contrib/comments/locale/km/LC_MESSAGES/django.mo
index e7a4c8dd05..d526205802 100644
Binary files a/django/contrib/comments/locale/km/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/km/LC_MESSAGES/django.po b/django/contrib/comments/locale/km/LC_MESSAGES/django.po
index b2a38bde81..d15e714663 100644
--- a/django/contrib/comments/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/km/LC_MESSAGES/django.po
@@ -6,63 +6,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "អត្ថបទ"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr ""
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] ""
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr ""
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] ""
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr ""
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr ""
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr ""
@@ -98,56 +98,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "ប្រភេទអត្ថន័យ"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "លេខ​សំគាល់​កម្មវិធី"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "សមាជិក"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr ""
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr ""
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr ""
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "មតិ​យោបល់"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "កាល​បរិច្ឆេទនៃ​ការ​សរសេរ​​"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "លេខ IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "ផ្សព្វផ្សាយ​ជាសធារណៈ"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "ត្រូវ​បាន​លប់​ចេញ"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -155,23 +155,23 @@ msgstr ""
 "សូម​ចុច​ជ្រើសរើស​យក​ប្រអប់​នេះ​ ប្រសិន​បើ​មតិ​យោបល់​មិនសមរម្យ។ ឃ្លា \" មតិ​យោបល់​នេះ​ត្រូវបាន​គេលប់​\" នឹងត្រូវ​"
 "បង្ហាញ​ជំនួស​វិញ។"
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "មតិ​យោបល់"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -186,19 +186,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "​កាលបរិច្ឆេទ"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/kn/LC_MESSAGES/django.mo b/django/contrib/comments/locale/kn/LC_MESSAGES/django.mo
index 17e6ddf49b..f18618bba5 100644
Binary files a/django/contrib/comments/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/kn/LC_MESSAGES/django.po b/django/contrib/comments/locale/kn/LC_MESSAGES/django.po
index 7c0de610f1..2aea390241 100644
--- a/django/contrib/comments/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/kn/LC_MESSAGES/django.po
@@ -7,64 +7,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: karthikbgl <karthikbgl@gmail.com>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "ವಿಷಯ"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr ""
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] ""
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr ""
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] ""
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr ""
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr ""
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr ""
@@ -100,56 +100,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "ಒಳವಿಷಯದ ಬಗೆ"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ವಸ್ತುವಿನ ಐಡಿ"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "ಬಳಕೆದಾರ"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr ""
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr ""
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "ಟಿಪ್ಪಣಿ"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "ಸಲ್ಲಿಸಿದ ದಿನಾಂಕ/ಸಮಯ"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP ವಿಳಾಸ"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "ಸಾರ್ವಜನಿಕವಾಗಿದೆ"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "ತೆಗೆದು ಹಾಕಲಾಗಿದೆ"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -157,23 +157,23 @@ msgstr ""
 "ಟಿಪ್ಪಣಿ ಅನುಚಿತವಾಗಿ ಇದ್ದಲ್ಲಿ ಈ ಚೌಕದಲ್ಲಿ ಗುರುತು ಮಾಡಿ. ಅದರ ಬದಲಾಗಿ \"ಈ ಟಿಪ್ಪಣಿ "
 "ತೆಗೆದುಹಾಕಲಾಗಿದೆ\" ಎಂಬ ಸಂದೇಶವನ್ನು  ತೋರಿಸಲಾಗುವುದು."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "ಟಿಪ್ಪಣಿಗಳು"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -188,19 +188,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s  ಸಲ್ಲಿಸಿದ್ದು"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "ದಿನಾಂಕ"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/ko/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ko/LC_MESSAGES/django.mo
index 1fa5435e13..4d34408279 100644
Binary files a/django/contrib/comments/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ko/LC_MESSAGES/django.po b/django/contrib/comments/locale/ko/LC_MESSAGES/django.po
index 57c4316ff8..51f5bace19 100644
--- a/django/contrib/comments/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ko/LC_MESSAGES/django.po
@@ -6,64 +6,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "내용"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "메타데이터"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "플래그되었습니다"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "선택된 코멘트에 플래그 달기"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "승인되었습니다"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "선택된 코멘트 승인하기"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "삭제되었습니다"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "선택된 코멘트 삭제"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s개의 코멘트가 성공적으로 %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s 의 코멘트"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s 의 사용자 비밀번호가 초기화 되었습니다."
@@ -99,56 +99,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "이 필드에 무엇이라도 입력하면 코멘트는 스팸으로 처리될 것입니다."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "콘텐츠 타입"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "오브젝트 ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "사용자"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "사용자명"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "사용자 이메일 주소"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "사용자 URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "코멘트"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "날짜/시간 확인"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP 주소"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "공개합니다."
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "이 사이트에서 코멘트가 나타나지 않게 하려면 체크 해제하세요."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "삭제합니다."
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -156,23 +156,23 @@ msgstr ""
 "코멘트가 부적절한 경우 체크하세요. \"코멘트가 삭제되었습니다.\" 메시지가 표시"
 "됩니다."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "코멘트(들)"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "이 코멘트는 등록된 사용자가 작성하였으므로 읽기 전용입니다."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr "이 코멘트는 등록된 사용자가 작성하였으므로 읽기 전용입니다."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -187,19 +187,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "플래그"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "날짜"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "코멘트 플래그"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "코멘트 플래그"
 
diff --git a/django/contrib/comments/locale/lt/LC_MESSAGES/django.mo b/django/contrib/comments/locale/lt/LC_MESSAGES/django.mo
index 770be4f3f0..3e165431f8 100644
Binary files a/django/contrib/comments/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/lt/LC_MESSAGES/django.po b/django/contrib/comments/locale/lt/LC_MESSAGES/django.po
index 40865afee9..dcd12982ca 100644
--- a/django/contrib/comments/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/lt/LC_MESSAGES/django.po
@@ -8,60 +8,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-09 16:58+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Simonas Kazlauskas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Turinys"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Meta-duomenys"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "pažymėtas"
 msgstr[1] "pažymėti"
 msgstr[2] "pažymėti"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Žymėti pasirinktus komentarus"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "patvirtintas"
 msgstr[1] "patvirtinti"
 msgstr[2] "patvirtinti"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Patvirtinti pasirinktus komentarus"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "pašalintas"
 msgstr[1] "pašalinti"
 msgstr[2] "pašalinti"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Pašalinti pasirinktus įrašus"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -69,12 +69,12 @@ msgstr[0] "%(count)s komentaras buvo sėkmingai %(action)s."
 msgstr[1] "%(count)s komentarai buvo sėkmingai %(action)s."
 msgstr[2] "%(count)s komentarai buvo sėkmingai %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s komentarai"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Paskutiniai %(site_name)s komentarai"
@@ -113,56 +113,56 @@ msgid ""
 msgstr ""
 "Jei ką nors įrašysite į šį laukelį, jūsų komentaras bus laikomas brukalu"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "turinio tipas"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objekto ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "vartotojas"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "vartotojo vardas"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "vartotojo el. pašto adresas"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "vartotojo nuoroda"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentaras"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "įvesta data/laikas"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP adresas"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "viešas"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Nuimkite šį žymejimą, kad komentaras būtų panaikintas."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "pašalintas"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -170,11 +170,11 @@ msgstr ""
 "Pažymėkite šį laukelį, jei komentaras netinkamas. \"Šis komentaras ištrintas"
 "\" bus rodoma."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentarai"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -182,7 +182,7 @@ msgstr ""
 "Šis komentaras buvo paskelbtas neprisijungusio vartotojo, todel vardas yra "
 "neredaguojamas."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -190,7 +190,7 @@ msgstr ""
 "Šis komentaras buvo paskelbtas neprisijungusio vartotojo, todel el. pašto "
 "adresas yra neredaguojamas."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -205,19 +205,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "žymė"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "Data"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "Komentaro žymė"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "Komentaro žymės"
 
diff --git a/django/contrib/comments/locale/lv/LC_MESSAGES/django.mo b/django/contrib/comments/locale/lv/LC_MESSAGES/django.mo
index 32ba22b16a..dda6b21f73 100644
Binary files a/django/contrib/comments/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/lv/LC_MESSAGES/django.po b/django/contrib/comments/locale/lv/LC_MESSAGES/django.po
index 7806772a83..0914841ea3 100644
--- a/django/contrib/comments/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/lv/LC_MESSAGES/django.po
@@ -6,60 +6,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Saturs"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadati"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "atzīmēts"
 msgstr[1] "atzīmēti"
 msgstr[2] "atzīmēts"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Atzīmēt izvēlētos komentārus"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "apstiprināts"
 msgstr[1] "apstiprināti"
 msgstr[2] "apstiprināti"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Apstiprināt izvēlētos komentārus"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "dzēsts"
 msgstr[1] "dzēsti"
 msgstr[2] "dzēsts"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Dzēst izvēlētos komentārus"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -67,12 +67,12 @@ msgstr[0] "%(count)s komentārs tika veiksmīgi %(action)s."
 msgstr[1] "%(count)s komentāri tika veiksmīgi %(action)s."
 msgstr[2] "%(count)s komentāru tika veiksmīgi %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s komentāri"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Pēdējie komentāri lapā %(site_name)s"
@@ -110,56 +110,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Ja aizpildīsiet šo lauku, tad komentārs tiks uzskatīts par spamu"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "satura tips"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objekta ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "lietotājs"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "lietotāja vārds"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "lietotāja e-pasta adrese"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "lietotāja URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentārs"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "nosūtīšanas datums/laiks"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP adrese"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "publisks"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Noņemiet ķeksi, lai komentārs neparādītos lapā."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "dzēsts"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -167,11 +167,11 @@ msgstr ""
 "Atķeksējiet, ja komentārs ir neatbilstošs (nepieklājīgs). Tā vietā tiks "
 "rādīts paziņojums \"Šis komentārs ir izdzēsts\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentāri"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -179,7 +179,7 @@ msgstr ""
 "Šo komentāru rakstīja autentificēts lietotājs, tāpēc vārds ir tikai "
 "lasīšanas režīmā."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -187,7 +187,7 @@ msgstr ""
 "Šo komentāru rakstīja autentificēts lietotājs, tāpēc e-pasts ir tikai "
 "lasīšanas režīmā."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -202,19 +202,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "atzīmēt"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datums"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "komentāra atzīmējums"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "komentāra atzīmējumi"
 
diff --git a/django/contrib/comments/locale/mk/LC_MESSAGES/django.mo b/django/contrib/comments/locale/mk/LC_MESSAGES/django.mo
index afcdbd9544..a2b3dc49d9 100644
Binary files a/django/contrib/comments/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/mk/LC_MESSAGES/django.po b/django/contrib/comments/locale/mk/LC_MESSAGES/django.po
index f1ebfe7702..d98772b431 100644
--- a/django/contrib/comments/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/mk/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Содржина"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Метаподатоци"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "обележан"
 msgstr[1] "обележани"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Обележи го одбраните коментари"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "одобрен"
 msgstr[1] "одобрени"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Одобри ги одбраните коментари"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "отстранет"
 msgstr[1] "отстранети"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Отстрани ги избраните коментари"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 коментар беше успешно %(action)s."
 msgstr[1] "%(count)s коментари беа успешно %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "коментари за %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Последни коментари за %(site_name)s"
@@ -105,57 +105,57 @@ msgid ""
 msgstr ""
 "Ако внесете нешто во ова поле вашиот коментар ќе биде означен како спам"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "тип на содржина"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "object ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "корисник"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "името на корисникот"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "е-пошта на корисникот"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "веб страна на корсникот"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "коментар"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "датум/време пријавен"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "ИП адреса"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "е јавен"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Одштиклирајте го ова за да направите коментаров да исчезне од овој сајт."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "е отстранет"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -163,11 +163,11 @@ msgstr ""
 "Штиклирајте го ова поле ако коментарот не е пригоден. Наместо него пораката "
 "„Овој коментар беше отстранет“ ќе биде прикажана."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "коментари"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -175,7 +175,7 @@ msgstr ""
 "Овој коментар бил пратен од автентициран корисник и затоа името е заштитено "
 "од промена."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -183,7 +183,7 @@ msgstr ""
 "Овој коментар бил пратен од автентициран корисник и затоа е-пошта е "
 "заштитена од промена."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -198,19 +198,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "обележи"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "датум"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "обележје за коментар"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "обележја за коментари"
 
diff --git a/django/contrib/comments/locale/ml/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ml/LC_MESSAGES/django.mo
index b7608b4232..8f3bb1c3d6 100644
Binary files a/django/contrib/comments/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ml/LC_MESSAGES/django.po b/django/contrib/comments/locale/ml/LC_MESSAGES/django.po
index a77a29288e..35a5a8e7ea 100644
--- a/django/contrib/comments/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ml/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "ഉള്ളടക്കം"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "മെറ്റാ-ഡാറ്റ"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "അടയാളപ്പെടുത്തി"
 msgstr[1] "അടയാളപ്പെടുത്തി"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "തെരഞ്ഞെടുത്ത അഭിപ്രായങ്ങള്‍ അടയാളപ്പെടുത്തുക"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "അംഗീകരിച്ചു"
 msgstr[1] "അംഗീകരിച്ചു"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "തെരഞ്ഞെടുത്ത അഭിപ്രായങ്ങള്‍ അംഗീകരിക്കുക"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "നീക്കം ചെയ്തു"
 msgstr[1] "നീക്കം ചെയ്തു"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "തെരഞ്ഞെടുത്ത അഭിപ്രായങ്ങള്‍ നീക്കം ചെയ്യുക"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 അഭിപ്രായം വിജയകരമായി %(action)s."
 msgstr[1] "%(count)s അഭിപ്രായങ്ങള്‍ വിജയകരമായി %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s അഭിപ്രായങ്ങള്‍"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s ലെ ഏറ്റവും പുതിയ അഭിപ്രായങ്ങള്‍"
@@ -105,56 +105,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "ഈ കള്ളിയില്‍ എന്തെങ്കിലും രേഖപ്പെടുത്തിയാല്‍ നിങ്ങളുടെ അഭിപ്രായം സ്പാം ആയി കണക്കാക്കും"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "ഏതു തരം ഉള്ളടക്കം"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "വസ്തുവിന്റെ ID (തിരിച്ചറിയല്‍ സംഖ്യ)"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "യൂസര്‍ (ഉപയോക്താവ്)"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "യൂസറുടെ പേര്"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "യൂസറുടെ ഇ-മെയില്‍ വിലാസം"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "യൂസറുടെ URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "അഭിപ്രായം"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "സമര്‍പ്പിച്ച തീയതി/സമയം"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP വിലാസം"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "പരസ്യമാണ്"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "അഭിപ്രായം സൈറ്റില്‍ നിന്നും ഫലപ്രദമായി നീക്കം ചെയ്യാന്‍ ഈ ബോക്സിലെ ടിക് ഒഴിവാക്കുക."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "നീക്കം ചെയ്തു."
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -162,17 +162,17 @@ msgstr ""
 "അഭിപ്രായം അനുചിതമെങ്കില്‍ ഈ ബോക്സ് ടിക് ചെയ്യുക. \"ഈ അഭിപ്രായം നീക്കം ചെയ്തു \" എന്ന സന്ദേശം "
 "ആയിരിക്കും പകരം കാണുക."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "അഭിപ്രായങ്ങള്‍"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "ഈ അഭിപ്രായം ഒരു അംഗീകൃത യൂസര്‍ രേഖപ്പെടുത്തിയതാണ്. അതിനാല്‍ പേര് വായിക്കാന്‍ മാത്രം."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -180,7 +180,7 @@ msgstr ""
 "ഈ അഭിപ്രായം ഒരു അംഗീകൃത യൂസര്‍ രേഖപ്പെടുത്തിയതാണ്. അതിനാല്‍ ഇ-മെയില്‍ വിലാസം വായിക്കാന്‍ "
 "മാത്രം."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -195,19 +195,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "അടയാളം"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "തീയതി"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "അഭിപ്രായ അടയാളം"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "അഭിപ്രായ അടയാളങ്ങള്‍"
 
diff --git a/django/contrib/comments/locale/mn/LC_MESSAGES/django.mo b/django/contrib/comments/locale/mn/LC_MESSAGES/django.mo
index 4475f1710c..1f2d18648c 100644
Binary files a/django/contrib/comments/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/mn/LC_MESSAGES/django.po b/django/contrib/comments/locale/mn/LC_MESSAGES/django.po
index a13b9fbcdf..a18be88721 100644
--- a/django/contrib/comments/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/mn/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Агуулга"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Мета өгөгдөл"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "тэгдэглсэн"
 msgstr[1] "тэгдэглсэн"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Сонгосон сэтгэгдэлүүдийг тэмдэглэ"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "зөвшөөрөх"
 msgstr[1] "зөвшөөрөх"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Сонгосон сэтгэгдэлүүдийг зөвшөөрөх"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "устгасан"
 msgstr[1] "устгасан"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Сонгосон сэтгэгдэлүүдийг утсгах"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s сэтгэгдэлийг амжилттай %(action)s."
 msgstr[1] "%(count)s сэтгэгдэлүүдийг амжилттай %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s сэтгэгдэлүүд"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr " %(site_name)s сүүлийн сэтгэгдэлүүд"
@@ -106,58 +106,58 @@ msgid ""
 msgstr ""
 "Та энэ хэсэгт ямар нэг зүйл оруулбал таний сэтгэгдэлийг  спам гэж үзэх болно."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "агуулгын төрөл"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "объектийн ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "хэрэглэгч "
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "хэрэглэгчийн нэр"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "хэрэглэгчийн цахим шуудангийн хаяг"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "хэрэглэгчийн URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "сэтгэгдэл"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "оруулсан огноо/цаг"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP хаяг"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "нийтийн"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Сайтаас санал сэтгэгдлийг байнга устгахын тулд энэ хайрцагны өмнөх чагтыг "
 "авна уу."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "устлаа"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -166,11 +166,11 @@ msgstr ""
 "тухайн санал сэтгэгдлийн оронд \"Энэ санал сэтгэгдлийг устгалаа\" гэсэн "
 "бичиг гарч ирнэ."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "сэтгэгдэлүүд"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -178,7 +178,7 @@ msgstr ""
 "Энэ санал сэтгэгдлийг баталгаажсан хэрэглэгч оруулсан учир зөвхөн нэрийг нь "
 "харж болно."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -186,7 +186,7 @@ msgstr ""
 "Энэ санал сэтгэгдлийг баталгаажсан хэрэглэгч оруулсан учир зөвхөн цахим "
 "шууданг нь харж болно."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -201,19 +201,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "тэмдэг"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "огноо"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "Тайлбарын тэмдэг"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "тайлбарын тэмдэгүүд"
 
diff --git a/django/contrib/comments/locale/my/LC_MESSAGES/django.mo b/django/contrib/comments/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..b5b20d4e20
Binary files /dev/null and b/django/contrib/comments/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/my/LC_MESSAGES/django.po b/django/contrib/comments/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..07dbf34468
--- /dev/null
+++ b/django/contrib/comments/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,285 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-03-17 06:50+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin.py:25
+msgid "Content"
+msgstr ""
+
+#: admin.py:28
+msgid "Metadata"
+msgstr ""
+
+#: admin.py:55
+msgid "flagged"
+msgid_plural "flagged"
+msgstr[0] ""
+
+#: admin.py:56
+msgid "Flag selected comments"
+msgstr ""
+
+#: admin.py:60
+msgid "approved"
+msgid_plural "approved"
+msgstr[0] ""
+
+#: admin.py:61
+msgid "Approve selected comments"
+msgstr ""
+
+#: admin.py:65
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] ""
+
+#: admin.py:66
+msgid "Remove selected comments"
+msgstr ""
+
+#: admin.py:78
+#, python-format
+msgid "1 comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] ""
+
+#: feeds.py:14
+#, python-format
+msgid "%(site_name)s comments"
+msgstr ""
+
+#: feeds.py:20
+#, python-format
+msgid "Latest comments on %(site_name)s"
+msgstr ""
+
+#: forms.py:96
+msgid "Name"
+msgstr "နာမည်"
+
+#: forms.py:97
+msgid "Email address"
+msgstr "အီးမေးလ်လိပ်စာ"
+
+#: forms.py:98
+msgid "URL"
+msgstr "ယူအာအယ်"
+
+#: forms.py:99
+msgid "Comment"
+msgstr "မှတ်ချက်"
+
+#: forms.py:177
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] ""
+
+#: forms.py:181 templates/comments/preview.html:16
+msgid "and"
+msgstr "နှင့်"
+
+#: forms.py:186
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+
+#: models.py:23
+msgid "content type"
+msgstr "အကြောင်းအရာအမျိုးအစား"
+
+#: models.py:25
+msgid "object ID"
+msgstr ""
+
+#: models.py:53 models.py:177
+msgid "user"
+msgstr ""
+
+#: models.py:55
+msgid "user's name"
+msgstr ""
+
+#: models.py:56
+msgid "user's email address"
+msgstr ""
+
+#: models.py:57
+msgid "user's URL"
+msgstr ""
+
+#: models.py:59 models.py:79 models.py:178
+msgid "comment"
+msgstr ""
+
+#: models.py:62
+msgid "date/time submitted"
+msgstr ""
+
+#: models.py:63
+msgid "IP address"
+msgstr "အိုင်ပီလိပ်စာ"
+
+#: models.py:64
+msgid "is public"
+msgstr ""
+
+#: models.py:65
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+
+#: models.py:67
+msgid "is removed"
+msgstr ""
+
+#: models.py:68
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: models.py:80
+msgid "comments"
+msgstr ""
+
+#: models.py:124
+msgid ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
+msgstr ""
+
+#: models.py:134
+msgid ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
+msgstr ""
+
+#: models.py:160
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: models.py:179
+msgid "flag"
+msgstr "အလံ"
+
+#: models.py:180
+msgid "date"
+msgstr "ရက်စွဲ"
+
+#: models.py:190
+msgid "comment flag"
+msgstr ""
+
+#: models.py:191
+msgid "comment flags"
+msgstr ""
+
+#: templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr ""
+
+#: templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr ""
+
+#: templates/comments/approve.html:12
+msgid "Approve"
+msgstr ""
+
+#: templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr ""
+
+#: templates/comments/approved.html:7 templates/comments/deleted.html:7
+#: templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr ""
+
+#: templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr ""
+
+#: templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr ""
+
+#: templates/comments/delete.html:12
+msgid "Remove"
+msgstr "ဖယ်ရှား"
+
+#: templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr ""
+
+#: templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr ""
+
+#: templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr ""
+
+#: templates/comments/flag.html:12
+msgid "Flag"
+msgstr "အလံ"
+
+#: templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr ""
+
+#: templates/comments/form.html:17 templates/comments/preview.html:32
+msgid "Post"
+msgstr ""
+
+#: templates/comments/form.html:18 templates/comments/preview.html:33
+msgid "Preview"
+msgstr ""
+
+#: templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr ""
+
+#: templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr ""
+
+#: templates/comments/preview.html:4 templates/comments/preview.html.py:13
+msgid "Preview your comment"
+msgstr ""
+
+#: templates/comments/preview.html:11
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] ""
+
+#: templates/comments/preview.html:16
+msgid "Post your comment"
+msgstr ""
+
+#: templates/comments/preview.html:16
+msgid "or make changes"
+msgstr ""
diff --git a/django/contrib/comments/locale/nb/LC_MESSAGES/django.mo b/django/contrib/comments/locale/nb/LC_MESSAGES/django.mo
index 3dd479a5f3..2e4002c419 100644
Binary files a/django/contrib/comments/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/nb/LC_MESSAGES/django.po b/django/contrib/comments/locale/nb/LC_MESSAGES/django.po
index fb1de3fb24..fd8247277a 100644
--- a/django/contrib/comments/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/nb/LC_MESSAGES/django.po
@@ -8,68 +8,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 21:43+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Sigurd Gartmann <sigurdga-transifex@sigurdga.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Innhold"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "flagget"
 msgstr[1] "flagget"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Flagg valgte kommentarer"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "godkjent"
 msgstr[1] "godkjent"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Tillat valgte kommentarer"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "fjernet"
 msgstr[1] "fjernet"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Fjern valgte kommentarer"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 kommentar ble %(action)s."
 msgstr[1] "%(count)s kommentarer ble %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s kommentarer"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Siste kommentarer fra %(site_name)s"
@@ -107,56 +107,56 @@ msgid ""
 msgstr ""
 "Hvis du oppgir noe i dette feltet, vil kommentaren bli behandlet som spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "innholdstype"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objekt-ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "bruker"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "brukerens navn"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "brukerens e-postadresse"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "brukerens nettadresse"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "kommentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "dato/tid for innsendelse"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "er tilgjengelig for alle"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Fjern avhuking av denne boksen for å fjerne kommentaren fra siden."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "er fjernet"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -164,11 +164,11 @@ msgstr ""
 "Huk av denne hvis kommentaren er upassende. Meldingen «Denne kommentaren har "
 "blitt fjernet» vil bli vist i stedet."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "kommentarer"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -176,7 +176,7 @@ msgstr ""
 "Denne kommentaren er skrevet av en innlogget bruker og navnet kan derfor "
 "ikke endres."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -184,7 +184,7 @@ msgstr ""
 "Denne kommentaren er skrevet av en innlogget bruker og e-postadressen kan "
 "derfor ikke endres."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -199,19 +199,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "flagg"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dato"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "kommentarflagg"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "kommentarflagg"
 
diff --git a/django/contrib/comments/locale/ne/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ne/LC_MESSAGES/django.mo
index a77f171fea..d2418831f6 100644
Binary files a/django/contrib/comments/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ne/LC_MESSAGES/django.po b/django/contrib/comments/locale/ne/LC_MESSAGES/django.po
index ead5ed93e9..ee04a2de57 100644
--- a/django/contrib/comments/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ne/LC_MESSAGES/django.po
@@ -1,76 +1,78 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Paras Nath Chaudhary <opnchaudhary@gmail.com>, 2012.
 # Sagar Chalise <chalisesagar@gmail.com>, 2011.
+#   <surit_people@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-02-14 13:24+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-12-05 19:55+0000\n"
+"Last-Translator: Paras Nath Chaudhary <opnchaudhary@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "विषय"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
-msgstr ""
+msgstr "मेटाडाटा"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "स्वीकृत"
 msgstr[1] "स्वीकृत"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "चुनिएको प्रतिकृया स्वीकार गर्नुहोस ।"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "हटाइएको छ"
 msgstr[1] "हटाइएको छ"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "चुनिएको प्रतिकृया हटाउनुहोस ।"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
-msgstr ""
+msgstr "%(site_name)s प्रतिकृया"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
-msgstr ""
+msgstr "%(site_name)sका ताजा प्रतिकृया"
 
 #: forms.py:96
 msgid "Name"
@@ -102,80 +104,80 @@ msgstr "र"
 #: forms.py:186
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
-msgstr ""
+msgstr "याहा केहि पनि नलेख्नु होला । याहा केहि लेखियेमा तेसला"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "विषयको ढाँचा"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr ""
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
-msgstr ""
+msgstr "प्रयोगकर्ता "
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr ""
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr ""
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr ""
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "प्रतिकृया"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr ""
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr ""
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr ""
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "हटाइएको छ"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "प्रतिकृया"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -185,19 +187,19 @@ msgid ""
 "http://%(domain)s%(url)s"
 msgstr ""
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "मिति"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
@@ -257,7 +259,7 @@ msgstr ""
 
 #: templates/comments/form.html:17 templates/comments/preview.html:32
 msgid "Post"
-msgstr ""
+msgstr "लेख "
 
 #: templates/comments/form.html:18 templates/comments/preview.html:33
 msgid "Preview"
diff --git a/django/contrib/comments/locale/nl/LC_MESSAGES/django.mo b/django/contrib/comments/locale/nl/LC_MESSAGES/django.mo
index 190b7c588c..8060a7b5fa 100644
Binary files a/django/contrib/comments/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/nl/LC_MESSAGES/django.po b/django/contrib/comments/locale/nl/LC_MESSAGES/django.po
index a03e8cae06..a5d6b9f186 100644
--- a/django/contrib/comments/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/nl/LC_MESSAGES/django.po
@@ -8,68 +8,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: go2people <admin@go2people.nl>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Inhoud"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "gemarkeerd"
 msgstr[1] "gemarkeerd"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Markeer geselecteerde commentaren"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "goedgekeurd"
 msgstr[1] "goedgekeurd"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Keur geselecteerde commentaren goed"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "verwijderd"
 msgstr[1] "verwijderd"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Verwijder geselecteerde commentaren"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] " %(count)s opmerking werd met succes %(action)s ."
 msgstr[1] " %(count)s opmerkingen werden met succes %(action)s ."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s opmerkingen"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Laatste opmerkingen op %(site_name)s"
@@ -107,57 +107,57 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Indien u hier iets invult dan wordt uw opmerking behandeld als spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "inhoudstype"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "object-ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "gebruiker"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "naam gebruiker"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "e-mailadres gebruiker"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL gebruiker"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "opmerking"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "datum/tijd toegevoegd"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-adres"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "is openbaar"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Vink dit vakje uit zodat de opmerking niet meer zichtbaar is op de site."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "is verwijderd"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -165,11 +165,11 @@ msgstr ""
 "Vink dit vak aan indien de opmerking niet gepast is. Een \"Dit commentaar is "
 "verwijderd\" bericht wordt dan getoond."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "opmerkingen"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -177,7 +177,7 @@ msgstr ""
 "Deze opmerking is gepost door een ingelogde gebruiker en daardoor is de naam "
 "niet aan te passen."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -185,7 +185,7 @@ msgstr ""
 "Deze opmerking is gepost door een ingelogde gebruiker en daardoor is het e-"
 "mailadres niet aan te passen."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -200,19 +200,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "vlag"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "opmerking vlag"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "opmerking vlaggen"
 
diff --git a/django/contrib/comments/locale/nn/LC_MESSAGES/django.mo b/django/contrib/comments/locale/nn/LC_MESSAGES/django.mo
index c11288252b..8dd0213048 100644
Binary files a/django/contrib/comments/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/nn/LC_MESSAGES/django.po b/django/contrib/comments/locale/nn/LC_MESSAGES/django.po
index 317581d4c6..4216f04e1a 100644
--- a/django/contrib/comments/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/nn/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Innhald"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "flagga"
 msgstr[1] "flagga"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Flagg valde kommentarar"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "Godkjend"
 msgstr[1] "Godkjende"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Tillat valde kommentarar"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "er fjerna"
 msgstr[1] "er fjerna"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Fjern valdte kommentarar"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "Ein kommentar vart %(action)s."
 msgstr[1] "%(count)s kommentarar vart %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s - kommentarar"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Siste kommentarar frå %(site_name)s"
@@ -105,56 +105,56 @@ msgid ""
 msgstr ""
 "Dersom du oppgjev noko i dette feltet, vil kommentaren bli behandla som spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "innhaldstype"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objekt-ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "brukar"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "brukaren sitt namn"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "brukaren si e-postadresse"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "brukaren si nettadresse"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "kommentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "dato/tid for innsending"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "er tilgjengeleg for alle"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Avmerk denne boksen for å fjerne kommentaren frå sida."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "er fjerna"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -162,11 +162,11 @@ msgstr ""
 "Kryss av denne dersom kommentaren er upassande. Meldinga \"Denne kommentaren "
 "har blitt fjerna\" vil bli vist i staden."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "kommentarar"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -174,7 +174,7 @@ msgstr ""
 "Denne kommentaren er skriven av ein innlogga brukar og namnnet kan difor "
 "ikkje endrast."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -182,7 +182,7 @@ msgstr ""
 "Denne kommentaren er skriven av ein innlogga brukar og e-postadressa kan "
 "derfor ikkje endrast."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -197,19 +197,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "flagg"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dato"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "kommentarflagg"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "kommentarflagg"
 
diff --git a/django/contrib/comments/locale/os/LC_MESSAGES/django.mo b/django/contrib/comments/locale/os/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..790f04b317
Binary files /dev/null and b/django/contrib/comments/locale/os/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/os/LC_MESSAGES/django.po b/django/contrib/comments/locale/os/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..18e94c1d7d
--- /dev/null
+++ b/django/contrib/comments/locale/os/LC_MESSAGES/django.po
@@ -0,0 +1,290 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 15:42+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/"
+"os/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: os\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:25
+msgid "Content"
+msgstr ""
+
+#: admin.py:28
+msgid "Metadata"
+msgstr ""
+
+#: admin.py:55
+msgid "flagged"
+msgid_plural "flagged"
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:56
+msgid "Flag selected comments"
+msgstr ""
+
+#: admin.py:60
+msgid "approved"
+msgid_plural "approved"
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:61
+msgid "Approve selected comments"
+msgstr ""
+
+#: admin.py:65
+msgid "removed"
+msgid_plural "removed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:66
+msgid "Remove selected comments"
+msgstr ""
+
+#: admin.py:78
+#, python-format
+msgid "1 comment was successfully %(action)s."
+msgid_plural "%(count)s comments were successfully %(action)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: feeds.py:14
+#, python-format
+msgid "%(site_name)s comments"
+msgstr ""
+
+#: feeds.py:20
+#, python-format
+msgid "Latest comments on %(site_name)s"
+msgstr ""
+
+#: forms.py:96
+msgid "Name"
+msgstr ""
+
+#: forms.py:97
+msgid "Email address"
+msgstr "Электрон посты адрис"
+
+#: forms.py:98
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:99
+msgid "Comment"
+msgstr ""
+
+#: forms.py:177
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms.py:181 templates/comments/preview.html:16
+msgid "and"
+msgstr "ӕмӕ"
+
+#: forms.py:186
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+
+#: models.py:23
+msgid "content type"
+msgstr ""
+
+#: models.py:25
+msgid "object ID"
+msgstr ""
+
+#: models.py:53 models.py:177
+msgid "user"
+msgstr "архайӕг"
+
+#: models.py:55
+msgid "user's name"
+msgstr ""
+
+#: models.py:56
+msgid "user's email address"
+msgstr ""
+
+#: models.py:57
+msgid "user's URL"
+msgstr ""
+
+#: models.py:59 models.py:79 models.py:178
+msgid "comment"
+msgstr ""
+
+#: models.py:62
+msgid "date/time submitted"
+msgstr ""
+
+#: models.py:63
+msgid "IP address"
+msgstr "IP адрис"
+
+#: models.py:64
+msgid "is public"
+msgstr ""
+
+#: models.py:65
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+
+#: models.py:67
+msgid "is removed"
+msgstr ""
+
+#: models.py:68
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: models.py:80
+msgid "comments"
+msgstr ""
+
+#: models.py:124
+msgid ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
+msgstr ""
+
+#: models.py:134
+msgid ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
+msgstr ""
+
+#: models.py:160
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: models.py:179
+msgid "flag"
+msgstr ""
+
+#: models.py:180
+msgid "date"
+msgstr ""
+
+#: models.py:190
+msgid "comment flag"
+msgstr ""
+
+#: models.py:191
+msgid "comment flags"
+msgstr ""
+
+#: templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr ""
+
+#: templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr ""
+
+#: templates/comments/approve.html:12
+msgid "Approve"
+msgstr ""
+
+#: templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr ""
+
+#: templates/comments/approved.html:7 templates/comments/deleted.html:7
+#: templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr ""
+
+#: templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr ""
+
+#: templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr ""
+
+#: templates/comments/delete.html:12
+msgid "Remove"
+msgstr "Схафын"
+
+#: templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr ""
+
+#: templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr ""
+
+#: templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr ""
+
+#: templates/comments/flag.html:12
+msgid "Flag"
+msgstr ""
+
+#: templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr ""
+
+#: templates/comments/form.html:17 templates/comments/preview.html:32
+msgid "Post"
+msgstr ""
+
+#: templates/comments/form.html:18 templates/comments/preview.html:33
+msgid "Preview"
+msgstr ""
+
+#: templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr ""
+
+#: templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr ""
+
+#: templates/comments/preview.html:4 templates/comments/preview.html.py:13
+msgid "Preview your comment"
+msgstr ""
+
+#: templates/comments/preview.html:11
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/comments/preview.html:16
+msgid "Post your comment"
+msgstr ""
+
+#: templates/comments/preview.html:16
+msgid "or make changes"
+msgstr ""
diff --git a/django/contrib/comments/locale/pa/LC_MESSAGES/django.mo b/django/contrib/comments/locale/pa/LC_MESSAGES/django.mo
index 1561a6b7b9..998f557c75 100644
Binary files a/django/contrib/comments/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/pa/LC_MESSAGES/django.po b/django/contrib/comments/locale/pa/LC_MESSAGES/django.po
index 9cbae5be46..d3a42d37dc 100644
--- a/django/contrib/comments/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/pa/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "ਸਮੱਗਰੀ"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "ਮੇਟਾਡਾਟਾ"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "ਚੁਣੀਆਂ ਟਿੱਪਣੀਆਂ ਫਲੈਗ ਕਰੋ"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "ਮਨਜ਼ੂਰ ਹੈ"
 msgstr[1] "ਮਨਜ਼ੂਰ ਹਨ"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "ਚੁਣੀਆਂ ਟਿੱਪਣੀਆਂ ਮਨਜ਼ੂਰ"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "ਹਟਾਈ"
 msgstr[1] "ਹਟਾਈਆਂ"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "ਚੁਣੀਆਂ ਟਿੱਪਣੀਆਂ ਹਟਾਓ"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "੧ ਟਿੱਪਣੀ ਠੀਕ ਤਰ੍ਹਾਂ %(action)s ਗਈ।"
 msgstr[1] "%(count)s ਟਿੱਪਣੀਆਂ ਠੀਕ ਤਰ੍ਹਾਂ %(action)s ਗਈਆਂ।"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s ਟਿੱਪਣੀਆਂ"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s ਉੱਤੇ ਤਾਜ਼ਾ ਟਿੱਪਣੀਆਂ"
@@ -104,78 +104,78 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "ਸਮੱਗਰੀ ਕਿਸਮ"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ਆਬਜੈਕਟ ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "ਯੂਜ਼ਰ"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "ਯੂਜ਼ਰ ਦਾ ਨਾਂ"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "ਯੂਜ਼ਰ ਦਾ ਈਮੇਲ ਐਡਰੈੱਸ"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "ਯੂਜ਼ਰ ਦਾ URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "ਟਿੱਪਣੀ"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "ਭੇਜਣ ਮਿਤੀ/ਸਮਾਂ"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP ਐਡਰੈੱਸ"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "ਪਬਲਿਕ ਹੈ"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "ਹਟਾਇਆ ਗਿਆ"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "ਟਿੱਪਣੀਆਂ"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -190,19 +190,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "ਫਲੈਗ"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "ਮਿਤੀ"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "ਟਿੱਪਣੀ ਫਲੈਗ"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "ਟਿੱਪਣੀ ਫਲੈਗ"
 
diff --git a/django/contrib/comments/locale/pl/LC_MESSAGES/django.mo b/django/contrib/comments/locale/pl/LC_MESSAGES/django.mo
index 55d7c9bcef..b8894b6d21 100644
Binary files a/django/contrib/comments/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/pl/LC_MESSAGES/django.po b/django/contrib/comments/locale/pl/LC_MESSAGES/django.po
index e7336e19c5..f510f485fb 100644
--- a/django/contrib/comments/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/pl/LC_MESSAGES/django.po
@@ -6,60 +6,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Zawartość"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadane"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "oflagowany"
 msgstr[1] "oflagowane"
 msgstr[2] "oflagowanych"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Oflaguj wybrane komentarze"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "zaakceptowany"
 msgstr[1] "zaakceptowane"
 msgstr[2] "zaakceptowanych"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Zaakceptuj wybrane komentarze"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "usunięty"
 msgstr[1] "usunięte"
 msgstr[2] "usuniętych"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Usuń wybrane komentarze"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -67,12 +67,12 @@ msgstr[0] "1 komentarz został %(action)s"
 msgstr[1] "%(count)s komentarze zostały %(action)s"
 msgstr[2] "%(count)s komentarzy zostało %(action)s"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "komentarze na %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Ostatnie komentarze na %(site_name)s"
@@ -111,56 +111,56 @@ msgid ""
 msgstr ""
 "Jeżeli wpiszesz cokolwiek w to pole, Twój komentarz zostanie uznany za spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "typ zawartości"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID obiektu"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "użytkownik"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nazwa użytkownika"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "adres e-mail użytkownika"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL użytkownika"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentarz"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/czas dodania"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Adres IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "publicznie dostępny"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Odznacz to pole, aby komentarz nie był wyświetlany w serwisie."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "usunięty"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -168,11 +168,11 @@ msgstr ""
 "Zaznacz to pole jeżeli komentarz jest nieodpowiedni. Wyświetlony zostanie "
 "tekst \"Ten komentarz został usunięty\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentarze"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -180,7 +180,7 @@ msgstr ""
 "Ten komentarz został dodany przez zalogowanego użytkownika i dlatego nazwa "
 "jest tylko do odczytu."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -188,7 +188,7 @@ msgstr ""
 "Ten komentarz został dodany przez zalogowanego użytkownika i dlatego adres e-"
 "mail jest tylko do odczytu."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -203,19 +203,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "flaga"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "data"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "flaga dla komentarza"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "flagi dla komentarzy"
 
diff --git a/django/contrib/comments/locale/pt/LC_MESSAGES/django.mo b/django/contrib/comments/locale/pt/LC_MESSAGES/django.mo
index 7082c8c582..bb7657d7ab 100644
Binary files a/django/contrib/comments/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/pt/LC_MESSAGES/django.po b/django/contrib/comments/locale/pt/LC_MESSAGES/django.po
index 9e05997e91..110978943c 100644
--- a/django/contrib/comments/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/pt/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Conteúdo"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "marcado"
 msgstr[1] "marcados"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marcar os comentários selecionados"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprovado"
 msgstr[1] "aprovados"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Aprovar os comentários selecionados"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "removido"
 msgstr[1] "removidos"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Remover os comentários selecionados"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 comentário foi %(action)s com sucesso."
 msgstr[1] "%(count)s comentários foram %(action)s com sucesso."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "comentários em %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Últimos comentários em %(site_name)s"
@@ -107,56 +107,56 @@ msgstr ""
 "Se introduzir alguma coisa neste campo o seu comentário irá ser tratado como "
 "spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tipo de conteúdo"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID do objeto"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "utilizador"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "o nome do utilizador"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "endereço de e-mail do utilizador"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL do utilizador"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comentário"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/hora de submissão"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "é público"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Não selecione esta caixa para que o comentário desapareça do site."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "foi removido"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -164,11 +164,11 @@ msgstr ""
 "Selecione esta opção se o comentário não é apropriado. Uma mensagem \"Este "
 "comentário foi removido\" será mostrada no seu lugar."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comentários"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -176,7 +176,7 @@ msgstr ""
 "Este comentário foi colocado por um utilizador autenticado, portanto o nome "
 "é apenas de leitura."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -184,7 +184,7 @@ msgstr ""
 "Este comentário foi colocado por um utilizador autenticado, portanto o e-"
 "mail é apenas de leitura."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -199,19 +199,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marcar"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "data"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "marca de comentário"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "marcas de comentários"
 
diff --git a/django/contrib/comments/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/comments/locale/pt_BR/LC_MESSAGES/django.mo
index 946b4d136c..581735cfab 100644
Binary files a/django/contrib/comments/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/comments/locale/pt_BR/LC_MESSAGES/django.po
index 10903f4cab..907b1e2350 100644
--- a/django/contrib/comments/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/pt_BR/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Conteúdo"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Meta-dados"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "marcado"
 msgstr[1] "marcados"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marcar comentários selecionados"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprovado"
 msgstr[1] "aprovados"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Aprovar comentários selecionados"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "removido"
 msgstr[1] "removidos"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Remover comentários selecionados"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 comentários foi %(action)s com sucesso."
 msgstr[1] "%(count)s comentários foram %(action)s com sucesso."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Comentários de %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Últimos comentários em %(site_name)s"
@@ -106,58 +106,58 @@ msgstr ""
 "Se você inserir qualquer coisa neste campo, seu comentário será tratado como "
 "spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tipo de conteúdo"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "id do objeto"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "usuário"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "nome do usuário"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "endereço de e-mail do usuário"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL do usuário"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comentário"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/hora de envio"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "é público"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Desmarque esta caixa para fazer o comentário desaparecer efetivamente deste "
 "site."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "foi removido"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -165,11 +165,11 @@ msgstr ""
 "Selecione esta opção se o comentário é inapropriado. A mensagem \"Este "
 "comentário foi removido\" será mostrada no lugar."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comentários"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -177,7 +177,7 @@ msgstr ""
 "Este comentário foi feito por um usuário autenticado e portanto seu nome é "
 "apenas para leitura."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -185,7 +185,7 @@ msgstr ""
 "Este comentário foi feito por um usuário autenticado e portanto seu e-mail é "
 "apenas para leitura."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -200,19 +200,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marcar"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "data"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "marca de comentário"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "marcas de comentários"
 
diff --git a/django/contrib/comments/locale/ro/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ro/LC_MESSAGES/django.mo
index 3b487fb1f3..709b61ec69 100644
Binary files a/django/contrib/comments/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ro/LC_MESSAGES/django.po b/django/contrib/comments/locale/ro/LC_MESSAGES/django.po
index a71f78ef73..53c49c6f5a 100644
--- a/django/contrib/comments/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ro/LC_MESSAGES/django.po
@@ -8,60 +8,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Conţinut"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadate"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "marcat"
 msgstr[1] "marcate"
 msgstr[2] "marcate"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Marchează comentariile selectate"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "aprobat"
 msgstr[1] "aprobate"
 msgstr[2] "aprobate"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Aprobă comentariile selectate"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "eliminat"
 msgstr[1] "eliminate"
 msgstr[2] "eliminate"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Elimină comentariile selectate"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -69,12 +69,12 @@ msgstr[0] "%(count)s comentariu a fost %(action)s cu succes."
 msgstr[1] "%(count)s comentarii au fost %(action)s cu succes."
 msgstr[2] "%(count)s de comentarii au fost %(action)s cu succes."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Comentariile de la %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Ultimele comentarii la %(site_name)s"
@@ -114,57 +114,57 @@ msgstr ""
 "Dacă introduceți ceva în acest câmp, comentariul dumneavoastră va fi "
 "considerat ca spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tip conţinut"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID obiect"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "utilizator"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "numele utilizatorului"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "adresa e-mail a utilizatorului"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL-ul utilizatorului"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "comentariu"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/ora creării"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "adresă ip"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "este public"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Debifaţi această casetă pentru a face comentariul să dispară de pe site."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "este șters"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -172,11 +172,11 @@ msgstr ""
 "Bifați această casuța dacă acest comentariu nu este adecvat. Un mesaj de "
 "tipul \"Acest comentariu a fost șters\" va fi afișat în schimb."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "comentarii"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -184,7 +184,7 @@ msgstr ""
 "Acest comentariu a fost scris de către un utilizator autentificat, astfel "
 "numele poate fi doar citit."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -192,7 +192,7 @@ msgstr ""
 "Acest comentariu a fost scris de către un utilizator autentificat, astfel "
 "adresa e-mail poate fi doar citită."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -207,19 +207,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "marcaj"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dată"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "marcaj comentariu"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "marcaje comentarii"
 
diff --git a/django/contrib/comments/locale/ru/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ru/LC_MESSAGES/django.mo
index 29988fabe9..aba2443455 100644
Binary files a/django/contrib/comments/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ru/LC_MESSAGES/django.po b/django/contrib/comments/locale/ru/LC_MESSAGES/django.po
index 6372934611..d962cf53c7 100644
--- a/django/contrib/comments/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ru/LC_MESSAGES/django.po
@@ -1,79 +1,81 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
 # Denis Darii <sinednx@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Алексей Борискин <sun.void@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-02-14 13:24+0000\n"
-"Last-Translator: Denis Darii <sinednx@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-02-05 20:10+0000\n"
+"Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Содержание"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
-msgstr[0] "выбран"
-msgstr[1] "выбраны"
-msgstr[2] "выбраны"
+msgstr[0] "помечен"
+msgstr[1] "помечены"
+msgstr[2] "помечены"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
-msgstr "Отметить выбранные комментарии"
+msgstr "Пометить выбранные комментарии"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
-msgstr[0] "одобренный"
-msgstr[1] "одобренные"
-msgstr[2] "одобренные"
+msgstr[0] "одобрен"
+msgstr[1] "одобрены"
+msgstr[2] "одобрены"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
-msgstr "Подтвердить выбранные комментарии"
+msgstr "Одобрить выбранные комментарии"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "удален"
 msgstr[1] "удалены"
 msgstr[2] "удалены"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Удалить выбранные комментарии"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s комментарий был успешно %(action)s."
-msgstr[1] "%(count)s комментариев были успешно %(action)s."
+msgstr[1] "%(count)s комментария были успешно %(action)s."
 msgstr[2] "%(count)s комментариев были успешно %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Комментарии %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Последние комментарии на %(site_name)s"
@@ -98,9 +100,12 @@ msgstr "Комментарий"
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Следите за своими словами! Слово %s не позволенно здесь."
-msgstr[1] "Следите за своими словами! Слова %s не позволенны здесь."
-msgstr[2] "Следите за своими словами! Слова %s не позволенны здесь."
+msgstr[0] ""
+"Следите за своими словами! Употребление слова \"%s\" здесь запрещено."
+msgstr[1] ""
+"Следите за своими словами! Употребление слов \"%s\" здесь запрещено."
+msgstr[2] ""
+"Следите за своими словами! Употребление слов \"%s\" здесь запрещено."
 
 #: forms.py:181 templates/comments/preview.html:16
 msgid "and"
@@ -110,58 +115,58 @@ msgstr "и"
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
-"Если что-нибудь введете в это поле, то ваш комментарий будет признан спамом"
+"Если вы что-то введете в это поле, то ваш комментарий будет помечен как спам"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "тип содержимого"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "идентификатор объекта"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "пользователь"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "имя пользователя"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "адрес электронной почты пользователя"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL пользователя"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "комментарий"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "дата и время добавления"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-адрес"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "публичный"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Снимите выделение, чтобы убрать комментарий с сайта."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
-msgstr "удален"
+msgstr "удалён"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -169,11 +174,11 @@ msgstr ""
 "Отметьте, если комментарий нежелателен. Взамен будет показано сообщение "
 "\"Этот комментарий был удален\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "Комментарии"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -181,7 +186,7 @@ msgstr ""
 "Комментарий был добавлен зарегистрированным пользователем, поэтому имя "
 "пользователя доступно только для чтения."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -189,7 +194,7 @@ msgstr ""
 "Комментарий был добавлен зарегистрированным пользователем, поэтому адрес "
 "электронной почты доступен только для чтения."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -204,25 +209,25 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "отметка"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "дата"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "отметка комментария"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "отметки комментариев"
 
 #: templates/comments/approve.html:4
 msgid "Approve a comment"
-msgstr "Подтвердить комментарий"
+msgstr "Одобрить комментарий"
 
 #: templates/comments/approve.html:7
 msgid "Really make this comment public?"
@@ -230,11 +235,11 @@ msgstr "Вы уверены, что хотите опубликовать это
 
 #: templates/comments/approve.html:12
 msgid "Approve"
-msgstr "Подтвердить"
+msgstr "Одобрить"
 
 #: templates/comments/approved.html:4
 msgid "Thanks for approving"
-msgstr "Спасибо за подтверждение"
+msgstr "Спасибо, что одобрили комментарий"
 
 #: templates/comments/approved.html:7 templates/comments/deleted.html:7
 #: templates/comments/flagged.html:7
diff --git a/django/contrib/comments/locale/sk/LC_MESSAGES/django.mo b/django/contrib/comments/locale/sk/LC_MESSAGES/django.mo
index 448b9c5235..a505d1a2cd 100644
Binary files a/django/contrib/comments/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/sk/LC_MESSAGES/django.po b/django/contrib/comments/locale/sk/LC_MESSAGES/django.po
index fd055939c8..9308793f74 100644
--- a/django/contrib/comments/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/sk/LC_MESSAGES/django.po
@@ -6,59 +6,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Obsah"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metaúdaje"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "označený"
 msgstr[1] "označené"
 msgstr[2] "označených"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Označiť vybraný komentár"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "schválený"
 msgstr[1] "schválené"
 msgstr[2] "schválených"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Schváliť vybraný komentár"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "odstránený"
 msgstr[1] "odstránené"
 msgstr[2] "odstránených"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Odstrániť vybrané komentáre"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -66,12 +66,12 @@ msgstr[0] "1 komentár bol úspešne %(action)s."
 msgstr[1] "%(count)s komentáre boli úspešne %(action)s."
 msgstr[2] "%(count)s komentárov bolo úspešne %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s komentáre"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Najnovšie komentáre na %(site_name)s"
@@ -110,57 +110,57 @@ msgid ""
 msgstr ""
 "Ak ste do tohoto poľa čokoľvek zadali, váš komentár bude považovaný za spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "typ obsahu"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "identifikátor objektu"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "používateľ"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "meno používateľa"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "e-mail adresa používateľa"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL používateľa"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentár"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "dátum a čas odoslania"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP adresa"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "je verejný"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Ak chcete, aby komentár zmizol zo stránky, zrušte zaškrtnutie tohoto políčka."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "je odstránený"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -168,11 +168,11 @@ msgstr ""
 "Zaškrtnite toto pole, ak je komentár nevhodný. Namiesto neho sa zobrazí "
 "správa \"Tento komenár bol odstránený\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentáre"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -180,7 +180,7 @@ msgstr ""
 "Tento komentár je od autentifikovaného používateľa a preto je jeho meno len "
 "na čítanie."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -188,7 +188,7 @@ msgstr ""
 "Tento komentár je od autentifikovaného používateľa a preto je jeho e-mail "
 "len na čítanie."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -203,19 +203,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "príznak"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "dátum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "komentárový príznak"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "komentárové príznaky"
 
diff --git a/django/contrib/comments/locale/sl/LC_MESSAGES/django.mo b/django/contrib/comments/locale/sl/LC_MESSAGES/django.mo
index fb33bf6323..8fc4cbadc1 100644
Binary files a/django/contrib/comments/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/sl/LC_MESSAGES/django.po b/django/contrib/comments/locale/sl/LC_MESSAGES/django.po
index aab9c68b09..7299673b7c 100644
--- a/django/contrib/comments/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/sl/LC_MESSAGES/django.po
@@ -6,77 +6,77 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-02-14 13:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-31 20:17+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Vsebina"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metapodatki"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
-msgstr[0] "označen"
-msgstr[1] "označena"
-msgstr[2] "označeni"
-msgstr[3] "označenih"
+msgstr[0] "označenih"
+msgstr[1] "označen"
+msgstr[2] "označena"
+msgstr[3] "označeni"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Označi izbrane komentarje"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
-msgstr[0] "odobren"
-msgstr[1] "odobrena"
-msgstr[2] "odobreni"
-msgstr[3] "odobrenih"
+msgstr[0] "odobrenih"
+msgstr[1] "odobren"
+msgstr[2] "odobrena"
+msgstr[3] "odobreni"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
-msgstr "Odobri izbrane komentarje"
+msgstr "Odobri izbrane opokomentarje"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
-msgstr[0] "odstranjen"
-msgstr[1] "odstranjena"
-msgstr[2] "odstranjeni"
-msgstr[3] "odstranjenih"
+msgstr[0] "odstranjenih"
+msgstr[1] "odstranjen"
+msgstr[2] "odstranjena"
+msgstr[3] "odstranjeni"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Odstrani izbrane komentarje"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
-msgstr[0] "%(count)s komentar je bil uspešno %(action)s."
-msgstr[1] "%(count)s komentarja sta bila uspešno %(action)s."
-msgstr[2] "%(count)s komentarji so bili uspešno %(action)s."
-msgstr[3] "%(count)s komentarjev je bilo uspešno %(action)s."
+msgstr[0] "%(count)s komentarev je uspešno %(action)s."
+msgstr[1] "%(count)s komentar je uspešno %(action)s."
+msgstr[2] "%(count)s komentarja sta uspešno %(action)s."
+msgstr[3] "%(count)s komentarji so uspešno %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
-msgstr "%(site_name)s komentarji"
+msgstr "Komentarji %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Zadnji komentarji na %(site_name)s"
@@ -87,11 +87,11 @@ msgstr "Ime"
 
 #: forms.py:97
 msgid "Email address"
-msgstr "E-poštni naslov"
+msgstr "Elektronski naslov"
 
 #: forms.py:98
 msgid "URL"
-msgstr "URL (spletni naslov)"
+msgstr "Naslov URL"
 
 #: forms.py:99
 msgid "Comment"
@@ -101,9 +101,9 @@ msgstr "Komentar"
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Pazite na jezik! Beseda %s tu ni dovoljena."
-msgstr[1] "Pazite na jezik! Besedi %s tu nista dovoljeni."
-msgstr[2] "Pazite na jezik! Besede %s tu niso dovoljene."
+msgstr[0] "Pazite na jezik! Besede %s tu niso dovoljene."
+msgstr[1] "Pazite na jezik! Beseda %s tu ni dovoljena."
+msgstr[2] "Pazite na jezik! Besedi %s tu nista dovoljeni."
 msgstr[3] "Pazite na jezik! Besede %s tu niso dovoljene."
 
 #: forms.py:181 templates/comments/preview.html:16
@@ -113,86 +113,87 @@ msgstr "in"
 #: forms.py:186
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
-msgstr "Če v to polje vnesete karkoli, bo vaš komentar označen kot nezaželen"
+msgstr ""
+"Če v to polje vnesete kakršnokoli besedilo, bo vaš komentar označen kot "
+"neželen komentar."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
-msgstr "tip vsebine"
+msgstr "vrsta vsebine"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
-msgstr "ID objekta"
+msgstr "ID predmeta"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "uporabnik"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
-msgstr "uporabnikovo ime"
+msgstr "ime uporabnika"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
-msgstr "e-poštni naslov"
+msgstr "elektronski naslov uporabnika"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
-msgstr "uporabnikov URL"
+msgstr "naslov URL uporabnika"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
-msgstr "datum/čas vnosa"
+msgstr "datum in čas objave"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
-msgstr "IP naslov"
+msgstr "naslov IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "je javno"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
-msgstr "Odkljukajte tu da komentar izgine s strani."
+msgstr "Odkljukajte izbor in komentar bo izginil s strani."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "je odstranjen"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
-"Odkljukajte, če je komentar neprimeren. Namesto komentarja bo vidno "
-"obvestilo \"Ta komentar je bil odstranjen\"."
+"Odkljukajte, če je komentarj neprimeren. Namesto komentarja bo prikazano "
+"obvestilo \"Komentar je bil odstranjen\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentarji"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
-"Ta komentar je poslal prijavljen uporabnik, zato je ime na voljo samo za "
-"branje."
+"Komentar je objavil prijavljen uporabnik, zato je ime na voljo le za branje."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
-"Ta komentar je poslal prijavljen uporabnik, zato je e-poštni naslov samo za "
-"branje."
+"Komentar je objavil prijavljen uporabnik, zato je elektronski naslov na "
+"voljo le za branje."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -201,51 +202,51 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
-"Poslal uporabnik %(user)s ob %(date)s\n"
+"Objavljeno z računa %(user)s ob %(date)s\n"
 "\n"
 "%(comment)s\n"
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
-msgstr "Označi"
+msgstr "označi"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
-msgstr "označen komentar"
+msgstr "oznaka komentarja"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "oznake komentarja"
 
 #: templates/comments/approve.html:4
 msgid "Approve a comment"
-msgstr "Odobritev komentarja"
+msgstr "Odobri komentar"
 
 #: templates/comments/approve.html:7
 msgid "Really make this comment public?"
-msgstr "Ste prepričani, da želite ta komentar objaviti?"
+msgstr "Ali ste prepričani, da želite ta komentar objaviti?"
 
 #: templates/comments/approve.html:12
 msgid "Approve"
-msgstr "Odobritev"
+msgstr "Odobri"
 
 #: templates/comments/approved.html:4
 msgid "Thanks for approving"
-msgstr "Hvala za odobritev komentarja"
+msgstr "Hvala za odobritev"
 
 #: templates/comments/approved.html:7 templates/comments/deleted.html:7
 #: templates/comments/flagged.html:7
 msgid ""
 "Thanks for taking the time to improve the quality of discussion on our site"
 msgstr ""
-"Hvala, da ste si vzeli čas in pomagali izboljšati kvaliteto dialoga na naši "
-"strani"
+"Hvala, da ste si vzeli čas in pomagali izboljšati kakovost pogovorov na naši "
+"strani."
 
 #: templates/comments/delete.html:4
 msgid "Remove a comment"
@@ -253,7 +254,7 @@ msgstr "Odstrani komentar"
 
 #: templates/comments/delete.html:7
 msgid "Really remove this comment?"
-msgstr "Zares želite odstraniti ta komentar?"
+msgstr "Ali res želite odstraniti ta komentar?"
 
 #: templates/comments/delete.html:12
 msgid "Remove"
@@ -261,27 +262,27 @@ msgstr "Odstrani"
 
 #: templates/comments/deleted.html:4
 msgid "Thanks for removing"
-msgstr "Hvala, ker ste odstranili"
+msgstr "Hvala, ker ste odstranili komentar."
 
 #: templates/comments/flag.html:4
 msgid "Flag this comment"
-msgstr "Prijavi ta komentar"
+msgstr "Označi ta komentar"
 
 #: templates/comments/flag.html:7
 msgid "Really flag this comment?"
-msgstr "Zares želite prijaviti ta komentar?"
+msgstr "Ali res želite označiti ta komentar?"
 
 #: templates/comments/flag.html:12
 msgid "Flag"
-msgstr "Prijavi"
+msgstr "Označi"
 
 #: templates/comments/flagged.html:4
 msgid "Thanks for flagging"
-msgstr "Hvala, ker ste prijavili komentar"
+msgstr "Hvala, ker ste označili komentar"
 
 #: templates/comments/form.html:17 templates/comments/preview.html:32
 msgid "Post"
-msgstr "Pošlji"
+msgstr "Objavi"
 
 #: templates/comments/form.html:18 templates/comments/preview.html:33
 msgid "Preview"
@@ -289,7 +290,7 @@ msgstr "Predogled"
 
 #: templates/comments/posted.html:4
 msgid "Thanks for commenting"
-msgstr "Hvala za komentiranje"
+msgstr "Hvala za objavljanje komentarjev"
 
 #: templates/comments/posted.html:7
 msgid "Thank you for your comment"
@@ -297,19 +298,19 @@ msgstr "Hvala za vaš komentar"
 
 #: templates/comments/preview.html:4 templates/comments/preview.html.py:13
 msgid "Preview your comment"
-msgstr "Predogled vašega komentarja"
+msgstr "Predogled komentarja"
 
 #: templates/comments/preview.html:11
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
-msgstr[0] "Prosimo, odpravite sledečo napako"
-msgstr[1] "Prosimo, odpravite sledeči napaki"
-msgstr[2] "Prosimo, odpravite sledeče napake"
-msgstr[3] "Prosimo, odpravite sledeče napake"
+msgstr[0] "Odpravite naslednje napake"
+msgstr[1] "Odpravite naslednjo napako"
+msgstr[2] "Odpravite naslednji napaki"
+msgstr[3] "Odpravite naslednje napake"
 
 #: templates/comments/preview.html:16
 msgid "Post your comment"
-msgstr "Pošlji svoj komentar"
+msgstr "Objavite komentar"
 
 #: templates/comments/preview.html:16
 msgid "or make changes"
diff --git a/django/contrib/comments/locale/sq/LC_MESSAGES/django.mo b/django/contrib/comments/locale/sq/LC_MESSAGES/django.mo
index 3a5cdba81d..3fcfb78560 100644
Binary files a/django/contrib/comments/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/sq/LC_MESSAGES/django.po b/django/contrib/comments/locale/sq/LC_MESSAGES/django.po
index 53392f114e..869b4eec04 100644
--- a/django/contrib/comments/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/sq/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Lëndë"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Tejtëdhëna"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "me shenjë"
 msgstr[1] "me shenjë"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Vëru shenjë komenteve të përzgjedhura"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "i miratuar"
 msgstr[1] "të miratuar"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Miratoji komentet e përzgjedhura"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "i hequr"
 msgstr[1] "të hequr"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Hiqi komentet e përzgjedhur"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 koment %(action)s me sukses."
 msgstr[1] "%(count)s komente %(action)s me sukses."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "komente te %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Komentet më të fundit te %(site_name)s"
@@ -105,58 +105,58 @@ msgid ""
 msgstr ""
 "Nëse fusni diçka në këtë fushë komenti juaj do të trajtohet si i pavlerë"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "lloj lënde"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID objekti"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "përdorues"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "emri i përdoruesit"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "adresa email e përdoruesit"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL përdoruesi"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "koment"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "data/koha e parashtrimit"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Adresë IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "është publike"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Hiqjani shenjën kësaj kutize që ta bëni komentin të zhduket faktikisht prej "
 "site-it."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "është hequr"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -164,11 +164,11 @@ msgstr ""
 "I vini shenjë kësaj kutie, nëse komenti është i papërshtatshëm. Në vend të "
 "tij do të shfaqet një mesazh \"Ky koment është hequr\"."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komente"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -176,7 +176,7 @@ msgstr ""
 "Ky koment u postua nga një përdorues i mirëfilltësuar, ndaj emri është nën "
 "atributin vetëm-lexim."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -184,7 +184,7 @@ msgstr ""
 "Ky koment u postua nga një përdorues i mirëfilltësuar, ndaj email-i është "
 "nën atributin vetëm-lexim."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -199,19 +199,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "shenjë"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datë"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "shenjë komenti"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "shenja komenti"
 
diff --git a/django/contrib/comments/locale/sr/LC_MESSAGES/django.mo b/django/contrib/comments/locale/sr/LC_MESSAGES/django.mo
index df19fae3d3..b3540d1dce 100644
Binary files a/django/contrib/comments/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/sr/LC_MESSAGES/django.po b/django/contrib/comments/locale/sr/LC_MESSAGES/django.po
index 34fed39c15..0093bf2788 100644
--- a/django/contrib/comments/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/sr/LC_MESSAGES/django.po
@@ -7,60 +7,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Садржај"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Метаподаци"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "означен"
 msgstr[1] "означена"
 msgstr[2] "означена"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Означавање изабраних коментара"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "одобрен"
 msgstr[1] "одобрена"
 msgstr[2] "одобрена"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Одобрење изабраних коментара"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "избрисан"
 msgstr[1] "избрисана"
 msgstr[2] "избрисана"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Обриши изабране коментаре"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -68,12 +68,12 @@ msgstr[0] "%(count)s коментар је успешно %(action)s."
 msgstr[1] "%(count)s коментара су успешно %(action)s."
 msgstr[2] "%(count)s коментара су успешно %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Коментари на сајту %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Скорији коментари на сајту %(site_name)s"
@@ -111,57 +111,57 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Ако ишта унесете у ово поље, Ваш коментар ће се сматрати спамом."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "тип садржаја"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID објекта"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "корисник"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "корисниково име"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "корисникова имејл адреса"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "корисников URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "коментар"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "датум/време постављања"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP адреса"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "јавно"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Деселектујте ово поље ако желите да порука фактички нестане са овог сајта."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "уклоњен"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -169,11 +169,11 @@ msgstr ""
 "Обележите ову кућицу ако је коментар неприкладан. Порука о уклањању ће бити "
 "приказана уместо коментара."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "коментари"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -181,7 +181,7 @@ msgstr ""
 "Овај коментар је поставио пријављен корисник и зато је поље са именом "
 "закључано."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -189,7 +189,7 @@ msgstr ""
 "Овај коментар је поставио пријављен корисник и зато је поље са имејл адресом "
 "закључано."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -204,19 +204,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "ознака"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "датум"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "ознака коментара"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "ознаке коментара"
 
diff --git a/django/contrib/comments/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/comments/locale/sr_Latn/LC_MESSAGES/django.mo
index 5ea727a518..a3f3f981ac 100644
Binary files a/django/contrib/comments/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/comments/locale/sr_Latn/LC_MESSAGES/django.po
index eb84e7c1ac..190e285c3c 100644
--- a/django/contrib/comments/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,60 +7,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Sadržaj"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metapodaci"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "označen"
 msgstr[1] "označena"
 msgstr[2] "označena"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Označavanje izabranih komentara"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "odobren"
 msgstr[1] "odobrena"
 msgstr[2] "odobrena"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Odobrenje izabranih komentara"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "izbrisan"
 msgstr[1] "izbrisana"
 msgstr[2] "izbrisana"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Obriši izabrane komentare"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -68,12 +68,12 @@ msgstr[0] "%(count)s komentar je uspešno %(action)s."
 msgstr[1] "%(count)s komentara su uspešno %(action)s."
 msgstr[2] "%(count)s komentara su uspešno %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "Komentari na sajtu %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Skoriji komentari na sajtu %(site_name)s"
@@ -111,57 +111,57 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Ako išta unesete u ovo polje, Vaš komentar će se smatrati spamom."
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "tip sadržaja"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID objekta"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "korisnikovo ime"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "korisnikova imejl adresa"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "korisnikov URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "komentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "datum/vreme postavljanja"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP adresa"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "javno"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 "Deselektujte ovo polje ako želite da poruka faktički nestane sa ovog sajta."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "uklonjen"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -169,11 +169,11 @@ msgstr ""
 "Obeležite ovu kućicu ako je komentar neprikladan. Poruka o uklanjanju će "
 "biti prikazana umesto komentara."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "komentari"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -181,7 +181,7 @@ msgstr ""
 "Ovaj komentar je postavio prijavljen korisnik i zato je polje sa imenom "
 "zaključano."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -189,7 +189,7 @@ msgstr ""
 "Ovaj komentar je postavio prijavljen korisnik i zato je polje sa imejl "
 "adresom zaključano."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -204,19 +204,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "oznaka"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "oznaka komentara"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "oznake komentara"
 
diff --git a/django/contrib/comments/locale/sv/LC_MESSAGES/django.mo b/django/contrib/comments/locale/sv/LC_MESSAGES/django.mo
index d98c813d81..c6803e05d9 100644
Binary files a/django/contrib/comments/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/sv/LC_MESSAGES/django.po b/django/contrib/comments/locale/sv/LC_MESSAGES/django.po
index b6f150c30e..a204b910e9 100644
--- a/django/contrib/comments/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/sv/LC_MESSAGES/django.po
@@ -7,68 +7,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Innehåll"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "flaggad"
 msgstr[1] "flaggade"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Flagga markerade kommentarer"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "godkänd"
 msgstr[1] "godkända"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Godkänn valda kommentarer"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "borttagen"
 msgstr[1] "borttagna"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Ta bort valda kommentarer"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] "%(count)s kommentarer har blivit %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s kommentarer"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Senaste kommentarer på %(site_name)s"
@@ -105,56 +105,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Om du fyller i detta fält kommer din kommentar att betraktas som spam"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "innehålls typ"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "objektets ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "användare"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "användares namn"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "användares e-postadress"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "användares URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "kommentar"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "skickat datum/tid"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP-adress"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "är offentlig"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Avmarkeras detta kommer kommentaren inte synas på webbplatsen."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "är borttaget"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -162,11 +162,11 @@ msgstr ""
 "Bocka för denna ruta om kommentaren är olämplig. Ett \"Denna kommentar har "
 "tagits bort\"-meddelande kommer visas istället."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "kommentarer"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -174,7 +174,7 @@ msgstr ""
 "Denna kommentar postades av en autentiserad användare och därför är namnet "
 "skrivskyddat."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -182,7 +182,7 @@ msgstr ""
 "Denna kommentar postades av en autentiserad användare och därför är e-"
 "postadressen skrivskyddad."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -197,19 +197,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "flagga"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "datum"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "kommentarsflagga"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "kommentarsflaggor"
 
diff --git a/django/contrib/comments/locale/sw/LC_MESSAGES/django.mo b/django/contrib/comments/locale/sw/LC_MESSAGES/django.mo
index 946ff9f1ab..6c3447a937 100644
Binary files a/django/contrib/comments/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/sw/LC_MESSAGES/django.po b/django/contrib/comments/locale/sw/LC_MESSAGES/django.po
index e8f4d5fb59..efc0c0cbcc 100644
--- a/django/contrib/comments/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/sw/LC_MESSAGES/django.po
@@ -5,71 +5,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-07 15:43+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-07-06 16:44+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
-msgstr ""
+msgstr "Maudhui"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
-msgstr ""
+msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "yameidhinishwa"
+msgstr[1] "yameidhinishwa"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
-msgstr ""
+msgstr "Idhinisha maoni yaliyochaguliwa"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "yameondolewa"
+msgstr[1] "yameondolewa"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Ondoa maoni yaliyochaguliwa"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "maoni %(action)s kwa mafanikio."
+msgstr[1] "maoni %(count)s %(action)s kwa mafanikio."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "maoni ya %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
-msgstr ""
+msgstr "Maoni ya karibuni ya %(site_name)s."
 
 #: forms.py:96
 msgid "Name"
@@ -102,79 +102,86 @@ msgstr "na"
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
+"Ikiwa utaingiza chochote katika uga huu maoni yako yatachukuliwa kama taka"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
-msgstr ""
+msgstr "aina ya maudhui"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
-msgstr ""
+msgstr "ID ya kitu"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "mtumiaji"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "jina la mtumiaji"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "anuani ya baruapepe ya mtumiaji"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL ya mtumiaji"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "maoni"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "tarehe/muda yalipotolewa"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "anuani ya IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
-msgstr ""
+msgstr "kwa umma"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
+"Toa tiki katika kisanduku hiki na maoni yako yatatolewa kikamilifu kutoka "
+"tovuti hii."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
-msgstr ""
+msgstr "yameondolewa"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "maoni"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
+"Maoni haya yametumwa na mtumiaji aliyethibitishwa na hivyo jina ni la kusoma "
+"tu."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
+"Maoni haya yametumwa na mtumiaji aliyethibitishwa na hivyo anuani ya "
+"baruapepe ni ya kusoma tu."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -183,20 +190,25 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Yametumwa na %(user)s %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "tarehe"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
@@ -206,7 +218,7 @@ msgstr ""
 
 #: templates/comments/approve.html:7
 msgid "Really make this comment public?"
-msgstr ""
+msgstr "Kweli toa maoni haya kwa umma?"
 
 #: templates/comments/approve.html:12
 msgid "Approve"
@@ -221,6 +233,7 @@ msgstr "Ahsante kwa kupitisha"
 msgid ""
 "Thanks for taking the time to improve the quality of discussion on our site"
 msgstr ""
+"Asante kwa kutumia muda ili kuboresha ubora wa mjadala katika tovuti yetu"
 
 #: templates/comments/delete.html:4
 msgid "Remove a comment"
diff --git a/django/contrib/comments/locale/ta/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ta/LC_MESSAGES/django.mo
index 6dbf0f2b0d..e4bc736825 100644
Binary files a/django/contrib/comments/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ta/LC_MESSAGES/django.po b/django/contrib/comments/locale/ta/LC_MESSAGES/django.po
index c54cf09203..a454d00176 100644
--- a/django/contrib/comments/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ta/LC_MESSAGES/django.po
@@ -6,68 +6,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr ""
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr ""
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr ""
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr ""
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr ""
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr ""
@@ -104,56 +104,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "பொருளடக்க வகை"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "அடையாளம்"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "பயனர்"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr ""
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr ""
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr ""
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "குறிப்பு"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "தேதி/நேரம் சமர்ப்பிக்கப்பட்டுள்ளது"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP விலாசம்"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "பொதுவானது"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "நீக்கபட்டது"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -161,23 +161,23 @@ msgstr ""
 "குறிப்பு சரியாக இல்லையென்றால் இந்த பெட்டியில் குறியிடவும். இதற்கு பதிலாக \"இந்த "
 "குறிப்பு நீக்கபட்டது\" காண்பிக்கபடும்."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "குறிப்பு"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -192,19 +192,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr ""
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/te/LC_MESSAGES/django.mo b/django/contrib/comments/locale/te/LC_MESSAGES/django.mo
index bee98cfe9c..cfa87b50cc 100644
Binary files a/django/contrib/comments/locale/te/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/te/LC_MESSAGES/django.po b/django/contrib/comments/locale/te/LC_MESSAGES/django.po
index e48e6eb1bd..92f2f40b8d 100644
--- a/django/contrib/comments/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/te/LC_MESSAGES/django.po
@@ -8,68 +8,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "విషయం"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr ""
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "అంగికరించబడినది"
 msgstr[1] "అంగికరించబడినది"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "ఎంచుకున్న వ్యాఖ్యానమునలను సంమతించుము"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "తీసివేయబడినది "
 msgstr[1] "తీసివేయబడినది "
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "ఎంచుకున్న వ్యాఖ్యానమునలను తీసివేయుము "
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 వ్యాఖ్యానము జయప్రదముగా %(action)s."
 msgstr[1] "%(count)s వ్యాఖ్యానములు జయప్రదముగా %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s వ్యాఖ్యలు"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "తాజా వ్యాఖ్యానములు %(site_name)s నందు కలదు "
@@ -106,78 +106,78 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "ఈ క్షేత్రములో ఏదయినా వ్యాఖ్య రాసినట్లయితే అది అసంధర్బ వ్యాఖ్య గా పరిగనించబడుతుంది "
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "సూచన రకం"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "వస్తువు ఐడి"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "వాడుకరి"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "వాడుకరి పేరు"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "వాడుకరి ఈమెయిలు చిరునామా"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "వాడుకరి URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "వ్యాఖ్య"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "సమర్పించిన తేదీ/సమయం"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "ఐపీ చిరునామా"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "బహిరంగమయినది"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "తీసివేయబడినది"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr " ఈ వ్యాఖ్యానము సరిగ్గా లేదని తోచినచో ఈ  డబ్బా ని చెక్ చేయండి "
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "వ్యాఖ్యలు"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -187,19 +187,19 @@ msgid ""
 "http://%(domain)s%(url)s"
 msgstr ""
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "తేదీ"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/th/LC_MESSAGES/django.mo b/django/contrib/comments/locale/th/LC_MESSAGES/django.mo
index a5e21dce31..1a69fafb73 100644
Binary files a/django/contrib/comments/locale/th/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/th/LC_MESSAGES/django.po b/django/contrib/comments/locale/th/LC_MESSAGES/django.po
index b07832a4b4..049bd0e8aa 100644
--- a/django/contrib/comments/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/th/LC_MESSAGES/django.po
@@ -9,64 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 06:23+0000\n"
 "Last-Translator: Suteepat Damrongyingsupab <monkeycrew_topza@hotmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "เนื้อหา"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Metadata"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "ถูกแจ้งเตือนแล้ว"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "แจ้งเตือนความคิดเห็นที่เลือก"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "ได้รับการอนุมัติ"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "อนุมัติความคิดเห็นที่เลือกไว้"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "ลบ"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "ลบความคิดเห็นที่เลือกไว้"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s ความคิดเห็นได้ถูก%(action)sเรียบร้อยแล้ว"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "ความเห็นของ %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "ความเห็นล่าสุดเมื่อ %(site_name)s"
@@ -102,79 +102,79 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "ถ้าคุณใส่ข้อมูลใดๆ ก็ตามในส่วนนี้ มันจะกลายเป็นสแปม"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "content type"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "อ็อบเจ็กต์ไอดี"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "ผู้ใช้"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "ชื่อของผู้ใช้"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "อีเมลของผู้ใช้"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL ของผู้ใช้"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "ข้อคิดเห็น"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "วันและเวลาที่ส่งข้อมูล"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "หมายเลขไอพี"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "สาธารณะ"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "เลือกออกเพื่อที่จะทำให้ข้อคิดเห็นนั้นหายไปจากเว็บไซต์"
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "ถอดออกแล้ว"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
 "เลือกเมื่อเห็นว่าข้อคิดเห็นไหนไม่เหมาะสม เมื่อข้อคิดเห็นนี้ได้ถูกลบแล้ว ข้อมูลอื่นจะถูกแสดงขึ้นแทน"
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "ความคิดเห็น"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "ข้อคิดเห็นนี้ได้ถูกเขียนไว้โดยผู้ใช้ที่สามารถเชื่อถือได้ จะถูกอ่านได้เพียงอย่างเดียว"
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr "ข้อคิดเห็นนี้ถูกเขียนไว้โดยผู้ใช้ที่สามารถเชื่อถือได้ ดังนั้นอีเมลนั้นจะถูกอ่านเท่านั้น"
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -189,19 +189,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "ธง"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "วันที่"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "ธงแสดงความเห็น"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "ปักธงแสดงความคิดเห็น"
 
diff --git a/django/contrib/comments/locale/tr/LC_MESSAGES/django.mo b/django/contrib/comments/locale/tr/LC_MESSAGES/django.mo
index d51dbcf079..5e37593d0b 100644
Binary files a/django/contrib/comments/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/tr/LC_MESSAGES/django.po b/django/contrib/comments/locale/tr/LC_MESSAGES/django.po
index 8644a1749b..63dcd68511 100644
--- a/django/contrib/comments/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/tr/LC_MESSAGES/django.po
@@ -6,64 +6,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "İçerik"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Meta bilgi"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "işaretli"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Seçili yorumları işaretle"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "onaylandı"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Seçili yorumları onayla"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "silinmiş"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Seçili yorumları sil"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s adet yorum başarıyla %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s sitesine ait yorumlar"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s sitesindeki son yorumlar"
@@ -101,56 +101,56 @@ msgstr ""
 "Eğer bu alana herhangi bir şey girerseniz, yorumunuz spam olarak kabul "
 "edilecektir"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "içerik türü"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "nesne no"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "kullanıcı"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "kullanıcının adı"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "kullanıcının e-posta adresi"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "kullanıcının URL'si"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "yorum"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "gönderim tarihi/saati"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP adresi"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "görünürlük"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Yorumu site üzerinden kaldırmak için bu kutucuğun seçimini kaldırın."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "silinmiş"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -158,18 +158,18 @@ msgstr ""
 "Yorum uygunsuz ise bu işareti kaldırın. \"Yorum silindi\" uyarısı "
 "görüntülenecek."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "yorumlar"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 "Bu yorum kayıtlı kullanıcı tarafından yazıldığı için başlığı salt okunurdur."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -177,7 +177,7 @@ msgstr ""
 "Bu yorum kayıtlı kullanıcı tarafından yazıldığı için e-posta adresi salt "
 "okunurdur."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -192,19 +192,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "işaret"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "tarih"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "yorum işareti"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "yorum işaretleri"
 
diff --git a/django/contrib/comments/locale/tt/LC_MESSAGES/django.mo b/django/contrib/comments/locale/tt/LC_MESSAGES/django.mo
index d2db5aabf8..e4ab7be6fd 100644
Binary files a/django/contrib/comments/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/tt/LC_MESSAGES/django.po b/django/contrib/comments/locale/tt/LC_MESSAGES/django.po
index b7d46d696c..7c0f5e230e 100644
--- a/django/contrib/comments/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/tt/LC_MESSAGES/django.po
@@ -5,64 +5,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2011-01-19 15:42+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr ""
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr ""
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] ""
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr ""
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] ""
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr ""
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr ""
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr ""
@@ -98,78 +98,78 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr ""
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr ""
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr ""
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr ""
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr ""
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr ""
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr ""
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr ""
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr ""
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr ""
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr ""
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr ""
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -179,19 +179,19 @@ msgid ""
 "http://%(domain)s%(url)s"
 msgstr ""
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr ""
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/uk/LC_MESSAGES/django.mo b/django/contrib/comments/locale/uk/LC_MESSAGES/django.mo
index 82a55c2673..13784c10d1 100644
Binary files a/django/contrib/comments/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/uk/LC_MESSAGES/django.po b/django/contrib/comments/locale/uk/LC_MESSAGES/django.po
index 7abe009286..7e09d2b449 100644
--- a/django/contrib/comments/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/uk/LC_MESSAGES/django.po
@@ -8,60 +8,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Зміст"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Мета-дані"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "позначено"
 msgstr[1] "позначено"
 msgstr[2] "позначено"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Позначити відзначені коментарі"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "апробовано"
 msgstr[1] "апробовано"
 msgstr[2] "апробовано"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Апробувати відзначені коментарі"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "видалено"
 msgstr[1] "видалено"
 msgstr[2] "видалено"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Видалити відзначені коментарі"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
@@ -69,12 +69,12 @@ msgstr[0] "%(count)s коментар було %(action)s."
 msgstr[1] "%(count)s коментарі було %(action)s."
 msgstr[2] "%(count)s коментарів було %(action)s."
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "коментарі сайту %(site_name)s"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Останні коментарі на сайті %(site_name)s"
@@ -112,56 +112,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Якщо ви введете щось в це поле, ваш коментар буде вважатися спамом"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "content type"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "ID об'єкту"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "користувач"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "ім'я користувача"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "e-mail адреса користувача"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "URL користувачів"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "коментар"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "дата/час додавання"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP адреса"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "публічний"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Видаліть галочку звідси, щоб коментар зник з сайту."
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "видалений"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -169,11 +169,11 @@ msgstr ""
 "Поставте тут галочку, якщо коментар неприйнятний. Повідомлення \"Цей "
 "коментар було видалено\" буде відображено замість цього коментаря."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "коментарі"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -181,7 +181,7 @@ msgstr ""
 "Цей коментар був розміщений зареєстрованим користувачем і тому ім'я не може "
 "бути відредаговано."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -189,7 +189,7 @@ msgstr ""
 "Цей коментар був розміщений зареєстрованим користувачем і тому email не може "
 "бути відредагований."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -204,19 +204,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "позначка"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "число"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "позначка коментаря"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "позначки коментаря"
 
diff --git a/django/contrib/comments/locale/ur/LC_MESSAGES/django.mo b/django/contrib/comments/locale/ur/LC_MESSAGES/django.mo
index dba69894a6..b83d36c59e 100644
Binary files a/django/contrib/comments/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/ur/LC_MESSAGES/django.po b/django/contrib/comments/locale/ur/LC_MESSAGES/django.po
index 2b4023f0e3..d15ecc05e0 100644
--- a/django/contrib/comments/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/ur/LC_MESSAGES/django.po
@@ -5,68 +5,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2011-01-19 15:42+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr ""
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr ""
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr ""
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr ""
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr ""
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr ""
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr ""
@@ -103,78 +103,78 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr ""
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr ""
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr ""
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr ""
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr ""
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr ""
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr ""
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr ""
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr ""
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr ""
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr ""
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr ""
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -184,19 +184,19 @@ msgid ""
 "http://%(domain)s%(url)s"
 msgstr ""
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr ""
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr ""
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/vi/LC_MESSAGES/django.mo b/django/contrib/comments/locale/vi/LC_MESSAGES/django.mo
index 37c42fd5fd..c7c842d1da 100644
Binary files a/django/contrib/comments/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/vi/LC_MESSAGES/django.po b/django/contrib/comments/locale/vi/LC_MESSAGES/django.po
index 72b002925d..a4ea7fc278 100644
--- a/django/contrib/comments/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/vi/LC_MESSAGES/django.po
@@ -7,64 +7,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Tran <hongdiepkien@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "Nội dung"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "Siêu dữ liệu"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] ""
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "Đặt cờ những nhận xét được chọn"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "phê duyệt"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "Phê duyệt những nhận xét đã chọn"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "loại bỏ"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "Loại bỏ nhận xét được chọn"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] ""
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr ""
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Nhận xét cuối cùng trên %(site_name)s"
@@ -100,56 +100,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Bất kì bình luận nào bạn nhập vào đây cũng sẽ bị coi là thư rác"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "kiểu nội dung"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "object ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "Người dùng"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "Tên người sử dụng"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "Địa chỉ email của người sử dụng"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "Đường dẫn URL của người sử dụng"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "Bình luận"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "Ngày/giờ đã đăng kí"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "Địa chỉ IP"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "Được phổ biến"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "Không đánh dấu vào hộp này để gỡ bình luận ra khỏi Site"
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "Bị xóa"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -157,11 +157,11 @@ msgstr ""
 "Đánh dấu vào hộp này nếu bình luận không thích hợp. Tin nhắn \"Bình luận đã "
 "bị xóa\" sẽ thay thế vào đó."
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "những nhận xét"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
@@ -169,7 +169,7 @@ msgstr ""
 "nhận xét này đã được đăng bởi một người dùng xác thực và do đó đặt tên cho "
 "là chỉ đọc."
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -177,7 +177,7 @@ msgstr ""
 "nhận xét này đã được đăng bởi một người dùng xác thực và do đó email là chỉ "
 "đọc."
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -190,19 +190,19 @@ msgstr ""
 "%(comment)s\n"
 "http://%(domain)s%(url)s "
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr ""
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "ngày"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "cờ nhận xét"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/comments/locale/zh_CN/LC_MESSAGES/django.mo
index 0508039641..7a4d8abedb 100644
Binary files a/django/contrib/comments/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/comments/locale/zh_CN/LC_MESSAGES/django.po
index 117afa7069..8f9871d45b 100644
--- a/django/contrib/comments/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,64 +7,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: Lele Long <schemacs@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "内容"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "元数据"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "标记"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "标记选中的评论"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "批准"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "批准选中的评论"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "移除"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "移除选中的评论"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s 条评论被成功 %(action)s。"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s的评论"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "%(site_name)s的最新评论"
@@ -100,56 +100,56 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "如果你在该字段中输入任何内容，那么你的评论就会被视为垃圾评论。"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "内容类型"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "对象ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "用户"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "用户名"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "用户的 email 地址"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "用户的网址"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "评论"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "提交日期/时间"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP 地址"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "公开"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "取消选中此复选框，可隐藏该条评论。"
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "已删除"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
@@ -157,23 +157,23 @@ msgstr ""
 "若评论内容不妥，则选中这个复选框。该评论将被一条\"此评论已经被删除\"的消息所"
 "替换。"
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "评论"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "此评论由一位验证用户发表，因此该用户名是只读的。"
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr "此评论由一位验证用户发表，因此该 email 是只读的。"
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -188,19 +188,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "标记"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "标记时间"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "评论标记"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "评论标记"
 
diff --git a/django/contrib/comments/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/comments/locale/zh_TW/LC_MESSAGES/django.mo
index 0a352ac39c..a3f711d4ae 100644
Binary files a/django/contrib/comments/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/comments/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/comments/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/comments/locale/zh_TW/LC_MESSAGES/django.po
index de0806d5f2..41a5df92f7 100644
--- a/django/contrib/comments/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/zh_TW/LC_MESSAGES/django.po
@@ -7,64 +7,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:24+0000\n"
 "Last-Translator: tcc <tcchou@tcchou.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:12
+#: admin.py:25
 msgid "Content"
 msgstr "內容"
 
-#: admin.py:15
+#: admin.py:28
 msgid "Metadata"
 msgstr "元資料"
 
-#: admin.py:42
+#: admin.py:55
 msgid "flagged"
 msgid_plural "flagged"
 msgstr[0] "已標記"
 
-#: admin.py:43
+#: admin.py:56
 msgid "Flag selected comments"
 msgstr "標記已選評論"
 
-#: admin.py:47
+#: admin.py:60
 msgid "approved"
 msgid_plural "approved"
 msgstr[0] "已核可"
 
-#: admin.py:48
+#: admin.py:61
 msgid "Approve selected comments"
 msgstr "核可已選評論"
 
-#: admin.py:52
+#: admin.py:65
 msgid "removed"
 msgid_plural "removed"
 msgstr[0] "已移除"
 
-#: admin.py:53
+#: admin.py:66
 msgid "Remove selected comments"
 msgstr "移除已選評論"
 
-#: admin.py:65
+#: admin.py:78
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "%(count)s 個評論已成功完成%(action)s。"
 
-#: feeds.py:13
+#: feeds.py:14
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "%(site_name)s 評論"
 
-#: feeds.py:23
+#: feeds.py:20
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "最新評論在 %(site_name)s"
@@ -100,78 +100,78 @@ msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "如果你在這一個欄位輸入任何內容，會被視為是垃圾評論"
 
-#: models.py:22
+#: models.py:23
 msgid "content type"
 msgstr "內容類型"
 
-#: models.py:24
+#: models.py:25
 msgid "object ID"
 msgstr "物件 ID"
 
-#: models.py:50 models.py:168
+#: models.py:53 models.py:177
 msgid "user"
 msgstr "使用者"
 
-#: models.py:52
+#: models.py:55
 msgid "user's name"
 msgstr "使用者名稱"
 
-#: models.py:53
+#: models.py:56
 msgid "user's email address"
 msgstr "使用者電子郵件"
 
-#: models.py:54
+#: models.py:57
 msgid "user's URL"
 msgstr "使用者 URL"
 
-#: models.py:56 models.py:76 models.py:169
+#: models.py:59 models.py:79 models.py:178
 msgid "comment"
 msgstr "評論"
 
-#: models.py:59
+#: models.py:62
 msgid "date/time submitted"
 msgstr "日期/時間已送出"
 
-#: models.py:60
+#: models.py:63
 msgid "IP address"
 msgstr "IP 位址"
 
-#: models.py:61
+#: models.py:64
 msgid "is public"
 msgstr "公開"
 
-#: models.py:62
+#: models.py:65
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr "取消這個選項可讓評論立刻在網站消失。"
 
-#: models.py:64
+#: models.py:67
 msgid "is removed"
 msgstr "已刪除"
 
-#: models.py:65
+#: models.py:68
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr "如果此評論不恰當則選取這個檢查框，其將以 \"此評論已被移除\" 訊息取代。"
 
-#: models.py:77
+#: models.py:80
 msgid "comments"
 msgstr "評論"
 
-#: models.py:119
+#: models.py:124
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr "這個評論由認證的使用者張貼, 因此名稱是唯讀的。"
 
-#: models.py:128
+#: models.py:134
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr "這個評論由認證的使用者張貼, 因此名稱是唯讀的。"
 
-#: models.py:153
+#: models.py:160
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -186,19 +186,19 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: models.py:170
+#: models.py:179
 msgid "flag"
 msgstr "標記"
 
-#: models.py:171
+#: models.py:180
 msgid "date"
 msgstr "日期"
 
-#: models.py:181
+#: models.py:190
 msgid "comment flag"
 msgstr "標記評論"
 
-#: models.py:182
+#: models.py:191
 msgid "comment flags"
 msgstr "評論標記"
 
diff --git a/django/contrib/comments/managers.py b/django/contrib/comments/managers.py
index bc0fc5f332..656200437b 100644
--- a/django/contrib/comments/managers.py
+++ b/django/contrib/comments/managers.py
@@ -8,7 +8,7 @@ class CommentManager(models.Manager):
         """
         QuerySet for all comments currently in the moderation queue.
         """
-        return self.get_query_set().filter(is_public=False, is_removed=False)
+        return self.get_queryset().filter(is_public=False, is_removed=False)
 
     def for_model(self, model):
         """
@@ -16,7 +16,7 @@ class CommentManager(models.Manager):
         a class).
         """
         ct = ContentType.objects.get_for_model(model)
-        qs = self.get_query_set().filter(content_type=ct)
+        qs = self.get_queryset().filter(content_type=ct)
         if isinstance(model, models.Model):
             qs = qs.filter(object_pk=force_text(model._get_pk_val()))
         return qs
diff --git a/django/contrib/comments/models.py b/django/contrib/comments/models.py
index c263ea7d10..bc4d932464 100644
--- a/django/contrib/comments/models.py
+++ b/django/contrib/comments/models.py
@@ -60,7 +60,7 @@ class Comment(BaseCommentAbstractModel):
 
     # Metadata about the comment
     submit_date = models.DateTimeField(_('date/time submitted'), default=None)
-    ip_address = models.IPAddressField(_('IP address'), blank=True, null=True)
+    ip_address = models.GenericIPAddressField(_('IP address'), unpack_ipv4=True, blank=True, null=True)
     is_public = models.BooleanField(_('is public'), default=True,
                     help_text=_('Uncheck this box to make the comment effectively ' \
                                 'disappear from the site.'))
diff --git a/django/contrib/comments/moderation.py b/django/contrib/comments/moderation.py
index 6c56d7a8a5..6648aebb59 100644
--- a/django/contrib/comments/moderation.py
+++ b/django/contrib/comments/moderation.py
@@ -302,7 +302,7 @@ class Moderator(object):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model in self._registry:
-                raise AlreadyModerated("The model '%s' is already being moderated" % model._meta.module_name)
+                raise AlreadyModerated("The model '%s' is already being moderated" % model._meta.model_name)
             self._registry[model] = moderation_class(model)
 
     def unregister(self, model_or_iterable):
@@ -318,7 +318,7 @@ class Moderator(object):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model not in self._registry:
-                raise NotModerated("The model '%s' is not currently being moderated" % model._meta.module_name)
+                raise NotModerated("The model '%s' is not currently being moderated" % model._meta.model_name)
             del self._registry[model]
 
     def pre_save_moderation(self, sender, comment, request, **kwargs):
diff --git a/django/contrib/comments/templatetags/comments.py b/django/contrib/comments/templatetags/comments.py
index 4d4eb2322f..d8eed76ad6 100644
--- a/django/contrib/comments/templatetags/comments.py
+++ b/django/contrib/comments/templatetags/comments.py
@@ -3,11 +3,20 @@ from django.template.loader import render_to_string
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib import comments
+from django.utils import six
+from django.utils.deprecation import RenameMethodsBase
 from django.utils.encoding import smart_text
 
 register = template.Library()
 
-class BaseCommentNode(template.Node):
+
+class RenameBaseCommentNodeMethods(RenameMethodsBase):
+    renamed_methods = (
+        ('get_query_set', 'get_queryset', PendingDeprecationWarning),
+    )
+
+
+class BaseCommentNode(six.with_metaclass(RenameBaseCommentNodeMethods, template.Node)):
     """
     Base helper class (abstract) for handling the get_comment_* template tags.
     Looks a bit strange, but the subclasses below should make this a bit more
@@ -17,7 +26,7 @@ class BaseCommentNode(template.Node):
     @classmethod
     def handle_token(cls, parser, token):
         """Class method to parse get_comment_list/count/form and return a Node."""
-        tokens = token.contents.split()
+        tokens = token.split_contents()
         if tokens[1] != 'for':
             raise template.TemplateSyntaxError("Second argument in %r tag must be 'for'" % tokens[0])
 
@@ -64,11 +73,11 @@ class BaseCommentNode(template.Node):
         self.comment = comment
 
     def render(self, context):
-        qs = self.get_query_set(context)
+        qs = self.get_queryset(context)
         context[self.as_varname] = self.get_context_value_from_queryset(context, qs)
         return ''
 
-    def get_query_set(self, context):
+    def get_queryset(self, context):
         ctype, object_pk = self.get_target_ctype_pk(context)
         if not object_pk:
             return self.comment_model.objects.none()
@@ -146,7 +155,7 @@ class RenderCommentFormNode(CommentFormNode):
     @classmethod
     def handle_token(cls, parser, token):
         """Class method to parse render_comment_form and return a Node."""
-        tokens = token.contents.split()
+        tokens = token.split_contents()
         if tokens[1] != 'for':
             raise template.TemplateSyntaxError("Second argument in %r tag must be 'for'" % tokens[0])
 
@@ -182,7 +191,7 @@ class RenderCommentListNode(CommentListNode):
     @classmethod
     def handle_token(cls, parser, token):
         """Class method to parse render_comment_list and return a Node."""
-        tokens = token.contents.split()
+        tokens = token.split_contents()
         if tokens[1] != 'for':
             raise template.TemplateSyntaxError("Second argument in %r tag must be 'for'" % tokens[0])
 
@@ -205,7 +214,7 @@ class RenderCommentListNode(CommentListNode):
                 "comments/%s/list.html" % ctype.app_label,
                 "comments/list.html"
             ]
-            qs = self.get_query_set(context)
+            qs = self.get_queryset(context)
             context.push()
             liststr = render_to_string(template_search_list, {
                 "comment_list" : self.get_context_value_from_queryset(context, qs)
diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py
index 7c02b21b6a..befd326092 100644
--- a/django/contrib/comments/views/comments.py
+++ b/django/contrib/comments/views/comments.py
@@ -86,10 +86,10 @@ def post_comment(request, next=None, using=None):
             # These first two exist for purely historical reasons.
             # Django v1.0 and v1.1 allowed the underscore format for
             # preview templates, so we have to preserve that format.
-            "comments/%s_%s_preview.html" % (model._meta.app_label, model._meta.module_name),
+            "comments/%s_%s_preview.html" % (model._meta.app_label, model._meta.model_name),
             "comments/%s_preview.html" % model._meta.app_label,
             # Now the usual directory based template hierarchy.
-            "comments/%s/%s/preview.html" % (model._meta.app_label, model._meta.module_name),
+            "comments/%s/%s/preview.html" % (model._meta.app_label, model._meta.model_name),
             "comments/%s/preview.html" % model._meta.app_label,
             "comments/preview.html",
         ]
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py
index 6aff07e568..3e132bb3a4 100644
--- a/django/contrib/contenttypes/generic.py
+++ b/django/contrib/contenttypes/generic.py
@@ -8,17 +8,27 @@ from functools import partial
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import connection
-from django.db.models import signals
 from django.db import models, router, DEFAULT_DB_ALIAS
-from django.db.models.fields.related import RelatedField, Field, ManyToManyRel
+from django.db.models import signals
+from django.db.models.fields.related import ForeignObject, ForeignObjectRel
+from django.db.models.related import PathInfo
+from django.db.models.sql.where import Constraint
 from django.forms import ModelForm
 from django.forms.models import BaseModelFormSet, modelformset_factory, save_instance
 from django.contrib.admin.options import InlineModelAdmin, flatten_fieldsets
 from django.contrib.contenttypes.models import ContentType
+from django.utils import six
+from django.utils.deprecation import RenameMethodsBase
 from django.utils.encoding import smart_text
 
 
-class GenericForeignKey(object):
+class RenameGenericForeignKeyMethods(RenameMethodsBase):
+    renamed_methods = (
+        ('get_prefetch_query_set', 'get_prefetch_queryset', PendingDeprecationWarning),
+    )
+
+
+class GenericForeignKey(six.with_metaclass(RenameGenericForeignKeyMethods)):
     """
     Provides a generic relation to any object through content-type/object-id
     fields.
@@ -42,7 +52,7 @@ class GenericForeignKey(object):
 
     def instance_pre_init(self, signal, sender, args, kwargs, **_kwargs):
         """
-        Handles initializing an object with the generic FK instaed of
+        Handles initializing an object with the generic FK instead of
         content-type/object-id fields.
         """
         if self.name in kwargs:
@@ -51,7 +61,7 @@ class GenericForeignKey(object):
             kwargs[self.fk_field] = value._get_pk_val()
 
     def get_content_type(self, obj=None, id=None, using=None):
-        if obj:
+        if obj is not None:
             return ContentType.objects.db_manager(obj._state.db).get_for_model(obj)
         elif id:
             return ContentType.objects.db_manager(using).get_for_id(id)
@@ -59,7 +69,7 @@ class GenericForeignKey(object):
             # This should never happen. I love comments like this, don't you?
             raise Exception("Impossible arguments to GFK.get_content_type!")
 
-    def get_prefetch_query_set(self, instances):
+    def get_prefetch_queryset(self, instances):
         # For efficiency, group the instances by content type and then do one
         # query per model
         fk_dict = defaultdict(set)
@@ -140,17 +150,14 @@ class GenericForeignKey(object):
         setattr(instance, self.fk_field, fk)
         setattr(instance, self.cache_attr, value)
 
-class GenericRelation(RelatedField, Field):
+class GenericRelation(ForeignObject):
     """Provides an accessor to generic related objects (e.g. comments)"""
 
     def __init__(self, to, **kwargs):
         kwargs['verbose_name'] = kwargs.get('verbose_name', None)
-        kwargs['rel'] = GenericRel(to,
-                            related_name=kwargs.pop('related_name', None),
-                            limit_choices_to=kwargs.pop('limit_choices_to', None),
-                            symmetrical=kwargs.pop('symmetrical', True))
-
-
+        kwargs['rel'] = GenericRel(
+            self, to, related_name=kwargs.pop('related_name', None),
+            limit_choices_to=kwargs.pop('limit_choices_to', None),)
         # Override content-type/object-id field names on the related class
         self.object_id_field_name = kwargs.pop("object_id_field", "object_id")
         self.content_type_field_name = kwargs.pop("content_type_field", "content_type")
@@ -158,37 +165,44 @@ class GenericRelation(RelatedField, Field):
         kwargs['blank'] = True
         kwargs['editable'] = False
         kwargs['serialize'] = False
-        Field.__init__(self, **kwargs)
+        # This construct is somewhat of an abuse of ForeignObject. This field
+        # represents a relation from pk to object_id field. But, this relation
+        # isn't direct, the join is generated reverse along foreign key. So,
+        # the from_field is object_id field, to_field is pk because of the
+        # reverse join.
+        super(GenericRelation, self).__init__(
+            to, to_fields=[],
+            from_fields=[self.object_id_field_name], **kwargs)
+
+    def resolve_related_fields(self):
+        self.to_fields = [self.model._meta.pk.name]
+        return [(self.rel.to._meta.get_field_by_name(self.object_id_field_name)[0],
+                 self.model._meta.pk)]
+
+    def get_reverse_path_info(self):
+        opts = self.rel.to._meta
+        target = opts.get_field_by_name(self.object_id_field_name)[0]
+        return [PathInfo(self.model._meta, opts, (target,), self.rel, True, False)]
 
     def get_choices_default(self):
-        return Field.get_choices(self, include_blank=False)
+        return super(GenericRelation, self).get_choices(include_blank=False)
 
     def value_to_string(self, obj):
         qs = getattr(obj, self.name).all()
         return smart_text([instance._get_pk_val() for instance in qs])
 
-    def m2m_db_table(self):
-        return self.rel.to._meta.db_table
-
-    def m2m_column_name(self):
-        return self.object_id_field_name
-
-    def m2m_reverse_name(self):
-        return self.rel.to._meta.pk.column
-
-    def m2m_target_field_name(self):
-        return self.model._meta.pk.name
-
-    def m2m_reverse_target_field_name(self):
-        return self.rel.to._meta.pk.name
+    def get_joining_columns(self, reverse_join=False):
+        if not reverse_join:
+            # This error message is meant for the user, and from user
+            # perspective this is a reverse join along the GenericRelation.
+            raise ValueError('Joining in reverse direction not allowed.')
+        return super(GenericRelation, self).get_joining_columns(reverse_join)
 
     def contribute_to_class(self, cls, name):
-        super(GenericRelation, self).contribute_to_class(cls, name)
-
+        super(GenericRelation, self).contribute_to_class(cls, name, virtual_only=True)
         # Save a reference to which model this class is on for future use
         self.model = cls
-
-        # Add the descriptor for the m2m relation
+        # Add the descriptor for the relation
         setattr(cls, self.name, ReverseGenericRelatedObjectsDescriptor(self))
 
     def contribute_to_related_class(self, cls, related):
@@ -200,21 +214,18 @@ class GenericRelation(RelatedField, Field):
     def get_internal_type(self):
         return "ManyToManyField"
 
-    def db_type(self, connection):
-        # Since we're simulating a ManyToManyField, in effect, best return the
-        # same db_type as well.
-        return None
-
     def get_content_type(self):
         """
         Returns the content type associated with this field's model.
         """
         return ContentType.objects.get_for_model(self.model)
 
-    def get_extra_join_sql(self, connection, qn, lhs_alias, rhs_alias):
-        extra_col = self.rel.to._meta.get_field_by_name(self.content_type_field_name)[0].column
-        contenttype = self.get_content_type().pk
-        return " AND %s.%s = %%s" % (qn(rhs_alias), qn(extra_col)), [contenttype]
+    def get_extra_restriction(self, where_class, alias, remote_alias):
+        field = self.rel.to._meta.get_field_by_name(self.content_type_field_name)[0]
+        contenttype_pk = self.get_content_type().pk
+        cond = where_class()
+        cond.add((Constraint(remote_alias, field.column, field), 'exact', contenttype_pk), 'AND')
+        return cond
 
     def bulk_related_objects(self, objs, using=DEFAULT_DB_ALIAS):
         """
@@ -254,12 +265,12 @@ class ReverseGenericRelatedObjectsDescriptor(object):
         qn = connection.ops.quote_name
         content_type = ContentType.objects.db_manager(instance._state.db).get_for_model(instance)
 
+        join_cols = self.field.get_joining_columns(reverse_join=True)[0]
         manager = RelatedManager(
             model = rel_model,
             instance = instance,
-            symmetrical = (self.field.rel.symmetrical and instance.__class__ == rel_model),
-            source_col_name = qn(self.field.m2m_column_name()),
-            target_col_name = qn(self.field.m2m_reverse_name()),
+            source_col_name = qn(join_cols[0]),
+            target_col_name = qn(join_cols[1]),
             content_type = content_type,
             content_type_field_name = self.field.content_type_field_name,
             object_id_field_name = self.field.object_id_field_name,
@@ -305,21 +316,21 @@ def create_generic_related_manager(superclass):
                 '%s__exact' % object_id_field_name: instance._get_pk_val(),
             }
 
-        def get_query_set(self):
+        def get_queryset(self):
             try:
                 return self.instance._prefetched_objects_cache[self.prefetch_cache_name]
             except (AttributeError, KeyError):
                 db = self._db or router.db_for_read(self.model, instance=self.instance)
-                return super(GenericRelatedObjectManager, self).get_query_set().using(db).filter(**self.core_filters)
+                return super(GenericRelatedObjectManager, self).get_queryset().using(db).filter(**self.core_filters)
 
-        def get_prefetch_query_set(self, instances):
+        def get_prefetch_queryset(self, instances):
             db = self._db or router.db_for_read(self.model, instance=instances[0])
             query = {
                 '%s__pk' % self.content_type_field_name: self.content_type.id,
                 '%s__in' % self.object_id_field_name:
                     set(obj._get_pk_val() for obj in instances)
                 }
-            qs = super(GenericRelatedObjectManager, self).get_query_set().using(db).filter(**query)
+            qs = super(GenericRelatedObjectManager, self).get_queryset().using(db).filter(**query)
             # We (possibly) need to convert object IDs to the type of the
             # instances' PK in order to match up instances:
             object_id_converter = instances[0]._meta.pk.to_python
@@ -359,14 +370,10 @@ def create_generic_related_manager(superclass):
 
     return GenericRelatedObjectManager
 
-class GenericRel(ManyToManyRel):
-    def __init__(self, to, related_name=None, limit_choices_to=None, symmetrical=True):
-        self.to = to
-        self.related_name = related_name
-        self.limit_choices_to = limit_choices_to or {}
-        self.symmetrical = symmetrical
-        self.multiple = True
-        self.through = None
+class GenericRel(ForeignObjectRel):
+
+    def __init__(self, field, to, related_name=None, limit_choices_to=None):
+        super(GenericRel, self).__init__(field, to, related_name, limit_choices_to)
 
 class BaseGenericInlineFormSet(BaseModelFormSet):
     """
@@ -378,7 +385,7 @@ class BaseGenericInlineFormSet(BaseModelFormSet):
         opts = self.model._meta
         self.instance = instance
         self.rel_name = '-'.join((
-            opts.app_label, opts.object_name.lower(),
+            opts.app_label, opts.model_name,
             self.ct_field.name, self.ct_fk_field.name,
         ))
         if self.instance is None or self.instance.pk is None:
@@ -398,7 +405,7 @@ class BaseGenericInlineFormSet(BaseModelFormSet):
     @classmethod
     def get_default_prefix(cls):
         opts = cls.model._meta
-        return '-'.join((opts.app_label, opts.object_name.lower(),
+        return '-'.join((opts.app_label, opts.model_name,
                         cls.ct_field.name, cls.ct_fk_field.name,
         ))
 
@@ -416,9 +423,9 @@ def generic_inlineformset_factory(model, form=ModelForm,
                                   fields=None, exclude=None,
                                   extra=3, can_order=False, can_delete=True,
                                   max_num=None,
-                                  formfield_callback=None):
+                                  formfield_callback=None, validate_max=False):
     """
-    Returns an ``GenericInlineFormSet`` for the given kwargs.
+    Returns a ``GenericInlineFormSet`` for the given kwargs.
 
     You must provide ``ct_field`` and ``object_id`` if they different from the
     defaults ``content_type`` and ``object_id`` respectively.
@@ -438,7 +445,8 @@ def generic_inlineformset_factory(model, form=ModelForm,
                                    formfield_callback=formfield_callback,
                                    formset=formset,
                                    extra=extra, can_delete=can_delete, can_order=can_order,
-                                   fields=fields, exclude=exclude, max_num=max_num)
+                                   fields=fields, exclude=exclude, max_num=max_num,
+                                   validate_max=validate_max)
     FormSet.ct_field = ct_field
     FormSet.ct_fk_field = fk_field
     return FormSet
diff --git a/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo
index c0fc6ba5f8..e68338fef3 100644
Binary files a/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po
index dc12cff247..7082aa5b66 100644
--- a/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "اسم صنف النموذج في python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "نوع البيانات"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "أنواع البيانات"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo
index 93a5f24c15..7cf0fd63c5 100644
Binary files a/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.po
index 53b7211859..09d7be9dd2 100644
--- a/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python modelinin sinif (class) adı"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "məzmun tipi"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "məzmun tipləri"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/be/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..91a9c9e851
Binary files /dev/null and b/django/contrib/contenttypes/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/be/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..4f38a9ac50
--- /dev/null
+++ b/django/contrib/contenttypes/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,45 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-01 10:43+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: models.py:130
+msgid "python model class name"
+msgstr "назва клясы пітонавае мадэлі"
+
+#: models.py:134
+msgid "content type"
+msgstr "від зьмесьціва"
+
+#: models.py:135
+msgid "content types"
+msgstr "віды зьмесьціва"
+
+#: views.py:17
+#, python-format
+msgid "Content type %(ct_id)s object has no associated model"
+msgstr "Аб’ект са зьмесьцівам віду %(ct_id)s не зьвязалі з мадэльлю"
+
+#: views.py:21
+#, python-format
+msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
+msgstr "Аб’ект %(obj_id)s са зьмесьцівам віду %(ct_id)s не існуе"
+
+#: views.py:27
+#, python-format
+msgid "%(ct_name)s objects don't have a get_absolute_url() method"
+msgstr "Аб’екты %(ct_name)s ня маюць спосабу «get_absolute_url()»"
diff --git a/django/contrib/contenttypes/locale/bg/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/bg/LC_MESSAGES/django.mo
index 030bd26871..ba73017632 100644
Binary files a/django/contrib/contenttypes/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/bg/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/bg/LC_MESSAGES/django.po
index 650283dd84..fc2304b088 100644
--- a/django/contrib/contenttypes/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/bg/LC_MESSAGES/django.po
@@ -2,45 +2,46 @@
 #
 # Translators:
 # Boris Chervenkov <office@sentido.bg>, 2012.
+#   <grgkostadinov@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-04-01 19:30+0000\n"
+"Last-Translator: Georgi Kostadinov <grgkostadinov@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "име на класа на модела в Python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "тип на съдържанието"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "типове съдържание"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "Обект с тип на съдържанието %(ct_id)s няма асоцииран модел."
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "Обект %(obj_id)s с тип на съдържанието %(ct_id)s не съществува."
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "%(ct_name)s обекти нямат метода get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/bn/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/bn/LC_MESSAGES/django.mo
index fd0d1feab9..54f5cb8644 100644
Binary files a/django/contrib/contenttypes/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/bn/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/bn/LC_MESSAGES/django.po
index 32e64b2d7c..5ef287f2d0 100644
--- a/django/contrib/contenttypes/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/bn/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "পাইথন মডেল ক্লাসের নাম"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "কনটেন্ট টাইপ"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "কনটেন্ট টাইপ সমূহ"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/localflavor/locale/ne/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/br/LC_MESSAGES/django.mo
similarity index 51%
rename from django/contrib/localflavor/locale/ne/LC_MESSAGES/django.mo
rename to django/contrib/contenttypes/locale/br/LC_MESSAGES/django.mo
index 53e7a85bf9..ea9ae6af95 100644
Binary files a/django/contrib/localflavor/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/br/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..431b65e461
--- /dev/null
+++ b/django/contrib/contenttypes/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,44 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 15:05+0000\n"
+"Last-Translator: Django team\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: models.py:130
+msgid "python model class name"
+msgstr ""
+
+#: models.py:134
+msgid "content type"
+msgstr ""
+
+#: models.py:135
+msgid "content types"
+msgstr ""
+
+#: views.py:17
+#, python-format
+msgid "Content type %(ct_id)s object has no associated model"
+msgstr ""
+
+#: views.py:21
+#, python-format
+msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
+msgstr ""
+
+#: views.py:27
+#, python-format
+msgid "%(ct_name)s objects don't have a get_absolute_url() method"
+msgstr ""
diff --git a/django/contrib/contenttypes/locale/bs/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/bs/LC_MESSAGES/django.mo
index 1a69166f71..d679156831 100644
Binary files a/django/contrib/contenttypes/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/bs/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/bs/LC_MESSAGES/django.po
index fd86314417..c81d2793c0 100644
--- a/django/contrib/contenttypes/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/bs/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "ime python klase modela"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tip sadržaja"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipovi sadržaja"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.mo
index 6e989d74fe..afa63268b8 100644
Binary files a/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.po
index 47c48f5db0..f39f4a7182 100644
--- a/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ca/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nom de la classe del model en python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tipus de contingut"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipus de continguts"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "L'objecte del tipus de contingut %(ct_id)s no té un model associat"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "L'objecte %(obj_id)s del tipus de contingut %(ct_id)s no existeix"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Els objectes %(ct_name)s no tenen un mètode get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/cs/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/cs/LC_MESSAGES/django.mo
index 5126202d86..bbbf8b11ee 100644
Binary files a/django/contrib/contenttypes/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/cs/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/cs/LC_MESSAGES/django.po
index ea37986810..e4d3b7422c 100644
--- a/django/contrib/contenttypes/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/cs/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "název třídy modelu v Pythonu"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "typ obsahu"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "typy obsahu"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Typ obsahu %(ct_id)s nemá přidružený model."
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Objekt %(obj_id)s typu obsahu %(ct_id)s neexistuje."
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Objektům %(ct_name)s chybí metoda get_absolute_url()."
diff --git a/django/contrib/contenttypes/locale/cy/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/cy/LC_MESSAGES/django.mo
index ec642f27d8..9f66a549df 100644
Binary files a/django/contrib/contenttypes/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/cy/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/cy/LC_MESSAGES/django.po
index 3042372203..1378931ad3 100644
--- a/django/contrib/contenttypes/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/cy/LC_MESSAGES/django.po
@@ -6,40 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr ""
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "math cynnwys"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "mathau cynnwys"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/da/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/da/LC_MESSAGES/django.mo
index 3a6f4c5768..6f22f9a3af 100644
Binary files a/django/contrib/contenttypes/locale/da/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/da/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/da/LC_MESSAGES/django.po
index 7d5061353a..859d45d1be 100644
--- a/django/contrib/contenttypes/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/da/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 14:41+0000\n"
 "Last-Translator: Kristian Øllegaard <kristian@oellegaard.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "klassenavn i Python-model"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "indholdstype"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "indholdstyper"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Indholdstypen %(ct_id)s objekt har ingen tilhørende model"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Indholdstypen %(ct_id)s objekt %(obj_id)s findes ikke"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr " %(ct_name)s objekter ikke har en get_absolute_url ()-metode"
diff --git a/django/contrib/contenttypes/locale/de/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/de/LC_MESSAGES/django.mo
index 38f5807350..9937fafef0 100644
Binary files a/django/contrib/contenttypes/locale/de/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/de/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/de/LC_MESSAGES/django.po
index 46e5d65e95..1b4cd0f737 100644
--- a/django/contrib/contenttypes/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/de/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 13:16+0000\n"
 "Last-Translator: André Hagenbruch <ahagenbruch@googlemail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "Python Modell-Klassenname"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "Inhaltstyp"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "Inhaltstypen"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Objekt des Inhaltstyps %(ct_id)s hat kein dazugehöriges Modell"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Objekt %(obj_id)s des Inhaltstyps %(ct_id)s ist nicht vorhanden"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr " %(ct_name)s  Objekte haben keine get_absolute_url ()-Methode"
diff --git a/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.mo
index bd2048fdcc..342dd37409 100644
Binary files a/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.po
index 34be783772..09f7721e5e 100644
--- a/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/el/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "όνομα python model class"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "τύπος περιεχομένου"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "τύποι περιεχομένου"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.mo
index b0f81e1e0d..68b8aa62be 100644
Binary files a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
index c45c2aff9c..03bedfadd8 100644
--- a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
@@ -1,41 +1,44 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-03-08 11:45+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: models.py:130
 msgid "python model class name"
-msgstr ""
+msgstr "python model class name"
 
 #: models.py:134
 msgid "content type"
-msgstr ""
+msgstr "content type"
 
 #: models.py:135
 msgid "content types"
-msgstr ""
+msgstr "content types"
 
 #: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "Content type %(ct_id)s object has no associated model"
 
 #: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 
 #: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "%(ct_name)s objects don't have a get_absolute_url() method"
diff --git a/django/contrib/contenttypes/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/en_GB/LC_MESSAGES/django.mo
index d280362c71..d413f1703e 100644
Binary files a/django/contrib/contenttypes/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/en_GB/LC_MESSAGES/django.po
index 2c06ecb404..488f9789b1 100644
--- a/django/contrib/contenttypes/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/en_GB/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 21:57+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python model class name"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "content type"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "content types"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Content type %(ct_id)s object has no associated model"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s objects don't have a get_absolute_url() method"
diff --git a/django/contrib/contenttypes/locale/eo/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/eo/LC_MESSAGES/django.mo
index 536898f7f7..8cee67abd5 100644
Binary files a/django/contrib/contenttypes/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/eo/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/eo/LC_MESSAGES/django.po
index e897c71c32..169a9fec56 100644
--- a/django/contrib/contenttypes/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/eo/LC_MESSAGES/django.po
@@ -1,45 +1,45 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Baptiste  <bapdarth@yahoo.fr>, 2011.
+# Baptiste  <bapdarth@yahoo.fr>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-09-15 19:58+0000\n"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "klasa nomo de pitona modelo"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "enhava tipo"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "enhavaj tipoj"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "Objekto kun enhava tipo %(ct_id)s ne havas asociitaj modeloj"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "Objekto %(obj_id)s kun enhava tipo %(ct_id)s ne ekzistas"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr " %(ct_name)s objektoj ne havas metodon get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.mo
index 92e2e16ab3..b77d63b45b 100644
Binary files a/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.po
index f47b44a9a9..c5b3086709 100644
--- a/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/es/LC_MESSAGES/django.po
@@ -7,41 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-14 19:04+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nombre de la clase modelo de python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipos de contenido"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 "El objeto de tipo de contenido %(ct_id)s  no tiene ningún modelo asociado."
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "El objeto de tipo de contenido %(ct_id)s objeto %(obj_id)s  no existe"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "El objeto %(ct_name)s no tiene un método get_absolute_url () "
diff --git a/django/contrib/contenttypes/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/es_AR/LC_MESSAGES/django.mo
index 613eecc6d9..7ff8772f6a 100644
Binary files a/django/contrib/contenttypes/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/es_AR/LC_MESSAGES/django.po
index 41ef8aede9..3fb4d62a26 100644
--- a/django/contrib/contenttypes/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/es_AR/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-16 01:41+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nombre de la clase python del modelo"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipos de contenido"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "El objeto Tipo de contenido %(ct_id)s no tiene un modelo asociado"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "El objeto Tipo de contenido %(ct_id)s %(obj_id)s no existe"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Los objetos %(ct_name)s no tienen un método et_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/es_MX/LC_MESSAGES/django.mo
index 9336beed30..1bf5e1e047 100644
Binary files a/django/contrib/contenttypes/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/es_MX/LC_MESSAGES/django.po
index 05dd3ed98d..6f8f79aa7f 100644
--- a/django/contrib/contenttypes/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/es_MX/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nombre de la clase python del modelo"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipos de contenido"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 "Los objetos con el tipo de contenido %(ct_id)s no tienen un modelo asociado"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Los objetos %(obj_id)s con el tipo de contenido %(ct_id)s no existen"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Los %(ct_name)s objetos no tienen el método get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/et/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/et/LC_MESSAGES/django.mo
index b7d2c026ff..5f5042edfb 100644
Binary files a/django/contrib/contenttypes/locale/et/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/et/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/et/LC_MESSAGES/django.po
index 1b5c657425..9c14459ccc 100644
--- a/django/contrib/contenttypes/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/et/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "pythoni mudeli klassinimi"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "sisutüüp"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "sisutüübid"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.mo
index 8f8ec0ee4f..c0584372c7 100644
Binary files a/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.po
index f227c68888..0606cf6910 100644
--- a/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/eu/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 20:45+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python model class izena"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "eduki mota"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "eduki motak"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "%(ct_id)s eduki motak ez dauka lotutako eredurik"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "%(ct_id)s eduki motako %(obj_id)s objekturik ez da existitzen"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s objektuek ez dauketa get_absolute_url() metodorik"
diff --git a/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.mo
index 5bbfc2f680..9f37edd5de 100644
Binary files a/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.po
index fcd0e69410..2244838b1e 100644
--- a/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/fa/LC_MESSAGES/django.po
@@ -1,45 +1,46 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Ali Nikneshan <ali@nikneshan.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-21 08:15+0000\n"
+"Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "نام پایتونی کلاس مدل"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "نوع محتوا"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "نوع‌های محتوا"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "نوع محتوای %(ct_id)s به هیچ مدلی مرتبط نشده است."
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "نوع محتوای  %(ct_id)s شیی  %(obj_id)s وجود ندارد"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "  اشیای %(ct_name)s متد  get_absolute_url() را ندارند."
diff --git a/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.mo
index 360da4e297..1aad6cf966 100644
Binary files a/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.po
index e9ba84e5d5..edf9ad1312 100644
--- a/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/fi/LC_MESSAGES/django.po
@@ -2,44 +2,45 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <klaus.dahlen@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-24 15:23+0000\n"
+"Last-Translator: nanook <klaus.dahlen@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "mallin python-luokan nimi"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "sisältötyyppi"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "sisältötyypit"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "Sisältötyypin %(ct_id)s objektiin ei ole liitetty mallia"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "Sisältötyypin %(ct_id)s objektia %(obj_id)s ei ole olemassa"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "%(ct_name)s-objekteilla ei ole get_absolute_url()-metodia"
diff --git a/django/contrib/contenttypes/locale/fr/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/fr/LC_MESSAGES/django.mo
index 0f3e40bb9d..b0bbf4c9db 100644
Binary files a/django/contrib/contenttypes/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/fr/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/fr/LC_MESSAGES/django.po
index fc041c64b1..a57a906b93 100644
--- a/django/contrib/contenttypes/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/fr/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nom de la classe python du modèle"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "type de contenu"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "types de contenu"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "L'objet type de contenu %(ct_id)s n'a pas de modèle associé"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "L'objet %(obj_id)s du type de contenu %(ct_id)s n'existe pas"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Les objets %(ct_name)s n'ont pas de méthode get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.mo
index 2f8cace10f..66a3a21c43 100644
Binary files a/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.po
index 768d4efe1f..70fe7ad79e 100644
--- a/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.po
@@ -7,41 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-16 13:17+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "píotón samhail aicme ainm"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tíopa inneachar "
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tíopaI inneachair"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Ní bhaineann samhail leis an cineál inneachar %(ct_id)s"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Níl cineál inneachar %(ct_id)s oibiacht %(obj_id)s ann"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Níl modh get_absolute_url() ag %(ct_name)s oibiachtaí"
diff --git a/django/contrib/contenttypes/locale/gl/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/gl/LC_MESSAGES/django.mo
index 730c77d935..dad362ac57 100644
Binary files a/django/contrib/contenttypes/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/gl/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/gl/LC_MESSAGES/django.po
index 3f7b20877f..93b347049a 100644
--- a/django/contrib/contenttypes/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/gl/LC_MESSAGES/django.po
@@ -1,45 +1,46 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <fonzzo@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-01-07 12:00+0000\n"
+"Last-Translator: fonso <fonzzo@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nome do módulo Python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tipo de contido"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipos de contido"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "O obxecto de tipo de contido %(ct_id)s non ten un modelo asociado"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "O obxecto %(obj_id)s con tipo de contido %(ct_id)s non existe"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "Os obxectos %(ct_name)s non teñen un método get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.mo
index 46526135ca..38d96970e2 100644
Binary files a/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.po
index f33be7597f..62dffbc141 100644
--- a/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/he/LC_MESSAGES/django.po
@@ -2,44 +2,45 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-21 10:49+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "שם ה־class של מודל פייתון"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "סוג תוכן"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "סוגי תוכן"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "לא משוייך מודל לאובייקט מסוג התוכן  %(ct_id)s"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "אובייקט %(obj_id)s מסוג תוכן %(ct_id)s אינו קיים"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "אובייקטי %(ct_name)s אינם כוללים מתודת get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/hi/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/hi/LC_MESSAGES/django.mo
index 3df5d6c7aa..55552662c1 100644
Binary files a/django/contrib/contenttypes/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/hi/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/hi/LC_MESSAGES/django.po
index 3ef257707c..e92a358d61 100644
--- a/django/contrib/contenttypes/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/hi/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-15 13:09+0000\n"
 "Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "पैथॉन मॉडल क्लास नाम"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "विषय-सूची प्रकार"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "विषय-सूचियाँ प्रकार"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "सामग्री प्रकार के  %(ct_id)s ऑब्जेक्ट कोई संबद्ध मॉडल नहीं है।"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "सामग्री प्रकार %(ct_id)s वस्तु %(obj_id)s मौजूद नहीं है."
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s वस्तुओं की get_absolute_url() विधि नहीं है."
diff --git a/django/contrib/contenttypes/locale/hr/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/hr/LC_MESSAGES/django.mo
index 3eedefd748..292c132a8d 100644
Binary files a/django/contrib/contenttypes/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/hr/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/hr/LC_MESSAGES/django.po
index 1abda4662d..5cbc2ecc5f 100644
--- a/django/contrib/contenttypes/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/hr/LC_MESSAGES/django.po
@@ -7,41 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-22 11:06+0000\n"
 "Last-Translator: Bojan Mihelač <bmihelac@mihelac.org>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "ime klase (class) python modela"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tip sadržaja"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipovi sadržaja"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Tip sadržaja %(ct_id)s objekt nema pridruženi model"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Tip sadržaja %(ct_id)s objekt  %(obj_id)s ne postoji"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s objekti nemaju get_absolute_url() metodu"
diff --git a/django/contrib/contenttypes/locale/hu/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/hu/LC_MESSAGES/django.mo
index 82ebf04201..511a02340c 100644
Binary files a/django/contrib/contenttypes/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/hu/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/hu/LC_MESSAGES/django.po
index 47053bd565..0e4f8b5db6 100644
--- a/django/contrib/contenttypes/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/hu/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 19:42+0000\n"
 "Last-Translator: Attila Nagy <>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python modell osztály neve"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tartalom típusa"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tartalom típusok"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "A %(ct_id)s tartalomtípus-objektumhoz nincsenek modellek hozzárendelve"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "%(ct_id)s tartalomtípus-objektum %(obj_id)s nem található"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s objektumoknak nincs get_absolute_url() metódusuk"
diff --git a/django/contrib/contenttypes/locale/ia/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..3827fccc5a
Binary files /dev/null and b/django/contrib/contenttypes/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ia/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..fb5657a8a8
--- /dev/null
+++ b/django/contrib/contenttypes/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,45 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-20 19:32+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: models.py:130
+msgid "python model class name"
+msgstr "nomine del classe del modello Python"
+
+#: models.py:134
+msgid "content type"
+msgstr "typo de contento"
+
+#: models.py:135
+msgid "content types"
+msgstr "typos de contento"
+
+#: views.py:17
+#, python-format
+msgid "Content type %(ct_id)s object has no associated model"
+msgstr "Le objecto del typo de contento %(ct_id)s non ha un modello associate"
+
+#: views.py:21
+#, python-format
+msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
+msgstr "Le objecto %(obj_id)s del typo de contento %(ct_id)s non existe"
+
+#: views.py:27
+#, python-format
+msgid "%(ct_name)s objects don't have a get_absolute_url() method"
+msgstr "Objectos %(ct_name)s non ha un methodo get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo
index aad3b4f7da..6d43fb4272 100644
Binary files a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po
index 7968d831b9..7218e071e8 100644
--- a/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/id/LC_MESSAGES/django.po
@@ -8,40 +8,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nama kelas model python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tipe konten"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipe konten"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Tipe konten objek %(ct_id)s tidak memiliki model yang terkait"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Tipe konten %(ct_id)s objek %(obj_id)s tidak ada"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Objek %(ct_name)s tidak memiliki metode get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo
index 332fc80a3e..a018e95221 100644
Binary files a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po
index 259767e295..e5704ed73c 100644
--- a/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/is/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 14:48+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python eininga klasa nafn"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "efnistag"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "efnistög"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Gerð innihalds %(ct_id)s hefur ekkert tengt módel"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Gerð innihalds %(ct_id)s hlutar %(obj_id)s er ekki til"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s hlutir hafa ekki get_absolute_url () aðferð"
diff --git a/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.mo
index 82b4e81c36..7149d78af0 100644
Binary files a/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.po
index 066b510a8b..de2441b15a 100644
--- a/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/it/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nome della classe del modello Python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "content type"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "content type"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "L'oggetto con content type %(ct_id)s non ha alcun modello associato"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "L'oggetto %(obj_id)s con content type %(ct_id)s non esiste"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Gli oggetti %(ct_name)s non hanno un metodo get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.mo
index 0b81d552d7..78049d8720 100644
Binary files a/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.po
index e798268f1f..b75066399d 100644
--- a/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ja/LC_MESSAGES/django.po
@@ -2,44 +2,48 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Shinya Okano <tokibito@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-04-06 09:53+0000\n"
+"Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "Python モデルクラス名"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "コンテンツタイプ"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "コンテンツタイプ"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
+"コンテンツタイプ %(ct_id)s のオブジェクトは、関連付けられたモデルを持っていま"
+"せん"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "コンテンツタイプ %(ct_id)s のオブジェクト %(obj_id)s は存在しません"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
+"%(ct_name)s のオブジェクトは get_absolute_url() メソッドを持っていません"
diff --git a/django/contrib/contenttypes/locale/ka/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ka/LC_MESSAGES/django.mo
index 9aac5f5ef1..d58581ba5a 100644
Binary files a/django/contrib/contenttypes/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ka/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ka/LC_MESSAGES/django.po
index 5d2213ed83..5f9a3196cc 100644
--- a/django/contrib/contenttypes/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ka/LC_MESSAGES/django.po
@@ -1,45 +1,47 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-03-01 08:10+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python-ის მოდელის კლასის სახელი"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "კონტენტის ტიპი"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "კონტენტის ტიპები"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "კონტენტის ტიპის %(ct_id)s ობიექტს არ გააჩნია ასოცირებული მოდელი"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "კონტენტის ტიპის %(ct_id)s ობიექტი %(obj_id)s არ არსებობს"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "%(ct_name)s ობიექტებს არ გააჩნიათ მეთოდი get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/kk/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/kk/LC_MESSAGES/django.mo
index 5e81bebccc..94bb8e9e73 100644
Binary files a/django/contrib/contenttypes/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/kk/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/kk/LC_MESSAGES/django.po
index 33373c9526..da6503f1a5 100644
--- a/django/contrib/contenttypes/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/kk/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Nurlan Rakhimzhanov <nurlan.rakhimzhanov@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "питонның үлгі классның аты"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "мазмұн түрі"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "мазмұн түрлері"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/km/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/km/LC_MESSAGES/django.mo
index 2ef606e288..3db01f742c 100644
Binary files a/django/contrib/contenttypes/locale/km/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/km/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/km/LC_MESSAGES/django.po
index 2ef508e501..d6b9c74362 100644
--- a/django/contrib/contenttypes/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/km/LC_MESSAGES/django.po
@@ -6,39 +6,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "ឈ្មោះ python model class"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "ប្រភេទអត្ថន័យ"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "ប្រភេទអត្ថន័យ"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.mo
index 22bfc3005e..8b8e1a5329 100644
Binary files a/django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.po
index 3e912e3b81..4617829900 100644
--- a/django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "ಪೈಥಾನ್ ಮಾಡೆಲ್  ಕ್ಲಾಸಿನ ಹೆಸರು"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "ಒಳವಿಷಯದ ಬಗೆ"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "ಒಳವಿಷಯದ ಬಗೆಗಳು"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.mo
index 5de203f089..ccc1db3888 100644
Binary files a/django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.po
index c0f3d86ee1..3f9e998420 100644
--- a/django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python 모델 클래스 명"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "콘텐츠 타입"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "콘텐츠 타입(들)"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.mo
index d9b801fb1e..ff93db2c33 100644
Binary files a/django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.po
index 2b26fb30be..608f99adb0 100644
--- a/django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.po
@@ -7,41 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-09 16:53+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Simonas Kazlauskas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python modelio klasės vardas"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "turinio tipas"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "turinio tipai"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Tūrinio tipo %(ct_id)s objektas neturi priskirto modelio"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Tūrinio tipo %(ct_id)s objektas %(obj_id)s neegzistuoja"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s objektai neturi get_absolute_url() metodo"
diff --git a/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.mo
index f65d45f8a1..de4420f94c 100644
Binary files a/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.po
index 46b3b49a5c..c7697831c1 100644
--- a/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/lv/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python modeļa klases nosaukums"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "satura tips"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "satura tipi"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/mk/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/mk/LC_MESSAGES/django.mo
index a40c74a091..21c8789d77 100644
Binary files a/django/contrib/contenttypes/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/mk/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/mk/LC_MESSAGES/django.po
index 77fa3d842f..4f145b54ee 100644
--- a/django/contrib/contenttypes/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/mk/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 11:11+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "име на класата за python моделoт"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "тип на содржина"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "типови содржини"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Типот на содржина %(ct_id)s објект нема асоциран модел"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Типот на содржина %(ct_id)s објект %(obj_id)s не постои"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s објекти немаат get_absolute_url() метод"
diff --git a/django/contrib/contenttypes/locale/ml/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ml/LC_MESSAGES/django.mo
index a6b42871d1..89e574cd92 100644
Binary files a/django/contrib/contenttypes/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ml/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ml/LC_MESSAGES/django.po
index 338ce881e4..0ecc2a3459 100644
--- a/django/contrib/contenttypes/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ml/LC_MESSAGES/django.po
@@ -2,45 +2,45 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Rajeesh Nair <rajeeshrnair@gmail.com>, 2011.
+# Rajeesh Nair <rajeeshrnair@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-04-17 18:21+0000\n"
 "Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "പൈത്തണ്‍ മോഡല്‍  ക്ളാസ്സിന്റെ പേര്"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "ഏതു തരം ഉള്ളടക്കം"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "ഏതൊക്കെ തരം ഉള്ളടക്കം"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "കണ്ടന്റ് ടൈപ്പ് %(ct_id)s വസ്തുവിന് അനുബന്ധമായ മോഡല്‍ ഇല്ല."
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "കണ്ടന്റ് ടൈപ്പ് %(ct_id)s വസ്തു %(obj_id)s നിലവിലില്ല"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "%(ct_name)s വസ്തുക്കള്‍ക്ക് get_absolute_url() രീതി ഇല്ല."
diff --git a/django/contrib/contenttypes/locale/mn/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/mn/LC_MESSAGES/django.mo
index 5c89707801..82ce61317f 100644
Binary files a/django/contrib/contenttypes/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/mn/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/mn/LC_MESSAGES/django.po
index ca725e79cd..ce86d3d07e 100644
--- a/django/contrib/contenttypes/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/mn/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "пайтоны модел класын нэр"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "агуулгын төрөл"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "агуулгын төрлүүд"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "%(ct_id)s төрлийн холбоотой модель олдсонгүй"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "%(ct_id)s төрлийн %(obj_id)s id тай обект олдсонгүй"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/my/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..9f2a7d708c
Binary files /dev/null and b/django/contrib/contenttypes/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/my/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..f6562b2700
--- /dev/null
+++ b/django/contrib/contenttypes/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,46 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-03-17 06:50+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: models.py:130
+msgid "python model class name"
+msgstr "စပါးကြီးမော်ဒယ်အမျိုးအစားနာမည်"
+
+#: models.py:134
+msgid "content type"
+msgstr "အကြောင်းအရာအမျိုးအစား"
+
+#: models.py:135
+msgid "content types"
+msgstr "အကြောင်းအရာအမျိုးအစားများ"
+
+#: views.py:17
+#, python-format
+msgid "Content type %(ct_id)s object has no associated model"
+msgstr "အကြောင်းအရာအမျိုးအစား %(ct_id)s အရာဝတ္ထုမှာဆက်နွယ်သောမော်ဒယ်မရှိ"
+
+#: views.py:21
+#, python-format
+msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
+msgstr "အကြောင်းအရာအမျိုးအစား %(ct_id)s အရာဝတ္ထု %(obj_id)s မတည်ရှိနေ"
+
+#: views.py:27
+#, python-format
+msgid "%(ct_name)s objects don't have a get_absolute_url() method"
+msgstr "%(ct_name)s အရာဝတ္ထုများ get_absolute_url() နည်းလမ်းမရှိ"
diff --git a/django/contrib/contenttypes/locale/nb/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/nb/LC_MESSAGES/django.mo
index 9ec91af9d4..819b19fd38 100644
Binary files a/django/contrib/contenttypes/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/nb/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/nb/LC_MESSAGES/django.po
index c8cd2e4dfd..111370bdfd 100644
--- a/django/contrib/contenttypes/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/nb/LC_MESSAGES/django.po
@@ -8,40 +8,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 14:51+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Sigurd Gartmann <sigurdga-transifex@sigurdga.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python-modellklassenavn"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "innholdstype"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "innholdstyper"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Innholdstype %(ct_id)s objekt har ingen assosiert model"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Innholdstype %(ct_id)s objekt %(obj_id)s finnes ikke"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s-objekter har ikke get_absolute_url()-metode"
diff --git a/django/contrib/contenttypes/locale/ne/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ne/LC_MESSAGES/django.mo
index bae30d1773..a7745a0ec9 100644
Binary files a/django/contrib/contenttypes/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ne/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ne/LC_MESSAGES/django.po
index aa657d2604..44afe13294 100644
--- a/django/contrib/contenttypes/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ne/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Sagar Chalise <chalisesagar@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "पाइथन मोडेल क्लासको नाम"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "विषयको ढाँचा"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "विषयको ढाँचाहरु"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/nl/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/nl/LC_MESSAGES/django.mo
index 3400192462..2adf301986 100644
Binary files a/django/contrib/contenttypes/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/nl/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/nl/LC_MESSAGES/django.po
index 863e67ccd6..491b119cca 100644
--- a/django/contrib/contenttypes/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/nl/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "klassenaam van pythonmodel"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "inhoudstype"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "inhoudstypen"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Content type %(ct_id)s object heeft geen bijbehorende model"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Content type %(ct_id)s object %(obj_id)s bestaat niet"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s objecten niet over een get_absolute_url() methode"
diff --git a/django/contrib/contenttypes/locale/nn/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/nn/LC_MESSAGES/django.mo
index 1c93704962..1ecc1795c9 100644
Binary files a/django/contrib/contenttypes/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/nn/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/nn/LC_MESSAGES/django.po
index 82e712d8b0..35a54563af 100644
--- a/django/contrib/contenttypes/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/nn/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python-modell klassenamn"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "innhaldstype"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "innhaldstypar"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/pa/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/pa/LC_MESSAGES/django.mo
index 77160565fd..1a52f2ff8f 100644
Binary files a/django/contrib/contenttypes/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/pa/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/pa/LC_MESSAGES/django.po
index d34c709b36..2fcbca16f0 100644
--- a/django/contrib/contenttypes/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/pa/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "ਪਾਈਥਨ ਮਾਡਲ ਕਲਾਸ ਨਾਂ"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "ਸਮੱਗਰੀ ਕਿਸਮ"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "ਸਮੱਗਰੀ ਕਿਸਮ"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.mo
index a01aef4e92..1369af3233 100644
Binary files a/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.po
index 358b6cf8d8..e12574658f 100644
--- a/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/pl/LC_MESSAGES/django.po
@@ -7,41 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 00:32+0000\n"
 "Last-Translator: angularcircle <angular.circle@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nazwa pythonowa modelu klasy"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "typ zawartości"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "typy zawartości"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Obiekt typu zawartości %(ct_id)s nie posiada przypisanego modelu"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Obiekt %(obj_id)s typu zawartości %(ct_id)s nie istnieje"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Obiekty %(ct_name)s nie posiadają metody o nazwie get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.mo
index b235b401d0..39882e1a09 100644
Binary files a/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.po
index 2fc04416f0..8559634b5e 100644
--- a/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.po
@@ -2,45 +2,45 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nuno Mariz <nmariz@gmail.com>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-04-02 14:45+0000\n"
 "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
-msgstr "nome da classe do modelo em python"
+msgstr "nome da classe do model em python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tipo de conteúdo"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipos de conteúdos"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "Objeto do tipo de conteúdo %(ct_id)s não tem nenhum model associado"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "Objeto %(obj_id)s do tipo de conteúdo %(ct_id)s não existe"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "Objetos %(ct_name)s não tem um método get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.mo
index d8f81cdc6c..5886b23a3e 100644
Binary files a/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.po
index d51bf86cc6..da2a8205b7 100644
--- a/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 18:27+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nome da classe model em python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tipo de conteúdo"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipos de conteúdo"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Objeto do tipo de conteúdo %(ct_id)s não tem nenhum model associado"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Objeto %(obj_id)s do tipo de conteúdo %(ct_id)s não existe"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Objetos %(ct_name)s não tem um método get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/ro/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ro/LC_MESSAGES/django.mo
index 4345554b23..eb4ab56c94 100644
Binary files a/django/contrib/contenttypes/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ro/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ro/LC_MESSAGES/django.po
index d7b96cbd99..ae2df068a1 100644
--- a/django/contrib/contenttypes/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ro/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "nume clasă model Python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tip conținut"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipuri conținut"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.mo
index ea19e9af86..6e1acc694d 100644
Binary files a/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.po
index 64084705a9..81c58ce07a 100644
--- a/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ru/LC_MESSAGES/django.po
@@ -8,43 +8,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "имя класса модели"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "тип содержимого"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "типы содержимого"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Тип содержимого %(ct_id)s не имеет связанной модели"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 "Объект с идентификатором %(obj_id)s, имеющий тип содержимого %(ct_id)s, не "
 "существует"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Объекты типа \"%(ct_name)s\" не имеют метода get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/sk/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/sk/LC_MESSAGES/django.mo
index a3a14912d9..1fc2947c85 100644
Binary files a/django/contrib/contenttypes/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/sk/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/sk/LC_MESSAGES/django.po
index a5ba9e49ea..5ec0fef82f 100644
--- a/django/contrib/contenttypes/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/sk/LC_MESSAGES/django.po
@@ -2,44 +2,45 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Marian Andre <marian@andre.sk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-07-15 12:13+0000\n"
+"Last-Translator: Marian Andre <marian@andre.sk>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "pythonovské meno triedy modelu"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "typ obsahu"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "typy obsahu"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "Objekt typu obsahu %(ct_id)s  nemá pridružený model"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "Objekt %(obj_id)s typu obsahu %(ct_id)s neexistuje"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr " Objekty %(ct_name)s neobsahujú metódu get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/sl/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/sl/LC_MESSAGES/django.mo
index 6212c11d87..a2d23d0e45 100644
Binary files a/django/contrib/contenttypes/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/sl/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/sl/LC_MESSAGES/django.po
index be0260ea13..09b5afdf56 100644
--- a/django/contrib/contenttypes/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/sl/LC_MESSAGES/django.po
@@ -1,47 +1,48 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Gašper Žejn <zejn@kiberpipa.org>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 #   <zejn@kiberpipa.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-31 19:42+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
-msgstr "python ime razreda modela"
+msgstr "ime razreda modela python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
-msgstr "tip vsebine"
+msgstr "vrsta vsebine"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
-msgstr "tipi vsebine"
+msgstr "vrste vsebine"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr "Objekt vrste %(ct_id)s nima povezanega modela"
+msgstr "Predmet vrste vsebine %(ct_id)s nima določenega povezanega modela"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr "Objekt %(obj_id)s vrste %(ct_id)s ne obstaja"
+msgstr "Predmet %(obj_id)s vrste %(ct_id)s ne obstaja"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr "Objekti vrste %(ct_name)s nimajo metode get_absolute_url()"
+msgstr "Predmeti vrste %(ct_name)s nimajo določila get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/sq/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/sq/LC_MESSAGES/django.mo
index 57a93c87ed..7358d3f724 100644
Binary files a/django/contrib/contenttypes/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/sq/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/sq/LC_MESSAGES/django.po
index b3542c041f..ed3829a0bd 100644
--- a/django/contrib/contenttypes/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/sq/LC_MESSAGES/django.po
@@ -6,40 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-11-25 19:25+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "emër klase modeli python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "lloj lënde"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "lloje lënde"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "Objekti %(ct_id)s për lloj lënde nuk ka model të përshoqëruar"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
+"Objekti %(obj_id)s për lloj lënde %(ct_id)s nuk ka model të përshoqëruar"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "Objektet %(ct_name)s nuk përmbajnë ndonjë metodë get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/sr/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/sr/LC_MESSAGES/django.mo
index 434cf7daa7..0574be8e82 100644
Binary files a/django/contrib/contenttypes/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/sr/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/sr/LC_MESSAGES/django.po
index 267630c5a8..ff0bfd8932 100644
--- a/django/contrib/contenttypes/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/sr/LC_MESSAGES/django.po
@@ -7,41 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "име python класе модела"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "тип садржаја"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "типови садржаја"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Тип садржаја %(ct_id)s нема асоцирани модел"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Тип садржаја %(ct_id)s објекта %(obj_id)s не постоји"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Објекти %(ct_name)s немају метод get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/sr_Latn/LC_MESSAGES/django.mo
index e2e8f746b6..ef56641641 100644
Binary files a/django/contrib/contenttypes/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/sr_Latn/LC_MESSAGES/django.po
index 88b1b594e2..6ecac16c77 100644
--- a/django/contrib/contenttypes/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,41 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "ime python klase modela"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "tip sadržaja"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "tipovi sadržaja"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Tip sadržaja %(ct_id)s nema asocirani model"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Tip sadržaja %(ct_id)s objekta %(obj_id)s ne postoji"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Objekti %(ct_name)s nemaju metod get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/sv/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/sv/LC_MESSAGES/django.mo
index 26f3756ba7..e8d13dc4dc 100644
Binary files a/django/contrib/contenttypes/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/sv/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/sv/LC_MESSAGES/django.po
index 60aa4a41d6..9c6059d27b 100644
--- a/django/contrib/contenttypes/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/sv/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "klassnamn för Python-modell"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "innehålls typ"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "innehållstyper"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Innehållstypens %(ct_id)s har ingen associerad modell."
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "Innehållstypens %(ct_id)s objekt %(obj_id)s finns inte"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s objekt har inte en get_absolute_url()-metod"
diff --git a/django/contrib/contenttypes/locale/sw/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/sw/LC_MESSAGES/django.mo
index ced836a77f..311d1bd0ce 100644
Binary files a/django/contrib/contenttypes/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/sw/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/sw/LC_MESSAGES/django.po
index eb7991c45a..3db8a415b6 100644
--- a/django/contrib/contenttypes/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/sw/LC_MESSAGES/django.po
@@ -5,40 +5,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-09 16:10+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr ""
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "aina ya maudhui"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "aina ya maudhui"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.mo
index 6484bf1cd6..16bb781c48 100644
Binary files a/django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.po
index 203c21e200..0bb71a64ad 100644
--- a/django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python model class name"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "பொருளடக்க வகை"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "பொருளடக்க வகைகள்"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/te/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/te/LC_MESSAGES/django.mo
index 195cebae15..cf22cfb0c2 100644
Binary files a/django/contrib/contenttypes/locale/te/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/te/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/te/LC_MESSAGES/django.po
index d7173a6482..73882917da 100644
--- a/django/contrib/contenttypes/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/te/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "పైతాన్ మొడల్ క్లాస్  పేరు"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "సూచన రకం"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "సూచన రకాలు"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/th/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/th/LC_MESSAGES/django.mo
index aea63e38aa..81ce0ce6f2 100644
Binary files a/django/contrib/contenttypes/locale/th/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/th/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/th/LC_MESSAGES/django.po
index e96cb648bb..017624767f 100644
--- a/django/contrib/contenttypes/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/th/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-09 03:09+0000\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Kowit Charoenratchatabhan <kowit.s.c@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python model class name"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "content type"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "content types"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "ประเภทของเนื้อหา %(ct_id)s ไม่มีอ็อบเจ็กที่มีรูปแบบที่เกี่ยวข้อง"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "ไม่มีประเภทของเนื้อหา %(ct_id)s วัตถุ %(obj_id)s"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s ไม่มีเมธอด get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.mo
index 35638da51f..2b6b13e352 100644
Binary files a/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po
index 2e49bc8711..e2203576cb 100644
--- a/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 20:31+0000\n"
 "Last-Translator: Murat Çorlu <muratcorlu@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python model sınıf adı"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "içerik türü"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "içerik türleri"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "%(ct_id)s içerik türü hiç bir model ile ilişkilendirilmemiş"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr "%(ct_id)s nolu içerik türünün %(obj_id)s nolu objesi yok"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "%(ct_name)s objeleri bir get_absolute_url() metoduna sahip değiller"
diff --git a/django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.mo
index 519d7f0a82..2adebcb079 100644
Binary files a/django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.po
index b7591bbe11..c06ec89583 100644
--- a/django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "модель классының исеме"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "эчтәлек тибы"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "эчтәлек тиблары"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.mo
index 5a1b63252a..c5118182f7 100644
Binary files a/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.po
index c48aacc0e6..0a1e968ef0 100644
--- a/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/uk/LC_MESSAGES/django.po
@@ -7,42 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-11 17:02+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "ім'я класу моделі"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "тип вмісту"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "типи вмісту"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr "Тип вмісту %(ct_id)s не має пов'язанної моделі"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 "Об'єкт з ідентифікатором %(ct_id)s, що має тип вмісту %(obj_id)s не існує"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr "Об'єкт типу %(ct_name)s не має методу get_absolute_url()"
diff --git a/django/contrib/contenttypes/locale/ur/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ur/LC_MESSAGES/django.mo
index 9ad1443035..c2d8439d72 100644
Binary files a/django/contrib/contenttypes/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/ur/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ur/LC_MESSAGES/django.po
index a03eea2c8f..4d0698cab0 100644
--- a/django/contrib/contenttypes/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/ur/LC_MESSAGES/django.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "پائثان کے ماڈل کی کلاس کا نام"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "مضمون کی قسم"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "مضمون کی اقسام"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/vi/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/vi/LC_MESSAGES/django.mo
index 3e9aec30a2..9956119b9c 100644
Binary files a/django/contrib/contenttypes/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/vi/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/vi/LC_MESSAGES/django.po
index 286aafc129..4f82f5efb7 100644
--- a/django/contrib/contenttypes/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/vi/LC_MESSAGES/django.po
@@ -7,40 +7,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 11:45+0000\n"
 "Last-Translator: Tran <hongdiepkien@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "tên lớp mô hình python"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "kiểu nội dung"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "kiểu nội dung"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
 msgstr ""
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
 msgstr ""
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/zh_CN/LC_MESSAGES/django.mo
index 71e86fd3d7..602cc89a3d 100644
Binary files a/django/contrib/contenttypes/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/zh_CN/LC_MESSAGES/django.po
index b2691d4c32..c7c0faf1ba 100644
--- a/django/contrib/contenttypes/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/zh_CN/LC_MESSAGES/django.po
@@ -2,45 +2,46 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Kevin Shi <leiarix@gmail.com>, 2012.
 # slene <vslene@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: slene <vslene@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-26 01:37+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python 模型类名"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "内容类型"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "内容类型"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "内容类型 %(ct_id)s 对象没有关联的模型"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "内容类型 %(ct_id)s 对象 %(obj_id)s 不存在"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "%(ct_name)s 对象没有 a get_absolute_url() 方法"
diff --git a/django/contrib/contenttypes/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/zh_TW/LC_MESSAGES/django.mo
index 27f6bfdece..629291e6e2 100644
Binary files a/django/contrib/contenttypes/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/contenttypes/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/zh_TW/LC_MESSAGES/django.po
index 9015ce83d6..dc7f4ffa7c 100644
--- a/django/contrib/contenttypes/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,45 +1,46 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <ilay@ilay.tw>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 11:45+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-06 02:26+0000\n"
+"Last-Translator: ilay <ilay@ilay.tw>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:123
+#: models.py:130
 msgid "python model class name"
 msgstr "python 模組名稱"
 
-#: models.py:127
+#: models.py:134
 msgid "content type"
 msgstr "內容類型"
 
-#: models.py:128
+#: models.py:135
 msgid "content types"
 msgstr "內容類型"
 
-#: views.py:15
+#: views.py:17
 #, python-format
 msgid "Content type %(ct_id)s object has no associated model"
-msgstr ""
+msgstr "內容類型 %(ct_id)s 的物件沒有關聯的資料模型"
 
-#: views.py:19
+#: views.py:21
 #, python-format
 msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist"
-msgstr ""
+msgstr "內容類型 %(ct_id)s 的物件 %(obj_id)s 不存在"
 
-#: views.py:25
+#: views.py:27
 #, python-format
 msgid "%(ct_name)s objects don't have a get_absolute_url() method"
-msgstr ""
+msgstr "%(ct_name)s 的物件沒有 get_absolute_url() 方法"
diff --git a/django/contrib/contenttypes/management.py b/django/contrib/contenttypes/management.py
index 8329ab65d9..ddd7654ed7 100644
--- a/django/contrib/contenttypes/management.py
+++ b/django/contrib/contenttypes/management.py
@@ -21,7 +21,7 @@ def update_contenttypes(app, created_models, verbosity=2, db=DEFAULT_DB_ALIAS, *
     # They all have the same app_label, get the first one.
     app_label = app_models[0]._meta.app_label
     app_models = dict(
-        (model._meta.object_name.lower(), model)
+        (model._meta.model_name, model)
         for model in app_models
     )
 
diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
index b658655bbb..f0bd109b00 100644
--- a/django/contrib/contenttypes/models.py
+++ b/django/contrib/contenttypes/models.py
@@ -25,7 +25,7 @@ class ContentTypeManager(models.Manager):
         return model._meta
 
     def _get_from_cache(self, opts):
-        key = (opts.app_label, opts.object_name.lower())
+        key = (opts.app_label, opts.model_name)
         return self.__class__._cache[self.db][key]
 
     def get_for_model(self, model, for_concrete_model=True):
@@ -43,7 +43,7 @@ class ContentTypeManager(models.Manager):
             # django.utils.functional.__proxy__ object.
             ct, created = self.get_or_create(
                 app_label = opts.app_label,
-                model = opts.object_name.lower(),
+                model = opts.model_name,
                 defaults = {'name': smart_text(opts.verbose_name_raw)},
             )
             self._add_to_cache(self.db, ct)
@@ -67,7 +67,7 @@ class ContentTypeManager(models.Manager):
                 ct = self._get_from_cache(opts)
             except KeyError:
                 needed_app_labels.add(opts.app_label)
-                needed_models.add(opts.object_name.lower())
+                needed_models.add(opts.model_name)
                 needed_opts.add(opts)
             else:
                 results[model] = ct
@@ -86,7 +86,7 @@ class ContentTypeManager(models.Manager):
             # These weren't in the cache, or the DB, create them.
             ct = self.create(
                 app_label=opts.app_label,
-                model=opts.object_name.lower(),
+                model=opts.model_name,
                 name=smart_text(opts.verbose_name_raw),
             )
             self._add_to_cache(self.db, ct)
@@ -119,7 +119,7 @@ class ContentTypeManager(models.Manager):
     def _add_to_cache(self, using, ct):
         """Insert a ContentType into the cache."""
         model = ct.model_class()
-        key = (model._meta.app_label, model._meta.object_name.lower())
+        key = (model._meta.app_label, model._meta.model_name)
         self.__class__._cache.setdefault(using, {})[key] = ct
         self.__class__._cache.setdefault(using, {})[ct.id] = ct
 
diff --git a/django/contrib/contenttypes/tests.py b/django/contrib/contenttypes/tests.py
index 10311fae92..7937873a00 100644
--- a/django/contrib/contenttypes/tests.py
+++ b/django/contrib/contenttypes/tests.py
@@ -6,6 +6,7 @@ from django.contrib.contenttypes.views import shortcut
 from django.contrib.sites.models import Site, get_current_site
 from django.http import HttpRequest, Http404
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.utils.http import urlquote
 from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
@@ -203,6 +204,7 @@ class ContentTypesTests(TestCase):
         })
 
 
+    @override_settings(ALLOWED_HOSTS=['example.com'])
     def test_shortcut_view(self):
         """
         Check that the shortcut view (used for the admin "view on site"
diff --git a/django/contrib/databrowse/__init__.py b/django/contrib/databrowse/__init__.py
deleted file mode 100644
index acb7626c8d..0000000000
--- a/django/contrib/databrowse/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-from django.contrib.databrowse.sites import DatabrowsePlugin, ModelDatabrowse, DatabrowseSite, site
-
-
-warnings.warn("The Databrowse contrib app is deprecated", DeprecationWarning)
diff --git a/django/contrib/databrowse/datastructures.py b/django/contrib/databrowse/datastructures.py
deleted file mode 100644
index 5f5f46f0d1..0000000000
--- a/django/contrib/databrowse/datastructures.py
+++ /dev/null
@@ -1,214 +0,0 @@
-"""
-These classes are light wrappers around Django's database API that provide
-convenience functionality and permalink functions for the databrowse app.
-"""
-from __future__ import unicode_literals
-
-from django.db import models
-from django.utils import formats
-from django.utils.text import capfirst
-from django.utils.encoding import smart_text, force_str, iri_to_uri
-from django.db.models.query import QuerySet
-from django.utils.encoding import python_2_unicode_compatible
-
-EMPTY_VALUE = '(None)'
-DISPLAY_SIZE = 100
-
-class EasyModel(object):
-    def __init__(self, site, model):
-        self.site = site
-        self.model = model
-        self.model_list = list(site.registry.keys())
-        self.verbose_name = model._meta.verbose_name
-        self.verbose_name_plural = model._meta.verbose_name_plural
-
-    def __repr__(self):
-        return force_str('<EasyModel for %s>' % self.model._meta.object_name)
-
-    def model_databrowse(self):
-        "Returns the ModelDatabrowse class for this model."
-        return self.site.registry[self.model]
-
-    def url(self):
-        return '%s%s/%s/' % (self.site.root_url, self.model._meta.app_label, self.model._meta.module_name)
-
-    def objects(self, **kwargs):
-        return self.get_query_set().filter(**kwargs)
-
-    def get_query_set(self):
-        easy_qs = self.model._default_manager.get_query_set()._clone(klass=EasyQuerySet)
-        easy_qs._easymodel = self
-        return easy_qs
-
-    def object_by_pk(self, pk):
-        return EasyInstance(self, self.model._default_manager.get(pk=pk))
-
-    def sample_objects(self):
-        for obj in self.model._default_manager.all()[:3]:
-            yield EasyInstance(self, obj)
-
-    def field(self, name):
-        try:
-            f = self.model._meta.get_field(name)
-        except models.FieldDoesNotExist:
-            return None
-        return EasyField(self, f)
-
-    def fields(self):
-        return [EasyField(self, f) for f in (self.model._meta.fields + self.model._meta.many_to_many)]
-
-class EasyField(object):
-    def __init__(self, easy_model, field):
-        self.model, self.field = easy_model, field
-
-    def __repr__(self):
-        return force_str('<EasyField for %s.%s>' % (self.model.model._meta.object_name, self.field.name))
-
-    def choices(self):
-        for value, label in self.field.choices:
-            yield EasyChoice(self.model, self, value, label)
-
-    def url(self):
-        if self.field.choices:
-            return '%s%s/%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, self.field.name)
-        elif self.field.rel:
-            return '%s%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name)
-
-class EasyChoice(object):
-    def __init__(self, easy_model, field, value, label):
-        self.model, self.field = easy_model, field
-        self.value, self.label = value, label
-
-    def __repr__(self):
-        return force_str('<EasyChoice for %s.%s>' % (self.model.model._meta.object_name, self.field.name))
-
-    def url(self):
-        return '%s%s/%s/%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, self.field.field.name, iri_to_uri(self.value))
-
-@python_2_unicode_compatible
-class EasyInstance(object):
-    def __init__(self, easy_model, instance):
-        self.model, self.instance = easy_model, instance
-
-    def __repr__(self):
-        return force_str('<EasyInstance for %s (%s)>' % (self.model.model._meta.object_name, self.instance._get_pk_val()))
-
-    def __str__(self):
-        val = smart_text(self.instance)
-        if len(val) > DISPLAY_SIZE:
-            return val[:DISPLAY_SIZE] + '...'
-        return val
-
-    def pk(self):
-        return self.instance._get_pk_val()
-
-    def url(self):
-        return '%s%s/%s/objects/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, iri_to_uri(self.pk()))
-
-    def fields(self):
-        """
-        Generator that yields EasyInstanceFields for each field in this
-        EasyInstance's model.
-        """
-        for f in self.model.model._meta.fields + self.model.model._meta.many_to_many:
-            yield EasyInstanceField(self.model, self, f)
-
-    def related_objects(self):
-        """
-        Generator that yields dictionaries of all models that have this
-        EasyInstance's model as a ForeignKey or ManyToManyField, along with
-        lists of related objects.
-        """
-        for rel_object in self.model.model._meta.get_all_related_objects() + self.model.model._meta.get_all_related_many_to_many_objects():
-            if rel_object.model not in self.model.model_list:
-                continue # Skip models that aren't in the model_list
-            em = EasyModel(self.model.site, rel_object.model)
-            yield {
-                'model': em,
-                'related_field': rel_object.field.verbose_name,
-                'object_list': [EasyInstance(em, i) for i in getattr(self.instance, rel_object.get_accessor_name()).all()],
-            }
-
-class EasyInstanceField(object):
-    def __init__(self, easy_model, instance, field):
-        self.model, self.field, self.instance = easy_model, field, instance
-        self.raw_value = getattr(instance.instance, field.name)
-
-    def __repr__(self):
-        return force_str('<EasyInstanceField for %s.%s>' % (self.model.model._meta.object_name, self.field.name))
-
-    def values(self):
-        """
-        Returns a list of values for this field for this instance. It's a list
-        so we can accomodate many-to-many fields.
-        """
-        # This import is deliberately inside the function because it causes
-        # some settings to be imported, and we don't want to do that at the
-        # module level.
-        if self.field.rel:
-            if isinstance(self.field.rel, models.ManyToOneRel):
-                objs = getattr(self.instance.instance, self.field.name)
-            elif isinstance(self.field.rel, models.ManyToManyRel): # ManyToManyRel
-                return list(getattr(self.instance.instance, self.field.name).all())
-        elif self.field.choices:
-            objs = dict(self.field.choices).get(self.raw_value, EMPTY_VALUE)
-        elif isinstance(self.field, models.DateField) or isinstance(self.field, models.TimeField):
-            if self.raw_value:
-                if isinstance(self.field, models.DateTimeField):
-                    objs = capfirst(formats.date_format(self.raw_value, 'DATETIME_FORMAT'))
-                elif isinstance(self.field, models.TimeField):
-                    objs = capfirst(formats.time_format(self.raw_value, 'TIME_FORMAT'))
-                else:
-                    objs = capfirst(formats.date_format(self.raw_value, 'DATE_FORMAT'))
-            else:
-                objs = EMPTY_VALUE
-        elif isinstance(self.field, models.BooleanField) or isinstance(self.field, models.NullBooleanField):
-            objs = {True: 'Yes', False: 'No', None: 'Unknown'}[self.raw_value]
-        else:
-            objs = self.raw_value
-        return [objs]
-
-    def urls(self):
-        "Returns a list of (value, URL) tuples."
-        # First, check the urls() method for each plugin.
-        plugin_urls = []
-        for plugin_name, plugin in self.model.model_databrowse().plugins.items():
-            urls = plugin.urls(plugin_name, self)
-            if urls is not None:
-                return zip(self.values(), urls)
-        if self.field.rel:
-            m = EasyModel(self.model.site, self.field.rel.to)
-            if self.field.rel.to in self.model.model_list:
-                lst = []
-                for value in self.values():
-                    if value is None:
-                        continue
-                    url = '%s%s/%s/objects/%s/' % (self.model.site.root_url, m.model._meta.app_label, m.model._meta.module_name, iri_to_uri(value._get_pk_val()))
-                    lst.append((smart_text(value), url))
-            else:
-                lst = [(value, None) for value in self.values()]
-        elif self.field.choices:
-            lst = []
-            for value in self.values():
-                url = '%s%s/%s/fields/%s/%s/' % (self.model.site.root_url, self.model.model._meta.app_label, self.model.model._meta.module_name, self.field.name, iri_to_uri(self.raw_value))
-                lst.append((value, url))
-        elif isinstance(self.field, models.URLField):
-            val = list(self.values())[0]
-            lst = [(val, iri_to_uri(val))]
-        else:
-            lst = [(list(self.values())[0], None)]
-        return lst
-
-class EasyQuerySet(QuerySet):
-    """
-    When creating (or cloning to) an `EasyQuerySet`, make sure to set the
-    `_easymodel` variable to the related `EasyModel`.
-    """
-    def iterator(self, *args, **kwargs):
-        for obj in super(EasyQuerySet, self).iterator(*args, **kwargs):
-            yield EasyInstance(self._easymodel, obj)
-
-    def _clone(self, *args, **kwargs):
-        c = super(EasyQuerySet, self)._clone(*args, **kwargs)
-        c._easymodel = self._easymodel
-        return c
diff --git a/django/contrib/databrowse/models.py b/django/contrib/databrowse/models.py
deleted file mode 100644
index 2e283e0995..0000000000
--- a/django/contrib/databrowse/models.py
+++ /dev/null
@@ -1 +0,0 @@
-# Empty models.py to allow for specifying databrowse as a test label.
diff --git a/django/contrib/databrowse/plugins/calendars.py b/django/contrib/databrowse/plugins/calendars.py
deleted file mode 100644
index a548c33c8f..0000000000
--- a/django/contrib/databrowse/plugins/calendars.py
+++ /dev/null
@@ -1,147 +0,0 @@
-from __future__ import unicode_literals
-
-from django import http
-from django.db import models
-from django.contrib.databrowse.datastructures import EasyModel
-from django.contrib.databrowse.sites import DatabrowsePlugin
-from django.shortcuts import render_to_response
-from django.utils.html import format_html, format_html_join
-from django.utils.text import capfirst
-from django.utils.encoding import force_text
-from django.views.generic import dates
-from django.utils import datetime_safe
-
-
-class DateViewMixin(object):
-    allow_empty = False
-    allow_future = True
-    root_url = None
-    model = None
-    field = None
-
-    def get_context_data(self, **kwargs):
-        context = super(DateViewMixin, self).get_context_data(**kwargs)
-        context.update({
-            'root_url': self.root_url,
-            'model': self.model,
-            'field': self.field
-        })
-        return context
-
-
-class DayView(DateViewMixin, dates.DayArchiveView):
-    template_name = 'databrowse/calendar_day.html'
-
-
-class MonthView(DateViewMixin, dates.MonthArchiveView):
-    template_name = 'databrowse/calendar_month.html'
-
-
-class YearView(DateViewMixin, dates.YearArchiveView):
-    template_name = 'databrowse/calendar_year.html'
-
-
-class IndexView(DateViewMixin, dates.ArchiveIndexView):
-    template_name = 'databrowse/calendar_main.html'
-
-
-class CalendarPlugin(DatabrowsePlugin):
-    def __init__(self, field_names=None):
-        self.field_names = field_names
-
-    def field_dict(self, model):
-        """
-        Helper function that returns a dictionary of all DateFields or
-        DateTimeFields in the given model. If self.field_names is set, it takes
-        take that into account when building the dictionary.
-        """
-        if self.field_names is None:
-            return dict([(f.name, f) for f in model._meta.fields if isinstance(f, models.DateField)])
-        else:
-            return dict([(f.name, f) for f in model._meta.fields if isinstance(f, models.DateField) and f.name in self.field_names])
-
-    def model_index_html(self, request, model, site):
-        fields = self.field_dict(model)
-        if not fields:
-            return ''
-        return format_html('<p class="filter"><strong>View calendar by:</strong> {0}</p>',
-                           format_html_join(', ', '<a href="calendars/{0}/">{1}</a>',
-                                            ((f.name, force_text(capfirst(f.verbose_name))) for f in fields.values())))
-
-    def urls(self, plugin_name, easy_instance_field):
-        if isinstance(easy_instance_field.field, models.DateField):
-            d = easy_instance_field.raw_value
-            return ['%s%s/%s/%s/%s/%s/' % (
-                easy_instance_field.model.url(),
-                plugin_name, easy_instance_field.field.name,
-                str(d.year),
-                datetime_safe.new_date(d).strftime('%b').lower(),
-                d.day)]
-
-    def model_view(self, request, model_databrowse, url):
-        self.model, self.site = model_databrowse.model, model_databrowse.site
-        self.fields = self.field_dict(self.model)
-
-        # If the model has no DateFields, there's no point in going further.
-        if not self.fields:
-            raise http.Http404('The requested model has no calendars.')
-
-        if url is None:
-            return self.homepage_view(request)
-        url_bits = url.split('/')
-        if url_bits[0] in self.fields:
-            return self.calendar_view(request, self.fields[url_bits[0]], *url_bits[1:])
-
-        raise http.Http404('The requested page does not exist.')
-
-    def homepage_view(self, request):
-        easy_model = EasyModel(self.site, self.model)
-        field_list = list(self.fields.values())
-        field_list.sort(key=lambda k:k.verbose_name)
-        return render_to_response('databrowse/calendar_homepage.html', {
-                'root_url': self.site.root_url,
-                'model': easy_model,
-                'field_list': field_list
-            })
-
-    def calendar_view(self, request, field, year=None, month=None, day=None):
-        easy_model = EasyModel(self.site, self.model)
-        root_url = self.site.root_url
-
-        if day is not None:
-            return DayView.as_view(
-                                year=year, month=month, day=day,
-                                date_field=field.name,
-                                queryset=easy_model.get_query_set(),
-                                root_url=root_url,
-                                model=easy_model,
-                                field=field
-                            )(request)
-        elif month is not None:
-            return MonthView.as_view(
-                                year=year, month=month,
-                                date_field=field.name,
-                                queryset=easy_model.get_query_set(),
-                                root_url=root_url,
-                                model=easy_model,
-                                field=field
-                            )(request)
-        elif year is not None:
-            return YearView.as_view(
-                                year=year,
-                                date_field=field.name,
-                                queryset=easy_model.get_query_set(),
-                                root_url=root_url,
-                                model=easy_model,
-                                field=field
-                            )(request)
-        else:
-            return IndexView.as_view(
-                                date_field=field.name,
-                                queryset=easy_model.get_query_set(),
-                                root_url=root_url,
-                                model=easy_model,
-                                field=field
-                            )(request)
-
-        assert False, ('%s, %s, %s, %s' % (field, year, month, day))
diff --git a/django/contrib/databrowse/plugins/fieldchoices.py b/django/contrib/databrowse/plugins/fieldchoices.py
deleted file mode 100644
index dc5e9aef14..0000000000
--- a/django/contrib/databrowse/plugins/fieldchoices.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from __future__ import unicode_literals
-
-from django import http
-from django.db import models
-from django.contrib.databrowse.datastructures import EasyModel
-from django.contrib.databrowse.sites import DatabrowsePlugin
-from django.shortcuts import render_to_response
-from django.utils.html import format_html, format_html_join
-from django.utils.http import urlquote
-from django.utils.text import capfirst
-from django.utils.encoding import force_text
-
-
-class FieldChoicePlugin(DatabrowsePlugin):
-    def __init__(self, field_filter=None):
-        # If field_filter is given, it should be a callable that takes a
-        # Django database Field instance and returns True if that field should
-        # be included. If field_filter is None, that all fields will be used.
-        self.field_filter = field_filter
-
-    def field_dict(self, model):
-        """
-        Helper function that returns a dictionary of all fields in the given
-        model. If self.field_filter is set, it only includes the fields that
-        match the filter.
-        """
-        if self.field_filter:
-            return dict([(f.name, f) for f in model._meta.fields if self.field_filter(f)])
-        else:
-            return dict([(f.name, f) for f in model._meta.fields if not f.rel and not f.primary_key and not f.unique and not isinstance(f, (models.AutoField, models.TextField))])
-
-    def model_index_html(self, request, model, site):
-        fields = self.field_dict(model)
-        if not fields:
-            return ''
-        return format_html('<p class="filter"><strong>View by:</strong> {0}</p>',
-                           format_html_join(', ', '<a href="fields/{0}/">{1}</a>',
-                                            ((f.name, force_text(capfirst(f.verbose_name))) for f in fields.values())))
-
-    def urls(self, plugin_name, easy_instance_field):
-        if easy_instance_field.field in self.field_dict(easy_instance_field.model.model).values():
-            return ['%s%s/%s/%s/' % (
-                easy_instance_field.model.url(),
-                plugin_name, easy_instance_field.field.name,
-                urlquote(easy_instance_field.raw_value, safe=''))]
-
-    def model_view(self, request, model_databrowse, url):
-        self.model, self.site = model_databrowse.model, model_databrowse.site
-        self.fields = self.field_dict(self.model)
-
-        # If the model has no fields with choices, there's no point in going
-        # further.
-        if not self.fields:
-            raise http.Http404('The requested model has no fields.')
-
-        if url is None:
-            return self.homepage_view(request)
-        url_bits = url.split('/', 1)
-        if url_bits[0] in self.fields:
-            return self.field_view(request, self.fields[url_bits[0]], *url_bits[1:])
-
-        raise http.Http404('The requested page does not exist.')
-
-    def homepage_view(self, request):
-        easy_model = EasyModel(self.site, self.model)
-        field_list = list(self.fields.values())
-        field_list.sort(key=lambda k: k.verbose_name)
-        return render_to_response('databrowse/fieldchoice_homepage.html', {'root_url': self.site.root_url, 'model': easy_model, 'field_list': field_list})
-
-    def field_view(self, request, field, value=None):
-        easy_model = EasyModel(self.site, self.model)
-        easy_field = easy_model.field(field.name)
-        if value is not None:
-            obj_list = easy_model.objects(**{field.name: value})
-            return render_to_response('databrowse/fieldchoice_detail.html', {'root_url': self.site.root_url, 'model': easy_model, 'field': easy_field, 'value': value, 'object_list': obj_list})
-        obj_list = [v[field.name] for v in self.model._default_manager.distinct().order_by(field.name).values(field.name)]
-        return render_to_response('databrowse/fieldchoice_list.html', {'root_url': self.site.root_url, 'model': easy_model, 'field': easy_field, 'object_list': obj_list})
diff --git a/django/contrib/databrowse/plugins/objects.py b/django/contrib/databrowse/plugins/objects.py
deleted file mode 100644
index e956f4ea67..0000000000
--- a/django/contrib/databrowse/plugins/objects.py
+++ /dev/null
@@ -1,18 +0,0 @@
-try:
-    from urllib.parse import urljoin
-except ImportError:     # Python 2
-    from urlparse import urljoin
-
-from django import http
-from django.contrib.databrowse.datastructures import EasyModel
-from django.contrib.databrowse.sites import DatabrowsePlugin
-from django.shortcuts import render_to_response
-
-class ObjectDetailPlugin(DatabrowsePlugin):
-    def model_view(self, request, model_databrowse, url):
-        # If the object ID wasn't provided, redirect to the model page, which is one level up.
-        if url is None:
-            return http.HttpResponseRedirect(urljoin(request.path, '../'))
-        easy_model = EasyModel(model_databrowse.site, model_databrowse.model)
-        obj = easy_model.object_by_pk(url)
-        return render_to_response('databrowse/object_detail.html', {'object': obj, 'root_url': model_databrowse.site.root_url})
diff --git a/django/contrib/databrowse/sites.py b/django/contrib/databrowse/sites.py
deleted file mode 100644
index b5cb2639d6..0000000000
--- a/django/contrib/databrowse/sites.py
+++ /dev/null
@@ -1,147 +0,0 @@
-from __future__ import unicode_literals
-
-from django import http
-from django.db import models
-from django.contrib.databrowse.datastructures import EasyModel
-from django.shortcuts import render_to_response
-from django.utils.safestring import mark_safe
-
-class AlreadyRegistered(Exception):
-    pass
-
-class NotRegistered(Exception):
-    pass
-
-class DatabrowsePlugin(object):
-    def urls(self, plugin_name, easy_instance_field):
-        """
-        Given an EasyInstanceField object, returns a list of URLs for this
-        plugin's views of this object. These URLs should be absolute.
-
-        Returns None if the EasyInstanceField object doesn't get a
-        list of plugin-specific URLs.
-        """
-        return None
-
-    def model_index_html(self, request, model, site):
-        """
-        Returns a snippet of HTML to include on the model index page.
-        """
-        return ''
-
-    def model_view(self, request, model_databrowse, url):
-        """
-        Handles main URL routing for a plugin's model-specific pages.
-        """
-        raise NotImplementedError
-
-class ModelDatabrowse(object):
-    plugins = {}
-
-    def __init__(self, model, site):
-        self.model = model
-        self.site = site
-
-    def root(self, request, url):
-        """
-        Handles main URL routing for the databrowse app.
-
-        `url` is the remainder of the URL -- e.g. 'objects/3'.
-        """
-        # Delegate to the appropriate method, based on the URL.
-        if url is None:
-            return self.main_view(request)
-        try:
-            plugin_name, rest_of_url = url.split('/', 1)
-        except ValueError: # need more than 1 value to unpack
-            plugin_name, rest_of_url = url, None
-        try:
-            plugin = self.plugins[plugin_name]
-        except KeyError:
-            raise http.Http404('A plugin with the requested name does not exist.')
-        return plugin.model_view(request, self, rest_of_url)
-
-    def main_view(self, request):
-        easy_model = EasyModel(self.site, self.model)
-        html_snippets = mark_safe('\n'.join([p.model_index_html(request, self.model, self.site) for p in self.plugins.values()]))
-        return render_to_response('databrowse/model_detail.html', {
-            'model': easy_model,
-            'root_url': self.site.root_url,
-            'plugin_html': html_snippets,
-        })
-
-class DatabrowseSite(object):
-    def __init__(self):
-        self.registry = {} # model_class -> databrowse_class
-        self.root_url = None
-
-    def register(self, *model_list, **options):
-        """
-        Registers the given model(s) with the given databrowse site.
-
-        The model(s) should be Model classes, not instances.
-
-        If a databrowse class isn't given, it will use DefaultModelDatabrowse
-        (the default databrowse options).
-
-        If a model is already registered, this will raise AlreadyRegistered.
-        """
-        databrowse_class = options.pop('databrowse_class', DefaultModelDatabrowse)
-        for model in model_list:
-            if model in self.registry:
-                raise AlreadyRegistered('The model %s is already registered' % model.__name__)
-            self.registry[model] = databrowse_class
-
-    def unregister(self, *model_list):
-        """
-        Unregisters the given model(s).
-
-        If a model isn't already registered, this will raise NotRegistered.
-        """
-        for model in model_list:
-            if model not in self.registry:
-                raise NotRegistered('The model %s is not registered' % model.__name__)
-            del self.registry[model]
-
-    def root(self, request, url):
-        """
-        Handles main URL routing for the databrowse app.
-
-        `url` is the remainder of the URL -- e.g. 'comments/comment/'.
-        """
-        self.root_url = request.path[:len(request.path) - len(url)]
-        url = url.rstrip('/') # Trim trailing slash, if it exists.
-
-        if url == '':
-            return self.index(request)
-        elif '/' in url:
-            return self.model_page(request, *url.split('/', 2))
-
-        raise http.Http404('The requested databrowse page does not exist.')
-
-    def index(self, request):
-        m_list = [EasyModel(self, m) for m in self.registry.keys()]
-        return render_to_response('databrowse/homepage.html', {'model_list': m_list, 'root_url': self.root_url})
-
-    def model_page(self, request, app_label, model_name, rest_of_url=None):
-        """
-        Handles the model-specific functionality of the databrowse site, delegating
-        to the appropriate ModelDatabrowse class.
-        """
-        model = models.get_model(app_label, model_name)
-        if model is None:
-            raise http.Http404("App %r, model %r, not found." % (app_label, model_name))
-        try:
-            databrowse_class = self.registry[model]
-        except KeyError:
-            raise http.Http404("This model exists but has not been registered with databrowse.")
-        return databrowse_class(model, self).root(request, rest_of_url)
-
-site = DatabrowseSite()
-
-from django.contrib.databrowse.plugins.calendars import CalendarPlugin
-from django.contrib.databrowse.plugins.objects import ObjectDetailPlugin
-from django.contrib.databrowse.plugins.fieldchoices import FieldChoicePlugin
-
-class DefaultModelDatabrowse(ModelDatabrowse):
-    plugins = {'objects': ObjectDetailPlugin(), 'calendars': CalendarPlugin(), 'fields': FieldChoicePlugin()}
diff --git a/django/contrib/databrowse/templates/databrowse/base.html b/django/contrib/databrowse/templates/databrowse/base.html
deleted file mode 100644
index 56464e0614..0000000000
--- a/django/contrib/databrowse/templates/databrowse/base.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
-<head>
-<title>{% block title %}{% endblock %}</title>
-{% block style %}
-<style type="text/css">
-* { margin:0; padding:0; }
-body { background:#eee; color:#333; font:76%/1.6 "Lucida Grande","Bitstream Vera Sans",Verdana,sans-serif; }
-a { color: #5b80b2; text-decoration:none; }
-a:hover { text-decoration:underline; }
-a img { border:none; }
-h1 { font-size:1.8em; color:#666; margin:0.4em 0 0.2em 0; }
-h2 { font-size:1.5em; color:#666; margin:1em 0 0.2em 0; }
-p { margin:0.5em 0 1em 0; }
-.odd { background-color:#EDF3FE; }
-.quiet { color:#666; }
-/* FILTERS */
-.filter { color:#999; font-size:0.9em; float:left; margin-bottom:10px; margin-right:20px; }
-.filter strong { color:#666; }
-/* OBJECT LISTS */
-.objectlist { clear:both; margin:0 -20px; color:#666; }
-.objectlist li a { display:block; padding:1em 20px; }
-.objectlist li a:hover { background:#5b80b2; color:#3B5572; color:#fff; text-decoration:none; }
-.related h2 { font-size: 1em; margin-bottom: 0.6em; }
-.related .objectlist li a { padding: 0.6em 20px; }
-.related .objectlist li.odd { background:#eee; }
-/* OBJECT DETAIL */
-.objectinfo { border-collapse:collapse; color:#666; margin:0 -20px; }
-.objectinfo td, .objectinfo th { padding:1em 20px; vertical-align:top; }
-.objectinfo td { width:100%; }
-.objectinfo th { text-align:left; white-space:nowrap; }
-/* MODEL GROUPS */
-.modelgroup { color:#999; font-size:0.9em; margin:0 -20px; }
-.modelgroup h2 { font-size:1.2em; margin:0; }
-.modelgroup h2 a { display: block; padding: 0.83em 20px; }
-.modelgroup h2 a:hover { text-decoration: none; color: #fff; }
-.modelgroup p { float:left; margin:-2.65em 0 0 14em; position:relative; }
-.modelgroup p a { white-space:nowrap; }
-.modelgroup a.more { color:#999; }
-.modelgroup:hover { background:#5b80b2; color:#becfe5; }
-.modelgroup:hover p a { color:#becfe5; }
-.modelgroup:hover a { color:#fff; }
-.modelgroup:hover a.more { color:#fff; }
-/* BREADCRUMBS */
-#breadcrumbs { padding:10px 0; color:#999; font-size:0.9em; }
-/* HEADER */
-#header a { display:block; background:#eee; color:#676868; padding:10px 20px; font-weight:bold; font-size:1em; text-decoration:none; border-bottom:1px solid #ddd; }
-#header a:hover { text-decoration:underline; }
-/* CONTENT */
-#content { background:#fff; border-bottom:1px solid #ddd; padding:0 20px; }
-</style>
-{% endblock %}
-{% block extrahead %}{% endblock %}
-</head>
-<body id="{% block bodyid %}page{% endblock %}">
-<div id="header"><a href="{{ root_url }}">{% block databrowse_title %}Databrowse{% endblock %}</a></div>
-<div id="content">
-{% block content %}{% endblock %}
-</div>
-</body>
-</html>
diff --git a/django/contrib/databrowse/templates/databrowse/base_site.html b/django/contrib/databrowse/templates/databrowse/base_site.html
deleted file mode 100644
index b577ab8427..0000000000
--- a/django/contrib/databrowse/templates/databrowse/base_site.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "databrowse/base.html" %}
diff --git a/django/contrib/databrowse/templates/databrowse/calendar_day.html b/django/contrib/databrowse/templates/databrowse/calendar_day.html
deleted file mode 100644
index c009a94c66..0000000000
--- a/django/contrib/databrowse/templates/databrowse/calendar_day.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ model.verbose_name_plural|capfirst }} with {{ field.verbose_name }} {{ day|date:"F j, Y" }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / <a href="../../../../">Calendars</a> / <a href="../../../">By {{ field.verbose_name }}</a> / <a href="../../">{{ day|date:"Y" }}</a> / <a href="../">{{ day|date:"F" }}</a> / {{ day|date:"d" }}</div>
-
-<h1>{{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %} with {{ field.verbose_name }} on {{ day|date:"F j, Y" }}</h1>
-
-<ul class="objectlist">
-{% for object in object_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ object.url }}">{{ object }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/calendar_homepage.html b/django/contrib/databrowse/templates/databrowse/calendar_homepage.html
deleted file mode 100644
index 85eb8af9eb..0000000000
--- a/django/contrib/databrowse/templates/databrowse/calendar_homepage.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}Calendars{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / Calendars</div>
-
-<h1>Calendars</h1>
-
-<ul class="objectlist">
-{% for field in field_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ field.name }}/">{{ model.verbose_name_plural|capfirst }} by {{ field.verbose_name }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/calendar_main.html b/django/contrib/databrowse/templates/databrowse/calendar_main.html
deleted file mode 100644
index 7cb59042df..0000000000
--- a/django/contrib/databrowse/templates/databrowse/calendar_main.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ field.verbose_name|capfirst }} calendar{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / <a href="../">Calendars</a> / By {{ field.verbose_name }}</div>
-
-<h1>{{ model.verbose_name_plural|capfirst }} by {{ field.verbose_name }}</h1>
-
-<ul class="objectlist">
-{% for year in date_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/calendar_month.html b/django/contrib/databrowse/templates/databrowse/calendar_month.html
deleted file mode 100644
index ad189f441c..0000000000
--- a/django/contrib/databrowse/templates/databrowse/calendar_month.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ model.verbose_name_plural|capfirst }} with {{ field.verbose_name }} in {{ month|date:"F Y" }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / <a href="../../../">Calendars</a> / <a href="../../">By {{ field.verbose_name }}</a> / <a href="../">{{ month|date:"Y" }}</a> / {{ month|date:"F" }}</div>
-
-<h1>{{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %} with {{ field.verbose_name }} on {{ month|date:"F Y" }}</h1>
-
-<ul class="objectlist">
-{% for object in object_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ object.url }}">{{ object }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/calendar_year.html b/django/contrib/databrowse/templates/databrowse/calendar_year.html
deleted file mode 100644
index a6e6f53ba3..0000000000
--- a/django/contrib/databrowse/templates/databrowse/calendar_year.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ model.verbose_name_plural|capfirst }} with {{ field.verbose_name }} in {{ year }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / <a href="../../">Calendars</a> / <a href="../">By {{ field.verbose_name }}</a> / {{ year }}</div>
-
-<h1>{{ model.verbose_name_plural|capfirst }} with {{ field.verbose_name }} in {{ year }}</h1>
-
-<ul class="objectlist">
-{% for month in date_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ month|date:"M"|lower }}/">{{ month|date:"F" }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/choice_detail.html b/django/contrib/databrowse/templates/databrowse/choice_detail.html
deleted file mode 100644
index 0abc536515..0000000000
--- a/django/contrib/databrowse/templates/databrowse/choice_detail.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}: {{ value }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / <a href="{{ field.url }}">By {{ field.field.verbose_name }}</a> / {{ value }}</div>
-
-<h1>{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}: {{ value }}</h1>
-
-<ul class="objectlist">
-{% for object in object_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ object.url }}">{{ object }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/choice_list.html b/django/contrib/databrowse/templates/databrowse/choice_list.html
deleted file mode 100644
index 58675e82bf..0000000000
--- a/django/contrib/databrowse/templates/databrowse/choice_list.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / By {{ field.field.verbose_name }}</div>
-
-<h1>{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}</h1>
-
-<ul class="objectlist">
-{% for choice in field.choices %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ choice.url }}">{{ choice.label }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/fieldchoice_detail.html b/django/contrib/databrowse/templates/databrowse/fieldchoice_detail.html
deleted file mode 100644
index 2dd55d48ac..0000000000
--- a/django/contrib/databrowse/templates/databrowse/fieldchoice_detail.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ model.verbose_name_plural|capfirst }} with {{ field.field.verbose_name }} {{ value }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / <a href="../../">Fields</a> / <a href="../">By {{ field.field.verbose_name }}</a> / {{ value }}</div>
-
-<h1>{{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %} with {{ field.field.verbose_name }} {{ value }}</h1>
-
-<ul class="objectlist">
-{% for object in object_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ object.url }}">{{ object }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/fieldchoice_homepage.html b/django/contrib/databrowse/templates/databrowse/fieldchoice_homepage.html
deleted file mode 100644
index b82c22d5b4..0000000000
--- a/django/contrib/databrowse/templates/databrowse/fieldchoice_homepage.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}Browsable fields in {{ model.verbose_name_plural }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / Fields</div>
-
-<h1>Browsable fields in {{ model.verbose_name_plural }}</h1>
-
-<ul class="objectlist">
-{% for field in field_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ field.name }}/">{{ model.verbose_name_plural|capfirst }} by {{ field.verbose_name }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/fieldchoice_list.html b/django/contrib/databrowse/templates/databrowse/fieldchoice_list.html
deleted file mode 100644
index bb60a0e871..0000000000
--- a/django/contrib/databrowse/templates/databrowse/fieldchoice_list.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / <a href="../">Fields</a> / By {{ field.field.verbose_name }}</div>
-
-<h1>{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}</h1>
-
-<ul class="objectlist">
-{% for object in object_list %}
-<li class="{% cycle 'odd' 'even' %}"><a href="{{ object|iriencode }}/">{{ object }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/homepage.html b/django/contrib/databrowse/templates/databrowse/homepage.html
deleted file mode 100644
index 0f6708f5fd..0000000000
--- a/django/contrib/databrowse/templates/databrowse/homepage.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}Databrowse{% endblock %}
-
-{% block bodyid %}homepage{% endblock %}
-
-{% block content %}
-
-{% for model in model_list %}
-  <div class="modelgroup {% cycle 'even' 'odd' %}">
-	  <h2><a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a></h2>
-		<p>
-		{% for object in model.sample_objects %}
-			<a href="{{ object.url }}">{{ object }}</a>, 
-		{% endfor %}
-			<a class="more" href="{{ model.url }}">More &rarr;</a>
-		</p>
-  </div>
-{% endfor %}
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/model_detail.html b/django/contrib/databrowse/templates/databrowse/model_detail.html
deleted file mode 100644
index 11c6808f14..0000000000
--- a/django/contrib/databrowse/templates/databrowse/model_detail.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ model.verbose_name_plural|capfirst }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / {{ model.verbose_name_plural|capfirst }}</div>
-
-<h1>{{ model.objects.count }} {% if model.objects.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %}</h1>
-
-{{ plugin_html }}
-
-<ul class="objectlist">
-{% for object in model.objects %}
-    <li class="{% cycle 'odd' 'even' %}"><a href="{{ object.url }}">{{ object }}</a></li>
-{% endfor %}
-</ul>
-
-{% endblock %}
diff --git a/django/contrib/databrowse/templates/databrowse/object_detail.html b/django/contrib/databrowse/templates/databrowse/object_detail.html
deleted file mode 100644
index 81c37f7736..0000000000
--- a/django/contrib/databrowse/templates/databrowse/object_detail.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends "databrowse/base_site.html" %}
-
-{% block title %}{{ object.model.verbose_name|capfirst }}: {{ object }}{% endblock %}
-
-{% block content %}
-
-<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ object.model.url }}">{{ object.model.verbose_name_plural|capfirst }}</a> / {{ object }}</div>
-
-<h1>{{ object.model.verbose_name|capfirst }}: {{ object }}</h1>
-
-<table class="objectinfo">
-{% for field in object.fields %}
-<tr class="{% cycle 'odd' 'even' %}">
-<th>{{ field.field.verbose_name|capfirst }}</th>
-<td>
-{% if field.urls %}
-{% for value, url in field.urls %}
-{% if url %}<a href="{{ url }}">{% endif %}{{ value }}{% if url %}</a>{% endif %}{% if not forloop.last %}, {% endif %}
-{% endfor %}
-{% else %}None{% endif %}
-</td>
-</tr>
-{% endfor %}
-</table>
-
-{% for related_object in object.related_objects %}
-  <div class="related">
-  <h2>Appears in "{{ related_object.related_field }}" in the following {{ related_object.model.verbose_name_plural }}:</h2>
-  {% if related_object.object_list %}
-  <ul class="objectlist">
-    {% for object in related_object.object_list %}
-    <li class="{% cycle 'odd' 'even' %}"><a href="{{ object.url }}">{{ object }}</a></li>
-    {% endfor %}
-  </ul>
-  {% else %}
-  <p class="quiet">(None)</p>
-  {% endif %}
-  </div>
-{% endfor %}
-
-{% endblock %}
diff --git a/django/contrib/databrowse/tests.py b/django/contrib/databrowse/tests.py
deleted file mode 100644
index d649b4af67..0000000000
--- a/django/contrib/databrowse/tests.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from django.contrib import databrowse
-from django.db import models
-from django.test import TestCase
-from django.utils.encoding import python_2_unicode_compatible
-
-
-@python_2_unicode_compatible
-class SomeModel(models.Model):
-    some_field = models.CharField(max_length=50)
-
-    def __str__(self):
-        return self.some_field
-
-
-@python_2_unicode_compatible
-class SomeOtherModel(models.Model):
-    some_other_field = models.CharField(max_length=50)
-
-    def __str__(self):
-        return self.some_other_field
-
-
-@python_2_unicode_compatible
-class YetAnotherModel(models.Model):
-    yet_another_field = models.CharField(max_length=50)
-
-    def __str__(self):
-        return self.yet_another_field
-
-
-class DatabrowseTests(TestCase):
-
-    def test_databrowse_register_unregister(self):
-        databrowse.site.register(SomeModel)
-        self.assertTrue(SomeModel in databrowse.site.registry)
-        databrowse.site.register(SomeOtherModel, YetAnotherModel)
-        self.assertTrue(SomeOtherModel in databrowse.site.registry)
-        self.assertTrue(YetAnotherModel in databrowse.site.registry)
-
-        self.assertRaisesMessage(
-            databrowse.sites.AlreadyRegistered,
-            'The model SomeModel is already registered',
-            databrowse.site.register, SomeModel, SomeOtherModel
-        )
-
-        databrowse.site.unregister(SomeOtherModel)
-        self.assertFalse(SomeOtherModel in databrowse.site.registry)
-        databrowse.site.unregister(SomeModel, YetAnotherModel)
-        self.assertFalse(SomeModel in databrowse.site.registry)
-        self.assertFalse(YetAnotherModel in databrowse.site.registry)
-
-        self.assertRaisesMessage(
-            databrowse.sites.NotRegistered,
-            'The model SomeModel is not registered',
-            databrowse.site.unregister, SomeModel, SomeOtherModel
-        )
-
-        self.assertRaisesMessage(
-            databrowse.sites.AlreadyRegistered,
-            'The model SomeModel is already registered',
-            databrowse.site.register, SomeModel, SomeModel
-        )
diff --git a/django/contrib/databrowse/urls.py b/django/contrib/databrowse/urls.py
deleted file mode 100644
index 5c431deb21..0000000000
--- a/django/contrib/databrowse/urls.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from django.conf.urls import patterns
-from django.contrib.databrowse import views
-
-# Note: The views in this URLconf all require a 'models' argument,
-# which is a list of model classes (*not* instances).
-
-urlpatterns = patterns('',
-    #(r'^$', views.homepage),
-    #(r'^([^/]+)/([^/]+)/$', views.model_detail),
-
-    (r'^([^/]+)/([^/]+)/fields/(\w+)/$', views.choice_list),
-    (r'^([^/]+)/([^/]+)/fields/(\w+)/(.*)/$', views.choice_detail),
-
-    #(r'^([^/]+)/([^/]+)/calendars/(\w+)/$', views.calendar_main),
-    #(r'^([^/]+)/([^/]+)/calendars/(\w+)/(\d{4})/$', views.calendar_year),
-    #(r'^([^/]+)/([^/]+)/calendars/(\w+)/(\d{4})/(\w{3})/$', views.calendar_month),
-    #(r'^([^/]+)/([^/]+)/calendars/(\w+)/(\d{4})/(\w{3})/(\d{1,2})/$', views.calendar_day),
-
-    #(r'^([^/]+)/([^/]+)/objects/(.*)/$', views.object_detail),
-)
diff --git a/django/contrib/databrowse/views.py b/django/contrib/databrowse/views.py
deleted file mode 100644
index 4543e95780..0000000000
--- a/django/contrib/databrowse/views.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from django.http import Http404
-from django.shortcuts import render_to_response
-
-###########
-# CHOICES #
-###########
-
-def choice_list(request, app_label, module_name, field_name, models):
-    m, f = lookup_field(app_label, module_name, field_name, models)
-    return render_to_response('databrowse/choice_list.html', {'model': m, 'field': f})
-
-def choice_detail(request, app_label, module_name, field_name, field_val, models):
-    m, f = lookup_field(app_label, module_name, field_name, models)
-    try:
-        label = dict(f.field.choices)[field_val]
-    except KeyError:
-        raise Http404('Invalid choice value given')
-    obj_list = m.objects(**{f.field.name: field_val})
-    return render_to_response('databrowse/choice_detail.html', {'model': m, 'field': f, 'value': label, 'object_list': obj_list})
diff --git a/django/contrib/flatpages/locale/af/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/af/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..6d8cf0e4a1
Binary files /dev/null and b/django/contrib/flatpages/locale/af/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/af/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/af/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..4d61e789b9
--- /dev/null
+++ b/django/contrib/flatpages/locale/af/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 16:48+0000\n"
+"Last-Translator: Django team\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"
+
+#: admin.py:10
+msgid "Advanced options"
+msgstr ""
+
+#: forms.py:7 models.py:11
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: forms.py:10
+msgid ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
+msgstr ""
+
+#: forms.py:19
+msgid "URL is missing a leading slash."
+msgstr ""
+
+#: forms.py:23
+msgid "URL is missing a trailing slash."
+msgstr ""
+
+#: forms.py:38
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
+msgstr ""
+
+#: models.py:12
+msgid "title"
+msgstr ""
+
+#: models.py:13
+msgid "content"
+msgstr ""
+
+#: models.py:14
+msgid "enable comments"
+msgstr ""
+
+#: models.py:15
+msgid "template name"
+msgstr ""
+
+#: models.py:16
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+
+#: models.py:17
+msgid "registration required"
+msgstr ""
+
+#: models.py:17
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: models.py:22
+msgid "flat page"
+msgstr ""
+
+#: models.py:23
+msgid "flat pages"
+msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Die veld is verpligtend."
diff --git a/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo
index 68400540b7..d17eb7804b 100644
Binary files a/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po
index 66c1fc11dc..70fb26634c 100644
--- a/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+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"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "خيارات متقدّمة"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "رابط"
 
@@ -52,23 +52,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "العنوان"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "المحتوى"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "السماح بالتعليقات"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "اسم القالب"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,20 +76,24 @@ msgstr ""
 "مثال: 'flatpages/contact_page.html'. إن لم تكن الصفحة موجودة، فسوف يستخدم "
 "النظام 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "التسجيل مطلوب"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "إذا كان هذا الخيار محددا، فإن المستخدمين الداخلين فقط سيتمكنون من مشاهدة "
 "الصفحة."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "صفحة مسطحة"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "صفحات مسطحة"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "هذا الحقل مطلوب."
diff --git a/django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo
index 60546847ad..2f914fc16a 100644
Binary files a/django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/az/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/az/LC_MESSAGES/django.po
index a921ba559f..94b23fd92b 100644
--- a/django/contrib/flatpages/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/az/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-22 16:33+0000\n"
-"Last-Translator: Dimitris Glezos <glezos@indifex.com>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Dimitris Glezos <glezos@transifex.com>\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Əlavə imkanlar"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -54,23 +54,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "başlıq"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "məzmun"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "şərhlər olsun"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "şablonun adı"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,20 +78,24 @@ msgstr ""
 "Məsələn, \"flatpages/contact_page.html\". Əgər göstərməsəniz, biz "
 "\"flatpages/default.html\" şablonundan istifadə edəcəyik."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "ancaq qeydiyyatlılar üçün"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Əgər bura quş qoysanız, ancaq qeydiyyatdan keçib sayta daxil olmuş "
 "istifadəçilər bu səhifəni görə biləcəklər."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "adi səhifə"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "adi səhifələr"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Bu sahə vacibdir."
diff --git a/django/contrib/flatpages/locale/be/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..eee063e02c
Binary files /dev/null and b/django/contrib/flatpages/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/be/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..543d9a00a1
--- /dev/null
+++ b/django/contrib/flatpages/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,100 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: admin.py:10
+msgid "Advanced options"
+msgstr "Адмысловыя можнасьці"
+
+#: forms.py:7 models.py:11
+msgid "URL"
+msgstr "Сеціўная спасылка"
+
+#: forms.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Прыклад: «/about/contact/». Упэўніцеся, што адрас пачынаецца й заканчваецца "
+"рыскаю «/»."
+
+#: forms.py:10
+msgid ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
+msgstr ""
+"Дазваляюцца толькі літары, лічбы, кропкі, знак падкрэсьліваньня, злучкі, "
+"нахіленыя рыскі, тыльды."
+
+#: forms.py:19
+msgid "URL is missing a leading slash."
+msgstr "Спасылка не пачынаецца з рыскі «/»."
+
+#: forms.py:23
+msgid "URL is missing a trailing slash."
+msgstr "Спасылка не заканчваецца рыскаю «/»."
+
+#: forms.py:38
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
+msgstr "На пляцоўцы «%(site)s» ужо існуе нязьменная бачына з адрасам «%(url)s»"
+
+#: models.py:12
+msgid "title"
+msgstr "назва"
+
+#: models.py:13
+msgid "content"
+msgstr "зьмесьціва"
+
+#: models.py:14
+msgid "enable comments"
+msgstr "дазволіць выказваньні"
+
+#: models.py:15
+msgid "template name"
+msgstr "назва шаблёну"
+
+#: models.py:16
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+"Прыклад: «flatpages/contact_page.html». Калі не пазначаць нічога, сыстэма "
+"будзе ўжываць «flatpages/default.html»."
+
+#: models.py:17
+msgid "registration required"
+msgstr "трэба запісацца"
+
+#: models.py:17
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Калі абраць гэта, бачыну змогуць пабачыць толькі тыя карыстальнікі, што "
+"апазналіся."
+
+#: models.py:22
+msgid "flat page"
+msgstr "нязьменная бачына"
+
+#: models.py:23
+msgid "flat pages"
+msgstr "нязьменныя бачыны"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Поле трэба запоўніць."
diff --git a/django/contrib/flatpages/locale/bg/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/bg/LC_MESSAGES/django.mo
index b653eb4f9d..fa7d889025 100644
Binary files a/django/contrib/flatpages/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/bg/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/bg/LC_MESSAGES/django.po
index a231235284..14217f6117 100644
--- a/django/contrib/flatpages/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/bg/LC_MESSAGES/django.po
@@ -2,27 +2,27 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Todor Lubenov <tlubenov@gmail.com>, 2011.
+# Todor Lubenov <tlubenov@gmail.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Todor Lubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Допълнителни опции"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -43,34 +43,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URL липсва водеща черта."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URL липсва наклонена черта."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "Flatpage с url %(url)s вече съществува за site %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "заглавие"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "съдържание"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "позволяване на коментари"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "име на шаблон"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,19 +78,23 @@ msgstr ""
 "Пример: 'flatpages/contact_page.html'.  Ако това не е указано, системата ще "
 "използва 'flatpages/default.html'.  "
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "изисква се регистрация"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ако това е чекнато, само логнати потребители ще могат да виждат страницата.  "
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "информативна страница"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "информативни страници"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Това поле е задължително."
diff --git a/django/contrib/flatpages/locale/bn/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/bn/LC_MESSAGES/django.mo
index 4e28b7102f..528c8220fb 100644
Binary files a/django/contrib/flatpages/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/bn/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/bn/LC_MESSAGES/django.po
index bdb436c957..a48d5d14c2 100644
--- a/django/contrib/flatpages/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/bn/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "এডভান্সড অপশন"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "ইউআরএল (URL)"
 
@@ -49,23 +49,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "শিরোনাম"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "কনটেন্ট"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "মন্তব্য প্রদান সচল করুন"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "টেমপ্লেট নাম"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -73,18 +73,22 @@ msgstr ""
 "উদাহরণঃ ’flatpage/contact_page.html'। এটি যদি খালি থাকে, তবে সিস্টেম "
 "’flatpage/default.html' ব্যবহার করবে।"
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "নিবন্ধন আবশ্যক"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "এটি চেক করা হলে, শুধুমাত্র লগইন করা সদস্যরা পাতাটি দেখতে সমর্থ হবেন।"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "ফ্লাট পাতা"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "ফ্লাট পাতা সমূহ"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "এটি আবশ্যক।"
diff --git a/django/contrib/flatpages/locale/br/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..293fb7e308
Binary files /dev/null and b/django/contrib/flatpages/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/br/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..966606ea94
--- /dev/null
+++ b/django/contrib/flatpages/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,92 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: admin.py:10
+msgid "Advanced options"
+msgstr ""
+
+#: forms.py:7 models.py:11
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: forms.py:10
+msgid ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
+msgstr ""
+
+#: forms.py:19
+msgid "URL is missing a leading slash."
+msgstr ""
+
+#: forms.py:23
+msgid "URL is missing a trailing slash."
+msgstr ""
+
+#: forms.py:38
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
+msgstr ""
+
+#: models.py:12
+msgid "title"
+msgstr "titl"
+
+#: models.py:13
+msgid "content"
+msgstr "danvez"
+
+#: models.py:14
+msgid "enable comments"
+msgstr ""
+
+#: models.py:15
+msgid "template name"
+msgstr ""
+
+#: models.py:16
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+
+#: models.py:17
+msgid "registration required"
+msgstr ""
+
+#: models.py:17
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: models.py:22
+msgid "flat page"
+msgstr ""
+
+#: models.py:23
+msgid "flat pages"
+msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Rekis eo leuniañ ar vaezienn."
diff --git a/django/contrib/flatpages/locale/bs/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/bs/LC_MESSAGES/django.mo
index 531aae45a9..19df38fa1d 100644
Binary files a/django/contrib/flatpages/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/bs/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/bs/LC_MESSAGES/django.po
index 8393334852..de42f97c85 100644
--- a/django/contrib/flatpages/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/bs/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Filip Dupanović <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Napredna podešavanja"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "naslov"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "sadržaj"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "omogući komentare"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "naziv obrazca"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,20 +79,24 @@ msgstr ""
 "Primjer: 'flatpages/contact_page.html'. Ako ovo ostavite praznim, sistem će "
 "koristiti 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registracija obavezna"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ako je ovo obilježeno, samo će prijavljeni korisnici moći da vide ovu "
 "stranicu."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "statična stranica"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "statične stranice"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Ovo polje se mora popuniti."
diff --git a/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.mo
index 94f0148365..f67c9db19e 100644
Binary files a/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.po
index 7ae4881ee2..b88702d200 100644
--- a/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ca/LC_MESSAGES/django.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opcions avançades"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr "La URL no acaba amb \"/\"."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Ja hi ha una pàgina estàtica amb la URL %(url)s per al lloc %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "títol"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "contingut"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "habilitar comentaris"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nom de la plantilla"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,18 +79,22 @@ msgstr ""
 "Exemple: 'flatpages/contact_page.html'. Si no es proporciona, el sistema "
 "utilitzarà 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "cal estar registrat"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Si està marcat, només els usuaris registrats podran veure la pàgina."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "pàgina estàtica"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "pàgines estàtiques"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Aquest camp és obligatori."
diff --git a/django/contrib/flatpages/locale/cs/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/cs/LC_MESSAGES/django.mo
index beaf2045fe..7a0a05ad68 100644
Binary files a/django/contrib/flatpages/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/cs/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/cs/LC_MESSAGES/django.po
index e50ab1f23f..a576c20f59 100644
--- a/django/contrib/flatpages/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/cs/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Pokročilá nastavení"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr "V adrese URL chybí koncové lomítko."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Flat stránka s adresou %(url)s pro web %(site)s již existuje."
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titulek"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "obsah"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "povolit komentáře"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "název šablony"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,18 +77,22 @@ msgstr ""
 "Příklad: \"flatpages/kontaktni_stranka.html\". Pokud toto není zadáno, bude "
 "použita šablona \"flatpages/default.html\"."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "nutná registrace"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Určuje, že tuto stránku uvidí pouze přihlášení uživatelé."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "statická stránka"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "statické stránky"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Pole je povinné."
diff --git a/django/contrib/flatpages/locale/cy/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/cy/LC_MESSAGES/django.mo
index ec69c2fdac..6b103b99ab 100644
Binary files a/django/contrib/flatpages/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/cy/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/cy/LC_MESSAGES/django.po
index 03c7772905..b06c0849fc 100644
--- a/django/contrib/flatpages/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/cy/LC_MESSAGES/django.po
@@ -6,22 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr ""
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -51,42 +52,46 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "teitl"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "cynnwys"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "galluogi sylwadau"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "enw'r templed"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "cofrestriad gofynnol"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Os wedi dewis, dim ond defnyddwyr a mewngofnodwyd bydd yn gallu gweld y "
 "tudalen."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "tudalen fflat"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "tudalennau fflat"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Mae angen y faes yma."
diff --git a/django/contrib/flatpages/locale/da/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/da/LC_MESSAGES/django.mo
index 4f06441bfb..805c57cb4a 100644
Binary files a/django/contrib/flatpages/locale/da/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/da/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/da/LC_MESSAGES/django.po
index 83214847f8..b53019e21d 100644
--- a/django/contrib/flatpages/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/da/LC_MESSAGES/django.po
@@ -9,22 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-12 23:52+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Avancerede muligheder"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -56,23 +56,23 @@ msgstr "URL mangler en afsluttende skråstreg."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Flatpage med URL'en %(url)s eksisterer allerede for siden %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titel"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "indhold"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "tillad kommentarer"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "skabelonnavn"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -80,20 +80,24 @@ msgstr ""
 "Eksempel: 'flatpages/kontaktside'. Hvis dette ikke tilbydes, bruger systemet "
 "'flatpages/default'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registrering påkrævet"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Hvis denne boks er markeret, vil kun brugere der er logget ind, kunne se "
 "siden."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "flad side"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "flade sider"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Dette felt er påkrævet."
diff --git a/django/contrib/flatpages/locale/de/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/de/LC_MESSAGES/django.mo
index 5eca816ac5..b81843eed1 100644
Binary files a/django/contrib/flatpages/locale/de/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/de/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/de/LC_MESSAGES/django.po
index ae27937949..e04beff1bd 100644
--- a/django/contrib/flatpages/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/de/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: André Hagenbruch <ahagenbruch@googlemail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Erweiterte Optionen"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "Adresse (URL)"
 
@@ -54,23 +54,23 @@ msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 "Flatpage mit der URL %(url)s ist für die Website %(site)s bereits vorhanden"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "Titel"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "Inhalt"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "Kommentare aktivieren"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "Name des Template"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,20 +78,24 @@ msgstr ""
 "Beispiel: 'flatpages/contact_page.html'. Wenn dieses Feld nicht gesetzt ist, "
 "wird standardmäßig 'flatpages/default.html' benutzt."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "Registrierung erforderlich"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Wenn hier ein Haken gesetzt ist, können nur angemeldete Benutzer diese Seite "
 "sehen."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "Seite"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "Seiten"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Dieses Feld ist zwingend erforderlich."
diff --git a/django/contrib/flatpages/locale/el/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/el/LC_MESSAGES/django.mo
index 4f5833d56b..fe17ed9aaa 100644
Binary files a/django/contrib/flatpages/locale/el/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/el/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/el/LC_MESSAGES/django.po
index 76411aa18d..747fc674bc 100644
--- a/django/contrib/flatpages/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/el/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Προχωρημένες επιλογές"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -54,23 +54,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "τίτλος"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "περιεχόμενο"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "ενεργοποίηση σχολίων"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "όνομα προτύπου"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,19 +78,23 @@ msgstr ""
 "Παράδειγμα: 'flatpages/contact_page.html'. Αν δεν εισαχθεί, το σύστημα θα "
 "χρησιμοποιήσει το 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "απαιτείται εγγραφή"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Εάν επιλεγεί, μόνο συνδεδεμένοι χρήστες θα μπορούν να βλέπουν τη σελίδα."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "απλή σελίδα"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "απλές σελίδες"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Αυτό το πεδίο είναι απαραίτητο."
diff --git a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.mo
index b0f81e1e0d..67acb769d7 100644
Binary files a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
index ded87e5420..e671dda5fc 100644
--- a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
@@ -1,88 +1,97 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: admin.py:10
 msgid "Advanced options"
-msgstr ""
+msgstr "Advanced options"
 
 #: forms.py:7 models.py:11
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: forms.py:8
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 
 #: forms.py:10
 msgid ""
 "This value must contain only letters, numbers, dots, underscores, dashes, "
 "slashes or tildes."
 msgstr ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URL is missing a leading slash."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URL is missing a trailing slash."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "Flatpage with url %(url)s already exists for site %(site)s"
 
 #: models.py:12
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #: models.py:13
 msgid "content"
-msgstr ""
+msgstr "content"
 
 #: models.py:14
 msgid "enable comments"
-msgstr ""
+msgstr "enable comments"
 
 #: models.py:15
 msgid "template name"
-msgstr ""
+msgstr "template name"
 
 #: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
 
 #: models.py:17
 msgid "registration required"
-msgstr ""
+msgstr "registration required"
 
-#: models.py:17
+#: models.py:18
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
+"If this is checked, only logged-in users will be able to view the page."
 
-#: models.py:22
+#: models.py:24
 msgid "flat page"
-msgstr ""
+msgstr "flat page"
 
-#: models.py:23
+#: models.py:25
 msgid "flat pages"
-msgstr ""
+msgstr "flat pages"
 
-#: tests/forms.py:97
+#: tests/forms.py:98
 msgid "This field is required."
-msgstr ""
+msgstr "This field is required."
diff --git a/django/contrib/flatpages/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/en_GB/LC_MESSAGES/django.mo
index bddd514a5f..7ab832faf7 100644
Binary files a/django/contrib/flatpages/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/en_GB/LC_MESSAGES/django.po
index a06d6c09ce..9e2ad3218a 100644
--- a/django/contrib/flatpages/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/en_GB/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-12 21:50+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Advanced options"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr "URL is missing a trailing slash."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Flatpage with url %(url)s already exists for site %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "title"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "content"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "enable comments"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "template name"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,19 +77,23 @@ msgstr ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registration required"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "If this is checked, only logged-in users will be able to view the page."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "flat page"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "flat pages"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "This field is required."
diff --git a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo
index c151a3988c..e4a29def71 100644
Binary files a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po
index 87f207c3c5..ed7e7149f4 100644
--- a/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/eo/LC_MESSAGES/django.po
@@ -2,26 +2,27 @@
 #
 # Translators:
 # Baptiste  <bapdarth@yahoo.fr>, 2011.
+# Baptiste  <baptiste+transifex@darthenay.fr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Altnivelaj elektoj"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -41,34 +42,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "La streka karaktero \"/\" ne ĉeestas en komenco de ĉeno."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "La streka karaktero \"/\" ne ĉeestas en fino de ĉeno."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Platpaĝo kun URL %(url)s jam ekzistas for la retejo %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titolo"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "enhavo"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "ebligu rimarkoj"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nomo de ŝablono"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,19 +77,23 @@ msgstr ""
 "Ekzemplo: 'platpaĝoj/kontakto_paĝo.html'. Se ĉi tiu ne provizas, la sistemo "
 "uzos 'platpaĝoj/defaŭlto.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registrado postulita"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Se ĉi tio estus elektita, nur ensalutitaj uzantoj povus rigardi la paĝon."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "plata paĝo"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "plataj paĝoj"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Tiu kampo estas postulata."
diff --git a/django/contrib/flatpages/locale/es/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/es/LC_MESSAGES/django.mo
index 09fc001f36..af5518cc8d 100644
Binary files a/django/contrib/flatpages/locale/es/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/es/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/es/LC_MESSAGES/django.po
index 2e82c25539..4e6250ac0a 100644
--- a/django/contrib/flatpages/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/es/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-13 19:53+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opciones avanzadas"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -54,23 +54,23 @@ msgstr "A la url le falta la barra final."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Un Flatpage con la url %(url)s ya existe para el sitio %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "título"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "contenido"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "habilitar comentarios"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nombre de plantilla"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,18 +78,22 @@ msgstr ""
 "Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema "
 "usará 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "debe estar registrado"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "página estática"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "páginas estáticas"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
diff --git a/django/contrib/flatpages/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/es_AR/LC_MESSAGES/django.mo
index b587eae368..b58a8ebf28 100644
Binary files a/django/contrib/flatpages/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/es_AR/LC_MESSAGES/django.po
index bee6da593a..05df41a9fc 100644
--- a/django/contrib/flatpages/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/es_AR/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-16 01:47+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opciones avanzadas"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -54,23 +54,23 @@ msgstr "A la URL le falta una / al final"
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Ya existe una flatpage con url %(url)s para el sitio %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "título"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "contenido"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "activar comentarios"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nombre de plantilla"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,18 +78,22 @@ msgstr ""
 "Ejemplo: 'flatpages/contact_page.html'. Si no lo proporciona, el sistema "
 "usará 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "debe estar registrado"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "página estática"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "páginas estáticas"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
diff --git a/django/contrib/flatpages/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/es_MX/LC_MESSAGES/django.mo
index 352c06413b..c9318807c9 100644
Binary files a/django/contrib/flatpages/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/es_MX/LC_MESSAGES/django.po
index 0228c112c2..3597062641 100644
--- a/django/contrib/flatpages/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/es_MX/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opciones avanzadas"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr "A la URL le falta una diagonal al final"
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "La página con la url %(url)s ya existe para el sitio %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "título"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "contenido"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "activar comentarios"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nombre de la plantilla"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,18 +77,22 @@ msgstr ""
 "Ejemplo: 'flatpages/pagina_contacto.html'. Si no lo proporciona, el sistema "
 "usará 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "necesario registrarse"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "página estática"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "páginas estática"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
diff --git a/django/contrib/flatpages/locale/es_VE/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/es_VE/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..53a5cbceea
Binary files /dev/null and b/django/contrib/flatpages/locale/es_VE/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/es_VE/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/es_VE/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..a0f1a16538
--- /dev/null
+++ b/django/contrib/flatpages/locale/es_VE/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 16:48+0000\n"
+"Last-Translator: Django team\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/"
+"django/language/es_VE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_VE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:10
+msgid "Advanced options"
+msgstr ""
+
+#: forms.py:7 models.py:11
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: forms.py:10
+msgid ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
+msgstr ""
+
+#: forms.py:19
+msgid "URL is missing a leading slash."
+msgstr ""
+
+#: forms.py:23
+msgid "URL is missing a trailing slash."
+msgstr ""
+
+#: forms.py:38
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
+msgstr ""
+
+#: models.py:12
+msgid "title"
+msgstr ""
+
+#: models.py:13
+msgid "content"
+msgstr ""
+
+#: models.py:14
+msgid "enable comments"
+msgstr ""
+
+#: models.py:15
+msgid "template name"
+msgstr ""
+
+#: models.py:16
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+
+#: models.py:17
+msgid "registration required"
+msgstr ""
+
+#: models.py:17
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: models.py:22
+msgid "flat page"
+msgstr ""
+
+#: models.py:23
+msgid "flat pages"
+msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
diff --git a/django/contrib/flatpages/locale/et/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/et/LC_MESSAGES/django.mo
index 8458d41621..6308de4fb4 100644
Binary files a/django/contrib/flatpages/locale/et/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/et/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/et/LC_MESSAGES/django.po
index 57c03b994b..b62d2f91c5 100644
--- a/django/contrib/flatpages/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/et/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Lisavalikud"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "pealkiri"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "sisu"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "võimalda kommentaarid"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "mall"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,18 +77,22 @@ msgstr ""
 "Näide: 'flatpages/contact_page.html'. Kui mall on määramata, kasutatakse "
 "vaikimisi malli 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registreerumine nõutav"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Kui see on valitud, näevad lehte ainult sisselogitud kasutajad"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "sisuleht"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "sisulehed"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "See lahter on nõutav."
diff --git a/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.mo
index 288f95ff68..3e91ee292c 100644
Binary files a/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.po
index a03b36db8c..6b0e0fff05 100644
--- a/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/eu/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 20:21+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Aukera aurreratuak"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -54,23 +54,23 @@ msgstr "URLk bukaerako / falta du."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "%(site)s webgunean dagoeneko existitzende %(url)s urldun Flatpage bat"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "izenburua"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "edukia"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "komentarioak onartu"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "plantila izena"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,20 +78,24 @@ msgstr ""
 "Adibidez: 'flatpages/contact_page.html'. Hau ematen ez bada, sistemak "
 "'flatpages/default.html' erabiliko du."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "erregistratzea beharrezkoa da"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Hau markatuta badago, erregistratutako erabiltzaileek bakarrik ikusiko dute "
 "orria."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "flat page"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "flat pages"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Eremu hau beharrezkoa da."
diff --git a/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.mo
index e349425059..f71d07b5e5 100644
Binary files a/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.po
index cc2b45f236..7f4687d0e9 100644
--- a/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/fa/LC_MESSAGES/django.po
@@ -1,28 +1,28 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Ali Nikneshan <ali@nikneshan.com>, 2011.
+# Ali Nikneshan <ali@nikneshan.com>, 2011, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "گزینه‌های پیشرفته"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
@@ -30,7 +30,7 @@ msgstr "نشانی اینترنتی"
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
-"مثال: '/about/contact/'. مطمئن شوید که خط اریب را هم در ابتدا و هم در انتها "
+"مثال: '/about/contact/'. مطمئن شوید که اسلش را هم در ابتدا و هم در انتها "
 "گذاشته‌اید."
 
 #: forms.py:10
@@ -41,34 +41,34 @@ msgstr "این مقدار فقط باید حاوی حروف، اعداد، خط
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "در آدرس اسلش آغازین فراموش شده است."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "در آدرس اسلش پایانی فراموش شده است."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "صفحه تخت با آدرس %(url)s برای سایت %(site)s وجود دارد "
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "عنوان"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "محتوا"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "فعال کردن نظرات"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "نام قالب"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,20 +76,24 @@ msgstr ""
 "مثال: 'flatpages/contact_page.html'. اگر این مشخص نشود، سیستم از 'flatpages/"
 "default.html' استفاده خواهد کرد."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "عضویت لازم است"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "اگر این انتخاب شود، فقط کاربران وارد شده خواهند توانست این صفحه را مشاهده "
 "نمایند."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "صفحه تخت"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "صفحات تخت"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "این فیلد لازم است."
diff --git a/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.mo
index 9c8701483e..53b16593cf 100644
Binary files a/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.po
index f7cb56ffc2..68388c4500 100644
--- a/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/fi/LC_MESSAGES/django.po
@@ -2,27 +2,28 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <klaus.dahlen@gmail.com>, 2012.
 # Ville Säävuori <ville@syneus.fi>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-24 15:17+0000\n"
+"Last-Translator: nanook <klaus.dahlen@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Lisäasetukset"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL-osoite"
 
@@ -43,34 +44,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URL:n alusta puuttuu kauttaviiva."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URL:n lopusta puuttuu kauttaviiva."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "Sivustolla %(site)s on jo sivu, jonka URL on %(url)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "otsikko"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "sisältö"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "salli kommentit"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "mallipohjan nimi"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,19 +79,23 @@ msgstr ""
 "Esimerkiksi: 'flatpages/yhteydenotto.html'. Jos tämä jätetään tyhjäksi, "
 "käytetään oletuspohjaa 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "vaaditaan rekisteröityminen"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Jos tämä kohta on valittu, vain sisäänkirjautuneet käyttäjät näkevät sivun."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "tekstisivu"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "tekstisivut"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Tämä kenttä vaaditaan."
diff --git a/django/contrib/flatpages/locale/fr/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/fr/LC_MESSAGES/django.mo
index 6b8984e811..8151f4160b 100644
Binary files a/django/contrib/flatpages/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/fr/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/fr/LC_MESSAGES/django.po
index 4bf7825856..fd139aed00 100644
--- a/django/contrib/flatpages/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/fr/LC_MESSAGES/django.po
@@ -2,29 +2,29 @@
 #
 # Translators:
 #   <charette.s@gmail.com>, 2012.
-#   <claude@2xlibre.net>, 2011.
+#   <claude@2xlibre.net>, 2011-2012.
 # claudep <claude@2xlibre.net>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: charettes <charette.s@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: claudep <claude@2xlibre.net>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Options avancées"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -56,23 +56,23 @@ msgstr "Le caractère « / » n'est pas présent en fin de chaîne."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "La page statique à l'URL %(url)s existe déjà pour le site %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titre"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "contenu"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "autoriser les commentaires"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nom du template"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -80,20 +80,24 @@ msgstr ""
 "Par exemple, « flatpages/contact_page.html ». Sans définition, le système "
 "utilisera « flatpages/default.html »."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "enregistrement requis"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Si coché, seuls les utilisateurs connectés auront la possibilité de voir "
 "cette page."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "page statique"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "pages statiques"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Ce champ est obligatoire."
diff --git a/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.mo
index 0c7d2c8109..72bb5e7e71 100644
Binary files a/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.po
index ee8008cc68..4648add989 100644
--- a/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-16 12:20+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Ard-rogha"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr "Tá slais deireanach in easnamh ag an URL."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Tá flatpage le url %(url)s ann cheana le suíomh %(site)s."
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "teideal"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "inneachar"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "Cuir nótaí tráchta ar chumas"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ainm an teimpléid"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,20 +79,24 @@ msgstr ""
 "Sampla: 'flatpages/contact_page.html'. Muna bhfuil sé ar soláthair, bainfidh "
 "an córás úsáid as 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "clárúchán riachtanach"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Dá mbéadh é seo seicailte, ní beidh ach úsáideora logáilte isteach in ann an "
 "leathanach seo a fheiceail"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "leacleathanach"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "leacleathanaigh"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Tá an réimse seo riachtanach."
diff --git a/django/contrib/flatpages/locale/gl/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/gl/LC_MESSAGES/django.mo
index 3f67c2ba26..52f32e073f 100644
Binary files a/django/contrib/flatpages/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/gl/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/gl/LC_MESSAGES/django.po
index 2194ce5c96..54e1ed61f3 100644
--- a/django/contrib/flatpages/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/gl/LC_MESSAGES/django.po
@@ -3,27 +3,28 @@
 # Translators:
 # fasouto <fsoutomoure@gmail.com>, 2011.
 # fonso <fonzzo@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-01-07 11:33+0000\n"
 "Last-Translator: fonso <fonzzo@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opciones avanzadas"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -43,34 +44,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "Falta unha barra inclinada no principio da URL."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "Falta unha barra inclinada no final da URL."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "Xa existe unha páxina simple con url %(url)s no sitio %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "título"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "contido"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "activar comentarios"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nome da plantilla"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,18 +79,22 @@ msgstr ""
 "Exemplo: 'flatpages/contact_page.html'. Se non se especifica, o sistema "
 "usará 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "require rexistro"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Se se marca, só poderán ver a páxina os usuarios identificados."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "páxina simple"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "páxinas simples"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Requírese este campo."
diff --git a/django/contrib/flatpages/locale/he/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/he/LC_MESSAGES/django.mo
index 99c4df87b0..f071585766 100644
Binary files a/django/contrib/flatpages/locale/he/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/he/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/he/LC_MESSAGES/django.po
index f83e903ee9..044ca60b89 100644
--- a/django/contrib/flatpages/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/he/LC_MESSAGES/django.po
@@ -3,26 +3,27 @@
 # Translators:
 # Alex Gaynor <alex.gaynor@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: Alex Gaynor <alex.gaynor@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-21 10:44+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "אפשרויות מתקדמות"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -42,34 +43,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "חסר קו נטוי בתחילת URL."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "חסר קו נטוי בסוף URL."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "קיים כבר דף פשוט עם  url %(url)s עבור אתר %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "כותרת"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "תוכן"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "אפשר תגובות"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "שם תבנית"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,18 +78,22 @@ msgstr ""
 "דוגמא: 'flatpages/contact_page.html'. אם לא צויין, המערכת תשתמש ב-'flatpages/"
 "default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "הרשמה נדרשת"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "אם מסומן, רק משתמשים מחוברים יוכלו לצפות בדף."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "דף פשוט"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "דפים פשוטים"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "יש להזין תוכן בשדה זה."
diff --git a/django/contrib/flatpages/locale/hi/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/hi/LC_MESSAGES/django.mo
index b436eb8da6..173fbb84d2 100644
Binary files a/django/contrib/flatpages/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/hi/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/hi/LC_MESSAGES/django.po
index 0bf9ab4799..c1a7930ab4 100644
--- a/django/contrib/flatpages/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/hi/LC_MESSAGES/django.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-15 13:39+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "उन्नत विकल्प"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -51,23 +51,23 @@ msgstr "यूआरएल से अनुगामी स्लैश गा
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "%(site)s साइट के लिए %(url)s यूआरएल के साथ चपटापृष्ट मौजूद है."
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "शीर्षक"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "विषय सूची"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "टिप्पणियां सक्षम करें"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "सांचे का नाम"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -75,18 +75,22 @@ msgstr ""
 "उदाहरण: 'flatpages/contact_page.html'. यदि यह जिक्र नहीं किया तो यह प्रणाली "
 "'flatpages/default.html' का प्रयोग करेगी. ."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "पंजीकरण आवश्यक"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "अगर इस जाँच की है, केवल लॉग इन करने वालों के लिए पृष्ठ देखने में सक्षम हो जाएगा."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "चपटा पृष्ट"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "चपटे पृष्ट"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "यह क्षेत्र अपेक्षित हैं"
diff --git a/django/contrib/flatpages/locale/hr/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/hr/LC_MESSAGES/django.mo
index 58e1f5d0a8..a5cb553268 100644
Binary files a/django/contrib/flatpages/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/hr/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/hr/LC_MESSAGES/django.po
index f091bd02dc..fbe7d23d0d 100644
--- a/django/contrib/flatpages/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/hr/LC_MESSAGES/django.po
@@ -2,28 +2,29 @@
 #
 # Translators:
 # aljosa <aljosa.mohorovic@gmail.com>, 2011.
+#   <aljosa.mohorovic@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: aljosa <aljosa.mohorovic@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Napredne opcije"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -44,34 +45,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URL-u nedostaje početni /."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URL-u nedostaje / na kraju."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "Stranica sa URL-om %(url)s već postoji za web %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "naslov"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "sadržaj"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "uključi komentare"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ime template-a"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,19 +80,23 @@ msgstr ""
 "Primjer: 'flatpages/contact_page.html'. Ako navedeno nije definirano sistem "
 "će koristiti 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registracija obavezna"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ako je ovo selektirano samo logirani korisnici moći će vidjeti ovu stranicu."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "statična stranica"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "statične stranice"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Unos za ovo polje je obavezan."
diff --git a/django/contrib/flatpages/locale/hu/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/hu/LC_MESSAGES/django.mo
index 9b45cd54eb..d5887e69c1 100644
Binary files a/django/contrib/flatpages/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/hu/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/hu/LC_MESSAGES/django.po
index bc83db22d4..d9b350f1ff 100644
--- a/django/contrib/flatpages/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/hu/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-19 20:14+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: istvanf <istvan.farkas@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "További beállítások"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -52,23 +52,23 @@ msgstr "AZ URL-ből hiányzik a záró perjel."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "%(site)s honlapon már létezik egyszerű oldal ezzel az URL-lel: %(url)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "cím"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "tartalom"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "megjegyzések engedélyezése"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "sablon neve"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,20 +76,24 @@ msgstr ""
 "Példa: 'flatpages/contact_page'. Ha ez nem létezik, a rendszer a 'flatpages/"
 "default.html' sablont fogja használni."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "regisztráció szükséges"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ha ez be van jelölve, csak bejelentkezett felhasználó tudja az oldalt "
 "megnézni."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "egyszerű oldal"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "egyszerű oldalak"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Ennek a mezőnek a megadása kötelező."
diff --git a/django/contrib/flatpages/locale/ia/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..a236c8e7b0
Binary files /dev/null and b/django/contrib/flatpages/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ia/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..2337a0efc9
--- /dev/null
+++ b/django/contrib/flatpages/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 16:48+0000\n"
+"Last-Translator: Django team\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:10
+msgid "Advanced options"
+msgstr ""
+
+#: forms.py:7 models.py:11
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: forms.py:10
+msgid ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
+msgstr ""
+
+#: forms.py:19
+msgid "URL is missing a leading slash."
+msgstr ""
+
+#: forms.py:23
+msgid "URL is missing a trailing slash."
+msgstr ""
+
+#: forms.py:38
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
+msgstr ""
+
+#: models.py:12
+msgid "title"
+msgstr ""
+
+#: models.py:13
+msgid "content"
+msgstr ""
+
+#: models.py:14
+msgid "enable comments"
+msgstr ""
+
+#: models.py:15
+msgid "template name"
+msgstr ""
+
+#: models.py:16
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+
+#: models.py:17
+msgid "registration required"
+msgstr ""
+
+#: models.py:17
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: models.py:22
+msgid "flat page"
+msgstr ""
+
+#: models.py:23
+msgid "flat pages"
+msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Iste campo es obligatori."
diff --git a/django/contrib/flatpages/locale/id/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/id/LC_MESSAGES/django.mo
index 3b350cf775..ee254df5f4 100644
Binary files a/django/contrib/flatpages/locale/id/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/id/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/id/LC_MESSAGES/django.po
index 36024dbac2..a9529ce376 100644
--- a/django/contrib/flatpages/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/id/LC_MESSAGES/django.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opsi lanjutan"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr "Tidak ada garis miring akhir pada URL."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Laman tetap %(url)s sudah ada untuk situs %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "judul"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "isi"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "aktifkan komentar"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nama templat"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,20 +79,24 @@ msgstr ""
 "Contoh: 'flatpages/contact_page.html'. Jika tidak tersedia, sistem akan "
 "menggunakan 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "pendaftaran diwajibkan"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Jika dipilih, hanya pengguna ter-otentikasi yang bisa mengunjungi halaman "
 "ini."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "laman tetap"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "laman tetap"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Bidang ini wajib diisi."
diff --git a/django/contrib/flatpages/locale/is/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/is/LC_MESSAGES/django.mo
index c55a885456..f338a0c78b 100644
Binary files a/django/contrib/flatpages/locale/is/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/is/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/is/LC_MESSAGES/django.po
index b4b978e1bf..a32b74afe9 100644
--- a/django/contrib/flatpages/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/is/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-19 14:45+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Ítarlegar stillingar"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "Veffang"
 
@@ -52,23 +52,23 @@ msgstr "Skástrik vantar aftast í slóð"
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "'Flatpage' með slóðina %(url)s er þegar til fyrir síðuna %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titill"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "innihald"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "virkja athugasemdir"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nafn sniðmáts"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,18 +76,22 @@ msgstr ""
 "Dæmi: 'flatpages/contact_page.html'. Ef ekkert er gefið upp mun kerfið nota "
 "'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "skráning nauðsynleg"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Ef þetta er valið geta eingöngu innskráðir notendur séð síðuna."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "flatskrá"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "flatskrár"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Þennan reit þarf að fylla út."
diff --git a/django/contrib/flatpages/locale/it/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/it/LC_MESSAGES/django.mo
index b226f2b2b3..77fa800076 100644
Binary files a/django/contrib/flatpages/locale/it/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/it/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/it/LC_MESSAGES/django.po
index ac87de34ce..9defe71c11 100644
--- a/django/contrib/flatpages/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/it/LC_MESSAGES/django.po
@@ -2,27 +2,27 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nicola Larosa <transifex@teknico.net>, 2011, 2012.
+# Nicola Larosa <transifex@teknico.net>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opzioni avanzate"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -54,23 +54,23 @@ msgstr "Manca una barra finale nella URL."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "La flatpage con url %(url)s esiste già per il sito %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titolo"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "contenuto"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "abilita commenti"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nome template"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,20 +78,24 @@ msgstr ""
 "Esempio: 'flatpages/contact_page.html'. Se non specificato, il sistema userà "
 "'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registrazione obbligatoria"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Se selezionato, solo gli utenti che hanno effettuato l'accesso potranno "
 "vedere la pagina."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "flat page"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "flat page"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Questo campo è obbligatorio."
diff --git a/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.mo
index 242e02fd43..9cd0db090f 100644
Binary files a/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.po
index f17a5b058f..5d26c68c74 100644
--- a/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ja/LC_MESSAGES/django.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 14:21+0000\n"
-"Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Yoichi Fujimoto <wozozo@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "詳細設定"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -54,23 +54,23 @@ msgstr "URLの末尾はスラッシュが必要です。"
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "URL %(url)s のフラットページは %(site)s のサイトに既に存在しています。"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "タイトル"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "内容"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "コメントを有効にする"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "テンプレート名"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,18 +78,22 @@ msgstr ""
 "例: 'flatpages/contact_page.html'. 指定しなければ、デフォルト設定"
 "の'flatpages/default.html' を使います。"
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "登録が必要です"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "チェックした場合、ログインしたユーザだけがページを参照できます。"
+msgstr "チェックした場合、ログインしたユーザーだけがページを参照できます。"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "フラットページ"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "フラットページ"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "このフィールドは必須です。"
diff --git a/django/contrib/flatpages/locale/ka/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ka/LC_MESSAGES/django.mo
index f0ab480693..44881e4eba 100644
Binary files a/django/contrib/flatpages/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ka/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ka/LC_MESSAGES/django.po
index 0a486432fd..004add3058 100644
--- a/django/contrib/flatpages/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ka/LC_MESSAGES/django.po
@@ -1,28 +1,30 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # avsd05 <avsd05@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-03-01 08:31+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "დამატებითი პარამეტრები"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -43,34 +45,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URL-ს დასაწყისში აკლია დახრილი ხაზი."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URL-ს ბოლოში აკლია დახრილი ხაზი."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "უბრალო გვერდი url-ით %(url)s უკვე არსებობს საიტისთვის %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "სათაური"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "კონტენტი"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "ჩავრთოთ კომენტარები"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "შაბლონის სახელი"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,20 +80,24 @@ msgstr ""
 "მაგალითი: 'flatpages/contact_page.html'. თუ იგი მითითებული არ არის, "
 "გამოყენებული იქნება 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "რეგისტრაცია აუცილებელია"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "თუ ეს დროშა ჩართულია, მხოლო შემოსულ მომხმარებლებს ექნებათ გვერდის "
 "დათვალიერების საშუალება."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "უბრალო გვერდი"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "უბრალო გვერდები"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "ეს ველი აუცილებელია."
diff --git a/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.mo
index 40d0480316..78c4bf6cfa 100644
Binary files a/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.po
index 42c1a0ec97..3067148e45 100644
--- a/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/kk/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Zhazira <zhazira.mt@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Толық опциялар"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "атау"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "мазмұн"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "комментарийларды рұқсат ету"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "шаблон атауы"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,19 +77,23 @@ msgstr ""
 "Мысал: 'flatpages/contact_page.html'. Ештенке берілмесе, 'flatpages/default."
 "html' қолданылады."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "тіркеу қажетті"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Бұл белгіленген жағдайда, тек енген қолданушылар ғана бетті көре алады."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "Жай бет"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "Жай беттер"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Бұл өрісті толтыру міндетті."
diff --git a/django/contrib/flatpages/locale/km/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/km/LC_MESSAGES/django.mo
index c8e4a062e4..8ccd210e7c 100644
Binary files a/django/contrib/flatpages/locale/km/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/km/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/km/LC_MESSAGES/django.po
index d2ad937c47..df55618f10 100644
--- a/django/contrib/flatpages/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/km/LC_MESSAGES/django.po
@@ -6,21 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr ""
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "អាស័យដ្ឋានគេហទំព័រ(URL)"
 
@@ -49,23 +49,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "ចំណងជើង"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "អត្ថន័យ"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "អនុញ្ញាត"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ឈ្មោះឯកសារគំរូ"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -73,18 +73,22 @@ msgstr ""
 "ឧទាហរណ៍ 'flatpages/contact_page.html'។ ប្រសិនឯកសារនេះមិនមានទេ​"
 " នោះឯកសារ 'flatpages/default.html'នឹងត្រូវប្រើ។"
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "ត្រូវការសមាជិកភាព"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "ប្រសិនជាចុចជ្រើសរើសយកជំរើសនេះ នោះ មានតែសមាជិកទេដែលអាចមើលទំព័រនេះបាន​។"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "ទំព័ថ្មី"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "ទំព័ថ្មី"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
diff --git a/django/contrib/flatpages/locale/kn/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/kn/LC_MESSAGES/django.mo
index f756c9441a..085358d8bf 100644
Binary files a/django/contrib/flatpages/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/kn/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/kn/LC_MESSAGES/django.po
index f649efd81b..a8da32667e 100644
--- a/django/contrib/flatpages/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/kn/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr ""
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -50,23 +50,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "ಶೀರ್ಷಿಕೆ"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "ಒಳವಿಷಯ"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "ಟಿಪ್ಪಣಿಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ಟೆಂಪ್ಲೇಟಿನ ಹೆಸರು"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -74,19 +74,23 @@ msgstr ""
 "ಉದಾ:'flatpages/contact_page.html'. ಇದನ್ನು ಕೊಡದಿದ್ದರೆ ಗಣಕವ್ಯವಸ್ಥೆಯು  'flatpages/"
 "default.html' ಅನ್ನು ಬಳಸುವದು."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "ನೋಂದಾವಣೆ ಅಗತ್ಯವಿದೆ."
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "ಇದರಲ್ಲಿ ಗುರುತು  ಮಾಡಿದರೆ,  ಒಳಬಂದ (ಲಾಗಿನ್ ಆದ) ಬಳಕೆದಾರರು ಮಾತ್ರ ಪುಟವನ್ನು ನೋಡಬಹುದು."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "ಚಪ್ಪಟೆ ಪುಟ"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "ಚಪ್ಪಟೆ  ಪುಟಗಳು"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "ಈ ಸ್ಥಳವು ಅಗತ್ಯವಿರುತ್ತದೆ."
diff --git a/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo
index 01723edbdf..9c7846dfa0 100644
Binary files a/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po
index e0df0d2f19..88451a6855 100644
--- a/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jaehong Kim <mixe@korea.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "고급 옵션"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -51,23 +51,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "제목"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "내용"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "사용 가능한 코멘트"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "템플릿명"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -75,18 +75,22 @@ msgstr ""
 "예: 'flatpages/contact_page.html' 를 사용할 수 없는 경우 시스템이 'flatpages/"
 "default.html' (을)를 사용합니다."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "등록하세요."
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "체크할 경우, 로그인 사용자만 해당 페이지를 볼 수 있습니다."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "플랫 페이지"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "플랫 페이지(들)"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "필수 항목입니다."
diff --git a/django/contrib/flatpages/locale/lt/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/lt/LC_MESSAGES/django.mo
index 6596a756e2..f9cca3d303 100644
Binary files a/django/contrib/flatpages/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/lt/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/lt/LC_MESSAGES/django.po
index 14e65397d1..65cf01e888 100644
--- a/django/contrib/flatpages/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/lt/LC_MESSAGES/django.po
@@ -8,23 +8,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-09 16:59+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Simonas Kazlauskas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Sudėtingesni nustatymai"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "Nuoroda"
 
@@ -56,23 +56,23 @@ msgstr "Nuorodos pabaigoje trūksta pasvirojo brūkšnio."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Paprastas puslapis su adresu %(url)s %(site)s puslapyje jau egzistuoja"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "pavadinimas"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "turinys"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "įjungti komentavimą"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "šablono vardas"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -80,18 +80,22 @@ msgstr ""
 "Pavyzdžiui: 'flatpages/contact_page.html'. Jeigu bus nenurodytas, sistema "
 "naudos 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registracija privaloma"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Jeigu pažymėta, tik prisijungę vartotojai galės matyti šį puslapį."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "paprastas puslapis"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "paprasti puslapiai"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Šis laukas yra privalomas."
diff --git a/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.mo
index ee7dee4bb0..8db09feedd 100644
Binary files a/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.po
index c827bd7dd8..971243e2ba 100644
--- a/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/lv/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Papildus opcijas"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -52,23 +52,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "virsraksts"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "saturs"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "ieslēgt komentārus"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "šablona nosaukums"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,19 +76,23 @@ msgstr ""
 "Piemēram: 'flatpages/contact_page.html'. Ja tas nav norādīts, sistēma "
 "lietos  'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "reģistrācija obligāta"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ja šis ir atzīmēts, tikai pieslēgušies lietotāji, varēs piekļūt šai lapu."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "vienkārša lapa"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "vienkāršas lapas"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Šis lauks ir obligāts."
diff --git a/django/contrib/flatpages/locale/mk/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/mk/LC_MESSAGES/django.mo
index 61df80285e..6ccac351b5 100644
Binary files a/django/contrib/flatpages/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/mk/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/mk/LC_MESSAGES/django.po
index 868b65e542..73ceba08b7 100644
--- a/django/contrib/flatpages/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/mk/LC_MESSAGES/django.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-12 11:18+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Напредни можности"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr "На линкот му недостасува завршна црта."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Страница со url %(url)s  веќе постои за сајт %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "наслов"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "содржина"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "овозможи коментари"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "име на шаблонот"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,20 +79,24 @@ msgstr ""
 "На пр. „flatpages/kontakt.html'. Ако не го внесете ова, системот ќе користи "
 "„flatpages/default.html“."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "потребна е регистрација"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ако ова е штиклирано, само најавените корисници ќе можат да ја гледаат оваа "
 "страница."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "статична страница"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "статични страници"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Ова поле е задолжително."
diff --git a/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.mo
index 6faa0fad5e..214fd47d02 100644
Binary files a/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.po
index 0b7aeb75be..3c736a7b9b 100644
--- a/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ml/LC_MESSAGES/django.po
@@ -2,27 +2,27 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Rajeesh Nair <rajeeshrnair@gmail.com>, 2011.
+# Rajeesh Nair <rajeeshrnair@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "ഉന്നത സൗകര്യങ്ങള്‍"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL(വെബ്-വിലാസം)"
 
@@ -41,34 +41,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URLന്റെ മുന്‍വശത്ത് ഒരു സ്ലാഷിന്റെ കുറവുണ്ട്."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URLന്റെ പിന്‍വശത്ത് ഒരു സ്ലാഷിന്റെ കുറവുണ്ട്."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "%(site)s എന്ന സൈറ്റിനു %(url)s എന്ന url ഉള്ള ഫ്ലാറ്റ്പേജ് നിലവിലുണ്ട്"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "ശീര്‍ഷകം"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "ഉള്ളടക്കം"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "അഭിപ്രായങ്ങള്‍ അനുവദിക്കുക"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ടെമ്പ്ലേറ്റിന്റെ പേര്"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,18 +76,22 @@ msgstr ""
 "ഉദാ: 'flatpages/contact_page.html'. ഇതു നല്കിയില്ലെങ്കില്‍, 'flatpages/default."
 "html' എന്ന വിലാസം ഉപയോഗിക്കപ്പെടും."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "രജിസ്ട്രേഷന്‍ ആവശ്യമാണ്"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "ഇതു ടിക് ചെയ്താല്‍ പിന്നെ ലോഗ്-ഇന്‍ ചെയ്ത യൂസര്‍ക്കു മാത്രമേ ഈ പേജ് കാണാന്‍ കഴിയൂ."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "ഫ്ളാറ്റ് പേജ്"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "ഫ്ളാറ്റ് പേജുകള്‍"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "ഈ കള്ളി(ഫീല്‍ഡ്) നിര്‍ബന്ധമാണ്."
diff --git a/django/contrib/flatpages/locale/mn/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/mn/LC_MESSAGES/django.mo
index 098ca8cebf..593738df68 100644
Binary files a/django/contrib/flatpages/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/mn/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/mn/LC_MESSAGES/django.po
index 7e44ccddc0..c3ddce18f7 100644
--- a/django/contrib/flatpages/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/mn/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-11 05:32+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Дээд хэрэглээний сонголтууд"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr "URL ийн арийн slash ийг мартсан байна"
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Хуудасны хаяг %(url)s  %(site)s  дээр давхардаж байна."
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "гарчиг"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "агуулга"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "санал сэтгэгдэл үлдээх боломжтой болгох"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "загварын нэр"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,20 +77,24 @@ msgstr ""
 "Жишээ: 'flatpages/contact_page.html'. Хэрэв ийм зүйл гарч ирэхгүй бол систем "
 "'flatpages/default.html'-ийг хэрэглэнэ."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "бүртгэгдсэн хэрэглэгчид үзнэ"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Үүнийг чагтлавал зөвхөн сайтад нэвтэрсэн хэрэглэгч сайтыг харах боломжтой "
 "болно."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "өөрчлөлтгүй хуудас"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "өөрчлөлтгүй хуудаснууд"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Энэ талбарыг бөглөх шаардлагатай."
diff --git a/django/contrib/flatpages/locale/my/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..e746c43fe6
Binary files /dev/null and b/django/contrib/flatpages/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/my/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..31fa1407f1
--- /dev/null
+++ b/django/contrib/flatpages/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,92 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 16:48+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin.py:10
+msgid "Advanced options"
+msgstr ""
+
+#: forms.py:7 models.py:11
+msgid "URL"
+msgstr "ယူအာအယ်"
+
+#: forms.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: forms.py:10
+msgid ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
+msgstr ""
+
+#: forms.py:19
+msgid "URL is missing a leading slash."
+msgstr ""
+
+#: forms.py:23
+msgid "URL is missing a trailing slash."
+msgstr ""
+
+#: forms.py:38
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
+msgstr ""
+
+#: models.py:12
+msgid "title"
+msgstr ""
+
+#: models.py:13
+msgid "content"
+msgstr ""
+
+#: models.py:14
+msgid "enable comments"
+msgstr ""
+
+#: models.py:15
+msgid "template name"
+msgstr ""
+
+#: models.py:16
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+
+#: models.py:17
+msgid "registration required"
+msgstr ""
+
+#: models.py:17
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: models.py:22
+msgid "flat page"
+msgstr ""
+
+#: models.py:23
+msgid "flat pages"
+msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr ""
diff --git a/django/contrib/flatpages/locale/nb/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/nb/LC_MESSAGES/django.mo
index 6c9be6c97b..ca7add746c 100644
Binary files a/django/contrib/flatpages/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/nb/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/nb/LC_MESSAGES/django.po
index adaea7693f..1bb1acbbb8 100644
--- a/django/contrib/flatpages/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/nb/LC_MESSAGES/django.po
@@ -9,22 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-12 21:45+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Sigurd Gartmann <sigurdga-transifex@sigurdga.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Avanserte innstillinger"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "Nettadresse"
 
@@ -55,23 +55,23 @@ msgstr "URL mangler avsluttende skråstrek."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Flatside med URL-en %(url)s finnes allerede for siden %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "tittel"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "innhold"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "tillat kommentarer"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "malnavn"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,18 +79,22 @@ msgstr ""
 "Eksempel: «flatpages/kontakt_side.html». Hvis denne ikke er gitt, vil "
 "«flatpages/default.html» bli brukt."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "krever registrering"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Hvis denne er krysset av, kan kun innloggede brukere se siden."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "flatside"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "flatsider"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Feltet er påkrevet."
diff --git a/django/contrib/flatpages/locale/ne/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ne/LC_MESSAGES/django.mo
index 5e6d99d299..f3e090ea3a 100644
Binary files a/django/contrib/flatpages/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ne/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ne/LC_MESSAGES/django.po
index caf3de6dc4..bb42849a65 100644
--- a/django/contrib/flatpages/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ne/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Sagar Chalise <chalisesagar@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr ""
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -49,40 +49,44 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "शीर्षक"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "विषय"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "प्रतिकृयाको लागि मञ्जुरी दिनुहोस"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr ""
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr ""
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr ""
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "यो फाँट अनिवार्य छ ।"
diff --git a/django/contrib/flatpages/locale/nl/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/nl/LC_MESSAGES/django.mo
index 9113a301e7..7aee6a295a 100644
Binary files a/django/contrib/flatpages/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/nl/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/nl/LC_MESSAGES/django.po
index b212ab81e7..ebb88790f9 100644
--- a/django/contrib/flatpages/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/nl/LC_MESSAGES/django.po
@@ -9,22 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Geavanceerde opties"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -54,23 +54,23 @@ msgstr "In de URL ontbreekt een eind slash."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Platte pagina met url %(url)s bestaat al voor site %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titel"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "inhoud"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "opmerkingen toestaan"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "sjabloonnaam"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -78,20 +78,24 @@ msgstr ""
 "Voorbeeld: 'flatpages/contact_page.html'. Als deze niet is opgegeven, dan "
 "wordt 'flatpages/default.html' gebruikt."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registratie verplicht"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Indien dit is aangevinkt kunnen alleen ingelogde gebruikers deze pagina "
 "bekijken."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "platte pagina"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "platte pagina's"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Dit veld is verplicht."
diff --git a/django/contrib/flatpages/locale/nn/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/nn/LC_MESSAGES/django.mo
index 5ddc9c459d..1fa65e4dbf 100644
Binary files a/django/contrib/flatpages/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/nn/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/nn/LC_MESSAGES/django.po
index 5221a6b934..552a04ba3f 100644
--- a/django/contrib/flatpages/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/nn/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: hgrimelid <havard@grimelid.com>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Avanserte innstillingar"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "Nettadresse"
 
@@ -53,23 +53,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "tittel"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "innhald"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "tillat kommentarer"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "malnamn"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,18 +77,22 @@ msgstr ""
 "Døme: 'flatpages/kontakt_side.html'. Dersom denne ikkje er gjeve, vil "
 "'flatpages/default.html' bli brukt."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "krevar registrering"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Dersom denne er kryssa av, kan berre innlogga brukarar sjå sida."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "flatside"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "flatsider"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Feltet er påkravd."
diff --git a/django/contrib/flatpages/locale/os/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/os/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..0fbdc075a4
Binary files /dev/null and b/django/contrib/flatpages/locale/os/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/os/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/os/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..0a27a83faa
--- /dev/null
+++ b/django/contrib/flatpages/locale/os/LC_MESSAGES/django.po
@@ -0,0 +1,101 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Xwybylty Soslan <soslanx@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-03-21 08:10+0000\n"
+"Last-Translator: Soslan Khubulov <soslanx@gmail.com>\n"
+"Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/"
+"os/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: os\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin.py:10
+msgid "Advanced options"
+msgstr "Флдӕр фадӕттӕ"
+
+#: forms.py:7 models.py:11
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Цӕвиттон: '/about/contact/'. Дӕ хъус дар цӕмӕ дзы сӕйраг ӕмӕ хицӕнгӕнаг "
+"слӕштӕ уой."
+
+#: forms.py:10
+msgid ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
+msgstr ""
+"Ам хъуамӕ ӕрмӕст дамгъӕтӕ, стъӕлфытӕ, бынылхӕххытӕ, дефистӕ, слӕштӕ ӕмӕ "
+"тильдӕтӕ уой."
+
+#: forms.py:19
+msgid "URL is missing a leading slash."
+msgstr "URL-ы сӕйраг слӕш нӕй."
+
+#: forms.py:23
+msgid "URL is missing a trailing slash."
+msgstr "URL-ы хицӕнгӕнаг слӕш нӕй."
+
+#: forms.py:38
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
+msgstr "%(url)s url-имӕ тъӕпӕнфарс нырид ис %(site)s сайтӕн"
+
+#: models.py:12
+msgid "title"
+msgstr "сӕр"
+
+#: models.py:13
+msgid "content"
+msgstr "мидис"
+
+#: models.py:14
+msgid "enable comments"
+msgstr "хъуыдытӕ баиу кӕнын"
+
+#: models.py:15
+msgid "template name"
+msgstr "хуызӕгы ном"
+
+#: models.py:16
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+"Цӕвиттон: 'flatpages/contact_page.html'. Кӕд ай лӕвӕрд нӕу, уӕд системӕ "
+"сӕвӕрдзӕн 'flatpages/default.html'."
+
+#: models.py:17
+msgid "registration required"
+msgstr "регистраци хъӕуы"
+
+#: models.py:17
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Кӕд ай нысангонд у, уӕд ацы фарс ӕрмӕст системӕмӕ хызт архайджытӕн уыдзӕнис "
+"бар уынын."
+
+#: models.py:22
+msgid "flat page"
+msgstr "тъӕпӕн фарс"
+
+#: models.py:23
+msgid "flat pages"
+msgstr "тъӕпӕн фӕрстӕ"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Ацы быдыр ӕнӕмӕнг у."
diff --git a/django/contrib/flatpages/locale/pa/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/pa/LC_MESSAGES/django.mo
index f31b4b62b6..bfeda09daf 100644
Binary files a/django/contrib/flatpages/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/pa/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/pa/LC_MESSAGES/django.po
index 4becb50ec6..a0a270e0b0 100644
--- a/django/contrib/flatpages/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/pa/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "ਤਕਨੀਕੀ ਚੋਣਾਂ"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -49,40 +49,44 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "ਟਾਈਟਲ"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "ਸਮੱਗਰੀ"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "ਟਿੱਪਣੀਆਂ ਚਾਲੂ"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ਟੈਪਲੇਟ ਨਾਂ"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਲੋੜੀਦੀ ਹੈ"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr ""
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "ਇਹ ਖੇਤਰ ਲਾਜ਼ਮੀ ਹੈ।"
diff --git a/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.mo
index 31005f27c3..a08185797d 100644
Binary files a/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.po
index 70cc54717f..56f29664e1 100644
--- a/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/pl/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-12 00:25+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: angularcircle <angular.circle@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opcje zaawansowane"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -56,23 +56,23 @@ msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 "Strona statyczna o adresie %(url)s została już utworzona dla domeny %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "tytuł"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "zawartość"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "włącz komentarze"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nazwa szablonu"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -80,19 +80,23 @@ msgstr ""
 "Przykład: 'flatpages/contact_page.html'. Jeżeli nie zostanie podane, system "
 "użyje 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "wymagana rejestracja"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Jeżeli zaznaczone - tylko zalogowani użytkownicy będą mogli zobaczyć stronę."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "strona statyczna"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "strony statyczne"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "To pole jest wymagane."
diff --git a/django/contrib/flatpages/locale/pt/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/pt/LC_MESSAGES/django.mo
index d7e894a939..cf1d9b953a 100644
Binary files a/django/contrib/flatpages/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/pt/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/pt/LC_MESSAGES/django.po
index 114b6247d4..144699aed1 100644
--- a/django/contrib/flatpages/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/pt/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opções avançadas"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr "Está a faltar a barra final no URL."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "A página plana com o url %(url)s já existe no site %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "título"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "conteúdo"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "permitir comentários"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nome da template"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,20 +77,24 @@ msgstr ""
 "Exemplo: 'flatpages/contact_page.html'. Se não for fornecido, o sistema "
 "usará: 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "é necessário registo"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Se estiver selecionado, apenas utilizadores autenticados poderão ver esta "
 "página."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "página plana"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "páginas planas"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Este campo é obrigatório."
diff --git a/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.mo
index f7a2d384ab..e1181e8563 100644
Binary files a/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.po
index 5ed7109085..d13d7baa48 100644
--- a/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-19 18:06+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opções avançadas"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr "Está faltando uma barra no final da URL."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Uma Flatpage com a URL %(url)s já existe para o site %(site)s "
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "título"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "conteúdo"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "habilitar comentários"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nome do template"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,19 +77,23 @@ msgstr ""
 "Exemplo: 'flatpages/contact_page.html'. Se não for informado, será utilizado "
 "'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registro obrigatório"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Se estiver assinalado, apenas usuários autenticados poderão ver a página."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "página plana"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "páginas planas"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Este campo é obrigatório."
diff --git a/django/contrib/flatpages/locale/ro/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ro/LC_MESSAGES/django.mo
index 57b22f4fa2..28c2b0f4d6 100644
Binary files a/django/contrib/flatpages/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ro/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ro/LC_MESSAGES/django.po
index f5de3ff323..9895ed0072 100644
--- a/django/contrib/flatpages/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ro/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Opțiuni avansate"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titlu"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "conținut"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "permite comentarii"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "nume șablon"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,20 +79,24 @@ msgstr ""
 "Exemplu: 'flatpages/contact_page.html'. Dacă aceasta nu există, sistemul va "
 "folosi 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "necesită înregistrare"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Dacă aceasta este bifată, numai utilizatorii autentificați vor putea vedea "
 "pagina."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "pagină statică"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "pagini statice"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Acest câmp este obligatoriu."
diff --git a/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.mo
index edd9923150..5b2a5e9bb4 100644
Binary files a/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.po
index 5c714d1341..c0f23d6b60 100644
--- a/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ru/LC_MESSAGES/django.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Расширенные настройки"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -57,23 +57,23 @@ msgstr "В конце URL отсутствует косая черта"
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Простая страница с адресом %(url)s уже существует для сайта %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "заголовок"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "содержимое"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "включить комментарии"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "имя шаблона"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -81,18 +81,22 @@ msgstr ""
 "Пример: 'flatpages/contact_page.html'. Если не указано, система будет "
 "использовать 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "требуется регистрация"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Если отмечено, только вошедшие пользователи смогут видеть страницу."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "простая страница"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "простые страницы"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Обязательное поле."
diff --git a/django/contrib/flatpages/locale/sk/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/sk/LC_MESSAGES/django.mo
index 8f6afe6cfa..01fb8da1c8 100644
Binary files a/django/contrib/flatpages/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/sk/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/sk/LC_MESSAGES/django.po
index 8b8b32299c..4d08eef1df 100644
--- a/django/contrib/flatpages/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/sk/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Pokročilé nastavenia"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -42,34 +42,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "V URL chýba úvodná lomka."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "V URL chýba koncová lomka."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Statická stránka s url %(url)s pre sídlo %(site)s už existuje."
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "názov"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "obsah"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "povoliť komentáre"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "názov šablóny"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,20 +77,24 @@ msgstr ""
 "Príklad: 'flatpages/contact_page.html'. Ak nič nenapíšete, systém použije "
 "'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "nutná registrácia"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ak je toto zaškrtnuté, stránku budú môcť prezerať len prihlásení "
 "používatelia."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "statická stránka"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "statické stránky"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Toto pole je povinné."
diff --git a/django/contrib/flatpages/locale/sl/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/sl/LC_MESSAGES/django.mo
index d2da5b282c..99a9be7f94 100644
Binary files a/django/contrib/flatpages/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/sl/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/sl/LC_MESSAGES/django.po
index e7d6538da1..2138bf53f2 100644
--- a/django/contrib/flatpages/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/sl/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Gašper Žejn <zejn@kiberpipa.org>, 2012.
 # iElectric <domen@dev.si>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 #   <zejn@kiberpipa.org>, 2012.
@@ -8,32 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-31 19:50+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Napredne možnosti"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
-msgstr "URL (spletni naslov)"
+msgstr "Naslov URL"
 
 #: forms.py:8
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
-"Primer: '/about/contact/'. Preverite ali vsebuje / (poševnico) na začetku in "
-"koncu vnosa."
+"Primer: '/about/contact/'. Poševnica (/) mora biti na začetku in na koncu "
+"vnosa."
 
 #: forms.py:10
 msgid ""
@@ -45,55 +46,57 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr "Na začetku URL naslova manjka poševnica."
+msgstr "Na začetku naslov URL manjka poševnica."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr "Na koncu URL naslova manjka poševnica."
+msgstr "Na koncu naslova URL manjka poševnica."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Enostavna stran na naslovu %(url)s že obstaja na strani %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "naslov"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "vsebina"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
-msgstr "omogoči komentarje"
+msgstr "omogoči opombe"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ime predloge"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
-"Primer: 'flatpages/contact_page.html'. Če to polje ni izpolnjeno, bo sistem "
-"uporabil 'flatpages/default.html'."
+"Primer: 'flatpages/contact_page.html'. Kadar je to polje prazno, sistem "
+"uporabi 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
-msgstr "obvezna registracija"
+msgstr "zahtevana je registracija"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Če je to polje izbrano, si bodo to stran lahko ogledali le prijavljeni "
-"uporabniki."
+msgstr "Izbrana možnost omogoča ogled strani le prijavljenim uporabnikom."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "enostavna stran"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "enostavne strani"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "To polje mora biti izpolnjeno."
diff --git a/django/contrib/flatpages/locale/sq/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/sq/LC_MESSAGES/django.mo
index b51d06b079..61b49eda1f 100644
Binary files a/django/contrib/flatpages/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/sq/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/sq/LC_MESSAGES/django.po
index 9f3487b2ea..7da9839883 100644
--- a/django/contrib/flatpages/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/sq/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-12-09 09:09+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Mundësi të mëtejshme"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -41,34 +41,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URL-së i mungon një pjerrake në krye."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URL-së i mungon një pjerrake në fund."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "Ka tashmë një flatpage me url %(url)s për site-in %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titull"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "lëndë"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "aktivizo komente"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "emër gjedheje"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,20 +76,24 @@ msgstr ""
 "Shembull: 'flatpages/contact_page.html'. Nëse nuk ka një të tillë, sistemi "
 "do të përdorë 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "lypset regjistrim"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Po iu vu shenjë kësaj, vetëm përdoruesit që kanë bërë hyrjen do të jenë në "
 "gjendje të shohin faqen."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "faqe e e thjeshtë"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "faqe të thjeshta"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Kjo fushë është e domosdoshme."
diff --git a/django/contrib/flatpages/locale/sr/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/sr/LC_MESSAGES/django.mo
index eae94322eb..8899e3f7e4 100644
Binary files a/django/contrib/flatpages/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/sr/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/sr/LC_MESSAGES/django.po
index f92f5dc9db..091253c259 100644
--- a/django/contrib/flatpages/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/sr/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Напредна подешавања"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr "Недостаје коса црта на крају URL-а."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Страница са адресом %(url)s већ постоји за сајт %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "наслов"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "садржај"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "омогући коментарисање"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "назив темплејта"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,19 +79,23 @@ msgstr ""
 "Пример: 'flatpages/contact_page.html'. Ако ово оставите празним, систем ће "
 "користити 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "потребна регистрација"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ако је ово обележено, само ће пријављени корисници моћи да виде ову страницу."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "флет страница"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "флет странице"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Ово поље се мора попунити."
diff --git a/django/contrib/flatpages/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/sr_Latn/LC_MESSAGES/django.mo
index 3e25947277..23ec780661 100644
Binary files a/django/contrib/flatpages/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/sr_Latn/LC_MESSAGES/django.po
index 3daf869937..d16ee75fd8 100644
--- a/django/contrib/flatpages/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Napredna podešavanja"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr "Nedostaje kosa crta na kraju URL-a."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Stranica sa adresom %(url)s već postoji za sajt %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "naslov"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "sadržaj"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "omogući komentarisanje"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "naziv templejta"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,20 +79,24 @@ msgstr ""
 "Primer: 'flatpages/contact_page.html'. Ako ovo ostavite praznim, sistem će "
 "koristiti 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "potrebna registracija"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Ako je ovo obeleženo, samo će prijavljeni korisnici moći da vide ovu "
 "stranicu."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "flet stranica"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "flet stranice"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Ovo polje se mora popuniti."
diff --git a/django/contrib/flatpages/locale/sv/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/sv/LC_MESSAGES/django.mo
index da23b4c049..89f44bdc6c 100644
Binary files a/django/contrib/flatpages/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/sv/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/sv/LC_MESSAGES/django.po
index 3903e7f0b1..c9ac688831 100644
--- a/django/contrib/flatpages/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/sv/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Avancerade inställningar"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr "URL:en saknar ett avslutande snedstreck."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Statisk sida med %(url)s finns redan för webbplatsen %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "titel"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "innehåll"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "aktivera kommentarer"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "mallnamn"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,18 +77,22 @@ msgstr ""
 "Exempel: 'sidor/kontaktsida.html'. Om detta inte fylls i kommer systemet att "
 "använda 'flatpages/default.html'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "registrering krävs"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Om detta bockas för kommer endast inloggade användare kunna se sidan."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "statisk sida"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "statiska sidor"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Detta fält måste fyllas i."
diff --git a/django/contrib/flatpages/locale/sw/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/sw/LC_MESSAGES/django.mo
index 5112f3670e..88894a9eac 100644
Binary files a/django/contrib/flatpages/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/sw/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/sw/LC_MESSAGES/django.po
index 0a139ba88b..f027b24cd1 100644
--- a/django/contrib/flatpages/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/sw/LC_MESSAGES/django.po
@@ -5,22 +5,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Chaguzi za hali ya juu"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -48,40 +48,44 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "kichwa"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "maudhui"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "ruhusu maoni"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr ""
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "usajili unahitajika"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr ""
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Sehemu hii inahitajika"
diff --git a/django/contrib/flatpages/locale/ta/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ta/LC_MESSAGES/django.mo
index 57dc184f8d..ca98b7c28b 100644
Binary files a/django/contrib/flatpages/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ta/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ta/LC_MESSAGES/django.po
index 84c0a9cfe1..2a3a89bc2e 100644
--- a/django/contrib/flatpages/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ta/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr ""
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -49,23 +49,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "தலைப்பு"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "பொருளடக்கம்"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "விமர்சனங்களை செயலாக்கு"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "வார்ப்புரு பெயர்"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -73,19 +73,23 @@ msgstr ""
 "உதாரணம்  'flatpages/contact_page'. இது இல்லையெனில் 'flatpages/default' என்பதே "
 "பயன்படுத்தப்படும்.ப்படும்."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "முன்பதிவு தேவை"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "இது தெரிவு செய்யப்பட்டிருந்தால், உள்நுழைந்த பயனர்கள் மட்டுமே இந்தப் பக்கத்தை பார்க்க முடியும்."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "எளிய பக்கம்"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "எளிய பக்கங்கள்"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "இந்த  புலத்தில் மதிப்பு தேவை"
diff --git a/django/contrib/flatpages/locale/te/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/te/LC_MESSAGES/django.mo
index 2cd8d56381..4e4212a92f 100644
Binary files a/django/contrib/flatpages/locale/te/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/te/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/te/LC_MESSAGES/django.po
index 82b5d39adc..d5e2518441 100644
--- a/django/contrib/flatpages/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/te/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr ""
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -49,23 +49,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "పట్టము"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "సూచన "
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr ""
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr ""
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -73,18 +73,22 @@ msgstr ""
 "ఉదాహరణ: 'flatpages/contact_page.html'.ఇది ఇవ్వకపోతే సిస్టం  'flatpages/default."
 "html' ని వాడుకుంటడి"
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "నమొదు చేయటము అవసరం"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "ఇది చెక్ చేసి ఉంటే కేవలం లాగ్గడ్ ఇన్ యూజర్లు పేజి చూడలేస్తారు"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr ""
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "ఈ ఫీల్డ్ అవసరము"
diff --git a/django/contrib/flatpages/locale/th/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/th/LC_MESSAGES/django.mo
index 6963c2ac04..87c673fe82 100644
Binary files a/django/contrib/flatpages/locale/th/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/th/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/th/LC_MESSAGES/django.po
index 1916c6ad23..6f84bfbbcc 100644
--- a/django/contrib/flatpages/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/th/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-09 04:29+0000\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: Kowit Charoenratchatabhan <kowit.s.c@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "ตัวเลือกเพิ่มเติม"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -50,23 +50,23 @@ msgstr "เครื่องหมาย \"/\" ตามหลัง URL หา
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "หน้าเรียบชื่อ %(url)s ถูกใช้ไปแล้วสำหรับ %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "หัวข้อ"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "เนื้อหา"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "ใช้งานข้อติชม"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ชื่อเทมเพลต"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -74,18 +74,22 @@ msgstr ""
 "ตัวอย่าง: 'flatpages/contact_page.html' ถ้าไม่ได้ถูกใช้ ระบบจะใช้ 'flatpages/default."
 "html' "
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "ต้องลงทะเบียนก่อน"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "ถ้าถูกเลือก ผู้ใช้ที่ลงทะเบียนเข้าสู่ระบบเท่านั้นที่จะสามารถดูหน้านี้"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "หน้าเรียบ"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "หน้าเรียบ"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "ฟิลด์นี้จำเป็น"
diff --git a/django/contrib/flatpages/locale/tr/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/tr/LC_MESSAGES/django.mo
index 0ae6b7aacf..1ba8477975 100644
Binary files a/django/contrib/flatpages/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/tr/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/tr/LC_MESSAGES/django.po
index 5f7b780968..8b64b4f09e 100644
--- a/django/contrib/flatpages/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/tr/LC_MESSAGES/django.po
@@ -8,22 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 20:33+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Murat Çorlu <muratcorlu@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Gelişmiş seçenekler"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr "URL sonunda bölü işareti yok."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "%(url)s adresli düz sayfa %(site)s sitesinde zaten mevcut"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "başlık"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "içerik"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "yorumlara izin ver"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "şablon adı"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,18 +79,22 @@ msgstr ""
 "Örnek: 'flatpages/contact_page.html'. Eğer birşey yazılmazsa, sistem "
 "otomatik olarak 'flatpages/default.html' kullanacak."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "kayıt gerekli"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Bu seçili ise, sadece kayıtlı kullanıcılar sayfayı görüntüleyebilir."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "düz sayfa"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "düz sayfalar"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Bu alan zorunludur."
diff --git a/django/contrib/flatpages/locale/tt/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/tt/LC_MESSAGES/django.mo
index 3392f8e762..6bd9b981cd 100644
Binary files a/django/contrib/flatpages/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/tt/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/tt/LC_MESSAGES/django.po
index 717992c7a0..e499abb849 100644
--- a/django/contrib/flatpages/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/tt/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:37+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Өстәмә көйләүләр"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -53,23 +53,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "башлам"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "эчтәлек"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "фикерләрне ялгарга"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "шаблон исеме"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -77,19 +77,23 @@ msgstr ""
 "Үрнәк: 'flatpages/contact_page.html'. Күрсәтелгән булмаса, система "
 "'flatpages/defalut.html' кулланыр."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "теркәлү кирәк"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Билгеләнгән булса, фәкать кергән кулланучылар гына сәхифәне күрә алырлар."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "гади сәхифә"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "гади сәхифәләр"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Мәҗбүри кыр."
diff --git a/django/contrib/flatpages/locale/udm/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/udm/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..2df306de04
Binary files /dev/null and b/django/contrib/flatpages/locale/udm/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/udm/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/udm/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..a21ce2056b
--- /dev/null
+++ b/django/contrib/flatpages/locale/udm/LC_MESSAGES/django.po
@@ -0,0 +1,91 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 16:48+0000\n"
+"Last-Translator: Django team\n"
+"Language-Team: Udmurt (http://www.transifex.com/projects/p/django/language/"
+"udm/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: udm\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin.py:10
+msgid "Advanced options"
+msgstr ""
+
+#: forms.py:7 models.py:11
+msgid "URL"
+msgstr "URL"
+
+#: forms.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: forms.py:10
+msgid ""
+"This value must contain only letters, numbers, dots, underscores, dashes, "
+"slashes or tildes."
+msgstr ""
+
+#: forms.py:19
+msgid "URL is missing a leading slash."
+msgstr ""
+
+#: forms.py:23
+msgid "URL is missing a trailing slash."
+msgstr ""
+
+#: forms.py:38
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
+msgstr ""
+
+#: models.py:12
+msgid "title"
+msgstr ""
+
+#: models.py:13
+msgid "content"
+msgstr ""
+
+#: models.py:14
+msgid "enable comments"
+msgstr ""
+
+#: models.py:15
+msgid "template name"
+msgstr ""
+
+#: models.py:16
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+
+#: models.py:17
+msgid "registration required"
+msgstr ""
+
+#: models.py:17
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: models.py:22
+msgid "flat page"
+msgstr ""
+
+#: models.py:23
+msgid "flat pages"
+msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Та клуэ."
diff --git a/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.mo
index 9f3985e140..0332447ebc 100644
Binary files a/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.po
index 97a17a2363..64a09026ef 100644
--- a/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/uk/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-03-11 17:11+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Додаткові опції"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -55,23 +55,23 @@ msgstr "В кінці URL відсутня коса риса."
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr "Проста сторінка з адресою %(url)s вже існує для сайту %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "заголовок"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "зміст"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "увімкнути коментарі"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "ім'я шаблона"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -79,20 +79,24 @@ msgstr ""
 "Приклад: 'flatpages/contact_page'. Якщо це не надано, система буда "
 "використовувати 'flatpages/default'."
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "потрібна реєстрація"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Якщо тут є галочка, тільки користувачі, що увійшли, зможуть переглядати цю "
 "сторінку."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "проста сторінка"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "прості сторінки"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Це поле обов'язкове."
diff --git a/django/contrib/flatpages/locale/ur/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ur/LC_MESSAGES/django.mo
index 4b8c048f29..d6564b5d23 100644
Binary files a/django/contrib/flatpages/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/ur/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ur/LC_MESSAGES/django.po
index 3753377a44..c3a99547a6 100644
--- a/django/contrib/flatpages/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/ur/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "اعلٰی اختیارات"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "یو آر ایل (URL("
 
@@ -52,23 +52,23 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "عنوان"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "مضمون"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "تبصرے فعال کریں"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "قالب کا نام"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -76,20 +76,24 @@ msgstr ""
 "مثال: 'flatpages/contact_page.html'۔ اگر یہ مھیا نھیں کیا گیا تو سسٹم "
 "'flatpages/default.html' استعمال کرے گا۔"
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "رجسٹریشن ضروری ھے"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "اگر یہ فعال ھے تو صرف اندر آئے ھوئے (logged-in) صارفین یہ صفحہ دیکھنے کے "
 "قابل ھوں گے۔"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "ھموار صفحہ"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "ھموار صفحے"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "یہ خانہ درکار ھے۔"
diff --git a/django/contrib/flatpages/locale/vi/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/vi/LC_MESSAGES/django.mo
index 2841506eef..78eb4eb64f 100644
Binary files a/django/contrib/flatpages/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/vi/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/vi/LC_MESSAGES/django.po
index d89c26bccf..2982a17a5b 100644
--- a/django/contrib/flatpages/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/vi/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
 "Last-Translator: Tran <hongdiepkien@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "Các lựa chọn "
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -50,42 +50,46 @@ msgstr ""
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "tiêu đề"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "nội dung"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "mở bình luận"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "tên thiết kế"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "Bạn cần phải cần đăng kí"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 "Nếu bạn đánh dấu vào đây, chỉ những tài khoản đã đăng nhập mới có thể xem "
 "được trang này."
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr ""
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr ""
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "Trường này là bắt buộc."
diff --git a/django/contrib/flatpages/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/zh_CN/LC_MESSAGES/django.mo
index 2f2f654e7f..39fb8d7b4b 100644
Binary files a/django/contrib/flatpages/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/zh_CN/LC_MESSAGES/django.po
index 485e41c6ee..bf80dc0424 100644
--- a/django/contrib/flatpages/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/zh_CN/LC_MESSAGES/django.po
@@ -2,27 +2,28 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Kevin Shi <leiarix@gmail.com>, 2012.
 # Lele Long <schemacs@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: Lele Long <schemacs@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "高级选项"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -39,34 +40,34 @@ msgstr "该值必须只能包含字母，数字，点号，下划线，破折号
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URL头部缺失斜线."
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URL尾部缺失斜线."
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "带有url %(url)s的Flatpage已经存在于站点 %(site)s"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "标题"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "内容"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "允许评论"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "模板名称"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -74,18 +75,22 @@ msgstr ""
 "例如：'flatpages/contact_page.html'。若未提供，系统将使用'flatpages/default."
 "html'。"
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "请先注册"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "如果被选中，仅登录用户才可以查看此页。"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "简单页面"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "简单页面"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "这个字段是必填项。"
diff --git a/django/contrib/flatpages/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/zh_TW/LC_MESSAGES/django.mo
index 8b497c46a2..7004cbdab4 100644
Binary files a/django/contrib/flatpages/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/flatpages/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/zh_TW/LC_MESSAGES/django.po
index 44194c310f..b22a205e7c 100644
--- a/django/contrib/flatpages/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,28 +1,29 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <ilay@ilay.tw>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # quantum9876 <quantum9876@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-03-08 12:31+0000\n"
-"Last-Translator: quantum9876 <quantum9876@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-18 10:56+0000\n"
+"Last-Translator: ilay <ilay@ilay.tw>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: admin.py:10
 msgid "Advanced options"
 msgstr "進階選項"
 
-#: forms.py:7 models.py:7
+#: forms.py:7 models.py:11
 msgid "URL"
 msgstr "URL"
 
@@ -40,34 +41,34 @@ msgstr ""
 
 #: forms.py:19
 msgid "URL is missing a leading slash."
-msgstr ""
+msgstr "URL 缺少前導的斜線。"
 
 #: forms.py:23
 msgid "URL is missing a trailing slash."
-msgstr ""
+msgstr "URL 缺少一個斜線。"
 
 #: forms.py:38
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
-msgstr ""
+msgstr "網站 %(site)s 已經存在一個浮動頁面，其位址為 %(url)s。"
 
-#: models.py:8
+#: models.py:12
 msgid "title"
 msgstr "標題"
 
-#: models.py:9
+#: models.py:13
 msgid "content"
 msgstr "內容"
 
-#: models.py:10
+#: models.py:14
 msgid "enable comments"
 msgstr "啟用評論"
 
-#: models.py:11
+#: models.py:15
 msgid "template name"
 msgstr "模板名稱"
 
-#: models.py:12
+#: models.py:16
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -75,18 +76,22 @@ msgstr ""
 "例如： 'flatpages/contact_page'。如果沒有提供它，系統會使用 'flatpages/"
 "default.html'。"
 
-#: models.py:13
+#: models.py:17
 msgid "registration required"
 msgstr "請先註冊"
 
-#: models.py:13
+#: models.py:17
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "如果此項被選取，則只有登入的使用者可以檢視頁面。"
 
-#: models.py:18
+#: models.py:22
 msgid "flat page"
 msgstr "簡平頁面"
 
-#: models.py:19
+#: models.py:23
 msgid "flat pages"
 msgstr "簡平頁面"
+
+#: tests/forms.py:97
+msgid "This field is required."
+msgstr "這個欄位是必須的。"
diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py
index 3a5b4d6135..42bb3adf23 100644
--- a/django/contrib/flatpages/models.py
+++ b/django/contrib/flatpages/models.py
@@ -2,19 +2,21 @@ from __future__ import unicode_literals
 
 from django.db import models
 from django.contrib.sites.models import Site
+from django.core.urlresolvers import get_script_prefix
 from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import python_2_unicode_compatible
-
+from django.utils.encoding import iri_to_uri, python_2_unicode_compatible
 
 @python_2_unicode_compatible
 class FlatPage(models.Model):
     url = models.CharField(_('URL'), max_length=100, db_index=True)
     title = models.CharField(_('title'), max_length=200)
     content = models.TextField(_('content'), blank=True)
-    enable_comments = models.BooleanField(_('enable comments'))
+    enable_comments = models.BooleanField(_('enable comments'), default=False)
     template_name = models.CharField(_('template name'), max_length=70, blank=True,
         help_text=_("Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."))
-    registration_required = models.BooleanField(_('registration required'), help_text=_("If this is checked, only logged-in users will be able to view the page."))
+    registration_required = models.BooleanField(_('registration required'),
+        help_text=_("If this is checked, only logged-in users will be able to view the page."),
+        default=False)
     sites = models.ManyToManyField(Site)
 
     class Meta:
@@ -27,4 +29,5 @@ class FlatPage(models.Model):
         return "%s -- %s" % (self.url, self.title)
 
     def get_absolute_url(self):
-        return self.url
+        # Handle script prefix manually because we bypass reverse()
+        return iri_to_uri(get_script_prefix().rstrip('/') + self.url)
diff --git a/django/contrib/flatpages/tests/__init__.py b/django/contrib/flatpages/tests/__init__.py
index 5dd5e89dca..3703e23cbf 100644
--- a/django/contrib/flatpages/tests/__init__.py
+++ b/django/contrib/flatpages/tests/__init__.py
@@ -1,5 +1,6 @@
-from django.contrib.flatpages.tests.csrf import *
-from django.contrib.flatpages.tests.forms import *
-from django.contrib.flatpages.tests.middleware import *
-from django.contrib.flatpages.tests.templatetags import *
-from django.contrib.flatpages.tests.views import *
+from django.contrib.flatpages.tests.test_csrf import *
+from django.contrib.flatpages.tests.test_forms import *
+from django.contrib.flatpages.tests.test_models import *
+from django.contrib.flatpages.tests.test_middleware import *
+from django.contrib.flatpages.tests.test_templatetags import *
+from django.contrib.flatpages.tests.test_views import *
diff --git a/django/contrib/flatpages/tests/csrf.py b/django/contrib/flatpages/tests/test_csrf.py
similarity index 97%
rename from django/contrib/flatpages/tests/csrf.py
rename to django/contrib/flatpages/tests/test_csrf.py
index e64c4bb102..59996d9824 100644
--- a/django/contrib/flatpages/tests/csrf.py
+++ b/django/contrib/flatpages/tests/test_csrf.py
@@ -1,6 +1,7 @@
 import os
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.test import TestCase, Client
 from django.test.utils import override_settings
 
@@ -38,6 +39,7 @@ class FlatpageCSRFTests(TestCase):
         response = self.client.get('/flatpage_root/no_such_flatpage/')
         self.assertEqual(response.status_code, 404)
 
+    @skipIfCustomUser
     def test_view_authenticated_flatpage(self):
         "A flatpage served through a view can require authentication"
         response = self.client.get('/flatpage_root/sekrit/')
diff --git a/django/contrib/flatpages/tests/forms.py b/django/contrib/flatpages/tests/test_forms.py
similarity index 94%
rename from django/contrib/flatpages/tests/forms.py
rename to django/contrib/flatpages/tests/test_forms.py
index 3bdfa15dfe..29fc0cabb9 100644
--- a/django/contrib/flatpages/tests/forms.py
+++ b/django/contrib/flatpages/tests/test_forms.py
@@ -58,11 +58,12 @@ class FlatpageAdminFormTests(TestCase):
 
         f = FlatpageForm(data=data)
 
-        self.assertFalse(f.is_valid())
+        with translation.override('en'):
+            self.assertFalse(f.is_valid())
 
-        self.assertEqual(
-            f.errors,
-            {'__all__': ['Flatpage with url /myflatpage1/ already exists for site example.com']})
+            self.assertEqual(
+                f.errors,
+                {'__all__': ['Flatpage with url /myflatpage1/ already exists for site example.com']})
 
     def test_flatpage_admin_form_edit(self):
         """
diff --git a/django/contrib/flatpages/tests/middleware.py b/django/contrib/flatpages/tests/test_middleware.py
similarity index 98%
rename from django/contrib/flatpages/tests/middleware.py
rename to django/contrib/flatpages/tests/test_middleware.py
index 4afa4ff982..1ad8fa93b3 100644
--- a/django/contrib/flatpages/tests/middleware.py
+++ b/django/contrib/flatpages/tests/test_middleware.py
@@ -1,6 +1,7 @@
 import os
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.contrib.flatpages.models import FlatPage
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -36,6 +37,7 @@ class FlatpageMiddlewareTests(TestCase):
         response = self.client.get('/flatpage_root/no_such_flatpage/')
         self.assertEqual(response.status_code, 404)
 
+    @skipIfCustomUser
     def test_view_authenticated_flatpage(self):
         "A flatpage served through a view can require authentication"
         response = self.client.get('/flatpage_root/sekrit/')
@@ -57,6 +59,7 @@ class FlatpageMiddlewareTests(TestCase):
         response = self.client.get('/no_such_flatpage/')
         self.assertEqual(response.status_code, 404)
 
+    @skipIfCustomUser
     def test_fallback_authenticated_flatpage(self):
         "A flatpage served by the middleware can require authentication"
         response = self.client.get('/sekrit/')
diff --git a/django/contrib/flatpages/tests/test_models.py b/django/contrib/flatpages/tests/test_models.py
new file mode 100644
index 0000000000..af12c420e0
--- /dev/null
+++ b/django/contrib/flatpages/tests/test_models.py
@@ -0,0 +1,22 @@
+# coding: utf-8
+
+from __future__ import unicode_literals
+
+from django.core.urlresolvers import set_script_prefix, clear_script_prefix
+from django.contrib.flatpages.models import FlatPage
+from django.test import TestCase
+
+
+class FlatpageModelTests(TestCase):
+
+    def test_get_absolute_url_urlencodes(self):
+        pf = FlatPage(title="Café!", url='/café/')
+        self.assertEqual(pf.get_absolute_url(), '/caf%C3%A9/')
+
+    def test_get_absolute_url_honors_script_prefix(self):
+        pf = FlatPage(title="Tea!", url='/tea/')
+        set_script_prefix('/beverages/')
+        try:
+            self.assertEqual(pf.get_absolute_url(), '/beverages/tea/')
+        finally:
+            clear_script_prefix()
diff --git a/django/contrib/flatpages/tests/templatetags.py b/django/contrib/flatpages/tests/test_templatetags.py
similarity index 94%
rename from django/contrib/flatpages/tests/templatetags.py
rename to django/contrib/flatpages/tests/test_templatetags.py
index aebc62277e..1a6f3c2975 100644
--- a/django/contrib/flatpages/tests/templatetags.py
+++ b/django/contrib/flatpages/tests/test_templatetags.py
@@ -1,6 +1,7 @@
 import os
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser, User
+from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.template import Template, Context, TemplateSyntaxError
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -24,9 +25,6 @@ class FlatpageTemplateTagTests(TestCase):
     fixtures = ['sample_flatpages']
     urls = 'django.contrib.flatpages.tests.urls'
 
-    def setUp(self):
-        self.me = User.objects.create_user('testuser', 'test@example.com', 's3krit')
-
     def test_get_flatpages_tag(self):
         "The flatpage template tag retrives unregistered prefixed flatpages by default"
         out = Template(
@@ -51,8 +49,10 @@ class FlatpageTemplateTagTests(TestCase):
             }))
         self.assertEqual(out, "A Flatpage,A Nested Flatpage,")
 
+    @skipIfCustomUser
     def test_get_flatpages_tag_for_user(self):
         "The flatpage template tag retrives all flatpages for an authenticated user"
+        me = User.objects.create_user('testuser', 'test@example.com', 's3krit')
         out = Template(
                 "{% load flatpages %}"
                 "{% get_flatpages for me as flatpages %}"
@@ -60,7 +60,7 @@ class FlatpageTemplateTagTests(TestCase):
                 "{{ page.title }},"
                 "{% endfor %}"
             ).render(Context({
-                'me': self.me
+                'me': me
             }))
         self.assertEqual(out, "A Flatpage,A Nested Flatpage,Sekrit Nested Flatpage,Sekrit Flatpage,")
 
@@ -88,8 +88,10 @@ class FlatpageTemplateTagTests(TestCase):
             }))
         self.assertEqual(out, "A Nested Flatpage,")
 
+    @skipIfCustomUser
     def test_get_flatpages_with_prefix_for_user(self):
         "The flatpage template tag retrive prefixed flatpages for an authenticated user"
+        me = User.objects.create_user('testuser', 'test@example.com', 's3krit')
         out = Template(
                 "{% load flatpages %}"
                 "{% get_flatpages '/location/' for me as location_flatpages %}"
@@ -97,7 +99,7 @@ class FlatpageTemplateTagTests(TestCase):
                 "{{ page.title }},"
                 "{% endfor %}"
             ).render(Context({
-                'me': self.me
+                'me': me
             }))
         self.assertEqual(out, "A Nested Flatpage,Sekrit Nested Flatpage,")
 
diff --git a/django/contrib/flatpages/tests/views.py b/django/contrib/flatpages/tests/test_views.py
similarity index 98%
rename from django/contrib/flatpages/tests/views.py
rename to django/contrib/flatpages/tests/test_views.py
index b69bd6abb4..0448b21227 100644
--- a/django/contrib/flatpages/tests/views.py
+++ b/django/contrib/flatpages/tests/test_views.py
@@ -1,6 +1,7 @@
 import os
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.contrib.flatpages.models import FlatPage
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -36,6 +37,7 @@ class FlatpageViewTests(TestCase):
         response = self.client.get('/flatpage_root/no_such_flatpage/')
         self.assertEqual(response.status_code, 404)
 
+    @skipIfCustomUser
     def test_view_authenticated_flatpage(self):
         "A flatpage served through a view can require authentication"
         response = self.client.get('/flatpage_root/sekrit/')
diff --git a/django/contrib/formtools/locale/ar/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ar/LC_MESSAGES/django.mo
index 48a74cb7de..3b75261b1a 100644
Binary files a/django/contrib/formtools/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ar/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ar/LC_MESSAGES/django.po
index 37d96f588a..6c584e495b 100644
--- a/django/contrib/formtools/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ar/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/az/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/az/LC_MESSAGES/django.mo
index ecbfc76413..b278bb7455 100644
Binary files a/django/contrib/formtools/locale/az/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/az/LC_MESSAGES/django.po b/django/contrib/formtools/locale/az/LC_MESSAGES/django.po
index 95faaa6ab2..23557aba99 100644
--- a/django/contrib/formtools/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/az/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/be/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..aba55f1593
Binary files /dev/null and b/django/contrib/formtools/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/be/LC_MESSAGES/django.po b/django/contrib/formtools/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..3cb9f7e923
--- /dev/null
+++ b/django/contrib/formtools/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,38 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-01 11:44+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: templates/formtools/wizard/wizard_form.html:15
+msgid "first step"
+msgstr "першы крок"
+
+#: templates/formtools/wizard/wizard_form.html:16
+msgid "prev step"
+msgstr "папярэдні крок"
+
+#: templates/formtools/wizard/wizard_form.html:18
+msgid "submit"
+msgstr "падаць"
+
+#: wizard/legacy.py:159
+msgid ""
+"We apologize, but your form has expired. Please continue filling out the "
+"form from this page."
+msgstr ""
+"Прабачце, але тэрмін дзеяньня блянку скончыўся. Працягвайце запаўняць на "
+"гэтай бачыне."
diff --git a/django/contrib/formtools/locale/bg/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/bg/LC_MESSAGES/django.mo
index 275a8561ea..352bfe34dc 100644
Binary files a/django/contrib/formtools/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/bg/LC_MESSAGES/django.po b/django/contrib/formtools/locale/bg/LC_MESSAGES/django.po
index 8098b3dfaf..cd846dbd32 100644
--- a/django/contrib/formtools/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/bg/LC_MESSAGES/django.po
@@ -1,33 +1,34 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <grgkostadinov@gmail.com>, 2012.
 # Todor Lubenov <tlubenov@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Todor Lubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-04-01 19:06+0000\n"
+"Last-Translator: Georgi Kostadinov <grgkostadinov@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "първа стъпка"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "предишна стъпка"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "запази"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/bn/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/bn/LC_MESSAGES/django.mo
index e801321b97..6afb81891c 100644
Binary files a/django/contrib/formtools/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/bn/LC_MESSAGES/django.po b/django/contrib/formtools/locale/bn/LC_MESSAGES/django.po
index 6e3192c2a0..788f94dda9 100644
--- a/django/contrib/formtools/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/bn/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/br/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..18ac3b622b
Binary files /dev/null and b/django/contrib/formtools/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/br/LC_MESSAGES/django.po b/django/contrib/formtools/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..6343ff1ecc
--- /dev/null
+++ b/django/contrib/formtools/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,38 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-29 17:40+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/formtools/wizard/wizard_form.html:15
+msgid "first step"
+msgstr "pazenn gentañ"
+
+#: templates/formtools/wizard/wizard_form.html:16
+msgid "prev step"
+msgstr "pazenn gent"
+
+#: templates/formtools/wizard/wizard_form.html:18
+msgid "submit"
+msgstr "kas"
+
+#: wizard/legacy.py:159
+msgid ""
+"We apologize, but your form has expired. Please continue filling out the "
+"form from this page."
+msgstr ""
+"Ho tigarez met aet eo ho furmskrid d'e dermen. Kendalc'hit d'e leuniañ war "
+"ar bajenn-mañ."
diff --git a/django/contrib/formtools/locale/bs/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/bs/LC_MESSAGES/django.mo
index 8b6e988555..ec8f3a4594 100644
Binary files a/django/contrib/formtools/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/bs/LC_MESSAGES/django.po b/django/contrib/formtools/locale/bs/LC_MESSAGES/django.po
index 24e2e2a171..71cdcdb7ea 100644
--- a/django/contrib/formtools/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/bs/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ca/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ca/LC_MESSAGES/django.mo
index c240aa9373..3c11d26484 100644
Binary files a/django/contrib/formtools/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ca/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ca/LC_MESSAGES/django.po
index 18c5a8b55a..e8fca2f4b7 100644
--- a/django/contrib/formtools/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ca/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-29 23:20+0000\n"
 "Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/cs/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/cs/LC_MESSAGES/django.mo
index 75a1547216..c369a134eb 100644
Binary files a/django/contrib/formtools/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/cs/LC_MESSAGES/django.po b/django/contrib/formtools/locale/cs/LC_MESSAGES/django.po
index ebd77a8633..4cdbe10a55 100644
--- a/django/contrib/formtools/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/cs/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/cy/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/cy/LC_MESSAGES/django.mo
index 90f89ea3c8..cfc045c005 100644
Binary files a/django/contrib/formtools/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/cy/LC_MESSAGES/django.po b/django/contrib/formtools/locale/cy/LC_MESSAGES/django.po
index 4823735237..a355e65ced 100644
--- a/django/contrib/formtools/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/cy/LC_MESSAGES/django.po
@@ -1,19 +1,21 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2011-03-15 15:47+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 16:45+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/da/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/da/LC_MESSAGES/django.mo
index bb9e0d389f..bf22d95b18 100644
Binary files a/django/contrib/formtools/locale/da/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/da/LC_MESSAGES/django.po b/django/contrib/formtools/locale/da/LC_MESSAGES/django.po
index 173604562a..ee3291900e 100644
--- a/django/contrib/formtools/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/da/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Christian Joergensen <christian@gmta.info>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/de/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/de/LC_MESSAGES/django.mo
index c6f1eb5c46..f1512b59bd 100644
Binary files a/django/contrib/formtools/locale/de/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/de/LC_MESSAGES/django.po b/django/contrib/formtools/locale/de/LC_MESSAGES/django.po
index 411bbda09b..a6aea7c8a2 100644
--- a/django/contrib/formtools/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/de/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-18 10:56+0000\n"
 "Last-Translator: André Hagenbruch <ahagenbruch@googlemail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/el/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/el/LC_MESSAGES/django.mo
index acad96682f..b01ae32d26 100644
Binary files a/django/contrib/formtools/locale/el/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/el/LC_MESSAGES/django.po b/django/contrib/formtools/locale/el/LC_MESSAGES/django.po
index 2c123fcae2..192ab34066 100644
--- a/django/contrib/formtools/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/el/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-07 14:57+0000\n"
 "Last-Translator: Yorgos Pagles <y.pagles@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/en/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/en/LC_MESSAGES/django.mo
index 18665ef9bb..64ae715f31 100644
Binary files a/django/contrib/formtools/locale/en/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po
index 04fa380ffa..e3b7dd7557 100644
--- a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po
@@ -1,32 +1,36 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-02-14 13:42+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "first step"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "prev step"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "submit"
 
-#: wizard/legacy.py:159
-msgid ""
-"We apologize, but your form has expired. Please continue filling out the "
-"form from this page."
-msgstr ""
+#~ msgid ""
+#~ "We apologize, but your form has expired. Please continue filling out the "
+#~ "form from this page."
+#~ msgstr ""
+#~ "We apologize, but your form has expired. Please continue filling out the "
+#~ "form from this page."
diff --git a/django/contrib/formtools/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/en_GB/LC_MESSAGES/django.mo
index 9564c36139..67905d4669 100644
Binary files a/django/contrib/formtools/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/formtools/locale/en_GB/LC_MESSAGES/django.po
index 67c3cd27f5..e3fcc9ed78 100644
--- a/django/contrib/formtools/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/en_GB/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: jon_atkinson <jon@jonatkinson.co.uk>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/eo/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/eo/LC_MESSAGES/django.mo
index 019d796387..e140ce203e 100644
Binary files a/django/contrib/formtools/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/eo/LC_MESSAGES/django.po b/django/contrib/formtools/locale/eo/LC_MESSAGES/django.po
index 62903444ff..040891f37a 100644
--- a/django/contrib/formtools/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/eo/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <adam.raizen@gmail.com>, 2012.
 # Baptiste  <bapdarth@yahoo.fr>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-12-11 19:21+0000\n"
+"Last-Translator: sagittarian <adam.raizen@gmail.com>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
@@ -34,5 +35,5 @@ msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
 msgstr ""
-"Ni pardonpetas, sed via formularo eksvalidiĝis. Bonvolu daŭri plenigi la "
-"formularon el ĉi-tiu paĝo."
+"Ni pardonpetas, sed via formularo eksvalidiĝis. Bonvolu daŭre plenigi la "
+"formularon el ĉi tiu paĝo."
diff --git a/django/contrib/formtools/locale/es/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/es/LC_MESSAGES/django.mo
index 04ee1c8312..0eaf6d4391 100644
Binary files a/django/contrib/formtools/locale/es/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/es/LC_MESSAGES/django.po b/django/contrib/formtools/locale/es/LC_MESSAGES/django.po
index 4a9ddc2a2a..053ae531f1 100644
--- a/django/contrib/formtools/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/es/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-01 23:28+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/es_AR/LC_MESSAGES/django.mo
index 2cab93380f..c2515f15c4 100644
Binary files a/django/contrib/formtools/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/formtools/locale/es_AR/LC_MESSAGES/django.po
index 5306d98453..de9ca31bfd 100644
--- a/django/contrib/formtools/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/es_AR/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-14 20:04+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/es_MX/LC_MESSAGES/django.mo
index d931117c77..c8927f35af 100644
Binary files a/django/contrib/formtools/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/formtools/locale/es_MX/LC_MESSAGES/django.po
index 9d35efd979..aa8fbc3fa4 100644
--- a/django/contrib/formtools/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/es_MX/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-06 19:17+0000\n"
 "Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/et/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/et/LC_MESSAGES/django.mo
index 307def8cae..0ce51b3166 100644
Binary files a/django/contrib/formtools/locale/et/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/et/LC_MESSAGES/django.po b/django/contrib/formtools/locale/et/LC_MESSAGES/django.po
index 964096a152..be77656829 100644
--- a/django/contrib/formtools/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/et/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/eu/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/eu/LC_MESSAGES/django.mo
index 7e352192c8..ebc8bcee77 100644
Binary files a/django/contrib/formtools/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/eu/LC_MESSAGES/django.po b/django/contrib/formtools/locale/eu/LC_MESSAGES/django.po
index 14ae66a9dc..8f13842833 100644
--- a/django/contrib/formtools/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/eu/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 21:22+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/fa/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/fa/LC_MESSAGES/django.mo
index fc70744d4b..d4f617831d 100644
Binary files a/django/contrib/formtools/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/fa/LC_MESSAGES/django.po b/django/contrib/formtools/locale/fa/LC_MESSAGES/django.po
index feee69efae..8cb01fee5a 100644
--- a/django/contrib/formtools/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/fa/LC_MESSAGES/django.po
@@ -1,33 +1,34 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Ali Nikneshan <ali@nikneshan.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-21 08:06+0000\n"
+"Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "گام اول"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "گام قبل"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "ارسال"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/fi/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/fi/LC_MESSAGES/django.mo
index 25ad98cca8..6c82090593 100644
Binary files a/django/contrib/formtools/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/fi/LC_MESSAGES/django.po b/django/contrib/formtools/locale/fi/LC_MESSAGES/django.po
index 31b1d045db..8ae2d83175 100644
--- a/django/contrib/formtools/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/fi/LC_MESSAGES/django.po
@@ -2,37 +2,38 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <klaus.dahlen@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-24 15:19+0000\n"
+"Last-Translator: nanook <klaus.dahlen@gmail.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "ensimmäinen vaihe"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "edellinen vaihe"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "lähetä"
 
 #: wizard/legacy.py:159
 msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
 msgstr ""
-"Pahoittelumme, mutta sessiosi on vanhentunut. Ole hyvä ja jatka lomakkeen "
+"Pahoittelumme, mutta istuntosi on vanhentunut. Ole hyvä ja jatka lomakkeen "
 "täyttämistä tältä sivulta."
diff --git a/django/contrib/formtools/locale/fr/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/fr/LC_MESSAGES/django.mo
index c6e87576b0..9110aae33f 100644
Binary files a/django/contrib/formtools/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/fr/LC_MESSAGES/django.po b/django/contrib/formtools/locale/fr/LC_MESSAGES/django.po
index ac6db14b51..52061254b8 100644
--- a/django/contrib/formtools/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/fr/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ga/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ga/LC_MESSAGES/django.mo
index c002149003..c2fc0a1800 100644
Binary files a/django/contrib/formtools/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ga/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ga/LC_MESSAGES/django.po
index b8a85ecc60..7f12cedd52 100644
--- a/django/contrib/formtools/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ga/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-16 13:32+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/gl/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/gl/LC_MESSAGES/django.mo
index d752fbfd9f..115e28f551 100644
Binary files a/django/contrib/formtools/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/gl/LC_MESSAGES/django.po b/django/contrib/formtools/locale/gl/LC_MESSAGES/django.po
index f3e2b80689..690179f353 100644
--- a/django/contrib/formtools/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/gl/LC_MESSAGES/django.po
@@ -2,32 +2,33 @@
 #
 # Translators:
 # fasouto <fsoutomoure@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: fasouto <fsoutomoure@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-01-07 12:00+0000\n"
+"Last-Translator: fonso <fonzzo@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "primeiro paso"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "paso anterior"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "enviar"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/he/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/he/LC_MESSAGES/django.mo
index 004f61d873..db5f68caf1 100644
Binary files a/django/contrib/formtools/locale/he/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/he/LC_MESSAGES/django.po b/django/contrib/formtools/locale/he/LC_MESSAGES/django.po
index f8c3fccbaa..3ae534cd0b 100644
--- a/django/contrib/formtools/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/he/LC_MESSAGES/django.po
@@ -3,20 +3,21 @@
 # Translators:
 # Alex Gaynor <alex.gaynor@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-19 05:12+0000\n"
-"Last-Translator: Alex Gaynor <alex.gaynor@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-21 10:46+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
@@ -28,7 +29,7 @@ msgstr "צעד אחרון"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "שלח"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/hi/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/hi/LC_MESSAGES/django.mo
index 31fd7f0a1d..25f3ce50c1 100644
Binary files a/django/contrib/formtools/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/hi/LC_MESSAGES/django.po b/django/contrib/formtools/locale/hi/LC_MESSAGES/django.po
index 2116d9748a..bd4f035043 100644
--- a/django/contrib/formtools/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/hi/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-26 14:26+0000\n"
 "Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/hr/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/hr/LC_MESSAGES/django.mo
index 0268b32a34..70cb5ccbd5 100644
Binary files a/django/contrib/formtools/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/hr/LC_MESSAGES/django.po b/django/contrib/formtools/locale/hr/LC_MESSAGES/django.po
index 7560a05229..4c9d9624b0 100644
--- a/django/contrib/formtools/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/hr/LC_MESSAGES/django.po
@@ -1,34 +1,36 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <berislav.lopac@gmail.com>, 2012.
+# Dimitris Glezos <glezos@indifex.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-23 06:18+0000\n"
+"Last-Translator: berislavlopac <berislav.lopac@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "prvi korak"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "prethodni korak"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "pošalji"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/hu/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/hu/LC_MESSAGES/django.mo
index 5a5a85f63c..7ee1179ef5 100644
Binary files a/django/contrib/formtools/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/hu/LC_MESSAGES/django.po b/django/contrib/formtools/locale/hu/LC_MESSAGES/django.po
index cb1933e643..60d5b279a7 100644
--- a/django/contrib/formtools/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/hu/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 19:26+0000\n"
 "Last-Translator: Attila Nagy <>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ia/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..d9f05d49dc
Binary files /dev/null and b/django/contrib/formtools/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ia/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..37fc9111ac
--- /dev/null
+++ b/django/contrib/formtools/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,38 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-20 19:22+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/formtools/wizard/wizard_form.html:15
+msgid "first step"
+msgstr "prime passo"
+
+#: templates/formtools/wizard/wizard_form.html:16
+msgid "prev step"
+msgstr "previe passo"
+
+#: templates/formtools/wizard/wizard_form.html:18
+msgid "submit"
+msgstr "submitter"
+
+#: wizard/legacy.py:159
+msgid ""
+"We apologize, but your form has expired. Please continue filling out the "
+"form from this page."
+msgstr ""
+"Vostre formulario ha expirate. Per favor continua a completar le formulario "
+"a partir de iste pagina."
diff --git a/django/contrib/formtools/locale/id/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/id/LC_MESSAGES/django.mo
index 50d0b6df60..076081ca93 100644
Binary files a/django/contrib/formtools/locale/id/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/id/LC_MESSAGES/django.po b/django/contrib/formtools/locale/id/LC_MESSAGES/django.po
index e558c1dbbc..2529c5a994 100644
--- a/django/contrib/formtools/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/id/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-06 20:07+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/is/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/is/LC_MESSAGES/django.mo
index ec401c959c..f279351c50 100644
Binary files a/django/contrib/formtools/locale/is/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/is/LC_MESSAGES/django.po b/django/contrib/formtools/locale/is/LC_MESSAGES/django.po
index 73405d0db3..cae6155daf 100644
--- a/django/contrib/formtools/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/is/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-15 13:34+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/it/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/it/LC_MESSAGES/django.mo
index ab41fb655e..5585c9146c 100644
Binary files a/django/contrib/formtools/locale/it/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/it/LC_MESSAGES/django.po b/django/contrib/formtools/locale/it/LC_MESSAGES/django.po
index 57971e9125..a9e6ecf5c0 100644
--- a/django/contrib/formtools/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/it/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ja/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ja/LC_MESSAGES/django.mo
index 51a5baf13a..27774a2db8 100644
Binary files a/django/contrib/formtools/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ja/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ja/LC_MESSAGES/django.po
index c6f2b1584b..dd6472f099 100644
--- a/django/contrib/formtools/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ja/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-09 00:28+0000\n"
 "Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ka/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ka/LC_MESSAGES/django.mo
index f467fc2024..8e60645534 100644
Binary files a/django/contrib/formtools/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ka/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ka/LC_MESSAGES/django.po
index 908af4df0a..9427cb3513 100644
--- a/django/contrib/formtools/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ka/LC_MESSAGES/django.po
@@ -1,33 +1,35 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-03-01 08:00+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "პირველი ეტაპი"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "წინა ეტაპი"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "გაგზავნა"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/kk/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/kk/LC_MESSAGES/django.mo
index 763e864704..ac1d449c54 100644
Binary files a/django/contrib/formtools/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/kk/LC_MESSAGES/django.po b/django/contrib/formtools/locale/kk/LC_MESSAGES/django.po
index a0bbdad620..3af7fd9960 100644
--- a/django/contrib/formtools/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/kk/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Nurlan Rakhimzhanov <nurlan.rakhimzhanov@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/kn/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/kn/LC_MESSAGES/django.mo
index 02f4714970..bc3f4feccb 100644
Binary files a/django/contrib/formtools/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/kn/LC_MESSAGES/django.po b/django/contrib/formtools/locale/kn/LC_MESSAGES/django.po
index c8084af5c5..a4baaa3d84 100644
--- a/django/contrib/formtools/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/kn/LC_MESSAGES/django.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2011-01-19 16:45+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ko/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ko/LC_MESSAGES/django.mo
index 39c1230d89..79c449c59c 100644
Binary files a/django/contrib/formtools/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ko/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ko/LC_MESSAGES/django.po
index 568895bdbe..1e60ad3f8d 100644
--- a/django/contrib/formtools/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ko/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/lt/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/lt/LC_MESSAGES/django.mo
index 079dd1c357..0cd8adbe83 100644
Binary files a/django/contrib/formtools/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/lt/LC_MESSAGES/django.po b/django/contrib/formtools/locale/lt/LC_MESSAGES/django.po
index 76bae35f1f..13d6996f97 100644
--- a/django/contrib/formtools/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/lt/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-09 16:54+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Simonas Kazlauskas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/lv/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/lv/LC_MESSAGES/django.mo
index c48113c8fd..c653b9a926 100644
Binary files a/django/contrib/formtools/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/lv/LC_MESSAGES/django.po b/django/contrib/formtools/locale/lv/LC_MESSAGES/django.po
index 8089be83a5..384a6d7550 100644
--- a/django/contrib/formtools/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/lv/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/mk/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/mk/LC_MESSAGES/django.mo
index d83caabd82..d2d5c3c661 100644
Binary files a/django/contrib/formtools/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/mk/LC_MESSAGES/django.po b/django/contrib/formtools/locale/mk/LC_MESSAGES/django.po
index 15b71c3a09..2d9eaef21a 100644
--- a/django/contrib/formtools/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/mk/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-15 12:12+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ml/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ml/LC_MESSAGES/django.mo
index b38256ec85..ed3a8c9390 100644
Binary files a/django/contrib/formtools/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ml/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ml/LC_MESSAGES/django.po
index fe79b9d137..ee6f4f0019 100644
--- a/django/contrib/formtools/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ml/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-07 15:16+0000\n"
 "Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/mn/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/mn/LC_MESSAGES/django.mo
index 72afb14bc6..9d5070a0ff 100644
Binary files a/django/contrib/formtools/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/mn/LC_MESSAGES/django.po b/django/contrib/formtools/locale/mn/LC_MESSAGES/django.po
index 389e68b98f..9d5a22e675 100644
--- a/django/contrib/formtools/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/mn/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/nb/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/nb/LC_MESSAGES/django.mo
index f43b2e1f8c..6704c01bd0 100644
Binary files a/django/contrib/formtools/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/nb/LC_MESSAGES/django.po b/django/contrib/formtools/locale/nb/LC_MESSAGES/django.po
index 8eb635d157..d8ed99b8e8 100644
--- a/django/contrib/formtools/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/nb/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-06 19:56+0000\n"
 "Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ne/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ne/LC_MESSAGES/django.mo
index be0377e09e..4a09b41173 100644
Binary files a/django/contrib/formtools/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ne/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ne/LC_MESSAGES/django.po
index e20906f91d..e8a35d2834 100644
--- a/django/contrib/formtools/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ne/LC_MESSAGES/django.po
@@ -1,32 +1,33 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Paras Nath Chaudhary <opnchaudhary@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-01 12:14+0000\n"
+"Last-Translator: Paras Nath Chaudhary <opnchaudhary@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "प्रथम चाल "
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "अघिल्लो  चाल "
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "जम्मा गर्नु "
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/nl/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/nl/LC_MESSAGES/django.mo
index a1c1f298da..4d95d5a281 100644
Binary files a/django/contrib/formtools/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/nl/LC_MESSAGES/django.po b/django/contrib/formtools/locale/nl/LC_MESSAGES/django.po
index bbc133e562..e280e68826 100644
--- a/django/contrib/formtools/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/nl/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-17 22:39+0000\n"
 "Last-Translator: Jeffrey Gelens <jeffrey@noppo.pro>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/nn/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/nn/LC_MESSAGES/django.mo
index 843b8cdd35..137cb99440 100644
Binary files a/django/contrib/formtools/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/nn/LC_MESSAGES/django.po b/django/contrib/formtools/locale/nn/LC_MESSAGES/django.po
index 2d03d5e035..a278676cbe 100644
--- a/django/contrib/formtools/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/nn/LC_MESSAGES/django.po
@@ -2,32 +2,33 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <odin.omdal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-03 20:20+0000\n"
+"Last-Translator: velmont <odin.omdal@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "fyrste steg"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "førre steg"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "lagre"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/pa/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/pa/LC_MESSAGES/django.mo
index 8ece97332e..e1ee5fdd3b 100644
Binary files a/django/contrib/formtools/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/pa/LC_MESSAGES/django.po b/django/contrib/formtools/locale/pa/LC_MESSAGES/django.po
index 7bdd57aa59..ac45484230 100644
--- a/django/contrib/formtools/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/pa/LC_MESSAGES/django.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/pl/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/pl/LC_MESSAGES/django.mo
index a000402e9c..4a2c7178a7 100644
Binary files a/django/contrib/formtools/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/pl/LC_MESSAGES/django.po b/django/contrib/formtools/locale/pl/LC_MESSAGES/django.po
index 23ef92df73..0380ceb6c9 100644
--- a/django/contrib/formtools/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/pl/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-21 12:46+0000\n"
 "Last-Translator: angularcircle <angular.circle@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/pt/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/pt/LC_MESSAGES/django.mo
index 1485712e65..161da52c8c 100644
Binary files a/django/contrib/formtools/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/pt/LC_MESSAGES/django.po b/django/contrib/formtools/locale/pt/LC_MESSAGES/django.po
index 25a47cf594..52e6053439 100644
--- a/django/contrib/formtools/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/pt/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-07 09:40+0000\n"
 "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/pt_BR/LC_MESSAGES/django.mo
index 972645d30a..4ad30f774f 100644
Binary files a/django/contrib/formtools/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/formtools/locale/pt_BR/LC_MESSAGES/django.po
index eeb7d1f1f4..fe1aa0965b 100644
--- a/django/contrib/formtools/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 17:01+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ro/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ro/LC_MESSAGES/django.mo
index 3945db09d5..9f0f22e861 100644
Binary files a/django/contrib/formtools/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ro/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ro/LC_MESSAGES/django.po
index f374ec580a..6d5c3b89fc 100644
--- a/django/contrib/formtools/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ro/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ru/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ru/LC_MESSAGES/django.mo
index fec7283aa0..04434dcf73 100644
Binary files a/django/contrib/formtools/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ru/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ru/LC_MESSAGES/django.po
index 0aec8915b9..630b74915e 100644
--- a/django/contrib/formtools/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ru/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-06 18:35+0000\n"
 "Last-Translator: Eugene MechanisM <contact@mechanism.name>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/sk/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/sk/LC_MESSAGES/django.mo
index 58636395ed..6786202c0e 100644
Binary files a/django/contrib/formtools/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/sk/LC_MESSAGES/django.po b/django/contrib/formtools/locale/sk/LC_MESSAGES/django.po
index 5cbae3f69c..080e62d3cc 100644
--- a/django/contrib/formtools/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/sk/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/sl/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/sl/LC_MESSAGES/django.mo
index 987ba2983f..6b82fd68b3 100644
Binary files a/django/contrib/formtools/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/sl/LC_MESSAGES/django.po b/django/contrib/formtools/locale/sl/LC_MESSAGES/django.po
index 4d6edc6a0e..36a15cf464 100644
--- a/django/contrib/formtools/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/sl/LC_MESSAGES/django.po
@@ -1,23 +1,24 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Gašper Žejn <zejn@kiberpipa.org>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 #   <zejn@kiberpipa.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-03-05 19:53+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-31 19:06+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
@@ -25,7 +26,7 @@ msgstr "prvi korak"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr "prejšnji korak"
+msgstr "predhodni korak"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
@@ -36,5 +37,5 @@ msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
 msgstr ""
-"Se opravičujemo, ampak vaš obrazec je potekel. Prosimo, da nadaljujete z "
-"izpolnjevanjem obrazca na tej strani."
+"Predviden čas izpolnjevanja obrazca je potekel. Nadaljujte z izpolnjevanjem "
+"na tej strani."
diff --git a/django/contrib/formtools/locale/sq/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/sq/LC_MESSAGES/django.mo
index c04d644a66..a86fab1306 100644
Binary files a/django/contrib/formtools/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/sq/LC_MESSAGES/django.po b/django/contrib/formtools/locale/sq/LC_MESSAGES/django.po
index 3336543e9a..d5b45af648 100644
--- a/django/contrib/formtools/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/sq/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-11-25 19:30+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "hapi i parë"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "hapi i mëparshëm"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "parashtroje"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/locale/sr/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/sr/LC_MESSAGES/django.mo
index 8a9619fb08..b218cd08ae 100644
Binary files a/django/contrib/formtools/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/sr/LC_MESSAGES/django.po b/django/contrib/formtools/locale/sr/LC_MESSAGES/django.po
index 49af1922e3..f619222af2 100644
--- a/django/contrib/formtools/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/sr/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-17 05:18+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/sr_Latn/LC_MESSAGES/django.mo
index df5a79dd34..ddb760de1a 100644
Binary files a/django/contrib/formtools/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/formtools/locale/sr_Latn/LC_MESSAGES/django.po
index e1a3612b63..d43e0f5776 100644
--- a/django/contrib/formtools/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-02 21:00+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/sv/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/sv/LC_MESSAGES/django.mo
index 51aea0229a..67f4567383 100644
Binary files a/django/contrib/formtools/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/sv/LC_MESSAGES/django.po b/django/contrib/formtools/locale/sv/LC_MESSAGES/django.po
index 1e98415820..29f52e9cba 100644
--- a/django/contrib/formtools/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/sv/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-06 20:33+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/sw/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/sw/LC_MESSAGES/django.mo
index 6c72e98e4e..a85dc843f8 100644
Binary files a/django/contrib/formtools/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/sw/LC_MESSAGES/django.po b/django/contrib/formtools/locale/sw/LC_MESSAGES/django.po
index 90bf280150..776314c315 100644
--- a/django/contrib/formtools/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/sw/LC_MESSAGES/django.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-07 15:24+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ta/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ta/LC_MESSAGES/django.mo
index 34bc62c0b6..042b791378 100644
Binary files a/django/contrib/formtools/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ta/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ta/LC_MESSAGES/django.po
index ed9a76c9ca..e7768e78dc 100644
--- a/django/contrib/formtools/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ta/LC_MESSAGES/django.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2011-01-19 16:45+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/te/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/te/LC_MESSAGES/django.mo
index 98782d9db6..44f211f9d1 100644
Binary files a/django/contrib/formtools/locale/te/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/te/LC_MESSAGES/django.po b/django/contrib/formtools/locale/te/LC_MESSAGES/django.po
index d6bd66d2d9..5dec0368e3 100644
--- a/django/contrib/formtools/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/te/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/th/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/th/LC_MESSAGES/django.mo
index eed24a31f5..0af4f91858 100644
Binary files a/django/contrib/formtools/locale/th/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/th/LC_MESSAGES/django.po b/django/contrib/formtools/locale/th/LC_MESSAGES/django.po
index dc17b14f13..b3964dd7af 100644
--- a/django/contrib/formtools/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/th/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Vichai Vongvorakul <vongvichai@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/tr/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/tr/LC_MESSAGES/django.mo
index 88e5509403..694c8b10c0 100644
Binary files a/django/contrib/formtools/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/tr/LC_MESSAGES/django.po b/django/contrib/formtools/locale/tr/LC_MESSAGES/django.po
index a6e678ce19..175b014e4f 100644
--- a/django/contrib/formtools/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/tr/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 20:13+0000\n"
 "Last-Translator: Murat Çorlu <muratcorlu@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/tt/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/tt/LC_MESSAGES/django.mo
index fb0056c41c..c248a8c242 100644
Binary files a/django/contrib/formtools/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/tt/LC_MESSAGES/django.po b/django/contrib/formtools/locale/tt/LC_MESSAGES/django.po
index bf89c1d9dd..3d4f8aa9b7 100644
--- a/django/contrib/formtools/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/tt/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/uk/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/uk/LC_MESSAGES/django.mo
index 46d8226b04..b3f244f0f7 100644
Binary files a/django/contrib/formtools/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/uk/LC_MESSAGES/django.po b/django/contrib/formtools/locale/uk/LC_MESSAGES/django.po
index 9d2922e461..05903656ce 100644
--- a/django/contrib/formtools/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/uk/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-11 17:26+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/ur/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/ur/LC_MESSAGES/django.mo
index d9d3d72fba..a86942c888 100644
Binary files a/django/contrib/formtools/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/ur/LC_MESSAGES/django.po b/django/contrib/formtools/locale/ur/LC_MESSAGES/django.po
index d42820363a..42f696b31a 100644
--- a/django/contrib/formtools/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/ur/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/vi/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/vi/LC_MESSAGES/django.mo
index a5a4117881..23ccf40186 100644
Binary files a/django/contrib/formtools/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/vi/LC_MESSAGES/django.po b/django/contrib/formtools/locale/vi/LC_MESSAGES/django.po
index 77b017e69d..fa4e62898b 100644
--- a/django/contrib/formtools/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/vi/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-02-14 13:42+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/zh_CN/LC_MESSAGES/django.mo
index 1f3f305ccf..1c93573185 100644
Binary files a/django/contrib/formtools/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/formtools/locale/zh_CN/LC_MESSAGES/django.po
index e40688530e..b228096a53 100644
--- a/django/contrib/formtools/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 18:56+0000\n"
 "Last-Translator: Ziang Song <songziang@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
diff --git a/django/contrib/formtools/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/formtools/locale/zh_TW/LC_MESSAGES/django.mo
index 9f1849ec1c..3ebc5c0ab8 100644
Binary files a/django/contrib/formtools/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/formtools/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/formtools/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/formtools/locale/zh_TW/LC_MESSAGES/django.po
index 68c0aee8a0..c4ee8b9485 100644
--- a/django/contrib/formtools/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,33 +1,34 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <ilay@ilay.tw>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-02-14 13:42+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-06 01:25+0000\n"
+"Last-Translator: ilay <ilay@ilay.tw>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/formtools/wizard/wizard_form.html:15
 msgid "first step"
-msgstr ""
+msgstr "第一步"
 
 #: templates/formtools/wizard/wizard_form.html:16
 msgid "prev step"
-msgstr ""
+msgstr "下一步"
 
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
-msgstr ""
+msgstr "送出"
 
 #: wizard/legacy.py:159
 msgid ""
diff --git a/django/contrib/formtools/tests/__init__.py b/django/contrib/formtools/tests/__init__.py
index aa7d5ff7d4..2bbeea8c5a 100644
--- a/django/contrib/formtools/tests/__init__.py
+++ b/django/contrib/formtools/tests/__init__.py
@@ -1,441 +1,2 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import datetime
-import os
-import pickle
-import re
-import warnings
-
-from django import http
-from django.conf import settings
-from django.contrib.formtools import preview, utils
-from django.contrib.formtools.wizard import FormWizard
-from django.test import TestCase
-from django.test.html import parse_html
-from django.test.utils import override_settings
-from django.utils._os import upath
-from django.utils import unittest
-
+from django.contrib.formtools.tests.tests import *
 from django.contrib.formtools.tests.wizard import *
-from django.contrib.formtools.tests.forms import *
-
-success_string = "Done was called!"
-success_string_encoded = success_string.encode()
-
-class TestFormPreview(preview.FormPreview):
-    def get_context(self, request, form):
-        context = super(TestFormPreview, self).get_context(request, form)
-        context.update({'custom_context': True})
-        return context
-
-    def get_initial(self, request):
-        return {'field1': 'Works!'}
-
-    def done(self, request, cleaned_data):
-        return http.HttpResponse(success_string)
-
-@override_settings(
-    TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(upath(__file__)), 'templates'),
-    ),
-)
-class PreviewTests(TestCase):
-    urls = 'django.contrib.formtools.tests.urls'
-
-    def setUp(self):
-        super(PreviewTests, self).setUp()
-        # Create a FormPreview instance to share between tests
-        self.preview = preview.FormPreview(TestForm)
-        input_template = '<input type="hidden" name="%s" value="%s" />'
-        self.input = input_template % (self.preview.unused_name('stage'), "%d")
-        self.test_data = {'field1': 'foo', 'field1_': 'asdf'}
-
-    def test_unused_name(self):
-        """
-        Verifies name mangling to get uniue field name.
-        """
-        self.assertEqual(self.preview.unused_name('field1'), 'field1__')
-
-    def test_form_get(self):
-        """
-        Test contrib.formtools.preview form retrieval.
-
-        Use the client library to see if we can sucessfully retrieve
-        the form (mostly testing the setup ROOT_URLCONF
-        process). Verify that an additional  hidden input field
-        is created to manage the stage.
-
-        """
-        response = self.client.get('/preview/')
-        stage = self.input % 1
-        self.assertContains(response, stage, 1)
-        self.assertEqual(response.context['custom_context'], True)
-        self.assertEqual(response.context['form'].initial, {'field1': 'Works!'})
-
-    def test_form_preview(self):
-        """
-        Test contrib.formtools.preview form preview rendering.
-
-        Use the client library to POST to the form to see if a preview
-        is returned.  If we do get a form back check that the hidden
-        value is correctly managing the state of the form.
-
-        """
-        # Pass strings for form submittal and add stage variable to
-        # show we previously saw first stage of the form.
-        self.test_data.update({'stage': 1, 'date1': datetime.date(2006, 10, 25)})
-        response = self.client.post('/preview/', self.test_data)
-        # Check to confirm stage is set to 2 in output form.
-        stage = self.input % 2
-        self.assertContains(response, stage, 1)
-
-    def test_form_submit(self):
-        """
-        Test contrib.formtools.preview form submittal.
-
-        Use the client library to POST to the form with stage set to 3
-        to see if our forms done() method is called. Check first
-        without the security hash, verify failure, retry with security
-        hash and verify sucess.
-
-        """
-        # Pass strings for form submittal and add stage variable to
-        # show we previously saw first stage of the form.
-        self.test_data.update({'stage': 2, 'date1': datetime.date(2006, 10, 25)})
-        response = self.client.post('/preview/', self.test_data)
-        self.assertNotEqual(response.content, success_string_encoded)
-        hash = self.preview.security_hash(None, TestForm(self.test_data))
-        self.test_data.update({'hash': hash})
-        response = self.client.post('/preview/', self.test_data)
-        self.assertEqual(response.content, success_string_encoded)
-
-    def test_bool_submit(self):
-        """
-        Test contrib.formtools.preview form submittal when form contains:
-        BooleanField(required=False)
-
-        Ticket: #6209 - When an unchecked BooleanField is previewed, the preview
-        form's hash would be computed with no value for ``bool1``. However, when
-        the preview form is rendered, the unchecked hidden BooleanField would be
-        rendered with the string value 'False'. So when the preview form is
-        resubmitted, the hash would be computed with the value 'False' for
-        ``bool1``. We need to make sure the hashes are the same in both cases.
-
-        """
-        self.test_data.update({'stage':2})
-        hash = self.preview.security_hash(None, TestForm(self.test_data))
-        self.test_data.update({'hash': hash, 'bool1': 'False'})
-        with warnings.catch_warnings(record=True):
-            response = self.client.post('/preview/', self.test_data)
-            self.assertEqual(response.content, success_string_encoded)
-
-    def test_form_submit_good_hash(self):
-        """
-        Test contrib.formtools.preview form submittal, using a correct
-        hash
-        """
-        # Pass strings for form submittal and add stage variable to
-        # show we previously saw first stage of the form.
-        self.test_data.update({'stage':2})
-        response = self.client.post('/preview/', self.test_data)
-        self.assertNotEqual(response.content, success_string_encoded)
-        hash = utils.form_hmac(TestForm(self.test_data))
-        self.test_data.update({'hash': hash})
-        response = self.client.post('/preview/', self.test_data)
-        self.assertEqual(response.content, success_string_encoded)
-
-
-    def test_form_submit_bad_hash(self):
-        """
-        Test contrib.formtools.preview form submittal does not proceed
-        if the hash is incorrect.
-        """
-        # Pass strings for form submittal and add stage variable to
-        # show we previously saw first stage of the form.
-        self.test_data.update({'stage':2})
-        response = self.client.post('/preview/', self.test_data)
-        self.assertEqual(response.status_code, 200)
-        self.assertNotEqual(response.content, success_string_encoded)
-        hash = utils.form_hmac(TestForm(self.test_data)) + "bad"
-        self.test_data.update({'hash': hash})
-        response = self.client.post('/previewpreview/', self.test_data)
-        self.assertNotEqual(response.content, success_string_encoded)
-
-
-class FormHmacTests(unittest.TestCase):
-
-    def test_textfield_hash(self):
-        """
-        Regression test for #10034: the hash generation function should ignore
-        leading/trailing whitespace so as to be friendly to broken browsers that
-        submit it (usually in textareas).
-        """
-        f1 = HashTestForm({'name': 'joe', 'bio': 'Speaking español.'})
-        f2 = HashTestForm({'name': '  joe', 'bio': 'Speaking español.  '})
-        hash1 = utils.form_hmac(f1)
-        hash2 = utils.form_hmac(f2)
-        self.assertEqual(hash1, hash2)
-
-    def test_empty_permitted(self):
-        """
-        Regression test for #10643: the security hash should allow forms with
-        empty_permitted = True, or forms where data has not changed.
-        """
-        f1 = HashTestBlankForm({})
-        f2 = HashTestForm({}, empty_permitted=True)
-        hash1 = utils.form_hmac(f1)
-        hash2 = utils.form_hmac(f2)
-        self.assertEqual(hash1, hash2)
-
-
-#
-# FormWizard tests
-#
-
-class TestWizardClass(FormWizard):
-
-    def get_template(self, step):
-        return 'forms/wizard.html'
-
-    def done(self, request, cleaned_data):
-        return http.HttpResponse(success_string)
-
-
-class DummyRequest(http.HttpRequest):
-
-    def __init__(self, POST=None):
-        super(DummyRequest, self).__init__()
-        self.method = POST and "POST" or "GET"
-        if POST is not None:
-            self.POST.update(POST)
-        self._dont_enforce_csrf_checks = True
-
-
-@override_settings(
-    SECRET_KEY="123",
-    TEMPLATE_DIRS=(
-        os.path.join(os.path.dirname(upath(__file__)), 'templates'),
-    ),
-)
-class WizardTests(TestCase):
-    urls = 'django.contrib.formtools.tests.urls'
-    wizard_step_data = (
-        {
-            '0-name': 'Pony',
-            '0-thirsty': '2',
-        },
-        {
-            '1-address1': '123 Main St',
-            '1-address2': 'Djangoland',
-        },
-        {
-            '2-random_crap': 'blah blah',
-        }
-    )
-
-    def setUp(self):
-        super(WizardTests, self).setUp()
-        self.save_warnings_state()
-        warnings.filterwarnings('ignore', category=DeprecationWarning,
-                                module='django.contrib.formtools.wizard')
-
-    def tearDown(self):
-        super(WizardTests, self).tearDown()
-        self.restore_warnings_state()
-
-    def test_step_starts_at_zero(self):
-        """
-        step should be zero for the first form
-        """
-        response = self.client.get('/wizard1/')
-        self.assertEqual(0, response.context['step0'])
-
-    def test_step_increments(self):
-        """
-        step should be incremented when we go to the next page
-        """
-        response = self.client.post('/wizard1/', {"0-field":"test", "wizard_step":"0"})
-        self.assertEqual(1, response.context['step0'])
-
-    def test_bad_hash(self):
-        """
-        Form should not advance if the hash is missing or bad
-        """
-        response = self.client.post('/wizard1/',
-                                    {"0-field":"test",
-                                     "1-field":"test2",
-                                     "wizard_step": "1"})
-        self.assertEqual(0, response.context['step0'])
-
-    def test_good_hash(self):
-        """
-        Form should advance if the hash is present and good, as calculated using
-        current method.
-        """
-        data = {"0-field": "test",
-                "1-field": "test2",
-                "hash_0": {
-                    2: "cd13b1db3e8f55174bc5745a1b1a53408d4fd1ca",
-                    3: "9355d5dff22d49dbad58e46189982cec649f9f5b",
-                }[pickle.HIGHEST_PROTOCOL],
-                "wizard_step": "1"}
-        response = self.client.post('/wizard1/', data)
-        self.assertEqual(2, response.context['step0'])
-
-    def test_11726(self):
-        """
-        Regression test for ticket #11726.
-        Wizard should not raise Http404 when steps are added dynamically.
-        """
-        reached = [False]
-        that = self
-
-        class WizardWithProcessStep(TestWizardClass):
-            def process_step(self, request, form, step):
-                if step == 0:
-                    if self.num_steps() < 2:
-                        self.form_list.append(WizardPageTwoForm)
-                if step == 1:
-                    that.assertTrue(isinstance(form, WizardPageTwoForm))
-                    reached[0] = True
-
-        wizard = WizardWithProcessStep([WizardPageOneForm])
-        data = {"0-field": "test",
-                "1-field": "test2",
-                "hash_0": {
-                    2: "cd13b1db3e8f55174bc5745a1b1a53408d4fd1ca",
-                    3: "9355d5dff22d49dbad58e46189982cec649f9f5b",
-                }[pickle.HIGHEST_PROTOCOL],
-                "wizard_step": "1"}
-        wizard(DummyRequest(POST=data))
-        self.assertTrue(reached[0])
-
-        data = {"0-field": "test",
-                "1-field": "test2",
-                "hash_0": {
-                    2: "cd13b1db3e8f55174bc5745a1b1a53408d4fd1ca",
-                    3: "9355d5dff22d49dbad58e46189982cec649f9f5b",
-                }[pickle.HIGHEST_PROTOCOL],
-                "hash_1": {
-                    2: "1e6f6315da42e62f33a30640ec7e007ad3fbf1a1",
-                    3: "c33142ef9d01b1beae238adf22c3c6c57328f51a",
-                }[pickle.HIGHEST_PROTOCOL],
-                "wizard_step": "2"}
-        self.assertRaises(http.Http404, wizard, DummyRequest(POST=data))
-
-    def test_14498(self):
-        """
-        Regression test for ticket #14498.  All previous steps' forms should be
-        validated.
-        """
-        reached = [False]
-        that = self
-
-        class WizardWithProcessStep(TestWizardClass):
-            def process_step(self, request, form, step):
-                that.assertTrue(form.is_valid())
-                reached[0] = True
-
-        wizard = WizardWithProcessStep([WizardPageOneForm,
-                                        WizardPageTwoForm,
-                                        WizardPageThreeForm])
-        data = {"0-field": "test",
-                "1-field": "test2",
-                "hash_0": {
-                    2: "cd13b1db3e8f55174bc5745a1b1a53408d4fd1ca",
-                    3: "9355d5dff22d49dbad58e46189982cec649f9f5b",
-                }[pickle.HIGHEST_PROTOCOL],
-                "wizard_step": "1"}
-        wizard(DummyRequest(POST=data))
-        self.assertTrue(reached[0])
-
-    def test_14576(self):
-        """
-        Regression test for ticket #14576.
-
-        The form of the last step is not passed to the done method.
-        """
-        reached = [False]
-        that = self
-
-        class Wizard(TestWizardClass):
-            def done(self, request, form_list):
-                reached[0] = True
-                that.assertTrue(len(form_list) == 2)
-
-        wizard = Wizard([WizardPageOneForm,
-                         WizardPageTwoForm])
-
-        data = {"0-field": "test",
-                "1-field": "test2",
-                "hash_0": {
-                    2: "cd13b1db3e8f55174bc5745a1b1a53408d4fd1ca",
-                    3: "9355d5dff22d49dbad58e46189982cec649f9f5b",
-                }[pickle.HIGHEST_PROTOCOL],
-                "wizard_step": "1"}
-        wizard(DummyRequest(POST=data))
-        self.assertTrue(reached[0])
-
-    def test_15075(self):
-        """
-        Regression test for ticket #15075.  Allow modifying wizard's form_list
-        in process_step.
-        """
-        reached = [False]
-        that = self
-
-        class WizardWithProcessStep(TestWizardClass):
-            def process_step(self, request, form, step):
-                if step == 0:
-                    self.form_list[1] = WizardPageTwoAlternativeForm
-                if step == 1:
-                    that.assertTrue(isinstance(form, WizardPageTwoAlternativeForm))
-                    reached[0] = True
-
-        wizard = WizardWithProcessStep([WizardPageOneForm,
-                                        WizardPageTwoForm,
-                                        WizardPageThreeForm])
-        data = {"0-field": "test",
-                "1-field": "test2",
-                "hash_0": {
-                    2: "cd13b1db3e8f55174bc5745a1b1a53408d4fd1ca",
-                    3: "9355d5dff22d49dbad58e46189982cec649f9f5b",
-                }[pickle.HIGHEST_PROTOCOL],
-                "wizard_step": "1"}
-        wizard(DummyRequest(POST=data))
-        self.assertTrue(reached[0])
-
-    def grab_field_data(self, response):
-        """
-        Pull the appropriate field data from the context to pass to the next wizard step
-        """
-        previous_fields = parse_html(response.context['previous_fields'])
-        fields = {'wizard_step': response.context['step0']}
-
-        for input_field in previous_fields:
-            input_attrs = dict(input_field.attributes)
-            fields[input_attrs["name"]] = input_attrs["value"]
-
-        return fields
-
-    def check_wizard_step(self, response, step_no):
-        """
-        Helper function to test each step of the wizard
-        - Make sure the call succeeded
-        - Make sure response is the proper step number
-        - return the result from the post for the next step
-        """
-        step_count = len(self.wizard_step_data)
-
-        self.assertContains(response, 'Step %d of %d' % (step_no, step_count))
-
-        data = self.grab_field_data(response)
-        data.update(self.wizard_step_data[step_no - 1])
-
-        return self.client.post('/wizard2/', data)
-
-    def test_9473(self):
-        response = self.client.get('/wizard2/')
-        for step_no in range(1, len(self.wizard_step_data) + 1):
-            response = self.check_wizard_step(response, step_no)
diff --git a/django/contrib/formtools/tests/forms.py b/django/contrib/formtools/tests/forms.py
index 1ed2ab48bb..6f3ce4b0bd 100644
--- a/django/contrib/formtools/tests/forms.py
+++ b/django/contrib/formtools/tests/forms.py
@@ -1,21 +1,4 @@
 from django import forms
-from django.contrib.formtools.wizard import FormWizard
-from django.http import HttpResponse
-
-class Page1(forms.Form):
-    name = forms.CharField(max_length=100)
-    thirsty = forms.NullBooleanField()
-
-class Page2(forms.Form):
-    address1 = forms.CharField(max_length=100)
-    address2 = forms.CharField(max_length=100)
-
-class Page3(forms.Form):
-    random_crap = forms.CharField(max_length=100)
-
-class ContactWizard(FormWizard):
-    def done(self, request, form_list):
-        return HttpResponse("")
 
 class TestForm(forms.Form):
     field1 = forms.CharField()
@@ -30,15 +13,3 @@ class HashTestForm(forms.Form):
 class HashTestBlankForm(forms.Form):
     name = forms.CharField(required=False)
     bio = forms.CharField(required=False)
-
-class WizardPageOneForm(forms.Form):
-    field = forms.CharField()
-
-class WizardPageTwoForm(forms.Form):
-    field = forms.CharField()
-
-class WizardPageTwoAlternativeForm(forms.Form):
-    field = forms.CharField()
-
-class WizardPageThreeForm(forms.Form):
-    field = forms.CharField()
diff --git a/django/contrib/formtools/tests/tests.py b/django/contrib/formtools/tests/tests.py
new file mode 100644
index 0000000000..56ef901127
--- /dev/null
+++ b/django/contrib/formtools/tests/tests.py
@@ -0,0 +1,187 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import datetime
+import os
+import pickle
+import re
+import warnings
+
+from django import http
+from django.conf import settings
+from django.contrib.formtools import preview, utils
+from django.test import TestCase
+from django.test.html import parse_html
+from django.test.utils import override_settings
+from django.utils._os import upath
+from django.utils import unittest
+
+from django.contrib.formtools.tests.forms import *
+
+success_string = "Done was called!"
+success_string_encoded = success_string.encode()
+
+class TestFormPreview(preview.FormPreview):
+    def get_context(self, request, form):
+        context = super(TestFormPreview, self).get_context(request, form)
+        context.update({'custom_context': True})
+        return context
+
+    def get_initial(self, request):
+        return {'field1': 'Works!'}
+
+    def done(self, request, cleaned_data):
+        return http.HttpResponse(success_string)
+
+@override_settings(
+    TEMPLATE_DIRS=(
+        os.path.join(os.path.dirname(upath(__file__)), 'templates'),
+    ),
+)
+class PreviewTests(TestCase):
+    urls = 'django.contrib.formtools.tests.urls'
+
+    def setUp(self):
+        super(PreviewTests, self).setUp()
+        # Create a FormPreview instance to share between tests
+        self.preview = preview.FormPreview(TestForm)
+        input_template = '<input type="hidden" name="%s" value="%s" />'
+        self.input = input_template % (self.preview.unused_name('stage'), "%d")
+        self.test_data = {'field1': 'foo', 'field1_': 'asdf'}
+
+    def test_unused_name(self):
+        """
+        Verifies name mangling to get uniue field name.
+        """
+        self.assertEqual(self.preview.unused_name('field1'), 'field1__')
+
+    def test_form_get(self):
+        """
+        Test contrib.formtools.preview form retrieval.
+
+        Use the client library to see if we can sucessfully retrieve
+        the form (mostly testing the setup ROOT_URLCONF
+        process). Verify that an additional  hidden input field
+        is created to manage the stage.
+
+        """
+        response = self.client.get('/preview/')
+        stage = self.input % 1
+        self.assertContains(response, stage, 1)
+        self.assertEqual(response.context['custom_context'], True)
+        self.assertEqual(response.context['form'].initial, {'field1': 'Works!'})
+
+    def test_form_preview(self):
+        """
+        Test contrib.formtools.preview form preview rendering.
+
+        Use the client library to POST to the form to see if a preview
+        is returned.  If we do get a form back check that the hidden
+        value is correctly managing the state of the form.
+
+        """
+        # Pass strings for form submittal and add stage variable to
+        # show we previously saw first stage of the form.
+        self.test_data.update({'stage': 1, 'date1': datetime.date(2006, 10, 25)})
+        response = self.client.post('/preview/', self.test_data)
+        # Check to confirm stage is set to 2 in output form.
+        stage = self.input % 2
+        self.assertContains(response, stage, 1)
+
+    def test_form_submit(self):
+        """
+        Test contrib.formtools.preview form submittal.
+
+        Use the client library to POST to the form with stage set to 3
+        to see if our forms done() method is called. Check first
+        without the security hash, verify failure, retry with security
+        hash and verify sucess.
+
+        """
+        # Pass strings for form submittal and add stage variable to
+        # show we previously saw first stage of the form.
+        self.test_data.update({'stage': 2, 'date1': datetime.date(2006, 10, 25)})
+        response = self.client.post('/preview/', self.test_data)
+        self.assertNotEqual(response.content, success_string_encoded)
+        hash = self.preview.security_hash(None, TestForm(self.test_data))
+        self.test_data.update({'hash': hash})
+        response = self.client.post('/preview/', self.test_data)
+        self.assertEqual(response.content, success_string_encoded)
+
+    def test_bool_submit(self):
+        """
+        Test contrib.formtools.preview form submittal when form contains:
+        BooleanField(required=False)
+
+        Ticket: #6209 - When an unchecked BooleanField is previewed, the preview
+        form's hash would be computed with no value for ``bool1``. However, when
+        the preview form is rendered, the unchecked hidden BooleanField would be
+        rendered with the string value 'False'. So when the preview form is
+        resubmitted, the hash would be computed with the value 'False' for
+        ``bool1``. We need to make sure the hashes are the same in both cases.
+
+        """
+        self.test_data.update({'stage':2})
+        hash = self.preview.security_hash(None, TestForm(self.test_data))
+        self.test_data.update({'hash': hash, 'bool1': 'False'})
+        with warnings.catch_warnings(record=True):
+            response = self.client.post('/preview/', self.test_data)
+            self.assertEqual(response.content, success_string_encoded)
+
+    def test_form_submit_good_hash(self):
+        """
+        Test contrib.formtools.preview form submittal, using a correct
+        hash
+        """
+        # Pass strings for form submittal and add stage variable to
+        # show we previously saw first stage of the form.
+        self.test_data.update({'stage':2})
+        response = self.client.post('/preview/', self.test_data)
+        self.assertNotEqual(response.content, success_string_encoded)
+        hash = utils.form_hmac(TestForm(self.test_data))
+        self.test_data.update({'hash': hash})
+        response = self.client.post('/preview/', self.test_data)
+        self.assertEqual(response.content, success_string_encoded)
+
+
+    def test_form_submit_bad_hash(self):
+        """
+        Test contrib.formtools.preview form submittal does not proceed
+        if the hash is incorrect.
+        """
+        # Pass strings for form submittal and add stage variable to
+        # show we previously saw first stage of the form.
+        self.test_data.update({'stage':2})
+        response = self.client.post('/preview/', self.test_data)
+        self.assertEqual(response.status_code, 200)
+        self.assertNotEqual(response.content, success_string_encoded)
+        hash = utils.form_hmac(TestForm(self.test_data)) + "bad"
+        self.test_data.update({'hash': hash})
+        response = self.client.post('/previewpreview/', self.test_data)
+        self.assertNotEqual(response.content, success_string_encoded)
+
+
+class FormHmacTests(unittest.TestCase):
+
+    def test_textfield_hash(self):
+        """
+        Regression test for #10034: the hash generation function should ignore
+        leading/trailing whitespace so as to be friendly to broken browsers that
+        submit it (usually in textareas).
+        """
+        f1 = HashTestForm({'name': 'joe', 'bio': 'Speaking español.'})
+        f2 = HashTestForm({'name': '  joe', 'bio': 'Speaking español.  '})
+        hash1 = utils.form_hmac(f1)
+        hash2 = utils.form_hmac(f2)
+        self.assertEqual(hash1, hash2)
+
+    def test_empty_permitted(self):
+        """
+        Regression test for #10643: the security hash should allow forms with
+        empty_permitted = True, or forms where data has not changed.
+        """
+        f1 = HashTestBlankForm({})
+        f2 = HashTestForm({}, empty_permitted=True)
+        hash1 = utils.form_hmac(f1)
+        hash2 = utils.form_hmac(f2)
+        self.assertEqual(hash1, hash2)
diff --git a/django/contrib/formtools/tests/urls.py b/django/contrib/formtools/tests/urls.py
index 99bf7eaefa..739095d69f 100644
--- a/django/contrib/formtools/tests/urls.py
+++ b/django/contrib/formtools/tests/urls.py
@@ -5,15 +5,11 @@ This is a URLconf to be loaded by tests.py. Add any URLs needed for tests only.
 from __future__ import absolute_import
 
 from django.conf.urls import patterns, url
-from django.contrib.formtools.tests import TestFormPreview, TestWizardClass
+from django.contrib.formtools.tests import TestFormPreview
 
-from django.contrib.formtools.tests.forms import (ContactWizard, Page1, Page2,
-    Page3, TestForm, WizardPageOneForm, WizardPageTwoForm, WizardPageThreeForm)
+from django.contrib.formtools.tests.forms import TestForm
 
 
 urlpatterns = patterns('',
     url(r'^preview/', TestFormPreview(TestForm)),
-    url(r'^wizard1/$', TestWizardClass(
-        [WizardPageOneForm, WizardPageTwoForm, WizardPageThreeForm])),
-    url(r'^wizard2/$', ContactWizard([Page1, Page2, Page3])),
 )
diff --git a/django/contrib/formtools/tests/wizard/__init__.py b/django/contrib/formtools/tests/wizard/__init__.py
index a2a9692ac6..81de44e655 100644
--- a/django/contrib/formtools/tests/wizard/__init__.py
+++ b/django/contrib/formtools/tests/wizard/__init__.py
@@ -1,6 +1,6 @@
-from django.contrib.formtools.tests.wizard.cookiestorage import TestCookieStorage
-from django.contrib.formtools.tests.wizard.forms import FormTests, SessionFormTests, CookieFormTests
-from django.contrib.formtools.tests.wizard.loadstorage import TestLoadStorage
+from django.contrib.formtools.tests.wizard.test_cookiestorage import TestCookieStorage
+from django.contrib.formtools.tests.wizard.test_forms import FormTests, SessionFormTests, CookieFormTests
+from django.contrib.formtools.tests.wizard.test_loadstorage import TestLoadStorage
 from django.contrib.formtools.tests.wizard.namedwizardtests.tests import (
     NamedSessionWizardTests,
     NamedCookieWizardTests,
@@ -9,7 +9,7 @@ from django.contrib.formtools.tests.wizard.namedwizardtests.tests import (
     NamedSessionFormTests,
     NamedCookieFormTests,
 )
-from django.contrib.formtools.tests.wizard.sessionstorage import TestSessionStorage
+from django.contrib.formtools.tests.wizard.test_sessionstorage import TestSessionStorage
 from django.contrib.formtools.tests.wizard.wizardtests.tests import (
     SessionWizardTests,
     CookieWizardTests,
diff --git a/django/contrib/formtools/tests/wizard/namedwizardtests/tests.py b/django/contrib/formtools/tests/wizard/namedwizardtests/tests.py
index 7529d89a2c..b6125db5b9 100644
--- a/django/contrib/formtools/tests/wizard/namedwizardtests/tests.py
+++ b/django/contrib/formtools/tests/wizard/namedwizardtests/tests.py
@@ -5,10 +5,11 @@ from django.http import QueryDict
 from django.test import TestCase
 
 from django.contrib.auth.models import User
+from django.contrib.auth.tests.utils import skipIfCustomUser
 
 from django.contrib.formtools.wizard.views import (NamedUrlSessionWizardView,
                                                    NamedUrlCookieWizardView)
-from django.contrib.formtools.tests.wizard.forms import get_request, Step1, Step2
+from django.contrib.formtools.tests.wizard.test_forms import get_request, Step1, Step2
 
 
 class NamedWizardTests(object):
@@ -21,7 +22,7 @@ class NamedWizardTests(object):
     def test_initial_call(self):
         response = self.client.get(reverse('%s_start' % self.wizard_urlname))
         self.assertEqual(response.status_code, 302)
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
         wizard = response.context['wizard']
         self.assertEqual(wizard['steps'].current, 'form1')
@@ -40,7 +41,7 @@ class NamedWizardTests(object):
         self.assertEqual(response.status_code, 302)
 
         # Test for proper redirect GET parameters
-        location = response['Location']
+        location = response.url
         self.assertNotEqual(location.find('?'), -1)
         querydict = QueryDict(location[location.find('?') + 1:])
         self.assertEqual(dict(querydict.items()), get_params)
@@ -60,7 +61,7 @@ class NamedWizardTests(object):
         response = self.client.post(
             reverse(self.wizard_urlname, kwargs={'step': 'form1'}),
             self.wizard_step_data[0])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
 
         self.assertEqual(response.status_code, 200)
         wizard = response.context['wizard']
@@ -79,7 +80,7 @@ class NamedWizardTests(object):
         response = self.client.post(
             reverse(self.wizard_urlname, kwargs={'step': 'form1'}),
             self.wizard_step_data[0])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['wizard']['steps'].current, 'form2')
@@ -88,7 +89,7 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname, kwargs={
                 'step': response.context['wizard']['steps'].current
             }), {'wizard_goto_step': response.context['wizard']['steps'].prev})
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['wizard']['steps'].current, 'form1')
@@ -116,7 +117,7 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             self.wizard_step_data[0])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['wizard']['steps'].current, 'form2')
@@ -128,7 +129,7 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             post_data)
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['wizard']['steps'].current, 'form3')
@@ -137,7 +138,7 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             self.wizard_step_data[2])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['wizard']['steps'].current, 'form4')
@@ -146,7 +147,7 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             self.wizard_step_data[3])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
 
         all_data = response.context['form_list']
@@ -169,7 +170,7 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             self.wizard_step_data[0])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
 
         post_data = self.wizard_step_data[1]
@@ -178,7 +179,7 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             post_data)
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
 
         step2_url = reverse(self.wizard_urlname, kwargs={'step': 'form2'})
@@ -194,14 +195,14 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             self.wizard_step_data[2])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
 
         response = self.client.post(
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             self.wizard_step_data[3])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
 
         all_data = response.context['all_cleaned_data']
@@ -227,7 +228,7 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             self.wizard_step_data[0])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
 
         post_data = self.wizard_step_data[1]
@@ -237,14 +238,14 @@ class NamedWizardTests(object):
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             post_data)
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
 
         response = self.client.post(
             reverse(self.wizard_urlname,
                     kwargs={'step': response.context['wizard']['steps'].current}),
             self.wizard_step_data[2])
-        loc = response['Location']
+        loc = response.url
         response = self.client.get(loc)
         self.assertEqual(response.status_code, 200, loc)
 
@@ -263,7 +264,7 @@ class NamedWizardTests(object):
         response = self.client.post(
             reverse(self.wizard_urlname, kwargs={'step': 'form1'}),
             self.wizard_step_data[0])
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['wizard']['steps'].current, 'form2')
 
@@ -271,11 +272,12 @@ class NamedWizardTests(object):
             '%s?reset=1' % reverse('%s_start' % self.wizard_urlname))
         self.assertEqual(response.status_code, 302)
 
-        response = self.client.get(response['Location'])
+        response = self.client.get(response.url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['wizard']['steps'].current, 'form1')
 
 
+@skipIfCustomUser
 class NamedSessionWizardTests(NamedWizardTests, TestCase):
     wizard_urlname = 'nwiz_session'
     wizard_step_1_data = {
@@ -307,6 +309,7 @@ class NamedSessionWizardTests(NamedWizardTests, TestCase):
     )
 
 
+@skipIfCustomUser
 class NamedCookieWizardTests(NamedWizardTests, TestCase):
     wizard_urlname = 'nwiz_cookie'
     wizard_step_1_data = {
@@ -367,11 +370,13 @@ class TestNamedUrlCookieWizardView(NamedUrlCookieWizardView):
         return response, self
 
 
+@skipIfCustomUser
 class NamedSessionFormTests(NamedFormTests, TestCase):
     formwizard_class = TestNamedUrlSessionWizardView
     wizard_urlname = 'nwiz_session'
 
 
+@skipIfCustomUser
 class NamedCookieFormTests(NamedFormTests, TestCase):
     formwizard_class = TestNamedUrlCookieWizardView
     wizard_urlname = 'nwiz_cookie'
diff --git a/django/contrib/formtools/tests/wizard/storage.py b/django/contrib/formtools/tests/wizard/storage.py
index fe1d96381f..17968dfcda 100644
--- a/django/contrib/formtools/tests/wizard/storage.py
+++ b/django/contrib/formtools/tests/wizard/storage.py
@@ -75,3 +75,13 @@ class TestStorage(object):
         storage.extra_data = extra_context
         storage2 = self.get_storage()('wizard2', request, None)
         self.assertEqual(storage2.extra_data, {})
+
+    def test_extra_context_key_persistence(self):
+        request = get_request()
+        storage = self.get_storage()('wizard1', request, None)
+
+        self.assertFalse('test' in storage.extra_data)
+
+        storage.extra_data['test'] = True
+
+        self.assertTrue('test' in storage.extra_data)
diff --git a/django/contrib/formtools/tests/wizard/cookiestorage.py b/django/contrib/formtools/tests/wizard/test_cookiestorage.py
similarity index 92%
rename from django/contrib/formtools/tests/wizard/cookiestorage.py
rename to django/contrib/formtools/tests/wizard/test_cookiestorage.py
index d450f47861..060e8260b5 100644
--- a/django/contrib/formtools/tests/wizard/cookiestorage.py
+++ b/django/contrib/formtools/tests/wizard/test_cookiestorage.py
@@ -5,10 +5,12 @@ from django.core import signing
 from django.core.exceptions import SuspiciousOperation
 from django.http import HttpResponse
 
+from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.contrib.formtools.wizard.storage.cookie import CookieStorage
 from django.contrib.formtools.tests.wizard.storage import get_request, TestStorage
 
 
+@skipIfCustomUser
 class TestCookieStorage(TestStorage, TestCase):
     def get_storage(self):
         return CookieStorage
@@ -43,5 +45,5 @@ class TestCookieStorage(TestStorage, TestCase):
         storage.init_data()
         storage.update_response(response)
         unsigned_cookie_data = cookie_signer.unsign(response.cookies[storage.prefix].value)
-        self.assertEqual(json.loads(unsigned_cookie_data),
+        self.assertJSONEqual(unsigned_cookie_data,
             {"step_files": {}, "step": None, "extra_data": {}, "step_data": {}})
diff --git a/django/contrib/formtools/tests/wizard/forms.py b/django/contrib/formtools/tests/wizard/test_forms.py
similarity index 77%
rename from django/contrib/formtools/tests/wizard/forms.py
rename to django/contrib/formtools/tests/wizard/test_forms.py
index 51cfaa661b..14c6e6a685 100644
--- a/django/contrib/formtools/tests/wizard/forms.py
+++ b/django/contrib/formtools/tests/wizard/test_forms.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 from django import forms, http
 from django.conf import settings
+from django.db import models
 from django.test import TestCase
 from django.template.response import TemplateResponse
 from django.utils.importlib import import_module
@@ -29,26 +30,40 @@ def get_request(*args, **kwargs):
     request.session = engine.SessionStore(None)
     return request
 
+
 class Step1(forms.Form):
     name = forms.CharField()
 
+
 class Step2(forms.Form):
     name = forms.CharField()
 
+
 class Step3(forms.Form):
     data = forms.CharField()
 
+
 class CustomKwargsStep1(Step1):
 
     def __init__(self, test=None, *args, **kwargs):
         self.test = test
         return super(CustomKwargsStep1, self).__init__(*args, **kwargs)
 
-class UserForm(forms.ModelForm):
-    class Meta:
-        model = User
 
-UserFormSet = forms.models.modelformset_factory(User, form=UserForm, extra=2)
+class TestModel(models.Model):
+    name = models.CharField(max_length=100)
+
+    class Meta:
+        app_label = 'formtools'
+
+
+class TestModelForm(forms.ModelForm):
+    class Meta:
+        model = TestModel
+
+
+TestModelFormSet = forms.models.modelformset_factory(TestModel, form=TestModelForm, extra=2)
+
 
 class TestWizard(WizardView):
     storage_name = 'django.contrib.formtools.wizard.storage.session.SessionStorage'
@@ -63,6 +78,12 @@ class TestWizard(WizardView):
             kwargs['test'] = True
         return kwargs
 
+class TestWizardWithInitAttrs(TestWizard):
+    form_list = [Step1, Step2]
+    condition_dict = {'step2': True}
+    initial_dict = {'start': {'name': 'value1'}}
+    instance_dict = {'start': User()}
+
 class FormTests(TestCase):
     def test_form_init(self):
         testform = TestWizard.get_initkwargs([Step1, Step2])
@@ -76,6 +97,9 @@ class FormTests(TestCase):
         self.assertEqual(
             testform['form_list'], {'0': Step1, '1': Step2, 'finish': Step3})
 
+        testform = TestWizardWithInitAttrs.get_initkwargs()
+        self.assertEqual(testform['form_list'], {'0': Step1, '1': Step2})
+
     def test_first_step(self):
         request = get_request()
 
@@ -117,6 +141,11 @@ class FormTests(TestCase):
         response, instance = testform(request)
         self.assertEqual(instance.get_next_step(), 'step3')
 
+        testform = TestWizardWithInitAttrs.as_view(
+            [('start', Step1), ('step2', Step2), ('step3', Step3)])
+        response, instance = testform(request)
+        self.assertEqual(instance.get_next_step(), 'step2')
+
     def test_form_kwargs(self):
         request = get_request()
 
@@ -147,10 +176,17 @@ class FormTests(TestCase):
         self.assertEqual(instance.get_form_initial('start'), {'name': 'value1'})
         self.assertEqual(instance.get_form_initial('step2'), {})
 
+        testform = TestWizardWithInitAttrs.as_view(
+            [('start', Step1), ('step2', Step2)])
+        response, instance = testform(request)
+
+        self.assertEqual(instance.get_form_initial('start'), {'name': 'value1'})
+        self.assertEqual(instance.get_form_initial('step2'), {})
+
     def test_form_instance(self):
         request = get_request()
-        the_instance = User()
-        testform = TestWizard.as_view([('start', UserForm), ('step2', Step2)],
+        the_instance = TestModel()
+        testform = TestWizard.as_view([('start', TestModelForm), ('step2', Step2)],
             instance_dict={'start': the_instance})
         response, instance = testform(request)
 
@@ -161,14 +197,22 @@ class FormTests(TestCase):
             instance.get_form_instance('non_exist_instance'),
             None)
 
+        testform = TestWizardWithInitAttrs.as_view(
+            [('start', TestModelForm), ('step2', Step2)])
+        response, instance = testform(request)
+
+        self.assertEqual(
+            instance.get_form_instance('start'),
+            TestWizardWithInitAttrs.instance_dict['start'])
+
     def test_formset_instance(self):
         request = get_request()
-        the_instance1, created = User.objects.get_or_create(
-            username='testuser1')
-        the_instance2, created = User.objects.get_or_create(
-            username='testuser2')
-        testform = TestWizard.as_view([('start', UserFormSet), ('step2', Step2)],
-            instance_dict={'start': User.objects.filter(username='testuser1')})
+        the_instance1, created = TestModel.objects.get_or_create(
+            name='test object 1')
+        the_instance2, created = TestModel.objects.get_or_create(
+            name='test object 2')
+        testform = TestWizard.as_view([('start', TestModelFormSet), ('step2', Step2)],
+            instance_dict={'start': TestModel.objects.filter(name='test object 1')})
         response, instance = testform(request)
 
         self.assertEqual(list(instance.get_form_instance('start')), [the_instance1])
diff --git a/django/contrib/formtools/tests/wizard/loadstorage.py b/django/contrib/formtools/tests/wizard/test_loadstorage.py
similarity index 55%
rename from django/contrib/formtools/tests/wizard/loadstorage.py
rename to django/contrib/formtools/tests/wizard/test_loadstorage.py
index 267dee0379..bb0b06eecf 100644
--- a/django/contrib/formtools/tests/wizard/loadstorage.py
+++ b/django/contrib/formtools/tests/wizard/test_loadstorage.py
@@ -1,8 +1,6 @@
 from django.test import TestCase
 
-from django.contrib.formtools.wizard.storage import (get_storage,
-                                                     MissingStorageModule,
-                                                     MissingStorageClass)
+from django.contrib.formtools.wizard.storage import get_storage, MissingStorage
 from django.contrib.formtools.wizard.storage.base import BaseStorage
 
 
@@ -12,11 +10,9 @@ class TestLoadStorage(TestCase):
             type(get_storage('django.contrib.formtools.wizard.storage.base.BaseStorage', 'wizard1')),
             BaseStorage)
 
-    def test_missing_module(self):
-        self.assertRaises(MissingStorageModule, get_storage,
+    def test_missing_storage(self):
+        self.assertRaises(MissingStorage, get_storage,
             'django.contrib.formtools.wizard.storage.idontexist.IDontExistStorage', 'wizard1')
-
-    def test_missing_class(self):
-        self.assertRaises(MissingStorageClass, get_storage,
+        self.assertRaises(MissingStorage, get_storage,
             'django.contrib.formtools.wizard.storage.base.IDontExistStorage', 'wizard1')
 
diff --git a/django/contrib/formtools/tests/wizard/sessionstorage.py b/django/contrib/formtools/tests/wizard/test_sessionstorage.py
similarity index 78%
rename from django/contrib/formtools/tests/wizard/sessionstorage.py
rename to django/contrib/formtools/tests/wizard/test_sessionstorage.py
index 85410725c9..0bd9fd8ecd 100644
--- a/django/contrib/formtools/tests/wizard/sessionstorage.py
+++ b/django/contrib/formtools/tests/wizard/test_sessionstorage.py
@@ -1,9 +1,11 @@
 from django.test import TestCase
 
+from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.contrib.formtools.tests.wizard.storage import TestStorage
 from django.contrib.formtools.wizard.storage.session import SessionStorage
 
 
+@skipIfCustomUser
 class TestSessionStorage(TestStorage, TestCase):
     def get_storage(self):
         return SessionStorage
diff --git a/django/contrib/formtools/tests/wizard/wizardtests/tests.py b/django/contrib/formtools/tests/wizard/wizardtests/tests.py
index 4aaea7d56e..1ee5dbdc78 100644
--- a/django/contrib/formtools/tests/wizard/wizardtests/tests.py
+++ b/django/contrib/formtools/tests/wizard/wizardtests/tests.py
@@ -7,11 +7,19 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.auth.tests.utils import skipIfCustomUser
 from django.contrib.formtools.wizard.views import CookieWizardView
-from django.contrib.formtools.tests.wizard.forms import UserForm, UserFormSet
 from django.utils._os import upath
 
 
+class UserForm(forms.ModelForm):
+    class Meta:
+        model = User
+
+
+UserFormSet = forms.models.modelformset_factory(User, form=UserForm, extra=2)
+
+
 class WizardTests(object):
     urls = 'django.contrib.formtools.tests.wizard.wizardtests.urls'
 
@@ -75,7 +83,7 @@ class WizardTests(object):
 
         # ticket #19025: `form` should be included in context
         form = response.context_data['wizard']['form']
-        self.assertEqual(response.context_data['form'], form)            
+        self.assertEqual(response.context_data['form'], form)
 
     def test_form_finish(self):
         response = self.client.get(self.wizard_url)
@@ -196,6 +204,7 @@ class WizardTests(object):
         self.assertEqual(response.status_code, 200)
 
 
+@skipIfCustomUser
 class SessionWizardTests(WizardTests, TestCase):
     wizard_url = '/wiz_session/'
     wizard_step_1_data = {
@@ -226,6 +235,8 @@ class SessionWizardTests(WizardTests, TestCase):
         }
     )
 
+
+@skipIfCustomUser
 class CookieWizardTests(WizardTests, TestCase):
     wizard_url = '/wiz_cookie/'
     wizard_step_1_data = {
@@ -256,6 +267,8 @@ class CookieWizardTests(WizardTests, TestCase):
         }
     )
 
+
+@skipIfCustomUser
 class WizardTestKwargs(TestCase):
     wizard_url = '/wiz_other_template/'
     wizard_step_1_data = {
@@ -347,6 +360,7 @@ class WizardTestGenericViewInterface(TestCase):
         self.assertEqual(response.context_data['another_key'], 'another_value')
 
 
+@skipIfCustomUser
 class WizardFormKwargsOverrideTests(TestCase):
     def setUp(self):
         super(WizardFormKwargsOverrideTests, self).setUp()
diff --git a/django/contrib/formtools/wizard/__init__.py b/django/contrib/formtools/wizard/__init__.py
index 8e51a3170d..e69de29bb2 100644
--- a/django/contrib/formtools/wizard/__init__.py
+++ b/django/contrib/formtools/wizard/__init__.py
@@ -1 +0,0 @@
-from django.contrib.formtools.wizard.legacy import FormWizard
diff --git a/django/contrib/formtools/wizard/legacy.py b/django/contrib/formtools/wizard/legacy.py
deleted file mode 100644
index d07e959de0..0000000000
--- a/django/contrib/formtools/wizard/legacy.py
+++ /dev/null
@@ -1,270 +0,0 @@
-"""
-FormWizard class -- implements a multi-page form, validating between each
-step and storing the form's state as HTML hidden fields so that no state is
-stored on the server side.
-"""
-from django.forms import HiddenInput
-from django.http import Http404
-from django.shortcuts import render_to_response
-from django.template.context import RequestContext
-from django.utils.crypto import constant_time_compare
-from django.utils.translation import ugettext_lazy as _
-from django.utils.decorators import method_decorator
-from django.views.decorators.csrf import csrf_protect
-
-from django.contrib.formtools.utils import form_hmac
-
-class FormWizard(object):
-    # The HTML (and POST data) field name for the "step" variable.
-    step_field_name="wizard_step"
-
-    # METHODS SUBCLASSES SHOULDN'T OVERRIDE ###################################
-
-    def __init__(self, form_list, initial=None):
-        """
-        Start a new wizard with a list of forms.
-
-        form_list should be a list of Form classes (not instances).
-        """
-        self.form_list = form_list[:]
-        self.initial = initial or {}
-
-        # Dictionary of extra template context variables.
-        self.extra_context = {}
-
-        # A zero-based counter keeping track of which step we're in.
-        self.step = 0
-
-        import warnings
-        warnings.warn(
-            'Old-style form wizards have been deprecated; use the class-based '
-            'views in django.contrib.formtools.wizard.views instead.',
-            DeprecationWarning)
-
-    def __repr__(self):
-        return "step: %d\nform_list: %s\ninitial_data: %s" % (self.step, self.form_list, self.initial)
-
-    def get_form(self, step, data=None):
-        "Helper method that returns the Form instance for the given step."
-        # Sanity check.
-        if step >= self.num_steps():
-            raise Http404('Step %s does not exist' % step)
-        return self.form_list[step](data, prefix=self.prefix_for_step(step), initial=self.initial.get(step, None))
-
-    def num_steps(self):
-        "Helper method that returns the number of steps."
-        # You might think we should just set "self.num_steps = len(form_list)"
-        # in __init__(), but this calculation needs to be dynamic, because some
-        # hook methods might alter self.form_list.
-        return len(self.form_list)
-
-    def _check_security_hash(self, token, request, form):
-        expected = self.security_hash(request, form)
-        return constant_time_compare(token, expected)
-
-    @method_decorator(csrf_protect)
-    def __call__(self, request, *args, **kwargs):
-        """
-        Main method that does all the hard work, conforming to the Django view
-        interface.
-        """
-        if 'extra_context' in kwargs:
-            self.extra_context.update(kwargs['extra_context'])
-        current_step = self.get_current_or_first_step(request, *args, **kwargs)
-        self.parse_params(request, *args, **kwargs)
-
-        # Validate and process all the previous forms before instantiating the
-        # current step's form in case self.process_step makes changes to
-        # self.form_list.
-
-        # If any of them fails validation, that must mean the validator relied
-        # on some other input, such as an external Web site.
-
-        # It is also possible that alidation might fail under certain attack
-        # situations: an attacker might be able to bypass previous stages, and
-        # generate correct security hashes for all the skipped stages by virtue
-        # of:
-        #  1) having filled out an identical form which doesn't have the
-        #     validation (and does something different at the end),
-        #  2) or having filled out a previous version of the same form which
-        #     had some validation missing,
-        #  3) or previously having filled out the form when they had more
-        #     privileges than they do now.
-        #
-        # Since the hashes only take into account values, and not other other
-        # validation the form might do, we must re-do validation now for
-        # security reasons.
-        previous_form_list = []
-        for i in range(current_step):
-            f = self.get_form(i, request.POST)
-            if not self._check_security_hash(request.POST.get("hash_%d" % i, ''),
-                                             request, f):
-                return self.render_hash_failure(request, i)
-
-            if not f.is_valid():
-                return self.render_revalidation_failure(request, i, f)
-            else:
-                self.process_step(request, f, i)
-                previous_form_list.append(f)
-
-        # Process the current step. If it's valid, go to the next step or call
-        # done(), depending on whether any steps remain.
-        if request.method == 'POST':
-            form = self.get_form(current_step, request.POST)
-        else:
-            form = self.get_form(current_step)
-
-        if form.is_valid():
-            self.process_step(request, form, current_step)
-            next_step = current_step + 1
-
-            if next_step == self.num_steps():
-                return self.done(request, previous_form_list + [form])
-            else:
-                form = self.get_form(next_step)
-                self.step = current_step = next_step
-
-        return self.render(form, request, current_step)
-
-    def render(self, form, request, step, context=None):
-        "Renders the given Form object, returning an HttpResponse."
-        old_data = request.POST
-        prev_fields = []
-        if old_data:
-            hidden = HiddenInput()
-            # Collect all data from previous steps and render it as HTML hidden fields.
-            for i in range(step):
-                old_form = self.get_form(i, old_data)
-                hash_name = 'hash_%s' % i
-                prev_fields.extend([bf.as_hidden() for bf in old_form])
-                prev_fields.append(hidden.render(hash_name, old_data.get(hash_name, self.security_hash(request, old_form))))
-        return self.render_template(request, form, ''.join(prev_fields), step, context)
-
-    # METHODS SUBCLASSES MIGHT OVERRIDE IF APPROPRIATE ########################
-
-    def prefix_for_step(self, step):
-        "Given the step, returns a Form prefix to use."
-        return str(step)
-
-    def render_hash_failure(self, request, step):
-        """
-        Hook for rendering a template if a hash check failed.
-
-        step is the step that failed. Any previous step is guaranteed to be
-        valid.
-
-        This default implementation simply renders the form for the given step,
-        but subclasses may want to display an error message, etc.
-        """
-        return self.render(self.get_form(step), request, step, context={'wizard_error': _('We apologize, but your form has expired. Please continue filling out the form from this page.')})
-
-    def render_revalidation_failure(self, request, step, form):
-        """
-        Hook for rendering a template if final revalidation failed.
-
-        It is highly unlikely that this point would ever be reached, but See
-        the comment in __call__() for an explanation.
-        """
-        return self.render(form, request, step)
-
-    def security_hash(self, request, form):
-        """
-        Calculates the security hash for the given HttpRequest and Form instances.
-
-        Subclasses may want to take into account request-specific information,
-        such as the IP address.
-        """
-        return form_hmac(form)
-
-    def get_current_or_first_step(self, request, *args, **kwargs):
-        """
-        Given the request object and whatever *args and **kwargs were passed to
-        __call__(), returns the current step (which is zero-based).
-
-        Note that the result should not be trusted. It may even be a completely
-        invalid number. It's not the job of this method to validate it.
-        """
-        if not request.POST:
-            return 0
-        try:
-            step = int(request.POST.get(self.step_field_name, 0))
-        except ValueError:
-            return 0
-        return step
-
-    def parse_params(self, request, *args, **kwargs):
-        """
-        Hook for setting some state, given the request object and whatever
-        *args and **kwargs were passed to __call__(), sets some state.
-
-        This is called at the beginning of __call__().
-        """
-        pass
-
-    def get_template(self, step):
-        """
-        Hook for specifying the name of the template to use for a given step.
-
-        Note that this can return a tuple of template names if you'd like to
-        use the template system's select_template() hook.
-        """
-        return 'forms/wizard.html'
-
-    def render_template(self, request, form, previous_fields, step, context=None):
-        """
-        Renders the template for the given step, returning an HttpResponse object.
-
-        Override this method if you want to add a custom context, return a
-        different MIME type, etc. If you only need to override the template
-        name, use get_template() instead.
-
-        The template will be rendered with the following context:
-            step_field -- The name of the hidden field containing the step.
-            step0      -- The current step (zero-based).
-            step       -- The current step (one-based).
-            step_count -- The total number of steps.
-            form       -- The Form instance for the current step (either empty
-                          or with errors).
-            previous_fields -- A string representing every previous data field,
-                          plus hashes for completed forms, all in the form of
-                          hidden fields. Note that you'll need to run this
-                          through the "safe" template filter, to prevent
-                          auto-escaping, because it's raw HTML.
-        """
-        context = context or {}
-        context.update(self.extra_context)
-        return render_to_response(self.get_template(step), dict(context,
-            step_field=self.step_field_name,
-            step0=step,
-            step=step + 1,
-            step_count=self.num_steps(),
-            form=form,
-            previous_fields=previous_fields
-        ), context_instance=RequestContext(request))
-
-    def process_step(self, request, form, step):
-        """
-        Hook for modifying the FormWizard's internal state, given a fully
-        validated Form object. The Form is guaranteed to have clean, valid
-        data.
-
-        This method should *not* modify any of that data. Rather, it might want
-        to set self.extra_context or dynamically alter self.form_list, based on
-        previously submitted forms.
-
-        Note that this method is called every time a page is rendered for *all*
-        submitted steps.
-        """
-        pass
-
-    # METHODS SUBCLASSES MUST OVERRIDE ########################################
-
-    def done(self, request, form_list):
-        """
-        Hook for doing something with the validated data. This is responsible
-        for the final processing.
-
-        form_list is a list of Form instances, each containing clean, valid
-        data.
-        """
-        raise NotImplementedError("Your %s class has not defined a done() method, which is required." % self.__class__.__name__)
diff --git a/django/contrib/formtools/wizard/storage/__init__.py b/django/contrib/formtools/wizard/storage/__init__.py
index f2293c93a3..8f57605ec5 100644
--- a/django/contrib/formtools/wizard/storage/__init__.py
+++ b/django/contrib/formtools/wizard/storage/__init__.py
@@ -1,22 +1,14 @@
-from django.utils.importlib import import_module
+from django.core.exceptions import ImproperlyConfigured
+from django.utils.module_loading import import_by_path
 
 from django.contrib.formtools.wizard.storage.base import BaseStorage
 from django.contrib.formtools.wizard.storage.exceptions import (
-    MissingStorageModule, MissingStorageClass, NoFileStorageConfigured)
+    MissingStorage, NoFileStorageConfigured)
 
 
 def get_storage(path, *args, **kwargs):
-    i = path.rfind('.')
-    module, attr = path[:i], path[i+1:]
     try:
-        mod = import_module(module)
-    except ImportError as e:
-        raise MissingStorageModule(
-            'Error loading storage %s: "%s"' % (module, e))
-    try:
-        storage_class = getattr(mod, attr)
-    except AttributeError:
-        raise MissingStorageClass(
-            'Module "%s" does not define a storage named "%s"' % (module, attr))
+        storage_class = import_by_path(path)
+    except ImproperlyConfigured as e:
+        raise MissingStorage('Error loading storage: %s' % e)
     return storage_class(*args, **kwargs)
-
diff --git a/django/contrib/formtools/wizard/storage/base.py b/django/contrib/formtools/wizard/storage/base.py
index 2e59679d09..6c155e0ff0 100644
--- a/django/contrib/formtools/wizard/storage/base.py
+++ b/django/contrib/formtools/wizard/storage/base.py
@@ -37,7 +37,7 @@ class BaseStorage(object):
     current_step = lazy_property(_get_current_step, _set_current_step)
 
     def _get_extra_data(self):
-        return self.data[self.extra_data_key] or {}
+        return self.data[self.extra_data_key]
 
     def _set_extra_data(self, extra_data):
         self.data[self.extra_data_key] = extra_data
diff --git a/django/contrib/formtools/wizard/storage/exceptions.py b/django/contrib/formtools/wizard/storage/exceptions.py
index eab9030cf1..e273a8654b 100644
--- a/django/contrib/formtools/wizard/storage/exceptions.py
+++ b/django/contrib/formtools/wizard/storage/exceptions.py
@@ -1,9 +1,6 @@
 from django.core.exceptions import ImproperlyConfigured
 
-class MissingStorageModule(ImproperlyConfigured):
-    pass
-
-class MissingStorageClass(ImproperlyConfigured):
+class MissingStorage(ImproperlyConfigured):
     pass
 
 class NoFileStorageConfigured(ImproperlyConfigured):
diff --git a/django/contrib/formtools/wizard/views.py b/django/contrib/formtools/wizard/views.py
index cba39151e7..17cfa6baa7 100644
--- a/django/contrib/formtools/wizard/views.py
+++ b/django/contrib/formtools/wizard/views.py
@@ -120,8 +120,8 @@ class WizardView(TemplateView):
         return super(WizardView, cls).as_view(**initkwargs)
 
     @classmethod
-    def get_initkwargs(cls, form_list, initial_dict=None,
-            instance_dict=None, condition_dict=None, *args, **kwargs):
+    def get_initkwargs(cls, form_list=None, initial_dict=None,
+        instance_dict=None, condition_dict=None, *args, **kwargs):
         """
         Creates a dict with all needed parameters for the form wizard instances.
 
@@ -144,12 +144,20 @@ class WizardView(TemplateView):
           will be called with the wizardview instance as the only argument.
           If the return value is true, the step's form will be used.
         """
+
         kwargs.update({
-            'initial_dict': initial_dict or {},
-            'instance_dict': instance_dict or {},
-            'condition_dict': condition_dict or {},
+            'initial_dict': initial_dict or kwargs.pop('initial_dict',
+                getattr(cls, 'initial_dict', None)) or {},
+            'instance_dict': instance_dict or kwargs.pop('instance_dict',
+                getattr(cls, 'instance_dict', None)) or {},
+            'condition_dict': condition_dict or kwargs.pop('condition_dict',
+                getattr(cls, 'condition_dict', None)) or {}
         })
-        init_form_list = SortedDict()
+
+        form_list = form_list or kwargs.pop('form_list',
+            getattr(cls, 'form_list', None)) or []
+
+        computed_form_list = SortedDict()
 
         assert len(form_list) > 0, 'at least one form is needed'
 
@@ -158,13 +166,13 @@ class WizardView(TemplateView):
             if isinstance(form, (list, tuple)):
                 # if the element is a tuple, add the tuple to the new created
                 # sorted dictionary.
-                init_form_list[six.text_type(form[0])] = form[1]
+                computed_form_list[six.text_type(form[0])] = form[1]
             else:
                 # if not, add the form with a zero based counter as unicode
-                init_form_list[six.text_type(i)] = form
+                computed_form_list[six.text_type(i)] = form
 
         # walk through the new created list of forms
-        for form in six.itervalues(init_form_list):
+        for form in six.itervalues(computed_form_list):
             if issubclass(form, formsets.BaseFormSet):
                 # if the element is based on BaseFormSet (FormSet/ModelFormSet)
                 # we need to override the form variable.
@@ -179,7 +187,7 @@ class WizardView(TemplateView):
                             "wizard view in order to handle file uploads.")
 
         # build the kwargs for the wizardview instances
-        kwargs['form_list'] = init_form_list
+        kwargs['form_list'] = computed_form_list
         return kwargs
 
     def get_prefix(self, *args, **kwargs):
@@ -257,11 +265,7 @@ class WizardView(TemplateView):
         # form. (This makes stepping back a lot easier).
         wizard_goto_step = self.request.POST.get('wizard_goto_step', None)
         if wizard_goto_step and wizard_goto_step in self.get_form_list():
-            self.storage.current_step = wizard_goto_step
-            form = self.get_form(
-                data=self.storage.get_step_data(self.steps.current),
-                files=self.storage.get_step_files(self.steps.current))
-            return self.render(form)
+            return self.render_goto_step(wizard_goto_step)
 
         # Check if form was refreshed
         management_form = ManagementForm(self.request.POST, prefix=self.prefix)
@@ -309,6 +313,17 @@ class WizardView(TemplateView):
         self.storage.current_step = next_step
         return self.render(new_form, **kwargs)
 
+    def render_goto_step(self, goto_step, **kwargs):
+        """
+        This method gets called when the current step has to be changed.
+        `goto_step` contains the requested step to go to.
+        """
+        self.storage.current_step = goto_step
+        form = self.get_form(
+            data=self.storage.get_step_data(self.steps.current),
+            files=self.storage.get_step_files(self.steps.current))
+        return self.render(form)
+
     def render_done(self, form, **kwargs):
         """
         This method gets called when all forms passed. The method should also
@@ -652,8 +667,7 @@ class NamedUrlWizardView(WizardView):
         """
         wizard_goto_step = self.request.POST.get('wizard_goto_step', None)
         if wizard_goto_step and wizard_goto_step in self.get_form_list():
-            self.storage.current_step = wizard_goto_step
-            return redirect(self.get_step_url(wizard_goto_step))
+            return self.render_goto_step(wizard_goto_step)
         return super(NamedUrlWizardView, self).post(*args, **kwargs)
 
     def get_context_data(self, form, **kwargs):
@@ -674,6 +688,14 @@ class NamedUrlWizardView(WizardView):
         self.storage.current_step = next_step
         return redirect(self.get_step_url(next_step))
 
+    def render_goto_step(self, goto_step, **kwargs):
+        """
+        This method gets called when the current step has to be changed.
+        `goto_step` contains the requested step to go to.
+        """
+        self.storage.current_step = goto_step
+        return redirect(self.get_step_url(goto_step))
+
     def render_revalidation_failure(self, failed_step, form, **kwargs):
         """
         When a step fails, we have to redirect the user to the first failing
diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py
index 6913bf5870..7e79be1860 100644
--- a/django/contrib/gis/admin/options.py
+++ b/django/contrib/gis/admin/options.py
@@ -51,9 +51,10 @@ class GeoModelAdmin(ModelAdmin):
     def formfield_for_dbfield(self, db_field, **kwargs):
         """
         Overloaded from ModelAdmin so that an OpenLayersWidget is used
-        for viewing/editing GeometryFields.
+        for viewing/editing 2D GeometryFields (OpenLayers 2 does not support
+        3D editing).
         """
-        if isinstance(db_field, models.GeometryField):
+        if isinstance(db_field, models.GeometryField) and db_field.dim < 3:
             request = kwargs.pop('request', None)
             # Setting the widget with the newly defined widget.
             kwargs['widget'] = self.get_map_widget(db_field)
@@ -93,6 +94,7 @@ class GeoModelAdmin(ModelAdmin):
                       'scrollable' : self.scrollable,
                       'layerswitcher' : self.layerswitcher,
                       'collection_type' : collection_type,
+                      'is_generic' : db_field.geom_type == 'GEOMETRY',
                       'is_linestring' : db_field.geom_type in ('LINESTRING', 'MULTILINESTRING'),
                       'is_polygon' : db_field.geom_type in ('POLYGON', 'MULTIPOLYGON'),
                       'is_point' : db_field.geom_type in ('POINT', 'MULTIPOINT'),
diff --git a/django/contrib/gis/admin/widgets.py b/django/contrib/gis/admin/widgets.py
index f4379be7f3..ceb8e9c9bd 100644
--- a/django/contrib/gis/admin/widgets.py
+++ b/django/contrib/gis/admin/widgets.py
@@ -7,7 +7,7 @@ from django.utils import six
 from django.utils import translation
 
 from django.contrib.gis.gdal import OGRException
-from django.contrib.gis.geos import GEOSGeometry, GEOSException, fromstr
+from django.contrib.gis.geos import GEOSGeometry, GEOSException
 
 # Creating a template context that contains Django settings
 # values needed by admin map templates.
@@ -40,7 +40,8 @@ class OpenLayersWidget(Textarea):
                 )
                 value = None
 
-        if value and value.geom_type.upper() != self.geom_type:
+        if (value and value.geom_type.upper() != self.geom_type and
+                self.geom_type != 'GEOMETRY'):
             value = None
 
         # Constructing the dictionary of the map options.
@@ -117,25 +118,3 @@ class OpenLayersWidget(Textarea):
                     raise TypeError
                 map_options[js_name] = value
         return map_options
-
-    def _has_changed(self, initial, data):
-        """ Compare geographic value of data with its initial value. """
-
-        # Ensure we are dealing with a geographic object
-        if isinstance(initial, six.string_types):
-            try:
-                initial = GEOSGeometry(initial)
-            except (GEOSException, ValueError):
-                initial = None
-
-        # Only do a geographic comparison if both values are available
-        if initial and data:
-            data = fromstr(data)
-            data.transform(initial.srid)
-            # If the initial value was not added by the browser, the geometry
-            # provided may be slightly different, the first time it is saved.
-            # The comparison is done with a very low tolerance.
-            return not initial.equals_exact(data, tolerance=0.000001)
-        else:
-            # Check for change of state of existence
-            return bool(initial) != bool(data)
diff --git a/django/contrib/gis/db/backends/mysql/compiler.py b/django/contrib/gis/db/backends/mysql/compiler.py
index 7079db9f6a..f4654eff84 100644
--- a/django/contrib/gis/db/backends/mysql/compiler.py
+++ b/django/contrib/gis/db/backends/mysql/compiler.py
@@ -30,3 +30,6 @@ class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
 
 class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
     pass
+
+class SQLDateTimeCompiler(compiler.SQLDateTimeCompiler, GeoSQLCompiler):
+    pass
diff --git a/django/contrib/gis/db/backends/mysql/operations.py b/django/contrib/gis/db/backends/mysql/operations.py
index fa20ca07f4..14402ec0a3 100644
--- a/django/contrib/gis/db/backends/mysql/operations.py
+++ b/django/contrib/gis/db/backends/mysql/operations.py
@@ -56,12 +56,13 @@ class MySQLOperations(DatabaseOperations, BaseSpatialOperations):
 
         lookup_info = self.geometry_functions.get(lookup_type, False)
         if lookup_info:
-            return "%s(%s, %s)" % (lookup_info, geo_col,
-                                   self.get_geom_placeholder(value, field.srid))
+            sql = "%s(%s, %s)" % (lookup_info, geo_col,
+                                  self.get_geom_placeholder(value, field.srid))
+            return sql, []
 
         # TODO: Is this really necessary? MySQL can't handle NULL geometries
         #  in its spatial indexes anyways.
         if lookup_type == 'isnull':
-            return "%s IS %sNULL" % (geo_col, (not value and 'NOT ' or ''))
+            return "%s IS %sNULL" % (geo_col, ('' if value else 'NOT ')), []
 
         raise TypeError("Got invalid lookup_type: %s" % repr(lookup_type))
diff --git a/django/contrib/gis/db/backends/oracle/compiler.py b/django/contrib/gis/db/backends/oracle/compiler.py
index 98da0163ba..d00af7fa71 100644
--- a/django/contrib/gis/db/backends/oracle/compiler.py
+++ b/django/contrib/gis/db/backends/oracle/compiler.py
@@ -20,3 +20,6 @@ class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
 
 class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
     pass
+
+class SQLDateTimeCompiler(compiler.SQLDateTimeCompiler, GeoSQLCompiler):
+    pass
diff --git a/django/contrib/gis/db/backends/oracle/introspection.py b/django/contrib/gis/db/backends/oracle/introspection.py
index 716f318d24..d6c8f452df 100644
--- a/django/contrib/gis/db/backends/oracle/introspection.py
+++ b/django/contrib/gis/db/backends/oracle/introspection.py
@@ -1,5 +1,7 @@
 import cx_Oracle
+import sys
 from django.db.backends.oracle.introspection import DatabaseIntrospection
+from django.utils import six
 
 class OracleIntrospection(DatabaseIntrospection):
     # Associating any OBJECTVAR instances with GeometryField.  Of course,
@@ -17,8 +19,11 @@ class OracleIntrospection(DatabaseIntrospection):
                                (table_name.upper(), geo_col.upper()))
                 row = cursor.fetchone()
             except Exception as msg:
-                raise Exception('Could not find entry in USER_SDO_GEOM_METADATA corresponding to "%s"."%s"\n'
-                                'Error message: %s.' % (table_name, geo_col, msg))
+                new_msg = (
+                    'Could not find entry in USER_SDO_GEOM_METADATA '
+                    'corresponding to "%s"."%s"\n'
+                    'Error message: %s.') % (table_name, geo_col, msg)
+                six.reraise(Exception, Exception(new_msg), sys.exc_info()[2])
 
             # TODO: Research way to find a more specific geometry field type for
             # the column's contents.
diff --git a/django/contrib/gis/db/backends/oracle/operations.py b/django/contrib/gis/db/backends/oracle/operations.py
index 4e42b4cf00..18697ac8c0 100644
--- a/django/contrib/gis/db/backends/oracle/operations.py
+++ b/django/contrib/gis/db/backends/oracle/operations.py
@@ -262,7 +262,7 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations):
                 return lookup_info.as_sql(geo_col, self.get_geom_placeholder(field, value))
         elif lookup_type == 'isnull':
             # Handling 'isnull' lookup type
-            return "%s IS %sNULL" % (geo_col, (not value and 'NOT ' or ''))
+            return "%s IS %sNULL" % (geo_col, ('' if value else 'NOT ')), []
 
         raise TypeError("Got invalid lookup_type: %s" % repr(lookup_type))
 
@@ -288,7 +288,7 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations):
     def spatial_ref_sys(self):
         from django.contrib.gis.db.backends.oracle.models import SpatialRefSys
         return SpatialRefSys
-    
+
     def modify_insert_params(self, placeholders, params):
         """Drop out insert parameters for NULL placeholder. Needed for Oracle Spatial
         backend due to #10888
diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py
index aa23b974db..4d31bbb53c 100644
--- a/django/contrib/gis/db/backends/postgis/operations.py
+++ b/django/contrib/gis/db/backends/postgis/operations.py
@@ -402,18 +402,10 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
         """
         Helper routine for calling PostGIS functions and returning their result.
         """
-        cursor = self.connection._cursor()
-        try:
-            try:
-                cursor.execute('SELECT %s()' % func)
-                row = cursor.fetchone()
-            except:
-                # Responsibility of callers to perform error handling.
-                raise
-        finally:
-            # Close out the connection.  See #9437.
-            self.connection.close()
-        return row[0]
+        # Close out the connection.  See #9437.
+        with self.connection.temporary_connection() as cursor:
+            cursor.execute('SELECT %s()' % func)
+            return cursor.fetchone()[0]
 
     def postgis_geos_version(self):
         "Returns the version of the GEOS library used with PostGIS."
@@ -560,7 +552,7 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
 
         elif lookup_type == 'isnull':
             # Handling 'isnull' lookup type
-            return "%s IS %sNULL" % (geo_col, (not value and 'NOT ' or ''))
+            return "%s IS %sNULL" % (geo_col, ('' if value else 'NOT ')), []
 
         raise TypeError("Got invalid lookup_type: %s" % repr(lookup_type))
 
diff --git a/django/contrib/gis/db/backends/spatialite/base.py b/django/contrib/gis/db/backends/spatialite/base.py
index b3a53820c1..7b49d71a61 100644
--- a/django/contrib/gis/db/backends/spatialite/base.py
+++ b/django/contrib/gis/db/backends/spatialite/base.py
@@ -1,15 +1,15 @@
+import sys
 from ctypes.util import find_library
 from django.conf import settings
 
 from django.core.exceptions import ImproperlyConfigured
-from django.db.backends.sqlite3.base import (
-    _sqlite_extract, _sqlite_date_trunc, _sqlite_regexp, _sqlite_format_dtdelta,
-    connection_created, Database, DatabaseWrapper as SQLiteDatabaseWrapper,
-    SQLiteCursorWrapper)
+from django.db.backends.sqlite3.base import (Database,
+    DatabaseWrapper as SQLiteDatabaseWrapper, SQLiteCursorWrapper)
 from django.contrib.gis.db.backends.spatialite.client import SpatiaLiteClient
 from django.contrib.gis.db.backends.spatialite.creation import SpatiaLiteCreation
 from django.contrib.gis.db.backends.spatialite.introspection import SpatiaLiteIntrospection
 from django.contrib.gis.db.backends.spatialite.operations import SpatiaLiteOperations
+from django.utils import six
 
 class DatabaseWrapper(SQLiteDatabaseWrapper):
     def __init__(self, *args, **kwargs):
@@ -52,7 +52,9 @@ class DatabaseWrapper(SQLiteDatabaseWrapper):
         try:
             cur.execute("SELECT load_extension(%s)", (self.spatialite_lib,))
         except Exception as msg:
-            raise ImproperlyConfigured('Unable to load the SpatiaLite library extension '
-                                       '"%s" because: %s' % (self.spatialite_lib, msg))
+            new_msg = (
+                'Unable to load the SpatiaLite library extension '
+                '"%s" because: %s') % (self.spatialite_lib, msg)
+            six.reraise(ImproperlyConfigured, ImproperlyConfigured(new_msg), sys.exc_info()[2])
         cur.close()
         return conn
diff --git a/django/contrib/gis/db/backends/spatialite/creation.py b/django/contrib/gis/db/backends/spatialite/creation.py
index 27332b9b57..d0a5f82033 100644
--- a/django/contrib/gis/db/backends/spatialite/creation.py
+++ b/django/contrib/gis/db/backends/spatialite/creation.py
@@ -30,7 +30,6 @@ class SpatiaLiteCreation(DatabaseCreation):
 
         self.connection.close()
         self.connection.settings_dict["NAME"] = test_database_name
-        self.connection.ops.confirm_spatial_components_versions()
 
         # Need to load the SpatiaLite initialization SQL before running `syncdb`.
         self.load_spatialite_sql()
diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py
index 5eaa77843c..83745476a0 100644
--- a/django/contrib/gis/db/backends/spatialite/operations.py
+++ b/django/contrib/gis/db/backends/spatialite/operations.py
@@ -1,4 +1,5 @@
 import re
+import sys
 from decimal import Decimal
 
 from django.contrib.gis.db.backends.base import BaseSpatialOperations
@@ -10,6 +11,8 @@ from django.core.exceptions import ImproperlyConfigured
 from django.db.backends.sqlite3.base import DatabaseOperations
 from django.db.utils import DatabaseError
 from django.utils import six
+from django.utils.functional import cached_property
+
 
 class SpatiaLiteOperator(SpatialOperation):
     "For SpatiaLite operators (e.g. `&&`, `~`)."
@@ -118,36 +121,49 @@ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
         gis_terms += self.geometry_functions.keys()
         self.gis_terms = dict([(term, None) for term in gis_terms])
 
-    def confirm_spatial_components_versions(self):
-        # Determine the version of the SpatiaLite library.
+    @cached_property
+    def spatial_version(self):
+        """Determine the version of the SpatiaLite library."""
         try:
-            vtup = self.spatialite_version_tuple()
-            version = vtup[1:]
-            if version < (2, 3, 0):
-                raise ImproperlyConfigured('GeoDjango only supports SpatiaLite versions '
-                                           '2.3.0 and above')
-            self.spatial_version = version
-        except ImproperlyConfigured:
-            raise
+            version = self.spatialite_version_tuple()[1:]
         except Exception as msg:
-            raise ImproperlyConfigured('Cannot determine the SpatiaLite version for the "%s" '
-                                       'database (error was "%s").  Was the SpatiaLite initialization '
-                                       'SQL loaded on this database?' %
-                                       (self.connection.settings_dict['NAME'], msg))
+            new_msg = (
+                'Cannot determine the SpatiaLite version for the "%s" '
+                'database (error was "%s").  Was the SpatiaLite initialization '
+                'SQL loaded on this database?') % (self.connection.settings_dict['NAME'], msg)
+            six.reraise(ImproperlyConfigured, ImproperlyConfigured(new_msg), sys.exc_info()[2])
+        if version < (2, 3, 0):
+            raise ImproperlyConfigured('GeoDjango only supports SpatiaLite versions '
+                                       '2.3.0 and above')
+        return version
 
-        if version >= (2, 4, 0):
+    @property
+    def _version_greater_2_4_0_rc4(self):
+        if self.spatial_version >= (2, 4, 1):
+            return True
+        elif self.spatial_version < (2, 4, 0):
+            return False
+        else:
             # Spatialite 2.4.0-RC4 added AsGML and AsKML, however both
             # RC2 (shipped in popular Debian/Ubuntu packages) and RC4
             # report version as '2.4.0', so we fall back to feature detection
             try:
                 self._get_spatialite_func("AsGML(GeomFromText('POINT(1 1)'))")
-                self.gml = 'AsGML'
-                self.kml = 'AsKML'
             except DatabaseError:
-                # we are using < 2.4.0-RC4
-                pass
-        if version >= (3, 0, 0):
-            self.geojson = 'AsGeoJSON'
+                return False
+            return True
+
+    @cached_property
+    def gml(self):
+        return 'AsGML' if self._version_greater_2_4_0_rc4 else None
+
+    @cached_property
+    def kml(self):
+        return 'AsKML' if self._version_greater_2_4_0_rc4 else None
+
+    @cached_property
+    def geojson(self):
+        return 'AsGeoJSON' if self.spatial_version >= (3, 0, 0) else None
 
     def check_aggregate_support(self, aggregate):
         """
@@ -344,7 +360,7 @@ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
             return op.as_sql(geo_col, self.get_geom_placeholder(field, geom))
         elif lookup_type == 'isnull':
             # Handling 'isnull' lookup type
-            return "%s IS %sNULL" % (geo_col, (not value and 'NOT ' or ''))
+            return "%s IS %sNULL" % (geo_col, ('' if value else 'NOT ')), []
 
         raise TypeError("Got invalid lookup_type: %s" % repr(lookup_type))
 
diff --git a/django/contrib/gis/db/backends/util.py b/django/contrib/gis/db/backends/util.py
index 2fc9123d26..2612810659 100644
--- a/django/contrib/gis/db/backends/util.py
+++ b/django/contrib/gis/db/backends/util.py
@@ -16,7 +16,7 @@ class SpatialOperation(object):
         self.extra = kwargs
 
     def as_sql(self, geo_col, geometry='%s'):
-        return self.sql_template % self.params(geo_col, geometry)
+        return self.sql_template % self.params(geo_col, geometry), []
 
     def params(self, geo_col, geometry):
         params = {'function' : self.function,
diff --git a/django/contrib/gis/db/models/fields.py b/django/contrib/gis/db/models/fields.py
index d90ce309d4..249617f771 100644
--- a/django/contrib/gis/db/models/fields.py
+++ b/django/contrib/gis/db/models/fields.py
@@ -202,7 +202,6 @@ class GeometryField(Field):
 
     def formfield(self, **kwargs):
         defaults = {'form_class' : forms.GeometryField,
-                    'null' : self.null,
                     'geom_type' : self.geom_type,
                     'srid' : self.srid,
                     }
diff --git a/django/contrib/gis/db/models/manager.py b/django/contrib/gis/db/models/manager.py
index 61fb82132b..aa57e3a507 100644
--- a/django/contrib/gis/db/models/manager.py
+++ b/django/contrib/gis/db/models/manager.py
@@ -9,95 +9,95 @@ class GeoManager(Manager):
     # properly.
     use_for_related_fields = True
 
-    def get_query_set(self):
+    def get_queryset(self):
         return GeoQuerySet(self.model, using=self._db)
 
     def area(self, *args, **kwargs):
-        return self.get_query_set().area(*args, **kwargs)
+        return self.get_queryset().area(*args, **kwargs)
 
     def centroid(self, *args, **kwargs):
-        return self.get_query_set().centroid(*args, **kwargs)
+        return self.get_queryset().centroid(*args, **kwargs)
 
     def collect(self, *args, **kwargs):
-        return self.get_query_set().collect(*args, **kwargs)
+        return self.get_queryset().collect(*args, **kwargs)
 
     def difference(self, *args, **kwargs):
-        return self.get_query_set().difference(*args, **kwargs)
+        return self.get_queryset().difference(*args, **kwargs)
 
     def distance(self, *args, **kwargs):
-        return self.get_query_set().distance(*args, **kwargs)
+        return self.get_queryset().distance(*args, **kwargs)
 
     def envelope(self, *args, **kwargs):
-        return self.get_query_set().envelope(*args, **kwargs)
+        return self.get_queryset().envelope(*args, **kwargs)
 
     def extent(self, *args, **kwargs):
-        return self.get_query_set().extent(*args, **kwargs)
+        return self.get_queryset().extent(*args, **kwargs)
 
     def extent3d(self, *args, **kwargs):
-        return self.get_query_set().extent3d(*args, **kwargs)
+        return self.get_queryset().extent3d(*args, **kwargs)
 
     def force_rhr(self, *args, **kwargs):
-        return self.get_query_set().force_rhr(*args, **kwargs)
+        return self.get_queryset().force_rhr(*args, **kwargs)
 
     def geohash(self, *args, **kwargs):
-        return self.get_query_set().geohash(*args, **kwargs)
+        return self.get_queryset().geohash(*args, **kwargs)
 
     def geojson(self, *args, **kwargs):
-        return self.get_query_set().geojson(*args, **kwargs)
+        return self.get_queryset().geojson(*args, **kwargs)
 
     def gml(self, *args, **kwargs):
-        return self.get_query_set().gml(*args, **kwargs)
+        return self.get_queryset().gml(*args, **kwargs)
 
     def intersection(self, *args, **kwargs):
-        return self.get_query_set().intersection(*args, **kwargs)
+        return self.get_queryset().intersection(*args, **kwargs)
 
     def kml(self, *args, **kwargs):
-        return self.get_query_set().kml(*args, **kwargs)
+        return self.get_queryset().kml(*args, **kwargs)
 
     def length(self, *args, **kwargs):
-        return self.get_query_set().length(*args, **kwargs)
+        return self.get_queryset().length(*args, **kwargs)
 
     def make_line(self, *args, **kwargs):
-        return self.get_query_set().make_line(*args, **kwargs)
+        return self.get_queryset().make_line(*args, **kwargs)
 
     def mem_size(self, *args, **kwargs):
-        return self.get_query_set().mem_size(*args, **kwargs)
+        return self.get_queryset().mem_size(*args, **kwargs)
 
     def num_geom(self, *args, **kwargs):
-        return self.get_query_set().num_geom(*args, **kwargs)
+        return self.get_queryset().num_geom(*args, **kwargs)
 
     def num_points(self, *args, **kwargs):
-        return self.get_query_set().num_points(*args, **kwargs)
+        return self.get_queryset().num_points(*args, **kwargs)
 
     def perimeter(self, *args, **kwargs):
-        return self.get_query_set().perimeter(*args, **kwargs)
+        return self.get_queryset().perimeter(*args, **kwargs)
 
     def point_on_surface(self, *args, **kwargs):
-        return self.get_query_set().point_on_surface(*args, **kwargs)
+        return self.get_queryset().point_on_surface(*args, **kwargs)
 
     def reverse_geom(self, *args, **kwargs):
-        return self.get_query_set().reverse_geom(*args, **kwargs)
+        return self.get_queryset().reverse_geom(*args, **kwargs)
 
     def scale(self, *args, **kwargs):
-        return self.get_query_set().scale(*args, **kwargs)
+        return self.get_queryset().scale(*args, **kwargs)
 
     def snap_to_grid(self, *args, **kwargs):
-        return self.get_query_set().snap_to_grid(*args, **kwargs)
+        return self.get_queryset().snap_to_grid(*args, **kwargs)
 
     def svg(self, *args, **kwargs):
-        return self.get_query_set().svg(*args, **kwargs)
+        return self.get_queryset().svg(*args, **kwargs)
 
     def sym_difference(self, *args, **kwargs):
-        return self.get_query_set().sym_difference(*args, **kwargs)
+        return self.get_queryset().sym_difference(*args, **kwargs)
 
     def transform(self, *args, **kwargs):
-        return self.get_query_set().transform(*args, **kwargs)
+        return self.get_queryset().transform(*args, **kwargs)
 
     def translate(self, *args, **kwargs):
-        return self.get_query_set().translate(*args, **kwargs)
+        return self.get_queryset().translate(*args, **kwargs)
 
     def union(self, *args, **kwargs):
-        return self.get_query_set().union(*args, **kwargs)
+        return self.get_queryset().union(*args, **kwargs)
 
     def unionagg(self, *args, **kwargs):
-        return self.get_query_set().unionagg(*args, **kwargs)
+        return self.get_queryset().unionagg(*args, **kwargs)
diff --git a/django/contrib/gis/db/models/sql/aggregates.py b/django/contrib/gis/db/models/sql/aggregates.py
index 9fcbb516d6..ae848c0894 100644
--- a/django/contrib/gis/db/models/sql/aggregates.py
+++ b/django/contrib/gis/db/models/sql/aggregates.py
@@ -22,13 +22,15 @@ class GeoAggregate(Aggregate):
             raise ValueError('Geospatial aggregates only allowed on geometry fields.')
 
     def as_sql(self, qn, connection):
-        "Return the aggregate, rendered as SQL."
+        "Return the aggregate, rendered as SQL with parameters."
 
         if connection.ops.oracle:
             self.extra['tolerance'] = self.tolerance
 
+        params = []
+
         if hasattr(self.col, 'as_sql'):
-            field_name = self.col.as_sql(qn, connection)
+            field_name, params = self.col.as_sql(qn, connection)
         elif isinstance(self.col, (list, tuple)):
             field_name = '.'.join([qn(c) for c in self.col])
         else:
@@ -36,13 +38,13 @@ class GeoAggregate(Aggregate):
 
         sql_template, sql_function = connection.ops.spatial_aggregate_sql(self)
 
-        params = {
+        substitutions = {
             'function': sql_function,
             'field': field_name
         }
-        params.update(self.extra)
+        substitutions.update(self.extra)
 
-        return sql_template % params
+        return sql_template % substitutions, params
 
 class Collect(GeoAggregate):
     pass
diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py
index 81a9941c9e..b488f59362 100644
--- a/django/contrib/gis/db/models/sql/compiler.py
+++ b/django/contrib/gis/db/models/sql/compiler.py
@@ -1,14 +1,16 @@
+import datetime
 try:
     from itertools import zip_longest
 except ImportError:
     from itertools import izip_longest as zip_longest
 
-from django.utils.six.moves import zip
-
-from django.db.backends.util import truncate_name, typecast_timestamp
+from django.conf import settings
+from django.db.backends.util import truncate_name, typecast_date, typecast_timestamp
 from django.db.models.sql import compiler
 from django.db.models.sql.constants import MULTI
 from django.utils import six
+from django.utils.six.moves import zip
+from django.utils import timezone
 
 SQLCompiler = compiler.SQLCompiler
 
@@ -31,6 +33,7 @@ class GeoSQLCompiler(compiler.SQLCompiler):
         qn2 = self.connection.ops.quote_name
         result = ['(%s) AS %s' % (self.get_extra_select_format(alias) % col[0], qn2(alias))
                   for alias, col in six.iteritems(self.query.extra_select)]
+        params = []
         aliases = set(self.query.extra_select.keys())
         if with_aliases:
             col_aliases = aliases.copy()
@@ -61,7 +64,9 @@ class GeoSQLCompiler(compiler.SQLCompiler):
                         aliases.add(r)
                         col_aliases.add(col[1])
                 else:
-                    result.append(col.as_sql(qn, self.connection))
+                    col_sql, col_params = col.as_sql(qn, self.connection)
+                    result.append(col_sql)
+                    params.extend(col_params)
 
                     if hasattr(col, 'alias'):
                         aliases.add(col.alias)
@@ -74,15 +79,13 @@ class GeoSQLCompiler(compiler.SQLCompiler):
             aliases.update(new_aliases)
 
         max_name_length = self.connection.ops.max_name_length()
-        result.extend([
-                '%s%s' % (
-                    self.get_extra_select_format(alias) % aggregate.as_sql(qn, self.connection),
-                    alias is not None
-                        and ' AS %s' % qn(truncate_name(alias, max_name_length))
-                        or ''
-                    )
-                for alias, aggregate in self.query.aggregate_select.items()
-        ])
+        for alias, aggregate in self.query.aggregate_select.items():
+            agg_sql, agg_params = aggregate.as_sql(qn, self.connection)
+            if alias is None:
+                result.append(agg_sql)
+            else:
+                result.append('%s AS %s' % (agg_sql, qn(truncate_name(alias, max_name_length))))
+            params.extend(agg_params)
 
         # This loop customized for GeoQuery.
         for (table, col), field in self.query.related_select_cols:
@@ -98,7 +101,7 @@ class GeoSQLCompiler(compiler.SQLCompiler):
                 col_aliases.add(col)
 
         self._select_aliases = aliases
-        return result
+        return result, params
 
     def get_default_columns(self, with_aliases=False, col_aliases=None,
             start_alias=None, opts=None, as_pairs=False, from_parent=None):
@@ -119,29 +122,16 @@ class GeoSQLCompiler(compiler.SQLCompiler):
         result = []
         if opts is None:
             opts = self.query.model._meta
-        # Skip all proxy to the root proxied model
-        opts = opts.concrete_model._meta
         aliases = set()
         only_load = self.deferred_to_columns()
-
+        seen = self.query.included_inherited_models.copy()
         if start_alias:
-            seen = {None: start_alias}
+            seen[None] = start_alias
         for field, model in opts.get_fields_with_model():
             if from_parent and model is not None and issubclass(from_parent, model):
+                # Avoid loading data for already loaded parents.
                 continue
-            if start_alias:
-                try:
-                    alias = seen[model]
-                except KeyError:
-                    link_field = opts.get_ancestor_link(model)
-                    alias = self.query.join((start_alias, model._meta.db_table,
-                            link_field.column, model._meta.pk.column))
-                    seen[model] = alias
-            else:
-                # If we're starting from the base model of the queryset, the
-                # aliases will have already been set up in pre_sql_setup(), so
-                # we can save time here.
-                alias = self.query.included_inherited_models[model]
+            alias = self.query.join_parent_model(opts, model, start_alias, seen)
             table = self.query.alias_map[alias].table_name
             if table in only_load and field.column not in only_load[table]:
                 continue
@@ -293,5 +283,35 @@ class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
                 if self.connection.ops.oracle:
                     date = self.resolve_columns(row, fields)[offset]
                 elif needs_string_cast:
-                    date = typecast_timestamp(str(date))
+                    date = typecast_date(str(date))
+                if isinstance(date, datetime.datetime):
+                    date = date.date()
                 yield date
+
+class SQLDateTimeCompiler(compiler.SQLDateTimeCompiler, GeoSQLCompiler):
+    """
+    This is overridden for GeoDjango to properly cast date columns, since
+    `GeoQuery.resolve_columns` is used for spatial values.
+    See #14648, #16757.
+    """
+    def results_iter(self):
+        if self.connection.ops.oracle:
+            from django.db.models.fields import DateTimeField
+            fields = [DateTimeField()]
+        else:
+            needs_string_cast = self.connection.features.needs_datetime_string_cast
+
+        offset = len(self.query.extra_select)
+        for rows in self.execute_sql(MULTI):
+            for row in rows:
+                datetime = row[offset]
+                if self.connection.ops.oracle:
+                    datetime = self.resolve_columns(row, fields)[offset]
+                elif needs_string_cast:
+                    datetime = typecast_timestamp(str(datetime))
+                # Datetimes are artifically returned in UTC on databases that
+                # don't support time zone. Restore the zone used in the query.
+                if settings.USE_TZ:
+                    datetime = datetime.replace(tzinfo=None)
+                    datetime = timezone.make_aware(datetime, self.query.tzinfo)
+                yield datetime
diff --git a/django/contrib/gis/db/models/sql/query.py b/django/contrib/gis/db/models/sql/query.py
index 3b8245e879..5877f2975a 100644
--- a/django/contrib/gis/db/models/sql/query.py
+++ b/django/contrib/gis/db/models/sql/query.py
@@ -72,6 +72,8 @@ class GeoQuery(sql.Query):
             value = Area(**{field.area_att : value})
         elif isinstance(field, (GeomField, GeometryField)) and value:
             value = Geometry(value)
+        elif field is not None:
+            return super(GeoQuery, self).convert_values(value, field, connection)
         return value
 
     def get_aggregation(self, using):
diff --git a/django/contrib/gis/db/models/sql/where.py b/django/contrib/gis/db/models/sql/where.py
index ec078aebed..c29533bf84 100644
--- a/django/contrib/gis/db/models/sql/where.py
+++ b/django/contrib/gis/db/models/sql/where.py
@@ -32,20 +32,22 @@ class GeoWhereNode(WhereNode):
     Used to represent the SQL where-clause for spatial databases --
     these are tied to the GeoQuery class that created it.
     """
-    def add(self, data, connector):
+
+    def _prepare_data(self, data):
         if isinstance(data, (list, tuple)):
             obj, lookup_type, value = data
             if ( isinstance(obj, Constraint) and
                  isinstance(obj.field, GeometryField) ):
                 data = (GeoConstraint(obj), lookup_type, value)
-        super(GeoWhereNode, self).add(data, connector)
+        return super(GeoWhereNode, self)._prepare_data(data)
 
     def make_atom(self, child, qn, connection):
         lvalue, lookup_type, value_annot, params_or_value = child
         if isinstance(lvalue, GeoConstraint):
             data, params = lvalue.process(lookup_type, params_or_value, connection)
-            spatial_sql = connection.ops.spatial_lookup_sql(data, lookup_type, params_or_value, lvalue.field, qn)
-            return spatial_sql, params
+            spatial_sql, spatial_params = connection.ops.spatial_lookup_sql(
+                    data, lookup_type, params_or_value, lvalue.field, qn)
+            return spatial_sql, spatial_params + params
         else:
             return super(GeoWhereNode, self).make_atom(child, qn, connection)
 
diff --git a/django/contrib/gis/forms/fields.py b/django/contrib/gis/forms/fields.py
index cefb6830ba..d3feac83e7 100644
--- a/django/contrib/gis/forms/fields.py
+++ b/django/contrib/gis/forms/fields.py
@@ -1,11 +1,15 @@
 from __future__ import unicode_literals
 
+import warnings
+
 from django import forms
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 # While this couples the geographic forms to the GEOS library,
 # it decouples from database (by not importing SpatialBackend).
-from django.contrib.gis.geos import GEOSException, GEOSGeometry
+from django.contrib.gis.geos import GEOSException, GEOSGeometry, fromstr
+
 
 class GeometryField(forms.Field):
     """
@@ -16,7 +20,7 @@ class GeometryField(forms.Field):
     widget = forms.Textarea
 
     default_error_messages = {
-        'no_geom' : _('No geometry value provided.'),
+        'required' : _('No geometry value provided.'),
         'invalid_geom' : _('Invalid geometry value.'),
         'invalid_geom_type' : _('Invalid geometry type.'),
         'transform_error' : _('An error occurred when transforming the geometry '
@@ -28,13 +32,18 @@ class GeometryField(forms.Field):
         # defaults (e.g., allow None).
         self.srid = kwargs.pop('srid', None)
         self.geom_type = kwargs.pop('geom_type', 'GEOMETRY')
-        self.null = kwargs.pop('null', True)
+        if 'null' in kwargs:
+            kwargs.pop('null', True)
+            warnings.warn("Passing 'null' keyword argument to GeometryField is deprecated.",
+                DeprecationWarning, stacklevel=2)
         super(GeometryField, self).__init__(**kwargs)
 
     def to_python(self, value):
         """
         Transforms the value to a Geometry object.
         """
+        if value in self.empty_values:
+            return None
         try:
             return GEOSGeometry(value)
         except (GEOSException, ValueError, TypeError):
@@ -46,15 +55,9 @@ class GeometryField(forms.Field):
         object (which is returned).  A ValidationError is raised if
         the value cannot be instantiated as a Geometry.
         """
-        if not value:
-            if self.null and not self.required:
-                # The geometry column allows NULL and is not required.
-                return None
-            else:
-                raise forms.ValidationError(self.error_messages['no_geom'])
-
-        # Transform the value to a python object first
-        geom = self.to_python(value)
+        geom = super(GeometryField, self).clean(value)
+        if geom is None:
+            return geom
 
         # Ensuring that the geometry is of the correct type (indicated
         # using the OGC string label).
@@ -73,3 +76,25 @@ class GeometryField(forms.Field):
                     raise forms.ValidationError(self.error_messages['transform_error'])
 
         return geom
+
+    def _has_changed(self, initial, data):
+        """ Compare geographic value of data with its initial value. """
+
+        # Ensure we are dealing with a geographic object
+        if isinstance(initial, six.string_types):
+            try:
+                initial = GEOSGeometry(initial)
+            except (GEOSException, ValueError):
+                initial = None
+
+        # Only do a geographic comparison if both values are available
+        if initial and data:
+            data = fromstr(data)
+            data.transform(initial.srid)
+            # If the initial value was not added by the browser, the geometry
+            # provided may be slightly different, the first time it is saved.
+            # The comparison is done with a very low tolerance.
+            return not initial.equals_exact(data, tolerance=0.000001)
+        else:
+            # Check for change of state of existence
+            return bool(initial) != bool(data)
diff --git a/django/contrib/gis/gdal/geometries.py b/django/contrib/gis/gdal/geometries.py
index eb67059245..0d75620b4e 100644
--- a/django/contrib/gis/gdal/geometries.py
+++ b/django/contrib/gis/gdal/geometries.py
@@ -76,7 +76,7 @@ class OGRGeometry(GDALBase):
 
         str_instance = isinstance(geom_input, six.string_types)
 
-        # If HEX, unpack input to to a binary buffer.
+        # If HEX, unpack input to a binary buffer.
         if str_instance and hex_regex.match(geom_input):
             geom_input = memoryview(a2b_hex(geom_input.upper().encode()))
             str_instance = False
diff --git a/django/contrib/gis/geoip/base.py b/django/contrib/gis/geoip/base.py
index 944240c811..4b8b6e1ed3 100644
--- a/django/contrib/gis/geoip/base.py
+++ b/django/contrib/gis/geoip/base.py
@@ -125,6 +125,8 @@ class GeoIP(object):
 
     def __del__(self):
         # Cleaning any GeoIP file handles lying around.
+        if GeoIP_delete is None:
+            return
         if self._country: GeoIP_delete(self._country)
         if self._city: GeoIP_delete(self._city)
 
diff --git a/django/contrib/gis/geoip/libgeoip.py b/django/contrib/gis/geoip/libgeoip.py
index 613949f809..e9e7cd7fe9 100644
--- a/django/contrib/gis/geoip/libgeoip.py
+++ b/django/contrib/gis/geoip/libgeoip.py
@@ -19,8 +19,8 @@ else:
 
 # Getting the path to the GeoIP library.
 if lib_name: lib_path = find_library(lib_name)
-if lib_path is None: raise GeoIPException('Could not find the GeoIP library (tried "%s"). '
-                                          'Try setting GEOIP_LIBRARY_PATH in your settings.' % lib_name)
+if lib_path is None: raise RuntimeError('Could not find the GeoIP library (tried "%s"). '
+                                        'Try setting GEOIP_LIBRARY_PATH in your settings.' % lib_name)
 lgeoip = CDLL(lib_path)
 
 # Getting the C `free` for the platform.
diff --git a/django/contrib/gis/geos/geometry.py b/django/contrib/gis/geos/geometry.py
index df396bdbd3..01719c21d4 100644
--- a/django/contrib/gis/geos/geometry.py
+++ b/django/contrib/gis/geos/geometry.py
@@ -11,6 +11,8 @@ from django.contrib.gis import memoryview
 # super-class for mutable list behavior
 from django.contrib.gis.geos.mutable_list import ListMixin
 
+from django.contrib.gis.gdal.error import SRSException
+
 # GEOS-related dependencies.
 from django.contrib.gis.geos.base import GEOSBase, gdal
 from django.contrib.gis.geos.coordseq import GEOSCoordSeq
@@ -382,7 +384,7 @@ class GEOSGeometry(GEOSBase, ListMixin):
     @property
     def wkt(self):
         "Returns the WKT (Well-Known Text) representation of this Geometry."
-        return wkt_w().write(self).decode()
+        return wkt_w(self.hasz and 3 or 2).write(self).decode()
 
     @property
     def hex(self):
@@ -460,24 +462,26 @@ class GEOSGeometry(GEOSBase, ListMixin):
     @property
     def ogr(self):
         "Returns the OGR Geometry for this Geometry."
-        if gdal.HAS_GDAL:
-            if self.srid:
-                return gdal.OGRGeometry(self.wkb, self.srid)
-            else:
-                return gdal.OGRGeometry(self.wkb)
-        else:
+        if not gdal.HAS_GDAL:
             raise GEOSException('GDAL required to convert to an OGRGeometry.')
+        if self.srid:
+            try:
+                return gdal.OGRGeometry(self.wkb, self.srid)
+            except SRSException:
+                pass
+        return gdal.OGRGeometry(self.wkb)
 
     @property
     def srs(self):
         "Returns the OSR SpatialReference for SRID of this Geometry."
-        if gdal.HAS_GDAL:
-            if self.srid:
-                return gdal.SpatialReference(self.srid)
-            else:
-                return None
-        else:
+        if not gdal.HAS_GDAL:
             raise GEOSException('GDAL required to return a SpatialReference object.')
+        if self.srid:
+            try:
+                return gdal.SpatialReference(self.srid)
+            except SRSException:
+                pass
+        return None
 
     @property
     def crs(self):
diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
index f011208ea0..6963b786c8 100644
--- a/django/contrib/gis/geos/libgeos.py
+++ b/django/contrib/gis/geos/libgeos.py
@@ -67,7 +67,7 @@ def notice_h(fmt, lst):
         warn_msg = fmt % lst
     except:
         warn_msg = fmt
-    logger.warn('GEOS_NOTICE: %s\n' % warn_msg)
+    logger.warning('GEOS_NOTICE: %s\n' % warn_msg)
 notice_h = NOTICEFUNC(notice_h)
 
 ERRORFUNC = CFUNCTYPE(None, c_char_p, c_char_p)
@@ -108,8 +108,11 @@ geos_version.argtypes = None
 geos_version.restype = c_char_p
 
 # Regular expression should be able to parse version strings such as
-# '3.0.0rc4-CAPI-1.3.3', '3.0.0-CAPI-1.4.1' or '3.4.0dev-CAPI-1.8.0'
-version_regex = re.compile(r'^(?P<version>(?P<major>\d+)\.(?P<minor>\d+)\.(?P<subminor>\d+))((rc(?P<release_candidate>\d+))|dev)?-CAPI-(?P<capi_version>\d+\.\d+\.\d+)$')
+# '3.0.0rc4-CAPI-1.3.3', '3.0.0-CAPI-1.4.1', '3.4.0dev-CAPI-1.8.0' or '3.4.0dev-CAPI-1.8.0 r0'
+version_regex = re.compile(
+    r'^(?P<version>(?P<major>\d+)\.(?P<minor>\d+)\.(?P<subminor>\d+))'
+    r'((rc(?P<release_candidate>\d+))|dev)?-CAPI-(?P<capi_version>\d+\.\d+\.\d+)( r\d+)?$'
+)
 def geos_version_info():
     """
     Returns a dictionary containing the various version metadata parsed from
@@ -119,8 +122,10 @@ def geos_version_info():
     """
     ver = geos_version().decode()
     m = version_regex.match(ver)
-    if not m: raise GEOSException('Could not parse version info string "%s"' % ver)
-    return dict((key, m.group(key)) for key in ('version', 'release_candidate', 'capi_version', 'major', 'minor', 'subminor'))
+    if not m:
+        raise GEOSException('Could not parse version info string "%s"' % ver)
+    return dict((key, m.group(key)) for key in (
+        'version', 'release_candidate', 'capi_version', 'major', 'minor', 'subminor'))
 
 # Version numbers and whether or not prepared geometry support is available.
 _verinfo = geos_version_info()
diff --git a/django/contrib/gis/geos/prototypes/geom.py b/django/contrib/gis/geos/prototypes/geom.py
index 5a614fe5f0..2683c2e25d 100644
--- a/django/contrib/gis/geos/prototypes/geom.py
+++ b/django/contrib/gis/geos/prototypes/geom.py
@@ -27,7 +27,7 @@ def bin_constructor(func):
 
 # HEX & WKB output
 def bin_output(func):
-    "Generates a prototype for the routines that return a a sized string."
+    "Generates a prototype for the routines that return a sized string."
     func.argtypes = [GEOM_PTR, POINTER(c_size_t)]
     func.errcheck = check_sized_string
     func.restype = c_uchar_p
diff --git a/django/contrib/gis/geos/prototypes/io.py b/django/contrib/gis/geos/prototypes/io.py
index 1be7da8845..1e80351dbf 100644
--- a/django/contrib/gis/geos/prototypes/io.py
+++ b/django/contrib/gis/geos/prototypes/io.py
@@ -45,6 +45,18 @@ wkt_writer_write.argtypes = [WKT_WRITE_PTR, GEOM_PTR]
 wkt_writer_write.restype = geos_char_p
 wkt_writer_write.errcheck = check_string
 
+try:
+    wkt_writer_get_outdim = GEOSFunc('GEOSWKTWriter_getOutputDimension')
+    wkt_writer_get_outdim.argtypes = [WKT_WRITE_PTR]
+    wkt_writer_get_outdim.restype = c_int
+    wkt_writer_set_outdim = GEOSFunc('GEOSWKTWriter_setOutputDimension')
+    wkt_writer_set_outdim.argtypes = [WKT_WRITE_PTR, c_int]
+except AttributeError:
+    # GEOSWKTWriter_get/setOutputDimension has been introduced in GEOS 3.3.0
+    # Always return 2 if not available
+    wkt_writer_get_outdim = lambda ptr: 2
+    wkt_writer_set_outdim = lambda ptr, dim: None
+
 ### WKBReader routines ###
 wkb_reader_create = GEOSFunc('GEOSWKBReader_create')
 wkb_reader_create.restype = WKB_READ_PTR
@@ -151,6 +163,17 @@ class WKTWriter(IOBase):
         "Returns the WKT representation of the given geometry."
         return wkt_writer_write(self.ptr, geom.ptr)
 
+    @property
+    def outdim(self):
+        return wkt_writer_get_outdim(self.ptr)
+
+    @outdim.setter
+    def outdim(self, new_dim):
+        if not new_dim in (2, 3):
+            raise ValueError('WKT output dimension must be 2 or 3')
+        wkt_writer_set_outdim(self.ptr, new_dim)
+
+
 class WKBWriter(IOBase):
     _constructor = wkb_writer_create
     _destructor = wkb_writer_destroy
@@ -217,9 +240,10 @@ def wkt_r():
         thread_context.wkt_r = _WKTReader()
     return thread_context.wkt_r
 
-def wkt_w():
+def wkt_w(dim=2):
     if not thread_context.wkt_w:
         thread_context.wkt_w = WKTWriter()
+    thread_context.wkt_w.outdim = dim
     return thread_context.wkt_w
 
 def wkb_r():
diff --git a/django/contrib/gis/geos/tests/test_geos.py b/django/contrib/gis/geos/tests/test_geos.py
index ec320f94ec..66d890d8cb 100644
--- a/django/contrib/gis/geos/tests/test_geos.py
+++ b/django/contrib/gis/geos/tests/test_geos.py
@@ -80,7 +80,8 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
         "Testing WKT output."
         for g in self.geometries.wkt_out:
             geom = fromstr(g.wkt)
-            self.assertEqual(g.ewkt, geom.wkt)
+            if geom.hasz and geos_version_info()['version'] >= '3.3.0':
+                self.assertEqual(g.ewkt, geom.wkt)
 
     def test_hex(self):
         "Testing HEX output."
@@ -661,6 +662,22 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
         p3 = fromstr(p1.hex, srid=-1) # -1 is intended.
         self.assertEqual(-1, p3.srid)
 
+    def test_custom_srid(self):
+        """ Test with a srid unknown from GDAL """
+        pnt = Point(111200, 220900, srid=999999)
+        self.assertTrue(pnt.ewkt.startswith("SRID=999999;POINT (111200.0"))
+        self.assertIsInstance(pnt.ogr, gdal.OGRGeometry)
+        self.assertIsNone(pnt.srs)
+
+        # Test conversion from custom to a known srid
+        c2w = gdal.CoordTransform(
+            gdal.SpatialReference('+proj=mill +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +R_A +ellps=WGS84 +datum=WGS84 +units=m +no_defs'),
+            gdal.SpatialReference(4326))
+        new_pnt = pnt.transform(c2w, clone=True)
+        self.assertEqual(new_pnt.srid, 4326)
+        self.assertAlmostEqual(new_pnt.x, 1, 3)
+        self.assertAlmostEqual(new_pnt.y, 2, 3)
+
     def test_mutable_geometries(self):
         "Testing the mutability of Polygons and Geometry Collections."
         ### Testing the mutability of Polygons ###
@@ -688,7 +705,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
             for i in range(len(mp)):
                 # Creating a random point.
                 pnt = mp[i]
-                new = Point(random.randint(1, 100), random.randint(1, 100))
+                new = Point(random.randint(21, 100), random.randint(21, 100))
                 # Testing the assignment
                 mp[i] = new
                 s = str(new) # what was used for the assignment is still accessible
@@ -1063,15 +1080,17 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
         self.assertEqual(mls.interpolate(17), Point(10, 7))
 
     def test_geos_version(self):
-        "Testing the GEOS version regular expression."
+        """Testing the GEOS version regular expression."""
         from django.contrib.gis.geos.libgeos import version_regex
-        versions = [ ('3.0.0rc4-CAPI-1.3.3', '3.0.0'),
-                     ('3.0.0-CAPI-1.4.1', '3.0.0'),
-                     ('3.4.0dev-CAPI-1.8.0', '3.4.0') ]
-        for v, expected in versions:
-            m = version_regex.match(v)
-            self.assertTrue(m)
-            self.assertEqual(m.group('version'), expected)
+        versions = [('3.0.0rc4-CAPI-1.3.3', '3.0.0', '1.3.3'),
+                    ('3.0.0-CAPI-1.4.1', '3.0.0', '1.4.1'),
+                    ('3.4.0dev-CAPI-1.8.0', '3.4.0', '1.8.0'),
+                    ('3.4.0dev-CAPI-1.8.0 r0', '3.4.0', '1.8.0')]
+        for v_init, v_geos, v_capi in versions:
+            m = version_regex.match(v_init)
+            self.assertTrue(m, msg="Unable to parse the version string '%s'" % v_init)
+            self.assertEqual(m.group('version'), v_geos)
+            self.assertEqual(m.group('capi_version'), v_capi)
 
 
 def suite():
diff --git a/django/contrib/gis/locale/ar/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ar/LC_MESSAGES/django.mo
index 4399bbf2bf..83fb0c3cba 100644
Binary files a/django/contrib/gis/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ar/LC_MESSAGES/django.po b/django/contrib/gis/locale/ar/LC_MESSAGES/django.po
index e4e7c17960..39759a7f4b 100644
--- a/django/contrib/gis/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ar/LC_MESSAGES/django.po
@@ -6,88 +6,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "حقل GIS الأساسي -- مُرتبط بنوع مواصفات OpenGIS الهندسية."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "نقطة إحداثية"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "سطر تسلسل أحرف"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "مُضلّع إحداثي"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "نقاط إحداثية"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "تسلسل أحرف متعدد الأسطر"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "مجموعة مُضلعات إحداثية"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "مجموعة إحداثية"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "لم تُدخل أي أحداثيات."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "الإحداثيات غير صحيحة."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "نوع الإحداثيات غير صحيح."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "حدث خطأ أثناء تحويل geometry إلى حقل SRID."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/az/LC_MESSAGES/django.mo b/django/contrib/gis/locale/az/LC_MESSAGES/django.mo
index 86026a6186..73f22cf806 100644
Binary files a/django/contrib/gis/locale/az/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/az/LC_MESSAGES/django.po b/django/contrib/gis/locale/az/LC_MESSAGES/django.po
index 7606062db2..40c6ea18bb 100644
--- a/django/contrib/gis/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/az/LC_MESSAGES/django.po
@@ -6,89 +6,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Əsas GIS sahəsi OpenGIS Müəyyənləşdirmə Həndəsəsi tipinə uyğunlaşdırılır."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Nöqtə"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Xətt"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poliqon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Nöqtələr"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Xətlər"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Poliqonlar"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Fiqurlar çoxluğu"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Həndəsi qiyməti verilməyib."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Həndəsi qiyməti düzgün deyil."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Həndəsi tipi düzgün deyil."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 "Fiquru vərəqənin fiqur sahəsinin SRID qiymətinə çevirərkən xəta baş verdi."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/be/LC_MESSAGES/django.mo b/django/contrib/gis/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..72c89ddea7
Binary files /dev/null and b/django/contrib/gis/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/be/LC_MESSAGES/django.po b/django/contrib/gis/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..479979b70c
--- /dev/null
+++ b/django/contrib/gis/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,94 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-01 11:31+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: views.py:9
+msgid "No feeds are registered."
+msgstr "Няма запісаных стужак."
+
+#: views.py:19
+#, python-format
+msgid "Slug %r isn't registered."
+msgstr "Біркі «%r» няма ў запісаных."
+
+#: db/models/fields.py:51
+msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
+msgstr ""
+"Галоўнае поле ҐІС — адлюстроўвае ґеамэтрычныя віды паводле спэцыфікацыі "
+"«OpenGIS»."
+
+#: db/models/fields.py:271
+msgid "Point"
+msgstr "Пункт"
+
+#: db/models/fields.py:275
+msgid "Line string"
+msgstr "Ломаная"
+
+#: db/models/fields.py:279
+msgid "Polygon"
+msgstr "Шматкутнік"
+
+#: db/models/fields.py:283
+msgid "Multi-point"
+msgstr "Набор пунктаў"
+
+#: db/models/fields.py:287
+msgid "Multi-line string"
+msgstr "Набор ломаных"
+
+#: db/models/fields.py:291
+msgid "Multi polygon"
+msgstr "Набор шматкутнікаў"
+
+#: db/models/fields.py:295
+msgid "Geometry collection"
+msgstr "Набор ґеамэтрычных аб’ектаў"
+
+#: forms/fields.py:19
+msgid "No geometry value provided."
+msgstr "Не пазначылі значэньне ґеамэтрыі."
+
+#: forms/fields.py:20
+msgid "Invalid geometry value."
+msgstr "Хібнае значэньне ґеамэтрыі."
+
+#: forms/fields.py:21
+msgid "Invalid geometry type."
+msgstr "Хібны від ґеамэтрыі."
+
+#: forms/fields.py:22
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr "Не ўдалося ператварыць ґеамэтрыю ў SRID."
+
+#: sitemaps/views.py:46
+#, python-format
+msgid "No sitemap available for section: %r"
+msgstr "Разьдзел «%r» ня мае мапы пляцоўкі."
+
+#: sitemaps/views.py:60
+#, python-format
+msgid "Page %s empty"
+msgstr "Бачына «%s» парожняя"
+
+#: sitemaps/views.py:62
+#, python-format
+msgid "No page '%s'"
+msgstr "Бачына «%s» не існуе"
diff --git a/django/contrib/gis/locale/bg/LC_MESSAGES/django.mo b/django/contrib/gis/locale/bg/LC_MESSAGES/django.mo
index 2f4adf512b..e266be961d 100644
Binary files a/django/contrib/gis/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/bg/LC_MESSAGES/django.po b/django/contrib/gis/locale/bg/LC_MESSAGES/django.po
index 5cf3408f41..5d32755516 100644
--- a/django/contrib/gis/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/bg/LC_MESSAGES/django.po
@@ -1,76 +1,77 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <grgkostadinov@gmail.com>, 2012.
 # Todor Lubenov <tlubenov@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Todor Lubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-04-01 19:16+0000\n"
+"Last-Translator: Georgi Kostadinov <grgkostadinov@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "Няма регистрирани фийда."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Слъгът %r не е регистриран."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Основно ГИС поле - карти за спецификация от OpenGIS  геометричен тип."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Точка"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Линеен елемент"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Полигон"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Комплексна-точка"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Комплексен-линеен елемент"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Комплексен полигон"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Геометрична колекция"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Няма предоставена геометрична стойност."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Невалидна геометрична стойност."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Невалиден геометричен тип."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -78,17 +79,17 @@ msgstr ""
 "Възникна грешка при трансформиране на геометрията на SRID от полето "
 "геометрия."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "Не съществува 'sitemap' на тази секция: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "Страница %s е празна"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "Няма страница '%s'"
diff --git a/django/contrib/gis/locale/bn/LC_MESSAGES/django.mo b/django/contrib/gis/locale/bn/LC_MESSAGES/django.mo
index 6dcc2a8265..73dfb1c323 100644
Binary files a/django/contrib/gis/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/bn/LC_MESSAGES/django.po b/django/contrib/gis/locale/bn/LC_MESSAGES/django.po
index dce0bcfe9b..57bc0a069b 100644
--- a/django/contrib/gis/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/bn/LC_MESSAGES/django.po
@@ -6,87 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr ""
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr ""
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr ""
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr ""
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr ""
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "কোন জ্যামিতিক মান দেয়া হয়নি।"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "জ্যামিতিক মানটি বৈধ নয়।"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "জ্যামিতিক নমুনাটি বৈধ নয়।"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/br/LC_MESSAGES/django.mo b/django/contrib/gis/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..d3c8da6319
Binary files /dev/null and b/django/contrib/gis/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/br/LC_MESSAGES/django.po b/django/contrib/gis/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..4ed3dd16d2
--- /dev/null
+++ b/django/contrib/gis/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,92 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-29 10:58+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: views.py:9
+msgid "No feeds are registered."
+msgstr ""
+
+#: views.py:19
+#, python-format
+msgid "Slug %r isn't registered."
+msgstr ""
+
+#: db/models/fields.py:51
+msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
+msgstr ""
+
+#: db/models/fields.py:271
+msgid "Point"
+msgstr ""
+
+#: db/models/fields.py:275
+msgid "Line string"
+msgstr ""
+
+#: db/models/fields.py:279
+msgid "Polygon"
+msgstr ""
+
+#: db/models/fields.py:283
+msgid "Multi-point"
+msgstr ""
+
+#: db/models/fields.py:287
+msgid "Multi-line string"
+msgstr ""
+
+#: db/models/fields.py:291
+msgid "Multi polygon"
+msgstr ""
+
+#: db/models/fields.py:295
+msgid "Geometry collection"
+msgstr ""
+
+#: forms/fields.py:19
+msgid "No geometry value provided."
+msgstr ""
+
+#: forms/fields.py:20
+msgid "Invalid geometry value."
+msgstr ""
+
+#: forms/fields.py:21
+msgid "Invalid geometry type."
+msgstr ""
+
+#: forms/fields.py:22
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr ""
+
+#: sitemaps/views.py:46
+#, python-format
+msgid "No sitemap available for section: %r"
+msgstr ""
+
+#: sitemaps/views.py:60
+#, python-format
+msgid "Page %s empty"
+msgstr "Pajenn %s goullo"
+
+#: sitemaps/views.py:62
+#, python-format
+msgid "No page '%s'"
+msgstr "Pajenn '%s' ebet"
diff --git a/django/contrib/gis/locale/bs/LC_MESSAGES/django.mo b/django/contrib/gis/locale/bs/LC_MESSAGES/django.mo
index 0894004a09..f2e9964f78 100644
Binary files a/django/contrib/gis/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/bs/LC_MESSAGES/django.po b/django/contrib/gis/locale/bs/LC_MESSAGES/django.po
index 9f9f374de7..3ed991c804 100644
--- a/django/contrib/gis/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/bs/LC_MESSAGES/django.po
@@ -6,73 +6,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Osnovno GIS polje -- mapiran je za  OpenGIS Specification Geometry tip polja."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Tačka"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linijska nit"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-point"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Višelinijska nit"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi poligon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometrijska kolekcija"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Niste zadali parametre za geometriju."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Neispravan parametar za geometriju."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Nepostojeći tip geometrije."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -80,17 +80,17 @@ msgstr ""
 "Došlo je do greške tokom pretvaranje geometrije u SRID geometrijskom polja "
 "obrazca."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/ca/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ca/LC_MESSAGES/django.mo
index 736d5e9c8b..a0cb3be777 100644
Binary files a/django/contrib/gis/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ca/LC_MESSAGES/django.po b/django/contrib/gis/locale/ca/LC_MESSAGES/django.po
index c3ab6d3f9c..17afcd283f 100644
--- a/django/contrib/gis/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ca/LC_MESSAGES/django.po
@@ -8,72 +8,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-13 19:35+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "No s'han registrat canal de contingut"
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "L'slug %r no està registrat"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "El camp GIS base -- correspon al tipus 'Geometry' de l'especificació OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Cadena de línies"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polígon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-punt"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Cadena de multi-línies"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi polígon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Col·leció de geometria"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "No s'ha indicat cap valor de geometria."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valor de geometria invàlid."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipus de geometria invàlid."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "S'ha produït un error en transformar la geometria al SRID del camp de "
 "geometria del formulari."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "No hi ha un mapa del lloc disponible per a la secció: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Pàgina %s buida"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "No hi ha cap pàgina '%s'"
diff --git a/django/contrib/gis/locale/cs/LC_MESSAGES/django.mo b/django/contrib/gis/locale/cs/LC_MESSAGES/django.mo
index 7650e51289..6788607ae8 100644
Binary files a/django/contrib/gis/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/cs/LC_MESSAGES/django.po b/django/contrib/gis/locale/cs/LC_MESSAGES/django.po
index 4ef9005462..c58a9f4aef 100644
--- a/django/contrib/gis/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/cs/LC_MESSAGES/django.po
@@ -7,72 +7,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Žádné dávky nejsou registrované."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Identifikátor %r není registrován."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Základní GIS pole -- mapováno na typ Geometry podle specifikace OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Bod"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Úsek čáry"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Mnohonásobný bod"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Mnohonásobný úsek čáry"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Mnohonásobný polygon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Kolekce geometrií"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Hodnota geometrie nezadána."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Neplatná hodnota geometrie."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Neplatný typ geometrie."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -80,17 +80,17 @@ msgstr ""
 "Nastala chyba při transformaci geometrie na identifikátor SRID geometrického "
 "formulářového pole."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Mapa webu není definovaná pro sekci: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Stránka %s je prázdná"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Není stránka '%s'"
diff --git a/django/contrib/gis/locale/cy/LC_MESSAGES/django.mo b/django/contrib/gis/locale/cy/LC_MESSAGES/django.mo
index ff8ac5cbc0..377df3dbf6 100644
Binary files a/django/contrib/gis/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/cy/LC_MESSAGES/django.po b/django/contrib/gis/locale/cy/LC_MESSAGES/django.po
index 9ed962cf56..b29153a749 100644
--- a/django/contrib/gis/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/cy/LC_MESSAGES/django.po
@@ -1,90 +1,92 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2011-03-15 15:48+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2011-01-19 16:52+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr ""
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr ""
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr ""
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr ""
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr ""
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr ""
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr ""
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr ""
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/da/LC_MESSAGES/django.mo b/django/contrib/gis/locale/da/LC_MESSAGES/django.mo
index dc73c2feb9..0aaa07d6a2 100644
Binary files a/django/contrib/gis/locale/da/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/da/LC_MESSAGES/django.po b/django/contrib/gis/locale/da/LC_MESSAGES/django.po
index ffca503252..78346746b7 100644
--- a/django/contrib/gis/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/da/LC_MESSAGES/django.po
@@ -9,89 +9,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 18:19+0000\n"
 "Last-Translator: Kristian Øllegaard <kristian@oellegaard.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Ingen feeds registrerede."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "\"Slug\" %r er ikke registreret."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Det grundlæggende GIS-felt - kæder til OpenGIS Specification geometritype."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linjesegment"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multipunkt"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multilinjesegment"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multipolygon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometrisamling"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Ingen værdi givet for geometri."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Ugyldig geometriværdi."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Ugyldig gemometritype."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 "Der opstod en fejl ved transformation af geometrien til formularfeltets SRID"
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Intet sitemap tilgængelig for sektion: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Siden %s er tom"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Ingen side hedder '%s'"
diff --git a/django/contrib/gis/locale/de/LC_MESSAGES/django.mo b/django/contrib/gis/locale/de/LC_MESSAGES/django.mo
index 1700d14d6f..22c812adbd 100644
Binary files a/django/contrib/gis/locale/de/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/de/LC_MESSAGES/django.po b/django/contrib/gis/locale/de/LC_MESSAGES/django.po
index 0d12ffa624..64d9847fc3 100644
--- a/django/contrib/gis/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/de/LC_MESSAGES/django.po
@@ -7,71 +7,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-14 06:38+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Keine Feeds registriert."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Kürzel %r nicht registriert."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Das Basis-GIS-Feld, das dem OpenGIS-Geometrie-Typ entspricht."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linienzug"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Mehrere Punkte"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Mehrere Linienzüge"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Mehrere Polygone"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Sammlung geometrischer Objekte"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Kein geometrischer Wert gegeben."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Ungültiger geometrischer Wert."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Ungültiger geometrischer Typ."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -79,17 +79,17 @@ msgstr ""
 "Ein Fehler ist beim Umwandeln der Geometrie-Werte in die SRID des Geometrie-"
 "Formularfeldes aufgetreten."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Für den Abschnit %r ist keine Sitemap vorhanden"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Seite %s ist leer"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Seite '%s' existiert nicht"
diff --git a/django/contrib/gis/locale/el/LC_MESSAGES/django.mo b/django/contrib/gis/locale/el/LC_MESSAGES/django.mo
index d9ea1d4cba..b8d1f5cbf6 100644
Binary files a/django/contrib/gis/locale/el/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/el/LC_MESSAGES/django.po b/django/contrib/gis/locale/el/LC_MESSAGES/django.po
index 82bc49d680..b137fe6c58 100644
--- a/django/contrib/gis/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/el/LC_MESSAGES/django.po
@@ -7,73 +7,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 19:19+0000\n"
 "Last-Translator: Kostas Papadimitriou <vinilios@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Δεν υπάρχουν εγγεγραμμένες ροές ειδήσεων."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Το βασικό πεδίο GIS - αντιστοιχεί στον τύπο γεωμετρίας των προδιαγραφών "
 "OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Σημείο"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Γραμμή string"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Πολύγωνο"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Πολλαπλό σημείο"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multi-line string"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Πολλαπλό πολύγωνο"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Συλλογή γεωμετριών"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Δε δόθηκε τιμή γεωμετρίας."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Άκυρα τιμή γεωμετρίας."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Άκυρος τύπος γεωμετρίας."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "Παρουσιάστηκε σφάλμα κατά τη μετατροπή της γεωμετρίας στο SRID του πεδίου "
 "της φόρμας  γεωμετρίας."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.mo b/django/contrib/gis/locale/en/LC_MESSAGES/django.mo
index 18665ef9bb..19ac4a3470 100644
Binary files a/django/contrib/gis/locale/en/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po
index 6ce301287e..ed57f6aa9c 100644
--- a/django/contrib/gis/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/en/LC_MESSAGES/django.po
@@ -1,88 +1,93 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-03-08 12:32+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "No feeds are registered."
 
 #: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Slug %r isn't registered."
 
 #: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
-msgstr ""
+msgstr "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 
-#: db/models/fields.py:271
+#: db/models/fields.py:270
 msgid "Point"
-msgstr ""
+msgstr "Point"
 
-#: db/models/fields.py:275
+#: db/models/fields.py:274
 msgid "Line string"
-msgstr ""
+msgstr "Line string"
 
-#: db/models/fields.py:279
+#: db/models/fields.py:278
 msgid "Polygon"
-msgstr ""
+msgstr "Polygon"
 
-#: db/models/fields.py:283
+#: db/models/fields.py:282
 msgid "Multi-point"
-msgstr ""
+msgstr "Multi-point"
 
-#: db/models/fields.py:287
+#: db/models/fields.py:286
 msgid "Multi-line string"
-msgstr ""
+msgstr "Multi-line string"
 
-#: db/models/fields.py:291
+#: db/models/fields.py:290
 msgid "Multi polygon"
-msgstr ""
+msgstr "Multi polygon"
 
-#: db/models/fields.py:295
+#: db/models/fields.py:294
 msgid "Geometry collection"
-msgstr ""
+msgstr "Geometry collection"
 
-#: forms/fields.py:19
+#: forms/fields.py:23
 msgid "No geometry value provided."
-msgstr ""
+msgstr "No geometry value provided."
 
-#: forms/fields.py:20
+#: forms/fields.py:24
 msgid "Invalid geometry value."
-msgstr ""
+msgstr "Invalid geometry value."
 
-#: forms/fields.py:21
+#: forms/fields.py:25
 msgid "Invalid geometry type."
-msgstr ""
+msgstr "Invalid geometry type."
 
-#: forms/fields.py:22
+#: forms/fields.py:26
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
 
 #: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
+msgstr "No sitemap available for section: %r"
 
 #: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
-msgstr ""
+msgstr "Page %s empty"
 
 #: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "No page '%s'"
diff --git a/django/contrib/gis/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/gis/locale/en_GB/LC_MESSAGES/django.mo
index a72e8aaaa7..84da2ade95 100644
Binary files a/django/contrib/gis/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/gis/locale/en_GB/LC_MESSAGES/django.po
index 991163bc86..47670045fe 100644
--- a/django/contrib/gis/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/en_GB/LC_MESSAGES/django.po
@@ -7,71 +7,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 21:57+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "No feeds are registered."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slug %r isn't registered."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Point"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Line string"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-point"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multi-line string"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi polygon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometry collection"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "No geometry value provided."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Invalid geometry value."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Invalid geometry type."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -79,17 +79,17 @@ msgstr ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "No sitemap available for section: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Page %s empty"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "No page '%s'"
diff --git a/django/contrib/gis/locale/eo/LC_MESSAGES/django.mo b/django/contrib/gis/locale/eo/LC_MESSAGES/django.mo
index 0d8669b2f2..bd420aad4d 100644
Binary files a/django/contrib/gis/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/eo/LC_MESSAGES/django.po b/django/contrib/gis/locale/eo/LC_MESSAGES/django.po
index 90528acde0..bc4dbfa50b 100644
--- a/django/contrib/gis/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/eo/LC_MESSAGES/django.po
@@ -1,75 +1,76 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Baptiste  <baptiste+transifex@darthenay.fr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:38+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Jaffa McNeill <jaffa.mcneill@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-09-19 03:30+0000\n"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "Neniu fluo estas registrita."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Ĵetonvorto %r ne estas registrita."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "La baza GISa kampo -- mapas al la MalfermaGIS Specifa Geometria tipo."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkto"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Liniŝnuro"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Plurangulo"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multpunkto"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multlinia ŝnuro"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multplurangulo"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometriaro"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Neniu geometria valoro provizas."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Malvalida geometria valoro."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Malvalida geometria tipo."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -77,17 +78,17 @@ msgstr ""
 "Eraro okazis dum transformi la geometrion al la SRID de la geometria forma "
 "kampo."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "Neniu paĝaro-mapo disponebla por sekcio:%r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "Paĝo %s malplena"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "Neniu paĝo '%s' trovita"
diff --git a/django/contrib/gis/locale/es/LC_MESSAGES/django.mo b/django/contrib/gis/locale/es/LC_MESSAGES/django.mo
index a837acf967..cc8a798d44 100644
Binary files a/django/contrib/gis/locale/es/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/es/LC_MESSAGES/django.po b/django/contrib/gis/locale/es/LC_MESSAGES/django.po
index c8987dfb31..e2acd65a55 100644
--- a/django/contrib/gis/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/es/LC_MESSAGES/django.po
@@ -8,72 +8,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-14 19:13+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "No se han registrado canales de contenido."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "El slug %r no está registrado."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "El campo GIS base -- apunta al tipo de especificación geométrica de OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punto"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Cadena de línea"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polígono"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Punto múltiple"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Cadena de línea múltiple"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Polígono múltiple"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Colección de \"Geometry\""
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "No se indico ningún valor de geometría."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valor de geometría inválido."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipo de geometría inválido."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "Ocurrió un error al transformar la geometria al SRID de la geometria del "
 "campo de formulario."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "No hay sitemap disponible para la sección: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "La página %s está vacía"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "No hay página '%s'"
diff --git a/django/contrib/gis/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/gis/locale/es_AR/LC_MESSAGES/django.mo
index aab32e855a..dbe31a8b39 100644
Binary files a/django/contrib/gis/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/gis/locale/es_AR/LC_MESSAGES/django.po
index c29014d082..90432c0337 100644
--- a/django/contrib/gis/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/es_AR/LC_MESSAGES/django.po
@@ -7,73 +7,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-16 01:45+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "No se han registrado feeds"
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "El slug %r no ha sido registrado"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "El campo GIS base -- corresponde al tipo Geometry de la especificación "
 "OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punto"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Secuencia de líneas"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polígono"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-punto"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Cadena multi-línea"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi polígono"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Colección de Geometry's"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "No se ha proporcionado un valor de geometría."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valor de geometría no válido."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipo de geometría no válido."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "Ha ocurrido un error mientras se transformaba la geometría al SRID del campo "
 "de formulario de la misma."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "No hay un sitemap disponible para la sección: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "La página %s está vacía"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "No existe la página '%s'"
diff --git a/django/contrib/gis/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/gis/locale/es_MX/LC_MESSAGES/django.mo
index d55a47a0dd..9862f83436 100644
Binary files a/django/contrib/gis/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/gis/locale/es_MX/LC_MESSAGES/django.po
index c24c667f83..427cd074a8 100644
--- a/django/contrib/gis/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/es_MX/LC_MESSAGES/django.po
@@ -6,73 +6,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "No hay feeds registrados."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "El slug %r no está registrado."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "El campo GIS base -- corresponde al tipo Geometry de la especificación "
 "OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punto"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Secuencia de líneas"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polígono"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-punto"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Cadena multi-línea"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi polígonos"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Colección de geometrías"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "No se ha proporcionado un valor de geometría."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valor de geometría no válido."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipo de geometría no válido."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -80,17 +80,17 @@ msgstr ""
 "Ha ocurrido un error mientras se transformaba la geometría al SRID del campo "
 "de formulario de la misma."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "No hay mapa del sitio disponible para esta sección: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Página %s vacía"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "No hay página '%s'"
diff --git a/django/contrib/gis/locale/et/LC_MESSAGES/django.mo b/django/contrib/gis/locale/et/LC_MESSAGES/django.mo
index 1d60dac637..f8ecba45c9 100644
Binary files a/django/contrib/gis/locale/et/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/et/LC_MESSAGES/django.po b/django/contrib/gis/locale/et/LC_MESSAGES/django.po
index 8c504d7a01..dd4ccf4be5 100644
--- a/django/contrib/gis/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/et/LC_MESSAGES/django.po
@@ -8,87 +8,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Baas GIS väli -- ühildub OpenGIS Spetsifikatsiooni Geomeetria tüübiga."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polügon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-punkt"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Mitmerealine string"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi-polügon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geomeetriakogum"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Geomeetriline väärtus puudub."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Vigane geomeetriline väärtus."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Vigane geomeetriline tüüp."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Geomeetria teisendamisel geomeetria vormivälja SRID-ks tekkis viga."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo b/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo
index 529b7875a1..094fed573d 100644
Binary files a/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/eu/LC_MESSAGES/django.po b/django/contrib/gis/locale/eu/LC_MESSAGES/django.po
index 7194992c37..6162169d75 100644
--- a/django/contrib/gis/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/eu/LC_MESSAGES/django.po
@@ -6,88 +6,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 20:41+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Ez dago jariorik erregistratuta."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "%r sluga ez dago erregistratuta."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Oinarrizko GIS eremua -- OpenGIS zehaztapeneko Geomtry motarentzat mapak"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Puntua"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Lerro string-a"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligonoa"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Puntu anitz"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Lerro anitz sting-a"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi poligonoa"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometria bilduma"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Ez fa geometria baliorik eman."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Geometria balio okera."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Geometria mota okerra."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Errore bat gertatu da geometria bere form eremuaren SRIDra biurtzean."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "%r atalarentzat ez dago sitemap-ik"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "%s orria hutsik dago"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "'%s' orririk ez"
diff --git a/django/contrib/gis/locale/fa/LC_MESSAGES/django.mo b/django/contrib/gis/locale/fa/LC_MESSAGES/django.mo
index d5ca32edb8..3cc7ac4e68 100644
Binary files a/django/contrib/gis/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/fa/LC_MESSAGES/django.po b/django/contrib/gis/locale/fa/LC_MESSAGES/django.po
index 2bf82f0272..9d15faf036 100644
--- a/django/contrib/gis/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/fa/LC_MESSAGES/django.po
@@ -1,93 +1,95 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Ali Nikneshan <ali@nikneshan.com>, 2012.
+# Alireza Savand <alireza.savand@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Saeed  <sd.javadi@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Saeed <sd.javadi@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-01-11 08:32+0000\n"
+"Last-Translator: Alireza Savand <alireza.savand@gmail.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "هیچ کدام از  فید ها ثبت شده است."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Slug %r ثبت نشده"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
-msgstr ""
+msgstr "فیلد  GIS  پایه -- نقشه‌ها برای مشخصه‌های هندسی OpenGIS"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "نقطه"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
-msgstr ""
+msgstr "رشته خط"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
-msgstr ""
+msgstr "چندضلعی"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
-msgstr ""
+msgstr "چند نقطه ای"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
-msgstr ""
+msgstr "چند خط رشته"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
-msgstr ""
+msgstr "چندین چند ضلعی "
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
-msgstr ""
+msgstr "مجموعه هندسی"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "مقدار جغرافیایی‌ای مقرر نشده است."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "مقدار جغرافیایی نامعتبر"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "نوعِ جغرافیایی نامعتبر"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
-msgstr ""
+msgstr "مشکلی در هنگام انتقال مختصات هندسی از فیلد به SRID رخ داد."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "هیچ سایت مپی برای قسمت %r موجود نیست"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "صفحه %s خالی است."
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "صفحه '%s' یافت نشد"
diff --git a/django/contrib/gis/locale/fi/LC_MESSAGES/django.mo b/django/contrib/gis/locale/fi/LC_MESSAGES/django.mo
index 3288e247ac..280927a97c 100644
Binary files a/django/contrib/gis/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/fi/LC_MESSAGES/django.po b/django/contrib/gis/locale/fi/LC_MESSAGES/django.po
index e1878ce01c..56eee41f4c 100644
--- a/django/contrib/gis/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/fi/LC_MESSAGES/django.po
@@ -7,87 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "GIS-peruskenttä – vastaa OpenGIS-määrittelyn geometriatyyppiä."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Piste"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Murtoviiva"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygoni"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Monipiste"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Monimurtoviiva"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Monipolygoni"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometriakokoelma"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Geometria-arvoa ei annettu."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Virheellinen geometria-arvo."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Virheellinen geometriatyyppi."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Kentän SRID-muunnoksessa tapahtui virhe."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/fr/LC_MESSAGES/django.mo b/django/contrib/gis/locale/fr/LC_MESSAGES/django.mo
index fa628322a6..c05f0c4389 100644
Binary files a/django/contrib/gis/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/fr/LC_MESSAGES/django.po b/django/contrib/gis/locale/fr/LC_MESSAGES/django.po
index 6124b51516..436d1c06c0 100644
--- a/django/contrib/gis/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/fr/LC_MESSAGES/django.po
@@ -7,73 +7,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Aucun flux enregistré."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Le slug %r n'est pas enregistré."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Le champ GIS -- convertit dans le type de spécification géométrique "
 "d'OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Point"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Chaîne de segment"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygone"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multipoint"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Chaîne multisegment"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multipolygone"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Collection géométrique"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Acune valeur géométrique fournie."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valeur géométrique non valide."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Type de géométrie non valide."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "Une erreur est survenue lors de la transformation de l'objet géométrique "
 "dans le SRID du champ de formulaire géométrique."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Aucun plan de site disponible pour la section %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Page %s vide"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Aucune page « %s »"
diff --git a/django/contrib/gis/locale/ga/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ga/LC_MESSAGES/django.mo
index 4e664e3018..92347e1cd0 100644
Binary files a/django/contrib/gis/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ga/LC_MESSAGES/django.po b/django/contrib/gis/locale/ga/LC_MESSAGES/django.po
index 53a047614f..0c1f31aa7b 100644
--- a/django/contrib/gis/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ga/LC_MESSAGES/django.po
@@ -7,74 +7,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-16 13:13+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Níl fothaí cláraithe."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Níl slug %r cláraithe."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "GIS an bonn réimse - léarscáileanna chun an Sonraíocht OpenGIS cineál "
 "Céimseata."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Pointe"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Líne teaghrán"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polagán"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Il-phointe"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Il-líne teaghrán"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Il polagán"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Céimseata bhailiú"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Ní soláthair méid geoiméadracht"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Méid geoiméadracht neamhbhailí"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tíopa geoiméadracht neamhbhailí"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -82,17 +82,17 @@ msgstr ""
 "Tharla earráid ag claochlú an geoiméadracht go dtí SRID an réimse fhoirm "
 "geoiméadracht."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Níl léarscáil an tSuoímh ar fáil le haghaidh roinn: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Leathanach %s folamh"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Níl leathanach '%s'"
diff --git a/django/contrib/gis/locale/gl/LC_MESSAGES/django.mo b/django/contrib/gis/locale/gl/LC_MESSAGES/django.mo
index 2f88d89e42..937ce0f832 100644
Binary files a/django/contrib/gis/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/gl/LC_MESSAGES/django.po b/django/contrib/gis/locale/gl/LC_MESSAGES/django.po
index 4a7bef9e2a..dd971eb100 100644
--- a/django/contrib/gis/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/gl/LC_MESSAGES/django.po
@@ -2,76 +2,77 @@
 #
 # Translators:
 # fasouto <fsoutomoure@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: fasouto <fsoutomoure@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-01-07 11:44+0000\n"
+"Last-Translator: fonso <fonzzo@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "Non hai feeds rexistradas."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "A url curta %r non está rexistrada."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "O campo GIS base -- correspóndese co tipo Geometry da especificación OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punto"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Secuencia de liñas"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polígono"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Punto múltiple"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Cadea multi-liña"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi polígono"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Colección de xeometrías"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Non se proporcionou un valor de xeometría."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valor xeométrico non válido."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipo xeometríco non válido."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -79,17 +80,17 @@ msgstr ""
 "Atopouse un erro mentras se trasnformaba a xeometría ó SRID do campo "
 "xeométrico do formulario."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "Non hai un mapa do sitio dispoñíbel para a sección: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "A páxina %s baleira"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "Non existe a páxina '%s'"
diff --git a/django/contrib/gis/locale/he/LC_MESSAGES/django.mo b/django/contrib/gis/locale/he/LC_MESSAGES/django.mo
index 0cab4661b6..9996575566 100644
Binary files a/django/contrib/gis/locale/he/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/he/LC_MESSAGES/django.po b/django/contrib/gis/locale/he/LC_MESSAGES/django.po
index 2f617c2b39..85f1de3227 100644
--- a/django/contrib/gis/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/he/LC_MESSAGES/django.po
@@ -2,91 +2,92 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-23 09:00+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "לא נרשמו פידים."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Slug %r אינו רשום."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "שדה ה־GIS הבסיסי -- ממופה לטיפוס OpenGIS Specification Geometry."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "נקודה"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "מחרוזת קו"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "פוליגון"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "מרובה־נקודות"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "מחרוזת קו מרובת שורות"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "פוליגון מרובה"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "אוסף גיאומטרי"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "לא סופק ערך גיאומטרי."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "ערך גאומטרי שגוי."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "סוג גיאומטרי שגוי."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "הייתה בעיה עם השינוי של הצורה לסוג של השדה."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "אין sitemap זמין עבור מדור: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "עמוד %s ריק"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "עמוד '%s' אינו קיים"
diff --git a/django/contrib/gis/locale/hi/LC_MESSAGES/django.mo b/django/contrib/gis/locale/hi/LC_MESSAGES/django.mo
index 0f93a565c3..221adcc954 100644
Binary files a/django/contrib/gis/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/hi/LC_MESSAGES/django.po b/django/contrib/gis/locale/hi/LC_MESSAGES/django.po
index c567a418e7..f89a528d02 100644
--- a/django/contrib/gis/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/hi/LC_MESSAGES/django.po
@@ -7,88 +7,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-15 13:44+0000\n"
 "Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "कोई फ़ीड पंजीकृत नहीं हैं."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "स्लग %r पंजीकृत नहीं है."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "आधारभूत GIS फ़ील्ड OpenGIS विशिष्टता ज्यामिति के प्ररूप हैं ."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "बिंदु"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "पंक्ति शृंखला"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "बहुभुज"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "बहु बिंदु"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "बहु - पंक्ति शृंखला"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "बहु बहुभुज"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "ज्यामिति संग्रह"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "कोई ज्यामिति मूल्य प्रदान नहीं की है."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "अवैध ज्यामिति मूल्य."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "अवैध ज्यामिति प्रकार"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 "ज्यामिति को ज्यामिति प्रपत्र फ़ील्ड के SRID में परिवर्तित करते वक़्त एक ग़लती हो गयी ."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "अनुभाग के लिए कोई साइटमैप उपलब्ध नहीं: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "पृष्ठ %s खाली"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "कोई पृष्ठ '%s' नहीं "
diff --git a/django/contrib/gis/locale/hr/LC_MESSAGES/django.mo b/django/contrib/gis/locale/hr/LC_MESSAGES/django.mo
index 0953ddcc24..1c2546fe84 100644
Binary files a/django/contrib/gis/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/hr/LC_MESSAGES/django.po b/django/contrib/gis/locale/hr/LC_MESSAGES/django.po
index 0559eab7d3..2ebb708e39 100644
--- a/django/contrib/gis/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/hr/LC_MESSAGES/django.po
@@ -1,77 +1,79 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <berislav.lopac@gmail.com>, 2012.
+# Davor Lučić <r.dav.lc@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-11-25 11:32+0000\n"
+"Last-Translator: Davor Lučić <r.dav.lc@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "Nema registriranih izvora."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Slug %r nije registriran."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Osnovno GIS polje -- mapira OpenGIS Specification Geometry tip."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Točka"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linija (Line string)"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Više točaka"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Više linija (Line string)"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Više poligona"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometrijska kolekcija"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Geometrijska vrijednost nije priložena."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Neispravna geometrijska vrijednost."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Neispravan geometrijski tip."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -79,17 +81,17 @@ msgstr ""
 "Došlo je do greške pri transformaciji geometrije na SRID geometrijskog polja "
 "forme."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "Ne postoji mapa za odjeljak: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "Stranica %s je prazna"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "Stranica '%s' ne postoji"
diff --git a/django/contrib/gis/locale/hu/LC_MESSAGES/django.mo b/django/contrib/gis/locale/hu/LC_MESSAGES/django.mo
index b40982259e..7fefadb479 100644
Binary files a/django/contrib/gis/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/hu/LC_MESSAGES/django.po b/django/contrib/gis/locale/hu/LC_MESSAGES/django.po
index c280b94a05..35833b802d 100644
--- a/django/contrib/gis/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/hu/LC_MESSAGES/django.po
@@ -8,88 +8,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 19:17+0000\n"
 "Last-Translator: Kristóf Gruber <>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Nincs regisztrált feed."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "%r slug nincs regisztrálva."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Az alap GIS mező -- az OpenGIS specifikáció geometria típusának megfelelően"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Pont"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Vonallánc"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-pont"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Többes vonallánc"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi-poligon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometria gyűjtemény"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Geometriai adat nem került megadásra."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Érvénytelen geometriai érték."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Érvénytelen geometriai típus."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Hiba történt a geometriai transzformáció során."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "%r szekcióhoz nincsen oldaltérkép"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "'%s' oldal üres"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "'%s' oldal nem létezik"
diff --git a/django/contrib/gis/locale/ia/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..ee67a4e0a7
Binary files /dev/null and b/django/contrib/gis/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ia/LC_MESSAGES/django.po b/django/contrib/gis/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..82bd05ee5c
--- /dev/null
+++ b/django/contrib/gis/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,96 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-20 19:30+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: views.py:9
+msgid "No feeds are registered."
+msgstr "Nulle syndication es registrate."
+
+#: views.py:19
+#, python-format
+msgid "Slug %r isn't registered."
+msgstr "Le denotation %r non es registrate."
+
+#: db/models/fields.py:51
+msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
+msgstr ""
+"Le campo GIS de base. Corresponde al typo geometric del specification "
+"OpenGIS."
+
+#: db/models/fields.py:271
+msgid "Point"
+msgstr "Puncto"
+
+#: db/models/fields.py:275
+msgid "Line string"
+msgstr "Texto de linea"
+
+#: db/models/fields.py:279
+msgid "Polygon"
+msgstr "Polygono"
+
+#: db/models/fields.py:283
+msgid "Multi-point"
+msgstr "Plure punctos"
+
+#: db/models/fields.py:287
+msgid "Multi-line string"
+msgstr "Texto con plure lineas"
+
+#: db/models/fields.py:291
+msgid "Multi polygon"
+msgstr "Plure polygonos"
+
+#: db/models/fields.py:295
+msgid "Geometry collection"
+msgstr "Collection geometric"
+
+#: forms/fields.py:19
+msgid "No geometry value provided."
+msgstr "Nulle valor geometric fornite."
+
+#: forms/fields.py:20
+msgid "Invalid geometry value."
+msgstr "Valor geometric invalide."
+
+#: forms/fields.py:21
+msgid "Invalid geometry type."
+msgstr "Typo geometric invalide."
+
+#: forms/fields.py:22
+msgid ""
+"An error occurred when transforming the geometry to the SRID of the geometry "
+"form field."
+msgstr ""
+"Un error occurreva durante le transformation del geometria al SRID del campo "
+"del formulario geometric."
+
+#: sitemaps/views.py:46
+#, python-format
+msgid "No sitemap available for section: %r"
+msgstr "Nulle mappa de sito disponibile pro le section: %r"
+
+#: sitemaps/views.py:60
+#, python-format
+msgid "Page %s empty"
+msgstr "Le pagina '%s' es vacue"
+
+#: sitemaps/views.py:62
+#, python-format
+msgid "No page '%s'"
+msgstr "Le pagina '%s' non existe"
diff --git a/django/contrib/gis/locale/id/LC_MESSAGES/django.mo b/django/contrib/gis/locale/id/LC_MESSAGES/django.mo
index 4eeba9e47d..7e96513656 100644
Binary files a/django/contrib/gis/locale/id/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/id/LC_MESSAGES/django.po b/django/contrib/gis/locale/id/LC_MESSAGES/django.po
index 586370c7fa..c118d47ef3 100644
--- a/django/contrib/gis/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/id/LC_MESSAGES/django.po
@@ -8,89 +8,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Tidak ada umpan terdaftar."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slug %r tidak terdaftar."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Bidang dasar GIS disesuaikan berdasarkan OpenGIS Specification Geometry."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Point"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Line string"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-point"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multi-line string"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi polygon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometry collection"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Nilai geometri tidak disediakan."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Nilai geometri salah."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipe geometri salah."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 "Galat terjadi saat mentransformasi geometri ke SRID bidang formulir geometri."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Tidak ada peta situs tersedia untuk bagian: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Laman %s kosong"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Tidak ada laman '%s'"
diff --git a/django/contrib/gis/locale/is/LC_MESSAGES/django.mo b/django/contrib/gis/locale/is/LC_MESSAGES/django.mo
index 02c2d51c3a..05ef40cd15 100644
Binary files a/django/contrib/gis/locale/is/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/is/LC_MESSAGES/django.po b/django/contrib/gis/locale/is/LC_MESSAGES/django.po
index f2e76d54e4..ea4632c480 100644
--- a/django/contrib/gis/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/is/LC_MESSAGES/django.po
@@ -7,87 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 14:50+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Engir listar (feeds) eru skráðir"
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slögg %r er ekki skráður"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Grunn GIS reitur -- varpast í OpenGIS rúmgerð."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punktur"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Lína"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Marghyrningur"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Punktar"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Línur"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Marghyrningar"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Rúmsafn"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Ekkert rúmgildi gefið."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Ógild rúmeining"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Ógild rúmmálsgerð."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Villa kom upp við að varpa rúmgildi í SRID reitsins."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Ekkert veftré tiltækt fyrir: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Síða %s tóm"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Engin síða %s"
diff --git a/django/contrib/gis/locale/it/LC_MESSAGES/django.mo b/django/contrib/gis/locale/it/LC_MESSAGES/django.mo
index 2953b8f19a..788ed4ab11 100644
Binary files a/django/contrib/gis/locale/it/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/it/LC_MESSAGES/django.po b/django/contrib/gis/locale/it/LC_MESSAGES/django.po
index 31a30249eb..134b129cca 100644
--- a/django/contrib/gis/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/it/LC_MESSAGES/django.po
@@ -7,72 +7,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Non ci sono feed registrati."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Lo slug %r non è registrato."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Il campo base GIS -- corrisponde al tipo Geometry delle specifiche OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punto"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Stringa linea"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligono"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multipunto"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Stringa multilinea"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi poligono"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Raccolta Geometry"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Nessun valore geometrico fornito."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valore geometrico non valido."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipo geometrico non valido."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -80,17 +80,17 @@ msgstr ""
 "Si è verificato un errore durante la trasformazione della geometria nello "
 "SRID del campo geometria della form."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Nessun sitemap disponibile per la sezione: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Pagina %s vuota"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Nessuna pagina '%s'"
diff --git a/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo
index c2365a1c90..a89a6ca43a 100644
Binary files a/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ja/LC_MESSAGES/django.po b/django/contrib/gis/locale/ja/LC_MESSAGES/django.po
index c35f54d8ba..32cff4a3f6 100644
--- a/django/contrib/gis/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ja/LC_MESSAGES/django.po
@@ -2,75 +2,76 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Shinya Okano <tokibito@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-07-31 16:39+0000\n"
+"Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "フィードが登録されていません。"
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "スラグ %r は登録されていません。"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "GIS基底フィールドです -- OpenGIS で決められた地形タイプに対応"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "点"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "線"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "ポリゴン"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "複数の点"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "複数の線"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "複数のポリゴン"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "地形の集合"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "geometry値がありません。"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "geometry値が不正です"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "geometryタイプが不正です。"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -78,17 +79,17 @@ msgstr ""
 "geometry を geometry フォームフィールドの SRID に変換しようとしてエラーが起き"
 "ました。"
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "このセクションで利用可能なサイトマップはありません: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "ページ %s は空です"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "ページ '%s' は存在しません"
diff --git a/django/contrib/gis/locale/ka/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ka/LC_MESSAGES/django.mo
index 76ccbf6735..2ca2164bfd 100644
Binary files a/django/contrib/gis/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ka/LC_MESSAGES/django.po b/django/contrib/gis/locale/ka/LC_MESSAGES/django.po
index d2f5cd983f..d61774c1ff 100644
--- a/django/contrib/gis/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ka/LC_MESSAGES/django.po
@@ -1,93 +1,95 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # avsd05 <avsd05@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2013-03-01 07:50+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "არცერთი ფიდი არ არის რეგისტრირებული."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "სლაგი %r არ არის რეგისტრირებული."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "GIS-ის ბაზური ველი -- შეესაბამება OpenGIS სპეციფიკაციის Geometry ტიპს."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "წერტილი"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "ხაზის მასივი"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "მრავალკუთხედი"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "წერტილების სიმრავლე"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "ხაზების სიმრავლის მასივი"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "მრავალკუთხედების სიმრავლე"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "გეომეტრიული კოლექცია"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "გეომეტრიის მნიშვნელობა მოცემული არ არის."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "გეომეტრიის მნიშვნელობა არასწორია."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "გეომეტრიის ტიპი არასწორია."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "ველიდან გეომეტრიის SRID-ში გადაყვანისას მოხდა შეცდომა."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "არ არსებობს საიტის რუკა სექციისთვის: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "გვერდი %s ცარიელია"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "გვერდი '%s' არ არსებობს"
diff --git a/django/contrib/gis/locale/kk/LC_MESSAGES/django.mo b/django/contrib/gis/locale/kk/LC_MESSAGES/django.mo
index 6ede74608a..3bd2828252 100644
Binary files a/django/contrib/gis/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/kk/LC_MESSAGES/django.po b/django/contrib/gis/locale/kk/LC_MESSAGES/django.po
index 03df192d7b..3bf38f77fc 100644
--- a/django/contrib/gis/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/kk/LC_MESSAGES/django.po
@@ -7,89 +7,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Zhazira <zhazira.mt@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Негізгі GIS алаңы - OpenGIS спецификация бойынша геометриялық түрлерін "
 "белгілейді."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Нүкте"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Сынық"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Көпбұрыш"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Нүкте жинағы"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Сынықтар жинағы"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Көпбұрыш жинағы"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Геометриялық объект жинағы"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Геметрия мәні берілген жоқ"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Геометрия мәні  дұрыс емес"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Геометрия  түрі  дұрыс емес"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Геометрияны SRID-ге өзгерту кезінде қате шықты."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/kn/LC_MESSAGES/django.mo b/django/contrib/gis/locale/kn/LC_MESSAGES/django.mo
index 6c1074880f..69ad9e1c00 100644
Binary files a/django/contrib/gis/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/kn/LC_MESSAGES/django.po b/django/contrib/gis/locale/kn/LC_MESSAGES/django.po
index a06f4d45a2..f5bb345263 100644
--- a/django/contrib/gis/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/kn/LC_MESSAGES/django.po
@@ -5,87 +5,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2011-01-19 16:52+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr ""
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr ""
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr ""
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr ""
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr ""
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr ""
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr ""
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr ""
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/ko/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ko/LC_MESSAGES/django.mo
index a3fe62e92a..875c4af637 100644
Binary files a/django/contrib/gis/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ko/LC_MESSAGES/django.po b/django/contrib/gis/locale/ko/LC_MESSAGES/django.po
index d81792b3cc..aa0bfc72eb 100644
--- a/django/contrib/gis/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ko/LC_MESSAGES/django.po
@@ -7,87 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Jaehong Kim <mixe@korea.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "기본 GIS 필드. OpenGIS Specification의 Geometry type으로 매핑됩니다."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "위치"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "한줄 문자열"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "다각형"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "복수위치"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "여러줄 문자열"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "복수 다각형"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "지리적 위치 모음"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Geometry 값이 없습니다."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Geometry 값이 부적절합니다."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Geometry 형식이 부적절합니다."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Geometry를 geometry 필드의 SRID로 변환하는 도중 오류가 발생하였습니다."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/lt/LC_MESSAGES/django.mo b/django/contrib/gis/locale/lt/LC_MESSAGES/django.mo
index 07b740d5ba..612f4134a6 100644
Binary files a/django/contrib/gis/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/lt/LC_MESSAGES/django.po b/django/contrib/gis/locale/lt/LC_MESSAGES/django.po
index d69cdd0bb8..f9fb936f6b 100644
--- a/django/contrib/gis/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/lt/LC_MESSAGES/django.po
@@ -3,93 +3,94 @@
 # Translators:
 # Kostas  <tamosiunas@gmail.com>, 2011.
 # lauris <lauris@runbox.com>, 2011.
+# Simonas Kazlauskas <simonas@kazlauskas.me>, 2012.
 # Simonas Simas <simonas@kazlauskas.me>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
-"PO-Revision-Date: 2012-03-09 17:01+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-06-14 13:31+0000\n"
+"Last-Translator: Simonas Kazlauskas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "Nėra užregistruotų srautų."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Adresas %r neregistruotas."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Bazinis GIS laukas - atvaizduoja OpenGIS Specification Geometry tipą"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Taškas"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Atkarpa"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Daugiakampis"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Taškų aibė"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Atkarpų aibė"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Daugiakampių aibė"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometrinė kolekcija"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Nenurodyta geometrinė reikšmė"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Netinkama geometrinė reikšmė"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Netinkamas geometrinis tipas"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Įvyko klaida pertvarkant geometrijos lauko SRID geometriją."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
+msgstr "Nėra %r skyriaus svetainės medžio"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Puslapis %s tuščias"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Nėra '%s' puslapio"
diff --git a/django/contrib/gis/locale/lv/LC_MESSAGES/django.mo b/django/contrib/gis/locale/lv/LC_MESSAGES/django.mo
index 11c2a3e740..695f71e7ed 100644
Binary files a/django/contrib/gis/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/lv/LC_MESSAGES/django.po b/django/contrib/gis/locale/lv/LC_MESSAGES/django.po
index 14684fe663..1be34d62b4 100644
--- a/django/contrib/gis/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/lv/LC_MESSAGES/django.po
@@ -6,89 +6,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Bāzes ĢIS lauks -- atbilst OpenGIS specifikācijas Geometry tipam."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkts"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Līniju virkne"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Daudzstūris"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Vairāki punkti"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Vairāku rindu virkne"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Vairāki daudzstūri"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Ģeometrijas kolekcija"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Nav norādīta ģeometrijas vērtība."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Nekorekta ģeometrijas vērtība."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Nekorekts ģeometrijas tips."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 "Sastapta kļūda, pārveidojot ģeometriju uz ģeometriskās formas lauka SRID."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/mk/LC_MESSAGES/django.mo b/django/contrib/gis/locale/mk/LC_MESSAGES/django.mo
index 4de850efd7..aae408ad38 100644
Binary files a/django/contrib/gis/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/mk/LC_MESSAGES/django.po b/django/contrib/gis/locale/mk/LC_MESSAGES/django.po
index ae67fa151d..f704745c22 100644
--- a/django/contrib/gis/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/mk/LC_MESSAGES/django.po
@@ -7,73 +7,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:39+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-12 11:30+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Нема регистрирани фидови."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Краткото име %r не е регистрирано"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Базичното GIS поле -- соодветствува на геометриски тип од OpenGIS "
 "спецификацијата."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Точка"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Линиска нишка"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Полигон"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Повеќе точки"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Повеќе-линиска нишка"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Повеќе полигони"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Колекција од геометриски објекти"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Не е внесена геометриска вредност."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Невалидна геометриска вредност."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Невалиден геометриски тип."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "Се појави грешка при трансформација на геометриската вредност во SRID од "
 "геометриското поле"
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Нема достапна мапа на сијтот за секцијата: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Страницата %s е празна"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Нема страница '%s'"
diff --git a/django/contrib/gis/locale/ml/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ml/LC_MESSAGES/django.mo
index d87150af6d..b4805a4b1c 100644
Binary files a/django/contrib/gis/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ml/LC_MESSAGES/django.po b/django/contrib/gis/locale/ml/LC_MESSAGES/django.po
index bfd1821fe9..53492c6c57 100644
--- a/django/contrib/gis/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ml/LC_MESSAGES/django.po
@@ -2,95 +2,95 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Rajeesh Nair <rajeeshrnair@gmail.com>, 2011.
+# Rajeesh Nair <rajeeshrnair@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-04-17 19:18+0000\n"
 "Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr " ഫീഡുകളൊന്നും രജിസ്റ്റര്‍ ചെയ്തിട്ടില്ല."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "%r എന്ന സ്ലഗ് രജിസ്റ്റര്‍ ചെയ്തിട്ടില്ല."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "അടിസ്ഥാന ജി.ഐ.എസ് കളം (ഫീല്‍ഡ്) -- ഓപ്പണ്‍ ജി.ഐ.എസ് നിര്‍ദേശിച്ച തരം ജ്യാമിതീയ രൂപത്തെ "
 "സൂചിപ്പിക്കാന്‍"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "ബിന്ദു"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "രേഖാ സ്ട്രിങ്ങ്"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "ബഹുഭുജം"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "ബഹുബിന്ദു"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "ബഹു രേഖാ സ്ട്രിങ്ങ്"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "ബഹു ബഹുഭുജം"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "ജ്യാമിതി ശേഖരം"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "ജ്യാമിതീയ മൂല്യമൊന്നും തന്നിട്ടില്ല."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "തെറ്റായ ജ്യാമിതീയ മൂല്യം."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "തെറ്റായ തരം ജ്യാമിതി."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 "ജ്യാമിതീയ രൂപത്തെ ജ്യാമിതി കളത്തിന്റെ SRID-ലേക്കു മാറ്റുമ്പോള്‍ എന്തോ തകരാറു സംഭവിച്ചിട്ടുണ്ട്."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "%r എന്ന വിഭാഗത്തിനു സൈറ്റ്മാപ്പൊന്നും ലഭ്യമല്ല."
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "പേജ്  %s കാലിയാണ്"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "'%s' എന്ന പേജില്ല."
diff --git a/django/contrib/gis/locale/mn/LC_MESSAGES/django.mo b/django/contrib/gis/locale/mn/LC_MESSAGES/django.mo
index 57935b3dd6..9cfa19d112 100644
Binary files a/django/contrib/gis/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/mn/LC_MESSAGES/django.po b/django/contrib/gis/locale/mn/LC_MESSAGES/django.po
index 26999805de..ed8497eae9 100644
--- a/django/contrib/gis/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/mn/LC_MESSAGES/django.po
@@ -9,73 +9,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-11 05:35+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Бүртгэгдсэн feeds байхгүй байна."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "%r слаг бүгтгэгдээгүй байна"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Үндсэн GIS талбар -- OpenGIS газрын зургын Геометрын дүрсны онцгой төрөлтэй "
 "байна."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Цэг"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Тэмдэгт мөр"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Олон өнцөгт"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Олон цэг"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Олон мөр бүхий тэмтэгт мөр"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Олон өнцөгтийн олонлог"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Дүрсний цуглуулга"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Дүрс оруулаагүй байна."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Буруу дүрс байна."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Дүрсийн төрөл буруу байна."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -83,17 +83,17 @@ msgstr ""
 "An error occurred when transforming the geometry to the SRID дүрсний форм "
 "талбарын SRID утгыг хөрвүүлэхэд алдаа гарлаа."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Энэ хэсэгт Sitemap алга: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "%s хуудас хоосон"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "'%s' хуудас байхгүй"
diff --git a/django/contrib/gis/locale/nb/LC_MESSAGES/django.mo b/django/contrib/gis/locale/nb/LC_MESSAGES/django.mo
index 3e3f27081d..0e7225907f 100644
Binary files a/django/contrib/gis/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/nb/LC_MESSAGES/django.po b/django/contrib/gis/locale/nb/LC_MESSAGES/django.po
index 02887466f3..1050de018a 100644
--- a/django/contrib/gis/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/nb/LC_MESSAGES/django.po
@@ -8,88 +8,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 14:13+0000\n"
 "Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Ingen feeds er registrert."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slug %r er ikke registrert."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "GIS-basefeltet - tilordnes til OpenGIS Specification Geometry-typen."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linje-string"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multipunkt"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multilinje-string"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi-polygon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometri-samling"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Ingen geometriverdi oppgitt."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Ugyldig geometriverdi"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Ugyldig geometritype"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 "En feil oppstod ved transformering av geometrien til SRID fra geometrifeltet."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Ingen sitemap tilgjengelig for seksjon: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Side %s tom"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Ingen side '%s'"
diff --git a/django/contrib/gis/locale/ne/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ne/LC_MESSAGES/django.mo
index c97d02091a..47f4944868 100644
Binary files a/django/contrib/gis/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ne/LC_MESSAGES/django.po b/django/contrib/gis/locale/ne/LC_MESSAGES/django.po
index 9f303e6289..118036b093 100644
--- a/django/contrib/gis/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ne/LC_MESSAGES/django.po
@@ -6,87 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Sagar Chalise <chalisesagar@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "बिन्दु"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "बहुभुज"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr ""
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr ""
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "ज्यामिति संकलन"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "ज्यामिति मान उपलब्ध छैन ।"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "उनुपयुक्त ज्यामिति मान"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "उनुपयुक्त ज्यामिति प्रकार"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/nl/LC_MESSAGES/django.mo b/django/contrib/gis/locale/nl/LC_MESSAGES/django.mo
index 31a3c84a70..c70ba11607 100644
Binary files a/django/contrib/gis/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/nl/LC_MESSAGES/django.po b/django/contrib/gis/locale/nl/LC_MESSAGES/django.po
index bbeebbb507..532c140717 100644
--- a/django/contrib/gis/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/nl/LC_MESSAGES/django.po
@@ -9,73 +9,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Er zijn geen feeds geregistreerd"
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slug %r is niet geregistreerd."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Het basis GIS veld -- corresponderend met het OpenGIS Specificatie "
 "Geometrisch type"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Lijn string"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygoon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-punt"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multi-lijn string"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi-polygoon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometrie collectie"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Geen geometrische waarde opgegeven."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Ongeldige geometrie waarde."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Ongeldig geometrie type."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -83,17 +83,17 @@ msgstr ""
 "Er is een fout opgetreden bij het omvormen van de geometrie naar de SRID van "
 "het geometrie veld."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Geen sitemap beschikbaar voor sectie: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Pagina %s leeg"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Geen pagina '%s'"
diff --git a/django/contrib/gis/locale/nn/LC_MESSAGES/django.mo b/django/contrib/gis/locale/nn/LC_MESSAGES/django.mo
index 9ff5120c24..58b47aae4f 100644
Binary files a/django/contrib/gis/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/nn/LC_MESSAGES/django.po b/django/contrib/gis/locale/nn/LC_MESSAGES/django.po
index 34d99881ed..dee213c5fb 100644
--- a/django/contrib/gis/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/nn/LC_MESSAGES/django.po
@@ -6,71 +6,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linjestreng"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Fleirpunkt"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Fleirlinje-streng"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi-polygon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometrisamling"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Ingen geometriverdi oppgjeve."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Ugyldig geometriverdi"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Ugyldig geometritype"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -78,17 +78,17 @@ msgstr ""
 "Det oppstod ein feil ved transformering av geometrien til SRID frå "
 "geometrifeltet."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/pa/LC_MESSAGES/django.mo b/django/contrib/gis/locale/pa/LC_MESSAGES/django.mo
index b265d0e865..484c8743f5 100644
Binary files a/django/contrib/gis/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/pa/LC_MESSAGES/django.po b/django/contrib/gis/locale/pa/LC_MESSAGES/django.po
index 5f0ec812ca..4a544e082a 100644
--- a/django/contrib/gis/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/pa/LC_MESSAGES/django.po
@@ -6,87 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "ਪੁਆਇੰਟ"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "ਲਾਈਨ ਸਤਰ"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "ਬਹੁਭੁਜ"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "ਕਈ-ਪੁਆਇੰਟ"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "ਮਲਟੀ ਬਹੁ-ਭੁਜ"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "ਜੁਮੈਟਰੀ ਭੰਡਾਰ"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "ਕੋਈ ਜੁਮੈਟਰੀ ਮੁੱਲ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ।"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "ਗਲਤ ਜੁਮੈਟਰੀ ਮੁੱਲ।"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "ਗਲਤ ਜੁਮੈਟਰੀ ਕਿਸਮ।"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/pl/LC_MESSAGES/django.mo b/django/contrib/gis/locale/pl/LC_MESSAGES/django.mo
index 627203bfec..0d0d6d8654 100644
Binary files a/django/contrib/gis/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/pl/LC_MESSAGES/django.po b/django/contrib/gis/locale/pl/LC_MESSAGES/django.po
index 6e08354f7b..6207045dbe 100644
--- a/django/contrib/gis/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/pl/LC_MESSAGES/django.po
@@ -7,73 +7,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-21 13:06+0000\n"
 "Last-Translator: angularcircle <angular.circle@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Kanał informacyjny (RSS/ATOM) nie został zarejestrowany."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slug '%r' nie został zarejestrowany."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Podstawowe pole GIS - odpowiada typowi Geometry w specyfikacji OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Ścieżka"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Wielokąt"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Zbiór punktów"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Zbiór ścieżek"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Zbiór wielokątów"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Zbiór geometrii"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Brak wartości geometrii."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Błędna wartość geometrii."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Błędny typ geometrii."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "Wystąpił błąd podczas przekształcania geometrii do SRID pola formularza "
 "geometrii."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Mapa strony dla sekcji '%r' nie jest dostępna"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Strona '%s' jest pusta"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Brak strony '%s'"
diff --git a/django/contrib/gis/locale/pt/LC_MESSAGES/django.mo b/django/contrib/gis/locale/pt/LC_MESSAGES/django.mo
index 6c0d488e00..36218eb7a9 100644
Binary files a/django/contrib/gis/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/pt/LC_MESSAGES/django.po b/django/contrib/gis/locale/pt/LC_MESSAGES/django.po
index c6a3cb2dcc..2129a231a5 100644
--- a/django/contrib/gis/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/pt/LC_MESSAGES/django.po
@@ -2,77 +2,77 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
-# Nuno Mariz <nmariz@gmail.com>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011, 2012.
 # Paulo Köch <paulo.koch@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-04-02 14:41+0000\n"
 "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "Nenhum feed está registado."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "O slug %r não está registado."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "O campo GIS base -- mapeado para o tipo especificado no OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Ponto"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linha"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polígono"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-ponto"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multi-linha"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi-polígono"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Coleção geométrica"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Não foi submetido nenhum valor do tipo geometria."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valor inválido de geometria."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipo inválido de geometria."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -80,17 +80,17 @@ msgstr ""
 "Ocorreu um erro na transformação da geometria para o SRID da geometria do "
 "campo do formulário."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "Nenhum sitemap disponível para secção: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "Página %s vazia"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "Nenhuma página '%s'"
diff --git a/django/contrib/gis/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/gis/locale/pt_BR/LC_MESSAGES/django.mo
index 7318001e3b..0e2f88891b 100644
Binary files a/django/contrib/gis/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/gis/locale/pt_BR/LC_MESSAGES/django.po
index 9ce48e0bba..3930630c75 100644
--- a/django/contrib/gis/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,72 +8,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-19 18:32+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Nenhum feed foi registrado."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "O slug %r não foi registrado."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "O campo GIS base -- mapeia para o tipo Especificação de Geometria OpenGIS"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Ponto"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linha string"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polígono"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multiponto"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multilinha string"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multipolígono"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Coleção geométrica"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Nenhum valor geométrico fornecido."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valor geométrico inválido."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tipo geométrico inválido."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "Ocorreu um erro ao transformar a geometria para o SRID do campo de "
 "formulário de geometria."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Nenhum sitemap disponível para a seção: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Página %s vazia"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Nenhuma página '%s'"
diff --git a/django/contrib/gis/locale/ro/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ro/LC_MESSAGES/django.mo
index 8ceffd7506..9a617fb46b 100644
Binary files a/django/contrib/gis/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ro/LC_MESSAGES/django.po b/django/contrib/gis/locale/ro/LC_MESSAGES/django.po
index 0922d71576..45887068d8 100644
--- a/django/contrib/gis/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ro/LC_MESSAGES/django.po
@@ -7,73 +7,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Câmpul GIS de bază -- mapat către tipul OpenGIS Specification Geometry."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punct"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Șir linii"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-punct"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Șir multi-linie"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi poligon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Colecție geometrie"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Nicio valoare geometrică furnizată."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Valoare geometrică nevalidă."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Tip geometric nevalid."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "A avut loc o eroare la transformarea geometriei în SRID-ul  câmpului "
 "geometric al formularului."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/ru/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ru/LC_MESSAGES/django.mo
index 92abf33562..2ef77c1fe3 100644
Binary files a/django/contrib/gis/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ru/LC_MESSAGES/django.po b/django/contrib/gis/locale/ru/LC_MESSAGES/django.po
index 2a0c88c92f..bd93428ff0 100644
--- a/django/contrib/gis/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ru/LC_MESSAGES/django.po
@@ -8,90 +8,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Нет зарегистрированных фидов."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Слаг %r не зарегистрирован."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Базовое ГИС-поле. Его потомки отражают конкретные геометрические типы по "
 "спецификации OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Точка"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Ломаная"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Многоугольник"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Набор точек"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Набор ломаных"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Набор многоугольников"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Набор геометрических объектов"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Не указано значение геометрии."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Неверное значение геометрии."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Неверный тип геометрии."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Произошла ошибка во время преобразования геометрии в SRID."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Нет карты сайта для секции: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Страница  %s пустая"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Нет страницы '%s'"
diff --git a/django/contrib/gis/locale/sk/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sk/LC_MESSAGES/django.mo
index 007bd14d6f..3effdc7093 100644
Binary files a/django/contrib/gis/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/sk/LC_MESSAGES/django.po b/django/contrib/gis/locale/sk/LC_MESSAGES/django.po
index 59b7f57f9a..a3fc4af44e 100644
--- a/django/contrib/gis/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/sk/LC_MESSAGES/django.po
@@ -2,91 +2,92 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Juraj Bubniak <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-07-16 12:16+0000\n"
+"Last-Translator: Juraj Bubniak <translations@jbub.eu>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "Žiadne kanály nie sú registrované."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Identifikátor %r nie je registrovaný."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Základné GIS pole -- mapuje na typ OpenGIS Specification Geometry"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Bod"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Čiara"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygón"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Viacero bodov"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Viacero čiar"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Viacero polygónov"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Goemetrická kolekcia"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Nie je zadaná žiadna geometrická hodnota."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Chybná geometrická hodnota."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Chybný geometrický typ."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Nastala chyba pri prevode geometrie do SRID z formulárového poľa."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "Žiadna mapa stránok nie je dostupná pre sekciu: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "Stránka %s je prázdna"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "Žiadna stránka '%s'"
diff --git a/django/contrib/gis/locale/sl/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sl/LC_MESSAGES/django.mo
index 4c447bcbcf..0939ba1bc9 100644
Binary files a/django/contrib/gis/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/sl/LC_MESSAGES/django.po b/django/contrib/gis/locale/sl/LC_MESSAGES/django.po
index 14a1976101..eac65ffe90 100644
--- a/django/contrib/gis/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/sl/LC_MESSAGES/django.po
@@ -1,97 +1,98 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Gašper Žejn <zejn@kiberpipa.org>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 #   <zejn@kiberpipa.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-10-31 19:06+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr "Ni registiranih virov."
+msgstr "Ni vpisanih virov."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr "Okrajšava %r ni registrirana."
+msgstr "Okrajšava %r ni vpisana."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
-"Osnovno GIS polje -- se preslika v tip Geometry po OpenGIS specifikaciji."
+"Osnovno polje GIS -- se preslika v vrsto Geometry po določilih OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Točka"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
-msgstr "Črtni zapis"
+msgstr "Črtni niz"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
-msgstr "Poligon"
+msgstr "Mnogokotnik"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
-msgstr "Večtočkovje"
+msgstr "Več-točkovi predmet"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
-msgstr "Več črtni zapis"
+msgstr "Več črtni niz"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
-msgstr "Več poligonov"
+msgstr "Večkratni mnogokotnikov"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
-msgstr "Niz likov"
+msgstr "Zbirka likov"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
-msgstr "Niste navedli geometrijske vrednosti."
+msgstr "Ni navdene geometrijske vrednosti."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Neveljavna geometrijska vrednost."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
-msgstr "Neveljaven tip geometrije."
+msgstr "Neveljavna vrsta geometrije."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
-"Pri pretvorbi geometrijskega zapisa v SRID geometrijskega polja je prišlo do "
-"napake."
+"Med pretvarjanjem geometrijskega zapisa v SRID geometrijskega polja je "
+"prišlo do napake."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Za odsek %r ni zemljevida strani."
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Stran %s je prazna"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Ni strani '%s'"
diff --git a/django/contrib/gis/locale/sq/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sq/LC_MESSAGES/django.mo
index 9638d19d24..cc8c9abf1e 100644
Binary files a/django/contrib/gis/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/sq/LC_MESSAGES/django.po b/django/contrib/gis/locale/sq/LC_MESSAGES/django.po
index 5074aa1e8b..83748392af 100644
--- a/django/contrib/gis/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/sq/LC_MESSAGES/django.po
@@ -6,88 +6,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-11-25 19:28+0000\n"
 "Last-Translator: Besnik <besnik@programeshqip.org>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "Nuk ka prurje të regjistruara."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Identifikuesi %r nuk është i regjistruar."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Fusha bazë GIS -- skiconi sipas llojit Gjeometri me Specifikime OpenGIS."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Pikë"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Varg vije"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Shumëkëndësh"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-pika"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Varg multi-vijë"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi shumëkëndësh"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Përmbledhje gjeometrie"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Nuk u dha vlerë gjeometrie."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Vlerë e pavlefshme gjeometrie."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Lloj i pavlefshëm gjeometrie."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
+"Ndodhi një gabim gjatë shndërrimit të gjeometrisë në fushë SRID formulari "
+"gjeometrie."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "Nuk ka të passhme hartë site-i për ndarjen: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "Faqe %s e zbrazët"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "Nuk ka faqe '%s'"
diff --git a/django/contrib/gis/locale/sr/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sr/LC_MESSAGES/django.mo
index 608c0b108d..65578202fa 100644
Binary files a/django/contrib/gis/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/sr/LC_MESSAGES/django.po b/django/contrib/gis/locale/sr/LC_MESSAGES/django.po
index 7eb351f569..6445770169 100644
--- a/django/contrib/gis/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/sr/LC_MESSAGES/django.po
@@ -7,89 +7,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Нема регистрованих фидова."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Слаг „%r“ није регистрован."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Основно „GIS“ поље које мапира тип геометрије по „OpenGIS“ спецификацији."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Тачка"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Линија"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Полигон"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Више тачака"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Више линија"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Више полигона"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Колекција геопметријских облика"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Нисте задали параметре за геометрију."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Неисправан параметар за геометрију."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Непостојећи тип геометрије."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Грешка се десила током трансформације геометрије на „SRID“ тип поља."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Нема сајт мапа за секцију: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Страница %s је празна"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Страница „%s“ не постоји"
diff --git a/django/contrib/gis/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sr_Latn/LC_MESSAGES/django.mo
index 08105730f6..1f38747501 100644
Binary files a/django/contrib/gis/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/gis/locale/sr_Latn/LC_MESSAGES/django.po
index b9fe47785c..aedbb470b1 100644
--- a/django/contrib/gis/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,89 +7,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Nema registrovanih fidova."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slag „%r“ nije registrovan."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Osnovno „GIS“ polje koje mapira tip geometrije po „OpenGIS“ specifikaciji."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Tačka"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linija"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Više tačaka"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Više linija"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Više poligona"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Kolekcija geopmetrijskih oblika"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Niste zadali parametre za geometriju."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Neispravan parametar za geometriju."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Nepostojeći tip geometrije."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Greška se desila tokom transformacije geometrije na „SRID“ tip polja."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Nema sajt mapa za sekciju: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Stranica %s je prazna"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Stranica „%s“ ne postoji"
diff --git a/django/contrib/gis/locale/sv/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sv/LC_MESSAGES/django.mo
index 4724df10f7..92e46f3ee9 100644
Binary files a/django/contrib/gis/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/sv/LC_MESSAGES/django.po b/django/contrib/gis/locale/sv/LC_MESSAGES/django.po
index 648997d4d7..5026dfeb85 100644
--- a/django/contrib/gis/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/sv/LC_MESSAGES/django.po
@@ -7,87 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Inga flöden är registrerade."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slugen %r är inte registrerad."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "Grundläggande GIS-fält -- motsvarar ett OpenGIS-geometrifält."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Punkt"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Linjesegment"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multipunkt"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multilinjesegment"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multipolygon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometrisamling"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Inget geometriskt värde angivet."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Ogiltigt geometrivärde."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Ogiltig geometrityp"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Ett fel uppstod under transformering till SRID:t hos formulärsfältet."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Ingen sitemap finns tillgänglig för sektionen: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Sidan %s tom"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Ingen sida '%s'"
diff --git a/django/contrib/gis/locale/sw/LC_MESSAGES/django.mo b/django/contrib/gis/locale/sw/LC_MESSAGES/django.mo
index ac85fa4779..533264c987 100644
Binary files a/django/contrib/gis/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/sw/LC_MESSAGES/django.po b/django/contrib/gis/locale/sw/LC_MESSAGES/django.po
index a295b1ef2d..8d7ec96eab 100644
--- a/django/contrib/gis/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/sw/LC_MESSAGES/django.po
@@ -5,71 +5,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-09 18:08+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slagi %r haijasajiliwa"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Nukta"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligoni"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Nukta-mbalimbali"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Poligoni mbalimbali"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Mkusanyiko wa jiometri"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Hakuna thamani ya jiometri iliyotolewa"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Thamani batili ya jiometri."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Aina batili ya jiometri."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -77,17 +77,17 @@ msgstr ""
 "Makosa yametokea wakati wa kubadilisha jiometri kuwa SRID ya sehemu ya fomu "
 "ya jiometri."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "Hakuna ramani ya tovuti kipengele %r inayopatikana"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "Ukurasa mtupu %s"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "Ukurasa '%s' haupo"
diff --git a/django/contrib/gis/locale/ta/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ta/LC_MESSAGES/django.mo
index b5935d62a9..9cd19efefe 100644
Binary files a/django/contrib/gis/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ta/LC_MESSAGES/django.po b/django/contrib/gis/locale/ta/LC_MESSAGES/django.po
index b92757ff81..5f878b1de7 100644
--- a/django/contrib/gis/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ta/LC_MESSAGES/django.po
@@ -5,87 +5,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2011-01-19 16:52+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr ""
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr ""
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr ""
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr ""
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr ""
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr ""
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr ""
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr ""
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/te/LC_MESSAGES/django.mo b/django/contrib/gis/locale/te/LC_MESSAGES/django.mo
index fe258109ca..1b7a2ffc0b 100644
Binary files a/django/contrib/gis/locale/te/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/te/LC_MESSAGES/django.po b/django/contrib/gis/locale/te/LC_MESSAGES/django.po
index 2609e29a6f..449d221b69 100644
--- a/django/contrib/gis/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/te/LC_MESSAGES/django.po
@@ -6,87 +6,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr ""
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr ""
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr ""
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr ""
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr ""
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "క్షెత్రగనిత మూల్యము ఇవ్వలెదు."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "సరికాని  క్షేత్రగణిత మూల్యము."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "సరికాని  క్షేత్రగణిత రకం."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/th/LC_MESSAGES/django.mo b/django/contrib/gis/locale/th/LC_MESSAGES/django.mo
index 5e74e59443..94a86d10ca 100644
Binary files a/django/contrib/gis/locale/th/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/th/LC_MESSAGES/django.po b/django/contrib/gis/locale/th/LC_MESSAGES/django.po
index 6aede1b645..19d42d401c 100644
--- a/django/contrib/gis/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/th/LC_MESSAGES/django.po
@@ -8,87 +8,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-09 04:19+0000\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Kowit Charoenratchatabhan <kowit.s.c@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "ไม่มีฟีดที่ลงทะเบียน"
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slug %r ไม่ได้ลงทะเบียน"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "เขตข้อมูล GIS ฐาน -- แผนที่ไปยังประเภท OpenGIS เรขาคณิตจำเพาะ"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "จุด"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "สายสตริง"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "รูปหลายเหลี่ยม"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "หลาย ๆ จุด"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "สตริงหลายบรรทัด"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "รูปหลายเหลี่ยมหลายรูป"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "คอลเลกชันรูปทรงเรขาคณิต"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "ไม่พบข้อมูลพิกัด"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "ค่าพิกัดผิดพลาด "
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "ขนิดข้อมูลพิกัดผิดพลาด"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "ข้อผิดพลาดที่เกิดขึ้นเมื่อการเปลี่ยนรูปทรงเรขาคณิตที่ SRID ของเขตข้อมูลฟอร์มเรขาคณิต"
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "ไม่มีแผนผังไซต์บริการสำหรับส่วน: %r"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "หน้า %s ที่ว่างเปล่า"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "ไม่มีหน้า '%s'"
diff --git a/django/contrib/gis/locale/tr/LC_MESSAGES/django.mo b/django/contrib/gis/locale/tr/LC_MESSAGES/django.mo
index 7990a8beb3..a86583f3d1 100644
Binary files a/django/contrib/gis/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/tr/LC_MESSAGES/django.po b/django/contrib/gis/locale/tr/LC_MESSAGES/django.po
index 351455ac8d..89525c6e42 100644
--- a/django/contrib/gis/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/tr/LC_MESSAGES/django.po
@@ -8,72 +8,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 21:17+0000\n"
 "Last-Translator: Murat Sahin <martinamca@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr "Hiçbir besleme kayıtlı değildir."
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr "Slug %r kayıtlı değildir."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Taban GIS alanı -- OpenGIS Spesifikasyonu Geometri türüne eşleşmektedir."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Nokta"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Satır dizisi"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Poligon"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Çok noktalı"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Çok satırlı metin"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Çoklu poligon"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometri kolleksiyonu"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Hiçbir geometri değeri verilmemiştir."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Geçersiz geometri değeri."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Geçersiz geometri türü."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -81,17 +81,17 @@ msgstr ""
 "Geometri verisi geometri form alanının SRID değerine dönüştürülürken hata "
 "oluştu."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr "%r bölümü için bir site haritası mevcut değil"
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr "%s sayfası boş"
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr "'%s' adında sayfa yok"
diff --git a/django/contrib/gis/locale/tt/LC_MESSAGES/django.mo b/django/contrib/gis/locale/tt/LC_MESSAGES/django.mo
index 9926a8797e..06ba802309 100644
Binary files a/django/contrib/gis/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/tt/LC_MESSAGES/django.po b/django/contrib/gis/locale/tt/LC_MESSAGES/django.po
index 72046704e3..dad34864ef 100644
--- a/django/contrib/gis/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/tt/LC_MESSAGES/django.po
@@ -6,89 +6,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 "Төп ГИС-кыр. Аның токымы OpenGIS спецификациясе буенча геометрик тибларны "
 "күрсәтә."
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Нокта"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Сынык сызык"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Күппочмак"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Нокта җыелмасы"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Сынык сызыклар җыелмасы"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Күппочмаклар җыелмасы"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Геометрик объектлар җыелмасы"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Геометрик кыйммәт күрсәтелмәгән."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Дөрес булмаган геометрик кыйммәт."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Дөрес булмаган геометрик тип."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Геометриядән SRIDгә үзгәртү вакытында хата килеп чыкты."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo b/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo
index 47456452c4..748d6d9755 100644
Binary files a/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/uk/LC_MESSAGES/django.po b/django/contrib/gis/locale/uk/LC_MESSAGES/django.po
index b714f8fdc3..7dd2a872d9 100644
--- a/django/contrib/gis/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/uk/LC_MESSAGES/django.po
@@ -2,94 +2,95 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <krzroman@gmail.com>, 2012.
 # Sergey Lysach <sergikoff88@gmail.com>, 2011.
 # Андрей Костенко <andrey@kostenko.name>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Андрей Костенко <andrey@kostenko.name>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-12 20:30+0000\n"
+"Last-Translator: Roman Kozlovskiy <krzroman@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Точка"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Багатокутник"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr ""
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr ""
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr ""
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "Не задано геометрічне значення."
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Невірне геометричне значення."
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Невірний геометричний тип."
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "Помилка при перетворенні геометрії до SRID геометричного поля форми."
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "Немає карти сайту для розділу: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "Сторінка %s порожня"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "Немає сторінки '%s'"
diff --git a/django/contrib/gis/locale/ur/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ur/LC_MESSAGES/django.mo
index 22247a44a1..e9bbe1154c 100644
Binary files a/django/contrib/gis/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/ur/LC_MESSAGES/django.po b/django/contrib/gis/locale/ur/LC_MESSAGES/django.po
index 9c22a8667d..1942125393 100644
--- a/django/contrib/gis/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/ur/LC_MESSAGES/django.po
@@ -6,71 +6,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "بنیادی GIS خانہ -- مخصوص OpenGIS جیومیٹری کی قسم سے منسلک ھے۔"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "نقطہ"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "لائن سٹرنگ"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "پولی گان"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "کثیر النقاط"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "متعدد لائنوں والا سٹرنگ"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "ملٹی پولی گان"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "جیومیٹری کا ذخیرہ"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "کوئی جیومیٹری ویلیو مھیا نھیں کی گئی۔"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "غلط جیومیٹری ویلیو۔"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "غلط جیومیٹری ٹائپ"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
@@ -78,17 +78,17 @@ msgstr ""
 "جیومیٹری کو جیومیٹری کے فارم کے SRID خانے میں تبدیل کرتے ھوئےکوئی خرابی واقع "
 "ھو گئی ھے۔"
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/vi/LC_MESSAGES/django.mo b/django/contrib/gis/locale/vi/LC_MESSAGES/django.mo
index 021b9a631e..2141e057b5 100644
Binary files a/django/contrib/gis/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/vi/LC_MESSAGES/django.po b/django/contrib/gis/locale/vi/LC_MESSAGES/django.po
index b8f47bef80..38d2b4ac73 100644
--- a/django/contrib/gis/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/vi/LC_MESSAGES/django.po
@@ -7,87 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
 "PO-Revision-Date: 2012-03-08 12:32+0000\n"
 "Last-Translator: Tran Van <vantxm@yahoo.co.uk>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
 msgstr ""
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
 msgstr ""
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Điểm"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr ""
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Đa giác"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Đa điểm"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr ""
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Nhiều đa giác"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr ""
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr ""
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "Giá trị của hình dạng không phù h"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "Kiểu hình dạng không phù hợp"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
 msgstr ""
 
-#: sitemaps/views.py:58
+#: sitemaps/views.py:60
 #, python-format
 msgid "Page %s empty"
 msgstr ""
 
-#: sitemaps/views.py:60
+#: sitemaps/views.py:62
 #, python-format
 msgid "No page '%s'"
 msgstr ""
diff --git a/django/contrib/gis/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/gis/locale/zh_CN/LC_MESSAGES/django.mo
index 85948f1021..37f5d17392 100644
Binary files a/django/contrib/gis/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/gis/locale/zh_CN/LC_MESSAGES/django.po
index ebb5767945..dce4758600 100644
--- a/django/contrib/gis/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/zh_CN/LC_MESSAGES/django.po
@@ -3,93 +3,94 @@
 # Translators:
 # Daniel Duan <DaNmarner@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Kevin Shi <leiarix@gmail.com>, 2012.
 # Lei Yang <yanglei.go@gmail.com>, 2011.
 # Lele Long <schemacs@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: Daniel Duan <DaNmarner@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-26 01:39+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "没有已注册的源。"
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "Slug %r 没有注册."
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "基本地理信息系统域 - 映射于 OpenGIS 规范几何类型。"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "点"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "行字串"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "多边形"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "多点"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "多行字符串"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "多个多边形"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "几何集合"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "未提供几何信息。"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "无效几何信息。"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "无效几何类型。"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "几何形状的SRID字段发生试图转换错误ました。"
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "没有站点地图可用的部分: %r"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "页面 %s 为空"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "无页面 '%s'"
diff --git a/django/contrib/gis/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/gis/locale/zh_TW/LC_MESSAGES/django.mo
index 4fd3e16469..d07b5195d0 100644
Binary files a/django/contrib/gis/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/gis/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/gis/locale/zh_TW/LC_MESSAGES/django.po
index d2ba404cd4..206cd9f467 100644
--- a/django/contrib/gis/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,93 +1,94 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <ilay@ilay.tw>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # quantum9876 <quantum9876@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-03-08 12:32+0000\n"
-"Last-Translator: quantum9876 <quantum9876@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"PO-Revision-Date: 2012-08-06 03:15+0000\n"
+"Last-Translator: ilay <ilay@ilay.tw>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: views.py:7
+#: views.py:9
 msgid "No feeds are registered."
-msgstr ""
+msgstr "沒有已註冊的 feed。"
 
-#: views.py:17
+#: views.py:19
 #, python-format
 msgid "Slug %r isn't registered."
-msgstr ""
+msgstr "嵌入式語法 %r 尚未註冊。"
 
-#: db/models/fields.py:50
+#: db/models/fields.py:51
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr "將基本的 GIS 平面以OpenGIS  Specification Geometry type對應。"
 
-#: db/models/fields.py:270
+#: db/models/fields.py:271
 msgid "Point"
 msgstr "Point 類別"
 
-#: db/models/fields.py:274
+#: db/models/fields.py:275
 msgid "Line string"
 msgstr "Line string 類別"
 
-#: db/models/fields.py:278
+#: db/models/fields.py:279
 msgid "Polygon"
 msgstr "Polygon 類別"
 
-#: db/models/fields.py:282
+#: db/models/fields.py:283
 msgid "Multi-point"
 msgstr "Multi-point 類別"
 
-#: db/models/fields.py:286
+#: db/models/fields.py:287
 msgid "Multi-line string"
 msgstr "Multi-line string 類別"
 
-#: db/models/fields.py:290
+#: db/models/fields.py:291
 msgid "Multi polygon"
 msgstr "Multi polygon 類別"
 
-#: db/models/fields.py:294
+#: db/models/fields.py:295
 msgid "Geometry collection"
 msgstr "Geometry collection (幾何型別之叢集) 類別"
 
-#: forms/fields.py:17
+#: forms/fields.py:19
 msgid "No geometry value provided."
 msgstr "沒有幾何資訊。"
 
-#: forms/fields.py:18
+#: forms/fields.py:20
 msgid "Invalid geometry value."
 msgstr "無效的幾何參數。"
 
-#: forms/fields.py:19
+#: forms/fields.py:21
 msgid "Invalid geometry type."
 msgstr "無效的幾何類型。"
 
-#: forms/fields.py:20
+#: forms/fields.py:22
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr "當把目前地理資訊-GIS，轉成空間參考識別碼-SRID時發生錯誤。"
 
-#: sitemaps/views.py:44
+#: sitemaps/views.py:46
 #, python-format
 msgid "No sitemap available for section: %r"
-msgstr ""
-
-#: sitemaps/views.py:58
-#, python-format
-msgid "Page %s empty"
-msgstr ""
+msgstr "區域 %r 無可用的網站地圖"
 
 #: sitemaps/views.py:60
 #, python-format
+msgid "Page %s empty"
+msgstr "頁面 %s 為空"
+
+#: sitemaps/views.py:62
+#, python-format
 msgid "No page '%s'"
-msgstr ""
+msgstr "無此頁面 '%s'"
diff --git a/django/contrib/gis/sitemaps/kml.py b/django/contrib/gis/sitemaps/kml.py
index db30606b04..837fe62b62 100644
--- a/django/contrib/gis/sitemaps/kml.py
+++ b/django/contrib/gis/sitemaps/kml.py
@@ -30,7 +30,7 @@ class KMLSitemap(Sitemap):
                 for field in source._meta.fields:
                     if isinstance(field, GeometryField):
                         kml_sources.append((source._meta.app_label,
-                                            source._meta.module_name,
+                                            source._meta.model_name,
                                             field.name))
             elif isinstance(source, (list, tuple)):
                 if len(source) != 3: 
diff --git a/django/contrib/gis/templates/gis/admin/openlayers.js b/django/contrib/gis/templates/gis/admin/openlayers.js
index eb40edae8f..924621ea49 100644
--- a/django/contrib/gis/templates/gis/admin/openlayers.js
+++ b/django/contrib/gis/templates/gis/admin/openlayers.js
@@ -6,23 +6,26 @@ OpenLayers.Projection.addTransform("EPSG:4326", "EPSG:3857", OpenLayers.Layer.Sp
 {{ module }}.wkt_f = new OpenLayers.Format.WKT();
 {{ module }}.is_collection = {{ is_collection|yesno:"true,false" }};
 {{ module }}.collection_type = '{{ collection_type }}';
+{{ module }}.is_generic = {{ is_generic|yesno:"true,false" }};
 {{ module }}.is_linestring = {{ is_linestring|yesno:"true,false" }};
 {{ module }}.is_polygon = {{ is_polygon|yesno:"true,false" }};
 {{ module }}.is_point = {{ is_point|yesno:"true,false" }};
 {% endblock %}
-{{ module }}.get_ewkt = function(feat){return 'SRID={{ srid }};' + {{ module }}.wkt_f.write(feat);}
+{{ module }}.get_ewkt = function(feat){
+  return 'SRID={{ srid }};' + {{ module }}.wkt_f.write(feat);
+};
 {{ module }}.read_wkt = function(wkt){
   // OpenLayers cannot handle EWKT -- we make sure to strip it out.
   // EWKT is only exposed to OL if there's a validation error in the admin.
   var match = {{ module }}.re.exec(wkt);
   if (match){wkt = match[1];}
   return {{ module }}.wkt_f.read(wkt);
-}
+};
 {{ module }}.write_wkt = function(feat){
   if ({{ module }}.is_collection){ {{ module }}.num_geom = feat.geometry.components.length;}
   else { {{ module }}.num_geom = 1;}
   document.getElementById('{{ id }}').value = {{ module }}.get_ewkt(feat);
-}
+};
 {{ module }}.add_wkt = function(event){
   // This function will sync the contents of the `vector` layer with the
   // WKT in the text field.
@@ -41,7 +44,7 @@ OpenLayers.Projection.addTransform("EPSG:4326", "EPSG:3857", OpenLayers.Layer.Sp
     }
     {{ module }}.write_wkt(event.feature);
   }
-}
+};
 {{ module }}.modify_wkt = function(event){
   if ({{ module }}.is_collection){
     if ({{ module }}.is_point){
@@ -52,57 +55,56 @@ OpenLayers.Projection.addTransform("EPSG:4326", "EPSG:3857", OpenLayers.Layer.Sp
       // vector layer so we only increment to the `num_geom` value.
       var feat = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.{{ geom_type }}());
       for (var i = 0; i < {{ module }}.num_geom; i++){
-	feat.geometry.addComponents([{{ module }}.layers.vector.features[i].geometry]);
+        feat.geometry.addComponents([{{ module }}.layers.vector.features[i].geometry]);
       }
       {{ module }}.write_wkt(feat);
     }
   } else {
     {{ module }}.write_wkt(event.feature);
   }
-}
+};
 // Function to clear vector features and purge wkt from div
 {{ module }}.deleteFeatures = function(){
   {{ module }}.layers.vector.removeFeatures({{ module }}.layers.vector.features);
   {{ module }}.layers.vector.destroyFeatures();
-}
+};
 {{ module }}.clearFeatures = function (){
   {{ module }}.deleteFeatures();
   document.getElementById('{{ id }}').value = '';
   {% localize off %}
   {{ module }}.map.setCenter(new OpenLayers.LonLat({{ default_lon }}, {{ default_lat }}), {{ default_zoom }});
   {% endlocalize %}
-}
+};
 // Add Select control
 {{ module }}.addSelectControl = function(){
   var select = new OpenLayers.Control.SelectFeature({{ module }}.layers.vector, {'toggle' : true, 'clickout' : true});
   {{ module }}.map.addControl(select);
   select.activate();
-}
-{{ module }}.enableDrawing = function(){ {{ module }}.map.getControlsByClass('OpenLayers.Control.DrawFeature')[0].activate();}
-{{ module }}.enableEditing = function(){ {{ module }}.map.getControlsByClass('OpenLayers.Control.ModifyFeature')[0].activate();}
+};
+{{ module }}.enableDrawing = function(){
+  {{ module }}.map.getControlsByClass('OpenLayers.Control.DrawFeature')[0].activate();
+};
+{{ module }}.enableEditing = function(){
+  {{ module }}.map.getControlsByClass('OpenLayers.Control.ModifyFeature')[0].activate();
+};
 // Create an array of controls based on geometry type
 {{ module }}.getControls = function(lyr){
   {{ module }}.panel = new OpenLayers.Control.Panel({'displayClass': 'olControlEditingToolbar'});
-  var nav = new OpenLayers.Control.Navigation();
-  var draw_ctl;
-  if ({{ module }}.is_linestring){
-    draw_ctl = new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Path, {'displayClass': 'olControlDrawFeaturePath'});
-  } else if ({{ module }}.is_polygon){
-    draw_ctl = new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Polygon, {'displayClass': 'olControlDrawFeaturePolygon'});
-  } else if ({{ module }}.is_point){
-    draw_ctl = new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Point, {'displayClass': 'olControlDrawFeaturePoint'});
+  {{ module }}.controls = [new OpenLayers.Control.Navigation()];
+  if (!{{ module }}.modifiable && lyr.features.length) return;
+  if ({{ module }}.is_linestring || {{ module }}.is_generic){
+    {{ module }}.controls.push(new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Path, {'displayClass': 'olControlDrawFeaturePath'}));
+  }
+  if ({{ module }}.is_polygon || {{ module }}.is_generic){
+    {{ module }}.controls.push(new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Polygon, {'displayClass': 'olControlDrawFeaturePolygon'}));
+  }
+  if ({{ module }}.is_point || {{ module }}.is_generic){
+    {{ module }}.controls.push(new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Point, {'displayClass': 'olControlDrawFeaturePoint'}));
   }
   if ({{ module }}.modifiable){
-    var mod = new OpenLayers.Control.ModifyFeature(lyr, {'displayClass': 'olControlModifyFeature'});
-    {{ module }}.controls = [nav, draw_ctl, mod];
-  } else {
-    if(!lyr.features.length){
-      {{ module }}.controls = [nav, draw_ctl];
-    } else {
-      {{ module }}.controls = [nav];
-    }
+    {{ module }}.controls.push(new OpenLayers.Control.ModifyFeature(lyr, {'displayClass': 'olControlModifyFeature'}));
   }
-}
+};
 {{ module }}.init = function(){
     {% block map_options %}// The options hash, w/ zoom, resolution, and projection settings.
     var options = {
@@ -127,13 +129,13 @@ OpenLayers.Projection.addTransform("EPSG:4326", "EPSG:3857", OpenLayers.Layer.Sp
       var admin_geom = {{ module }}.read_wkt(wkt);
       {{ module }}.write_wkt(admin_geom);
       if ({{ module }}.is_collection){
-	// If geometry collection, add each component individually so they may be
-	// edited individually.
-	for (var i = 0; i < {{ module }}.num_geom; i++){
-	  {{ module }}.layers.vector.addFeatures([new OpenLayers.Feature.Vector(admin_geom.geometry.components[i].clone())]);
-	}
+        // If geometry collection, add each component individually so they may be
+        // edited individually.
+        for (var i = 0; i < {{ module }}.num_geom; i++){
+          {{ module }}.layers.vector.addFeatures([new OpenLayers.Feature.Vector(admin_geom.geometry.components[i].clone())]);
+        }
       } else {
-	{{ module }}.layers.vector.addFeatures([admin_geom]);
+        {{ module }}.layers.vector.addFeatures([admin_geom]);
       }
       // Zooming to the bounds.
       {{ module }}.map.zoomToExtent(admin_geom.geometry.getBounds());
@@ -171,4 +173,4 @@ OpenLayers.Projection.addTransform("EPSG:4326", "EPSG:3857", OpenLayers.Layer.Sp
     } else {
       {{ module }}.enableDrawing();
     }
-}
+};
diff --git a/django/contrib/gis/tests/data/geometries.json b/django/contrib/gis/tests/data/geometries.json
index 46de4d6182..b1a6ad14bf 100644
--- a/django/contrib/gis/tests/data/geometries.json
+++ b/django/contrib/gis/tests/data/geometries.json
@@ -20,6 +20,7 @@
   ],
   "wkt_out": [
     {"wkt": "POINT (110 130)", "ewkt": "POINT (110.0000000000000000 130.0000000000000000)", "kml": "<Point><coordinates>110.0,130.0,0</coordinates></Point>", "gml": "<gml:Point><gml:coordinates>110,130</gml:coordinates></gml:Point>"},
+    {"wkt": "POINT (110 130 85)", "ewkt": "POINT Z (110.0000000000000000 130.0000000000000000 85.0000000000000000)", "kml": "<Point><coordinates>110.0,130.0,85.0</coordinates></Point>", "gml": "<gml:Point><gml:coordinates>110,130,85</gml:coordinates></gml:Point>"},
     {"wkt": "LINESTRING (40 40,50 130,130 130)", "ewkt": "LINESTRING (40.0000000000000000 40.0000000000000000, 50.0000000000000000 130.0000000000000000, 130.0000000000000000 130.0000000000000000)", "kml": "<LineString><coordinates>40.0,40.0,0 50.0,130.0,0 130.0,130.0,0</coordinates></LineString>", "gml": "<gml:LineString><gml:coordinates>40,40 50,130 130,130</gml:coordinates></gml:LineString>"},
     {"wkt": "POLYGON ((150 150,410 150,280 20,20 20,150 150),(170 120,330 120,260 50,100 50,170 120))", "ewkt": "POLYGON ((150.0000000000000000 150.0000000000000000, 410.0000000000000000 150.0000000000000000, 280.0000000000000000 20.0000000000000000, 20.0000000000000000 20.0000000000000000, 150.0000000000000000 150.0000000000000000), (170.0000000000000000 120.0000000000000000, 330.0000000000000000 120.0000000000000000, 260.0000000000000000 50.0000000000000000, 100.0000000000000000 50.0000000000000000, 170.0000000000000000 120.0000000000000000))", "kml": "<Polygon><outerBoundaryIs><LinearRing><coordinates>150.0,150.0,0 410.0,150.0,0 280.0,20.0,0 20.0,20.0,0 150.0,150.0,0</coordinates></LinearRing></outerBoundaryIs><innerBoundaryIs><LinearRing><coordinates>170.0,120.0,0 330.0,120.0,0 260.0,50.0,0 100.0,50.0,0 170.0,120.0,0</coordinates></LinearRing></innerBoundaryIs></Polygon>", "gml": "<gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>150,150 410,150 280,20 20,20 150,150</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>170,120 330,120 260,50 100,50 170,120</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon>"},
     {"wkt": "MULTIPOINT (10 80,110 170,110 120)", "ewkt": "MULTIPOINT (10.0000000000000000 80.0000000000000000, 110.0000000000000000 170.0000000000000000, 110.0000000000000000 120.0000000000000000)", "kml": "<MultiGeometry><Point><coordinates>10.0,80.0,0</coordinates></Point><Point><coordinates>110.0,170.0,0</coordinates></Point><Point><coordinates>110.0,120.0,0</coordinates></Point></MultiGeometry>", "gml": "<gml:MultiPoint><gml:pointMember><gml:Point><gml:coordinates>10,80</gml:coordinates></gml:Point></gml:pointMember><gml:pointMember><gml:Point><gml:coordinates>110,170</gml:coordinates></gml:Point></gml:pointMember><gml:pointMember><gml:Point><gml:coordinates>110,120</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint>"},
@@ -29,6 +30,7 @@
   ],
   "hex_wkt": [
     {"wkt": "POINT(0 1)", "hex": "01010000000000000000000000000000000000F03F"},
+    {"wkt": "POINT(0 1 5)", "hex": "01010000800000000000000000000000000000F03F0000000000001440"},
     {"wkt": "LINESTRING(0 1, 2 3, 4 5)", "hex": "0102000000030000000000000000000000000000000000F03F0000000000000040000000000000084000000000000010400000000000001440"},
     {"wkt": "POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))", "hex": "010300000001000000050000000000000000000000000000000000000000000000000024400000000000000000000000000000244000000000000024400000000000000000000000000000244000000000000000000000000000000000"},
     {"wkt": "MULTIPOINT(0 0, 10 0, 10 10, 0 10, 0 0)", "hex": "010400000005000000010100000000000000000000000000000000000000010100000000000000000024400000000000000000010100000000000000000024400000000000002440010100000000000000000000000000000000002440010100000000000000000000000000000000000000"},
@@ -118,4 +120,4 @@
       {"wkt": "POLYGON ((-5 0,-5 10,5 10,5 5,10 5,10 -5,0 -5,0 0,-5 0))"},
       {"wkt": "POLYGON ((2 0, 2 15, 18 15, 18 0, 2 0))"}
   ]
-}
\ No newline at end of file
+}
diff --git a/django/contrib/gis/tests/geoadmin/tests.py b/django/contrib/gis/tests/geoadmin/tests.py
index 6fadebdb9a..669914bdea 100644
--- a/django/contrib/gis/tests/geoadmin/tests.py
+++ b/django/contrib/gis/tests/geoadmin/tests.py
@@ -38,7 +38,7 @@ class GeoAdminTest(TestCase):
         """ Check that changes are accurately noticed by OpenLayersWidget. """
         geoadmin = admin.site._registry[City]
         form = geoadmin.get_changelist_form(None)()
-        has_changed = form.fields['point'].widget._has_changed
+        has_changed = form.fields['point']._has_changed
 
         initial = Point(13.4197458572965953, 52.5194108501149799, srid=4326)
         data_same = "SRID=3857;POINT(1493879.2754093995 6894592.019687599)"
diff --git a/django/contrib/gis/tests/geoapp/test_feeds.py b/django/contrib/gis/tests/geoapp/test_feeds.py
index 85e777ae78..c9cf6362c1 100644
--- a/django/contrib/gis/tests/geoapp/test_feeds.py
+++ b/django/contrib/gis/tests/geoapp/test_feeds.py
@@ -22,7 +22,7 @@ class GeoFeedTest(TestCase):
         Site._meta.installed = self.old_Site_meta_installed
 
     def assertChildNodes(self, elem, expected):
-        "Taken from regressiontests/syndication/tests.py."
+        "Taken from syndication/tests.py."
         actual = set([n.nodeName for n in elem.childNodes])
         expected = set(expected)
         self.assertEqual(actual, expected)
diff --git a/django/contrib/gis/tests/geoapp/test_regress.py b/django/contrib/gis/tests/geoapp/test_regress.py
index 0e9c5c44a3..a27b2d40f6 100644
--- a/django/contrib/gis/tests/geoapp/test_regress.py
+++ b/django/contrib/gis/tests/geoapp/test_regress.py
@@ -5,7 +5,7 @@ from datetime import datetime
 
 from django.contrib.gis.tests.utils import no_mysql, no_spatialite
 from django.contrib.gis.shortcuts import render_to_kmz
-from django.db.models import Count
+from django.db.models import Count, Min
 from django.test import TestCase
 
 from .models import City, PennsylvaniaCity, State, Truth
@@ -49,7 +49,8 @@ class GeoRegressionTests(TestCase):
         founded = datetime(1857, 5, 23)
         mansfield = PennsylvaniaCity.objects.create(name='Mansfield', county='Tioga', point='POINT(-77.071445 41.823881)',
                                                     founded=founded)
-        self.assertEqual(founded, PennsylvaniaCity.objects.dates('founded', 'day')[0])
+        self.assertEqual(founded, PennsylvaniaCity.objects.datetimes('founded', 'day')[0])
+        self.assertEqual(founded, PennsylvaniaCity.objects.aggregate(Min('founded'))['founded__min'])
 
     def test_empty_count(self):
          "Testing that PostGISAdapter.__eq__ does check empty strings. See #13670."
diff --git a/django/contrib/gis/tests/geoapp/test_sitemaps.py b/django/contrib/gis/tests/geoapp/test_sitemaps.py
index 5f063dfba3..aa2d97032c 100644
--- a/django/contrib/gis/tests/geoapp/test_sitemaps.py
+++ b/django/contrib/gis/tests/geoapp/test_sitemaps.py
@@ -24,7 +24,7 @@ class GeoSitemapTest(TestCase):
         Site._meta.installed = self.old_Site_meta_installed
 
     def assertChildNodes(self, elem, expected):
-        "Taken from regressiontests/syndication/tests.py."
+        "Taken from syndication/tests.py."
         actual = set([n.nodeName for n in elem.childNodes])
         expected = set(expected)
         self.assertEqual(actual, expected)
diff --git a/django/contrib/gis/tests/geoapp/tests.py b/django/contrib/gis/tests/geoapp/tests.py
index 8f2c22e841..a5164d39d1 100644
--- a/django/contrib/gis/tests/geoapp/tests.py
+++ b/django/contrib/gis/tests/geoapp/tests.py
@@ -295,10 +295,8 @@ class GeoLookupTest(TestCase):
         self.assertEqual(2, len(qs))
         for c in qs: self.assertEqual(True, c.name in cities)
 
-    # The left/right lookup tests are known failures on PostGIS 2.0+
-    # until the following bug is fixed:
-    #  http://trac.osgeo.org/postgis/ticket/2035
-    # TODO: Ensure fixed in 2.0.2, else modify upper bound for version here.
+    # The left/right lookup tests are known failures on PostGIS 2.0/2.0.1
+    # http://trac.osgeo.org/postgis/ticket/2035
     if (2, 0, 0) <= connection.ops.spatial_version <= (2, 0, 1):
         test_left_right_lookups = unittest.expectedFailure(test_left_right_lookups)
 
diff --git a/django/contrib/gis/tests/inspectapp/tests.py b/django/contrib/gis/tests/inspectapp/tests.py
index 8fc39db58d..d28bdf0290 100644
--- a/django/contrib/gis/tests/inspectapp/tests.py
+++ b/django/contrib/gis/tests/inspectapp/tests.py
@@ -4,7 +4,7 @@ import os
 
 from django.db import connections
 from django.test import TestCase
-from django.contrib.gis.gdal import Driver, GDAL_VERSION
+from django.contrib.gis.gdal import Driver
 from django.contrib.gis.geometry.test_data import TEST_DATA
 from django.contrib.gis.utils.ogrinspect import ogrinspect
 
@@ -12,6 +12,8 @@ from .models import AllOGRFields
 
 
 class OGRInspectTest(TestCase):
+    maxDiff = 1024
+
     def test_poly(self):
         shp_file = os.path.join(TEST_DATA, 'test_poly', 'test_poly.shp')
         model_def = ogrinspect(shp_file, 'MyModel')
@@ -54,72 +56,61 @@ class OGRInspectTest(TestCase):
         # complains about permissions, and SpatiaLite/Oracle are
         # insanely difficult to get support compiled in for in GDAL.
         if not connections['default'].ops.postgis:
-            return
+            self.skipTest("This database does not support 'ogrinspect'ion")
 
         # Getting the database identifier used by OGR, if None returned
         # GDAL does not have the support compiled in.
         ogr_db = get_ogr_db_string()
         if not ogr_db:
-            return
+            self.skipTest("Your GDAL installation does not support PostGIS databases")
 
-        # writing shapefules via GDAL currently does not support writing OGRTime
+        # Writing shapefiles via GDAL currently does not support writing OGRTime
         # fields, so we need to actually use a database
         model_def = ogrinspect(ogr_db, 'Measurement',
                                layer_key=AllOGRFields._meta.db_table,
                                decimal=['f_decimal'])
 
-        expected = [
-            '# This is an auto-generated Django model module created by ogrinspect.',
-            'from django.contrib.gis.db import models',
-            '',
-            'class Measurement(models.Model):',
-            '    f_decimal = models.DecimalField(max_digits=0, decimal_places=0)',
-        ]
+        self.assertTrue(model_def.startswith(
+            '# This is an auto-generated Django model module created by ogrinspect.\n'
+            'from django.contrib.gis.db import models\n'
+            '\n'
+            'class Measurement(models.Model):\n'
+        ))
 
-        if GDAL_VERSION < (1, 9, 0):
-            # Prior to GDAL 1.9, the order of the model fields was not
-            # the same as the columns in the database.
-            expected.extend([
-            '    f_int = models.IntegerField()',
-            '    f_datetime = models.DateTimeField()',
-            '    f_time = models.TimeField()',
-            '    f_float = models.FloatField()',
-            '    f_char = models.CharField(max_length=10)',
-            '    f_date = models.DateField()',
-            ])
-        else:
-            expected.extend([
-            '    f_float = models.FloatField()',
-            '    f_int = models.IntegerField()',
-            '    f_char = models.CharField(max_length=10)',
-            '    f_date = models.DateField()',
-            '    f_datetime = models.DateTimeField()',
-            '    f_time = models.TimeField()',
-            ])
+        # The ordering of model fields might vary depending on several factors (version of GDAL, etc.)
+        self.assertIn('    f_decimal = models.DecimalField(max_digits=0, decimal_places=0)', model_def)
+        self.assertIn('    f_int = models.IntegerField()', model_def)
+        self.assertIn('    f_datetime = models.DateTimeField()', model_def)
+        self.assertIn('    f_time = models.TimeField()', model_def)
+        self.assertIn('    f_float = models.FloatField()', model_def)
+        self.assertIn('    f_char = models.CharField(max_length=10)', model_def)
+        self.assertIn('    f_date = models.DateField()', model_def)
 
-        expected.extend([
-            '    geom = models.PolygonField()',
-            '    objects = models.GeoManager()',
-        ])
+        self.assertTrue(model_def.endswith(
+            '    geom = models.PolygonField()\n'
+            '    objects = models.GeoManager()'
+        ))
 
-        self.assertEqual(model_def, '\n'.join(expected))
 
 def get_ogr_db_string():
-    # Construct the DB string that GDAL will use to inspect the database.
-    # GDAL will create its own connection to the database, so we re-use the
-    # connection settings from the Django test.  This approach is a bit fragile
-    # and cannot work on any other database other than PostgreSQL at the moment.
+    """
+    Construct the DB string that GDAL will use to inspect the database.
+    GDAL will create its own connection to the database, so we re-use the
+    connection settings from the Django test.
+    """
     db = connections.databases['default']
 
     # Map from the django backend into the OGR driver name and database identifier
     # http://www.gdal.org/ogr/ogr_formats.html
     #
-    # TODO: Support Oracle (OCI), MySQL, and SpatiaLite.
+    # TODO: Support Oracle (OCI).
     drivers = {
-        'django.contrib.gis.db.backends.postgis': ('PostgreSQL', 'PG'),
+        'django.contrib.gis.db.backends.postgis': ('PostgreSQL', "PG:dbname='%(db_name)s'", ' '),
+        'django.contrib.gis.db.backends.mysql': ('MySQL', 'MYSQL:"%(db_name)s"', ','),
+        'django.contrib.gis.db.backends.spatialite': ('SQLite', '%(db_name)s', '')
     }
 
-    drv_name, db_str = drivers[db['ENGINE']]
+    drv_name, db_str, param_sep = drivers[db['ENGINE']]
 
     # Ensure that GDAL library has driver support for the database.
     try:
@@ -127,10 +118,12 @@ def get_ogr_db_string():
     except:
         return None
 
+    # SQLite/Spatialite in-memory databases
+    if db['NAME'] == ":memory:":
+        return None
+
     # Build the params of the OGR database connection string
-    # TODO: connection strings are database-dependent, thus if
-    #       we ever test other backends, this will need to change.
-    params = ["dbname='%s'" % db['NAME']]
+    params = [db_str % {'db_name': db['NAME']}]
     def add(key, template):
         value = db.get(key, None)
         # Don't add the parameter if it is not in django's settings
@@ -141,4 +134,4 @@ def get_ogr_db_string():
     add('USER', "user='%s'")
     add('PASSWORD', "password='%s'")
 
-    return '%s:%s' % (db_str, ' '.join(params))
+    return param_sep.join(params)
diff --git a/django/contrib/gis/tests/relatedapp/models.py b/django/contrib/gis/tests/relatedapp/models.py
index 659fef7a93..5fc5e1377d 100644
--- a/django/contrib/gis/tests/relatedapp/models.py
+++ b/django/contrib/gis/tests/relatedapp/models.py
@@ -1,5 +1,4 @@
 from django.contrib.gis.db import models
-from django.contrib.localflavor.us.models import USStateField
 from django.utils.encoding import python_2_unicode_compatible
 
 @python_2_unicode_compatible
@@ -11,7 +10,7 @@ class Location(models.Model):
 @python_2_unicode_compatible
 class City(models.Model):
     name = models.CharField(max_length=50)
-    state = USStateField()
+    state = models.CharField(max_length=2)
     location = models.ForeignKey(Location)
     objects = models.GeoManager()
     def __str__(self): return self.name
diff --git a/django/contrib/gis/tests/test_geoforms.py b/django/contrib/gis/tests/test_geoforms.py
index ed851df0d2..24bb50c6bc 100644
--- a/django/contrib/gis/tests/test_geoforms.py
+++ b/django/contrib/gis/tests/test_geoforms.py
@@ -1,6 +1,7 @@
 from django.forms import ValidationError
 from django.contrib.gis.gdal import HAS_GDAL
 from django.contrib.gis.tests.utils import HAS_SPATIALREFSYS
+from django.utils import six
 from django.utils import unittest
 
 
@@ -37,15 +38,13 @@ class GeometryFieldTest(unittest.TestCase):
         "Testing GeometryField's handling of null (None) geometries."
         # Form fields, by default, are required (`required=True`)
         fld = forms.GeometryField()
-        self.assertRaises(forms.ValidationError, fld.clean, None)
-
-        # Still not allowed if `null=False`.
-        fld = forms.GeometryField(required=False, null=False)
-        self.assertRaises(forms.ValidationError, fld.clean, None)
+        with six.assertRaisesRegex(self, forms.ValidationError,
+                "No geometry value provided."):
+            fld.clean(None)
 
         # This will clean None as a geometry (See #10660).
         fld = forms.GeometryField(required=False)
-        self.assertEqual(None, fld.clean(None))
+        self.assertIsNone(fld.clean(None))
 
     def test03_geom_type(self):
         "Testing GeometryField's handling of different geometry types."
diff --git a/django/contrib/gis/tests/test_spatialrefsys.py b/django/contrib/gis/tests/test_spatialrefsys.py
index 7f7a0111f1..257e06a3f8 100644
--- a/django/contrib/gis/tests/test_spatialrefsys.py
+++ b/django/contrib/gis/tests/test_spatialrefsys.py
@@ -2,6 +2,7 @@ from django.db import connection
 from django.contrib.gis.gdal import HAS_GDAL
 from django.contrib.gis.tests.utils import (no_mysql, oracle, postgis,
     spatialite, HAS_SPATIALREFSYS, SpatialRefSys)
+from django.utils import six
 from django.utils import unittest
 
 
@@ -10,9 +11,8 @@ test_srs = ({'srid' : 4326,
              'auth_srid' : 4326,
              # Only the beginning, because there are differences depending on installed libs
              'srtext' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84"',
-             'proj4' : ['+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ',
-                        # +ellps=WGS84 has been removed in the 4326 proj string in proj-4.8
-                        '+proj=longlat +datum=WGS84 +no_defs '],
+             # +ellps=WGS84 has been removed in the 4326 proj string in proj-4.8
+             'proj4_re' : r'\+proj=longlat (\+ellps=WGS84 )?\+datum=WGS84 \+no_defs ',
              'spheroid' : 'WGS 84', 'name' : 'WGS 84',
              'geographic' : True, 'projected' : False, 'spatialite' : True,
              'ellipsoid' : (6378137.0, 6356752.3, 298.257223563), # From proj's "cs2cs -le" and Wikipedia (semi-minor only)
@@ -22,8 +22,9 @@ test_srs = ({'srid' : 4326,
              'auth_name' : ('EPSG', False),
              'auth_srid' : 32140,
              'srtext' : 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980"',
-             'proj4' : ['+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=4000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ',
-                        '+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=4000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs '],
+             'proj4_re' : r'\+proj=lcc \+lat_1=30.28333333333333 \+lat_2=28.38333333333333 \+lat_0=27.83333333333333 '
+                          r'\+lon_0=-99 \+x_0=600000 \+y_0=4000000 \+ellps=GRS80 '
+                          r'(\+datum=NAD83 |\+towgs84=0,0,0,0,0,0,0)?\+units=m \+no_defs ',
              'spheroid' : 'GRS 1980', 'name' : 'NAD83 / Texas South Central',
              'geographic' : False, 'projected' : True, 'spatialite' : False,
              'ellipsoid' : (6378137.0, 6356752.31414, 298.257222101), # From proj's "cs2cs -le" and Wikipedia (semi-minor only)
@@ -54,7 +55,7 @@ class SpatialRefSysTest(unittest.TestCase):
             # No proj.4 and different srtext on oracle backends :(
             if postgis:
                 self.assertTrue(srs.wkt.startswith(sd['srtext']))
-                self.assertTrue(srs.proj4text in sd['proj4'])
+                six.assertRegex(self, srs.proj4text, sd['proj4_re'])
 
     @no_mysql
     def test02_osr(self):
@@ -73,7 +74,7 @@ class SpatialRefSysTest(unittest.TestCase):
             # Testing the SpatialReference object directly.
             if postgis or spatialite:
                 srs = sr.srs
-                self.assertTrue(srs.proj4 in sd['proj4'])
+                six.assertRegex(self, srs.proj4, sd['proj4_re'])
                 # No `srtext` field in the `spatial_ref_sys` table in SpatiaLite
                 if not spatialite:
                     self.assertTrue(srs.wkt.startswith(sd['srtext']))
diff --git a/django/contrib/gis/utils/__init__.py b/django/contrib/gis/utils/__init__.py
index 5d340bd001..c6617d299f 100644
--- a/django/contrib/gis/utils/__init__.py
+++ b/django/contrib/gis/utils/__init__.py
@@ -14,12 +14,4 @@ if HAS_GDAL:
     except:
         pass
 
-# GeoIP now lives in `django.contrib.gis.geoip`; this shortcut will be
-# removed in Django 1.6.
-from django.contrib.gis.utils import geoip
-HAS_GEOIP = geoip.HAS_GEOIP
-if HAS_GEOIP:
-    GeoIP = geoip.GeoIP
-    GeoIPException = geoip.GeoIPException
-
 from django.contrib.gis.utils.wkt import precision_wkt
diff --git a/django/contrib/gis/utils/geoip.py b/django/contrib/gis/utils/geoip.py
deleted file mode 100644
index 781917e4c9..0000000000
--- a/django/contrib/gis/utils/geoip.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import warnings
-
-from django.contrib.gis import geoip
-HAS_GEOIP = geoip.HAS_GEOIP
-if HAS_GEOIP:
-    BaseGeoIP = geoip.GeoIP
-    GeoIPException = geoip.GeoIPException
-
-    class GeoIP(BaseGeoIP):
-        def __init__(self, *args, **kwargs):
-            warnings.warn('GeoIP class has been moved to `django.contrib.gis.geoip`, and '
-                          'this shortcut will disappear in Django v1.6.',
-                          DeprecationWarning, stacklevel=2)
-            super(GeoIP, self).__init__(*args, **kwargs)
diff --git a/django/contrib/gis/utils/layermapping.py b/django/contrib/gis/utils/layermapping.py
index 8a793b96c3..282dbc7450 100644
--- a/django/contrib/gis/utils/layermapping.py
+++ b/django/contrib/gis/utils/layermapping.py
@@ -16,7 +16,6 @@ from django.contrib.gis.gdal import (CoordTransform, DataSource,
 from django.contrib.gis.gdal.field import (
     OFTDate, OFTDateTime, OFTInteger, OFTReal, OFTString, OFTTime)
 from django.db import models, transaction
-from django.contrib.localflavor.us.models import USStateField
 from django.utils import six
 from django.utils.encoding import force_text
 
@@ -55,17 +54,11 @@ class LayerMapping(object):
         models.SlugField : OFTString,
         models.TextField : OFTString,
         models.URLField : OFTString,
-        USStateField : OFTString,
         models.BigIntegerField : (OFTInteger, OFTReal, OFTString),
         models.SmallIntegerField : (OFTInteger, OFTReal, OFTString),
         models.PositiveSmallIntegerField : (OFTInteger, OFTReal, OFTString),
         }
 
-    # The acceptable transaction modes.
-    TRANSACTION_MODES = {'autocommit' : transaction.autocommit,
-                         'commit_on_success' : transaction.commit_on_success,
-                         }
-
     def __init__(self, model, data, mapping, layer=0,
                  source_srs=None, encoding='utf-8',
                  transaction_mode='commit_on_success',
@@ -129,9 +122,11 @@ class LayerMapping(object):
 
         # Setting the transaction decorator with the function in the
         # transaction modes dictionary.
-        if transaction_mode in self.TRANSACTION_MODES:
-            self.transaction_decorator = self.TRANSACTION_MODES[transaction_mode]
-            self.transaction_mode = transaction_mode
+        self.transaction_mode = transaction_mode
+        if transaction_mode == 'autocommit':
+            self.transaction_decorator = None
+        elif transaction_mode == 'commit_on_success':
+            self.transaction_decorator = transaction.atomic
         else:
             raise LayerMapError('Unrecognized transaction mode: %s' % transaction_mode)
 
@@ -434,7 +429,8 @@ class LayerMapping(object):
             # Creating the CoordTransform object
             return CoordTransform(self.source_srs, target_srs)
         except Exception as msg:
-            raise LayerMapError('Could not translate between the data source and model geometry: %s' % msg)
+            new_msg = 'Could not translate between the data source and model geometry: %s' % msg
+            six.reraise(LayerMapError, LayerMapError(new_msg), sys.exc_info()[2])
 
     def geometry_field(self):
         "Returns the GeometryField instance associated with the geographic column."
@@ -503,9 +499,6 @@ class LayerMapping(object):
             else:
                 progress_interval = progress
 
-        # Defining the 'real' save method, utilizing the transaction
-        # decorator created during initialization.
-        @self.transaction_decorator
         def _save(feat_range=default_range, num_feat=0, num_saved=0):
             if feat_range:
                 layer_iter = self.layer[feat_range]
@@ -557,10 +550,6 @@ class LayerMapping(object):
                     except SystemExit:
                         raise
                     except Exception as msg:
-                        if self.transaction_mode == 'autocommit':
-                            # Rolling back the transaction so that other model saves
-                            # will work.
-                            transaction.rollback_unless_managed()
                         if strict:
                             # Bailing out if the `strict` keyword is set.
                             if not silent:
@@ -578,6 +567,9 @@ class LayerMapping(object):
             # values returned here.
             return num_saved, num_feat
 
+        if self.transaction_decorator is not None:
+            _save = self.transaction_decorator(_save)
+
         nfeat = self.layer.num_feat
         if step and isinstance(step, int) and step < nfeat:
             # Incremental saving is requested at the given interval (step)
diff --git a/django/contrib/gis/utils/srs.py b/django/contrib/gis/utils/srs.py
index 07a593d90e..fe2f291cb8 100644
--- a/django/contrib/gis/utils/srs.py
+++ b/django/contrib/gis/utils/srs.py
@@ -24,7 +24,7 @@ def add_srs_entry(srs, auth_name='EPSG', auth_srid=None, ref_sys_name=None,
        Defaults to the SRID determined by GDAL.
 
      ref_sys_name:
-       For SpatiaLite users only, sets the value of the the `ref_sys_name` field.
+       For SpatiaLite users only, sets the value of the `ref_sys_name` field.
        Defaults to the name determined by GDAL.
 
      database:
diff --git a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo
index 6fb966a61d..829e9bcf6e 100644
Binary files a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po
index aed3e2d184..85392ea0a1 100644
--- a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po
@@ -7,47 +7,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "اليوم"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "أمس"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "غداً"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr " "
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr " "
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr " "
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr " "
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -58,7 +58,7 @@ msgstr[3] "%(value).1f مليون"
 msgstr[4] "%(value).1f مليون"
 msgstr[5] "%(value).1f مليون"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -69,7 +69,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -80,7 +80,7 @@ msgstr[3] "%(value).1f مليار"
 msgstr[4] "%(value).1f مليار"
 msgstr[5] "%(value).1f مليار"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -91,7 +91,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -102,7 +102,7 @@ msgstr[3] "%(value).1f ترليونات"
 msgstr[4] "%(value).1f ترليون"
 msgstr[5] "%(value).1f ترليون"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -113,7 +113,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -124,7 +124,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -135,7 +135,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -146,7 +146,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -157,7 +157,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -168,7 +168,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -179,7 +179,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -190,7 +190,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -201,7 +201,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -212,7 +212,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -223,7 +223,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -234,7 +234,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -245,7 +245,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -256,7 +256,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -267,7 +267,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -278,7 +278,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -289,53 +289,53 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "واحد"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "إثنان"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "ثلالثة"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "أربعة"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "خمسة"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "ستة"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "سبعة"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "ثمانية"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "تسعة"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -346,7 +346,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -357,7 +357,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -368,13 +368,13 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -385,7 +385,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -396,7 +396,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo
index 3857ee37b6..075c2c22ff 100644
Binary files a/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po
index 9719eb9ebd..07b16e07b2 100644
--- a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po
@@ -6,224 +6,224 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "bu gün"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "dünən"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "sabah"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "-ıncı"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "-ıncı"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "-ıncı"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "-ıncı"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milyon"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s milyon"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milyard"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s milyard"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilyon"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s trilyon"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "bir"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "iki"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "üç"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "dörd"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "beş"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "altı"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "yeddi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "səkkiz"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "doqquz"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s əvvəl"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "indi"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -231,7 +231,7 @@ msgstr[0] ""
 "one: bir saniyə əvvəl\n"
 "other: %(count)s saniyə əvvəl"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -239,7 +239,7 @@ msgstr[0] ""
 "one: bir dəqiqə əvvəl\n"
 "other: %(count)s dəqiqə əvvəl"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -247,13 +247,13 @@ msgstr[0] ""
 "one: bir saat əvvəl\n"
 "other: %(count)s saat əvvəl"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s sonra"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -261,7 +261,7 @@ msgstr[0] ""
 "one: bir saniyə sonra\n"
 "other: %(count)s saniyə sonra"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -269,7 +269,7 @@ msgstr[0] ""
 "one: bir dəqiqə sonra\n"
 "other: %(count)s dəqiqə sonra"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/be/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..9788500416
Binary files /dev/null and b/django/contrib/humanize/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/be/LC_MESSAGES/django.po b/django/contrib/humanize/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..b9aac2853a
--- /dev/null
+++ b/django/contrib/humanize/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,350 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-07-31 12:10+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: tests.py:125 templatetags/humanize.py:167
+msgid "today"
+msgstr "сёньня"
+
+#: tests.py:125 templatetags/humanize.py:171
+msgid "yesterday"
+msgstr "ўчора"
+
+#: tests.py:125 templatetags/humanize.py:169
+msgid "tomorrow"
+msgstr "заўтра"
+
+#: templatetags/humanize.py:25
+msgid "th"
+msgstr "ы"
+
+#: templatetags/humanize.py:25
+msgid "st"
+msgstr "ы"
+
+#: templatetags/humanize.py:25
+msgid "nd"
+msgstr "і"
+
+#: templatetags/humanize.py:25
+msgid "rd"
+msgstr "і"
+
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f мільён"
+msgstr[1] "%(value).1f мільёны"
+msgstr[2] "%(value).1f мільёнаў"
+msgstr[3] "%(value).1f мільёнаў"
+
+#: templatetags/humanize.py:55
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s мільён"
+msgstr[1] "%(value)s мільёны"
+msgstr[2] "%(value)s мільёнаў"
+msgstr[3] "%(value)s мільёнаў"
+
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f мільярд"
+msgstr[1] "%(value).1f мільярды"
+msgstr[2] "%(value).1f мільярдаў"
+msgstr[3] "%(value).1f мільярдаў"
+
+#: templatetags/humanize.py:59
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value).s мільярд"
+msgstr[1] "%(value)s мільярды"
+msgstr[2] "%(value)s мільярдаў"
+msgstr[3] "%(value)s мільярдаў"
+
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f трыльён"
+msgstr[1] "%(value).1f трыльёны"
+msgstr[2] "%(value).1f трыльёнаў"
+msgstr[3] "%(value).1f трыльёнаў"
+
+#: templatetags/humanize.py:63
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s трыльён"
+msgstr[1] "%(value)s трыльёны"
+msgstr[2] "%(value)s трыльёнаў"
+msgstr[3] "%(value)s трыльёнаў"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f квадрыльён"
+msgstr[1] "%(value).1f квадрыльёны"
+msgstr[2] "%(value).1f квадрыльёнаў"
+msgstr[3] "%(value).1f квадрыльёнаў"
+
+#: templatetags/humanize.py:67
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s квадрыльён"
+msgstr[1] "%(value)s квадрыльёны"
+msgstr[2] "%(value)s квадрыльёнаў"
+msgstr[3] "%(value)s квадрыльёнаў"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f квінтыльён"
+msgstr[1] "%(value).1f квінтыльёны"
+msgstr[2] "%(value).1f квінтыльёнаў"
+msgstr[3] "%(value).1f квінтыльёнаў"
+
+#: templatetags/humanize.py:71
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s квінтыльён"
+msgstr[1] "%(value)s квінтыльёны"
+msgstr[2] "%(value)s квінтыльёнаў"
+msgstr[3] "%(value)s квінтыльёнаў"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f сэкстыльён"
+msgstr[1] "%(value).1f сэкстыльёны"
+msgstr[2] "%(value).1f сэкстыльёнаў"
+msgstr[3] "%(value).1f сэкстыльёнаў"
+
+#: templatetags/humanize.py:75
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s сэкстыльён"
+msgstr[1] "%(value)s сэкстыльёны"
+msgstr[2] "%(value)s сэкстыльёнаў"
+msgstr[3] "%(value)s сэкстыльёнаў"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f сэптыльён"
+msgstr[1] "%(value).1f сэптыльёны"
+msgstr[2] "%(value).1f сэптыльёнаў"
+msgstr[3] "%(value).1f сэптыльёнаў"
+
+#: templatetags/humanize.py:79
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s сэптыльён"
+msgstr[1] "%(value)s сэптыльёны"
+msgstr[2] "%(value)s сэптыльёнаў"
+msgstr[3] "%(value)s сэптыльёнаў"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f актыльён"
+msgstr[1] "%(value).1f актыльёны"
+msgstr[2] "%(value).1f актыльёнаў"
+msgstr[3] "%(value).1f актыльёнаў"
+
+#: templatetags/humanize.py:83
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s актыльён"
+msgstr[1] "%(value)s актыльёны"
+msgstr[2] "%(value)s актыльёнаў"
+msgstr[3] "%(value)s актыльёнаў"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f нанільён"
+msgstr[1] "%(value).1f нанільёны"
+msgstr[2] "%(value).1f нанільёнаў"
+msgstr[3] "%(value).1f нанільёнаў"
+
+#: templatetags/humanize.py:87
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s нанільён"
+msgstr[1] "%(value)s нанільёны"
+msgstr[2] "%(value)s нанільёнаў"
+msgstr[3] "%(value)s нанільёнаў"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f дэцыльён"
+msgstr[1] "%(value).1f дэцыльёны"
+msgstr[2] "%(value).1f дэцыльёнаў"
+msgstr[3] "%(value).1f дэцыльёнаў"
+
+#: templatetags/humanize.py:91
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s дэцыльён"
+msgstr[1] "%(value)s дэцыльёны"
+msgstr[2] "%(value)s дэцыльёнаў"
+msgstr[3] "%(value)s дэцыльёнаў"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f ґуґал"
+msgstr[1] "%(value).1f ґуґлы"
+msgstr[2] "%(value).1f ґуґлаў"
+msgstr[3] "%(value).1f ґуґлаў"
+
+#: templatetags/humanize.py:95
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s ґуґал"
+msgstr[1] "%(value)s ґуґлы"
+msgstr[2] "%(value)s ґуґлаў"
+msgstr[3] "%(value)s ґуґлаў"
+
+#: templatetags/humanize.py:144
+msgid "one"
+msgstr "адзін"
+
+#: templatetags/humanize.py:144
+msgid "two"
+msgstr "два"
+
+#: templatetags/humanize.py:144
+msgid "three"
+msgstr "тры"
+
+#: templatetags/humanize.py:144
+msgid "four"
+msgstr "чатыры"
+
+#: templatetags/humanize.py:144
+msgid "five"
+msgstr "пяць"
+
+#: templatetags/humanize.py:144
+msgid "six"
+msgstr "шэсьць"
+
+#: templatetags/humanize.py:144
+msgid "seven"
+msgstr "сем"
+
+#: templatetags/humanize.py:144
+msgid "eight"
+msgstr "восем"
+
+#: templatetags/humanize.py:144
+msgid "nine"
+msgstr "дзевяць"
+
+#: templatetags/humanize.py:190
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s таму"
+
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
+msgid "now"
+msgstr "зараз"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s сэкунду таму"
+msgstr[1] "%(count)s сэкунды таму"
+msgstr[2] "%(count)s сэкундаў таму"
+msgstr[3] "%(count)s сэкундаў таму"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s хвіліну таму"
+msgstr[1] "%(count)s хвіліны таму"
+msgstr[2] "%(count)s хвілінаў таму"
+msgstr[3] "%(count)s хвілінаў таму"
+
+#: templatetags/humanize.py:206
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s гадзіну таму"
+msgstr[1] "%(count)s гадзіны таму"
+msgstr[2] "%(count)s гадзінаў таму"
+msgstr[3] "%(count)s гадзінаў таму"
+
+#: templatetags/humanize.py:212
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "праз %(delta)s"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "праз %(count)s сэкунду"
+msgstr[1] "праз %(count)s сэкунды"
+msgstr[2] "праз %(count)s сэкундаў"
+msgstr[3] "праз %(count)s сэкундаў"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "праз %(count)s хвіліну"
+msgstr[1] "праз %(count)s хвіліны"
+msgstr[2] "праз %(count)s хвілінаў"
+msgstr[3] "праз %(count)s хвілінаў"
+
+#: templatetags/humanize.py:228
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "праз %(count)s гадзіну"
+msgstr[1] "праз %(count)s гадзіны"
+msgstr[2] "праз %(count)s гадзінаў"
+msgstr[3] "праз %(count)s гадзінаў"
diff --git a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo
index da54b47d39..f2047c93bf 100644
Binary files a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po
index f5a3393d17..9d1eaa890c 100644
--- a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po
@@ -1,295 +1,296 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <grgkostadinov@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Todor Lubenov <tlubenov@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Todor Lubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-04-01 19:29+0000\n"
+"Last-Translator: Georgi Kostadinov <grgkostadinov@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "днес"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "вчера"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "Утре"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "и"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ви"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "ри"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ти"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f милион"
 msgstr[1] "%(value).1f милиона"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s милион"
+msgstr[1] "%(value)s милиона"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f милиард"
 msgstr[1] "%(value).1f милиарда"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s милиард"
+msgstr[1] "%(value)s милиарда"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f трилион"
 msgstr[1] "%(value).1f трилиона"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s трилион"
+msgstr[1] "%(value)s трилиона"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f квадрилион"
+msgstr[1] "%(value).1f квадрилиона"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s квадрилион"
+msgstr[1] "%(value)s квадрилиона"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f квинтилион"
+msgstr[1] "%(value).1f квинтилиона"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s квинтилион"
+msgstr[1] "%(value)s квинтилиона"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f секстилион"
+msgstr[1] "%(value).1f секстилиона"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s секстилион"
+msgstr[1] "%(value)s секстилиона"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f септилион"
+msgstr[1] "%(value).1f септилиона"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s септилион"
+msgstr[1] "%(value)s септилиона"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f октилион"
+msgstr[1] "%(value).1f октилиона"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s октилион"
+msgstr[1] "%(value)s октилиона"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f нонилион"
+msgstr[1] "%(value).1f нонилиона"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s нонилион"
+msgstr[1] "%(value)s нонилиона"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f децилион"
+msgstr[1] "%(value).1f децилиона"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s децилион"
+msgstr[1] "%(value)s децилиона"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f гугол"
+msgstr[1] "%(value).1f гугола"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s гугол"
+msgstr[1] "%(value)s гугола"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "един"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "четири"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "пет"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "шест"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "седем"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "осем"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "девет"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "преди %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
-
-#: templatetags/humanize.py:191
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "сега"
 
 #: templatetags/humanize.py:196
 #, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "преди секунда"
+msgstr[1] "преди %(count)s секунди"
 
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "преди минута"
+msgstr[1] "преди %(count)s минути"
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "преди час"
+msgstr[1] "преди %(count)s часа"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "%(delta)s от сега"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "секунда от сега"
+msgstr[1] "%(count)s секунди от сега"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "минута от сега"
+msgstr[1] "%(count)s минути от сега"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "час от сега"
+msgstr[1] "%(count)s часа от сега"
diff --git a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo
index e0fece7890..40ea002180 100644
Binary files a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po
index 22773f9950..7e9a70d063 100644
--- a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po
@@ -6,287 +6,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "আজ"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "আগামীকাল"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "তম"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ম"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "য়"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "য়"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f মিলিয়ন"
 msgstr[1] "%(value).1f মিলিয়ন"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f বিলিয়ন"
 msgstr[1] "%(value).1f বিলিয়ন"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ট্রিলিয়ন"
 msgstr[1] "%(value).1f ট্রিলিয়ন"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "এক"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "দুই"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "তিন"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "চার"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "পাঁচ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "ছয়"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "সাত"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "আট"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "নয়"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/br/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..00b764daec
Binary files /dev/null and b/django/contrib/humanize/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/br/LC_MESSAGES/django.po b/django/contrib/humanize/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..2fd9457065
--- /dev/null
+++ b/django/contrib/humanize/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,294 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-06-29 10:20+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: tests.py:125 templatetags/humanize.py:167
+msgid "today"
+msgstr "hiziv"
+
+#: tests.py:125 templatetags/humanize.py:171
+msgid "yesterday"
+msgstr "dec'h"
+
+#: tests.py:125 templatetags/humanize.py:169
+msgid "tomorrow"
+msgstr "warc'hoazh"
+
+#: templatetags/humanize.py:25
+msgid "th"
+msgstr "<sup>e</sup>"
+
+#: templatetags/humanize.py:25
+msgid "st"
+msgstr "<sup>añ</sup>"
+
+#: templatetags/humanize.py:25
+msgid "nd"
+msgstr "<sup>l</sup>"
+
+#: templatetags/humanize.py:25
+msgid "rd"
+msgstr "<sup>e</sup>"
+
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f milion"
+msgstr[1] "%(value).1f milion"
+
+#: templatetags/humanize.py:55
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s million"
+
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f miliard"
+msgstr[1] "%(value).1f miliard"
+
+#: templatetags/humanize.py:59
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miliard"
+msgstr[1] "%(value)s miliard"
+
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f bilion"
+msgstr[1] "%(value).1f bilion"
+
+#: templatetags/humanize.py:63
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s bilion"
+msgstr[1] "%(value)s bilion"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f c'hadrilion"
+msgstr[1] "%(value).1f kadrilion"
+
+#: templatetags/humanize.py:67
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s c'hadrilion"
+msgstr[1] "%(value)s kadrilion"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f c'hintilion"
+msgstr[1] "%(value).1f kintilion"
+
+#: templatetags/humanize.py:71
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s c'hintilion"
+msgstr[1] "%(value)s kintilion"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sekstilion"
+msgstr[1] "%(value).1f sekstilion"
+
+#: templatetags/humanize.py:75
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sekstilion"
+msgstr[1] "%(value)s sekstilion"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilion"
+msgstr[1] "%(value).1f septilion"
+
+#: templatetags/humanize.py:79
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septilion"
+msgstr[1] "%(value)s septilion"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktilion"
+msgstr[1] "%(value).1f oktilion"
+
+#: templatetags/humanize.py:83
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s oktilion"
+msgstr[1] "%(value)s oktilion"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonilion"
+msgstr[1] "%(value).1f nonilion"
+
+#: templatetags/humanize.py:87
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonilion"
+msgstr[1] "%(value)s nonilion"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f dekilion"
+msgstr[1] "%(value).1f dekilion"
+
+#: templatetags/humanize.py:91
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s dekilion"
+msgstr[1] "%(value)s dekilion"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f gogol"
+msgstr[1] "%(value).1f gogol"
+
+#: templatetags/humanize.py:95
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s gogol"
+msgstr[1] "%(value)s gogol"
+
+#: templatetags/humanize.py:144
+msgid "one"
+msgstr "unan"
+
+#: templatetags/humanize.py:144
+msgid "two"
+msgstr "daou"
+
+#: templatetags/humanize.py:144
+msgid "three"
+msgstr "tri"
+
+#: templatetags/humanize.py:144
+msgid "four"
+msgstr "pevar"
+
+#: templatetags/humanize.py:144
+msgid "five"
+msgstr "pemp"
+
+#: templatetags/humanize.py:144
+msgid "six"
+msgstr "c'hwec'h"
+
+#: templatetags/humanize.py:144
+msgid "seven"
+msgstr "seizh"
+
+#: templatetags/humanize.py:144
+msgid "eight"
+msgstr "eizh"
+
+#: templatetags/humanize.py:144
+msgid "nine"
+msgstr "nav"
+
+#: templatetags/humanize.py:190
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s zo"
+
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
+msgid "now"
+msgstr "bremañ"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "un eilenn zo"
+msgstr[1] "%(count)s eilenn zo"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "ur vunutenn zo"
+msgstr[1] "%(count)s munut zo"
+
+#: templatetags/humanize.py:206
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "un eurvezh zo"
+msgstr[1] "%(count)s eurvezh zo"
+
+#: templatetags/humanize.py:212
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "a-benn %(delta)s "
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "a-benn un eilenn"
+msgstr[1] "a-benn %(count)s eilenn"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "a-benn ur vunutenn"
+msgstr[1] "a-benn %(count)s munut"
+
+#: templatetags/humanize.py:228
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "a-benn un eurvezh"
+msgstr[1] "a-benn %(count)s eurvezh"
diff --git a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo
index be9d529926..678f208e6a 100644
Binary files a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po
index 111e2b9e46..5015fa0352 100644
--- a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po
@@ -7,47 +7,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Filip Dupanović <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "deset"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "jučer"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "sutra"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "-i"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "-vi"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "-i"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "-i"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -55,7 +55,7 @@ msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f miliona"
 msgstr[2] "%(value).1f miliona"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -63,7 +63,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -71,7 +71,7 @@ msgstr[0] "%(value).1f milijarda"
 msgstr[1] "%(value).1f milijarde"
 msgstr[2] "%(value).1f milijardi"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -79,7 +79,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -87,7 +87,7 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliona"
 msgstr[2] "%(value).1f biliona"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -95,7 +95,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -103,7 +103,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -111,7 +111,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -119,7 +119,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -127,7 +127,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -135,7 +135,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -143,7 +143,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -151,7 +151,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -159,7 +159,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -167,7 +167,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -175,7 +175,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -183,7 +183,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -191,7 +191,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -199,7 +199,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -207,7 +207,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -215,7 +215,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -223,53 +223,53 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "jedan"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "četiri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "pet"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sedam"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "osam"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "devet"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -277,7 +277,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -285,7 +285,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -293,13 +293,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -307,7 +307,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -315,7 +315,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo
index f43242c386..6d5765fe40 100644
Binary files a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po
index c10eb73685..fec039f2d0 100644
--- a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-05 23:00+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "avui"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ahir"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "demà"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "è"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "r"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "n"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "r"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milió"
 msgstr[1] "%(value).1f  milions"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s milió"
 msgstr[1] "%(value)s milions"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miliard"
 msgstr[1] "%(value).1f miliards"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s miliard"
 msgstr[1] "%(value)s miliards"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f bilió"
 msgstr[1] "%(value).1f bilions"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s bilió"
 msgstr[1] "%(value)s bilió"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f quadrilió"
 msgstr[1] "%(value).1f quadrilions"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s quadrilió"
 msgstr[1] "%(value)s quadrilions"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f quintilió"
 msgstr[1] "%(value).1f quintilions"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s quintilió"
 msgstr[1] "%(value)s quintilions"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sextilió"
 msgstr[1] "%(value).1f sextilions"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sextilió"
 msgstr[1] "%(value)s sextilions"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septilió"
 msgstr[1] "%(value).1f septilions"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septilió"
 msgstr[1] "%(value)s septilions"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f octilió"
 msgstr[1] "%(value).1f octilions"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s octilió"
 msgstr[1] "%(value)s octilions"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f nonilió"
 msgstr[1] "%(value).1f nonilions"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s nonilió"
 msgstr[1] "%(value)s nonilions"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f decilió"
 msgstr[1] "%(value).1f decilions"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s decilió"
 msgstr[1] "%(value)s decilions"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googols"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googols"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "un"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dos"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "quatre"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinc"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sis"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "set"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "vuit"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nou"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "fa %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "ara"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "fa un segon"
 msgstr[1] "fa %(count)s segons"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "fa un minut"
 msgstr[1] "fa %(count)s minuts"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "fa una hora"
 msgstr[1] "fa %(count)s hores"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s des d'ara"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "d'aquí a un segon"
 msgstr[1] "d'aquí a %(count)s segons"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "d'aquí a un minut"
 msgstr[1] "d'aquí a %(count)s minuts"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo
index 0a8eb1693b..35b33e1c67 100644
Binary files a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po
index 4f99a88374..41fa53f123 100644
--- a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po
@@ -7,46 +7,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "dnes"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "včera"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "zítra"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -54,7 +54,7 @@ msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f miliony"
 msgstr[2] "%(value).1f milionů"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -62,7 +62,7 @@ msgstr[0] " %(value)s milion"
 msgstr[1] " %(value)s miliony"
 msgstr[2] " %(value)s milionů"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -70,7 +70,7 @@ msgstr[0] "%(value).1f miliarda"
 msgstr[1] "%(value).1f miliardy"
 msgstr[2] "%(value).1f miliard"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -78,7 +78,7 @@ msgstr[0] "%(value)s miliarda"
 msgstr[1] "%(value)s miliardy"
 msgstr[2] "%(value)s miliard"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -86,7 +86,7 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliony"
 msgstr[2] "%(value).1f bilionů"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -94,7 +94,7 @@ msgstr[0] "%(value)s bilion"
 msgstr[1] "%(value)s biliony"
 msgstr[2] "%(value)s bilionů"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -102,7 +102,7 @@ msgstr[0] "%(value).1f biliarda"
 msgstr[1] "%(value).1f biliardy"
 msgstr[2] "%(value).1f biliard"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -110,7 +110,7 @@ msgstr[0] "%(value)s biliarda"
 msgstr[1] "%(value)s biliardy"
 msgstr[2] "%(value)s biliard"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -118,7 +118,7 @@ msgstr[0] "%(value).1f trilion"
 msgstr[1] "%(value).1f triliony"
 msgstr[2] "%(value).1f trilionů"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -126,7 +126,7 @@ msgstr[0] "%(value)s trilion"
 msgstr[1] "%(value)s triliony"
 msgstr[2] "%(value)s trilionů"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -134,7 +134,7 @@ msgstr[0] "%(value).1f triliarda"
 msgstr[1] "%(value).1f triliardy"
 msgstr[2] "%(value).1f triliard"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -142,7 +142,7 @@ msgstr[0] "%(value)s triliard"
 msgstr[1] "%(value)s triliardy"
 msgstr[2] "%(value)s triliard"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -150,7 +150,7 @@ msgstr[0] "%(value).1f kvadrilion"
 msgstr[1] "%(value).1f kvadriliony"
 msgstr[2] "%(value).1f kvadrilionů"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -158,7 +158,7 @@ msgstr[0] "%(value)s kvadrilion"
 msgstr[1] "%(value)s kvadriliony"
 msgstr[2] "%(value)s kvadrilionů"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -166,7 +166,7 @@ msgstr[0] "%(value).1f kvadriliarda"
 msgstr[1] "%(value).1f kvadriliardy"
 msgstr[2] "%(value).1f kvadriliard"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -174,7 +174,7 @@ msgstr[0] "%(value)s kvadriliarda"
 msgstr[1] "%(value)s kvadriliardy"
 msgstr[2] "%(value)s kvadriliard"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -182,7 +182,7 @@ msgstr[0] "%(value).1f kvintilion"
 msgstr[1] "%(value).1f kvintiliony"
 msgstr[2] "%(value).1f kvintilionů"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -190,7 +190,7 @@ msgstr[0] "%(value)s kvintilion"
 msgstr[1] "%(value)s kvintiliony"
 msgstr[2] "%(value)s kvintilionů"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -198,7 +198,7 @@ msgstr[0] "%(value).1f kvintiliarda"
 msgstr[1] "%(value).1f kvintiliardy"
 msgstr[2] "%(value).1f kvintiliard"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -206,7 +206,7 @@ msgstr[0] "%(value)s kvintiliarda"
 msgstr[1] "%(value)s kvintiliardy"
 msgstr[2] "%(value)s kvintiliard"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -214,7 +214,7 @@ msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googoly"
 msgstr[2] "%(value).1f googolů"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -222,53 +222,53 @@ msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googoly"
 msgstr[2] "%(value)s googolů"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "jedna"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dvě"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tři"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "čtyři"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "pět"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sedm"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "osm"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "devět"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s v minulosti"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "nyní"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -276,7 +276,7 @@ msgstr[0] "před sekundou"
 msgstr[1] "před %(count)s sekundami"
 msgstr[2] "před %(count)s sekundami"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -284,7 +284,7 @@ msgstr[0] "před minutou"
 msgstr[1] "před %(count)s minutami"
 msgstr[2] "před %(count)s minutami"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -292,13 +292,13 @@ msgstr[0] "před hodinou"
 msgstr[1] "před %(count)s hodinami"
 msgstr[2] "před %(count)s hodinami"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s v budoucnosti"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -306,7 +306,7 @@ msgstr[0] "za sekundu"
 msgstr[1] "za %(count)s sekundy"
 msgstr[2] "za %(count)s sekund"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -314,7 +314,7 @@ msgstr[0] "za minutu"
 msgstr[1] "za %(count)s minuty"
 msgstr[2] "za %(count)s minut"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo
index 700bfabf8e..2b8a5bee9a 100644
Binary files a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po
index d6d7ce3c66..2b102a079f 100644
--- a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po
@@ -1,49 +1,51 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2011-03-15 15:28+0000\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2011-01-19 15:13+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr ""
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr ""
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -52,7 +54,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -61,7 +63,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -70,7 +72,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -79,7 +81,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -88,7 +90,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -97,7 +99,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -106,7 +108,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -115,7 +117,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -124,7 +126,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -133,7 +135,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -142,7 +144,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -151,7 +153,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -160,7 +162,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -169,7 +171,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -178,7 +180,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -187,7 +189,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -196,7 +198,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -205,7 +207,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -214,7 +216,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -223,7 +225,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -232,7 +234,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -241,53 +243,53 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -296,7 +298,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -305,7 +307,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -314,13 +316,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -329,7 +331,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -338,7 +340,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo
index bdd56dc46b..99bd1b4a93 100644
Binary files a/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/da/LC_MESSAGES/django.po b/django/contrib/humanize/locale/da/LC_MESSAGES/django.po
index 678f596d16..a2f723b6c7 100644
--- a/django/contrib/humanize/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/da/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Christian Joergensen <christian@gmta.info>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "i dag"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "i går"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "i morgen"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f millioner"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s million"
 msgstr[1] "%(value)s millioner"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milliard"
 msgstr[1] "%(value).1f milliarder"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s milliard"
 msgstr[1] "%(value)s milliarder"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billioner"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s billion"
 msgstr[1] "%(value)s billioner"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f billiard"
 msgstr[1] "%(value).1f billiarder"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s billiard"
 msgstr[1] "%(value)s billiarder"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f trillion"
 msgstr[1] "%(value).1f trillioner"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s trillion"
 msgstr[1] "%(value)s trillioner"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f trilliard"
 msgstr[1] "%(value).1f trilliarder"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s trilliard"
 msgstr[1] "%(value)s trilliarder"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f kvadrillion"
 msgstr[1] "%(value).1f kvadrillioner"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s kvadrillion"
 msgstr[1] "%(value)s kvadrillioner"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f kvadrilliard"
 msgstr[1] "%(value).1f kvadrilliarder"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s kvadrilliard"
 msgstr[1] "%(value)s kvadrilliarder"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f kvintillion"
 msgstr[1] "%(value).1f kvintillioner"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s kvintillion"
 msgstr[1] "%(value)s kvintillioner"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f kvintilliard"
 msgstr[1] "%(value).1f kvintilliarder"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s kvintilliard"
 msgstr[1] "%(value)s kvintilliarder"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f gogol"
 msgstr[1] "%(value).1f gogoler"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s gogol"
 msgstr[1] "%(value)s gogoler"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "en"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "to"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "fire"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "fem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seks"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "syv"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "otte"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "ni"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s siden"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "nu"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "et sekund siden"
 msgstr[1] "%(count)s sekunder siden"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "et minut siden"
 msgstr[1] "%(count)s minutter siden"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "en time siden"
 msgstr[1] "%(count)s timer siden"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s fra nu af"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "et sekund fra nu af"
 msgstr[1] "%(count)s sekunder fra nu af"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "et minut fra nu af"
 msgstr[1] "%(count)s minutter fra nu af"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo
index 7201a6609a..aefda047a6 100644
Binary files a/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/de/LC_MESSAGES/django.po b/django/contrib/humanize/locale/de/LC_MESSAGES/django.po
index 36fa064334..60f193e5ce 100644
--- a/django/contrib/humanize/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/de/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: André Hagenbruch <ahagenbruch@googlemail.com>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "heute"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "gestern"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "morgen"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f Million"
 msgstr[1] "%(value).1f Millionen"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s Million"
 msgstr[1] "%(value)s Millionen"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f Milliarde"
 msgstr[1] "%(value).1f Milliarden"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s Milliarde"
 msgstr[1] "%(value)s Milliarden"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f Billion"
 msgstr[1] "%(value).1f Billionen"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s Billion"
 msgstr[1] "%(value)s Billionen"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f Billiarde"
 msgstr[1] "%(value).1f Billiarden"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s Billiarde"
 msgstr[1] "%(value)s Billiarden"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f Trillion"
 msgstr[1] "%(value).1f Trillionen"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s Trillion"
 msgstr[1] "%(value)s Trillionen"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f Trilliarde"
 msgstr[1] "%(value).1f Trilliarden"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s Trilliarde"
 msgstr[1] "%(value)s Trilliarden"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f Quadrillion"
 msgstr[1] "%(value).1f Quadrillionen"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s Quadrillion"
 msgstr[1] "%(value)s Quadrillionen"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f Quadrilliarde"
 msgstr[1] "%(value).1f Quadrilliarden"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s Quadrilliarde"
 msgstr[1] "%(value)s Quadrilliarden"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f Quintillion"
 msgstr[1] "%(value).1f Quintillionen"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s Quintillion"
 msgstr[1] "%(value)s Quintillionen"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f Quintilliarde"
 msgstr[1] "%(value).1f Quintilliarden"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s Quintilliarde"
 msgstr[1] "%(value)s Quintilliarden"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f Sedezilliarde"
 msgstr[1] "%(value).1f Sedezilliarden"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s Sedezilliarde"
 msgstr[1] "%(value)s Sedezilliarden"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ein"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "zwei"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "drei"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "vier"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "fünf"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sechs"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sieben"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "acht"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "neun"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "vor %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "jetzt"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "vor einer Sekunde"
 msgstr[1] "vor %(count)s Sekunden"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "vor einer Minute"
 msgstr[1] "vor %(count)s Minuten"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "vor einer Stunde"
 msgstr[1] "vor %(count)s Stunden"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "in %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "in einer Sekunde"
 msgstr[1] "in %(count)s Sekunden"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "in einer Minute"
 msgstr[1] "in %(count)s Minuten"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo
index 6366ded25e..b89497a279 100644
Binary files a/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/el/LC_MESSAGES/django.po b/django/contrib/humanize/locale/el/LC_MESSAGES/django.po
index b3decd8427..ab13aaba40 100644
--- a/django/contrib/humanize/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/el/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-12 19:02+0000\n"
 "Last-Translator: Kostas Papadimitriou <vinilios@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "σήμερα"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "χθες"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "αύριο"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "η"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "η"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "η"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "η"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f εκατομμύριο"
 msgstr[1] "%(value).1f εκατομμύρια"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] " %(value)s  εκατομμύριο"
 msgstr[1] " %(value)s  εκατομμύρια"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f δισεκατομμύριο"
 msgstr[1] "%(value).1f δισεκατομμύρια"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s δισεκατομμύριο"
 msgstr[1] "%(value)s δισεκατομμύρια"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f τρισεκατομμύριο"
 msgstr[1] "%(value).1f τρισεκατομμύρια"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s τρισεκατομμύριο"
 msgstr[1] "%(value)s τρισεκατομμύρια"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f τετράκις εκατομμύριο"
 msgstr[1] "%(value).1f τετράκις εκατομμύρια"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s τετράκις εκατομμύριο"
 msgstr[1] "%(value)s τετράκις εκατομμύρια"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f πεντάκις εκατομμύριo"
 msgstr[1] "%(value).1f πεντάκις εκατομμύρια"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s πεντάκις εκατομμύριo"
 msgstr[1] "%(value)s πεντάκις εκατομμύρια"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f εξάκις εκατομμύριo"
 msgstr[1] "%(value).1f εξάκις εκατομμύρια"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s εξάκις εκατομμύριo"
 msgstr[1] "%(value)s εξάκις εκατομμύρια"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f επτάκις εκατομμύριο"
 msgstr[1] "%(value).1f επτάκις εκατομμύρια"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s επτάκις εκατομμύριο"
 msgstr[1] "%(value)s επτάκις εκατομμύρια"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f οκτάκις εκατομμύριο"
 msgstr[1] "%(value).1f οκτάκις εκατομμύρια"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s οκτάκις εκατομμύριο"
 msgstr[1] "%(value)s οκτάκις εκατομμύρια"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f εννεάκις εκατομμύριο"
 msgstr[1] "%(value).1f εννεάκις εκατομμύρια"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s εννεάκις εκατομμύριο"
 msgstr[1] "%(value)s εννεάκις εκατομμύρια"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f δεκάκις εκατομμύριο"
 msgstr[1] "%(value).1f δεκάκις εκατομμύρια"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s δεκάκις εκατομμύριο"
 msgstr[1] "%(value)s δεκάκις εκατομμύρια"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ένα"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "δύο"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "τρία"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "τέσσερα"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "πέντε"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "έξι"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "εφτά"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "οκτώ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "εννιά"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "πριν από %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "τώρα"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "πριν από ένα δευτερόλεπτο"
 msgstr[1] "πριν από %(count)s δευτερόλεπτα"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "πριν από ένα λεπτό"
 msgstr[1] "πριν από %(count)s λεπτά"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "πριν από μια ώρα"
 msgstr[1] "πριν από %(count)s ώρες"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "σε %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "σε ένα δευτερόλεπτο"
 msgstr[1] "σε %(count)s δευτερόλεπτα"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "σε ένα λεπτό"
 msgstr[1] "σε %(count)s λεπτά"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo
index 149d073523..55110ebd78 100644
Binary files a/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
index 0e46126adb..a4b6138e7f 100644
--- a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
@@ -1,290 +1,293 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:57+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
-#: tests.py:125 templatetags/humanize.py:167
+#: tests.py:131 templatetags/humanize.py:168
 msgid "today"
-msgstr ""
+msgstr "today"
 
-#: tests.py:125 templatetags/humanize.py:171
+#: tests.py:131 templatetags/humanize.py:172
 msgid "yesterday"
-msgstr ""
+msgstr "yesterday"
 
-#: tests.py:125 templatetags/humanize.py:169
+#: tests.py:131 templatetags/humanize.py:170
 msgid "tomorrow"
-msgstr ""
+msgstr "tomorrow"
 
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:26
 msgid "th"
-msgstr ""
+msgstr "th"
 
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:26
 msgid "st"
-msgstr ""
+msgstr "st"
 
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:26
 msgid "nd"
-msgstr ""
+msgstr "nd"
 
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:26
 msgid "rd"
-msgstr ""
-
-#: templatetags/humanize.py:54
-#, python-format
-msgid "%(value).1f million"
-msgid_plural "%(value).1f million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "rd"
 
 #: templatetags/humanize.py:55
 #, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f million"
+msgstr[1] "%(value).1f million"
+
+#: templatetags/humanize.py:56
+#, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:58
-#, python-format
-msgid "%(value).1f billion"
-msgid_plural "%(value).1f billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s million"
 
 #: templatetags/humanize.py:59
 #, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f billion"
+msgstr[1] "%(value).1f billion"
+
+#: templatetags/humanize.py:60
+#, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:62
-#, python-format
-msgid "%(value).1f trillion"
-msgid_plural "%(value).1f trillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billion"
 
 #: templatetags/humanize.py:63
 #, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f trillion"
+msgstr[1] "%(value).1f trillion"
+
+#: templatetags/humanize.py:64
+#, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:66
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s trillion"
+msgstr[1] "%(value)s trillion"
 
 #: templatetags/humanize.py:67
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f quadrillion"
+msgstr[1] "%(value).1f quadrillion"
+
+#: templatetags/humanize.py:68
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:70
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s quadrillion"
+msgstr[1] "%(value)s quadrillion"
 
 #: templatetags/humanize.py:71
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f quintillion"
+msgstr[1] "%(value).1f quintillion"
+
+#: templatetags/humanize.py:72
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:74
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s quintillion"
+msgstr[1] "%(value)s quintillion"
 
 #: templatetags/humanize.py:75
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sextillion"
+msgstr[1] "%(value).1f sextillion"
+
+#: templatetags/humanize.py:76
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:78
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s sextillion"
+msgstr[1] "%(value)s sextillion"
 
 #: templatetags/humanize.py:79
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septillion"
+msgstr[1] "%(value).1f septillion"
+
+#: templatetags/humanize.py:80
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:82
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s septillion"
+msgstr[1] "%(value)s septillion"
 
 #: templatetags/humanize.py:83
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octillion"
+msgstr[1] "%(value).1f octillion"
+
+#: templatetags/humanize.py:84
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:86
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s octillion"
+msgstr[1] "%(value)s octillion"
 
 #: templatetags/humanize.py:87
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonillion"
+msgstr[1] "%(value).1f nonillion"
+
+#: templatetags/humanize.py:88
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:90
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s nonillion"
+msgstr[1] "%(value)s nonillion"
 
 #: templatetags/humanize.py:91
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decillion"
+msgstr[1] "%(value).1f decillion"
+
+#: templatetags/humanize.py:92
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:94
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s decillion"
+msgstr[1] "%(value)s decillion"
 
 #: templatetags/humanize.py:95
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:96
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "one"
-msgstr ""
+msgstr "one"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "two"
-msgstr ""
+msgstr "two"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "three"
-msgstr ""
+msgstr "three"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "four"
-msgstr ""
+msgstr "four"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "five"
-msgstr ""
+msgstr "five"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "six"
-msgstr ""
+msgstr "six"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "seven"
-msgstr ""
+msgstr "seven"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "eight"
-msgstr ""
+msgstr "eight"
 
-#: templatetags/humanize.py:144
+#: templatetags/humanize.py:145
 msgid "nine"
-msgstr ""
+msgstr "nine"
 
-#: templatetags/humanize.py:190
+#: templatetags/humanize.py:191
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "%(delta)s ago"
 
-#: templatetags/humanize.py:193 templatetags/humanize.py:215
+#: templatetags/humanize.py:194 templatetags/humanize.py:216
 msgid "now"
-msgstr ""
+msgstr "now"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:197
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "a second ago"
+msgstr[1] "%(count)s seconds ago"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:202
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "a minute ago"
+msgstr[1] "%(count)s minutes ago"
 
-#: templatetags/humanize.py:206
+#: templatetags/humanize.py:207
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "an hour ago"
+msgstr[1] "%(count)s hours ago"
 
-#: templatetags/humanize.py:212
+#: templatetags/humanize.py:213
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
+msgstr "%(delta)s from now"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:219
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "a second from now"
+msgstr[1] "%(count)s seconds from now"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:224
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "a minute from now"
+msgstr[1] "%(count)s minutes from now"
 
-#: templatetags/humanize.py:228
+#: templatetags/humanize.py:229
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "an hour from now"
+msgstr[1] "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo
index 6be955bd92..409a859dee 100644
Binary files a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po
index 0f64c64475..d542a1c4e5 100644
--- a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: jon_atkinson <jon@jonatkinson.co.uk>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "today"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "yesterday"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "tomorrow"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f million"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s million"
 msgstr[1] "%(value)s million"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billion"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s billion"
 msgstr[1] "%(value)s billion"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trillion"
 msgstr[1] "%(value).1f trillion"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s trillion"
 msgstr[1] "%(value)s trillion"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f quadrillion"
 msgstr[1] "%(value).1f quadrillion"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s quadrillion"
 msgstr[1] "%(value)s quadrillion"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f quintillion"
 msgstr[1] "%(value).1f quintillion"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s quintillion"
 msgstr[1] "%(value)s quintillion"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sextillion"
 msgstr[1] "%(value).1f sextillion"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sextillion"
 msgstr[1] "%(value)s sextillion"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septillion"
 msgstr[1] "%(value).1f septillion"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septillion"
 msgstr[1] "%(value)s septillion"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f octillion"
 msgstr[1] "%(value).1f octillion"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s octillion"
 msgstr[1] "%(value)s octillion"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f nonillion"
 msgstr[1] "%(value).1f nonillion"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s nonillion"
 msgstr[1] "%(value)s nonillion"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f decillion"
 msgstr[1] "%(value).1f decillion"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s decillion"
 msgstr[1] "%(value)s decillion"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "one"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "two"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "three"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "four"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "five"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "six"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "seven"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "eight"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nine"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s ago"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "now"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "a second ago"
 msgstr[1] "%(count)s seconds ago"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "a minute ago"
 msgstr[1] "%(count)s minutes ago"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "an hour ago"
 msgstr[1] "%(count)s hours ago"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s from now"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "a second from now"
 msgstr[1] "%(count)s seconds from now"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "a minute from now"
 msgstr[1] "%(count)s minutes from now"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/eo/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/eo/LC_MESSAGES/django.mo
index 3ec0a0175e..8ae4ba941b 100644
Binary files a/django/contrib/humanize/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/eo/LC_MESSAGES/django.po b/django/contrib/humanize/locale/eo/LC_MESSAGES/django.po
index 65eee24f56..e8d92f7d71 100644
--- a/django/contrib/humanize/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/eo/LC_MESSAGES/django.po
@@ -5,287 +5,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "hodiaŭ"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "morgaŭ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "a"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "a"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "a"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "a"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milionoj"
 msgstr[1] "%(value).1f milionoj"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s milionoj"
 msgstr[1] "%(value)s milionoj"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miliardoj"
 msgstr[1] "%(value).1f miliardoj"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s miliardoj"
 msgstr[1] "%(value)s miliardoj"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f triiliono"
 msgstr[1] "%(value).1f triiliono"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s triilionoj"
 msgstr[1] "%(value)s triilionoj"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f kvariliono"
 msgstr[1] "%(value).1f kvariliono"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s kvarilionoj"
 msgstr[1] "%(value)s kvarilionoj"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f kvinilionoj"
 msgstr[1] "%(value).1f kvinilionoj"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s kvinilionoj"
 msgstr[1] "%(value)s kvinilionoj"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sesilionoj"
 msgstr[1] "%(value).1f sesilionoj"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sesilionoj"
 msgstr[1] "%(value)s sesilionoj"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f sepilionoj"
 msgstr[1] "%(value).1f sepilionoj"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s sepilionoj"
 msgstr[1] "%(value)s sepilionoj"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f okilionoj"
 msgstr[1] "%(value).1f okilionoj"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s okilionoj"
 msgstr[1] "%(value)s okilionoj"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f naŭilionoj"
 msgstr[1] "%(value).1f naŭilionoj"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s naŭilionoj"
 msgstr[1] "%(value)s naŭilionoj"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f dekilionoj"
 msgstr[1] "%(value).1f dekilionoj"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s dekilionoj"
 msgstr[1] "%(value)s dekilionoj"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f guglo"
 msgstr[1] "%(value).1f guglo"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s gugloj"
 msgstr[1] "%(value)s gugloj"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "unu"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "du"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "kvar"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "kvin"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "ses"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sep"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "ok"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "naŭ"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s antaŭe"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "nun"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "unu sekundo antaŭe"
 msgstr[1] "%(count)s sekundoj antaŭe"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "unu minuto antaŭe"
 msgstr[1] "%(count)s minutoj antaŭe"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "unu horo antaŭe"
 msgstr[1] "%(count)s horoj antaŭe"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s ekde nun"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "unu sekundo ekde nun"
 msgstr[1] "%(count)s sekundoj ekde nun"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "unu minuto ekde nun"
 msgstr[1] "%(count)s minutoj ekde nun"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo
index 44b9bba118..efa0393cb3 100644
Binary files a/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/es/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es/LC_MESSAGES/django.po
index 664f0ef355..570e38a40c 100644
--- a/django/contrib/humanize/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/es/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-14 19:27+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "hoy"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ayer"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "mañana"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millón"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s millon"
 msgstr[1] "%(value)s millones"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f millardo"
 msgstr[1] "%(value).1f millardos"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s millardo"
 msgstr[1] "%(value)s millardos"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billón"
 msgstr[1] "%(value).1f billón"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s billón"
 msgstr[1] "%(value)s billones"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f billardo"
 msgstr[1] "%(value).1f billardos"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s billardos"
 msgstr[1] "%(value)s billardos"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f trillón"
 msgstr[1] "%(value).1f trillones"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s trillón"
 msgstr[1] "%(value)s trillones"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f trillardo"
 msgstr[1] "%(value).1f trillardos"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s trillardo"
 msgstr[1] "%(value)s trillardos"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f cuatrillón"
 msgstr[1] "%(value).1f cuatrillones"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s cuatrillón"
 msgstr[1] "%(value)s cuatrillones"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f cuatrillardo"
 msgstr[1] "%(value).1f cuatrillardos"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s cuatrillardo"
 msgstr[1] "%(value)s cuatrillardos"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f quintillón"
 msgstr[1] "%(value).1f quintillones"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s quintillón"
 msgstr[1] "%(value)s quintillones"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f quintillardo"
 msgstr[1] "%(value).1f quintillardos"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s quintillardo"
 msgstr[1] "%(value)s quintillardos"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] " %(value)s  googol"
 msgstr[1] " %(value)s  googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "uno"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dos"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "cuatro"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "siete"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "ocho"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nueve"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "hace %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "ahora"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "hace un segundo"
 msgstr[1] "hace %(count)s segundos"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "hace un minuto"
 msgstr[1] "hace %(count)s minutos "
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "hace una hora"
 msgstr[1] "hace %(count)s horas"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s a partir de ahora"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "un segundo a partir de ahora"
 msgstr[1] "%(count)s segundos a partir de ahora"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "un minuto a partir de ahora"
 msgstr[1] " %(count)s minutos a partir de ahora"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo
index 316edb7fb6..24ec06e985 100644
Binary files a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po
index 8e5f5e873c..8ae200f703 100644
--- a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-22 11:22+0000\n"
 "Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "hoy"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ayer"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "mañana"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "to"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ro"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "do"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ro"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millones"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s millón"
 msgstr[1] "%(value)s millones"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f millardo"
 msgstr[1] "%(value).1f millardos"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s millardo"
 msgstr[1] "%(value)s millardos"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billón"
 msgstr[1] "%(value).1f billones"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s billón"
 msgstr[1] "%(value)s billones"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f mil billones"
 msgstr[1] "%(value).1f miles de billones"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s mil billones"
 msgstr[1] "%(value)s miles de billones"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f trillón"
 msgstr[1] "%(value).1f trilliones"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s trillón"
 msgstr[1] "%(value)s trilliones"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f mil trillones"
 msgstr[1] "%(value).1f miles de trillones"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s mil trillones"
 msgstr[1] "%(value)s miles de trillones"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f cuatrillón"
 msgstr[1] "%(value).1f cuatrillones"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s cuatrillón"
 msgstr[1] "%(value)s cuatrillones"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f mil cuatrillones"
 msgstr[1] "%(value).1f miles de cuatrillones"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s mil cuatrillones"
 msgstr[1] "%(value)s miles de cuatrillones"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f quintillón"
 msgstr[1] "%(value).1f quintillones"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s quintillón"
 msgstr[1] "%(value)s quintillones"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f mil quintillones"
 msgstr[1] "%(value).1f miles de quintillones"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s mil quintillones"
 msgstr[1] "%(value)s miles de quintillones"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f \"gúgol\""
 msgstr[1] "%(value).1f \"gúgols\""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s \"gúgol\""
 msgstr[1] "%(value)s \"gúgols\""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "uno"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dos"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "cuatro"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "siete"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "ocho"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nueve"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "hace %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "ahora"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "hace un segundo"
 msgstr[1] "hace %(count)s segundos"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "hace un minuto"
 msgstr[1] "hace %(count)s minutos"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "hace una hora"
 msgstr[1] "hace %(count)s horas"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "dentro de %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "dentro de un segundo"
 msgstr[1] "dentro de %(count)s segundos"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "dentro de un minuto"
 msgstr[1] "dentro de %(count)s minutos"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo
index 2f5e1b4e70..4a3719b5d0 100644
Binary files a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po
index 62dfb0571b..da4e1b803b 100644
--- a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po
@@ -6,287 +6,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-06 20:32+0000\n"
 "Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "hoy"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ayer"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "mañana"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "to"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ro"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "do"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ro"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millones"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s millones"
 msgstr[1] "%(value)s millones"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f billón"
 msgstr[1] "%(value).1f billones"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s billiones"
 msgstr[1] "%(value)s billiones"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trillón"
 msgstr[1] "%(value).1f trillones"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s trilliones"
 msgstr[1] "%(value)s trilliones"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f cuatrillón"
 msgstr[1] "%(value).1f cuatrillones"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s cuatrillón"
 msgstr[1] "%(value)s cuatrillones"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f quintillón"
 msgstr[1] "%(value).1f quintillones"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s quintillón"
 msgstr[1] "%(value)s quintillones"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sextillón"
 msgstr[1] "%(value).1f sextillones"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sextillón"
 msgstr[1] "%(value)s sextillones"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septillón"
 msgstr[1] "%(value).1f septillones"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septillón"
 msgstr[1] "%(value)s septillones"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f octillón"
 msgstr[1] "%(value).1f octillones"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s octillón"
 msgstr[1] "%(value)s octillones"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f nonillion"
 msgstr[1] "%(value).1f nonillion"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s nonillón"
 msgstr[1] "%(value)s nonillones"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f decillón"
 msgstr[1] "%(value).1f decillones"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s decillón"
 msgstr[1] "%(value)s decillones"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googoles"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googoles"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "uno"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dos"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "cuatro"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "siete"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "ocho"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nueve"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "hace %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "ahora"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "hace un segundo"
 msgstr[1] "hace %(count)s segundos"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "Hace un minuto"
-msgstr[1] "Hace %(count)s minutos"
+msgstr[1] "Hace %s minutos"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "Hace una hora"
-msgstr[1] "Hace %(count)s horas"
+msgstr[1] "Hace %s horas"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s a partir de ahora"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "un segundo a partir de ahora"
 msgstr[1] "%(count)s segundos a partir de ahora"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "un minuto a partir de ahora"
 msgstr[1] "%(count)s minutos a partir de ahora"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo
index f8b501a4cc..a4bee483bb 100644
Binary files a/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/et/LC_MESSAGES/django.po b/django/contrib/humanize/locale/et/LC_MESSAGES/django.po
index 8dc558e273..bc4c81c2a0 100644
--- a/django/contrib/humanize/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/et/LC_MESSAGES/django.po
@@ -6,287 +6,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "täna"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "eile"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "homme"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f miljon"
 msgstr[1] "%(value).11f miljonit"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miljard"
 msgstr[1] "%(value).1f miljardit"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f triljon"
 msgstr[1] "%(value).1f triljonit"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "üks"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "kaks"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "kolm"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "neli"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "viis"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "kuus"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "seitse"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "kaheksa"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "üheksa"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo
index 09f6ddc045..0b29589578 100644
Binary files a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po
index 73bacc3520..fcb8d287ec 100644
--- a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-09 10:28+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "gaur"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "atzo"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "bihar"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "garren"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "garren"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "garren"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "miloi %(value).1f "
 msgstr[1] "%(value).1f miloi"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "milioi %(value)s"
 msgstr[1] "%(value)s milioi"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "biloi %(value).1f "
 msgstr[1] "%(value).1f biloi"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "bilioi %(value)s"
 msgstr[1] "%(value)s bilioi"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "triloi %(value).1f "
 msgstr[1] "%(value).1f triloi"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "trilioi %(value)s"
 msgstr[1] "%(value)s trilioi"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "kuatrilioi %(value).1f "
 msgstr[1] "%(value).1f kuatrilioi"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "kuatrilioi %(value)s"
 msgstr[1] "%(value)s kuatrilioi"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "kintilioi %(value).1f"
 msgstr[1] "%(value).1f kintilioi"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "kintilioi %(value)s"
 msgstr[1] "%(value)s kintilioi"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "sextilioi %(value).1f"
 msgstr[1] "%(value).1f sextilioi"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "sextilioi %(value)s"
 msgstr[1] "%(value)s sextilioi"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "septilioi %(value).1f"
 msgstr[1] "%(value).1f septilioi"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "septilioi %(value)s"
 msgstr[1] "%(value)s septilioi"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "octilioi %(value).1f"
 msgstr[1] "%(value).1f octilioi"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "octillioi %(value)s"
 msgstr[1] " %(value)s  octilioi"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "nonilioi %(value).1f "
 msgstr[1] "%(value).1f nonilioi"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "nonilioi %(value)s"
 msgstr[1] "%(value)s nonilioi"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "dezilioi %(value).1f"
 msgstr[1] "%(value).1f deziioi"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "dezilioi %(value)s "
 msgstr[1] "%(value)s dezilioi"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "gugol %(value).1f"
 msgstr[1] "%(value).1f gugol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "gugol %(value)s"
 msgstr[1] "%(value)s gugol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "bat"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "bi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "hiru"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "lau"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "bost"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sei"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "zazpi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "zortzi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "bederatzi"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "duela %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "orain"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "duela segundu bat"
 msgstr[1] "duela %(count)s segundu"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "duela minutu  bat"
 msgstr[1] "duela %(count)s minutu "
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "duela ordubete"
 msgstr[1] "duela %(count)s ordu"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s barru"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "segundu bat barru"
 msgstr[1] "%(count)s segundu barru"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "minutu bat barru"
 msgstr[1] "%(count)s minutu barru"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo
index b32fb72433..9447626a1d 100644
Binary files a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po
index 83783fbe9e..5ae6f04db7 100644
--- a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po
@@ -1,266 +1,270 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Ali Nikneshan <ali@nikneshan.com>, 2012.
+# Alireza Savand <alireza.savand@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-11 08:49+0000\n"
+"Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "امروز"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "دیروز"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "فردا"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "اُم"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "اُم"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "اُم"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "اُم"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f میلیون"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
+msgstr[0] "%(value)s میلیون"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f بیلیون"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
+msgstr[0] "%(value)s میلیارد"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f تریلون"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
+msgstr[0] "%(value)s تریلیون"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f کوادریلیون"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
+msgstr[0] "%(value)s کوادریلیون"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f  کوانتینیوم"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
+msgstr[0] "%(value)s کوانتینیوم"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f  با 21 صفر"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
+msgstr[0] "%(value)s با 21 صفر"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f سپتیلیون"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
+msgstr[0] "%(value)s سپتیلیون"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octillion"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
+msgstr[0] "%(value)s octillion"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] " %(value).1f با 54 صفر"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
+msgstr[0] "%(value)s با 54 صفر"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f با شصت صفر"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
+msgstr[0] "%(value)s با شصت صفر"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
+msgstr[0] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "یک"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "دو"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "سه"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "چهار"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "پنج"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "شش"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "هفت"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "هشت"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "نُه"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "%(delta)s قبل"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
+msgstr "اکنون"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
+msgstr[0] "%(count)s ثانیه پیش"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
+"%(count)s دقیقه پیش\n"
+" "
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
+msgstr[0] "%(count)s ساعت پیش"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
+msgstr "%(delta)s از الان"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "%(count)s ثانیه بعد"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "%(count)s دقیقه بعد"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
+msgstr[0] "%(count)s ساعت بعد"
diff --git a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo
index 9d23269787..6ee7a4eba9 100644
Binary files a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po
index 1c46e15c95..7931d4c75e 100644
--- a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:40+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "tänään"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "eilen"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "huomenna"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f miljoona"
 msgstr[1] "%(value).1f miljoonaa"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s miljoona"
 msgstr[1] "%(value)s miljoonaa"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miljardi"
 msgstr[1] "%(value).1f miljardia"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s miljardi"
 msgstr[1] "%(value)s miljardia"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f biljoona"
 msgstr[1] "%(value).1f biljoonaa"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s biljoona"
 msgstr[1] "%(value)s biljoonaa"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "yksi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "kaksi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "kolme"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "neljä"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "viisi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "kuusi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "seitsemän"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "kahdeksan"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "yhdeksän"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s sitten"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "nyt"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "sekunti sitten"
 msgstr[1] "%(count)s sekuntia sitten"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "minuutti sitten"
 msgstr[1] "%(count)s minuuttia sitten"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "tunti sitten"
 msgstr[1] "%(count)s tuntia sitten"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s tästä hetkestä"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "sekunnin kuluttua"
 msgstr[1] "%(count)s sekunnin kuluttua"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "minuutin kuluttua"
 msgstr[1] "%(count)s minuutin kuluttua"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo
index 8afabad021..e85cc4a17d 100644
Binary files a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po
index b5eec6bc38..6c9edbf335 100644
--- a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "aujourd'hui"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "hier"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "demain"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "<sup>e</sup>"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "<sup>er</sup>"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "<sup>e</sup>"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "<sup>e</sup>"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f millions"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s million"
 msgstr[1] "%(value)s millions"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milliard"
 msgstr[1] "%(value).1f milliards"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s milliard"
 msgstr[1] "%(value)s milliards"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billions"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s billion"
 msgstr[1] "%(value)s billions"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f quadrillion"
 msgstr[1] "%(value).1f quadrillions"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s quadrillion"
 msgstr[1] "%(value)s quadrillions"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f quintillion"
 msgstr[1] "%(value).1f quintillions"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s quintillion"
 msgstr[1] "%(value)s quintillions"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sextillion"
 msgstr[1] "%(value).1f sextillions"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sextillion"
 msgstr[1] "%(value)s sextillion"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septillion"
 msgstr[1] "%(value).1f septillions"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septillion"
 msgstr[1] "%(value)s septillions"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f octillion"
 msgstr[1] "%(value).1f octillions"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s octillion"
 msgstr[1] "%(value)s octillions"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f nonillion"
 msgstr[1] "%(value).1f nonillions"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s nonillion"
 msgstr[1] "%(value)s nonillions"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f décillion"
 msgstr[1] "%(value).1f décillions"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s décillion"
 msgstr[1] "%(value)s décillions"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f gogol"
 msgstr[1] "%(value).1f gogols"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s gogol"
 msgstr[1] "%(value)s gogols"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "un"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "deux"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "trois"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "quatre"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinq"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "six"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sept"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "huit"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "neuf"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "il y a %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "maintenant"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "il y a une seconde"
 msgstr[1] "il y a %(count)s secondes"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "il y a une minute"
 msgstr[1] "il y a %(count)s minutes"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "il y a une heure"
 msgstr[1] "il y a %(count)s heures"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "dans %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "dans une seconde"
 msgstr[1] "dans %(count)s secondes"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "dans une minute"
 msgstr[1] "dans %(count)s minutes"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo
index e77ce15076..87c8d34d6e 100644
Binary files a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po
index 1650407de3..3ad6f2a866 100644
--- a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po
@@ -7,47 +7,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-16 13:31+0000\n"
 "Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "inniu"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "inné"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "amárach"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "ú"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ú"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "ú"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ú"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -57,7 +57,7 @@ msgstr[2] "%(value).1f milliún"
 msgstr[3] "%(value).1f milliún"
 msgstr[4] "%(value).1f milliún"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -67,7 +67,7 @@ msgstr[2] " %(value)s  milliún"
 msgstr[3] " %(value)s  milliún"
 msgstr[4] " %(value)s  milliún"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -77,7 +77,7 @@ msgstr[2] "%(value).1f billiún"
 msgstr[3] "%(value).1f billiún"
 msgstr[4] "%(value).1f billiún"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -87,7 +87,7 @@ msgstr[2] " %(value)s  billiún"
 msgstr[3] " %(value)s  billiún"
 msgstr[4] " %(value)s  billiún"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -97,7 +97,7 @@ msgstr[2] "%(value).1f trilliún"
 msgstr[3] "%(value).1f trilliún"
 msgstr[4] "%(value).1f trilliún"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -107,7 +107,7 @@ msgstr[2] " %(value)s  trilliún"
 msgstr[3] " %(value)s  trilliún"
 msgstr[4] " %(value)s  trilliún"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -117,7 +117,7 @@ msgstr[2] "%(value).1f quadrilliún"
 msgstr[3] "%(value).1f quadrilliún"
 msgstr[4] "%(value).1f quadrilliún"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -127,7 +127,7 @@ msgstr[2] "%(value)s quadrilliún"
 msgstr[3] "%(value)s quadrilliún"
 msgstr[4] "%(value)s quadrilliún"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -137,7 +137,7 @@ msgstr[2] "%(value).1f quintillion"
 msgstr[3] "%(value).1f quintillion"
 msgstr[4] "%(value).1f quintillion"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -147,7 +147,7 @@ msgstr[2] "%(value)s quintillion"
 msgstr[3] "%(value)s quintillion"
 msgstr[4] "%(value)s quintillion"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -157,7 +157,7 @@ msgstr[2] "%(value).1f sextillion"
 msgstr[3] "%(value).1f sextillion"
 msgstr[4] "%(value).1f sextillion"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -167,7 +167,7 @@ msgstr[2] "%(value)s sextillion"
 msgstr[3] "%(value)s sextillion"
 msgstr[4] "%(value)s sextillion"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -177,7 +177,7 @@ msgstr[2] "%(value).1f septillion"
 msgstr[3] "%(value).1f septillion"
 msgstr[4] "%(value).1f septillion"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -187,7 +187,7 @@ msgstr[2] "%(value)s septillion"
 msgstr[3] "%(value)s septillion"
 msgstr[4] "%(value)s septillion"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -197,7 +197,7 @@ msgstr[2] "%(value).1f octillion"
 msgstr[3] "%(value).1f octillion"
 msgstr[4] "%(value).1f octillion"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -207,7 +207,7 @@ msgstr[2] "%(value)s octillion"
 msgstr[3] "%(value)s octillion"
 msgstr[4] "%(value)s octillion"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -217,7 +217,7 @@ msgstr[2] "%(value).1f nonillion"
 msgstr[3] "%(value).1f nonillion"
 msgstr[4] "%(value).1f nonillion"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -227,7 +227,7 @@ msgstr[2] "%(value)s nonillion"
 msgstr[3] "%(value)s nonillion"
 msgstr[4] "%(value)s nonillion"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -237,7 +237,7 @@ msgstr[2] "%(value).1f decillion"
 msgstr[3] "%(value).1f decillion"
 msgstr[4] "%(value).1f decillion"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -247,7 +247,7 @@ msgstr[2] "%(value)s decillion"
 msgstr[3] "%(value)s decillion"
 msgstr[4] "%(value)s decillion"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -257,7 +257,7 @@ msgstr[2] "%(value).1f googol"
 msgstr[3] "%(value).1f googol"
 msgstr[4] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -267,53 +267,53 @@ msgstr[2] "%(value)s googol"
 msgstr[3] "%(value)s googol"
 msgstr[4] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "aon"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dó"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "trí"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "ceathair"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cúig"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sé"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "seacht"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "ocht"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "naoi"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s ó shin"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "anois"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -323,7 +323,7 @@ msgstr[2] "%(count)s soicind ó shin"
 msgstr[3] "%(count)s soicind ó shin"
 msgstr[4] "%(count)s soicind ó shin"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -333,7 +333,7 @@ msgstr[2] "%(count)s nóiméad ó shin"
 msgstr[3] "%(count)s nóiméad ó shin"
 msgstr[4] "%(count)s nóiméad ó shin"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -343,13 +343,13 @@ msgstr[2] "%(count)s uair a chloig ó shin"
 msgstr[3] "%(count)s uair a chloig ó shin"
 msgstr[4] "%(count)s uair a chloig ó shin"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr " %(delta)s as seo amach"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -359,7 +359,7 @@ msgstr[2] "%(count)s soicind as seo amach"
 msgstr[3] "%(count)s soicind as seo amach"
 msgstr[4] "%(count)s soicind as seo amach"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -369,7 +369,7 @@ msgstr[2] "%(count)s nóiméad as seo amach"
 msgstr[3] "%(count)s nóiméad as seo amach"
 msgstr[4] "%(count)s nóiméad as seo amach"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo
index 465a5caf1e..3fb145185b 100644
Binary files a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po
index 0cf9b46ee4..5a7aa14824 100644
--- a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po
@@ -2,295 +2,296 @@
 #
 # Translators:
 # fasouto <fsoutomoure@gmail.com>, 2011.
+#   <fonzzo@gmail.com>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2013-01-07 11:58+0000\n"
+"Last-Translator: fonso <fonzzo@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "hoxe"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "onte"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "mañá"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millóns"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s millón"
 msgstr[1] "%(value)s millóns"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f mil millóns"
 msgstr[1] "%(value).1f miles de millóns"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s mil millóns"
+msgstr[1] "%(value)s mil millóns"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billón"
 msgstr[1] "%(value).1f billóns"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s billón"
+msgstr[1] "%(value)s billóns"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f trillóns"
+msgstr[1] "%(value).1f trillóns"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s trillón"
+msgstr[1] "%(value)s trillóns"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f cuadrillóns"
+msgstr[1] "%(value).1f cuadrillóns"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s cuadrillón"
+msgstr[1] "%(value)s cuadrillóns"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f quintillóns"
+msgstr[1] "%(value).1f quintillóns"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s quintillón"
+msgstr[1] "%(value)s quintillóns"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f sextillóns"
+msgstr[1] "%(value).1f sextillóns"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s sextillón"
+msgstr[1] "%(value)s sextillóns"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f septillóns"
+msgstr[1] "%(value).1f septillóns"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s septillón"
+msgstr[1] "%(value)s septillóns"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f octillóns"
+msgstr[1] "%(value).1f octillóns"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s octillón"
+msgstr[1] "%(value)s octillóns"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f nonillóns"
+msgstr[1] "%(value).1f nonillóns"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s nonillón"
+msgstr[1] "%(value)s nonillóns"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f gúgols"
+msgstr[1] "%(value).1f gúgols"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s gúgol"
+msgstr[1] "%(value)s gúgols"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "un"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dous"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "catro"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sete"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "oito"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nove"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "hai %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
+msgstr "agora"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "hai un segundo"
 msgstr[1] "hai %(count)s segundos"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "hai un minuto"
 msgstr[1] "hai %(count)s minutos"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "hai unha hora"
 msgstr[1] "hai %(count)s horas"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "dentro de %(delta)s"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "dentro dun segundo"
+msgstr[1] "dentro de %(count)s segundos"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "dentro dun minuto"
+msgstr[1] "dentro de %(count)s minutos"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "dentro dunha hora"
+msgstr[1] "dentro de %(count)s horas"
diff --git a/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo
index edb6565fa1..fd3e56c39b 100644
Binary files a/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/he/LC_MESSAGES/django.po b/django/contrib/humanize/locale/he/LC_MESSAGES/django.po
index eed5fa8eb0..c7a24a83b2 100644
--- a/django/contrib/humanize/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/he/LC_MESSAGES/django.po
@@ -3,291 +3,292 @@
 # Translators:
 # Alex Gaynor <alex.gaynor@gmail.com>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Alex Gaynor <alex.gaynor@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-10-21 11:11+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "היום"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "אתמול"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "מחר"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "רביעי"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ראשון"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "שני"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "שלישי"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f מיליון"
 msgstr[1] "%(value).1f מיליונים"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s מיליון"
 msgstr[1] "%(value)s מיליון"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f מיליארד"
 msgstr[1] "%(value).1f מיליארדים"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s מיליארד"
 msgstr[1] "%(value)s מיליארד"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f טריליון"
 msgstr[1] "%(value).1f טריליונים"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s טריליון"
 msgstr[1] "%(value)s טריליון"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f קוודריליון"
+msgstr[1] "%(value).1f קוודריליון"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s קוודריליון"
+msgstr[1] "%(value)s קוודריליון"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f קווינטיליון"
+msgstr[1] "%(value).1f קווינטיליון"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s קווינטיליון"
+msgstr[1] "%(value)s קווינטיליון"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f סקסטיליון"
+msgstr[1] "%(value).1f סקסטיליון"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s סקסטיליון"
+msgstr[1] "%(value)s סקסטיליון"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f ספטיליון"
+msgstr[1] "%(value).1f ספטיליון"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s ספטיליון"
+msgstr[1] "%(value)s ספטיליון"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f אוקטיליון"
+msgstr[1] "%(value).1f אוקטיליון"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s אוקטיליון"
+msgstr[1] "%(value)s אוקטיליון"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f נוניליון"
+msgstr[1] "%(value).1f נוניליון"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s נוניליון"
+msgstr[1] "%(value)s נוניליון"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f דציליון"
+msgstr[1] "%(value).1f דציליון"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s דציליון"
+msgstr[1] "%(value)s דציליון"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f גוגול"
+msgstr[1] "%(value).1f גוגול"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s גוגול"
+msgstr[1] "%(value)s גוגול"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "אחד"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "שניים"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "שלושה"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "ארבעה"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "חמישה"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "שישה"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "שבעה"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "שמונה"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "תשעה"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "לפני %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "עכשיו"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "לפני שנייה"
 msgstr[1] "לפני %(count)s שניות"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "לפני דקה"
 msgstr[1] "לפני %(count)s דקות"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "לפני שעה"
 msgstr[1] "לפני %(count)s שעות"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "בעוד %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "בעוד שנייה"
 msgstr[1] "בעוד %(count)s שניות"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "בעוד דקה"
 msgstr[1] "בעוד %(count)s דקות"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo
index 5e894c5d53..cc613b4ba1 100644
Binary files a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po
index f3e4632c58..88563ae2e2 100644
--- a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-04 08:26+0000\n"
 "Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "आज"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "कल (बीता)"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "कल"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "वाँ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ला"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "रा"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "रा"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f मिलियन"
 msgstr[1] "%(value).1f मिलियन"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s मिलियन"
 msgstr[1] "%(value)s मिलियन"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f बिलियन"
 msgstr[1] "%(value).1f बिलियन"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s बिलियन"
 msgstr[1] "%(value)s बिलियन"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f खरब"
 msgstr[1] "%(value).1f खरब"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s खरब"
 msgstr[1] "%(value)s खरब"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f करोड़ शंख"
 msgstr[1] "%(value).1f करोड़ शंख"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s करोड़ शंख"
 msgstr[1] "%(value)s करोड़ शंख"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f कुइनतिलिअन "
 msgstr[1] "%(value).1f कुइनतिलिअन "
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s कुइनतिलिअन "
 msgstr[1] "%(value)s कुइनतिलिअन "
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f सेक्सतिलियन"
 msgstr[1] "%(value).1f सेक्सतिलियन"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s सेक्सतिलियन"
 msgstr[1] "%(value)s सेक्सतिलियन"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f सेपतिलियन "
 msgstr[1] "%(value).1f सेपतिलियन "
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s सेपतिलियन "
 msgstr[1] "%(value)s सेपतिलियन "
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f ओकतिलियन "
 msgstr[1] "%(value).1f ओकतिलियन "
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s ओकतिलियन "
 msgstr[1] "%(value)s ओकतिलियन "
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f नोनिलियन"
 msgstr[1] "%(value).1f नोनिलियन"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s नोनिलियन"
 msgstr[1] "%(value)s नोनिलियन"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f देसीलियन"
 msgstr[1] "%(value).1f देसीलियन"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s देसीलियन"
 msgstr[1] "%(value)s देसीलियन"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f गोगोल"
 msgstr[1] "%(value).1f गोगोल"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s गोगोल"
 msgstr[1] "%(value)s गोगोल"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "एक"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "दो"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "तीन"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "चार"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "पाँच"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "छह"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "सात"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "आठ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "नौ"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s पहले"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "अभी"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "एक सेकेंड पहले"
 msgstr[1] "%(count)s सेकेंड पहले"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] " एक मिनट पहले"
 msgstr[1] "%(count)s मिनट पहले"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "एक घंटा पहले"
 msgstr[1] "%(count)s घंटे पहले"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s अब से"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "अब से एक सेकेंड"
 msgstr[1] "अब से %(count)s सेकेंड"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "अब से एक मिनट"
 msgstr[1] "अब से %(count)s मिनट"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo
index f3a791cbcc..25d9a90219 100644
Binary files a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po
index 2dbed4b754..2b961d7fbd 100644
--- a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po
@@ -1,52 +1,54 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <aljosa.mohorovic@gmail.com>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <senko.rasic@dobarkod.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-04-16 10:48+0000\n"
+"Last-Translator: aljosa <aljosa.mohorovic@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "danas"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "jučer"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "sutra"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -54,15 +56,15 @@ msgstr[0] "%(value).1f milijun"
 msgstr[1] "%(value).1f milijuna"
 msgstr[2] "%(value).1f milijuna"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s milijun"
+msgstr[1] "%(value)s milijuna"
+msgstr[2] "%(value)s milijun"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -70,15 +72,15 @@ msgstr[0] "%(value).1f milijarda"
 msgstr[1] "%(value).1f milijarde"
 msgstr[2] "%(value).1f milijarde"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s milijarda"
+msgstr[1] "%(value)s milijarde"
+msgstr[2] "%(value)s milijardi"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -86,238 +88,238 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliona"
 msgstr[2] "%(value).1f bilion"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s bilijun"
+msgstr[1] "%(value)s bilijuna"
+msgstr[2] "%(value)s bilijuna"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f kvadrilijun"
+msgstr[1] "%(value).1f kvadrilijuna"
+msgstr[2] "%(value).1f kvadrilijuna"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s kvadrilijun"
+msgstr[1] "%(value)s kvadrilijuna"
+msgstr[2] "%(value)s kvadrilijuna"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kvintilijun"
+msgstr[1] "%(value).1f kvintilijuna"
+msgstr[2] "%(value).1f kvintilijuna"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s kvintilijun"
+msgstr[1] "%(value)s kvintilijuna"
+msgstr[2] "%(value)s kvintilijuna"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sekstilijun"
+msgstr[1] "%(value).1f sekstilijuna"
+msgstr[2] "%(value).1f sekstilijuna"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s sekstilijun"
+msgstr[1] "%(value)s sekstilijuna"
+msgstr[2] "%(value)s sekstilijuna"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilijun"
+msgstr[1] "%(value).1f septilijuna"
+msgstr[2] "%(value).1f septilijuna"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s septilijun"
+msgstr[1] "%(value)s septilijuna"
+msgstr[2] "%(value)s septilijuna"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktilijun"
+msgstr[1] "%(value).1f oktilijuna"
+msgstr[2] "%(value).1f oktilijuna"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s oktilijun"
+msgstr[1] "%(value)s oktilijuna"
+msgstr[2] "%(value)s oktilijuna"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonillion"
+msgstr[1] "%(value).1f nonillion"
+msgstr[2] "%(value).1f nonillion"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s nonillion"
+msgstr[1] "%(value)s nonillion"
+msgstr[2] "%(value)s nonillion"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decillion"
+msgstr[1] "%(value).1f decillion"
+msgstr[2] "%(value).1f decillion"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s decillion"
+msgstr[1] "%(value)s decillion"
+msgstr[2] "%(value)s decillion"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+msgstr[2] "%(value).1f googol"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
+msgstr[2] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "jedan"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "četiri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "pet"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sedam"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "osam"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "devet"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "prije %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
-
-#: templatetags/humanize.py:191
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr "sada"
 
 #: templatetags/humanize.py:196
 #, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "prije sekundu"
+msgstr[1] "prije %(count)s sekunde"
+msgstr[2] "prije %(count)s sekundi"
 
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "prije minutu"
+msgstr[1] "prije %(count)s minute"
+msgstr[2] "prije %(count)s minuta"
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "prije sat vremena"
+msgstr[1] "prije %(count)s sata"
+msgstr[2] "prije %(count)s sati"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr "%(delta)s od sad"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "sekunda od sad"
+msgstr[1] "%(count)s sekunde od sad"
+msgstr[2] "%(count)s sekundi od sad"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "za minutu"
+msgstr[1] "za %(count)s minuta"
+msgstr[2] "za %(count)s minuta"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "za sat vremena"
+msgstr[1] "za %(count)s sata/sati"
+msgstr[2] "za %(count)s sata/sati"
diff --git a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo
index a5895e6aa8..120573971a 100644
Binary files a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po
index d410993436..dd3a33838e 100644
--- a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-19 20:34+0000\n"
 "Last-Translator: istvanf <istvan.farkas@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "ma"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "tegnap"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "holnap"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value)1f millió"
 msgstr[1] "%(value)1f millió"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s millió"
 msgstr[1] "%(value)s millió"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value)1f milliárd"
 msgstr[1] "%(value)1f milliárd"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] " %(value)s milliárd"
 msgstr[1] " %(value)s milliárd"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value)1f trilliárd"
 msgstr[1] "%(value)1f trilliárd"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s billió"
 msgstr[1] "%(value)s billió"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f billiárd"
 msgstr[1] "%(value).1f billiárd"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s billiárd"
 msgstr[1] "%(value)s billiárd"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f trillió"
 msgstr[1] "%(value).1f trillió"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s trillió"
 msgstr[1] "%(value)s trillió"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f trilliárd"
 msgstr[1] "%(value).1f trilliárd"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s trilliárd"
 msgstr[1] "%(value)s trilliárd"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f kvadrillió"
 msgstr[1] "%(value).1f kvadrillió"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s kvadrillió"
 msgstr[1] "%(value)s kvadrillió"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f kvadrilliárd"
 msgstr[1] "%(value).1f kvadrilliárd"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s kvadrilliárd"
 msgstr[1] "%(value)s kvadrilliárd"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f kvintillió"
 msgstr[1] "%(value).1f kvintillió"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s kvintillió"
 msgstr[1] "%(value)s kvintillió"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f kvintilliárd"
 msgstr[1] "%(value).1f kvintilliárd"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s kvintilliárd"
 msgstr[1] "%(value)s kvintilliárd"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "egy"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "kettő"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "három"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "négy"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "öt"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "hat"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "hét"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "nyolc"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "kilenc"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr " %(delta)s ezelőtt"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "most"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "egy másodperccel ezelőtt"
 msgstr[1] "%(count)s másodperccel ezelőtt"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "egy perccel ezelőtt"
 msgstr[1] "%(count)s perccel ezelőtt"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "egy órával ezelőtt"
 msgstr[1] "%(count)s órával ezelőtt"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s mostantól"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "egy másodperccel ezután"
 msgstr[1] "%(count)s másodperccel ezután"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "egy perccel ezután"
 msgstr[1] "%(count)s perccel ezután"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..7a0c99d660
Binary files /dev/null and b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..7cffdb298e
--- /dev/null
+++ b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,294 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-05-03 20:48+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: tests.py:125 templatetags/humanize.py:167
+msgid "today"
+msgstr "hodie"
+
+#: tests.py:125 templatetags/humanize.py:171
+msgid "yesterday"
+msgstr "heri"
+
+#: tests.py:125 templatetags/humanize.py:169
+msgid "tomorrow"
+msgstr "deman"
+
+#: templatetags/humanize.py:25
+msgid "th"
+msgstr "e"
+
+#: templatetags/humanize.py:25
+msgid "st"
+msgstr "me"
+
+#: templatetags/humanize.py:25
+msgid "nd"
+msgstr "nde"
+
+#: templatetags/humanize.py:25
+msgid "rd"
+msgstr "tie"
+
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f million"
+msgstr[1] "%(value).1f milliones"
+
+#: templatetags/humanize.py:55
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s milliones"
+
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f milliardo"
+msgstr[1] "%(value).1f milliardos"
+
+#: templatetags/humanize.py:59
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s milliardo"
+msgstr[1] "%(value)s milliardos"
+
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f billion"
+msgstr[1] "%(value).1f billiones"
+
+#: templatetags/humanize.py:63
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billiones"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f billiardo"
+msgstr[1] "%(value).1f billiardos"
+
+#: templatetags/humanize.py:67
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s billiardo"
+msgstr[1] "%(value)s billiardos"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f trillion"
+msgstr[1] "%(value).1f trilliones"
+
+#: templatetags/humanize.py:71
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s trillion"
+msgstr[1] "%(value)s trilliones"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f trilliardo"
+msgstr[1] "%(value).1f trilliardos"
+
+#: templatetags/humanize.py:75
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s trilliardo"
+msgstr[1] "%(value)s trilliardos"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f quadrillion"
+msgstr[1] "%(value).1f quadrilliones"
+
+#: templatetags/humanize.py:79
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s quadrillion"
+msgstr[1] "%(value)s quadrilliones"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f quadrilliardo"
+msgstr[1] "%(value).1f quadrilliardos"
+
+#: templatetags/humanize.py:83
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s quadrilliardo"
+msgstr[1] "%(value)s quadrilliardos"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f quintillion"
+msgstr[1] "%(value).1f quintilliones"
+
+#: templatetags/humanize.py:87
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s quintillion"
+msgstr[1] "%(value)s quintilliones"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f quintilliardo"
+msgstr[1] "%(value).1f quintilliardos"
+
+#: templatetags/humanize.py:91
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s quintilliardo"
+msgstr[1] "%(value)s quintilliardos"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googoles"
+
+#: templatetags/humanize.py:95
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googoles"
+
+#: templatetags/humanize.py:144
+msgid "one"
+msgstr "un"
+
+#: templatetags/humanize.py:144
+msgid "two"
+msgstr "duo"
+
+#: templatetags/humanize.py:144
+msgid "three"
+msgstr "tres"
+
+#: templatetags/humanize.py:144
+msgid "four"
+msgstr "quatro"
+
+#: templatetags/humanize.py:144
+msgid "five"
+msgstr "cinque"
+
+#: templatetags/humanize.py:144
+msgid "six"
+msgstr "sex"
+
+#: templatetags/humanize.py:144
+msgid "seven"
+msgstr "septe"
+
+#: templatetags/humanize.py:144
+msgid "eight"
+msgstr "octo"
+
+#: templatetags/humanize.py:144
+msgid "nine"
+msgstr "novem"
+
+#: templatetags/humanize.py:190
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s retro"
+
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
+msgid "now"
+msgstr "ora"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "un secunda retro"
+msgstr[1] "%(count)s secundas retro"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "un minuta retro"
+msgstr[1] "%(count)s minutas retro"
+
+#: templatetags/humanize.py:206
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "un hora retro"
+msgstr[1] "%(count)s horas retro"
+
+#: templatetags/humanize.py:212
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "in %(delta)s"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "in un secunda"
+msgstr[1] "in %(count)s secundas"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "in un minuta"
+msgstr[1] "in %(count)s minutas"
+
+#: templatetags/humanize.py:228
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "in un hora"
+msgstr[1] "in %(count)s horas"
diff --git a/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo
index a4771cf794..b400d2c1cd 100644
Binary files a/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/id/LC_MESSAGES/django.po b/django/contrib/humanize/locale/id/LC_MESSAGES/django.po
index 19b93987fa..3b52cde706 100644
--- a/django/contrib/humanize/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/id/LC_MESSAGES/django.po
@@ -7,260 +7,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-06 20:12+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "hari ini"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "kemarin"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "besok"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f juta"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s juta"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milyar"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s miliar"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilyun"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s triliun"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f kuadriliun"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s kuadriliun"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f kuintiliun"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s kuintiliun"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sekstiliun"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sekstiliun"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septiliun"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septiliun"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f oktiliun"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s oktiliun"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f noniliun"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s noniliun"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f desiliun"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s desiliun"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "satu"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dua"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tiga"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "empat"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "lima"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "enam"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "tujuh"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "delapan"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "sembilan"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s yang lalu"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "sekarang"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "%(count)s detik yang lalu"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "%(count)s menit yang lalu"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "%(count)s jam yang lalu"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s dari sekarang"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "%(count)s detik dari sekarang"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "%(count)s menit dari sekarang"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo
index 00f15f74ab..2114e71434 100644
Binary files a/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po
index 54e32e9070..fd0a71a2ac 100644
--- a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-17 18:46+0000\n"
 "Last-Translator: gudmundur <gudmundur.bjarni@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "í dag"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "gærdagur"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "morgundagur"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milljón"
 msgstr[1] "%(value).1f milljónir"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s milljón"
 msgstr[1] "%(value)s milljónir"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milljarður"
 msgstr[1] "%(value).1f milljarðar"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s milljarður"
 msgstr[1] "%(value)s milljarðar"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billjarður"
 msgstr[1] "%(value).1f billjónir"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s billjón"
 msgstr[1] "%(value)s billjónir"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f billjarður"
 msgstr[1] "%(value).1f billjarðar"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s billjarður"
 msgstr[1] "%(value)s billjarðar"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f trilljón"
 msgstr[1] "%(value).1f trilljónir"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s trilljón"
 msgstr[1] "%(value)s trilljónir"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f trilljarður"
 msgstr[1] "%(value).1f trilljarðar"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s trilljarður"
 msgstr[1] "%(value)s trilljarðar"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f kvaðrilljón"
 msgstr[1] "%(value).1f kvaðrilljónir"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s kvaðrilljón"
 msgstr[1] "%(value)s kvaðrilljónir"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f kvaðrilljarður"
 msgstr[1] "%(value).1f kvaðrilljarðar"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s kvaðrilljarður"
 msgstr[1] "%(value)s kvaðrilljarðar"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f kvintilljón"
 msgstr[1] "%(value).1f kvintilljónir"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s kvintilljón"
 msgstr[1] "%(value)s kvintilljónir"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f kvintilljarður"
 msgstr[1] "%(value).1f kvintilljarðar"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s kvintilljarður"
 msgstr[1] "%(value)s kvintilljarðar"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "einn"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "tveir"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "þrír"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "fjórir"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "fimm"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sex"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sjö"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "átta"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "níu"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s síðan"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "núna"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "fyrir sekúndu síðan"
 msgstr[1] "%(count)s sekúndum síðan"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "fyrir mínútu síðan"
 msgstr[1] "%(count)s mínútum síðan"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "fyrir klukkustund"
 msgstr[1] "fyrir %(count)s klukkustundum"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "eftir %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "eftir sekúndu"
 msgstr[1] "eftir %(count)s sekúndur"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "eftir mínútu"
 msgstr[1] "eftir %(count)s mínútur"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo
index fb0aa71ac7..2f08e719b6 100644
Binary files a/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/it/LC_MESSAGES/django.po b/django/contrib/humanize/locale/it/LC_MESSAGES/django.po
index 25a21a030e..3919fe797c 100644
--- a/django/contrib/humanize/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/it/LC_MESSAGES/django.po
@@ -9,287 +9,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "oggi"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ieri"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "domani"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milione"
 msgstr[1] "%(value).1f milioni"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s milione"
 msgstr[1] "%(value)s milioni"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miliardo"
 msgstr[1] "%(value).1f miliardi"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s miliardo"
 msgstr[1] "%(value)s miliardi"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f migliaio di miliardi"
 msgstr[1] "%(value).1f migliaia di miliardi"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s migliaio di miliardi"
 msgstr[1] "%(value)s migliaia di miliardi"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f milione di miliardi"
 msgstr[1] "%(value).1f milioni di miliardi"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s milione di miliardi"
 msgstr[1] "%(value)s milioni di miliardi"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f miliardo di miliardi"
 msgstr[1] "%(value).1f miliardi di miliardi"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s miliardo di miliardi"
 msgstr[1] "%(value)s miliardi di miliardi"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f migliaio di miliardi di miliardi"
 msgstr[1] "%(value).1f migliaia di miliardi di miliardi"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s migliaio di miliardi di miliardi"
 msgstr[1] "%(value)s migliaia di miliardi di miliardi"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f milione di miliardi di miliardi"
 msgstr[1] "%(value).1f milioni di miliardi di miliardi"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s milione di miliardi di miliardi"
 msgstr[1] "%(value)s milioni di miliardi di miliardi"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f miliardo di miliardi di miliardi"
 msgstr[1] "%(value).1f miliardi di miliardi di miliardi"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s miliardo di miliardi di miliardi"
 msgstr[1] "%(value)s miliardi di miliardi di miliardi"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f migliaio di miliardi di miliardi di miliardi"
 msgstr[1] "%(value).1f migliaioa di miliardi di miliardi di miliardi"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s migliaio di miliardi di miliardi di miliardi"
 msgstr[1] "%(value)s migliaia di miliardi di miliardi di miliardi"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f milione di miliardi di miliardi di miliardi"
 msgstr[1] "%(value).1f milioni di miliardi di miliardi di miliardi"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s milione di miliardi di miliardi di miliardi"
 msgstr[1] "%(value)s milioni di miliardi di miliardi di miliardi"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "uno"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "due"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "quattro"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinque"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sei"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sette"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "otto"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nove"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s fa"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "adesso"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "un secondo fa"
 msgstr[1] "%(count)s secondi fa"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "un minuto fa"
 msgstr[1] "%(count)s minuti fa"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "un'ora fa"
 msgstr[1] "%(count)s ore fa"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s da adesso"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "un secondo da adesso"
 msgstr[1] "%(count)s secondi da adesso"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "un minuto da adesso"
 msgstr[1] "%(count)s minuti da adesso"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo
index 1b4d1e805c..84eada5bca 100644
Binary files a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po
index 4f04f0b022..d85a0be91e 100644
--- a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po
@@ -8,260 +8,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-19 13:00+0000\n"
-"Last-Translator: Jonas Obrist <me@ojii.ch>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-05 11:26+0000\n"
+"Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "今日"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "昨日"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "明日"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "番目"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "番目"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "番目"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "番目"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f 百万"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s百万"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f 十億"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s十億"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f 兆"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
+msgstr[0] "%(value)s兆"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "1"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "2"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "3"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "4"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "5"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "6"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "7"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "8"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "9"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s前"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "今"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "%(count)s秒前"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "%(count)s分前"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "%(count)s時間前"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "今から%(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "今から%(count)s秒"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "今から%(count)s分"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo
index c0de258538..a43b94a672 100644
Binary files a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po
index 8530779f70..812302a1ff 100644
--- a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po
@@ -1,266 +1,268 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Translators:
+# André Bouatchidzé <a@anbz.net>, 2013.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2013-03-01 10:40+0000\n"
+"Last-Translator: André Bouatchidzé <a@anbz.net>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "დღეს"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "ხვალ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "-ე"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "-ლი"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "-ე"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "-ე"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f მილიონი"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
+msgstr[0] "%(value)s მილიონი"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f მილიარდი"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
+msgstr[0] "%(value)s მილიარდი"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ტრილიონი"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
+msgstr[0] "%(value)s ტრილიონი"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f კვადრილიონი"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
+msgstr[0] "%(value)s კვადრილიონი"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f კვინტილიონი"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
+msgstr[0] "%(value)s კვინტილიონი"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f სექსტილიონი"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
+msgstr[0] "%(value)s სექსტილიონი"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f სეპტილიონი"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
+msgstr[0] "%(value)s სეპტილიონი"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f ოქტილიონი"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
+msgstr[0] "%(value)s ოქტილიონი"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f ნონილიონი"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
+msgstr[0] "%(value)s ნონილიონი"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f დეცილიონი"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
+msgstr[0] "%(value)s დეცილიონი"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f გუგოლი"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
+msgstr[0] "%(value)s გუგოლი"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ერთი"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "ორი"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "სამი"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "ოთხი"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "ხუთი"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "ექვსი"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "შვიდი"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "რვა"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "ცხრა"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "%(delta)s-ის წინ"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
-
-#: templatetags/humanize.py:191
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
+msgstr "ახლა"
 
 #: templatetags/humanize.py:196
 #, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s წამის წინ"
 
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s წუთის წინ"
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
+msgstr[0] "%(count)s საათის წინ"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
+msgstr "%(delta)s-ის შემდეგ"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "%(count)s წამის შემდეგ"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "%(count)s წუთის შემდეგ"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
+msgstr[0] "%(count)s საათის შემდეგ"
diff --git a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo
index 7658946964..505347390d 100644
Binary files a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po
index de1a38cc0a..c95936aabb 100644
--- a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po
@@ -6,224 +6,224 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "бүгін"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "кеше"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "ерте"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "ші"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ші"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "ші"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ші"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f миллион"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s миллион"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f миллиард"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s миллиард"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f триллион"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s trillion"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "бір"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "екі"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "үш"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "төрт"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "бес"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "алты"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "жеті"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "сегіз"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "тоғыз"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s бұрын"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "кәзір"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -231,7 +231,7 @@ msgstr[0] ""
 "one: бір секунд бұрын\n"
 "other: %(count)s секунд бұрын"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -239,7 +239,7 @@ msgstr[0] ""
 "one: бір минут бұрын\n"
 "other: %(count)s минут бұрын"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -247,13 +247,13 @@ msgstr[0] ""
 "one: бір сағат бұрын\n"
 "other: %(count)s сағат бұрын"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "кәзірден %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -261,7 +261,7 @@ msgstr[0] ""
 "one: кәзірден бір секунд\n"
 "other: кәзірден %(count)s секунд"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -269,7 +269,7 @@ msgstr[0] ""
 "one: кәзірден бір минут\n"
 "other: кәзірден %(count)s минут"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo
index b87b428a1f..f23551063f 100644
Binary files a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po
index d6c2b09f2c..3663361ae3 100644
--- a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po
@@ -5,260 +5,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2011-01-19 15:13+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr ""
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr ""
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo
index 8accc57ea0..72f175cc4c 100644
Binary files a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po
index e152870c72..6bbc99969a 100644
--- a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po
@@ -6,260 +6,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "오늘"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "어제"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "내일"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "번째"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "번째"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "번째"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "번째"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f백만"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f십억"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f조"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "1"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "2"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "3"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "4"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "5"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "6"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "7"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "8"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "9"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo
index a57dc07456..1f0e45d562 100644
Binary files a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po
index 8982b2b8af..4d3b4207c2 100644
--- a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po
@@ -8,47 +8,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-09 16:51+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Simonas Kazlauskas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "šiandien"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "vakar"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "rytoj"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "-as"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "-as"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "-as"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "-as"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -56,7 +56,7 @@ msgstr[0] "%(value).1f milijonas"
 msgstr[1] "%(value).1f milijonai"
 msgstr[2] "%(value).1f milijonai"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -64,7 +64,7 @@ msgstr[0] "%(value)s milijonas"
 msgstr[1] "%(value)s milijonai"
 msgstr[2] "%(value)s milijonų"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -72,7 +72,7 @@ msgstr[0] "%(value).1f milijardas"
 msgstr[1] "%(value).1f milijardai"
 msgstr[2] "%(value).1f milijardai"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -80,7 +80,7 @@ msgstr[0] "%(value)s milijardas"
 msgstr[1] "%(value)s milijardai"
 msgstr[2] "%(value)s milijardų"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -88,7 +88,7 @@ msgstr[0] "%(value).1f trilijonas"
 msgstr[1] "%(value).1f trilijonai"
 msgstr[2] "%(value).1f trilijonai"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -96,7 +96,7 @@ msgstr[0] "%(value)s trilijonas"
 msgstr[1] "%(value)s trilijonai"
 msgstr[2] "%(value)s trilijonų"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -104,7 +104,7 @@ msgstr[0] "%(value).1f kvadrilijonas"
 msgstr[1] "%(value).1f kvadrilijonai"
 msgstr[2] "%(value).1f kvadrilijonų"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -112,7 +112,7 @@ msgstr[0] "%(value)s kvadrilijonas"
 msgstr[1] "%(value)s kvadrilijonai"
 msgstr[2] "%(value)s kvadrilijonų"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -120,7 +120,7 @@ msgstr[0] "%(value).1f kvintilijonas"
 msgstr[1] "%(value).1f kvintilijonai"
 msgstr[2] "%(value).1f kvintilijonų"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -128,7 +128,7 @@ msgstr[0] "%(value)s kvintilijonas"
 msgstr[1] "%(value)s kvintilijonai"
 msgstr[2] "%(value)s kvintilijonų"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -136,7 +136,7 @@ msgstr[0] "%(value).1f sikstilijonas"
 msgstr[1] "%(value).1f sikstilijonai"
 msgstr[2] "%(value).1f sikstilijonų"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -144,7 +144,7 @@ msgstr[0] "%(value)s sikstilijonas"
 msgstr[1] "%(value)s sikstilijonai"
 msgstr[2] "%(value)s sikstilijonų"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -152,7 +152,7 @@ msgstr[0] "%(value).1f septilijonas"
 msgstr[1] "%(value).1f septilijonai"
 msgstr[2] "%(value).1f septilijonų"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -160,7 +160,7 @@ msgstr[0] "%(value)s septilijonas"
 msgstr[1] "%(value)s septilijonai"
 msgstr[2] "%(value)s septilijonų"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -168,7 +168,7 @@ msgstr[0] "%(value).1f oktilijonas"
 msgstr[1] "%(value).1f oktilijonai"
 msgstr[2] "%(value).1f oktilijonų"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -176,7 +176,7 @@ msgstr[0] "%(value)s oktilijonas"
 msgstr[1] "%(value)s oktilijonai"
 msgstr[2] "%(value)s oktilijonų"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -184,7 +184,7 @@ msgstr[0] "%(value).1f naintilijonas"
 msgstr[1] "%(value).1f naintilijonai"
 msgstr[2] "%(value).1f naintilijonų"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -192,7 +192,7 @@ msgstr[0] "%(value)s naintilijonas"
 msgstr[1] "%(value)s naintilijonai"
 msgstr[2] "%(value)s naintilijonų"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -200,7 +200,7 @@ msgstr[0] "%(value).1f decilijonas"
 msgstr[1] "%(value).1f decilijonai"
 msgstr[2] "%(value).1f decilijonų"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -208,7 +208,7 @@ msgstr[0] "%(value)s decilijonas"
 msgstr[1] "%(value)s decilijonai"
 msgstr[2] "%(value)s decilijonų"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -216,7 +216,7 @@ msgstr[0] "%(value).1f gugolas"
 msgstr[1] "%(value).1f gugolai"
 msgstr[2] "%(value).1f gugolų"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -224,53 +224,53 @@ msgstr[0] "%(value)s gugolas"
 msgstr[1] "%(value)s gugolai"
 msgstr[2] "%(value)s gugolų"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "vienas"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "du"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "trys"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "keturi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "penki"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "šeši"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "septyni"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "aštuoni"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "devyni"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "prieš %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "dabar"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -278,7 +278,7 @@ msgstr[0] "prieš sekundę"
 msgstr[1] "prieš %(count)s sekundes"
 msgstr[2] "prieš %(count)s sekundžių"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -286,7 +286,7 @@ msgstr[0] "prieš minutę"
 msgstr[1] "prieš %(count)s minutes"
 msgstr[2] "prieš %(count)s minučių"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -294,13 +294,13 @@ msgstr[0] "prieš valandą"
 msgstr[1] "prieš %(count)s valandas"
 msgstr[2] "prieš %(count)s valandų"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s nuo dabar"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -308,7 +308,7 @@ msgstr[0] "sekundė nuo dabar"
 msgstr[1] "%(count)s sekundės nuo dabar"
 msgstr[2] "%(count)s sekundžių nuo dabar"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -316,7 +316,7 @@ msgstr[0] "minutė nuo dabar"
 msgstr[1] "%(count)s minutės nuo dabar"
 msgstr[2] "%(count)s minučių nuo dabar"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo
index db205f8561..602f6c7c5a 100644
Binary files a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po
index dc8d185197..3b93c8aa41 100644
--- a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po
@@ -6,47 +6,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "šodien"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "vakar"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "rīt"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -54,7 +54,7 @@ msgstr[0] "%(value).1f miljons"
 msgstr[1] "%(value).1f miljoni"
 msgstr[2] "%(value).1f miljonu"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -62,7 +62,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -70,7 +70,7 @@ msgstr[0] "%(value).1f miljards"
 msgstr[1] "%(value).1f miljardi"
 msgstr[2] "%(value).1f miljardu"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -78,7 +78,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -86,7 +86,7 @@ msgstr[0] "%(value).1f triljons"
 msgstr[1] "%(value).1f triljoni"
 msgstr[2] "%(value).1f triljonu"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -94,7 +94,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -102,7 +102,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -110,7 +110,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -118,7 +118,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -126,7 +126,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -134,7 +134,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -142,7 +142,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -150,7 +150,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -158,7 +158,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -166,7 +166,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -174,7 +174,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -182,7 +182,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -190,7 +190,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -198,7 +198,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -206,7 +206,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -214,7 +214,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -222,53 +222,53 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "viens"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "divi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "trīs"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "četri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "pieci"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seši"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "septiņi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "astoņi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "deviņi"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -276,7 +276,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -284,7 +284,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -292,13 +292,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -306,7 +306,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -314,7 +314,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo
index ba2cb11df8..2a019c36ad 100644
Binary files a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po
index 510902826a..4f3150f2ba 100644
--- a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-15 12:41+0000\n"
 "Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "денеска"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "вчера"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "утре"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f милион"
 msgstr[1] "%(value).1f милион"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s милион"
 msgstr[1] "%(value)s милиони"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f милијарда"
 msgstr[1] "%(value).1f милијарда"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s милијарда"
 msgstr[1] "%(value)s милијарди"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f трилион"
 msgstr[1] "%(value).1f трилион"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s трилион"
 msgstr[1] "%(value)s трилиони"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f квадрилион"
 msgstr[1] "%(value).1f квадрилиони"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s квадрилион"
 msgstr[1] "%(value)s квадрилиони"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f квинтилион"
 msgstr[1] "%(value).1f квинтилиони"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s квинтилион"
 msgstr[1] "%(value)s квинтилиони"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f секстилион"
 msgstr[1] "%(value).1f секстилиони"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s секстилион"
 msgstr[1] "%(value)s секстилиони"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f септилион"
 msgstr[1] "%(value).1f септилиони"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s септилион"
 msgstr[1] "%(value)s септилиони"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f октилион"
 msgstr[1] "%(value).1f октилиони"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s октилион"
 msgstr[1] "%(value)s октилиони"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f нонилион"
 msgstr[1] "%(value).1f нонилиони"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s нонилион"
 msgstr[1] "%(value)s нонилиони"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f децилион"
 msgstr[1] "%(value).1f децилиони"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s децилион"
 msgstr[1] "%(value)s децилиони"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f гугол"
 msgstr[1] "%(value).1f гуголи"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s гугол"
 msgstr[1] "%(value)s гуголи"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "еден"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "четири"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "пет"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "шест"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "седум"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "осум"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "девет"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "пред %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "сега"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "пред една секунда"
 msgstr[1] "пред %(count)s секунди"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "пред една минута"
 msgstr[1] "пред %(count)s минути"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "пред еден час"
 msgstr[1] "пред %(count)s часа"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "за %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "за една секунда"
 msgstr[1] "за %(count)s секунди"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "за една минута"
 msgstr[1] "за %(count)s минути"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo
index 6c7c2cf924..43d5450d9e 100644
Binary files a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po
index c37ae5cf02..0d859a477c 100644
--- a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-07 15:48+0000\n"
 "Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "ഇന്ന്"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ഇന്നലെ"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "നാളെ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "ആം"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ആം"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "ആം"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ആം"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f മില്ല്യണ്‍ (ദശലക്ഷം)"
 msgstr[1] "%(value).1f മില്ല്യണ്‍ (ദശലക്ഷം)"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s ദശലക്ഷം"
 msgstr[1] "%(value)s ദശലക്ഷം"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f ബില്ല്യണ്‍ (ശതകോടി)"
 msgstr[1] "%(value).1f ബില്ല്യണ്‍ (ശതകോടി)"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s ശതകോടി"
 msgstr[1] "%(value)s ശതകോടി"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ട്രില്ല്യണ്‍ (ലക്ഷം കോടി)"
 msgstr[1] "%(value).1f ട്രില്ല്യണ്‍ (ലക്ഷം കോടി)"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s ലക്ഷം കോടി"
 msgstr[1] "%(value)s ലക്ഷം കോടി"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f ക്വാഡ്രില്ല്യണ്‍"
 msgstr[1] "%(value).1f ക്വാഡ്രില്ല്യണ്‍"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s ക്വാഡ്രില്ല്യണ്‍"
 msgstr[1] "%(value)s ക്വാഡ്രില്ല്യണ്‍"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f ക്വിന്റില്ല്യണ്‍"
 msgstr[1] "%(value).1f ക്വിന്റില്ല്യണ്‍"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s ക്വിന്റില്ല്യണ്‍"
 msgstr[1] "%(value)s ക്വിന്റില്ല്യണ്‍"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f സെക്സ്റ്റില്ല്യണ്‍"
 msgstr[1] "%(value).1f സെക്സ്റ്റില്ല്യണ്‍"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s സെക്സ്റ്റില്ല്യണ്‍"
 msgstr[1] "%(value)s സെക്സ്റ്റില്ല്യണ്‍"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f സെപ്റ്റില്ല്യണ്‍"
 msgstr[1] "%(value).1f സെപ്റ്റില്ല്യണ്‍"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s സെപ്റ്റില്ല്യണ്‍"
 msgstr[1] "%(value)s സെപ്റ്റില്ല്യണ്‍"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f ഒക്റ്റില്ല്യണ്‍"
 msgstr[1] "%(value).1f ഒക്റ്റില്ല്യണ്‍"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s ഒക്റ്റില്ല്യണ്‍"
 msgstr[1] "%(value)s ഒക്റ്റില്ല്യണ്‍"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f നോനില്ല്യണ്‍"
 msgstr[1] "%(value).1f നോനില്ല്യണ്‍"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s നോനില്ല്യണ്‍"
 msgstr[1] "%(value)s നോനില്ല്യണ്‍"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f ഡെസില്ല്യണ്‍"
 msgstr[1] "%(value).1f ഡെസില്ല്യണ്‍"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s ഡെസില്ല്യണ്‍"
 msgstr[1] "%(value)s ഡെസില്ല്യണ്‍"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f ഗൂഗോള്‍"
 msgstr[1] "%(value).1f ഗൂഗോള്‍"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s ഗൂഗോള്‍"
 msgstr[1] "%(value)s ഗൂഗോള്‍"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ഒന്ന്"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "രണ്ട്"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "മൂന്ന്"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "നാല്"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "അഞ്ച്"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "ആറ്"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "ഏഴ്"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "എട്ട്"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "ഒന്‍പത്"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s മുമ്പ്"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "ഇപ്പോള്‍"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "ഒരു സെക്കന്‍ഡ് മുമ്പ്"
 msgstr[1] "%(count)s സെക്കന്‍ഡുകള്‍ മുമ്പ്"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "ഒരു മിനുറ്റ് മുമ്പ്"
 msgstr[1] "%(count)s മിനുറ്റുകള്‍ മുമ്പ്"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "ഒരു മണിക്കൂര്‍ മുമ്പ്"
 msgstr[1] "%(count)s മണിക്കൂര്‍ മുമ്പ്"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "ഇപ്പോള്‍ മുതല്‍ %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു സെക്കന്‍ഡ്"
 msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s സെക്കന്‍ഡുകള്‍"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു മിനുട്ട്"
 msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s മിനുട്ടുകള്‍"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo
index ca55a11103..720037f9fd 100644
Binary files a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po
index 1baf585b9a..5efb77675b 100644
--- a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-15 12:39+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "өнөөдөр"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "өчигдөр"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "маргааш"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "-р"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "-р"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "-р"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "-р"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f сая"
 msgstr[1] "%(value).1f сая"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s сая"
 msgstr[1] "%(value)s сая"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f тэр бум"
 msgstr[1] "%(value).1f тэр бум"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s тэрбум"
 msgstr[1] "%(value)s тэрбум"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f их наяд"
 msgstr[1] "%(value).1f их наяд"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s их наяд"
 msgstr[1] "%(value)s их наяд"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f их маш дэлэгмэл"
 msgstr[1] "%(value).1f их маш дэлэгмэл"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s их маш дэлэгмэл"
 msgstr[1] "%(value)s их маш дэлэгмэл"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f их ингуумэл"
 msgstr[1] "%(value).1f их ингуумэл"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s их ингуумэл"
 msgstr[1] "%(value)s их ингуумэл"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f ялгаруулагч"
 msgstr[1] "%(value).1f ялгаруулагч"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s ялгаруулагч"
 msgstr[1] "%(value)s ялгаруулагч"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f их өвөр дээр"
 msgstr[1] "%(value).1f их өвөр дээр"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s их өвөр дээр"
 msgstr[1] "%(value)s их өвөр дээр"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f хязгаар үзэгдэл"
 msgstr[1] "%(value).1f хязгаар үзэгдэл"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s хязгаар үзэгдэл"
 msgstr[1] "%(value)s хязгаар үзэгдэл"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f их шалтгааны зүйл"
 msgstr[1] "%(value).1f их шалтгааны зүйл"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s их шалтгааны зүйл"
 msgstr[1] "%(value)s их шалтгааны зүйл"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f эрхэт"
 msgstr[1] "%(value).1f эрхэт"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s эрхэт"
 msgstr[1] "%(value)s эрхэт"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s сэтгэшгүй"
 msgstr[1] "%(value)s сэтгэшгүй"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "нэг"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "хоёр"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "гурав"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "дөрөв"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "тав"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "зургаа"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "долоо"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "найм"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "ес"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s өмнө"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "одоо"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "секундын өмнө"
 msgstr[1] "%(count)s секундын өмнө"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "минутын өмнө"
-msgstr[1] "%(count)s минутын өмнө"
+msgstr[1] "%s минутын өмнө"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "цагын өмнө"
-msgstr[1] "%(count)s цагын өмнө"
+msgstr[1] "%s цагын өмнө"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s дараа"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "секундын дараа"
 msgstr[1] "%(count)s секундын дараа"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "минутын дараа"
 msgstr[1] "%(count)s минутын дараа"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/my/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..abbcd1feb4
Binary files /dev/null and b/django/contrib/humanize/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/my/LC_MESSAGES/django.po b/django/contrib/humanize/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..a653a2fce7
--- /dev/null
+++ b/django/contrib/humanize/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,267 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2013-03-18 11:00+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: tests.py:125 templatetags/humanize.py:167
+msgid "today"
+msgstr "ယနေ့"
+
+#: tests.py:125 templatetags/humanize.py:171
+msgid "yesterday"
+msgstr "မနေ့"
+
+#: tests.py:125 templatetags/humanize.py:169
+msgid "tomorrow"
+msgstr "မနက်ဖြန်"
+
+#: templatetags/humanize.py:25
+msgid "th"
+msgstr "မြောက်"
+
+#: templatetags/humanize.py:25
+msgid "st"
+msgstr "မြောက်"
+
+#: templatetags/humanize.py:25
+msgid "nd"
+msgstr "မြောက်"
+
+#: templatetags/humanize.py:25
+msgid "rd"
+msgstr "မြောက်"
+
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f မီလီယံ"
+
+#: templatetags/humanize.py:55
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s မီလီယံ"
+
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f ဘီလီယံ"
+
+#: templatetags/humanize.py:59
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s ဘီလီယံ"
+
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f တရီလျံ"
+
+#: templatetags/humanize.py:63
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s တရီလျံ"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f ကွပ်ဒရီလျံ"
+
+#: templatetags/humanize.py:67
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s ကွပ်ဒရီလျံ"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f ကွင့်တီလျံ"
+
+#: templatetags/humanize.py:71
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s ကွင့်တီလျံ"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f ဆက်တီလျံ"
+
+#: templatetags/humanize.py:75
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s ဆက်တီလျံ"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f ဆပ်တီလျံ"
+
+#: templatetags/humanize.py:79
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s ဆပ်တီလျံ"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f အော့တီလျံ"
+
+#: templatetags/humanize.py:83
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s အော့တီလျံ"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f နိုနီလျံ"
+
+#: templatetags/humanize.py:87
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s နိုနီလျံ"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f ဒက်စီလျံ"
+
+#: templatetags/humanize.py:91
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s ဒက်စီလျံ"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f ဂူးဂေါ်"
+
+#: templatetags/humanize.py:95
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s ဂူးဂေါ်"
+
+#: templatetags/humanize.py:144
+msgid "one"
+msgstr "တစ်"
+
+#: templatetags/humanize.py:144
+msgid "two"
+msgstr "နှစ်"
+
+#: templatetags/humanize.py:144
+msgid "three"
+msgstr "သံုး"
+
+#: templatetags/humanize.py:144
+msgid "four"
+msgstr "လေး"
+
+#: templatetags/humanize.py:144
+msgid "five"
+msgstr "ငါး"
+
+#: templatetags/humanize.py:144
+msgid "six"
+msgstr "ခြောက်"
+
+#: templatetags/humanize.py:144
+msgid "seven"
+msgstr "ခုနစ်"
+
+#: templatetags/humanize.py:144
+msgid "eight"
+msgstr "ရှစ်"
+
+#: templatetags/humanize.py:144
+msgid "nine"
+msgstr "ကိုး"
+
+#: templatetags/humanize.py:190
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s အခါက"
+
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
+msgid "now"
+msgstr "ယခု"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s စက္ကန့်များအခါက"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s မိနစ်များအခါက"
+
+#: templatetags/humanize.py:206
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s နာရီများအခါက"
+
+#: templatetags/humanize.py:212
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s ယခုမှ"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "ယခုမှ %(count)s စက္ကန့်များ"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "ယခုမှ %(count)s မိနစ်များ"
+
+#: templatetags/humanize.py:228
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "ယခုမှ %(count)s နာရီများ"
diff --git a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo
index 27e25c48f6..2c37adf9c3 100644
Binary files a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po
index 75d2df175c..de5cd66746 100644
--- a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-08 14:27+0000\n"
 "Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "i dag"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "i går"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "i morgen"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f millioner"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s million"
 msgstr[1] "%(value)s millioner"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milliard"
 msgstr[1] "%(value).1f milliarder"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s milliard"
 msgstr[1] "%(value)s milliarder"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billioner"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s billion"
 msgstr[1] "%(value)s billioner"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f kvadrillion"
 msgstr[1] "%(value).1f kvadrillioner"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s kvadrillion"
 msgstr[1] "%(value)s kvadrillioner"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f kvintillion"
 msgstr[1] "%(value).1f kvintillioner"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s kvintillion"
 msgstr[1] "%(value)s kvintillioner"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sekstillion"
 msgstr[1] "%(value).1f sekstillioner"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sekstillion"
 msgstr[1] "%(value)s sekstillioner"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septillion"
 msgstr[1] "%(value).1f septillioner"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septillion"
 msgstr[1] "%(value)s septillioner"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f oktillion"
 msgstr[1] "%(value).1f oktillioner"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s oktillion"
 msgstr[1] "%(value)s oktillioner"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f nonillion"
 msgstr[1] "%(value).1f nonillioner"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s nonillion"
 msgstr[1] "%(value)s nonillioner"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f desillion"
 msgstr[1] "%(value).1f desillioner"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s desillion"
 msgstr[1] "%(value)s desillioner"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googoler"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googoler"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "én"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "to"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "fire"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "fem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seks"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sju"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "åtte"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "ni"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s siden"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "nå"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "ett sekund siden"
 msgstr[1] "%(count)s sekunder siden"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "ett minutt siden"
 msgstr[1] "%(count)s minutter siden"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "en time siden"
 msgstr[1] "%(count)s timer siden"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s fra nå"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "ett sekund fra nå"
 msgstr[1] "%(count)s sekunder fra nå"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "ett minutt fra nå"
 msgstr[1] "%(count)s minutter fra nå"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ne/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ne/LC_MESSAGES/django.mo
index 8483211081..96d09ee0c3 100644
Binary files a/django/contrib/humanize/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ne/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ne/LC_MESSAGES/django.po
index d9bf4559a6..3de435749d 100644
--- a/django/contrib/humanize/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ne/LC_MESSAGES/django.po
@@ -1,291 +1,292 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Paras Nath Chaudhary <opnchaudhary@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2011-01-19 15:13+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-10-04 12:02+0000\n"
+"Last-Translator: Paras Nath Chaudhary <opnchaudhary@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
-msgstr ""
+msgstr "आज"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
-msgstr ""
+msgstr "हिजो"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
-msgstr ""
+msgstr "भोली"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s मिलियन"
+msgstr[1] "%(value)s मिलियन"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s अरब"
+msgstr[1] "%(value)s अरब"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s खरब"
+msgstr[1] "%(value)s खरब"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s करोड़ शंख"
+msgstr[1] "%(value)s करोड़ शंख"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
-msgstr ""
+msgstr "एक "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
-msgstr ""
+msgstr "दुई "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
-msgstr ""
+msgstr "तीन "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
-msgstr ""
+msgstr "चार "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
-msgstr ""
+msgstr "पाँच "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
-msgstr ""
+msgstr "छ "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
-msgstr ""
+msgstr "सात "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
-msgstr ""
+msgstr "आठ "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
-msgstr ""
+msgstr "नौ "
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "%(delta)s अगाडी"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
-
-#: templatetags/humanize.py:191
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "अहिले"
 
 #: templatetags/humanize.py:196
 #, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "एक सेकेन्ड  अगाडी "
+msgstr[1] "%(count)s सेकेन्ड  अगाडी "
 
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "एक मिनेट अगाडी "
+msgstr[1] "%(count)s मिनेट अगाडी "
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "एक घन्टा अगाडी "
+msgstr[1] "%(count)s घन्टा अगाडी "
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo
index 5ce9524e7f..d70980fc88 100644
Binary files a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po
index 27e3fc2b1d..1fbe538b4e 100644
--- a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-07 19:59+0000\n"
 "Last-Translator: Blue <alexandervanratingen@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "vandaag"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "gisteren"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "morgen"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "e"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "e"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "e"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "e"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f miljoen"
 msgstr[1] "%(value).1f miljoen"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s miljoen"
 msgstr[1] "%(value)s miljoen"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miljard"
 msgstr[1] "%(value).1f miljard"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s miljard"
 msgstr[1] "%(value)s miljard"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f biljoen"
 msgstr[1] "%(value).1f biljoen"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s biljoen"
 msgstr[1] "%(value)s biljoen"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f biljard"
 msgstr[1] "%(value).1f biljard"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s biljard"
 msgstr[1] "%(value)s biljard"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f triljoen"
 msgstr[1] "%(value).1f triljoen"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s triljoen"
 msgstr[1] "%(value)s triljoen"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f triljard"
 msgstr[1] "%(value).1f triljard"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s triljard"
 msgstr[1] "%(value)s triljard"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f quadriljoen"
 msgstr[1] "%(value).1f quadriljoen"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s quadriljoen"
 msgstr[1] "%(value)s quadriljoen"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f quadriljard"
 msgstr[1] "%(value).1f quadriljard"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s quadriljard"
 msgstr[1] "%(value)s quadriljard"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f quintiljoen"
 msgstr[1] "%(value).1f quintiljoen"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s quintiljoen"
 msgstr[1] "%(value)s quintiljoen"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f quintiljard"
 msgstr[1] "%(value).1f quintiljard"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s quintiljard"
 msgstr[1] "%(value)s quintiljard"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "één"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "twee"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "drie"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "vier"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "vijf"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "zes"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "zeven"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "acht"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "negen"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s geleden"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "nu"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "een seconde geleden"
 msgstr[1] "%(count)s seconden geleden"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "een minuut geleden"
 msgstr[1] "%(count)s minuten geleden"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "een uur geleden"
 msgstr[1] "%(count)s uur geleden"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s van nu"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "een seconde van nu"
 msgstr[1] "%(count)s seconden van nu"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "een minuut van nu"
 msgstr[1] "%(count)s minuten van nu"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo
index dc9d4fae7d..fea6cf45f6 100644
Binary files a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po
index 4054346553..16e4cd5091 100644
--- a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po
@@ -2,293 +2,294 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+#   <odin.omdal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-06-03 20:11+0000\n"
+"Last-Translator: velmont <odin.omdal@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "i dag"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "i går"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "i morgon"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f millionar"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s millionar"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milliard"
 msgstr[1] "%(value).1f milliardar"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s milliard"
+msgstr[1] "%(value)s milliardar"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billionar"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billionar"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f kvadrillion"
+msgstr[1] "%(value).1f kvadrillionar"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s kvadrillion"
+msgstr[1] "%(value)s kvadrillionar"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kvintillion"
+msgstr[1] "%(value).1f kvintillionar"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s kvintillion"
+msgstr[1] "%(value)s kvintillionar"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sekstillion"
+msgstr[1] "%(value).1f sekstilionar"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s sekstillion"
+msgstr[1] "%(value)s sekstillionar"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septillion"
+msgstr[1] "%(value).1f septillionar"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s septillion"
+msgstr[1] "%(value)s septillionar"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktillion"
+msgstr[1] "%(value).1f oktillionar"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s oktillion"
+msgstr[1] "%(value)s oktillionar"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonillion"
+msgstr[1] "%(value).1f nonillionar"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s nonillion"
+msgstr[1] "%(value)s nonillionar"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f desillion"
+msgstr[1] "%(value).1f desillionar"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s desillion"
+msgstr[1] "%(value)s desillionar"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googolar"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googolar"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "éin"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "to"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "fire"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "fem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seks"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sju"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "åtte"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "ni"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "%(delta)s sidan"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
-
-#: templatetags/humanize.py:191
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "no"
 
 #: templatetags/humanize.py:196
 #, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "eitt sekund sidan"
+msgstr[1] "%(count)s sekund sidan"
 
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "eitt minutt sidan"
+msgstr[1] "%(count)s minutt sidan"
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "éin time sidan"
+msgstr[1] "%(count)s timar sidan"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "%(delta)s frå no"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "eitt sekund frå no"
+msgstr[1] "%(count)s sekund frå no"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "eitt minutt frå no"
+msgstr[1] "%(count)s minutt frå no"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "éin time frå no"
+msgstr[1] "%(count)s timar frå no"
diff --git a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo
index 23e6c1f217..4494b40114 100644
Binary files a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po
index 5a12ae4e52..b11c11fd97 100644
--- a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po
@@ -6,287 +6,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "ਅੱਜ"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ਕੱਲ੍ਹ"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "ਭਲਕੇ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "ਵਾਂ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ਲਾਂ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "ਜਾ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ਜਾ"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f ਮਿਲੀਅਨ"
 msgstr[1] "%(value).1f ਮਿਲੀਅਨ"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f ਬਿਲੀਅਨ"
 msgstr[1] "%(value).1f ਬਿਲੀਅਨ"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ਟਰਲੀਅਨ"
 msgstr[1] "%(value).1f ਟਰਲੀਅਨ"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ਇੱਕ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "ਦੋ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "ਤਿੰਨ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "ਚਾਰ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "ਪੰਜ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "ਛੇ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "ਸੱਤ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "ਅੱਠ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "ਨੌ"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo
index 19e685a248..6fb0ad05d9 100644
Binary files a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po
index 6856048dbd..0dd21aa9e4 100644
--- a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po
@@ -8,47 +8,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-22 13:05+0000\n"
 "Last-Translator: Roman Barczyński <rombar@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "dzisiaj"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "jutro"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "-y"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "-szy"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "-gi"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "-ci"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -56,7 +56,7 @@ msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f miliony"
 msgstr[2] "%(value).1f milionów"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -64,7 +64,7 @@ msgstr[0] "%(value)s milion"
 msgstr[1] "%(value)s miliony"
 msgstr[2] "%(value)s milionów"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -72,7 +72,7 @@ msgstr[0] "%(value).1f miliard"
 msgstr[1] "%(value).1f miliardy"
 msgstr[2] "%(value).1f miliardów"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -80,7 +80,7 @@ msgstr[0] "%(value)s miliard"
 msgstr[1] "%(value)s miliardy"
 msgstr[2] "%(value)s miliardów"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -88,7 +88,7 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliony"
 msgstr[2] "%(value).1f bilionów"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -96,7 +96,7 @@ msgstr[0] "%(value)s bilion"
 msgstr[1] "%(value)s biliony"
 msgstr[2] "%(value)s bilionów"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -104,7 +104,7 @@ msgstr[0] "%(value).1f biliard"
 msgstr[1] "%(value).1f biliardy"
 msgstr[2] "%(value).1f biliardów"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -112,7 +112,7 @@ msgstr[0] "%(value)s biliard"
 msgstr[1] "%(value)s biliardy"
 msgstr[2] "%(value)s biliardów"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -120,7 +120,7 @@ msgstr[0] "%(value).1f trylion"
 msgstr[1] "%(value).1f tryliony"
 msgstr[2] "%(value).1f trylionów"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -128,7 +128,7 @@ msgstr[0] "%(value)s trylion"
 msgstr[1] "%(value)s tryliony"
 msgstr[2] "%(value)s trylionyów"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -136,7 +136,7 @@ msgstr[0] "%(value).1f tryliard"
 msgstr[1] "%(value).1f tryliardy"
 msgstr[2] "%(value).1f tryliardów"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -144,7 +144,7 @@ msgstr[0] " %(value)s tryliard"
 msgstr[1] "%(value)s tryliardy"
 msgstr[2] "%(value)s tryliardów"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -152,7 +152,7 @@ msgstr[0] "%(value).1f kwadrylion"
 msgstr[1] "%(value).1f kwadryliony"
 msgstr[2] "%(value).1f kwadrylionów"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -160,7 +160,7 @@ msgstr[0] "%(value)s kwadrylion"
 msgstr[1] "%(value)s kwadryliony"
 msgstr[2] "%(value)s kwadrylionów"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -168,7 +168,7 @@ msgstr[0] "%(value).1f kwadryliard"
 msgstr[1] "%(value).1f kwardyliardy"
 msgstr[2] "%(value).1f kwadryliardów"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -176,7 +176,7 @@ msgstr[0] "%(value)s kwadryliard"
 msgstr[1] "%(value)s kwardyliardy"
 msgstr[2] "%(value)s kwadryliardów"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -184,7 +184,7 @@ msgstr[0] "%(value).1f kwintylion"
 msgstr[1] "%(value).1f kwintyliony"
 msgstr[2] "%(value).1f kwintylionów"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -192,7 +192,7 @@ msgstr[0] "%(value)s kwintylion"
 msgstr[1] "%(value)s kwintyliony"
 msgstr[2] "%(value)s kwintylionów"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -200,7 +200,7 @@ msgstr[0] "%(value).1f kwintyliard"
 msgstr[1] "%(value).1f kwintyliardy"
 msgstr[2] "%(value).1f kwintyliardów"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -208,7 +208,7 @@ msgstr[0] "%(value)s kwintyliard"
 msgstr[1] "%(value)s kwintyliardy"
 msgstr[2] "%(value)s kwintyliardów"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -216,7 +216,7 @@ msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googole"
 msgstr[2] "%(value).1f googolów"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -224,53 +224,53 @@ msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googole"
 msgstr[2] "%(value)s googolów"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "jeden"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dwa"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "trzy"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "cztery"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "pięć"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sześć"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "siedem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "osiem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "dziewięć"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s temu"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "teraz"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -278,7 +278,7 @@ msgstr[0] "sekundę temu"
 msgstr[1] "%(count)s sekundy temu"
 msgstr[2] "%(count)s sekund temu"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -286,7 +286,7 @@ msgstr[0] "minutę temu"
 msgstr[1] "%(count)s minuty temu"
 msgstr[2] "%(count)s minut temu"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -294,13 +294,13 @@ msgstr[0] "godzinę temu"
 msgstr[1] "%(count)s  godzin temu"
 msgstr[2] "%(count)s  godziny temu"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "za %(delta)s "
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -308,7 +308,7 @@ msgstr[0] "za sekundę"
 msgstr[1] "za %(count)s sekundy"
 msgstr[2] "za %(count)s sekund"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -316,7 +316,7 @@ msgstr[0] "za minutę"
 msgstr[1] "za %(count)s minuty"
 msgstr[2] "za %(count)s minut"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo
index b5a17d3e8b..583a4bbccc 100644
Binary files a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po
index 53a83dfe6a..a7ceb7a533 100644
--- a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po
@@ -2,293 +2,294 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-04-02 15:07+0000\n"
+"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "hoje"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ontem"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "amanhã"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milhão"
 msgstr[1] "%(value).1f milhões"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s milhão"
+msgstr[1] "%(value)s milhões"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f bilião"
 msgstr[1] "%(value).1f biliões"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s bilião"
+msgstr[1] "%(value)s biliões"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilião"
 msgstr[1] "%(value).1f triliões"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s trilião"
+msgstr[1] "%(value)s triliões"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f quadrilião"
+msgstr[1] "%(value).1f quadriliões"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s quadrilião"
+msgstr[1] "%(value)s quadriliões"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f quintilião"
+msgstr[1] "%(value).1f quintiliões"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s quintilião"
+msgstr[1] "%(value)s quintiliões"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sextilião"
+msgstr[1] "%(value).1f sextiliões"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s sextilião"
+msgstr[1] "%(value)s sextiliões"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilião"
+msgstr[1] "%(value).1f septiliões"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s septilião"
+msgstr[1] "%(value)s septiliões"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octilião"
+msgstr[1] "%(value).1f octiliões"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s octilião"
+msgstr[1] "%(value)s octiliões"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonilião"
+msgstr[1] "%(value).1f noniliões"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s nonilião"
+msgstr[1] "%(value)s noniliões"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decilião"
+msgstr[1] "%(value).1f deciliões"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s decilião"
+msgstr[1] "%(value)s deciliões"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "um"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dois"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "três"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "quatro"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sete"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "oito"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nove"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "%(delta)s atrás"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
-
-#: templatetags/humanize.py:191
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "agora"
 
 #: templatetags/humanize.py:196
 #, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "há 1 segundo"
+msgstr[1] "há %(count)s segundos"
 
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "há 1 minuto"
+msgstr[1] "há %(count)s minutos"
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "há 1 hora"
+msgstr[1] "há %(count)s horas"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "%(delta)s a partir de agora"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "1 segundo a partir de agora"
+msgstr[1] "%(count)s segundos a partir de agora"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "1 minuto a partir de agora"
+msgstr[1] "%(count)s minutos a partir de agora"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 hora a partir de agora"
+msgstr[1] "%(count)s horas a partir de agora"
diff --git a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo
index 5557702e52..4db59a9655 100644
Binary files a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po
index f08177c71f..db05e7fb21 100644
--- a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,6 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Eduardo Carvalho <eduardocereto@gmail.com>, 2012.
 # Guilherme Gondim <semente+transifex@taurinus.org>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Sandro  <sandrossv@hotmail.com>, 2011.
@@ -8,287 +9,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-21 16:26+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-06-04 12:37+0000\n"
+"Last-Translator: Eduardo Carvalho <eduardocereto@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "hoje"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ontem"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "amanhã"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milhão"
 msgstr[1] "%(value).1f milhões"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s milhão"
 msgstr[1] "%(value)s milhões"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f bilhão"
 msgstr[1] "%(value).1f bilhões"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s bilhão"
 msgstr[1] "%(value)s bilhões"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilhão"
 msgstr[1] "%(value).1f trilhões"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s trilhão"
 msgstr[1] "%(value)s trilhões"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f quadrilhão"
 msgstr[1] "%(value).1f quadrilhões"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s quadrilhão"
 msgstr[1] "%(value)s quadrilhões"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f quintilhão"
 msgstr[1] "%(value).1f quintilhões"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s quintilhão"
 msgstr[1] "%(value)s quintilhões"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sextilhão"
 msgstr[1] "%(value).1f sextilhões"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sextilhão"
 msgstr[1] "%(value)s sextilhões"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septilhão"
 msgstr[1] "%(value).1f septilhões"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septilhão"
 msgstr[1] "%(value)s septilhões"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f octilhão"
 msgstr[1] "%(value).1f octilhões"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s octilhão"
 msgstr[1] "%(value)s octilhões"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f nonilhão"
 msgstr[1] "%(value).1f nonilhões"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s nonilhão"
 msgstr[1] "%(value)s nonilhões"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f decilhão"
+msgstr[1] "%(value).1f decilhões"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s decilhão"
+msgstr[1] "%(value)s decilhões"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "um"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dois"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "três"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "quatro"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sete"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "oito"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nove"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s atrás"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "agora"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "há 1 segundo"
 msgstr[1] "há %(count)s segundos"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "há 1 minuto"
 msgstr[1] "há %(count)s minutos"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "há 1 hora"
 msgstr[1] "há %(count)s horas"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s a partir de agora"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "1 segundo a partir de agora"
 msgstr[1] "%(count)s segundos a partir de agora"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "1 minuto a partir de agora"
 msgstr[1] "%(count)s minutos a partir de agora"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo
index e335921c34..a1dfb625ae 100644
Binary files a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po
index 8d516be94b..2795c20d38 100644
--- a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po
@@ -8,47 +8,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: sorin <sorin.sbarnea@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "astăzi"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "ieri"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "mâine"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "ul"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ul"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "lea"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "lea"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -56,7 +56,7 @@ msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f milioane"
 msgstr[2] "%(value).1f de milione"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -64,7 +64,7 @@ msgstr[0] "%(value)s milion"
 msgstr[1] "%(value)s milioane"
 msgstr[2] "%(value)s de milioane"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -72,7 +72,7 @@ msgstr[0] "%(value).1f miliard"
 msgstr[1] "%(value).1f miliarde"
 msgstr[2] "%(value).1f de miliarde"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -80,7 +80,7 @@ msgstr[0] "%(value)s miliard"
 msgstr[1] "%(value)s miliarde"
 msgstr[2] "%(value)s de miliarde"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -88,7 +88,7 @@ msgstr[0] "%(value).1f trilion"
 msgstr[1] "%(value).1f trilioane"
 msgstr[2] "%(value).1f de trilioane"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -96,7 +96,7 @@ msgstr[0] "%(value)s trilion"
 msgstr[1] "%(value)s trilioane"
 msgstr[2] "%(value)s de trilioane"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -104,7 +104,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -112,7 +112,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -120,7 +120,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -128,7 +128,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -136,7 +136,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -144,7 +144,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -152,7 +152,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -160,7 +160,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -168,7 +168,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -176,7 +176,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -184,7 +184,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -192,7 +192,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -200,7 +200,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -208,7 +208,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -216,7 +216,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -224,53 +224,53 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "unu"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "doi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "trei"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "patru"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "cinci"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "șase"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "șapte"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "opt"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nouă"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "acum %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "acum"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -278,7 +278,7 @@ msgstr[0] "acum o secundă"
 msgstr[1] "acum %(count)s secunde"
 msgstr[2] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -286,7 +286,7 @@ msgstr[0] "acum un minut"
 msgstr[1] "acum %(count)s minute "
 msgstr[2] "acum %(count)s de minute "
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -294,13 +294,13 @@ msgstr[0] "acum o oră"
 msgstr[1] "acum %(count)s ore"
 msgstr[2] "acum %(count)s de ore"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s de acum"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -308,7 +308,7 @@ msgstr[0] "o secundă de acum"
 msgstr[1] "%(count)s secunde de acum"
 msgstr[2] "%(count)s de secunde de acum"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -316,7 +316,7 @@ msgstr[0] "un minut de acum"
 msgstr[1] "%(count)s minute de acum"
 msgstr[2] "%(count)s de ore de acum"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo
index b74478aae9..972d4051f1 100644
Binary files a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po
index a59e996baa..b99d741b2d 100644
--- a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po
@@ -9,47 +9,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-07 08:58+0000\n"
 "Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "сегодня"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "вчера"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "завтра"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "ий"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ый"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "ой"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ий"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -57,7 +57,7 @@ msgstr[0] "%(value).1f миллион"
 msgstr[1] "%(value).1f миллиона"
 msgstr[2] "%(value).1f миллионов"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -65,7 +65,7 @@ msgstr[0] "%(value)s миллион"
 msgstr[1] "%(value)s миллиона"
 msgstr[2] "%(value)s миллионов"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -73,7 +73,7 @@ msgstr[0] "%(value).1f миллиард"
 msgstr[1] "%(value).1f миллиарда"
 msgstr[2] "%(value).1f миллиардов"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -81,7 +81,7 @@ msgstr[0] "%(value)s миллиард"
 msgstr[1] "%(value)s миллиарда"
 msgstr[2] "%(value)s миллиардов"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -89,7 +89,7 @@ msgstr[0] "%(value).1f триллион"
 msgstr[1] "%(value).1f триллиона"
 msgstr[2] "%(value).1f триллионов"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -97,7 +97,7 @@ msgstr[0] "%(value)s триллион"
 msgstr[1] "%(value)s триллиона"
 msgstr[2] "%(value)s триллионов"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -105,7 +105,7 @@ msgstr[0] "%(value).1f квадриллион"
 msgstr[1] "%(value).1f квадриллиона"
 msgstr[2] "%(value).1f квадриллионов"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -113,7 +113,7 @@ msgstr[0] "%(value)s квадриллион"
 msgstr[1] "%(value)s квадриллиона"
 msgstr[2] "%(value)s квадриллионов"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -121,7 +121,7 @@ msgstr[0] "%(value).1f квинтиллион"
 msgstr[1] "%(value).1f квинтиллиона"
 msgstr[2] "%(value).1f квинтиллионов"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -129,7 +129,7 @@ msgstr[0] "%(value)s квинтиллион"
 msgstr[1] "%(value)s квинтиллиона"
 msgstr[2] "%(value)s квинтиллионов"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -137,7 +137,7 @@ msgstr[0] "%(value).1f секстиллион"
 msgstr[1] "%(value).1f секстиллиона"
 msgstr[2] "%(value).1f секстиллионов"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -145,7 +145,7 @@ msgstr[0] "%(value)s секстиллион"
 msgstr[1] "%(value)s секстиллиона"
 msgstr[2] "%(value)s секстиллионов"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -153,7 +153,7 @@ msgstr[0] "%(value).1f септиллион"
 msgstr[1] "%(value).1f септиллиона"
 msgstr[2] "%(value).1f септиллионов"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -161,7 +161,7 @@ msgstr[0] "%(value)s септиллион"
 msgstr[1] "%(value)s септиллиона"
 msgstr[2] "%(value)s септиллионов"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -169,7 +169,7 @@ msgstr[0] "%(value).1f октиллион"
 msgstr[1] "%(value).1f октиллиона"
 msgstr[2] "%(value).1f октиллионов"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -177,7 +177,7 @@ msgstr[0] "%(value)s октиллион"
 msgstr[1] "%(value)s октиллиона"
 msgstr[2] "%(value)s октиллионов"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -185,7 +185,7 @@ msgstr[0] "%(value).1f нониллион"
 msgstr[1] "%(value).1f нониллиона"
 msgstr[2] "%(value).1f нониллионов"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -193,7 +193,7 @@ msgstr[0] "%(value)s нониллион"
 msgstr[1] "%(value)s нониллиона"
 msgstr[2] "%(value)s нониллионов"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -201,7 +201,7 @@ msgstr[0] "%(value).1f дециллион"
 msgstr[1] "%(value).1f дециллиона"
 msgstr[2] "%(value).1f дециллионов"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -209,7 +209,7 @@ msgstr[0] "%(value)s дециллион"
 msgstr[1] "%(value)s дециллиона"
 msgstr[2] "%(value)s дециллионов"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -217,7 +217,7 @@ msgstr[0] "%(value).1f гугол"
 msgstr[1] "%(value).1f гугола"
 msgstr[2] "%(value).1f гуголов"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -225,53 +225,53 @@ msgstr[0] "%(value)s гугол"
 msgstr[1] "%(value)s гугола"
 msgstr[2] "%(value)s гуголов"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "один"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "четыре"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "пять"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "шесть"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "семь"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "восемь"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "девять"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s назад"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "сейчас"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -279,7 +279,7 @@ msgstr[0] "%(count)s секунду назад"
 msgstr[1] "%(count)s секунды назад"
 msgstr[2] "%(count)s секунд назад"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -287,7 +287,7 @@ msgstr[0] "%(count)s минуту назад"
 msgstr[1] "%(count)s минуты назад"
 msgstr[2] "%(count)s минут назад"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -295,13 +295,13 @@ msgstr[0] "%(count)s час назад"
 msgstr[1] "%(count)s часа назад"
 msgstr[2] "%(count)s часов назад"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "через %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -309,7 +309,7 @@ msgstr[0] "через %(count)s секунду"
 msgstr[1] "через %(count)s секунды"
 msgstr[2] "через %(count)s секунд"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -317,7 +317,7 @@ msgstr[0] "через %(count)s минуту"
 msgstr[1] "через %(count)s минуты"
 msgstr[2] "через %(count)s минут"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo
index 8d459c416f..1588323e94 100644
Binary files a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po
index e82874cb78..7219a3f09c 100644
--- a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po
@@ -7,46 +7,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "dnes"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "včera"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "zajtra"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -54,7 +54,7 @@ msgstr[0] "%(value).1f milión"
 msgstr[1] "%(value).1f milióny"
 msgstr[2] "%(value).1f miliónov"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -62,7 +62,7 @@ msgstr[0] " %(value)s milión"
 msgstr[1] " %(value)s milióny"
 msgstr[2] " %(value)s miliónov"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -70,7 +70,7 @@ msgstr[0] "%(value).1f miliárda"
 msgstr[1] "%(value).1f miliardy"
 msgstr[2] "%(value).1f miliárd"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -78,7 +78,7 @@ msgstr[0] " %(value)s miliarda"
 msgstr[1] " %(value)s miliardy"
 msgstr[2] " %(value)s miliárd"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -86,7 +86,7 @@ msgstr[0] "%(value).1f bilión"
 msgstr[1] "%(value).1f bilióny"
 msgstr[2] "%(value).1f biliónov"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -94,7 +94,7 @@ msgstr[0] "%(value)s bilión"
 msgstr[1] "%(value)s bilióny"
 msgstr[2] "%(value)s biliónov"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -102,7 +102,7 @@ msgstr[0] "%(value).1f biliardy"
 msgstr[1] "%(value).1f biliardy"
 msgstr[2] "%(value).1f biliárd"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -110,7 +110,7 @@ msgstr[0] "%(value)s biliarda"
 msgstr[1] "%(value)s biliardy"
 msgstr[2] "%(value)s biliárd"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -118,7 +118,7 @@ msgstr[0] "%(value).1f triliónu"
 msgstr[1] "%(value).1f triliónu"
 msgstr[2] "%(value).1f triliónu"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -126,7 +126,7 @@ msgstr[0] "%(value)s trilión"
 msgstr[1] "%(value)s trilióny"
 msgstr[2] "%(value)s triliónov"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -134,7 +134,7 @@ msgstr[0] "%(value).1f triliardy"
 msgstr[1] "%(value).1f triliardy"
 msgstr[2] "%(value).1f triliárd"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -142,7 +142,7 @@ msgstr[0] "%(value)s triliarda"
 msgstr[1] "%(value)s triliardy"
 msgstr[2] "%(value)s triliárd"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -150,7 +150,7 @@ msgstr[0] "%(value).1f kvadriliónu"
 msgstr[1] "%(value).1f kvadriliónu"
 msgstr[2] "%(value).1f kvadriliónov"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -158,7 +158,7 @@ msgstr[0] "%(value)s kvadrilión"
 msgstr[1] "%(value)s kvadrilióny"
 msgstr[2] "%(value)s kvadriliónov"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -166,7 +166,7 @@ msgstr[0] "%(value).1f kvadriliardy"
 msgstr[1] "%(value).1f kvadriliardy"
 msgstr[2] "%(value).1f kvadriliárd"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -174,7 +174,7 @@ msgstr[0] "%(value)s kvadriliarda"
 msgstr[1] "%(value)s kvadriliardy"
 msgstr[2] "%(value)s kvadriliárd"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -182,7 +182,7 @@ msgstr[0] "%(value).1f kvintiliónu"
 msgstr[1] "%(value).1f kvintiliónu"
 msgstr[2] "%(value).1f kvintiliónov"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -190,7 +190,7 @@ msgstr[0] "%(value)s kvintilión"
 msgstr[1] "%(value)s kvintilióny"
 msgstr[2] "%(value)s kvintiliónov"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -198,7 +198,7 @@ msgstr[0] "%(value).1f kvintiliardy"
 msgstr[1] "%(value).1f kvintiliardy"
 msgstr[2] "%(value).1f kvintiliárd"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -206,7 +206,7 @@ msgstr[0] "%(value)s kvintiliarda"
 msgstr[1] "%(value)s kvintiliardy"
 msgstr[2] "%(value)s kvintiliárd"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -214,7 +214,7 @@ msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googol"
 msgstr[2] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -222,53 +222,53 @@ msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googol"
 msgstr[2] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "jeden"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "štyri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "päť"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "šesť"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sedem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "osem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "deväť"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "pred %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "teraz"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -276,7 +276,7 @@ msgstr[0] "pred sekundou"
 msgstr[1] "pred %(count)s sekundami"
 msgstr[2] "pred %(count)s sekundami"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -284,7 +284,7 @@ msgstr[0] "pred minútou"
 msgstr[1] "pred %(count)s minútami"
 msgstr[2] "pred %(count)s minútami"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -292,13 +292,13 @@ msgstr[0] "pred hodinou"
 msgstr[1] "pred %(count)s hodinami"
 msgstr[2] "pred %(count)s hodinami"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s odteraz"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -306,7 +306,7 @@ msgstr[0] "sekundu odteraz"
 msgstr[1] "%(count)s sekundy odteraz"
 msgstr[2] "%(count)s sekúnd odteraz"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -314,7 +314,7 @@ msgstr[0] "minútu odteraz"
 msgstr[1] "%(count)s minúty odteraz"
 msgstr[2] "%(count)s minút odteraz"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo
index 01e26e28fb..28437d72c3 100644
Binary files a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po
index 212ac98a62..20ce6e1cd7 100644
--- a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po
@@ -1,354 +1,356 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Gašper Žejn <zejn@kiberpipa.org>, 2011.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # Jure Cuhalev <gandalf@owca.info>, 2011.
+# Jure Čuhalev <gandalf@owca.info>, 2011.
 #   <zejn@kiberpipa.org>, 2011.
 # zejn <zejn@kiberpipa.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-10-31 19:15+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "danes"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "včeraj"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "jutri"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
-msgstr[0] "%(value).1f milijon"
-msgstr[1] "%(value).1f milijona"
-msgstr[2] "%(value).1f milijoni"
-msgstr[3] "%(value).1f milijonov"
+msgstr[0] "%(value).1f milijonov"
+msgstr[1] "%(value).1f milijon"
+msgstr[2] "%(value).1f milijona"
+msgstr[3] "%(value).1f milijoni"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] "%(value)s milijon"
-msgstr[1] "%(value)s milijona"
-msgstr[2] "%(value)s milijoni"
-msgstr[3] "%(value)s milijonov"
-
-#: templatetags/humanize.py:57
-#, python-format
-msgid "%(value).1f billion"
-msgid_plural "%(value).1f billion"
-msgstr[0] "%(value).1f miljarda"
-msgstr[1] "%(value).1f miljardi"
-msgstr[2] "%(value).1f miljarde"
-msgstr[3] "%(value).1f miljard"
+msgstr[0] "%(value)s milijonov"
+msgstr[1] "%(value)s milijon"
+msgstr[2] "%(value)s milijona"
+msgstr[3] "%(value)s milijoni"
 
 #: templatetags/humanize.py:58
 #, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f miljard"
+msgstr[1] "%(value).1f miljarda"
+msgstr[2] "%(value).1f miljardi"
+msgstr[3] "%(value).1f miljarde"
+
+#: templatetags/humanize.py:59
+#, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] "%(value)s miljarda"
-msgstr[1] "%(value)s miljardi"
-msgstr[2] "%(value)s miljarde"
-msgstr[3] "%(value)s miljard"
-
-#: templatetags/humanize.py:61
-#, python-format
-msgid "%(value).1f trillion"
-msgid_plural "%(value).1f trillion"
-msgstr[0] "%(value).1f triljon"
-msgstr[1] "%(value).1f triljona"
-msgstr[2] "%(value).1f triljoni"
-msgstr[3] "%(value).1f triljonov"
+msgstr[0] "%(value)s miljard"
+msgstr[1] "%(value)s miljarda"
+msgstr[2] "%(value)s miljardi"
+msgstr[3] "%(value)s miljarde"
 
 #: templatetags/humanize.py:62
 #, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f triljonov"
+msgstr[1] "%(value).1f triljon"
+msgstr[2] "%(value).1f triljona"
+msgstr[3] "%(value).1f triljoni"
+
+#: templatetags/humanize.py:63
+#, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] "%(value)s triljon"
-msgstr[1] "%(value)s triljona"
-msgstr[2] "%(value)s triljoni"
-msgstr[3] "%(value)s triljonov"
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] "%(value).1f  kvadrilijon"
-msgstr[1] "%(value).1f  kvadrilijona"
-msgstr[2] "%(value).1f  kvadrilijoni"
-msgstr[3] "%(value).1f  kvadrilijonov"
+msgstr[0] "%(value)s triljonov"
+msgstr[1] "%(value)s triljon"
+msgstr[2] "%(value)s triljona"
+msgstr[3] "%(value)s triljoni"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f  kvadrilijonov"
+msgstr[1] "%(value).1f  kvadrilijon"
+msgstr[2] "%(value).1f  kvadrilijona"
+msgstr[3] "%(value).1f  kvadrilijoni"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] "%(value)s kvadrilijon"
-msgstr[1] "%(value)s kvadrilijona"
-msgstr[2] "%(value)s kvadrilijoni"
-msgstr[3] "%(value)s kvadrilijonov"
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] "%(value).1f kvintilijon"
-msgstr[1] "%(value).1f kvintilijona"
-msgstr[2] "%(value).1f kvintilijoni"
-msgstr[3] "%(value).1f kvintilijonov"
+msgstr[0] "%(value)s kvadrilijonov"
+msgstr[1] "%(value)s kvadrilijon"
+msgstr[2] "%(value)s kvadrilijona"
+msgstr[3] "%(value)s kvadrilijoni"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kvintilijonov"
+msgstr[1] "%(value).1f kvintilijon"
+msgstr[2] "%(value).1f kvintilijona"
+msgstr[3] "%(value).1f kvintilijoni"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] "%(value)s kvintilijon"
-msgstr[1] "%(value)s kvintilijona"
-msgstr[2] "%(value)s kvintilijoni"
-msgstr[3] "%(value)s kvintilijonov"
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] "%(value).1f sekstilijon"
-msgstr[1] "%(value).1f sekstilijona"
-msgstr[2] "%(value).1f sekstilijoni"
-msgstr[3] "%(value).1f sekstilijonov"
+msgstr[0] "%(value)s kvintilijonov"
+msgstr[1] "%(value)s kvintilijon"
+msgstr[2] "%(value)s kvintilijona"
+msgstr[3] "%(value)s kvintilijoni"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sekstilijonov"
+msgstr[1] "%(value).1f sekstilijon"
+msgstr[2] "%(value).1f sekstilijona"
+msgstr[3] "%(value).1f sekstilijoni"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] "%(value)s sekstilijon"
-msgstr[1] "%(value)s sekstilijona"
-msgstr[2] "%(value)s sekstilijoni"
-msgstr[3] "%(value)s sekstilijonov"
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] "%(value).1f septilijon"
-msgstr[1] "%(value).1f septilijona"
-msgstr[2] "%(value).1f septilijoni"
-msgstr[3] "%(value).1f septilijonov"
+msgstr[0] "%(value)s sekstilijonov"
+msgstr[1] "%(value)s sekstilijon"
+msgstr[2] "%(value)s sekstilijona"
+msgstr[3] "%(value)s sekstilijoni"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilijonov"
+msgstr[1] "%(value).1f septilijon"
+msgstr[2] "%(value).1f septilijona"
+msgstr[3] "%(value).1f septilijoni"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] "%(value)s septilijon"
-msgstr[1] "%(value)s septilijona"
-msgstr[2] "%(value)s septilijon"
-msgstr[3] "%(value)s septilijonov"
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] "%(value).1f oktilijon"
-msgstr[1] "%(value).1f oktilijona"
-msgstr[2] "%(value).1f oktilijoni"
-msgstr[3] "%(value).1f oktilijonov"
+msgstr[0] "%(value)s septilijonov"
+msgstr[1] "%(value)s septilijon"
+msgstr[2] "%(value)s septilijona"
+msgstr[3] "%(value)s septilijoni"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktilijonov"
+msgstr[1] "%(value).1f oktilijon"
+msgstr[2] "%(value).1f oktilijona"
+msgstr[3] "%(value).1f oktilijoni"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] "%(value)s oktilijon"
-msgstr[1] "%(value)s oktilijona"
-msgstr[2] "%(value)s oktilijoni"
-msgstr[3] "%(value)s oktilijonov"
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] "%(value).1f nonilijon"
-msgstr[1] "%(value).1f nonilijona"
-msgstr[2] "%(value).1f nonilijoni"
-msgstr[3] "%(value).1f nonilijonov"
+msgstr[0] "%(value)s oktilijonov"
+msgstr[1] "%(value)s oktilijon"
+msgstr[2] "%(value)s oktilijona"
+msgstr[3] "%(value)s oktilijoni"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonilijonov"
+msgstr[1] "%(value).1f nonilijon"
+msgstr[2] "%(value).1f nonilijona"
+msgstr[3] "%(value).1f nonilijoni"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] "%(value)s nonilijon"
-msgstr[1] "%(value)s nonilijona"
-msgstr[2] "%(value)s nonilijon"
-msgstr[3] "%(value)s nonilijonov"
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] "%(value).1f decilijon"
-msgstr[1] "%(value).1f decilijona"
-msgstr[2] "%(value).1f decilijoni"
-msgstr[3] "%(value).1f decilijonov"
+msgstr[0] "%(value)s nonilijonov"
+msgstr[1] "%(value)s nonilijon"
+msgstr[2] "%(value)s nonilijona"
+msgstr[3] "%(value)s nonilijoni"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decilijonov"
+msgstr[1] "%(value).1f decilijon"
+msgstr[2] "%(value).1f decilijona"
+msgstr[3] "%(value).1f decilijoni"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] "%(value)s decilijon"
-msgstr[1] "%(value)s decilijona"
-msgstr[2] "%(value)s decilijoni"
-msgstr[3] "%(value)s decilijonov"
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] "%(value).1f googol"
-msgstr[1] "%(value).1f googola"
-msgstr[2] "%(value).1f googoli"
-msgstr[3] "%(value).1f googolov"
+msgstr[0] "%(value)s decilijonov"
+msgstr[1] "%(value)s decilijon"
+msgstr[2] "%(value)s decilijona"
+msgstr[3] "%(value)s decilijoni"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f gugolov"
+msgstr[1] "%(value).1f gugol"
+msgstr[2] "%(value).1f gugola"
+msgstr[3] "%(value).1f gugoli"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] "%(value)s googol"
-msgstr[1] "%(value)s googola"
-msgstr[2] "%(value)s googoli"
-msgstr[3] "%(value)s googolov"
+msgstr[0] "%(value)s gugolov"
+msgstr[1] "%(value)s gugol"
+msgstr[2] "%(value)s gugola"
+msgstr[3] "%(value)s gugoli"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ena"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
-msgstr "dva"
+msgstr "dve"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "štiri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "pet"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sedem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "osem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "devet"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "Pred %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "zdaj"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
-msgstr[0] "pred sekundo"
-msgstr[1] ""
-msgstr[2] "pred %(count)s sekundami"
+msgstr[0] "pred %(count)s sekundami"
+msgstr[1] "pred %(count)s sekundo"
+msgstr[2] "pred %(count)s sekundama"
 msgstr[3] "pred %(count)s sekundami"
 
-#: templatetags/humanize.py:196
-#, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] "pred minuto"
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] "pred minuto"
-
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "pred %(count)s minutami"
+msgstr[1] "pred %(count)s minuto"
+msgstr[2] "pred %(count)s minutama"
+msgstr[3] "pred %(count)s minutami"
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] "pred eno uro"
+msgstr[0] "pred %(count)s urami"
+msgstr[1] "pred %(count)s uro"
+msgstr[2] "pred %(count)s urama"
+msgstr[3] "pred %(count)s urami"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "čez %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
-msgstr[0] "čez sekundo"
-msgstr[1] ""
-msgstr[2] "čez %(count)s sekunde"
-msgstr[3] "čez %(count)s sekund"
-
-#: templatetags/humanize.py:218
-#, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] "čez minuto"
-msgstr[1] ""
-msgstr[2] "čez %(count)s minute"
-msgstr[3] "čez %(count)s minut"
+msgstr[0] "čez %(count)s sekund"
+msgstr[1] "čez %(count)s sekundo"
+msgstr[2] "čez %(count)s sekundi"
+msgstr[3] "čez %(count)s sekunde"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "čez %(count)s minut"
+msgstr[1] "čez %(count)s minuto"
+msgstr[2] "čez %(count)s minuti"
+msgstr[3] "čez %(count)s minute"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] "čez eno uro"
-msgstr[1] ""
-msgstr[2] "čez %(count)s ure"
-msgstr[3] "čez %(count)s ur"
+msgstr[0] "čez %(count)s ur"
+msgstr[1] "čez %(count)s uro"
+msgstr[2] "čez %(count)s uri"
+msgstr[3] "čez %(count)s ure"
diff --git a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo
index 21aa21ec87..d45f85c95f 100644
Binary files a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po
index 5ea04d7124..ca393296de 100644
--- a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po
@@ -6,289 +6,289 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-11-25 19:51+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "sot"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "dje"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "nesër"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
-msgstr ""
+msgstr "ti"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
-msgstr ""
+msgstr "ti"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
-msgstr ""
+msgstr "ti"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f milionë"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s milion"
+msgstr[1] "%(value)s milionë"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miliard"
 msgstr[1] "%(value).1f miliardë"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s miliard"
+msgstr[1] "%(value)s miliardë"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilion"
 msgstr[1] "%(value).1f trilionë"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s trilion"
+msgstr[1] "%(value)s trilionë"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f kuadrilion"
+msgstr[1] "%(value).1f kuadrilionë"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s kuadrilion"
+msgstr[1] "%(value)s kuadrilionë"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kuintilion"
+msgstr[1] "%(value).1f kuintilionë"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s kuintilionë"
+msgstr[1] "%(value)s kuintilionë"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sestilion"
+msgstr[1] "%(value).1f sestilionë"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s sestilion"
+msgstr[1] "%(value)s sestilionë"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilion"
+msgstr[1] "%(value).1f septilionë"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s septilion"
+msgstr[1] "%(value)s septilionë"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktilion"
+msgstr[1] "%(value).1f oktilionë"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s oktilion"
+msgstr[1] "%(value)s oktilionë"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonilion"
+msgstr[1] "%(value).1f nonilionë"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s nonilion"
+msgstr[1] "%(value)s nonilionë"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decilion"
+msgstr[1] "%(value).1f decilionë"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s decillion"
+msgstr[1] "%(value)s decilionë"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f gugol"
+msgstr[1] "%(value).1f gugolë"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value)s gugol"
+msgstr[1] "%(value)s gugolë"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "një"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dy"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "katër"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "pesë"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "gjashtë"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "shtatë"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "tetë"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nëntë"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "%(delta)s më parë"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
-
-#: templatetags/humanize.py:191
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "tani"
 
 #: templatetags/humanize.py:196
 #, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "një sekondë më parë"
+msgstr[1] "%(count)s sekonda më parë"
 
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "një minutë më parë"
+msgstr[1] "%(count)s minuta më parë"
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "një orë më parë"
+msgstr[1] "%(count)s orë më parë"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "%(delta)s nga tani"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
-msgstr[1] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "një sekondë nga tani"
+msgstr[1] "%(count)s sekonda nga tani"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "një minutë nga tani"
+msgstr[1] "%(count)s minuta nga tani"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "një orë nga tani"
+msgstr[1] "%(count)s orë nga tani"
diff --git a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo
index 8dad4bebfc..82ffab2c4d 100644
Binary files a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po
index 239b4e27a6..dafecf4c4c 100644
--- a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po
@@ -7,47 +7,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-20 15:05+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "десет"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "јуче"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "сутра"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "-и"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "-ви"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "-и"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "-и"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -55,7 +55,7 @@ msgstr[0] "%(value).1f милион"
 msgstr[1] "%(value).1f милиона"
 msgstr[2] "%(value).1f милиона"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -63,7 +63,7 @@ msgstr[0] "%(value)s милион"
 msgstr[1] "%(value)s милиона"
 msgstr[2] "%(value)s милиона"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -71,7 +71,7 @@ msgstr[0] "%(value).1f билион"
 msgstr[1] "%(value).1f билиона"
 msgstr[2] "%(value).1f билиона"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -79,7 +79,7 @@ msgstr[0] "%(value)s билион"
 msgstr[1] "%(value)s билиона"
 msgstr[2] "%(value)s билиона"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -87,7 +87,7 @@ msgstr[0] "%(value).1f трилион"
 msgstr[1] "%(value).1f трилиона"
 msgstr[2] "%(value).1f трилиона"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -95,7 +95,7 @@ msgstr[0] "%(value)s трилион"
 msgstr[1] "%(value)s трилиона"
 msgstr[2] "%(value)s трилиона"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -103,7 +103,7 @@ msgstr[0] "%(value).1f квадрилион"
 msgstr[1] "%(value).1f квадрилиона"
 msgstr[2] "%(value).1f квадрилиона"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -111,7 +111,7 @@ msgstr[0] "%(value)s квадрилион"
 msgstr[1] "%(value)s квадрилиона"
 msgstr[2] "%(value)s квадрилиона"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -119,7 +119,7 @@ msgstr[0] "%(value).1f квинтилион"
 msgstr[1] "%(value).1f квинтилиона"
 msgstr[2] "%(value).1f квинтилиона"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -127,7 +127,7 @@ msgstr[0] "%(value)s квинтилион"
 msgstr[1] "%(value)s квинтилиона"
 msgstr[2] "%(value)s квинтилиона"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -135,7 +135,7 @@ msgstr[0] "%(value).1f секстилион"
 msgstr[1] "%(value).1f секстилиона"
 msgstr[2] "%(value).1f секстилиона"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -143,7 +143,7 @@ msgstr[0] "%(value)s секстилион"
 msgstr[1] "%(value)s секстилиона"
 msgstr[2] "%(value)s секстилиона"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -151,7 +151,7 @@ msgstr[0] "%(value).1f септилион"
 msgstr[1] "%(value).1f септилиона"
 msgstr[2] "%(value).1f септилиона"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -159,7 +159,7 @@ msgstr[0] "%(value)s септилион"
 msgstr[1] "%(value)s септилиона"
 msgstr[2] "%(value)s септилиона"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -167,7 +167,7 @@ msgstr[0] "%(value).1f окталион"
 msgstr[1] "%(value).1f окталиона"
 msgstr[2] "%(value).1f окталиона"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -175,7 +175,7 @@ msgstr[0] "%(value)s окталион"
 msgstr[1] "%(value)s окталиона"
 msgstr[2] "%(value)s окталиона"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -183,7 +183,7 @@ msgstr[0] "%(value).1f нонилион"
 msgstr[1] "%(value).1f нонилиона"
 msgstr[2] "%(value).1f нонилиона"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -191,7 +191,7 @@ msgstr[0] "%(value)s нонилион"
 msgstr[1] "%(value)s нонилиона"
 msgstr[2] "%(value)s нонилиона"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -199,7 +199,7 @@ msgstr[0] "%(value).1f дектилион"
 msgstr[1] "%(value).1f дектилиона"
 msgstr[2] "%(value).1f дектилиона"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -207,7 +207,7 @@ msgstr[0] "%(value)s дектилион"
 msgstr[1] "%(value)s дектилиона"
 msgstr[2] "%(value)s дектилиона"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -215,7 +215,7 @@ msgstr[0] "%(value).1f гугол"
 msgstr[1] "%(value).1f гугола"
 msgstr[2] "%(value).1f гугола"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -223,53 +223,53 @@ msgstr[0] "%(value)s гугол"
 msgstr[1] "%(value)s гугола"
 msgstr[2] "%(value)s гугола"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "један"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "четири"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "пет"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "шест"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "седам"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "осам"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "девет"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "пре %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "сада"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -277,7 +277,7 @@ msgstr[0] "пре једне секунде"
 msgstr[1] "пре %(count)s секунде"
 msgstr[2] "пре %(count)s секунди"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -285,7 +285,7 @@ msgstr[0] "пре једног минута"
 msgstr[1] "пре %(count)s минута"
 msgstr[2] "пре %(count)s минута"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -293,13 +293,13 @@ msgstr[0] "пре једног сата"
 msgstr[1] "пре %(count)s сата"
 msgstr[2] "пре %(count)s сати"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "за %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -307,7 +307,7 @@ msgstr[0] "за једну секунду"
 msgstr[1] "за %(count)s секунде"
 msgstr[2] "за %(count)s секунди"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -315,7 +315,7 @@ msgstr[0] "за један минут"
 msgstr[1] "за %(count)s минута"
 msgstr[2] "за %(count)s минута"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo
index 3240e6198e..37857822eb 100644
Binary files a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po
index 34a5d3989e..226beb1957 100644
--- a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po
@@ -7,47 +7,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-05 14:01+0000\n"
 "Last-Translator: Janos Guljas <janos@resenje.org>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "deset"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "juče"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "sutra"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "-i"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "-vi"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "-i"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "-i"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -55,7 +55,7 @@ msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f miliona"
 msgstr[2] "%(value).1f miliona"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -63,7 +63,7 @@ msgstr[0] "%(value)s milion"
 msgstr[1] "%(value)s miliona"
 msgstr[2] "%(value)s miliona"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -71,7 +71,7 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliona"
 msgstr[2] "%(value).1f biliona"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -79,7 +79,7 @@ msgstr[0] "%(value)s bilion"
 msgstr[1] "%(value)s biliona"
 msgstr[2] "%(value)s biliona"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -87,7 +87,7 @@ msgstr[0] "%(value).1f trilion"
 msgstr[1] "%(value).1f triliona"
 msgstr[2] "%(value).1f triliona"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -95,7 +95,7 @@ msgstr[0] "%(value)s trilion"
 msgstr[1] "%(value)s triliona"
 msgstr[2] "%(value)s triliona"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -103,7 +103,7 @@ msgstr[0] "%(value).1f kvadrilion"
 msgstr[1] "%(value).1f kvadriliona"
 msgstr[2] "%(value).1f kvadriliona"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -111,7 +111,7 @@ msgstr[0] "%(value)s kvadrilion"
 msgstr[1] "%(value)s kvadriliona"
 msgstr[2] "%(value)s kvadriliona"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -119,7 +119,7 @@ msgstr[0] "%(value).1f kvintilion"
 msgstr[1] "%(value).1f kvintiliona"
 msgstr[2] "%(value).1f kvintiliona"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -127,7 +127,7 @@ msgstr[0] "%(value)s kvintilion"
 msgstr[1] "%(value)s kvintiliona"
 msgstr[2] "%(value)s kvintiliona"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -135,7 +135,7 @@ msgstr[0] "%(value).1f sekstilion"
 msgstr[1] "%(value).1f sekstiliona"
 msgstr[2] "%(value).1f sekstiliona"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -143,7 +143,7 @@ msgstr[0] "%(value)s sekstilion"
 msgstr[1] "%(value)s sekstiliona"
 msgstr[2] "%(value)s sekstiliona"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -151,7 +151,7 @@ msgstr[0] "%(value).1f septilion"
 msgstr[1] "%(value).1f septiliona"
 msgstr[2] "%(value).1f septiliona"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -159,7 +159,7 @@ msgstr[0] "%(value)s septilion"
 msgstr[1] "%(value)s septiliona"
 msgstr[2] "%(value)s septiliona"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -167,7 +167,7 @@ msgstr[0] "%(value).1f oktalion"
 msgstr[1] "%(value).1f oktaliona"
 msgstr[2] "%(value).1f oktaliona"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -175,7 +175,7 @@ msgstr[0] "%(value)s oktalion"
 msgstr[1] "%(value)s oktaliona"
 msgstr[2] "%(value)s oktaliona"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -183,7 +183,7 @@ msgstr[0] "%(value).1f nonilion"
 msgstr[1] "%(value).1f noniliona"
 msgstr[2] "%(value).1f noniliona"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -191,7 +191,7 @@ msgstr[0] "%(value)s nonilion"
 msgstr[1] "%(value)s noniliona"
 msgstr[2] "%(value)s noniliona"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -199,7 +199,7 @@ msgstr[0] "%(value).1f dektilion"
 msgstr[1] "%(value).1f dektiliona"
 msgstr[2] "%(value).1f dektiliona"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -207,7 +207,7 @@ msgstr[0] "%(value)s dektilion"
 msgstr[1] "%(value)s dektiliona"
 msgstr[2] "%(value)s dektiliona"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -215,7 +215,7 @@ msgstr[0] "%(value).1f gugol"
 msgstr[1] "%(value).1f gugola"
 msgstr[2] "%(value).1f gugola"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -223,53 +223,53 @@ msgstr[0] "%(value)s gugol"
 msgstr[1] "%(value)s gugola"
 msgstr[2] "%(value)s gugola"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "jedan"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "četiri"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "pet"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sedam"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "osam"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "devet"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "pre %(delta)s"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "sada"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -277,7 +277,7 @@ msgstr[0] "pre jedne sekunde"
 msgstr[1] "pre %(count)s sekunde"
 msgstr[2] "pre %(count)s sekundi"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -285,7 +285,7 @@ msgstr[0] "pre jednog minuta"
 msgstr[1] "pre %(count)s minuta"
 msgstr[2] "pre %(count)s minuta"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -293,13 +293,13 @@ msgstr[0] "pre jednog sata"
 msgstr[1] "pre %(count)s sata"
 msgstr[2] "pre %(count)s sati"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "za %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -307,7 +307,7 @@ msgstr[0] "za jadnu sekundu"
 msgstr[1] "za %(count)s sekunde"
 msgstr[2] "za %(count)s sekundi"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -315,7 +315,7 @@ msgstr[0] "za jedan minut"
 msgstr[1] "za %(count)s minuta"
 msgstr[2] "za %(count)s minuta"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo
index 82e69b535e..66f0f9344c 100644
Binary files a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po
index 85f28e68ae..ea3fa14c3f 100644
--- a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po
@@ -7,287 +7,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-06 20:29+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "idag"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "igår"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "imorgon"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr ":a"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr ":a"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr ":e"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr ":e"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f miljon"
 msgstr[1] "%(value).1f miljoner"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s miljon"
 msgstr[1] "%(value)s miljoner"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value)1.f miljard"
 msgstr[1] "%(value)1.f miljarder"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s miljard"
 msgstr[1] "%(value)s miljarder"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value)1.f biljon"
 msgstr[1] "%(value)1.f biljoner"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s triljon"
 msgstr[1] "%(value)s triljoner"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f biljard"
 msgstr[1] "%(value).1f biljarder"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s biljard"
 msgstr[1] "%(value)s biljarder"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f kvintiljon"
 msgstr[1] "%(value).1f kvintiljoner"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s kvintiljon"
 msgstr[1] "%(value)s kvintiljoner"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f triljard"
 msgstr[1] "%(value).1f triljarder"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s triljard"
 msgstr[1] "%(value)s triljarder"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f kvadriljon"
 msgstr[1] "%(value).1f kvadriljoner"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s kvadriljon"
 msgstr[1] "%(value)s kvadriljoner"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f kvadriljard"
 msgstr[1] "%(value).1f kvadriljarder"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s kvadriljard"
 msgstr[1] "%(value)s kvadriljarder"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f kvintiljon"
 msgstr[1] "%(value).1f kvintiljoner"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s kvintiljon"
 msgstr[1] "%(value)s kvintiljoner"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f kvintiljard"
 msgstr[1] "%(value).1f kvintiljarder"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s kvintiljard"
 msgstr[1] "%(value)s kvintiljarder"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 msgstr[1] "%(value).1f googoler"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 msgstr[1] "%(value)s googoler"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ett"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "två"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "fyra"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "fem"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sex"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "sju"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "åtta"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "nio"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s sedan"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "nu"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "en sekund sedan"
 msgstr[1] "%(count)s sekunder sedan"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "en minut sedan"
 msgstr[1] "%(count)s minuter sedan"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "en timma sedan"
 msgstr[1] "%(count)s timmar sedan"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s från nu"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "en sekund från nu"
 msgstr[1] "%(count)s sekunder från nu"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "en minut från nu"
 msgstr[1] "%(count)s minuter från nu"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/sw/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sw/LC_MESSAGES/django.mo
index 7d654b547d..dc79ff4d17 100644
Binary files a/django/contrib/humanize/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/sw/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sw/LC_MESSAGES/django.po
index 0553a0a679..80b0d21cbe 100644
--- a/django/contrib/humanize/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sw/LC_MESSAGES/django.po
@@ -5,287 +5,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-07 12:57+0000\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-07-06 18:46+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "leo"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "jana"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "kesho"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr " "
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr " "
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr " "
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr " "
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "milioni %(value).1f"
+msgstr[1] "milioni %(value).1f"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "milioni %(value)s"
 msgstr[1] "milioni %(value)s"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "bilioni %(value).1f"
+msgstr[1] "bilioni %(value).1f"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "bilioni %(value)s"
 msgstr[1] "bilioni %(value)s"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "trilioni %(value).1f"
+msgstr[1] "trilioni %(value).1f"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "trilioni %(value)s"
 msgstr[1] "trilioni %(value)s"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "kuadrilioni %(value).1f"
+msgstr[1] "kuadrilioni %(value).1f"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "kuadrilioni %(value)s"
+msgstr[1] "kuadrilioni %(value)s"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "kuintilioni %(value).1f"
+msgstr[1] "kuintilioni %(value).1f"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "kuintilioni %(value)s"
+msgstr[1] "kuintilioni %(value)s"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "seksitilioni %(value).1f"
+msgstr[1] "seksitilioni %(value).1f"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "seksitilioni %(value)s"
+msgstr[1] "seksitilioni %(value)s"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "septilioni %(value).1f"
+msgstr[1] "septilioni %(value).1f"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "septilioni %(value)s"
 msgstr[1] "septilioni %(value)s"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f oktilioni"
+msgstr[1] "%(value).1f oktilioni"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "oktilioni %(value)s"
 msgstr[1] "oktilioni %(value)s"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "nonilioni %(value).1f"
+msgstr[1] "nonilioni %(value).1f"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "nonilioni %(value)s"
 msgstr[1] "nonilioni %(value)s"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "desilioni %(value).1f"
+msgstr[1] "desilioni %(value).1f"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "desilioni %(value)s"
 msgstr[1] "desilioni %(value)s"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "gogoli %(value).1f"
+msgstr[1] "gogoli %(value).1f"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "gogoli %(value)s"
+msgstr[1] "gogoli %(value)s"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "moja"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "mbili"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "tatu"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "nne"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "tano"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "sita"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "saba"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "nane"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "tisa"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s zilizopita"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "sasa"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "sekunde iliyopita"
 msgstr[1] "sekunde %(count)s zilizopita"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "dakika iliyopita"
 msgstr[1] "dakika %(count)s zilizopita"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "saa iliyopita"
 msgstr[1] "saa %(count)s zilizopita"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s kutoka sasa"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "sekunde moja kutoka sasa"
 msgstr[1] "sekunde %(count)s kutoka sasa"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "dakika moja kutoka sasa"
 msgstr[1] "dakika %(count)s kutoka sasa"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo
index 5a03afc955..55acc54e53 100644
Binary files a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po
index ddd27f8a7c..e7bca62a78 100644
--- a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po
@@ -5,287 +5,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2011-01-19 15:13+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr ""
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr ""
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo
index 288af3fd8f..1b44b477e8 100644
Binary files a/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/te/LC_MESSAGES/django.po b/django/contrib/humanize/locale/te/LC_MESSAGES/django.po
index 56cd2faf46..a4901b2b54 100644
--- a/django/contrib/humanize/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/te/LC_MESSAGES/django.po
@@ -8,287 +8,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "ఈ రోజు"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "రెపు"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "వ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "వ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "వ"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "వ"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ఒక్కటి"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "రెండు"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "మూడు"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "నాలుగు"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "ఐదు"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "ఆరు"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "ఏడు"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "ఎనిమిది "
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "తొమ్మిది"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s క్రితము"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "ఇప్పుడు "
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "ఒక క్షణం క్రితము "
 msgstr[1] "%(count)s క్షణాలు క్రితము "
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "ఒక నిముషము క్రితము "
 msgstr[1] "%(count)s నిముషాల క్రితము "
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "ఒక గంట క్రితము "
 msgstr[1] "%(count)s గంటల క్రితము "
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "ఇప్పటినుండి %(delta)s కు"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "ఒక క్షణములో "
 msgstr[1] "%(count)s క్షణాలో "
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "ఒక నిముషములో "
 msgstr[1] "%(count)s నిముషాలో "
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo
index 8ec80c28f5..1db0c95efb 100644
Binary files a/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/th/LC_MESSAGES/django.po b/django/contrib/humanize/locale/th/LC_MESSAGES/django.po
index 15813862e2..f8a466dc5c 100644
--- a/django/contrib/humanize/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/th/LC_MESSAGES/django.po
@@ -8,260 +8,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Vichai Vongvorakul <vongvichai@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "วันนี้"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "พรุ่งนี้"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f หนึ่งล้าน"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s ล้าน"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f สิบล้าน"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s พันล้าน"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ร้อยล้าน"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] " %(value)s  ล้านล้าน"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f quadrillion"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s quadrillion"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f quintillion"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s quintillion"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f sextillion"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s sextillion"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septillion"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septillion"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f octillion"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s octillion"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f nonillion"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s nonillion"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f decillion"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s decillion"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "หนึ่ง"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "สอง"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "สาม"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "สี่"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "ห้า"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "หก"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "เจ็ด"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "แปด"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "เก้า"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr " %(delta)s  ที่ผ่านมา"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "ขณะนี้"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "%(count)s วินาทีที่ผ่านมา"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "%(count)s นาทีที่แล้ว"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "%(count)s ชั่วโมงที่แล้ว"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s จากนี้"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "%(count)s วินาทีต่อจากนี้"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] " %(count)s  นาทีต่อจากนี้"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo
index c632641ac2..5b8b08836f 100644
Binary files a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po
index 0e811870d6..e7c42cbe31 100644
--- a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po
@@ -8,260 +8,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-10 14:53+0000\n"
 "Last-Translator: Metin Amiroff <amiroff@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "bugün"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "dün"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "yarın"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milyon"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s milyon"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milyar"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s milyar"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilyon"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s trilyon"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f katrilyon"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s katrilyon"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f kentilyon"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s kentilyon"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f seksilyon"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s seksilyon"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f septilyon"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s septilyon"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f oktilyon"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s oktilyon"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f nonilyon"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s nonilyon"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f desilyon"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s desilyon"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f googol"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s googol"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "bir"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "iki"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "üç"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "dört"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "beş"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "altı"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "yedi"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "sekiz"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "dokuz"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s önce"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "şimdi"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "%(count)s saniye önce"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
-msgstr[0] "%(count)s dakika önce"
+msgstr[0] "%s dakika önce"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] "%(count)s saat önce"
+msgstr[0] "%s saat önce"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "şu andan %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "şu andan %(count)s saniye sonra"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "şu andan %(count)s dakika sonra"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/tt/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/tt/LC_MESSAGES/django.mo
index 121e637a64..f331d6194b 100644
Binary files a/django/contrib/humanize/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/tt/LC_MESSAGES/django.po b/django/contrib/humanize/locale/tt/LC_MESSAGES/django.po
index 3968f0b2d5..2717433c23 100644
--- a/django/contrib/humanize/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/tt/LC_MESSAGES/django.po
@@ -6,260 +6,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "бүген"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "кичә"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "иртәгә"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "че"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "че"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "че"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "че"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f миллион"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s миллион"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f миллиард"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s миллиард"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f триллион"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s триллион"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] "%(value).1f квадриллион"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] "%(value)s квадриллион"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] "%(value).1f квинтиллион"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] "%(value)s квинтиллион"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] "%(value).1f секстиллион"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] "%(value)s секстиллион"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] "%(value).1f септиллион"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] "%(value)s септиллион"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] "%(value).1f октиллион"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] "%(value)s октиллион"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] "%(value).1f нониллион"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] "%(value)s нониллион"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] "%(value).1f дециллион"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] "%(value)s дециллион"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] "%(value).1f дециллион"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] "%(value)s гугол"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "бер"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "ике"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "өч"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "дүрт"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "биш"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "алты"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "җиде"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "сигез"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "тугыз"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s элек"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "хәзер"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "%(count)s секунд элек"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "%(count)s минут элек"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "%(count)s сәгать элек"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "хәзердән %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "%(count)s секундта"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "%(count)s минутта"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo
index b8c628d7e4..d58aef7bac 100644
Binary files a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po
index 726a2f7d6e..dc4b85f9e9 100644
--- a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po
@@ -8,47 +8,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-11 17:52+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "сьогодні"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "вчора"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "завтра"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "ий"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "ий"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "ій"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "ий"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -56,7 +56,7 @@ msgstr[0] "%(value).1f мільйон"
 msgstr[1] "%(value).1f мільйони"
 msgstr[2] "%(value).1f мільйонів"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
@@ -64,7 +64,7 @@ msgstr[0] "%(value)s мільйон"
 msgstr[1] "%(value)s мільйони"
 msgstr[2] "%(value)s мільйонів"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
@@ -72,7 +72,7 @@ msgstr[0] "%(value).1f мільярд"
 msgstr[1] "%(value).1f мільярди"
 msgstr[2] "%(value).1f мільярдів"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
@@ -80,7 +80,7 @@ msgstr[0] "%(value)s мільярд"
 msgstr[1] "%(value)s мільярди"
 msgstr[2] "%(value)s мільярдів"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -88,7 +88,7 @@ msgstr[0] "%(value).1f трильйон"
 msgstr[1] "%(value).1f трильйони"
 msgstr[2] "%(value).1f трильйонів"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
@@ -96,7 +96,7 @@ msgstr[0] "%(value)s трильйон"
 msgstr[1] "%(value)s трильйони"
 msgstr[2] "%(value)s трильйонів"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
@@ -104,7 +104,7 @@ msgstr[0] "%(value).1f квадрильйон"
 msgstr[1] "%(value).1f квадрильйони"
 msgstr[2] "%(value).1f квадрильйонів"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
@@ -112,7 +112,7 @@ msgstr[0] "%(value)s квадрильйон"
 msgstr[1] "%(value)s квадрильйони"
 msgstr[2] "%(value)s квадрильйонів"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
@@ -120,7 +120,7 @@ msgstr[0] "%(value).1f квінтильйон"
 msgstr[1] "%(value).1f квінтильйона"
 msgstr[2] "%(value).1f квінтильйонів"
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
@@ -128,7 +128,7 @@ msgstr[0] "%(value)s квінтильйон"
 msgstr[1] "%(value)s квінтильйона"
 msgstr[2] "%(value)s квінтильйонів"
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
@@ -136,7 +136,7 @@ msgstr[0] "%(value).1f секстильйон"
 msgstr[1] "%(value).1f секстильйона"
 msgstr[2] "%(value).1f секстильйонів"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
@@ -144,7 +144,7 @@ msgstr[0] "%(value)s секстильйон"
 msgstr[1] "%(value)s секстильйона"
 msgstr[2] "%(value)s секстильйонів"
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
@@ -152,7 +152,7 @@ msgstr[0] "%(value).1f септильйон"
 msgstr[1] "%(value).1f септильйона"
 msgstr[2] "%(value).1f септильйонів"
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
@@ -160,7 +160,7 @@ msgstr[0] "%(value)s септильйон"
 msgstr[1] "%(value)s септильйона"
 msgstr[2] "%(value)s септильйонів"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
@@ -168,7 +168,7 @@ msgstr[0] "%(value).1f октильйон"
 msgstr[1] "%(value).1f октильйони"
 msgstr[2] "%(value).1f октильйонів"
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
@@ -176,7 +176,7 @@ msgstr[0] "%(value)s октильйон"
 msgstr[1] "%(value)s октильйони"
 msgstr[2] "%(value)s октильйонів"
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
@@ -184,7 +184,7 @@ msgstr[0] "%(value).1f нонільйон"
 msgstr[1] "%(value).1f нонільйони"
 msgstr[2] "%(value).1f нонільйонів"
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
@@ -192,7 +192,7 @@ msgstr[0] "%(value)s нонільйон"
 msgstr[1] "%(value)s нонільйони"
 msgstr[2] "%(value)s нонільйонів"
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
@@ -200,7 +200,7 @@ msgstr[0] "%(value).1f децильйон"
 msgstr[1] "%(value).1f децильйони"
 msgstr[2] "%(value).1f децильйонів"
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
@@ -208,7 +208,7 @@ msgstr[0] "%(value)s децильйон"
 msgstr[1] "%(value)s децильйони"
 msgstr[2] "%(value)s децильйонів"
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
@@ -216,7 +216,7 @@ msgstr[0] "%(value).1f гугол"
 msgstr[1] "%(value).1f гуголі"
 msgstr[2] "%(value).1f гуголів"
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
@@ -224,53 +224,53 @@ msgstr[0] "%(value)s гугол"
 msgstr[1] "%(value)s гуголі"
 msgstr[2] "%(value)s гуголів"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "один"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "чотири"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "п'ять"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "шість"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "сім"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "вісім"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "дев'ять"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s тому"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "зараз"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -278,7 +278,7 @@ msgstr[0] "секунду тому"
 msgstr[1] "%(count)s секунди тому"
 msgstr[2] "%(count)s секунд тому"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -286,7 +286,7 @@ msgstr[0] "хвилину тому"
 msgstr[1] "%(count)s хвилини тому"
 msgstr[2] "%(count)s хвилин тому"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
@@ -294,13 +294,13 @@ msgstr[0] "годину тому"
 msgstr[1] "%(count)s години тому"
 msgstr[2] "%(count)s годин тому"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "через %(delta)s"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -308,7 +308,7 @@ msgstr[0] "через секунду"
 msgstr[1] "через %(count)s секунди"
 msgstr[2] "через %(count)s секунд"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -316,7 +316,7 @@ msgstr[0] "через хвилину"
 msgstr[1] "через %(count)s хвилини"
 msgstr[2] "через %(count)s хвилин"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo
index 0e980ce44e..b023b5358d 100644
Binary files a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po
index f48ca63333..f990f7f065 100644
--- a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po
@@ -6,287 +6,287 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "آج"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "گزستہ کل"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "آئندہ کل"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "واں"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "پہلا"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "دوسرا"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "تیسرا"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f ملین"
 msgstr[1] "%(value).1f ملین"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f بلین"
 msgstr[1] "%(value).1f بلین"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ٹریلین"
 msgstr[1] "%(value).1f ٹریلین"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "ایک"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "دو"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "تین"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "چار"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "پانچ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "چھ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "سات"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "آتھ"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "نو"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo
index 540d6348da..04a40d9609 100644
Binary files a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po
index 3da8c173ff..0a0a30ce08 100644
--- a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po
@@ -6,260 +6,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "Hôm nay"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "Hôm qua"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "Ngày mai"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:75
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:79
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:83
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:87
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:91
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:95
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "Một"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "Hai"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "Ba"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "Bốn"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "Năm"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "Sáu"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "Bảy"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "Tám"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "Chín"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo
index 59f5d1fb92..392ae24f81 100644
Binary files a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po
index 0fc7961006..e470e0ab6b 100644
--- a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po
@@ -2,265 +2,266 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Kevin Shi <leiarix@gmail.com>, 2012.
 # Ziang Song <songziang@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: Ziang Song <songziang@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-26 01:58+0000\n"
+"Last-Translator: 磊 施 <leiarix@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "今天"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "昨天"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "明天"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f 百万"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s 百万"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f 十亿"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s 十亿"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f 万亿"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s 万亿"
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
+msgstr[0] "%(value).1f 1000的5次方"
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 1000的5次方"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f 1000的4次方"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 1000的4次方"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f 1000的7次方"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 1000的7次方"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f 1000的8次方"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 1000的8次方"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f 1000的9次方"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 1000的9次方"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f 1000的10次方"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 1000的10次方"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f 1000的11次方"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
+msgstr[0] "%(value)s 1000的11次方"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f 10的100次方"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
+msgstr[0] "%(value)s 10的100次方"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "一"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "二"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "三"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "四"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "五"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "六"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "七"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "八"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "九"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr "%(delta)s 之前"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
 msgstr "现在"
 
-#: templatetags/humanize.py:191
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] "%(count)s 秒钟之前"
 
-#: templatetags/humanize.py:196
+#: templatetags/humanize.py:201
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] "%(count)s 分钟之前"
 
-#: templatetags/humanize.py:201
+#: templatetags/humanize.py:206
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] "%(count)s 小时之前"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr "%(delta)s 之后"
 
-#: templatetags/humanize.py:213
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] "%(count)s 秒钟之后"
 
-#: templatetags/humanize.py:218
+#: templatetags/humanize.py:223
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] "%(count)s 分钟之后"
 
-#: templatetags/humanize.py:223
+#: templatetags/humanize.py:228
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo
index 91ab667c5f..880d8aea79 100644
Binary files a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po
index 4e38a2a7d1..111b035110 100644
--- a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po
@@ -3,265 +3,266 @@
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
 # tcc <tcchou@tcchou.org>, 2011.
+#   <yyc1217@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-02-14 13:08+0000\n"
-"Last-Translator: tcc <tcchou@tcchou.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-09-20 06:29+0000\n"
+"Last-Translator: yyc1217 <yyc1217@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests.py:108 templatetags/humanize.py:164
+#: tests.py:125 templatetags/humanize.py:167
 msgid "today"
 msgstr "今天"
 
-#: tests.py:108 templatetags/humanize.py:168
+#: tests.py:125 templatetags/humanize.py:171
 msgid "yesterday"
 msgstr "昨天"
 
-#: tests.py:108 templatetags/humanize.py:166
+#: tests.py:125 templatetags/humanize.py:169
 msgid "tomorrow"
 msgstr "明天"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:24
+#: templatetags/humanize.py:25
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:53
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f 百萬"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
-msgstr[0] ""
+msgstr[0] "%(value)s 百萬"
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f 十億"
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
-msgstr[0] ""
+msgstr[0] "%(value)s 十億"
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f 兆"
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:65
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 兆"
 
 #: templatetags/humanize.py:66
 #, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f 千兆"
+
+#: templatetags/humanize.py:67
+#, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:69
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 千兆"
 
 #: templatetags/humanize.py:70
 #, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f 百京"
+
+#: templatetags/humanize.py:71
+#, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:73
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 百京"
 
 #: templatetags/humanize.py:74
 #, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f 十垓"
+
+#: templatetags/humanize.py:75
+#, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:77
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 十垓"
 
 #: templatetags/humanize.py:78
 #, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f 秭"
+
+#: templatetags/humanize.py:79
+#, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:81
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 秭"
 
 #: templatetags/humanize.py:82
 #, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f 千秭"
+
+#: templatetags/humanize.py:83
+#, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 千秭"
 
 #: templatetags/humanize.py:86
 #, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f 百穰"
+
+#: templatetags/humanize.py:87
+#, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
+msgstr[0] "%(value)s 百穰"
 
 #: templatetags/humanize.py:90
 #, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f 十溝"
+
+#: templatetags/humanize.py:91
+#, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
-msgstr[0] ""
-
-#: templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
+msgstr[0] "%(value)s 十溝"
 
 #: templatetags/humanize.py:94
 #, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f 穰大數"
+
+#: templatetags/humanize.py:95
+#, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
-msgstr[0] ""
+msgstr[0] "%(value)s 穰大數"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "one"
 msgstr "一"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "two"
 msgstr "二"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "three"
 msgstr "三"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "four"
 msgstr "四"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "five"
 msgstr "五"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "six"
 msgstr "六"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "seven"
 msgstr "七"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "eight"
 msgstr "八"
 
-#: templatetags/humanize.py:143
+#: templatetags/humanize.py:144
 msgid "nine"
 msgstr "九"
 
-#: templatetags/humanize.py:185
+#: templatetags/humanize.py:190
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
-msgstr ""
+msgstr "%(delta)s 以前"
 
-#: templatetags/humanize.py:188 templatetags/humanize.py:210
+#: templatetags/humanize.py:193 templatetags/humanize.py:215
 msgid "now"
-msgstr ""
-
-#: templatetags/humanize.py:191
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
+msgstr "現在"
 
 #: templatetags/humanize.py:196
 #, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s 秒前"
 
 #: templatetags/humanize.py:201
 #, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s 分鐘前"
+
+#: templatetags/humanize.py:206
+#, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
-msgstr[0] ""
+msgstr[0] "%(count)s 小時前"
 
-#: templatetags/humanize.py:207
+#: templatetags/humanize.py:212
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
-msgstr ""
-
-#: templatetags/humanize.py:213
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
+msgstr "%(delta)s 後"
 
 #: templatetags/humanize.py:218
 #, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "%(count)s 秒後"
 
 #: templatetags/humanize.py:223
 #, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "%(count)s 分鐘後"
+
+#: templatetags/humanize.py:228
+#, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
-msgstr[0] ""
+msgstr[0] "%(count)s 小時後"
diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py
index 7e8f163174..21f4c452fa 100644
--- a/django/contrib/humanize/templatetags/humanize.py
+++ b/django/contrib/humanize/templatetags/humanize.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 import re
 from datetime import date, datetime
+from decimal import Decimal
 
 from django import template
 from django.conf import settings
@@ -35,7 +36,7 @@ def intcomma(value, use_l10n=True):
     """
     if settings.USE_L10N and use_l10n:
         try:
-            if not isinstance(value, float):
+            if not isinstance(value, (float, Decimal)):
                 value = int(value)
         except (TypeError, ValueError):
             return intcomma(value, False)
diff --git a/django/contrib/humanize/tests.py b/django/contrib/humanize/tests.py
index c648f544d7..1e1c8424e6 100644
--- a/django/contrib/humanize/tests.py
+++ b/django/contrib/humanize/tests.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 import datetime
+from decimal import Decimal
 
 try:
     import pytz
@@ -38,8 +39,6 @@ class MockDateTime(datetime.datetime):
 class HumanizeTests(TestCase):
 
     def humanize_tester(self, test_list, result_list, method):
-        # Using max below ensures we go through both lists
-        # However, if the lists are not equal length, this raises an exception
         for test_content, result in zip(test_list, result_list):
             t = Template('{%% load humanize %%}{{ test_content|%s }}' % method)
             rendered = t.render(Context(locals())).strip()
@@ -54,28 +53,31 @@ class HumanizeTests(TestCase):
                        '12th', '13th', '101st', '102nd', '103rd',
                        '111th', 'something else', None)
 
-        self.humanize_tester(test_list, result_list, 'ordinal')
+        with translation.override('en'):
+            self.humanize_tester(test_list, result_list, 'ordinal')
 
     def test_intcomma(self):
         test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25,
-                     '100', '1000', '10123', '10311', '1000000', '1234567.1234567',
+                     '100', '1000', '10123', '10311', '1000000', '1234567.1234567', Decimal('1234567.1234567'),
                      None)
         result_list = ('100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25',
-                       '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567',
+                       '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567', '1,234,567.1234567',
                      None)
 
-        self.humanize_tester(test_list, result_list, 'intcomma')
+        with translation.override('en'):
+            self.humanize_tester(test_list, result_list, 'intcomma')
 
     def test_l10n_intcomma(self):
         test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25,
-                     '100', '1000', '10123', '10311', '1000000', '1234567.1234567',
+                     '100', '1000', '10123', '10311', '1000000', '1234567.1234567', Decimal('1234567.1234567'),
                      None)
         result_list = ('100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25',
-                       '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567',
+                       '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567', '1,234,567.1234567',
                      None)
 
         with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=False):
-            self.humanize_tester(test_list, result_list, 'intcomma')
+            with translation.override('en'):
+                self.humanize_tester(test_list, result_list, 'intcomma')
 
     def test_intcomma_without_number_grouping(self):
         # Regression for #17414
@@ -92,7 +94,8 @@ class HumanizeTests(TestCase):
                        '1.0 billion', '2.0 billion', '6.0 trillion',
                        '1.3 quadrillion', '3.5 sextillion',
                        '8.1 decillion', None)
-        self.humanize_tester(test_list, result_list, 'intword')
+        with translation.override('en'):
+            self.humanize_tester(test_list, result_list, 'intword')
 
     def test_i18n_intcomma(self):
         test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25,
@@ -117,8 +120,8 @@ class HumanizeTests(TestCase):
         test_list.append(None)
         result_list = ('one', 'two', 'three', 'four', 'five', 'six',
                        'seven', 'eight', 'nine', '10', None)
-
-        self.humanize_tester(test_list, result_list, 'apnumber')
+        with translation.override('en'):
+            self.humanize_tester(test_list, result_list, 'apnumber')
 
     def test_naturalday(self):
         today = datetime.date.today()
@@ -158,7 +161,8 @@ class HumanizeTests(TestCase):
         orig_humanize_datetime, humanize.datetime = humanize.datetime, MockDateTime
         try:
             with override_settings(TIME_ZONE="America/Chicago", USE_TZ=True):
-                self.humanize_tester([dt], ['yesterday'], 'naturalday')
+                with translation.override('en'):
+                    self.humanize_tester([dt], ['yesterday'], 'naturalday')
         finally:
             humanize.datetime = orig_humanize_datetime
 
@@ -219,8 +223,10 @@ class HumanizeTests(TestCase):
 
         orig_humanize_datetime, humanize.datetime = humanize.datetime, MockDateTime
         try:
-            self.humanize_tester(test_list, result_list, 'naturaltime')
-            with override_settings(USE_TZ=True):
-                self.humanize_tester(test_list, result_list_with_tz_support, 'naturaltime')
+            with translation.override('en'):
+                self.humanize_tester(test_list, result_list, 'naturaltime')
+                with override_settings(USE_TZ=True):
+                    self.humanize_tester(
+                        test_list, result_list_with_tz_support, 'naturaltime')
         finally:
             humanize.datetime = orig_humanize_datetime
diff --git a/django/contrib/localflavor/__init__.py b/django/contrib/localflavor/__init__.py
deleted file mode 100644
index 785186fd28..0000000000
--- a/django/contrib/localflavor/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import warnings
-warnings.warn("django.contrib.localflavor is deprecated. Use the separate django-localflavor-* packages instead.", DeprecationWarning)
diff --git a/django/contrib/localflavor/ar/ar_provinces.py b/django/contrib/localflavor/ar/ar_provinces.py
deleted file mode 100644
index 600ef1eb16..0000000000
--- a/django/contrib/localflavor/ar/ar_provinces.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-A list of Argentinean provinces and autonomous cities as `choices` in a
-formfield. From
-http://www.argentina.gov.ar/argentina/portal/paginas.dhtml?pagina=425
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-PROVINCE_CHOICES = (
-    ('B', 'Buenos Aires'),
-    ('K', 'Catamarca'),
-    ('H', 'Chaco'),
-    ('U', 'Chubut'),
-    ('C', 'Ciudad Autónoma de Buenos Aires'),
-    ('X', 'Córdoba'),
-    ('W', 'Corrientes'),
-    ('E', 'Entre Ríos'),
-    ('P', 'Formosa'),
-    ('Y', 'Jujuy'),
-    ('L', 'La Pampa'),
-    ('F', 'La Rioja'),
-    ('M', 'Mendoza'),
-    ('N', 'Misiones'),
-    ('Q', 'Neuquén'),
-    ('R', 'Río Negro'),
-    ('A', 'Salta'),
-    ('J', 'San Juan'),
-    ('D', 'San Luis'),
-    ('Z', 'Santa Cruz'),
-    ('S', 'Santa Fe'),
-    ('G', 'Santiago del Estero'),
-    ('V', 'Tierra del Fuego, Antártida e Islas del Atlántico Sur'),
-    ('T', 'Tucumán'),
-)
diff --git a/django/contrib/localflavor/ar/forms.py b/django/contrib/localflavor/ar/forms.py
deleted file mode 100644
index cc6c833de0..0000000000
--- a/django/contrib/localflavor/ar/forms.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-AR-specific Form helpers.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-from django.contrib.localflavor.ar.ar_provinces import PROVINCE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import RegexField, CharField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class ARProvinceSelect(Select):
-    """
-    A Select widget that uses a list of Argentinean provinces/autonomous cities
-    as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(ARProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
-
-class ARPostalCodeField(RegexField):
-    """
-    A field that accepts a 'classic' NNNN Postal Code or a CPA.
-
-    See:
-        http://www.correoargentino.com.ar/cpa/que_es
-        http://www.correoargentino.com.ar/cpa/como_escribirlo
-    """
-    default_error_messages = {
-        'invalid': _("Enter a postal code in the format NNNN or ANNNNAAA."),
-    }
-
-    def __init__(self, max_length=8, min_length=4, *args, **kwargs):
-        super(ARPostalCodeField, self).__init__(r'^\d{4}$|^[A-HJ-NP-Za-hj-np-z]\d{4}\D{3}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        value = super(ARPostalCodeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        if len(value) not in (4, 8):
-            raise ValidationError(self.error_messages['invalid'])
-        if len(value) == 8:
-            return '%s%s%s' % (value[0].upper(), value[1:5], value[5:].upper())
-        return value
-
-class ARDNIField(CharField):
-    """
-    A field that validates 'Documento Nacional de Identidad' (DNI) numbers.
-    """
-    default_error_messages = {
-        'invalid': _("This field requires only numbers."),
-        'max_digits': _("This field requires 7 or 8 digits."),
-    }
-
-    def __init__(self, max_length=10, min_length=7, *args, **kwargs):
-        super(ARDNIField, self).__init__(max_length, min_length, *args,
-                **kwargs)
-
-    def clean(self, value):
-        """
-        Value can be a string either in the [X]X.XXX.XXX or [X]XXXXXXX formats.
-        """
-        value = super(ARDNIField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        if not value.isdigit():
-            value = value.replace('.', '')
-        if not value.isdigit():
-            raise ValidationError(self.error_messages['invalid'])
-        if len(value) not in (7, 8):
-            raise ValidationError(self.error_messages['max_digits'])
-
-        return value
-
-class ARCUITField(RegexField):
-    """
-    This field validates a CUIT (Código Único de Identificación Tributaria). A
-    CUIT is of the form XX-XXXXXXXX-V. The last digit is a check digit.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'),
-        'checksum': _("Invalid CUIT."),
-        'legal_type': _('Invalid legal type. Type must be 27, 20, 23 or 30.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(ARCUITField, self).__init__(r'^\d{2}-?\d{8}-?\d$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Value can be either a string in the format XX-XXXXXXXX-X or an
-        11-digit number.
-        """
-        value = super(ARCUITField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value, cd = self._canon(value)
-        if not value[:2] in ['27', '20', '23', '30']:
-            raise ValidationError(self.error_messages['legal_type'])
-        if self._calc_cd(value) != cd:
-            raise ValidationError(self.error_messages['checksum'])
-        return self._format(value, cd)
-
-    def _canon(self, cuit):
-        cuit = cuit.replace('-', '')
-        return cuit[:-1], cuit[-1]
-
-    def _calc_cd(self, cuit):
-        # Calculation code based on:
-        # http://es.wikipedia.org/wiki/C%C3%B3digo_%C3%9Anico_de_Identificaci%C3%B3n_Tributaria
-        mults = (5, 4, 3, 2, 7, 6, 5, 4, 3, 2)
-        tmp = sum([m * int(cuit[idx]) for idx, m in enumerate(mults)])
-        result = 11 - (tmp % 11)
-        if result == 11:
-            result = 0
-        elif result == 10:
-            result = 9
-        return str(result)
-
-    def _format(self, cuit, check_digit=None):
-        if check_digit is None:
-            check_digit = cuit[-1]
-            cuit = cuit[:-1]
-        return '%s-%s-%s' % (cuit[:2], cuit[2:], check_digit)
diff --git a/django/contrib/localflavor/at/at_states.py b/django/contrib/localflavor/at/at_states.py
deleted file mode 100644
index d4b4d8aa53..0000000000
--- a/django/contrib/localflavor/at/at_states.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*
-from django.utils.translation import ugettext_lazy as _
-
-STATE_CHOICES = (
-    ('BL', _('Burgenland')),
-    ('KA', _('Carinthia')),
-    ('NO', _('Lower Austria')),
-    ('OO', _('Upper Austria')),
-    ('SA', _('Salzburg')),
-    ('ST', _('Styria')),
-    ('TI', _('Tyrol')),
-    ('VO', _('Vorarlberg')),
-    ('WI', _('Vienna')),
-)
\ No newline at end of file
diff --git a/django/contrib/localflavor/at/forms.py b/django/contrib/localflavor/at/forms.py
deleted file mode 100644
index c531bec2e9..0000000000
--- a/django/contrib/localflavor/at/forms.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""
-AT-specific Form helpers
-"""
-from __future__ import unicode_literals
-import re
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-re_ssn = re.compile(r'^\d{4} \d{6}')
-
-
-class ATZipCodeField(RegexField):
-    """
-    A form field that validates its input is an Austrian postcode.
-
-    Accepts 4 digits (first digit must be greater than 0).
-    """
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXX.'),
-    }
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(ATZipCodeField, self).__init__(r'^[1-9]{1}\d{3}$',
-                max_length, min_length, *args, **kwargs)
-
-class ATStateSelect(Select):
-    """
-    A Select widget that uses a list of AT states as its choices.
-    """
-    def __init__(self, attrs=None):
-        from django.contrib.localflavor.at.at_states import STATE_CHOICES
-        super(ATStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
-
-class ATSocialSecurityNumberField(Field):
-    """
-    Austrian Social Security numbers are composed of a 4 digits and 6 digits
-    field. The latter represents in most cases the person's birthdate while
-    the first 4 digits represent a 3-digits counter and a one-digit checksum.
-
-    The 6-digits field can also differ from the person's birthdate if the
-    3-digits counter suffered an overflow.
-
-    This code is based on information available on
-    http://de.wikipedia.org/wiki/Sozialversicherungsnummer#.C3.96sterreich
-    """
-
-    default_error_messages = {
-        'invalid': _('Enter a valid Austrian Social Security Number in XXXX XXXXXX format.'),
-    }
-
-    def clean(self, value):
-        value = super(ATSocialSecurityNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ""
-        if not re_ssn.search(value):
-            raise ValidationError(self.error_messages['invalid'])
-        sqnr, date = value.split(" ")
-        sqnr, check = (sqnr[:3], (sqnr[3]))
-        if int(sqnr) < 100:
-           raise ValidationError(self.error_messages['invalid'])
-        res = int(sqnr[0])*3 + int(sqnr[1])*7 + int(sqnr[2])*9 \
-           + int(date[0])*5 + int(date[1])*8 + int(date[2])*4 \
-           + int(date[3])*2 + int(date[4])*1 + int(date[5])*6
-        res = res % 11
-        if res != int(check):
-           raise ValidationError(self.error_messages['invalid'])
-        return '%s%s %s'%(sqnr, check, date,)
diff --git a/django/contrib/localflavor/au/au_states.py b/django/contrib/localflavor/au/au_states.py
deleted file mode 100644
index 578d61bb01..0000000000
--- a/django/contrib/localflavor/au/au_states.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""
-An alphabetical list of states for use as `choices` in a formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-
-STATE_CHOICES = (
-    ('ACT', 'Australian Capital Territory'),
-    ('NSW', 'New South Wales'),
-    ('NT', 'Northern Territory'),
-    ('QLD', 'Queensland'),
-    ('SA', 'South Australia'),
-    ('TAS', 'Tasmania'),
-    ('VIC', 'Victoria'),
-    ('WA', 'Western Australia'),
-)
diff --git a/django/contrib/localflavor/au/forms.py b/django/contrib/localflavor/au/forms.py
deleted file mode 100644
index d3a00e200c..0000000000
--- a/django/contrib/localflavor/au/forms.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""
-Australian-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.au.au_states import STATE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-PHONE_DIGITS_RE = re.compile(r'^(\d{10})$')
-
-class AUPostCodeField(RegexField):
-    """ Australian post code field.
-
-    Assumed to be 4 digits.
-    Northern Territory 3-digit postcodes should have leading zero.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a 4 digit postcode.'),
-    }
-
-    def __init__(self, max_length=4, min_length=None, *args, **kwargs):
-        super(AUPostCodeField, self).__init__(r'^\d{4}$',
-            max_length, min_length, *args, **kwargs)
-
-
-class AUPhoneNumberField(Field):
-    """Australian phone number field."""
-    default_error_messages = {
-        'invalid': 'Phone numbers must contain 10 digits.',
-    }
-
-    def clean(self, value):
-        """
-        Validate a phone number. Strips parentheses, whitespace and hyphens.
-        """
-        super(AUPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('(\(|\)|\s+|-)', '', smart_text(value))
-        phone_match = PHONE_DIGITS_RE.search(value)
-        if phone_match:
-            return '%s' % phone_match.group(1)
-        raise ValidationError(self.error_messages['invalid'])
-
-
-class AUStateSelect(Select):
-    """
-    A Select widget that uses a list of Australian states/territories as its
-    choices.
-    """
-    def __init__(self, attrs=None):
-        super(AUStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
diff --git a/django/contrib/localflavor/au/models.py b/django/contrib/localflavor/au/models.py
deleted file mode 100644
index ce4f120f77..0000000000
--- a/django/contrib/localflavor/au/models.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-from django.db.models.fields import CharField
-
-from django.contrib.localflavor.au.au_states import STATE_CHOICES
-from django.contrib.localflavor.au import forms
-
-class AUStateField(CharField):
-
-    description = _("Australian State")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['choices'] = STATE_CHOICES
-        kwargs['max_length'] = 3
-        super(AUStateField, self).__init__(*args, **kwargs)
-
-
-class AUPostCodeField(CharField):
-
-    description = _("Australian Postcode")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 4
-        super(AUPostCodeField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.AUPostCodeField}
-        defaults.update(kwargs)
-        return super(AUPostCodeField, self).formfield(**defaults)
-
-
-class AUPhoneNumberField(CharField):
-
-    description = _("Australian Phone number")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 20
-        super(AUPhoneNumberField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.AUPhoneNumberField}
-        defaults.update(kwargs)
-        return super(AUPhoneNumberField, self).formfield(**defaults)
-
diff --git a/django/contrib/localflavor/be/be_provinces.py b/django/contrib/localflavor/be/be_provinces.py
deleted file mode 100644
index fa537ec22a..0000000000
--- a/django/contrib/localflavor/be/be_provinces.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-
-# ISO codes
-PROVINCE_CHOICES = (
-    ('VAN', _('Antwerp')),
-    ('BRU', _('Brussels')),
-    ('VOV', _('East Flanders')),
-    ('VBR', _('Flemish Brabant')),
-    ('WHT', _('Hainaut')),
-    ('WLG', _('Liege')),
-    ('VLI', _('Limburg')),
-    ('WLX', _('Luxembourg')),
-    ('WNA', _('Namur')),
-    ('WBR', _('Walloon Brabant')),
-    ('VWV', _('West Flanders'))
-)
diff --git a/django/contrib/localflavor/be/be_regions.py b/django/contrib/localflavor/be/be_regions.py
deleted file mode 100644
index 2c19d4d4d3..0000000000
--- a/django/contrib/localflavor/be/be_regions.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-
-# ISO codes
-REGION_CHOICES = (
-    ('BRU', _('Brussels Capital Region')),
-    ('VLG', _('Flemish Region')),
-    ('WAL', _('Wallonia'))
-)
diff --git a/django/contrib/localflavor/be/forms.py b/django/contrib/localflavor/be/forms.py
deleted file mode 100644
index 6166254ba3..0000000000
--- a/django/contrib/localflavor/be/forms.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-Belgium-specific Form helpers
-"""
-
-from __future__ import absolute_import
-
-from django.contrib.localflavor.be.be_provinces import PROVINCE_CHOICES
-from django.contrib.localflavor.be.be_regions import REGION_CHOICES
-from django.forms.fields import RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class BEPostalCodeField(RegexField):
-    """
-    A form field that validates its input as a belgium postal code.
-
-    Belgium postal code is a 4 digits string. The first digit indicates
-    the province (except for the 3ddd numbers that are shared by the
-    eastern part of Flemish Brabant and Limburg and the and 1ddd that
-    are shared by the Brussels Capital Region, the western part of
-    Flemish Brabant and Walloon Brabant)
-    """
-    default_error_messages = {
-        'invalid': _(
-            'Enter a valid postal code in the range and format 1XXX - 9XXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(BEPostalCodeField, self).__init__(r'^[1-9]\d{3}$',
-                max_length, min_length, *args, **kwargs)
-
-class BEPhoneNumberField(RegexField):
-    """
-    A form field that validates its input as a belgium phone number.
-
-    Landlines have a seven-digit subscriber number and a one-digit area code,
-    while smaller cities have a six-digit subscriber number and a two-digit
-    area code. Cell phones have a six-digit subscriber number and a two-digit
-    area code preceeded by the number 4.
-    0d ddd dd dd, 0d/ddd.dd.dd, 0d.ddd.dd.dd,
-    0dddddddd - dialling a bigger city
-    0dd dd dd dd, 0dd/dd.dd.dd, 0dd.dd.dd.dd,
-    0dddddddd - dialling a smaller city
-    04dd ddd dd dd, 04dd/ddd.dd.dd,
-    04dd.ddd.dd.dd, 04ddddddddd - dialling a mobile number
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid phone number in one of the formats '
-                     '0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, '
-                     '0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, '
-                     '0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, '
-                     '0xxxxxxxx or 04xxxxxxxx.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(BEPhoneNumberField, self).__init__(r'^[0]\d{1}[/. ]?\d{3}[. ]\d{2}[. ]?\d{2}$|^[0]\d{2}[/. ]?\d{2}[. ]?\d{2}[. ]?\d{2}$|^[0][4]\d{2}[/. ]?\d{2}[. ]?\d{2}[. ]?\d{2}$',
-            max_length, min_length, *args, **kwargs)
-
-class BERegionSelect(Select):
-    """
-    A Select widget that uses a list of belgium regions as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(BERegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
-
-class BEProvinceSelect(Select):
-    """
-    A Select widget that uses a list of belgium provinces as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(BEProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
diff --git a/django/contrib/localflavor/br/br_states.py b/django/contrib/localflavor/br/br_states.py
deleted file mode 100644
index ab37b1d223..0000000000
--- a/django/contrib/localflavor/br/br_states.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-An alphabetical list of Brazilian states for use as `choices` in a formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-STATE_CHOICES = (
-    ('AC', 'Acre'),
-    ('AL', 'Alagoas'),
-    ('AP', 'Amapá'),
-    ('AM', 'Amazonas'),
-    ('BA', 'Bahia'),
-    ('CE', 'Ceará'),
-    ('DF', 'Distrito Federal'),
-    ('ES', 'Espírito Santo'),
-    ('GO', 'Goiás'),
-    ('MA', 'Maranhão'),
-    ('MT', 'Mato Grosso'),
-    ('MS', 'Mato Grosso do Sul'),
-    ('MG', 'Minas Gerais'),
-    ('PA', 'Pará'),
-    ('PB', 'Paraíba'),
-    ('PR', 'Paraná'),
-    ('PE', 'Pernambuco'),
-    ('PI', 'Piauí'),
-    ('RJ', 'Rio de Janeiro'),
-    ('RN', 'Rio Grande do Norte'),
-    ('RS', 'Rio Grande do Sul'),
-    ('RO', 'Rondônia'),
-    ('RR', 'Roraima'),
-    ('SC', 'Santa Catarina'),
-    ('SP', 'São Paulo'),
-    ('SE', 'Sergipe'),
-    ('TO', 'Tocantins'),
-)
diff --git a/django/contrib/localflavor/br/forms.py b/django/contrib/localflavor/br/forms.py
deleted file mode 100644
index 0f957be37f..0000000000
--- a/django/contrib/localflavor/br/forms.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-BR-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.br.br_states import STATE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, CharField, Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-phone_digits_re = re.compile(r'^(\d{2})[-\.]?(\d{4})[-\.]?(\d{4})$')
-
-class BRZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXXX-XXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(BRZipCodeField, self).__init__(r'^\d{5}-\d{3}$',
-            max_length, min_length, *args, **kwargs)
-
-class BRPhoneNumberField(Field):
-    default_error_messages = {
-        'invalid': _('Phone numbers must be in XX-XXXX-XXXX format.'),
-    }
-
-    def clean(self, value):
-        super(BRPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('(\(|\)|\s+)', '', smart_text(value))
-        m = phone_digits_re.search(value)
-        if m:
-            return '%s-%s-%s' % (m.group(1), m.group(2), m.group(3))
-        raise ValidationError(self.error_messages['invalid'])
-
-class BRStateSelect(Select):
-    """
-    A Select widget that uses a list of Brazilian states/territories
-    as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(BRStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
-
-class BRStateChoiceField(Field):
-    """
-    A choice field that uses a list of Brazilian states as its choices.
-    """
-    widget = Select
-    default_error_messages = {
-        'invalid': _('Select a valid brazilian state. That state is not one of the available states.'),
-    }
-
-    def __init__(self, required=True, widget=None, label=None,
-                 initial=None, help_text=None):
-        super(BRStateChoiceField, self).__init__(required, widget, label,
-                                                 initial, help_text)
-        self.widget.choices = STATE_CHOICES
-
-    def clean(self, value):
-        value = super(BRStateChoiceField, self).clean(value)
-        if value in EMPTY_VALUES:
-            value = ''
-        value = smart_text(value)
-        if value == '':
-            return value
-        valid_values = set([smart_text(k) for k, v in self.widget.choices])
-        if value not in valid_values:
-            raise ValidationError(self.error_messages['invalid'])
-        return value
-
-def DV_maker(v):
-    if v >= 2:
-        return 11 - v
-    return 0
-
-class BRCPFField(CharField):
-    """
-    This field validate a CPF number or a CPF string. A CPF number is
-    compounded by XXX.XXX.XXX-VD. The two last digits are check digits.
-
-    More information:
-    http://en.wikipedia.org/wiki/Cadastro_de_Pessoas_F%C3%ADsicas
-    """
-    default_error_messages = {
-        'invalid': _("Invalid CPF number."),
-        'max_digits': _("This field requires at most 11 digits or 14 characters."),
-        'digits_only': _("This field requires only numbers."),
-    }
-
-    def __init__(self, max_length=14, min_length=11, *args, **kwargs):
-        super(BRCPFField, self).__init__(max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Value can be either a string in the format XXX.XXX.XXX-XX or an
-        11-digit number.
-        """
-        value = super(BRCPFField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        orig_value = value[:]
-        if not value.isdigit():
-            value = re.sub("[-\.]", "", value)
-        try:
-            int(value)
-        except ValueError:
-            raise ValidationError(self.error_messages['digits_only'])
-        if len(value) != 11:
-            raise ValidationError(self.error_messages['max_digits'])
-        orig_dv = value[-2:]
-
-        new_1dv = sum([i * int(value[idx]) for idx, i in enumerate(range(10, 1, -1))])
-        new_1dv = DV_maker(new_1dv % 11)
-        value = value[:-2] + str(new_1dv) + value[-1]
-        new_2dv = sum([i * int(value[idx]) for idx, i in enumerate(range(11, 1, -1))])
-        new_2dv = DV_maker(new_2dv % 11)
-        value = value[:-1] + str(new_2dv)
-        if value[-2:] != orig_dv:
-            raise ValidationError(self.error_messages['invalid'])
-
-        return orig_value
-
-class BRCNPJField(Field):
-    default_error_messages = {
-        'invalid': _("Invalid CNPJ number."),
-        'digits_only': _("This field requires only numbers."),
-        'max_digits': _("This field requires at least 14 digits"),
-    }
-
-    def clean(self, value):
-        """
-        Value can be either a string in the format XX.XXX.XXX/XXXX-XX or a
-        group of 14 characters.
-        """
-        value = super(BRCNPJField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        orig_value = value[:]
-        if not value.isdigit():
-            value = re.sub("[-/\.]", "", value)
-        try:
-            int(value)
-        except ValueError:
-            raise ValidationError(self.error_messages['digits_only'])
-        if len(value) != 14:
-            raise ValidationError(self.error_messages['max_digits'])
-        orig_dv = value[-2:]
-
-        new_1dv = sum([i * int(value[idx]) for idx, i in enumerate(list(range(5, 1, -1)) + list(range(9, 1, -1)))])
-        new_1dv = DV_maker(new_1dv % 11)
-        value = value[:-2] + str(new_1dv) + value[-1]
-        new_2dv = sum([i * int(value[idx]) for idx, i in enumerate(list(range(6, 1, -1)) + list(range(9, 1, -1)))])
-        new_2dv = DV_maker(new_2dv % 11)
-        value = value[:-1] + str(new_2dv)
-        if value[-2:] != orig_dv:
-            raise ValidationError(self.error_messages['invalid'])
-
-        return orig_value
diff --git a/django/contrib/localflavor/ca/ca_provinces.py b/django/contrib/localflavor/ca/ca_provinces.py
deleted file mode 100644
index 884668a9fd..0000000000
--- a/django/contrib/localflavor/ca/ca_provinces.py
+++ /dev/null
@@ -1,63 +0,0 @@
-""" 
-An alphabetical list of provinces and territories for use as `choices` 
-in a formfield., and a mapping of province misspellings/abbreviations to 
-normalized abbreviations
-
-Source: http://www.canada.gc.ca/othergov/prov_e.html 
-
-This exists in this standalone file so that it's only imported into memory 
-when explicitly needed. 
-""" 
-
-PROVINCE_CHOICES = ( 
-    ('AB', 'Alberta'), 
-    ('BC', 'British Columbia'), 
-    ('MB', 'Manitoba'), 
-    ('NB', 'New Brunswick'), 
-    ('NL', 'Newfoundland and Labrador'),
-    ('NT', 'Northwest Territories'), 
-    ('NS', 'Nova Scotia'), 
-    ('NU', 'Nunavut'), 
-    ('ON', 'Ontario'), 
-    ('PE', 'Prince Edward Island'), 
-    ('QC', 'Quebec'), 
-    ('SK', 'Saskatchewan'), 
-    ('YT', 'Yukon')
-)
-
-PROVINCES_NORMALIZED = {
-    'ab': 'AB',
-    'alberta': 'AB',
-    'bc': 'BC',
-    'b.c.': 'BC',
-    'british columbia': 'BC',
-    'mb': 'MB',
-    'manitoba': 'MB',
-    'nb': 'NB',
-    'new brunswick': 'NB',
-    'nf': 'NL',
-    'nl': 'NL',
-    'newfoundland': 'NL',
-    'newfoundland and labrador': 'NL',
-    'nt': 'NT',
-    'northwest territories': 'NT',
-    'ns': 'NS',
-    'nova scotia': 'NS',
-    'nu': 'NU',
-    'nunavut': 'NU',
-    'on': 'ON',
-    'ontario': 'ON',
-    'pe': 'PE',
-    'pei': 'PE',
-    'p.e.i.': 'PE',
-    'prince edward island': 'PE',
-    'pq' : 'QC',
-    'qc': 'QC',
-    'quebec': 'QC',
-    'sk': 'SK',
-    'saskatchewan': 'SK',
-    'yk': 'YT',
-    'yt': 'YT',
-    'yukon': 'YT',
-    'yukon territory': 'YT',
-}
\ No newline at end of file
diff --git a/django/contrib/localflavor/ca/forms.py b/django/contrib/localflavor/ca/forms.py
deleted file mode 100644
index 4ebfb06c2b..0000000000
--- a/django/contrib/localflavor/ca/forms.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""
-Canada-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, CharField, Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
-sin_re = re.compile(r"^(\d{3})-(\d{3})-(\d{3})$")
-
-class CAPostalCodeField(CharField):
-    """
-    Canadian postal code field.
-
-    Validates against known invalid characters: D, F, I, O, Q, U
-    Additionally the first character cannot be Z or W.
-    For more info see:
-    http://www.canadapost.ca/tools/pg/manual/PGaddress-e.asp#1402170
-    """
-    default_error_messages = {
-        'invalid': _('Enter a postal code in the format XXX XXX.'),
-    }
-
-    postcode_regex = re.compile(r'^([ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ]) *(\d[ABCEGHJKLMNPRSTVWXYZ]\d)$')
-
-    def clean(self, value):
-        value = super(CAPostalCodeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        postcode = value.upper().strip()
-        m = self.postcode_regex.match(postcode)
-        if not m:
-            raise ValidationError(self.default_error_messages['invalid'])
-        return "%s %s" % (m.group(1), m.group(2))
-
-class CAPhoneNumberField(Field):
-    """Canadian phone number field."""
-    default_error_messages = {
-        'invalid': _('Phone numbers must be in XXX-XXX-XXXX format.'),
-    }
-
-    def clean(self, value):
-        """Validate a phone number.
-        """
-        super(CAPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('(\(|\)|\s+)', '', smart_text(value))
-        m = phone_digits_re.search(value)
-        if m:
-            return '%s-%s-%s' % (m.group(1), m.group(2), m.group(3))
-        raise ValidationError(self.error_messages['invalid'])
-
-class CAProvinceField(Field):
-    """
-    A form field that validates its input is a Canadian province name or abbreviation.
-    It normalizes the input to the standard two-leter postal service
-    abbreviation for the given province.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a Canadian province or territory.'),
-    }
-
-    def clean(self, value):
-        super(CAProvinceField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        try:
-            value = value.strip().lower()
-        except AttributeError:
-            pass
-        else:
-            # Load data in memory only when it is required, see also #17275
-            from .ca_provinces import PROVINCES_NORMALIZED
-            try:
-                return PROVINCES_NORMALIZED[value.strip().lower()]
-            except KeyError:
-                pass
-        raise ValidationError(self.error_messages['invalid'])
-
-class CAProvinceSelect(Select):
-    """
-    A Select widget that uses a list of Canadian provinces and
-    territories as its choices.
-    """
-    def __init__(self, attrs=None):
-        # Load data in memory only when it is required, see also #17275
-        from .ca_provinces import PROVINCE_CHOICES
-        super(CAProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
-
-class CASocialInsuranceNumberField(Field):
-    """
-    A Canadian Social Insurance Number (SIN).
-
-    Checks the following rules to determine whether the number is valid:
-
-        * Conforms to the XXX-XXX-XXX format.
-        * Passes the check digit process "Luhn Algorithm"
-             See: http://en.wikipedia.org/wiki/Social_Insurance_Number
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'),
-    }
-
-    def clean(self, value):
-        super(CASocialInsuranceNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        match = re.match(sin_re, value)
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-
-        number = '%s-%s-%s' % (match.group(1), match.group(2), match.group(3))
-        check_number = '%s%s%s' % (match.group(1), match.group(2), match.group(3))
-        if not self.luhn_checksum_is_valid(check_number):
-            raise ValidationError(self.error_messages['invalid'])
-        return number
-
-    def luhn_checksum_is_valid(self, number):
-        """
-        Checks to make sure that the SIN passes a luhn mod-10 checksum
-        See: http://en.wikipedia.org/wiki/Luhn_algorithm
-        """
-
-        sum = 0
-        num_digits = len(number)
-        oddeven = num_digits & 1
-
-        for count in range(0, num_digits):
-            digit = int(number[count])
-
-            if not (( count & 1 ) ^ oddeven ):
-                digit = digit * 2
-            if digit > 9:
-                digit = digit - 9
-
-            sum = sum + digit
-
-        return ( (sum % 10) == 0 )
diff --git a/django/contrib/localflavor/ch/ch_states.py b/django/contrib/localflavor/ch/ch_states.py
deleted file mode 100644
index ba5934a4d4..0000000000
--- a/django/contrib/localflavor/ch/ch_states.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*
-from django.utils.translation import ugettext_lazy as _
-
-STATE_CHOICES = (
-    ('AG', _('Aargau')),
-    ('AI', _('Appenzell Innerrhoden')),
-    ('AR', _('Appenzell Ausserrhoden')),
-    ('BS', _('Basel-Stadt')),
-    ('BL', _('Basel-Land')),
-    ('BE', _('Berne')),
-    ('FR', _('Fribourg')),
-    ('GE', _('Geneva')),
-    ('GL', _('Glarus')),
-    ('GR', _('Graubuenden')),
-    ('JU', _('Jura')),
-    ('LU', _('Lucerne')),
-    ('NE', _('Neuchatel')),
-    ('NW', _('Nidwalden')),
-    ('OW', _('Obwalden')),
-    ('SH', _('Schaffhausen')),
-    ('SZ', _('Schwyz')),
-    ('SO', _('Solothurn')),
-    ('SG', _('St. Gallen')),
-    ('TG', _('Thurgau')),
-    ('TI', _('Ticino')),
-    ('UR', _('Uri')),
-    ('VS', _('Valais')),
-    ('VD', _('Vaud')),
-    ('ZG', _('Zug')),
-    ('ZH', _('Zurich'))
-)
diff --git a/django/contrib/localflavor/ch/forms.py b/django/contrib/localflavor/ch/forms.py
deleted file mode 100644
index bf71eeea32..0000000000
--- a/django/contrib/localflavor/ch/forms.py
+++ /dev/null
@@ -1,122 +0,0 @@
-"""
-Swiss-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.ch.ch_states import STATE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-id_re = re.compile(r"^(?P<idnumber>\w{8})(?P<pos9>(\d{1}|<))(?P<checksum>\d{1})$")
-phone_digits_re = re.compile(r'^0([1-9]{1})\d{8}$')
-
-class CHZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(CHZipCodeField, self).__init__(r'^\d{4}$',
-        max_length, min_length, *args, **kwargs)
-
-class CHPhoneNumberField(Field):
-    """
-    Validate local Swiss phone number (not international ones)
-    The correct format is '0XX XXX XX XX'.
-    '0XX.XXX.XX.XX' and '0XXXXXXXXX' validate but are corrected to
-    '0XX XXX XX XX'.
-    """
-    default_error_messages = {
-        'invalid': _('Phone numbers must be in 0XX XXX XX XX format.'),
-    }
-
-    def clean(self, value):
-        super(CHPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('(\.|\s|/|-)', '', smart_text(value))
-        m = phone_digits_re.search(value)
-        if m:
-            return '%s %s %s %s' % (value[0:3], value[3:6], value[6:8], value[8:10])
-        raise ValidationError(self.error_messages['invalid'])
-
-class CHStateSelect(Select):
-    """
-    A Select widget that uses a list of CH states as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(CHStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
-
-class CHIdentityCardNumberField(Field):
-    """
-    A Swiss identity card number.
-
-    Checks the following rules to determine whether the number is valid:
-
-        * Conforms to the X1234567<0 or 1234567890 format.
-        * Included checksums match calculated checksums
-
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'),
-    }
-
-    def has_valid_checksum(self, number):
-        given_number, given_checksum = number[:-1], number[-1]
-        new_number = given_number
-        calculated_checksum = 0
-        fragment = ""
-        parameter = 7
-
-        first = str(number[:1])
-        if first.isalpha():
-            num = ord(first.upper()) - 65
-            if num < 0 or num > 8:
-                return False
-            new_number = str(num) + new_number[1:]
-            new_number = new_number[:8] + '0'
-
-        if not new_number.isdigit():
-            return False
-
-        for i in range(len(new_number)):
-          fragment = int(new_number[i])*parameter
-          calculated_checksum += fragment
-
-          if parameter == 1:
-            parameter = 7
-          elif parameter == 3:
-            parameter = 1
-          elif parameter ==7:
-            parameter = 3
-
-        return str(calculated_checksum)[-1] == given_checksum
-
-    def clean(self, value):
-        super(CHIdentityCardNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        match = re.match(id_re, value)
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-
-        idnumber, pos9, checksum = match.groupdict()['idnumber'], match.groupdict()['pos9'], match.groupdict()['checksum']
-
-        if idnumber == '00000000' or \
-           idnumber == 'A0000000':
-            raise ValidationError(self.error_messages['invalid'])
-
-        all_digits = "%s%s%s" % (idnumber, pos9, checksum)
-        if not self.has_valid_checksum(all_digits):
-            raise ValidationError(self.error_messages['invalid'])
-
-        return '%s%s%s' % (idnumber, pos9, checksum)
-
diff --git a/django/contrib/localflavor/cl/cl_regions.py b/django/contrib/localflavor/cl/cl_regions.py
deleted file mode 100644
index d76f6ad834..0000000000
--- a/django/contrib/localflavor/cl/cl_regions.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-A list of Chilean regions as `choices` in a formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-REGION_CHOICES = (
-    ('RM',  'Región Metropolitana de Santiago'),
-    ('I',   'Región de Tarapacá'),
-    ('II',  'Región de Antofagasta'),
-    ('III', 'Región de Atacama'),
-    ('IV',  'Región de Coquimbo'),
-    ('V',   'Región de Valparaíso'),
-    ('VI',  'Región del Libertador Bernardo O\'Higgins'),
-    ('VII', 'Región del Maule'),
-    ('VIII','Región del Bío Bío'),
-    ('IX',  'Región de la Araucanía'),
-    ('X',   'Región de los Lagos'),
-    ('XI',  'Región de Aysén del General Carlos Ibáñez del Campo'),
-    ('XII', 'Región de Magallanes y la Antártica Chilena'),
-    ('XIV', 'Región de Los Ríos'),
-    ('XV',  'Región de Arica-Parinacota'),
-)
diff --git a/django/contrib/localflavor/cl/forms.py b/django/contrib/localflavor/cl/forms.py
deleted file mode 100644
index a5340141ce..0000000000
--- a/django/contrib/localflavor/cl/forms.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""
-Chile specific form helpers.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import smart_text
-
-from .cl_regions import REGION_CHOICES
-
-class CLRegionSelect(Select):
-    """
-    A Select widget that uses a list of Chilean Regions (Regiones)
-    as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(CLRegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
-
-class CLRutField(RegexField):
-    """
-    Chilean "Rol Unico Tributario" (RUT) field. This is the Chilean national
-    identification number.
-
-    Samples for testing are available from
-    https://palena.sii.cl/cvc/dte/ee_empresas_emisoras.html
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid Chilean RUT.'),
-        'strict': _('Enter a valid Chilean RUT. The format is XX.XXX.XXX-X.'),
-        'checksum': _('The Chilean RUT is not valid.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        if 'strict' in kwargs:
-            del kwargs['strict']
-            super(CLRutField, self).__init__(r'^(\d{1,2}\.)?\d{3}\.\d{3}-[\dkK]$',
-                error_message=self.default_error_messages['strict'], *args, **kwargs)
-        else:
-            # In non-strict mode, accept RUTs that validate but do not exist in
-            # the real world.
-            super(CLRutField, self).__init__(r'^[\d\.]{1,11}-?[\dkK]$', *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Check and clean the Chilean RUT.
-        """
-        super(CLRutField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        rut, verificador = self._canonify(value)
-        if self._algorithm(rut) == verificador:
-            return self._format(rut, verificador)
-        else:
-            raise ValidationError(self.error_messages['checksum'])
-
-    def _algorithm(self, rut):
-        """
-        Takes RUT in pure canonical form, calculates the verifier digit.
-        """
-        suma  = 0
-        multi = 2
-        for r in rut[::-1]:
-            suma  += int(r) * multi
-            multi += 1
-            if multi == 8:
-                multi = 2
-        return '0123456789K0'[11 - suma % 11]
-
-    def _canonify(self, rut):
-        """
-        Turns the RUT into one normalized format. Returns a (rut, verifier)
-        tuple.
-        """
-        rut = smart_text(rut).replace(' ', '').replace('.', '').replace('-', '')
-        return rut[:-1], rut[-1].upper()
-
-    def _format(self, code, verifier=None):
-        """
-        Formats the RUT from canonical form to the common string representation.
-        If verifier=None, then the last digit in 'code' is the verifier.
-        """
-        if verifier is None:
-            verifier = code[-1]
-            code = code[:-1]
-        while len(code) > 3 and '.' not in code[:3]:
-            pos = code.find('.')
-            if pos == -1:
-                new_dot = -3
-            else:
-                new_dot = pos - 3
-            code = code[:new_dot] + '.' + code[new_dot:]
-        return '%s-%s' % (code, verifier)
-
diff --git a/django/contrib/localflavor/cn/cn_provinces.py b/django/contrib/localflavor/cn/cn_provinces.py
deleted file mode 100644
index c27cba6423..0000000000
--- a/django/contrib/localflavor/cn/cn_provinces.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-An alphabetical list of provinces for use as `choices` in a formfield.
-
-Reference:
-http://en.wikipedia.org/wiki/ISO_3166-2:CN
-http://en.wikipedia.org/wiki/Province_%28China%29
-http://en.wikipedia.org/wiki/Direct-controlled_municipality
-http://en.wikipedia.org/wiki/Autonomous_regions_of_China
-"""
-from __future__ import unicode_literals
-
-CN_PROVINCE_CHOICES = (
-    ("anhui", "安徽"),
-    ("beijing", "北京"),
-    ("chongqing", "重庆"),
-    ("fujian", "福建"),
-    ("gansu", "甘肃"),
-    ("guangdong", "广东"),
-    ("guangxi", "广西壮族自治区"),
-    ("guizhou", "贵州"),
-    ("hainan", "海南"),
-    ("hebei", "河北"),
-    ("heilongjiang", "黑龙江"),
-    ("henan", "河南"),
-    ("hongkong", "香港"),
-    ("hubei", "湖北"),
-    ("hunan", "湖南"),
-    ("jiangsu", "江苏"),
-    ("jiangxi", "江西"),
-    ("jilin", "吉林"),
-    ("liaoning", "辽宁"),
-    ("macao", "澳门"),
-    ("neimongol", "内蒙古自治区"),
-    ("ningxia", "宁夏回族自治区"),
-    ("qinghai", "青海"),
-    ("shaanxi", "陕西"),
-    ("shandong", "山东"),
-    ("shanghai", "上海"),
-    ("shanxi", "山西"),
-    ("sichuan", "四川"),
-    ("taiwan", "台湾"),
-    ("tianjin", "天津"),
-    ("xinjiang", "新疆维吾尔自治区"),
-    ("xizang", "西藏自治区"),
-    ("yunnan", "云南"),
-    ("zhejiang", "浙江"),
-)
diff --git a/django/contrib/localflavor/cn/forms.py b/django/contrib/localflavor/cn/forms.py
deleted file mode 100644
index 43adcf3f01..0000000000
--- a/django/contrib/localflavor/cn/forms.py
+++ /dev/null
@@ -1,214 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Chinese-specific form helpers
-"""
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.cn.cn_provinces import CN_PROVINCE_CHOICES
-from django.forms import ValidationError
-from django.forms.fields import CharField, RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-__all__ = (
-    'CNProvinceSelect',
-    'CNPostCodeField',
-    'CNIDCardField',
-    'CNPhoneNumberField',
-    'CNCellNumberField',
-)
-
-
-ID_CARD_RE = r'^\d{15}(\d{2}[0-9xX])?$'
-POST_CODE_RE = r'^\d{6}$'
-PHONE_RE = r'^\d{3,4}-\d{7,8}(-\d+)?$'
-CELL_RE = r'^1[358]\d{9}$'
-
-# Valid location code used in id card checking algorithm
-CN_LOCATION_CODES = (
-     11,  # Beijing
-     12,  # Tianjin
-     13,  # Hebei
-     14,  # Shanxi
-     15,  # Nei Mongol
-     21,  # Liaoning
-     22,  # Jilin
-     23,  # Heilongjiang
-     31,  # Shanghai
-     32,  # Jiangsu
-     33,  # Zhejiang
-     34,  # Anhui
-     35,  # Fujian
-     36,  # Jiangxi
-     37,  # Shandong
-     41,  # Henan
-     42,  # Hubei
-     43,  # Hunan
-     44,  # Guangdong
-     45,  # Guangxi
-     46,  # Hainan
-     50,  # Chongqing
-     51,  # Sichuan
-     52,  # Guizhou
-     53,  # Yunnan
-     54,  # Xizang
-     61,  # Shaanxi
-     62,  # Gansu
-     63,  # Qinghai
-     64,  # Ningxia
-     65,  # Xinjiang
-     71,  # Taiwan
-     81,  # Hong Kong
-     91,  # Macao
-)
-
-class CNProvinceSelect(Select):
-    """
-    A select widget with list of Chinese provinces as choices.
-    """
-    def __init__(self, attrs=None):
-        super(CNProvinceSelect, self).__init__(
-            attrs, choices=CN_PROVINCE_CHOICES,
-        )
-
-
-class CNPostCodeField(RegexField):
-    """
-    A form field that validates as Chinese post code.
-    Valid code is XXXXXX where X is digit.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a post code in the format XXXXXX.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(CNPostCodeField, self).__init__(POST_CODE_RE, *args, **kwargs)
-
-
-class CNIDCardField(CharField):
-    """
-    A form field that validates as Chinese Identification Card Number.
-
-    This field would check the following restrictions:
-        * the length could only be 15 or 18.
-        * if the length is 18, the last digit could be x or X.
-        * has a valid checksum.(length 18 only)
-        * has a valid birthdate.
-        * has a valid location.
-
-    The checksum algorithm is described in GB11643-1999.
-    """
-    default_error_messages = {
-        'invalid': _('ID Card Number consists of 15 or 18 digits.'),
-        'checksum': _('Invalid ID Card Number: Wrong checksum'),
-        'birthday': _('Invalid ID Card Number: Wrong birthdate'),
-        'location': _('Invalid ID Card Number: Wrong location code'),
-    }
-
-    def __init__(self, max_length=18, min_length=15, *args, **kwargs):
-        super(CNIDCardField, self).__init__(max_length, min_length, *args,
-                                         **kwargs)
-
-    def clean(self, value):
-        """
-        Check whether the input is a valid ID Card Number.
-        """
-        # Check the length of the ID card number.
-        super(CNIDCardField, self).clean(value)
-        if not value:
-            return ""
-        # Check whether this ID card number has valid format
-        if not re.match(ID_CARD_RE, value):
-            raise ValidationError(self.error_messages['invalid'])
-        # Check the birthday of the ID card number.
-        if not self.has_valid_birthday(value):
-            raise ValidationError(self.error_messages['birthday'])
-        # Check the location of the ID card number.
-        if not self.has_valid_location(value):
-            raise ValidationError(self.error_messages['location'])
-        # Check the checksum of the ID card number.
-        value = value.upper()
-        if not self.has_valid_checksum(value):
-            raise ValidationError(self.error_messages['checksum'])
-        return '%s' % value
-
-    def has_valid_birthday(self, value):
-        """
-        This function would grab the birthdate from the ID card number and test
-        whether it is a valid date.
-        """
-        from datetime import datetime
-        if len(value) == 15:
-            # 1st generation ID card
-            time_string = value[6:12]
-            format_string = "%y%m%d"
-        else:
-            # 2nd generation ID card
-            time_string = value[6:14]
-            format_string = "%Y%m%d"
-        try:
-            datetime.strptime(time_string, format_string)
-            return True
-        except ValueError:
-            # invalid date
-            return False
-
-    def has_valid_location(self, value):
-        """
-        This method checks if the first two digits in the ID Card are valid.
-        """
-        return int(value[:2]) in CN_LOCATION_CODES
-
-    def has_valid_checksum(self, value):
-        """
-        This method checks if the last letter/digit in value is valid
-        according to the algorithm the ID Card follows.
-        """
-        # If the length of the number is not 18, then the number is a 1st
-        # generation ID card number, and there is no checksum to be checked.
-        if len(value) != 18:
-            return True
-        checksum_index = sum(
-            map(
-                lambda a,b:a*(ord(b)-ord('0')),
-                (7,9,10,5,8,4,2,1,6,3,7,9,10,5,8,4,2),
-                value[:17],
-            ),
-        ) % 11
-        return '10X98765432'[checksum_index] == value[-1]
-
-
-class CNPhoneNumberField(RegexField):
-    """
-    A form field that validates as Chinese phone number
-    A valid phone number could be like:
-        010-55555555
-    Considering there might be extension phone numbers, so this could also be:
-        010-55555555-35
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid phone number.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(CNPhoneNumberField, self).__init__(PHONE_RE, *args, **kwargs)
-
-
-class CNCellNumberField(RegexField):
-    """
-    A form field that validates as Chinese cell number
-    A valid cell number could be like:
-        13012345678
-    We used a rough rule here, the first digit should be 1, the second could be
-    3, 5 and 8, the rest could be what so ever.
-    The length of the cell number should be 11.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid cell number.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(CNCellNumberField, self).__init__(CELL_RE, *args, **kwargs)
diff --git a/django/contrib/localflavor/co/co_departments.py b/django/contrib/localflavor/co/co_departments.py
deleted file mode 100644
index 7168f54cc2..0000000000
--- a/django/contrib/localflavor/co/co_departments.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-A list of Colombian departaments as `choices` in a
-formfield.
-
-This exists in this standalone file so that it's only
-imported into memory when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-DEPARTMENT_CHOICES = (
-    ('AMA', 'Amazonas'),
-    ('ANT', 'Antioquia'),
-    ('ARA', 'Arauca'),
-    ('ATL', 'Atlántico'),
-    ('DC',  'Bogotá'),
-    ('BOL', 'Bolívar'),
-    ('BOY', 'Boyacá'),
-    ('CAL', 'Caldas'),
-    ('CAQ', 'Caquetá'),
-    ('CAS', 'Casanare'),
-    ('CAU', 'Cauca'),
-    ('CES', 'Cesar'),
-    ('CHO', 'Chocó'),
-    ('COR', 'Córdoba'),
-    ('CUN', 'Cundinamarca'),
-    ('GUA', 'Guainía'),
-    ('GUV', 'Guaviare'),
-    ('HUI', 'Huila'),
-    ('LAG', 'La Guajira'),
-    ('MAG', 'Magdalena'),
-    ('MET', 'Meta'),
-    ('NAR', 'Nariño'),
-    ('NSA', 'Norte de Santander'),
-    ('PUT', 'Putumayo'),
-    ('QUI', 'Quindío'),
-    ('RIS', 'Risaralda'),
-    ('SAP', 'San Andrés and Providencia'),
-    ('SAN', 'Santander'),
-    ('SUC', 'Sucre'),
-    ('TOL', 'Tolima'),
-    ('VAC', 'Valle del Cauca'),
-    ('VAU', 'Vaupés'),
-    ('VID', 'Vichada'),
-)
diff --git a/django/contrib/localflavor/co/forms.py b/django/contrib/localflavor/co/forms.py
deleted file mode 100644
index cdd151e0df..0000000000
--- a/django/contrib/localflavor/co/forms.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-Colombian-specific form helpers.
-"""
-
-from __future__ import absolute_import
-
-from django.contrib.localflavor.co.co_departments import DEPARTMENT_CHOICES
-from django.forms.fields import Select
-
-
-class CODepartmentSelect(Select):
-    """
-    A Select widget that uses a list of Colombian states as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(CODepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_CHOICES)
diff --git a/django/contrib/localflavor/cz/cz_regions.py b/django/contrib/localflavor/cz/cz_regions.py
deleted file mode 100644
index 51827e3bf7..0000000000
--- a/django/contrib/localflavor/cz/cz_regions.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-Czech regions, translations get from http://www.crwflags.com/fotw/Flags/cz-re.html
-"""
-
-from django.utils.translation import ugettext_lazy as _
-
-REGION_CHOICES = (
-    ('PR', _('Prague')),
-    ('CE', _('Central Bohemian Region')),
-    ('SO', _('South Bohemian Region')),
-    ('PI', _('Pilsen Region')),
-    ('CA', _('Carlsbad Region')),
-    ('US', _('Usti Region')),
-    ('LB', _('Liberec Region')),
-    ('HK', _('Hradec Region')),
-    ('PA', _('Pardubice Region')),
-    ('VY', _('Vysocina Region')),
-    ('SM', _('South Moravian Region')),
-    ('OL', _('Olomouc Region')),
-    ('ZL', _('Zlin Region')),
-    ('MS', _('Moravian-Silesian Region')),
-)
diff --git a/django/contrib/localflavor/cz/forms.py b/django/contrib/localflavor/cz/forms.py
deleted file mode 100644
index c7e81e4037..0000000000
--- a/django/contrib/localflavor/cz/forms.py
+++ /dev/null
@@ -1,136 +0,0 @@
-"""
-Czech-specific form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.cz.cz_regions import REGION_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Select, RegexField, Field
-from django.utils.translation import ugettext_lazy as _
-
-
-birth_number = re.compile(r'^(?P<birth>\d{6})/?(?P<id>\d{3,4})$')
-ic_number = re.compile(r'^(?P<number>\d{7})(?P<check>\d)$')
-
-class CZRegionSelect(Select):
-    """
-    A select widget widget with list of Czech regions as choices.
-    """
-    def __init__(self, attrs=None):
-        super(CZRegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
-
-class CZPostalCodeField(RegexField):
-    """
-    A form field that validates its input as Czech postal code.
-    Valid form is XXXXX or XXX XX, where X represents integer.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a postal code in the format XXXXX or XXX XX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(CZPostalCodeField, self).__init__(r'^\d{5}$|^\d{3} \d{2}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Validates the input and returns a string that contains only numbers.
-        Returns an empty string for empty values.
-        """
-        v = super(CZPostalCodeField, self).clean(value)
-        return v.replace(' ', '')
-
-class CZBirthNumberField(Field):
-    """
-    Czech birth number field.
-    """
-    default_error_messages = {
-        'invalid_format': _('Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX.'),
-        'invalid': _('Enter a valid birth number.'),
-    }
-
-    def clean(self, value, gender=None):
-        super(CZBirthNumberField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        match = re.match(birth_number, value)
-        if not match:
-            raise ValidationError(self.error_messages['invalid_format'])
-
-        birth, id = match.groupdict()['birth'], match.groupdict()['id']
-
-        # Three digits for verification number were used until 1. january 1954
-        if len(id) == 3:
-            return '%s' % value
-
-        # Birth number is in format YYMMDD. Females have month value raised by 50.
-        # In case that all possible number are already used (for given date),
-        # the month field is raised by 20.
-        month = int(birth[2:4])
-        if (not 1 <= month <= 12) and (not 21 <= month <= 32) and \
-                (not 51 <= month <= 62) and (not 71 <= month <= 82):
-            raise ValidationError(self.error_messages['invalid'])
-
-        day = int(birth[4:6])
-        if not (1 <= day <= 31):
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Fourth digit has been added since 1. January 1954.
-        # It is modulo of dividing birth number and verification number by 11.
-        # If the modulo were 10, the last number was 0 (and therefore, the whole
-        # birth number wasn't divisable by 11. These number are no longer used (since 1985)
-        # and the condition 'modulo == 10' can be removed in 2085.
-
-        modulo = int(birth + id[:3]) % 11
-
-        if (modulo == int(id[-1])) or (modulo == 10 and id[-1] == '0'):
-            return '%s' % value
-        else:
-            raise ValidationError(self.error_messages['invalid'])
-
-class CZICNumberField(Field):
-    """
-    Czech IC number field.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid IC number.'),
-    }
-
-    def clean(self, value):
-        super(CZICNumberField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        match = re.match(ic_number, value)
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-
-        number, check = match.groupdict()['number'], int(match.groupdict()['check'])
-
-        sum = 0
-        weight = 8
-        for digit in number:
-            sum += int(digit)*weight
-            weight -= 1
-
-        remainder = sum % 11
-
-        # remainder is equal:
-        #  0 or 10: last digit is 1
-        #  1: last digit is 0
-        # in other case, last digit is 11 - remainder
-
-        if (not remainder % 10 and check == 1) or \
-        (remainder == 1 and check == 0) or \
-        (check == (11 - remainder)):
-            return '%s' % value
-
-        raise ValidationError(self.error_messages['invalid'])
-
diff --git a/django/contrib/localflavor/de/de_states.py b/django/contrib/localflavor/de/de_states.py
deleted file mode 100644
index 2872a7871a..0000000000
--- a/django/contrib/localflavor/de/de_states.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*
-from django.utils.translation import ugettext_lazy as _
-
-STATE_CHOICES = (
-    ('BW', _('Baden-Wuerttemberg')),
-    ('BY', _('Bavaria')),
-    ('BE', _('Berlin')),
-    ('BB', _('Brandenburg')),
-    ('HB', _('Bremen')),
-    ('HH', _('Hamburg')),
-    ('HE', _('Hessen')),
-    ('MV', _('Mecklenburg-Western Pomerania')),
-    ('NI', _('Lower Saxony')),
-    ('NW', _('North Rhine-Westphalia')),
-    ('RP', _('Rhineland-Palatinate')),
-    ('SL', _('Saarland')),
-    ('SN', _('Saxony')),
-    ('ST', _('Saxony-Anhalt')),
-    ('SH', _('Schleswig-Holstein')),
-    ('TH', _('Thuringia')),
-)
diff --git a/django/contrib/localflavor/de/forms.py b/django/contrib/localflavor/de/forms.py
deleted file mode 100644
index a7891d117f..0000000000
--- a/django/contrib/localflavor/de/forms.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""
-DE-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.de.de_states import STATE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-id_re = re.compile(r"^(?P<residence>\d{10})(?P<origin>\w{1,3})[-\ ]?(?P<birthday>\d{7})[-\ ]?(?P<validity>\d{7})[-\ ]?(?P<checksum>\d{1})$")
-
-class DEZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXXX.'),
-    }
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(DEZipCodeField, self).__init__(r'^\d{5}$',
-            max_length, min_length, *args, **kwargs)
-
-class DEStateSelect(Select):
-    """
-    A Select widget that uses a list of DE states as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(DEStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
-
-class DEIdentityCardNumberField(Field):
-    """
-    A German identity card number.
-
-    Checks the following rules to determine whether the number is valid:
-
-        * Conforms to the XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.
-        * No group consists entirely of zeroes.
-        * Included checksums match calculated checksums
-
-    Algorithm is documented at http://de.wikipedia.org/wiki/Personalausweis
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.'),
-    }
-
-    def has_valid_checksum(self, number):
-        given_number, given_checksum = number[:-1], number[-1]
-        calculated_checksum = 0
-        fragment = ""
-        parameter = 7
-
-        for i in range(len(given_number)):
-            fragment = str(int(given_number[i]) * parameter)
-            if fragment.isalnum():
-                calculated_checksum += int(fragment[-1])
-            if parameter == 1:
-                parameter = 7
-            elif parameter == 3:
-                parameter = 1
-            elif parameter ==7:
-                parameter = 3
-
-        return str(calculated_checksum)[-1] == given_checksum
-
-    def clean(self, value):
-        super(DEIdentityCardNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        match = re.match(id_re, value)
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-
-        gd = match.groupdict()
-        residence, origin = gd['residence'], gd['origin']
-        birthday, validity, checksum = gd['birthday'], gd['validity'], gd['checksum']
-
-        if residence == '0000000000' or birthday == '0000000' or validity == '0000000':
-            raise ValidationError(self.error_messages['invalid'])
-
-        all_digits = "%s%s%s%s" % (residence, birthday, validity, checksum)
-        if not self.has_valid_checksum(residence) or not self.has_valid_checksum(birthday) or \
-            not self.has_valid_checksum(validity) or not self.has_valid_checksum(all_digits):
-                raise ValidationError(self.error_messages['invalid'])
-
-        return '%s%s-%s-%s-%s' % (residence, origin, birthday, validity, checksum)
diff --git a/django/contrib/localflavor/ec/ec_provinces.py b/django/contrib/localflavor/ec/ec_provinces.py
deleted file mode 100644
index db25d26ff8..0000000000
--- a/django/contrib/localflavor/ec/ec_provinces.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-A list of Ecuador departaments as `choices` in a
-formfield.
-
-This exists in this standalone file so that it's only
-imported into memory when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-PROVINCE_CHOICES = (
-    ('A', 'Azuay'),
-    ('B', 'Bolívar'),
-    ('F', 'Cañar'),
-    ('C', 'Carchi'),
-    ('H', 'Chimborazo'),
-    ('X', 'Cotopaxi'),
-    ('O', 'El Oro'),
-    ('E', 'Esmeraldas'),
-    ('W', 'Galápagos'),
-    ('G', 'Guayas'),
-    ('I', 'Imbabura'),
-    ('L', 'Loja'),
-    ('R', 'Los Ríos'),
-    ('M', 'Manabí'),
-    ('S', 'Morona Santiago'),
-    ('N', 'Napo'),
-    ('D', 'Orellana'),
-    ('Y', 'Pastaza'),
-    ('P', 'Pichincha'),
-    ('SE', 'Santa Elena'),
-    ('SD', 'Santo Domingo de los Tsáchilas'),
-    ('U', 'Sucumbíos'),
-    ('T', 'Tungurahua'),
-    ('Z', 'Zamora Chinchipe'),
-)
diff --git a/django/contrib/localflavor/ec/forms.py b/django/contrib/localflavor/ec/forms.py
deleted file mode 100644
index d28728b940..0000000000
--- a/django/contrib/localflavor/ec/forms.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""
-Ecuador-specific form helpers.
-"""
-
-from __future__ import absolute_import
-
-from django.contrib.localflavor.ec.ec_provinces import PROVINCE_CHOICES
-from django.forms.fields import Select
-
-class ECProvinceSelect(Select):
-    """
-    A Select widget that uses a list of Ecuador provinces as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(ECProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
diff --git a/django/contrib/localflavor/es/es_provinces.py b/django/contrib/localflavor/es/es_provinces.py
deleted file mode 100644
index 51f681f4fc..0000000000
--- a/django/contrib/localflavor/es/es_provinces.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.utils.translation import ugettext_lazy as _
-
-PROVINCE_CHOICES = (
-    ('01', _('Araba')),
-    ('02', _('Albacete')),
-    ('03', _('Alacant')),
-    ('04', _('Almeria')),
-    ('05', _('Avila')),
-    ('06', _('Badajoz')),
-    ('07', _('Illes Balears')),
-    ('08', _('Barcelona')),
-    ('09', _('Burgos')),
-    ('10', _('Caceres')),
-    ('11', _('Cadiz')),
-    ('12', _('Castello')),
-    ('13', _('Ciudad Real')),
-    ('14', _('Cordoba')),
-    ('15', _('A Coruna')),
-    ('16', _('Cuenca')),
-    ('17', _('Girona')),
-    ('18', _('Granada')),
-    ('19', _('Guadalajara')),
-    ('20', _('Guipuzkoa')),
-    ('21', _('Huelva')),
-    ('22', _('Huesca')),
-    ('23', _('Jaen')),
-    ('24', _('Leon')),
-    ('25', _('Lleida')),
-    ('26', _('La Rioja')),
-    ('27', _('Lugo')),
-    ('28', _('Madrid')),
-    ('29', _('Malaga')),
-    ('30', _('Murcia')),
-    ('31', _('Navarre')),
-    ('32', _('Ourense')),
-    ('33', _('Asturias')),
-    ('34', _('Palencia')),
-    ('35', _('Las Palmas')),
-    ('36', _('Pontevedra')),
-    ('37', _('Salamanca')),
-    ('38', _('Santa Cruz de Tenerife')),
-    ('39', _('Cantabria')),
-    ('40', _('Segovia')),
-    ('41', _('Seville')),
-    ('42', _('Soria')),
-    ('43', _('Tarragona')),
-    ('44', _('Teruel')),
-    ('45', _('Toledo')),
-    ('46', _('Valencia')),
-    ('47', _('Valladolid')),
-    ('48', _('Bizkaia')),
-    ('49', _('Zamora')),
-    ('50', _('Zaragoza')),
-    ('51', _('Ceuta')),
-    ('52', _('Melilla')),
-)
-
diff --git a/django/contrib/localflavor/es/es_regions.py b/django/contrib/localflavor/es/es_regions.py
deleted file mode 100644
index 3c1ea0e974..0000000000
--- a/django/contrib/localflavor/es/es_regions.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.utils.translation import ugettext_lazy as _
-
-REGION_CHOICES = (
-    ('AN', _('Andalusia')),
-    ('AR', _('Aragon')),
-    ('O', _('Principality of Asturias')),
-    ('IB', _('Balearic Islands')),
-    ('PV', _('Basque Country')),
-    ('CN', _('Canary Islands')),
-    ('S', _('Cantabria')),
-    ('CM', _('Castile-La Mancha')),
-    ('CL', _('Castile and Leon')),
-    ('CT', _('Catalonia')),
-    ('EX', _('Extremadura')),
-    ('GA', _('Galicia')),
-    ('LO', _('La Rioja')),
-    ('M', _('Madrid')),
-    ('MU', _('Region of Murcia')),
-    ('NA', _('Foral Community of Navarre')),
-    ('VC', _('Valencian Community')),
-)
-
diff --git a/django/contrib/localflavor/es/forms.py b/django/contrib/localflavor/es/forms.py
deleted file mode 100644
index da0769d2a0..0000000000
--- a/django/contrib/localflavor/es/forms.py
+++ /dev/null
@@ -1,189 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Spanish-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.es.es_provinces import PROVINCE_CHOICES
-from django.contrib.localflavor.es.es_regions import REGION_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class ESPostalCodeField(RegexField):
-    """
-    A form field that validates its input as a spanish postal code.
-
-    Spanish postal code is a five digits string, with two first digits
-    between 01 and 52, assigned to provinces code.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid postal code in the range and format 01XXX - 52XXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(ESPostalCodeField, self).__init__(
-                r'^(0[1-9]|[1-4][0-9]|5[0-2])\d{3}$',
-                max_length, min_length, *args, **kwargs)
-
-class ESPhoneNumberField(RegexField):
-    """
-    A form field that validates its input as a Spanish phone number.
-    Information numbers are ommited.
-
-    Spanish phone numbers are nine digit numbers, where first digit is 6 (for
-    cell phones), 8 (for special phones), or 9 (for landlines and special
-    phones)
-
-    TODO: accept and strip characters like dot, hyphen... in phone number
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(ESPhoneNumberField, self).__init__(r'^(6|7|8|9)\d{8}$',
-                max_length, min_length, *args, **kwargs)
-
-class ESIdentityCardNumberField(RegexField):
-    """
-    Spanish NIF/NIE/CIF (Fiscal Identification Number) code.
-
-    Validates three diferent formats:
-
-        NIF (individuals): 12345678A
-        CIF (companies): A12345678
-        NIE (foreigners): X12345678A
-
-    according to a couple of simple checksum algorithms.
-
-    Value can include a space or hyphen separator between number and letters.
-    Number length is not checked for NIF (or NIE), old values start with a 1,
-    and future values can contain digits greater than 8. The CIF control digit
-    can be a number or a letter depending on company type. Algorithm is not
-    public, and different authors have different opinions on which ones allows
-    letters, so both validations are assumed true for all types.
-    """
-    default_error_messages = {
-        'invalid': _('Please enter a valid NIF, NIE, or CIF.'),
-        'invalid_only_nif': _('Please enter a valid NIF or NIE.'),
-        'invalid_nif': _('Invalid checksum for NIF.'),
-        'invalid_nie': _('Invalid checksum for NIE.'),
-        'invalid_cif': _('Invalid checksum for CIF.'),
-    }
-
-    def __init__(self, only_nif=False, max_length=None, min_length=None, *args, **kwargs):
-        self.only_nif = only_nif
-        self.nif_control = 'TRWAGMYFPDXBNJZSQVHLCKE'
-        self.cif_control = 'JABCDEFGHI'
-        self.cif_types = 'ABCDEFGHKLMNPQS'
-        self.nie_types = 'XT'
-        id_card_re = re.compile(r'^([%s]?)[ -]?(\d+)[ -]?([%s]?)$' % (self.cif_types + self.nie_types, self.nif_control + self.cif_control), re.IGNORECASE)
-        super(ESIdentityCardNumberField, self).__init__(id_card_re, max_length, min_length,
-                error_message=self.default_error_messages['invalid%s' % (self.only_nif and '_only_nif' or '')],
-                *args, **kwargs)
-
-    def clean(self, value):
-        super(ESIdentityCardNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        nif_get_checksum = lambda d: self.nif_control[int(d)%23]
-
-        value = value.upper().replace(' ', '').replace('-', '')
-        m = re.match(r'^([%s]?)[ -]?(\d+)[ -]?([%s]?)$' % (self.cif_types + self.nie_types, self.nif_control + self.cif_control), value)
-        letter1, number, letter2 = m.groups()
-
-        if not letter1 and letter2:
-            # NIF
-            if letter2 == nif_get_checksum(number):
-                return value
-            else:
-                raise ValidationError(self.error_messages['invalid_nif'])
-        elif letter1 in self.nie_types and letter2:
-            # NIE
-            if letter2 == nif_get_checksum(number):
-                return value
-            else:
-                raise ValidationError(self.error_messages['invalid_nie'])
-        elif not self.only_nif and letter1 in self.cif_types and len(number) in [7, 8]:
-            # CIF
-            if not letter2:
-                number, letter2 = number[:-1], int(number[-1])
-            checksum = cif_get_checksum(number)
-            if letter2 in (checksum, self.cif_control[checksum]):
-                return value
-            else:
-                raise ValidationError(self.error_messages['invalid_cif'])
-        else:
-            raise ValidationError(self.error_messages['invalid'])
-
-class ESCCCField(RegexField):
-    """
-    A form field that validates its input as a Spanish bank account or CCC
-    (Codigo Cuenta Cliente).
-
-        Spanish CCC is in format EEEE-OOOO-CC-AAAAAAAAAA where:
-
-            E = entity
-            O = office
-            C = checksum
-            A = account
-
-        It's also valid to use a space as delimiter, or to use no delimiter.
-
-        First checksum digit validates entity and office, and last one
-        validates account. Validation is done multiplying every digit of 10
-        digit value (with leading 0 if necessary) by number in its position in
-        string 1, 2, 4, 8, 5, 10, 9, 7, 3, 6. Sum resulting numbers and extract
-        it from 11.  Result is checksum except when 10 then is 1, or when 11
-        then is 0.
-
-        TODO: allow IBAN validation too
-    """
-    default_error_messages = {
-        'invalid': _('Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX.'),
-        'checksum': _('Invalid checksum for bank account number.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(ESCCCField, self).__init__(r'^\d{4}[ -]?\d{4}[ -]?\d{2}[ -]?\d{10}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        super(ESCCCField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        control_str = [1, 2, 4, 8, 5, 10, 9, 7, 3, 6]
-        m = re.match(r'^(\d{4})[ -]?(\d{4})[ -]?(\d{2})[ -]?(\d{10})$', value)
-        entity, office, checksum, account = m.groups()
-        get_checksum = lambda d: str(11 - sum([int(digit) * int(control) for digit, control in zip(d, control_str)]) % 11).replace('10', '1').replace('11', '0')
-        if get_checksum('00' + entity + office) + get_checksum(account) == checksum:
-            return value
-        else:
-            raise ValidationError(self.error_messages['checksum'])
-
-class ESRegionSelect(Select):
-    """
-    A Select widget that uses a list of spanish regions as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(ESRegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
-
-class ESProvinceSelect(Select):
-    """
-    A Select widget that uses a list of spanish provinces as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(ESProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
-
-
-def cif_get_checksum(number):
-    s1 = sum([int(digit) for pos, digit in enumerate(number) if int(pos) % 2])
-    s2 = sum([sum([int(unit) for unit in str(int(digit) * 2)]) for pos, digit in enumerate(number) if not int(pos) % 2])
-    return (10 - ((s1 + s2) % 10)) % 10
-
diff --git a/django/contrib/localflavor/fi/fi_municipalities.py b/django/contrib/localflavor/fi/fi_municipalities.py
deleted file mode 100644
index 6f90e5e02b..0000000000
--- a/django/contrib/localflavor/fi/fi_municipalities.py
+++ /dev/null
@@ -1,355 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-An alphabetical list of Finnish municipalities for use as `choices` in a
-formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-
-from __future__ import unicode_literals
-
-MUNICIPALITY_CHOICES = (
-    ('akaa', "Akaa"),
-    ('alajarvi', "Alajärvi"),
-    ('alavieska', "Alavieska"),
-    ('alavus', "Alavus"),
-    ('artjarvi', "Artjärvi"),
-    ('asikkala', "Asikkala"),
-    ('askola', "Askola"),
-    ('aura', "Aura"),
-    ('brando', "Brändö"),
-    ('eckero', "Eckerö"),
-    ('enonkoski', "Enonkoski"),
-    ('enontekio', "Enontekiö"),
-    ('espoo', "Espoo"),
-    ('eura', "Eura"),
-    ('eurajoki', "Eurajoki"),
-    ('evijarvi', "Evijärvi"),
-    ('finstrom', "Finström"),
-    ('forssa', "Forssa"),
-    ('foglo', "Föglö"),
-    ('geta', "Geta"),
-    ('haapajarvi', "Haapajärvi"),
-    ('haapavesi', "Haapavesi"),
-    ('hailuoto', "Hailuoto"),
-    ('halsua', "Halsua"),
-    ('hamina', "Hamina"),
-    ('hammarland', "Hammarland"),
-    ('hankasalmi', "Hankasalmi"),
-    ('hanko', "Hanko"),
-    ('harjavalta', "Harjavalta"),
-    ('hartola', "Hartola"),
-    ('hattula', "Hattula"),
-    ('haukipudas', "Haukipudas"),
-    ('hausjarvi', "Hausjärvi"),
-    ('heinola', "Heinola"),
-    ('heinavesi', "Heinävesi"),
-    ('helsinki', "Helsinki"),
-    ('hirvensalmi', "Hirvensalmi"),
-    ('hollola', "Hollola"),
-    ('honkajoki', "Honkajoki"),
-    ('huittinen', "Huittinen"),
-    ('humppila', "Humppila"),
-    ('hyrynsalmi', "Hyrynsalmi"),
-    ('hyvinkaa', "Hyvinkää"),
-    ('hameenkoski', "Hämeenkoski"),
-    ('hameenkyro', "Hämeenkyrö"),
-    ('hameenlinna', "Hämeenlinna"),
-    ('ii', "Ii"),
-    ('iisalmi', "Iisalmi"),
-    ('iitti', "Iitti"),
-    ('ikaalinen', "Ikaalinen"),
-    ('ilmajoki', "Ilmajoki"),
-    ('ilomantsi', "Ilomantsi"),
-    ('imatra', "Imatra"),
-    ('inari', "Inari"),
-    ('inkoo', "Inkoo"),
-    ('isojoki', "Isojoki"),
-    ('isokyro', "Isokyrö"),
-    ('jalasjarvi', "Jalasjärvi"),
-    ('janakkala', "Janakkala"),
-    ('joensuu', "Joensuu"),
-    ('jokioinen', "Jokioinen"),
-    ('jomala', "Jomala"),
-    ('joroinen', "Joroinen"),
-    ('joutsa', "Joutsa"),
-    ('juankoski', "Juankoski"),
-    ('juuka', "Juuka"),
-    ('juupajoki', "Juupajoki"),
-    ('juva', "Juva"),
-    ('jyvaskyla', "Jyväskylä"),
-    ('jamijarvi', "Jämijärvi"),
-    ('jamsa', "Jämsä"),
-    ('jarvenpaa', "Järvenpää"),
-    ('kaarina', "Kaarina"),
-    ('kaavi', "Kaavi"),
-    ('kajaani', "Kajaani"),
-    ('kalajoki', "Kalajoki"),
-    ('kangasala', "Kangasala"),
-    ('kangasniemi', "Kangasniemi"),
-    ('kankaanpaa', "Kankaanpää"),
-    ('kannonkoski', "Kannonkoski"),
-    ('kannus', "Kannus"),
-    ('karijoki', "Karijoki"),
-    ('karjalohja', "Karjalohja"),
-    ('karkkila', "Karkkila"),
-    ('karstula', "Karstula"),
-    ('karttula', "Karttula"),
-    ('karvia', "Karvia"),
-    ('kaskinen', "Kaskinen"),
-    ('kauhajoki', "Kauhajoki"),
-    ('kauhava', "Kauhava"),
-    ('kauniainen', "Kauniainen"),
-    ('kaustinen', "Kaustinen"),
-    ('keitele', "Keitele"),
-    ('kemi', "Kemi"),
-    ('kemijarvi', "Kemijärvi"),
-    ('keminmaa', "Keminmaa"),
-    ('kemionsaari', "Kemiönsaari"),
-    ('kempele', "Kempele"),
-    ('kerava', "Kerava"),
-    ('kerimaki', "Kerimäki"),
-    ('kesalahti', "Kesälahti"),
-    ('keuruu', "Keuruu"),
-    ('kihnio', "Kihniö"),
-    ('kiikoinen', "Kiikoinen"),
-    ('kiiminki', "Kiiminki"),
-    ('kinnula', "Kinnula"),
-    ('kirkkonummi', "Kirkkonummi"),
-    ('kitee', "Kitee"),
-    ('kittila', "Kittilä"),
-    ('kiuruvesi', "Kiuruvesi"),
-    ('kivijarvi', "Kivijärvi"),
-    ('kokemaki', "Kokemäki"),
-    ('kokkola', "Kokkola"),
-    ('kolari', "Kolari"),
-    ('konnevesi', "Konnevesi"),
-    ('kontiolahti', "Kontiolahti"),
-    ('korsnas', "Korsnäs"),
-    ('koskitl', "Koski Tl"),
-    ('kotka', "Kotka"),
-    ('kouvola', "Kouvola"),
-    ('kristiinankaupunki', "Kristiinankaupunki"),
-    ('kruunupyy', "Kruunupyy"),
-    ('kuhmalahti', "Kuhmalahti"),
-    ('kuhmo', "Kuhmo"),
-    ('kuhmoinen', "Kuhmoinen"),
-    ('kumlinge', "Kumlinge"),
-    ('kuopio', "Kuopio"),
-    ('kuortane', "Kuortane"),
-    ('kurikka', "Kurikka"),
-    ('kustavi', "Kustavi"),
-    ('kuusamo', "Kuusamo"),
-    ('kylmakoski', "Kylmäkoski"),
-    ('kyyjarvi', "Kyyjärvi"),
-    ('karkola', "Kärkölä"),
-    ('karsamaki', "Kärsämäki"),
-    ('kokar', "Kökar"),
-    ('koylio', "Köyliö"),
-    ('lahti', "Lahti"),
-    ('laihia', "Laihia"),
-    ('laitila', "Laitila"),
-    ('lapinjarvi', "Lapinjärvi"),
-    ('lapinlahti', "Lapinlahti"),
-    ('lappajarvi', "Lappajärvi"),
-    ('lappeenranta', "Lappeenranta"),
-    ('lapua', "Lapua"),
-    ('laukaa', "Laukaa"),
-    ('lavia', "Lavia"),
-    ('lemi', "Lemi"),
-    ('lemland', "Lemland"),
-    ('lempaala', "Lempäälä"),
-    ('leppavirta', "Leppävirta"),
-    ('lestijarvi', "Lestijärvi"),
-    ('lieksa', "Lieksa"),
-    ('lieto', "Lieto"),
-    ('liminka', "Liminka"),
-    ('liperi', "Liperi"),
-    ('lohja', "Lohja"),
-    ('loimaa', "Loimaa"),
-    ('loppi', "Loppi"),
-    ('loviisa', "Loviisa"),
-    ('luhanka', "Luhanka"),
-    ('lumijoki', "Lumijoki"),
-    ('lumparland', "Lumparland"),
-    ('luoto', "Luoto"),
-    ('luumaki', "Luumäki"),
-    ('luvia', "Luvia"),
-    ('lansi-turunmaa', "Länsi-Turunmaa"),
-    ('maalahti', "Maalahti"),
-    ('maaninka', "Maaninka"),
-    ('maarianhamina', "Maarianhamina"),
-    ('marttila', "Marttila"),
-    ('masku', "Masku"),
-    ('merijarvi', "Merijärvi"),
-    ('merikarvia', "Merikarvia"),
-    ('miehikkala', "Miehikkälä"),
-    ('mikkeli', "Mikkeli"),
-    ('muhos', "Muhos"),
-    ('multia', "Multia"),
-    ('muonio', "Muonio"),
-    ('mustasaari', "Mustasaari"),
-    ('muurame', "Muurame"),
-    ('mynamaki', "Mynämäki"),
-    ('myrskyla', "Myrskylä"),
-    ('mantsala', "Mäntsälä"),
-    ('mantta-vilppula', "Mänttä-Vilppula"),
-    ('mantyharju', "Mäntyharju"),
-    ('naantali', "Naantali"),
-    ('nakkila', "Nakkila"),
-    ('nastola', "Nastola"),
-    ('nilsia', "Nilsiä"),
-    ('nivala', "Nivala"),
-    ('nokia', "Nokia"),
-    ('nousiainen', "Nousiainen"),
-    ('nummi-pusula', "Nummi-Pusula"),
-    ('nurmes', "Nurmes"),
-    ('nurmijarvi', "Nurmijärvi"),
-    ('narpio', "Närpiö"),
-    ('oravainen', "Oravainen"),
-    ('orimattila', "Orimattila"),
-    ('oripaa', "Oripää"),
-    ('orivesi', "Orivesi"),
-    ('oulainen', "Oulainen"),
-    ('oulu', "Oulu"),
-    ('oulunsalo', "Oulunsalo"),
-    ('outokumpu', "Outokumpu"),
-    ('padasjoki', "Padasjoki"),
-    ('paimio', "Paimio"),
-    ('paltamo', "Paltamo"),
-    ('parikkala', "Parikkala"),
-    ('parkano', "Parkano"),
-    ('pedersore', "Pedersöre"),
-    ('pelkosenniemi', "Pelkosenniemi"),
-    ('pello', "Pello"),
-    ('perho', "Perho"),
-    ('pertunmaa', "Pertunmaa"),
-    ('petajavesi', "Petäjävesi"),
-    ('pieksamaki', "Pieksämäki"),
-    ('pielavesi', "Pielavesi"),
-    ('pietarsaari', "Pietarsaari"),
-    ('pihtipudas', "Pihtipudas"),
-    ('pirkkala', "Pirkkala"),
-    ('polvijarvi', "Polvijärvi"),
-    ('pomarkku', "Pomarkku"),
-    ('pori', "Pori"),
-    ('pornainen', "Pornainen"),
-    ('porvoo', "Porvoo"),
-    ('posio', "Posio"),
-    ('pudasjarvi', "Pudasjärvi"),
-    ('pukkila', "Pukkila"),
-    ('punkaharju', "Punkaharju"),
-    ('punkalaidun', "Punkalaidun"),
-    ('puolanka', "Puolanka"),
-    ('puumala', "Puumala"),
-    ('pyhtaa', "Pyhtää"),
-    ('pyhajoki', "Pyhäjoki"),
-    ('pyhajarvi', "Pyhäjärvi"),
-    ('pyhanta', "Pyhäntä"),
-    ('pyharanta', "Pyhäranta"),
-    ('palkane', "Pälkäne"),
-    ('poytya', "Pöytyä"),
-    ('raahe', "Raahe"),
-    ('raasepori', "Raasepori"),
-    ('raisio', "Raisio"),
-    ('rantasalmi', "Rantasalmi"),
-    ('ranua', "Ranua"),
-    ('rauma', "Rauma"),
-    ('rautalampi', "Rautalampi"),
-    ('rautavaara', "Rautavaara"),
-    ('rautjarvi', "Rautjärvi"),
-    ('reisjarvi', "Reisjärvi"),
-    ('riihimaki', "Riihimäki"),
-    ('ristiina', "Ristiina"),
-    ('ristijarvi', "Ristijärvi"),
-    ('rovaniemi', "Rovaniemi"),
-    ('ruokolahti', "Ruokolahti"),
-    ('ruovesi', "Ruovesi"),
-    ('rusko', "Rusko"),
-    ('raakkyla', "Rääkkylä"),
-    ('saarijarvi', "Saarijärvi"),
-    ('salla', "Salla"),
-    ('salo', "Salo"),
-    ('saltvik', "Saltvik"),
-    ('sastamala', "Sastamala"),
-    ('sauvo', "Sauvo"),
-    ('savitaipale', "Savitaipale"),
-    ('savonlinna', "Savonlinna"),
-    ('savukoski', "Savukoski"),
-    ('seinajoki', "Seinäjoki"),
-    ('sievi', "Sievi"),
-    ('siikainen', "Siikainen"),
-    ('siikajoki', "Siikajoki"),
-    ('siikalatva', "Siikalatva"),
-    ('siilinjarvi', "Siilinjärvi"),
-    ('simo', "Simo"),
-    ('sipoo', "Sipoo"),
-    ('siuntio', "Siuntio"),
-    ('sodankyla', "Sodankylä"),
-    ('soini', "Soini"),
-    ('somero', "Somero"),
-    ('sonkajarvi', "Sonkajärvi"),
-    ('sotkamo', "Sotkamo"),
-    ('sottunga', "Sottunga"),
-    ('sulkava', "Sulkava"),
-    ('sund', "Sund"),
-    ('suomenniemi', "Suomenniemi"),
-    ('suomussalmi', "Suomussalmi"),
-    ('suonenjoki', "Suonenjoki"),
-    ('sysma', "Sysmä"),
-    ('sakyla', "Säkylä"),
-    ('taipalsaari', "Taipalsaari"),
-    ('taivalkoski', "Taivalkoski"),
-    ('taivassalo', "Taivassalo"),
-    ('tammela', "Tammela"),
-    ('tampere', "Tampere"),
-    ('tarvasjoki', "Tarvasjoki"),
-    ('tervo', "Tervo"),
-    ('tervola', "Tervola"),
-    ('teuva', "Teuva"),
-    ('tohmajarvi', "Tohmajärvi"),
-    ('toholampi', "Toholampi"),
-    ('toivakka', "Toivakka"),
-    ('tornio', "Tornio"),
-    ('turku', "Turku"),
-    ('tuusniemi', "Tuusniemi"),
-    ('tuusula', "Tuusula"),
-    ('tyrnava', "Tyrnävä"),
-    ('toysa', "Töysä"),
-    ('ulvila', "Ulvila"),
-    ('urjala', "Urjala"),
-    ('utajarvi', "Utajärvi"),
-    ('utsjoki', "Utsjoki"),
-    ('uurainen', "Uurainen"),
-    ('uusikaarlepyy', "Uusikaarlepyy"),
-    ('uusikaupunki', "Uusikaupunki"),
-    ('vaala', "Vaala"),
-    ('vaasa', "Vaasa"),
-    ('valkeakoski', "Valkeakoski"),
-    ('valtimo', "Valtimo"),
-    ('vantaa', "Vantaa"),
-    ('varkaus', "Varkaus"),
-    ('varpaisjarvi', "Varpaisjärvi"),
-    ('vehmaa', "Vehmaa"),
-    ('vesanto', "Vesanto"),
-    ('vesilahti', "Vesilahti"),
-    ('veteli', "Veteli"),
-    ('vierema', "Vieremä"),
-    ('vihanti', "Vihanti"),
-    ('vihti', "Vihti"),
-    ('viitasaari', "Viitasaari"),
-    ('vimpeli', "Vimpeli"),
-    ('virolahti', "Virolahti"),
-    ('virrat', "Virrat"),
-    ('vardo', "Vårdö"),
-    ('vahakyro', "Vähäkyrö"),
-    ('voyri-maksamaa', "Vöyri-Maksamaa"),
-    ('yli-ii', "Yli-Ii"),
-    ('ylitornio', "Ylitornio"),
-    ('ylivieska', "Ylivieska"),
-    ('ylojarvi', "Ylöjärvi"),
-    ('ypaja', "Ypäjä"),
-    ('ahtari', "Ähtäri"),
-    ('aanekoski', "Äänekoski")
-)
diff --git a/django/contrib/localflavor/fi/forms.py b/django/contrib/localflavor/fi/forms.py
deleted file mode 100644
index 633f3e5f1b..0000000000
--- a/django/contrib/localflavor/fi/forms.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-FI-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.fi.fi_municipalities import MUNICIPALITY_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class FIZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXXX.'),
-    }
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(FIZipCodeField, self).__init__(r'^\d{5}$',
-            max_length, min_length, *args, **kwargs)
-
-class FIMunicipalitySelect(Select):
-    """
-    A Select widget that uses a list of Finnish municipalities as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(FIMunicipalitySelect, self).__init__(attrs, choices=MUNICIPALITY_CHOICES)
-
-class FISocialSecurityNumber(Field):
-    default_error_messages = {
-        'invalid': _('Enter a valid Finnish social security number.'),
-    }
-
-    def clean(self, value):
-        super(FISocialSecurityNumber, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        checkmarks = "0123456789ABCDEFHJKLMNPRSTUVWXY"
-        result = re.match(r"""^
-            (?P<date>([0-2]\d|3[01])
-            (0\d|1[012])
-            (\d{2}))
-            [A+-]
-            (?P<serial>(\d{3}))
-            (?P<checksum>[%s])$""" % checkmarks, value, re.VERBOSE | re.IGNORECASE)
-        if not result:
-            raise ValidationError(self.error_messages['invalid'])
-        gd = result.groupdict()
-        checksum = int(gd['date'] + gd['serial'])
-        if checkmarks[checksum % len(checkmarks)] == gd['checksum'].upper():
-            return '%s' % value.upper()
-        raise ValidationError(self.error_messages['invalid'])
diff --git a/django/contrib/localflavor/fr/forms.py b/django/contrib/localflavor/fr/forms.py
deleted file mode 100644
index 8b841fff5f..0000000000
--- a/django/contrib/localflavor/fr/forms.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-FR-specific Form helpers
-"""
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.fr.fr_department import DEPARTMENT_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import CharField, RegexField, Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-phone_digits_re = re.compile(r'^0\d(\s|\.)?(\d{2}(\s|\.)?){3}\d{2}$')
-
-class FRZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXXX.'),
-    }
-
-    def __init__(self, max_length=5, min_length=5, *args, **kwargs):
-        super(FRZipCodeField, self).__init__(r'^\d{5}$',
-            max_length, min_length, *args, **kwargs)
-
-class FRPhoneNumberField(CharField):
-    """
-    Validate local French phone number (not international ones)
-    The correct format is '0X XX XX XX XX'.
-    '0X.XX.XX.XX.XX' and '0XXXXXXXXX' validate but are corrected to
-    '0X XX XX XX XX'.
-    """
-    default_error_messages = {
-        'invalid': _('Phone numbers must be in 0X XX XX XX XX format.'),
-    }
-
-    def __init__(self, max_length=14, min_length=10, *args, **kwargs):
-        super(FRPhoneNumberField, self).__init__(
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        super(FRPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('(\.|\s)', '', smart_text(value))
-        m = phone_digits_re.search(value)
-        if m:
-            return '%s %s %s %s %s' % (value[0:2], value[2:4], value[4:6], value[6:8], value[8:10])
-        raise ValidationError(self.error_messages['invalid'])
-
-class FRDepartmentSelect(Select):
-    """
-    A Select widget that uses a list of FR departments as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(FRDepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_CHOICES)
diff --git a/django/contrib/localflavor/fr/fr_department.py b/django/contrib/localflavor/fr/fr_department.py
deleted file mode 100644
index a2cca957c2..0000000000
--- a/django/contrib/localflavor/fr/fr_department.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# See the "Code officiel géographique" on the INSEE website <www.insee.fr>.
-from __future__ import unicode_literals
-
-DEPARTMENT_CHOICES = (
-    # Metropolitan departments
-    ('01', '01 - Ain'),
-    ('02', '02 - Aisne'),
-    ('03', '03 - Allier'),
-    ('04', '04 - Alpes-de-Haute-Provence'),
-    ('05', '05 - Hautes-Alpes'),
-    ('06', '06 - Alpes-Maritimes'),
-    ('07', '07 - Ardèche'),
-    ('08', '08 - Ardennes'),
-    ('09', '09 - Ariège'),
-    ('10', '10 - Aube'),
-    ('11', '11 - Aude'),
-    ('12', '12 - Aveyron'),
-    ('13', '13 - Bouches-du-Rhône'),
-    ('14', '14 - Calvados'),
-    ('15', '15 - Cantal'),
-    ('16', '16 - Charente'),
-    ('17', '17 - Charente-Maritime'),
-    ('18', '18 - Cher'),
-    ('19', '19 - Corrèze'),
-    ('2A', '2A - Corse-du-Sud'),
-    ('2B', '2B - Haute-Corse'),
-    ('21', '21 - Côte-d\'Or'),
-    ('22', '22 - Côtes-d\'Armor'),
-    ('23', '23 - Creuse'),
-    ('24', '24 - Dordogne'),
-    ('25', '25 - Doubs'),
-    ('26', '26 - Drôme'),
-    ('27', '27 - Eure'),
-    ('28', '28 - Eure-et-Loir'),
-    ('29', '29 - Finistère'),
-    ('30', '30 - Gard'),
-    ('31', '31 - Haute-Garonne'),
-    ('32', '32 - Gers'),
-    ('33', '33 - Gironde'),
-    ('34', '34 - Hérault'),
-    ('35', '35 - Ille-et-Vilaine'),
-    ('36', '36 - Indre'),
-    ('37', '37 - Indre-et-Loire'),
-    ('38', '38 - Isère'),
-    ('39', '39 - Jura'),
-    ('40', '40 - Landes'),
-    ('41', '41 - Loir-et-Cher'),
-    ('42', '42 - Loire'),
-    ('43', '43 - Haute-Loire'),
-    ('44', '44 - Loire-Atlantique'),
-    ('45', '45 - Loiret'),
-    ('46', '46 - Lot'),
-    ('47', '47 - Lot-et-Garonne'),
-    ('48', '48 - Lozère'),
-    ('49', '49 - Maine-et-Loire'),
-    ('50', '50 - Manche'),
-    ('51', '51 - Marne'),
-    ('52', '52 - Haute-Marne'),
-    ('53', '53 - Mayenne'),
-    ('54', '54 - Meurthe-et-Moselle'),
-    ('55', '55 - Meuse'),
-    ('56', '56 - Morbihan'),
-    ('57', '57 - Moselle'),
-    ('58', '58 - Nièvre'),
-    ('59', '59 - Nord'),
-    ('60', '60 - Oise'),
-    ('61', '61 - Orne'),
-    ('62', '62 - Pas-de-Calais'),
-    ('63', '63 - Puy-de-Dôme'),
-    ('64', '64 - Pyrénées-Atlantiques'),
-    ('65', '65 - Hautes-Pyrénées'),
-    ('66', '66 - Pyrénées-Orientales'),
-    ('67', '67 - Bas-Rhin'),
-    ('68', '68 - Haut-Rhin'),
-    ('69', '69 - Rhône'),
-    ('70', '70 - Haute-Saône'),
-    ('71', '71 - Saône-et-Loire'),
-    ('72', '72 - Sarthe'),
-    ('73', '73 - Savoie'),
-    ('74', '74 - Haute-Savoie'),
-    ('75', '75 - Paris'),
-    ('76', '76 - Seine-Maritime'),
-    ('77', '77 - Seine-et-Marne'),
-    ('78', '78 - Yvelines'),
-    ('79', '79 - Deux-Sèvres'),
-    ('80', '80 - Somme'),
-    ('81', '81 - Tarn'),
-    ('82', '82 - Tarn-et-Garonne'),
-    ('83', '83 - Var'),
-    ('84', '84 - Vaucluse'),
-    ('85', '85 - Vendée'),
-    ('86', '86 - Vienne'),
-    ('87', '87 - Haute-Vienne'),
-    ('88', '88 - Vosges'),
-    ('89', '89 - Yonne'),
-    ('90', '90 - Territoire de Belfort'),
-    ('91', '91 - Essonne'),
-    ('92', '92 - Hauts-de-Seine'),
-    ('93', '93 - Seine-Saint-Denis'),
-    ('94', '94 - Val-de-Marne'),
-    ('95', '95 - Val-d\'Oise'),
-    # Overseas departments, communities, and other territories
-    ('971', '971 - Guadeloupe'),
-    ('972', '972 - Martinique'),
-    ('973', '973 - Guyane'),
-    ('974', '974 - La Réunion'),
-    ('975', '975 - Saint-Pierre-et-Miquelon'),
-    ('976', '976 - Mayotte'),
-    ('977', '977 - Saint-Barthélemy'),
-    ('978', '978 - Saint-Martin'),
-    ('984', '984 - Terres australes et antarctiques françaises'),
-    ('986', '986 - Wallis et Futuna'),
-    ('987', '987 - Polynésie française'),
-    ('988', '988 - Nouvelle-Calédonie'),
-    ('989', '989 - Île de Clipperton'),
-)
diff --git a/django/contrib/localflavor/gb/forms.py b/django/contrib/localflavor/gb/forms.py
deleted file mode 100644
index bf90f80281..0000000000
--- a/django/contrib/localflavor/gb/forms.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-GB-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.gb.gb_regions import GB_NATIONS_CHOICES, GB_REGION_CHOICES
-from django.forms.fields import CharField, Select
-from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _
-
-
-class GBPostcodeField(CharField):
-    """
-    A form field that validates its input is a UK postcode.
-
-    The regular expression used is sourced from the schema for British Standard
-    BS7666 address types: http://www.govtalk.gov.uk/gdsc/schemas/bs7666-v2-0.xsd
-
-    The value is uppercased and a space added in the correct place, if required.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid postcode.'),
-    }
-    outcode_pattern = '[A-PR-UWYZ]([0-9]{1,2}|([A-HIK-Y][0-9](|[0-9]|[ABEHMNPRVWXY]))|[0-9][A-HJKSTUW])'
-    incode_pattern = '[0-9][ABD-HJLNP-UW-Z]{2}'
-    postcode_regex = re.compile(r'^(GIR 0AA|%s %s)$' % (outcode_pattern, incode_pattern))
-    space_regex = re.compile(r' *(%s)$' % incode_pattern)
-
-    def clean(self, value):
-        value = super(GBPostcodeField, self).clean(value)
-        if value == '':
-            return value
-        postcode = value.upper().strip()
-        # Put a single space before the incode (second part).
-        postcode = self.space_regex.sub(r' \1', postcode)
-        if not self.postcode_regex.search(postcode):
-            raise ValidationError(self.error_messages['invalid'])
-        return postcode
-
-class GBCountySelect(Select):
-    """
-    A Select widget that uses a list of UK Counties/Regions as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(GBCountySelect, self).__init__(attrs, choices=GB_REGION_CHOICES)
-
-class GBNationSelect(Select):
-    """
-    A Select widget that uses a list of UK Nations as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(GBNationSelect, self).__init__(attrs, choices=GB_NATIONS_CHOICES)
diff --git a/django/contrib/localflavor/gb/gb_regions.py b/django/contrib/localflavor/gb/gb_regions.py
deleted file mode 100644
index c5f5dd7b76..0000000000
--- a/django/contrib/localflavor/gb/gb_regions.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""
-Sources:
-    English regions: http://www.statistics.gov.uk/geography/downloads/31_10_01_REGION_names_and_codes_12_00.xls
-    Northern Ireland regions: http://en.wikipedia.org/wiki/List_of_Irish_counties_by_area
-    Welsh regions: http://en.wikipedia.org/wiki/Preserved_counties_of_Wales
-    Scottish regions: http://en.wikipedia.org/wiki/Regions_and_districts_of_Scotland
-"""
-from django.utils.translation import ugettext_lazy as _
-
-ENGLAND_REGION_CHOICES = (
-    ("Bedfordshire", _("Bedfordshire")),
-    ("Buckinghamshire", _("Buckinghamshire")),
-    ("Cambridgeshire", ("Cambridgeshire")),
-    ("Cheshire", _("Cheshire")),
-    ("Cornwall and Isles of Scilly", _("Cornwall and Isles of Scilly")),
-    ("Cumbria", _("Cumbria")),
-    ("Derbyshire", _("Derbyshire")),
-    ("Devon", _("Devon")),
-    ("Dorset", _("Dorset")),
-    ("Durham", _("Durham")),
-    ("East Sussex", _("East Sussex")),
-    ("Essex", _("Essex")),
-    ("Gloucestershire", _("Gloucestershire")),
-    ("Greater London", _("Greater London")),
-    ("Greater Manchester", _("Greater Manchester")),
-    ("Hampshire", _("Hampshire")),
-    ("Hertfordshire", _("Hertfordshire")),
-    ("Kent", _("Kent")),
-    ("Lancashire", _("Lancashire")),
-    ("Leicestershire", _("Leicestershire")),
-    ("Lincolnshire", _("Lincolnshire")),
-    ("Merseyside", _("Merseyside")),
-    ("Norfolk", _("Norfolk")),
-    ("North Yorkshire", _("North Yorkshire")),
-    ("Northamptonshire", _("Northamptonshire")),
-    ("Northumberland", _("Northumberland")),
-    ("Nottinghamshire", _("Nottinghamshire")),
-    ("Oxfordshire", _("Oxfordshire")),
-    ("Shropshire", _("Shropshire")),
-    ("Somerset", _("Somerset")),
-    ("South Yorkshire", _("South Yorkshire")),
-    ("Staffordshire", _("Staffordshire")),
-    ("Suffolk", _("Suffolk")),
-    ("Surrey", _("Surrey")),
-    ("Tyne and Wear", _("Tyne and Wear")),
-    ("Warwickshire", _("Warwickshire")),
-    ("West Midlands", _("West Midlands")),
-    ("West Sussex", _("West Sussex")),
-    ("West Yorkshire", _("West Yorkshire")),
-    ("Wiltshire", _("Wiltshire")),
-    ("Worcestershire", _("Worcestershire")),
-)
-
-NORTHERN_IRELAND_REGION_CHOICES = (
-    ("County Antrim", _("County Antrim")),
-    ("County Armagh", _("County Armagh")),
-    ("County Down", _("County Down")),
-    ("County Fermanagh", _("County Fermanagh")),
-    ("County Londonderry", _("County Londonderry")),
-    ("County Tyrone", _("County Tyrone")),
-)
-
-WALES_REGION_CHOICES = (
-    ("Clwyd", _("Clwyd")),
-    ("Dyfed", _("Dyfed")),
-    ("Gwent", _("Gwent")),
-    ("Gwynedd", _("Gwynedd")),
-    ("Mid Glamorgan", _("Mid Glamorgan")),
-    ("Powys", _("Powys")),
-    ("South Glamorgan", _("South Glamorgan")),
-    ("West Glamorgan", _("West Glamorgan")),
-)
-
-SCOTTISH_REGION_CHOICES = (
-    ("Borders", _("Borders")),
-    ("Central Scotland", _("Central Scotland")),
-    ("Dumfries and Galloway", _("Dumfries and Galloway")),
-    ("Fife", _("Fife")),
-    ("Grampian", _("Grampian")),
-    ("Highland", _("Highland")),
-    ("Lothian", _("Lothian")),
-    ("Orkney Islands", _("Orkney Islands")),
-    ("Shetland Islands", _("Shetland Islands")),
-    ("Strathclyde", _("Strathclyde")),
-    ("Tayside", _("Tayside")),
-    ("Western Isles", _("Western Isles")),
-)
-
-GB_NATIONS_CHOICES = (
-    ("England", _("England")),
-    ("Northern Ireland", _("Northern Ireland")),
-    ("Scotland", _("Scotland")),
-    ("Wales", _("Wales")),
-)
-
-GB_REGION_CHOICES = ENGLAND_REGION_CHOICES + NORTHERN_IRELAND_REGION_CHOICES + WALES_REGION_CHOICES + SCOTTISH_REGION_CHOICES
-
diff --git a/django/contrib/localflavor/generic/forms.py b/django/contrib/localflavor/generic/forms.py
deleted file mode 100644
index b040f68bb4..0000000000
--- a/django/contrib/localflavor/generic/forms.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from django import forms
-
-DEFAULT_DATE_INPUT_FORMATS = (
-    '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06'
-    '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006'
-    '%d %b %Y', '%d %b, %Y',            # '25 Oct 2006', '25 Oct, 2006'
-    '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 2006'
-    '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006'
-)
-
-DEFAULT_DATETIME_INPUT_FORMATS = (
-    '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
-    '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
-    '%Y-%m-%d',              # '2006-10-25'
-    '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59'
-    '%d/%m/%Y %H:%M',        # '25/10/2006 14:30'
-    '%d/%m/%Y',              # '25/10/2006'
-    '%d/%m/%y %H:%M:%S',     # '25/10/06 14:30:59'
-    '%d/%m/%y %H:%M',        # '25/10/06 14:30'
-    '%d/%m/%y',              # '25/10/06'
-)
-
-class DateField(forms.DateField):
-    """
-    A date input field which uses non-US date input formats by default.
-    """
-    def __init__(self, input_formats=None, *args, **kwargs):
-        input_formats = input_formats or DEFAULT_DATE_INPUT_FORMATS
-        super(DateField, self).__init__(input_formats=input_formats, *args, **kwargs)
-
-class DateTimeField(forms.DateTimeField):
-    """
-    A date and time input field which uses non-US date and time input formats
-    by default.
-    """
-    def __init__(self, input_formats=None, *args, **kwargs):
-        input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS
-        super(DateTimeField, self).__init__(input_formats=input_formats, *args, **kwargs)
-
-class SplitDateTimeField(forms.SplitDateTimeField):
-    """
-    Split date and time input fields which use non-US date and time input
-    formats by default.
-    """
-    def __init__(self, input_date_formats=None, input_time_formats=None, *args, **kwargs):
-        input_date_formats = input_date_formats or DEFAULT_DATE_INPUT_FORMATS
-        super(SplitDateTimeField, self).__init__(input_date_formats=input_date_formats,
-                                                 input_time_formats=input_time_formats, *args, **kwargs)
diff --git a/django/contrib/localflavor/hk/forms.py b/django/contrib/localflavor/hk/forms.py
deleted file mode 100644
index ab4f70f193..0000000000
--- a/django/contrib/localflavor/hk/forms.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-Hong Kong specific Form helpers
-"""
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import CharField
-from django.forms import ValidationError
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-hk_phone_digits_re = re.compile(r'^(?:852-?)?(\d{4})[-\.]?(\d{4})$')
-hk_special_numbers = ('999', '992', '112')
-hk_phone_prefixes = ('2', '3', '5', '6', '8', '9')
-hk_formats = ['XXXX-XXXX', '852-XXXX-XXXX', '(+852) XXXX-XXXX',
-    'XXXX XXXX', 'XXXXXXXX']
-
-
-
-class HKPhoneNumberField(CharField):
-    """
-    Validate Hong Kong phone number.
-    The input format can be either one of the followings:
-    'XXXX-XXXX', '852-XXXX-XXXX', '(+852) XXXX-XXXX',
-    'XXXX XXXX', or 'XXXXXXXX'.
-    The output format is 'XXXX-XXXX'.
-
-    Note: The phone number shall not start with 999, 992, or 112.
-          And, it should start with either 2, 3, 5, 6, 8, or 9.
-
-    Ref - http://en.wikipedia.org/wiki/Telephone_numbers_in_Hong_Kong
-    """
-    default_error_messages = {
-        'disguise': _('Phone number should not start with ' \
-                    'one of the followings: %s.' % \
-                    ', '.join(hk_special_numbers)),
-        'invalid': _('Phone number must be in one of the following formats: '
-                    '%s.' % ', '.join(hk_formats)),
-        'prefix': _('Phone number should start with ' \
-                  'one of the followings: %s.' % \
-                  ', '.join(hk_phone_prefixes)),
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(HKPhoneNumberField, self).__init__(*args, **kwargs)
-
-    def clean(self, value):
-        super(HKPhoneNumberField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = re.sub('(\(|\)|\s+|\+)', '', smart_text(value))
-        m = hk_phone_digits_re.search(value)
-        if not m:
-            raise ValidationError(self.error_messages['invalid'])
-
-        value = '%s-%s' % (m.group(1), m.group(2))
-        for special in hk_special_numbers:
-            if value.startswith(special):
-                raise ValidationError(self.error_messages['disguise'])
-
-        prefix_found = map(lambda prefix: value.startswith(prefix),
-                           hk_phone_prefixes)
-        if not any(prefix_found):
-            raise ValidationError(self.error_messages['prefix'])
-
-        return value
diff --git a/django/contrib/localflavor/hr/forms.py b/django/contrib/localflavor/hr/forms.py
deleted file mode 100644
index 083b61c49e..0000000000
--- a/django/contrib/localflavor/hr/forms.py
+++ /dev/null
@@ -1,282 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-HR-specific Form helpers
-"""
-from __future__ import absolute_import, unicode_literals
-
-import datetime
-import re
-
-from django.contrib.localflavor.hr.hr_choices import (
-    HR_LICENSE_PLATE_PREFIX_CHOICES, HR_COUNTY_CHOICES,
-    HR_PHONE_NUMBER_PREFIX_CHOICES)
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, Select, RegexField
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-jmbg_re = re.compile(r'^(?P<dd>\d{2})(?P<mm>\d{2})(?P<yyy>\d{3})' + \
-            r'(?P<rr>\d{2})(?P<bbb>\d{3})(?P<k>\d{1})$')
-oib_re = re.compile(r'^\d{11}$')
-plate_re = re.compile(r'^(?P<prefix>[A-ZČŠŽ]{2})' + \
-            r'(?P<number>\d{3,4})(?P<suffix>[ABCDEFGHIJKLMNOPRSTUVZ]{1,2})$')
-postal_code_re = re.compile(r'^\d{5}$')
-phone_re = re.compile(r'^(\+385|00385|0)(?P<prefix>\d{2})(?P<number>\d{6,7})$')
-jmbag_re = re.compile(r'^601983(?P<copy>\d{1})1(?P<jmbag>\d{10})(?P<k>\d{1})$')
-
-
-class HRCountySelect(Select):
-    """
-    A Select widget that uses a list of counties of Croatia as its choices.
-    """
-
-    def __init__(self, attrs=None):
-        super(HRCountySelect, self).__init__(attrs, choices=HR_COUNTY_CHOICES)
-
-
-class HRLicensePlatePrefixSelect(Select):
-    """
-    A Select widget that uses a list of vehicle license plate prefixes of
-    Croatia as its choices.
-    """
-
-    def __init__(self, attrs=None):
-        super(HRLicensePlatePrefixSelect, self).__init__(attrs,
-            choices=HR_LICENSE_PLATE_PREFIX_CHOICES)
-
-
-class HRPhoneNumberPrefixSelect(Select):
-    """
-    A Select widget that uses a list of phone number prefixes of Croatia as its
-    choices.
-    """
-
-    def __init__(self, attrs=None):
-        super(HRPhoneNumberPrefixSelect, self).__init__(attrs,
-            choices=HR_PHONE_NUMBER_PREFIX_CHOICES)
-
-
-class HRJMBGField(Field):
-    """
-    Unique Master Citizen Number (JMBG) field.
-    The number is still in use in Croatia, but it is being replaced by OIB.
-
-    Source: http://en.wikipedia.org/wiki/Unique_Master_Citizen_Number
-
-    For who might be reimplementing:
-    The "area" regular expression group is used to calculate the region where a
-    person was registered. Additional validation can be implemented in
-    accordance with it, however this could result in exclusion of legit
-    immigrated citizens. Therefore, this field works for any ex-Yugoslavia
-    country.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid 13 digit JMBG'),
-        'date': _('Error in date segment'),
-    }
-
-    def clean(self, value):
-        super(HRJMBGField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = value.strip()
-
-        matches = jmbg_re.search(value)
-        if matches is None:
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Make sure the date part is correct.
-        dd = int(matches.group('dd'))
-        mm = int(matches.group('mm'))
-        yyy = int(matches.group('yyy'))
-        try:
-            datetime.date(yyy, mm, dd)
-        except ValueError:
-            raise ValidationError(self.error_messages['date'])
-
-        # Validate checksum.
-        k = matches.group('k')
-        checksum = 0
-        for i, j in zip(range(7, 1, -1), range(6)):
-            checksum += i * (int(value[j]) + int(value[13 - i]))
-        m = 11 - checksum % 11
-        if m == 10:
-            raise ValidationError(self.error_messages['invalid'])
-        if m == 11 and k != '0':
-            raise ValidationError(self.error_messages['invalid'])
-        if not str(m) == k:
-            raise ValidationError(self.error_messages['invalid'])
-
-        return '%s' % (value, )
-
-
-class HROIBField(RegexField):
-    """
-    Personal Identification Number of Croatia (OIB) field.
-
-    http://www.oib.hr/
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid 11 digit OIB'),
-    }
-
-    def __init__(self, min_length=11, max_length=11, *args, **kwargs):
-        super(HROIBField, self).__init__(r'^\d{11}$',
-            min_length, max_length, *args, **kwargs)
-
-    def clean(self, value):
-        super(HROIBField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        return '%s' % (value, )
-
-
-class HRLicensePlateField(Field):
-    """
-    Vehicle license plate of Croatia field. Normalizes to the specific format
-    below. Suffix is constructed from the shared letters of the Croatian and
-    English alphabets.
-
-    Format examples:
-        SB 123-A
-        (but also supports more characters)
-        ZG 1234-AA
-
-    Used for standardized license plates only.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid vehicle license plate number'),
-        'area': _('Enter a valid location code'),
-        'number': _('Number part cannot be zero'),
-    }
-
-    def clean(self, value):
-        super(HRLicensePlateField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = re.sub(r'[\s\-]+', '', smart_text(value.strip())).upper()
-
-        matches = plate_re.search(value)
-        if matches is None:
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Make sure the prefix is in the list of known codes.
-        prefix = matches.group('prefix')
-        if prefix not in [choice[0] for choice in HR_LICENSE_PLATE_PREFIX_CHOICES]:
-            raise ValidationError(self.error_messages['area'])
-
-        # Make sure the number portion is not zero.
-        number = matches.group('number')
-        if int(number) == 0:
-            raise ValidationError(self.error_messages['number'])
-
-        return '%s %s-%s' % (prefix,number,matches.group('suffix'), )
-
-
-class HRPostalCodeField(Field):
-    """
-    Postal code of Croatia field.
-    It consists of exactly five digits ranging from 10000 to possibly less than
-    60000.
-
-    http://www.posta.hr/main.aspx?id=66
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid 5 digit postal code'),
-    }
-
-    def clean(self, value):
-        super(HRPostalCodeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = value.strip()
-        if not postal_code_re.search(value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Make sure the number is in valid range.
-        if not 9999<int(value)<60000:
-            raise ValidationError(self.error_messages['invalid'])
-
-        return '%s' % (value, )
-
-
-class HRPhoneNumberField(Field):
-    """
-    Phone number of Croatia field.
-    Format: Complete country code or leading zero, area code prefix, 6 or 7
-    digit number.
-    Validates fixed, mobile and FGSM numbers. Normalizes to a full number with
-    country code (+385 prefix).
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid phone number'),
-        'area': _('Enter a valid area or mobile network code'),
-        'number': _('The phone nubmer is too long'),
-    }
-
-    def clean(self, value):
-        super(HRPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = re.sub(r'[\-\s\(\)]', '', smart_text(value))
-
-        matches = phone_re.search(value)
-        if matches is None:
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Make sure the prefix is in the list of known codes.
-        prefix = matches.group('prefix')
-        number = matches.group('number')
-        if prefix[0] == '1':
-            number = prefix[1] + number
-            prefix = prefix[0]
-        if prefix not in [choice[0] for choice in HR_PHONE_NUMBER_PREFIX_CHOICES]:
-            raise ValidationError(self.error_messages['area'])
-
-        # Make sure the number is of adequate length.
-        if prefix=='1' and len(number)!=7:
-            raise ValidationError(self.error_messages['number'])
-
-        return '%s%s%s' % ('+385',prefix,number)
-
-
-class HRJMBAGField(Field):
-    """
-    Unique Master Academic Citizen Number of Croatia (JMBAG) field.
-    This number is used by college students and professors in Croatia.
-
-    http://www.cap.srce.hr/IzgledX.aspx
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid 19 digit JMBAG starting with 601983'),
-        'copy': _('Card issue number cannot be zero'),
-    }
-
-    def clean(self, value):
-        super(HRJMBAGField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = re.sub(r'[\-\s]', '', value.strip())
-
-        matches = jmbag_re.search(value)
-        if matches is None:
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Make sure the issue number is not zero.
-        if matches.group('copy')=='0':
-            raise ValidationError(self.error_messages['copy'])
-
-        # Validate checksum using Luhn algorithm.
-        num = [int(x) for x in value]
-        if not sum(num[::-2] + [sum(divmod(d * 2, 10)) for d in num[-2::-2]]) % 10 == 0:
-            raise ValidationError(self.error_messages['invalid'])
-
-        return '%s' % (value, )
diff --git a/django/contrib/localflavor/hr/hr_choices.py b/django/contrib/localflavor/hr/hr_choices.py
deleted file mode 100644
index beb2969405..0000000000
--- a/django/contrib/localflavor/hr/hr_choices.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Sources:
-    Croatian Counties: http://en.wikipedia.org/wiki/ISO_3166-2:HR
-
-    Croatia doesn't have official abbreviations for counties.
-    The ones provided are in common use.
-"""
-from __future__ import unicode_literals
-
-from django.utils.translation import ugettext_lazy as _
-
-HR_COUNTY_CHOICES = (
-    ('GZG', _('Grad Zagreb')),
-    ('BBŽ', _('Bjelovarsko-bilogorska županija')),
-    ('BPŽ', _('Brodsko-posavska županija')),
-    ('DNŽ', _('Dubrovačko-neretvanska županija')),
-    ('IŽ', _('Istarska županija')),
-    ('KŽ', _('Karlovačka županija')),
-    ('KKŽ', _('Koprivničko-križevačka županija')),
-    ('KZŽ', _('Krapinsko-zagorska županija')),
-    ('LSŽ', _('Ličko-senjska županija')),
-    ('MŽ', _('Međimurska županija')),
-    ('OBŽ', _('Osječko-baranjska županija')),
-    ('PSŽ', _('Požeško-slavonska županija')),
-    ('PGŽ', _('Primorsko-goranska županija')),
-    ('SMŽ', _('Sisačko-moslavačka županija')),
-    ('SDŽ', _('Splitsko-dalmatinska županija')),
-    ('ŠKŽ', _('Šibensko-kninska županija')),
-    ('VŽ', _('Varaždinska županija')),
-    ('VPŽ', _('Virovitičko-podravska županija')),
-    ('VSŽ', _('Vukovarsko-srijemska županija')),
-    ('ZDŽ', _('Zadarska županija')),
-    ('ZGŽ', _('Zagrebačka županija')),
-)
-
-"""
-Sources:
-http://hr.wikipedia.org/wiki/Dodatak:Popis_registracijskih_oznaka_za_cestovna_vozila_u_Hrvatskoj
-
-Only common license plate prefixes are provided. Special cases and obsolete prefixes are omitted.
-"""
-
-HR_LICENSE_PLATE_PREFIX_CHOICES = (
-    ('BJ', 'BJ'),
-    ('BM', 'BM'),
-    ('ČK', 'ČK'),
-    ('DA', 'DA'),
-    ('DE', 'DE'),
-    ('DJ', 'DJ'),
-    ('DU', 'DU'),
-    ('GS', 'GS'),
-    ('IM', 'IM'),
-    ('KA', 'KA'),
-    ('KC', 'KC'),
-    ('KR', 'KR'),
-    ('KT', 'KT'),
-    ('KŽ', 'KŽ'),
-    ('MA', 'MA'),
-    ('NA', 'NA'),
-    ('NG', 'NG'),
-    ('OG', 'OG'),
-    ('OS', 'OS'),
-    ('PU', 'PU'),
-    ('PŽ', 'PŽ'),
-    ('RI', 'RI'),
-    ('SB', 'SB'),
-    ('SK', 'SK'),
-    ('SL', 'SL'),
-    ('ST', 'ST'),
-    ('ŠI', 'ŠI'),
-    ('VK', 'VK'),
-    ('VT', 'VT'),
-    ('VU', 'VU'),
-    ('VŽ', 'VŽ'),
-    ('ZD', 'ZD'),
-    ('ZG', 'ZG'),
-    ('ŽU', 'ŽU'),
-)
-
-"""
-The list includes county and cellular network phone number prefixes.
-"""
-
-HR_PHONE_NUMBER_PREFIX_CHOICES = (
-    ('1', '01'),
-    ('20', '020'),
-    ('21', '021'),
-    ('22', '022'),
-    ('23', '023'),
-    ('31', '031'),
-    ('32', '032'),
-    ('33', '033'),
-    ('34', '034'),
-    ('35', '035'),
-    ('40', '040'),
-    ('42', '042'),
-    ('43', '043'),
-    ('44', '044'),
-    ('47', '047'),
-    ('48', '048'),
-    ('49', '049'),
-    ('51', '051'),
-    ('52', '052'),
-    ('53', '053'),
-    ('91', '091'),
-    ('92', '092'),
-    ('95', '095'),
-    ('97', '097'),
-    ('98', '098'),
-    ('99', '099'),
-)
diff --git a/django/contrib/localflavor/id/forms.py b/django/contrib/localflavor/id/forms.py
deleted file mode 100644
index 2005dbc75c..0000000000
--- a/django/contrib/localflavor/id/forms.py
+++ /dev/null
@@ -1,217 +0,0 @@
-"""
-ID-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-import time
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, Select
-from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import smart_text
-
-
-postcode_re = re.compile(r'^[1-9]\d{4}$')
-phone_re = re.compile(r'^(\+62|0)[2-9]\d{7,10}$')
-plate_re = re.compile(r'^(?P<prefix>[A-Z]{1,2}) ' + \
-            r'(?P<number>\d{1,5})( (?P<suffix>([A-Z]{1,3}|[1-9][0-9]{,2})))?$')
-nik_re = re.compile(r'^\d{16}$')
-
-
-class IDPostCodeField(Field):
-    """
-    An Indonesian post code field.
-
-    http://id.wikipedia.org/wiki/Kode_pos
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid post code'),
-    }
-
-    def clean(self, value):
-        super(IDPostCodeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = value.strip()
-        if not postcode_re.search(value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        if int(value) < 10110:
-            raise ValidationError(self.error_messages['invalid'])
-
-        # 1xxx0
-        if value[0] == '1' and value[4] != '0':
-            raise ValidationError(self.error_messages['invalid'])
-
-        return '%s' % (value, )
-
-
-class IDProvinceSelect(Select):
-    """
-    A Select widget that uses a list of provinces of Indonesia as its
-    choices.
-    """
-
-    def __init__(self, attrs=None):
-        # Load data in memory only when it is required, see also #17275
-        from django.contrib.localflavor.id.id_choices import PROVINCE_CHOICES
-        super(IDProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
-
-
-class IDPhoneNumberField(Field):
-    """
-    An Indonesian telephone number field.
-
-    http://id.wikipedia.org/wiki/Daftar_kode_telepon_di_Indonesia
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid phone number'),
-    }
-
-    def clean(self, value):
-        super(IDPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        phone_number = re.sub(r'[\-\s\(\)]', '', smart_text(value))
-
-        if phone_re.search(phone_number):
-            return smart_text(value)
-
-        raise ValidationError(self.error_messages['invalid'])
-
-
-class IDLicensePlatePrefixSelect(Select):
-    """
-    A Select widget that uses a list of vehicle license plate prefix code
-    of Indonesia as its choices.
-
-    http://id.wikipedia.org/wiki/Tanda_Nomor_Kendaraan_Bermotor
-    """
-
-    def __init__(self, attrs=None):
-        # Load data in memory only when it is required, see also #17275
-        from django.contrib.localflavor.id.id_choices import LICENSE_PLATE_PREFIX_CHOICES
-        super(IDLicensePlatePrefixSelect, self).__init__(attrs,
-            choices=LICENSE_PLATE_PREFIX_CHOICES)
-
-
-class IDLicensePlateField(Field):
-    """
-    An Indonesian vehicle license plate field.
-
-    http://id.wikipedia.org/wiki/Tanda_Nomor_Kendaraan_Bermotor
-
-    Plus: "B 12345 12"
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid vehicle license plate number'),
-    }
-
-    def clean(self, value):
-        # Load data in memory only when it is required, see also #17275
-        from django.contrib.localflavor.id.id_choices import LICENSE_PLATE_PREFIX_CHOICES
-        super(IDLicensePlateField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        plate_number = re.sub(r'\s+', ' ',
-            smart_text(value.strip())).upper()
-
-        matches = plate_re.search(plate_number)
-        if matches is None:
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Make sure prefix is in the list of known codes.
-        prefix = matches.group('prefix')
-        if prefix not in [choice[0] for choice in LICENSE_PLATE_PREFIX_CHOICES]:
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Only Jakarta (prefix B) can have 3 letter suffix.
-        suffix = matches.group('suffix')
-        if suffix is not None and len(suffix) == 3 and prefix != 'B':
-            raise ValidationError(self.error_messages['invalid'])
-
-        # RI plates don't have suffix.
-        if prefix == 'RI' and suffix is not None and suffix != '':
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Number can't be zero.
-        number = matches.group('number')
-        if number == '0':
-            raise ValidationError(self.error_messages['invalid'])
-
-        # CD, CC and B 12345 12
-        if len(number) == 5 or prefix in ('CD', 'CC'):
-            # suffix must be numeric and non-empty
-            if re.match(r'^\d+$', suffix) is None:
-                raise ValidationError(self.error_messages['invalid'])
-
-            # Known codes range is 12-124
-            if prefix in ('CD', 'CC') and not (12 <= int(number) <= 124):
-                raise ValidationError(self.error_messages['invalid'])
-            if len(number) == 5 and not (12 <= int(suffix) <= 124):
-                raise ValidationError(self.error_messages['invalid'])
-        else:
-            # suffix must be non-numeric
-            if suffix is not None and re.match(r'^[A-Z]{,3}$', suffix) is None:
-                raise ValidationError(self.error_messages['invalid'])
-
-        return plate_number
-
-
-class IDNationalIdentityNumberField(Field):
-    """
-    An Indonesian national identity number (NIK/KTP#) field.
-
-    http://id.wikipedia.org/wiki/Nomor_Induk_Kependudukan
-
-    xx.xxxx.ddmmyy.xxxx - 16 digits (excl. dots)
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid NIK/KTP number'),
-    }
-
-    def clean(self, value):
-        super(IDNationalIdentityNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = re.sub(r'[\s.]', '', smart_text(value))
-
-        if not nik_re.search(value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        if int(value) == 0:
-            raise ValidationError(self.error_messages['invalid'])
-
-        def valid_nik_date(year, month, day):
-            try:
-                t1 = (int(year), int(month), int(day), 0, 0, 0, 0, 0, -1)
-                d = time.mktime(t1)
-                t2 = time.localtime(d)
-                if t1[:3] != t2[:3]:
-                    return False
-                else:
-                    return True
-            except (OverflowError, ValueError):
-                return False
-
-        year = int(value[10:12])
-        month = int(value[8:10])
-        day = int(value[6:8])
-        current_year = time.localtime().tm_year
-        if year < int(str(current_year)[-2:]):
-            if not valid_nik_date(2000 + int(year), month, day):
-                raise ValidationError(self.error_messages['invalid'])
-        elif not valid_nik_date(1900 + int(year), month, day):
-            raise ValidationError(self.error_messages['invalid'])
-
-        if value[:6] == '000000' or value[12:] == '0000':
-            raise ValidationError(self.error_messages['invalid'])
-
-        return '%s.%s.%s.%s' % (value[:2], value[2:6], value[6:12], value[12:])
diff --git a/django/contrib/localflavor/id/id_choices.py b/django/contrib/localflavor/id/id_choices.py
deleted file mode 100644
index 64c4bccf13..0000000000
--- a/django/contrib/localflavor/id/id_choices.py
+++ /dev/null
@@ -1,107 +0,0 @@
-import warnings
-from django.utils.translation import ugettext_lazy as _
-
-# Reference: http://id.wikipedia.org/wiki/Daftar_provinsi_Indonesia
-
-# Indonesia does not have an official Province code standard.
-# I decided to use unambiguous and consistent (some are common) 3-letter codes.
-
-warnings.warn(
-    'There have been recent changes to the ID localflavor. See the release notes for details',
-    RuntimeWarning
-)
-
-PROVINCE_CHOICES = (
-    ('ACE', _('Aceh')),
-    ('BLI', _('Bali')),
-    ('BTN', _('Banten')),
-    ('BKL', _('Bengkulu')),
-    ('DIY', _('Yogyakarta')),
-    ('JKT', _('Jakarta')),
-    ('GOR', _('Gorontalo')),
-    ('JMB', _('Jambi')),
-    ('JBR', _('Jawa Barat')),
-    ('JTG', _('Jawa Tengah')),
-    ('JTM', _('Jawa Timur')),
-    ('KBR', _('Kalimantan Barat')),
-    ('KSL', _('Kalimantan Selatan')),
-    ('KTG', _('Kalimantan Tengah')),
-    ('KTM', _('Kalimantan Timur')),
-    ('BBL', _('Kepulauan Bangka-Belitung')),
-    ('KRI', _('Kepulauan Riau')),
-    ('LPG', _('Lampung')),
-    ('MLK', _('Maluku')),
-    ('MUT', _('Maluku Utara')),
-    ('NTB', _('Nusa Tenggara Barat')),
-    ('NTT', _('Nusa Tenggara Timur')),
-    ('PPA', _('Papua')),
-    ('PPB', _('Papua Barat')),
-    ('RIU', _('Riau')),
-    ('SLB', _('Sulawesi Barat')),
-    ('SLS', _('Sulawesi Selatan')),
-    ('SLT', _('Sulawesi Tengah')),
-    ('SLR', _('Sulawesi Tenggara')),
-    ('SLU', _('Sulawesi Utara')),
-    ('SMB', _('Sumatera Barat')),
-    ('SMS', _('Sumatera Selatan')),
-    ('SMU', _('Sumatera Utara')),
-)
-
-LICENSE_PLATE_PREFIX_CHOICES = (
-    ('A', _('Banten')),
-    ('AA', _('Magelang')),
-    ('AB', _('Yogyakarta')),
-    ('AD', _('Surakarta - Solo')),
-    ('AE', _('Madiun')),
-    ('AG', _('Kediri')),
-    ('B', _('Jakarta')),
-    ('BA', _('Sumatera Barat')),
-    ('BB', _('Tapanuli')),
-    ('BD', _('Bengkulu')),
-    ('BE', _('Lampung')),
-    ('BG', _('Sumatera Selatan')),
-    ('BH', _('Jambi')),
-    ('BK', _('Sumatera Utara')),
-    ('BL', _('Nanggroe Aceh Darussalam')),
-    ('BM', _('Riau')),
-    ('BN', _('Kepulauan Bangka Belitung')),
-    ('BP', _('Kepulauan Riau')),
-    ('CC', _('Corps Consulate')),
-    ('CD', _('Corps Diplomatic')),
-    ('D', _('Bandung')),
-    ('DA', _('Kalimantan Selatan')),
-    ('DB', _('Sulawesi Utara Daratan')),
-    ('DC', _('Sulawesi Barat')),
-    ('DD', _('Sulawesi Selatan')),
-    ('DE', _('Maluku')),
-    ('DG', _('Maluku Utara')),
-    ('DH', _('NTT - Timor')),
-    ('DK', _('Bali')),
-    ('DL', _('Sulawesi Utara Kepulauan')),
-    ('DM', _('Gorontalo')),
-    ('DN', _('Sulawesi Tengah')),
-    ('DR', _('NTB - Lombok')),
-    ('DS', _('Papua dan Papua Barat')),
-    ('DT', _('Sulawesi Tenggara')),
-    ('E', _('Cirebon')),
-    ('EA', _('NTB - Sumbawa')),
-    ('EB', _('NTT - Flores')),
-    ('ED', _('NTT - Sumba')),
-    ('F', _('Bogor')),
-    ('G', _('Pekalongan')),
-    ('H', _('Semarang')),
-    ('K', _('Pati')),
-    ('KB', _('Kalimantan Barat')),
-    ('KH', _('Kalimantan Tengah')),
-    ('KT', _('Kalimantan Timur')),
-    ('L', _('Surabaya')),
-    ('M', _('Madura')),
-    ('N', _('Malang')),
-    ('P', _('Jember')),
-    ('R', _('Banyumas')),
-    ('RI', _('Federal Government')),
-    ('S', _('Bojonegoro')),
-    ('T', _('Purwakarta')),
-    ('W', _('Sidoarjo')),
-    ('Z', _('Garut')),
-)
diff --git a/django/contrib/localflavor/ie/forms.py b/django/contrib/localflavor/ie/forms.py
deleted file mode 100644
index cb401019c2..0000000000
--- a/django/contrib/localflavor/ie/forms.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-UK-specific Form helpers
-"""
-
-from __future__ import absolute_import
-
-from django.contrib.localflavor.ie.ie_counties import IE_COUNTY_CHOICES
-from django.forms.fields import Select
-
-
-class IECountySelect(Select):
-    """
-    A Select widget that uses a list of Irish Counties as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(IECountySelect, self).__init__(attrs, choices=IE_COUNTY_CHOICES)
diff --git a/django/contrib/localflavor/ie/ie_counties.py b/django/contrib/localflavor/ie/ie_counties.py
deleted file mode 100644
index c8991e01ae..0000000000
--- a/django/contrib/localflavor/ie/ie_counties.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""
-Sources:
-    Irish Counties: http://en.wikipedia.org/wiki/Counties_of_Ireland    
-"""
-from django.utils.translation import ugettext_lazy as _
-
-IE_COUNTY_CHOICES = (
-    ('antrim', _('Antrim')),
-    ('armagh', _('Armagh')),
-    ('carlow', _('Carlow')),
-    ('cavan', _('Cavan')),
-    ('clare', _('Clare')),
-    ('cork', _('Cork')),
-    ('derry', _('Derry')),
-    ('donegal', _('Donegal')),
-    ('down', _('Down')),
-    ('dublin', _('Dublin')),
-    ('fermanagh', _('Fermanagh')),
-    ('galway', _('Galway')),
-    ('kerry', _('Kerry')),
-    ('kildare', _('Kildare')),
-    ('kilkenny', _('Kilkenny')),
-    ('laois', _('Laois')),
-    ('leitrim', _('Leitrim')),
-    ('limerick', _('Limerick')),
-    ('longford', _('Longford')),
-    ('louth', _('Louth')),
-    ('mayo', _('Mayo')),
-    ('meath', _('Meath')),
-    ('monaghan', _('Monaghan')),
-    ('offaly', _('Offaly')),
-    ('roscommon', _('Roscommon')),
-    ('sligo', _('Sligo')),
-    ('tipperary', _('Tipperary')),
-    ('tyrone', _('Tyrone')),
-    ('waterford', _('Waterford')),
-    ('westmeath', _('Westmeath')),
-    ('wexford', _('Wexford')),
-    ('wicklow', _('Wicklow')),
-)
diff --git a/django/contrib/localflavor/il/forms.py b/django/contrib/localflavor/il/forms.py
deleted file mode 100644
index de6ba6b23d..0000000000
--- a/django/contrib/localflavor/il/forms.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""
-Israeli-specific form helpers
-"""
-from __future__ import unicode_literals
-import re
-
-from django.core.exceptions import ValidationError
-from django.core.validators import EMPTY_VALUES
-from django.forms.fields import RegexField, Field, EMPTY_VALUES
-from django.utils.checksums import luhn
-from django.utils.translation import ugettext_lazy as _
-
-# Israeli ID numbers consist of up to 8 digits followed by a checksum digit.
-# Numbers which are shorter than 8 digits are effectively left-zero-padded.
-# The checksum digit is occasionally separated from the number by a hyphen,
-# and is calculated using the luhn algorithm.
-#
-# Relevant references:
-#
-# (hebrew) http://he.wikipedia.org/wiki/%D7%9E%D7%A1%D7%A4%D7%A8_%D7%96%D7%94%D7%95%D7%AA_(%D7%99%D7%A9%D7%A8%D7%90%D7%9C)
-# (hebrew) http://he.wikipedia.org/wiki/%D7%A1%D7%A4%D7%A8%D7%AA_%D7%91%D7%99%D7%A7%D7%95%D7%A8%D7%AA
-
-id_number_re = re.compile(r'^(?P<number>\d{1,8})-?(?P<check>\d)$')
-
-class ILPostalCodeField(RegexField):
-    """
-    A form field that validates its input as an Israeli postal code.
-    Valid form is XXXXX where X represents integer.
-    """
-
-    default_error_messages = {
-        'invalid': _('Enter a postal code in the format XXXXX'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(ILPostalCodeField, self).__init__(r'^\d{5}$', *args, **kwargs)
-
-    def clean(self, value):
-        if value not in EMPTY_VALUES:
-            value = value.replace(" ", "")
-        return super(ILPostalCodeField, self).clean(value)
-
-
-class ILIDNumberField(Field):
-    """
-    A form field that validates its input as an Israeli identification number.
-    Valid form is per the Israeli ID specification.
-    """
-
-    default_error_messages = {
-        'invalid': _('Enter a valid ID number.'),
-    }
-
-    def clean(self, value):
-        value = super(ILIDNumberField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        match = id_number_re.match(value)
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-
-        value = match.group('number') + match.group('check')
-        if not luhn(value):
-            raise ValidationError(self.error_messages['invalid'])
-        return value
diff --git a/django/contrib/localflavor/in_/forms.py b/django/contrib/localflavor/in_/forms.py
deleted file mode 100644
index 5c1d009ef4..0000000000
--- a/django/contrib/localflavor/in_/forms.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""
-India-specific Form helpers.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.in_.in_states import STATES_NORMALIZED, STATE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, CharField, Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-phone_digits_re = re.compile(r"""
-(
-    (?P<std_code>                   # the std-code group
-        ^0                          # all std-codes start with 0
-        (
-            (?P<twodigit>\d{2})   | # either two, three or four digits
-            (?P<threedigit>\d{3}) | # following the 0
-            (?P<fourdigit>\d{4})
-        )
-    )
-    [-\s]                           # space or -
-    (?P<phone_no>                   # the phone number group
-        [1-6]                       # first digit of phone number
-        (
-            (?(twodigit)\d{7})   |  # 7 more phone digits for 3 digit stdcode
-            (?(threedigit)\d{6}) |  # 6 more phone digits for 4 digit stdcode
-            (?(fourdigit)\d{5})     # 5 more phone digits for 5 digit stdcode
-        )
-    )
-)$""", re.VERBOSE)
-
-
-class INZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXXXX or XXX XXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(INZipCodeField, self).__init__(r'^\d{3}\s?\d{3}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        super(INZipCodeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        # Convert to "NNNNNN" if "NNN NNN" given
-        value = re.sub(r'^(\d{3})\s(\d{3})$', r'\1\2', value)
-        return value
-
-
-class INStateField(Field):
-    """
-    A form field that validates its input is a Indian state name or
-    abbreviation. It normalizes the input to the standard two-letter vehicle
-    registration abbreviation for the given state or union territory
-    """
-    default_error_messages = {
-        'invalid': _('Enter an Indian state or territory.'),
-    }
-
-    def clean(self, value):
-        super(INStateField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        try:
-            value = value.strip().lower()
-        except AttributeError:
-            pass
-        else:
-            try:
-                return smart_text(STATES_NORMALIZED[value.strip().lower()])
-            except KeyError:
-                pass
-        raise ValidationError(self.error_messages['invalid'])
-
-
-class INStateSelect(Select):
-    """
-    A Select widget that uses a list of Indian states/territories as its
-    choices.
-    """
-    def __init__(self, attrs=None):
-        super(INStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
-
-
-class INPhoneNumberField(CharField):
-    """
-    INPhoneNumberField validates that the data is a valid Indian phone number,
-    including the STD code. It's normalised to 0XXX-XXXXXXX or 0XXX XXXXXXX
-    format. The first string is the STD code which is a '0' followed by 2-4
-    digits. The second string is 8 digits if the STD code is 3 digits, 7
-    digits if the STD code is 4 digits and 6 digits if the STD code is 5
-    digits. The second string will start with numbers between 1 and 6. The
-    separator is either a space or a hyphen.
-    """
-    default_error_messages = {
-        'invalid': _('Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format.'),
-    }
-
-    def clean(self, value):
-        super(INPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = smart_text(value)
-        m = phone_digits_re.match(value)
-        if m:
-            return '%s' % (value)
-        raise ValidationError(self.error_messages['invalid'])
-
diff --git a/django/contrib/localflavor/in_/in_states.py b/django/contrib/localflavor/in_/in_states.py
deleted file mode 100644
index 375b201311..0000000000
--- a/django/contrib/localflavor/in_/in_states.py
+++ /dev/null
@@ -1,133 +0,0 @@
-"""
-A mapping of state misspellings/abbreviations to normalized abbreviations, and
-an alphabetical list of states for use as `choices` in a formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-
-STATE_CHOICES = (
-    ('KA', 'Karnataka'),
-    ('AP', 'Andhra Pradesh'),
-    ('KL', 'Kerala'),
-    ('TN', 'Tamil Nadu'),
-    ('MH', 'Maharashtra'),
-    ('UP', 'Uttar Pradesh'),
-    ('GA', 'Goa'),
-    ('GJ', 'Gujarat'),
-    ('RJ', 'Rajasthan'),
-    ('HP', 'Himachal Pradesh'),
-    ('JK', 'Jammu and Kashmir'),
-    ('AR', 'Arunachal Pradesh'),
-    ('AS', 'Assam'),
-    ('BR', 'Bihar'),
-    ('CG', 'Chattisgarh'),
-    ('HR', 'Haryana'),
-    ('JH', 'Jharkhand'),
-    ('MP', 'Madhya Pradesh'),
-    ('MN', 'Manipur'),
-    ('ML', 'Meghalaya'),
-    ('MZ', 'Mizoram'),
-    ('NL', 'Nagaland'),
-    ('OR', 'Orissa'),
-    ('PB', 'Punjab'),
-    ('SK', 'Sikkim'),
-    ('TR', 'Tripura'),
-    ('UA', 'Uttarakhand'),
-    ('WB', 'West Bengal'),
-
-    # Union Territories
-    ('AN', 'Andaman and Nicobar'),
-    ('CH', 'Chandigarh'),
-    ('DN', 'Dadra and Nagar Haveli'),
-    ('DD', 'Daman and Diu'),
-    ('DL', 'Delhi'),
-    ('LD', 'Lakshadweep'),
-    ('PY', 'Pondicherry'),
-)
-
-STATES_NORMALIZED = {
-    'an': 'AN',
-    'andaman and nicobar': 'AN',
-    'andra pradesh': 'AP',
-    'andrapradesh': 'AP',
-    'andhrapradesh': 'AP',
-    'ap': 'AP',
-    'andhra pradesh': 'AP',
-    'ar': 'AR',
-    'arunachal pradesh': 'AR',
-    'assam': 'AS',
-    'as': 'AS',
-    'bihar': 'BR',
-    'br': 'BR',
-    'cg': 'CG',
-    'chattisgarh': 'CG',
-    'ch': 'CH',
-    'chandigarh': 'CH',
-    'daman and diu': 'DD',
-    'dd': 'DD',
-    'dl': 'DL',
-    'delhi': 'DL',
-    'dn': 'DN',
-    'dadra and nagar haveli': 'DN',
-    'ga': 'GA',
-    'goa': 'GA',
-    'gj': 'GJ',
-    'gujarat': 'GJ',
-    'himachal pradesh': 'HP',
-    'hp': 'HP',
-    'hr': 'HR',
-    'haryana': 'HR',
-    'jharkhand': 'JH',
-    'jh': 'JH',
-    'jammu and kashmir': 'JK',
-    'jk': 'JK',
-    'karnataka': 'KA',
-    'karnatka': 'KA',
-    'ka': 'KA',
-    'kerala': 'KL',
-    'kl': 'KL',
-    'ld': 'LD',
-    'lakshadweep': 'LD',
-    'maharastra': 'MH',
-    'mh': 'MH',
-    'maharashtra': 'MH',
-    'meghalaya': 'ML',
-    'ml': 'ML',
-    'mn': 'MN',
-    'manipur': 'MN',
-    'madhya pradesh': 'MP',
-    'mp': 'MP',
-    'mizoram': 'MZ',
-    'mizo': 'MZ',
-    'mz': 'MZ',
-    'nl': 'NL',
-    'nagaland': 'NL',
-    'orissa': 'OR',
-    'odisa': 'OR',
-    'orisa': 'OR',
-    'or': 'OR',
-    'pb': 'PB',
-    'punjab': 'PB',
-    'py': 'PY',
-    'pondicherry': 'PY',
-    'rajasthan': 'RJ',
-    'rajastan': 'RJ',
-    'rj': 'RJ',
-    'sikkim': 'SK',
-    'sk': 'SK',
-    'tamil nadu': 'TN',
-    'tn': 'TN',
-    'tamilnadu': 'TN',
-    'tamilnad': 'TN',
-    'tr': 'TR',
-    'tripura': 'TR',
-    'ua': 'UA',
-    'uttarakhand': 'UA',
-    'up': 'UP',
-    'uttar pradesh': 'UP',
-    'westbengal': 'WB',
-    'bengal': 'WB',
-    'wb': 'WB',
-    'west bengal': 'WB'
-}
diff --git a/django/contrib/localflavor/is_/forms.py b/django/contrib/localflavor/is_/forms.py
deleted file mode 100644
index 1ae3e012a1..0000000000
--- a/django/contrib/localflavor/is_/forms.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""
-Iceland specific form helpers.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-from django.contrib.localflavor.is_.is_postalcodes import IS_POSTALCODES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import RegexField
-from django.forms.widgets import Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-class ISIdNumberField(RegexField):
-    """
-    Icelandic identification number (kennitala). This is a number every citizen
-    of Iceland has.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.'),
-        'checksum': _('The Icelandic identification number is not valid.'),
-    }
-
-    def __init__(self, max_length=11, min_length=10, *args, **kwargs):
-        super(ISIdNumberField, self).__init__(r'^\d{6}(-| )?\d{4}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        value = super(ISIdNumberField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = self._canonify(value)
-        if self._validate(value):
-            return self._format(value)
-        else:
-            raise ValidationError(self.error_messages['checksum'])
-
-    def _canonify(self, value):
-        """
-        Returns the value as only digits.
-        """
-        return value.replace('-', '').replace(' ', '')
-
-    def _validate(self, value):
-        """
-        Takes in the value in canonical form and checks the verifier digit. The
-        method is modulo 11.
-        """
-        check = [3, 2, 7, 6, 5, 4, 3, 2, 1, 0]
-        return sum([int(value[i]) * check[i] for i in range(10)]) % 11 == 0
-
-    def _format(self, value):
-        """
-        Takes in the value in canonical form and returns it in the common
-        display format.
-        """
-        return smart_text(value[:6]+'-'+value[6:])
-
-class ISPhoneNumberField(RegexField):
-    """
-    Icelandic phone number. Seven digits with an optional hyphen or space after
-    the first three digits.
-    """
-    def __init__(self, max_length=8, min_length=7, *args, **kwargs):
-        super(ISPhoneNumberField, self).__init__(r'^\d{3}(-| )?\d{4}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        value = super(ISPhoneNumberField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        return value.replace('-', '').replace(' ', '')
-
-class ISPostalCodeSelect(Select):
-    """
-    A Select widget that uses a list of Icelandic postal codes as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(ISPostalCodeSelect, self).__init__(attrs, choices=IS_POSTALCODES)
-
diff --git a/django/contrib/localflavor/is_/is_postalcodes.py b/django/contrib/localflavor/is_/is_postalcodes.py
deleted file mode 100644
index f1f3357c1c..0000000000
--- a/django/contrib/localflavor/is_/is_postalcodes.py
+++ /dev/null
@@ -1,152 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-IS_POSTALCODES = (
-    ('101', '101 Reykjavík'),
-    ('103', '103 Reykjavík'),
-    ('104', '104 Reykjavík'),
-    ('105', '105 Reykjavík'),
-    ('107', '107 Reykjavík'),
-    ('108', '108 Reykjavík'),
-    ('109', '109 Reykjavík'),
-    ('110', '110 Reykjavík'),
-    ('111', '111 Reykjavík'),
-    ('112', '112 Reykjavík'),
-    ('113', '113 Reykjavík'),
-    ('116', '116 Kjalarnes'),
-    ('121', '121 Reykjavík'),
-    ('123', '123 Reykjavík'),
-    ('124', '124 Reykjavík'),
-    ('125', '125 Reykjavík'),
-    ('127', '127 Reykjavík'),
-    ('128', '128 Reykjavík'),
-    ('129', '129 Reykjavík'),
-    ('130', '130 Reykjavík'),
-    ('132', '132 Reykjavík'),
-    ('150', '150 Reykjavík'),
-    ('155', '155 Reykjavík'),
-    ('170', '170 Seltjarnarnes'),
-    ('172', '172 Seltjarnarnes'),
-    ('190', '190 Vogar'),
-    ('200', '200 Kópavogur'),
-    ('201', '201 Kópavogur'),
-    ('202', '202 Kópavogur'),
-    ('203', '203 Kópavogur'),
-    ('210', '210 Garðabær'),
-    ('212', '212 Garðabær'),
-    ('220', '220 Hafnarfjörður'),
-    ('221', '221 Hafnarfjörður'),
-    ('222', '222 Hafnarfjörður'),
-    ('225', '225 Álftanes'),
-    ('230', '230 Reykjanesbær'),
-    ('232', '232 Reykjanesbær'),
-    ('233', '233 Reykjanesbær'),
-    ('235', '235 Keflavíkurflugvöllur'),
-    ('240', '240 Grindavík'),
-    ('245', '245 Sandgerði'),
-    ('250', '250 Garður'),
-    ('260', '260 Reykjanesbær'),
-    ('270', '270 Mosfellsbær'),
-    ('300', '300 Akranes'),
-    ('301', '301 Akranes'),
-    ('302', '302 Akranes'),
-    ('310', '310 Borgarnes'),
-    ('311', '311 Borgarnes'),
-    ('320', '320 Reykholt í Borgarfirði'),
-    ('340', '340 Stykkishólmur'),
-    ('345', '345 Flatey á Breiðafirði'),
-    ('350', '350 Grundarfjörður'),
-    ('355', '355 Ólafsvík'),
-    ('356', '356 Snæfellsbær'),
-    ('360', '360 Hellissandur'),
-    ('370', '370 Búðardalur'),
-    ('371', '371 Búðardalur'),
-    ('380', '380 Reykhólahreppur'),
-    ('400', '400 Ísafjörður'),
-    ('401', '401 Ísafjörður'),
-    ('410', '410 Hnífsdalur'),
-    ('415', '415 Bolungarvík'),
-    ('420', '420 Súðavík'),
-    ('425', '425 Flateyri'),
-    ('430', '430 Suðureyri'),
-    ('450', '450 Patreksfjörður'),
-    ('451', '451 Patreksfjörður'),
-    ('460', '460 Tálknafjörður'),
-    ('465', '465 Bíldudalur'),
-    ('470', '470 Þingeyri'),
-    ('471', '471 Þingeyri'),
-    ('500', '500 Staður'),
-    ('510', '510 Hólmavík'),
-    ('512', '512 Hólmavík'),
-    ('520', '520 Drangsnes'),
-    ('522', '522 Kjörvogur'),
-    ('523', '523 Bær'),
-    ('524', '524 Norðurfjörður'),
-    ('530', '530 Hvammstangi'),
-    ('531', '531 Hvammstangi'),
-    ('540', '540 Blönduós'),
-    ('541', '541 Blönduós'),
-    ('545', '545 Skagaströnd'),
-    ('550', '550 Sauðárkrókur'),
-    ('551', '551 Sauðárkrókur'),
-    ('560', '560 Varmahlíð'),
-    ('565', '565 Hofsós'),
-    ('566', '566 Hofsós'),
-    ('570', '570 Fljót'),
-    ('580', '580 Siglufjörður'),
-    ('600', '600 Akureyri'),
-    ('601', '601 Akureyri'),
-    ('602', '602 Akureyri'),
-    ('603', '603 Akureyri'),
-    ('610', '610 Grenivík'),
-    ('611', '611 Grímsey'),
-    ('620', '620 Dalvík'),
-    ('621', '621 Dalvík'),
-    ('625', '625 Ólafsfjörður'),
-    ('630', '630 Hrísey'),
-    ('640', '640 Húsavík'),
-    ('641', '641 Húsavík'),
-    ('645', '645 Fosshóll'),
-    ('650', '650 Laugar'),
-    ('660', '660 Mývatn'),
-    ('670', '670 Kópasker'),
-    ('671', '671 Kópasker'),
-    ('675', '675 Raufarhöfn'),
-    ('680', '680 Þórshöfn'),
-    ('681', '681 Þórshöfn'),
-    ('685', '685 Bakkafjörður'),
-    ('690', '690 Vopnafjörður'),
-    ('700', '700 Egilsstaðir'),
-    ('701', '701 Egilsstaðir'),
-    ('710', '710 Seyðisfjörður'),
-    ('715', '715 Mjóifjörður'),
-    ('720', '720 Borgarfjörður eystri'),
-    ('730', '730 Reyðarfjörður'),
-    ('735', '735 Eskifjörður'),
-    ('740', '740 Neskaupstaður'),
-    ('750', '750 Fáskrúðsfjörður'),
-    ('755', '755 Stöðvarfjörður'),
-    ('760', '760 Breiðdalsvík'),
-    ('765', '765 Djúpivogur'),
-    ('780', '780 Höfn í Hornafirði'),
-    ('781', '781 Höfn í Hornafirði'),
-    ('785', '785 Öræfi'),
-    ('800', '800 Selfoss'),
-    ('801', '801 Selfoss'),
-    ('802', '802 Selfoss'),
-    ('810', '810 Hveragerði'),
-    ('815', '815 Þorlákshöfn'),
-    ('820', '820 Eyrarbakki'),
-    ('825', '825 Stokkseyri'),
-    ('840', '840 Laugarvatn'),
-    ('845', '845 Flúðir'),
-    ('850', '850 Hella'),
-    ('851', '851 Hella'),
-    ('860', '860 Hvolsvöllur'),
-    ('861', '861 Hvolsvöllur'),
-    ('870', '870 Vík'),
-    ('871', '871 Vík'),
-    ('880', '880 Kirkjubæjarklaustur'),
-    ('900', '900 Vestmannaeyjar'),
-    ('902', '902 Vestmannaeyjar')
-)
diff --git a/django/contrib/localflavor/it/forms.py b/django/contrib/localflavor/it/forms.py
deleted file mode 100644
index 916ce9bb3d..0000000000
--- a/django/contrib/localflavor/it/forms.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""
-IT-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.it.it_province import PROVINCE_CHOICES
-from django.contrib.localflavor.it.it_region import REGION_CHOICES
-from django.contrib.localflavor.it.util import ssn_check_digit, vat_number_check_digit
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import smart_text
-
-
-class ITZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a valid zip code.'),
-    }
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(ITZipCodeField, self).__init__(r'^\d{5}$',
-              max_length, min_length, *args, **kwargs)
-
-class ITRegionSelect(Select):
-    """
-    A Select widget that uses a list of IT regions as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(ITRegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
-
-class ITProvinceSelect(Select):
-    """
-    A Select widget that uses a list of IT provinces as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(ITProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
-
-class ITSocialSecurityNumberField(RegexField):
-    """
-    A form field that validates Italian Social Security numbers (codice fiscale).
-    For reference see http://www.agenziaentrate.it/ and search for
-    'Informazioni sulla codificazione delle persone fisiche'.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid Social Security number.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(ITSocialSecurityNumberField, self).__init__(r'^\w{3}\s*\w{3}\s*\w{5}\s*\w{5}$',
-              max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        value = super(ITSocialSecurityNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('\s', '', value).upper()
-        try:
-            check_digit = ssn_check_digit(value)
-        except ValueError:
-            raise ValidationError(self.error_messages['invalid'])
-        if not value[15] == check_digit:
-            raise ValidationError(self.error_messages['invalid'])
-        return value
-
-class ITVatNumberField(Field):
-    """
-    A form field that validates Italian VAT numbers (partita IVA).
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid VAT number.'),
-    }
-
-    def clean(self, value):
-        value = super(ITVatNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        try:
-            vat_number = int(value)
-        except ValueError:
-            raise ValidationError(self.error_messages['invalid'])
-        vat_number = str(vat_number).zfill(11)
-        check_digit = vat_number_check_digit(vat_number[0:10])
-        if not vat_number[10] == check_digit:
-            raise ValidationError(self.error_messages['invalid'])
-        return smart_text(vat_number)
diff --git a/django/contrib/localflavor/it/it_province.py b/django/contrib/localflavor/it/it_province.py
deleted file mode 100644
index 5aad1611dd..0000000000
--- a/django/contrib/localflavor/it/it_province.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*
-from __future__ import unicode_literals
-
-PROVINCE_CHOICES = (
-    ('AG', 'Agrigento'),
-    ('AL', 'Alessandria'),
-    ('AN', 'Ancona'),
-    ('AO', 'Aosta'),
-    ('AR', 'Arezzo'),
-    ('AP', 'Ascoli Piceno'),
-    ('AT', 'Asti'),
-    ('AV', 'Avellino'),
-    ('BA', 'Bari'),
-    ('BT', 'Barletta-Andria-Trani'), # active starting from 2009
-    ('BL', 'Belluno'),
-    ('BN', 'Benevento'),
-    ('BG', 'Bergamo'),
-    ('BI', 'Biella'),
-    ('BO', 'Bologna'),
-    ('BZ', 'Bolzano/Bozen'),
-    ('BS', 'Brescia'),
-    ('BR', 'Brindisi'),
-    ('CA', 'Cagliari'),
-    ('CL', 'Caltanissetta'),
-    ('CB', 'Campobasso'),
-    ('CI', 'Carbonia-Iglesias'),
-    ('CE', 'Caserta'),
-    ('CT', 'Catania'),
-    ('CZ', 'Catanzaro'),
-    ('CH', 'Chieti'),
-    ('CO', 'Como'),
-    ('CS', 'Cosenza'),
-    ('CR', 'Cremona'),
-    ('KR', 'Crotone'),
-    ('CN', 'Cuneo'),
-    ('EN', 'Enna'),
-    ('FM', 'Fermo'), # active starting from 2009
-    ('FE', 'Ferrara'),
-    ('FI', 'Firenze'),
-    ('FG', 'Foggia'),
-    ('FC', 'Forlì-Cesena'),
-    ('FR', 'Frosinone'),
-    ('GE', 'Genova'),
-    ('GO', 'Gorizia'),
-    ('GR', 'Grosseto'),
-    ('IM', 'Imperia'),
-    ('IS', 'Isernia'),
-    ('SP', 'La Spezia'),
-    ('AQ', 'L’Aquila'),
-    ('LT', 'Latina'),
-    ('LE', 'Lecce'),
-    ('LC', 'Lecco'),
-    ('LI', 'Livorno'),
-    ('LO', 'Lodi'),
-    ('LU', 'Lucca'),
-    ('MC', 'Macerata'),
-    ('MN', 'Mantova'),
-    ('MS', 'Massa-Carrara'),
-    ('MT', 'Matera'),
-    ('VS', 'Medio Campidano'),
-    ('ME', 'Messina'),
-    ('MI', 'Milano'),
-    ('MO', 'Modena'),
-    ('MB', 'Monza e Brianza'), # active starting from 2009
-    ('NA', 'Napoli'),
-    ('NO', 'Novara'),
-    ('NU', 'Nuoro'),
-    ('OG', 'Ogliastra'),
-    ('OT', 'Olbia-Tempio'),
-    ('OR', 'Oristano'),
-    ('PD', 'Padova'),
-    ('PA', 'Palermo'),
-    ('PR', 'Parma'),
-    ('PV', 'Pavia'),
-    ('PG', 'Perugia'),
-    ('PU', 'Pesaro e Urbino'),
-    ('PE', 'Pescara'),
-    ('PC', 'Piacenza'),
-    ('PI', 'Pisa'),
-    ('PT', 'Pistoia'),
-    ('PN', 'Pordenone'),
-    ('PZ', 'Potenza'),
-    ('PO', 'Prato'),
-    ('RG', 'Ragusa'),
-    ('RA', 'Ravenna'),
-    ('RC', 'Reggio Calabria'),
-    ('RE', 'Reggio Emilia'),
-    ('RI', 'Rieti'),
-    ('RN', 'Rimini'),
-    ('RM', 'Roma'),
-    ('RO', 'Rovigo'),
-    ('SA', 'Salerno'),
-    ('SS', 'Sassari'),
-    ('SV', 'Savona'),
-    ('SI', 'Siena'),
-    ('SR', 'Siracusa'),
-    ('SO', 'Sondrio'),
-    ('TA', 'Taranto'),
-    ('TE', 'Teramo'),
-    ('TR', 'Terni'),
-    ('TO', 'Torino'),
-    ('TP', 'Trapani'),
-    ('TN', 'Trento'),
-    ('TV', 'Treviso'),
-    ('TS', 'Trieste'),
-    ('UD', 'Udine'),
-    ('VA', 'Varese'),
-    ('VE', 'Venezia'),
-    ('VB', 'Verbano Cusio Ossola'),
-    ('VC', 'Vercelli'),
-    ('VR', 'Verona'),
-    ('VV', 'Vibo Valentia'),
-    ('VI', 'Vicenza'),
-    ('VT', 'Viterbo'),
-)
diff --git a/django/contrib/localflavor/it/it_region.py b/django/contrib/localflavor/it/it_region.py
deleted file mode 100644
index e12a1e731b..0000000000
--- a/django/contrib/localflavor/it/it_region.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*
-from __future__ import unicode_literals
-
-REGION_CHOICES = (
-    ('ABR', 'Abruzzo'),
-    ('BAS', 'Basilicata'),
-    ('CAL', 'Calabria'),
-    ('CAM', 'Campania'),
-    ('EMR', 'Emilia-Romagna'),
-    ('FVG', 'Friuli-Venezia Giulia'),
-    ('LAZ', 'Lazio'),
-    ('LIG', 'Liguria'),
-    ('LOM', 'Lombardia'),
-    ('MAR', 'Marche'),
-    ('MOL', 'Molise'),
-    ('PMN', 'Piemonte'),
-    ('PUG', 'Puglia'),
-    ('SAR', 'Sardegna'),
-    ('SIC', 'Sicilia'),
-    ('TOS', 'Toscana'),
-    ('TAA', 'Trentino-Alto Adige'),
-    ('UMB', 'Umbria'),
-    ('VAO', 'Valle d’Aosta'),
-    ('VEN', 'Veneto'),
-)
diff --git a/django/contrib/localflavor/it/util.py b/django/contrib/localflavor/it/util.py
deleted file mode 100644
index e1aa9c0419..0000000000
--- a/django/contrib/localflavor/it/util.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from django.utils.encoding import smart_text
-
-def ssn_check_digit(value):
-    "Calculate Italian social security number check digit."
-    ssn_even_chars = {
-        '0': 0, '1': 1, '2': 2, '3': 3, '4': 4, '5': 5, '6': 6, '7': 7, '8': 8,
-        '9': 9, 'A': 0, 'B': 1, 'C': 2, 'D': 3, 'E': 4, 'F': 5, 'G': 6, 'H': 7,
-        'I': 8, 'J': 9, 'K': 10, 'L': 11, 'M': 12, 'N': 13, 'O': 14, 'P': 15,
-        'Q': 16, 'R': 17, 'S': 18, 'T': 19, 'U': 20, 'V': 21, 'W': 22, 'X': 23,
-        'Y': 24, 'Z': 25
-    }
-    ssn_odd_chars = {
-        '0': 1, '1': 0, '2': 5, '3': 7, '4': 9, '5': 13, '6': 15, '7': 17, '8':
-        19, '9': 21, 'A': 1, 'B': 0, 'C': 5, 'D': 7, 'E': 9, 'F': 13, 'G': 15,
-        'H': 17, 'I': 19, 'J': 21, 'K': 2, 'L': 4, 'M': 18, 'N': 20, 'O': 11,
-        'P': 3, 'Q': 6, 'R': 8, 'S': 12, 'T': 14, 'U': 16, 'V': 10, 'W': 22,
-        'X': 25, 'Y': 24, 'Z': 23
-    }
-    # Chars from 'A' to 'Z'
-    ssn_check_digits = [chr(x) for x in range(65, 91)]
-
-    ssn = value.upper()
-    total = 0
-    for i in range(0, 15):
-        try:
-            if i % 2 == 0:
-                total += ssn_odd_chars[ssn[i]]
-            else:
-                total += ssn_even_chars[ssn[i]]
-        except KeyError:
-            msg = "Character '%(char)s' is not allowed." % {'char': ssn[i]}
-            raise ValueError(msg)
-    return ssn_check_digits[total % 26]
-
-def vat_number_check_digit(vat_number):
-    "Calculate Italian VAT number check digit."
-    normalized_vat_number = smart_text(vat_number).zfill(10)
-    total = 0
-    for i in range(0, 10, 2):
-        total += int(normalized_vat_number[i])
-    for i in range(1, 11, 2):
-        quotient , remainder = divmod(int(normalized_vat_number[i]) * 2, 10)
-        total += quotient + remainder
-    return smart_text((10 - total % 10) % 10)
diff --git a/django/contrib/localflavor/jp/forms.py b/django/contrib/localflavor/jp/forms.py
deleted file mode 100644
index 2529364d5a..0000000000
--- a/django/contrib/localflavor/jp/forms.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-JP-specific Form helpers
-"""
-
-from __future__ import absolute_import
-
-from django.contrib.localflavor.jp.jp_prefectures import JP_PREFECTURES
-from django.forms.fields import RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class JPPostalCodeField(RegexField):
-    """
-    A form field that validates its input is a Japanese postcode.
-
-    Accepts 7 digits, with or without a hyphen.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a postal code in the format XXXXXXX or XXX-XXXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(JPPostalCodeField, self).__init__(r'^\d{3}-\d{4}$|^\d{7}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Validates the input and returns a string that contains only numbers.
-        Returns an empty string for empty values.
-        """
-        v = super(JPPostalCodeField, self).clean(value)
-        return v.replace('-', '')
-
-class JPPrefectureSelect(Select):
-    """
-    A Select widget that uses a list of Japanese prefectures as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(JPPrefectureSelect, self).__init__(attrs, choices=JP_PREFECTURES)
diff --git a/django/contrib/localflavor/jp/jp_prefectures.py b/django/contrib/localflavor/jp/jp_prefectures.py
deleted file mode 100644
index f079fe6a3d..0000000000
--- a/django/contrib/localflavor/jp/jp_prefectures.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from django.utils.translation import ugettext_lazy
-
-JP_PREFECTURES = (
-    ('hokkaido', ugettext_lazy('Hokkaido'),),
-    ('aomori', ugettext_lazy('Aomori'),),
-    ('iwate', ugettext_lazy('Iwate'),),
-    ('miyagi', ugettext_lazy('Miyagi'),),
-    ('akita', ugettext_lazy('Akita'),),
-    ('yamagata', ugettext_lazy('Yamagata'),),
-    ('fukushima', ugettext_lazy('Fukushima'),),
-    ('ibaraki', ugettext_lazy('Ibaraki'),),
-    ('tochigi', ugettext_lazy('Tochigi'),),
-    ('gunma', ugettext_lazy('Gunma'),),
-    ('saitama', ugettext_lazy('Saitama'),),
-    ('chiba', ugettext_lazy('Chiba'),),
-    ('tokyo', ugettext_lazy('Tokyo'),),
-    ('kanagawa', ugettext_lazy('Kanagawa'),),
-    ('yamanashi', ugettext_lazy('Yamanashi'),),
-    ('nagano', ugettext_lazy('Nagano'),),
-    ('niigata', ugettext_lazy('Niigata'),),
-    ('toyama', ugettext_lazy('Toyama'),),
-    ('ishikawa', ugettext_lazy('Ishikawa'),),
-    ('fukui', ugettext_lazy('Fukui'),),
-    ('gifu', ugettext_lazy('Gifu'),),
-    ('shizuoka', ugettext_lazy('Shizuoka'),),
-    ('aichi', ugettext_lazy('Aichi'),),
-    ('mie', ugettext_lazy('Mie'),),
-    ('shiga', ugettext_lazy('Shiga'),),
-    ('kyoto', ugettext_lazy('Kyoto'),),
-    ('osaka', ugettext_lazy('Osaka'),),
-    ('hyogo', ugettext_lazy('Hyogo'),),
-    ('nara', ugettext_lazy('Nara'),),
-    ('wakayama', ugettext_lazy('Wakayama'),),
-    ('tottori', ugettext_lazy('Tottori'),),
-    ('shimane', ugettext_lazy('Shimane'),),
-    ('okayama', ugettext_lazy('Okayama'),),
-    ('hiroshima', ugettext_lazy('Hiroshima'),),
-    ('yamaguchi', ugettext_lazy('Yamaguchi'),),
-    ('tokushima', ugettext_lazy('Tokushima'),),
-    ('kagawa', ugettext_lazy('Kagawa'),),
-    ('ehime', ugettext_lazy('Ehime'),),
-    ('kochi', ugettext_lazy('Kochi'),),
-    ('fukuoka', ugettext_lazy('Fukuoka'),),
-    ('saga', ugettext_lazy('Saga'),),
-    ('nagasaki', ugettext_lazy('Nagasaki'),),
-    ('kumamoto', ugettext_lazy('Kumamoto'),),
-    ('oita', ugettext_lazy('Oita'),),
-    ('miyazaki', ugettext_lazy('Miyazaki'),),
-    ('kagoshima', ugettext_lazy('Kagoshima'),),
-    ('okinawa', ugettext_lazy('Okinawa'),),
-)
diff --git a/django/contrib/localflavor/kw/forms.py b/django/contrib/localflavor/kw/forms.py
deleted file mode 100644
index 2c2b023e70..0000000000
--- a/django/contrib/localflavor/kw/forms.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""
-Kuwait-specific Form helpers
-"""
-from __future__ import unicode_literals
-
-import re
-from datetime import date
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field
-from django.utils.translation import gettext as _
-
-id_re = re.compile(r'^(?P<initial>\d{1})(?P<yy>\d\d)(?P<mm>\d\d)(?P<dd>\d\d)(?P<mid>\d{4})(?P<checksum>\d{1})')
-
-class KWCivilIDNumberField(Field):
-    """
-    Kuwaiti Civil ID numbers are 12 digits, second to seventh digits
-    represents the person's birthdate.
-
-    Checks the following rules to determine the validty of the number:
-        * The number consist of 12 digits.
-        * The birthdate of the person is a valid date.
-        * The calculated checksum equals to the last digit of the Civil ID.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid Kuwaiti Civil ID number'),
-    }
-
-    def has_valid_checksum(self, value):
-        weight = (2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2)
-        calculated_checksum = 0
-        for i in range(11):
-            calculated_checksum += int(value[i]) * weight[i]
-
-        remainder = calculated_checksum % 11
-        checkdigit = 11 - remainder
-        if checkdigit != int(value[11]):
-            return False
-        return True
-
-    def clean(self, value):
-        super(KWCivilIDNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        if not re.match(r'^\d{12}$', value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        match = re.match(id_re, value)
-
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-
-        gd = match.groupdict()
-
-        try:
-            d = date(int(gd['yy']), int(gd['mm']), int(gd['dd']))
-        except ValueError:
-            raise ValidationError(self.error_messages['invalid'])
-
-        if not self.has_valid_checksum(value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        return value
diff --git a/django/contrib/localflavor/locale/ar/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ar/LC_MESSAGES/django.mo
deleted file mode 100644
index dca9905152..0000000000
Binary files a/django/contrib/localflavor/locale/ar/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ar/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ar/LC_MESSAGES/django.po
deleted file mode 100644
index 12ae404731..0000000000
--- a/django/contrib/localflavor/locale/ar/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3534 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Ossama Khayat <okhayat@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Ossama Khayat <okhayat@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.net/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"
-"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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "أدخل رمزاً بريدياً بالنسق NNNN أو ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "يتطلب هذا الحقل أرقاماً فقط."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "يتطلب الحقل 7 أو 8 أعداد."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "أدخل رمز CUIT صحيح بالنسق XX-XXXXXXXX-X أو XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "رمز CUIT غير صحيح."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "برغنلاند"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "كارينثيا"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "أدنى النمسا"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "أقصى النمسا"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "سالزبورغ"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "ستيريا"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "تايرُل"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "فورارلبيرغ"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "فيينا"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "أدخل رمز zip بالنسق XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "أدخل رقم ضمان اجتماعي سويدي صحيح بالنسق XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "بروكسل"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "لوكسومبورج"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "أدخل الرمز البريدي بالتسلسل الصحيح ما بين 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"أدخل رقم هاتف صحيح بأي من الأنساق التالية 0x xxx xx xx، 0xx xx xx xx، 04xx "
-"xx xx xx، 0x/xxx.xx.xx، 0xx/xx.xx.xx، 04xx/xx.xx.xx، 0x.xxx.xx.xx، 0xx.xx.xx."
-"xx، 04xx.xx.xx.xx، 0xxxxxxxx أو 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "أدخل رمزاً بريدياً بالنسق XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "أرقام الهاتف يجب أن تكون بالنسق XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "انتق ولايةً برازيلية صحيحة. تلك الولاية ليست ضمن الولايات المتاحة."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "رقم CPF غير صحيح."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "يتطلب هذا الحقل 11 رقماً أو 14 حرفاً كحد أقصى."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "رقم CNPJ غير صحيح."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "يتطلب هذا الحقل 14 رقماً على الأقل."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "أدخل رمزاً بريدياً بنسق XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "أدخل رقم ضمان اجتماعي كندي صحيح بالنسق XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "أرجاو"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "جنيف"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "زيورخ"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"أدخل رقم هوية سويسرية صحيح أو رقم جواز سفر بالنسق X1234567<0 أو 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "أدخل رمز RUT تشيلي صحيح."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "أدخل رمز RUT تشيلي صحيح. النسق هو XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "قيمة RUT التشيلية غير صحيحة."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "براغ"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "وسط منطقة بوهيميا"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "جنوب منطقة بوهيميا"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "منطقة جنوب مورافيا"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "أدخل رمزاً بريدياً بالنسق XXXXX أو XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "أدخل رقم الميلاد بالنسق XXXXXX/XXXX أو XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "مُعطى غير صحيح للجنس، الرجاء إدخال القيمة 'f' أو 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "أدخل رقم ميلاد صحيح."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "أدخل رقم IC صحيح."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "بافاريا"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "برلين"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "هامبورغ"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "أدخل رمز zip بالنسق XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"أدخل رقم بطاقة هوية ألمانية صحيحة بالنسق XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "أرافا"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "ألميريا"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "أفيلا"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "باداجوز"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "برشلونة"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "بورجوس"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "كاستلّو"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "قرطبة"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "غرناطة"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "جوادالاخارا"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "ليون"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "مدريد"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "لاس بالماس"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "سالامانكا"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "توليدو"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "فالنسيا"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "الأندلس"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "أراغون"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "جزر الكناري"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "كتالونيا"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "جليقية"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "أدخل رمزاً بريدياً صحيحاً بالمدى والنسق 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr "أدخل رقم هاتف صحيح بأحد الأنساق 6XXXXXXXX، 8XXXXXXXX أو 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "رجاءً أدخل قيمة NIF، NIE أو CIF صحيحة."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "رجاءً أدخل قيمة NIF أو NIE صحيحة."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "تدقيق مجموع NIF غير صحيح."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "تدقيق مجموع NIE غير صحيح."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "تدقيق مجموع CIF غير صحيح."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "رجاءً أدخل رقم حساب بنكي صحيح بالنسق XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "تدقيق مجموع رقم حساب البنك غير صحيح."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "أدخل رقم ضمان اجتماع فنلندي صحيح."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "أرقام الهاتف يجب أن تكون بالنسق 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "أدخل رمزاً بريدياً صحيحاً."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "ديربي شاير"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "دِفون"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "لندن العظمى"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "مانشستر العظمى"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "هامشاير"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "كِنْت"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "شمال يورك شاير"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "أوكسفوردشاير"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "جنوب يوركشاير"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "ستافوردشاير"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "سوفولك"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "مقاطعة ارماغ"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "مقاطعة داون"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "مقاطعة فيرماناغ"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "مقاطعة لندنديري"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "مقاطعة تيرون"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "غوِنْت"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "غوينيد"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "وسط غلامورغان"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "جنوب غلامورغان"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "غرب غلامورغان"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "وسط اسكتلندا"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "هاي لاند"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "لوثيان"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "جزر أوركني"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "جزر شتلاند"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "ستراثكلايد"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "الجزر الغربية"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "إنجلترا"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "شمال ايرلندا"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "اسكوتلندة"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "ويلز"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "أدخل رقم لوحة رخصة مركبة صحيح"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "أدخل رقم هاتف صحيح"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "أدخل رمزاً بريدياً صحيحاً"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "أدخل رقم NIK/KTP صحيح"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "بالي"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "بانتن"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "بنجكولو"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "جاكرتا"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "جامبي"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "جاوة الغربية"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "جاوة الوسطى"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "جاوة الشرقية"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "غرب كاليمانتان"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "جنوب كاليمانتان"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "وسط كاليمانتان"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "شرق كاليمانتان"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "جزر بانكا بليتانج"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "جزر رياو"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "لامبونج"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "مالوكو"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "سومطرة الغربية"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "سومطرة الشرقية"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "سومطرة الشمالية"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "باتي"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "سورابايا"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "الحكومة الاتحادية"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "اكتب الرمز البريدي بالنسق XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "أدخل رقم هوية صحيح."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "رجاءً أدخل رقم مُعرّف آيسلندي صحيح. النسق هو XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "رقم المُعرّف الآيسلندي غير صحيح."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "أدخل رمز zip صحيح."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "أدخل رقم ضمان اجتماعي صحيح."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "أدخل رقم ضريبة VAT صحيح."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "أدخل رمزاً بريدياً بالنسق XXXXXXX أو XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "هوكايدو"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "أوموري"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "ياماغاتا"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "فوكوشيما"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "طوكيو"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "ياماناشي"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "شيغا"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "كيوتو"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "أُساكا"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "هَيوغو"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "نارا"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "واكاياما"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "أوكاياما"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "هيروشيما"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "ياماغوشي"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "توكوشيما"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "كاغاوا"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "ساغا"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "ناجاساكي"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "كوماموتو"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "ميازاكي"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "كاغوشيما"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "أوكيناوا"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "أدخل رقم بطاقة مدنيّة كويتيّة صحيح"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "دورانجو"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "ولاية مكسيكو"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "ميتشواكان"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "موريلوس"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "ناياريت"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "نويفو ليون"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "اواكساكا"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "بويبلا"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "كويريتارو"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "كينتانا رو"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "سونورا"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "تاباسكو"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "تاماوليباس"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "تلاكسكالا"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "أدخل رمزاً بريدياً صحيحاً."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "أدخل رقم SoFi صحيح."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "أدخل رقم ضمان اجتماعي نرويجي صحيح."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "يتطلب هذا الحقل 8 أرقام."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "يتطلب هذا الحقل 11 أرقام."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "يتكون رقم الهوية الوطني من 11 رقماً."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "تدقيق مجموع خاطئ لرقم الهوية الوطنية."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "تدقيق مجموع خاطئ لرقم الضريبة (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "رقم السجل التجاري الوطني (REGON) يتكون من 9 أو 14 رقم."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "تدقيق مجموع خاطئ لرقم السجل التجاري الوطني (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "أدخل رمزاً بريدياً بالنسق XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "أدخل رمزاً بريدياً بالنسق XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "يجب أن تحتوي أرقام الهواتف 9 أرقام، أو أن تبدأ بعلامة + أو صفرين."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "أدخل قيمة CIF صحيحة."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "أدخل قيمة CNP صحيحة."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "أدخل رمز IBAN صحيحاً بالنسق ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "أرقام الهاتف يجب أن تكون بالنسق XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "أدخل رمزاً بريدياً صحيحاً بالنسق XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "أدخل رقم تنظيم سويدي صحيح."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "أدخل رقم مُعرّف شخصي سويدي صحيح."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "أرقام Co-ordination غير مسموح بها."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "أدخل رمز بريدي سويدي بالنسبق XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "ستوكهولم"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "براتيسلافا I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "براتيسلافا II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "براتيسلافا III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "براتيسلافا IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "براتيسلافا V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "تشادسا"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "كوشيتسه I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "كوشيتسه II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "كوشيتسه III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "كوشيتسه IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "كوشيتسه - أوكولي"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "ريمافسكا سوبوتا"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "روتزنافا"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "أدخل الرمز البريدي بالنسق XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "أرقام الهواتف يجب أن تكون بالنسق 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "أدخل رقم هوية تركية صحيح."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "رقم الهوية التركي يجب أن يتكون من 11 رقماً."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "أدخل رمز zip بالنسق XXXXX أو XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "أرقام الهاتف يجب أن تكون بالنسق XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "أدخل رقم ضمان اجتماعي أميركي صحيح بالنسق XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "أدخل اسم ولاية أو إقليم أميركي."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "ولاية أمريكية (حرفان كبيران)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "رمز بريدي أميركي (حرفان لاتينيان كبيران)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "رقم هاتف"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "أدخل رقم CI صحيح بالنسق X.XXX.XXX-X,XXXXXXX-X أو XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "أدخل رقم CI صحيح."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "أدخل رقم هويّة جنوب إفريقيّة صحيح"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "أدخل رمز بريد جنوب إفريقي صحيح"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "شرق كيب"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "شمال كيب"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "شمال شرق"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "غير كيب"
diff --git a/django/contrib/localflavor/locale/az/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/az/LC_MESSAGES/django.mo
deleted file mode 100644
index c18b2b2fd3..0000000000
Binary files a/django/contrib/localflavor/locale/az/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/az/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/az/LC_MESSAGES/django.po
deleted file mode 100644
index a91b299ad9..0000000000
--- a/django/contrib/localflavor/locale/az/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3543 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Ali Ismayilov <ali@ismailov.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
-"language/az/)\n"
-"Language: az\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Poçt indeksini NNNN və ya ANNNNAAA formatında daxil edin."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Bu sahəyə ancaq rəqəmlər yazmaq olar."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Bu sahəyə 7 və ya 8 rəqəm yazmaq olar."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "XX-XXXXXXXX-X və ya XXXXXXXXXXXX formatında düzgün CUIT daxil edin."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Səhv CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Karintiya"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Aşağı Avstriya"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Yuxarı Avstriya"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Zalsburq"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Ştiriya"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberq"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vyana"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "XXXX formatında poçt indeksini daxil edin."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"XXXX XXXXXX formatında düzgün Avstriya Sosial Sığorta Nömrəsini daxil edin."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "4-rəqəmli poçt indeksini daxil edin."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Avstraliya ştatı"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Avstraliya poçt indeksi"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Avstraliya telefon nömrəsi"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antverpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brüssel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Şərqi Flandriya"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamand Brabantı"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Lyej"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburq"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Lüksemburq"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Valon Brabantı"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Qərbi Flandriya"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brüssel Paytaxt Rayonu"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flamand regionu"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valoniya"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "1XXX-9XXX diapazonu və formatında düzgün poçt indeksini daxil edin."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/"
-"xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx və ya "
-"04xxxxxxxx formatlarından birində işlək telefon nömrəsini daxil edin."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "XXXXX-XXX formatında poçt indeksini daxil edin."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefon nömrələri XX-XXXX-XXXX formatında olmalıdır."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Düzgün Braziliya ştatı seçin. Bizim siyahıda belə ştat yoxdur."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Səhv CPF nömrəsi."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Bura ən çoxu 11 rəqəm və ya 14 simvol yaza bilərsiniz."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Səhv CNPJ nömrəsi."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Bu sahəyə ən azı 14 rəqəm yazmaq lazımdır."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "XXX XXX formatında poçt indeksini daxil edin."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"XXX-XXX-XXX formatında işlək Kanada Sosial Sığorta nömrəsini daxil edin."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aarqo"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appensell İnneroden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appensell Ossearroden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Bazel-Ştadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Bazel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Friburg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Cenevrə"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Qlarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Qraubünden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Cura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lusern"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuşatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidvalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obvalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Şaffhauzen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Şvis"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Zoloturn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Sankt-Qallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Turqau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Tiçino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Vale"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vo"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Suq"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Sürix"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"X1234567<0 və ya 1234567890 formatında İsveçrə şəxsiyyət vəsiqəsi və ya "
-"pasportu kodunu daxil edin."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Çili üçün RUT daxil edin."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "XX.XXX.XXX-X formatında Çili üçün düzgün RUT daxil edin."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Çili üçün RUT düzgün deyil."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "XXXXXX formatında poçt indeksini daxil edin."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Şəxsiyyət vəsiqəsi kodu 15 və ya 18 rəqəmdən ibarət olmalıdır."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praqa"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Mərkəzi Bohemiya vilayəti"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Cənubi Bohemiya vilayəti"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Plsen vilayəti"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlsbad vilayəti"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti vilayəti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberets vilayəti"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradets vilayəti"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubits vilayəti"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vısoçina vilayəti"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Cənubi Moraviya vilayəti"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouts vilayəti"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin vilayəti"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moraviya-Silesiya vilayəti"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "XXXXX və ya XXX XX formatında poçt indeksini daxil edin."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "XXXXXX/XXXX və ya XXXXXXXXXX formatında doğum kodunu daxil edin."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Cins səhv göstərilib, \"f\" və ya \"m\" yazmaq olar."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Doğum kodunu düzgün yazın."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "IC nömrəsini düzgün yazın."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Vürtemberq"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavariya"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburq"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburq"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Meklenburq-Qərbi Pomeraniya"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Aşağı Saksoniya"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Şimali Reyn-Vestfaliya"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Reynland-Palatinatlıq"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saar"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saksoniya"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saksoniya-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Şlezviq-Holştayn"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Turingiya"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "XXXXX formatında poçt indeksini daxil edin."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X formatında Almaniya şəxsiyyət vəsiqəsinin "
-"seriya kodunu daxil edin."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albesete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alakant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeriya"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badaxos"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Balear adaları"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barselona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burqos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Kaseres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Kadis"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Kastelyo"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Syudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Kordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "La Korunya"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Kuenka"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Xerona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Qrenada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Qvadalaxara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Qipuskoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Uelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Ueska"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Xaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleyda"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioxa"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Luqo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaqa"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Mursiya"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturiya"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palensiya"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las-Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanka"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Kruz de Tenererife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Kantabriya"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Seqoviya"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilya"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soriya"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valensiya"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valyadolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biskayya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Saraqosa"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Seuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilya"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Əndəlus"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Araqon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturiya knyazlığı"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balear adaları"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basklar Ölkəsi"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanar adaları"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastiliya-La-Manş"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastiliya və Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Kataloniya"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Estremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Qalisiya"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Mursiya vilayəti"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra Foral Cəmiyyəti"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valensiya Cəmiyyəti"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-"01XXX - 52XXX formatı və diapazonunda düzgün poçt indeksini daxil edin."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"6XXXXXXXX, 8XXXXXXXX və ya 9XXXXXXXX formatlarından birində düzgün telefon "
-"nömrəsini daxil edin."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Düzgün NIF, NIE və ya CIF daxil edin."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Düzgün NIF və ya NIE daxil edin."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "NIF üçün yoxlama cəmi düzgün gəlmədi."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "NIE üçün yoxlama cəmi düzgün gəlmədi."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "CIF üçün yoxlama cəmi düzgün gəlmədi."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"XXXX-XXXX-XX-XXXXXXXXXX formatında düzgün bank hesabı kodunu daxil edin."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Bank hesabı kodu üçün yoxlama cəmi düzgün gəlmədi."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Fin sosial müdafiə kodunu daxil edin."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefon nömrələri 0X XX XX XX XX formatında olmalıdır."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Düzgün poçt indeksini daxil edin."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordşir"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Bakinqemşir"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Çeşir"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Kornuoll və Silli adaları"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Kambriya"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbişir"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Darem"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Şərqi Sasseks"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Esseks"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Qlosesterşir"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Böyük London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Böyük Mançester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hempşir"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordşir"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lankaşir"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Lesterşir"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Linkolnşir"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Mersisayd"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Şimali Yorkşir"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northemptonşir"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Nortumberlend"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinqemşir"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oksfordşir"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Şropşir"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Cənubi Yorkşir"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordşir"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Saffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Sürrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tayn və Uir"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Uoruikşir"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Uest-Minlends"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Qərbi Sasseks"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Qərbi Yorkşir"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Uiltşir"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Vursterşir"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Antrim qraflığı"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Arma qraflığı"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Daun qraflığı"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Fermana qraflığı"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Londonderri qraflığı"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Tiron qraflığı"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Kluid"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dived"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Quent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Quinet"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Qlamorqan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Pouis"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Cənubi Qlamorqan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Qərbi Qlamorqan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Mərkəzi Şotlandiya"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Damfris və Qallouey"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fayf"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Qrampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Haylend"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lotian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkni adaları"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Şetlend adaları"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Stratklayd"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Taysayd"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Qərbi adalar"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "İngiltərə"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Şimali İrlandiya"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Şotlandiya"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Uels"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Avtomobil qeydiyyat nömrəsini düzgün daxil edin."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Telefon nömrəsini düzgün daxil edin."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Düzgün poçt indeksini daxil edin."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "NIK/KTP nömrəsini düzgün daxil edin."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Açex"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Benqkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Cokyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Cakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Qorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Cambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Qərbi Timor"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Mərkəzi Cava"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Şərqi Cava"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Qərbi Kalimantan"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Cənubi Kalimantan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Mərkəzi Kalimantan"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Şərqi Kalimantan"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Banqka-Belutinq adaları"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Riau adaları"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampunq"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Molukku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Şimali Molukku"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Qərbi Kiçik Zond adaları"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Şərqi Kiçik Zond adaları"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Qərbi Papua"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Qərbi Sulavesi"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Cənubi Sulavesi"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Mərkəzi Sulavesi"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Cənubi-Şərqi Sulavesi"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Şimali Sulavesi"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Qərbi Sumatra"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Cənubi Sumatra"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Şimali Sumatra"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelanq"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanqore Açeh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Banka Belitunq"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Konsulluq Korpusu"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Diplomatik Korpus"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandunq"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Şimali Sulavesi"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Çimali Sulavesi"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua və Qərbi Papua"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Çirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbava"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Boqor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalonqan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semaranq"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malanq"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Cember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal hakimiyyət"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Boconeqoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purvakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarco"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Qarut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Arma"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Karlou"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Kavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Kler"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Kork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derri"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Doneqal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Daun"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermana"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Qoluey"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerri"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kilder"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenni"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Liiş"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Litrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerik"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Lonqford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Laut"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Meyo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Mit"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monağan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offali"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roskommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Slayqo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tippereri"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tiron"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Uoterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Uestmit"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Ueksford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Uiklou"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "XXXXX formatında poçt indeksini daxil edin."
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "ID kodunu düzgün daxil edin."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"XXXXXX-XXXX formatında düzgün İslandiya identifikasiya kodunu daxil edin."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Bu, düzgün İsland identifikasiya kodu deyil."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Düzgün poçt indeksini daxil edin."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Düzgün Sosial Müdafiə kodunu daxil edin."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Düzgün ƏDV kodunu daxil edin."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Düzgün poçt indeksini XXXXXXX və ya XXX-XXXX formatında daxil edin."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaydo"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "İvate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamaqata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukuşima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "İbaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Totiqi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Qunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Tiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanaqava"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanasi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Naqano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niiqata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "İsikava"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Qifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Sidzuka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aiçi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Siqa"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyoqo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Vakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Simane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hirosima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaquti"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokusima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kaqava"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Koti"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saqa"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Naqasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyadzaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kaqosima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinava"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Küveyt şəxsiyyət vəsiqəsinin seriya nömrəsini daxil edin."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aquaskalyentes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Aşağı Kaliforniya"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Cənubi Aşağı Kaliforniya"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Kampeçe"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Çihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Çyapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Koahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Kolima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Federal vilayət"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Duranqo"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Gerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Quanahuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "İdalqo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Xalisko"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Mexiko"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Miçoakan"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo-Leon"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaka"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Keretaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Kintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Lui Potosi"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasko"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaskala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Verakrus"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yukatan"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Sakatekas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Düzgün poçt indeksini daxil edin."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Düzgün SoFi kodunu daxil edin."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drente"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frisland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Qelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Qroningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Şimali Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Şimali Hollandiya"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overeysel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrext"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zellandiya"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Cənubi Hollandiya"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Norveç sosial müdafiə kodunu daxil edin."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Bura 8 rəqəm yazmaq lazımdır."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Bura 11 rəqəm yazmaq lazımdır."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Milli İdentifikasiya Nömrəsi 11 rəqəmdən ibarətdir."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Milli İdentifikasiya Nömrəsi üçün yoxlama cəmi düzgün çıxmadı."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "VÖEN üçün yoxlama cəmi düzgün çıxmadı."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Milli İş Qeydiyyat Nömrəsi (REGON) 9 və ya 14 rəqəmdən ibarətdir."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Milli İş Qeydiyyat Nömrəsi (REGON) üçün yoxlama cəmi düzgün çıxmadı."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "XX-XXX formatında poçt indeksini daxil edin."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Aşağı Silesiya"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyaviya-Pomeraniya"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lyublyan"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lyubuş"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Kiçik Polşa"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Mazoviya"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Aşağı Karpat"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlyasye"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomeraniya"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesiya"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Svyetokşiskye"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Varmiya-Mazuriya"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Böyük Polşa"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Qərbi Pomeraniya"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "XXXX-XXX formatında poçt indeksini daxil edin."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Telefon nömrələri 9 rəqəmdən ibarət olmalı, ya +, ya da 00 ilə başlamalıdır."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Düzgün CIF kodunu daxil edin."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Düzgün CNP kodunu daxil edin."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "ROXX-XXXX-XXXX-XXXX-XXXX-XXXX formatında düzgün IBAN daxil edin."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefon nömrələri XXXX-XXXXXX formatında olmalıdır."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "XXXXXX formatında düzgün poçt indeksini daxil edin."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "İsveç təşkilatları üçün düzgün nömrəni daxil edin."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Düzgün İsveç şəxsiyyətin təsdiqi kodunu daxil edin."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinasiya nömrələri qadağandır."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "XXXXX formatında İsveç poçt indeksini daxil edin."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stokholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Vesterbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Estergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Yonköpinq"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberq"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Qotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinqe"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skone"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Vestra-Qotaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Vermland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Erebru"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Vestmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Yevleborq"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Vesternnorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Yemtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bistirisa"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Ştyavnisa"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardeyov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovse nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bitça"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Çadsa"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolnı Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunayska Seda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Qalanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Qelnisa"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohoves"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "İlava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kejmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Koşitse I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Koşitse II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Koşitse III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Koşitse IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Koşitse - okolye"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kisuske Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levitse"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoça"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovski Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Luçenets"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malatski"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilabortse"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Mixalovtse"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Miyava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamki"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Pyeştanı"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povajska Bistrisa"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Pryevidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puxov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revusa"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rojnyava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Rujomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senes"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senisa"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalisa"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobranse"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spişka Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lyubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolçanı"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trençin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turçanske Teplise"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velki Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravse"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovitsa"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Jar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Jilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bistritsa vilayəti"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava vilayəti"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Koşitse vilayəti"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra vilayəti"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Preşov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trençin vilayəti"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava vilayəti"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Jilina vilayəti"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "XXXXX formatında poçt indeksini daxil edin."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "0XXX XXX XXXX formatında telefon nömrəsini daxil edin."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Düzgün Türkiyə identifikasiya kodunu daxil edin."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Türkiyə identifikasiya kodu 11 rəqəmdən ibarətdir."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "XXXXX və ya XXXXX-XXXX formatında poçt indeksini daxil edin."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefon nömrəsi XXX-XXX-XXXX formatında olmalıdır."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "XXX-XX-XXXX formatında ABŞ Sosial Müdafiyə kodunu daxil edin."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "ABŞ ştatı və ya ərazisini daxil edin."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "ABŞ ştatı (iki böyük hərf)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "ABŞ poçt indeksi (iki böyük hərf)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefon nömrəsi"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"X.XXX.XXX-X,XXXXXXX-X və ya XXXXXXXX formatında düzgün CI kodunu daxil edin."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "CI kodunu düzgün daxil edin."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Cənubi Afrika üçün düzgün identifikasiya kodunu daxil edin."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Cənubi Afrika üçün düzgün poçt indeksini daxil edin."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Şərqi Keyp"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Azad Ştat"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Qautenq"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "Kva-Zulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpulamanqa"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Şimali Keyp"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Şimali-Qərb"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Qərbi Keyp"
diff --git a/django/contrib/localflavor/locale/bg/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/bg/LC_MESSAGES/django.mo
deleted file mode 100644
index d7166872aa..0000000000
Binary files a/django/contrib/localflavor/locale/bg/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/bg/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/bg/LC_MESSAGES/django.po
deleted file mode 100644
index 0f4621f53b..0000000000
--- a/django/contrib/localflavor/locale/bg/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3548 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Boris Chervenkov <office@sentido.bg>, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Todor Lubenov <tlubenov@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
-"language/bg/)\n"
-"Language: bg\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Въведете пощенския код във формат NNNN или ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Това поле изисква число."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Това поле изисква 7 или 8 цифри."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"Въведете валиден номер на германска лична карта в формат XX-XXXXXXXX-X или "
-"XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Невалиден CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Бургенланд"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Каринтия"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Долна Австрия"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Горна Австрия"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Залцбург"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Сирия"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Тирол"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Форарлберг"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Виена"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Въведете пощенски код в формат XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Въведете валиден номер на социалната осигуровка австрийски в ХХХХ XXXXXX "
-"формат."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Антверпен"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Брюксел"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Източна Фландрия"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Фламандски Брабант"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Ено"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Леге"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Люксембург"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Намур"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Валонски Брабант"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Западна Фландрия"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Брюксел столица"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Фламандския регион"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Валония"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Въведете валиден пощенски код в обхвата и формата 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Въведете валиден телефонен номер в един от форматите 0x ххх хх хх, хх хх хх "
-"0xx, 04xx хх хх хх, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x . xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx или 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Въведете пощенски код в формат XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Телефонните номера трябва да бъдат в формат XX-XXXX-XXXX.  "
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Изберете валиден бразилски щат.  Този, не е един отвалидните щати."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Невалиден CPF номер"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Това поле изисква поне 11 цифри или 14 символа."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Невалиден CNPJ номер"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Това поле изисква поне 14 цифри."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Въведете пощенски код в формат XXX XXХ."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Въведете валиден номер на канадската социална осигуровка в формата XXX-XX-"
-"XXXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Ааргау"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Берн"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Фрайбург"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Женева"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Гларус"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Юра"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Люцерна"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Нюшател"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Нидвалден"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Шафхаузен"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Швиц"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Санкт Гален"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Ури"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Во"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Цюрих"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Въведете валиден швейцарски индентификационен номер в X1234567<0 или "
-"1234567890 формат"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Въведете валиден чилийски RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Въведете валиден чилийски RUT. Форпатът представлява ХХ ХХХ ХХХ-Х."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Чилийският RUT не е валиден."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Прага"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Централна Бохемия"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Южна Бохемия"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Регион Пилзен"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Карлсбад регион"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Усти регион"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Либерец регион"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Храдец регион"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Пардубице регион"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Височински край"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Южноморавски край"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Оломоуц регион"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Регион Злин"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Моравско-Силезия"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Въведете пощенски код в формат XXXXX или XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Въведете номер на раждане във формат XXXXXX / XXXX или XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Невалиден незадължителен параметър Пол, валидни стойности са 'f' и 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Въведете валиден номер на раждане."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Въведете валиден IC номер."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Баден-Вюртемберг"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Бавария"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Берлин"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Бранденбург"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Бремен"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Хамбург"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Хесен "
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Мекленбург-Предна Померания"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Долна Саксония "
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Райнланд-Пфалц"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Саарланд"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Саксония"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Саксония-Анхалт"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Шлезвиг-Холщайн"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Тюрингия"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Въведете пощенски код в формат XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Въведете валиден номер на германска лична карта в формат  XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Албасете"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Алмерия"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Авила"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Бадахос"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Балеарски острови"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Барселона"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Бургос"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Касерес"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Кадиз"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Сиудад Реал"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Кордоба"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "А Коруня"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Куенка"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Хирона"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Гранада"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Гуадалахара"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Уелва"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Хуеска"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Хаен"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Леон"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Лейда"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "Ла Риоха"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Луго"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Мадрид"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Малага"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Мурсия "
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Навара"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Оуренсе"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Астурия"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Паленсия"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Лас Палмас де Гран Канария"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Понтеведра"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Саламанка"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Санта Круз де Тенерифе"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Сеговия"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Севиля"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Сория"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Тарагона"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Теруел"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Толедо"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Валенсия"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Валядолид"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Замора"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Сарагоса"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Сеута"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Мелила"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Андалусия"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Арагон"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Княжество Астурия"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Балеарските острови"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Страна на баските"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Канарски острови"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Кастилия-Ла Манча"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Кастилия и Леон"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Каталония"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Галисия"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Района на Мурсия"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral област Навара"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Валенсия"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Въведете валиден пощенски код в интервала 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Въведевалиден телефонен номер в един от форматите 6XXXXXXXX, 8XXXXXXXX или "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Въведете валиден НИФ, НИЕ, или ЦИФ."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Въведете валиден НИГ или НИЕ."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Невалидна чексума за НИФ"
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Невалидна чексума за НИЕ"
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Невалидна чексума за ЦИФ"
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Въведете валиден номер на банковата ви сметка във формат XXXX-XXXX-XX-"
-"XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Невалидна чексума за номер на банковата сметка"
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Въведете валиден финландски номер на социалната осигуровка."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Телефонните номера трябва да са в 0X XX XX XX XX формат."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Въведете валиден пощенски код."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Бедфордшър"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Источен Съсек "
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Есекс"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Велик Лондон"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Велик Манчестер "
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Хемпшир"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Кент"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Ланкашър"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Линкълншир"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Норфолк"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Северен Йоркшир"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Нортхемптъншир"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Нотингамшир"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Оксфордшир"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Съмърсет"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Южен Йорксър"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Уест Мидландс"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Западен Съсекс"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Западен Йоркшир"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Англия"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Северна Ирландия"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Шотландия"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Уелс"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Въведете валиден регистрационен номер на превозното средство"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Въведете валиден телефонен номер"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Въведете валиден пощенски код"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Въведете валиден NIIK/KTP номер"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Аче"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Бали"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Бенгкулу"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Джакарта"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Източна Ява"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Молукски острови"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Папуа"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Папуа Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Риау"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Сулавеси Барат"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Сулавеси Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Сулавеси Тенга"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Сулавеси Тенгара"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Сулавеси Утара"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Суматера Барат"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Суматера Селатан"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Суматера Утара"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Ачех"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Федералното правителство"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Дъблин"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Голуей"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Килкени"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Лонгфорд"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Лоут"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Майо"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Мийт"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Монахан"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Слиго"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Тайрън"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Уотърфорд"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Уексфорд"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Уиклоу"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Въведете пощенски код в формат XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Въведете валиден номер на лична карта."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Въведете валиден исландски номер. Форматът представлява XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Исландския номер за индентификация е невлиден"
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Въведете валиден пощенски код."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Въведете валиден номер на социалната ви осигуровка."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Въведете валиден VAT номер."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Въведете пощенски код в формат XXXXXXX или XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Хокайдо"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Амори"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Акита"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Ямагата"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Фукушима"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ибараки"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Сайтама"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Чиба"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Токио"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Канагава"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Яманаши"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Нагано"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Ниигата"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Тояма"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ишикава"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Фукуи"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Шизуока"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Мие"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Шига"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Киато"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Осака"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Хиого"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Нара"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Вакаяма"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Окаяма"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Хирошима"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Ямагучи"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Токушима"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Кагава"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ехиме"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Кочи"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Фукуока"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Сага"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Нагазаки"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Кумамото"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Оита"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Миазаки"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Кагошима"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Окинава"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Въведете валиден кувейтски граждански номер"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Агуаскалиентес"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Долна Калифорния"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Баха Калифорния Сур"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Кампече"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Чихуахуа"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Чиапас"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Гереро"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Гуанахуато"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Хидалго"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado де Мексико"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Мичоакан"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Нуево Леон"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Оаксака"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Пуебла"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Кинтана Роо"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Синалоа"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "Сан Луис Потоси"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Табаско"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Тамаулипас"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Тласкала"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Юкатан"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Закатекас"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Въведете валиден пощенски код."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Въведете валиден SoFi номер"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Дренте"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Грьонинген"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Утрехт"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Въведете валиден норвежки номер на социалната осигуровка."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Това поле изисква 8 цифри."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Това поле изисква 11 цифри."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Националният индентификационен номер се състои от 11 цифри"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Грешна чексума за Националния индентификационен номер"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Грешна чексума за данъчен номер (НИП)"
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Национален търговски регистър номер (REGON) се състои от 9 или 14 цифри."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Грешна чексума за Националния Бизнес Регистрационен Номер (REGON)"
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Въведете пощенски код в формат XX-ХXXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Долна Силезия"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Предна Померания"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Люблин"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Любушко"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Лодз"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Ополе"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Померания"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Силезия"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Велика Полша"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Западна Померания"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Въведете пощенски код в формат XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Телефонните номера трябва да са 9 цифри, или започнете с + или 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Въведете валиден CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Въведете валиден CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Въведете валиден IBAN в RОXX-XXXX-XXXX-XXXX-XXXX-XXXX формат"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Телефонните номера трябва да са в XXXX-XXXXXX формат."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Въведете валиден пощенски код в формат XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Въведете валиден шведски номер на организация."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Въведете валиден шведско ЕГН."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Ко-ординационни номера не са позволени."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Въведете шведски пощенски код в формат XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Стокхолм"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Упсала"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Йонкьопинг"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Готланд"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Блекинге"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Скания"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Халанд"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Даларна"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Банска Бистрица"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Банска Стиавница"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce NAD Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Братислава I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Братислава II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Братислава III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Братислава IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Братислава V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Čadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Долни Кубин"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Комарно"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Кошице I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Кошице II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Кошице III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Кошице IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Кошице - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Нове Место Kysucke"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Липтовски Микулаш"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lučenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Мартин"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Наместово"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Нитра"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Нове Место NAD Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nové Zámky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizánske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltár"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Попрад"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Бистрица"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Прешов"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Púchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rožňava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Събинов"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Сенец"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Скалица"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Стара Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebišov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Тренчин"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Търнава"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turčianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Veľký Krtíš"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Вранов над Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Зволен"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Žarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Жилина"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Банска Бистрица регион"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Братислава регион"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Кошице регион"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Нитра регион"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Прешов регион"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Тренчин регион"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Търнава регион"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Жилина регион"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Въведете пощенски код в формат XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Телефонните номера трябва да са в 0XXX XXX формат XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Въведете валиден турски идентификационен номер."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Турски Идентификационен номер трябва да бъде 11 цифри."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Въведете zip код в формат XXXXX или XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Телефонните номера трябва да са в XXX-XXX-XXXX формат."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Въведете валиден номер на социалната осигуровка в формат XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Въведете американския щат или територия."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "американски щат (две главни букви)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "САЩ пощенски код (две главни букви)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Телефонен номер"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Въведете валиден номер CI в X.XXX.XXX-X, XXXXXXX-X или XXXXXXXX формат."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Въведете валиден CI номер."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Въведете валиден южно-африкански номер за индентификация"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Въведете валиден пощенски код за Южна Африка"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Източен Кейп"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Свободната държава"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Гаутенг"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "Квазулу-Натал"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Лимпопо"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Мпумаланга"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/bn/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/bn/LC_MESSAGES/django.mo
deleted file mode 100644
index a749e05020..0000000000
Binary files a/django/contrib/localflavor/locale/bn/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/bn/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/bn/LC_MESSAGES/django.po
deleted file mode 100644
index b53e73a392..0000000000
--- a/django/contrib/localflavor/locale/bn/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3527 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
-"bn/)\n"
-"Language: bn\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "ইউ, এস, রাজ্য (দুটো আপারকেস অক্ষর)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "ফোন নাম্বার"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/bs/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/bs/LC_MESSAGES/django.mo
deleted file mode 100644
index 80e48b60ac..0000000000
Binary files a/django/contrib/localflavor/locale/bs/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/bs/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/bs/LC_MESSAGES/django.po
deleted file mode 100644
index 300951c2ab..0000000000
--- a/django/contrib/localflavor/locale/bs/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3542 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Filip Dupanović <filip.dupanovic@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Filip Dupanović <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
-"bs/)\n"
-"Language: bs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Unesite poštanski broj u formatu NNNN ili ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Ovo polje zahtjeva samo brojeve."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Ovo polje mora da sadrži 7 ili 8 cifara."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Unesite ispravan CUIT u formatu XX-XXXXXXXX-X or XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Neispravan CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Karintija"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Donja Austrija"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Gornja Austrija"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salcburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Stirija"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Voralber"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Beč"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Unesite poštanski broj u formatu XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Unesite važeći austrijski broj socijalnog osiguranja u formatu XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brisel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Istočna Flandrija"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamanski Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Valonski Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Zapadna Flandrija"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Regija glavnoga grada Bruxellesa"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flamanska regija"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonija"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Unesite ispravan poštanski broj u rasponu i formatu 1XXX-9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Unesite važeći broj telefona u jednom od formata 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx ili 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Unesite zip kod u formatu XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonski brojevi moraju biti u XX-XXXX-XXXX formatu."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Odaberite ispravnu brazilsku državu. Ta država nije među ponuđenima."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Neispravan CPF broj."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Polje zahtijeva najviše 11 cifri ili 14 znamenki."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Neispravan CNPJ broj."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Polje zahtijeva najmanje 14 cifri."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Unesite poštanski broj u formtu XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Unesite ispravan kanadski Social Insurance broj u XXX-XXX-XXX formatu."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-grad"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-provincija"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ženeva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucern"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Unesite ispravan broj švicarske lične karte ili pasoša u X1234567<0 ili u "
-"1234567890 formatu."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Unesite ispravan čileanski RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Unesite ispravan čileanski RUT. Format je XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Čileanski RUT nije ispravan."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prag"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Centralna Češka"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Južna Češka"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Plzenjski kraj"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlovarski kraj"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Ustečki kraj"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberečki kraj"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Kralovehradečki kraj"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubički kraj"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Visočina kraj"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Južna Moravska"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomoučki kraj"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlinski kraj"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravsko-seleški kraj"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Unesite poštanski broj u formatu XXXXX ili XX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Unesite datum rođenja u formatu XXXXXX/XXXX ili XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Neispravan parametar Pol; ispravne vrijednosti su 'f' i 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Unesite ispravan datum rođendana."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Unsite ispravan IC broj."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Donja Saška"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Sjeverno Porajnje-Zapadna Falačka"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saška"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Unesite poštanski broj u formatu XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Unesite ispravan broj njemačke lične karte u XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"formatu."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Kordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "Korunja"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Kuenka"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Unesite ispravan poštanski broj u nizu i formatu 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Unesite ispravan telefonski broj u jednom od formata 6XXXXXXXX, 8XXXXXXXX "
-"ili 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Unesite ispravan NIF, NIE ili CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Unesite ispravan NIF ili NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Neispravan checksum za NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Neispravan checksum za NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Neispravan checksum za CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Unesite isravan broj bankovnog računa u obliku XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Neispravan checksum za broj bankovnog računa."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Unesite ispravni finski identifikacijski broj."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Broj telefona mora biti u formatu 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Unesite ispravan broj automobilske tablice"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Unesite ispravan telefonski broj"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Unesite ispravni poštansku kod"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Unesite ispravan NIK/KTP broj"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Unesite ispravan islandski identifikacijski broj. Format je XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islanski identifikacijski broj nije ispravan."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Unesite ispravnu zip adresu."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Unesite ispravan Social Security broj."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Unesite ispravan VAT broj."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Unesite poštanski broj u formatu XXXXXXX ili XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Unesite ispravan kuvajtski Civil ID broj"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Unesite ispravnu poštansku adresu"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Unesite ispravan SoFi broj"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Unesite ispravan norveški jedinstveni matični broj građana."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Polje zahtijeva 8 cifri."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Polje zahtijeva 11 cifri."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "National Identification Number sastoji se od 11 cifri."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Pogrešan checksum za National Identification Number."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Pogrešan checksum za Tax Number (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"National Business Register Number (REGON) sastoji se od 9 ili 14 cifri."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Pogrešan checksum za National Business Register Number (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Unesite ispravnu poštansku adresu u formatu XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Unesite zup kod u formatu XXXX-XXX"
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefonski brojevi moraju imati 9 cifri, ili početi sa + ili 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Unesite ispravan CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Unesite ispravan CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Unesite ispravan IBAN ROXX-XXXX-XXXX-XXXX-XXXX-XXXX formatu"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonski brojevi moraju biti u XXXX-XXXXXX formatu."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Unesite ispravan poštanski broj u formatu XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Unesite ispravan švedski organizacijski broj."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Unesite ispravan švedski identifikacijski broj"
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinatni brojevi nisu dozvoljeni."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Unesite švedsku poštansku adresu u formatu XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Unesite poštansku adresu u formatu XXXXX ili XXXXX-XXXX"
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Broj telefona mora biti u formatu XX-XXXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Unesite ispravan američki Social Security broj u XXX-XX-XXXX formatu."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Unesite U.S. državu ili teritorij"
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Država u SAD (dva velika slova)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Broj telefona"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Unestie važeći CUIT u formatu XX-XXXXXXXX-X or XXXXXXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Unsite ispravan IC broj."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Unesite ispravan južnoafrički ID broj"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Unesite ispravnu južnoafričku poštansku adresu"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/ca/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ca/LC_MESSAGES/django.mo
deleted file mode 100644
index eaac30e682..0000000000
Binary files a/django/contrib/localflavor/locale/ca/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ca/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ca/LC_MESSAGES/django.po
deleted file mode 100644
index 8e81df0bed..0000000000
--- a/django/contrib/localflavor/locale/ca/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3566 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Antoni Aloy <antoni.aloy@trespams.com>, 2011.
-# Carles Barrobés <carles@barrobes.com>, 2011, 2012.
-# el_libre como el chaval <el.libre@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
-"ca/)\n"
-"Language: ca\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Introduïu un codi postal en el format NNNN o ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Aquest camp precisa només números."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Aquest camp precisa 7 o 8 dígits."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"Introduïu un número CUIT vàlid en el format XX-XXXXXXXX-X o XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT invàlid."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Àustria Inferior"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Àustria Superior"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introduïu un codi zip en el format XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Introduïu un número vàlid de la Seguretat Social Austríaca en el format XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Introdueix el codi postal de 4 digits"
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Estat australià"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Codo postal australià"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Telèfon australià"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Ambers"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brussel·les"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flandes de l'est"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabant flamenc"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Lieja"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Brabant való"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandes de l'oest"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Regió capital de Brussel·les"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Regió flamenca"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valònia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Introduïu un codi postal vàlid en el rang i format 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Introduïu un número de telèfon vàlid en un dels formats 0x xxx xx xx, 0xx xx "
-"xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx o 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Introduïu un codi zip en el format XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "El número de telèfon ha d'estar en el format XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Seleccioneu un estat brasiler vàlid. Aquest estat no és un dels estats "
-"disponibles."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Número CPF invàlid."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Aquest camp precisa com a màxim 11 dígits o 14 caràcters."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Número CNPJ invàlid."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Aquest camp precisa almenys 14 dígits."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Introduïu un codi postal en el format XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Introduïu un número vàlid de la Seguretat Social de Canadà en el format XXX-"
-"XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Argau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Inner-Rhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausser-Rhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basilea-Ciutat"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basilea-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berna"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Friburg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ginebra"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerna"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zuric"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Introduïu un número d'identificació o de passaport Suïssos en els formats "
-"1234567890 o X1234567<0."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Introduïu un RUT Xilè vàlid."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Introduïu un RUT Xilè vàlid. El format és XX.XXX.XXX-X"
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "El RUT Xilè no és vàlid."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Introdueix el codi postal en format XXXXX"
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "L'identificador de tarja ha de tenir 15 o 18 dígits"
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Nombre de tarja invàlid: suma de comprovació incorrecta"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Nombre de tarja invàlid: data de naixement errònia"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Nombre de tarja d'identificació  invàlid: codi d'ubicació incorrecta"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Introdueix un telèfon vàlid"
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Escriu un número correcte de mòbil"
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Regió Bohèmia Central"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Regió Bohèmia Sur"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Regió Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Regió Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Regió Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Regió Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Regió Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Regió Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Regió Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Regió Moràvia Sur"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Regió Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Regió Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Regió Moràvia-Silesiana"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Introduïu un codi postal en el format XXXXX o XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Introduïu un número de naixement en el format XXXXXX/XXXX o XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"El paràmetre opcional 'Gènere' és invàlid, els valors vàlids son 'f' i 'm'."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Introduïu un número de naixement vàlid."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Introduïu un número de IC vàlid."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Württemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Baviera"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlín"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Pomerània Occidental"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Baixa Saxònia"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Renània del Nord-Westfàlia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Renània-Palatinat"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxònia"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxònia-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Slesvig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Turíngia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introduïu un codi zip en el format XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Introduïu un número vàlid de tarjeta d'identificació alemanya en el format "
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Àlaba"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Àvila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Càceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadis"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castelló"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Còrdova"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "La Corunya"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Conca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúscoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Osca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Lleó"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Màlaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Múrcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Astúries"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palència"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantàbria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segòvia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Sòria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Terol"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "València"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biscaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Saragossa"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragó"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principat d'Astúries"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Illes Balears"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Euskadi"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canàries"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castella-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castella i Lleó"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalunya"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galícia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Regió de Múrcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Comunitat Foral de Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Comunitat Valenciana"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Introduïu un codi postal en rang i format 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Introduïu un número de telèfon vàlid en un dels formats 6XXXXXXXX, 8XXXXXXXX "
-"o 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Si us plau, introduïu un NIF, NIE o CIF vàlid."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Si us plau, introduïu un NIF o NIE vàlid."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Verificació del NIF invàlida."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Verificació del NIE invàlida."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Verificació del CIF invàlida."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Introduïu un número de compte bancari vàlid en el format XXXX-XXXX-XX-"
-"XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Verificació del número de compte bancari invàlida."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Introduïu un número vàlid de la seguretat social finlandesa."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Els números de telèfon han de estar en el format 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Introduïu un codi postal vàlid."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Glamorgan Sud"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Glamorgan Oest"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Escòcia central"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Illes Orkney"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Illes Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Illes Occidentals"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglaterra"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlanda del Nord"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Escòcia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Gal·les"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Introdueixi un codi JMBG de 13 dígits"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Error en el segment data"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Introdueixi un codi OIB d'11 dígits"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Introduïu un número de matrícula vàlid."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Escriu un codi de localització vàlid"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "La part d'un nombre no pot ser 0"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Escriu un codi postal de 5 xifres vàlid"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Introduïu un número de telèfon vàlid."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Escriu un codi d'àrea o prefix mòbil correcte"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "El número de telèfon és massa llarg"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Introdueix un codi JMBAG vàlid de 19 dígits que comenci per 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "El nombre d'expedició de la tarja no pot ser zero"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Koprivnica-Krizevci"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Introduïu un codi postal vàlid."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Introduïu un número NIK/KTP vàlid."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Govern Federal"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Introduïu un codi postal amb el format XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Introduïu un número de ID vàlid."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Escriu un codi postal en format XXXXXX o XXX XXX"
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Introdueix un estat o territori de l'India"
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Els números de telèfon han de tenir el format 02X-8X, 03X-7X o 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Introduïu un número vàlid d'identificació d'Islàndia. El format és XXXXXX-"
-"XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "El número d'identificació d'Islàndia no és vàlid."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Introduïu un codi zip vàlid."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Introduïu un número valid de la Seguretat Social."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Introduïu un número d'IVA (VAT) vàlid."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Introduïu un codi postal en el format XXXXXXX o XX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Introduïu un número d'Identitat Kuwaitià vàlid"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Les targes d'identitat han de tenir 4 o 7 dígits o una lletra majúscula i 7 "
-"dígits."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Aquest camp ha de tenir exactament 13 dígits."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Els 7 primers dígits de l'UMCM han de representar una data passada vàlida"
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "El UMCN no es vàlid"
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasileva"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevcani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Cair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Tajra d'identificació macedònia"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Un municipi de Macedònia (2 codi de caràcters)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Identificació de ciutadà (13 dígits)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Entreu un codi postal vàlid amb el format XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Entreu un RFC vàlid."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Suma de verificació invàlida per RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Entreu un CURP vàlid."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Suma de verificació invàlida per CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Estat mexicà (tres lletres majúscules)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Codi postal mexicà"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "RFC mexicà"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "CURP mexicà"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baixa Califòrnia"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baixa Califòrnia Sud"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Districte Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estat de Mèxic"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Introduïu un codi postal vàlid."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Introduïu un número SoFi vàlid."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Introduïu un número de la seguretat social Noruega vàlid."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Aquest camp precisa 8 dígits."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Aquest camp precisa 11 dígits."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "El número d'identidicació nacional està compost de 11 digits."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Verificació del número d'identificació nacional invàlida."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-"El nombre de la tarja d'identificació nacional consisteix en 3 lletres i 6 "
-"dígits"
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Suma de comprovació incorrecta pel nombre d'identificació nacional"
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Entreu un número tributari (NIP) en el format XXX-XXX-XX-XX, XXX-XX-XX-XXX o "
-"XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Verificació del número tributari (NIP) invàlida."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"El número nacional de registre de negocis (REGON) està compost de 9 o 14 "
-"dígits."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Verificació del número nacional de registre de negocis invàlida."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Introduïu un codi postal en el format XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Baixa Silèsia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Polònia Menor"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerània"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silèsia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Polònia Major"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Pomerània Oest"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Introduïu un codi postal en el format XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Els números de telèfon han de tenir 9 dígits, o començar per + o 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Introduïu un CIF vàlid."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Introduïu un CNP vàlid."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Introduïu un IBAN vàlid en el format ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "El número de telèfon ha d'estar en el format XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Introduïu un codi postal vàlid en el format XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Introdueixi un codi posta en format XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Introdueixi un número de passaport en format XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Introdueixi un número de passaport en format XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Central Federal County"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "South Federal County"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "North-West Federal County"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Far-East Federal County"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Siberian Federal County"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Ural Federal del Comtat"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Federal del Comtat"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "North-Caucasian Federal County"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya Oblast '"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast '"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast '"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast '"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast '"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast '"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast '"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast '"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast '"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavl Oblast '"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast '"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Introduïu un número d'organització Sueca vàlid."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Introduïu un número d'identitat personal suec vàlid."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "No es permeten números de coordinació."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Introduïu un codi postal suec en el format XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Estocolm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"Els 7 primers dígits de l'EMSO han de representar una data vàlida en el "
-"passat."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "L'EMSO no és vàlid."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Entreu un número vàlid per a impostos en el format SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Entreu un número de telèfon en el format +386XXXXXXXX o 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Regió de Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Regió de Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Regió de Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Regió de Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Regió de Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Regió de Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Regió de Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Regió de Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Introduïu un codi postal amb el format XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Els números de telèfon han de tenir el format 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Introduïu un número d'identificació turc vàlid."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Els números d'identificació turcs han de tenir 11 dígits."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduïu un codi postal en el format XXXXX o XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Els números de telèfon han d'estar en el format XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Introduïu un número vàlid de la Seguretat Social dels E.U.A. en el format "
-"XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Introduïu un estat o territori dels E.U.A."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estat dels E.U.A. (dues lletres majúscules)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Codi postal dels EUA (dues lletres majúscules)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Número de telèfon"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Introduïu un número CI vàlid en el format X.XXX.XXX-X,XXXXXXX-X o XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Introduïu un número CI vàlid."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Introduïu un número d'Identitat Sud Africà vàlid"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Introduïu un codi postal Sud Africà vàlid."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Cap Oriental"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Estat lliure"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Cap Nord"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Cap Oest"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Cap Occidental"
diff --git a/django/contrib/localflavor/locale/cs/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/cs/LC_MESSAGES/django.mo
deleted file mode 100644
index c01aa55583..0000000000
Binary files a/django/contrib/localflavor/locale/cs/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/cs/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/cs/LC_MESSAGES/django.po
deleted file mode 100644
index 8b91dfae94..0000000000
--- a/django/contrib/localflavor/locale/cs/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3545 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Jirka Vejrazka <Jirka.Vejrazka@gmail.com>, 2011.
-# Vlada Macek <macek@sandbox.cz>, 2011, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
-"cs/)\n"
-"Language: cs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru NNNN nebo ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Pole smí obsahovat pouze číslice."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Pole smí obsahovat jen 7 nebo 8 číslic."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"Zadejte platné identifikační číslo CUIT ve tvaru XX-XXXXXXXX-X nebo "
-"XXXXXXXXXXXX"
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Neplatné CUIT"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Hradsko"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Korutany"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Dolní Rakousko"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Horní Rakousko"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salcbursko"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Štýrsko"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrolsko"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlbersko"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vídeň"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Zadejte platné rodné číslo (ASSN) ve tvaru XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Zadejte čtyřmístné poštovní číslo."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australský stát"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australské poštovní číslo"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australské telefonní číslo"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antverpy"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brusel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Východní Flandry"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Vlámský Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Henegavsko"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Lutych"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburk"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Lucembursko"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Valonský Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Západní Flandry"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brusel-hlavní město"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Vlámský region"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonsko"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Vložte platné poštovní směrovací číslo v rozsahu a tvaru 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Vložte platné telefonní číslo v jednom z tvarů 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonní číslo smí být pouze ve tvaru XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Neplatný brazilský stát. Vyberte jeden z nabízených států."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Neplatné číslo CPF."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Pole smí obsahovat nejvýše 11 číslic nebo 14 znaků."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Neplatné číslo CNPJ."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Pole smí obsahovat nejméně 14 číslic."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Zadejte platné kanadské číslo soc. pojištění (SID) ve tvaru XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basilej-město"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basilej-venkov"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ženeva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubünden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucern"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchâtel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Curych"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Zadejte platné švýcarské identifikační číslo nebo číslo cestovního pasu ve "
-"tvaru X1234567<0 nebo 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Zadejte platné chilské RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Zadejte platné chilské RUT ve tvaru XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Neplatné RUT."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Zadejte poštovní číslo ve tvaru XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Číslo identifikačního průkazu má 15 nebo 18 číslic."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Neplatné číslo identifikačního průkazu: Špatný kontrolní součet"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Neplatné číslo identifikačního průkazu: Špatné datum narození"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Neplatné číslo identifikačního průkazu: Špatný kód oblasti"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Zadejte platné telefonní číslo."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Zadejte platné číslo buňky."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praha"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Středočeský kraj"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Jihočeský kraj"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Plzeňský kraj"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlovarský kraj"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Ústecký kraj"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberecký kraj"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Královéhradecký kraj"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubický kraj"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysočina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Jihomoravský kraj"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomoucký kraj"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlínský kraj"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravskoslezský kraj"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXXX nebo XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Zadejte rodné číslo ve tvaru XXXXXX/XXXX nebo XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Neplatný nepovinný parametr Gender, platné hodnoty jsou 'f' a 'm'."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Zadejte platné rodné číslo."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Zadejte platné IČ."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Bádensko-Württembersko"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavorsko"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlín"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Braniborsko"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Brémy"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburk"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hesensko"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Meklenbursko-Přední Pomořansko"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Dolní Sasko"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Severní Porýní-Vestfálsko"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Porýní-Falc"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Sársko"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Sasko"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Sasko-Anhaltsko"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Šlesvicko-Holštýnsko"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Durynsko"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Zadejte platné německé identifikační číslo ve tvaru XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Araba"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Baleáry"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúzcoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lérida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcie"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturie"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Kantábrie"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencie"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biskajsko"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusie"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragonie"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturské knížectví"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Baleáry"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskicko"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanárské ostrovy"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastilie-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastilie a León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalánsko"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicie"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcie"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencie"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Zadejte platné poštovní směrovací číslo ve tvaru 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Zadejte platné telefonní číslo v jednom ze tvarů 6XXXXXXXX, 8XXXXXXXX nebo "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Zadejte platné hodnoty NIF, NIE nebo CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Zadejte platné hodnoty NIF nebo NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Neplatný kontrolní součet pro NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Neplatný kontrolní součet pro NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Neplatný kontrolní součet pro CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Zadejte platné číslo bankovního účtu ve tvaru XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Neplatný kontrolní součet pro číslo bankovního účtu."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Zadejte platné finské rodné číslo."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonní číslo musí být ve tvaru 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Zadejte platné poštovní směrovací číslo."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Velký Londýn"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Velký Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne a Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Střední Skotsko"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries a Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkneje"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetlandy"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Západní ostrovy"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglie"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Severní Irsko"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Skotsko"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Zadejte platné JMBG o 13 číslicích."
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Chybný segment data"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Zadejte jedenáctimístné číslo OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Vložte platné číslo poznávací značky vozu"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Zadejte platný kód oblasti"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Číselná část nesmí být nulová."
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Zadejte platné pětimístné poštovní směrovací číslo."
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Zadejte platné telefonní číslo"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Zadejte platnou oblast nebo kód mobilní sítě."
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefonní číslo je příliš dlouhé."
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Zadejte platné 19imístné JMBAG začínající na 601983."
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Číslo vydání karty nemůže být nula"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorská župa"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posávská župa"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovnicko-neretvanská župa"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istrijská župa"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovacká župa"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivnicko-križevecká župa"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorská župa"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Licko-senjská župa"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Mezimuřská župa"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osijecko-baranjská župa"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požežsko-slavonská župa"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Přímořsko-gorskokotarská župa"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisacko-moslavinská župa"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatská župa"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibenicko-kninská župa"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinská župa"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Viroviticko-podrávská župa"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-sremská župa"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarská župa"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Záhřebská župa"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Zadejte platné poštovní směrovací číslo."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Vložte platné číslo NIK/KTP"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federální vláda"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Vložte platné číslo ID"
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Zadejte kód ZIP ve tvaru XXXXXX nebo XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Zadejte indický stát nebo teritorium."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Telefonní čísla musí být ve tvaru 02X-8X, 03X-7X nebo 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Zadejte platné islandské identifikační číslo ve tvaru XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Neplatné islandské identifikační číslo."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Zadejte platné poštovní směrovací číslo."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Zadejte platné číslo SSN."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Zadejte platné daňové identifikační číslo."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXXXXX nebo XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaidó"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Mijagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Jamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukušima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Točigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Čiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Jamanaši"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Tojama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Išikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Šizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aiči"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Šiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kjóto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Ósaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hjógo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakajama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Šimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okajama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hirošima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Jamaguči"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokušima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kóči"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Óita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Mijazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagošima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Vložte platné kuvajtské občanské identifikační číslo"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Číslo identifikačního průkazu musí buď obsahovat 4 či 7 číslic nebo z velké "
-"písmo a 7 číslic."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Toto pole by mělo obsahovat přesně 13 číslic."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "Prvních 7 číslic UMCN musí být platné uplynulé datum."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN je neplatné."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo a Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Číslo makedonského identifikačního průkazu"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Makedonská obec (dvoupísmenný kód)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Rodné číslo (13 číslic)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Zadejte platné PSČ ve tvaru XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Zadejte platné RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Neplatný kontrolní součet RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Zadejte platný CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Neplatný kontrolní součet CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mexický stát (tři velká písmena)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexické PSČ"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexické RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexický CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Zadejte platné poštovní směrovací číslo"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Zadejte platné číslo SoFi"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Severní Brabantsko"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Severní Holandsko"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Jižní Holandsko"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Zadejte platné norské číslo sociálního pojištěni (SSN)."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Pole musí obsahovat 8 číslic."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Pole musí obsahovat 11 číslic."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Národní identifikační číslo obsahuje 11 číslic."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Neplatný kontrolní součet pro Národní identifikační číslo."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Číslo národního identifikačního průkazu (3 písmena a 6 číslic)"
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Špatný kontrolní součet čísla národního identifikačního průkazu."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Zadejte pole daňového čísla (NIP) ve tvaru XXX-XXX-XX-XX, XXX-XX-XX-XXX nebo "
-"XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Neplatný kontrolní součet pro daňové identifikační číslo."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Identifikační číslo podnikatele (REGON) obsahuje 9 až 14 číslic."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Neplatný kontrolní součet pro identifikační číslo podnikatele (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Dolnoslezské vojvodství"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kujavsko-pomořské vojvodství"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublinské vojvodství"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubušské vojvodství"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodžské vojvodství"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Malopolské vojvodství"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Mazovské vojvodství"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opolské vojvodství"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Podkarpatské vojvodství"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podleské vojvodství"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomořské vojvodství"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Slezské vojvodství"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Svatokřížské vojvodství"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Varmijsko-mazurské vojvodství"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Velkopolské vojvodství"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Západopomořanské vojvodství"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefonní číslo musí mít 9 číslo nebo začínat + či 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Zadejte platné CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Zadejte platné CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Zadejte platné IBAN ve tvaru ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonní číslo musí být ve tvaru XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Zadejte platné poštovní směrovací číslo ve tvaru XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Zadejte číslo pasu ve tvaru XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Zadejte číslo pasu ve tvaru XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Centrální federální okruh"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Jižní federální okruh"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Severozápadní federální okruh"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Dálněvýchodní federální okruh"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Sibiřský federální okruh"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Uralský federální okruh"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Povolžský federální okruh"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Severokavkazský federální okruh"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Petrohrad"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskevská oblast"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygejsko"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Baškortostán"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Burjatsko"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Republika Altaj"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestán"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingušsko"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardsko-Balkarsko"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmycko"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karačajevsko-Čerkesko"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Republika Karélie"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Marij El"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordvinsko"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sacha"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severní Osetie (Alanie)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstán"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tuva"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtsko"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Chakasie"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Čečensko"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Čuvašsko"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altajský kraj"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabajkalský kraj"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamčatský kraj"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarský kraj"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnojarský kraj"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permský kraj"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Přímořský kraj"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropolský kraj"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Chabarovský kraj"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurská oblast"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Archangelská oblast"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrachaňská oblast"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodská oblast"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Brjanská oblast"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirská oblast"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradská oblast"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologdská oblast"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voroněžská oblast"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovská oblast"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutská oblast"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradská oblast"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kalužská oblast"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovská oblast"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovská oblast"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromská oblast"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganská oblast"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurská oblast"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradská oblast"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipecká oblast"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanská oblast"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanská oblast"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nižněnovgorodská oblast"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodská oblast"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirská oblast"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omská oblast"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburská oblast"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orelská oblast"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenská oblast"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovská oblast"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovská oblast"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazaňská oblast"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Sachalinská oblast"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovská oblast"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sachalinská oblast"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovská oblast"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenská oblast"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovská oblast"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverská oblast"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomská oblast"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tomská oblast"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Ťumenská oblast"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Uljanovská oblast"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Čeljabinská oblast"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Jaroslavská oblast"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Židovská autonomní oblast"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Něnecký autonomní okruh"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Chantymansijský autonomní okruh - Jugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Čukotský autonomní okruh"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Jamalskoněnecký autonomní okruh"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Vložte platné číslo švédské organizace."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Vložte platné švédské osobní identifikační číslo."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinační čísla nejsou povolena."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Vložte švédské poštovní směrovací číslo ve tvaru XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "Prvních 7 číslic EMSO musí představovat datum uplynulého dne."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO je neplatné."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Zadejte platné daňové číslo ve tvaru SIXXXXXXXX."
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Zadejte telefonní číslo ve tvaru +386XXXXXXXX nebo 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banská Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banská Štiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Bánovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytča"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Čadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolný Kubín"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajská Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenné"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kežmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komárno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Košice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Košice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Košice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Košice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Košice-okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucké Nové Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoča"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovský Mikuláš"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lučenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Námestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nové Mesto nad Váhom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nové Zámky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizánske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piešťany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltár"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Považská Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Prešov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Púchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revúca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavská Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rožňava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ružomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spišská Nová Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stará Ľubovňa"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidník"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Šaľa"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topoľčany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebišov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trenčín"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turčianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdošín"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Veľký Krtíš"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Topľou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlaté Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Žarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Žiar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Žilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banskobystrický kraj"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislavský kraj"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Košický kraj"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitranský kraj"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Prešovský kraj"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trenčínský kraj"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnavský kraj"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Žilinský kraj"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefonní čísla musí být ve tvaru 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Vložte platné Turecké Identifikační číslo."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turecké Identifikační číslo musí obsahovat 11 číslic."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Zadejte poštovní směrovací číslo ve tvaru XXXXX nebo XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonní číslo musí být ve tvaru XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Zadejte platné osobní číslo (U.S. SSN) ve tvaru XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Vložte stát USA nebo teritorium."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stát v USA (dvě velká písmena)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Poštovní směrovací číslo v USA (dvě velká písmena)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonní číslo"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Vložte platné číslo CI ve tvaru X.XXX.XXX-X,XXXXXXX-X nebo XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Vložte platné číslo CI."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Zadejte platné jihoafrické identifikační číslo"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Zadejte platné jihoafrické poštovní směrovací číslo"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Východní Kapsko"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Svobodný stát"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Severní Kapsko"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Severozápadní provincie"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Západní Kapsko"
diff --git a/django/contrib/localflavor/locale/cy/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/cy/LC_MESSAGES/django.mo
deleted file mode 100644
index 61193a49f4..0000000000
Binary files a/django/contrib/localflavor/locale/cy/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/cy/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/cy/LC_MESSAGES/django.po
deleted file mode 100644
index 1568c36845..0000000000
--- a/django/contrib/localflavor/locale/cy/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3527 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Talaith U.D. (dwy briflythyren)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Rhif ffôn"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/da/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/da/LC_MESSAGES/django.mo
deleted file mode 100644
index b032b35e72..0000000000
Binary files a/django/contrib/localflavor/locale/da/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/da/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/da/LC_MESSAGES/django.po
deleted file mode 100644
index 5f8be6d6e2..0000000000
--- a/django/contrib/localflavor/locale/da/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3551 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Christian Joergensen <christian@gmta.info>, 2012.
-# Erik Wognsen <r4mses@gmail.com>, 2012.
-# Finn Gruwier <finn@gruwier.dk>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-#   <kristian@oellegaard.com>, 2012.
-# Kristian Øllegaard <kristian@oellegaard.com>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-20 07:36+0000\n"
-"Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
-"da/)\n"
-"Language: da\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Indtast et postnummer i formatet NNNN eller ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "I dette felt skal kun indtastes cifre."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Dette felt kræver 7 eller 8 cifre."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Indtast en gyldig CUIT i format XX-XXXXXXXX-X eller XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Ugyldig CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Lower Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Upper Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vienna"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Indtast et postnummer i formatet XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Indtast et gyldigt østrigsk sygesikringsnummer i format XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Indtast et firecifret postnummer."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australsk stat"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australsk postnummer"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australsk telefonnummer"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruxelles"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Østflandern"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamsk Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Vallonsk Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Vestflandern"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Hovedstadsregionen Bruxelles"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flamske region"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallonien"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Indtast et gyldigt postnummer i område og format 1XXX - 9xxx."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Indtast et gyldigt telefonnummer i et af formaterne 0x xxx xx xx, 0xx xx xx "
-"xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x . xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx eller 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Indtast et postnummer i formatet XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonnumre skal være i formatet XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Vælg en gyldig brasiliansk provins. Denne provins er ikke gyldig."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Ugyldigt CPF-nummer."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Dette felt kræver mindst 11 og højst 14 tegn."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Ugyldigt CNPJ-nummer."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "dette felt kræver mindst 14 cifre."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Indtast et postnummer i formatet XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Indtast et gyldigt canadisk sygesikringsnummer i formatet XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Indtast et svejtsisk identitets- eller pasnr. i format X1234567<0 eller "
-"1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Indtast en gyldig chilensk RUT"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Indtast en gyldig chilensk RUT. Formatet er XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Den chilenske RUT er ugyldig."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Indtast et postnummer i formatet XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "ID-kortnummer består af 15 eller 18 cifre."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Ugyldigt ID-kortnummer: Forkert kontrolsum"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Ugyldigt ID-kortnummer: Forkert fødselsdato"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Ugyldigt ID-kortnummer: Forkert lokationskode"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Indtast et gyldigt telefonnummer."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Indtast et gyldigt mobilnummer"
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prag"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Centrale Böhmen"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Sydlige Böhmen"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen-regionen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad-regionen"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti-regionen"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec-regionen"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec-regionen"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice-region"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina region"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Sydmoravien"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomuc-regionen"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin-regionen"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravien-Silesien"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Indtast et postnr. i format XXXXX eller XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Indtast et fødselsnr. i formatet XXXXXX/XXXX or XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Ugyldig værdi for køn. Gyldige værdier er 'f' og 'm'."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Indtast et gyldigt fødselsnummer."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Indtast et IC-nummer."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Indtast et postnummer i formatet XXXXX"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Indtast et tysk identiteskortsnr. i formatet XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearic Islands"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basque Country"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canary Islands"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile and Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Region of Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Indtast et gyldigt postnr. i området 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Indtast et gyldigt telefonnr. i et af disse formater: 6XXXXXXXX, 8XXXXXXXX, "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Indtast venligst gyldig NIF, NIE eller CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Indtast venligst gyldig NIF eller NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Ugyldig kontrolsum for NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Ugyldig kontrolsum for NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Ugyldig kontrolsum for CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Indtast venligst et gyldigt bankkontonr. i formatet XXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Ugyldig kontrolsum for bankkontonr."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Indtast et gyldigt finsk sygesikringsnummer."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonnumre skal være i formatet 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Indtast et gyldigt postnummer."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Northern Ireland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Walisisk"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Indtast et gyldigt 13-cifret JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Fejl i dato-segment"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Indtast et gyldigt 11-cifret OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Indtast et gyldigt bilnummer"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Indtast en gyldig lokationskode"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Tal-delen kan ikke være nul"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Indtast et gyldigt femcifret postnummer"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Indtast et gyldigt telefonnummer"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Indtast en gyldig område- eller mobilnetværkskode"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefonnummeret er for langt"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Indtast et gyldigt 19-cifret JMBAG startende med 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Kortudgivelsesnummer kan ikke være nul"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Indtast et gyldigt postnummer"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Indtast et gyldigt NIK/KTP-nummer."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Shigo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrol"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Indtast et postnummer i formatet XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Indtast et gyldigt ID-nummer."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Indtast et postnummer i formatet XXXXXX eller XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Indtast en indisk stat eller territorie."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Telefonnumre skal være angivet i 02X-8x, 03X-7X eller 04X-6X format."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Indtast et gyldigt islandsk identifikationsnr. Formatet er XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Det islandske identifikationsnummer er ikke gyldigt."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Indtast et gyldigt postnummer."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Indtast et gyldigt sygesikringsnummer."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Indtast et gyldigt momsnummer."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Indtast et gyldigt postnr. i formatet XXXXXXX eller XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Indtast et gyldigt kuwaitisk personnummer."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Identitetskortnummer skal indeholde enten mellem fire og syv cifre eller et "
-"stort bogstav og syv cifre"
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Dette felt burde indeholde præcis 13 cifre."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"De første syv cifre af UMCN'en skal repræsentere en gyldig dato i fortiden."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN'en er ikke gyldig."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Makedonsk identitetskort-nummer"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "En makedonsk kommune (2 bogstaver)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Unikt hovedborgernummer (13 tal)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Indtast et gyldigt postnummer angivet i formatet XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Indtast en gyldig RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Ugyldig kontrolsum for RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Indtast en gyldig CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Ugyldig kontrolsum for CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mexikansk stat (3 store bogstaver)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexikansk postnummer."
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexikansk RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexikansk CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Indtast et gyldigt postnummer"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Indtast et gyldigt SoFi-nummer"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Indtast et gyldigt norsk sygesikringsnummer."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Dette felt kræver 8 cifre."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Dette felt kræver 11 cifre."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Nationale identifikationsnumre kræver 11 cifre."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Forkert kontrolsum for nationalt identifikationsnummer."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Nationalt ID-kortnummer består af 3 bostaver og 6 tal"
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Forkert kontrolsum for det nationale ID-kortnummer."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Indtast et momsregistreringsnummer felt (NIP) angivet i formatet XXX-XXX-XX-"
-"XX, XXX-XX-XX-XXX eller XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Forkert kontrolsum for NIP. "
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "National Business Register Number (REGON) består af 9 eller 14 cifre."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Forkert kontrolsum for REGON-nr."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Indtast et postnummer i formatet XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Indtast et postnummer i formatet XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefonnumre skal have 9 cifre, eller starte med + eller 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Indtast et gyldigt CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Indtast et gyldigt CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Indtast et gyldigt IBAN i formatet ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefinnumre skal være i formatet XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Indtast et gyldigt postnummer i formatet XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Indtast et postnummer med formatet XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Indtast pasnummer i formatet XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Indtast pasnummer i formatet XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Central Federal County"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "South Federal County"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "North-West Federal County"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Far-East Federal County"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Siberian Federal County"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Ural Federal County"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Federal County"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "North-Caucasian Federal County"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Skt. Petersborg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Indtast et gyldigt svensk organisationsnummer."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Indtast et gyldigt svensk personnummer."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinationsnumre er ikke tilladt."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Indtast et svensk postnummer i formatet XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"De første 7 cifre i EMSOen skal representere en gyldig dato i fortiden."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "Denne EMSO er ugyldig."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-"Indtast et gyldigt momsregistreringsnummer angivet i formatet SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-"Indtast telefonnummer angivet i formatet +386 XXXXXXXX eller 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "nov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Slovakisk"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Fransk"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava region"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice region"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra region"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov region"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin region"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava region"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina region"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Indtast et postnummer i formatet XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefonnumre skal være i formatet 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Indtast et gyldigt tyrkisk identifikationsnummer."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Tyrkisk Identifikationsnummer skal være 11 cifre."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Indtast et postnr. i format XXXXX eller XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonnumre skal være i formatet XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Indtast et gyldigt U. S sygesikringsnummer i format XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Indtast en amerikansk stat."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stat (i USA, to store bogstaver)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "USA-postnummer (to store bogstaver)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Indtast et gyldigt CI-nummer i formatet X.XXX.XXX-X,XXXXXXX-X eller XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Indtast et gyldigt CI-nummer."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Indtast et gyldigt sydafrikansk sygesikringsnummer."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Indtast et gyldigt sydafrikansk postnummer."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/de/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/de/LC_MESSAGES/django.mo
deleted file mode 100644
index 3a6e2fa200..0000000000
Binary files a/django/contrib/localflavor/locale/de/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/de/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/de/LC_MESSAGES/django.po
deleted file mode 100644
index fdb45773a8..0000000000
--- a/django/contrib/localflavor/locale/de/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3567 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011, 2012.
-# Mark Raddatz <mraddatz@gmail.com>, 2011.
-#   <mraddatz@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-14 06:52+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
-"de/)\n"
-"Language: de\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Bitte eine gültige Postleitzahl im Format NNNN oder ANNNNAAA eingeben."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Dieses Feld darf nur Ziffern enthalten."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Dieses Feld benötigt 7 oder 8 Ziffern."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"Bitte eine gültige CUIT im Format XX-XXXXXXXX-X oder XXXXXXXXXXXX eingeben."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Ungültige CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Kärnten"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Niederösterreich"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Oberösterreich"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Steiermark"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Wien"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXXX eingeben."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Bitte eine gültige österreichische Sozialversicherungsnummer im Format XXXX "
-"XXXXXX eingeben."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Bitte eine 4-stellig Postleitzahl eingeben."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australischer Bundesstaat"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australisch Postleitzahl"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australisch Telefonnummer"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brüssel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Ostflandern"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flämisch-Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hennegau"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Lüttich"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namür"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Wallonisch-Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Westflandern"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Region Brüssel-Hauptstadt"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flandern"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonie"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Bitte eine gültige Postleitzahl im Format 1XXX bis 9XXX eingeben."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Bitte eine gültige Telefonnummer in einem der folgenden Formate eingeben 0x "
-"xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx."
-"xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx "
-"eingeben."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXXXX-XXX eingeben."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonnummern müssen das Format XX-XXXX-XXXX haben."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Bitte einen gültigen brasilianischen Bundesstaat auswählen."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Ungültige CPF-Nummer."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Dieses Feld benötigt mindestens 11 Ziffern oder 14 Zeichen."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Ungültige CNPJ-Nummer."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Dieses Feld benötigt mindestens 14 Ziffern"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXX XXX eingeben."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Bitte eine gültige kanadische Sozialversicherungsnummer im Format XXX-XXX-"
-"XXX eingeben."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Freiburg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genf"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubünden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Luzern"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zürich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Bitte eine gültige Schweizer Identifikations- oder Reisepassnummer im "
-"FormatX1234567<0 oder 1234567890 eingeben."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Bitte eine gültige chilenische RUT eingeben."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Bitte eine chilenische RUT im Format XX.XXX.XXX-X eingeben."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Diese chilenische RUT ist ungültig."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Bitte eine Postleitzahl im Format XXXXXX eingeben."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Die Ausweisnummer besteht aus 15 oder 18 Ziffern."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Ungültige Ausweisnummer: Falsche Prüfsumme"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Ungültige Ausweisnummer: Falsches Geburtsdatum"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Ungültige Ausweisnummer: Falsche Ortskennzahl"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Bitte eine gültige Telefonnummer eingeben."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Bitte eine gültige Handynummer eingeben."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prag"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Mittelböhmische Region"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Südböhmische Region"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Region Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Region Karlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Region Ústí"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Region Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Region Königgrätz"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Region Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Region Vysočina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Südmährische Region"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Region Olmütz"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Region Zlín"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Mährisch-Schlesische Region"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXXXX oder XXX XX eingeben."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Bitte eine Geburtsnummer im Format XXXXXX/XXXX oder XXXXXXXXXX eingeben."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Ungültiger Wert für Geschlecht, gültig sind: 'f' und 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Bitte eine gültige Geburtsnummer eingeben."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Bitte eine gültige IC-Nummer eingeben."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Württemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bayern"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Vorpommern"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Niedersachsen"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Nordrhein-Westfalen"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rheinland-Pfalz"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Sachsen"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Sachsen-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thüringen"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXXXX eingeben."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Bitte eine gültige deutsche Personalausweisnummer im Format XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X eingeben."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Balearische Inseln"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturien"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Kantabrien"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusien"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragonien"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Fürstentum Asturien"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearische Inseln"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskenland"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanarische Inseln"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastilien-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastilien-León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalonien"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicien"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foralgemeinschaft Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencia"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Bitte eine gültige Postleitzahl im Format 01XXX bis 52XXX eingeben."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Bitte eine gültige Telefonnummer in einem der folgenden Formate eingeben "
-"6XXXXXXXX, 8XXXXXXXX oder 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Bitte eine gültige NIF, NIE oder CIF eingeben."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Bitte eine gültige NIF oder NIE eingeben."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Ungültige Prüfsumme für NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Ungültige Prüfsumme für NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Ungültige Prüfsumme für CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Bitte eine gültige Kontonummer im Format XXXX-XXXX-XX-XXXXXXXXXX eingeben."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Ungültige Prüfsumme für Kontonummer."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Bitte eine gültige finnische Sozialversicherungsnummer eingeben."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonnummern müssen das Format 0X XX XX XX XX haben."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Bitte eine gültige Postleitzahl eingeben."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Nordirland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Schottland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Bitte eine gültige 13-stellige JMBG eingeben"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Fehler im Datums-Segment"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Bitte eine gültige 11-stellige OIB eingeben"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Bitte eine gültige Nummernschildnummer eingeben"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Bitte eine gültige Ortskennzahl eingeben"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Der Nummernteil darf nicht Null sein"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Bitte eine gültige 5-stellige Postleitzahl eingeben"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Bitte eine gültige Telefonnummer eingeben"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Geben Sie eine gültige Bereichs- oder Mobilfunknetz-Vorwahl ein"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Die Telefonnummer ist zu lang"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Geben Sie eine gültige 19-stellige JMBAG beginnend mit 601983 ein"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Die Ausstellungsnummer der Karte darf nicht Null sein"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Stadt Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Gespanschaft Bjelovar-Bilogora"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Gespanschaft Brod-Posavina"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Gespanschaft Dubrovnik-Neretva"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Gespanschaft Istrien"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Gespanschaft Karlovac"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Gespanschaft Koprivnica-Križevci"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Gespanschaft Krapina-Zagorje"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Gespanschaft Lika-Senj"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Gespanschaft Međimurje"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Gespanschaft Osijek-Baranja"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Gespanschaft Požega-Slawonien"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Gespanschaft Primorje-Gorski kotar"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Gespanschaft Sisak-Moslavina"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Gespanschaft Split-Dalmatien"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Gespanschaft Šibenik-Knin"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Gespanschaft Varaždin"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Gespanschaft Virovitica-Podravina"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Gespanschaft Vukovar-Syrmien"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Gespanschaft Zadar"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Gespanschaft Zagreb"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Bitte eine gültige Postleitzahl eingeben"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Bitte eine gültige NIK/KTP-Nummer eingeben."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Bundesregierung"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Bitte eine gültige Postleitzahl im Format XXXXX eingeben."
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Bitte eine gültige Ausweisnummer eingeben."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-"Bitte eine gültige Postleitzahl im Format XXXXXX oder XXX XXX eingeben."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Geben Sie einen indischen Bundesstaat oder Territorium ein."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Telefonnummern müssen im Format 02X-8X, 03X-7X oder 04X-6X sein."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Bitte eine gültige isländische Identifikationsnummer im Format XXXXXX-XXXX "
-"eingeben."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Die isländische Identifikationsnummer ist nicht gültig."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Bitte eine gültige Postleitzahl eingeben."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Bitte eine gültige Sozialversicherungsnummer eingeben."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Bitte eine gültige Umsatzsteuernummer eingeben."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-"Bitte eine gültige Postleitzahl im Format XXXXXXX oder XXX-XXXX eingeben."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaidō"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyōto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Ōsaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyōgo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Ōita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Bitte eine gültige Kuwaitische Identifikationsnummer eingeben"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Ausweisnummern muss entweder 4 bis 7 Ziffern oder einen Großbuchstaben und 7 "
-"Ziffern enthalten."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Dieses Feld sollte genau 13 Ziffern enthalten."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Die ersten 7 Ziffern der UMCN müssen ein gültiges Datum in der Vergangenheit "
-"darstellen."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "Die UMCN ist nicht gültig."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo und Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Mazedonische Ausweisnummer"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Eine mazedonischen Gemeinde (2 Zeichen-Code)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Eindeutige Bürger-Nummer (13 Ziffern)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXXXX eingeben."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Bitte gültige RFC eingeben."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Ungültige Prüfsumme für RFC-Nummer."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Bitte gültige CURP eingeben."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Ungültige Prüfsumme für CURP eingegeben."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mexikanischer Bundesstaat (dreistellige Abkürzung)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexikanische Postleitzahl"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexikanische RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexikanische CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Bitte eine gültige Postleitzahl eingeben"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Bitte eine gültige SoFi-Nummer eingeben"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drente"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Nordbrabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Nordholland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Südholland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Bitte eine gültige norwegische Sozialversicherungsnummer eingeben."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Dieses Feld benötigt 8 Zeichen."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Dieses Feld benötigt 11 Zeichen."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Nationale Identifikationsnummer besteht aus 11 Ziffern."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Falsche Prüfsumme für die nationale Identifikationsnummer."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Die nationale Ausweisnummer  besteht aus 3 Buchstaben und 6 Ziffern."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Falsche Prüfsumme für die nationale Ausweisnummer."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Bitte eine Steuernummer (NIP) im Format XXX-XXX-XX-XX, XXX-XX-XX-XXX oder "
-"XXXXXXXXXX eingeben."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Falsche Prüfsumme für die Steuernummer (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Nationale Geschäftsregistrierungsnummer (REGON) besteht aus 9 oder 14 "
-"Zeichen."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Falsche Prüfsumme für die nationale Geschäftsregistrierungsnummer (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XX-XXX eingeben."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Niederschlesien"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kujawien-Pommern"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Land Lebus"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Łódź"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Kleinpolen"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masowien"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Oppeln"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Karpatenvorland"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pommern"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Schlesien"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Heiligkreuz"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Ermland-Masuren"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Großpolen"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Vorpommern"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Bitte eine gültige Postleitzahl im Format XXXX-XXX eingeben."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Telefonnummern müssen aus 9 Ziffern bestehen, oder mit + oder 00 beginnen."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Bitte eine gültige CIF eingeben."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Bitte eine gültige CNP eingeben."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-"Bitte eine gültige IBAN im Format ROXX-XXXX-XXXX-XXXX-XXXX-XXXX eingeben."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonnummern müssen das Format XXXX-XXXXXX haben."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Bitte eine gültige Postleitzahl im Format XXXXXX eingeben"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Bitte eine Postleitzahl im Format XXXXXX eingeben."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Bitte eine Reisepassnummer im Format XXXX XXXXXX eingeben."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Bitte eine Reisepassnummer im Format XX XXXXXXX eingeben."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Föderationskreis Zentralrussland"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Föderationskreis Südrussland"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Föderationskreis Nordwestrussland"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Föderationskreis Ferner Osten"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Föderationskreis Sibirien"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Föderationskreis Ural"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Föderationskreis Wolga"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Föderationskreis Nordkaukasus"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskau"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Sankt Petersburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Oblast Moskau"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Republik Adygeja"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Republik Baschkortostan"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Republik Burjatien"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Republik Altai"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Republik Dagestan"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Republik Inguschetien"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarische Republik"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Republik Kalmückien"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karatschai-Tscherkessische Republik"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Republik Karelien"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Republik Komi"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Republik Mari El"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Republik Mordwinien"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Republik Sacha (Jakutien)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Republik Nordossetien-Alanien"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Republik Tatarstan"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Republik Tuwa"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtische Republik"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Republik Chakassien"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Tschetschenische Republik"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Tschuwaschische Republik"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Region Altai"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Region Transbaikalien"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Region Kamtschatka"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Region Krasnodar"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Region Krasnojarsk"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Region Perm"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Region Primorje"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Region Stawropol"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Region Chabarowsk"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Oblast Amur"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Oblast Archangelsk"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Oblast Astrachan"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Oblast Belgorod"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Oblast Brjansk"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Oblast Wladimir"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya Oblast '"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Oblast Wolgograd"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Oblast Woronesch"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Oblast Iwanowo"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Oblast Irkutsk"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Oblast Kaliningrad"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Oblast Kaluga"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Oblast Kemerowo"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Oblast Kirow"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Oblast Kostroma"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Oblast Kurgan"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Oblast Kursk"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Oblast Leningrad"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Oblast Lipezk"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Oblast Magadan"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Oblast Murmansk"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Oblast Nischni Nowgorod"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Oblast Nowgorod"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Oblast Nowosibirsk"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Oblast Omsk"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Oblast Orenburg"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Oblast Orjol"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Oblast Pensa"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Oblast Pskow"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Oblast Rostow"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Oblast Rjasan"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Oblast Samara"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Oblast Saratow"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Oblast Sachalin"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Oblast Swerdlowsk"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Oblast Smolensk"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Oblast Tambow"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Oblast Twer"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Oblast Tomsk"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Oblast Tula"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Oblast Tjumen"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Oblast Uljanowsk"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Oblast Tscheljabinsk"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Oblast Jaroslawl"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Jüdische Autonome Oblast"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Autonomer Kreis der Nenzen"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Autonomer Kreis der Chanten und Mansen - Jugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Autonomer Kreis der Tschuktschen"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Autonomer Kreis der Jamal-Nenzen"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Bitte eine gültige Schwedische Organisationsnummer eingeben."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Bitte eine gültige schwedische Personenidentifikationsnummer eingeben."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Ordnungsnummern sind nicht erlaubt."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Bitte eine gültige schwedische Postleitzahl im Format XXXXX eingeben."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"Die ersten 7 Stellen der EMSO Ziffer muss einem vergangenen Datum "
-"entsprichen. "
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO ungültig."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Bitte eine gültige Steuernummer im Format SIXXXXXXXX eingeben"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Bitte eine Telefonnummer im Format +386XXXXXXXX or 0XXXXXXXX eingeben."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banská Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banská Štiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Bánovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytča"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Čadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolný Kubín"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajská Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenné"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kežmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucké Nové Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoča"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovský Mikuláš"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lučenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Námestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nové Mesto nad Váhom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nové Zámky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizánske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piešťany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltár"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Považská Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Prešov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Púchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revúca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rožňava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ružomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spišská Nová Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stará Ľubovňa"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidník"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topoľčany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebišov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trenčín"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turčianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdošín"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Veľký Krtíš"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Topľou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Žarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Žiar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Žilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banská Bystrica Region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislavský kraj"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Prešov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trenčín"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Žilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Geben Sie eine Postleitzahl im Format XXXXX ein."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefonnummern müssen im Format 0XXX XXX XXXX sein."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Geben Sie eine valide Türkische Identifikationsnummer ein."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Türkische Identifikationsnummern benötigen 11 Zeichen."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-"Bitte eine gültige Postleitzahl im Format XXXXX oder XXXXX-XXXX eingeben."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonnummern müssen das Format XXX-XXX-XXXX haben."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Bitte eine gültige US-amerikanische Sozialversicherungsnummer im Format XXX-"
-"XX-XXXX eingeben."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Geben Sie einen US-Bundesstaat oder Territorium ein."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S.-Bundesstaat (zwei Großbuchstaben)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "US-Postleitzahl (zwei Großbuchstaben)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Bitte eine gültige CI im Format X.XXX.XXX-X,XXXXXXX-X oder XXXXXXXX eingeben."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Bitte eine gültige CI-Nummer eingeben."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Bitte eine gültige südafrikanische Identifikationsnummer eingeben"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Bitte eine gültige südafrikanische Postleitzahl eingeben"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Ostkap"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Freistaat"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Nordkap"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Nordwest"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Westkap"
diff --git a/django/contrib/localflavor/locale/el/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/el/LC_MESSAGES/django.mo
deleted file mode 100644
index 20078ffe5e..0000000000
Binary files a/django/contrib/localflavor/locale/el/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/el/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/el/LC_MESSAGES/django.po
deleted file mode 100644
index ccba8da991..0000000000
--- a/django/contrib/localflavor/locale/el/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3556 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Dimitris Glezos <glezos@indifex.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Yorgos Pagles <y.pagles@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Yorgos Pagles <y.pagles@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
-"el/)\n"
-"Language: el\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Εισαγάγετε έναν ταχυδρομικό κώδικα σε μορφή NNNN ή ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Αυτό το πεδίο απαιτεί μόνο αριθμούς."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Αυτό το πεδίο απαιτεί 7 ή 8 ψηφία."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Εισάγετε έγκυρο CUIT στη μορφή ΧΧ-XXXXXXXX-X ή XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Λανθασμένο CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Μπούργκενλαντ"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Καρινθία"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Κάτω Αυστρία"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Άνω Αυστρία"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Σάλτσμπουργκ"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Στυρία"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Τυρόλο"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Βιέννη"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Πληκτρολογήστε έναν ταχυδρομικό κωδικό στο ΧΧΧΧ μορφή."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Εισάγετε έναν έγκυρθ αυστριακό Αριθμό Κοινωνικής Ασφάλισης στη μορφή XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Αμβέρσα"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Βρυξέλλες"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Ανατολική Φλάνδρα"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Φλαμανδική Μπραμπάντ"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Λιέγη"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Λουξεμβούργο"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Ουαλονική/Βαλλονική Μπραμπάντ"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Δυτική Φλάνδρα"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Περιφέρεια Βρυξελλών Capital"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Περιφέρεια της Φλάνδρας"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Βαλλονία - γαλλόφωνο Βέλγιο"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα με εύρος και μορφή 1xxx - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Εισάγετε έναν έγκυρο αριθμό τηλεφώνου σε μία από τις μορφές 0x xxx xx xx, "
-"0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x."
-"xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Πληκτρολογήστε έναν ταχυδρομικό κώδικα σε μορφή ΧΧΧΧΧ-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Οι αριθμοί τηλεφώνου πρέπει να έχουν μορφή XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Επιλέξτε μια έγκυρη βραζιλιάνικη πριφέρεια. Το όνομα της περιφέρειας αυτής "
-"δεν είναι έγκυρο."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Ο αριθμός CPF δεν είναι έγκυρος."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Αυτό το πεδίο απαιτεί το πολύ 11 ψηφία ή 14 χαρακτήρες."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Ο αριθμός CNPJ δεν είναι έγκυρος."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Αυτό το πεδίο απαιτεί τουλάχιστον 14 ψηφία"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Εισαγάγετε έναν ταχυδρομικό κώδικα με τη μορφή ΧΧΧ ΧΧΧ."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Εισάγετε έναν έγκυρο καναδικό αριθμό κοινωνικής ασφάλισης στη μορφή ΧΧΧ-ΧΧΧ."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Βέρνη"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Φράιμπουργκ"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Γενεύη"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Λουκέρνη"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Σεντ Γκάλεν"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Ζυρίχη"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Εισάγετε έναν έγκυρο αριθμό ελβετικής ταυτότητας ή διαβατηρίου με μορφή "
-"X1234567<0 ή 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Εισάγετε ένα έγκυρο αριθμό RUT Χιλής."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Εισάγετε ένα έγκυρο αριθμό RUT Χιλής. Η μορφή του είναι XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Αυτός ο αριθμός RUT Χιλής δεν είναι έγκυρος. "
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Πράγα"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Κεντρική Περιφέρεια Βοημίας"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Περιφέρεια Νοτίου Βοημίας"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Περιφέρεια Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Περιφέρεια Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Περιφέρεια Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Περιφέρεια Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Περιφέρεια Χράντεκ"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Περιφέρεια Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Περιφέρεια Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Περιφέρεια Νότιας Μοραβίας"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Περιφέρεια Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Περιφέρεια Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Περιφέρεια Μοραβίας-Σιλεσίας"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Εισαγάγετε έναν ταχυδρομικό κώδικα σε μορφή XXXXX ή XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Πληκτρολογήστε έναν αριθμό γέννησης με τη μορφή XXXXXX / XXXX ή XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Μη έγυρη επιλογή για την προεραιτική παράμετρο \"Φύλο\". Έγκυρες επιλογές "
-"είναι 'f' για αρσνικό και 'm' για θυληκό."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Πληκτρολογήστε έναν έγκυρο αριθμό γέννησης."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Πληκτρολογήστε έναν έγκυρο αριθμό IC."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Βαυαρία"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Βερολίνο"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Βραδεμβούργο"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Βρέμη"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Αμβούργο"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Έσσεν"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Μεκλεμβούργο-Δυτική Προπομερανία"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Κάτω Σαξονία"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Βόρεια Ρηνανία-Βεστφαλία"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Ρηνανία-Παλατινάτο"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Σάαρλαντ"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Σαξωνία"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Σαξονία-Άνχαλτ"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Θουριγγία"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Πληκτρολογήστε έναν ταχυδρομικό κωδικό στο XXXXX σχήμα."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Πληκτρολογήστε έναν έγκυρο γερμανικό αριθμό ταυτότητας με μορφή XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Αλμπαθέτε"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Αλμερία"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Βαλεαρίδες Νήσοι"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Βαρκελώνη"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Καντίζ"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Κόρδοβα"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Γρανάδα"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Γκουανταλαχάρα"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Ουέλβα"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Μαδρίτη"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Μάλαγα"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Μούρθια"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Ναβάρα"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ουρένσε"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Αστούριας"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Λας Πάλμας"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Σαλαμάνκα"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Σάντα Κρούζ Τενερίφης"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Σεβίλλη"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Σόρια"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Ταραχόνα"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Τολέδο"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Βαλένθια"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Βαγιαδολίδ"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Βισκάια"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Ζαμόρα"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Σαραγόσα"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Θέουτα"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Μελίλια"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Ανδαλουσία"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Πριγκιπάτο της Αστούριας"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Βαλεαρίδες Νήσοι"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Χώρα των Βάσκων"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Κανάριοι Νήσοι"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilla-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Καστίλλη και Λεόν"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Καταλονία"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Εξτρεμαδούρα"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Γαλικία"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Περιφέρεια της Μούρθια"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Κοινότητας Foral της Ναβάρρας"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Κοινότητα της Βαλένθια"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-"Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα με εύρος και μορφή 01XXX  - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Πληκτρολογήστε έναν έγκυρο αριθμό τηλεφώνου μία από τις μορφές 6XXXXXXXX, "
-"8XXXXXXXX ή 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Παρακαλώ εισάγετε έναν έγκυρο αριθμό NIF, ΝΙΕ ή CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Παρακαλώ εισάγετε έναν έγκυρο αριθμό NIF ή ΝΙΕ."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Ο αριθμός NIF δεν επαληθεύεται."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Ο αριθμός NIE δεν επαληθεύεται."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Ο αριθμός CIF δεν επαληθεύεται."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Πρακαλούμε εισάγετε έναν έγκυρο αριθμό τραπεζικού λογαριασμού σε μορφή ΧΧΧΧ-"
-"ΧΧΧΧ-ΧΧ-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Ο αριθμός τραπεζικού λογαριασμού δεν επαληθεύεται."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Εισάγετε έναν έγκυρο φινλανδικό αριθμό μητρώου κοινωνικής ασφάλισης."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Οι αριθμοί τηλεφώνου πρέπει να είναι σε μορφή 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Εισάγετε ένα έγκυρο ταχυδρομικό κώδικα."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Μπεντφορντσάιρ"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Μπακινγκχαμσάιρ"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Κορνουάλη και νήσοι Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Ντερμπυσάιρ"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Ντέβον"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Ντόρσετ"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Ντάρχαμ"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Ανατολικό Σάσεξ"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Έσσεξ"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Ευρύτερο Λονδίνο"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Ευρύτερο Μάντσεστερ"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Χάμπσάιρ"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Χαρτφορντσάιρ"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Κέντ"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Μερσερσάιντ"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Νόρφολκ"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Βόρειο Γιόρκσαϊρ"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Νόρθχαμπτονσαϊρ"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Νότιγχαμσαϊρ"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Όξφορντσαϊρ"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Σόμερσετ"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Νότιο Γιόρκσαϊρ"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Στάφορντσαϊρ"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Σάφολκ"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Σάρεϊ"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Γουόργουικσαϊρ"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Δυτικό Σάσεξ"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Δυτικό Γιόρκσαϊρ"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Επαρχία Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Επαρχία Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Επαρχία Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Επαρχία Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Κεντρικό Γκλαμόργκαν"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Νότιο Γκλαμόργκαν"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Δυτικό Γκλαμόργκαν"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Μπόρντερς"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Κεντρική Σκωτία"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Ντάμφρις και Γκάλοουέι"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Φλογέρα"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Χάιλαντ"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Αγγλία"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Βόρεια Ιρλανδία"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Σκωτία"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Ουαλία"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Εισάγετε έναν έγυρο αριθμό πινακίδας οχήματος."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Εισάγετε έναν έγκυρο αριθμό τηλεφώνου"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Εισάγετε έναν έγκυρο αριθμό ΝΙΚ/KTP"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Ατσέ"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Μπαλί"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Μπενγκουλού"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Τζακάρτα"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Γκοροντάλο"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Μαλούκου"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Παπούα"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Παπούα Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Σώμα Προξενείων"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Διπλωματικό Σώμα"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Daratan Utara"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Kepulauan Utara"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Σουραμπάγια"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Ομοσπονδιακή κυβέρνηση"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Δουβλίνο"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Λόνγκφορντ"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Εισαγάγετε έναν ταχυδρομικό κώδικα σε μορφή XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Πληκτρολογήστε έναν έγκυρο αριθμό ταυτότητας."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Εισάγετε έναν έγκυρο αριθμό ισλανδικής ταυτότητας. Η μορφή είναι XXXXXX-ΧΧΧΧ."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Μη έγκυρος αριθμός ισλανδικής ταυτότητας. "
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Πληκτρολογήστε έναν έγκυρο αριθμό Κοινωνικής Ασφάλισης."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Πληκτρολογήστε έναν έγκυρο αριθμό ΦΠΑ."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Εισαγάγετε έναν ταχυδρομικό κώδικα σε μορφή XXXXXXX ή XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Αομόρι"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Ακίτα"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Γιαμαγκάτα"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Φουκουσίμα"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Σαϊτάμα"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Τσίμπα"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Τόκιο"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Γιαμανάσι"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Ναγκάνο"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Νιιγκάτα"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Τογιάμα"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ισικάουα"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Φουκούι"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Σιζουόκα"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Κιότο"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Οσάκα"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Χιροσίμα"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Γιαμαγκούτσι"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Κότσι"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Φουκουόκα"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Ναγκασάκι"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Κουμαμότο"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Οϊτά"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Μιγιαζάκι"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Καγκοσίμα"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Οκινάουα"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Εισάγετε έναν έγκυρο αριθμό ταυτότητας Κουβέιτ."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Τσιουάουα"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Πληκτρολογήστε έναν έγκυρο αριθμό SoFi"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Ντρέντε"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Γκρόνινγκεν"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Ουτρέχτη"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Εισάγετε έναν έγκυρο νορβηγικό αριθμό μητρώου κοινωνικής ασφάλισης."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Αυτό το πεδίο απαιτεί 8 ψηφία."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Αυτό το πεδίο απαιτεί 11 ψηφία."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Ο Αριθμός Ταυτότητας αποτελείται από 11 ψηφία."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Ο Αριθμός Ταυτότητας δεν επαληθεύεται"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Ο αριθμό φορολογικού μητρώου (ΑΦΜ) δεν επαληθεύεται."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Ο Αριθμός Εθνικού Μητρώου Επιχειρήσεων (REGON) αποτελείται από 9 ή 14 ψηφία."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Ο Αριθμός Εθνικού Μητρώου Επιχειρήσεων (REGON) δεν επαληθεύεται."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Εισαγάγετε έναν ταχυδρομικό κώδικα με τη μορφή XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Κάτω Σιλεσία"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Πομερανίας"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Πομερανία"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Δυτική Πομερανία"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Πληκτρολογήστε έναν ταχυδρομικό κώδικα σε μορφή ΧΧΧΧ-ΧΧΧ."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Οι αριθμοί τηλεφώνου πρέπει να έχουν 9 ψηφία, ή να αρχίζουν με + ή 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Εισάγετε έναν έγκυρο αριθμό CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Εισάγετε έναν έγκυρο αριθμό CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-"Εισάγετε έναν έγκυρο αριθμό IBAN με μορφή ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Οι αριθμοί τηλεφώνου πρέπει να έχουν μορφή XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα με τη μορφή XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Εισάγετε έγκυρο αριθμό Σουηδικής οργάνωσης."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Εισάγετε έναν έγκυρο Σουηδικό αριθμό ταυτότητας."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Δεν επιτρέπονται αριθμοί συντονισμού (coordination numbers)"
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Εισάγετε ένα σουηδικό ταχυδρομικό κώδικα στην μορφή XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Στοκχόλμη"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Ουψάλα"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Bánovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Μπρατισλάβα Ι"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Μπρατισλάβα ΙΙ"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Μπρατισλάβα ΙΙΙ"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Μπρατισλάβα IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Μπρατισλάβα V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Γιέλνιτσα"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Κόσιτσε Ι"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Κόσιτσε ΙΙ"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Κόσιτσε ΙΙΙ"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Κόσιτσε IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Κόσιτσε - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Námestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Váhom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rožňava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Στρόπκοβ"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Περιφέρεια Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Περιφέρεια Μπρατισλάβας"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Περιφέρεια Κόσιτσε"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Περιφέρεια Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Περιφέρεια Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Περιφέρεια Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Περιφέρεια Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Περιφέρεια της Ζίλινα"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Εισαγάγετε έναν ταχυδρομικό κώδικα στη μορφή XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Οι αριθμοί τηλεφώνου πρέπει να είναι στη μορφή 0XXX ΧΧΧ ΧΧΧΧ."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Εισάγετε ένα έγκυρο τουρκικό αριθμός ταυτότητας."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Ο Τουρκικός αριθμός ταυτότητας είναι 11 ψηφία."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Πληκτρολογήστε έναν ταχυδρομικό κώδικα σε μορφή XXXXX ή XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Οι αριθμοί τηλεφώνου πρέπει να έχουν μορφή ΧΧΧ-ΧΧΧΧ."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Εισάγετε έναν έγκυρο αριθμό Κοινωνικής Ασφάλισης Η.Π.Α με μορφή XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Εισάγετε μια πολιτεία των Η.Π.Α. ή επικράτεια."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Πολιτεία ΗΠΑ. (δύο κεφαλαία γράμματα)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Ταχυδρομικός κώδικας Η.Π.Α. (δύο κεφαλαία γράμματα)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Αριθμός τηλεφώνου"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Πληκτρολογήστε έναν έγκυρο αριθμό CI σε μορφή X.XXX.XXX-X, XXXXXXX-X ή "
-"XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Πληκτρολογήστε έναν έγκυρο αριθμό CI."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Εισάγετε έναν έγκυρο αριθμό ταυτότητας Νοτίου Αφρικής."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα Νοτίου Αφρικής."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Ανατολικό Ακρωτήρι"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Βόρειο Ακρωτήριο"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Βορειοδυτική"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Δυτικό Ακρωτήριο"
diff --git a/django/contrib/localflavor/locale/en/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/en/LC_MESSAGES/django.mo
deleted file mode 100644
index 4f431ef8a1..0000000000
Binary files a/django/contrib/localflavor/locale/en/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
deleted file mode 100644
index ffccefdfbc..0000000000
--- a/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3546 +0,0 @@
-# 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: 2012-10-15 10:57+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
-"Language-Team: English <en@li.org>\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: ar/forms.py:84
-msgid "Invalid legal type. Type must be 27, 20, 23 or 30."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:47 us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: ca/forms.py:69
-msgid "Enter a Canadian province or territory."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:37
-msgid "Phone numbers must be in 0XX XXX XX XX format."
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:102
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Araba"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hk/forms.py:37
-#, python-format
-msgid "Phone number should not start with one of the followings: %s."
-msgstr ""
-
-#: hk/forms.py:40
-#, python-format
-msgid "Phone number must be in one of the following formats: %s."
-msgstr ""
-
-#: hk/forms.py:42
-#, python-format
-msgid "Phone number should start with one of the followings: %s."
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:77
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:33
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:34
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:32
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:51
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:27
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:92
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:93
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:67
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:110
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:111
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:191
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:192
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:45
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:19
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:39
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:22
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:59
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:143
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:175
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:200
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:36
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:22
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:56
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/en_GB/LC_MESSAGES/django.mo
deleted file mode 100644
index 4dba2ddb26..0000000000
Binary files a/django/contrib/localflavor/locale/en_GB/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/en_GB/LC_MESSAGES/django.po
deleted file mode 100644
index a3f472c8f1..0000000000
--- a/django/contrib/localflavor/locale/en_GB/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3544 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Ross Poulton <ross@rossp.org>, 2011, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-12 23:53+0000\n"
-"Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
-"django/language/en_GB/)\n"
-"Language: en_GB\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Enter a postal code in the format NNNN or ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "This field requires only numbers."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "This field requires 7 or 8 digits."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Invalid CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Lower Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Upper Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vienna"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Enter a zip code in the format XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Enter a 4 digit postcode."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australian State"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australian Postcode"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australian Phone number"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerp"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brussels"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "East Flanders"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flemish Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "West Flanders"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brussels Capital Region"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flemish Region"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Enter a valid postal code in the range and format 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Enter a zip code in the format XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Phone numbers must be in XX-XXXX-XXXX format."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Invalid CPF number."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "This field requires at most 11 digits or 14 characters."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Invalid CNPJ number."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "This field requires at least 14 digits"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Enter a postal code in the format XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Enter a valid Chilean RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "The Chilean RUT is not valid."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Enter a post code in the format XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "ID Card Number consists of 15 or 18 digits."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Invalid ID Card Number: Wrong checksum"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Invalid ID Card Number: Wrong birthdate"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Invalid ID Card Number: Wrong location code"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Enter a valid phone number."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Enter a valid cell number."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prague"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Central Bohemian Region"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "South Bohemian Region"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen Region"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad Region"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti Region"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec Region"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Region"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice Region"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina Region"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "South Moravian Region"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc Region"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin Region"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravian-Silesian Region"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Enter a postal code in the format XXXXX or XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Enter a valid birth number."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Enter a valid IC number."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Enter a zip code in the format XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearic Islands"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basque Country"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canary Islands"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile and Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Region of Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Enter a valid postal code in the range and format 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Please enter a valid NIF, NIE, or CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Please enter a valid NIF or NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Invalid checksum for NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Invalid checksum for NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Invalid checksum for CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Invalid checksum for bank account number."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Enter a valid Finnish social security number."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Phone numbers must be in 0X XX XX XX XX format."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Enter a valid postcode."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Northern Ireland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Enter a valid 13 digit JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Error in date segment"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Enter a valid 11 digit OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Enter a valid vehicle license plate number"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Enter a valid location code"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Number part cannot be zero"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Enter a valid 5 digit postal code"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Enter a valid phone number"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Enter a valid area or mobile network code"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "The phone number is too long"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Enter a valid 19 digit JMBAG starting with 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Card issue number cannot be zero"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Enter a valid post code"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Enter a valid NIK/KTP number"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Enter a postal code in the format XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Enter a valid ID number."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Enter a zip code in the format XXXXXX or XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Enter an Indian state or territory."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "The Icelandic identification number is not valid."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Enter a valid zip code."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Enter a valid Social Security number."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Enter a valid VAT number."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Enter a valid Kuwaiti Civil ID number"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "This field should contain exactly 13 digits."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "The first 7 digits of the UMCN must represent a valid past date."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "The UMCN is not valid."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Macedonian identity card number"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "A Macedonian municipality (2 character code)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Unique master citizen number (13 digits)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Enter a valid zip code in the format XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Enter a valid RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Invalid checksum for RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Enter a valid CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Invalid checksum for CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mexico state (three uppercase letters)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexico zip code"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexican RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexican CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Enter a valid postal code"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Enter a valid SoFi number"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Enter a valid Norwegian social security number."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "This field requires 8 digits."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "This field requires 11 digits."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "National Identification Number consists of 11 digits."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Wrong checksum for the National Identification Number."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "National ID Card Number consists of 3 letters and 6 digits."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Wrong checksum for the National ID Card Number."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Wrong checksum for the Tax Number (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "National Business Register Number (REGON) consists of 9 or 14 digits."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Wrong checksum for the National Business Register Number (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Enter a postal code in the format XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Enter a zip code in the format XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Phone numbers must have 9 digits, or start by + or 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Enter a valid CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Enter a valid CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Phone numbers must be in XXXX-XXXXXX format."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Enter a valid postal code in the format XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Enter a postal code in the format XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Enter a passport number in the format XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Enter a passport number in the format XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Central Federal County"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "South Federal County"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "North-West Federal County"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Far-East Federal County"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Siberian Federal County"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Ural Federal County"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Federal County"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "North-Caucasian Federal County"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Enter a valid Swedish organisation number."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Enter a valid Swedish personal identity number."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Co-ordination numbers are not allowed."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Enter a Swedish postal code in the format XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "The first 7 digits of the EMSO must represent a valid past date."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "The EMSO is not valid."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Enter a valid tax number in form SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava region"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice region"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra region"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov region"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin region"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava region"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina region"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Enter a postal code in the format XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Phone numbers must be in 0XXX XXX XXXX format."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Enter a valid Turkish Identification number."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turkish Identification number must be 11 digits."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Phone numbers must be in XXX-XXX-XXXX format."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Enter a U.S. state or territory."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. state (two uppercase letters)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "U.S. postal code (two uppercase letters)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Phone number"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Enter a valid CI number."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Enter a valid South African ID number"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Enter a valid South African postal code"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/eo/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/eo/LC_MESSAGES/django.mo
deleted file mode 100644
index 4b0fef3411..0000000000
Binary files a/django/contrib/localflavor/locale/eo/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/eo/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/eo/LC_MESSAGES/django.po
deleted file mode 100644
index 1ff986a74d..0000000000
--- a/django/contrib/localflavor/locale/eo/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3543 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jaffa McNeill <jaffa.mcneill@gmail.com>, 2012.
-#   <kristjan.schmidt@googlemail.com>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jaffa McNeill <jaffa.mcneill@gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
-"language/eo/)\n"
-"Language: eo\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Enigu poŝtan kodon en la formato NNNN aŭ ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Ĉi tiu kampo bezonas sole nombrojn."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Ĉi tiu kampo bezonas 7 aŭ 8 ciferoj."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Enigu validan CUIT en XX-XXXXXXXX-X aŭ XXXXXXXXXXXX formato."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Malvalida CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenlando"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Karintio"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Malsupra Aŭstrujo"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Supra Aŭstrujo"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salcburgo"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Stirio"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirolo"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlbergo"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vieno"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Enigu poŝtan kodon en la formato XXXX"
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Enigu validan Aŭstran Socialasekuran numeron en XXXX XXXXXX formato."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Enigu 4 ciferon postkodon."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Aŭstralia ŝtato"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Aŭstralia Posta Kodo"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Aŭstralia Telefonnumero"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antverpeno"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruselo"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Orienta Flandrio"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flandra Brabanto"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Henegovio"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Lieĝo"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburgo"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luksemburgio"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namuro"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Valona Brabanto"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Okcidenta Flandrio"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Bruselo Ĉefurbo Regiono"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flandra Regiono"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonio"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Enigu validan poŝtan kodon en la variado kaj formato 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Enigu validan telefonnumeron en unu el la formatoj 0x xxx xx xx, 0xx xx xx "
-"xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, "
-"0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Enigu poŝtan kodon en la formato XXXXX-XXX"
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonnumeroj devas esti en la formato XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Elektu validan brazilan staton. Kiu stato ne estas unu el la haveblaj statoj."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Nevalida CPF numero"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Ĉi tiu kampo bezonas maksimume 11 ciferojn aŭ 14 karakterojn."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Nevalida CNPJ numero."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Ĉi tiu kampo bezonas almenaŭ 14 ciferojn"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Enigu poŝtan kodon en la formato XXX XXX"
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Enigu validan Kanadan Socian Asekuron nombron en XXX-XXX-XXX formato."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Argovio"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Apencelo Interna"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Apencelo Ekstera"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Bazelo-Stado"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Bazelo-Lando"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berno"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Friburgo"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ĝenevo"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glaruso"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graŭbendeno"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Juro"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerno"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuŝatelo"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidvaldo"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obvaldo"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Ŝafhaŭzo"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Ŝvico"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Soloturno"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Sankt-Galo"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Turgovio"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Tiĉino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Urio"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valezo"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaŭdo"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zugo"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zuriko"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Enigu validan Svisan identecon aŭ pasporton karton nombro laŭ formato "
-"X1234567<0 aŭ 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Enigu validan Ĉilian RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Enigu validan Ĉilian RUT. La formato estas XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "La Ĉilia RUT ne estas valida."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Enigu postan kodon laŭformate XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Identiga Karta Nombro konsistas el 15 aŭ 18 ciferoj."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Nevalida Identiga Karta Nombro: Malĝusta kontrolsumo"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Nevalida Identiga Karta Nombro: Malĝusta naskiĝodato"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Nevalida Identiga Karta Nombro: Malĝusta loka kodo"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Enigu validan Telefonnumeron"
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Enigu validan poŝtelefonnumeron"
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prago"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Mezbohemia regiono"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Sudbohemia regiono"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Regiono Pilseno"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Regiono Karlsbado"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Regiono Ustio"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Regiono Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Regiono Hradeco"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubico regiono"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Regiono Vysočina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Sudmoravia regiono"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc-regiono"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Regiono Zlín"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moraviasilezia regiono"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Enigu poŝtan kodon laŭ la formato XXXXX aŭ XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Enigu naskiĝon nombron laŭ la formato  XXXXXX/XXXX aŭ XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Nuligita laŭvola parametro Sekso, validaj valoroj estas 'f' kaj 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Enigu validan naskiĝon nombron."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Enigu validan IC nombron."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Virtembergo"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavario"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlino"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburgo"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremeno"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburgo"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hesio"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Meklenburg-okcidenta Pomerio"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Malsupra Saksio"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Nordrejn-Vestfalio"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rejnlando-Palatino"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Sarlando"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saksio"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saksio-Anhalto"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Ŝlesvigo-Holstinio"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Turingio"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Enigu poŝtan kodon laŭformate XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Enigu validan Germanan identigan karton nombron laŭformate  XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Aravo"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albaketo"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alikanto"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almerio"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avilo "
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badaĥozo"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Balearoj"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelono "
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgoso"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cakereso"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Kadizo"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Kastelo"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Kjudad Realo"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Kordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "Korunjo"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Kuenco"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Ĝirono"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granado"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Gvadalaharo"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Gipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Onubo"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Uesko"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Ĥaeno"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leono"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Ilerdo"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "Rioĥo"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrido"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malago"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcio"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navaro"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orenso"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturio"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencio"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmaso"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedro"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanco"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Sant-Kruzo de Tenerifo"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Kantabrio"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovio"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilo"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Sorio"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Taragono"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruelo"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencio"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valadolido"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biskajo"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamoro"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragozo"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceŭto"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilo"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andaluzio"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragono"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Princlando de Asturio"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "La Balearoj"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Eŭskio"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "La Kanaraj insuloj"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastilio-Manĉo"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastilio kaj leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalunio"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Ekstremaduro"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galegio"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Regiono de Murcio"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Luita Komunuma de Navaro"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencia komunumo"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Enigu validan poŝtan kodon en la gamo kaj formato 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Enigu validan telefonnumeron laŭformate 6XXXXXXXX, 8XXXXXXXX aŭ 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Bonvolu enigu validan NIF, NIE, aŭ CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Bonvolu enigu validan NIF aŭ NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Nevalida kontrolsumo por NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Nevalida kontrolsumo por NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Nevalida kontrolsumo por CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Bonvolu enigu validan bankokonton nombron laŭformate  XXXX-XXXX-XX-"
-"XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Nevalida kontrolsumo por bankokonto nombro."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Enigu validan Finnan socialasekuran numeron."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonnumeroj devus esti formate 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Enigu validan poŝtan kodon."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordŝiro"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Bukinghamŝiro"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Ĉeŝiro"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Kornvalo kaj Insuloj de Silio"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Kumbrio"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbiŝiro"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devono"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorseto"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durhamo"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Orienta Susekso"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Esekso"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Glosterŝiro"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Granda Londono"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Granda Manĉestro"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampŝiro"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordŝiro"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kento"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lankaŝiro"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Lesterŝiro"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Linconŝiro"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Mersiflanko"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfoko"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Norda Jorkŝiro"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Nordhamptonŝiro"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Nordhumberlando"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Notinghamŝiro"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oksfordŝiro"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Ŝropŝiro"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerseto"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Suda Jorkŝiro"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Stafordŝiro"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Sufoko"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surejo"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tijno kaj Viero"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Varvikŝiro"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Okcidenta Mezlando"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Okcidenta Susekso"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Okcidenta Jorkŝiro"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Viltŝiro"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Vorĉesterŝiro"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Distrikto Antrimo"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Distrikto Armao"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Distrikto Doŭno"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Distrikto Fermano"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Distrikto Londonderio"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Distrikto Tirono"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clujido"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Difedo"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gŭento"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gŭinedo"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Meza Glamorgano"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Poŭiso"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Suda Glamorgano"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Okcidenta Glamorgano"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Landlimoj"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Meza Skotlando"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfrizo kaj Galovajo"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fifo"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampiano"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Altlando"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lotiano"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orknija Insuloj"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Ŝetlando Insuloj"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Stratklido"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tajflanko"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Okcidenta Insuloj"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglujo"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Norda Irlando"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Skotlando"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Kimrio"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Enigu validan 13 cifero JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Eraro en dato segmento"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Enigu validan 11 cifero OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Enigu validan veturilon licencplaton nombron"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Enigu validan lokan kodon"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Nombra parto ne povas esti nulo"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Enigu validan 5 cifero postan kodon"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Enigu validan telefonnumeron"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Eniri validan lokan aŭ moveblan retan kodo"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "La telefonnumero estas tro longa"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Eniri validan 19 ciferan JMBAG komence 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Karta eldona nombro ne povas est nulo"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagrebo"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovar-Bilogora Distrikto"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brod-Posavina Distrikto"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovnik-Neretva Distrikto"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istria Distrikto"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovaka Distrikto"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivnica-Krizevcia Distrikto"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinska Zagorska Distrikto"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Lika Senjska Distrikto"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska Distrikto"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osijek-Baranja distrikto"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Pozega-Slavonia Distrikto"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-Goranska Distrikto"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisako-Moslavaka Distrikto"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Split-Dalmatio Distrikto"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Ŝibenik-Knin Distrikto"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varazdin Distrikto"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitica-Podravina Distrikto"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovar Srem Distrikto"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska Distrikto"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka Distrikto"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Enigu validan poŝtkodon"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Enigu validan NIK/KTP nombron"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceho"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Balio"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Bantamo"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulo"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Jogjakarto"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Ĝakarto"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Ĝambio"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Okcidenta Javo"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Centra Javo"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Orienta Javo"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Okcidenta Kalimantano"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Suda Kalimantano"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Centra Kalimantano"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Orienta Kalimantano"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Bangka-Belitung Insuloj"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Riau Insuloj"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampungo"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Moluko"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Norda Maluko"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Okcidenta Nusa Tengaro"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Orienta Nusa Tengaro"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papuo"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papuo-Barato"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riao"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Okcidenta Sulaveso"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Suda Sulaveso"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Centra Sulaveso"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Suda Orienta Sulaveso"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Norda Sulaveso"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Okcidenta Sumatro"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Suda Sumatro"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Norda Sumatro"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelango"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarto"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madjuno"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kedirio"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanulo"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Aĉeho"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Bangka-Belitung Insuloj"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Konsulejo"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Diplomatiaj gildoj"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandungo"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Norda Sulaveso"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timoro"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Norda Sulavesa Insuloj"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lomboko"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papuo-Barato"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Norda Sulaveso"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbavo"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumbao"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogoro"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongano"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarango"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Patio"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabajo"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Maduro"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malango"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jembero"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banjumaso"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federacia registaro"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Puruakarto"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garuto"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrimo"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armaho"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Karlo"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Kavano"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Klaro"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Korko"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derio"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegalo"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Doaŭno"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublino"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermano"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galvao"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerio"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildaro"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenio"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laoiso"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Letrimo"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limeriko"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longfordo"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louto"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Majo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meato"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monahano"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Ofalio"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roskomono"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tiperaro"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tirono"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Vaterfordo"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Vestmeato"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Veksfordo"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Viklovo"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Enigu poŝtan kodon laŭformate XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Enigu validan identan nombron."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Enigu poŝtan kodon laŭformate XXXXXX aŭ XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Enigu Baratan staton aŭ teritorion."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Telefonnumeroj devus esti formate laŭ 02X-8X aŭ 03X-7X aŭ 04X-6X"
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Enigu validan Islandan identigan nombron laŭformate XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "La Icelandic identiga nombro ne estas valida."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Enigu validan poŝtan kodon."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Enigu validan Socialasekuran numeron."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Enigu validann AVI nombro."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Enigu poŝtan kodon laŭformate XXXXXXX aŭ XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokajdo"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomoro"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iŭato"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Mijago"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akito"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagato"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukuŝimo"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibarako"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Toĉigo"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunmao"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitamo"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Ĉibo"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagaŭo"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Jamanaŝio"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Nijgato"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Tojamo"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Iŝikaŭo"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukuo"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifuo"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Ŝizuoko"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aiĉio"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie-prefektejo"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Ŝigao"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kioto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osako"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hjogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Narao"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Ŭakajamo"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Totorio"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Ŝimano"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okajamo"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroŝimo"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Jamaguĉo"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokuŝimo"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagaŭo"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehimo"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Koĉio"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoko"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Sagao"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasako"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita prefektejo"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Mijazako"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshimo"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinavo"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Enigu validan Kuvajtan Civilan Identigan Kartan nombron"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Identiga karta nombroj devus enhavi aŭ 4 - 7 ciferoj aŭ majuskla letero kaj "
-"7 ciferoj."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Ĉi tiu kampo enhavus ĝuste 13 ciferojn."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"La unuaj 7 ciferoj de la UMCN devus reprezenti validan pasintecon daton."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "La UMCN ne estas valida."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodromo"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitolao"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdancio"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinjeo"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenicao"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butelo"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčanio"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veleso"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinicao"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vranešticao"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčišteo"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Babao"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelijao"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivaro"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debaro"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarcao"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapijao"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisaro"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolnenio"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrovo"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Zelino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajaso"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovcio"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilindeno"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovco"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarcio"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbincio"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpošo"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Vodao"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Končeo"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćanio"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palankao"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštanio"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo kaj Rostušao"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenicao"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brodo"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogilao"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novacio"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomejo"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Oĥrido"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petroveco"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pečevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnicao"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilepo"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištipo"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radovišo"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovceo"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Reseno"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosomano"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Sarajo"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikolo"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopišteo"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojrano"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričaneo"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Strugao"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumicao"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničanio"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearceo"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centaro"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Zupao"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čairo"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaškao"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štipo"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizario"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Macedonia identiga karta nombro"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Macedonia urbo (2 karaktero kodo)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Unika mastra civitana nombro (13 ciferoj)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Enigu validan poŝtan kodon laŭformate XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Enigu validan RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Nevalida kontrolsumo por RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Enigu validan CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Nevalida kontrolsumo por CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Meksika stato (tri majusklaj leteroj)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Meksika poŝta kodo"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Meksika RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Meksika CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascaliento"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Basa Kalifornio"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Basa Kalifornio Suro"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeĉeo"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Ĉihuahuao"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Ĉiapaso"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Koahuilo"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Kolimo"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Federacia Distrikto"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Ŝtato de Méksiko"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Miĥoakáno"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Moreloso"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Najarito"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo Leono"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaksako"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Pueblo"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Kueretaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Kvintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinalo"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "Sankta Luiz Potosio"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonorao"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasko"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaŭlipaso"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlakskalao"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Verakruzo"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Jukatanio"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zakatecaso"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Enigu validan poŝtan kodon."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Enigu validan SoFi nombron."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drento"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevolando"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frislando"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderlando"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningeno"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Norda Brabanto"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Norda Holando"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijselo"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrekto"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zelando"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Suda Holando"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Enigu validan Norvegan socialasekuran numeron."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Ĉi tiu kampo bezonas 8 ciferojn."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Ĉi tiu kampo bezonas 11 ciferojn."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Nacia Identiga Nombro konsistas el 11 ciferoj."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Malĝusta kontrolsumo por la Nacia Identiga Nombro."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Nacia Identiga Karta Nombro konsistas el 3 leteroj kaj 6 ciferoj."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Malĝusta kontrolsumo por la Nacia Identiga Karta Nombro"
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Malĝusta kontrolsumo por la imposta nombro (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Nacia Komerca Registra Nombro (REGON) konsistas el 9 aŭ 14 ciferoj."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Malĝusta kontrolsumo por la Komerca Registra Nombro (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Enigu poŝtan kodon laŭformate XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Malsupra Silezio"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kujavia-Pomerio"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublino"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubuŝo"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodzo"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Pli malgranda Pollando"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovio"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opolo"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subkarpatio"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlaĥio"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerio"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silezio"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Sŭietokrziskio"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Varmia-Masurio"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Granda Pollando"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Okcidenta Pomerio"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Enigu poŝtan kodon laŭformate XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefonnumeroj devas havi 9 ciferoj, aŭ komenco de + aŭ 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Enigu validan CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Enigu validan CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Enigu validan IBAN laŭformate ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonnumeroj devas esti laŭformate XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Enigu validan poŝtan kodon laŭformate XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Enigu poŝtan kodon laŭformate XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Enigu pasportan nombron laŭformate XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Enigu pasportan nombron laŭformate XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Centra Federacia Distrikto"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Suda Federacia Distrikto"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Norda-Okcidenta  Federacia Distrikto"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Fora-Orienta  Federacia Distrikto"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Siberia Federacia Distrikto"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Urals Federacia Distrikto"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzskio Federacia Distrikto"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Norda Kaŭkasina Federacia Distrikto"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskvo"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Sankt-Peterburgo"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskva provinco"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Respubliko de Adigeo"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Respubliko de Baŝkirio"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Respubliko de Burjatio"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Respubliko de Altaio"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Respubliko de Dagestano"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Respubliko de Inguŝskajo"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Respubliko de Kabardio-Balkario"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Respubliko de Kalmukio"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Respubliko de Karaĉajio-Ĉerkesio"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Respubliko de Karelio"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Respubliko de Komio"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Respubliko de Mari Elo"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Respubliko de Mordvio"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Respubliko de Saka (Jakutijo)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Respubliko de Severnaja Osetio (Alanio)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Respubliko de Tatarstano"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Respubliko de Tijvao (Tuvao)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Respubliko de Udmurtskajao"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Respubliko de Kakasijao"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Ĉeĉenskaja Respubliko"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Ĉuvaŝskaya Respubliko"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altajskia Federacio"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabajkalski Federacio"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamĉatski Federacio"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarski Federacio"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnojarski Federacio"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permski Federacio"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorski Federacio"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropolsij Federacio"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Kabarovski Federacio"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaja Provinco"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkangelskaja Provinco"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakanskaja Provinco"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaja Provinco"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Brijanskaja Provinco"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaja Provinco"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogrodskaja Provinco"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaja Provinco"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezskaja Provinco"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaja Provinco"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaja Provinco"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaja Provinco"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzskaja Provinco"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaja Provinco"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaja Provinco"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaja Provinco"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaja Provinco"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaja Provinco"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaja Provinco"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipekaja Provinco"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaja Provinco"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaja Provinco"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja Provinco"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaja Provinco"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaja Provinco"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaja Provinco"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaja Provinco"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaja Provinco"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaja Provinco"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Skovskaja Provinco"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaj Provinco"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaja Provinco"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaja Provinco"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaja Provinco"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaja Provinco"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaja Provinco"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaja Provinco"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaja Provinco"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaja Provinco"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaja Provinco"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tulskaja Provinco"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tjumenskaja Provinco"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ulianovskaja Provinco"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Ĉeljabinskaja Provinco"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Jaroslavskaja Provinco"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evrejskaja Aŭtonoma Provinco"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Nenekija Aŭtonoma Areo"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Ĥanti-Mansa Aŭtonoma Areo - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Ĉukotka Aŭtonoma Areo"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Jamalo-Nenekija Aŭtonoma Areo"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Enigu validan Svedan organizaĵon nombron."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Enigu validan Svedan propran identecon nombron."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Kunordigado nombroj ne permesita."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Enigu validan Svedan poŝtan kodon laŭformate XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stokholmo"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Vasterboteno"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norboteno"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Upsalo"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Sodermanlando"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Ostrogotio"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jonkopingo"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronobergo"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmaro"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotlando"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekingo"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skaneo"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halando"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Vastra Gotalando"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Varmlando"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Orebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Vastmanlando"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarnao"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gavelborgo"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Vasternorlando"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jamtlando"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"La unuaj 7 ciferoj de la EMSO devas reprezenti validan pasintecon daton."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "La EMSO ne estas valida."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Enigu validan imposton nombron laŭformate SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Enigu telefonnumeron laŭformate +386XXXXXXXX aŭ 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bijstricao"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnicao"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejovo"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravo"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislavo 1"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislavo 2"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislavo 3"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislavo 4"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislavo 5"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bijtĉao"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadĉao"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detvao"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolni Kubino"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Stredao"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galantao"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnicao"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Ĥohoveco"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humeno"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilavao"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmaroko"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosiĉeo 1"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosiĉeo 2"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosiĉeo 3"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosiĉeo 4"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosiĉeo - okolio"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupino"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kjsuka Nova Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levico"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoco"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovskij Mikulaso"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Luceneco"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malakijo"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martino"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborco"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Miĉalovco"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Mijavo"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitrao"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nova Mesto nad Vahomo"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nova Zamkijo"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizansko"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinoko"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Pistanio"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltaro"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bijstriko"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presovo"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidzao"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puĉovo"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuko"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobotao"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznavao"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberoko"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinovo"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Seneco"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senicao"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalicao"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Sninao"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobranzo"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spiska Nova Vezo"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovnao"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkovo"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidniko"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Salao"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolĉanio"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebiŝovo"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trenĉino"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trinavo"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianska Teplico"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdoŝino"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velkij Krtiso"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplo"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlata Moravco"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvoleno"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovico"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronomo"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilino"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Regiono Banska Bijstrico"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Regiono Bratislavo"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Regiono Kosico"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Regiono Nitrao"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Regiono Presovo"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Regiono Trencino"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Regiono Tirnavo"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Regiono Zilino"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Enigu poŝtan kodon laŭformate XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefonnumeroj dev esti en laŭformate 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Enigu validan Turkan Identigon nombron."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turka Identigo nombro dev esti 11 ciferoj."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Enigu poŝtan kodon laŭformate XXXXX aŭ XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonnumeroj devus esti formate kiel XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Enigu validan usonan Socialasekuran numeron formate kiel XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Enigu usonan staton aŭ teritorion."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Usonan stato (du majusklaj leteroj)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Usonan poŝta kodo (du majusklaj leteroj)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonnumero"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Enigu validan CI numbron laŭformate X.XXX.XXX-X,XXXXXXX-X aŭ XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Enigu validan CI numbron."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Eniri validan Sudafrikan identigan kartan nombron"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Eniri validan Sudafrikan identigan poŝtan kodon"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Orienta Kabo"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Liberŝtato"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gaŭtengo"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "Kvazulu-Natalo"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalango"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Norda Kabo"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Norda Okcidento"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Okcidenta Kabo"
diff --git a/django/contrib/localflavor/locale/es/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/es/LC_MESSAGES/django.mo
deleted file mode 100644
index f7ebde81e0..0000000000
Binary files a/django/contrib/localflavor/locale/es/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/es/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/es/LC_MESSAGES/django.po
deleted file mode 100644
index 88d26b452e..0000000000
--- a/django/contrib/localflavor/locale/es/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3571 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Abraham Estrada <abraham.estrada@gmail.com>, 2011.
-# Antoni Aloy <antoni.aloy@trespams.com>, 2011, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Juan Antonio Infantes Díaz <ersame@gmail.com>, 2011.
-# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2011.
-# Marc Garcia <garcia.marc@gmail.com>, 2011.
-#   <serra.guillem@gmail.com>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-13 19:47+0000\n"
-"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Introduzca un código postal en el formato NNNN or ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Este campo sólo acepta números."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Este campo necesita 7 u 8 dígitos."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Introduzca un CUIT válido en el formato XX-XXXXXXXX-X o XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT inválido."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Australia Baja"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Australia Alta"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introduzca un código postal en el formato XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Introduzca un número de la Seguridad Social Austriaca válido en el formato "
-"XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Introducir 4 dígitos del un código postal."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Estado australiano"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Código postal de Australia"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Número de teléfono de Australia"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerp"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruselas"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flandes Oriental"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flemish Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburgo"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandes Occidental"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Región de Bruselas Capital"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Región Flamenca"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Introduzca un código postal en el rango y formato 01XXX - 52XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Introduzca un número de teléfono válido según los siguientes formatos: 0x "
-"xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx."
-"xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Introduzca un código postal en el formato XXXX-XXXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Los números de teléfono deben tener el formato XXX-XXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Seleccione un estado brasileño válido. Este estado no es uno de los estados "
-"disponibles."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Número CPF inválido."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Este campo necesita un máximo de 11 dígitos o 14 caracteres."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Número CNPJ inválido."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Este campo necesita 14 dígitos como mínimo"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Introduzca un código postal en el formato XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Introduzca un Número del Seguro Social de Canadá válido en el formato XXX-"
-"XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Introduzca un número de identificación o pasaporte suizos válidos en el "
-"formato X1234567<0 o 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Introduzca un RUT chileno válido."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Introduzca un RUT chileno válido. El formato es XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "El RUT chileno no es válido."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Introduzca un código postal en el formato XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-"Identificación de número de tarjetas que se compone de 15 o 18 dígitos."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-"Inválido número de Identificación digital: suma de comprobación incorrecta"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-"Inválido número de Identificación digital: fecha de nacimiento incorrecta"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Inválido número de Identificación digital: Código de Ubicación errónea"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Introduzca un número de teléfono válido."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Introduzca un número celular/movil válido."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Región Bohemia Central"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Región Bohemia Sur"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Región Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Región Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Región Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Región Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Región Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Región Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Región Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Región Moravia Sur"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Región Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Región Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Región Moravia-Silesiana"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Introduzca un código postal en el formato XXXXX o XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Introduzca un número de nacimiento en el formato XXXXXX/XXXX o XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"El parámetro opcional 'Género' es inválido, los valores válidos son 'f' y 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Introduzca un número de nacimiento válido."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Introduzca un número IC válido."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlín"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburgo"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introduzca un código postal en el formato XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Introduzca un número de tarjeta de identidad de Alemania válida en el "
-"formato XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Islas Baleares"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "La Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Gerona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúzcoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lérida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Vizcaya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalucía"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragón"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principado de Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Islas Baleares"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "País Vasco"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canarias"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilla-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilla y León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Cataluña"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Región de Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Comunidad Foral de Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Comunidad Valenciana"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Introduzca un código postal en el rango y formato 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Introduzca un número de teléfono válido en el formato 6XXXXXXXX, 8XXXXXXXX o "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Por favor introduzca un NIF, NIE o CIF válido."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Por favor, introduzca un NIF o NIE válido."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "El NIF es incorrecto."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "El NIE es incorrecto."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "El CIF es incorrecto."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Introduzca un número de cuenta bancaria en el formato XXXX-XXXX-XX-"
-"XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "El número de cuenta bancaria es incorrecto."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Introduzca un número de seguro social finlandés válido."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Los números de teléfono deben tener el formato 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Introduzca un código postal válido."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall e Islas de Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Londres (área metropolitana)"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Manchester (área metropolitana)"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne y Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Condado de Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Condado de Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Condado de Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Condado de Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Condado de Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Condado de Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries y Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Inglaterra"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlanda del Norte"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Escocia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Gales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Escriba un JMBG valido de 13 dígitos"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Error en el segmento de la fecha"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Escriba un OIB valido de 11 dígitos"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Introduzca un número de placa vehicular válido"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Introduzca un código de ubicación válido"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Parte del número no puede ser cero"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Introduzca un código postal válido de 5 dígitos"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Introduzca un número de teléfono válido"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Ingrese en un área válida o código de red móvil"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "El número teléfono es demasiado largo"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Escriba un JMBAG de 19 dígitos iniciando con 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "El número de expedición de la tarjeta no puede ser cero"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-Zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osjecko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-Goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-Moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-Dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-Kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Viroviticko-Podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Introduzca un código postal válido"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Introduzca un número NIK/KTP válido."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jacarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Gobierno Federal"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "de Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "sesión"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Introduzca un código postal en el formato XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Introduzca un número de identificación válido."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Introduzca un código postal en el formato XXXXXX o XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Ingrese un estado o territorio indio."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Los números de teléfono deben empezar por 2X-8X o 03X-7X o 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Introduzca un número de identificación de Islandia válido. El formato es "
-"XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "El número de identificación de Islandia no es válido."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Introduzca un código postal válido."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Introduzca un número de Seguro Social válido."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Introduzca un número VAT válido."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Introduzca un código postal en el formato XXXXX o XXXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Introduzca un ID Civil kuwaití válido"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Números de cédula de identidad debe contener 4 a 7 dígitos o una letra "
-"mayúscula y 7 dígitos."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Este campo debe contener exactamente 13 dígitos."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Los 7 primeros dígitos de la UMCN debe representar una fecha válida pasado."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "El UMCN no es válido."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aracinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevcani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Excluir"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delcevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorce Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Zelino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpos"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Kocani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Krusevo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehcevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoricane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "-Centar Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Cair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Caska"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Cucer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Suto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Número de la tarjeta de identidad macedonia "
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Un municipio de Macedonia (2 código de caracteres)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Número maestro único de ciudadanos (13 dígitos)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Entre un código zip válido en el formato XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Entre un RFC válido."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Suma de verificación incorrecta."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Entre un CURP válido."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Suma de verificación de CURP inválida."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Estado de México (tres letras mayúsculas)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Código zip de México"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "RFC de México"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "CURP de México"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Introduzca un código postal válido"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Introduzca un número SoFi válido"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Introduzca un número de seguro social de Noruega válido."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Este campo necesita 8 dígitos."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Este campo necesita 11 dígitos."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Número de Identificación Nacional consiste en 11 dígitos"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "El Número de Identificación Nacional es incorrecto."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-"Número de Tarjeta Identificador del Documento Nacional de Identidad que se "
-"compone de 3 letras y 6 dígitos."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-"Suma de comprobación incorrecta para el número de tarjetas de identificación "
-"nacional."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Entre un campo de identificación fiscal con el formato  XXX-XXX-XX-XX, XXX-"
-"XX-XX-XXX o XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "El Número de Identificación Tributaria (NIP) es incorrecto."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"El Número Nacional de Registro de Negocios (REGON) consiste en 9 o 14 "
-"dígitos."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "El Número Nacional de Registro de Negocios (REGON) es incorrecto."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Introduzca un código postal en el formato XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Introduzca un código postal en el formato XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Los números de teléfono deben ser de 9 dígitos, o comenzar con + o 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Introduzca un CIF válido."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Introduzca un CNP válido."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Introduzca un IBAN válido en el formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Los números de teléfono deben tener el formato XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Introduzca un código postal válido en el formato XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Introduzca un código postal en el formato XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Introduzca un número de pasaporte en el formato XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Introduzca un número de pasaporte en el formato XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Condado Federal Central "
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Condado Federal del Sur"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Condado Federal del Norte-Oeste"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Condado Federal del Extremo Oriente"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Condado Federal de Siberia"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Condado Federal de Ural"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Condado Federal de Privolzhsky"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Condado Federal del Norte del Cáucaso"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya Oblast '"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adigueya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostán, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buriatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Daguestán, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Saja, Respublika (Yakutia)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstán, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya Oblast '"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya Oblast '"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast '"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya Oblast '"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast '"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya Oblast '"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast '"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast '"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast '"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya Oblast '"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya Oblast '"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya Oblast '"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluga Oblast '"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya Oblast '"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya Oblast '"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya Oblast '"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya Oblast '"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya Oblast '"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya Oblast '"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast '"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast '"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja Oblast '"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast '"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast '"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya Oblast '"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast '"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast '"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast '"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast '"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya Oblast '"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya Oblast '"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya Oblast '"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya Oblast '"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast '"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovsk \""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolensk '"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast '"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya Oblast '"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast '"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast '"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast '"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya Oblast '"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya Oblast '"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya Oblast '"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja Oblast '"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Introduzca un número de organización sueca válido."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Introduzca un número de identidad personal sueco válido."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "No se admiten número de Co-ordinación."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Introduzca un código postal en el formato XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Estocolmo"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "Los primeros 7 dígitos del EMSO deben representar un fecha válida."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "El EMSO no es válido."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Entre un número de identificación fiscal de la forma SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Entre un número de teléfonocon la forma  +386XXXXXXXX o 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Región de Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Región de Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Región de Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Región de Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Región de Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Región de Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Región de Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Región de Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Región de Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Región de Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Región de Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Región de Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Región de Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Región de Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Región de Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Región de Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Región de Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Región de Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Región de Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Región de Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Región de Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Región de Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Región de Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Introduzca un código postal en el formato XXXXX"
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Los número de teléfono deben tener en el formato 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Introduzca un número de identificador turco válido."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "El número de identificación turco debe contener 11 dígitos."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduzca un código postal en el formato XXXXX o XXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Los números de teléfono deben tener el formato XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Introduzca un Número Seguro Social de EEUU válido en el formato XXX-XX-XXXX"
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Introduzca un estado o territorio de los EEUU."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado de los EEUU (dos letras mayúsculas)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Código postal de EE.UU. (dos letras mayúsculas)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Número de teléfono"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Introduzca un número de CI válido en el formato X.XXX.XXX-X,XXXXXXX-X o "
-"XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Introduzca un número CI válido."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Introduzca un ID surafricano válido"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Introduzca un código postal surafricano válido"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/es_AR/LC_MESSAGES/django.mo
deleted file mode 100644
index f8597784b0..0000000000
Binary files a/django/contrib/localflavor/locale/es_AR/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/es_AR/LC_MESSAGES/django.po
deleted file mode 100644
index d0d435f28c..0000000000
--- a/django/contrib/localflavor/locale/es_AR/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3570 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Ramiro Morales <cramm0@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-21 15:04+0000\n"
-"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
-"django/language/es_AR/)\n"
-"Language: es_AR\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Introduzca un código postal en formato NNNN o ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Este campo sólo permite valores numéricos."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Este campo requiere 7 u 8 dígitos."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Introduzca un CUIT válido en formato XX-XXXXXXXX-X o XXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT inválido."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carintia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Baja Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Alta Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburgo"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Estiria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introduzca un zip code en formato XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Introduzca un Número de Seguridad Social austríaco válido en formato XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Introduzca un código postal de 4 dígitos."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Estado australiano"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Código postal de Australia"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Número de teléfono de Australia"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Amberes"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruselas"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flandes Oriental"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabante Flamenco"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Henao"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Lieja"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburgo"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburgo"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Brabante Valón"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandes Occidental"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Región de Bruselas-Capital"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Región Flamenca"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Introduzca un código postal válido con el rango y el formato 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Introduzca un número telefónico en uno de los formatos 0x xxx xx xx, 0xx xx "
-"xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx ó 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Introduzca un zip code en formato XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Los números telefónicos deben respetar el formato XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Seleccione un estado Brasileño válido. Ese estado no es uno de los estados "
-"disponibles."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Número CPF inválido."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Este campo requiere como máximo 11 dígitos o 14 caracteres."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Número CNPJ inválido."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Este campo requiere al menos 14 dígitos."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Introduzca un código postal en formato XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Introduzca un Número de Seguridad Social Canadiense válido en formato XXX-"
-"XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Introduzca un número válido de tarjeta de identidad o pasaporte Suizos en "
-"formato X1234567<0 o 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Introduzca un RUT chileno válido."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Introduzca un RUT chileno válido. EL formato es XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "El RUT chileno no es válido."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Introduzca un código postal en el formato XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-"Identificación de número de tarjetas que se compone de 15 o 18 dígitos."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-"número de Identificación digital inválido: Suma de comprobación incorrecta"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-"Número de Identificación digital inválido: Fecha de nacimiento incorrecta"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Número de Identificación digital inválido: Código de Ubicación errónea"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Introduzca un número de teléfono válido."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Introduzca un número celular/movil válido."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "región Bohemia Central"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "región Bohemia Meridional"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "región Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "región Karlovy Vary"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "región Ústí nad Labem"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "región Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "región Hradec Králové"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "región Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "región Vysočina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "región Moravia Meridional"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "región Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "región Zlín"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "región Moravia-Silesia"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Introduzca un código postal en formato XXXXX o XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Introduzca un número de nacimiento en formato XXXXXX/XXXX o XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Valor erróneo para el parámetro opcional género. Los valores válidos son 'f' "
-"y 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Introduzca un número de nacimiento válido."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Introduzca un número IC válido."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlín"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburgo"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Renania septentrional-Westfalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introduzca un zip code en formato XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Introduzca un número de tarjeta de identidad alemán válido en formato "
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Islas Baleares"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "La Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Gerona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúzcoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lérida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Vizcaya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalucía"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragón"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principado de Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Islas Baleares"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "País Vasco"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Islas Canarias"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilla-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilla y León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Cataluña"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Región de Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Comunidad Foral de Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Comunidad Valenciana"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-"Introduzca un código postal en el siguiente rango y con el siguiente "
-"formato: 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Introduzca un número telefónico en uno de los siguientes formatos: "
-"6XXXXXXXX, 8XXXXXXXX o 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Por favor introduzca un NIF, NIE o CIF válidos."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Por favor, introduzca un NIF o CIE válidos."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Código de verificación de NIF inválido."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Código de verificación de NIE inválido."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Código de verificación de CIF inválido."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Por favor introduzca un número de cuenta bancaria válido en formato XXXX-"
-"XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Código de verificación de número de cuenta bancaria inválido."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Introduzca un número de seguridad social finlandés válido."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Los números telefónicos deben respetar el formato 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Introduzca un postcode válido."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall e Islas de Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermarmagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Escocia Central"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Inglaterra"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlanda del Norte"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Escocia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Gales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Introduzca un JMBG de 13 dígitos valido"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Error en el segmento de la fecha"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Introduzca un OIB de 11 dígitos válido"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Introduzca un número de placa de licencia de vehículo válido."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Introduzca un código de ubicación válido"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Parte del número no puede ser cero"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Introduzca un código postal de 5 dígitos válido"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Introduzca un número telefónico válido."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Introduzca un área o código de red móvil válidos"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "El número teléfono es demasiado largo"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Introduzca un JMBAG de 19 dígitos iniciando con 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "El número de emisión de la tarjeta no puede ser cero"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-Zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osjecko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-Goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-Moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-Dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-Kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Viroviticko-Podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Introduzca un código postal válido."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Introduzca un número NIK/KTP válido."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Java Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Java Central"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Java Oriental"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Occidental"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Meridional"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Central"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Oriental"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Islas Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Molucas"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Molucas Septentrional"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusatenggara Occidental"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusatenggara Oriental"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papúa"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Provincia de Papúa Occidental"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Célebes Occidental"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Célebes Meridional"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Célebes Central"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Célebes Suroriental"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Molucas Septentrional"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatra Occidental"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatra Meridional"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatra Septentrional"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Aceh"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Introduzca un código postal en el formato XXXXX."
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Introduzca número ID válido."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Introduzca un código postal en el formato XXXXXX o XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Introduzca un estado o territorio indio."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Los números de teléfono deben empezar por 2X-8X o 03X-7X o 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Introduzca un número de identificación islandés válido. El formato es XXXXXX-"
-"XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "El número de identificación islandés no es válido."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Introduzca un zip code válido."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Introduzca un número de Seguridad Social válido."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Introduzca un número VAT válido."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Introduzca un código postal en formato XXXXXX o XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Introduzca un número de ID civil kuwaití válido."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Números de cédula de identidad debe contener 4 a 7 dígitos o una letra "
-"mayúscula y 7 dígitos."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Este campo debe contener exactamente 13 dígitos."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Los 7 primeros dígitos de la UMCN deben representar una fecha válida pasado."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "El UMCN no es válido."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aracinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevcani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Excluir"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delcevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorce Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Zelino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpos"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Kocani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Krusevo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehcevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoricane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "-Centar Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Cair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Caska"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Cucer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Suto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Número de la tarjeta de identidad macedonia "
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Un municipio de Macedonia (2 código de caracteres)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Número maestro único de ciudadanos (13 dígitos)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Entre un código zip válido en el formato XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Entre un RFC válido."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Suma de verificación incorrecta."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Entre un CURP válido."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Suma de verificación de CURP inválida."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Estado de México (tres letras mayúsculas)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Código zip de México"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "RFC de México"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "CURP de México"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Introduzca un código postal válido."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Introduzca un número SoFi válido."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drente"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevolanda"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frisia"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Güeldres"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groninga"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Brabante Septentrional"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Holanda Septentrional"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zelanda"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Holanda Meridional"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Introduzca un número de seguridad social Noruego válido."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Este campo requiere 8 dígitos."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Este campo requiere 11 dígitos."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Los Números Nacionales de Identificación constan de 11 dígitos."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Código de verificación de Número Nacional de Identificación inválido."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-"Número de Tarjeta Identificador del Documento Nacional de Identidad que se "
-"compone de 3 letras y 6 dígitos."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-"Suma de comprobación incorrecta para el número de tarjetas de identificación "
-"nacional."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Entre un campo de identificación fiscal con el formato  XXX-XXX-XX-XX, XXX-"
-"XX-XX-XXX o XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Código de verificación de Número Impositivo (NIP) inválido."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Los Números Nacionales de Registro de Negocios (REGON) constan de 9 o 14 "
-"dígitos."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Código de verificación de Número Nacional de Registro de Negocios (REGON) "
-"inválido."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Introduzca un código postal en formato XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Baja Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Cuyavia y Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubus"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Pequeña Polonia"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpacia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlaquia"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Varmia y Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Gran Polonia"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Pomerania Occidental"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Introduzca un zip code en formato XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Los números telefónicos deben ser de 9 dígitos o comenzar con + o 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Introduzca un CIF válido."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Introduzca un CNP válido."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Introduzca un IBAN válido en formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Los números telefónicos deben respetar el formato XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Introduzca un código postal válido en formato XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Introduzca un código postal en el formato XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Introduzca un número de pasaporte en el formato XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Introduzca un número de pasaporte en el formato XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Condado Federal Central "
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Condado Federal del Sur"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Condado Federal del Norte-Oeste"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Condado Federal del Extremo Oriente"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Condado Federal de Siberia"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Condado Federal de Ural"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Condado Federal de Privolzhsky"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Condado Federal del Norte del Cáucaso"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya Oblast '"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adigueya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostán, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buriatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Daguestán, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Saja, Respublika (Yakutia)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstán, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya Oblast '"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya Oblast '"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast '"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya Oblast '"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast '"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya Oblast '"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast '"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast '"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast '"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya Oblast '"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya Oblast '"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya Oblast '"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluga Oblast '"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya Oblast '"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya Oblast '"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya Oblast '"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya Oblast '"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya Oblast '"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya Oblast '"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast '"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast '"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja Oblast '"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast '"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast '"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya Oblast '"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast '"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast '"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast '"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast '"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya Oblast '"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya Oblast '"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya Oblast '"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya Oblast '"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast '"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovsk \""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolensk '"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast '"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya Oblast '"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast '"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast '"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast '"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya Oblast '"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya Oblast '"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya Oblast '"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja Oblast '"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Introduzca un número de organización sueco válido."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Introduzca un número de identidad personal sueco válido."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "No se admiten números de co-ordinación"
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Introduzca un código postal sueco en formato XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Estocolmo"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergrötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Escania"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "Los primeros 7 dígitos del EMSO deben representar un fecha válida."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "El EMSO no es válido."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Entre un número de identificación fiscal de la forma SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Entre un número de teléfonocon la forma  +386XXXXXXXX o 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "región Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "región Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "región Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "región Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "región Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "región Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "región Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "región Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Introduzca un código postal en el formato XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Los números telefónicos deben tener el formato 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Introduzca número de identificación turco válido."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Los números de identificación turcos deben consistir de 11 dígitos."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduzca un zip code en el formato XXXXX o XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Los números telefónicos deben respetar el formato XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Introduzca un Número de Seguridad Social en formato XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Introduzca un estado de EE.UU. o un territorio."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado de los EE.UU. (dos letras mayúsculas)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Código postal de EE.UU. (dos letras en mayúscula)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Número de teléfono"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Introduzca un número CI válido en formato X.XXX.XXX-X,XXXXXXX-X o XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Introduzca un número CI válido."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Introduzca un número de ID de Sudáfrica válido."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Introduzca un código postal de Sudáfrica válido."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/es_MX/LC_MESSAGES/django.mo
deleted file mode 100644
index af01e2457d..0000000000
Binary files a/django/contrib/localflavor/locale/es_MX/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/es_MX/LC_MESSAGES/django.po
deleted file mode 100644
index 0f8f58252f..0000000000
--- a/django/contrib/localflavor/locale/es_MX/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3566 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Abraham Estrada <abraham.estrada@gmail.com>, 2011, 2012.
-# msmtotti <figo10mexico@gmail.com>, 2011.
-# zodman <zodman@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
-"language/es_MX/)\n"
-"Language: es_MX\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Introduzca un código postal en el formato NNNN o ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Este campo requiere sólo números."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Este campo requiere 7 u 8 dígitos."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Ingrese un CUIT válido en el formato  XX-XXXXXXXX-X o XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT inválido."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carintia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Baja Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Alta Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburgo"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Estiria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introduzca un código postal en el formato XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Introduzca un número de Seguro Social de Austria en el formato XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Introduzca un código postal de 4 dígitos."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Estado australiano"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Código postal australiano"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Número telefónico australiano"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Amberes"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruselas"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flanders del este"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabante Flamenc"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburgo"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburgo"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandes Occidental"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Región de Bruselas Capital"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Región Flamenca"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Introduzca un código postal válido en el formato 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Introduzca un número de teléfono válido en uno de los formatos xx xx xxx 0x, "
-"xx xx xx 0xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x . "
-"xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx o 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Introduzca un código postal en el formato XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Los números de teléfono debe estar en formato XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Seleccione un estado brasileño válido. Ese estado no es uno de los estados "
-"disponibles."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Número CPF inválido"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Este campo requiere un máximo de 11 dígitos o caracteres 14."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Número CNPJ inválido"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Este campo requiere un mínimo de 14 dígitos"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Introduzca un código postal en el formato XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Introduzca un número de Seguro Social de Canadá en formato XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Argovia"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berna"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Friburgo"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ginebra"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Cantón de Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Cantón del Tesino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Cantón del Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "República y cantón de Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zúrich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Introduzca una identidad Suiza válida o número de pasaporte en el formato "
-"X1234567<0 ó 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Introduzca un RUT chileno válido."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Introduzca un RUT chileno válido. El formato es XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "El RUT chileno no es válido."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Introduzca un código postal en el formato de XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "El número de tarjeta de identificación consta de 15 o 18 dígitos."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Número de Tarjeta de Identificación Inválido: Comprobación incorrecta"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Número de Tarjeta de Identificación Inválido: Fecha incorrecta"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-"Número de Tarjeta de Identificación Inválido: Código de ubicación incorrecto"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Introduzca un número de teléfono válido."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Introduzca un número de teléfono celular válido."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Región de Bohemia Central"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Región de Bohemia del Sur"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Región de Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Región de Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Región de Ústí nad Labem"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Región de Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Región de Hradec Králové"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Región de Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Región de Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Región Moravia del Sur"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Región de Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Región de Zlín"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Región de Moravia-Silesia"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Introduzca un código postal en el formato XXXXX o XX XXX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Introduzca una fecha de nacimiento en el formato XXXXXX / XXXX o XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Parámetro de Genero opcional inválido, los valores válidos son 'f' y 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Introduzca una fecha de nacimiento válida."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Introduzca un número IC válido."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wurtemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlín"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandeburgo"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburgo"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hesse"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklemburgo-Pomerania Occidental"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Baja Sajonia "
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Sajonia"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Sajonia-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introduzca el código postal en el formato XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Introduzca un número válido de tarjeta de identidad alemana en formato "
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Islas Baleares"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellon"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "La Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Gerona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúzcoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lérida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Vizcaya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalucía"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragón"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principado de Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Islas Baleares"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "País Vasco"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Islas Canarias"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilla y La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilla y León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Cataluña"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Región de Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Comunidad Foral de Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Comunidad Valenciana"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Introduzca un código postal válido en el formato 01XXX al 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Introduzca un número de teléfono válido en uno de los formatos 6XXXXXXXX, "
-"8XXXXXXXX o 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Por favor introduzca una NIF, NIE o CIF válida."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Por favor introduzca una NIF o NIE válida."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "El NIF es incorrecto."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "El NIE es incorrecto."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "El CIF es incorrecto."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Por favor, introduzca un número de cuenta bancaria válida en el formato XXXX-"
-"XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Suma de chequeo inválido para el número de banco."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Introduzca un número válido de seguridad social finlandés."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "El número de teléfono debe estar en el formato 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Introduzca un código postal válido."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall e Islas de Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Yorkshire del Norte"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Yorkshire del Sur"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne y Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Sussex Occidental"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Yorkshire Occidental"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Condado de Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Condado de Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Condado de Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Condado de Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Condado de Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Condado de Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Glamorgan del Sur"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Glamorgan Occidental"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Escocia Central"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries y Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Islas Orcadas"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Islas Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Islas Occidentales"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Inglaterra"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlanda del Norte"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Escocia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "País de Gales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Introduzca un JMBG válido de 13 dígitos."
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Error en el segmento de la fecha"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Introduzca un OIB de 11 dígitos"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Introduzca una matrícula de vehículo válida."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Introduzca un código de ubicación válido"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "El número de pieza no puede ser cero"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Introduzca un código postal válido de 5 dígitos"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Introduzca un número de teléfono válido"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Introduzca una área válida o código de red móvil"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "El número de teléfono es demasiado largo."
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Introduzca un JMBAG válido de 19 dígitos iniciando con 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Número de expedición de la tarjeta no puede ser cero"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Introduzca un código postal válido"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Introduzca un NIK/KTP número."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Gobierno Federal"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Introduzca un código postal en el formato XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Introduzca un número de identificación válido."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Introduzca un código postal en el formato XXXXXX o XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Introduzca en un estado o territorio Indú."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Los números de teléfono deben estar en el formato 02X-8X o 03X-7X o 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Introduzca un número válido de identificación islandesa. El formato es "
-"XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "El número de identificación islandesa no es válido."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Introduzca un código postal válido."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Introduzca un número de Seguro Social."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Introduzca un número VAT válido."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Introduzca un código postal en el formato XXXXXXX o XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Introduzca un número de identificación civil kuwaití"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Los números de la tarjeta de identidad deben contener de 4 a 7 dígitos o una "
-"letra mayúscula y dígitos 7."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Este campo debe contener exactamente 13 dígitos."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Los 7 primeros dígitos de la UMCN deben representar una fecha pasada válida."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "El UMCN no es válido."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Número de tarjeta de identidad de Macedonia"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Un municipio de Macedonia (Código de 2 caracteres)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Cédula maestra única de ciudadanía número (13 dígitos)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Introduzca un código postal válido en el formato de XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Ingresa un RFC válido."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "RFC inválido."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Ingresa una CURP válida."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "CURP inválido."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Estado de México (tres letras mayúsculas)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Código postal mexicano"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "RFC mexicano"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "CURP mexicano"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Introduzca un código postal válido"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Introduzca un número SoFi válido"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Introduzca un número válido de la seguridad social noruego."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Este campo requiere de 8 dígitos."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Este campo requiere de 11 dígitos."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Número de Identidad Nacional se compone de 11 dígitos."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "El Número de Identificación Nacional es incorrecto."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-"El número de tarjeta de identificación nacional se compone de 3 letras y "
-"dígitos 6."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "El número de tarjeta de identificación nacional es inválido."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Introduzca un campo de número de identificación fiscal (NIP) en el formato "
-"XXX-XXX-XX-XX, XXX-XX-XX-XXX o XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "El Número de Identificación Tributaria (NIP) es incorrecto."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"El Número Nacional de Registro de Negocios (REGON) consiste en 9 o 14 "
-"dígitos."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "El Número Nacional de Registro de Negocios (REGON) es incorrecto."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Introduzca un código postal en el formato XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Baja Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Pomerania Occidental"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Introduzca un código postal en el formato XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Los número de teléfono debe tener 9 dígitos, o empezar con + ó 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Introduzca un CIF válido."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Introduzca un CNP válido."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-"Introduzca un código IBAN válido en el formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Los números de teléfono debe estar en formato XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Introduzca un código postal válido en el formato XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Introduzca un código postal en el formato XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Introduzca un número de pasaporte en el formato XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Introduzca un número de pasaporte en el formato XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Condado Federal Central"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Condado Federal Sur"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Condado Federal Noroeste"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Condado Federal de Lejano Oriente"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Condado Federal Siberio"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Condado Federal Ural"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Condado Federal"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "North-Caucasian Condado Federal"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "San Petersburgo"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Introduzca un número válido de organización sueca."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Introduzca un número válido de identidad personal sueco."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Los números de coordinación no se admiten."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Introduzca un código postal sueco en el formato XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Estocolmo"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"Los 7 primeros dígitos del EMSO deben representar una fecha pasada válida."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "El EMSO no es válido."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-"Introduzca un número de identificación fiscal válida en forma SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-"Introduzca el número de teléfono en el formato +386 XXXXXXXX o 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Región de Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Región de Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Región de Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Región de Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Región de Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Región de Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Región de Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Región de Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Región de Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Región de Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Región de Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Región de Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Región de Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Región de Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Región de Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Región de Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Región de Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Región de Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Región de Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Región de Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Región de Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Región de Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Introduzca un código postal en el formato XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Los números de teléfono deben estar en el formato 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Introduzca un número de identificación turco válido."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "El número de identificación turco debe ser de 11 dígitos."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduzca un código postal en el formato XXXXX o XXXXX XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Números de teléfono deben estar en el formato XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Introduzca un número de Seguro Social de los EE.UU. en formato XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Ingresar un estado de EE.UU. o territorio."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado de EE.UU. (dos letras mayúsculas)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "EE.UU. código postal (dos letras mayúsculas)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Número de teléfono"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Introduzca un número válido de CI en formato X.XXX.XXX-X,XXXXXXX-X ó "
-"XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Introduzca un número CI válido."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Introduzca un número de identificación de Sudáfrica válido"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Introduzca un código postal de Sudáfrica válido"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Provincia Oriental del Cabo"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Estado Libre"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "La Provincia de Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Provincia Septentrional del Cabo"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Noroeste"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Occidental del Cabo"
diff --git a/django/contrib/localflavor/locale/et/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/et/LC_MESSAGES/django.mo
deleted file mode 100644
index 1b3dae17b2..0000000000
Binary files a/django/contrib/localflavor/locale/et/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/et/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/et/LC_MESSAGES/django.po
deleted file mode 100644
index fbe31e83c0..0000000000
--- a/django/contrib/localflavor/locale/et/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3539 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# madisvain <madisvain@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
-"et/)\n"
-"Language: et\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Sisesta postiindeks kujul NNNN või ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "See väli peab koosnema ainult numbritest."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Siin väljal peab olema kas 7 või 8 numbrit."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Sisesta korrektne CUIT kujul XX-XXXXXXXX-X or XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Vale CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Kärnten"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Alam-Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Ülem-Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Steiermark"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirool"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viin"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Sisesta postiindeks kujul XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Sisesta kehtiv Austria sotsiaalkindlustusnumber formaadis XXX-XX-XXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburgi provints"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luksenburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Sisestage kehtiv postiindeks vahemikus ja formaadis 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Sisestage kehtiv telefoninumber ühes järgnevatest formaatidest 0x xxx xx xx, "
-"0XX xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x . "
-"xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx või 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Sisesta postiindeks kujul XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefoninumbrid peavad olema kujul XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Vali korrektne Brasiilia osariik. Valitud osariik ei ole korrektne."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Mittekorrektne CPF number."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "See väli võib olla maksimaalselt 11 või 14 sümbolit."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Mittekorrektne CNPJ number."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "See väli peab olema vähemalt 14-kohaline arv."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Sisesta postiindeks kujul XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Sisesta korrektne Kanada sotsiaalturvatunnus formaadis XXX-XXX-XXXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Sisesta kehtiv Šveitsi isiku- või passinumber kujul X1234567<0 või "
-"1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Sisesta korrektne Tšiili RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Sisesta korrektne Tšiili RUT formaadis XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Tšiili RUT on ebakorrektne."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praha"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Kesk-Boheemia regioon"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Lõuna-Boheemia regioon"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilseni regioon"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbadi regioon"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti regioon"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Libereci regioon"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradeci regioon"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice regioon"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina regioon"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Lõuna-Moraavia regioon"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouci regioon"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlini regioon"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moraavia-Sileesia regioon"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Sisesta postiindeks kujul XXXXX või XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX"
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja "
-"'m' (mees)"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Sisesta sobiv sünninumber."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Sisesta ID kaardi number."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Württemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Baieri"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berliin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Vorpommern"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Alam-Saksi"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Nordrhein-Westfalen"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rheinland-Pfalz"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarimaa"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saksimaa"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saksi-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Tüüringi"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Sisesta postiindeks kujul XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Sisesta kehtiv Saksamaa ID-kaardi number kujul XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Baleaarid"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúzcoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Astuuria"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Vizcaya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andaluusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragón"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Astuuria"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Baleaarid"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskimaa"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanaari saared"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilla-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilla-León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Kataloonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencia"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Sisesta korrektne postiindeks vahemikus 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Sisesta korrektne telefoninumber, mis on formaadis 6XXXXXXXX, 8XXXXXXXX või "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Palun sisesta korrektne NIF, NIE või CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Palun sisesta korrektne NIF või NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Vale NIF-i kontrollsumma."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Vale NIE kontrollsumma."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Vale CIF-i kontrollsumma."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Palun sisesta korrektne kontonumber formaadis XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Pangakonto numbri kontrollsumma on vale."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Sisesta korrektne Soome sotsiaalturvatunnus."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefoninumbrid peavad olema 0X XX XX XX XX formaadis."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Sisesta kehtiv postiindeks."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Suur-London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Suur-Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Lõuna-Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne ja Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Lääne-Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Lääne-Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Lääne-Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Piirid"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Kesk-Šotimaa"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney saared"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetlandi saared"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Inglismaa"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Põhja-Iirimaa"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Šotimaa"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Sisestage kehtiv sõiduki numbrimärk"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Sisesta kehtiv telefoninumber"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Sisestage kehtiv postiindeks"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Sisestage kehtiv NIK / KTP number"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Sisesta kehtiv Islandi isikukood formaadis XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islandi isikukood ei ole korrektne."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Sisesta korrektne postiindeks."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Sisesta korrektne sotsiaalturvatunnus."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Sisesta korrektne käibemaksukohuslase kood."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Sisesta postiindeks kujul XXXXXXX või XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Sisesta kehtiv postiindeks"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Sisesta kehtiv SoFi number"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friisimaa"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningeni provints"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Põhja-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Põhja-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrechti provints"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Lõuna-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Sisesta kehtiv Norra sotsiaalturvatunnus."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Sellel väljal peab olema 8 numbrit."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Sellel väljal peab olema 11 numbrit."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Riiklik isikukood koosneb 11 numbrist."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Isikukoodil on vale kontrollsumma."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Maksukohustusnumbril (NIP) on vale kontrollsumma."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Riikliku Äriregistri Number (REGON) koosneb 9 või 14 numbrist."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Riiklikul Äriregistri Numbri (REGON) kontrollsumma on vale."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Sisesta postiindeks kujul XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Alam-Sileesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kujawy-Pomorze"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Łódź"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Väike-Poola"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masoovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Podkarpacie"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlaasia"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomorze"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Sileesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Święty Krzyżi"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Suur-Poola"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Lääne-Pomorze"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Sisestage korrektne CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Sisestage korrektne CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Sisesta korrektne IBAN kujul ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefoninumbrid peavad olema kujul XXXX-XXXXXX"
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Sisesta postiindeks kujul XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banská Bystrica regioon"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava regioon"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Košice regioon"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra regioon"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Prešovi regioon"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trenšíni regioon"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava regioon"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Žilina regioon"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Sisestage postiindeks XXXXX formaadis."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefoninumbrid peavad olema 0XXX XXX XXXX formaadis."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Sisestage kehtiv Türgi identifitseerimisnumber."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Türgi Identifitseerimisnumber peab olema 11 numbrit."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Sisesta postiindeks kujul XXXXX või XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefoninumbrid peavad olema XXX-XXX-XXX formaadis."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Sisesta kehtiv U.S. Social Security number formaadis XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Sisestage USA osariik või piirkond."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S.A. osariik (kaks suurt tähte)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "USA postiindeks (kaks suurtähte)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefoninumber"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Sisestage kehtiv CI number X.XXX.XXX-X, XXXXXXX-X või XXXXXXXX formaadis."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Sisestage kehtiv CI number."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Sisesta kehtiv Lõuna-Aafrika ID-number"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Sisesta kehtiv Lõuna-Aafrika postiindeks"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/eu/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/eu/LC_MESSAGES/django.mo
deleted file mode 100644
index 5be22d0f13..0000000000
Binary files a/django/contrib/localflavor/locale/eu/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/eu/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/eu/LC_MESSAGES/django.po
deleted file mode 100644
index 85942faa0a..0000000000
--- a/django/contrib/localflavor/locale/eu/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3550 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Aitzol Naberan <anaberan@codesyntax.com>, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-09 11:05+0000\n"
-"Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
-"eu/)\n"
-"Language: eu\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "NNNN edo ANNNNAAA formatoan idatzi posta kode bat."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Eremu honek zenbakiak bakarrik behar ditu."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Eremu honek 7 edo 8 digito behar ditu."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "CUIT zuzena idatzi XX-XXXXXXXX-X edo XXXXXXXXXXXX formatoan."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT okerra."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Behe Australia"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Goi Australia"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vienna"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "zip kodea XXXX formatoan idatzi."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Australiako Gizarte Segurantza kode zuzena sartu XXXX XXXXXX formatuan."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Sartu 4 digituko posta kodea"
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australian State"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australiar postakodea"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australiar telefono zenbakia"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerp"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brussels"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "East Flanders"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flemish Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "West Flanders"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brussels Capital Region"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flemish Region"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Sartu 1XXX - 9XXX tartean dagoen posta kode zuzen bat."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Onartutako  telefono zenbaki formatuak 0x xxx xx xx, 0xx xx xx xx, 04xx xx "
-"xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx."
-"xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "XXXXX-XXX formatoan zip kodea idatzi."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefono zenbakiak XX-XXXX-XXXX formatoa behar dute."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Brasilgo estatu zuzen bat aukeratu. Hori ez dago aukeran."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "CPF zenbaki okerra."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Eremu honek gehienez 11 digito edo 14 karaktere behar ditu."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "CNPJ zenbaki okerra."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Eremu honek 14 digito behar ditu gutxienez"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Posta kodea idatzi XXX XXX formatoan."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Sartu Kanadako segurtasun sozialeko zenbaki zuzen bat XXX-XXX-XXX formatoan."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Saru Suitzako Nortasun agiri edo pasaporte zenbaki zuzen bat X1234567<0 edo "
-"1234567890 formatuan."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Txileko RUT zuzen bat sartu"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Txileko RUT zuzen bat sartu. Formatoa: XX.XXX.XXX.X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Txileko RUTa ez da baliozkoa"
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Sartu posta kodea XXXXXX formatuan."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "ID Txartel Zenbakiak 15 edo 18 digitu dauzka."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "ID Txartel Zenbaki okerra: konprobazio batura ez da zuzena"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "ID Txartel Zenbaki okerra: jaiotza data ez da zuzena"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "ID Txartel Zenbaki okerra: kokalekua ez da zuzena"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Sartu telefono zenbaki zuzen bat."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Saru mugikor zenbaki zuzen bat."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prague"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Central Bohemian Region"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "South Bohemian Region"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen Region"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad Region"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti Region"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec Region"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Region"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice Region"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina Region"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "South Moravian Region"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc Region"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin Region"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravian-Silesian Region"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Sartu XXXXX edo XXX XX formatuko posta kode zuzena."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Saru jaiotza zenbakia XXXXXX/XXXX edo XXXXXXXXXX formatuan"
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Aukerako Genero parametro okerra, onartutako balioak 'f' eta 'm' dira"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Urtebetetze zenbaki okerra"
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Sartu IC zenbaki zuzena."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Sartu zip kodea XXXXX formatoan"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Sartu Alemaniako Nortasun agiri zenbaki zuzena XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"formatuan."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Araba"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albazete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Bartzelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Gupuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "Errioxa"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murtzia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Nafarroa"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palentzia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevila"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andaluzia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragoi"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturiaseko printzipadoa"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balear uharteak"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Euskal Herria"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canaria uharteak"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "La Mancha-Gaztela"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Gaztela eta Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalunia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galizia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murtzia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Nafarroako komunitate forala"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valenciako komunitatea"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Kode postal bat idatzi hurrengo formato eta tartearekin: 01XXX - 52XXX"
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Telefono zenbaki bat idatzi hurrengo formato batekin: 6XXXXXXXX, 8XXXXXXXX "
-"edo 9XXXXXXXX"
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Idatzi NIF,NIE edo CIF zuzena."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Idatzi NIF edo NIE zuzena."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "NIF kontrol kode okerra."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "NIE kontrol kode okerra."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "CIF kontrol kode okerra."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Mesedez idatzi banku kontu zenbaki zuzena XXXX-XXXX-XX-XXXXXXXXXX "
-"formatoarekin."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Banku kontu zenbakian kontrol digito okerra."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Sartu Finlandialko Gizarte segurantza zenbaki zuzena"
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefono zenabkiak 0X XX XX XX XX formatuan egon behar dira."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Sartu posta kokde zuzen bat"
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Northern Ireland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Sartu 13 digituko JMBG zuzena"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Errorea data atalean"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Sartu 11 digituko OIB zuzena"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Sartu ibilgailu matrikula zenbaki zuzena"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Sartu kokaleku kode zuzena"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Zenbaki atala ezin da zero izan"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Sartu 5 digituko posta kode zuzena"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Sartu telefono zenbaki zuzen bat"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Sartu ingurune edo sare mugikor kode zuzena"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefono zenbakia luzeegia da"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Satu 601983 hasten den 19 digituko JMBAG zuzena"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Card issue zenbakia ezin da zero izan"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Sartu posta kode zuzen bat"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Sartu NIK/KTP zenbaki zuzena"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Sartu posta kode zuzena XXXXXX  formatuan"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Sartu ID zenbaki zuzena"
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Sartu zip kode zuzena XXXXXX edo XXX XXX formatuan."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Sartu Indiako estatu edo lurraldea."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "no zenbakiak 02X-8X edo 03X-7X edo 04X-6X formatuan egon behar dira."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Sartu Islandiako identifikazio zenbaki zuzena. Fomatua XXXXXX-XXXX da."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islandiako identifikazio zenbakia ez da zuzena."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Sartu posta kode zuzena"
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Gizarte Segurantza zenbaki zuzena."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Sartu VAT zenbaki zuzena."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Sartu posta kode zuzena XXXXXXX edo XXX-XXXX formatuan."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Sartu Kuwaiteko Civil ID zenbaki zuzena"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Identifikazio txartel zenbakiek 4 edo 7 digitu izan ditzazkete, edo "
-"maiuskula bat eta 7 digitu."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Eremu honek zehazki 13 digitu izan behar ditu."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"UMCNaren lehen 7 digituek iraganeko data zuzen bat adierazi behar dute."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN ez da zuzena."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Mazedoniako identifikazio txartel zenbakia"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Mazedoniako herria (2 karaktereko kodea)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Hiritar zenbaki nagusi bakarra (13 digitu)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Sartu zip kode zuzena XXXXX formatuan."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Sartu RFC zuzena."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "RFCaren konprobazio batura okerra."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Sartu CURP zuzena."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "CURParen konprobazio batura okerra."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mexikar estatua (hiru letra maiuskula)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexikar zip kodea"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexikar RFCa"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexikar CURPa"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Posta kode zuzena sartu"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Sartu SoFi zenbaki zuzena"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Sartu Norbegiako Gizarte Segurantze zenbaki zuzena."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Eremu honek 8 digitu behar ditu"
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Eremu honek 11 digitu behar ditu"
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Identifikaizio Zenbaki Nazionalak 11 digitu dauzka."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Identifikazio Zenbaki Nazionalaren konprobazio batura okerra."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Nazio ID Txartel Zenbakiak 3 letra eta 6 digitu dauzka."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Nazio ID Txartel Zenbakiaren konprobazio batura okerra."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Sartu zerga zenbaki (NIP) zuzena XXX-XXX-XX-XX, XXX-XX-XX-XXX edo XXXXXXXXXX "
-"formatuan."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Tax Number (NIP)ren konprobazio zenbaki okerra."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"National Business Register Number (REGON) 9 - 14 zenbakiz osatuta dago."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Konprobazio batura okerra National Buseness Register Number (REGON) "
-"zenbakirako."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Sartu posta kode zuzena XX-XXX formatuan."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Sartu zip kode zuzena XXXX-XXX formatuan."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefono zenbakiek 9 digito izan behar dute, edo + edo 00 hasi."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Sartu CIF zuzena."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Sartu CNP zuzena."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Sartu IBAN zuzena ROXX-XXXX-XXXX-XXXX-XXXX-XXXX formatuan."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefono zenbakiak XXXX-XXXXXX formatuan egon behar dira."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Sartu baleko posta kodea XXXXXX formatuan"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Sartu posta kode zuzena XXXXXX formatuan."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Sartu pasaporte zenbakia XXXX XXXXXX formatuan."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Sartu pasaporte zenbakia XX XXXXXXX formatuan."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Central Federal County"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "South Federal County"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "North-West Federal County"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Far-East Federal County"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Siberian Federal County"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Ural Federal County"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Federal County"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "North-Caucasian Federal County"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Sartu Suediako erakunde zenbaki zuzena."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Sartu Suediako identifikazio zenbaki pertsonala."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Ko-ordenazio zenbakiak ez daude baimenduta."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Sartu Suediako posta kode zuzena XXXXX formatuan."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"EMSOaren lehen 7 digituek iraganeko data zuzen bat adierazi behar dute."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO ez da zuzena."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Sartu zerga zenbaki zuzena SIXXXXXXXX formatuan"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Sartu telefono zenbakia +386XXXXXXXX edo 0XXXXXXXX formatuan."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava region"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice region"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra region"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov region"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin region"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava region"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina region"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Sartu posta kode zuzena XXXXX formatuan."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefono zenbakiak 0XXX XXX XXXX formatuan egon behar dira."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Sartu Turkiako Identifikazio zenbaki zuzena."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turkiako Identifikazio zenbakiak 11 digitu dauzka."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Sartu posta kode zuzena XXXXX edo XXXXX-XXXX formatuan."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefono zenbakiak XXX-XXX-XXXX formatuan egon behar dira."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Sartu EEBBtako Gizarte Segurantza zenbakia XXX-XX-XXXX formatuan."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Sartu EEBB estatu edo lurralde bat."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "AEB estatua (bi letra maiuskula)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "EEBB posta kodea (bi letra maiuskula)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefono zenbakia"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Sartu CI zenbaki zuzena X.XXX.XXX-X,XXXXXXX-X edo XXXXXXXX formatuan."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Sartu CI zenbaki zuzena."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Sartu Hego Afrikako ID zenbaki zuzena"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Sartu Hego Afrikako posta kode zuzena"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/fa/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/fa/LC_MESSAGES/django.mo
deleted file mode 100644
index 2a431c69c4..0000000000
Binary files a/django/contrib/localflavor/locale/fa/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/fa/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/fa/LC_MESSAGES/django.po
deleted file mode 100644
index fd1b2582ff..0000000000
--- a/django/contrib/localflavor/locale/fa/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3529 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Ali Nikneshan <ali@nikneshan.com>, 2011.
-# iman darabi <iman.darabi@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: iman darabi <iman.darabi@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
-"fa/)\n"
-"Language: fa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "کد پستی را به شکل NNNN یا ANNNNAAA وارد کنید."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "در این فیلد فقط عدد می‌توانید وارد کنید."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "این فیلد ۷ یا ۸ رقم لازم دارد."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "یک مقدار  CUITمعتبر به فرم XX-XXXXXXXX-X یا XXXXXXXXXXXX وارد کنید."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "بورگن لاند"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "کرنتن"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "اتریش سفلا"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "اتریش بالا"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "سالزبورگ"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "فورآلبرگ"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "وین"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "کد پستی صحیح را به شکل XXXX وارد کنید."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "شماره معتبر اتريشي تامين اجتماعي را به فرمت xxxxx xxxxxx وارد نماييد"
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "آنتورپ"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "بروکسل"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "فلاندر شرق"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "اهل فلاندرز Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "صاحب تیول"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "لوکزامبورگ"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "والونی Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "فلاندر غرب"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "منطقه بروکسل پایتخت"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "اهل فلاندرز منطقه"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "کد پستی را به شکل XXXXX-XXX وارد کنید."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "شماره تلفنها باید به شکل XX-XXXX-XXXX باشند."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "طول این فیلد حداقل ۱۱ شماره و حداکثر ۱۴ حرف می باشد."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "فیلد حداقل باید ۱۴ شماره باشد"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "کد پستس را به شکل XXX·XXX. وارد کنید."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "خیابان Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "کد پستی را به شکل XXXXX وارد کنید."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "یک کد پستی وارد کنید."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "یک شماره تلفن معتبر وارد کنید."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "این فیلد، ۸ رقم لازم دارد."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "این فیلد ۱۱ رقم لازم دارد."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "ایالت آمریکا(دو حرف بزرگ)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "شماره تلفن"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/fi/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/fi/LC_MESSAGES/django.mo
deleted file mode 100644
index 6bfb0e66e0..0000000000
Binary files a/django/contrib/localflavor/locale/fi/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/fi/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/fi/LC_MESSAGES/django.po
deleted file mode 100644
index d63b69b9d9..0000000000
--- a/django/contrib/localflavor/locale/fi/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3542 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Antti Kaihola <akaihol+transifex@ambitone.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
-"fi/)\n"
-"Language: fi\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Syötä postinumero muodossa NNNN tai ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Tähän kenttään kelpaavat vain numerot."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Tähän kenttään vaaditaan 7 tai 8 numeroa."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Syötä oikea CUIT joko XX-XXXXXXXX-X tai XXXXXXXXXXXX -muodossa."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Virheellinen CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Kärnten"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Ala-Itävalta"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Ylä-Itävalta"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Steiermark"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tiroli"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Wien"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Syötä postinumero muodossa XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Syötä oikea itävaltalainen henkilötunnus muodossa XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Anna nelinumeroinen postinumero."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australian osavaltio"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "australialainen postinumero"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "australialainen puhelinnumero"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bryssel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Itä-Flanderi"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flaamilainen Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Vallonian Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Länsi-Flanderi"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brysselin metropolialue"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "flaamilainen alue"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Syötä postinumero muodossa ja välillä 1XXX–9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Syötä puhelinnumero muodossa 0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/"
-"xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx."
-"xx.xx, 0xxxxxxxx tai 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Syötä postinumero muodossa XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Puhelinnumeron tulee olla muodossa XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Valitse oikea brasilialainen osavaltio. Valitsemasi osavaltio ei ole yksi "
-"sallituista osavaltiosta."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Virheellinen CPF-numero."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Tämä kenttä vaatii vähintään 11 ja enintään 14 merkkiä."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Virheellinen CNPJ-numero."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Tähän kenttään vaaditaan ainakin 14 numeroa."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Syötä postinumero muodossa XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Syötä oikea kanadalainen henkilötunnus muodossa XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Syötä oikea chileläinen RUT"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "The Chilean RUT is not valid."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Syötä postinumero muodossa XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Henkilökortin tunnisteessa on 15 tai 18 numeroa."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Virheellinen henkilökortin numero: väärä tarkistussumma"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Virheellinen henkilökortin numero: virheellinen syntymäaika"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Virheellinen henkilökortin numero: virheellinen sijaintikoodi"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Anna voimassa oleva puhelinnumero."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Anna voimassa oleva matkapuhelinnumero."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praha"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Central Bohemian Region"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "South Bohemian Region"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen Region"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad Region"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti Region"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec Region"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Region"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice Region"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina Region"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "South Moravian Region"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc Region"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zilin region"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravian-Silesian Region"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Syötä postinumero muodossa XXXXX tai XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Syötä henkilötunnus muodossa XXXXXX/XXXX tai XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Virheellinen valinnainen sukupuoli, valitse 'f' (nainen) tai 'm' (mies)"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Syötä oikea henkilötunnus."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Syötä oikea IC-tunnus."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Syötä postinumero muodossa XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Syötä oikea saksalainen henkilötunnus muodossa XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Baleaarit"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúzcoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturia"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Vizcaya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragonia"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturian ruhtinaskunta"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Baleaarit"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskimaa"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanariansaaret"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastilia-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastilia ja León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencia"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Syötä oikea postinumero väliltä ja muodossa 01XXX-52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Syötä oikea puhelinnumero muodoissa 6XXXXXXXX, 8XXXXXXXX tai 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Syötä oikea NIF, NIE tai CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Syötä oikea NIF tai NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Väärä tarkistusnumero NIF:lle."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Väärä tarkistusnumero NIE:lle."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Väärä tarkistusnumero CIF:lle."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Syötä oikea pankin tilinumero muodossa XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Väärä tarkistusnumero pankin tilinumerolle."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Syötä oikea suomalainen henkilötunnus."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Puhelinnumeroiden on ontava muodossa 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Syötä oikea postinumero."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Northern Ireland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Scotland"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Anna kelvollinen 13-numeroinen JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Virhe päivämääräosassa"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Anna kelvollinen 11-numeroinen OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Syötä oikea rekisterikilpi"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Anna kelvollinen sijaintikoodi"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Numero-osa ei voi olla nolla"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Anna kelvollinen 5-numeroinen postinumero"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Syötä oikea puhelinnumero"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Anna oikea suunta- tai matkaviestinverkon numero"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Puhelinnumero on liian pitkä"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Anna kelvollinen 19-numeroinen ja 601983-alkuinen JMBAG"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Syötä oikea postinumero"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Syötä oikea NIK/KTP numero"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Syötä postinumero muodossa XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Syötä oikea henkilötunnus."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Syötä postinumero muodossa XXXXXX tai XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Anna Intian osavaltio tai territorio."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Syötä oikea islantilainen henkilötunnus muodossa XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islantilainen henkilötunnus on virheellinen."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Syötä oikea postinumero."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Syötä oikea henkilötunnus."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Syötä oikea ALV-tunnus."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Syötä postinumero muodossa XXXXXXX tai XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kioto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Syötä oikea kuwaitilainen henkilötunnus"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Henkilökortin tunnisteessa on oltava 4 tai 7 numeroa tai iso kirjain ja 7 "
-"numeroa."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Tässä kentässä pitää olla tasan 13 numeroa."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "UMCN:n ensimmäisten 7 numeron tulee vastata kelvollista päivämäärää."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN ei kelpaa."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Syötä oikea postinumero"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Syötä ikea SoFi-numero"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Syötä oikea norjalainen henkilötunnus."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Tähän kenttään vaaditaan 8 numeroa."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Tähän kenttään vaaditaan 11 numeroa."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Henkilötunnus koostuu 11 numerosta."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Virheellinen tarkistusnumero henkilötunnukselle."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Väärä tarkistusnumero veronumerolle (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "National Business Register -numerossa (REGON) on 9 tai 14 numeroa."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Wrong checksum for the National Business Register Number (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Syötä postinumero muodossa XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Syötä postinumero muodossa XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Puhelinnumeroissa tulee olla 9 numeroa tai niiden kuuluu alkaa +:lla tai  00:"
-"lla."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Syötä oikea CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Syötä oikea CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Syötä oikea IBAN muodossa ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Puhelinnumeron tulee olla muodossa XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Syötä postinumero muodossa XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Syötä oikea ruotsalainen yritystunnus."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Syötä oikea ruotsalainen henkilötunnus."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Co-ordination numbers are not allowed."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Syötä ruotsalainen postinumero muodossa XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Tukholma"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banská Bystrican alue"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislavan alue"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Košicen alue"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitran alue"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Prešovin alue"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trenčínin alue"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava region"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina region"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Syötä postinumero muodossa XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Puhelinnumeroiden pitää olla muodossa 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Syötä oikea turkkilainen henkilötunnus."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turkkilaisessa henkilötunnuksessa pitää olla 11 numeroa."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Phone numbers must be in XXX-XXX-XXXX format."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Enter a U.S. state or territory."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "USA:n osavaltio (suuraakkosin, kaksi kirjainta)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "USA:n postikoodi (kaksi isoa kirjainta)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Puhelinnumero"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Enter a valid CI number."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Enter a valid South African ID number"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Enter a valid South African postal code"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/fr/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/fr/LC_MESSAGES/django.mo
deleted file mode 100644
index a902dc53ef..0000000000
Binary files a/django/contrib/localflavor/locale/fr/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/fr/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/fr/LC_MESSAGES/django.po
deleted file mode 100644
index 5c9c480ddd..0000000000
--- a/django/contrib/localflavor/locale/fr/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3564 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-#   <claude@2xlibre.net>, 2011, 2012.
-# Claude Paroz <claude@2xlibre.net>, 2011.
-# claudep <claude@2xlibre.net>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
-"fr/)\n"
-"Language: fr\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Saisissez un code postal au format NNNN ou ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Ce champ ne doit contenir que des nombres."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Ce champ requiert 7 ou 8 chiffres."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Saisissez un numéro CUIT au format XX-XXXXXXXX-X ou XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT non valide."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthie"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Basse-Autriche"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Haute-Autriche"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styrie"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vienne"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Saisissez un code postal norvégien au format XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Saisissez un numéro de sécurité sociale autrichien valide au format XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Saisissez un code postal à 4 chiffres."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "État australien"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Code postal australien"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Numéro de téléphone australien"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Anvers"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruxelles"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flandre Orientale"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabant flamand"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liège"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limbourg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Brabant wallon"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandre Occidentale"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Région de Bruxelles-Capitale"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Région flamande"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonie"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Saisissez un code postal valide au format et dans l'intervalle 1XXX-9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Saisissez un numéro de téléphone valide dans l'un des formats 0x xxx xx xx, "
-"0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x."
-"xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx ou 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Saisissez un code postal brésilien au format XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Les numéros de téléphone doivent être au format XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Sélectionnez un état brésilien valide. Cet état ne fait pas partie de ceux "
-"disponibles."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Numéro CPF non valide."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Ce champ requiert au plus 11 chiffres ou 14 caractères."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Numéro CNPJ non valide."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Ce champ requiert au minimum 14 chiffres"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Saisissez un code postal au format XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Saisissez un numéro de sécurité sociale canadien au format XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Argovie"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Rhodes-Intérieures"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Rhodes-Extérieures"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Bâle-Ville"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Bâle-Campagne"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genève"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glaris"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Grisons"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchâtel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwald"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwald"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhouse"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Soleure"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Saint Gall"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgovie"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Tessin"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zoug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Saisissez un numéro de passeport ou de carte d'identité suisse valide au "
-"format X1234567<0 ou 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Saisissez un RUT chilien valide."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Saisissez un RUT chilien valide au format XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Ce RUT chilien est non valide."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Saisissez un code postal au format XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Le numéro de carte d'identité consiste en 15 ou 18 chiffres."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Numéro de carte d'identité non valide : mauvaise somme de contrôle"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Numéro de carte d'identité non valide : mauvaise date de naissance"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Numéro de carte d'identité non valide : mauvais code d'emplacement"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Saisissez un numéro de téléphone valide."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Saisissez un numéro de portable valide."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prague"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Bohême du Centre"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Bohême du Sud"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Moravie du Sud"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravie-Silésie"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Saisissez un code postal au format XXXXX ou XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Saisissez une date de naissance au format XXXXXX/XXXX ou XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Le paramètre optionnel du genre est non valide, les valeurs autorisées sont "
-"« f » et « m »"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Saisissez une date de naissance valide."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Saisissez un numéro IC valide."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Bade-Wurtemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavière"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandebourg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Brême"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hambourg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hess"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklembourg-Poméranie occidentale"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Basse Saxe"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Rhénanie-du-Nord-Westphalie"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhénanie-Palatinat"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Sarre"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxe"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxe-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringe"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Saisissez un code postal au format XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Saisissez un numéro de carte d'identité allemande au format XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Îles Baléares"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelone"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadix"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "La Corogne"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Gérone"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Grenade"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúzcoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lérida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcie"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Ténérife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabrie"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Ségovie"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Séville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragone"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valence"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biscaye"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Saragosse"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalousie"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principauté des Asturies"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Îles Baléares"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Pays basque"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Îles Canaries"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castille-La Manche"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castille-et-León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalogne"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Estrémadure"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galice"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcie"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Communauté valencienne"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Saisissez un code postal dans l'intervalle et au format 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Saisissez un numéro de téléphone au format 6XXXXXXXX, 8XXXXXXXX ou 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Saisissez une adresse NIF, NIE ou CIF valide."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Saisissez un NIF ou NIE valide."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Mauvais checksum pour NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Mauvais checksum pour NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Mauvais checksum pour CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Saisissez un numéro de compte bancaire valide au format XXXXX-XXXX-XX-"
-"XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Somme de contrôle non valide pour le numéro de compte bancaire."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Saisissez un numéro de sécurité sociale finlandais."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Les numéros de téléphone doivent être au format 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Saisissez un code postal valide."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornouailles et les îles Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbrie"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Sussex de l'Est"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Grand Londres"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Grand Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancastre"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Yorkshire du Nord"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Yorkshire du Su"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne et Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Midlands de l'Ouest"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Sussex de l'Ouest"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Yorkshire de l'Ouest"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Comté d'Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Comté d'Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Comté de Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Comté de Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Comté de Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Comté de Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid·Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Écosse centrale"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orcades"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Îles Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Hébrides extérieures"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Angleterre"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlande du Nord"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Écosse"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Pays de Galles"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Saisissez un JMBG à 13 chiffres valide"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Erreur dans le segmenet de date"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Saisissez un OIB à 11 chiffres valide"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Saisissez un numéro de plaque d'immatriculation valide"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Saisissez un code d'emplacement valide"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "La partie nombre ne peut pas être à zéro"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Saisissez un code postal à 5 chiffres valide"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Saisissez un numéro de téléphone valide"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Saisissez un code de zone ou de réseau mobile valide"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Le numéro de téléphone est trop long"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Saisissez un JMBAG à 19 chiffres valide, en commençant par 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Le numéro de délivrance de la carte ne peut pas être à zéro"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Ville de Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Comitat de Bjelovar-Bilogora"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Comitat de Brod-Posavina"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Comitat de Dubrovnik-Neretva"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Comitat d'Istrie"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Comitat de Karlovac"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Comitat de Koprivnica-Križevci"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Comitat de Krapina-Zagorje"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Comitat de Lika-Senj"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Comitat de Međimurje"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Comitat d'Osijek-Baranja"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Comitat de Požega-Slavonie"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Comitat de Primorje-Gorski Kotar"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Comitat de Sisak-Moslavina"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Comitat de Split-Dalmatie"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Comitat de Šibenik-Knin"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Comitat de Varaždin"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Comitat de Virovitica-Podravina"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Comitat de Vukovar-Syrmie"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Comitat de Zadar"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Comitat de Zagreb"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Saisissez un code postal valide"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Saisissez un numéro NIK/KTP valide"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Java occidental"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Java central"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Java oriental"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan occidental"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan du sud"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan central"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan oriental"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Île Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Île Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Moluques"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Moluques du nord"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara occidental"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara oriental"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papouasie"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papouasie occidentale"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi occidental"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi du Sud"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi central"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi du Sud-Est"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi du Nord"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumaratera occidental"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera du Sud"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera du Nord"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Megelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps consulaire"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps diplomatique"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi du Nord"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Îles de Sulawesi du Nord"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Florès"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Gouvernement fédéral"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Saisissez un code postal au format XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Saisissez un numéro d'identification valide."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Saisisset un code postal au format XXXXXX ou XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Saisissez un état ou un territoire indien."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Les numéros de téléphone doivent être au format 02X-8X, 03X-7X ou 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Saisissez un code postal islandais valide au format XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Le numéro d'identification islandais est non valide."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Saisissez un code postal valide."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Saisissez un numéro valide de Sécurité Sociale."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Saisissez un numéro de TVA valide."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Saisissez un code postal japonais au format XXXXXXX ou XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaidō"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyōto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyōgo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Ōita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Saisissez un numéro d'identification civil koweïtien valide"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Les numéros de cartes d'identité doivent contenir soit 4 ou 7 chiffres, soit "
-"une lettre majuscule et 7 chiffres."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Ce champ doit contenir exactement 13 chiffres."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Les 7 premiers chiffres de l'UMCN doivent constituer un date passée valide."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "L'UMCN n'est pas valide."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Numéro de carte d'identité de Macédoine"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Une ville de Macédoine (code à 2 caractères)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Numéro de citoyen unique (13 chiffres)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Saisissez un code postal valide au format XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Saisissez un RFC valide."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Somme de contrôle incorrecte pour le RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Saisissez un CURP valide."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Somme de contrôle incorrecte pour le CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "État mexicain (trois lettres majuscules)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Code postal mexicain"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Numéro RFC mexicain"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Numéro CURP mexicain"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "District fédéral"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "État de Mexico"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Saisissez un code postal valide."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Saisissez un numéro SoFi valide."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frise"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gueldre"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningue"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Brabant-du-Nord"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Hollande-du-Nord"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Hollande-Méridionale"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Saisissez un numéro de sécurité sociale norvégien valide."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Ce champ requiert 8 chiffres."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Ce champ requiert 11 chiffres."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Le numéro national d'identification (NIN) comporte 11 chiffres."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Somme de contrôle non valide pour le numéro d'identification national."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-"Le numéro de carte d'identité nationale consiste en 3 lettres et 6 chiffres."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Mauvaise somme de contrôle du numéro de carte d'identité nationale."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Saisissez un code NIP (impôts) au format XXX-XXX-XX-XX, XXX-XX-XX-XXX ou "
-"XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Somme de contrôle non valide du numéro de taxe (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Le numéro de registre du commerce national (REGON) comporte 9 ou 14 chiffres."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Somme de contrôle non valide pour le numéro de registre du commerce national "
-"(REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Saisissez un code postal au format XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Basse-Silésie"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Cujavie-Poméranie"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Łódź"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Petite-Pologne"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Mazovie "
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Basses-Carpates"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlachie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Poméranie"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silésie"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Varmie-Mazurie"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Grande-Pologne"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Poméranie Occidentale"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Saisissez un code postal au format XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Les numéros de téléphone doivent comporter 9 chiffres, ou débuter par un + "
-"ou 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Saisissez une CIF valide."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Saisissez une CNP valide."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Saisissez un IBAN valide au format ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Les numéros de téléphone doivent être au format XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Saisissez un code postal valide au format XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Saisissez un code postal au format XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Saisissez un numéro de passeport au format XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Saisissez un numéro de passeport au format XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "District fédéral central"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "District fédéral du Sud"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "District fédéral du Nord-Ouest"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "District fédéral extrême-oriental"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "District fédéral sibérien"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "District fédéral de l'Oural"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "District fédéral de la Volga"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "District fédéral du Nord-Caucase"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moscou"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Pétersbourg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moscou, Oblast de"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adyguée, République d’"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bachkirie, République de"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Bouriatie, République de"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altaï, République de l'"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Daguestan, République du"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingouchie, République d'"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarie, République de"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmoukie, République de"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karatchaïévo-Tcherkessie, République de"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Carélie, République de"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komis, Répiblique des"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Maris, République des"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovie, République de"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, République de (Iakoutie)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Ossétie-du-Nord-Alanie, République d’"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, République du"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Touva, République de"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Oudmourtie, République d’"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassia, République de"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Tchétchénie, République de"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Tchouvachie, République de"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altaï, Kraï de l’"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Transbaïkalie, Kraï de"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamtchatka, Kraï du"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodar, Kraï de"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoïarsk, Kraï de"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Perm, Kraï de"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorie, Kraï du"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol, Kraï de"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovsk, Kraï de"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amour, Oblast d’"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangelsk, Oblast d’"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhan, Oblast d‘"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorod, Oblast de"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Briansk, Oblast de"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimir, Oblast de"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgograd, Oblast de"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologda, Oblast de"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronej, Oblast de"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovo, Oblast d’"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkoutsk, Oblast d'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningrad, Oblast de "
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kalouga, Oblast de"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovo, Oblast de"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirov, Oblast de"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostroma, Oblast de"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kourgan, Oblast de"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Koursk, Oblast de"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Léningrad, Oblast de"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipetsk, Oblast de"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadan, Oblast de"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Mourmansk, Oblast de"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nijni Novgorod, Oblast de"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorod, Oblast de"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novossibirsk, Oblast de"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omsk, Oblast d'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenbourg, Oblast d’"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orel, Oblast d'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penza, Oblast de"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskov, Oblast de"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostov, Oblast de"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Riazan, Oblast de"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samara, Oblast de"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratov, Oblast de"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhaline, Oblast de"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovsk, Oblast de"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolensk, Oblast de"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambov, Oblast de"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tver, Oblast de"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomsk, Oblast de"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Toula, Oblast de"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tioumen, Oblast de"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Oulianovsk, Oblast d’"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Tcheliabinsk, Oblast de"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Iaroslavl, Oblast de"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Oblast autonome juif"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Nénétsie, District autonome de"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khantys-Mansis, District autonome des"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Tchoukotka, District autonome de"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Iamalo-Nénétsie, District autonome de"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Saisissez un numéro d'organisation suédois valide."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Saisissez un numéro d'identité personnelle suédois valide."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Le nombres de co-ordination ne sont pas autorisés."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Saisissez un code postal suédois au format XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"Les 7 premiers chiffres du EMSO doivent correspondre à une date valide dans "
-"le passé."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "Le EMSO n'est pas valide."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Saisissez un code fiscal valide au format SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Saisissez un numéro de téléphone au format +386XXXXXXXX ou 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banská Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banská Štiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Bánovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytča"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Čadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolný Kubín"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajská Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenné"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kežmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komárno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Košice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Košice·II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Košice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Košice·IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Košice–okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucké Nové Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoča"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovský Mikuláš"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lučenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Námestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nové Mesto nad Váhom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nové Zámky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizánske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piešťany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltár"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Považská Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Prešov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Púchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revúca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavská Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rožňava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ružomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spišská Nová Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stará Ľubovňa"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidník"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Šaľa"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topoľčany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebišov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trenčín"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turčianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdošín"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Veľký Krtíš"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Topľou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlaté Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Žarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Žiar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Žilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Région de Banská Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Région de Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Région de Košice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Prešov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trenčín"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Žilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Saisissez un code postal au format XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Les numéros de téléphone doivent correspondre au format 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Saisissez un numéro d'identification turc valide."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Les numéros d'identification turcs sont formés de 11 chiffres."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Saisissez un code postal américain au format XXXXX ou XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Les numéros de téléphone doivent être au format XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Saisissez un numéro de sécurité sociale américain au format XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Saisissez un état ou un territoire américain."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "État Américain (deux lettres majuscules)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Code postal des États-Unis (deux lettres majuscules)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Numéro de téléphone"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Saisissez un numéro de CI valide au format X.XXX.XXX-X,XXXXXXX-X ou XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Saisissez un numéro CI valide."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Saisissez un numéro d'identification sud-africain valide."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Saisissez un code postal sud-africain valide."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Cap-Oriental"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "État-Libre"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Cap-du-Nord"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Nord-Ouest"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Cap-Occidental"
diff --git a/django/contrib/localflavor/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/fy_NL/LC_MESSAGES/django.mo
deleted file mode 100644
index 89e6b75028..0000000000
Binary files a/django/contrib/localflavor/locale/fy_NL/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/fy_NL/LC_MESSAGES/django.po
deleted file mode 100644
index 9fe32d7d7c..0000000000
--- a/django/contrib/localflavor/locale/fy_NL/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3524 +0,0 @@
-# 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: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2011-03-15 15:41+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: English <en@li.org>\n"
-"Language: fy_NL\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/ga/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ga/LC_MESSAGES/django.mo
deleted file mode 100644
index 4124e81d23..0000000000
Binary files a/django/contrib/localflavor/locale/ga/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ga/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ga/LC_MESSAGES/django.po
deleted file mode 100644
index 93633966af..0000000000
--- a/django/contrib/localflavor/locale/ga/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3560 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Michael Thornhill <michael@maithu.com>, 2011, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-16 12:58+0000\n"
-"Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
-"ga/)\n"
-"Language: ga\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Cuir isteach cód póstal ins an formáid NNNN nó ANNNNAAA"
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Teastaíonn an réimse seo uimhreacha amháin."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Teastaíonn an réimse seo 7 nó 8 digite."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Cuir isteach CUIT bailí i formáid XX-XXXXXXXX-X nó XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT neamhbailí"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "An Ostair íochtarach"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "An Ostair uachtarach"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Tyrol"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vín"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Cuir isteach cód zip ins an formáid XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Iontráil uimhir Ostaire Slándáil Shóisialta bailí i bhformáid XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Iontráil postchód4 dhigit."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Stát na hAstráile"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Postchód Astráil"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Uimhir telefón Astráil"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerp"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "An Bhruiséil"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flóndras Oirthear"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabant Pléimeannach"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Lucsamburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "West Flanders"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Caipitil Réigiún na Bhruiséil"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Réigiún Pléimeannach"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Cuir isteach cód poist bailí sa raon agus formáid 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Cuir isteach uimhir theileafóin bailí i gceann de na formáidí 0x xxx xx xx, "
-"0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x."
-"xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx nó 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Iontráil zip-cód i bhformáid XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Ní mór Uimhreacha teileafóin a chur i XX-XXXX-XXXX format."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Roghnaigh stát na Brasaíle bailí. Ní thugann an Stát sin ar cheann de na "
-"stáit atá ar fáil."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Uimhir CPF neamhbhailí."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-"Éilíonn an réimse seo ag an chuid is mó dhigit 11 nó 14 de charachtair."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Neamhbhailí CNPJ uimhir."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Éilíonn an réimse seo ar a laghad 14 digití"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Iontráil cód poist i bhformáid XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Iontráil uimhir Cheanada Árachais Shóisialaigh bailí i bhformáid XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Talún"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "An Ghinéiv"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zürich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Iontráil aitheantais hEilvéise bailí nó uimhir pas cárta i bhformáid "
-"X1234567<0 nó 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Iontráil RUT Chilean bailí."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Iontráil RUT bailí Chilean. Is é an fhormáid XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Níl an RUT Chilean bailí."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Iontráil postchód i bhformáid XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Uimhir Aitheantais Carta comhdhéanta de 15 nó 18 digití."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Uimhir Aitheantais Carta neamhbhailí: checksum mícheart "
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Carta ID neamhbhailí: breith lá mícheart "
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Carta ID neamhbhailí: cód na háite mícheart "
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Iontráil uimhir theileafóin bailí"
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Cuir isteach uimhir fón bailí."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prague"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Réigiún Central Bohemian"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Réigiún Bohemian Theas"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen Réigiún"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad Réigiún"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti Réigiún"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec Réigiún"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Réigiún"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice Réigiún"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina Réigiún"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Réigiún Moravian Theas"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Réigiún Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Réigiún Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Réigiún Moravian-Silesian"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Iontráil cód poist i bhformáid XXXXX nó XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Iontráil uimhir breithe i bhformáid XXXXXX/XXXX nó XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Paraiméadar inscne roghnach neamhbhailí, is iad 'f' agus 'm' na luachanna "
-"bailí"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Cuir isteach uimhir breithe bailí."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Cuir isteach uimhir IC bailí."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "An Bhaváir"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Beirlín"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Pomerania Thiar"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "An tSacsain Íochtair"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Réin Thuaidh-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Dúiche na Réine-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "An tSacsain"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "An tSacsain-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Iontráil zip-cód i bhformáid XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Iontráil uimhir cárta aitheantais na Gearmáine bailí i bhformáid XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Maidrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Phrionsacht Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Na hOileáin Bhailéaracha"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Tír na mBascach"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Na hOileáin Chanáracha"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilla-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilla agus Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "An Chatalóin"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Réigiún de Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Chomhphobail Foral de Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Iontráil cód poist bailí i raon agus formáid 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Iontráil uimhir theileafóin bailí i gceann de na formáidí 6XXXXXXXX, "
-"8XXXXXXXX nó 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Cuir isteach NIF bailí, NIE, nó CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Cuir isteach NIF bailí nó NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Sheiceála neamhbhailí do NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Sheiceála neamhbhailí do NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Sheiceála neamhbhailí do CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Cuir isteach uimhir chuntais bainc bailí i bhformáid XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Sheiceála neamhbhailí do uimhir cuntas bainc."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Cuir isteach uimhir Fionlainne slándála sóisialta bailí."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Ní mór Uimhreacha teileafóin a chur i bhformáid 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Iontráil postchód bailí."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Corn na Breataine agus na Oileáin Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Contae Aontroma"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Contae Ard Mhacha"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Contae an Dúin"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Contae Fhear Manach"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Contae Dhoire"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Contae Thír Eoghain"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Albain"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries agus Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "na hOiléain Orkney"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "na hOiléain Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Oileáin Iarthair"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Sasana"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Tuaisceart Éireann"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Albain"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "An Bhreatain Bheag"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Iontráil JMBG 13 digit bailí"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Earráid sa deighleog dáta"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Iontráil OIB 11 dhigit bailí "
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Cuir isteach uimhir feithicle bailí pláta cheadúnas"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Iontráil cód suoímh bailí"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Ní féidir an uimhir a bheith nialas"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Iontráil postcód 5 dhigit bailí"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Iontráil uimhir theileafóin bailí"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Cuir isteach limistéar bailí nó cód líonra soghluaiste"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Tá uimhir an fón ró-fhada"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Iontráil JMBAG 19 dhigit bailí ag tosú le 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Ní féidir uimhir eisiúna cárta a bheith nialas"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Iontráil cód poist bailí"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Cuir isteach uimhir NIK/KTP bailí"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Cór gconsalacht"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Cór Taidhleoireachta"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Rialtas Feidearálach"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Aontroim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Ard Mhacha"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Ceatharlach"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "An Cabhan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "An Clar"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Corcaigh"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Doire"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Dún na nGall"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "an Dún"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Baile Atha Cliath"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fear Manach"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Gaillimh"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Chiarrai"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Cill Dara"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Cill Chainnigh"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laoise"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Liatroim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Luimneach"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "An Longfort"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Lú"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mhaigh Eo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "an Mhí"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Muineachán"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Uíbh Fhailí"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Ros Comain"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligeach"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tiobraid Arann"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tír Eoghain"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Port Láirge"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Na hIarmhí"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Loch Garman"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Cill Mhantáin"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Cuir isteach cód poist san fhormáid XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Cuir isteach uimhir aitheantais bailí."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Cuir isteach cód zip san fhormáid XXXXXX nó XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Cuir isteach an stát Indiach nó gcríoch."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Ní mór uimhreacha gutháin a bheith i bhformáid 02X-8x nó 03X-7x nó 04X-6x."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Cuir isteach uimhir aitheantais bailí hÍoslainne. Is é an fhormáid XXXXXX-"
-"XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Níl an uimhir aitheantais hÍoslainne bailí."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Iontráil zip-cód bailí."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Iontráil uimhir Slándáil Shóisialta bailí."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Iontráil uimhir CBL bailí."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Iontráil cód poist i bhformáid XXXXXXX nó XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tóiceo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Iontráil uimhir ID Sibhialta Kuwati bailí"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Ní mór uimhreacha cártaí aitheantais go bhfuil ceachtar 4 go 7 dhigit nó "
-"litir chás uachtair agus 7 digití."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Ba chóir go bhfuil an réimse seo go díreach 13 digití."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Ní mór don chéad 7 dhigit de na UMCN ionadaíocht a dhéanamh ar dháta bailí "
-"anuas."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "Níl an UMCN bailí."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Cárta uimhir aitheantais Macadóinis"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "A bhardas Macadóinis (2 cód carachtar)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Líon saoránach uathúil máistir (13 dhigit)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Cuir isteach cód zip bailí sa XXXXX bhformáid."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Iontráil RFC bailí."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Sheiceála neamhbhailí do RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Iontráil CURP bailí."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Neamhbhailí sheiceála do CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Meicsiceo stáit (trí litreacha cás uachtair)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Cód zip Meicsiceo"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mheicsiceo RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mheicsiceo CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California an Ridire"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Feidearálach"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Rubha"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Iontráil cód poist bailí"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Iontráil uimhir SoFi bailí"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Cuir isteach uimhir leasa na hIorua sóisialta bailí."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Éilíonn an réimse 8 digití."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Éilíonn an réimse seo 11 digití."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Náisiúnta Uimhir Aitheantais comhdhéanta de 11 digití."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Sheiceála mícheart ar an Uimhir Aitheantais Náisiúnta."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-"Is éard atá Náisiúnta Uimhir an Chárta Aitheantais de 3 litreacha agus "
-"digití 6."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Sheiceála mícheart le haghaidh an Chárta ID Náisiúnta."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Cuir isteach ar réimse uimhir cánach (NIP) i bhformáid XXX-XXX-XX-XX, XXX-"
-"XXX-XX XX-nó XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Sheiceála mícheart ar an Uimhir Cánach (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Uimhir Náisiúnta Clár Gnó (REGON) comhdhéanta de 9 nó 14 digití."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Sheiceála Mícheart do Uimhir Ghnó Clár Náisiúnta (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Iontráil cód poist i bhformáid XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Silesia Íochtarach"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "An Pholainn lú "
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "An Pholainn Mór"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Pomerania Thiar"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Iontráil zip-cód i bhformáid XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Ní mór líon Fón tá 9 dhigit, nó tús le + nó 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Iontráil CIF bailí."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Iontráil CNP bailí."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Iontráil IBAN bailí i bhformáid ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Ní mór uimhreacha teileafóin a chur i bhformáid XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Iontráil cód poist bailí i bhformáid XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Cuir isteach postcód san fhormáid XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Iontráil uimhir phas san fhormáid XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Iontráil uimhir phas san fhormáid XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Contae Feidearálach Lár"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Contae Feidearálach Deisceart"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Contae Feidearálach Iar-Tuaisceart"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Contae Feidearálach Fada Oirthear"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Contae Feidearálach Siberian"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Contae Feidearálach Ural"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Contae Feidearálach Privolzhsky"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Contae Feidearálach North-Caucasian"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Cuir isteach uimhir eagraíochta bailí Sualainnis."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Iontráil uimhir aitheantais bailí Sualainnis pearsanta."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Ní líon Comhordaithe Co-cheadaítear."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Iontráil cód poist na Sualainne i bhformáid XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stócólm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"Ní mór don chéad 7 dhigit de na EMSO ionadaíocht a dhéanamh ar dháta bailí "
-"anuas."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "Níl an EMSO bailí."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Iontráil uimhir cánach bailí i bhfoirm SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Cuir isteach uimhir theileafóin i bhfoirm 386 XXXXXXXX nó 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "An Bhratasláiv I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "An Bhratasláiv II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "An Bhratasláiv III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "An Bhratasláiv IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "An Bhratasláiv V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica réigiún"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "An Bhratasláiv réigiún"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice réigiún"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra réigiún"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov réigiún"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin réigiún"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava réigiún"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina réigiún"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Cuir isteach cód poist san fhormáid XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Ní mór líon Fón a bheith i bhformáid 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Iontráil uimhir aitheantais bailí Tuircis."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Ní mór a aithint Tuircis uimhir 11 digití."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Iontráil zip-cód i bhformáid XXXXX nó XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Ní mór uimhreacha teileafóin a chur i format XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Iontráil uimhir Slándáil Shóisialta US bailí i bhformáid XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Iontráil US stát nó i gcríoch."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. stát (dhá litreacha móra)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "US cód poist (dhá litreacha móra)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Uimhir telefón"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Iontráil CI bailí a roinnt i X.XXX.XXX-X, XXXXXXX-X nó XXXXXXXX formáid."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Cuir isteach uimhir IC bailí."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Iontráil uimhir ID hAfraice Theas bailí"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Iontráil cód poist na hAfraice Theas bailí"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Saorstát"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Iarthuaisceart"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/gl/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/gl/LC_MESSAGES/django.mo
deleted file mode 100644
index cd1b3cc302..0000000000
Binary files a/django/contrib/localflavor/locale/gl/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/gl/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/gl/LC_MESSAGES/django.po
deleted file mode 100644
index f707e66fd0..0000000000
--- a/django/contrib/localflavor/locale/gl/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3538 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# fasouto <fsoutomoure@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
-"gl/)\n"
-"Language: gl\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Insira un código postal no formato NNNN ou ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Este campo soamente admite números."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Este campo require 7 ou 8 díxitos."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carintia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Estiria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Insira un código posttal no formato XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Insira un código postal Austríaco no formato XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruxelas"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flandres oriental"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liège"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburgo"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburgo"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandres occidental"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Rexión de Flandres"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Insira un código postal no rango e formato 1XXX  - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Insira un código postal no formato XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Os números de teléfono deben estar no formato XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Número de CPF non válido."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Este campo acepta como máximo 11 díxitos ou 14 caracteres."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Número de CNPJ non válido"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Este campo require polo menos 14 díxitos."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Insira un código postal no formato XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Argovia"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Interior"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Exterior"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basilea-Cidade"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basilea-Campo"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berna"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Friburgo"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Xenebra"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Grisóns"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Xura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerna"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwald"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwald"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Soleura"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "San Galo"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Turgovia"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Tesino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Insira un número válido de tarxeta de identidade ou pasaporte no formato "
-"X1234567<0 ou 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Rexión Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Rexión Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Rexión Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Rexión Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Rexión Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Rexión Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Rexión Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Rexión Moravia do sur"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Rexión Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Rexión Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Insira un código postal no formato XXXXX ou XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Württemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Baviera"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlín"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandemburgo"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburgo"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hesse"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklemburgo-Pomerania Occidental"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Baixa Saxonia"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Renania do Norte-Westfalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Renania-Palatinado"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Sarre"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxonia"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxonia-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Turinxia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Insira un código postal no formato XXXXX"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Insira un número válido de tarxeta de identidade alemá no formato "
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badaxoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illas Baleares"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Cidade Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Xirona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalaxara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúscoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "A Rioxa"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "As Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biscaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalucía"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragón"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principado de Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Illas Baleares"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "País Vasco"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Illas Canarias"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castela-A Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castela e León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Cataluña"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Comunidade Foral de Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Comunidade Valenciana"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Introduza un NIF, NIE ou CIF válido."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Insira un NIF ou NIE válido."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "A suma de verificación do NIF é incorrecta."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "A suma de verificación do NIE é incorrecta."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "A suma de verificación do CIF é incorrecta."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Insira un número válido de tarxeta da seguridade social finlandesa."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Insira un código postal válido."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Escocia central"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Illas occidentais"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Inglaterra"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlanda do norte"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Escocia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "País de Gales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Insira un número de teléfono válido."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Insira un código postal válido."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papúa"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Goberno federal"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublín"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Insira un código postal no formato XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Introduza un número de ID válido."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Insira un número de identificación islandés válido. O formato é XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "O número de identificación islandés non é válido."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Insira un código postal válido."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Insira un número da seguridade social válido."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Insira un número de IVE válido."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Insira un código postal no formato XXXXXXX ou XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaidō"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Toquio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kioto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyōgo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kōchi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Ōita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baixa California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baixa California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Iucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Insira un código postal válido"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frisia"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Insira un número válida da seguridade social norueguesa."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Este campo require 8 díxitos."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Este campo require 11 díxitos."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "O Número de identificación nacional consiste en 11 díxitos."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-"A suma de verificación do Número de identificación nacional é incorrecta."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Insira un código postal no formato XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Baixa silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Gran polonia"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Pomerania occidental"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Insira un código postal no formato XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Os números de teléfono deben ter 9 díxitos, ou comezar por + ou 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Introduza un CIF válido."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Introduza un CNP válido."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Insira un código postal no formato XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Insira un código postal Sueco no formato XXXXX-XXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Estocolmo"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Rexión de Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Insira un código postal válido no formato XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Os números de teléfono deben ter o formato 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Introduza un número de identificación turco válido."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "O número de identificación turco debe ter 11 díxitos."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Insira un código postal no formato XXXXX ou XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Os números de teléfono deben ter o formato XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Insira un número válido da seguridade social dos Estados Unidos no formato "
-"XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Insira un estado ou territorio dos Estados Unidos."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado dos Estados Unidos (dúas letras maiúsculas)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Código postal dos Estados Únidos (dúas letras maiúsculas)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Número de teléfono"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Introduza un número CI válido con formato X.XXX.XXX-X,XXXXXXX-X ou XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Introduza un número CI válido."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Introduza un número de ID sudafricano válido"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Insira un código postal Sudáfricano válido"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Estado libre"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/he/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/he/LC_MESSAGES/django.mo
deleted file mode 100644
index 92f165c57a..0000000000
Binary files a/django/contrib/localflavor/locale/he/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/he/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/he/LC_MESSAGES/django.po
deleted file mode 100644
index a4b7319cba..0000000000
--- a/django/contrib/localflavor/locale/he/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3532 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Alex Gaynor <alex.gaynor@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Alex Gaynor <alex.gaynor@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
-"he/)\n"
-"Language: he\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "יש להזין קוד דואר בתבנית NNNN או ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "יש להזין רק ספרות בשדה זה."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "שדה זה דורש 7 או 8 ספרות."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "יש להזין מספר CUIT חוקי בתבנית XX-XXXXXXXX-X או XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT שגוי"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "\tבורגנלנד"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "קרינתיה"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "אוסטריה התחתונה"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "אוסטריה עילית"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "זלצבורג"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "שטיריה"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "טירול"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "פורארלברג"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "וינה"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "יש להזין מיקוד בתבנית XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "יש להזין מספר ביטוח לאומי אוסטרלי חוקי בתבנית XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "אנטוורפן"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "בריסל"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "מזרח פלנדריה"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "ברבנט הפלמית"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "היינאוט"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "לייז'"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "לימבורג"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "לוקסמבורג"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "נאמור"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "ברבנט הוולונית"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "פלנדריה המערבית"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "אזור פלמי"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "ולוניה"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"יש להזין מספר טלפון חוקי באחד מהפורמטים 0x xxx xx xx, 0xx xx xx xx, 04xx xx "
-"xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx."
-"xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "יש להזין מיקוד בתבנית XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "מספרי טלפון חייבים להיות בתבנית XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "נא לבחור מדינה ברזילאית חוקית. מדינה זו אינה אחת מהמדינות האפשריות."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "מספר CPF לא חוקי"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "שדה זה דורש 11 או 14 ספרות לכל היותר."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "מספר CNPJ לא חוקי"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "שדה זה דורש לפחות 14 ספרות."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "יש להזין מיקוד בתבנית XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "יש להזין מספר ביטוח לאומי קנדי חוקי בתבנית XXX-XXX-XXXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "ארגאו"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "אפנצל אינר־רודן"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "אפנצל אוסר־רודן"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "באזל־שטאדט"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "באזל־לנדשאפט"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "ברן"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "פריבור"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "ג'נבה"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "גלרוס"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "גראובינדן"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "ז'ורה"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "לוצרן"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "נשאטל"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "נידוולדן"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "אובוולדן"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "שפהאוזן"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "שוויץ"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "זולותורן"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "סנט גלן"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "טיצ'ינו"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "אורי"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "ואלה"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "וו"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "צוג"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "ציריך"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr "יש להזין מספר זיהוי או דרכון שוויצרי בתבנית X1234567<0 או 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "יש להזין RUT צ'יליאני חוקי."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "יש להזין RUT צ'יליאני חוקי. התבנית היא XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "שדה RUT צ'יליאני אינו חוקי."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "פראג"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "מרכז בוהמיה"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "דרום בוהמיה"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "מחוז פילזן"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "מחוז או איזור קרלסבד"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "מחוז אוסטי"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "מחוז ליברץ"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "מחוז חרדץ"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "מחוז פרדוביצה"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "מחוז ויסוצ'ינה"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "דרום מורביה"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "מחוז או איזור אולומוק"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "מחוז זלין"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "איזור מורביה – שלזיה"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "יש להזין קוד דואר בתבנית XXXXX או XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "הזן מספר לידה בתבנית XXXXXX/XXXX או XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "המשתנה שהזנת בשדה מין שגוי. הערכים החוקיים הם 'f' ו־'m'."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "הזן מספר לידה חוקי."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "הזן מספר IC חוקי."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "באדן־וירטמברג"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "באווריה"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "ברלין"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "ברנדנבורג"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "ברמן"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "המבורג"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "הסה"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "מקלנבורג-מערב פומרניה"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "סקסוניה התחתונה"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "נורדריין־וסטפאליה"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "ריינלנד־פאלץ"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "חבל הסאר"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "סקסוניה"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "סקסוניה־אנהלט"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "שלזוויג־הולשטיין"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "תורינגיה"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "יש להזין מיקוד בתבנית XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr "יש להזין מספר זיהוי גרמני חוקי בתבנית XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "אראבה"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "אלבסטה"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "אלאקאנט"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "אלמריה"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "אווילה"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "באדאג'וז"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "האיים הבלאריים"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "ברצלונה"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "בורגוס"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "קסרס"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "קדיס"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "קסטלו"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "העיר הקולוניאלית"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "קורדובה"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "א קורוניה"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "קואנקה"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "ז'ירונה"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "גרנדה"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "גוודלחרה"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "גוויפוזקואה"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "אואלבה"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "אואסקה"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "חאאן"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "לאון"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "ליידה"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "לה ריוחה"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "לוגו"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "מדריד"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "מאלאגה"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "מורסיה"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "נווארה"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "אוורנס"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "אסטוריאס"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "פלנסיה"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "לאס פאלמס"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "פונטוורדה"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "סלמנקה"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "סנטה קרוז דה טנריף"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "קנטבריה"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "סגוביה"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "סביליה"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "סוריה"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "טרגונה"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "טרואל"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "טולדו"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "ולנסיה"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "ויאדוליד"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "ביסקאיה"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "סמורה"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "סראגוסה"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "סאוטה"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "מלייה"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "אנדלוסיה"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "אראגון"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "נסיכות אסטוריאס"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "האיים הבלאריים"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "חבל הבסקים"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "האיים הקנריים"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "קסטיליה-לה מנצ'ה"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "קסטיליה ולאון"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "קאטלוניה"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "אקסטרמדורה"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "גאליציה"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "אזור מורסיה"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "הקהילה האוטונומית של נווארה"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "קהילת ולנסיה"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "נא להזין מיקוד חוקי בתחום ובתבנית 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"נא להזין מספר טלפון חוקי באחת מהתבניות 6XXXXXXXX, 8XXXXXXXX  או 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "נא להזין NIF, NIE, או CIF חוקי."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "נא להזין NIF או NIE חוקי."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "סיכום ביקורת שגוי עבור NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "סיכום ביקורת שגוי עבור NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "סיכום ביקורת שגוי עבור CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "נא להזין מספר חשבון בנק חוקי בתבנית XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "סיכום ביקורת שגוי עבור מספר חשבון בנק."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "יש להזין מספר ביטוח לאומי פיני חוקי."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "מספרי טלפון חייבים  להיות בתבנית 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "יש להזין מיקוד חוקי."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr " בדפורשייר"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "באקינגהמשייר"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr " צ'שייר"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "קורנוול ואיי סילי"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr " קאמבריה"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "דרבישייר"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr " דבון"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "דורסט"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "דרהאם"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "מזרח אסקס"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "אסקס"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "גלוסטרשייר"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "לונדון רבתי"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "מנצ'סטר רבתי"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "המפשייר"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "הארטפורדשייר"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "קנט"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "לנקשייר"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "ליסטרשייר"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr " לינקולנשייר"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "מרסיסייד"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "נורפולק"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "צפון יורקשייר"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "נורת'המפטונשייר"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "נורת'אמברלנד"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "נוטינגהאמשייר"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "אוקספורדשייר"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "שרופשייר"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "סומרסט"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "דרום יורקשייר"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "סטאפורדשייר"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr " סאפוק"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "סוריי"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "טיין ו־וויר"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr " וורוויקשייר"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "מערב המידלנדס"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "מערב סאסקס"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "מערב יורקשייר"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr " ווילטשייר"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr " ווסטרשייר"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "מחוז אנטרים"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "ארמה"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "מחוז דאון"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "מחוז פרמאנה"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "מחוז לונדונברי"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "מחוז טיירון"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "קלוויד"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "דייפד"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "גוונט"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "גווינד"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "מרכז גלמורגן"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "ַפואיס"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "דרום גלמורגן"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "מערב גלמורגן"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "גבולות"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "מרכז סקוטלנד"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "דמפרייס וגאלוויי"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "פייף"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr " גרמפיאן"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "רמה"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "לודיאן"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "איי אורקיי"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "איי שטלנד"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "סטראת'קלייד"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "טייסייד"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "האיים המערביים"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "אנגליה"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "צפון אירלנד"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "סקוטלנד"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "וויילס"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "יש להזין מספר רישוי רכב חוקי"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "יש להזין מספר טלפון חוקי"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "יש להזין מיקוד חוקי."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "הזן מספר NIK/KTP חוקי."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "אצ 'ה"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "באלי"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "בנטן"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "בנגולו"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "ג'וקיירטה"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "ג'קרטה"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "גורנטלו"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "ג'מבי"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "ג'אווה מערב"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "ג'אווה מרכז"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "ג'אווה מזרח"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "בורנאו מערב"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "בורנאו דרום"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "בורנאו מרכז"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "בורנאו מזרח"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "איי בנגקה בליטונג"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "איי ריאאו"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "למפונג"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "מאלוקו"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "מאלוקו צפון"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "איי סונדה הקטנים - מערב"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "איי סונדה הקטנים - מזרח"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "פפוא"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "פפוא מערב"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "ריאאו"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "סולבסי מערב"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "סולבסי דרום"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "סולבסי מרכז"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "סולבסי דרום־מזרח"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "סולבסי צפון"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "סומטרה מערב"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "סומטרה דרום"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "סומטרה צפון"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "מאגלנג"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "סורקרטה - סולו"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "מדיון"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "קדירי"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "טפנולי"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "נגרוא אסה דרוסלם"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "בנגה-מליטנג"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "קונסוליות"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "שגרירויות"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "בנדונג"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "סולאוסי צפון"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - טימור"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "איי סולבסי צפון"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - לומבוק"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "פאפו ופאפו מערב"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "סיירבון"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - סומבאווה"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - פלורס"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - סומבה"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "בוגור"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "פקלונגאן"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "סמרנג"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "פאטי"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "סורביה"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "מדורה"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "מאלאנג"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "ג'מבר"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "בניומס"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "ממשל פדרלי"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "בוג'ונגורו"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "פורקוורטה"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "סידוארג'ו"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "גארוט"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "אנטרים"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "ארמאה"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "קארלאו"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "קאוובן"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "קלייר"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "קורק"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "דרי"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "דונגאל"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "דאון"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "דבלין"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "פרמנה"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "גולוויי"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "קרי"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "קילדאר"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "קילקני"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "ליש"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "לייטרים"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "לימריק"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "לונגפורד"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "לאות'"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "מאיו"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "מית'"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "מונהאן"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "אופלי"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "רוסקומון"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "סלייגו"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "טיפררי"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "טיירון"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "ווטפורד"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "וסטמית'"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "וקספורד"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "ויקלו"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "יש להזין מספר זיהות תקף."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "יש להזין מספר זיהוי איסלנדי חוקי. התבנית היא XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "מספר הזיהוי האיסלנדי אינו חוקי"
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "יש להזין מיקוד חוקי."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "יש להזין מספר ביטוח לאומי חוקי."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "יש להזין מספר מע\"מ חוקי"
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "יש להזין קוד דואר בתבנית XXXXXXX או XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "הוקאידו"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "אאומורי"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "מיאגי"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "אקיטה"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "יאמאגטה"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "פוקושימה"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "איברקי"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "טושיגי"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "גונמה"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "סאיטאמה"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "צ'יבה"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "טוקיו"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "קאנגאווה"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "יאמאנשי"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "נאגאנו"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "נייגטה"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "טויאמה"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "אישיקאוואה"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "פוקוי"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "גיפו"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "שיזואוקה"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "אייצ'י"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "מיי"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "שיגה"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "קיוטו"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "אוסקה"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "הייוגו"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "נארה"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "ווקאייאמה"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "טוטורי"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "אוקייאמה"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "הירושימה"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "יאמאגוצ'י"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "טוקושימה"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "קאגאווה"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "קוצ'י"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "פוקוקה"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "סגה"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "נגסקי"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "קומאמוטו"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "אויטה"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "מיאזאקי"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "קגושימה"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "אוקינאווה"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "נא להזין מספר זיהוי כוויתי חוקי"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "אגואסקליינטס"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "באחה קליפורניה"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "באחה קליפורניה הדרומית"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "קמפצ'ה"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "צ'יוואוה"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "צ'יאפס"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "קואהווילה"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "קולימה"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "מחוז פדרלי"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "דוראנגו"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "גררו"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "גואנחואטו"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "אידלגו"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "חליסקו"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "אסטאדו דה מקסיקו"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "מיצ'ואקן"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "מורלוס"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "נייארית"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "נואבו ליאון"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "אואסקה"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "פואבלה"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "קוורטארו"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "קינטאנה רו"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "סינאלוה"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "סאן לואי פוטוסי"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "סונורה"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "טבסקו"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "טמפוליפס"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "טלקסקאלה"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "ורקרוז"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "יוקטן"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "זאקאטקס"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "יש להזין מיקוד חוקי."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "יש להזין מספר SoFi חוקי"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "דרנתה"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "פלבולנד"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "פריזלנד"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "חלדרלנד"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "חרונינגן"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "צפון בראבנט"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "צפון הולנד"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "אובראיסל"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "אוטרכט"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "זילנד"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "דרום הולנד"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "יש להזין מספר ביטוח לאומי נורבגי חוקי."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "שדה זה דורש 8 ספרות."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "שדה זה דורש 11 ספרות."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "מספר זיהוי לאומי מורכב מ-11 ספרות"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "סכום ביקורת שגוי עבור מספר הזיהוי הלאומי"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "סיכום ביקורת שגוי עבור מספר מס (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "מספר רשומת בית עסק ארצי(REGON) מכיל או תשע או ארבע עשרה ספרות."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "סיכום שגוי National Business Register Number (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "נא להזין מיקוד בתבנית XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "סילסיה התחתונה"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "קויאבויה - פומרניה"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "לובלין"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "לובוש"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "לודז'"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "פולין זוטא"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "מזוביה"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "אופולה"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "תת קרפטיה"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "פודלסיה"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "פומרניה"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "סילסיה"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "סבייטוקזי'סקי"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "וורמיה- מזוריה"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "פולין רבתי"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "מערב פומרניה"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "יש להזין מיקוד בתבנית XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "מספרי טלפון חייבים להכיל 9 ספרות, או להתחיל ב + או 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "יש להזין CIF חוקי."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "יש להזין CNP חוקי."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "יש להזין מספר IBAN חוקי בתבנית ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "מספרי טלפון חייבים להיות בתבנית XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "נא להזין מיקוד חוקי בתבנית XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "הזן מספר ארגון שוודי חוקי."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "יש להזין מספר זיהוי אישי שוודי חוקי."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "מספרי שיתוף פעולה אינם מותרים בשימוש"
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "נא להזין מיקוד שוודי בתבנית XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "סטוקהולם"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "וסטרבוטן"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "נורבוטן"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "אופסלה"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "סדרמאנלנד"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "אסטריֶטלנד"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "ינשפין"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "קרונוברג"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "קאלמאר"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "גוטלנד"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "בלשיניה"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "סקונה"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "הלנד"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "יטאלנד המערבית"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "ורמלנד"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "ארברו"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "וסטמנלנד"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "דלארנה"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "יבלבורג"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "וסטרנורלנד"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "ימטלנד"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr " בנסקה ביסטריצה"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "בנסקה שטיאבניצה"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "ברדיוב"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "בנובץ ע\"מ בברבו"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "ברזנו"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "ברטיסלאבה 1"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "ברטיסלאבה 2"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "ברטיסלאבה 3"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "ברטיסלאבה 4"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "ברטיסלאבה 5"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "ביטצ'ה"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "צ'דקה"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "דטבה"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "דולני קובין"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "דונאייסקה סטרדה"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "גלנטה"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "גלניקה"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "הלוהובץ"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "הומנה"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "אילבה"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "קזמרוק"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "קומרנו"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "קושיצה 1"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "קושיצה 2"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "קושיצה 3"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "קושיצה 4"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "קושיצ'ה - אוקולי"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "קרופינה"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "קיוסקה נובה מסטו"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "לביצה"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "לבוצ'ה"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "ליפטובסקי מיקולס"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "לוצ'נץ'"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "מאלאקי"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "מרטין"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "מדזילבורצה"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "מיחלובצה"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "מיאווה"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "נמסטובו"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "ניטרה"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "נובה מסטו ע\"נ וה"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "נווי־זאמקי"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "פרטיזנסקה"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "פזינוק"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "פיאסטאני"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "פולטר"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "פופרד"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "פובסקה ביסטריצ'ה"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "פרשוב"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "פרבידזה"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "פוצ'וב"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "ריץ"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "רימובסקה סובוטה"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "רוזנבה"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "רוזומברוק"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "סבינוב"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "סנץ"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "סניצ'ה"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "סקליצ'ה"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "סנינה"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "סוברנס"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "ספישסקה נובה וס"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "סטרה לובובנה"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "סרטופקוב"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "סבידניק"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "סאלה"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "טופולצ'ני"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "טרביסוב"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "טרנצ'ין"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "טרנאוה"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "טורצינסק טפליץ"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "טברודוסין"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "ולקי קריץ"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "טרנוב ע\"נ טופולו"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "זלטה מורבצה"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "זבולן"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "זרנוביקה"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "ז'יר ע\"נ הרון"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "ז'ילינה"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "מחוז בטנסקה ביסטריקה"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "מחוז ברטיסלבה"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "מחוז קושיצ'ה"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "מחוז ניטרה"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "מחוז פראסוב"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "מחוז טראנצין"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "מחוז טרנאוה"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "מחוז ז'ילינה"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "מספרי טלפון חייבים להיות בפורמט 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "יש להזין מספר זיהות טורקי תקף."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "מספר זיהות טורקי חייב להיות 11 מספרים."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "יש להזין מיקוד חוקי בתבנית XXXXX או XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "מספרי טלפון חייבים להיות בתבנית XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "יש להזין מספר ביטוח לאומי אמריקאי בתבנית XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "יש להזין מדינה או טריטרויה בארה\"ב"
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "מדינה בארה\"ב (שתי אותיות גדולות)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "מספר טלפון"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "יש להזין מספר CI חוקי בתבנית X.XXX.XXX-X,XXXXXXX-X או XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "יש להזין מספר CI חוקי."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "נא להזין מספר זיהוי דרום אפריקאי חוקי"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "נא להזין מיקוד דרום אפריקאי חוקי"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "הכף המזרחי"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "המדינה החופשית"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "גאוטנג"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "קווזולו־נאטאל"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "לימפופו"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "מפומלנגה"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "כף צפוני"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "דרום מערב"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "כף מערבי"
diff --git a/django/contrib/localflavor/locale/hi/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/hi/LC_MESSAGES/django.mo
deleted file mode 100644
index a98ebc02bc..0000000000
Binary files a/django/contrib/localflavor/locale/hi/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/hi/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/hi/LC_MESSAGES/django.po
deleted file mode 100644
index 400c6ce167..0000000000
--- a/django/contrib/localflavor/locale/hi/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3540 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# chandankumar(ciypro) <chandankumar.093047@gmail.com>, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Sandeep Satavlekar <sandysat@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-15 13:28+0000\n"
-"Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
-"hi/)\n"
-"Language: hi\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "डाक संहिता को NNNN अथवा ANNNNAAA के प्रतिरूप में दर्ज करें ।"
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "इस क्षेत्र में संख्या भरें ।"
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "इस क्षेत्र में 7 अथवा 8 अंक दर्ज करें ।"
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "मान्य CUIT XX-XXXXXXXX-X अथवा XXXXXXXXXXXX प्रतिरूप में गर्ज करें ।"
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "अमान्य CUIT"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "बर्गनलान्ड"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "कारिन्थिया"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "निम्न आस्ट्रिया"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "ऊपरी आस्ट्रिया"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "साल्जबर्ग"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "स्टीरिया"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "टैराल"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "वोरार्लबर्ग"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "वियेन्ना"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "डाक संहिता को XXXX के प्रतिरूप में दर्ज करें ।"
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "मान्य आस्ट्रियन सोशल सेक्यूरिटी अंक को XXXX XXXXXX प्रतिरूप में भरें"
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "4 अंकों का पिन कोड दर्ज करें."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "ऑस्ट्रेलियाई राज्य"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "ऑस्ट्रेलियाई पोस्टकोड"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "ऑस्ट्रेलियाई टेलिफोन नम्बर"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "एंटवर्प"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "ब्रसेल्स"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "पूरब फ़्लैंडर्स"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "फ़्लेमिश ब्राबांट"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "हैनॉट"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "लीग"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "लिम्बर्ग"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "लक्ज़मबर्ग"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "नामुर"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "वालून ब्राबांट"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "पश्चिम फ़्लैंडर्स"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "ब्रुसेल्स राजधानी क्षेत्र"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "फ्लेमिश क्षेत्र"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "वालोनिया"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "1XXX - 9XXX सीमा और प्रारूप  में एक वैध डाक कोड दर्ज करें."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"इन में से एक स्वरूपों में एक वैध फ़ोन नंबर दर्ज करें 0x xxx xx xx, 0xx xx xx xx, 04xx xx "
-"xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx."
-"xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxxमें एक वैध फ़ोन नंबर दर्ज करें."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "डाक संहिता को XXXXX-XXX के प्रतिरूप में दर्ज करें ।"
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "टेलिफ़ोन संख्या XX-XXXX-XXXX प्रतिरूप में होनी चाहिए ।"
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "मान्य ब्रजिलियन राज्य चुनिए । यह राज्य उपस्थित राज्यों में नहीं है ।"
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "अमान्य CPF संख्या ।"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "इस क्षेत्र में 11 अथवा 14 अक्षर भरें ।"
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "अमान्य CNPJ संख्या ।"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "इस क्षेत्र में कम से कम 14 अंक भरें"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "डाक संहिता के XXX XXX प्रतिरूप में भरें ।"
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "मान्य कनेडियन सोशल सेक्यूरिटी संख्या को XXX-XXX-XXX प्रतिरूप में भरें ।"
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "आरगाव"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "अप्पेनजेल इन्नरहोडन"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "अप्पेनजेल ओसरहोडन"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "बासेल-सटाड्ट"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "बासेल-लान्ड"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "बर्न"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "फ्रीबोर्ग"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "जेनीवा"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "ग्लारस"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "ग्राबुएन्डन"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "जुरा"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "लुसेर्न"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "न्यूकाटेल"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "निड्वाल्ढेन"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "ओब्वालडेन"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "षाफहौसेन"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "ष्विज"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "सोलोथर्न"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "सन्त.गालेन"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "थुर्गाव"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "टिचिनो"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "उरी"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "वलैस"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "वौड"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "जुग"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "जूरिच"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"मान्य स्विस्स पहचान अथवा पास्सपोर्ट संख्या को X1234567<0 अथवा 1234567890 प्रतिरूप में "
-"भरें ।"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "मान्य चिली कि RUT भरें ।"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "मान्य चिली कि RUT भरें । XX.XXX.XXX-X प्रतिरूप में भरें ।"
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "यह चिली का RUT अमान्य है ।"
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "डाक संहिता को XXXXXX प्रतिरूप में भरें ।"
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "आईडी कार्ड नंबर 15 या 18 अंकों के होते हैं."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "अवैध आईडी कार्ड नंबर:गलत जाँचयोग"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "अवैध आईडी कार्ड नंबर: गलत जन्मतिथि"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "अवैध आईडी कार्ड संख्या: गलत स्थान कोड"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "वैध फ़ोन नंबर दर्ज करें."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "एक वैध सेल नंबर दर्ज करें."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "प्राग"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "मध्य बोहेनिया क्षेत्र"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "दक्षिण बोहेनिया क्षेत्र"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "प्लज़ेन क्षेत्र"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad क्षेत्र"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti क्षेत्र"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec क्षेत्र"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec क्षेत्र"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice क्षेत्र"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina क्षेत्र"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "दक्षिण मोरावियन क्षेत्र"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "ओलोोमोक क्षेत्र"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin क्षेत्र"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "मोरावियन-सिलेसियन क्षेत्र"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "डाक संहिता को XXXXX अथवा XXX XX प्रतिरूप में भरें ।"
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "XXXXXX/XXXXयाXXXXXXXXXX प्रारूप में जन्म संख्या दर्ज करें."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "अवैध वैकल्पिक पैरामीटर लिंग, वैध मान 'f' और 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "वैध जन्म संख्या दर्ज करें."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "वैध आईसी संख्या दर्ज करें."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "बाडेन-वुएर्टेम्बर्ग"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "बवारिया"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "बर्लिन"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "ब्रान्डेनबर्ग"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "ब्रेमेन"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "हाम्बर्ग"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "हेस्सेन"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "मेकलेनबर्ग"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "लोअर साक्सोनी"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "उत्तरी रैन-वेस्टफालिया"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "रैनलान्ड-पलाटिनेट"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "सारलान्ड"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "साक्सोनी"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "साक्सोनी-अन्हाल्ट"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "ष्लेस्विग-होल्स्टैन"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "थुरिन्गिया"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "डाक संहिता को XXXXX प्रतिरूप में भरें ।"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"मान्य जर्मन पहचान पत्र संख्या को XXXXXXXXXXX-XXXXXXX-XXXXXXX-X प्ततिरूप में भरें ।"
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "अरवा"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "अल्बासेट"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "अलाकान्ट"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "अल्मेरिया"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "अविला"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "बडाजोज"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "इल्लेस बालियर्स"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "बार्सिलोना"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "बर्गोस"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "कासेरेस"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "काडीज"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "कास्टेल्लो"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "स्यूडाड रियल"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "कोर्डोबा"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "आ कोरुन्या"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "कुएन्का"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "गिरोना"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "ग्रनडा"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "गुवाडलाजारा"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "गुविपुज्कोवा"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "हुएल्का"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "हुएस्का"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "जैन"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "लियोन"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "ल्लैडा"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "ला रियोजा"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "लुगो"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "माड्रिड"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "मलगा"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "मुर्किया"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "नवारे"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "अवर्सेन्स"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "अस्टुरियास"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "पलेन्शिया"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "ला पामास"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "पोन्टेवेड्रा"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "सलामन्का"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "सान्टा क्रूज द टेनेरिफे"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "कन्टाब्रिया"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "सेजोविया"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "सेविल्ला"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "सोरिया"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "तारागोना"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "तेरुवेल"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "टोलिडो"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "वलेन्शिया"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "वलाडोयिड"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "बिजकाया"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "जमोरा"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "जारागोस्सा"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "क्यूटा"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "मेलिल्ला"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "अन्डालुसिया"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "आरगोन"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "प्रिनसिपालिटी आफ अस्टुरियास"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "बलीयरिक द्वीप"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "बास्क देश"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "कनरी द्वीप"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "कास्टील-ला मान्का"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "कास्टील ओर लियोन"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "कटलोनिया"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "एक्स्ट्रीमदूरा"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "गलीशिया"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "मुर्किया प्रान्त"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "नवारे की फोरल समाज"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "वलेन्शियन समाज"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "मान्य डाक संहिता को 01XXX - 52XXX के श्रेणी और प्ततिरूप में भरें ।"
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"मान्य टेलिफोन संख्या को किसी एक प्रतिरूप में भरें : 6XXXXXXXX, 8XXXXXXXX अथवा "
-"9XXXXXXXX ।"
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "कृपया मान्य NIF, NIE अथवा CIF भरें ।"
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "कृपया मान्य NIF अथवा NIE भरें ।"
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "NIF के लिए अमान्य जाँच योग ।"
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "NIE के लिए अमान्य जाँच योग ।"
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "CIF के लिए अमान्य जाँच योग ।"
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "कृपया मान्य बैंक खाता संख्या को XXXX-XXXX-XX-XXXXXXXXXX प्रतिरूप में भरें ।"
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "बैंक खाता संख्या के लिए अमान्य जाँच योग ।"
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "मान्य फिन्निश सोशल सेक्यूरिटी संख्या भरें ।"
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "फोन नंबर 0x XX XX XX XX प्रारूप में होना चाहिए है."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "मान्य डाक संहिता भरें ।"
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "बेडफार्डशायर"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "बकहिन्गमशायर"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "चेशायर"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "कार्नवाल और सिसिली द्वीप"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "क्मब्रिया"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "डेर्बीशायर"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "डेवोन"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "डोर्सेट"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "डर्हम"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "पूर्वी सस्सेक्स"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "एस्सेक्स"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "ग्लौसेस्टरशायर"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "ग्रेटर लन्डन"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "ग्रेटर मानचेस्टर"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "हाम्पशायर"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "हर्टफार्डशायर"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "केन्ट"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "लान्काशायर"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "लेसेस्टशायर"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "लिन्कनशायर"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "मेर्सीसैड"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "नोर्फोक"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "उत्तरी यार्कशायर"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "नार्थाम्पटनशायर"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "नार्थम्बरलान्ड"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "नाटिन्गहमशायर"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "आक्सफर्डशायर"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "श्रापशायर"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "सोमर्सेट"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "दक्षिणी यार्कशायर"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "स्टाफोर्डशायर"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "सफ्फोक"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "सर्रे"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "टैन और वेर"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "वार्विकशायर"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "पश्चिमी मिडलान्ड"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "पश्चिमी ससेक्स"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "पश्चिमी यार्कशायर"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "विल्टशायर"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "वर्सेस्टशायर"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "कौन्टी आन्ट्रिम"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "कौन्टी आर्माघ"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "कौन्टी डौन"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "कौन्टी फर्मानाघ"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "कौन्टी लन्डनडेर्री"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "कौन्टी टैरोन"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "लिविड"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "डैफेड"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "ग्वेन्ट"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "ग्वैनीड"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "मिड ग्लामोर्गान"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "पोवीस"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "दक्षिणी ग्लामोर्गान"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "पश्चिमी ग्लामोर्गान"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "बोर्डार्स"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "सेंट्रल स्काटलान्ड"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "डमफ्रैस और गालोवे"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "फिफे"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "ग्राम्पियेन"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "हैलान्ड"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "लोथियन"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "ओर्कनी द्वीप"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "शेटलान्ड द्वीप"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "स्ट्राथक्लैड"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "टेसैड"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "पश्चिमी आय्लस"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "इन्गलान्ड"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "उत्तरी आयरलान्ड"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "स्काटलान्ड"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "वेल्स"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "वैध 13 अंक JMBG दर्ज करें"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "तारीख खंड में त्रुटि"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "वैध 11 अंकीय OIB दर्ज करें"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "वैध वाहन के लाइसेंस प्लेट संख्या दर्ज करें"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "वैध स्थान कोड दर्ज करें"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "संख्या हिस्सा शून्य नहीं हो सकते है "
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "वैध 5 अंक का डाक कोड दर्ज करें"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "मान्य टेलिफोन संख्या भरें"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "मान्य क्षेत्र या मोबाइल नेटवर्क कोड दर्ज करें"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "फोन नंबर बहुत लंबा है"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "मान्य 19 अंकीय JMBAG जो 601,983 के साथ शुरू हो दर्ज करें"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "कार्ड जारी संख्या शून्य नहीं हो सकते है"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "ग्रद ज़ाग्रेब"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "ब्जेलोवार्सको-बिलोगोर्सका जुपानिजा "
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "ब्रोद्सको-पोसव्सका जुपानिजा"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "दुब्रोवाच्को-नेरेत्वन्सका जुपानिजा"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "इस्तार्सका जुपानिजा"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "कर्लोवाच्का जुपानिजा"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "कोप्रिव्निच्को-क्रिज़ेवाच्का जुपानिजा"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "क्रपिन्सको-ज़गोर्सका जुपानिजा"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "लिच्को-सेंज्सका जुपानिजा"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "मेदिमुर्सका जुपानिजा"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "ओस्जेच्को-बरंज्सका जुपानिजा"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "पोज़ेसको-स्लावोंसका जुपानिजा"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "प्रिमोर्सको-गोरंसका जुपानिजा "
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "सिसच्को-मोस्लावाच्का जुपानिजा"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "स्प्लित्सको-दल्मातिन्सका जुपानिजा"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "सिबेंसको-क्निन्सका जुपानिजा"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "वरज्दिन्सका जुपानिजा"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "विरोवितिच्को-पोद्रव्सका जुपानिजा"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "वुकोवार्सको-सृजेम्सका जुपानिजा "
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "ज़दार्सका जुपानिजा"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "ज़ग्रेबच्का जुपानिजा"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "मान्य डाक कोड दर्ज करें"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "वैध निक/KTP संख्या दर्ज करें"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "आचे"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "बाली"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "बेंटन"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "बेंग्कुलु"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "योग्याकार्ता"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "जकार्ता"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "गोरोंटलो"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "जाम्बी "
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "जावा बारत"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "जावा तेंगाह"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "जावा तिमुर"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "कालीमंतन बैरेट"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "कालीमंतन सेलातान"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "कालीमंतन तेंगाह "
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "कालीमंतन तिमुर "
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "केपुलौँ बंगका-बेलितुंग "
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "केपुलौँ  इऔ  "
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "लम्पुंग"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "मालुकु  "
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "मालुकु उतरा "
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "नुसा तेंग्गारा बारात "
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "नुसा तेंग्गारा तिमुर "
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "पापुआ "
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "पापुआ बारात "
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr " इऔ"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "सुलावेसी बारात "
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "सुलावेसी सलतन "
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "सुलावेसी तेंगाह "
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "सुलावेसी तेंग्गारा "
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "सुलावेसी उतरा "
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "सुमतेरा बारात "
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "सुमतेरा सलतन "
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "सुमतेरा उतरा "
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "मगेलंग "
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "सुरकर्ता-सोलो "
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "मदिउन"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "केदिरी "
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "तपनुली "
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "नंग्ग्रोए असह दारुस्सलाम "
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "केपुलौँ बंगका बेलितुंग "
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "वाहिनी दूतावास"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "राजनयिक कोर"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "बैंडुंग"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "सुलावेसी उतरा दरतन "
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - तिमोर"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "सुलावेसी उतरा केपुलौँ "
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB -लोम्बोक "
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "पापुआ दान पापुआ बारात "
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "सिरेबों "
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - सुम्बावा"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - फ्लोरेस"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT-सुम्बा "
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "बोगोर"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "पेकलोंगन "
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "सेमारंग "
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "पति"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "सुराबाया "
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "मदुरा "
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "मलंग "
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "जेम्बेर "
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "बन्युमस "
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "संघीय सरकार"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "बोजोनेगोरो "
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "पुर्वाकर्ता "
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "सिदोअर्जो "
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "गृत "
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "आन्ट्रिम"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "आर्माघ"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "कार्लो"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "कैवन"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "क्लेयर"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "कॉर्क"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "डेरी"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "डोनेगल"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "नीचे"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "डबलिन"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "फर्मानाघ"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "गैल्वे"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "केरी"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "किल्दारे "
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "किल्केंन्य"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "लोइस "
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "लेइत्रिम "
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "लिमेरिच्क "
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "लोंग्फोर्ड "
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "लौट "
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "मैयो"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "माथ "
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "मोनाघन "
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "ओफ्फली "
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "रोस्कोम्मों "
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "स्लीगो "
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "टिप्पेरारी "
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "टैरोन"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "वातेर्फोर्ड "
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "वेस्त्माथ "
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "वेक्सफोर्ड "
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "विच्क्लो "
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "डाक संहिता को XXX XX प्रतिरूप में भरें"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr " वैध आइ.डि संख्या भरें."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "डाक संहिता को XXXXXX या XXX XXXके प्रतिरूप में दर्ज करें ।"
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "भारतीय राज्य या क्षेत्र दर्ज करें."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "फोन नंबर  02X-8X या 03X-7X या 04X-6Xप्रारूप में होना चाहिए है."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "मान्य आइस्लान्डिक पहचान संख्या भरें । उसका प्रतिरूप XXXXXX-XXXX है ।"
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "यह आइस्लान्डिक पहचान संख्या अमान्य है ।"
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "मान्य डाक संहिता भरें ।"
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "मान्य सोशल सेक्यूरिटी संख्या भरें ।"
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "मान्य VAT संख्या भरें ।"
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "डाक संहिता को XXXXXXX or XXX-XXXX प्रतिरूप में भरें ।"
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "होक्कायिडो"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "औमोरी"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "इवाटे"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "मियागी"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "अकीटा"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "यमागाटा"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "फुकुशीमा"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "इबाराकी"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "तोचिगी"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "गन्मा"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "सैतामा"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "चीबा"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "टोकियो"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "कनगावा"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "यमनाशी"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "नगानो"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "नीगाटा"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "तोयामा"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "इशीकावा"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "फुकुयी"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "गिफू"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "शिजुकोवा"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "ऐची"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "मी"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "शिगा"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "क्योटो"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "ओसाका"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "ह्योगो"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "नारा"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "वकायामा"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "टोत्तोरी"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "शिमाने"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "ओकयामा"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "हिरोशीमा"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "यामागुची"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "टोकुशीमा"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "कगावा"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "एहीमे"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "कोची"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "फुकुवोका"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "सागा"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "नागासाकी"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "कुमामोटो"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "ओइटा"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "मियाजाकी"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "कागोशीमा"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "ओकिनावा"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "मान्य कुवैती नागरिक ID संख्या दर्ज करें"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"पहचान कार्ड नंबर या तो 4 से 7 अंक या एक अपरकेस अक्षर और 7 अंको  का होना चाहिए."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "इस क्षेत्र में वास्तव में 13 अंक होने चाहिए."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "UMCN के पहले 7 अंकों एक मान्य पिछले तारीख का प्रतिनिधित्व करना चाहिए."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN मान्य नहीं है."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "एरोड्रोम"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "अरसिनोवो  "
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "बेरोवो "
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "बितोला "
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "बोग्दंची "
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "बोगोविन्जे "
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "बोसिलोवो "
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "ब्र्वेनिचा "
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "बुटेल "
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "वलान्दोवो "
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "वसिलेवो "
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "वेव्कानी "
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "वेल्स "
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "विनिचा "
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "व्रनेस्तिचा  "
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "व्रप्सिस्ते "
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "गाजी बाबा "
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "गेव्गेलिजा "
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "गोस्तिवर "
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "ग्राद्सको "
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "देबर "
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "देबर्चा "
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "देल्सवो "
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "देमिर कपिजा  "
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "देमिर हिसार "
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "दोल्नेनी "
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "दृगोवो "
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "ग्जोर्चे पेत्रोव "
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "ज़ेलिनो "
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "ज़जास  "
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "ज़ेलेनिकोवो "
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "ज्र्नोव्ची "
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "इलिंदें "
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "जेगुनोव्स "
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "कवदर्ची "
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "कर्बिंची "
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "कर्पोस "
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "किसेला वोडा "
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "किसवो "
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr " कोंचे "
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "कोकानी "
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "क्रतोवो "
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "करिव पलंका "
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "क्रिवोगास्तानी "
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "कृसेवो "
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "कुमनोवो "
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "लिप्कोवो "
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "लोज़ोवो "
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "मव्रोवो  इ  रोस्तुसा "
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "मकेदोंसका कामेनीका  "
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "मकेदोंसकी ब्रोड "
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "मोगिला "
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "नेगोतिनो "
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "नोवाची "
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "नोवो सेलो "
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "ओस्लोमेज "
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "ओहरिड"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "पेट्रोवेक "
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "पह्सवो "
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "प्लास्निचा "
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "प्रिलेप "
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "प्रोबिस्तिप "
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "रादोविस "
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "रंकोव्स "
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "रेसें "
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "रोसोमन "
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "सरज  "
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "स्वेती निकोले "
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "सोपिस्ते "
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "स्टार दोज्रण "
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "स्तरों नागोरिकाने "
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "स्त्रुगा "
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "स्त्रुमिचा "
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "स्तुदेनिकानी "
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "टारस "
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "तेतोवो "
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "सेंटर "
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "सेंटर-जुप "
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "सैर "
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "केसका"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "ससिनोवो-ओब्लेसेवो "
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "कसर-संदेवो "
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "स्टिप "
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "सुतो ओरिज़री "
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "मैसेडोनिया पहचान कार्ड संख्या"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "मैसेडोनिया नगर पालिका (2 वर्ण कोड)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "अनोखी मास्टर नागरिक संख्या (13 अंक)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "प्रारूप XXXXX में एक मान्य ज़िप कोड दर्ज करें."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "मान्य RFC दर्ज करें."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "RFC के लिए अमान्य जाँचयोग."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "मान्य CURP दर्ज करें."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "CURP के लिए अमान्य जाँचयोग."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "मेक्सिको राज्य (तीन बड़े अक्षरों)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "मेक्सिको ज़िप कोड"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "मेक्सिकन RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "मेक्सिकन CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "अगुवास्कालियेन्टेस"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "बाहा कालिफोर्निया"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "बाहा कालिफोर्निया सर"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "कम्पीची"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "चिहुआहुआ"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "चियापास"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "कोहुइला"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "कोलिमा"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "डिस्ट्रिटो फेड्रल"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "डुरान्गो"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "गुवेरेर्रो"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "गुवानाजुवाटो"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "हिडाल्गो"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "जलिस्को"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "एस्टादो द मेक्सिको"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "मिचोवाकान"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "मोरेलोस"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "नायारिट"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "नुवेवो लियोन"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "ओक्साका"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "पुवेब्ला"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "क्वेरेतारो"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "क्विन्ताना रू"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "सिनालोवा"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "सेन लुविस पोटोसि"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "सोनोरा"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "टबास्को"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "टमौलिपास"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "लाक्सकाला"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "वेराक्रूज"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "युकाटान"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "जकाटेकास"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "मान्य डाक संहिता भरें"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "मान्य SoFi संख्या भरें"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "ड्रेनथ"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "फ्लेवोलान्ड"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "फ्रैस्लान्ड"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "जेल्डेर्लान्ड"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "ग्रोनिजेन"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "नूर्ड-ब्राबान्ट"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "नूर्ड-हालान्ड"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "ओवरिस्सेल"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "उट्रेक्क"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "जीलान्ड"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "ज्वीड-हालान्ड"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "मान्य नोर्वेजी सोशल सेक्यौरिटी संख्या भरें ।"
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "इस क्षेत्र में 8 अंक भरें ।"
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "इस क्षेंत्र में 11 अंक भरें ।"
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "राष्ट्रीय पहचान संख्या में 11 अंक भरें ।"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "राष्ट्रीय पहचान संख्या में गलत जाँच योग ।"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "राष्ट्रीय आईडी कार्ड संख्या 3 अक्षरों और 6 अंकों के होते हैं."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "राष्ट्रीय आईडी कार्ड संख्या के लिए गलत जाँचयोग."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"कर संख्या क्षेत्र (NIP) को XXX-XXX-XX-XX, XXX-XX-XX-XXX अथवा   XXXXXXXXXX प्रतोरूप "
-"में भरें."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "कर संख्या के लिए गलत जाँच योग ।"
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "राष्ट्रीय व्यापार पंजीकरण संख्या (REGON) 9 या 14 अंक के होते हैं."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "राष्ट्रीय व्यापार रजिस्टर संख्या (REGON) के लिए गलत चेकसम."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "डाक संहिता को XX-XXX प्रतिरूप में भरें ।"
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "लोवर सिलेसिया"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "कुयाविया-पोमेरानिया"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "लब्लिन"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "लुबुस्ज"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "लोड्ज"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "लेस्सर पोलान्ड"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "मसोविया"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "ओपोल"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "सबकारपेथिया"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "पोदलासी"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "पोमेरानिया"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "सिलेसिया"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "स्विटोक्रिस्की"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "वार्मिया-मासुरिया"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "ग्रेटर पोलान्ड"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "पश्चिम पोमेरानिया"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "XXXX-XXX प्रारूप में ज़िप कोड दर्ज करें."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "फ़ोन नंबर 9 अंक के होते है, या + या 00 से शुरू करते हैं."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "मान्य CIF भरें ।"
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "मान्य CNP भरें ।"
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "मान्य IBAN को ROXX-XXXX-XXXX-XXXX-XXXX-XXXX प्रतिरूप में भरें ।"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "टेलिफोन संख्या को XXXX-XXXXXX प्रतिरूप में भरें ।"
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "मान्य डाक संहिता को XXXXXX प्रतिरूप में भरें ।"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "XXXXXX प्रारूप में डाक कोड दर्ज करें."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "XXXX XXXXXX प्रारूप में पासपोर्ट संख्या दर्ज करें."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "XX xxxxxxx प्रारूप में पासपोर्ट संख्या दर्ज करें."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "केन्द्रीय संघीय काउंटी"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "दक्षिण संघीय काउंटी"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "उत्तर-पश्चिम संघीय काउंटी"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "सुदूर-पूर्व संघीय काउंटी"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "साइबेरियाई संघीय काउंटी"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "यूराल संघीय काउंटी"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "प्रिवोल्जह्स्क्य संघीय काउंटी"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "उत्तर-कोकेशियान संघीय काउंटी"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "मॉस्क्वा"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "सेंट-पीटर्सबर्ग"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "मोस्कोव्स्काया ओब्लास्ट"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "अद्य्गेया, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "बश्कोर्तोस्तान, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr " बुर्यटिया, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "अल्ती, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "दागेस्तान, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "इन्गुश्स्काया  रेस्पुब्लिका "
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "कबर्दिनो-बल्कार्स्काया  रेस्पुब्लिका "
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "कल्म्य्किया , रेस्पुब्लिका "
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "कराचेवो-चेर्केस्स्काया रेस्पुब्लिका "
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "करेलिया, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "कोमी, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "मरीय एहल , रेस्पुब्लिका "
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "मोर्दोविया, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "सखा, रेस्पुब्लिका (याकुतिया )"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "सेवेर्नाया ओसेटिया, रेस्पुब्लिका (अलानिया)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "तातार्स्तान, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "त्य्वा, रेस्पुब्लिका (तुवा)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "उद्मुर्त्स्काया रेस्पुब्लिका "
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "खाकस्सिया, रेस्पुब्लिका "
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "चेचेंस्काया रेस्पुब्लिका"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "चुवाश्स्काया रेस्पुब्लिका "
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "अल्ताय्स्कीय क्रय  "
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "ज़बय्कल्स्कीय  क्रय "
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "कम्चात्स्कीय  क्रय "
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "क्रस्नोदार्स्कीय  क्रय "
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "क्रस्नोयार्स्कीय  क्रय "
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "पेर्म्स्कीय  क्रय "
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "प्रिमोर्स्कीय  क्रय "
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "स्टाव्रोपोल'सिय्य  क्रय "
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "खबरोव्स्कीय  क्रय "
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "अमुर्स्काया ओब्लास्ट' "
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "अर्खंगेल'स्काय  ओब्लास्ट'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "अस्त्रखान्स्काया  ओब्लास्ट'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "बेल्गोरोद्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "ब्र्यांस्काया ओब्लास्ट '"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "व्लादिमिर्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "वोल्गोग्रद्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "वोलोगोद्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "वोरोनेज्ह्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "इवानोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "इर्कुत्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "कलिनिन्ग्रद्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "कलुज्ह्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "केमेरोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "किरोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "कोस्त्रोम्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "कुर्गंस्काया ओब्लास्ट '"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "कुर्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "लेनिन्ग्रद्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "लिपेच्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "मगदंस्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "मुर्मंस्काया ओब्लास्ट '"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "निज्हेगोरोद्स्काजा ओब्लास्ट'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "नोव्गोरोद्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "नोवोसिबिर्स्काया ओब्लास्ट '"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "ओम्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "ओरेंबुर्ग्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "ओर्लोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "पेंज़ेन्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "प्स्कोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "रोस्तोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "र्जज़न्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "समर्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "सरतोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "सखालिंस्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "स्वेर्द्लोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "स्मोलेंस्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "तम्बोव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "त्वेर्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "तोम्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "टूल'स्काय  ओब्लास्ट'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "त्युमेंस्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "उल'इअनोव्स्कय  ओब्लास्ट '"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "चेल्याबिन्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "यारोस्लाव्स्काया ओब्लास्ट'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "एव्रेय्स्काया अव्तोनोम्नाजा  ओब्लास्ट'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "नेनेच्कीय औतोनोम्न्य्य ओकृग "
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "खांटी-मंसिय्स्कीय अव्तोनोम्न्य्य ओकृग - युगरा "
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "चुकोत्स्कीय अव्तोनोम्न्य्य ओकृग "
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "यमलो-नेनेच्कीय  अव्तोनोम्न्य्य ओकृग "
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "मान्य स्वीडिश संगठन संख्या दर्ज करें."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "मान्य स्वीडिश व्यक्तिगत पहचान संख्या दर्ज करें."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "समन्वय नंबर स्वीकार्य नहीं हैं."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "XXXXX प्रारूप में स्वीडिश डाक कोड दर्ज करें."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "स्टॉकहॉम"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "वास्तेबोतेन "
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "नारबोटेन "
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "उपासला"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "सोदेरमानलैंड "
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "ओस्टेरगोटलैंड "
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "जोंकोपिंग"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "क्रोनोबर्ग "
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "कालमार"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "गोटलैंड "
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "ब्लेकिंगे "
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "स्काने "
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "हालैंड "
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "वस्त्रा गाटलैंड "
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "वार्मलैंड "
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "ओरेब्रो"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "वास्टमैनलैंड  "
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "डालार्ना "
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "गावलेबार्ग "
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "वास्तरनारलैंड "
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "जामलैंड "
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "EMSO के पहले 7 अंकों एक मान्य पिछले तारीख का प्रतिनिधित्व करना चाहिए."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO मान्य नहीं है."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "प्रपत्र SIXXXXXXXX में एक मान्य टैक्स संख्या दर्ज करें"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "प्रपत्र 386 XXXXXXXX या 0XXXXXXXX में फोन नंबर दर्ज करें."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "बान्का बिस्ट्रिका"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "बान्का स्टियानिका"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "बार्डेजोव"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "बनोव्स नाड बेब्राव"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "ब्रेजनोव"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "ब्राटिस्लावा 1"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "ब्राटिस्लावा 2"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "ब्राटिस्लावा 3"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "ब्राटिस्लावा 4"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "ब्राटिस्लावा 5"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "बैट्चा"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "काड्का"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "डेत्वा"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "डोल्नी कुबिन"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "डुनास्का स्ट्रेडा"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "गलान्टा"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "गेल्निका"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "लोहोवेक"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "हुमेन्न"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "ल्लावा"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "केजमारोक"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "कोमार्नो"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "कोसिस 1"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "कोसिस 2"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "कोसिस 3"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "कोसिस 4"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "कोसिस - ओकोली"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "क्रूपिना"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "क्यसुके नोवे मेस्तो"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "लेविस"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "लेवोका"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "लिप्टोस्की मिकुलास"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "लुसेनेक"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "मलाकी"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "मार्टिन"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "मेड्जिलाबोर्स"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "मिकालोव्स"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "मैजावा"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "नमस्तोवो"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "निट्रा"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "नोवे मेस्टो नाड वाहोम"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "नोवे जाम्की"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "पार्तिजास्के"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "पेजिनोक"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "पियेस्तानी"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "पोल्टार"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "पोप्राड"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "पोवास्का बैस्ट्रिका"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "प्रेसोव"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "प्रियेविसा"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "पुकाव"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "रेवुका"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "रिमास्का सोबोटा"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "रोजोनावा"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "रुजोम्बेरोक"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "सबिनोव"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "सेनेक"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "सेनिका"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "स्कालिका"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "स्नीना"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "सोब्रानस"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "स्पिस्का नोवा वेस"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "स्टारा लुब्नोवा"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "स्ट्रोकोव"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "स्विड्निक"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "साला"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "टोपोल्कानी"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "ट्रेबिसोव"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "ट्रेन्किन"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "ट्रनावा"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "टुर्षियान्के टेप्लिस"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "दोसिन"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "वेलकी रिटिस"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "रानोव नाड टोप्लोव"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "लाटे मोरास"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "वोलेन"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "जार्नोडिका"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "जियर नाड रोनोम"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "जिलिना"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "बान्का बिस्ट्रिका प्रान्त"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "ब्राटिस्लावा प्रान्त"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "कोसिस प्रान्त"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "निट्रा प्रान्त"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "प्रेसोव प्रान्त"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "ट्रेन्किन प्रान्त"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "नावा प्रान्त"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "जिलिना प्रान्त"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "डाक संहिता को XXX XX प्रतिरूप में भरें."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "टेलिफोन संख्या को 0XXX XXX XXXX- प्रतिरूप में भरें ।"
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "मान्य तुर्की पहचान संख्या दर्ज करें."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "तुर्की पहचान संख्या 11 अंकों का होना चाहिए."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "डाक संहिता को XXXXX अथवा XXXXX-XXXX प्रतिरूप में भरें ।"
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "टेलिफोन संख्या को -XXX XXX -XXXX- प्रतिरूप में भरें ।"
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "मान्य U.S सोशल सेक्यूरिटी संख्या को XXX-XX-XXXX प्रतिरूप में भरें ।"
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "एक अमेरिकी राज्य या क्षेत्र दर्ज करें."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "अमेरिकी राज्य (दो अपरकेस अक्षर)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "अमेरिकी डाक कोड (दो बड़े अक्षरों)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "टेलिफोन संख्या"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "X.XXX.XXX - X, xxxxxxx - X या XXXXXXXX प्रारूप में मान्य सीआई संख्या दर्ज करें."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "वैध आईसी संख्या दर्ज करें."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "मान्य दक्षिणि आफ्रिकी आइ.डि संख्या भरें"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "मान्य दक्षिणि आफ्रिकी डाक संहिता संख्या भरें"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "पूर्वी केप"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "फ्री स्टेट"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "गौटेन्ग"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "क्वाजूलू-नटाल"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "लिम्पोपो"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "पुमलान्गा"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "उत्तरी केप"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "उत्तर पूर्व"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "पश्चिमी केप"
diff --git a/django/contrib/localflavor/locale/hr/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/hr/LC_MESSAGES/django.mo
deleted file mode 100644
index f82722b249..0000000000
Binary files a/django/contrib/localflavor/locale/hr/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/hr/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/hr/LC_MESSAGES/django.po
deleted file mode 100644
index f72ecdfeba..0000000000
--- a/django/contrib/localflavor/locale/hr/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3546 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# aljosa <aljosa.mohorovic@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: aljosa <aljosa.mohorovic@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
-"hr/)\n"
-"Language: hr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Unesite ispravan poštanski broj formata NNNN ili ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Ovo polje zahtjeva samo brojeve."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Ovo polje zahtjeva 7 ili 8 numeričkih znakova."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Unesite ispravan CUIT formata XX-XXXXXXXX-X ili XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Neispravan CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Donja Austrija"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Gornja Austrija"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Štajerska"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Beč"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Unesite zip kod formata XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Unesite ispravan broj socijalnog osiguranja Austrije formata XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brisel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Istočna Flandrija"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamanski Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Valonski Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Zapadna Flandrija"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brussels Capital Region"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flamanska regija"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonija"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Unesite važeći poštanski broj u rasponu i formatu 1xxx - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Unesite valjani broj telefona u jednom od formata 0x xxx xx xx, xx xx xx "
-"0xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x . xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx ili 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Unesite zip kod formata XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonski brojevi moraju biti formata XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Izaberite ispravnu brazilsku državu. Država nije jedna od dostupnih država."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Neispravan CPF broj."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Ovo polje zahtjeva najviše 11 numeričkih znakova ili 14 slova."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Neispravan CNPJ broj."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Ovo polje zahtjeva bar 14 numeričkih znakova"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Unesite poštanski broj formata XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Unesite valjani kanadski broj socijalnog osiguranja formata XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ženeva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Unesite ispravan švicarski identifikacijski broj ili broj putovnice formata "
-"X1234567<0 ili 1234567890"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Unesite ispravan čileanski RUT"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Unesite ispravan čileanski RUT formata XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Čileanski RUT nije ispravan."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prag"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Središnja Češka"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Južna Češka"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Plzeňski kraj"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlovarski kraj"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Ústečki kraj"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberečki kraj"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Královéhradečki kraj"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubički kraj"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysočina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Južna Moravska"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomoučki kraj"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlínski kraj"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravsko-šleski kraj"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Unesi ispravan poštanski broj formata XXXXX ili XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Unesite datum rođenja formata XXXXXX/XXXX ili XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Neispravnan opcijonalni parametar spol, ispravne vrijednosti su 'f' i 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Unesite ispravan datum rodenja."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Unesite ispravan IC broj."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Donja Saska"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Sjeverno Porajnje-Zapadna Falačka"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saska"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Unesite zip kod formata XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Unesite broj njemačke identifikacijske kartice formata XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Kneževina Asturija"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearsko otočje"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskija"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanarski Otoci"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastilja-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastilja i Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalonija"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Regija Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Unesite ispravan poštanski broj u rasponu i formatu od 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Unesite ispravan broj telefona u jednom od formata 6XXXXXXXX, 8XXXXXXXX ili "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Unesite ispravan NIF, NIE ili CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Molim unesite ispravan NIF ili NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Neispravan checksum za NIF"
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Neispravan checksum za NIF"
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Neispravan checksum za CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Molim unesite ispravan broj bankovnog računa formata XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Neispravan checksum za broj bankovnog računa."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Unesite ispravan broj finskog socijalnog osiguranja."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonski brojevi moraju biti formata 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Unesite ispravan poštanski broj."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall i Otoci Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Županija Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Županija Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Županija Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Županija Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Županija Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Županija Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Južni Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Zapadni Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Centralna Škotska"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Zapadno Otočje"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Engleska"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Sjeverna irska"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Škotska"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Unesite ispravanu registraciju za vozilo"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Unesite ispravan telefonski broj"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Unesite ispravan poštanski broj"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Unesite ispravan NIK/KTP broj."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Džakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federalna vlada"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wexford"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Unesite poštanski broj u formatu XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Unesite valjani ID broj."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Unesite ispravan islandski identifikacijski broj formata XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islandski identifikacijski broj nije ispravan."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Unesite ispravan zip kod."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Unesite ispravan broj socijalnog osiguranja."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Unesite ispravan VAT broj."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Unesite poštanski broj formata XXXXXXX or XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Unesi ispravan kuvajtski Civil ID broj."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Država Meksiko"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Unesite ispravan poštanski broj"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Unesite ispravan SoFi broj"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Unesite ispravan broj norveškog socijalnog osiguranja."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Ovo polje zahtjeva 8 numeričkih znakova."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Ovo polje zahtjeva 11 numeričkih znakova."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Nacionalni identifikacijski broj sadrži 11 numeričkih znakova."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Neispravan checksum za Nacionalni identifikacijski broj."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Neispravan checksum za porezni broj (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"National Business Register Number (REGON) sastoji se od 9 ili 14 numeričkih "
-"znakova."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Neispravan checked za National Business Register Number (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Unesi poštanski broj formata XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Donja Šleska"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Mala Poljska"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Šleska"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Unesite poštanski broj u formatu XXX-XXXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefonski brojevi moraju imati 9 brojeva, ili početi sa + ili 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Unesite ispravan CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Unesite ispravan CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Unesite ispravan IBAN formata ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonski brojevi moraju biti formata XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Unesite ispravan poštanski broj formata XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Unesite valjani broj švedske organizacije."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Unesite ispravan švedski osobni identifikacijski broj."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinacijski brojevi nisu dozvoljeni."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Unesite švedski poštanski broj formata XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Regija Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Regija Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Regija Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Regija Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Regija Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Regija Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Regija Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Regija Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Unesite poštanski broj u formatu XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefonski brojevi moraju biti u 0XXX XXX XXXX formatu."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Unesite valjani turski identifikacijski broj."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turski Identifikacioni broj mora biti 11 znamenki."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Unesite zip kod formata XXXXX or XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonski brojevi moraju biti u XXX-XXX-XXXX formatu."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Unesi ispravan broj socijalnog osiguranja S.A.D.-a formata XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Unesite državu ili teritorij u SAD-u."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Država S.A.D.-a (dva velika slova)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Američki poštanski broj (dva velika slova)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonski broj"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Unesite valjani CI broj u X.XXX.XXX-X, XXXXXXX-X ili XXXXXXXX formatu."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Unesite ispravan CI broj."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Unesi ispravan južnoafrički ID broj."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Unesite ispravan južnoafrički poštanski broj."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/hu/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/hu/LC_MESSAGES/django.mo
deleted file mode 100644
index 56b2458f2e..0000000000
Binary files a/django/contrib/localflavor/locale/hu/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/hu/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/hu/LC_MESSAGES/django.po
deleted file mode 100644
index af64482c54..0000000000
--- a/django/contrib/localflavor/locale/hu/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3561 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Attila Nagy <>, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# János Péter Ronkay <transifex@hangya.net>, 2012.
-# Kristóf Gruber <>, 2012.
-# Szilveszter Farkas <szilveszter.farkas@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-20 00:00+0000\n"
-"Last-Translator: Attila Nagy <>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
-"language/hu/)\n"
-"Language: hu\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Adjon meg egy irányítószámot 'NNNN' vagy 'ANNNNAA' alakban."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Ez a mező csak számokat tartalmazhat."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Ennek a mezőnek 7 vagy 8 számjegyet kell tartalmaznia."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"Adjon meg egy érvényes CUIT-t 'XX-XXXXXXXX', vagy 'XXXXXXXXXXXX' alakban."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Érvénytelen CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Karintia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Alsó-Ausztria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Felső-Ausztria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Stájerország"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Bécs"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Adjon meg egy irányítószámot 'XXXX' alakban."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Adjon meg egy érvényes ausztriai társadalombiztosítási azonosítót 'XXXX "
-"XXXXXX' alakban."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Adjon meg egy négy számjegyű irányítószámot."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Ausztrál szövetségi állam"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Ausztrál irányítószám"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Ausztrál telefonszám"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brüsszel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Kelet-Flandria"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamand Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liége"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Vallon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Nyugat-Flandria"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brüsszel fővárosi régió"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flamand régió"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallónia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Adjon meg egy érvényes irányítószámot 1XXX-9XXX tartományban és formátumban."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Adjon meg egy érvényes telefonszámot az alábbi formátumok egyikében: 0x xxx "
-"xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx."
-"xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx, vagy 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Adjon meg egy irányítószámot 'XXXXX-XXX' alakban."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "A telefonszámoknak 'XXX-XXX-XXXX' formátumúnak kell lenniük."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Válasszon ki egy érvényes brazil államot. Az Ön választása nincs az elérhető "
-"lehetőségek között."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Érvénytelen CPF szám."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Ez a mező legfeljebb 11 számjegyet vagy 14 karaktert tartalmazhat."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Érvénytelen CNPJ szám."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Ennek a mezőnek legalább 14 számjegyet kell tartalmaznia."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Írjon be egy irányítószámot 'XXX XXX' alakban."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Adjon meg egy érvényes kanadai egészségbiztosítási számot 'XXX-XXX-XXX' "
-"alakban."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Bázel-város"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Bázel-vidék"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genf"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zürich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Adjon meg egy érvényes svájci személyazonosító vagy útlevél számot "
-"\"X1234567<0\" vagy \"1234567890\" alakban."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Adjon meg egy érvényes chilei RUT-ot."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Adjon meg egy érvényes chilei RUT-ot 'XX.XXX.XXX-X' alakban."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "A chilei RUT érvénytelen."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Adjon meg egy 'XXXXXX' formátumú irányítószámot."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "A személyi igazolvány szám 15 vagy 18 jegyből áll."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Hibás személyi igazolvány szám: Hibás ellenőrző összeg"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Hibás személyi igazolvány szám: Hibás születési dátum"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Hibás személyi igazolvány szám: Hibás hely kód"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Adjon meg egy érvényes telefonszámot."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Adj meg érvényes mobil számot!"
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prága"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Közép-Csehországi kerület"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Dél-Csehországi kerület"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Plzeňi kerület"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlovy Vary-i kerület"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Ústí nad Labem-i kerület"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Libereci kerület"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Králové-i kerület"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubicei kerület"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysočina kerület"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Dél-Morva kerület"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouci kerület"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlíni kerület"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Morva–Sziléziai kerület"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Adjon meg egy irányítószámot 'XXXXX' vagy 'XXX XX' alakban."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Adjon meg egy születési számot XXXXXX/XXXX, vagy XXXXXXXXXX formátumban."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Érvénytelen nem. Érvényes értékek: 'f' és 'm'."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Adjon meg egy érvényes születési számot."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Adjon meg egy érvényes IC számot."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Württemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bajorország"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bréma"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Nyugat-Pomeránia"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Alsó-Szászország"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Észak-Rajna-Vesztfália"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Szárföld"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Szászország"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Szász-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Türingia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Adjon meg egy irányítószámot 'XXXXX' alakban."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Adjon meg egy érvényes német személyazonosító számot \"XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X\" alakban."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Baleár szigetek"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgosz"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palenica"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalúzia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asztúriák tartománya"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Baleár-szigetek"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baszkföld"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanári-szigetek"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kasztília-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kasztília és Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalónia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galícia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murciai régió"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarrai autonóm közösség"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valenciai közösség"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Adjon meg egy irányítószámot '01XXX-52XXX' alakban és tartományban."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Adjon meg egy telefonszámot '6XXXXXXXX', '8XXXXXXXX' vagy '9XXXXXXXX' "
-"alakban."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Adjon meg egy érvényes NIF-et, NIE-t, vagy CIF-et."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Adjon meg egy érvényes NIF-et vagy NIE-t."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Érvénytelen NIF ellenőrzőösszeg."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Érvénytelen NIE ellenőrzőösszeg."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Érvénytelen CIF ellenőrzőösszeg."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Adjon meg egy érvényes bankszámlaszámot 'XXXX.XXXX-XX-XXXXXXXXXX' alakban."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Érvénytelen bankszámlaszám ellenőrzőösszeg."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Adjon meg egy érvényes finn társadalombiztosítási számot."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "A telefonszámnak 0X XX XX XX XX formátumban kell lennie."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Adjon meg egy érvényes irányítószámot."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertofrdshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Linclonshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Aounty Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamoran"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Közép-Skócia"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkey-szigetek"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland-szigetek"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglia"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Észak-Írország"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Skócia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "A 13 számjegyű JMBG megadása"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Hiba a dátum szegmensben"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "A 11 számjegyű OIB megadása"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Adjon meg egy érvényes rendszámot"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Adj meg érvényes hely kódot"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "A szám rész nem lehet nulla"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Adjon meg egy érvényes öt számjegyű irányítószámot."
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Adjon meg egy érvényes telefonszámot."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Adj meg érvényes vonalas vagy mobil körzet számot"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "A telefonszám túl hosszú"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "A kártya kibocsájtási száma nem lehet nulla"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Adjon meg egy érvényes irányítószámot"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Adjon meg egy érvényes NIK/KTP számot"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Dzsakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Adjon meg egy irányítószámot XXXXX formátumban."
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Adjon meg egy érvényes ID számot."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Adjon meg egy 'XXXXXX' vagy 'XXX XXX' formátumú irányítószámot."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Adj meg egy indiai államot vagy területet"
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "A telefonszámokat 02X-8X, 03X-7X vagy 04X-6X formában kell megadni."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Adjon meg egy érvényes izlandi személyazonosító számot \"XXXXXX-XXXX\" "
-"alakban."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Az izlandi személyazonosító szám érvénytelen."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Adjon meg egy érvényes irányítószámot."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Adjon meg egy érvényes társadalombiztosítási számot."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Adjon meg egy érvényes ÁFA számot."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Adjon meg egy irányítószámot \"XXXXXXX\" vagy \"XXX-XXXX\" alakban."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tókió"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kiotó"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Oszaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagaszaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Adjon meg egy érvények kuvaiti Civil ID számot"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Az azonosító kártya számok 4 vagy 7 számjegyet, vagy egy nagy betűt majd 7 "
-"számjegyet kell, hogy tartalmazzanak"
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Ennek a mezőnek pontosan 13 számot kell tartalmaznia."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "Érvénytelen UMCN."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Macedón azonosító kártya szám"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Macedón község (2 karakter)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Érvénytelen RFC ellenőrzőösszeg."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Érvénytelen CURP ellenőrzőösszeg."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mexikói állam (három nagybetűs rövidítés)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexikói irányító szám"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexikói RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexikói CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distritio Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Mexikóváros"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "SOnora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Adjon meg egy érvényes irányítószámot. "
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Adjon meg egy érvényes SoFi számot."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Adjon meg egy érvényes norvég társadalombiztosítási számot."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Ennek a mezőnek 8 számjegyet kell tartalmaznia."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Ennek a mezőnek 11 számjegyet kell tartalmaznia."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "A nemzeti azonosítószám 11 számjegyből áll."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Hibás a nemzeti azonosítószám ellenőrző kódja."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-"A Nemzeti Személyi Azonosító Szám 3 karaktert és 6 számjegyet tartalmaz."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Érvénytelen a Nemzeti Személyi Azonosító Szám ellenőrzőösszege."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Hibás az adószám (NIP) ellenőrzőösszege."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "A nemzeti vállakozásregisztrációs szám (REGON) 9 vagy 14 számból áll."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Hibás a nemzeti üzleti azonosítószám (REGON) ellenőrzőösszege."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Adjon meg egy irányítószámot 'XX-XXX' alakban."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Alsó-Szilézia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Kis-Lengyelország"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Mazóvia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Szubkárpátok"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomeránia"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Szilézia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Nagy-Lengyelország"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Nyugat-Pomeránia"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Adjon meg egy irányítószámot XXXX-XXX formátumban."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"A telefonszámnak 9 számjegyből kell állnia, vagy +-szal, vagy 00-val kell "
-"kezdődnie."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Adjon meg egy érvényes CIF-t."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Adjon meg egy érvényes CNP-t."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-"Adjon meg egy érvényes nemzetközi bankszámlaszámot 'ROXX-XXXX-XXXX-XXXX-XXXX-"
-"XXXX-XXXX' alakban."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "A telefonszámoknak 'XXXX-XXXXXX' formátumúnak kell lenniük."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Adjon meg egy érvényes irányítószámot 'XXXXXX' alakban."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Add meg a postai kódot XXXXXX formában"
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Add meg az útlevél számot XXXX XXXXXX formában"
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Add meg az útlevél számot XX XXXXXXX formában"
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Központi szövetségi körzet"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Déli szövetségi körzet"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Északnyugati szövetségi körzet"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Távol-keleti szövetségi körzet"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Szibériai szövetségi körzet"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Uráli szövetségi körzet"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Volga-menti szövetségi körzet"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Észak-kaukázusi szövetségi körzet"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moszkva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Szentpétervár"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moszkvai terület"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adige Köztársaság"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Baskír Köztársaság"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Burját Köztársaság"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altaj Köztársaság"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagesztáni Köztársaság"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingus Köztársaság"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabard- és Balkárföld"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmük Köztársaság"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karacsáj-Cserkeszföld"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karélia Köztársaság"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr " Komi Köztársaság"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Marij El Köztársaság"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordvin Köztársaság"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Szaha Köztársaság (Jakutföld)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Észak-Oszétia Köztársaság (Alánia)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatár Köztársaság"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tuvai Köztársaság (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurt Köztársaság"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Hakaszföld"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Csecsen Köztársaság"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Csuvasföld"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altaji határterület"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Bajkálontúli határterület"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamcsatkai határterület"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasznodari határterület"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasznojarszki határterület"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permi határterület"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Tengermelléki határterület"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Sztavropoli határterület"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Habarovszki határterület"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadani terület"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanszki terület"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nyizsnyij Novgorod-i terület"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodi terület"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novoszibirszki terület"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omszki terület"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgi terület"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orjoli terület"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzai terület"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pszkovi terület"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rosztovi terület"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanyi terület"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Szamarai terület"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Szaratovi terület"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Szahalini terület"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Szverdlovi terület"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Szmolenszki terület"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovi terület"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tveri terület"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomszki terület"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tulai terület"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenyi terület"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Uljanovszki terület"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Cseljabinszki terület"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Jaroszlavli terület"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Zsidó Autonóm Terület"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Nyenyec Autonóm KörzetNyenyec Autonóm Körzet"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Hanti-Manysi Autonóm Körzet"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Csukcs Autonóm Körzet"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Jamali Nyenyec Autonóm Körzet"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Adjon meg egy érvényes svéd szervezeti számot."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Adjon meg egy érvényes svéd személyi számot."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinációs számok nem megengedettek."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Adjon meg egy svéd irányítószámot XXXXX formátumban."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "Az EMSO első 7 számjegyének érvényes, múltbéli dátumot kell jelölnie."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "Érvénytelen EMSO."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Adj meg érvényes adószámot SIXXXXXXXX formában"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "A telefonszámot +386XXXXXXXX vagy 0XXXXXXXX formátumban kell megadnod"
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Besztercebánya"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Selmecbánya"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bártfa"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Pozsony I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Pozsony II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Pozsony III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Pozsony IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Pozsony V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunaszerdahely"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galánta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Késmárk"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komárom"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kassa I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kassa II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kassa III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kassa IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kassa - környék"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Léva"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptószentmiklós"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Losonc"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacka"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Túrócszentmárton"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nyitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Érsekújvár"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprád"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Eperjes"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimaszombat"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rozsnyó"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Rózsahegy"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Igló"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sellye"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencsén"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Nagyszombat"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zólyom"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zsolna"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Besztercebánya régió"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Pozsony régió"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kassa régió"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nyitra régió"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Eperjesi régió"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencsén régió"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Nagyszombati régió"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zsolna régió"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Adjon meg egy irányítószámot XXXXX formátumban."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "A telefonszámnak 0XXX XXX XXXX formátumban kell lennie."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Adjon meg egy érvényes török azonosító számot."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Egy török azonosító szám 11 számjegyből áll."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Adjon meg egy irányítószámot 'XXXXX', vagy 'XXXXX-XXXX' alakban."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "A telefonszámnak XXX-XXX-XXXX formátumban kell lennie."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Adjon meg egy érvényes USA SSN-t 'XXX-XX-XXXX' formátumban."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Adjon meg egy U.S. államot vagy területet."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "USA állam (két nagybetű)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "U.S. postai azonosító (két nagybetű)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonszám"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Adjon meg egy érvényes CI számot X.XXX.XXX-X,XXXXXXX-X, vagy XXXXXXXX "
-"formátumban."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Adjon meg egy érvényes CI számot."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Adjon meg egy érvényes dél-afrikai azonosító számot."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Adjon meg egy érvényes dél-afrikai irányítószámot."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu -Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/id/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/id/LC_MESSAGES/django.mo
deleted file mode 100644
index 93c2970e49..0000000000
Binary files a/django/contrib/localflavor/locale/id/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/id/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/id/LC_MESSAGES/django.po
deleted file mode 100644
index 6f340c1fb8..0000000000
--- a/django/contrib/localflavor/locale/id/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3555 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# rodin <romihardiyanto@gmail.com>, 2011.
-#   <romihardiyanto@gmail.com>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:41+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
-"language/id/)\n"
-"Language: id\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Masukkan kode pos dalam format NNNN atau ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Bidang ini hanya membutuhkan isian angka."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Bidang ini membutuhkan isian sebanyak 7 atau 8 angka."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Masukkan CUIT yang valid dalam format XX-XXXXXXXX-X atau XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT salah."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Lower Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Upper Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Wina"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Masukkan kode pos dalam format XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Masukkan Nomor Identifikasi Sosial Austria yang valid dalam format XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Masukkan 4 angka kode pos"
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Negara Bagian Australia"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Kode pos Australia"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Nomor telepon Australia"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerp"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brussels"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "East Flanders"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flemish Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "West Flanders"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brussels Capital Region"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flemish Region"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Masukkan kode pos yang valid dalam rentang dan format 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Masukkan nomor telepon yang valid dalam salah satu format sebagai berikut: "
-"0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/"
-"xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx, atau "
-"04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Masukkan kode pos dalam format XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Nomor telepon harus dalam format XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Pilih negara bagian Brazil yang valid. Provinsi ini tidak termasuk dalam "
-"daftar negara bagian."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Nomor CPF salah."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-"Bidang ini hanya membutuhkan isian paling banyak 11 angka atau 14 huruf."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Nomor CNPJ salah."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Bidang ini membutuhkan sedikitnya 14 angka"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Masukkan kode pos dalam format XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Masukkan nomor Asuransi Sosial Kanada yang valid dalam format XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Masukkan identitas atau nomor paspor Swiss yang valid dalam bentuk "
-"X1234567<0 atau 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Masukkan RUT Chile yang valid."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Masukkan RUT Chile yang valid. Formatnya adalah XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "RUT Chile salah."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Masukkan angka kode pos dalam format XXXXXX"
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Nomor Kartu ID terdiri dari 15 atau 18 angka."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Nomor Kartu ID tidak valid: Ceksum salah"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Nomor Kartu ID tidak valid: Tanggal lahir salah"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Nomor Kartu ID tidak valid: Kode lokasi salah"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Masukkan nomor telepon yang valid."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Masukkan nomor ponsel yang valid."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praha"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Daerah Bohemia Tengah"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Daerah Bohemia Selatan"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Daerah Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Daerah Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Daerah Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Daerah Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Daerah Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Daerah Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Daerah Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Daerah Moravia Selatan"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Daerah Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Daerah Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Daerah Moravia-Silesian"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Masukkan kode pos dalam format XXXXX atau XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Masukkan tanggal lahir dalam format XXXXXX/XXXX atau XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Parameter opsional jenis kelamin salah, pilih 'f' atau 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Masukkan tanggal lahir yang valid."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Masukkan nomor IC yang valid."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Rhine-Westphalia Utara"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Masukkan kode pos dalam format XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Masukkan nomor kartu identitas Jerman yang valid dalam format XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearic Islands"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basque Country"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canary Islands"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile and Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Region of Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Masukkan kode pos yang valid dalam format 01XXX - 52XXX"
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Masukkan nomor telepon yang valid dalam format 6XXXXXXXX, 8XXXXXXXX atau "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Mohon masukkan NIF, NIE atau CIF yang valid."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Mohon masukkan NIF atau NIE yang valid."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Checksum untuk NIF salah."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Checksum untuk NIE salah."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Checksum untuk CIF salah."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Masukkan nomor akun bank yang valid dalam format XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Checksum untuk nomor akun bank salah."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Masukkan nomor identitas Finlandia yang valid."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Nomor telepon harus dalam format 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Masukkan kode pos yang valid."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall dan Kepulauan Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries dan Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Kepulauan Orkney"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Kepulauan Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Inggris"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlandia Utara"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotlandia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Masukkan 13 angka JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Galat pada segmen tanggal"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Masukkan 11 angka OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Masukkan nomor polisi kendaraan yang valid"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Masukkan kode lokasi yang valid"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Bagian angka tidak boleh nol"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Masukkan 5 angka kode pos yang valid"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Masukkan nomor telepon yang valid"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Masukkan kode area atau jaringan ponsel yang valid"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Nomor telepon terlalu panjang"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Masukkan 5 angka JMBAG valid diawali dengan 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Nomor penerbitan kartu tidak boleh nol"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Masukkan kode pos yang valid"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Masukkan nomor NIK/KTP yang valid"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Korps Konsulat"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Korps Diplomatik"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Pemerintahan Federal"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Masukkan kode pos dalam format XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Masukkan nomor ID yang valid."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Masukkan kode pos dalam format XXXXXX atau XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Masukkan negara bagian atau teritori India."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Format nomor telepon yang benar adalah 02X-8X atau 03X-7X atau 04X-6X"
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Masukkan nomor identifikasi Islandia yang valid. Formatnya adalah XXXXXX-"
-"XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Nomor identifikasi Islandia salah."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Masukkan kode pos yang valid."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Masukkan nomor Jaminan Sosial yang valid."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Masukkan nomor VAT yang valid."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Masukkan kode pos dalam format XXXXXXX atau XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Masukkan nomor ID Warga Kuwait yang valid"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Nomor kartu identitas harus mengandung 4 hingga 7 angka atau satu huruf "
-"besar dan 7 angka. "
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Isian ini harus berisi persis 13 angka."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "7 angka awal UMCN harus mewakili tanggal di masa lalu yang valid."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN tidak valid"
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Nomor kartu identitas Makedonia"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Munisipalitas Makedonia (2 kode karakter)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Nomor penduduk master unik (13 angka)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Masukkan kode pos yang valid dalam format XXXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Masukkan RFC yang valid."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Ceksum untuk RFC tidak valid"
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Masukkan CURP yang valid."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Ceksum untuk CURP tidak valid"
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Negara bagian Meksiko (tiga huruf besar)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Kode pos Meksiko"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "RFC Meksiko"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "CURP Meksiko"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Masukkan kode pos yang valid"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Masukkan nomor SoFi yang valid"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Masukkan nomor jaminan sosial Norwegia yang valid."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Bidang ini membutuhkan isian 8 angka."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Bidang ini membutuhkan isian 11 angka."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Nomor Identifikasi Nasional terdiri dari 11 angka."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Checksum untuk Nomor Identifikasi Nasional salah."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Nomor Kartu ID Nasional terdidi dari 3 huruf dan 6 angka."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Ceksum Nomor Kartu ID Nasional salah."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Masukkan isian nomor pajak (NIP) dalam format XXX-XXX-XX-XX, XXX-XX-XX-XXX, "
-"atau XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Checksum untuk Nomor Pajak (NIP) salah."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Nomor Registrasi Bisnis Nasional (REGON) terdiri dari 9 atau 14 angka."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Checksum untuk Nomor Registrasi Bisnis Nasional (REGON) salah."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Masukkan kode pos dalam format XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Masukkan kode pos dalam format XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Nomor telepon harus memiliki 9 angka, atau dimulai dari + atau 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Masukkan CIF yang valid."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Masukkan CNP yang valid."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Masukkan IBAN yang valid dalam format ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Nomor telepon harus dalam format XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Masukkan kode pos yang valid dalam format XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Masukkan kode pos dalam format XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Masukkan nomor paspor dalam format XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Masukkan nomor paspor dalam format XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Central Federal County"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "South Federal County"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "North-West Federal County"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Far-East Federal County"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Siberian Federal County"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Ural Federal County"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Federal County"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "North-Caucasian Federal County"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskow"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Masukkan nomor organisasi Swedia yang valid."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Masukkan nomor identifikasi pribadi Swedia yang valid."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Nomor koordinasi tidak diperbolehkan."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Masukkan kode pos Swedia dalam format XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "7 angka pertama EMSO harus mewakili tanggal di masa lalu yang valid"
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO tidak valid."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Masukkan nomor pajak yang valid dalam format SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Masukkan nomor telepon dalam format +386XXXXXXXX atau 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Daerah Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Daerah Brastilava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Daerah Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Daerah Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Daerah Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Daerah Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Daerah Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Daerah Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Masukkan kode pos dalam format XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Nomor telepon harus dalam format 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Masukkan nomor Identifikasi Turki yang valid."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Jumlah angka pada Nomor Identifikasi Turki harus sebanyak 11 angka."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Masukkan kode pos dalam format XXXXX atau XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Nomor telepon harus dalam format XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Masukkan nomor Jaminan Sosial A.S. yang valid dalam format XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Masukkan negara bagian atau teritori A.S."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Negara bagian A.S. (dua huruf besar)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Kode pos A.S. (dua huruf besar)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Nomor telepon"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Masukkan nomor CI yang valid dalam format X.XXX.XXX-X,XXXXXXX-X atau "
-"XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Masukkan nomor CI yang valid."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Masukkan nomor ID Afrika Selatan yang valid"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Masukkan kode pos Afrika Selatan yang valid"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/is/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/is/LC_MESSAGES/django.mo
deleted file mode 100644
index 708f70b9ad..0000000000
Binary files a/django/contrib/localflavor/locale/is/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/is/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/is/LC_MESSAGES/django.po
deleted file mode 100644
index ad7f155fe8..0000000000
--- a/django/contrib/localflavor/locale/is/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3532 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-#   <gudmundur.bjarni@gmail.com>, 2012.
-# Hafsteinn Einarsson <haffi67@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: gudmundur <gudmundur.bjarni@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
-"language/is/)\n"
-"Language: is\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Færðu inn póstnúmer í sniðinu NNNN eða ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Þessi reitur tekur aðeins tölugildi."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Þessi reitur krefst 7 eða 8 tölustafa."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Færðu inn gilt CUIT í XX-XXXXXXXX-X eða XXXXXXXXXXXX sniðinu."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Ógilt CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Karinþía"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Neðra Austurríki"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Efra Austurríki"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styría"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Týról"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vín"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Sláðu inn póstnúmer á sniðinu XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Sláðu inn gilda austurríska kennitölu á forminu XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brussel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Austur flæmingjaland"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flæmska Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limaborg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Lúxembúrg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namúr"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Vallónska Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Vestur flæmingjaland"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Höfuðborgarsvæðið Brussel"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flæmska svæðið"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallónía"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Sláðu inn gilt póstnúmer á sniðinu 1XXX-9XXX"
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Sláðu inn gilt símanúmer á einu af eftirfarandi sniðum: 0x xxx xx xx, 0xx xx "
-"xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Sláðu inn zip póstfang í sniðinu XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Símanúmer verða að vera í XXX-XXX-XXXX sniði."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Veldu gilt brasilískt fylki. Fylkið er ekki eitt af gildum fylkjum."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Ógilt CPF númer."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Í þennan reit má setja inn í mesta lagi 11 tölustafi eða 14 bókstafi."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Ógilt CNPJ númer."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Þessi reitur krefst að minnsta kosti 14 tölustafa."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Sláðu inn póstnúmer á sniðinu XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Sláðu inn gilda kanadíska kennitölu á forminu XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genf"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prag"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Brimarborg"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamborg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hesson"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Neðra-Saxland"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxland"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxland-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Slésvík-Holtsetaland"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Sláðu inn póstnúmer á sniðinu XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Sláðu inn gilt póstnúmer."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Sláðu inn gilt símanúmer."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Sláðu inn gilda íslenska kennitölu. Sniðið er DDMMÁÁÁÁ-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Íslenska kennitalan er ekki gild."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Sláðu inn VSK númer."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Sláðu inn gilt póstnúmer."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Þessi reitur krefst 8 tölustafa."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Þessi reitur krefst 11 tölustafa."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Bandarískt fylki (tveir hástafir)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Símanúmer"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/it/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/it/LC_MESSAGES/django.mo
deleted file mode 100644
index 3488efb8f5..0000000000
Binary files a/django/contrib/localflavor/locale/it/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/it/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/it/LC_MESSAGES/django.po
deleted file mode 100644
index 49b7811acd..0000000000
--- a/django/contrib/localflavor/locale/it/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3567 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Denis Darii <sinednx@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-#   <lukefiltroman@gmail.com>, 2011.
-# Nicola Larosa <transifex@teknico.net>, 2011, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
-"it/)\n"
-"Language: it\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Inserisci un codice postale nel formato NNNN o ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Questo campo può contenere solo numeri."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Questo campo richiede 7 o 8 cifre."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Inserisci un CUIT valido nel formato XX-XXXXXXXX-X o XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT non valido."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinzia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Bassa Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Alta Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salisburgo"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirolo"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vienna"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Inserisci un codice postale nel formato XXXX ."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Inserisci un Numero di Assistenza Sociale Austriaco valido, nel formato XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Inserisci un codice postale a 4 cifre"
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Stato Australiano"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Codice postale Australiano"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Numero di telefono Australiano"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Anversa"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruxelles"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Fiandre Orientali"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabante Fiammingo"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liegi"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Lussemburgo"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Brabante Vallone"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Fiandre Occidentali"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Regione di Bruxelles Capitale"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Regione delle Fiandre"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Inserisci un codice postale valido nell'intervallo e formato 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Inserisci un numero di telefono valido in uno dei formati 0x xx xx xxx, 0xx "
-"xx xx xx, xx xx xx 04xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x . xxx."
-"xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx o 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Inserisci un codice postale nel formato XXXXX-XXX ."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "I numeri di telefono devono essere in formato XX-XXXX-XXXX ."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Scegli uno stato brasiliano valido. Questo stato non è uno di quelli "
-"disponibili."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Numero CPF non valido."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Questo campo richiede non più di 11 cifre o 14 caratteri."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Numero CNPJ non valido."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Questo campo richiede almeno 14 cifre"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Inserisci un codice postale nel formato XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Inserisci un numero di Assicurazione Sociale Canadese valido nel formato XXX-"
-"XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berna"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Friburgo"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ginevra"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerna"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurigo"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Inserisci un numero di carta d'identità o passaporto svizzeri validi nel "
-"formato X1234567<0 o 1234567890 ."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Inserisci un RUT cileno valido."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Inserisci un RUT cileno valido. Il formato è XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Il RUT cileno non è valido."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Inserisci un codice postale nel formato XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Il numero della carta d'identità consiste di 15 o 18 caratteri."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Numero carta d'identità non valido: checksum errato"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Numero carta d'identità non valido: data di nascita errata"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Numero carta d'identità non valido: codice località errato"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Inserisci un numero di telefono valido."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Inserisci un numero di cellulare valido."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Regione Boema Centrale"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Regione Boema del Sud"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Regione di Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Regione di Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Regione di Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Regione di Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Regione di Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Regione di Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Regione di Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Regione della Moravia del Sud"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Regione di Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Regione di Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Regione della Moravia-Silesia"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Inserisci un codice postale nel formato XXXXX o XXX XX ."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Inserisci un numero di nascita nel formato XXXXXX/XXXX o XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Parametro opzionale 'Sesso' non valido, i valori validi sono 'f' ed 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Inserisci un numero di nascita valido."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Inserisci un numero di IC valido."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Baviera"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlino"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburgo"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Brema"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Amburgo"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Pomerania Ovest"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Bassa Sassonia"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Reno Nord-Wesfalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Sassonia"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Turingia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Inserisci un codice postale nel formato XXXXX ."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Inserisci un numero di carta d'identità tedesco valido nel formato "
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X ."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Isole Baleari"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcellona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadice"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Città Reale"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturie"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Croce di Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Siviglia"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valenza"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Saragozza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principato delle Asturie"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Isole Baleari"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Paese Basco"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Isole Canarie"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castiglia-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castiglia e Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalogna"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Estremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galizia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Regione Murzia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Comunità Forale di Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Comunità di Valenza"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-"Inserisci un codice postale valido nell'intervallo e formato 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Inserisci un numero telefonico valido in uno dei formati 6XXXXXXXX, "
-"8XXXXXXXX o 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Inserisci un NIF, NIE o CIF valido."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Inserisci un NIF o NIE valido."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Checksum non valido per il NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Checksum non valido per il NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Checksum non valido per il CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Inserisci un numero di conto corrente bancario valido nel formato XXXX-XXXX-"
-"XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Checksum non valido per il numero di conto corrente bancario."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Inserisci un numero di assistenza sociale finlandese valido."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "I numeri di telefono devono essere in formato 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Inserisci un codice postale valido."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornovaglia e Isole di Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Sussex dell'Est"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Yorkshire del Nord"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Yorkshire del Sud"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Midland Ovest"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Sussex Ovest"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Yorkshire Ovest"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Contea di Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Contea di Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Contea di Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Contea di Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Contea di Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Contea di Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Glamorgan Sud"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Glamorgan Ovest"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Scozia Centrale"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Isole Orkney"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Isole Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Isole dell'Ovest"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Inghilterra"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlanda del Nord"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scozia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Galles"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Inserisci un JMBG (Ex Jugoslavia) valido a 13 cifre"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Errore nella data"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Inserisci l'OIB (Croazia) valido a 11 cifre"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Inserisci una targa automobilistica valida"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Inserisci un codice località valido"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "La sezione numerica non può essere zero"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Inserisci un codice postale valido a 5 cifre"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Inserisci un numero telefonico valido"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Inserisci un'area valida od un codice di rete mobile"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Il numero telefonico è troppo lungo"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Inserisci un numero JMBAG valido a 19 cifre che inizi con 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Il numero di rilascio della carta non può essere zero"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-Zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Litoraneo-montana županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-Moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-Dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varazdinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-Podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Inserisci un codice postale valido"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Inserisci un numero NIK/KTP valido"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Giacarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corpi Consolari"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corpi Diplomatici"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Governo Federale"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublino"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Inserisci un codice postale nel formato XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Inserisci un numero di identità valido."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Inserisci un codice postale nel formato XXXXXX o XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Inserisci uno stato o territorio Indiano."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"I numeri di telefono devono essere in formato 02X-8X o 03X-7X o 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Inserisci un numero di identificazione islandese valido. Il formato è XXXXXX-"
-"XXXX ."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Il numero di identificazione islandese non è valido."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Inserisci un codice postale valido."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Inserisci un numero di Assistenza Sociale valido."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Inserisci un numero di partita IVA valido."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Inserisci un codice postale nel formato XXXXXXX o XXX-XXXX ."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Inserisci un numero civile ID kuwaitiano valido"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"I numeri delle carte d'identità devono essere composti da 4 a 7 cifre o da "
-"una lettera maiuscola e 7 cifre."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Questo campo dovrebbe contenere esattamente 13 cifre."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Le prime 7 cifre dell'UMCN devono rappresentare una data valida del passato."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "L'UMCN non è valido."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aracinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevcani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Stella Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Numero della carta d'identità Macedone"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Un comune Macedone (codice da 2 caratteri)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Numero unico dei cittadini (13 cifre)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Inserisci un codice postale valido nel formato XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Inserire un RFC valido."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Checksum non valido per RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Inserisci un CURP valido."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Checksum non valido per CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Stato del Messico (tre lettere maiuscole)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "CAP messicano"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "RFC messicana"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "CURP messicana"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baia California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baia California del Sud"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distretto Federale"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Stato del Messico"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuova Leòn"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Inserisci un codice postale valido"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Inserisci un numero SoFi valido"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Inserisci un numero di assistenza sociale norvegese valido."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Questo campo richiede 8 cifre."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Questo campo richiede 11 cifre."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Il Numero Identificativo Nazionale è costituito da 11 cifre."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Checksum errato per il Numero Identificativo Nazionale."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-"Il numero della carta d'identità nazionale è composto da 3 lettere e 6 cifre."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Checksum errato per il numero della carta d'identità nazionale."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Inserisci un campo di codice fiscale (NIP) nel formato XXX-XXX-XX-XX, XXX-XX-"
-"XX-XXX o XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Checksum errato per il Numero d'Imposta (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 "
-"cifre."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Checksum errato per il Numero di Registro Nazionale d'Impresa (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Inserisci un codice postale nel formato XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Bassa Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublino"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Polonia Minore"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Polonia Maggiore"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Pomerania Ovest"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Inserisci un codice postale nel formato XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "I numeri di telefono devono avere 9 cifre, o iniziare con + o 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Inserisci un codice CIF valido."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Inserisci un codice CNP valido."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-"Inserisci un codice IBAN valido nel formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "I numeri di telefono devono essere nel formato XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Inserisci un codice postale valido nel formato XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Inserisci un codice postale nel formato XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Inserisci un numero di passaporto nel formato XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Inserisci un numero di passaporto nel formato XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Contea Federale Centrale"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Contea Federale del Sud"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Contea Federale"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Contea Federale dell'Estremo Est"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Contea Federale Siberiana"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Contea Federale degli Urali"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Contea Federale Privolzhsky"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Contea Federale Nord-Caucasica"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Mosca"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "San Pietroburgo"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya Oblast '"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buriazia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Daghestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast '"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast '"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast '"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast '"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast '"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast '"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast '"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast '"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast '"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast '"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast '"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast '"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast '"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast '"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirov oblast '"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast '"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast '"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast '"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast '"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast '"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast '"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast '"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast '"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast '"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast '"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast '"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast '"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast '"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast '"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast '"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostov oblast '"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast '"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast '"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast '"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast '"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast '"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast '"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast '"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast '"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast '"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast '"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast '"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast '"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast '"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslav oblast '"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast '"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Inserisci un numero di organizzazione svedese valido."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Inserisci un numero d'identità personale svedese valido."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "I numeri di coordinamento non sono ammessi."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Inserisci un codice postale svedese nel formato XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stoccolma"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"Le prime 7 cifre del codice EMSO devono rappresentare una data passata "
-"valida."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "Il codice EMSO non è valido."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Inserisci un numero fiscale valido nella forma SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Inserisci un numero telefonico nella forma +386XXXXXXXX o 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Regione di Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Regione di Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Regione di Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Regione di Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Regione di Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Regione di Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Regione di Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Regione di Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Inserire un codice postale nel formato XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "I numeri di telefono devono essere in formato 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Inserisci un numero di identità turco valido."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Il numero di identificazione turco deve essere di 11 cifre."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Inserisci un codice postale nel formato XXXXX o XXXXX-XXXX ."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "I numeri di telefono devono essere in formato XXX-XXX-XXXX ."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Inserisci un numero di assistenza sociale USA valido, nel formato XXX-XX-"
-"XXXX ."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Inserisci uno stato o territorio USA."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stato USA (due lettere maiuscole)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Codice di avviamento postale degli Stati Uniti (due lettere maiuscole)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Numero di telefono"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Inserisci un numero CI valido nel formato X.XXX.XXX-X, XXXXXXX-X o XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Inserisci un numero CI valido."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Inserisci un numero ID sudafricano valido"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Inserisci un codice postale sudafricano valido"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Capo Est"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Libero Stato"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Capo Nord"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Nordovest"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Capo Ovest"
diff --git a/django/contrib/localflavor/locale/ja/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ja/LC_MESSAGES/django.mo
deleted file mode 100644
index 35147f9b07..0000000000
Binary files a/django/contrib/localflavor/locale/ja/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ja/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ja/LC_MESSAGES/django.po
deleted file mode 100644
index 70f4baf102..0000000000
--- a/django/contrib/localflavor/locale/ja/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3542 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Tetsuya Morimoto <tetsuya.morimoto@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Tetsuya Morimoto <tetsuya.morimoto@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
-"ja/)\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "NNNNか、ANNNNAAAの形式で郵便番号を入力してください。"
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "このフィールドは必須です(数値のみ)。"
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "7桁か8桁で入力して下さい。"
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"XX-XXXXXXXX-X か XXXXXXXXXXXX の形式で納税証明単一番号(CUIT)を入力して下さ"
-"い。"
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "無効な納税証明単一番号(CUIT): %s"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Lower Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Upper Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vienna"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "XXXXの形式でZipコードを入力してください。"
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "XXXX XXXXXX の形式でオーストリア社会保障番号を入力してください。"
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "アントワープ"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "ブリュッセル"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "東フランドル"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "フランダースブラバント"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "エノー州"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "リエージュ"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "ルクセンブルグ"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "ナミュール"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "ブラバンワロン州"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "西フランドル"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "ブリュッセル首都圏"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "フランダース地方"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "ワロン地域"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "郵便番号の範囲を 1XXX - 9XXX の形式で入力してください。"
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"電話番号を次の形式のうちどれかを選択して入力してください: 0x xxx xx xx, 0xx "
-"xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx."
-"xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "XXXXX-XXXの形式でZipコードを入力してください。"
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "電話番号は XX-XXXX-XXXX 形式で入力してください。"
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "ブラジルの州から選択してください。選択したものは候補にありません。"
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "ブラジル納税者番号(CPF)が無効です。"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "11桁の数字か14文字で入力してください。"
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "納税登録番号(CNPJ)が正しくありません。"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "14桁以上で入力して下さい。"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "XXX XXXの形式で郵便番号を入力してください。"
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "XXX-XXX-XXX の形式で、カナダ社会保障番号を入力して下さい。"
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"スイス アイデンティティかパスポート番号を X1234567<0 か 1234567890 の形式で入"
-"力して下さい。"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "正しいチリ納税者番号(RUT)を入力してください。"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "XX.XXX.XXX-Xの形式でチリ納税者番号(RUT)を入力してください。"
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "このチリ納税者番号(RUT)は無効です。"
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "プラハ"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "中央ボヘミア州"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "南ボヘミア州"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "プルゼニ州"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "カルロヴィ・ヴァリ州"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "ウースチー州"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "リベレツ州"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "フラデツ・クラーロヴェー州"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "パルドゥビツェ州"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "ヴィソチナ州"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "南モラヴィア州"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "オロモウツ州"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "ズリーン州"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "モラヴィア・スレスコ州"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "XXXXXか、XXX XXの形式で郵便番号を入力してください。"
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "XXXXXX/XXXXか、XXXXXXXXXXの形式で誕生番号を入力してください。"
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"オプションの性別パラメーターに対する不正な値です。可能な値は 'f' か 'm' で"
-"す。"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "誕生番号を正しく入力してください。"
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "IC番号を正しく入力してください。"
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "XXXXXの形式でZipコードを入力してください。"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X の形式でドイツIDカード番号を入力して下さい。"
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearic Islands"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basque Country"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canary Islands"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile and Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Region of Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "01XXX から 52XXXの形式で郵便番号を入力してください。"
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"6XXXXXXXX か 8XXXXXXXX か 9XXXXXXXX かのいずれかの形式で電話番号を入力してく"
-"ださい。"
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-"スペイン納税者番号(NIF)かスペイン住民番号(N.I.E)かスペイン企業番号(CIF)のいず"
-"れかを入力してください。"
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "スペイン納税者番号(NIF)かスペイン住民番号(N.I.E)を入力してください。"
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "スペイン納税者番号(NIF)のチェックサムがあいません。"
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "スペイン住民番号(N.I.E)のチェックサムがあいません。"
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "スペイン企業番号(CIF)のチェックサムがあいません。"
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "XXXX-XXXX-XX-XXXXXXXXXX の形式で銀行口座番号を入力して下さい。"
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "銀行口座番号のチェックサムがあいません。"
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "フィンランド社会保証番号を正しく入力してください。"
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "電話番号は 0X XX XX XX XX 形式で入力してください。"
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "郵便番号を正しく入力してください。"
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Northern Ireland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "自動車のプレートナンバーを正しく入力してください。"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "電話番号を正しく入力してください。"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "郵便番号を正しく入力してください。"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "NIK/KTP番号を正しく入力してください。"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "アチェ"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "バリ"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "バンテン"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "ベンクルー州"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "ジョクジャカルタ"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "ジャカルタ"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "ゴロンタロ"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "ジャンビ"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "ジャワバラット州"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "ジャワトゥンガ州"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "ジャワティムール州"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "カリマンタンバラット州"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "カリマンタンスラタン州"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "カリマンタントゥンガ州"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "カリマンタンティムール州"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "バンカ-ビリトン諸島"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "リアオ諸島"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "ランプン州"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "マルク州"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "マルクウタラ"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "ヌサトゥンガラバラット"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "ヌサトゥンガラティムール州"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "パプア"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "パプアバラット"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "リアウ州"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "スラウェシバラット"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "スラウェシスラタン州"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "スラウェシトゥンガ州"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "スラウェシトゥンガラ州"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "スラウェシウタラ州"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "スマトラバラット州"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "スマトラスラタン州"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "スマトラウタラ州"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "マグラン"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "スラカルタ - ソロ"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "マディウン"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "クディリ"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "タパヌリ"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "ナングロアチェダルサラーム"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "バンカビリトン諸島"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "領事館部隊"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "外交部隊"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "バンドン"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "スラウェシウタラダラタン"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "株式会社 NTT - 東ティモール"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "スラウェシウタラ諸島"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - ロンボク"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "パプアダンパプアバラット"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "チルボン"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - スンバワ"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "株式会社 NTT - フローリーズ"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "株式会社NTT - スンバ"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "ボゴール"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "プカロンガン"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "スマラン"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "パティ"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "スラバヤ"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "マドゥラ"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "マラン"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "ジェンバー"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "バニュマス"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "連邦政府"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "ボジョネゴロ"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "プルワカルタ"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "シドアルジョ"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "ガルト"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "アントリム"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "アルマー"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "カーロー"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "カバン"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "クレア"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "コーク"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "デリー"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "ドニゴール"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "ダウン"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "ダブリン"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "ファーマナ州"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "ゴールウェイ"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "ケリー"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "キルデア"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "キルケニー"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "リーシュ"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "リートリム"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "リマリック"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "ロングフォード"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "ラウス"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "メイヨー"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "ミーズ"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "モナハン"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "オファリー"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "ロスコモン"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "スライゴ"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "ティペラリー"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "タイローン"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "ウォーターフォード"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "ウェストミーズ"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "ウェクスフォード"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "ウィックロー"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "郵便番号を XXXXX 形式で入力してください"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "ID 番号を入力してください。"
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "XXXXXか、XXXXX-XXXXの形式でアイスランド納税者番号を入力してください。"
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "アイスランド納税者番号を正しく入力して下さい。"
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Zipコードを正しく入力してください。"
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "社会保障番号番号を正しく入力してください。"
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "VAT番号を正しく入力してください。"
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "北海道"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "青森県"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "岩手県"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "宮城県"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "秋田県"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "山形県"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "福島県"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "茨城県"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "栃木県"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "群馬県"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "埼玉県"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "千葉県"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "東京都"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "神奈川県"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "山梨県"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "長野県"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "新潟県"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "富山県"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "石川県"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "福井県"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "岐阜県"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "静岡県"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "愛知県"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "三重県"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "滋賀県"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "京都府"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "大阪府"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "兵庫県"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "奈良県"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "和歌山県"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "鳥取県"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "島根県"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "岡山県"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "広島県"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "山口県"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "徳島県"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "香川県"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "愛媛県"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "高知県"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "福岡県"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "佐賀県"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "長崎県"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "熊本県"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "大分県"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "宮崎県"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "鹿児島県"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "沖縄県"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "クウェート市民番号を正しく入力してください。"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacan"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo Leon"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Queretaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosi"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatan"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "郵便番号を正しく入力してください。"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "社会税務番号(SoFi)を正しく入力してください。"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "ノルウェー社会保障番号を正しく入力してください。"
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "8桁で入力して下さい。"
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "11桁で入力して下さい。"
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "国民識別番号は11文字で入力して下さい。"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "国民識別番号のチェックサムがあいません。"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "税務署登録ID(NIP)のチェックサムがあいません。"
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "ポーランド企業番号(REGON)は9文字か14文字で入力して下さい。"
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "ポーランド企業番号(REGON)のチェックサムがあいません。"
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "XX-XXXの形式で郵便番号を入力してください。"
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "XXXX-XXXの形式でZipコードを入力してください。"
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "電話番号は9桁の数字か、プラス記号(+)または00で始まる必要があります。"
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "CIFを正しく入力してください。"
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "CNPを正しく入力してください。"
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "ROXX-XXXX-XXXX-XXXX-XXXX-XXXX の形式でIBANを入力してください"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "電話番号は XXXX-XXXXXX 形式で入力してください。"
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "XXXXXX の形式で郵便番号を入力してください。"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "スウェーデン組織番号を正しく入力してください。"
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "スウェーデン個人識別番号を正しく入力してください。"
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "コーディネーション番号は許可されていません。"
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "XXXXXの形式で郵便番号を入力してください。"
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "ストックホルム"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "ベステルボッテン"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "ノルボッテン"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "ウプサラ"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "セーデルマンランド"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "エステルイェトランド"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "ヨンショーピン"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "クルーヌベリ"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "カルマル"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "ゴトランド"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "ブレーキンゲ"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "スコーネ"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "ハランド"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "ヴィストライェータランド"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "ヴェルムランド"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "オレブロ"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "ベストマンランド"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "ダーラルナ"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "イェブレボリ"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "ベステルノルランド"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "イェムトランド"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava region"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice region"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra region"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov region"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin region"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava region"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina region"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "郵便番号を XXXXX 形式で入力してください。"
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "電話番号は 0XXX XXX XXXX 形式でなければいけません。"
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "トルコ国民番号を入力してください。"
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "トルコ国民番号は11桁でなければいけません。"
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "XXXXXか、XXXXX-XXXXの形式で郵便番号を入力してください。"
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "電話番号は XXX-XXX-XXXX 形式で入力してください。"
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "XXX-XX-XXXX の形式で、米国社会保障番号を入力して下さい。"
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "合衆国の州か地域を入力してください。"
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "アメリカの州 (大文字二文字で)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "米国郵便番号(大文字で2文字)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "電話番号"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "X.XXX.XXX-X,XXXXXXX-X か XXXXXXXX の形式でCI番号を入力して下さい。"
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "CI番号を正しく入力してください。"
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "南アフリカID番号を正しく入力してください。"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "南アフリカ郵便番号を正しく入力してください。"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/ka/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ka/LC_MESSAGES/django.mo
deleted file mode 100644
index 21c4865e9c..0000000000
Binary files a/django/contrib/localflavor/locale/ka/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ka/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ka/LC_MESSAGES/django.po
deleted file mode 100644
index 9de31b163e..0000000000
--- a/django/contrib/localflavor/locale/ka/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3546 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# avsd05 <avsd05@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
-"ka/)\n"
-"Language: ka\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "შეიყვანეთ საფოსტო კოდი ერთ-ერთ ფორმატში: NNNN ან ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "ამ ველში შეიძლება იყოს მხოლოდ ციფრები."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "ამ ველში შეიძლება იყოს 7 ან 8 თანრიგი."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"შეიყვანეთ დასაშვები CUIT ერთ-ერთ ფორმატში: XX-XXXXXXXX-X ან XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "არასწორი CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "ბურგლენდი"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "კარინტია"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "ქვემო ავსტრია"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "ზემო ავსტრია"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "ზალცბურგი"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "სტირია"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "ტიროლი"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "ფორარლბერგი"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "ვენა"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "შეიყვანეთ zip-კოდი ფორმატში XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "შეიყვანეთ კანადაში დასაშვები პირადი ნომერი ფორმატში: XXX-XXX-XXX"
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "ანტვერპი"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "ბრიუსელი"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "აღმ. ფლანდრები"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "ფლამანდიური ბრაბანტი"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "ჰაინაუტი"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "ლიჯი"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "ლიმბურგი"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "ლუქსემბურგი"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "ნამური"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "ვალონიური ბრაბანტი"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "დას. ფლანდრები"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "ბრიუსელი-დედაქალაქი"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "ფლემიური რაიონი"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "ვალონია"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "შეიყვანეთ სწორი საფოსტო კოდი ფორმატში 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"შეიყვანეთ ტელეფონის ნომერი დასაშვებ ფორმატში: 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "შეიყვანეთ zip-კოდი ფორმატში: XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "ტელეფონის ნომრები უნდა იყოს XX-XXXX-XXXX ფორმატში."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"შეიყვანეთ დასაშვები ბრაზილიური შტატი. მოცემული შტატი არ არის დასაშვები."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "არასწორი CPF ნომერი."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "ეს ველი უნდა შეიცავდეს 11 ციფრს ან 14 სიმბოლოს, ან ნაკლებს."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "არასწორი CNPJ ნომერი."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "ეს ველი მოითხოვს არაუმეტეს 14 თანრიგისა"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "შეიყვანეთ საფოსტო კოდი ფორმატში: XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"შეიყვანეთ კანადაში დასაშვები სოციალური დაზღვევის ნომერი ფორმატში: XXX-XXX-XXX"
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "აარგაუ"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "აპენცელ ინერჰოდენ"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "აპენცელ აუსერჰოდენ"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "ბაზელ-შტადტი"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "ბაზელ-ლანდი"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "ბერნი"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "ფრაიბურგი"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "ჟენევა"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "გლარუსი"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "გრაუბუენდენ"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "ჯურა"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "ლეცერნი"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "ნოიხატლი"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "ნიდვალდენი"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "ობვალდენი"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "შაფჰაუზენი"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "შვიცი"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "სოლოთურნი"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "სენტ-გალენი"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "თურგაუ"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "ტიჯინო"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "ური"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "ვალაისი"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "ვაუდი"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "ცუგი"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "ციურიხი"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"შეიყვანეთ შვეიცარიაში დაშვებული პირადი ან პასპორტის ნომერი, ფორმატებში: "
-"X1234567<0 ან 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "შეიყვანეთ დასაშვები ჩილიური RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "შეიყვანეთ დასაშვები ჩილიური RUT. ფორმატი: XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "ჩილიური RUT არასწორია."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "პრაღა"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "ცენტრალური ბოჰემიის რაიონი"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "სამხრეთ ბოჰემიის რაიონი"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "პილსენის რაიონი"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "კარლსბადის რაიონი"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "იუსტის რაიონი"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "ლიბერეცის რაიონი"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "ჰრადეცის რაიონი"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "პარდუბიცეს რაიონი"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "ვისოჩინას რაიონი"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "სამხრეთ მორავიის რაიონი"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "ოლომუცის რაიონი"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "ზლინის რაიონი"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "მორავია-სილესიის რაიონ"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "შეიყვანეთ საფოსტო კოდი ფორმატში XXXXX or XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "ბადენ-ვურტემბერგი"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "ბავარია"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "ბერლინი"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "ბრანდენბურგი"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "ბრემენი"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "ჰამბურგი"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "ჰესენი"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "მეკლენბურგ-ვესტერნ პომერანია"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "ქვემო საქსონია"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "ჩრდილოეთ რაინ-ვესტფალია"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "რაინლანდ-პალატინატა"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "ზაარლანდი"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "საქსონია"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "საქსონია-ანჰალტ"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "შლეზვიგ-ჰოლშტაინი"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "თურინგია"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "შეიყვანეთ zip-კოდი ფორმატში XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"შეიყვანეთ გერმანიაში დასაშვები პირადობის მოწმობის ნომერი, ფორმატში: "
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "არავა"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "ალბასეტე"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "ალასანტი"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "ალმერია"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "ავილა"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "ბადაჰოსი"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "ილეს ბალეარს"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "ბარსელონა"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "ბურგოსი"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "კასერესი"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "კადიზი"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "კასტელო"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "სიუდად რეალი"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "კორდობა"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "ა კორუნია"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "კუენსა"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "გირონა"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "გრანადა"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "გუადალაჯარა"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "გუიპუზკოა"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "ჰუელვა"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "ჰუესკა"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "ჯეინი"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "ლეონი"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "ლეიდა"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "ლა რიოხა"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "ლუგო"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "მადრიდი"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "მალაგა"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "მურსია"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "ნავარე"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "ოურენსი"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "ასტურია"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "პალენსია"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "ლას პალმას"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "პონტევედრა"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "სალამანსა"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "სანტა კრუზ დე ტენერიფე"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "კანტაბრია"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "სეგოვია"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "სევილი"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "სორია"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "ტარაგონა"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "ტერუელი"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "ტოლედო"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "ვალენსია"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "ვალადოლიდი"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "ბიზკაია"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "სამორა"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "სარაგოსა"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "კეუტა"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "მელილა"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "ანდალუზია"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "არაგონ"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "ასტურიის პრინციპატი"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "ბალეარის კუნძულები"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "ბასკების ქვეყანა"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "კანარის კუნძuლები"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "კასტილია ლა მანჩა"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "კასტილია და ლეონი"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "კატალონია"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "ექსტრემადურა"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "გალიცია"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "მურსიის რეგიონი"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "ნავარის ფორალური თემი"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "ვალენსიის თემი"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-"შეიყვანეთ სწორი საფოსტო კოდი შემდეგ ინტერვალში და ფორმატში: 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"შეიყვანეთ სწორი სატელეფონო ნომერი ერთ-ერთ ფორმატში: 6XXXXXXXX, 8XXXXXXXX ან "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "გთხოვთ, შეიყვანოთ სწორი NIF, NIE, ან CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "გთხოვთ, შეიყვანოთ სწორი NIF ან NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "NIF-ის საკონტროლო ჯამი არასწორია."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "NIE-ს საკონტროლო ჯამი არასწორია."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "CIF-ის საკონტროლო ჯამი არასწორია."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"გთხოვთ, შეიყვანოთ სწორი საბანკო ანგარიშის ნომერი ფორმატში: XXXX-XXXX-XX-"
-"XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "არასწორი საკონტროლო ჯამი საბანკო ანგარიშის ნომრისათვის."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "შეიყვანეთ სწორი ფინური პირადი ნომერი."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "შეიყვანეთ სწორი საფოსტო კოდი."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "ბედფორდშირი"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "ბუკინჰემშირი"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "ჩეშირი"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "კორნუოლი და სილის კუნძულები"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "კამბრია"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "დერბიშირი"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "დევონი"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "დორსეტი"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "დარემი"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "აღმოსავლეთ სასექსი"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "ესექსი"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "გლოსტეშირი"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "დიდი ლონდონი"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "დიდი მანჩესტერი"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "ჰემპშირი"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "ჰარტფორდშირი"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "კენტი"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "ლანკაშირი"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "ლაიჩესტეშირი"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "ლინკოლნშირი"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "მერსისაიდი"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "ნორფოლკი"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "ჩრდილოეთ იოკშირი"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "ნორტჰემპტონშირი"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "ნორტუმბერლანდი"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "ნოტინგემშირი"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "ოქსფორდშირი"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "შროპშირი"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "სომერსეტი"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "სამხრეთ იოკშირი"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "სტაფორდშირი"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "საფოლკი"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "სურეი"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "თაინ და უირი"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "უარვიკშირი"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "დასავლეთ მიდლენდსი"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "დასავლეთ სასექსი"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "დასავლეთ იოკშირი"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "უილტშირი"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "უორსესტერშირი"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "ანტრიმის ქვეყანა"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "არმაგის ქვეყანა"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "დაუნის ქვეყანა"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "ფერმანაგის ქვეყანა"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "ლონდონდერის ქვეყანა"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "ტაირონის ქვეყანა"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "კლოუიდი"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "დაიფიდი"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "გვენტი"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "გუაინიდი"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "შუა გლემორგენი"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "პოუისი"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "სამხრეთ გლემორგენი"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "დასავლეთ გლემორგენი"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "საზღვრები"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "ცენტრალური შოტლანდია"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "დამფრაის და გელოუეი"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "ფაიფი"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "გრემპაინი"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "ჰაილენდი"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "ლოთიენი"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "ორკნის კუნძულები"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "შიტლენდის კუნძულები"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "სტრესკლაიდი"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "თეისაიდი"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "დასავლეთ კუნძულები"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "ინგლისი"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "ჩრდილოეთ ირლანდია"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "შოტლანდია"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "უელსი"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "შეიყვანეთ სწორი ტელეფონის ნომერი"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"შეიყვანეთ სწორი ისლანდიური საიდენტიფიკაციო ნომერი. ფორმატია XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "ისლანდიური საიდენტიფიკაციო ნომერი არასწორია."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "შეიყვანეთ სწორი zip-კოდი."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "შეიყვანეთ სწორი პირადი ნომერი."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "შეიყვანეთ სწორი დღგ-ს ნომერი."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "შეიყვანეთ საფოსტო კოდი ფორმატში XXXXXXX ან XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "ჰოკაიდო"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "აომორი"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "იუატე"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "მიიაგი"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "აკიტა"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "იამაგატა"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "ფუკუსიმა"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "იბარაკი"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "ტოჩიგი"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "გუნმა"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "საიტამა"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "ჩიბა"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "ტოკიო"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "კანაგავა"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "იამანაში"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "ნაგანო"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "ნიიგატა"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "ტოიამა"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "იშიკავა"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "ფუკუი"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "გიფუ"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "შიზუოკა"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "აიჩი"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "მიე"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "შიგა"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "კიოტო"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "ოსაკა"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "ჰიოგო"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "ნარა"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "უაკაიამა"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "ტოტორი"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "შიმანე"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "ოკაიამა"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "ჰიროსიმა"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "იამაგუჩი"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "ტოკუშიმა"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "კაგავა"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "ეჰიმე"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "კოჩი"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "ფუკუოკა"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "საგა"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "ნაგასაკი"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "კუმამოტო"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "ოიტა"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "მიაზაკი"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "კაგოსიმა"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "ოკინავა"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "აგუასკალიენტესი"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "ქვემო კალიფორნია"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "ქვემო სამხრეთ კალიფორნია"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "კამპეჩე"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "ჩიჰუაჰუა"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "ჩიაპასი"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "კოაჰუილა"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "კოლიმა"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "ფედერალური ოლქი"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "დურანგო"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "გერერო"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "გუანაჰუატო"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "იდალგო"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "ჰალისკო"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "მეხიკოს შტატი"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "მიჩოაკანი"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "მორელოსი"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "ნაიარიტი"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "ნუევო-ლეონი"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "ოახაკა"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "პუებლა"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "კერეტარო"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "კინტანა-როო"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "სინალოა"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "სან-ლუის-პოტოსი"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "sონორა"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "ტაბასკო"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "ტამაულიპასი"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "ტლასკალა"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "ვერაკრუსი"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "იუკატანი"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "საკატეკასი"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "შეიყვანეთ სწორი საფოსტო კოდი"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "შეიყვანეთ სწორი SoFi ნომერი"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "დრენტე"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "ფლევოლანდი"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "ფრისლანდია"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "გელდერლანდი"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "გრონიგენი"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "ჩრდილოეთ ბრაბანტი"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "ჩრდილოეთ ჰოლანდია"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "ოვერეისელი"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "უტრეხტი"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "ზელანდია"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "სამხრეთ ჰოლანდია"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "შეიყვანეთ სწორი ნორვეგიული პირადი ნომერი."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "ეს ველი შედგება 8 თანრიგისაგან."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "ეს ველი სედგება 11 თანრიგისაგან."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "ეროვნული საიდენტიფიკაციო ნომერი შედგება 11 თანრიგისაგან."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "არასწორი საკონტროლო ჯამი ეროვნულ საიდენტიფიკაციო ნომერში."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "არასწორი საკონტროლო ჯამი საგადასახადო ნომრისათვის (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"არასწორი საკონტროლო ჯამი საწარმოოს ეროვნულ სარეგისტრაციო ნომერში (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "შეიყვანეთ საფოსტო კოდი ფორმატში XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "ქვემო სილეზია"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "კუიავია-პომერანია"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "ლუბლინი"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "ლუბუში"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "ლოძი"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "მცირე პოლონეთი"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "მაზოვია"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "ოპოლე"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "სუბკარპატია"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "პოდლასიე"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "პომერანია"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "სილეზია"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "სვენტოკშისკე"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "ვარმია-მაზურია"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "დიდი პოლონეთი"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "დასავლეთ პომერანია"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "შეიყვანეთ სწორი URL."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "შეიყვანეთ სწორი URL."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-"შეიყვანეთ დასაშვები CUIT ერთ-ერთ ფორმატში: XX-XXXXXXXX-X ან XXXXXXXXXXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "ტელეფონის ნომრები უნდა იყოს XX-XXXX-XXXX ფორმატში."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "შეიყვანეთ საფოსტო კოდი ფორმატში: XXX XXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "ბანსკა ბისტრიცა"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "ბანსკა შტიავნიცა"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "ბარდეიოვი"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "ბანოვცე-ნად-ბებრავოუ"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "ბრეზნო"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "ბრატისლავა I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "ბრატისლავა II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "ბრატისლავა III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "ბრატისლავა IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "ბრატისლავა V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "ბიტჩა"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "ჩადცა"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "დეტვა"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "დოლნი კუბინი"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "დუნაისკა სტრედა"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "გალანტა"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "გელნიცა"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "ჰლოჰოვეცი"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "ჰუმენე"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "ილავა"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "კეზმაროკი"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "კომარნო"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "კოშიცე I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "კოშიცე II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "კოშიცე III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "კოშიცე IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "კოშიცე - ოკოლიე"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "კრუპინა"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "კისუცკე ნოვე მესტო"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "ლევიცე"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "ლევოჩა"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "ლიპტოვსკი მიკულაში"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "ლუჩენეცი"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "მალაცკი"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "მარტინი"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "მეძილაბორცე"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "მიხალოვცე"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "მიავა"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "ნამესტოვო"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "ნიტრა"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "ნოვე-მესტო-ნად-ვაჰომ"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "ნოვე ზამკი"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "პარტიზანსკე"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "პეზინოკი"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "პიესტანი"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "პოლტარი"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "პოპრადი"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "პოვაჟსკა ბისტრიცა"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "პრესოვი"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "პრიევიძა"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "პუხოვი"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "რევუცა"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "რიმავსკა სობოტა"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "როზნავა"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "რუზომბეროკი"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "საბინოვი"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "სენეცი"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "სენიცა"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "სკალიცა"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "სნინა"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "სობრანცე"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "სპისკა-ნოვა-ვესი"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "სტარა-ლუბოვნა"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "სტროპკოვი"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "სვიდნიკი"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "სალა"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "ტოპოლჩანი"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "ტრებისოვი"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "ტრენჩინი"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "ტრნავა"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "ტურჩანსკე ტეპლიცე"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "ტვრდოშინი"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "ველკი კრტიში"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "ვრანოვ-ნად-ტოპლოუ"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "ზლატე მორავცე"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "ზვოლენი"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "ზარნოვიცა"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "ზიარ-ნად-ჰრონომი"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "ზილინა"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "ბანსკა-ბისტრიცის რაიონი"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "ბრატისლავას რაიონი"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "კოშიცეს რაიონი"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "ნიტრას რაიონი"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "პრესოვის რაიონი"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "ტრენჩინის რაიონი"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "ტრნავას რაიონი"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "ზილინას რაიონი"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "შეიყვანეთ zip-კოდი ფორმატში XXXXX ან XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "შეიყვანეთ სწორი აშშ-ს პირადი ნომერი ფორმატში XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "აშშ შტატი (ორი ასომთავრული)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "ტელეფონის ნომერი"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "შეიყვანეთ სწორი სამხრეთ-აფრიკული ID ნომერი"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "შეიყვანეთ სწორი სამხრეთ-აფრიკული საფოსტო კოდი"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "აღმოსავლეთ კაპი"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "თავისუფალი სახელმწიფო"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "გაუტენგი"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "კვაზულუ-ნატალი"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "ლიმპოპო"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "მპუმალანგა"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "ჩრდილოეთ კაპი"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "ჩრდილო-დასავლეთი"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "დასავლეთ კაპი"
diff --git a/django/contrib/localflavor/locale/kk/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/kk/LC_MESSAGES/django.mo
deleted file mode 100644
index 50f1bef047..0000000000
Binary files a/django/contrib/localflavor/locale/kk/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/kk/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/kk/LC_MESSAGES/django.po
deleted file mode 100644
index 29ac60abe4..0000000000
--- a/django/contrib/localflavor/locale/kk/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3526 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2011-01-19 16:22+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
-"kk/)\n"
-"Language: kk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/km/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/km/LC_MESSAGES/django.mo
deleted file mode 100644
index 602dc1e30c..0000000000
Binary files a/django/contrib/localflavor/locale/km/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/km/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/km/LC_MESSAGES/django.po
deleted file mode 100644
index 26de62ffeb..0000000000
--- a/django/contrib/localflavor/locale/km/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3526 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: km\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "សហរដ្ឋអាមេរិក U.S. (ជាមួយនឹងអក្សរធំពីរ)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "លេខទូរស័ព្ទ"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/kn/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/kn/LC_MESSAGES/django.mo
deleted file mode 100644
index b440543ae3..0000000000
Binary files a/django/contrib/localflavor/locale/kn/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/kn/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/kn/LC_MESSAGES/django.po
deleted file mode 100644
index da456526ce..0000000000
--- a/django/contrib/localflavor/locale/kn/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3527 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
-"kn/)\n"
-"Language: kn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "ಅಮೇರಿಕಾ ಸಂಯುಕ್ತ ಸಂಸ್ಥಾನದ ರಾಜ್ಯ ( ಎರಡು ಇಂಗ್ಲೀಷ್ ದೊಡ್ಡಕ್ಷರಗಳು)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/ko/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ko/LC_MESSAGES/django.mo
deleted file mode 100644
index eafad3447c..0000000000
Binary files a/django/contrib/localflavor/locale/ko/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ko/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ko/LC_MESSAGES/django.po
deleted file mode 100644
index d44a0165e6..0000000000
--- a/django/contrib/localflavor/locale/ko/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3535 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jaehong Kim <mixe@korea.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jaehong Kim <mixe@korea.com>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
-"ko/)\n"
-"Language: ko\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "우편번호를 입력하세요.(NNNN 또는 ANNNNAAA)"
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "숫자만 입력해야 합니다."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "7개 또는 8개의 숫자만 허용됩니다."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "CUIT를 입력하세요.(XX-XXXXXXXX-X 또는 XXXXXXXXXXXX 형식)"
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "부적절한 CUIT"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "부르겐란트 주"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "케른텐 주"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "니더외스터라이히 주"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "오버외스터라이히 주"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "잘츠부르크"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "슈타이어 주"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "티롤 주"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "폴라를베르크 주"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "빈"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "우편번호를 입력하세요. (XXXX 형식)"
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "올바른 오스트리아 사회보장번호(XXXX XXXXX 형식)를 입력하세요."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "안트위르펜"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "브뤼셀"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "동플랑드르"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "플레 미시 브라반트"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "에노"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "리에주"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "림뷔르흐 주"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "룩셈브르크"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "나무르"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "왈론 브라반트"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "웨스트 플랑드르"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "브뤼셀 캐피탈 지역"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "플랑드르 지역"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "왈로니아"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "우편번호를 1XXX-9XXX 형식으로 입력하세요."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"전화번호를 0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx."
-"xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx 또"
-"는 04xxxxxxxx 형식중 하나로 입력하세요."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "우편번호는 XXXXX-XXX 형식으로 입력하세요."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "전화번호는 XX-XXXX-XXXX 형식으로 입력하세요."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "올바르게 선택해 주세요. 선택하신 것이 선택가능항목에 없습니다."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "CPF 값이 올바르지 않습니다."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "최대 11자 또는 14자 이하로 입력해 주세요."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "올바른 CNPJ 번호를 입력하세요."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "이 항목은 최소한 14개의 숫자를 입력해야 합니다."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "우편번호를 입력하세요.(XXX XXX 형식)"
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "올바른 캐나다 사회보장번호(XXX-XXX-XXX 형식)를 입력하세요."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "아르가우 주"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "아펜첼이너로덴 주"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "아펜첼아우서로덴 주"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "바젤슈타트 주"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "바젤란트 주"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "베른"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "프리부르 주"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "제네바"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "글라루스 주"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "그라우뷘덴 주"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "쥐라 주"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "루체른"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "뇌샤텔 주"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "니트발덴 주"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "옵발덴 주"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "샤프하우젠 주"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "슈비츠 주"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "졸로투른 주"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "장크트갈렌 주"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "투르가우 주"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "티치노 주"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "우리 주"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "발레 주"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "보 주"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "추크 주"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "취리히"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"올바른 스위스 주민번호 또는 여권 번호를 입력하세요. (X1234567<0 또는 "
-"1234567890 형식)"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "올바른 칠레 RUT를 입력하세요."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "올바른 칠레 RUT 번호 XX.XXX.XXX-X 형식으로 입력하세요."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "칠레 RUT 값이 올바르지 않습니다."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "프라하"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "이호체스코 주"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "스트르셰도체스코 주"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "플젠 주"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "카를로비바리 주"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "우스티나트라벰 주"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "리베레츠 주"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "호라데츠 크랄로베 주"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "파르두비체 주"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "비소치나 주"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "이호모라프스코 주"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "올로모우츠 주"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "즐린 주"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "모라바슬레스코주"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "우편번호를 입력하세요. (XXXXX 또는 XXX XX 형식)"
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "생년월일을 입력하세요. (XXXXXX/XXXX 또는 XXXXXXXXXX 형식)"
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "성별은 'f' 또는 'm'으로 입력해야 합니다."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "올바른 생년월일을 입력하세요."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "올바른 IC 번호를 입력하세요."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "바덴-뷔르템베르크 주"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "바이에른 자유주"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "베를린"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "브란덴부르크 주"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "브레멘 자유 한자 도시"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "함부르크 자유 한자 도시"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "헤센 주"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "메클렌부르크-포어포메른 주"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "니더작센 주"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "노르트라인-베스트팔렌 주"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "라인란트-팔츠 주"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "자를란트 주"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "작센 자유주"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "작센-안할트 주"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "슐레스비히-홀슈타인 주"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "튀링겐 자유주"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "우편번호를 입력하세요. (XXXXX 형식)"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr "올바른 독일 주민번호(XXXXXXXXXXX-XXXXXXX-XXXXXXX-X 형식)를 입력하세요."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "알라바 주"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "알바세테 주"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "알리칸테 주"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "알메리아 주"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "아빌라 주"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "바다호스 주"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "발레아레스 제도"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "바르셀로나 주"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "부르고스 주"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "카세레스 주"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "카디스 주"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "카스테욘 주"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "시우다드레알 주"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "코르도바 주"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "라코루냐 주"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "쿠엥카 주"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "헤로나 주"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "그라나다 주"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "과달라하라 주"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "기푸스코아 주"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "우엘바 주"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "우에스카 주"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "하엔 주"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "레온 주"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "레리다 주"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "라리오하 주"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "루고 주"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "마드리드 주"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "말라가 주"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "무르시아 주"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "나바라 주"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "오렌세 주"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "아스투리아스 주"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "팔렌시아 주"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "라스팔마스 주"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "폰테베드라 주"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "살라망카 주"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "산타크루스데테네리페 주"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "칸타브리아 주"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "세고비아 주"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "세비야 주"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "소리아 주"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "타라고나 주"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "테루엘 주"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "톨레도 주"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "발렌시아 주"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "바야돌리드 주"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "비스카야 주"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "사모라 주"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "사라고사 주"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "세우타 자치주"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "멜리야 주"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "안달루시아 주"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "아라곤 주"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "아스투리아스 지방"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "발레아레스 제도"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "바스크 지방"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "카나리 제도"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "카스티야라만차 지방"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "카스티야레온 지방"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "카탈로니아 지방"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "에스트레마두라 지방"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "갈리시아 지방"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "무르시아 지방"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "나바라 지방"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "발렌시아 지방"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "우편번호를 입력하세요. (01XXX - 52XXX 형식)"
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"올바른 전화번호를 입력하세요. (6XXXXXXXX, 8XXXXXXXX 또는 9XXXXXXXX 형식)"
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "올바른 NIF, NIE 또는 CIF를 입력하세요."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "올바른 NIF 또는 NIE를 입력하세요."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "NIF의 체크섬이 틀립니다."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "NIE의 체크섬이 틀립니다."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "CIF의 체크섬이 틀립니다."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "올바른 계좌번호를 입력하세요. (XXXX-XXXX-XX-XXXXXXXXXX 형식)"
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "계좌번호의 체크섬이 틀립니다."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "올바른 핀란드 사회보장 번호를 입력하세요."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "전화번호는 0X XX XX XX XX 형식이어야 합니다."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "올바른 우편번호를 입력하세요."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "베드퍼드셔 주"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "버킹엄셔 주"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "체셔 주"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "콘월 주 (시실리 섬)"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "컴브리아 주"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "더비셔 주"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "데번 주"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorest 주"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "카운티 더럼 주"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "이스트 서섹스 주"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "에섹스 주"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "글로스터셔 주"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "그레이터 런던"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "그레이터 멘체스터 주"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "햄프셔 주"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "허트퍼드셔 주"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "켄트 주"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "랭커셔 주"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "레스터셔 주"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "링컨셔 주"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "머시사이드 주"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "노퍽 주"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "노스요크셔 주"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "노스햄프턴 주"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "노섬벌랜드 주"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "노팅험셔 주"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "옥스포드셔 주"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "시롭셔 주"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "서머셋 주"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "사우스요크셔 주"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "스태포드셔 주"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "서퍽 주"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "서리 주"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "타인-웨어 주"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "워릭셔 주"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "웨스트미들랜즈"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "웨스트서섹스 주"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "웨스트요크셔 주"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "윌트셔 주"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "우스터셔 주"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "앤트림 카운티"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "아마 카운티"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "다운 카운티"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "퍼매너 카운티"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "런던데리 카운티"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "티론 카운티"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "클루이드 주"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "디버드 주"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "궨트 주"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "귀네드 주"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "미드글라모건 주"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "포이스 주"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "사우스글라모건 주"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "웨스트글라모건 주"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "보더스 주"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "센트럴스코틀랜드"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "덤프리스갤러웨이 주"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "파이프 주"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "그램피언 주"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "하이랜드 주"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "로디언 주"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "오크니 제도"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "셰틀랜드 제도"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "스트래스클라이드 주"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "태이사이드 주"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "웨스턴아일 주"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "잉글랜드 주"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "노던아일랜드 주"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "스코틀랜드 주"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "웨일즈 주"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "올바른 차량 등록 번호를 입력하세요."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "올바른 전화번호를 입력하세요."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "올바른 우편번호를 입력하세요."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "올바른 NIK/KTP 번호를 입력하세요."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "아체"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "발리"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "반텐"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "벵쿨루"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "족자 카르타"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "자카르타"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "고론탈로"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "잠비"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "자와 바라트"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "자와 텐가"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "자와 티무르"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "칼리만탄 바라트"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "칼리만탄 슬라탄"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "칼리만탄 텐가"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "칼리만탄 티무르"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "케풀라우안 방카-벨리텅"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "케풀라우안 리아우"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "렘풍"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "말루쿠"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "말루쿠 우타라"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "누사 텐가라 바라트"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "누사 텐가라 티무르"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "파푸아"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "파푸아 바라트"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "리아우"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "술라웨시 바라트"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "술라웨시 슬라탄"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "술라웨시 Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "술라웨시 Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "술라웨시 우타라"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "수마 테라 바라트"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "수마트라 슬라탄"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "수마트라 우타라"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "수라 카르타 - 솔로몬"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe 아체 Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "군단 영사관"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "군단 외교"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "반둥"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "술라웨시의 우타라 Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - 티모르"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "술라웨시의 우타라 Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - 롬복"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "파푸아 댄 파푸아 바라트"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - 플로레스"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "보고르"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "세마랑"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "수라바야"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "연방 정부"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "앤트림"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "캐번"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "클레어"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "코르크"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "데리"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "도네갈"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "더블린"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "골웨이"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "케리"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "킬데어"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "킬케니"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "라오 이스"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "리트림"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "롱퍼드"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "로우쓰"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "메이요"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "미스"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "모나핸"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "오팔리"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "로스 커먼"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "슬라이고"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "워터 포드"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "웩스포드"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "위클로"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "XXXXX형식의 우편 번호를 입력하세요."
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "올바른 ID 번호를 입력하세요."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "올바른 아이슬란드 주민번호를 입력하세요. (XXXXXX-XXXX 형식)"
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "아이슬란드 주민번호가 올바르지 않습니다."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "올바른 우편번호를 입력하세요."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "올바른 사회보장번호를 입력하세요."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "올바른 VAT 번호를 입력하세요."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "우편번호를 입력하세요. (XXXXXXX or XXX-XXXX 형식)"
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "홋카이도"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "아오모리 현"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "이와테 현"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "미야기 현"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "아키타 현"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "야마가타 현"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "후쿠시마 현"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "이바라키 현"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "도치기 현"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "군마 현"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "사이타마 현"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "지바 현"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "도쿄 도"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "카나가와 현"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "야마나시 현"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "나가노 현"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "니가타 현"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "도야마 현"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "이시카와 현"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "후쿠이 현"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "기후 현"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "시즈오카 현"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "아이치 현"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "미에 현"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "시가 현"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "교토 부"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "오사카 부"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "효고 현"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "나라 현"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "와카야마 현"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "돗토리 현"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "시마네 현"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "아카야마 현"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "히로시마 현"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "야마구치 현"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "도구시마 현"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "카가와 현"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "에히메 현"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "고치 현"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "후쿠오카 현"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "사가 현"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "나가사키 현"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "구마모토 현"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "오이타 현"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "미야자키 현"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "가고시마 현"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "오키나와 현"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "올바른 쿠웨이트 주민번호를 입력하세요."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "아과스칼리엔테스 주"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "바하칼리포르니아 주"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "바하칼리포르니아수르 주"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "캄페체 주"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "치와와 주"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "치아파스 주"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "코아우일라 주"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "콜리마 주"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "연방구 (멕시코시)"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "두랑고 주"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "게레로 주"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "과나후아토 주"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "이달고 주"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "할리스코 주"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "멕시코 주"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "미초아칸 주"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "모렐로스 주"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "나야리트 주"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "누에보레온 주"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "오아하카 주"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "푸에블라 주"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "케레타로 주"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "킨타나로오 주"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "시날로아 주"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "산루이스포토시 주"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "소노라 주"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "타바스코 주"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "타마울리파스 주"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "틀락스칼라 주"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "베라크루스 주"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "유카탄 주"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "사카테카스 주"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "올바른 우편번호를 입력하세요."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "올바른 SoFi 번호를 입력하세요."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "드렌터 주"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "플레볼란트 주"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "프리슬란트 주"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "힐데를란트 주"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "흐로닝언 주"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "노르트브라반트 주"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "노르트홀란트 주"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "오버레이셜 주"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "위트레흐트 주"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "제일란트 주"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "자위트홀란트 주"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "올바른 노르웨이 사회보장번호를 입력해 주세요."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "이 항목은 8자리 숫자로 필요합니다."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "이 항목은 11자리 숫자가 필요합니다."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "주민번호는 11자리 숫자로 구성됩니다."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "주민번호 체크섬이 올바르지 않습니다."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Tax 번호(NIP)의 체크섬이 올바르지 않습니다."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "사업자 등록번호(REGON)은 9자리 또는 14자리의 숫자로 구성됩니다."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "사업자 등록번호(REGON)의 체크섬이 올바르지 않습니다."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "우편번호를 입력하세요. (XX-XXX 형식)"
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "우편번호는 XXXXX-XXX 형식으로 입력하세요."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "전화번호는 9자리 숫자이거나 + 또는 00으로 시작해야 합니다."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "올바른 CIF를 입력하세요."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "올바른 CNP를 입력하세요."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "올바른 IBAN을 입력하세요. (ROXX-XXXX-XXXX-XXXX-XXXX-XXXX 형식)"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "전화번호는 XXXX-XXXXXX 형식이어야 합니다."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "올바른 우편번호를 입력하세요. (XXXXXX 형식)"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "올바른 스웨덴 기관 번호를 입력하세요."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "올바른 스웨덴 주민번호를 입력하세요."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "조율 번호는 사용할 수 없습니다."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "올바른 스웨덴 우편번호를 입력하세요. (XXXXX 형식)"
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "스톡홀름"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "노르보텐"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "웁살라"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "칼마르"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "고틀랜드"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "블레킹예"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "스코네"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "베스 Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "외레브로"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "달라르나"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Shina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava region"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice region"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra region"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov region"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin region"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava region"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina region"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "XXXXX형식의 우편 번호를 입력하세요."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "전화번호는 0XXX XXX XXXX 형식입니다."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "올바른 터키계 ID 번호를 입력하세요."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "터키계 식별 번호는 11 자리 숫자입니다."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "우편번호를 입력하세요. (XXXXX 또는 XXXXX-XXXX 형식)"
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "전화번호는 XX-XXXX-XXXX 형식으로 입력하세요."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "올바른 미국 사회보장번호를 입력하세요. (XXX-XX-XXXX 형식)"
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "미국 주나 지역을 입력하세요."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "미국의 주 (두개의 대문자로)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "미국 우편번호 (대문자 약어 2자)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "전화번호"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"올바른 CI 번호를 입력하세요. (X.XXX.XXX-X, XXXXXXX-X 또는 XXXXXXXX 형식)"
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "올바른 CI 번호를 입력하세요."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "올바른 남아프리카 주민번호를 입력하세요."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "올바른 남아프리카 우편번호를 입력하세요."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "이스턴케이프 주"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "프리스테이트 주"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "가우텡 주"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "크와줄루나탈 주"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "림포포 주"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "음푸말랑가 주"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "노던케이프 주"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "노스웨스트 주"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "웨스턴케이프 주"
diff --git a/django/contrib/localflavor/locale/lt/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/lt/LC_MESSAGES/django.mo
deleted file mode 100644
index f471849bc8..0000000000
Binary files a/django/contrib/localflavor/locale/lt/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/lt/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/lt/LC_MESSAGES/django.po
deleted file mode 100644
index 4f6d11891e..0000000000
--- a/django/contrib/localflavor/locale/lt/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3554 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Kostas  <tamosiunas@gmail.com>, 2011.
-# lauris <lauris@runbox.com>, 2011.
-# Nikolajus Krauklis <nikolajus@gmail.com>, 2011.
-# Simonas Simas <simonas@kazlauskas.me>, 2012.
-# Vytautas Astrauskas <vastrauskas@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-09 18:09+0000\n"
-"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
-"language/lt/)\n"
-"Language: lt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Įveskite pašto kodą NNNN arba ANNNNAAA formatu."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Šis laukas priima tik skaičius."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Šis laukas priima 7 arba 8 skaičius."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-"Įveskite tinkamą asmens id numerį XXXXXXXXXXX-XXXXXXX-XXXXXXX-X formatu."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Negaliojantis asmens identifikavimo numeris."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenlandas"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Žemutinė Austrija"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Aukštutinė Austrija"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Zalcburgas"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Įveskite pašto kodą XXXX formatu."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Įveskite teisingą Austrijos socialinio draudimo numerį XXXX XXXXXX formatu."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Įveskite 4 skaitmenų pašto kodą."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australijos valstija"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australijos pašto kodas"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australijos telefono numeris"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antverpenas"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Briuselis"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Rytų Flandrija"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamandų Brabanto"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Liuksemburgas"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "West Flanders"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Briuselio sostinės regionas"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flemish regionas"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonija"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Įveskite pašto kodą 1XXX - 9XXX formatu."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Įveskite teisingą telefono numerį vienu iš šių formatu: 0x xxx xx xx, 0xx xx "
-"xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Įveskite pašto kodą XXXXX-XXX formatu."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonas turi būti XXX-XXXX-XXXX formatu."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Pasirinkite teisingą Brazilijos valstiją. Jūsų pasirinkta valstija nėra "
-"teisinga."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Netinkamas CPF numeris"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Šis laukas talpina daugiausiai 11 skaitmenų arba 14 simbolių."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Netinkamas CNPJ numeris"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Šis laukas reikalauja mažiausiai 14 skaitmenų."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Įveskite pašto kodą XXX XXX formatu."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Įveskite teisingą Kanados socialinio draudimo numerį XXX-XXX-XXX formatu."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ženeva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Įveskite tinkamą šveicarų asmens id ar paso numerį X1234567<0 arba "
-"1234567890 formatu."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Įveskite teisingą Čilės RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Įveskite teisingą Čilės RUT numerį XX.XXX.XXX-X formatu."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Čilės RUT neteisingas."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Įveskite pašto kodą formatu XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-"Identifikacinės kortelės numeris susideda iš 15-os arba 18-os skaitmenų."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Neteisingas identifikacinės kortelės numeris: Neteisingas gimtadienis"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-"Neteisingas identifikacinės kortelės numeris: Neteisingas vietovės kodas"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Įveskite tinkamą telefono numerį."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praha"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Vidurio Čekijos kraštas"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Pietų Čekijos kraštas"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilzeno regionas"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad Region"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti Region"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec Region"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Region"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice Region"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina Region"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "South Moravian Region"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc Region"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin Region"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravian-Silesian Region"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Įveskite pašto kodą XXXXX ar XXX XX formatu."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Įveskite gimimo liudijimo numerį XXXXXX/XXXX ar XXXXXXXXXX formatu."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Netinkama lyties reikšmė. Tinkamos reikšmės: 'f' ir 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Įveskite teisingą gimimo numerį."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Įveskite teisingą IC numerį."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavarija"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlynas"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburgas"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremenas"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburgas"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Žemutinė Saksonija"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saksonija"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Įveskite pašto kodą XXXXX formatu."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Įveskite tinkamą Vokiško asmens id numerį XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"formatu."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barselona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leonas"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madridas"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalūzija"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearic Islands"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basque Country"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanarų salos"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile and Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Region of Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valensijos Bendrija"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Įveskite galiojantį pašto kodą 01XXX - 52XXX formatu."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Įveskite teisingą telefono numerį 6XXXXXXXX, 8XXXXXXXX ar 9XXXXXXXX formatu."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Prašome įvesti teisingą NIF, NIE ar CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Prašome įvesti teisingą NIF ar NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Neteisinga NIF kontrolinė suma."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Neteisinga NIE kontrolinė suma."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Neteisinga CIF kontrolinė suma."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Prašome įvesti teisingą banko sąskaitos numerį XXXX-XXXX-XX-XXXXXXXXXX "
-"formatu."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Neteisinga banko sąskaitos numerio kontrolinė suma. "
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Įveskite tinkamą suomišką socialinio draudimo numerį."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefono numeris turi būti 0X XX XX XX XX formatu."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Įveskite galiojantį pašto kodą."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Eseksas"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oksfordšyras"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Pietų Jorkšyras"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Stafordšyras"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Vakarų Jorkšyras"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Centrinė Škotija"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglija"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Šiaurinė Airija"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Škotija"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Velsas"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Įveskite teisingą 13-os skaitmenų JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Klaida datos dalyje"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Įveskite teisingą 11-os skaitmenų OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Įveskite teisingą transporto priemonės registracijos numerį"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Įveskite teisingą vietovės kodą"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Skaitinė dalis negali būti nulis"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Įveskite teisingą 5-ių ženklų pašto kodą"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Įveskite teisingą telefono numerį"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Įveskite teisingą vietovės arba mobiliojo ryšio tiekėjo kodą"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefono numeris yra per ilgas"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Įveskite teisingą 19-os skaičių JMBAG prasidedantį 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Kortelės išdavimo numeris negali būti nulis"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Zagrebo miestas"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovaras-Bilogora"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodas-Posavina"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovnikas-Neretva"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istrija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovaco apskritis"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivnica-Križevcai"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapina-Zagorjė"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Lika-Senis"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Medžimurjė"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osijekas-Barania"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požega-Slavonija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorjė-Kalnų Kotaras"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisakas-Moslavina"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitas-Dalmatija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibenikas-Kninas"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždino apskritis"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitica-Podravina"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovaras-Srijemas"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadaro apskritis"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebo apskritis"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Įveskite galiojantį pašto kodą"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Įveskite teisingą NIK/KTP numerį."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublinas"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Įveskite pašto kodą XXXXX formatu"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Įveskite teisingą ID numerį."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Įveskite ZIP pašto kodą XXXXXX arba XXX XXX formatu."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Įveskite tinkamą islandų asmens id numerį XXXXXX-XXXX formatu."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islandiškas asmens ID yra netinkamas."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Įveskite tinkamą pašto kodą."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Įveskite tinkamą socialinio draudimo numerį."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Įveskite tinkamą PVM numerį"
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Įveskite pašto kodą XXXXXXX arba XXX-XXXX formatu."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokaidas"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokijas"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kioto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hirošima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasakis"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinava"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Įveskite teisingą Kuveito tapatybės kortelės numerį."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Identifikacijos kortelės skaičiai turi turėti nuo 4-ių iki 7-ių skaitmenų "
-"arba didžiąją raidę ir 7 skaitmenis."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Šis laukelis turėtų turėti lygiai 13 skaitmenų."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "Pirmi 7 UMCN skaitmenys turi nurodyti teisingą datą praeityje."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN yra neteisingas."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodromas"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovas"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovas"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdančis"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinja"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovas"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brveniča"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovas"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevas"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčanis"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Velesas"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčištės"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivaras"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradskas"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debaras"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevas"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisaras"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolnenis"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovas"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želinas"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovas"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovičas"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilindenas"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovčė"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarčis"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevas"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Končė"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Kočanis"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovas"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštanis"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševas"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovas"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovas"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovas ir Rostušė"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonijos Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonijos Brodas"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotinas"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novačis"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selas"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomeja"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohridas"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovecas"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevas"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilepas"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištipas"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radovišas"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovčė"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resenas"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosomanas"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikolas"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopištas"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Dojranas"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričanas"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničanis"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearcė"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovas"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centrinė Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovas-Obleševas"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevas"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štipas"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Įveskite teisingą ZIP pašto kodą XXXXX formatu."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Įveskite teisingą RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Įveskite teisingą CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de Mexico"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacan"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Queretaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosi"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatan"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Įveskite galiojantį pašto kodą"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Įveskite teisingą SoFi numerį."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Šiaurinis Brabantas"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Šiaurinė Olandija"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Įveskite tinkamą norvegiška socialinio draudimo numerį."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Šis laukas priima 8 skaičius."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Šis laukas priima 11 skaičių."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Nacionalinį asmens identifikavimo kodą sudaro 11 skaitmenų."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Neteisinga nacionalinio identifikacinio numerio kontrolinė suma."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Neteisinga mokesčių mokėtojo numerio (NIP) kontrolinė suma."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Nacionalinis verslo registracijos numeris (REGON) susideda iš 9 ar 14 "
-"skaitmenų."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Neteisinga nacionalinio verslo numerio (REGON) kontrolinė suma."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Įveskite pašto kodą XX-XXX formatu."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Įveskite pašto kodą XXXX-XXX formatu."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefono numerį turi sudaryti 9 skaitmenys arba prasidėti + ar 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Įveskite teisingą CIF numerį."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Įveskite teisingą CNP numerį."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Įveskite teisingą IBAN numerį ROXX-XXXX-XXXX-XXXX-XXXX-XXXX formatu"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefono numeris turi būti XXXX-XXXXXX formatu."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Įveskite teisingą pašto kodą XXXXXX formatu"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Įveskite pašto kodą XXXXXX formatu."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Įveskite paso numerį XXXX XXXXXX formatu."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Įveskite paso numerį XX XXXXXXX formatu."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Maskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Sankt-Peterburgas"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygėjos Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Baškirijos Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altajaus Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestano Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelija, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altajaus kraštas"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Įveskite teisingą Švedijos organizacijos identifikacinį numerį."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Įveskite teisingą Švedijos asmeninį identifikacinį numerį."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinavimo numeriai uždrausti."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Įveskite Švedų pašto kodą XXXXX formatu."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stokholmas"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Vasterbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Sodermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Ostergotland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jonkoping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotlandas"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skane"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Vastra Gotaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Varmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Orebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Vastmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gavleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Vasternorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jamtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Įveskite teisingą mokesčių numerį SIXXXXXXXX formatu."
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Įveskite telefono numerį +386XXXXXXXX arba 0XXXXXXXX formatu."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica regionas"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislavos regionas"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice regionas"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra regionas"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov regionas"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin regionas"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava regionas"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina regionas"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Įveskite pašto kodą XXXXX formatu."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefono numeriai turi būti 0XXX XXX XXXX formatu."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Įveskite teisingą Turkijos identifikacinį numerį."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turkijos identifikacinis numeris turi sudaryti 11 skaičių"
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Įveskite pašto kodą XXXXX arba XXXXX-XXXX formatu."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefono numeriai turi būti XXX-XXX-XXXX formatu."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Įveskite tinkamą JAV socialinio draudimo numerį."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Įveskite JAV valstiją ar teritoriją."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "JAV valstija (dvi didžiosios raidės)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "JAV pašto kodas (dvi didžiosiosios raidės)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefono numeris"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Įveskite teisingą CI numerį X.XXX.XXX-X,XXXXXXX-X ar XXXXXXXX formatu."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Įveskite teisingą CI numerį."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Įveskite teisingą Pietų Afrikos identifikavimo numerį."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Įveskite teisingą Pietų Afrikos pašto kodą."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Rytinis Keiptaunas"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Šiaurinis Keiptaunas"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Vakarinis Keiptaunas"
diff --git a/django/contrib/localflavor/locale/lv/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/lv/LC_MESSAGES/django.mo
deleted file mode 100644
index ffde5331ed..0000000000
Binary files a/django/contrib/localflavor/locale/lv/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/lv/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/lv/LC_MESSAGES/django.po
deleted file mode 100644
index 3ff90ab366..0000000000
--- a/django/contrib/localflavor/locale/lv/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3544 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
-"lv/)\n"
-"Language: lv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Ievadiet pasta indeksu NNNN vai ANNNNAAA formātā."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Šis lauks drīkst saturēt tikai ciparus."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Šim laukam jasastāv no 7 vai 8 cipariem."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Ievadiet korektu CUIT XX-XXXXXXXX-X vai XXXXXXXXXXXX formātos."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Nekorekts CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenlande"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Karintija"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Zalcburga"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Stīrija"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirole"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vīne"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Ievadiet pasta indeksu formātā XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Ievadiet korektu Austrijas sociālās drošības numuru XXXX XXXXXX formātā."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburga"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Ievadiet pasta indeksu XXXXX-XXX formātā."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Tālruņa numuriem jābūt XXX-XXXX-XXXX formātā."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Izvēlēties derīgu Brazīlijas pavalsti. Šī pavalsts nav no pieejamajām "
-"pavalstīm."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Nekorekts CPF numurs"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Šī lauka vērtībai jābūt ne vairāk kā 11 cipariem vai 14 simboliem."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Nekorekts CNPJ numurs"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Šim laukam jasastāv ne vairāk kā no 14 cipariem."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Ievadiet pasta indeksu formātā XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Ievadiet korektu Kanādas sociālās apdrošināšanas numuru XXX-XXX-XXX formātā."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ženēva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarusa"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valē"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Cīrige"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Lūdzu ievadiet korektu šveiciešu identifikācijas vai pases nummuru "
-"X1234567<0 vai 1234567890 formātā."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Ievadiet korektu čīliešu RUT"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Ievadiet korektu čīliešu RUT XX.XXX.XXX-X formātā."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Čīles RUT ir nekorekts."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prāga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Centrālbohēmijas reģions"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Dienvidbohēmijas reģions"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilzenes reģions"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karslbādes reģions"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Ievadiet pasta indeksu XXXXX vai XXX XX formātos."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Ievadiet dzimšanas numuru XXXXXX/XXXX vai XXXXXXXXXX formātā."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Nekorekts neobligatais parametrs dzimums, korektās vērtības ir 'f' un 'm'."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Ievadiet korektu dzimšanas numuru."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Ievadiet korektu IC numuru."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Bādene-Virtemburga"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavārija"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlīne"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburga"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Brēmene"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburga"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hesene"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Meklenburga-Rietumpomerānija"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lejassaksija"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Ziemeļreina-Vestfālija"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Reinaszeme-Pfalca"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saksija"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saksija-Anhalte"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Šlesviga-Holšteina"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Tīringene"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Ievadiet pasta indeksu formātā XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Ievadiet korektu Vācijas identifikācijas kartes numuru XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X formātā."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almērija"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barselona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Kadisa"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Kordova"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Hirona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granāda"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Gvadalahara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leona"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madride"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Mursija"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Orense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Astūrija"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palensija"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Laspalmasa"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanka"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Tenerifes Santa Kruza"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Kantabrija"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovija"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seviļa"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Sorija"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Taragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valensija"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valadolida"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biskaja"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Saragosa"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalūzija"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragona"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Astūrijas novads"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Baleāru salas"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basku zeme"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanāriju salas"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastīlija La Manša"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastīlija Leona"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalonija"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Ekstremadūra"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galīcija"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Mursijas reģions"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-"Ievadiet korektu pasta indeksu sekojošajā formātā un robežās 01XXX - 52XXX"
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Ievadiet korektu tālruņa numuru vienā no sekojošajiem formātiem 6XXXXXXXX, "
-"8XXXXXXXX vai 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Ievadiet korektu NIF, NIE vai CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Lūdzu ievadiet korektu NIF vai NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Nekorekta NIF kontrolsumma."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Nekorekta NIE kontrolsumma."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Nekorekta CIF kontrolsumma."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Ievadiet korektu bankas konta numuru formātā XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Nekorekta bankas konta numura kontrolsumma."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Ievadiet korektu Somijas sociālās drošības nummuru."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefona numuriem jābūt  0X XX XX XX XX formātā."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Ievadiet korektu pasta indeksu."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Češīra"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Kumbrija"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devona"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kenta"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surreja"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglija"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Ziemeļīrija"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Skotija"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Velsa"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Ievadiet korektu transportlīdzekļa numuru."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Ievadiet korektu tālruņa numuru."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Ievadiet korektu pasta indeksu."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Ievadiet korektu NIK/KTP  numuru."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Jogiakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Džakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Korka"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublina"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galveja"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenija"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerika"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Lūdzu ievadiet korektu Islandes identifikācijas nummuru XXXXXX-XXXX formātā."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islandes identifikācijas nummurs nav korekts."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Ievadiet korektu pasta indeksu."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Ievadiet korektu sociālās drošības nummuru."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Ievadiet korektu PVN numuru."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Ievadiet pasta indeksu XXXXXXX vai XXX-XXXX formātos."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Ivate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukušima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokija"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Išikava"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Šizuka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kioto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Šimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hirošima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagošima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinava"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Ievadiet korektu Kuveitas pilsoņu ID numuru."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Kampeče"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Kolima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Verakrusa"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Jukatana"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Ievadiet korektu pasta indeksu."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Ievadiet korektu SoFi numuru."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frīzlande"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningena"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Ziemeļbrabante"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Ziemeļholande"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrehta"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zēlande"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Dienvidholande"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Lūdzu ievadiet korektu Norvēģijas sociālās drošības nummuru."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Šim laukam jasastāv no 8 cipariem."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Šim laukam jasastāv no 11 cipariem."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Nacionālais identifikācijas numurs sastāv no 11 cipariem."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Nekorekta kontrolsumma nacionālajam identifikācijas numuram."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Nekorekta nodokļu numura (NIP) kontrolsumma."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Nacionālais biznesa reģistra numurs (REGON) sastāv no 9 vai 14 cipariem."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Nekorekta nacionālā biznesa reģistra numura (REGON) kontrolsumma."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Ievadiet pasta indeksu formātā XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Apakšsilēzija"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodza"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerānija"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silēzija"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Ievadiet pasta indeksu XXXX-XXX formātā."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Tālruņa numuriem jābūt 9 cipariem vai jāsākas ar + vai 00"
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Ievadiet korektu CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Ievadiet korektu CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Ievadiet korektu IBAN ROXX-XXXX-XXXX-XXXX-XXXX-XXXX formātā."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Tālruņa numuriem jābūt XXXX-XXXXXX formātā."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Ievadiet pasta indeksu formātā XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Ievadiet korektu Zviedrijas organizācijas numuru."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Ievadiet korektu Zviedrijas ID numuru."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Ievadiet Zviedrijas pasta indeksu formātā XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stokholma"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Upsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotlande"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Ērebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jemtlande"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Ievadiet pasta indeksu XXXXX vai XXXXX-XXXX formātos."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefona numuriem jābūt XXX-XXXX-XXXX formātā."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Ievadiet korektu ASV sociālās apdrošināšanas numuru XXX-XX-XXXX formātā."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Ievadiet ASV štatu vai teritoriju."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "ASV štats (divi augšējā reģistra burti)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Tālruņa numurs"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Ievadiet korektu CI numuru X.XXX.XXX-X,XXXXXXX-X vai XXXXXXXX formātos."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Ievadiet korektu CI numuru."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Ievadiet korektu DĀR ID numuru."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Ievadiet korektu DĀR pasta indeksu."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/mk/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/mk/LC_MESSAGES/django.mo
deleted file mode 100644
index efe20225b5..0000000000
Binary files a/django/contrib/localflavor/locale/mk/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/mk/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/mk/LC_MESSAGES/django.po
deleted file mode 100644
index 2e0970612c..0000000000
--- a/django/contrib/localflavor/locale/mk/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3554 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-#   <vvangelovski@gmail.com>, 2012.
-# vvangelovski <vvangelovski@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-12 11:12+0000\n"
-"Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
-"language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Внесете поштенски број во форматот NNNN или ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Во ова поле смее да бидат само бројки."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Во ова поле смее да има 7 или 8 цифри."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Внесете правилен CUIT во XX-XXXXXXXX-X or XXXXXXXXXXXX формат."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Неправилен CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Бургенленд"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Каринтиа"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Долна Австрија"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Горна Австрија"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Салцзбург"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Стириа"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Тирол"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Ворарлберг"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Виена"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Внесете правилен поштенски број во форматот XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Внесете правилен број за социјално осигурување на Австрија во XXXX-XXXXXX "
-"формат."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Внесете 4 цифрен поштенски број."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Австралиска држава"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Австралиски поштенски број"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Австралиски телефонски број"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Антверп"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Брисел"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Источен Фландерс"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Фламански Брабант"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Хаинаут"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Лиж"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Лимбург"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Луксембург"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Намур"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Валун Брабант"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Западен Фландерс"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Брисел Престолничен Регион"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Фламански Регион"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Валониа"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Внесете валиден поштенски број во форматот 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Внесете валиден телефонски број во еден од следниве формати: 0x xxx xx xx, "
-"0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x."
-"xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Внесете правилен поштенски број во форматот XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Телефонските броеви мора да бидат во XX-XXXX-XXXX форматот."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Изберете правилна бразилска држава. Оваа држава не е од достапните држави."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Неправилен CPF број."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Во ова поле смее да има најмногу 11 цифри или 14 знаци."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Неправилен CNPJ број."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Во ова поле треба да има најмалку 14 цифри"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Внесете правилен поштенски број во формат XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Внесте правилен канадски број за осигурување во XXX-XXX-XXX форматот."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Женева"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Цирих"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Внесете правилен швајцарски број на пасош во X1234567<0 или  1234567890 "
-"формат."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Внесете правилeн RUT за Чиле."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Внесете правилен RUT за Чиле. Форматот е Xx.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "RUT бројот за Чиле е невалиден."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Внесете поштенски код во формат XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Број на лична карта се состои од 15 или 18 цифри."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Невалиден број лична карта: Неуспешна проверка по контролен број"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Невалиден број лична карта: Погрешен датум на раѓање"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Невалиден број лична карта: Погрешен код на локација"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Внесете валиден телефонски број."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Внесете валиден мобилен број."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Прага"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Централен Бохемиски регион"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Јужен Бохемиски регион"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Пилзенски регион"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Карлсбадски регион"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Усти регион"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Либерец регион"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Храдец регион"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Пардубице регион"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Висоцина регион"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Јужно Моравски регион"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Оломуц регион"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Зилина регион"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Моравско-Силесански регион"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Внесете поштенски број во форматот XXXXX или XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Внесете даночен број (NIP) во форматот XXXXXX/XXXX или XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Невалидна вредност за опционален параметар пол, валидни вредности се 'f' и "
-"'m'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Внесете правилен даночен број."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Внесете правилен даночен број."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Баден-Вуертемберг"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Баварија"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Берлин"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Бранденбург"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Бремен"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Хамбург"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Хесен"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Мекленбург - Западна Померанија"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Долна Саксонија"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Северна Рајна-Вестфалија"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Рајналенд-Палатинате"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Сарленд"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Саксонија"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Саксонија-Анхалт"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Шлесвиг-Холштајн"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Турингиа"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Внесете правилен поштенски број во формат XXXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Внесете правилен број на лична карта во Германија во XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X  форматот."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Авила"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Барцелона"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Кордоба"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Леон"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Луго"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Мадрид"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Малага"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Санта Круз и Тенерифе"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Севиља"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Толедо"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Валенсија"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Сарагоса"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Андалузија"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Арагон"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Острови Балеарик"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Баскија"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Канарски острови"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Кастиља ла Манча"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Кастиња и Леон"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Каталонија"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Екстремадура"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Галиција"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Регион Мурција"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Внесете поштенски број во опсег и формат 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Внесете правилен телефонски број во еден од формативе 6XXXXXXXX, 8XXXXXXXX "
-"или 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Ве молам внесете правиелн NIF, NIE или CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Ве молам внесете валиден NIF или NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Неправилна контролна сума за NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Неправилна контролна сума за NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Неправилна контролна сум за CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Внесете правилна банкарска сметка во формат XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Неправилна контролна сума за бројот на банкарската сметка."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Внесте правилен фински матичен број."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Телефонските броеви мора да бидат во 0X XX XX XX XX форматот."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Внесете правилен поштенски код."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Бедфордшир"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Букингхамшир"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Чешир"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Кумбриа"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Дербишир"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Девон"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Дорсет"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Дурам"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Источен Сасекс"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Есекс"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Поширок Лондон"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Поширок Манчестер"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Хемпшир"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Хертфордшир"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Кент"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Ланкашир"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Линколншир"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Мерсејсајд"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Норфолк"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Северен Јоркшир"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Нортхамтоншир"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Нотингхамшир"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Оксфордшир"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Шропшир"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Сомерсет"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Јужен Јоркшир"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Стафордшир"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Суфолк"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Западен Мидландс"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Западен Сасекс"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Западен Јоркшир"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Вилтшир"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Гвент"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Јужен Гламорга"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Западен Гламорган"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Централна Шкотска"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Грампиан"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Англија"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Северна Ирска"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Шкотска"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Велс"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Внесете валиден 13 цифрен ЕМБГ"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Грешка во сегментот со датум"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Внесете валиден 11 цифрен OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Внесете валидна регистарска табличка."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Внесете валиден код на локација"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Делот со број не може да биде нула"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Внесете валиден 5 цифрен поштенски код"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Внесете валиден телефонски број"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Внесете валиден код за област или мобилна мрежа"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Телефонскиот број е премногу долг"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Внесете валиден 19 цифрен ЕМБГ кој почнува со 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Бројот на издавање на картичка не може да биде нула"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Град Загреб"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Беловарско-билоградска објаст"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Бродско-посавска област"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Дубровачко-неретванска област"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Истарска област"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Карловачка област"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Копривничко-крижевачка област"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Крапинско-загорска област"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Личко-сењска област"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Меџимурска област"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Осјечко-барањска област"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Пожешко-славонска област"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Приморско-горанска област"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Сисачко-мославачка област"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Сплитско-далматинска област"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Шибенско-книнска област"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Вараждинска област"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Вировичко-подравска област"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Вуковарско-сремска област"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Задарска област"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Загребачка област"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Внесете правилен поштенски код"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Внесете правилен NIK/KTP број."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Ацех"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Бали"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Бантен"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Бенгкулу"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Јогјакарта"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Џакарта"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Горонтало"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Џамби"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Јава Барат"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Јава Тенга"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Јава Тимур"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Калинмантан Барат"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Калимантан Селатан"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Калимантан Тенга"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Калимантан Тимур"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Кепулуан Банга-Белитунг"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Кепулуан Риау"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Лампунг"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Малуку"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Малуку Утара"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Нуса Тенгара Барат"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Нуса Тенгара Тимур"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Папуа"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Папуа Барат"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Риау"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Сулавеси Барат"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Сулавеси Селатан"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Сулавеси Тенга"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Сулавеси Тенгара"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Сулавеси Утара"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Суматера Барат"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Суматера Селатан"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Суматера Утара"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Магеланг"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Суракарта - Соло"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Мадиун"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Кедири"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Тапанули"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Нангоре Аце Дарусалам"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Кепулуан Банга Белитунг"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Бандунг"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Сулавеси Утара Даратан"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Сулавеси Утара Кепулуан"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Папуа дан Папуа Барат"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Циребон"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Богор"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Пекалонган"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Семаранг"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Пати"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Сурабаја"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Мадура"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Маланг"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Џембер"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Банјумас"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Федерална Влада"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Бојонегоро"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Пурвакарта"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Сидоарџо"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Гарут"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Антрим"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Армаг"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Карлов"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Каван"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Кларе"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Корк"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Дери"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Донегал"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Даун"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Даблин"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Ферманаг"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Галвеј"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Кери"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Килдаре"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Килкени"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Лаоис"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Лајтрим"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Лимерик"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Лонгфорд"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Лут"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Мајо"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Мит"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Монаган"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Офали"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Росомон"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Слиго"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Типерари"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Тајрон"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Вотерфорд"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Вестмит"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Вексфорд"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Виклоу"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Внесете поштенски код во форматот XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Внесете валиден идентификациски број."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Внесете поштенски код во формат XXXXXX или ХХХ ХХХ."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Внесете Индиска држава или територија."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Телефонските броеви мора да бидат во 02X-8Х или 03X-7Х или 04Х-6X формат."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Внесете валиден идентификационен број од Исланд. Форматот е XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Исландскиот идентификационент број е невалиден."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Внесете правилен поштенски број."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Внесете правилен осигурителен број."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Внесете правилен даночен број."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Внесете поштенски број во форматот XXXXXXX или XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Хокаидо"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Аомори"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Ивате"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Мијаги"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Акита"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Јамагата"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Фукушима"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ибараки"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Точиги"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Гунма"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Саитама"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Чиба"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Токио"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Канагава"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Јаманаши"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Нагано"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Нигита"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Тојама"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ишикава"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Фукуи"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Гифу"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Шизоука"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Аичи"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Мие"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Шига"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Кјото"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Осака"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Хиого"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Нара"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Вакајама"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Тотори"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Шимане"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Окајама"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Хирошима"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Јамагучи"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Токушима"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Кагава"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Еиме"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Кочи"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Фукуока"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Сага"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Нагасаки"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Кумамото"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Оита"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Мијазаки"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Кагошима"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Окинава"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Внесете правилен кувајтски број за идентификација"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Броевѕ од лична карта мора да содржат или 4-7 цифри или латинична буква и 7 "
-"цифри."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Ова поле треба да содржи точно 13 цифри."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Првите 7 бројки од ЕМБГ мора да претставуваат валидна дата од минатото."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "ЕМБГ не е валиден."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Аеродром"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Арачиново"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Берово"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Битола"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Богданци"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Боговиње"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Босилово"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Брвеница"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Бутел"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Валандово"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Василево"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Вевчани"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Велес"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Виница"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Вранештица"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Врапчиште"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Гази Баба"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Гевгелија"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Гостивар"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Градско"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Дебар"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Дебарца"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Делчево"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Демир Капија"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Демир Хисар"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Долнени"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Другово"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Ѓорче Петров"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Желино"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Зајас"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Зелениково"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Зрновци"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Илинден"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Јегуновце"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Кавадарци"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Карбинци"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Карпош"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Кисела Вода"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Кичево"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Конче"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Кочани"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Кратово"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Крива Паланка"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Кривогаштани"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Крушево"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Куманово"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Липково"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Лозово"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Маврово и Ростуша"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Македонска Каменица"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Македонски Брод"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Могила"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Неготино"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Новаци"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Ново Село"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Осломеј"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Охрид"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Петровец"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Пехчево"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Пласница"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Прилеп"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Пробиштип"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Радовиш"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Ранковце"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Ресен"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Росоман"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Сарај"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Свети Николе"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Сопиште"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Стар Дојран"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Старо Нагоричане"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Струга"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Струмица"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Студеничани"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Теарце"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Тетово"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Центар"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Центар-Жупа"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Чаир"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Чашка"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Чешиново-Облешево"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Чучер-Сандево"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Штип"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Шуто Оризари"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Македонски број на лична карта"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Македонска општина (2 карактерен код)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Единствен матичен број на граѓанинот (13 цифри)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Внесете валиден поштенски код во формат ХХХХХ."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Внесете валиден RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Невалидна проверка за RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Внесете валиден CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Невалидна проверка за CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Мексичка држава (три големи букви)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Мексички поштенски код"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Мексикански RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Мексикански CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Баја Калифорнија"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Кампеш"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Чиапас"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Колима"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Дуранго"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Гуереро"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Хидалго"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Џалиско"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Куантана Ро"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Синалоа"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "Сан Луис Потоси"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Сонора"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Табаско"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Тамаулипас"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Веракруз"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Јукатан"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Зацатекас"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Внесете правилен поштенски код"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Внесете валиден осигурителен број"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Дренте"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Флеволанд"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Фраисланд"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Гелдерланд"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Гронинген"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Утрехт"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Зиланд"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Ве молам внесете правилен норвешки матичен број."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Во ова поле мора да се внесат 8 цифри."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Во ова поле се потребни 11 цифри."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Националниот идентификационен број се состои од 11 цифири."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Погрешна проверка за Националниот идентификационен број."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Број на национална лична карта се состои од 3 букви и 6 цифри."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Погрешна контролна проверка на бројот на национална лична карта."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Внесете даночен број (НИП) во формат XXX-XXX-XX-XX, XXX-XX-XX-XXX или "
-"xxxxxxxxxx."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Даночниот број (NIP) е погрешен."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Националниот бизнис регистрациски број (REGON) се состои од 9 или 14 цифри."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Неправилна контролна сум за Националниот бизнис регистрационен број (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Внесете правилен поштенски број во формат XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Долна Силесиа"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Лублин"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Лубус"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Лодз"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Масовиа"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Ополе"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Субкарпатиа"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Подласи"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Померанија"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Силесиа"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Западна Померанија"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Внесете поштенски број во форматот XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Телефонските броеви мора да се со 9 цифри, или да почнуваат со + или 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Внесете правилен CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Внесете правилен CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Внесете правилен IBAN во ROXX-XXXX-XXXX-XXXX-XXXX-XXXX формат"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Телефонските броеви мора да бидат во XXXX-XXXXXX форматот."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Внесете правилен поштенски код во формат XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Внесете поштенски код во формат XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Внесете број на пасош во формат XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Внесете број на пасош во формат ХХ XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Central Federal County"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "South Federal County"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "North-West Federal County"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Far-East Federal County"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Siberian Federal County"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Ural Federal County"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Federal County"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "North-Caucasian Federal County"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Москва"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Санкт Петербург"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Внесете број на шведска организација."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Внесте правилен шведски матичен број."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Координациски броеви не се дозволени."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Внесете правилен шведски поштенски број во формат XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Стокхолм"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Вестерботен"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Норботен"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Упсала"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Содерманланд"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Остерготланд"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Јонкопинг"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Кроненберг"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Калмар"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Готланд"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Блекинге"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Скане"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Халанд"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Вестра Готаланд"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Вермленд"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Оребро"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Вестменланд"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Даларна"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Гевлеборг"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Вестернорланд"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Јемтланд"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"Првите 7 бројки од ЕМБГ мора да претставуваат валидна дата од минатото."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "ЕМБГ не е валиден."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Внесете валиден даночен број во форма SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Внесете телефонски број во форма +386XXXXXXXX или 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Банска Бистрица"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Банска Стиавница"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Бардејов"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Бановце над Бебраво"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Брезно"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Братислава I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Братислава II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Братислава III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Братислава IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Братислава V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Битка"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Кадка"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Детва"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Гелника"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Хлоховец"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Хумен"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Кезмарок"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Комарно"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Кошице I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Кошице II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Кошице III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Кошице IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Кошице - околина"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Крупина"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Левице"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Левока"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Луценец"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Мартин"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Наместово"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Нитра"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Партизанске"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Пезинок"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Полтар"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Попрад"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Пресов"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Пучов"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Ревука"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Рознава"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Рузомберок"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Сабинов"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Сенец"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Сеника"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Скалица"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Шнина"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Собранце"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Стара Љубовна"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Стропков"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Свидник"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Сала"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Тополчани"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Требисов"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Тренцин"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Трнава"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Тврдосин"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Злате Моравце"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Зволен"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Зарновица"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Зилина"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Братиславски регион"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Кошице регион"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Нитра регион"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Пресов регион"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Тренцин регион"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Трнава регион"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Зилина регион"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Внесете поштенски код во форматот XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Телефонските броеви мора да бидат во форматот 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Внесете валиден Турски идентификациски број."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Турскиот идентификациски број мора да биде 11 цифри."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Внесете поштенски број во форматот XXXXX или XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Телефонските броеви мора да бидат во XXX-XXX-XXXX форматот."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Внесте правилен матичен број за САД во XXX-XX-XXXX форматот."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Внесете држава или територија од САД."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Држава во САД (две големи букви)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Поштенски код во САД (две големи букви)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Телефонски број"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Внесете правилен CI во X.XXX.XXX-X,XXXXXXX-X или XXXXXXXX формат."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Внесете правилен CI број."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Внесете правилен јужно афрички број за идентификација"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Внесете правилен јужно афрички поштенски код"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Источен Кејп"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/ml/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ml/LC_MESSAGES/django.mo
deleted file mode 100644
index aceabc6f33..0000000000
Binary files a/django/contrib/localflavor/locale/ml/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ml/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ml/LC_MESSAGES/django.po
deleted file mode 100644
index 168cb0aeaa..0000000000
--- a/django/contrib/localflavor/locale/ml/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3527 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
-"language/ml/)\n"
-"Language: ml\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/mn/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/mn/LC_MESSAGES/django.mo
deleted file mode 100644
index c5d8e90f01..0000000000
Binary files a/django/contrib/localflavor/locale/mn/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/mn/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/mn/LC_MESSAGES/django.po
deleted file mode 100644
index 25b67076bf..0000000000
--- a/django/contrib/localflavor/locale/mn/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3557 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# badka <badral214@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-#   <jargalanch@gmail.com>, 2012.
-# miigaa ... <b.myagmardorj@gmail.com>, 2012.
-#   <mnts26@gmail.com>, 2011.
-# Tsolmon <mnts26@gmail.com>, 2011.
-#   <zolzaya.erdenebaatar@gmail.com>, 2011.
-# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011, 2012.
-# Баясгалан Цэвлээ <bayasaa_7672@yahoo.com>, 2011, 2012.
-# Ганзориг БП <ganzo.bp@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
-"language/mn/)\n"
-"Language: mn\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Шуудангийн дугаараа NNNN буюу ANNNNAAA хэлбэрээр оруулна уу. "
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Энэ хэсэгт зөвхөн тоо оруулна."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Энэ хэсэгт зөвхөн 7-8 оронтой тоо оруулна."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "CUIT-ээ XX-XXXXXXXX-X эсвэл XXXXXXXXXXXX хэлбэрээр оруулна уу."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Хүчингүй CUIT байна."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Бургенланд"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Каринтиа"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Доод Австри"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Дээд Австри"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Зальцбург"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Стириа"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Тирол"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Ворарлберг"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Венн"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Шуудангийн индексээ XXXX хэлбэрээр оруулна уу."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Австрийн нийгмийн хамгааллын дугаараа XXXX XXXXXX хэлбэрээр оруулна уу."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Шуудангийн код 4 тоог оруулна уу."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Австралийн муж"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Австралийн шуудангийн код"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Австралийн утасны дугаар"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Антверп"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Бруссель"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Зүүн Пландерс"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Фламанд Брабант"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Хайнаут"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Лэйге"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Лимбург"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Люксенбург"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Намур"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Валлон Брабант"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Баруун Пландерс"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Бурвэйл үндсэн муж"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Флемиш муж"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Валлониа"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Зөв шуудангийг код оруулна уу хэлбэр ба хязгаар нь 1xxx-9xxx."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Зөв утасны дугаараа зөв оруулна уу. Оруулах Хэлбэрүүд  0x xxx xx xx, 0xx xx "
-"xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Шуудангийн индексээ XXXXX-XXX хэлбэрээр оруулна уу. "
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Утасны дугаараа XX-XXXX-XXXX хэлбэрээр оруулна уу."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Бразилийн мужаа сонгоно уу. Энэ нь байгаа муж биш байна."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "CPF дугаар хүчингүй байна."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-"Энэ хэсэгт 11-ээс илүүгүй оронтой тоо буюу 14-өөс илүүгүй тэмдэгт оруулна уу."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "CNPJ дугаар хүчингүй байна."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Энэ хэсэгт наад зах нь 14 оронтой тоо оруулна уу."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Шуудангийн дугаараа XXX XXX хэлбэрээр оруулна уу."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Канадын нийгмийн даатгалын дугаараа XXX-XXX-XXX хэлбэрээр оруулна уу."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Ааргау"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Аппензелл Иннерходен "
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Аппензелл Ауссеррходен"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Басел-Стат"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Басел-Ланд"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Берн"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Фрайбург"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Женев"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Гларус"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Граубенден"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Юра"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Лусерн"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Ноехател"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Нидвалден"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Обвалден"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Шафхаусен"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Швиц"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Солотурн"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Сант-Галлен"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Тургау"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Тикино"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Ури"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Валаис"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Вауд"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Зуг"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Зурик"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Щвейцарийн үнэмлэх юм уу пасспортныхоо дугаарыг X1234567<0 эсвэл 1234567890 "
-"хэлбэрээр оруулна уу."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Чилийн RUT-ээ оруулна уу."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Чилийн RUT-ээ XX.XXX.XXX-X хэлбэрээр оруулна уу. "
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Чилийн RUT хүчингүй байна."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Шуудангийн кодоо XXXXXX форматын дагуу оруулна уу."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "ID картын дугаар 15 эсвэл 18 оронгоос бүрдэнэ"
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Бодит ID картын дугаар оруулна уу. Нийлбэр буруу байна"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "ID картын дугаар буруу:Төрсөн огноо буруу"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "ID картын дугаар буруу:Байршилийн код буруу"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Зөв утасны дугаар оруулна уу."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Зөв гар утасны дугаар оруулна уу."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Прага"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Төв Бохемийн бүс"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Хойд Бохемийн бүс"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Пилсен Бүс"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Карлсбад бүс"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Усти Бүс"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Либерец Бүс"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Храдец Бүс"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Пардубице Бүс"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Высочина Бүс"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Өмнөд Моравийн Бүс"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Оломус Бүс"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Злин Бүс"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Морави-Силесийн Бүс"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Шуудангийн дугаараа XXXXX буюу XXX XX хэлбэрээр оруулна уу."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Төрсөн тоогоо XXXXXX/XXXX эсвэл XXXXXXXXXX хэлбэрээр оруулна уу."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Хүйсээ зөв оруулна уу. Зөв утга 'f' болон 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Төрсөн тоогоо зөв оруулна уу."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Зөв IC дугаар оруулна уу"
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Баден-Вюртемберг"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Бавари"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Берлин"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Бранденбург"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Бремен"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Хамбург"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Хессен"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Мекленбург-Баруун Помераниа"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Доод Саксони"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Хойд Рейн-Вестфалиа"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Рейнланд-Палатинет"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Саарланд"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Саксония"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Саксония-Анхалт"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Шлесвиг-Холстейн"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Турингиа"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Шуудангийн индексээ XXXXX хэлбэрээр оруулна уу."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Германы үнэмлэхний дугаарыг XXXXXXXXXXX-XXXXXXX-XXXXXXX-X хэлбэрээр оруулна "
-"уу."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Арава"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Албасет"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Алакант"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Алмериа"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Авила"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Бадажоз"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Иллес Балеарс"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Барселон"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Бургоз"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Касерес"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Кадиз"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Кастелло"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Сиудад Рийл"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Кордоба"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "А Коруна"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Куэнса"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Гирона"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Гранада"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Гуадалажара"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Гипузкоа"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Хуелва"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Хуеска"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Жен"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Леон"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Ллейда"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "Ла Риожа"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Луго"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Мадрид"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Малага"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Мурсиа"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Наварре"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Оуренс"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Астуриас"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Паленсиа"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Лас Палмас"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Понтеведра"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Саламанка"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Санта Круз дэ Тенериф"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Кантабриа"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Сеговиа"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Севилль"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Сориа"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Таррагона"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Теруел"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Толедо"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Валенсиа"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Валладолид"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Бизкаиа"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Замора"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Зарагоза"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Сеута"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Мелилла"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Андалусиа"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Арагон"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Астуриасын вант улс"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Балеарикийн арлууд"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Баск улс"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Канарын арлууд"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Кастил-Ла-Манча"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Кастил ба Леон"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Каталон"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Экстремадура"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Галисиа"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Мурсиа муж"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Наваррегийн Форал суурин"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Валенсиагийн суурин"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Шуудангийн дугаараа 01XXX - 52XXX хооронд, энэ хэлбэрээр оруулна уу."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Утасны дугаараа 6XXXXXXXX, 8XXXXXXXX буюу 9XXXXXXXX хэлбэрийн аль нэгээр "
-"оруулна уу."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "NIF, NIE, CIF оруулна уу."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "NIF, NIE оруулна уу."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "NIF-ийн шалгах нийлбэр буруу байна."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "NIE-ийн шалгах нийлбэр буруу байна."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "CIF-ийн шалгах нийлбэр буруу байна."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Дансны дугаараа XXXX-XXXX-XX-XXXXXXXXXX хэлбэрээр оруулна уу."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Дансны дугаарын шалгах нийлбэр буруу байна."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Финляндийн нийгмийн хамгааллын дугаараа оруулна уу."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Утасны дугаар 0X XX XX XX XX хэлбэртэй байх хэрэгтэй."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Шуудангийн дугаараа оруулна уу."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Бэдфордшир"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Букингхэмшир"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Чешир"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Корнүолл ба Скиллийн арлууд"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Кумбриа"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Дэрбишир"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Дэвон"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Дорсэт"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Дурхам"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Ийст Суссекс"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Эссекс"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Глоусестершир"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Их Лондон "
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Их Манчестэр"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Хэмпшир"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Хэртфордшир"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Кэнт"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Ланкашир"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Леисэстершир"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Линколншир"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Мэрсэисайд"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Норфолк"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Норт Йоркшир"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Нортамптоншир"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Нортамберланд"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Ноттингхэмшир"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Оксфордшир"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Шропшир"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Сомерсэт"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Саут Йоркшир"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Стаффордшир"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Суффолк"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Сурреи"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Тийн ба Виэр"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Уарвикшир"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Вэст Мидландс"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Вест Суссекс"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Вест Йоркшир"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Вилтшир"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Ворсестершир"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Антрим каунти"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Армагх каунти"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Даун каунти"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Ферманаф каунти"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Лондондерри каунти"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Тирон каунти"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Клвид "
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Дифед"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Гвент"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Гвинедд"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Дундад Гламорган"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Повис"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Өмнөд Гламорган"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Баруун Гламорган"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Бордэрс"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Төв Шотланд"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Дамфрайс ба Галловэй"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Файф"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Грампиан"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Хайланд"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Лотиан"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Оркнэй арлууд"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Шетланд арлууд"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Стратклид"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Тайсайд"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Вестерн Айслс"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Англи"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Умард Ирланд"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Шотланд"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Вэльс"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "13 орон бүхий бодит JMBG оруулна уу"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Огнооны сегментэд алдаа байна"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "11 орон бүхий бодит OIB оруулна уу"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Машины гэрчилгээний дугаарыг зөв оруулна уу."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Хүчинтэй байршилийн кодыг оруулна уу"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Тоон хэсэг тэг байж болохгүй"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Шуудангийн код 5 оронтой тоо байх ёстой."
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Утасны дугаараа оруулна уу"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Бодит газар нутаг эсвэл мобайл сүлжээний код оруулна уу."
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Утасны дугаар хэт урт байна."
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "601983 -р эхэлсэн 19 орон бүхий бодит JMBAG оруулна уу."
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Card issue number нь тэг байж болохгүй"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Зөв шуудангын код оруулна уу"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Зөв NIK/KTP дугаар оруулна уу"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Асех"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Бали"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Бантен"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Бенкулу"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Ёогакарта"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Жакарта"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Горонтало"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Жамби"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Жаба Барат"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Жаба Тенгах"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Жава Тимур"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Калимантан Барат"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Калимантан Селатан"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Калимантан Тенгах"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Калимантан Тимур"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Кепулауан Бангка-Белитунг"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Кепулауан Риау"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Лампунг"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Малуку"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Малуку Утара"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Нуса Тенггара Барат"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Нуса Тенггара Тимур"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Папуа"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Папуа Барат"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Риау"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Сулавеси Барат"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Сулавеси Селатан"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Сулавеси Тенгах"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Сулавеси Тенггара"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Сулавеси Утара"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Сулавеси Барат"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Сулавеси Селатан"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Сулавеси Утара"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Магеланг"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Суракарта - Соло"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Мадиун"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Кедири"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Тапанули"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Нангрой Ачех Даруссалам"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Кепулауан Бангка Белитунг"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Консулын газар"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Элчин сайдын яам"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Бангдунг"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Сулавеси утара даратан"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "НТТ - Тимор"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Сулавеси Утара Кепулауан"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "НТБ-Ломбок"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Папуа дан Папуа Барат"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Киребон"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "НТБ - Сумбава"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "НТТ - Флорес"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "НТТ-Сумба"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Богор"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Пекалонган"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Семаранг"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Пати"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Сурабаяа"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Мадура"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Маланг"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Жембер"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Банюмас"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Улсын засгийн газар"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Божонегоро"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Пурвакарта"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Сидоаржо"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Гарут"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Антрим"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Армагх"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Карлов"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Каван"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Кларе"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Корк"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Дерри"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Донегал"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Доош"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Дублин"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Ферманаг"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Галвей"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Керри"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Килдаре"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Килкенни"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Лаоис"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Леитрим"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Лимерик"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Лонгфорд"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Лоут"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Маё"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Меат"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Mонагхан"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Оффали"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Роскоммон"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Слиго"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Типперари"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Тироне"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Ватерфорд"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Вестмеат"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Вексфорд"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Виклов"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Шуудангийн кодоо XXXXX хэлбэрээр оруулна уу."
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Зөв ID дугаар оруулна уу."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "XXXXXX эсвэл XXX XXX форматаар zip кодыг оруулна уу."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Энэтхэгийн муж эсвэл газар нутаг оруулна уу."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Утасны дугаар нь 02X-8X эсвэл 03X-7X эсвэл 04X-6X форматтай байх хэрэгтэй."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Исландын үнэмлэхний дугаараа XXXXXX-XXXX хэлбэрээр оруулна уу."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Исландын үнэмлэхний дугаар хүчингүй байна."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Шуудангийн индексээ оруулна уу."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Нийгмийн хамгааллын дугаараа оруулна уу."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "VAT дугаараа оруулна уу."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Шуудангийн дугаараа XXXXXXX буюу XXX-XXXX хэлбэрээр оруулна уу."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Хоккайдо"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Аомори"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Иватэ"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Мияаги"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Акита"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Ямагата"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Фукушима"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ибараки"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Точиги"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Гунма"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Саитама"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Чиба"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Токио"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Канагва"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Яманаши"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Нагано"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Нийгата"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Тояма"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ишикава"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Фукуи"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Гифу"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Шизуока"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Аичи"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Мие"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Шига"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Кёто"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Осака"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Нёго"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Нара"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Вакаяма"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Тоттори"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Шиманэ"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Окаяма"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Хирошима"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Ямагучи"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Токушима"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Кагава"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Эхимэ"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Кочи"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Фукуока"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Сага"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Нагасаки"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Кумамото"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Оита"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Миязаки"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Кагошима"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Окинава"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Кувайтын иргэний үнэмлэхний дугаарыг оруулна уу."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Иргэний үнэмлэхний дугаар нь тоо болон том үсгээс бүрдэх 4-өөс 7 хүртлэх "
-"орон, түүний дараа дан тооноос бүрдэх 7 оронгоор бүтнэ."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Энэ талбарт 13 оронтой тоо байх хэрэгтэй."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "UMCN-н эхний 7 орон бодит өнгөрсөн огноог илэрхийлэх ёстой."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN буруу байна."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Аэродром"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Босилово"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Бутел"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Валандово"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Василэво"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Винка"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Македонийн иргэний үнэмлэхийн дугаар"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Македонийн хотын захиргаа (2 оронтой код)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Давтагдашгүй мастер иргэний дугаар (13 оронтой тоо)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "XXXXX форматаар бодит zip код оруулна уу."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Бодит RFC оруулна уу."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "RFC хяналтын нийлбэр буруу байна."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Бодит CURP оруулна уу."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "CURP хяналтын нийлбэр буруу байна."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Мексикийн муж (3 том үсэг)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Мексикийн zip код"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Мексикийн RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Мексикийн CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Агуаскалиентэс"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Бажа Калифорни"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Бажа Калифорни Сур"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Кампече"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Чихуахуа"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Чиапас"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Коахуила"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Колима"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Холбооны Дистрито"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Дуранго"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Гуерреро"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Гуанажуато"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Хидалго"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Жалиско"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Мехико"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Мичоакан"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Морелос"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Наярит"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Нуево Леон"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Вахака"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Пуебло"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Куеретаро"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Кинтана Ро"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Синалоа"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "Сан Луис Потоси"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Сонора"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Табаско"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Тамаулипас"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Тласкала"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Веракруз"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Юкатан"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Закатекас"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Шуудангийн дугаараа оруулна уу."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "SoFi дугаараа оруулна уу."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Дрэнтэ"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Флеволанд"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Фраисланд"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Гелдерланд"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Гронинген"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Нуурд-Брабант"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Нуурд-Холланд"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Овераисл"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Утрехт"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Зийланд"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Заит-Холланд"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Норвегийн нийгмийн хамгааллын дугаараа оруулна уу."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Энэ хэсэгт 8 оронтой тоо оруулна."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Энэ хэсэгт 11 оронтой тоо оруулна."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Үндэсний таних дугаар 11 оронтой байна."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Үндэсний таних дугаарын шалгах нийлбэр буруу байна."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Үндэсний ID Картын Дугаар нь 3 үсэг болон 6 тоо оронгоос бүрдэнэ."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Үндэсний ID Картын Дугаарын хяналтын нийлбэр буруу байна."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Зөв татварын дугаар оруулна уу (NIP) формат нь XXX-XXX-XX-XX, XXX-XX-XX-XXX "
-"эсвэл XXXXXXXXXX хэлбэртэй байна."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Татварын дугаарын шалгах нийлбэр буруу байна."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Байгууллагын бүртгэлийн дугаар (REGON) нь 9 эсвэл 14 оронтой тоо байх "
-"хэрэгтэй."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Үндэсний бизнесийн бүртгэлийн дугаарын шалгах нийлбэр буруу байна."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Шуудангийн дугаараа XX-XXX хэлбэрээр оруулна уу."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Доод Силесиа"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Куявиа-Помераниа"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Лублин"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Лубуски"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Лодз"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Бага Польш"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Масовиа"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Ополе"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Субкарпатиа"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Подласие"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Помераниа"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Силесиа"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Свентокшишки"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Вармиа-Масуриа"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Их Польш"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Баруун Помераниа"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Зип кодоо XXXX-XXX.хэлбэрээр оруулна уу."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Утасны дугаар 9 оронтой байх хэрэгтэй эсвэл  + болон 00 эхлэнэ."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "CIF оруулна уу."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "CNP оруулна уу."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "IBAN-ийг ROXX-XXXX-XXXX-XXXX-XXXX-XXXX хэлбэрээр оруулна уу."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Утасны дугаар XXXX-XXXXXX хэлбэрээр байх ёстой."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Шуудангийн дугаараа XXXXXX хэлбэрээр оруулна уу."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "XXXXXX форматаар шуудангын кодыг оруулна уу."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "XXXX XXXXXX форматаар паспортын дугаарыг оруулна уу. "
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "XX XXXXXXX форматаар паспортын дугаарыг оруулна уу. "
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Төв Холбооны Муж"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Өмнөд Холбооны Муж"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Баруун-Хойд Холбооны Муж"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Зүүн Холбооны Муж"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Сибирын Холбооны Муж"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Уралын Холбооны Муж"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Привольский Холбооны Муж"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Хойд-Кавказын Холбооны Муж"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Москва"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Сант-Петербург"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Москвагийн хүрээ"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "бүгд найрамдах Адыгея улс"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "бүгд найрамдах Башкортостан улс"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "бүгд найрамдах Бурят улс"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "бүгд найрамдах Алтай улс"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "бүгд найрамдах Дагесиан улс"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Бүгд найрамдах Ингүш Улс"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Бүгд найрамдах Кабардино-Балкар Улс"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Бүгд найрамдах Халмиг Улс"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Бүгд найрамдах Халмиг Улс"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Бүгд найрамдах Карачаево-Черкес Улс"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Бүгд найрамдах Коми Улс"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Бүгд найрамдах Марий Эл Улс"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Бүгд найрамдах Мордов Улс"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Бүгд найрамдах Саха Улс"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Бүгд найрамдах Коми Улс"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Бүгд найрамдах Татарстан Улс"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Бүгд найрамдах Тува Улс"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Бүгд найрамдах Удмурт Улс"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Бүгд найрамдах Хакаш Улс"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Бүгд найрамдах Чечен Улс"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Бүгд найрамдах Чуваш Улс"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Алтайн хязгаар"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Забайкалийн хязгаар"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Камчатскийн хязгаар"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Краснодарийн хязгаар"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Красноярскийн хязгаар"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Пермийн хязгаар"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Приморийн хязгаар"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Ставрополийн хязгаар"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Хабаровскийн хязгаар"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-"Утасны дугаар нь 02X-8X эсвэл 03X-7X эсвэл 04X-6X форматтай байх хэрэгтэй."
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Архангельскийн хүрээ"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Астраханская бүс нутаг"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Белгородын бүс нутаг"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Биряны бүс нутаг"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Владимирын бүс нутаг"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Волгоградыг бүс нутаг"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Вологодын бүс нутаг"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Воронежын бүс нутаг"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ивановын бүс нутаг"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Иркутскийн бүс нутаг"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Калинградын бүс нутаг"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Калужын бүс нутаг"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Кемеровская муж"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Кировская муж"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Костромская муж"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Курганская муж"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Курсикын бүс нутаг"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Ленинградын бүс нутаг"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Липецкая муж"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Магаданская муж"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Мурманская муж"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Нижегородской муж"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Новгородская муж"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Новосибирская муж"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Омская муж"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Оренбургская муж"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Орловская муж"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Пензенская муж"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Псковская муж"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Ростовская муж"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Рязанская муж"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Самарская муж"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Саратовская муж"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Сахалинская муж"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Свердловской муж"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Смоленская муж"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Тамбовская муж"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Тверская муж"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Томская муж"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Тульскийн бүс нутаг"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Тюменская муж"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ульяновская муж"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Челябинская муж"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Челябинская муж"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Еврейская автономная муж"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Ненецкий автономии дүүрэг"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Ханты-Мансийский автономный округ - Югра"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Чукотский автономный дүүрэг"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Ямало-Neneckiy автономный дүүрэг"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Шведийн байгуулагын дугаараа зөв оруулна уу."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Шведийн хувийн дугаараа зөв оруулна уу."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Co-ordination-д тоог зөвшөөрөхгүй."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Шведийн шуудангийн кодыг XXXXX хэлбэрээр оруулна уу."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Стокгольм"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Вестерботтен"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Норрботтен"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Уппсала"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Сёдерманланд"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Эстергётланд"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Йёнчёпинг"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Кронберг"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Калмар"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Готланд"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Блекингэ"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Скане"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Халланд"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Вестра-Гёталанд"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Вермланд"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Оуребо"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Вестманланд"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Даларна"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Евлерборг"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Вестернорланд"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Емтланд"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "EMSO-н эхний 7 оронтой тоо нь бодит өнгөрсөн оноог илэрхийлнэ."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO хүчингүй байна."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "SIXXXXXXXX форматаар бодит татварын дугаар оруулна уу"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "+386XXXXXXXX эсвэл 0XXXXXXXX форматаар утасны дугаарыг оруулна уу."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Банска Бистрика"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Банска Стиавника"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Бардежов"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Бановц над Бебравоу"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Брезно"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Братислав l"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Братислав ll"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Братислав lll"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Братислав lV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Братислав V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Битка"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Кадка"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Детва"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Долни Кубин"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Дунайска Стреда"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Галанта"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Гелника"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Хлоховек"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Хюменн"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Илава"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Кезмарок"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Комарно"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Косиз I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Косиз II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Косиз III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Косиз IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Косиз - околие"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Крупина"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Кисук Нове Место"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Левис "
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Левока"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Липтовски Микулас"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Лукенек"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Малаки"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Мартин "
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Медзилаборс"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Михаловс"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Мияава"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Наместово"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Нитра"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Нове Место над Вахом"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Нове Замки"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Партизанске"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Пезинок"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Пиестани"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Полтар"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Попрад"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Повазска Бистрика"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Пресов"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Приевидза"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Пучов"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Ревука"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Римавска Собота"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Рознава"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Рузомберок"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Сабинов"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Сенек"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Сеника"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Скалиса"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Снина"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Собранс"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Списска Нова Вес"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Стара Любовна"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Стропков"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Свидник"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Сала"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Тополсани"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Требисов"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Тренкин"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Трнава"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Туркианск Теплис"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Тврдосин"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Велки Кртис"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Вранов над Топлоу"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Злате Моравс"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Зволен"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Зарновика"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Зиар над Хроном"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Зилина"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Банска Бистрика муж "
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Братислав муж "
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Косиз муж"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Нитра муж"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Пресов муж"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Тренкин муж"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Трнава муж"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Зилина муж"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Шуудангын кодын XXXXX хэлбэрээр оруулна уу. "
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Утасны дугаа 0XXX XXX XXXX хэлбэртэй байна."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Зөв Түрк бүртгэлийн дугаар оруулна уу."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Түрк бүртгэлийн дугаар заавал 11 оронтой байна. "
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Шуудангийн индексээ XXXXX буюу XXXXX-XXXX хэлбэрээр оруулна уу."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Утасы дугаар \"XXX-XXX-XXXX \" загварын дугуу байна."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "АНУ-ын нийгмийн хамгааллын дугаараа XXX-XX-XXXX хэлбэрээр оруулна уу."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "АНУ-ийн муж эсвэл or бүс нутаг оруулна уу."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. төлөв (хоёр том үсэг)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "АНУ ийн шуудангийн код (хоёр том үсэг)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Утасны дугаар"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Хүчинтэй CI дугаарыг X.XXX.XXX-X,XXXXXXX-X эсвэл XXXXXXXX форматаар оруулна "
-"уу."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Хүчинтэй CI дугаарыг оруулна уу"
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Өмнөд Африкийн ID дугаараа оруулна уу."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Өмнөд Африкийн шуудангийн дугаараа оруулна уу."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Зүүн Кэйп"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Фрий стэйт"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Гаутэнг"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "КваЗулу-Натал"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Лимпопо"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Мпумаланга"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Хойд Кэйп"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Норт Вэст"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Баруун Кэйп"
diff --git a/django/contrib/localflavor/locale/nb/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/nb/LC_MESSAGES/django.mo
deleted file mode 100644
index e092691949..0000000000
Binary files a/django/contrib/localflavor/locale/nb/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/nb/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/nb/LC_MESSAGES/django.po
deleted file mode 100644
index b7a5e5d16c..0000000000
--- a/django/contrib/localflavor/locale/nb/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3548 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-#   <jonklo@gmail.com>, 2012.
-# jonklo <jonklo@gmail.com>, 2011.
-#   <sigurdga-transifex@sigurdga.no>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-10 01:40+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
-"language/nb/)\n"
-"Language: nb\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Oppgi et postnummer på formen NNNN eller ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Feltet krever kun tall."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Feltet krever 7 eller 8 siffer."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Oppgi gyldig CUIT på formen XX-XXXXXXXX-X or XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Ugyldig CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Niederösterreich"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Oberösterreich"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Steiermark"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Wien"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Oppgi et postnummer på formen XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Oppgi et gyldig Østerrisk personnummer på formen XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Oppgi et firesifret postnummer."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australsk stat"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australsk postnummer"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australsk telefonnummer"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brussel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Øst-Flandern"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamsk Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liège"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Vallonsk Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Vest-Flandern"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brussel-regionen"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flandern"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Oppgi et gyldig postnummer på formen 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Oppgi et gyldig telefonnummer i et av følgende formater: 0x xxx xx xx, 0xx "
-"xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx."
-"xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx eller 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Oppgi et postnummer på formen XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonnumre må være på formen XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Velg en gyldig brasiliansk stat. Den staten er ikke et av de tilgjengelige "
-"valgene."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Ugyldig CPF-nummer."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Feltet krever maksimum 11 eller 14 tegn."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Ugyldig CNPJ-nummer."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Feltet krever minst 14 siffer."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Oppgi et postnummer på formen XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Oppgi et gyldig kanadisk personnummer på formen XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Landschaft"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genève"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubünden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Luzern"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchâtel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Wallis"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zürich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Oppgi et gyldig sveitsisk identitets- eller passnummer på formen X1234567<0 "
-"eller 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Oppgi et gyldig chilensk RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Oppgi et gyldig chilensk RUT på formen XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Den chilenske RUT-en er ugyldig."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Oppgi et postnummer på formen XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "ID-kortnummer bestående av 15 eller 18 siffer."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Ugyldig ID-kortnummer: feil sjekksum"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Ugyldig ID-kortnummer: feil fødselsdato"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Ugyldig ID-kortnummer: feil stedskode"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Oppgi et gyldig telefonnummer."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Oppgi et gyldig mobiltelefonnummer."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praha"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Sentralbøhmen-regionen"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Sydbøhmen-regionen"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Plzeň-regionen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlovy Vary-regionen"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Ústí nad Labem-regionen"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec-regionen"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Králové-regionen"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice-regionen"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Žilina-regionen"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Sydmähriske-regionen"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc-regionen"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlín-regionen"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Mähren-Schlesien-regionen"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Oppgi et postnummer på formen XXXXX eller XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Oppgi et fødselsnummer på formen XXXXXX/XXXX eller XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Ugyldig valgfritt parameter kjønn. Gyldige verdier er 'f' and 'm'."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Oppgi et gyldig fødselsnummer."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Oppgi et gyldig IC-nummer."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Württemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bayern"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Vorpommern"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Niedersachsen"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Nordrhein-Westfalen"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rheinland-Pfalz"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Sachsen"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Sachsen-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thüringen"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Oppgi et postnummer på formen XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Oppgi et gyldig tysk identitetsnummer på formen XXXXXXXXXXX-XXXXXXX-XXXXXXX-"
-"X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Balearene"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Gipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Vizcaya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalucía"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragón"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearene"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskerland"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanariøyene"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilla-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilla y León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencia"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Oppgi et gyldig postnummer på formen 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Oppgi et gyldig telefonnummer på et av følgende formater: 6XXXXXXXX, "
-"8XXXXXXXX eller 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Oppgi et gyldig NIF, NIE eller CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Oppgi et gyldig NIF eller NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Ugyldig kontrollsum for NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Ugyldig kontrollsum for NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Ugyldig kontrollsum for CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Oppgi et gyldig kontonummer på formen XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Ugyldig kontrollsum for kontonummer."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Oppgi et gyldig finsk personnummer."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonnumre må være på formen 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Oppgi et gyldig postnummer."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Stor-London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Stor-Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orknøyene"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Ytre Hebridene"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Nord-Irland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Skottland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Oppgi et gyldig 13-sifret JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Feil i datosegment"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Oppgi et gyldig 11-sifret OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Oppgi et gyldig kjøretøyregistreringsnummer."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Oppgi en gyldig stedskode"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Nummerdelen kan ikke være null"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Oppgi et gyldig femsifret postnummer"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Oppgi et gyldig telefonnummer."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Oppgi en gyldig område- eller mobilnettverkskode"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefonnummeret er for langt"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Oppgi et gyldig 19-sifret JMBAG begynnende med 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Kortutstedsnummer kan ikke være null"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Zagreb by"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovar-Bilogora"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brod-Posavina"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovnik-Neretva"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istria"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovac"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivnica-Križevci"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapina-Zagorje"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Lika-Senj"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurje"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osijek-Baranja"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požega-Slavonia"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorje-Gorski Kotar"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisak-Moslavina"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Split-Dalmatia"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibenik-Knin"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždin"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitica-Podravina"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovar-Syrmia"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadar"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagreb fylke"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Oppgi et gyldig postnummer."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Oppgi et gyldig NIK/KTP-nummer."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Oppgi et postnummer på formen XXXXX."
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Oppgi et gyldig ID-nummer."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Oppgi et postnummer på formen XXXXXX or XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Oppgi en indisk stat eller et område."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Telefonnumre må være på formen 02X-8X, 03X-7X eller 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Oppgi et gyldig islandsk identifikasjonsnummer på formen XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Det islandske identifikasjonsnummeret er ugyldig."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Oppgi et gyldig postnummer."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Oppgi et gyldig italiensk personnummer."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Oppgi et gyldig VAT-nummer."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Oppgi et postnummer på formen XXXXXXX eller XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Oppgi et gyldig Kuwaiti Civil ID-nummer."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Identitetskortnummer må inneholde enten 4 eller 7 siffer eller en stor "
-"bokstav og 7 siffer."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Dette feltet bør inneholde nøyaktig 13 siffer."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"De første syv sifrene av UMCN må representere en gyldig dato i fortiden."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN er ikke gyldig."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Makedonsk identitetskortnummer"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Et makedonsk fylke (2-tegns kode)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Unikt innbyggernummer (13 siffer)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Oppgi et gyldig postnummer på formen XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Oppgi en gyldig RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Ugyldig sjekksum for RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Oppgi en gyldig CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Ugyldig sjekksum for CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Meksikansk stat (tre store bokstaver)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Meksikansk postnummer"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Meksikansk RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Meksikansk CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Oppgi et gyldig postnummer."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Oppgi et gyldig SoFi-nummer."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Oppgi et gyldig norsk personnummer."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Feltet krever åtte siffer."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Feltet krever 11 siffer."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "National Identification Number består av 11 siffer."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Feil kontrollsum for National Identification Number."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Nasjonalt ID-kortnummer består av 3 bokstaver og 6 siffer."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Feil sjekksum for nasjonalit ID-kortnummer."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Oppgi et skattenummer (NIP) på formen XXX-XXX-XX-XX, XXX-XX-XX-XXX eller "
-"XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Ugyldig kontrollsum for NIP."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "National Business Register Number (REGON) består av 9 eller 14 siffer."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Ugyldig kontrollsum for National Business Register Number (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Oppgi et postnummer på formen XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz voivodskap"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Łódź voivodskap"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lillepolske voivodskap"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masoviske voivodskap"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole voivodskap"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subkarpatiske voivodskap"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie voivodskap"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pommerske voivodskap"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Schlesiske voivodskap"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Helligkorsvoivodskapet"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Ermelandskmasuriske voivodskap"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Storpolske voivodskap"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Vestpommerske voivodskap"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Oppgi et postnummer på formen XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefonnumre må ha 9 siffer, eller starte med + eller 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Oppgi et gyldig CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Oppgi et gyldig CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Oppgi et gyldig IBAN på formen ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonnumre må være på formen XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Oppgi et postnummer på formen XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Oppgi et postnummer på formen XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Oppgi et passnummer på formen XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Oppgi et passnummer på formen XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Sentralt føderalt distrikt"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Sørlig føderalt distrikt"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Nordvestlig føderalt distrikt"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Fjernøstlig føderalt distrikt"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Sibir, føderalt distrikt"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Ural, føderalt disktrikt"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzjskij, føderalt distrikt"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Nord-Kaukasisk, føderalt distrikt"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva, føderal by"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Sankt Petersburg, føderal by"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskva, provins"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygia, republikk"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Basjkortostan, republikk"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Burjatia, republikk"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altaj, republikk"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, republikk"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingusjetia, republikk"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkaria, republikk"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, republikk"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karatsjajevo-Tsjerkessia, republikk"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, republikk"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, republikk"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mari El, republikk"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, republikk"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha (Jakutia), republikk"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Nord-Ossetia (Alania), republikk"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, republikk"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tuva, republikk"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtia, republikk"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakasia, republikk"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Tsjetsjenia, republikk"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Tsjuvasjia, republikk"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altaj, territorium"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabajkalskij, territorium"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamtsjatka, territorium"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodar, territorium"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnojarsk, territorium"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Perm, territorium"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorsk, territorium"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol, territorium"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovsk, territorium"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amur, provins"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangelsk, provins"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhan, provins"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorod, provins"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Brjansk, provins"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimir, provins"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgograd, provins"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologda, provins"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezj, provins"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovo, provins"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutsk, provins"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningrad"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluga, provins"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovo, provins"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirov, provins"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostroma, provins"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurgan, provins"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kursk, provins"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningrad"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipetsk, provins"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadan, provins"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmansk, provins"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizjnij Novgorod, provins"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorod, provins"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirsk, provins"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omsk, provins"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburg, provins"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orjol, provins"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penza, provins"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskov, provins"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostov, provins"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazan, provins"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samara, provins"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratov, provins"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalin, provins"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovsk, provins"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolensk, provins"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambov"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tver, provins"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomsk, provins"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tula, provins"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tjumen, provins"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Uljanovsk, provins"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Tsjeljabinsk, provins"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Jaroslavl, provins"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Den jødiske autonome oblasten"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Nenetsk, autonomt distrikt"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansia, autonomt distrikt"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Tsjukotka, autonomt distrikt"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Jamalo-Nenetsk, autonomt distrikt"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Oppgi et gyldig svensk organisasjonsnummer."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Oppgi et gyldig svensk personnummer."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordineringsnumre er ikke tillatt."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Oppgi et gyldig svensk postnummer på formen XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"De første 7 siffer av EMSO-en må representere en gyldig dato i fortiden."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO-en er ikke gyldig."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Oppgi et gyldig skattenummer på formen SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Oppgi telefonnummer på formen +386XXXXXXXX eller 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banská Bystrica-regionen"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava-regionen"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Košice-regionen"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra-regionen"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Prešov-regionen"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trenčín-regionen"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava-regionen"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Žilina-regionen"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Oppgi et postnummer på formen XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefonnumre må være på formen 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Oppgi et gyldig tyrkisk identifikasjonsnummer."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Tyrkiske identifikasjonsnummer må være 11 siffer."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Oppgi et postnummer på formen XXXXX eller XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonnumre må være på formen XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Oppgi et gyldig amerikansk Social Security-nummer på formen XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Oppgi en amerikansk stat eller et område"
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stat (i USA, to store bokstaver)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Amerikansk postnummer (med to store bokstaver)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Oppgi gyldig CI på formen X.XXX.XXX-X,XXXXXXX-X eller XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Oppgi et gyldig CI-nummer."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Oppgi et gyldig South African ID-nummer."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Oppgi et gyldig postnummer."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/ne/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ne/LC_MESSAGES/django.po
deleted file mode 100644
index 7ef555b429..0000000000
--- a/django/contrib/localflavor/locale/ne/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3526 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2011-01-19 16:22+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
-"ne/)\n"
-"Language: ne\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/nl/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/nl/LC_MESSAGES/django.mo
deleted file mode 100644
index 0a863be0a6..0000000000
Binary files a/django/contrib/localflavor/locale/nl/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/nl/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/nl/LC_MESSAGES/django.po
deleted file mode 100644
index 083aae274c..0000000000
--- a/django/contrib/localflavor/locale/nl/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3561 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-#   <alexandervanratingen@gmail.com>, 2012.
-# Blue <alexandervanratingen@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Jeffrey Gelens <jeffrey@noppo.pro>, 2011, 2012.
-# Tino de Bruijn <tinodb@gmail.com>, 2011, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jeffrey Gelens <jeffrey@noppo.pro>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
-"nl/)\n"
-"Language: nl\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Geef een postcode op volgens het NNNN of ANNNNAAA formaat."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Dit veld dient alleen cijfers te bevatten."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Dit veld dient 7 of 8 cijfers te bevatten."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Geef een geldige CUIT op in het XX-XXXXXXXX-X of XXXXXXXXXXXX formaat."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Ongeldige CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Lager Australië"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Hoger Australië"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Wenen"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Geef een postcode op in het formaat XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Geef een geldig Oostenrijks Sociaalnummer op in het XXX-XX-XXXX formaat."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Voer een 4-cijferige postcode in."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australische staat"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australische postcode"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australische telefoonnummer"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brussel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Oost-Vlaanderen"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Vlaams-Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Luik"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namen"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Waals-Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "West-Vlaanderen"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brussels Hoofdstedelijk Gewest"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Vlaamse Gewest"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Wallonië"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Voer een geldige postcode in het bereik en de vorm 1xxx - 9xxx."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Voer een geldig telefoonnummer in een van de volgende formaten: 0x xxx xx "
-"xx, xx xx xx 0xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, "
-"0x . xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx of 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Geef een postcode op in het formaat XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefoonnummers dienen volgens het XX-XXXX-XXXX formaat te zijn."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Selecteer een geldige Braziliaanse staat. Uw keuze is niet een van de "
-"beschikbare staten."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Ongeldig CPF nummer."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Dit veld dient maximaal 11 cijfers of 14 karakters te bevatten."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Ongeldig CNPJ nummer."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Dit veld vereist minimaal 14 cijfers."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Geef een postcode op in het formaat XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Geef een geldig Canadees Sociaal Verzekeringsnummer op volgens het XXX-XXX-"
-"XXX formaat."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stad"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genève"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Geef een geldig Zwitsers identiteits- of paspoortnummer op volgens het "
-"X1234567<0 of 1234567890 formaat"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Geef een geldige Chileense RUT op."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Geef een geldige Chileense RUT op. Het formaat is XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "De Chileense RUT is ongeldig."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Voer een postcode in het formaat XXXXXX in."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "ID-kaart nummer bestaat uit 15 of 18 getallen"
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Ongeldige ID-kaart nummer: verkeerde checksum"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Ongeldige ID-kaart nummer: verkeerde geboortedatum"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Ongeldige ID-kaart nummer: verkeerde locatie code"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Voer een geldig telefoonnummer in."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Voer een geldig mobiel telefoonnummer in."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praag"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Midden-Bohemen"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Zuid-Bohemen"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Ústí nad Labem"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Králové"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysočina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Zuid-Moravië"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlín"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravië-Silezië"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Geef een postcode op in het formaat XXXXX of XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Geef een geboorte nummer op in het formaat XXXXXX/XXXX or XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Ongeldige optionele parameter Geslacht, geldige waarden zijn 'f' en 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Geef een geldig geboorte nummer."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Geef een geldig IC nummer op."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Beieren"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlijn"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Nedersaksen"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Noordrijn-Westfalen"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rijnland-Palts"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saksen"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saksen-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Sleeswijk-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thüringen"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Geef een postcode op in het formaat XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Geef een geldig Duits identiteitsnummer op volgens het XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X formaat."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Balearen"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencië"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusië"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Prinsdom Asturië"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearen"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskenland"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canarische Eilanden"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilië-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilië en León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonië"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicië"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencia"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Vul een postcode in volgens het 01XXX - 52XXX formaat."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Geef een geldig telefoonnummer op in één van de volgende formaten: "
-"6XXXXXXXX, 8XXXXXXXX of 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Geef een geldige NIF, NIE of CIF op."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Geef een geldige NIF of NIE op."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Ongeldig controlegetal voor NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Ongeldig controlegetal voor NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Ongeldig controlegetal voor CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Geef een geldig bankrekeningnummer op in het formaat XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Ongeldig controlegetal voor het bankrekeningnummer."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Geef een geldig Fins sociaal nummer op."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefoonnummers moeten in 0X XX XX XX XX-formaat staan."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Geef een geldige postcode op."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall en de Scilly-Eilanden"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Oost-Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Groot-Londen"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Groot-Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Noord-Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Zuid-Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West-Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West-Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West-Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Graafschap Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Graafschap Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Graafschap Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Graafschap Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Graafschap Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Graafschap Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Zuid-Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West-Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Schotse-Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Centraal-Schotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries en Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkneyeilanden"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetlandeilanden"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Buiten-Hebriden"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Engeland"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Noord-Ierland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Schotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Voor een geldige 13-cijferige JMBG in"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Fout in het datum segment"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Voer een geldige 11-cijferige OIB in"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Voer een geldige nummerplaat in"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Voer een geldige locatie code in"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Het nummer gedeelte kan niet nul zijn"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Voer een geldige, 5-cijferige postcode in"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Geef een geldig telefoonnummer op"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Voer een geldig gebied of een mobiele netwerk code in"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Het telefoonnummer is te lang"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Voer een geldige 19-cijferige JMBAG in die begint met 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Het kaart afgifte nummer kan niet nul zijn"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovar-Bilogora"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brod-Posavina"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovnik-Neretva"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istrië"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovac"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivnica-Križevci"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapina-Zagorje"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-Senjska zupanija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Voer een geldige postcode in"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Voer een geldige NIK / KTP nummer in"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Atjeh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Noord-Java"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Midden-Java"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Oost-Java"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Noord-Kalimantan"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Zuid-Kalimantan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Midden-Kalimantan"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Oost-Kalimantan"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Banka-Billiton"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Riouwarchipel"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Molukken"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Noord-Molukken"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "West-Nusa Tenggara"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Oost-Nusa Tenggara"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papoea"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "West-Papoea"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "West-Celebes"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Zuid-Celebes"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Midden-Celebes"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Zuidoost-Celebes"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Noord-Celebes"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "West-Sumatra"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Zuid-Sumatra"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Noord-Sumatra"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Atjeh"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Banka-Billiton"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulaire"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Diplomatiek Korps"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Soembawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Soemba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federale Regering"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Voer een postcode in het formaat XXXXX in"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Voer een geldig ID-nummer in."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Voer een postcode in in het formaat XXXXXX of XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Voer een Indiase staat of territorium in."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Telefoonnummers moeten worden ingevoerd in één van de volgende formaten: "
-"02X-8X, 03X-7X of 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Geef een geldig IJslands identificatienummer op. Het formaat is XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Het IJslandse identificatienummer is niet geldig."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Geef een geldige postcode op."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Geef een geldig Sociaal Nummer op."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Geef een geldig BTW nummer op."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Geef een geldige postcode op in het formaat XXXXXXX of XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Voer een geldig Koeweits Burger ID-nummer in"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"ID kaart nummers moeten bestaan uit 4 of 7 cijfers, of uit een hoofdletter "
-"en 7 cijfers"
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Dit veld moet exact 13 cijfers bevatten"
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "De eerste 7 cijfers van de UMCN moeten een geldige datum weergeven."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "De UMCN is niet geldig."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Dit veld moet exact 13 cijfers bevatten"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Macedonisch identiteitskaart nummer"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Een Macedonische gemeente (2 tekens)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Unique master citizen number (13 cijfers)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Voer een geldige postcode in, in de vorm XXXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Voer een geldige RFC in."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Ongeldige checksum in als RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Voer een geldige CURP in."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Ongeldige checksum in als CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mexicaanse staat (3 hoodfletters)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexicaanse postcode"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexicaanse RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexicaanse CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "de Staat Mexico"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Geef een geldige postcode op"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Geef een geldig SoFi nummer op"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Geef een geldig Noors Sociaal Nummer op."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Dit veld vereist 8 cijfers."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Dit veld vereist 11 cijfers."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Het Nationaal Identificatie Nummer bestaat uit 11 cijfers."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Verkeerd controlecijfer voor het Nationaal Identificatie Nummer."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Nationaal ID kaart nummer bestaande uit 3 letters en 6 cijfers."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Verkeerde checksum voor het Nationale ID kaarnummer."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Voer een geldig belasting nummer veld (NIP) in van de vorm XXX-XXX-XX-XX, "
-"XXX-XX-XX-XXX of XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Verkeerd controlecijfer voor het fiscaal nummer (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Het Nationaal Zakelijk Registratie Nummer (REGON) bestaat uit 9 of 14 "
-"cijfers."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Verkeerd controlecijfer op het Nationaal Zakelijk Registratie Nummer (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Geef een postcode op in het formaat XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Neder-Silezië"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Klein-Polen"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Groot-Polen"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Voer een postcode in in het formaat XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Telefoonnummers moeten uit 9 cijfers bestaan, of beginnen met een + of 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Geef een geldige CIF op."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Geef een geldige CNP op."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-"Geef een geldige IBAN volgens het ROXX-XXXX-XXXX-XXXX-XXXX-XXXX formaat"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefoonnummers moeten in het formaat XXXX-XXXXXX zijn."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Geef een geldige postcode in het formaat XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Voer een postcode in in het formaat XXXXXX"
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Voer een paspoort nummer in als XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Voer een paspoort nummer in als XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Centrale Federale Provincie"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Zuidelijke Federale Provincie"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Noord-Westelijke Federale Provincie"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Ver Oostelijke Federale Provincie"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Siberische Federale Provincie"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Oerale Federale Provincie"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Federale Provincie"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Noord Kaukasische Federale Provincie"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Sint Petersburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Voer een postcode in in het formaat XXXXXX"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Voer een geldig Zweeds organisatie nummer in."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Voer een geldig Zweeds persoonlijk identificatie nummer in"
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Coördinatie nummers zijn niet toegestaan."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Voer een Zweedse postcode in, in het formaat XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"De eerste 7 cijfers van de EMSO moeten een geldige verleden datum weergeven."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "De EMSO is niet geldig."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Voer een geldig belasting nummer in van de vorm SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Voer een telefoonnummer in van de vorm +386XXXXXXXX of 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Regio Banská Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Regio Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Regio Košice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Regio Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Regio Prešov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Regio Trenčín"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Regio Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Regio Žilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Voer een postcode in in het formaat XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefoonnummers moeten in 0XXX XXX XXXX formaat staan."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Voer een geldig Turks identificatienummer in."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Een Turks Identificatienummer moet uit 11 cijfers bestaan."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Geef een geldige postcode op volgens het XXXXX of XXXXX-XXXX formaat."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefoonnummers moeten in XXX-XXX-XXXX formaat staan."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Geef een geldig V.S. Sociaalnummer op in het XXX-XX-XXXX formaat."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Voer een Amerikaanse staat of grondgebied in."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Staat van de VS (twee hoofdletters)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Postcode in de VS (twee hoofdletters)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefoonnummer"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Voer een geldig CI nummer in, in X.XXX.XXX-X, XXXXXXX of XXXXXXXX-X formaat."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Voer een geldig CI nummer in."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Geef een geldig Zuid-Afrikaans identificatienummer op"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Geef een geldige Zuid-Afrikaanse postcode op"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Oost-Kaap"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Vrijstaat"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Noord-Kaap"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Noordwest"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "West-Kaap"
diff --git a/django/contrib/localflavor/locale/nn/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/nn/LC_MESSAGES/django.mo
deleted file mode 100644
index 224e528b77..0000000000
Binary files a/django/contrib/localflavor/locale/nn/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/nn/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/nn/LC_MESSAGES/django.po
deleted file mode 100644
index c55916b190..0000000000
--- a/django/contrib/localflavor/locale/nn/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3537 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# hgrimelid <havard@grimelid.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: hgrimelid <havard@grimelid.com>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
-"language/nn/)\n"
-"Language: nn\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Oppgje eit postnummer på forma NNNN eller ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Feltet krevar berre tall."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Feltet krevar 7 eller 8 siffer."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Oppgje gyldig CUIT på forma XX-XXXXXXXX-X or XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Ugyldig CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Niederösterreich"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Oberösterreich"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Steiermark"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Wien"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Oppgje eit postnummer på forma XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Oppgje eit gyldig Østerrisk personnummer på forma XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brussel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Aust-Flandern"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamsk Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Vallonsk Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Vest-Flandern"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Skriv inn eit gyldig postnummer i området og med formatet 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Oppgje eit postnummer på forma XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonnummeret må vere på forma XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Velg ein gyldig brasiliansk stat. Den staten er ikkje eit av dei "
-"tilgjengelege valga."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Ugyldig CPF-nummer."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Feltet krevar maksimum 11 eller 14 siffer."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Ugyldig CNPJ-nummer."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Feltet krevar minst 14 siffer."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Oppgje eit postnummer på forma XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "Oppgje eit gyldig kanadisk personnummer på forma XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Landschaft"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genève"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubünden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Luzern"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchâtel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Wallis"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zürich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Oppgje eit gyldig sveitsisk identitets- eller passnummer på forma X1234567<0 "
-"eller 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Oppgje eit gyldig chilensk RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Oppgje eit gyldig chilensk RUT på forma XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Den chilenske RUT er ugyldig."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praha"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Sentralbøhmen region"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Sydbøhmen region"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Plzeň region"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlovy Vary region"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Ústí nad Labem region"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec region"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Králové region"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice region"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Žilina-regionen"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Sydmähriske region"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc region"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlín region"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Mähren-Schlesien region"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Oppgje eit postnummer på forma XXXXX or XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Oppgje eit fødselsnummer på forma XXXXXX/XXXX eller XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Oppgje eit gyldig fødselsnummer."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Oppgje eit gyldig IC-nummer."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Württemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bayern"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Vorpommern"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Niedersachsen"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Nordrhein-Westfalen"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rheinland-Pfalz"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Sachsen"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Sachsen-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thüringen"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Oppgje eit postnummer på forma XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Oppgje eit gyldig tysk identitetsnummer på forma XXXXXXXXXXX-XXXXXXX-XXXXXXX-"
-"X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Balearane"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Gipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalucía"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragón"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearane"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskarland"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanariøyene"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castilla-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilla y León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valenciana"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Oppgje eit gyldig postnummer på forma 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Oppgje eit gyldig telefonnummer på eit av følgjande format: 6XXXXXXXX, "
-"8XXXXXXXX eller 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Oppgje eit gyldig NIF, NIE eller CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Oppgje eit gyldig NIF eller NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Ugyldig kontrollsum for NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Ugyldig kontrollsum for NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Ugyldig kontrollsum for CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Oppgje eit gyldig kontonummer på forma XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Ugyldig kontrollsum for kontonummer."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Oppgje eit gyldig finsk personnummer."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonnummeret må vere på forma 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Oppgje eit gyldig postnummer."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Stor-London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Stor-Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries og Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orknøyene"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Ytre Hebridene"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Nord-Irland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Skottland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Oppgje eit gyldig bilnummer."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Oppgje eit gyldig telefonnummer"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Oppgje eit gyldig postnummer"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Oppgje eit gyldig NIK/KTP-nummer."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madium"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Oppgje eit gyldig islandsk identifikasjonsnummer på forma XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Det islandske identifikasjonsnummeret er ugyldig."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Oppgje eit gyldig postnummer."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Oppgje eit gyldig italiensk personnummer."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Oppgje eit gyldig VAT-nummer."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Oppgje eit postnummer på forma XXXXXXX eller XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Oppgje eit gyldig kuwaitisk ID-nummer."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Oppgje eit gyldig postnummer."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Oppgje eit gyldig SoFi-nummer."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Oppgje eit gyldig norsk personnummer."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Feltet krevar åtte siffer."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Feltet krevar 11 siffer."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "National Identification Number består av 11 siffer."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Feil kontrollsum for National Identification Number."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Ugyldig kontrollsum for NIP."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "National Business Register Number (REGON) består av 9 eller 14 siffer."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Ugyldig kontrollsum for National Business Register Number (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Oppgje eit postnummer på forma XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Oppgje eit postnummer på forma XXXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Oppgje eit gyldig CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Oppgje eit gyldig CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Oppgje eit gyldig IBAN på forma ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonnummeret må vere på forma XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Oppgje eit postnummer på forma XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Oppgje eit gyldig svensk organisasjonsnummer."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Oppgje eit gyldig svensk personnummer."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinasjonsnummer er ikkje tillate."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Oppgje eit svensk postnummer på forma XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banská Bystrica-regionen"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava-regionen"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Košice-regionen"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra-regionen"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Prešov-regionen"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trenčín-regionen"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava-regionen"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Žilina-regionen"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Oppgje eit postnummer på forma XXXXX eller XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonnummer må vere på forma XX-XXXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Oppgje eit gyldig amerikansik Social Security-nummer på forma XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stat (i USA, to store bokstavar)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Oppgje gyldig CI-nummer på forma X.XXX.XXX-X,XXXXXXX-X eller XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Oppgje eit gyldig CI-nummer."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Oppgje eit gyldig South African ID-nummer."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Oppgje eit gyldig postnummer."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/pa/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/pa/LC_MESSAGES/django.mo
deleted file mode 100644
index 69093f0f93..0000000000
Binary files a/django/contrib/localflavor/locale/pa/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/pa/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/pa/LC_MESSAGES/django.po
deleted file mode 100644
index d04b2a9054..0000000000
--- a/django/contrib/localflavor/locale/pa/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3527 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
-"language/pa/)\n"
-"Language: pa\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "ਇਹ ਖੇਤਰ ਲਈ ਨੰਬਰ ਹੀ ਚਾਹੀਦੇ ਹਨ।"
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "ਇਹ ਖੇਤਰ ਲਈ  7 ਜਾਂ 8 ਅੰਕ ਚਾਹੀਦੇ ਹਨ।"
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "ਗਲਤ CUIT ਹੈ।"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "ਵੀਆਨਾ"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "ਗਲਤ CPF ਨੰਬਰ ਹੈ।"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "ਠੀਕ ਜਨਮ ਨੰਬਰ ਦਿਉ।"
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "ਬਰਲਿਨ"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "ਇੰਗਲੈਂਡ"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "ਉੱਤਰੀ ਆਈਰਲੈਂਡ"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "ਸਕਾਟਲੈਂਡ"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "ਵਾਲਿਜ਼"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "ਠੀਕ ਫੋਨ ਨੰਬਰ ਦਿਓ"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "ਠੀਕ ਪੋਸਟ ਕੋਡ ਦਿਓ"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "ਜੈਕਰਾਤਾ"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "ਫੈਡਰਲ ਸਰਕਾਰ"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "ਟੋਕੀਓ"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "ਇਹ ਖੇਤਰ ਲਈ ੧੧ ਅੰਕ ਚਾਹੀਦੇ ਹਨ।"
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "ਫੋਨ ਨੰਬਰ"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/pl/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/pl/LC_MESSAGES/django.mo
deleted file mode 100644
index 23d4e172f5..0000000000
Binary files a/django/contrib/localflavor/locale/pl/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/pl/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/pl/LC_MESSAGES/django.po
deleted file mode 100644
index 4792b444b2..0000000000
--- a/django/contrib/localflavor/locale/pl/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3551 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# angularcircle <angular.circle@gmail.com>, 2011.
-#   <angular.circle@gmail.com>, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# konryd <konryd@gmail.com>, 2011.
-# Roman Barczyński <rombar@gmail.com>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-22 12:51+0000\n"
-"Last-Translator: Roman Barczyński <rombar@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
-"pl/)\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Wpisz kod pocztowy w formacie NNNN lub ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "To pole może zawierać jedynie liczby."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "To pole musi zawierać 7 lub 8 cyfr."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Podaj poprawny numer CUIT w formacie XX-XXXXXXXX-X lub XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Niepoprawny CUIT"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Karyntia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Dolna Austria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Górna Austria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Wiedeń"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Wpisz kod pocztowy w formacie XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Wpisz poprawny numer austriackiego ubezpieczenia w formacie XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Wprowadź 4 cyfrowy kod pocztowy."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Stan w Australii"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australijski kod pocztowy"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australijski numer telefonu"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpia"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruksela"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flandria Wschodnia"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabancja Flamandzka"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburgia"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Brabancja Walońska"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandria Zachodnia"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Region Stołeczny Brukseli"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Region Flamandzki"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Walonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Wpisz kod pocztowy w zakresie i formacie 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Wpisz poprawny numer telefoniczny w formacie 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx lub 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Wpisz kod pocztowy w formacie XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Numery telefoniczne muszą być w formacie XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Wybierz poprawny brazylijski stan. Ten stan nie jest jednym z dostępnych "
-"stanów."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Błędny numer CPF."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "To pole nie może zawierać więcej niż 11 cyfr lub 14 znaków."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Błędny numer CNPJ."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "To pole musi zawierać co najmniej 14 cyfr"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Wpisz kod pocztowy w formacie XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Wpisz poprawny numer kanadyjskiego ubezpieczenia w formacie XXX-XXX-XXXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Argowia"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Bazylea-miasto"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Bazylea-okręg"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berno"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fryburg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genewa"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Gryzonia"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerna"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Szafuza"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solura"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Sankt Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Turgowia"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurych"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Podaj poprawny numer szwajcarskiego dowodu osobistego lub paszportu w "
-"formacie X1234567<0 lub 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Wpisz poprawny chilijski RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Podaj poprawny chilijski RUT w formacie XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Podany chilijski RUT jest nieprawidłowy."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Wprowadź kod pocztowy w formacie XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Nr dowodu składa się z 15 lub 18 cyfr."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Niepoprawny nr dowodu: zła suma kontrolna"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Niepoprawny nr dowodu: zła data urodzenia"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Niepoprawny nr dowodu: zły kod lokacji"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Wprowadź poprawny numer telefonu."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Wprowadź poprawny numer telefonu komórkowego."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Kraj środkowoczeski"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Kraj południowoczeski"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Kraj pilzneński"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Kraj karlowarski"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Kraj ustecki"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Kraj liberecki"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Kraj hredecki"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Kraj pardubicki"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Wysoczyzna"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Kraj południowomorawski"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Kraj ołomuniecki"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Kraj zliński"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Kraj morawski-śląski"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Wpisz kod pocztowy w formacie XXXXX or XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Wpisz numer urodzenia w formacie XXXXXX/XXXX or XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Niepoprawny dodatkowy parametr płci, wartości poprawne to 'f' i 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Wpisz poprawny numer urodzenia."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Wpisz poprawny numer IC."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Badenia-Wirtembergia"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bawaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburgia"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Brema"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hesja"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Meklemburgia-Pomorze Zachodnie"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Dolna Saksonia"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Nadrenia Północna-Westfalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Nadrenia-Palatynat"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Kraj Saary"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saksonia"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saksonia-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Szlezwik-Holsztyn"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Turyngia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Wpisz kod pocztowy w formacie XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Podaj poprawny numer niemieckiego dowodu osobistego w formacie XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arawa"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Baleary"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Kadyks"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellon"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Kordowa"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Gipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madryt"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcja"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Nawarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturia"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanka"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Kantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segowia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sewilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Walencja"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Vizcaya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Saragossa"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andaluzja"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragonia"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturia"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Baleary"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Kraj Basków"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Wyspy Kanaryjskie"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastylia-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastylia-Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Estremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicja"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcja"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Nawarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Walencja"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Wpisz kod pocztowy w zakresie i formacie 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Wpisz numer telefoniczny w formacie 6XXXXXXXX, 8XXXXXXXX lub 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Proszę wpisać poprawny numer NIF, NIE lub CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Proszę wpisać poprawny numer NIF lub NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Niepoprawna suma kontrolna NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Niepoprawna suma kontrolna NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Niepoprawna suma kontrolna CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Podaj poprawny numer konta bankowego w formacie XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Niepoprawna suma kontrolna numeru konta bankowego."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Wpis poprawny numer fińskiego ubezpieczenia socjalnego."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Numery telefoniczne muszą być w formacie 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Wpisz poprawny kod pocztowy."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Kornwalia i wyspy Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Wielki Londyn"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Hrabstwo Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Hrabstwo Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Hrabstwo Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Hrabstwo Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Hrabstwo Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Hrabstwo Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Scottish Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkady"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Szetlandy"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Hebrydy Zewnętrzne"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglia"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlandia Północna"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Szkocja"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Walia"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Wprowadź poprawny 13-cyfrowy JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Błąd w segmencie daty"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Wprowadź poprawny 11-cyfrowy OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Wpisz poprawny numer rejestracyjny pojazdu"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Wprowadź poprawny kod lokacji"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Numer nie może być zerem"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Wprowadź poprawny 5 cyfrowy kod pocztowy"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Wpisz poprawny numer telefonu"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Wpisz poprawny kod obszaru lub sieci komórkowej"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Podany numer telefonu jest za długi"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Wpisz poprawny 19-cyfrowy JMBAG zaczynający się od 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Nr wydania karty nie może być zerem"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Wpisz poprawny kod pocztowy"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Wpisz poprawny numer NIK/KTP."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Dżakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Barat Tenggara Nusa"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Zachodnia"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Konsularne"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Dyplomatyczne"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Rząd Federalny"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Wpisz kod pocztowy w formacie XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Wpisz poprawny numer ID."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Wpisz kod pocztowy w formacie XXXXXX lub XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Wpisz indyjski stan lub terytorium"
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Numer telefonu powinien być zapisany jednym z trzech formatów: '02X-8X', "
-"'03X-7X' lub '04X-6X'."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Podaj poprawny numer islandzkiego dowodu osobistego w formacie XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Numer islandzkiego dowodu osobistego jest błędny."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Wpisz poprawny kod pocztowy."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Wpisz poprawny numer ubezpieczenia socjalnego."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Wpisz poprawny numer VAT."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Wpisz kod pocztowy w formacie XXXXXXX lub XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroszima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Wpisz poprawny kuwejcki numer ID"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr "Nr dowodu musi zawierać albo 4 do 7 cyfr albo dużą literę i 7 cyfr."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "To pole powinno zawierać dokładnie 13 cyfr."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "Pierwsze 7 cyfr UMCN musi reprezentować poprawną, przeszłą datę."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN jest niepoprawny"
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Nr macedońskiego dowodu tożsamości"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Macedońska gmina (2-literowy kod)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Unikatowy numer obywatela (13 cyfr)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Wprowadź poprawny kod pocztowy w formacie XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Wpisz poprawny RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Niepoprawna suma kontrolna RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Wpisz porpawny CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Niepoprawna suma kontrolna CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Stan (trzy duże litery)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Kod pocztowy"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Meksykański RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Meksykański CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Kalifornia Dolna"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Kalifornia Dolna Południowa"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Meksyk (miasto)"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Meksyk (stan)"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michocan"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo Leon"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Queretaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potasi"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Jukatan"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Wpisz poprawny kod pocztowy"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Wpisz poprawny numer SoFi"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Fryzja"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Geldria"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Brabancja Północna"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Holandia Północna"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zelandia"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Holandia Południowa"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Wpis poprawny numer norweskiego ubezpieczenia socjalnego."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "To pole musi zawierać 8 cyfr."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "To pole musi zawierać 11 cyfr."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Numer PESEL składa się z 11 cyfr."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Błędna suma kontrolna numeru PESEL."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Numer dowodu osobistego składa się z 3 liter i 6 cyfr."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Błędna suma kontrolna numeru dowodu osobistego."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Wprowadź numer identyfikacji podatkowej (NIP) w jednym z trzech formatów:  "
-"'XXX-XXX-XX-XX', 'XXX-XX-XX-XXX' lub 'XXXXXXXXXX'."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Błędna suma kontrolna numeru NIP"
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Numer REGON składa się z 9 lub 14 cyfr."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Błędna suma kontrolna numeru REGON"
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Wpisz kod pocztowy w formacie XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Dolnośląskie"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kujawsko-Pomorskie"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lubelskie"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubuskie"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Łódzkie"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Małopolskie"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Mazowieckie"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opolskie"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Podkarpackie"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlaskie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomorskie"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Śląskie"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Świętokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmińsko-Mazurskie"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Wielkopolskie"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Zachodniopomorskie"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Wpisz kod pocztowy w formacie XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Numery telefonów muszą mieć 9 cyfr lub zaczynać się od + albo 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Wpisz poprawny CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Wpisz poprawny CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Podaj poprawny IBAN w formacie ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Numery telefoniczne muszą być w formacie XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Wpisz kod pocztowy w formacie XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Wprowadź kod pocztowy w formacie XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Wprowadź numer paszportu w formacie XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Wprowadź numer paszportu w formacie XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Centralny Okręg Federalny"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Południowy Okręg Federalny"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Północno-Zachodni Okręg Federalny"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Dalekowschodni Okręg Federalny"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Syberyjski Okręg Federalny"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Uralski Okręg Federalny"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Nadwołżański Okręg Federalny"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Północnokaukaski Okręg Federalny"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Saint-Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Wpisz poprawny szwedzki numer organizacji."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Wpis poprawny szwedzki numer identyfikacji osobistej."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Numery tymczasowe nie są dozwolone."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Wpisz szwedzki kod pocztowy w formacie XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Sztokholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "Pierwsze 7 cyfr EMSO muszą reprezentować poprawną, przeszłą datę"
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO jest niepoprawne."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Wprowadź numer telefonu w formacie SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Wprowadź numer telefonu w formacie +386XXXXXXXX lub 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Bańska Bystrzyca"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Bańska Szczawnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardiów"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratysława I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratysława II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratysława III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratysława IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratysława V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Czadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kieżmarek"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Koszyce I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Koszyce II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Koszyce III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Koszyce IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Koszyce - okolice"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Lewocza"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptowski Mikulasz"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Łuczeniec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Pieszczany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Poważska Bystrzyca"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Preszów"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Rużemberk"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Nowa Wieś Spiska"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubowla"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolczany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trenczyn"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnawa"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Twardoszyn"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zwoleń"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Żylina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Kraj bańskobystrzycki"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Kraj bratysławski"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kraj koszycki"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Kraj nitrzański"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Kraj preszowski"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Kraj trenczyński"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Kraj trnawski"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Kraj żyliński"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Wpisz kod pocztowy w formacie XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Numery telefoniczne muszą być w formacie 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Wpisz poprawny Turecki Numer Identyfikacyjny."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turecki Numer Identyfikacyjny składa się z 11 cyfr."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Wpisz kod pocztowy w formacie XXXXX. lub XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Numery telefoniczne muszą być w formacie XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Wpisz poprawny numer U.S. Social Security w formacie XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Podaj stan lub terytorium USA."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stan USA (dwie duże litery)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Kod pocztowy USA (dwie duże litery)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Numer telefonu"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Wprowadź poprawny numer CI w formacie X.XXX.XXX-X, XXXXXXX-X lub XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Wpisz poprawny numer CI."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Wpisz poprawny południowoafrykański numer ID"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Wpisz poprawny południowoafrykański kod pocztowy"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Prowincja Przylądkowa Wschodnia"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Wolne Państwo"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Prowincja Przylądkowa Północna"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Prowincja Północno-Zachodnia"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Prowincja Przylądkowa Zachodnia"
diff --git a/django/contrib/localflavor/locale/pt/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/pt/LC_MESSAGES/django.mo
deleted file mode 100644
index 6335cbb4a9..0000000000
Binary files a/django/contrib/localflavor/locale/pt/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/pt/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/pt/LC_MESSAGES/django.po
deleted file mode 100644
index aee06612ad..0000000000
--- a/django/contrib/localflavor/locale/pt/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3555 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Nuno Mariz <nmariz@gmail.com>, 2011.
-# Paulo Köch <paulo.koch@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
-"language/pt/)\n"
-"Language: pt\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Introduza um código postal no formato NNNN ou ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Este campo apenas aceita números."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Este campo apenas aceita 7 ou 8 dígitos."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Introduza o CUIT no formato XX-XXXXXXXX-X ou XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT inválido."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Caríntia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Baixa Áustria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Alta Áustria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburgo"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introduza um código postal no formato XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Introduza um código de segurança social austríaco válido no formato XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antuérpia"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruxelas"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flandres Oriental"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabante Flamengo"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburgo"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandres Ocidental"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Região de Bruxelas Capital"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Região de Flandres"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valónia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Introduza um código postal válido no intervalo e formato de 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Digite um número de telefone válido em um dos formatos de xx xx 0 x xxx, xx "
-"xx 0xx xx, xx xx xx 04xx, 0x/xxx.xx.xx, 04xx/xx.xx.xx 0xx/xx.xx.xx, 0x . xxx."
-"xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx 0xxxxxxxx ou 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Introduza um código postal no formato XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Os números de telefone deverão ser no formato XXX-XXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Seleccione um estado brazileiro válido. Esse estado não se encontra "
-"disponível."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Número de CPF inválido."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Este campo aceita no máximo 11 dígitos ou 14 carateres."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Número CNPJ inválido."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Este campo aceita no mínimo 14 dígitos"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Introduza um código postal no formato XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Introduza um código de segurança social Canadiano válido no formato XXX-XXX-"
-"XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genebra"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Luzerna"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurique"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Introduza uma identificação Suíça ou número de passaporte no formato "
-"X1234567<0 ou 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Introduza um RUT Chileno válido."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Introduza um RUT Chileno válido. O formato é XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "O RUT Chileno é inválido."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Região Central da Boêmia"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Região Sul da Boémia"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Região de Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Região de Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Região de Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Region de Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Região de Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Região de Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Região de Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Região de Morávia do Sul"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Região de Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Região de Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Região da Morávia-Silésia"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Introduza um código postal no formato XXXXX ou XXX XX"
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Introduza um número de nascimento no formato XXXXXX/XXXX ou XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Parâmetro opcional inválido do Género, os valores válidos são 'f' e 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Introduza um de número de nascimento válido."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Introduza um número de IC válido."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlim"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklemburgo-Pomerânia Ocidental"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Baixa Saxônia"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introduza um código postal no formato XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Introduza uma identificação Alemã válida no formato XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X"
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearic Islands"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basque Country"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canary Islands"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile and Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Region of Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Instruduza um código postal válido no formato 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Introduza um número de telefone válido num dos formatos 6XXXXXXXX, 8XXXXXXXX "
-"or 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Por favor introduza um NIF, NIE, ou CIF válido."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Por favor introduza um NIF ou NIE válido."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Checksum inválido para o NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Checksum inválido para o NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Checksum inválido para o CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Por favor introduza um número de conta bancária no formato XXXX-XXXX-XX-"
-"XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Checksum inválido para o número de conta bancária."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Introduza um número de segurança social Finlandês válido."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Os números de telefone deverão ser no formato 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Inserir um código-postal válido."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Northern Ireland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Introduza um número de matrícula de veículo válido"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Introduza um número de telefone válido."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Introduza um código postal válido."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Introduza um número NIK/KTP válido"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Government"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Introduza um código postal no formato XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Digite um número de identificação válido."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Introduza um número de identificação Islândica válida. O formato é XXXXXX-"
-"XXXX"
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Número de identificação Islândica inválido."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Introduza um código postal válido."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Introduza um número de Segurança Social válido."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Introduza um de IVA válido."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Introduza um código postal no formato XXXXXXX or XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Introduza um número Civil ID Kuwaitiano válido"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Introduza um código postal válido."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Introduza um número SoFi válido."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Introduza um número de segurança social Norueguês válido."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Este campo requere 8 dígitos."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Este campo requere 11 dígitos."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "O número de identificação nacional consiste em 11 dígitos."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Checksum errado para o número nacional de identificação."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Checksum errado para o número de imposto NIP."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"O Número de Registo Nacional de Negócio (REGON) consiste em 9 ou 14 dígitos."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Checksum errado para o número de registo nacional de negócio (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Introduza um código postal no formato XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Introduza um código postal no formato XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Os números de telefone devem conter 9 dígitos, ou começarem por + ou 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Introduza um CIF válido."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Introduza um CNP válido."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Introduza um IBAN válido no formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Os números de telefone deverão ser no formato XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Introduza um código postal válido no formato XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Introduza um número de organização Sueco válido."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Introduza um número de identificação pessoal válido."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Números de coordenação não são permitidos."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Introduza um código postal Sueco no formato XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava region"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice region"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra region"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov region"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin region"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava region"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina region"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Introduza um código postal no formato XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Os números de telefone deve estar no formato XXXX XXX 0xxx."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Digite um número de identificação válido Turco."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Número de identificação Turco deve ter 11 dígitos."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduza o código postal no formato XXXXX or XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Os números de telefone deverão ser no formato XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Introduza o número de Segurança Social dos E.U. no formato XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Introduza um estado ou território do E.U.A.."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado dos E.U.A (duas letras em maiúsculas)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Código postal dos EUA (duas letras maiúsculas)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Número de telefone"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Introduza um número CI válido no formato X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Introduza um número CI válido."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Introduza um número ID da África do Sul válido"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Introduza um código postal da África do Sul válido"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/pt_BR/LC_MESSAGES/django.mo
deleted file mode 100644
index 9d81bf1658..0000000000
Binary files a/django/contrib/localflavor/locale/pt_BR/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/pt_BR/LC_MESSAGES/django.po
deleted file mode 100644
index 9270adf1ac..0000000000
--- a/django/contrib/localflavor/locale/pt_BR/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3557 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Eduardo Carvalho <eduardocereto@gmail.com>, 2011.
-# Guilherme Gondim <semente+transifex@taurinus.org>, 2011, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-21 16:36+0000\n"
-"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
-"Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
-"com>\n"
-"Language: pt_BR\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Informe um código postal no formato NNNN ou ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Este campo requer somente números."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Este campo requer 7 ou 8 dígitos."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Informe um CUIT válido no formato XX-XXXXXXXX-X ou XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT inválido."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Caríntia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Baixa Áustria"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Alta Áustria"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburgo"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Estíria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Informe um código postal no formato XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Informe um número de Seguro Social Austríaco válido no formato XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Informe um código postal de 4 dígitos."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Estado Australiano"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Código postal Australiano"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Número de telefone Australiano"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antuérpia"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruxelas"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flandres Oriental"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Brabante Flamengo"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liège"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburgo"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburgo"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Brabante Valão"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flandres Ocidental"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Região de Bruxelas-Capital"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Região de Flandres"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valônia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Informe um código postal válido no intervalo e formato 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Insira um número de telefone válido em um dos formatos 0x xxx xx xx, 0xx xx "
-"xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx."
-"xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx ou 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Informe um código postal no formato XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Números de telefone devem estar no formato XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Selecione um estado brasileiro válido. O estado escolhido não é um dos "
-"estados disponíveis."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Número de CPF inválido."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Este campo requer no máximo 11 dígitos ou 14 caracteres."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Número de CNPJ inválido."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Este campo requer ao menos 14 dígitos"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Informe um código postal no formato XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Informe um número de Canadian Social Insurance válido no formato XXX-XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Argóvia"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Interior"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Exterior"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basiléia-Cidade"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basiléia-Campo"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berna"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Friburgo"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genebra"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glaris"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Grisões"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerna"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchâtel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwald"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwald"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Soleura"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "São Galo"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Turgóvia"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Tessino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurique"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Informe uma indentidade Suíça ou número de passaporte válido no formato "
-"X1234567<0 ou 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Informe um RUT chileno válido."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Informe um RUT chileno válido. O formato é XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "O RUT chileno não é válido."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Informe um código postal com o formato XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Números de cartão de identidade consistem em 15 ou 18 dígitos."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Número do cartão de identidade inválido: checksum errado"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Número do cartão de identidade inválido: data de nascimento errada"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Número do cartão de identidade inválido: código local errado"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Informe um número de telefone válido."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Informe um número de celular válido."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Região de Boêmia Central"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Região de Boêmia do Sul"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Região de Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Região de Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Região de Ústí"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Região de Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Região de Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Região de Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Região de Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Região de Morávia do Sul"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Região de Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Região de Zlín"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Região de Morávia-Silésia"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Informe um código postal no formato XXXXX ou XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Informe um número de nascimento no formato XXXXXX/XXXX ou XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Parâmetro opcional Gênero inválido, os valores válidos são 'f' e 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Informe um número de nascimento válido."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Informe um número IC válido."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wüerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Baviera"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlim"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburgo"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburgo"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklemburgo-Pomerânia Ocidental"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Baixa-Saxônia"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Renânia do Norte-Vestfália"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Renânia-Palatinado"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Sarre"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxônia"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxônia-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Turíngia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Informe um código postal no formato XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Informe um número de cartão de identidade Alemã no formato XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Álava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alicante"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Ilhas Baleares"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Cidade Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "Corunha"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Gerunda"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipúscoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leão"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lérida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Múrcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Astúrias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palência"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantábria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segóvia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilhe"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Sória"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valência"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biscaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Saragoça"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilha"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andaluzia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragão"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principado das Astúrias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Ilhas Baleares"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "País Basco"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Ilhas Canárias"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castela-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Cestela e Leão"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalunha"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galiza"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Região de Múrcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Comunidade Foral de Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Comunidade Valenciana"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Informe um código postal válido no intervalo e formato 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Informe um número de telefone válido em um destes formatos 6XXXXXXXX, "
-"8XXXXXXXX ou 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Por favor, informe um NIF, NIE OU CIF válido."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Por favor, informe um NIF ou FIE válido."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "O NIF é incorreto."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "O NIE é incorreto."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "O CIF é incorreto."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Por favor, informe um número de conta bancária válida no formato XXXX-XXXX-"
-"XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Número de verificação de conta bancária incorreto."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Informe um número de seguro social finlandês válido."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Números de telefone devem estar no formato 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Informe um código postal válido."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornualha e Ilhas Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cúmbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Sussex Oriental"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Grande Londres"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Grande Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Nortúmbria"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Midlands Ocidental"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Sussex Oriental"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Condado de Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Condado de Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Condado de Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Condado de Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Condado de Derry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Condado de Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Terras Altas"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Órcades"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Ilhas Shetland"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Ilhas Ocidentais"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Inglaterra"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlanda do Norte"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Escócia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "País de Gales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Digite um JMBG de 13 dígitos válido"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Erro no segmento de data"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Digite um OIB de 11 dígitos válido"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Informe uma placa de licença de veículo válida."
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Informe um código de localização válido"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "N'umero não pode ser zero"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Informe um código postal de 5 dígitos válido"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Informe um número de telefone válido."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Insira uma área válida ou um código de rede de celular"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "O número de telefone é muito longo"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Insira um valor JMBAG de 19 dígitos válido começando com 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Número de emissão do cartão não pode ser zero"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Informe um código postal válido."
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Informe um número NIK/KTP válido."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Achém"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jacarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Java Ocidental"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Java Central"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Java Oriental"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Ocicental"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan do Sul"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Central"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Oriental"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Ilhas Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Ilhas Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Molucas"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Molucas do Norte"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Sonda Ocidental"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Sonda Oriental"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Ocidental"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Celebes Ocidental"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Celebes do Sul"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Celebes Central"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Celebes do Sudeste"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Celebes do Norte"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatra Ocidental"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatra do Sul"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatra do Norte"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Achém"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Ilhas Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corpo Consulado"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corpo Diplomático"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Norte do Continente"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Ilhas Sulawesi do Norte"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua e Papua Ocidental"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surubaia"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Governo Federal"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Condado"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Condado"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Condado"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Introduza um código postal no formato XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Digite um número de ID válido."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Insira um CEP no formato XXXXXX ou XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Informe um estado ou território Indiano."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Os números de telefone devem estar no formato 02X-8X ou 03X-7X ou 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Informe um número de identificação islandês válido."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "O número de identificação islandês não é válido."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Informe um código postal válido."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Informe um número de Segurança Social válido."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Informe um número IVA válido."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Informe um código postal no formato XXXXXXX ou XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tóquio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Quioto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaca"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Informe um ID Civil Kuwaitiano válido."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Números de cartão de identidade deve conter de 4 a 7 dígitos ou uma letra "
-"maiúscula e 7 dígitos."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Este campo deve conter exatamente 13 dígitos."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"Os 7 primeiros dígitos do UMCN devem representar uma data no passado válida."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "O UMCN não é válido."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-"Os números de telefone devem estar no formato 02X-8X ou 03X-7X ou 04X-6X."
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Número do cartão de identidade macedônio"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Um município Macedônio (código de 2 caracteres)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Insira um código postal válido no formato XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Insira um RFC válido."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Checksum inválido para RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Insira um CURP válido."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Checksum inválido para CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Estado do México (três letras maiúsculas)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Código postal do México"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "RFC Mexicano"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "CURP Mexicano"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado do México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Informe um código postal válido."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Informe um número SoFi válido."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drente"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevolândia"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frísia"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Güéldria"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groninga"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Brabante do Norte"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Holanda do Norte"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zelândia"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Holanda do Sul"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Informe um número de segurança social norueguês válido."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Este campo requer 8 dígitos."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Este campo requer 11 dígitos."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "O Número de Identificação Nacional consistem de 11 dígitos."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Número de Identificação Nacional incorreto."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Número do ID Nacional é composto por 3 letras e 6 dígitos."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Checksum errado para o Número do Cartão de ID Nacional."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Insira no campo um número fiscal (NIP) no formato XXX-XXX-XX-XX, XXX-XX-XX-"
-"XXX ou XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "O Número de Identificação Tributária (NIP) é incorreto."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"O Número Nacional de Registro de Negócios (REGON) consiste em 9 ou 14 "
-"dígitos."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "O Número Nacional de Registro de Negócios (REGON) é incorreto."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Informe um código postal válido no formato XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Baixa Silésia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubúsquia"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Łódź"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Pequena Polônia"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Mazóvia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpácia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerânia"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silésia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Santa Cruz"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Vármia-Masúria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Grande Polônia"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Pomerânia Ocidental"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Informe um código postal no formato XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Números de telefone precisam conter 9 dígios, ou começarem com + ou 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Informe um CIF válido."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Informe um CNP válido."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Informe um IBAN válido no formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Números de telefone devem estar no formato XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Informe um código postal no formato XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Insira um código postal no formato XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Insira um número de passaporte no formato XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Insira um número de passaporte no formato XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovskaya oblast'"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeya, Respublika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Bashkortostan, Respublika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatia, Respublika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay, Respublika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardino-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karachaevo-Cherkesskaya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelia, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mariy Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovia, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sakha, Respublika (Yakutiya)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetia, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tyva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Chechenskaya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast '"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovskaya oblast'"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovskaya oblast'"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya oblast'"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya oblast'"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurskaya oblast'"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradskaya oblast'"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeckaya oblast'"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanskaya oblast'"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanskaya oblast'"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodskaja oblast'"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodskaya oblast'"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirskaya oblast'"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omskaya oblast'"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgskaya oblast'"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovskaya oblast'"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya oblast'"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya oblast'"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovskaya oblast'"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazanskaya oblast'"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarskaya oblast'"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovskaya oblast'"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinskaya oblast'"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovskaya oblast'"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenskaya oblast'"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovskaya oblast'"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverskaya oblast'"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomskaya oblast'"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tul'skaya oblast'"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumenskaya oblast'"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya oblast'"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinskaya oblast'"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavskaya oblast'"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya avtonomnaja oblast'"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy autonomnyy okrug"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy avtonomnyy okrug"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy avtonomnyy okrug"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Informe um número de organização sueco válido."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Informe um número sueco de identidade pessoal válido."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Números de coordenação não são permitidos."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Informe um código postal sueco válido no formato XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Estocolmo"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotlândia"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"Os 7 primeiros dígitos do EMSO devem representar uma data no passado válida."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "O EMSO não é válido."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Insira um número fiscal válido na forma SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Insira o número do telefone na forma +386XXXXXXXX ou 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banská Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banská Štiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Bánovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytča"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Čadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolný Kubín"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajská Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenné"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kežmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komárno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Košice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Košice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Košice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Košice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Košice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucké Nové Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoča"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovský Mikuláš"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lučenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Námestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nové Mesto nad Váhom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nové Zámky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizánske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piešťany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltár"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Považská Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Prešov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Púchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revúca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavská Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rožňava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ružomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spišská Nová Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stará Ľubovňa"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidník"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Šaľa"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topoľčany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebišov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trenčín"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turčianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdošín"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Veľký Krtíš"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Topľou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlaté Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Žarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Žiar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Žilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Região de Banská Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Região de Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Região de Košice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Região de Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Região de Prešov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Região de Trenčín"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Região de Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Região de Žilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Introduza um código postal no formato XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Números de telefone devem estar no formato 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Digite um número de identificação turco válido."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Número de identificação turco deve ter 11 dígitos."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Informe um código postal no formato XXXXX ou XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Números de telefone devem estar no formato XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Informe um número de Seguro Social dos EUA válido no formato XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Insira um estado ou território dos E.U.A."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estado dos E.U.A. (duas letras maiúsculas)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "código postal dos EUA(duas letras maiúsculas)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Número de telefone"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Informe um número CI válido no formato X.XXX.XXX-X,XXXXXXX-X ou XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Informe um número CI válido."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Informe um ID sul-africado válido."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Informe um código postal sul-africado válido."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Cabo Oriental"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Estado Livre"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Cabo Setentrional"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Noroeste"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Cabo Ocidental"
diff --git a/django/contrib/localflavor/locale/ro/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ro/LC_MESSAGES/django.mo
deleted file mode 100644
index 9bf158f508..0000000000
Binary files a/django/contrib/localflavor/locale/ro/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ro/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ro/LC_MESSAGES/django.po
deleted file mode 100644
index 66ce07c80a..0000000000
--- a/django/contrib/localflavor/locale/ro/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3551 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Denis Darii <sinednx@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Denis Darii <sinednx@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
-"ro/)\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Introduceți un cod poștal valid de forma NNNN sau ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Acest câmp acceptă doar numere."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Acest câmp are nevoie de 7 sau 8 cifre."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Introduceți un CUIT valid de forma XX-XXXXXXXX-X sau XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT invalid."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carintia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Austria Inferioară"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Austria Superioară"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viena"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introduceți un cod poștal de forma XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Introduceţi un Număr de Securitate Socială Austriac valabil în formatul XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Anvers"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruxelles"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Flanderul de est"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flemish Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Vasal"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Flanders de Vest"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Regiunea-Capitală din Bruxel"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonia"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Introduceți un număr de telefon valabil în unul din următoarele formate: 0x "
-"xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx."
-"xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Adăugați un cod poștal de forma XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Numerele de telefon trebuie să fie în format XXX-XXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Selectați un stat brazilian valid. Acest stat nu se află printre statele "
-"disponibile."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Număr CPF invalid."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Acest câmp are nevoie de cel mult 11 cifre sau 14 caractere."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Număr CNPJ invalid."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Acest câmp are nevoie de cel puțin 14 cifre."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Introduceți un cod poștal de forma XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Introduceți un număr canadian de asigurare socială valid de forma XXX-XXX-"
-"XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berna"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Geneva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerna"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "JoiTurgovia"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Introduceți un număr elvetian de identitate sau pașaport, valid, de forma "
-"X1234567<0 sau 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Introduceți RUT chilian valid."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Introduceți un RUT chilian valid. Formatul este XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "RUT-ul chilean nu este valid."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Regiunea Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Regiunea Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Regiunea Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Regiunea Vysočina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Regiunea Moravia de Sud"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Regiunea Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Introduceți un cod poștal de forma XXXXX or XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Introduceți data de naștere în formatul XXXXXX/XXXX sau XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Introduceți data de nastere valabilă"
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessa"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Pomerania Inferioara"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Saxonia Inferioara"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Renania de Nord-Westfalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Renanina-Palatinat"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxonia"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxonia-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Turingia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introduceți un cod poștal de forma XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Introduceți un număr german de identitate valid, de forma XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Insulele Baleare"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilia"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principatul Asturiei"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Insulele Baleare"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Tara Bascilor"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Insulele Canare"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castilia și Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Regiunea Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Comunitatea Forală Navara"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Comunitatea Valencia"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-"Introduceți un cod poștal valid în intervalul și de forma 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Introduceți un număr de telefon valid într-unul dintre formatele 6XXXXXXXX, "
-"8XXXXXXXX sau 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Introduceţi vă rog un NIF, NIE sau CIF valid."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Introduceți vă rog un NIF sau NIE valid."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Sumă de control invalidă pentru NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Sumă de control invalidă pentru NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Sumă de control invalidă pentru CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Introduceți un număr de cont bancar valid de forma XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Sumă de control invalidă pentru numărul de cont bancar."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Introduceți un număr finlandez de securitate socială valid."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Numerele de telefon trebuie să fie în formatul 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Introduceți un cod poștal valid."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall și Insulele Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Londra Mare"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne și Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Comitatul Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Comitatul Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Comitatul Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Comitatul Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Comitatul Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Comitatul Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries și Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglia"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Irlanda de Nord"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotia"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Țara Galilor"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Introduceţi un număr de telefon valid"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Introduceţi un cod poştal valabil"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Introduceți codul poștal în următorul format XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Introduceți un număr islandez de autentificare valid. Formatul este XXXXXX-"
-"XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Numărul islandez de identificare nu este valid."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Introduceți un cod poștal valid."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Introduceți un număr de securitate socială valid."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Introduceți un număr TVA valid."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Introduceți un cod poștal de forma XXXXXXX sau XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Districtul Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Introduceți un cod poștal valid"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Introduceți un număr SoFi valid"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frizia"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Brabantul de Nord"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Olanda de Nord"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeelanda"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Olanda de Sud"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Introduceți un număr norvegian de securitate socială valid."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Acest câmp are nevoie de 8 cifre."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Acest câmp are nevoie de 11 cifre."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Numărul Național de Identificare conține 11 cifre."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Sumă de control greșită pentru Numărul Național de Identificare."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Sumă de control greșită pentru Numărul de Taxa (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Suma de control gresita pentru Numărul National din Registrul pentru Afaceri "
-"(REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Introduceți un cod poștal de forma XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Silezia Inferioară"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Polonia Mică"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Podcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silezia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Polonia Mare"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Pomerania Occidentală"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Introduceți un cod poștal valabil în formatul XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica region"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Regiunea Bratislava"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Regiunea Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Regiunea Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Regiunea Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Regiunea Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Regiunea Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Regiunea Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Introduceți codul poștal în formatul XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Numărul de telefon trebuie să fie în formatul 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduceți un cod poștal de forma XXXXX or XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Numărul de telefon trebuie să fie în formatul XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Introduceți un număr SUA de Securitate Sociala de forma XXX-XX-XXXX format."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stat SUA (doua litere mari)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Număr de telefon"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Introduceți un ID sud african valid"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Introduceți un cod poștal sud african valid"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/ru/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ru/LC_MESSAGES/django.mo
deleted file mode 100644
index d1d3fc1a74..0000000000
Binary files a/django/contrib/localflavor/locale/ru/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ru/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ru/LC_MESSAGES/django.po
deleted file mode 100644
index f482cc0841..0000000000
--- a/django/contrib/localflavor/locale/ru/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3562 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Denis Darii <sinednx@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Michael Bashkirov <michael.bashkirov@gmail.com>, 2011.
-# Алексей Борискин <sun.void@gmail.com>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
-"ru/)\n"
-"Language: ru\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Введите почтовый индекс в формате NNNN или ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Это поле принимает только числа."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Это поле требует 7 или 8 цифр."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Введите правильный CUIT в формате XX-XXXXXXXX-X или XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Неверный CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Бургенланд"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Каринтия"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Нижняя Австрия"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Верхняя Австрия"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Зальцбург"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Штирия"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Тироль"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Ворарлберг"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Вена"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Введите правильный индекс в формате XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Введите правильный номер социального страхования Австрии в формате XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Введите 4 цифры почтового индекса"
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Австралийский штат"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Австралийский почтовый индекс"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Австралийский телефонный номер"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Антверпен"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Брюссель"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Восточная Фландрия"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Фламандский Брабант"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Хаинаут"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Льеж"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Лимбург"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Люксембург"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Намюр"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Валлонский Брабант"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Западная Фландрия"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Брюссельская Капитальная Область"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Фламандский регион"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Валлония"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Введите действительный почтовый индекс в диапазон и формат 1xxx - 9xxx."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Введите действительный номер телефона в одном из форматов 0x хх хх ххх, 0xx "
-"хх хх хх, 04xx хх хх хх, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x . xxx."
-"xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx или 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Введите почтовый индекс в формате XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Телефонные номера должны быть в формате XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Выберите корректный бразильский штат. Указанного варианта нет среди "
-"допустимых значений."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Неправильный CPF номер."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Это поле требует 11 цифр или 14 символов."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Неправильный CNPJ номер."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Это поле требует как минимум 14 цифр"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Введите почтовый индекс в формате XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Введите правильный номер социального страхования Канады в формате XXX-XXX-"
-"XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Ааргау"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Аппенцелль-Иннерроден"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Аппенцелль-Ауссерроден"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Базель-Штадт"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Базель-Ланд"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Берн"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Фрибур"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Женева"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Гларус"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Граубюнден"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Джура"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Люцерн"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Нёвшатель"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Нидвальден"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Обвальден"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Шаффхаузен"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Швиц"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Золотурн"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Санкт-Галлен"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Тургау"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Тичино"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Ури"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Вале"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Во"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Цуг"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Цюрих"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Введите правильный номер швейцарского паспорта личности или номер карты в "
-"формате X1234567<0 или 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Введите правильный RUT Чили."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Введите правильный RUT Чили. Формат: XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Чилийский RUT недействителен."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Введите почтовый индекс в формате XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Номер идентификационной карты состоит из 15 или 18 цифр."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Неверный номер идентификационной карты: контрольная сумма неверна"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Неверный номер идентификационной карты: неверная дата рождения"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Неверный номер идентификационной карты: неверный код региона"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Введите корректный телефонный номер."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Введите корректный номер мобильного телефона."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Прага"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Среднечешский край"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Южночешский край"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Пльзенский край"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Карловарский край"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Устецкий край"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Либерецкий край"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Краловеградецкий край"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Пардубицкий край"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Край Высочина"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Южноморавский край"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Оломоуцкий край"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Злинский край"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Моравскосилезский край"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Введите почтовый индекс в формате XXXXX или XXX-XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"Введите номер свидетельства о рождении в формате XXXXXX/XXXX или XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Неверный аргумент для пола, допустимые значения: 'f' и 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Введите правильный номер свидетельства о рождении."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Введите правильный IC номер."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Баден-Вюртемберг"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Бавария"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Берлин"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Бранденбург"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Бремен"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Гамбург"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Гессен"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Мекленбург-Западная Померания"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Нижняя Саксония"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Северный Рейн-Вестфалия"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Рейнланд-Пфальц"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Саар"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Саксония"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Саксония-Анхальт"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Шлезвиг-Гольштейн"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Тюрингия"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Введите почтовый индекс в формате XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Введите правильный номер паспорта личности в формате XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Арава"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Альбасете"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Аликанте"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Альмерия"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Авила"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Бадахос"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Балеарские острова"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Барселона"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Бургос"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Касерес"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Кадис"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Кастельо"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Сьюдад-Реаль"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Кордоба"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "Ла-Корунья"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Куэнка"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Херона"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Гранада"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Гвадалахара"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Гипускоа"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Уэльва"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Уэска"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Хаэн"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Леон"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Лерида"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "Риоха"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Луго"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Мадрид"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Малага"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Мурсия"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Наварра"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Оренсе"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Астурия"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Паленсия"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Лас-Пальмас"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Понтеведра"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Саламанка"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Санта-Крус-де-Тенерифе"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Кантабрия"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Сеговия"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Севилья"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Сория"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Таррагона"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Теруэль"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Толедо"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Валенсия"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Вальядолид"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Бискайя"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Замора"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Сарагоса"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Сеута"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Мелилья"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Андалусия"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Арагон"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Астурийское княжество"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Балеарские острова"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Страна Басков"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Канарские острова"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Кастилия-Ла-Манча"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Кастилия и Леон"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Каталония"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Эстремадура"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Галисия"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Мурсия"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Наварра"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Валенсия"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Введите почтовый индекс в диапазоне и формате 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Введите правильный телефонный номер в одном из форматов 6XXXXXXXX, 8XXXXXXXX "
-"или 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Пожалуйста, введите правильный NIF, NIE или CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Пожалуйста, введите правильный NIF или NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Неверная проверочная сумма для NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Неверная проверочная сумма для NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Неверная проверочная сумма для CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Пожалуйста, введите правильный банковский номер в формате XXXX-XXXX-XX-"
-"XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Неверная проверочная сумма для банковского номера."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Введите правильный номер социального страхования Финляндии."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Телефонные номера должны быть в формате 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Введите правильный почтовый индекс."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Бедфордшир"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Бакингемшир"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Чешир"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Корнуолл и острова Силли"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Камбрия"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Дербишир"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Девон"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Дорсет"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Дарем"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Восточный Сассекс"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Эссекс"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Глостершир"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Большой Лондон"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Большой Манчестер"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Хэмпшир"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Хартфордшир"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Кент"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Ланкашир"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Лестершир"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Линкольншир"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Мерсисайд"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Норфолк"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Северный Йоркшир"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Нортгемптоншир"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Нортумберленд"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Ноттингемшир"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Оксфордшир"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Шропшир"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Сомерсет"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Южный Йоркшир"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Стаффордшир"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Саффолк"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Сюррей"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Тайн и Уир"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Уорикшир"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Уэст-Мидлендс"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Западный Сассекс"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Западный Йоркшир"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Уилтшир"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Вустершир"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Графство Антрим"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Графство Арма"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Графство Даун"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Графство Фермана"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Графство Лондондерри"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Графство Тирон"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Клуид"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Дивед"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Гуент"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Гуинет"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Мид-Гламорган"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Поуис"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Южный Гламорган"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Западный Гламорган"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Бордерс"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Центральная Шотландия"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Дамфрис и Галлоуэй"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Файф"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Грампиан"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Хайленд"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Лотиан"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Оркнейские острова"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Шетлендские острова"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Стратклайд"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Тэйсайд"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Западные острова"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Англия"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Северная Ирландия"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Шотландия"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Уэльс"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Введите корретный 13-значный JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Ошибка в сегменте даты"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Введите корретный 11-значный OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Введите правильный регистрационный номер автомобиля"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Введите корретный код региона"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Числовая часть не может быть нулём"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Введите корректный 5-значный почтовый индекс"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Введите правильный телефонный номер"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Введите корректный код региона или код мобильной сети"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Слишком длинный телефонный номер"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Введите корректный 19-значный JMBAG, начинающийся с 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Код выпуска карты не может быть нулём"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Город Загреб"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Беловарско-Билогорская жупания"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Бродско-Посавская жупания"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Дубровницко-Неретванская жупания"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Истрийская жупания"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Карловацкая жупания"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Копривницко-Крижевацкая жупания"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Крапинско-Загорская жупания"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Лицко-Сеньская жупания"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Меджумурская жупания"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Осиецко-Бараньская жупания"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Пожежско-Славонская жупания"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Приморско-Горанская жупания"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Сисацко-Мославинская жупания"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Сплитско-Далматинская жупания"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Шибенско-Книнская жупания"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Вараждинская жупания"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Вировитицко-Подравская жупания"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Вуковарско-Сремская жупания"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Задарская жупания"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Загребская жупания"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Введите правильный почтовый индекс"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Введите правильный NIK/KTP номер"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Ачех"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Бали"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Бантен"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Бенгкулу"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Джокьякарта"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Джакарта"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Горонтало"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Джамби"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Западная Ява"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Центральная Ява"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Восточная Ява"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Западный Калимантан"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Южный Калимантан"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Центральный Калимантан"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Восточный Калимантан"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Острова Бангка-Белитунг"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Острова Риау"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Лампунг"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Молукку"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Северное Молукку"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Западные Малые Зондские острова"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Восточные Малые Зондские острова"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Папуа"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Западное Папуа"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Риау"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Западное Сулавеси"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Южное Сулавеси"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Центральное Сулавеси"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Юго-Восточное Сулавеси"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Северное Сулавеси"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Западная Суматра"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Южная Суматра"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Северная Суматра"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Магеланг"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Суракарта - Соло"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Мадиун"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Кедири"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Тапанули"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Ачех"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Бангка-Белитунг"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Консульский корпус"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Дипломатический корпус"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Бандунг"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Северное Сулавеси"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Тимор"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Северное Сулавеси"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Ломбок"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Папуа и Западное Папуа"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Чиребон"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Сумбава"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Флорес"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Сумба"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Богор"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Пекалонган"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Семаранг"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Пати"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Сурабая"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Мадура"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Маланг"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Джембер"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Банджумас"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Федеральное правительство"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Боджонегоро"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Пурвакарта"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Сидоарджо"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Гарут"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Антрим"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Арма"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Карлоу"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Каван"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Клэр"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Корк"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Дерри"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Донегол"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Даун"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Дублин"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Фермана"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Голуэй"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Керри"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Килдэр"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Килкенни"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Лиишь"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Литрим"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Лимерик"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Лонгфорд"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Лаут"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Мейо"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Мит"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Монахан"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Оффали"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Роскоммон"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Слайго"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Типперэри"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Тирон"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Уотерфорд"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Уэстмит"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Уэксфорд"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Уиклоу"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Введите почтовый индекс в формате XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Введите действительный ID номер."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Введите корректный почтовый индекс в формате XXXXXX или XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Введите индийский штат или территорию."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Телефонные номера должны быть в формате 02X-8X, или 03X-7X, или 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Введите правильный исландский идентификационный номер. Формат: XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Неправильный исландский идентификационный номер."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Введите правильный почтовый индекс."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Введите правильный номер социального страхования."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Введите правильный VAT номер."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Введите почтовый индекс в формате XXXXXXX или XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Хоккайдо"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Аомори"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Иватэ"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Мияги"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Акита"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Ямагата"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Фукушима"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ибакари"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Тотиги"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Гунма"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Сайтама"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Тиба"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Токио"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Канагава"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Яманаси"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Нагано"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Ниигата"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Тояма"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Исикава"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Фукуи"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Гифу"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Сидзуока"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Айчи"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Миэ"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Сига"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Киото"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Осака"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Хёго"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Нара"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Вакаяма"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Тоттори"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Симанэ"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Окаяма"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Хиросима"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Ямагути"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Токусима"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Кагава"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Эхимэ"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Коти"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Фукуока"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Сага"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Нагасаки"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Кумамото"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Оита"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Миядзаки"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Кагосима"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Окинава"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Введите правильный номер кувейтского удостоверения личности"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Номер идентификационной карты должен содержать или от 4 до 7 цифр, или "
-"заглавную букву и 7 цифр."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Это поле должно содержать ровно 13 цифр."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "Первые 7 цифр UMCN должны быть корректной датой в прошлом."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "Некорректный UMCN."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Аэродром"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Арачиново"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Берово"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Битола"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Богданци"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Боговинье"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Босилово"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Брвеница"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Бутел"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Валандово"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Василево"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Вевчани"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Велес"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Виница"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Вранештица"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Врапчиште"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Гази-Баба"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Гевгелия"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Гостивар"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Градско"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Дебар"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Дебарца"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Делчево"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Демир-Капия"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Демир-Хисар"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Долнени"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Другово"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Гёрче-Петров"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Желино"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Заяс"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Зелениково"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Зрновци"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Илинден"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Егуновце"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Кавадарци"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Карбинци"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Карпош"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Кисела-Вода"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Кичево"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Конче"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Кочани"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Кратово"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Крива-Паланка"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Кривогаштани"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Крушево"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Куманово"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Липково"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Лозово"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Маврово и Ростуша"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Македонска-Каменица"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Македонски-Брод"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Могила"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Неготино"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Новаци"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Ново-Село"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Осломей"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Охрид"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Петровец"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Пехчево"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Пласница"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Прилеп"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Пробиштип"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Радовиш"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Ранковце"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Ресен"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Росоман"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Сарай"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Свети-Николе"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Сопиште"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Стар-Дойран"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Старо-Нагоричане"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Струга"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Струмица"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Студеничани"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Теарце"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Тетово"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Центр"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Центар-Жупа"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Чаир"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Чашка"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Чешиново-Облешево"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Чучер-Сандево"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Штип"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Шуто-Оризари"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Номер идентификационной карты Македонии"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Македонский муниципалитет (двухбуквенный код)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Индивидуальный номер гражданина (13 цифр)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Введите корректный почтовый индекс в формате XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Введите корректный RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Неверная контрольная сумма RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Введите корректный CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Неверная контрольная сумма CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Мексиканский штат (три заглавных буквы)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Мексиканский почтовый индекс"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Мексиканский RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Мексиканский CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Агуаскальентес"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Нижняя Калифорния"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Южная Нижняя Калифорни"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Кампече"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Чиуауа"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Чьяпас"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Коауила"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Колима"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Федеральный округ"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Дуранго"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Герреро"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Гуанахуато"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Идальго"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Халиско"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Мехико"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Мичоакан"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Морелос"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Наярит"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Нуэво-Леон"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Оахака"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Пуэбла"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Керетаро"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Кинтана-Роо"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Синалоа"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "Сан-Луис-Потоси"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Сонора"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Табаско"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Тамаулипас"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Тласкала"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Веракрус"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Юкатан"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Сакатекас"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Введите правильный почтовый индекс"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Введите правильный SoFi номер"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Дренте"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Флеволанд"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Фрисланд"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Гелдерланд"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Гронинген"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Северный Брабант"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Северная Голландия"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Оверэйсел"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Утрехт"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Зеландия"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Южная Голландия"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Введите правильный номер социального страхования Норвегии."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Это поле требует 8 цифр."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Это поле требует 11 цифр."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Национальный идентификационный номер состоит из 11 цифр."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Неверная проверочная сумма для NIF."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Номер национальной идентификационной карты содержит 3 буквы и 6 цифр."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-"Некорректная контрольная сумма номера национальной идентификационной карты."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Введите идентификатор налогоплательщика (NIP) в формате XXX-XXX-XX-XX, XXX-"
-"XX-XX-XXX или XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Неверная проверочная сумма для NIP."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Национальный деловой регистрационный номер (REGON) состоит из 9 или 14 цифр."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Неверная проверочная сумма для национального делового регистрационного "
-"номера (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Введите почтовый индекс в формате XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Нижнесилезское"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Куявско-Поморское"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Люблинское"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Любушское"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Лодзинское"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Малопольское"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Мазовецкое"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Опольское"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Подкарпатское"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Подляское"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Поморское"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Силезское"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Свентокшиское"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Варминско-Мазурское"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Великопольское"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Западнопоморское"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Введите почтовый индекс в формате XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Телефонные номера должны состоять из 9 цифр или начинаться с + или 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Введите правильный CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Введите правильный CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Введите правильный IBAN в формате ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Телефонные номера должны быть в формате XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Введите почтовый индекс в формате XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Введите почтовый индекс в формате XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Введите номер и серию паспорта в формате XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Введите номер и серию паспорта в формате XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Центральный федеральный округ"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Южный федеральный округ"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Северо-Западный федеральный округ"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Дальневосточный федеральный округ"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Сибирский федеральный округ"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Уральский федеральный округ"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Приволжский федеральный округ"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Северо-Кавказский федеральный округ"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Москва"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Санкт-Петербург"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Московская область"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Адыгея, Республика"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Башкортостан, Республика"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Бурятия, Республика"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Алтай, Республика"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Дагестан, Республика"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ингушская Республика"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Кабардино-Балкарская Республика"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Республика Калмыкия"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Карачаево-Черкесская Республика"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Карелия, Республика"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Коми, Республика"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Марий Эл, Республика"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Мордовия, Республика"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Саха, Республика (Якутия)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Северная Осетия, Республика (Алания)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Татарстан, Республика"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Тыва, Республика (Тува)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Удмуртская Республика"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Хакасия, Республика"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Чеченская Республика"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Чувашская Республика"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Алтайский Край"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Забайкальский Край"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Камчатский Край"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Краснодарский Край"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Красноярский Край"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Пермский Край"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Приморский Край"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Ставропольский Край"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Хабаровский Край"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Амурская область"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Архангельская область"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Астраханская область"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Белгородская область"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Брянская область"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Владимирская область"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Волгоградская область"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Вологодская область"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Воронежская область"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ивановская область"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Иркутская область"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Калининградская область"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Калужская область"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Кемеровская область"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Кировская область"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Костромская область"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Курганская область"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Курская область"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Ленинградская область"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Липецкая область"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Магаданская область"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Мурманская область"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Нижегородская область"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Новгородская область"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Новосибирская область"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Омская область"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Оренбургская область"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Орловская область"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Пензенская область"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Псковская область"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Ростовская область"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Рязанская область"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Самарская область"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Саратовская область"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Сахалинская область"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Свердловская область"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Смоленская область"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Тамбовская область"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Тверская область"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Томская область"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Тульская область"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Тюменская область"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ульяновская область"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Челябинская область"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Ярославская область"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Еврейская автономная область"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Ненецкий автономный округ"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Ханты-Мансийский автономный округ — Югра "
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Чукотский автономный округ"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Ямало-Ненецкий автономный округ"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Введите правильный шведский идентификационный номер организации."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Введите правильный шведский персональный идентификационный номер."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Координационные номера запрещены"
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Введите шведский почтовый индекс в формате XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Стокгольм"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Вестерботтен"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Норрботтен"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Уппсала"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Сёдерманланд"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Эстергётланд"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Йёнчёпинг"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Крунуберг"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Кальмар"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Готланд"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Блекинге"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Сконе"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Халланд"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Вестра-Гёталанд"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Вермланд"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Эребру"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Вестманланд"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Даларна"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Евлеборг"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Вестерноррланд"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Емтланд"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "Первые 7 цифр EMSO должны быть корректной датой в прошлом."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO некорректен."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Введите корректный идентификатор налогоплательщика в форме SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Введите телефонный номер в форме +386XXXXXXXX или 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Банска Бистрица"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Банска Штьявница"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Бардейов"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Бановце-над-Бебравоу"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Брезно"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Братислава I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Братислава II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Братислава III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Братислава IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Братислава V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Битча"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Чадца"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Детва"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Долны Кубин"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Дунайска Стреда"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Галанта"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Гелница"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Глоговец"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Гуменне"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Илава"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Кежмарок"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Комарно"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Кошице I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Кошице II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Кошице III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Кошице IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Кошице-периферия"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Крупина"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Кисуцке Нове Место"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Левице"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Левоча"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Липтовски Микулаш"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Лученец"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Малацки"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Мартин"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Медзилаборце"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Михаловце"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Миява"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Наместово"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Нитра"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Новое Место-над-Вагом"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Нове Замки"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Партизанске"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Пезинок"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Пьештяны"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Полтар"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Попрад"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Поважска Бистрица"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Прешов"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Прьевидза"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Пухов"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Ревуца"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Римавска Собота"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Рожнява"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ружомберок"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Сабинов"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Сенец"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Сеница"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Скалица"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Снина"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Собранце"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Спишска Нова Вес"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Стара Любовня"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Стропков"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Свидник"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Сала"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Топольчаны"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Требишов"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Тренчин"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Трнава"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Турчьянске Теплице"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Тврдошин"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Вельки Кртиш"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Вранов-над-Топлёу"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Злате Моравце"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Зволен"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Жарновица"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Жьяр-над-Гроном"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Жилина"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Банскобистрицкий край"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Братиславский край"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Кошицкий край"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Нитранский край"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Прешовский край"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Тренчинский край"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Трнавский край"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Жилинский край"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Введите почтовый индекс в формате XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Номера телефонов должны быть в формате 0xxx XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Введите действительный турецкий Идентификационный номер."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "У турецкого Идентификационного номера должно быть 11 цифр."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Введите почтовый индекс в формате XXXXX или XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Телефонные номера должны быть в формате XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Введите правильный номер социального страхования США в формате XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Введите штат или территорию США"
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Штат США (две заглавные буквы)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Американский индекс (две заглавные буквы)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Номер телефона"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Введите правильный CI-номер в формате X.XXX.XXX-X,XXXXXXX-X или XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Введите правильный CI-номер."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Введите правильный идентификационный номер Южной Африки."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Введите правильный почтовый индекс Южной Африки"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Восточная Капская провинция"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Свободный штат"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Гаутенг"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "Квазулу-Натал"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Лимпопо"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Мпумаланга"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Северная Капская провинция"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Северо-запад"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Западная Капская провинция"
diff --git a/django/contrib/localflavor/locale/sk/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/sk/LC_MESSAGES/django.mo
deleted file mode 100644
index 366c21da00..0000000000
Binary files a/django/contrib/localflavor/locale/sk/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/sk/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/sk/LC_MESSAGES/django.po
deleted file mode 100644
index 8dfbe3659e..0000000000
--- a/django/contrib/localflavor/locale/sk/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3546 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Marian Andre <marian@andre.sk>, 2011, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Marian Andre <marian@andre.sk>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
-"sk/)\n"
-"Language: sk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Zadajte poštové smerovacie číslo v tvare NNNN alebo ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Toto pole môže obsahovať len čísla."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Toto pole vyžaduje 7 alebo 8 číslic."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Vložte platné CUIT vo formáte XX-XXXXXXXX-X alebo XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Neplatné CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Korutánsko"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Dolné Rakúsko"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Horné Rakúsko"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Štajersko"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirolsko"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlbersko"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Viedeň"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Zadajte platné rakúske číslo sociálneho poistenia vo formáte XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Zadajte štvorciferné poštové smerovacie číslo."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Austrálsky štát"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Austrálske PSČ"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Austrálske telefónne číslo"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antverpy"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brusel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Východné Flámsko"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flámsky Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hennegavsko"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Belgické Luxembursko"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Valónsky Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Západné Flámsko"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Región hlavného mesta Brusel"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flámsky región"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valónsko"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Zadajte platné poštové smerovacie číslo v rozmedzí a v tvare 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Zadajte platné telefónne číslo v jednom z tvarov 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx alebo 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefónne čísla musia byť vo formáte XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Vyberte platný brazílsky štát. Tento štát nepatrí medzi existujúce štáty."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Chybné CPF číslo."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Toto pole môže mať najviac 11 čísel alebo 14 písmen."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Chybné CNPJ číslo."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Toto pole vyžaduje minimálne 14 číslic"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Zadajte platné číslo kanadského sociálneho poistenia vo formáte XXX-XXX-XX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ženeva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucern"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Vložte platné švajčiarske číslo občianskeho preukazu alebo pasu vo formáte "
-"X1234567<0 alebo 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Vložte platné čilské RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Vložte platné čilské RUT. Formát je XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Čilské RUT nie je platné."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Číslo preukazu sa skladá z 15 alebo 18 číslic."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Neplatné číslo preukazu: Zlý kontrolný súčet"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Neplatné číslo preukazu: Zlý dátum narodenia"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Neplatné číslo preukazu: Zlý kód územia"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Zadajte platné telefónne číslo."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Zadajte platné číslo mobilného telefónu."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praha"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Stredočeský kraj"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Juhočeský kraj"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Plzenský kraj"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Karlovarský kraj"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Ústecký kraj"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberecký kraj"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradecký kraj"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubický kraj"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysočina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Juhomoravský kraj"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomoucký kraj"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Žlínsky kraj"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravskosliezsky kraj"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXXX alebo XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Zadajte rodné číslo vo formáte XXXXXX/XXXX alebo XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Neplatný voliteľný parameter pohlavie, platné hodnoty sú 'f' a 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Zadajte platné rodné číslo."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Zadajte platné IC číslo."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Bádensko-Wuerttembersko"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavorsko"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlín"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenbursko"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Brémy"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessensko"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Meklenbursko-Predpomoransko"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Dolné Sasko"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Severné Porýnie-Westfálsko"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Porýnie-Falcko"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Sasko"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Sasko-Anhaltsko"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswigsko-Holsteinsko"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Vložte poštové smerovacie číslo v tvare XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Vložte platné nemecké číslo občianskeho preukazu vo formáte XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Baleáry"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Kantábria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalúzia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturské kniežatstvo"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Baleárske ostrovy"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskicko"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanárske ostrovy"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastília-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastília-León"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalánsko"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Estremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galícia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia a okolie"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencijské spoločenstvo"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-"Zadajte platné poštové smerovacie číslo v rozmedzí a v tvare 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Zadajte platné telefónne číslo v tvare 6XXXXXXXX, 8XXXXXXXX alebo 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Zadajte platné NIF, NIE alebo CIF, prosím."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Zadajte platné NIF alebo NIE, prosím."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Neplatný kontrolný súčet pre NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Neplatný kontrolný súčet pre NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Neplatný kontrolný súčet pre CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Zadajte, prosím, platné číslo bankového účtu v tvare XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Neplatný kontrolný súčet čísla bankového účtu."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Vložte platné fínske číslo sociálneho poistenia."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefónne čísla musia mať formát 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Zadajte platné poštové smerovacie číslo."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall a Ostrovy Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne a Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "okres Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "okres Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "okres Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "okres Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "okres Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "okres Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries a Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkneyské ostrovy"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetlandské ostrovy"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Anglicko"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Severné Írsko"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Škótsko"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Zadajte platných 13 číslic JMBG"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Chyba v dátumovej časti"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Zadajte platných 11 číslic OIB"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Zadajte platnú štátnu poznávaciu značku auta"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Zadajte platný kód územia "
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Číselná časť nemôže byť nula"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Zadajte platné 5-miestne PSČ"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Zadajte platné telofónne číslo"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Zadajte platný kód pre oblasť alebo mobilnú sieť"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefónne číslo je príliš dlhé"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Zadajte platných 19 číslic JMBAG počnúc 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Číslo vydania karty nemôže byť nula"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Záhreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorská župa"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posávska župa"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovnícko-neretvianska župa"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istrijská župa"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovecká župa"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivnicko-križevatská župa"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorská župa"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Licko-senjská župa"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Medzimurská župa"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osijecko-baranjská župa"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požecko-slavónska župa"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Prímorsko-gorskokotarská župa"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisacko-moslavinská župa"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatínska župa"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibenicko-kninská župa"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždínska župa"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Viroviticko-podrávska župa"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-sriemska župa"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarská župa"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Záhrebská župa"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Zadajte platné poštové smerovacie číslo"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Zadajte platné NIK/KTP číslo"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federálna vláda"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXXX."
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Zadajte platné ID číslo."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXXXX, alebo XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Zadajte indický štát alebo územie."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Telefónne čísla musia byť v tvare 02X-8X alebo 03X-7X alebo 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Zadajte platné islandské identifikačné číslo. Formát je XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islandské identifikačné číslo je neplatné."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Zadajte platné poštové smerovacie číslo."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Vložte platné číslo sociálneho poistenia."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Zadajte platné VAT číslo."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXXXXX alebo XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaidó"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Mijagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Jamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukušima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Točigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Čiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Jamanaši"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Tojama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Išikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Šizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aiči"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Šiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kjóto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hjógo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakajama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Šimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okajama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hirošima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Jamaguči"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokušima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kóči"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Mijazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagošima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Zadajte platné kuvaitské civilné identifikačné číslo"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Číslo občianskeho preukazu musí obsahovať buď 4 až 7 číslic alebo veľké "
-"písmeno a 7 číslic."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Toto pole musí obsahovať presne 13 číslic."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "Prvých 7 číslic UMCN musí predstavovať platný dátum minulosti."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN nie je platný."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo a Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Číslo macedónskeho preukazu totožnosti"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Macedónska samospráva (2 znakový kód)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Unikátne číslo občana (13 číslic)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Zadajte platné poštové smerovacie číslo v tvare XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Zadajte platné RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Neplatný kontrolný súčet pre RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Zadajte platné CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Neplatný kontrolný súčet pre CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Štát Mexika (tri veľké písmená)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexické PSČ"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexické RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexické CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Róo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Zadajte platné poštové smerovacie číslo"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Zadajte platné SoFi číslo"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drente"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flavónsko"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Frízsko"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Severné Brabantsko"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Severný Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zéland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Južný Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Vložte platné nórske číslo sociálneho poistenia."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Toto pole vyžaduje 8 číslic."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Toto pole vyžaduje 11 číslic."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Národné identifikačné číslo sa skladá z 11 číslic."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Nesprávny kontrolný súčet pre národné identifikačné číslo."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Číslo občianskeho preukazu sa skladá z 3 písmen a 6 číslic."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Zlý kontrolný súčet pre číslo občianskeho preukazu."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Nesprávny kontrolný súčet pre daňové číslo (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Číslo národného obchodného registra (REGON) sa skladá z 9 alebo zo 14 číslic."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Nesprávny kontrolný súčet pre číslo národného obchodného registra (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Vložte poštové smerovacie číslo v tvare XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Dolnosliezske vojvodstvo"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kujavsko-pomoranské vojvodstvo"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lubelské vojvodstvo"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubuské vojvodstvo"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodžské vojvodstvo"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Malopoľské vojvodstvo"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Mazovské vojvodstvo"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opolské vojvodstvo"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Podkarpatské vojvodstvo"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podleské vojvodstvo"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomoranské vojvodstvo"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Sliezske vojvodstvo"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Svätokrížske vojvodstvo"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Varmsko-mazurské vojvodstvo"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Veľkopoľské vojvodstvo"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Západopomoranské vojvodstvo"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare  XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefónne čísla musia obsahovať 9 číslic a začína znakom + alebo 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Zadajte platné CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Zadajte platné CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Zadajte platné IBAN vo formáte ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefónne čísla musia mať formát XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Zadajte platné poštové smerovacie číslo v tvare XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Zadajte číslo pasu v tvare XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Zadajte číslo pasu v tvare XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Centrálny federálny okruh"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Južný federálny okruh"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Severozápadný federálny okruh"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Ďalekovýchodný federálny okruh"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Sibírsky federálny okruh"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Uralský federálny okruh"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Povolžský federálny okruh"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Severokaukazský federálny okruh"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Petrohrad"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskovská oblasť"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygejská republika"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Baškirská republika"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buriatska republika"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altajská republika"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestanská republika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingušská republika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardsko-balkardská republika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmycká republika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karačajsko-čerkeská republika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelská republika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komijská republika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Marijská republika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordvianska republika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Jakutská republika (Sacha)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severoosetská republika (Alánsko)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatárska republika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tuvianska republika (Tuvia)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtská republika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Karačajsko-čerkeská republika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Čečenská republika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Čuvašská republika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altajský kraj"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabajkalský kraj"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamčatský kraj"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarský kraj"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnojarský kraj"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permský kraj"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Prímorský kraj"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropoľský kraj"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Chabarovský kraj"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurská oblasť"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Archangeľská oblasť"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrachánska oblasť"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodská oblasť"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Brianska oblasť"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimírska oblasť"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradská oblasť"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologdská oblasť"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronežská oblasť"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovská oblasť"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutská oblasť"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradská oblasť"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kalužská oblasť"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovská oblasť"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirovská oblasť"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromská oblasť"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganská oblasť"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kurská oblasť"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningradská oblasť"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipecká oblasť"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadanská oblasť"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmanská oblasť"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nižnonovgorodská oblasť"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorodská oblasť"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibírska oblasť"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omská oblasť"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburská oblasť"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovská oblasť"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzianska oblasť"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovská oblasť"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostovská oblasť"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Riazanská oblasť"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samarská oblasť"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratovská oblasť"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sachalinská oblasť"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovská oblasť"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolenská oblasť"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambovská oblasť"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tverská oblasť"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomská oblasť"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tulská oblasť"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Ťumenská oblasť"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ulianovská oblasť"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Čeľabinská oblasť"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Jaroslavlianska oblasť"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Židovská autonómna oblasť"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Nenecký autonómny okruh"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Chantyjsko-mansijský autonómny okruh "
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Čukotský autonómny okruh"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Jamalskonenecký autonómny okruh"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Zadajte platné švédske číslo organizácie."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Zadajte platné švédske osobné identifikačné číslo."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinačné čísla nie sú povolené."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Zadajte švédske poštové smerovacie číslo v tvare XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "Prvých 7 číslic EMSO musí predstavovať platný dátum minulosti."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO nie je platný."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Zadajte platné daňové identifikačné číslo v tvare SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Zadajte telefónne číslo v tvare +386XXXXXXXX alebo 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banská Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banská Štiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Bánovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytča"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Čadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolný Kubín"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajská Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenné"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kežmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komárno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Košice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Košice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Košice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Košice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Košice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucké Nové Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoča"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovský Mikuláš"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lučenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Námestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nové Mesto nad Váhom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nové Zámky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizánske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piešťany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltár"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Považská Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Prešov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Púchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revúca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavská Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Rožňava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ružomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spišská Nová Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stará Ľubovňa"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidník"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Šaľa"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topoľčany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebišov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trenčín"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turčianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdošín"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Veľký Krtíš"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Topľou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlaté Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Žarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Žiar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Žilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banskobystrický kraj"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislavský kraj"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Košický kraj"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitriansky kraj"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Prešovský kraj"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trančiansky kraj"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnavský kraj"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Žilinský kraj"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Zadajte poštové smerovacie číslo v tvare XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefónne čísla musia mať tvar 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Zadajte platné turecké identifikačné číslo."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turecké identifikačné číslo musí mať 11 číslic."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Zadajte poštové smerovacie číslo vo formáte XXXXX alebo XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefónne čísla musia byť vo formáte XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Vložte platné číslo U.S. sociálneho poistenia vo formáte XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Zadajte štát USA alebo teritórium."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Štát USA (dve veľké písmená)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "Poštový kód (dve veľké písmená)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefónne číslo"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "Vložte platné CI vo formáte X.XXX.XXX-X,XXXXXXX-X alebo XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Zadajte platné IC číslo."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Zadajte platné juhoafrické ID číslo."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Zadajte platné juhoafrické poštové smerovacie číslo"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/sl/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/sl/LC_MESSAGES/django.mo
deleted file mode 100644
index 10d789ed8f..0000000000
Binary files a/django/contrib/localflavor/locale/sl/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/sl/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/sl/LC_MESSAGES/django.po
deleted file mode 100644
index 33981bfd9b..0000000000
--- a/django/contrib/localflavor/locale/sl/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3559 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# iElectric <domen@dev.si>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Jure Cuhalev <gandalf@owca.info>, 2011.
-#   <zejn@kiberpipa.org>, 2011, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
-"language/sl/)\n"
-"Language: sl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Vpišite poštno številko v zapisu NNNN ali ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "To polje lahko vsebuje samo številke."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "To polje mora vsebovati 7 ali 8 števk."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Vpišite veljavno CUIT v zapisu XX-XXXXXXXX-X or XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Neveljaven CUIT vnos."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Gradiščansko"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Koroška"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Spodnja Avstrija"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Zgornja Avstrija"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Avstrijska Štajerska"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirolska"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Dunaj"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Vnesite veljavno poštno številko v obliki XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Vpišite veljavno številko avstrijskega socialnega zavarovanja v zapisu XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Vnesite 4-mestno poštno številko."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Avstralska zvezna država"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Avstralska poštna številka"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Avstralska telefonska številka"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bruselj"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "vzhodna Flanska"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flemish Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hengavsko"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liège"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luksemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "zahodna Flamska"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Bruseljska regija"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flemska regija"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Valonija"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Vnesi veljavno poštno številko v obliki 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Vnesite veljavno telefonsko številko v eni od naslednjih oblik: 0x xxx xx "
-"xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, "
-"0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx ali 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Vnesite poštno številko v zapisu XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonska številka mora biti v zapisu XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Izberite veljavno brazilsko državo. Ta država ni med ponujenimi izbirami."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Nepravilna CPF številka."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "To polje zahteva največ 11 števk ali 14 znakov."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Nepravilna CNPJ številka."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "To polje mora vsebovati vsaj 14 števk."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Vnesite veljavno poštno številko v obliki XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Vpišite veljavno številko kanadskega socialnega zavarovanja v zapisu XXX-XXX-"
-"XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel (mesto)"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel (dežela)"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Ženeva"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Vpišite veljavno številko švicarske osebne izkaznice ali potnega lista v "
-"zapisu X1234567<0 ali 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Vnesite veljaven čilski RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Vpišite veljaven čilenski RUT v zapisu XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Ta čilenski RUT ni veljaven."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Vnesite poštno številko v obliki XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "Številka ID kartice je sestavljena iz 15 ali 18 števk."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Neveljavna številka ID kartice: napačna preverjevalna števka."
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Neveljavna številka ID kartice: neveljaven datum rojstva."
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Neveljavna številka ID kartice: neveljavna lokacijska koda."
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Vnesite veljavno telefonsko številko."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Vnesite veljavno mobilno številko."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Praga"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Central Bohemian Region"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "South Bohemian Region"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen Region"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad Region"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti Region"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec Region"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Region"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice Region"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina Region"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "South Moravian Region"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc Region"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin Region"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravian-Silesian Region"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Vpišite poštno številko v zapisu XXXXX ali XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Vnesite rojstno številko v obliki XXXXXX/XXXX ali XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Neveljaven neobvezni vnos Spol, veljavne vrednosti sta 'f' in 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Vnesite veljavno rojstno številko."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Vnesite veljavno IC številko."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavarska"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Lower Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Severno porenje - Westfalija"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Posarje"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saška-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Vnesite veljavno poštno številko v obliki XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Vpišite veljavno številko nemške osebne izkaznice v zapisu XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Balearski otoki"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearski otoki"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskovska pokrajina"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanarski otoki"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile and Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Region of Murcia"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Vpišite veljavno poštno številko v obsegu in zapisu od 01XXX do 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Vpišite veljavno telefonsko številko v zapisu 6XXXXXXXX, 8XXXXXXXX ali "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Prosimo, vnesite veljavni NIF, NIE, ali CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Prosimo, vnesite veljaven NIF ali NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Neveljavna preverjevalna vsota za NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Neveljavna preverjevalna vsota za NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Neveljavna preverjevalna vsota za CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Vpišite veljavno številko bančnega računa v zapisu XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Neveljavna preverjevalna vsota za številko bančnega računa."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Vnesite veljavno številko finskega socialnega zavarovanja."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonska številka mora biti v zapisu 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Vnesite veljavno poštno številko."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Northern Ireland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Vnesite veljavno 13-mestno številko JMBG."
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Napaka v datumskem delu."
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Vnesite veljavno 11-mestno OIB številko."
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Vnesite veljavno avtomobilsko registrsko številko"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Vnesite veljavno lokacijsko kodo."
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Številski del ne more biti nič"
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Vnesite veljavno 5-mestno poštno številko"
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Vnesite veljavno telefonsko številko"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Vnesite veljavno področno ali omrežno številko"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefonska številka je predolga"
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Vnesite veljavno 19-mestno JMBAG številko, ki se začne z 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Potrdilna številka kartice ne more biti nič"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Mesto Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-belogorska pokrajina"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska pokrajina"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovniško-neretvanska pokrajina"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istrska pokrajina"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovška pokrajina"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivniško-križevačka pokrajina"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska pokrajina"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska pokrajina"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska pokrajina"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osješko-baranjska pokrajina"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska pokrajina"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-gorska pokrajina"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Siško-moslavška pokrajina"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska pokrajina"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibeniško-kninska pokrajina"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska pokrajina"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitško-podravska pokrajina"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-sremska pokrajina"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadrska pokrajina"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebška pokrajina"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Vnesite veljavno poštno številko"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Vnesite veljavno NIK/KTP številko."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Zvezna vlada"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Vnesi poštno številko v obliki XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Vnesi veljavno ID številko."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Vnesite poštno številko v zapisu XXXXXX ali XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Vnesite indijsko državo ali teritorij."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Telefonske številke morajo biti v zapisu 02X-8X ali 03X-7X ali 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Vpišite pravilno islandsko identifikacijsko številko v zapisu XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Islandska identifikacijska številka ni pravilna."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Vnesite veljavno poštno številko."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Vnesite veljavno številko socialnega zavarovanja."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Vnesite veljavno davčno (DDV) številko."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Vpišite poštno številko v zapisu XXXXXXX or XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Jamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Točigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Čiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokio"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Jamanaši"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Išikava"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Šizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Šiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kjoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hjogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Vakajama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Šimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okajama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hirošima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Jamaguči"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokušima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Koči"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagošima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinava"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Vnesite veljavno Kuvajtsko osebno ID številko"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Številka osebne izkaznice mora vsebovati ali od 4 do 7 števk ali veliko črko "
-"in 7 števk."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "To polje mora vsebovati natanko 13 števil."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "Prvih 7 števil UMCN mora predstavljati veljaven datum v preteklosti."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "Število UMCN ni veljavno."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studenčani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizani"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Številka makedonske osebne izkaznice"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Šifra makedonskega mesta (2 črkovna koda)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Enotna matična številka občana (13 števk)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Vnesite veljavno poštno številko v zapisu XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Vnesite veljaven RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Neveljavna preverjevalna števka za RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Vnesite veljavno CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Neveljavna preverjevalna števka za CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mehiška država (tri velike črke)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mehiška poštna številka"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mehiški RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mehiški CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Vnesite veljavno poštno številko"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Vnesite veljavno nizozemsko davčno številko"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Vnesite veljavno številko norveškega socialnega zavarovanja."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "To polje mora vsebovati 8 števk."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "To polje mora vsebovati 11 števk."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Nacionalna identifikacijska številka je sestavljena iz 11 števk."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-"Preverjevalna vsota za nacionalno identifikacijsko številko ne ustreza."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Številka osebne izkaznice je sestavljena iz treh črk in šestih števk."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Napačna preverjevalna števka za številko osebne izkaznice."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Vnesite veljavno davčno številko (NIP) v zapisu XXX-XXX-XX-XX, XXX-XX-XX-XXX "
-"ali XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Napačna preverjevalna vsota za davčno številko (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"Nacionalna poslovna registracijska številka (REGON) je sestavljena iz 9 ali "
-"14 števk."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Napačna preverjevalna vsota za nacionalno poslovno registracijsko številko "
-"(REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Vnesite veljavno poštno številko v obliki XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Spodna Šlezija"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Šlezija"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Vnesite poštno številko v zapisu XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefonske številke morajo imeti 9 števk ali pa se začeti z + ali 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Vnesite veljaven CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Vnesite veljaven CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Vpišite veljaen IBAN v obliki ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonska številka mora biti v zapisu XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Vnesite veljavno poštno številko v obliki XXXXXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Vnesite poštno številko v zapisu XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Vnesite številko potnega lista v zapisu XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Vnesite številko potnega lista v zapisu XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Osrednja zvezna pokrajina"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Južna zvezna pokrajina"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Severozahodna zvezna pokrajina"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Zvezna pokrajina daljnega vzhoda"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Sibirska zvezna pokrajina"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Uralska zvezna pokrajina"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Zvezna pokrajina Privolzhsky"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Servernokavkaška zvezna pokrajina"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Sankt Petersburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Vnesite veljavno švedsko številko organizacije."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Vnesite veljavno švedsko osebno identifikacijsko številko."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinacijske številke niso dovoljene."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Vnesite veljavno švedsko poštno številko v obliki XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "Prvih 7 števk EMŠO števila mora biti veljaven pretekli datum."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMŠO ni veljaven."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Vnesite veljavno davčno številko v zapisu SIXXXXXXXX"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "Vnesite telefonsko številko v zapisu +386XXXXXXXX ali 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Regija Banska Bystrica"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislavska regija"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Regija Kosice"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Regija Nitra"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Regija Presov"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Regija Trencin"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Regija Trnava"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Regija Zilina"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Vnesi poštno številko v formatu XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefonske številke morajo biti v obliki 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Vnesi veljavno turško identifikacijsko številko."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turška identifikacijska številka mora biti dolga 11 znakov."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Vnesite poštno številko v zapisu XXXXX ali XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonska številka mora biti zapisana v formatu XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Vpišite veljavno številko ameriškega socialnega zavarovanja v zapisu XXX-XX-"
-"XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Vpiši zvezno državno ZDA ali ozemlje ZDA."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Koda ameriške zvezne države (dve veliki črki)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "ZDA poštna številka (dve veliki črki)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonska številka"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Vpišite veljavno CI številko v formatu X.XXX.XXX-X,XXXXXXX-X ali XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Vnesite veljavno CI številko."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Vnesite veljavno južnoafriško ID številko"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Vnesite veljavno južnoafriško poštno številko."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/sq/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/sq/LC_MESSAGES/django.mo
deleted file mode 100644
index a871e9b76f..0000000000
Binary files a/django/contrib/localflavor/locale/sq/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/sq/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/sq/LC_MESSAGES/django.po
deleted file mode 100644
index 9194549152..0000000000
--- a/django/contrib/localflavor/locale/sq/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3526 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
-"sq/)\n"
-"Language: sq\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/sr/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/sr/LC_MESSAGES/django.mo
deleted file mode 100644
index 33ed1672b0..0000000000
Binary files a/django/contrib/localflavor/locale/sr/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/sr/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/sr/LC_MESSAGES/django.po
deleted file mode 100644
index 15d9b8bdc6..0000000000
--- a/django/contrib/localflavor/locale/sr/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3529 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
-"sr/)\n"
-"Language: sr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Унесите поштански број у формату НННН или АННННААА."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Ово поље мора да садржи само бројке."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Ово поље мора да садржи 7 или 8 цифара"
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Унестие важећи CUIT у формату XX-XXXXXXXX-X or XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Неважећи CUIT"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Бургенланд"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Каринтија"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Доња Аустрија"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Горња Аустрија"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Салцбург"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Стирија"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Тирол"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Воралбер"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Беч"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Унесите поштански број у формату XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Унесите важећи аустријски број социјалног осигурања у формату XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Унесите поштански број у формату XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Број телефона мора бити у формату XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Одаберите постојећу бразилску државу. Та држава није међу понуђенима."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Неважећи CPF број"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Држава у САД (два велика слова)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Број телефона"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/sr_Latn/LC_MESSAGES/django.mo
deleted file mode 100644
index f5c12d3e24..0000000000
Binary files a/django/contrib/localflavor/locale/sr_Latn/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/sr_Latn/LC_MESSAGES/django.po
deleted file mode 100644
index 3b856aecad..0000000000
--- a/django/contrib/localflavor/locale/sr_Latn/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3529 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
-"language/sr@latin/)\n"
-"Language: sr@latin\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Unesite poštanski broj u formatu NNNN ili ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Ovo polje mora da sadrži samo brojke."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Ovo polje mora da sadrži 7 ili 8 cifara"
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Unestie važeći CUIT u formatu XX-XXXXXXXX-X or XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Nevažeći CUIT"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Karintija"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Donja Austrija"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Gornja Austrija"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salcburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Stirija"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tirol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Voralber"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Beč"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Unesite poštanski broj u formatu XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Unesite važeći austrijski broj socijalnog osiguranja u formatu XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Unesite poštanski broj u formatu XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Broj telefona mora biti u formatu XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "Odaberite postojeću brazilsku državu. Ta država nije među ponuđenima."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Nevažeći CPF broj"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Država u SAD (dva velika slova)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Broj telefona"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/sv/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/sv/LC_MESSAGES/django.mo
deleted file mode 100644
index d9f679f8a8..0000000000
Binary files a/django/contrib/localflavor/locale/sv/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/sv/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/sv/LC_MESSAGES/django.po
deleted file mode 100644
index 9228b51c91..0000000000
--- a/django/contrib/localflavor/locale/sv/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3553 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Andreas Pelme <andreas@pelme.se>, 2011, 2012.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
-"sv/)\n"
-"Language: sv\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Fyll i ett postnummer med formatet NNNN eller ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Detta fält kräver enbart siffror."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Detta fält kräver 7 eller 8 sifrror."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Fyll i ett giltigt CUIT med formatet XX-XXXXXXXX-X eller XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Felaktigt CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Kärnten"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Niederösterreich"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Oberösterreich"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Steiermark"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrolen"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Wien"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Fyll i postnummer med formatet XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Fyll i ett giltigt Österrikiskt personnummer i formatet XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "Ange ett fyrsiffrigt postnummer."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Australiensisk stat"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Australiensiskt postnummer"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Australiensiskt telefonnummer"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerpen"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Bryssel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Östra Flandern"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flamländska Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Vallonska Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Västflandern"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Huvudstadsregionen Bryssel"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flandern"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallonien"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "Ange ett giltig postnummer i området och formatet 1XXX-9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Ange ett giltigt telefonnummer i något av formaten 0x xxx xx xx, 0xx xx xx "
-"xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, "
-"0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Fyll i ett postnummer med formatet XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefonnummer måste vara i formatet XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Välj ett giltigt alternativ. Det valet finns inte bland tillgängliga "
-"alternativ."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Ogiltigt CPF-nummer."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Detta fält kräver högst 11 siffror eller 14 bokstäver."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Ogiltigt CNPJ-nummer."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Detta fält kräver minst 14 sifrror"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Fyll i ett postnummer med formatet XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Fyll i ett giltigt Kanadensiskt \"social insurance number\" med formatet XXX-"
-"XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Landschaft"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Bern"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Genève"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubünden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Luzern"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchâtel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Sankt Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zürich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Fyll i ett giltigt Schweiziskt ID- eller passkortnummer med formatet "
-"X1234567<0 eller 1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Fyll i ett giltigt chilenskt RUT"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Fyll i ett giltigt chilenskt RUT. Formatet är XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Det chilenska RUT:et var inte giltigt."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "Ange ett postnummer i formatet XXXXXX."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "ID-kortnummer består av 15 eller 18 siffror."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Ogiltigt ID-kortnummer: Felaktig kontrollsumma"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Ogiltigt ID-kortnummer: Felaktig födelsedag"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Ogiltigt ID-kortnummer: Felaktig platskod"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Ange ett giltigt telefonnummer."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Ange ett giltigt mobiltelefonnummer."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prag"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Centralböhmen"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Sydböhmen"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "Sydmähren"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Mähren-Schlesien"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Fyll i ett postnummer med formatet XXXXX eller XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "Ange ett födelsenummer i formatet XXXXXX/XXXX or XXXXXXXXXX."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Ogiltigt val av kön, giltiga värden är 'f' och 'm'."
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Fyll i ett giltigt födelsenummer."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Ange ett giltigt IC-nummer."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Württemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bayern"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Vorpommern"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Nedre Sachsen"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Nordrhein-Westfalen"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhenlandet"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Sachsen"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Sachsen-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thüringen"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Fyll i ett postnummer med formatet XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Fyll i ett giltigt tyskt ID-kortnummer med formatet XXXXXXXXXXX-XXXXXXX-"
-"XXXXXXX-X."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "AlmeriaAlmería"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Ávila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barcelona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Cáceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cádiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castellón"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruña"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaén"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "León"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Málaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarra"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturien"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Kantabrien"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Sevilla"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Biscaya"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusien"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragonien"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Asturien"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearerna"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Baskien"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Kanarieöarna"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Kastilien-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Kastilien och Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Katalonien"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicien"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murciaregionen"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Navarra"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valenciaregionen"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Fyll i ett giltigt postnummer i serien och med formatet 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Fyll i ett giltigt telefonnummer med ett av formaten: 6XXXXXXXX, 8XXXXXXXX "
-"eller 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Var god fyll i en giltig NIF, NIE, eller CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Var god fyll i giltigt NIF eller NIE."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Ogiltig kontrollsumma för NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Ogiltig kontrollsumma för NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Ogiltig kontrollsumma för CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Var god fyll i ett giltigt bankkontonummer i XXXX-XXXX-XX-XXXXXXXXXX-format."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Ogiltig kontrollsumma för bankkontonummer."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Fyll i ett giltigt finskt personnummer."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefonnummer måste vara i formatet 0X XX XX XX XX."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Fyll i ett giltigt postnummer."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "East Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Essex"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Gloucestershire"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Mid Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "South Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "West Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Central Scotland"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries and Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Islands"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Islands"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Western Isles"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Nordirland"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Scotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Ange en giltig 13-siffrig JMBG."
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Fel i datumdelen."
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Ange en giltig 11-siffrig OIB."
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Ange ett giltigt bilnummer"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Ange en giltig platskod."
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Nummerdelen får inte vara noll."
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Ange ett giltigt femsiffrigt postnummer."
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Fyll i ett giltigt telefonnummer."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Ange en giltigt riktnummer eller mobiltelefonnummer."
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefonnumret är för långt."
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "Ange ett giltigt 19-siffrigt JMBAG som börjar med 601983"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Kortutfärdarnumret får inte vara noll"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovar-Bilogoras län"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brod-Posavinas län"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovnik-Neretvas län"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istriens län"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovacs län"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivnica-Križevcis län"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapina-Zagorjes län"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Lika-Senjs län"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurjes län"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osijek-Baranjas län"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požega-Slavoniens län"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorje-Gorski kotars län"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisak-Moslavinas län"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Split-Dalmatiens län"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibenik-Knins län"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždins län"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitica-Podravinas län"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadars län"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebs län"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Ange ett giltigt postnummer"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Ange ett giltigt NIK/KTP-nummer."
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federala regeringen"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "Ange ett postnummer i formatet XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Ange ett giltigt ID-nummer."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "Ange ett postnummer i formatet XXXXXX eller XXX XXX."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Ange en indisk stat eller territorium."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr "Telefonnummer måste vara i formatet 02X-8X, 03X-7X eller 04X-6X."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Fyll i ett giltigt isländskt personnummer. Formatet är XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Det isländska personnumret är inte giltigt."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Fyll i ett giltigt postnummer."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Fyll i ett giltigt personnummer."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Fyll i ett giltigt VAT-nummer."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Fyll i ett postnummer med formatet XXXXXXX eller XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ischikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kuamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Ange ett giltigt kuwaitiskt personnummer."
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"ID-kortnummer måste innehålla antingen fyra till sju siffror eller en versal "
-"och sju siffror."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Fältet ska innehålla exakt 13 siffror."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-"De första sju siffrorna av UMCN-numret måste representera ett giltigt, "
-"passerat datum."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN-numret är inte giltigt."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Makedonskt ID-kortsnummer."
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "En makedonsk kommun (tvåsiffrig kod)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Unikt medborgarnummer (UMCN) (13 siffror)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "Ange ett giltigt postnummer i formatet XXXXX."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Ange en giltig RFC."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "Ogiltig kontrollsumma för RFC."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Enge en giltig CURP."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "Ogiltig kontrollsumma för CURP."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Mexikansk stat (tre versaler)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Mexikanskt postnummer"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Mexikanst RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Mexikanst CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Mexikanska staten"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Fyll i ett giltigt postnummer."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Fyll i ett giltigt SoFi-nummer."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Fyll i ett giltigt norskt personnummer."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Detta fält kräver 8 sifrror."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Detta fält kräver 11 sifrror."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "\"National Identification Number\" består av 11 siffror."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Fel kontrollsumma för \"National Identification Number\""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Nationellt ID-kortnummer består av tre bokstäver och sex siffror."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Felaktig kontrollsumma för nationellt ID-kortnummer."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"Ange ett giltigt skattenummer (NIP) på formatet XXX-XXX-XX-XX, XXX-XX-XX-XXX "
-"eller XXXXXXXXXX."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Fel kontrollsumma för skattenumret (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-"National Business Register Number (REGON) består av 9 eller 14 siffror."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Fel kontrollsumma för \"National Business Register Number\" (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Fyll i ett postnummer med formatet XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Lower Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "West Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "Ange ett postnummer i formatet XXXX-XXX."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "Telefonnummer måste innehålla 9 siffror eller börja på + eller 00."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Fyll i ett giltigt CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Fyll i ett giltigt CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Fyll i ett giltigt IBAN med formatet ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefonnummer måste vara i formatet XXXX-XXXXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Fyll i ett postnummer med formatet XXX XXX."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "Ange ett postnummer på formatet XXXXXX."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "Ange ett passnummer på formatet XXXX XXXXXX."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "Ange ett passnummer på formatet XX XXXXXXX."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Tsentralnyj"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Juzjnyj"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Severo-Zapadnyj"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Dalnevostotjnyj"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Sibirskij"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Uralskij"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzjskij"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Severo-Kavkazskij"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskva"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Sankt Peterburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskva oblast"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adygeiska republiken"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Republiken Basjkirien"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Republiken Burjatien"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altajrepubliken"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dagestanrepubliken"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardinien-Balkarien"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmuckien"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karatjajen-Tjerkessien"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelska republiken"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mari"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordvinien"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Sacha"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Republiken Nordossetien-Alanien"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tatarstan"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tuva"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtienr"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Chakassien"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Tjetjenien"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Tjuvasjien"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altaj kraj"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabajkalskij kraj"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamtjatka kraj"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodar kraj"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnojarsk kraj"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Perm kraj"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorje kraj"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol kraj"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Chabarovsk kraj"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amur oblast"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Archangelsk oblast"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrachan oblast"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorod oblast"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Brjansk oblast"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimir oblast"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgograd oblast"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologda oblast"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezj oblast"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovo oblast"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutsk oblast"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningrad oblast"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluga oblast"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovo oblast"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirov oblast"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostroma oblast"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurgan oblast"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kursk oblast"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningrad oblast"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipetsk oblast"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadan oblast"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmansk oblast"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizjnij Novgorod oblast"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorod oblast"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirsk oblast"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omsk oblast"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburg oblast"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orjol oblast"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penza oblast"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskov oblast"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostov oblast"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazan oblast"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samara oblast"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratov oblast"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sachalin oblast"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovsk oblast"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolensk oblast"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambov oblast"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tver oblast"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomsk oblast"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tula oblast"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tiumen oblast"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Uljanovsk oblast"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Tjeljabinsk oblast"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Jaroslavl oblast"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Judiska autonoma länet"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Nentsien"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Chantien-Mansien"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Tjuktjien"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Jamalo-Nentsien"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Ange ett giltigt svenskt organisationsnummer."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Ange ett giltigt svenskt personnummer."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Koordinationsnummer är ej tillåtna."
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "Ange ett giltigt svenskt postnummer i formatet XXXXX."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-"De första sju siffrorna av EMSO måste representera ett giltigt, passerat "
-"datum."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO är inte giltig."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "Ange ett giltigt skattenummer på formatet SIXXXXXXXX."
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-"Ange ett giltigt telefonnummer på formatet +386XXXXXXXX eller 0XXXXXXXX."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica-regionen"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava-regionen"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice-regionen"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra-regionen"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov-regionen"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin-regionen"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava-regionen"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina-regionen"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "Ange ett postnummer i formatet XXXXX."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefonnummer måste anges i formatet 0XXX XXX XXXX."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Ange ett giltigt turkiskt personnummer."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "Turkiska personnummer måste vara 11 siffror."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Fyll i ett postnummer med formatet XXXXX eller XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefonnummer måste vara i formatet XXX-XXX-XXXX."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Fyll i ett giltigt amerikanskt personnummer i formatet XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "Ange en amerikansk delstat eller territorium."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Delstat i USA (två versaler)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "U.S.A. postnummer (två versaler)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-"Ange ett giltigt CI-nummer i formatet X.XXX.XXX-X,XXXXXXX-X eller XXXXXXXX."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Ange ett giltigt CI-nummer."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Fyll i ett giltigt Sydafrikanskt ID-nummer."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Fyll i ett giltigt Afrikanskt postnummer."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Eastern Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "North West"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Western Cape"
diff --git a/django/contrib/localflavor/locale/sw/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/sw/LC_MESSAGES/django.mo
deleted file mode 100644
index b23b2b79bc..0000000000
Binary files a/django/contrib/localflavor/locale/sw/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/sw/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/sw/LC_MESSAGES/django.po
deleted file mode 100644
index 273a54e289..0000000000
--- a/django/contrib/localflavor/locale/sw/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3526 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2011-01-19 16:22+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
-"sw/)\n"
-"Language: sw\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/ta/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ta/LC_MESSAGES/django.mo
deleted file mode 100644
index e7c5b9a328..0000000000
Binary files a/django/contrib/localflavor/locale/ta/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ta/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ta/LC_MESSAGES/django.po
deleted file mode 100644
index 87645234de..0000000000
--- a/django/contrib/localflavor/locale/ta/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3527 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
-"ta/)\n"
-"Language: ta\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. மாநிலம் (இரண்டு மேல் எழுத்துவகை எழுத்து"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "தொலைபேசி எண்"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/te/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/te/LC_MESSAGES/django.mo
deleted file mode 100644
index 3c59a75a1b..0000000000
Binary files a/django/contrib/localflavor/locale/te/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/te/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/te/LC_MESSAGES/django.po
deleted file mode 100644
index 61d5a330a2..0000000000
--- a/django/contrib/localflavor/locale/te/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3533 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# bhaskar teja yerneni <prudhviy@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
-"te/)\n"
-"Language: te\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "దయచెసి తపాలు సంహిత  NNNN లెక ANNNNAAA రూపలవన్యములొ ఇవ్వండి"
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "ఈ క్షేత్రములో కేవలము అంకెలు మాత్రమే సమర్పించగలరు "
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "ఈ క్షేత్రములో కేవలము 7 లేక 8 అంకములు మాత్రమే సమర్పించగలరు."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "దయచేసి సరైన CUIT(XX-XXXXXXXX-X లెక XXXXXXXXXXXX రూపలవన్యం) ఇవ్వండి."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "సరికాని  CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "బుర్గెన్లాండ్"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "కారింథియా"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "లొవర్ ఆస్ట్రియ"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "అప్పర్ ఆస్ట్రియ"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "సాల్సబర్గ్"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "స్టైరియా"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "టైరొల్"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "వొరార్లబెర్గ్"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "వియెన్నా"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "దయచేసి తపాలు సంహిత XXXX రూపలవన్యములొ ఇవ్వండి."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "దయచేసి సరైన ఆస్ట్రేలియన్ సొషల్ సెక్యురిటి (XXXX XXXXXX రూపలవన్యము) సంఖ్య ఇవ్వండి."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "అంత్వేర్ప్ "
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "బ్రుస్సేల్స్ "
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "తూర్పు ఫ్లన్దేర్స్ "
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "ఫ్లెమిష్  బ్రబంట్"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "హైనుట్ "
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "లిఎగే "
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "లింబర్గ్"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "నాముర్"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "వాల్లూన్  బ్రబంట్ "
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "పశ్చిమ ఫ్లన్దేర్స్ "
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "బ్రుస్సేల్స్ రాజధాని ప్రదేశము "
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "ఫ్లెమిష్  ప్రదేశము"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "వాల్లోనియా "
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "దయచేసి తపాలు సంహిత XXXXX-XXX రూపలవన్యములొ ఇవ్వండి."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "దూరవాణి సంఖ్య XX-XXXX-XXXX రూపలావన్యములొ ఉండాలి."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "సరైన బ్రజిలియన్ రజ్యము ఏర్పర్చండి. ఈ రజ్యం లభ్యమైన రజ్యాలొ లెదు."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "చెల్లని CPF సంఖ్య"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "చెల్లని CNPJ సంఖ్య"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "దయచేసి తపాలు సంహిత XXX XXX రూపలవన్యములొ ఇవ్వండి."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "దయచేసి సరైన కనెడియన్ సొషల్ ఇన్షురన్స్ (XXX-XXX-XXX రూపలవన్యము) సంఖ్య ఇవ్వండి."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "ఆర్గౌ"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "ఆప్పెంజెల్ ఈన్నెర్హొడెన్"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "ఆప్పెంజెల్ ఆఉస్సెర్హొడెన్"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "బసెల్-స్టద్ట్"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "బసెల్-లాండ్"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "బర్న్"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "ఫ్రిబౌర్గ్"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "జెనీవా"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "గ్లారస్"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "గ్రౌబెండెన్"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "జుర"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "లుకర్న్"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "న్యుకటెల్"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "నిడ్వాల్డెన్"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "ఒబ్వాల్డెన్"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "షఫౌసెన్"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "ష్విజ్"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "సొలొథర్న్"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "స్త్.గాలెన్"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "తర్గౌ"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "తికినొ"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "ఉరి"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "వలె"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "వౌడ్"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "జుగ్గ"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "జురిక్"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"దయచేసి సరైన స్విస్సు గుర్తు లెక పాస్పొర్టు సంఖ్య ఇవ్వండి (X1234567<0 లెక 1234567890 "
-"రూపలావన్యము)"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "దయచేసి సరైన  చిలి RUT ఇవ్వండి."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "సరైన చిలి RUT (XX.XXX.XXX-X రూపలవన్యము) సంఖ్య ఇవ్వండి."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "మీరు ఇచ్చిన చిలి RUT చెల్లదు."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "ప్రెగ్"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "మధ్య బోహేమియన్ ప్రదేశము "
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "దక్షిణ బోహేమియన్ ప్రదేశము "
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "పిల్సేన్ ప్రదేశము"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "కార్ల్సబాద్ "
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "దయచేసి తపాలు సంహిత  (XXXXX లెక XXX XX రూపలవన్యములొ )ఇవ్వండి."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "దయచేసి సరియిన పుట్టిన తేదిను ఇవ్వండి "
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "భాడెన్-వెర్తెంబెర్గ్"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "బవారియా"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "బెర్లిన్"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "బ్రాండెంబర్గ్"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "బ్రెమెన్"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "హంబర్గ్"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "హెస్సెన్"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "మెక్లెంబర్గ్-పశ్చిమ ఫొమెరనియా"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "లౌఎర్ సాక్సొని"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "ఉత్తర రైన్-వెస్టఫలియా"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "రైనెలాండ్-ఫలాటినట్"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "సార్లాండ్"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "సాక్సొని"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "సాక్సొని-అనాట్"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "శ్లెజ్విగ్-హొల్సటైన్"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "థురింగియా"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "దయచేసి తపాలు సంహిత XXXXX రూపలవన్యములొ ఇవ్వండి."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"దయచేసి సరైన జర్మన్ గుర్తు చీట్లు (XXXXXXXXXXX-XXXXXXX-XXXXXXX-X రూపలవన్యము) సంఖ్య "
-"ఇవ్వండి."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "అరవ"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "అల్బాసెట్"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "అలకంట్"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "అల్మిరియా"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "అవిల"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "బడాజొజ్జ్"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "ఇల్లెస్ బలేర్స్"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "బార్సిలొనా"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "బర్గొస్"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "కసిరెస్"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "కడిజ్"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "kasTello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "సియుడాడ్ రియాల్"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "కొర్డొబా"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "ఆ కొరున్యా"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "కువెంకా"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "గిరొనా"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "గ్రనడా"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "గువడలజర"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "గువిపుజకొవ"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "హువెల్వ"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "హుఎస్కా"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "జేన్"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "లియొన్"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "లైడ"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "ల రిఒజ"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "లుగొ"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "మాడ్రిడ్"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "మలగా"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "మర్కియ"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "నవర్రె"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "ఔరెన్సె"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "అస్టురియాస్"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "పలెన్శియా"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "లా పామాస్"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "పొంటెవెడెర"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "సలమంక"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "సాంట క్రుజ్ ద టెనెరిఫె"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "కంటబ్రియా"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "సెగొవియా"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "సెవియా"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "సొరియా"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "టర్రగొన"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "టెరువెల్"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "టొలిడొ"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "వెలెన్షియా"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "వల్లడొలిడ్"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "బిజ్కైయా"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "జమొర"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "జరగొసా"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "క్యుట"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "మెలిల్ల్యా"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "అండలుసియా"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "ఎరొగొన్"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "ప్రిన్సిపాలిటి ఒఫ్ ఆస్టురియాస్"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "బలెయారిక్ ద్వీపాలు"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "బాస్క్ దెశం"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "కనరి ద్వీపాలు"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "కస్తిల్-ల మంక"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "కస్టిల్ మరియు లియొన్"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "కటలొనియా"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "ఎక్స్ట్రీమదుర"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "గలిషియా"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "మర్కియ రాజ్యము"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "ఫొరల్  కమ్యునిటి ఒఫ్ నావర్రె"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "వాలెన్షియన్ కమ్యునిటి"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"దయచేసి సరైన దూరవాణి సంఖ్య ఇవ్వండి (6XXXXXXXX, 8XXXXXXXX లెక 9XXXXXXXX రూపలావన్యము)"
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "దయచేసి సరైన NIF, NIE లెక CIF ఇవ్వండి ."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "దయచేసి సరైన NIF లెక NIEఇవ్వండి."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "చెల్లని  NIF నియంతృలెక్యం."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "చెల్లని  NIE నియంతృలెక్యం."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "చెల్లని  CIF నియంతృలెక్యం."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "దయచేసి సరైన  కొఠీ లెక్య సంఖ్య ఇవ్వండి (XXXX-XXXX-XX-XXXXXXXXXX రూపలావన్యము)"
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "చెల్లని  కొఠీ లెక్క సంఖ్య నియంతృలెక్యం."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "దయచెసి సరైన ఫిన్నిష్ సొషల్ సెక్యురిటి సంఖ్య ఇవ్వండి."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "దయచేసి సరైన తపాలు సంహిత ఇవ్వండి."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "బెడ్ఫర్డషైర్"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "బఖింఘమషైర్"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "చెషైర్"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "కార్న్వాల్ మరియు సిసిల్లీ ద్వీపాలు"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "కంబ్రియా"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "డెర్బీషైర్"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "డెవొన్"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "డొర్సెట్"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "డుర్హం"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "తూర్పు  సుస్సెక్స"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "ఎసెక్స"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "గ్లౌసెస్తెరషైర్"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "గ్రెటర్ లండన్"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "గ్రెటర్ మాంచెస్టర్"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "హాంపషైర్"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "హెర్ట్ఫొర్డషైర్"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "కెంట్"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "లెంకషైర్"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "లెసెటర్షర్"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "లింకన్షర్"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "మర్సీసైడ్"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "నార్ఫొల్క"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "ఉత్తర యొర్కషైర్"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "నార్తంప్టొనషైర్"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "నార్థంబెర్లాండ్"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "నాటింఘమషైర్"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "ఆక్ష్ఫర్డషైర్"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "ష్రొపషైర్"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "సొమర్సెట్"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "దక్షిణ యొర్కషైర్"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "స్టఫ్ఫొర్డషైర్"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "సఫ్ఫొల్క"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "సుర్రెయ్"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "టైన్ మరియు వెర్"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "వార్విక్షైర్"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "పశ్చిమ మిడ్లాండ్స"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "పశ్చిమ ససెక్స"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "పశ్చిమ యొర్కషైరె"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "విల్టషైర్"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "వొర్సెస్టషైర్"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "కౌంటీ అంట్రిం"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "కౌంటీ అర్మాఘ్"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "కౌంటీ డౌన్"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "కౌంటీ ఫెర్మనాఘ్"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "కౌంటీ లొండొండెర్రీ"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "కౌంటీ టైరొన్"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "క్ల్వైడ్"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "డైఫెద్"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "గ్వెంట్"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "గ్వైనెడ్"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "మిడ్ గ్లమార్గాను"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "పొవిస్"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "దక్షిణ గ్లమార్గాను"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "పశ్చిమ గ్లమార్గాను"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "బార్డర్స్"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "మధ్యస్థమైన  స్కాట్లాండ్"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "డుంఫ్రిఎస్ మరియు గెలొవెస్"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "ఫిఫె"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "గ్రాంపియన్"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "హైలాండ్"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "లొతియన్"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "ఓర్క్నీ ద్వీపాలు"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "షెట్లాండ్ ద్వీపాలు"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "స్త్రట్తక్లైడ్"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "టేసైడ్"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "వెస్టెర్న ద్వీపాలు"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "ఇంగ్లాండ్"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "నార్తెర్న ఐర్లాండ్"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "స్కాట్లాండ్"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "వెల్స్"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "దయచెసి సరైన దూరవాణి సంఖ్య ఇవ్వండి"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "దయచేసి సరియిన తపాలా సంక్యను ఇవ్వండి "
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "దయచేసి సరియిన NIK/KTP సంక్యను ఇవ్వండి "
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "బాలి "
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "జకార్త"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "గోరోంటలో"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "జాంబి "
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "దయచేసి సరైన ఐస్లాండిక్ గుర్తు(XXXXXX-XXXX రూపలవన్యము) సంఖ్య ఇవ్వండి."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "చెల్లని ఐస్లాండిక్ గుర్తు సంఖ్య."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "దయచేసి సరైన తపాలు సంహిత ఇవ్వండి."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "దయచేసి సరైన సొషల్ సెక్యురిటి సంఖ్య ఇవ్వండి."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "దయచేసి సరైన VAT సంఖ్య  ఇవ్వండి."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "దయచేసి తపాలు సంహిత  (XXXXX-XXX లెక XXX-XXXX రూపలవన్యము ) ఇవ్వండి."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "హొకైడొ"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "ఒమొరి"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "ఇవాటె"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "మియాగి"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "అకిట"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "యమగాట"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "ఫుకుషిమ"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "ఇబరాకి"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "టొచిగి"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "గున్మ"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "సైతమా"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "చిబ"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "టొకియొ"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "కనగావా"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "యమనాషి"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "నగానొ"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "నీగాట"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "టొయామా"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "ఇషికావా"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "ఫుకుయి"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "గిఫు"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "షిజుఒక"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "ఐచి"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "మి"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "షిగ"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "క్యొటొ"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "ఒసాకా"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "హ్యొగొ"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "నారా"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "వకయామా"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "టొట్టొరి"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "షిమానె"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "ఒకయామా"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "హిరొషిమా"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "యామాగుచ్చి"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "టొకుషిమా"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "కగావా"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "ఎహిమె"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "కొచి"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "ఫుకొకు"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "సగా"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "నాగాసాకి"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "కుమమొటొ"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "ఒయిటొ"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "మియజాకి"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "కాగొషిమా"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "ఒకినావా"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "అగూస్కలియెంటెస్"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "బాహా కాలిఫొర్నియ"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "బాహా కాలిఫొర్నియ సుర్"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "కంపెచె"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "చిహువహువ"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "చియపస్"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "కోహుయిల"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "కొలిమ"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "డిస్ట్రిటొ ఫెడ్రల్"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "డురంగొ"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "గువెర్రెరొ"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "గువనజువటొ"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "హిడల్గొ"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "జలిస్కొ"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "ఏస్తడొ డ మెక్సికొ"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "మికోకన్"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "మొరెలొస్"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "నయరిట్"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "నుఎవొ లియొన్"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "ఓక్సక"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "పువెబ్ల"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "కువెరెటరొ"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "క్వింటన రూ"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "సినలో"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "సన్ లువిస్ పొటొసి"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "సొనొర"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "టబస్కొ"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "టమౌలిపాస్"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "లక్స్కాలా"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "వెరక్రుజ్"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "యుకటన్"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "జకటెకాస్"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "దయచేసి సరైన  తపాలు సంహిత ఇవ్వండి"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "దయచేసి సరైన SoFi సంఖ్య  ఇవ్వండి."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "డ్రెంత్"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "ఫ్లెవొలాండ్"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "ఫ్రియెస్లాండ్"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "జెల్దెర్లాండ్"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "గ్రొనింజెన్"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "నొర్డ్-బ్రబంట్"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "నొర్డ్-హలాండ్"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "ఒవెరిస్సెల్"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "యూట్రెక్"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "జీలాండ్"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "జుఇడ్-హాలాండ్"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "దయచెసి సరైన నార్వెజియన్ సొషల్ సెక్యురిటి సంఖ్య ఇవ్వండి."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "చెల్లని రష్ట్ర గుర్తు సంఖ్య నియంతృలెక్యము"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "చెల్లని పన్ను సంఖ్య (ణీఫ్)నియంతృలెక్యము"
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "చెల్లని రష్ట్ర వ్వవహార లెక్క పట్టి సంఖ్య నియంతృలెక్యము (REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "దయచేసి తపాలు సంహిత  XX-XXX రూపలవన్యములొ ఇవ్వండి."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "లౌఎర్ సిలెసియ"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "కుయవియ-పొమెరానియ"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "లబ్లిన్"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "లుబుస్"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "లొడ్జ్"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "లెస్సెర్ పొలాండ్"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "మసొవియ"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "ఒపొల్"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "సుబ్కర్పతియ"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "పొడ్లసి"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "పొమెరానియా"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "సిలెసియా"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "స్విటొక్ర్జిస్కియె"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "వర్మియ-మాసురియా"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "గ్రేటెర్ పొలాండ్"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "పశ్చిమ పొమెరనియా"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "దయచేసి సరైన CIF ఇవ్వండి."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "దయచేసి సరైన CNP ఇవ్వండి."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "దయచేసి సరైన IBAN (ROXX-XXXX-XXXX-XXXX-XXXX రూపలవన్యము) ఇవ్వండి."
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "దూరవాణి సంఖ్య XXXX-XXXXXX రూపలవన్యములొ ఇవ్వాలి."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "దయచేసి సరైన తపాలు సంహిత  XXXXXX రూపలవన్యములొ ఇవ్వండి."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "బన్స్క బైస్ట్రిక"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "బన్స్క స్టీవ్నిక"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "భర్డెజొవ్"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "బనొవ్స నడ్ బెబ్రవౌ"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "బ్రెజ్నొ"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "బ్రాటిస్లావా I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "బ్రాటిస్లావా II "
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "బ్రాటిస్లావా III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "బ్రాటిస్లావా IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "బ్రాటిస్లావా V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "బిట్స"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "కడ్క"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "దెట్వ"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "డొల్ని కుబిన్"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "డునజస్క స్ట్రెడ"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "గలంటా"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "గెల్నికా"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "లొహొవెక్"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "హుమీనె"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "ఇలావ"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "కెజ్మరొక్"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "కొమార్నొ"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "కొసైస్ I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "కొసైస్ II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "కొసైస్ III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "కొసైస్ IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "కొసైస్ - ఒకొలి"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "క్రుపిన"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "kysuke nove mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "లెవిస్"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "లెవొక"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "లిప్టొవ్స్కి మికులాస్"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "లుసెనెక్"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "మలకీ"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "మార్టిన్"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "మెద్జిలబొర్స్"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "మిషాలొవ్సె"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "మైజావా"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "నేంస్తొవొ"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "నిట్రా"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "నొవె మెస్టొ నడ్ వాహొం"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "నొవె జంకి"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "పర్తిజన్స్కె"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "పెజినొక్"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "పిఎస్టాని"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "పొల్టర్"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "పొప్రడ్"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "పొవజ్స్క బ్య్స్ట్రిక"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "ప్రెసొవ్"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "ప్రిఎవిద్జ"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "పుచొవ్"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "రెవుక"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "రిమవ్స్క సొబొట"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "రొజ్నవ"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "రుజొంబెరొక్"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "సబినొవ్"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "సెనెక్"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "సెనికా"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "స్కాలికా"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "స్నిన"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "సొబ్రన్సె"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "స్పిస్స్కా నొవ వెస్"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "స్టరలుబ్నొవ"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "స్ట్రొప్కొవ్"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "స్విడ్నిక్"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "సాలా"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "టొపొల్కొని"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "ట్రెబిసొవ్"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "త్రెంకిన్"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "నావా"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "టుర్చీన్స్కె టెప్లిచె"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "దొసిన్"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "వెల్కై రిటిస్"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "వ్రనొవ్ నాడ్ టొప్లౌ"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "జ్లటె మొరావ్సె"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "జ్వొలెన్"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "జార్నొవిక"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "జీర్ నాడ్ రొనొం"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "జిలిన"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "భన్స్క భైస్త్రిక రాజ్యం"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "బ్రాటిస్లావ రాజ్యము"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "కొసైస్ రాజ్యము"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "నిట్రా రాజ్యము"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "ప్రెసావు రాజ్యము"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "ట్రెంకిన్ రాజ్యము"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "ట్ర్నావా రాజ్యము"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "జిలిన రాజ్యము"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "దయచేసి తపాలు సంహిత  (XXXXX లెక XXXXX-XXXX రూపలవన్యము) ఇవ్వండి."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "దయచేసి సరైన అమెరిక సొషల్ సెక్యురిటి (XXX-XX-XXXX రూపలవన్యము) సంఖ్య ఇవ్వండి."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "అమెరికా రాజ్యము"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "ఫోన్ నంబరు"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "దయచేసి సరైన దక్షిణ ఆఫ్రిక  ఐడ్ ఇవ్వండి."
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "దయచేసి సరైన దక్షిణ ఆఫ్రిక తపాలు సాంహిత ఇవ్వండి."
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "తూర్పు కెప్"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "ఫ్రీ స్టెట్"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "గౌటెంగ్"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "క్వజులు-నటాల్"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "లింపొపొ"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "పుమలంగ"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "naarterna kEp"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "పశ్చిమ కెప్"
diff --git a/django/contrib/localflavor/locale/th/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/th/LC_MESSAGES/django.mo
deleted file mode 100644
index 1392a95d9d..0000000000
Binary files a/django/contrib/localflavor/locale/th/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/th/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/th/LC_MESSAGES/django.po
deleted file mode 100644
index b7848b702b..0000000000
--- a/django/contrib/localflavor/locale/th/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3533 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Suteepat Damrongyingsupab <monkeycrew_topza@hotmail.com>, 2012.
-# Vichai Vongvorakul <vongvichai@gmail.com>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-12 06:54+0000\n"
-"Last-Translator: Suteepat Damrongyingsupab <monkeycrew_topza@hotmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
-"th/)\n"
-"Language: th\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "กรุณาใส่รหัสไปรษณีย์ ในรูปแบบของ NNNN หรือ ANNNNAAA  "
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "ฟิลด์นี้ต้องการเฉพาะตัวเลขเท่านั้น"
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "ฟิลด์นี้ต้องการตัวเลขจำนวน 7 หรือ 8 หลัก"
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "ใส่ CUIT ในรูปของ XX-XXXXXXXX-X หรือ XXXXXXXXXXXX"
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT ไม่สมบูรณ์"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "เบอร์เกินแลนด์"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "คารินเธีย"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "ออสเตรียใต้"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "ออสเตรียเหนือ"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "แซลซ์เบิร์ก"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "สไตเรีย"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "ไทรอล"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "โวราร์ลเบิร์ก"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "เวียนนา"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปแบบของ XXXX"
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "ใส่หมายเลขประกันสังคมออสเตรีย ในรูปแบบ XXXX XXXXXX "
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "ใส่หมายเลขรหัสไปรษณีย์ 4 หลัก"
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "แอนต์เวิร์ป"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "กรุงบรัสเซลส์"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "ฟลานเดอร์ตะวันออก"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "ฟลามส์บราบานต์"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "แอโน"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "ไลกี"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "ลิมเบอร์ก"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "ลักเซมเบิร์ก"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "นามูร์"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "วัลลูนบราแบนต์"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "ฟลานเดอร์ตะวันตก"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "เขตเมืองหลวงบรัสเซลส์"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "เขตฟลามส์"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "เขตวัลลูน"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "โปรดใส่รหัสไปรษณีย์ที่ถูกต้องทั้งระยะช่วงและรูปแบบ 1XXX - 9XXX."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"โปรดใส่หมายเลขโทรศัพท์ในรูปแบบใดรูปแบบหนึ่ง ดังต่อไปนี้ 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปแบบ XXXXX-XXX "
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "ใส่หมายเลขโทรศัพท์ในรูปแบบ XX-XXXX-XXXX "
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "เลือกชื่อเมืองของบราซิล"
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "ตัวเลข CPF ไม่สมบูรณ์"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "ฟิลด์นี้ต้องการตัวเลขมากที่สุด 11 หรือ 14 ตัว"
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "ตัวเลข CNPJ ไม่สมบูรณ์"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "ฟิลด์นี้ต้องการตัวเลขอย่างน้อย 14 หลัก"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปแบบ XXX XXX "
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "ใส่หมายเลขของบัตรประกันสังคมแคนาดา ในรูปแบบ XXX-XXX-XXX "
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "อาร์เกา"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "แอพเพ็นเซล อินเนอร์ฮอเดน"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "แอพเพ็นเซล ออสเซอร์ฮอเดน"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "บาเซิล-ชตัดท์"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "บาเซิล-ชตัดท์"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "เบอร์เน"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "ฟรายบวก"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "เจนีวา"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "กลารัส"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "เกาบึนเดน"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "จูรา"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "ลูเซิร์น"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "นูชาเทล"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "นิดวาลเดน"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "ออบวาลเดน"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "ชัฟเฮาซัน"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "ชวิซ"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "โซโลเธิร์น"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "เซนท์ กัลเลน"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "เธอร์เกอ"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "ทีชิโน"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "ยูริ"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "วาเล"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "วอด"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "ซูก"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "ซูริค"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"ใส่หมายเลขประจำตัวประชาชนหรือหมายเลขพาสปอร์ต ในรูปแบบ X1234567<0 หรือ 1234567890"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "ใส่ RUT ของชิลีที่ถูกต้อง"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "ใส่หมายเลข RUT ของชิลีที่ถูกต้องในรูปแบบ XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "RUT ของชิลีไม่ถูกต้อง"
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "เมืองปราก"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "เขตเซ็นทรัลโบฮีเมีย"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "เขตเซาท์โบฮีเมีย"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "เขตเปิลเซน"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "เขตคาร์ลสแบด"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "เขตอูสตีนาดลาเบม"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "เขตลีเบเรซ"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "เขตฮราเดตส์กราลอเว"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "เขตปาร์ดูบีตเซ"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "เขตวีซอชีนา"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "เขตเซาท์มอเรเวีย"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "เขตออลอโมตซ์"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "เขตซลีน"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "เขตมอเรเวีย-ไซลีเชีย"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "กรุณาใส่รหัสไปรษณีย์ในรูปของ XXXXX หรือ XXX XX "
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "ใส่เลขที่เกิดในรูปแบบ XXXXXX / XXXX หรือ XXXXXXXXXX"
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "รหัสเพศไม่ถูกต้อง, ค่าที่ถูกต้องคือ 'f' และ 'm'"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "ใส่เลขที่เกิดให้ถูกต้อง"
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "ใส่หมายเลข IC ที่ถูกต้อง"
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "บาเดิน-เวือร์ทเทมแบร์ก"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "บาวาเรีย"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "เบอร์ลิน"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "บรานเดนเบิร์ก"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "เบรเมน"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "ฮัมบูร์ก"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "เฮสส์"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "เม็กเลนเบิร์กตะวันตก-โพเมราเนีย"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "แซกโซนีล่าง"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "ไรน์ เวสท์ฟาเลีย เหนือ"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "ไรน์แลนด์-พาลาทิเนต"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "ซาร์แลนด์"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "แซกโซนี"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "แซกโซนี-แอเฮาท์"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "ชเลสวิก-โฮลชไตน์"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "เธอร์ริงเกีย"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "ใส่รหัสไปรษณ๊ย์ ในรูปแบบ XXXXX"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr "ใส่หมายเลขประจำตัวประชาชนเยอรมันในรูปแบบ XXXXXXXXXXX-XXXXXXX-XXXXXXX-X"
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "อราวา"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "อัลบาเซเต"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "อลาแคนท์"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "อัลมีเรีย"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "อบียา"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "บาดาจอซ"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "หมู่เกาะแบลีแอริก"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "บาเซโลนา"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "เบอร์โกซ"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "กาเซเรส"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "คาดิซ"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "คาสเทลโล"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "ซิวดัด เรอัล"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "คอร์โดบา"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "ลา คอรุนญ่า"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "เกวงกา"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "จีโรนา"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "กรานาดา"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "กวาดาลาฮารา"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "กีปุซโกอา"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "อูเอลบา"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "อวยสกา"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "คาเอน "
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "ลีออน"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "เยย์ดา"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "ลา ริโอฮา"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "ลูโก"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "มาดริด"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "มายอกา"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "มูร์เซีย"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "นาวาร์"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "โอเรนเซ"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "อัสตูเรียส"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "ปาเลนเซีย"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "ลาส พัลมาส"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "ปอนเตเบดรา"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "ซาลามังกา"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "ซานตาครูซ ดา เตริเนเฟ"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "กันตาเบรีย"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "เซโกเบีย"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "เซบียา"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "โซเรีย"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "ตาร์ราโกนา"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "เตรวยล์"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "โตเลโด"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "บาเลนเซีย"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "บายาโดลิด"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "บิสกาเอีย"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "ซาโมรา"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "ซาราโกซา"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "เซวตา"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "เมลียา"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "อันดาลูเซีย"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "อะรากอน"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "ราชรัฐอัสตูเรียส"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "หมู่เกาะแบลีแอริก"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "แคว้นบาสค์"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "หมู่เกาะคะเนรี"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "กัสตียา-ลามันชา"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "คาสตีลและเลออน"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "คาเทโลเนีย"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "เอกเตรมาดูรา"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "กาลิเซีย"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "แคว้น มูเซียร์"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "แคว้นกฎบัตรนาวาร์ "
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "แคว้นบาเลนเซีย"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปของ 01XXX - 52XXX "
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr "ใส่เบอร์โทรศัพท์ในรูปของ 6XXXXXXXX, 8XXXXXXXX หรือ 9XXXXXXXX "
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "กรุณาใส่ NIF, NIE, หรือ CIF "
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "กรุณาใส่ NIF หรือ NIE"
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "ผลรวมตรวจสอบ สำหรับ NIF ผิดพลาด"
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "ผลรวมตรวจสอบ สำหรับ NIE ผิดพลาด"
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "ผลรวมตรวจสอบ สำหรับ CIF ผิดพลาด"
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "กรุณาใส่หมายเลขบัญชีในรูปแบบ XXXX-XXXX-XX-XXXXXXXXXX"
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "ผลรวมตรวจสอบ สำหรับบัญชีธนาคารผิดพลาด"
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "ใส่หมายเลขประกันสังคมฟินแลนด์"
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "หมายเลขโทรศัพท์จะต้องอยู่ในรูปแบบ 0x XX XX XX XX"
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "ใส่รหัสไปรษณีย์"
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "เบดฟอร์ดเชียร์"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "บัคกิ้งแฮมเชียร์"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "ชีเชียร์"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "คอนวอลล์ และไฮเซลส์แห่งซิลลี"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "คัมเบรีย"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "เดอร์บีเชียร์"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "เดวอน"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "ดอร์เซท"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "เดอร์แรม"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "ซัสเซ็กซ์ ตะวันออก"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "เอสเซ็กซ์"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "กลอสเตอร์เชียร์"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "เกรตเตอร์ ลอนดอน"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "เกรตเตอร์ แมนเชสเตอร์"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "แฮมเชียร์"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "เฮิร์ทฟอร์ดเชียร์"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "เคนท์"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "แลงคาเชียร์"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "เลสเตอร์เชียร์"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "ลินคอล์นเชียร์"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "เมอร์ซี่ไซด์"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "นอร์ฟอล์ก"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "ยอร์กเชียร์เหนือ"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "นอร์ทแฮมตันเชียร์"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "นอร์ทฮัมเบอร์แลนด์"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "นอตติ้งแฮมเชียร์"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "ออกซ์ฟอร์ดเชียร์"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "ชรอพเชียร์"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "ซอมเมอร์เซท"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "ยอร์กเชียร์ ใต้"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "สตาฟฟอร์ดเชียร์"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "ซัฟฟอล์ก"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "เซอร์รี่"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "ไทน์ และ เวียร์"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "วอร์วิกเชียร์"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "มิดแลนด์ ตะวันตก"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "ซัสเซ็กซ์ ตะวันตก"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "ยอร์กเชียร์ ตะวันตก"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "วิลท์เชียร์"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "วอร์เซสเตอร์เชียร์"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "แอนทริม"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "อามาห์"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "ดาวน์"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "เฟอร์มานาห์"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "ลอนดอนเดอร์รี่"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "ไทโรน"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "คลูวิด"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "ดิฟฟิด"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "เกวนท์"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "กวินนืดด์"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "กลามอร์แกนกลาง"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "โพวิส"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "กลามอร์แกน ใต้"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "กลามอร์แกน ตะวันตก"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "บอร์เดอส์"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "สกอตแลนด์กลาง"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "ดัมฟรายส์และแกลโลเวย์"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "ไฟฟ์"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "แกรมเพียน"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "ไฮแลนด์"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "ลอเธียน"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "เกาะออร์กนี่"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "เกาะเชตแลนด์"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "สเตรทไคลด์"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "เทย์ไซด์"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "ไอเซลส์ตะวันออก"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "อังกฤษ"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "ไอร์แลนด์เหนือ"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "สกอตต์แลนด์"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "เวลส์"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "ใส่เลขแผ่นป้ายทะเนียนรถให้ถูกต้อง"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "ใส่หมายเลขโทรศัพท์"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "ใส่รหัสที่ไปรษณีย์ให้ถูกต้อง"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "ใส่หมายเลข NIK / KTP ที่ถูกต้อง"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "เขตปกครองพิเศษอาเจะห์"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "จังหวัดบาหลี"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "จังหวัดบันเตน"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "จังหวัดเบงกูลู"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "เขตปกครองพิเศษย็อกยาการ์ตา"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "เขตนครหลวงพิเศษจาการ์ตา"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "จังหวัดโกรอนตาโล"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "จังหวัดจัมบี"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "จังหวัดชวาตะวันตก"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "จังหวัดชวากลาง"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "จังหวัดชวาตะวันออก"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "จังหวัดกาลีมันตันตะวันตก"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "จังหวัดกาลีมันตันใต้"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "จังหวัดกาลีมันตันกลาง"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "จังหวัดกาลีมันตันตะวันออก"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "หมู่เกาะบังกาเบลีตุง"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "หมู่เกาะเรียว"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "จังหวัดลัมปุง"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "จังหวัดมาลูกู"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "จังหวัดมาลูกูเหนือ"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "จังหวัดนูซาเต็งการาตะวันตก"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "จังหวัดนูซาเต็งการาตะวันออก"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "จังหวัดปาปัว"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "ใส่รหัสไปรษณีย์ในรูปแบบ XXXXX"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "ป้อนหมายเลขรหัสที่ถูกต้อง"
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "ใส่หมายเลขประจำตัวประชาชนไอซ์แลนด์ในรูปของ XXXXXX-XXXX"
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "หมายเลขประจำตัวประชาชนไอซ์แลนด์ไม่ถูกต้อง"
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "ใส่รหัสไปรษณีย์"
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "ใส่หมายเลขประกันสังคม"
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "กรอกหมายเลขภาษีมูลค่าเพิ่มที่ถูต้อง"
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปของ XXXXXXX หรือ XXX-XXXX"
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "ฮอกไกโด"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "อาโอโมริ"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "อิวาเตะ"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "มิยากิ"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "อากิตะ"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "ยามากาตา"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "ฟุกุชิมา"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "อิบารากิ"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "โตชิกิ"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "กันมา"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "ไซตามะ"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "ชิบะ"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "โตเกียว"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "คะนะงะวะ"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "ยามานาชิ"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "นากาโนะ"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "นีงะตะ"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "โทยามะ"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "อิชิคาวะ"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "ฟูกุอิ"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "กิฟู"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "ชิซูโอกะ"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "อะอิชิ"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "มิเอะ"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "ชิกะ"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "เกียวโต"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "โอซากา"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "เฮียวโงะ"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "นาระ"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "วากะยามะ"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "ทตโตะริ"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "ชิมาเนะ"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "โอกะยามะ"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "ฮิโรชิมา"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "ยามากุชิ"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "โตกุชิมะ"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "คากะวะ"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "อิฮิเมะ"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "โคจิ"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "ฟุกุโอกะ"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "ซากะ"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "นากะซากิ"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "คุมะโมโตะ"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "โออิตะ"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "มิยาซากิ"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "คาโกชิมา"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "โอคินาวะ"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "ใส่หมายเลขรหัสไปรษณีย์ 4 หลัก"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "อากวัสกาเลียนเตส"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "บาจา แคลิฟอร์เนีย"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "บาฮากาลิฟอร์เนียซูร์"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "กัมเปเช"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "ชีวาวา"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "เชียปัส"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "โกอาวีลา"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "โคลิมา"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "เม็กซิโก ซิตี้"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "ดูรังโก"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "เกร์เรโร"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "กวานาวาโต"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "ฮิดาลโก"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "จาลิสโค"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "เม็กซิโก"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "มิโชอากัง"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "มอเรโลส"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "นายาริต"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "นวยโวเลออง"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "โออาซากา"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "ปวยบลา"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "กิเรตาโร"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "กินตานาโร"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "ซีนาโลอา"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "ซันลุยส์โปโตซี"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "โซโนร่า"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "ทาบาสโค"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "ตาเมาลีปัส"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "ตลัซกาลา"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "เวรากรูซ"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "ยูกาตัง"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "ซากาเตกัส"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "ใส่รหัสไปรษณีย์"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "กรอกหมายเลขประจำตัวประชาชน"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "แดรนด์"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "เฟลโวแลนด์"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "ฟรายส์แลนด์"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "เกลเดอร์แลนด์"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "เกรอนิงเกน"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "นอร์ด บราเบนต์"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "นอร์ด ฮอลแลนด์"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "โอเวอรีเซล"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "อูเทรซ์ค"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "ซีแลนด์"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "ซูด ฮอลแลนด์"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "ใส่หมายเลขประกันสังคมนอร์เวย์"
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "ข่องนี้ต้องการตัวเลข 8 ตัว"
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "ช่องนี้ต้องการตัวเลข 11 ตัว"
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "บัตรประจำตัวประชาประกอบด้วยตัวเลข 11 ตัว"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "ผลรวมตรวจสอบของหมายเลขประจำตัวประชาชนผิดพลาด"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "ผลรวมตรวจสอบสำหรับหมายเลขผู้เสียภาษี (NIP) ผิดพลาด."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "ผลรวมตรวจสอบ National Business Register Number (REGON) ผิดพลาด."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปของ XX-XXX"
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "ซิลเลสเซียใต้"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "คูยาเวีย-โพเมราเนีย"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "ลูบลิน"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "ลูเบิส์ช"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "ลอดซ์"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "เลสเซอร์โปแลนด์"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "มาโซเวีย"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "โอโปล์"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "ซับคาเพเทีย"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "พอดลาซีย์"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "โพเมราเนีย"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "ซิลเลสเซีย"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "สเวียตโตเชียตสกี"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "วอร์เมีย มาซูเรีย"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "เกรทเธอร์โปแลนด์"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "โพเมราเนียตะวันตก"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปแบบ XXXX-XXX"
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "หมายเลขโทรศัพท์ต้องมี 9 หลักหรือเริ่มต้นด้วยการ + หรือ 00"
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "กรุณาใส่ CIF"
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "กรุณาใส่ CNP"
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "ใส่หมายเลข IBAN ในรูปแบบ ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "หมายเลขโทรศัพท์ต้องอยู่ในรูปแบบ XXXX-XXXXXX"
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "กรุณาใส่รหัสไปรษณีย์ในรูปของ XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "แคว้น บันสคา บิสทิคา"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "แคว้น บันสคา สเตรียนิคา"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "บาเดโยฟ"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "บานอฟเซ นาด เบบราวู"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "เบรซโน"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "บราทิสลาวา หนึ่ง"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "บราทิสลาวา สอง"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "บราทิสลาวา สาม"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "บราทิสลาวา สี่"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "บราทิสลาวา ห้า"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "ไบต์กา"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "คัดคา"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "เดทวา"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "ดอลนี่ คูบิน"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "ดูนูซกา สเตรดา"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "กาลันตา"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "เกลนิคา"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "ลอเวคช์"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "ฮูเมนเน"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "อิลลาวา"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "เคซมารอก"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "โคมาร์โน"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "แคว้น โคซิเซ หนึ่ง"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "แคว้น โคซิเซ สอง"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "แคว้น โคซิเซ สาม"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "แคว้น โคซิเซ สี่"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "แคว้น โคซิเซ โอโคไล"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "ครูพินา"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "เคียสเซียก โนฟ เมสโต"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "เลวิซ"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "เลโวคา"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "ลิบโตสกี มิคูลาส"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "ลูเซินเนค"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "มาเลคสกี"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "มาร์ติน"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "เม็ดซิลลาบอร์ซ"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "มิคัลโลฟเซอ"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "มียาวา"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "เนเมสโตโว"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "นิทรา"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "โนเฟ เมสโต นาด วาห์อม"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "โนเฟ ซามกี"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "ปาร์ติซานเก"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "เปซินอก"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "เปียสตานี"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "พอลต้าร์"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "ป็อบปราด"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "โปวาสคา บิสทิคา"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "แคว้น พรีซอฟ"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "เปรียวิซา"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "ปูชอพ"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "เรวูก้า"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "ริมาฟสกา โซโบตา"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "รอซนาวา"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "บูซอมเบรอก"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "ซาบินอฟ"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "เซเนค"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "เซนิก้า"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "สคาลิก้า"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "สนินา"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "โซบรานเซ"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "สปิสสกา โนวา เวส"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "สตรารา ลูโบฟนา"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "สตรอปคอฟ"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "สวิดนิก"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "ซาลา"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "โทพอลคานี่"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "เทรบิซอฟ"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "เทรนซิน"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "แคว้น ทนาวา"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "เทอเซียนสเค เตปลิเซ"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "ทวาโดซิน"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "เวลเค เคอติส"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "วรานอฟ นาด ท็อปพลู"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "สตาเต โทราฟเซ"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "ซโวเลน"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "ซาร์โนวีก้า"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "ไซอาร์ นาด โฮนอม"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "ซิลินา"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "แคว้น บันสคา บิสทิคา"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "แคว้น บราทิสลาวา"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "แคว้น โคซิเซ"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "แคว้น นิทรา"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "แคว้น พรีซอฟ"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "แคว้น เทรนซิน"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "แคว้น ทนาวา"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "แคว้น ซิลินา"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปแบบ XXXXX"
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "หมายเลขโทรศัพท์จะต้องอยู่ในรูปแบบ 0XXX xxx xxxx"
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "ใส่รหัสไปรษณีย์ในรูปของ XXXXX หรือ XXXXX-XXXX"
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "หมายเลขโทรศัพท์จะต้องอยู่ในรูปแบบ XXX-XXX-XXXX"
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "ใส่หมายเลขประกันสังคมอเมริกา"
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "รัฐในสหรัฐ (ตัวอักษรใหญ่ 2 ตัว)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "หมายเลขโทรศัพท์"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "ใส่หมายเลขประจำตัวประชาชนแอฟริกาใต้"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "ใส่รหัสไปรษณีย์แอฟริกาใต้"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "อิสเทิร์นแคป"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "ฟรีเสตต์"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "กัวเตง"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "ควาซูลา-เนทาล"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "ลิมโพโพ"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "มูมาลากา"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "นอร์ทเทิร์นแคป"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "นอร์ทเวสต์"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "เวสต์เทิร์นแคป"
diff --git a/django/contrib/localflavor/locale/tr/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/tr/LC_MESSAGES/django.mo
deleted file mode 100644
index a135a569cf..0000000000
Binary files a/django/contrib/localflavor/locale/tr/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/tr/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/tr/LC_MESSAGES/django.po
deleted file mode 100644
index b8b31d1e11..0000000000
--- a/django/contrib/localflavor/locale/tr/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3559 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Metin Amiroff <amiroff@gmail.com>, 2011, 2012.
-# Murat Çorlu <muratcorlu@gmail.com>, 2012.
-# Murat Sahin <martinamca@gmail.com>, 2011, 2012.
-# Ozan  <uobasar@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-12 21:26+0000\n"
-"Last-Translator: Murat Çorlu <muratcorlu@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
-"tr/)\n"
-"Language: tr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "NNNN ya da ANNNNAAA formatında bir posta kodu yazın."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Bu alan sadece rakam gerektirmektedir."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Bu alan 7 veya 8 rakam gerektirmektedir."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "XX-XXXXXXXX-X ya da XXXXXXXXXXXX formatında bir CUIT girin."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Geçersiz CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Burgenland"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Carinthia"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Alt Avusturya"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Üst Avusturya"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Salzburg"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Styria"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Tyrol"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Vorarlberg"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Vyana"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "XXXX formatında posta kodu girin."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Lütfen XXXX XXXXXX formatında geçerli bir Avusturya Sosyal Güvenlik Numarası "
-"giriniz."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr "4 rakamlı postakodunu girin."
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr "Avustralya Eyaleti"
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr "Avustralya Posta Kodu"
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr "Avustralya Telefon Numarası"
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "Antwerp"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Brüksel"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "Doğu Flanders"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "Flemish Brabant"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "Hainaut"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Liege"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Limburg"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Lüksemburg"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "Namur"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "Walloon Brabant"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "Batı Flanders"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "Brüksel Başkent Bölgesi"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "Flemish Bölgesi"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "Vallonya"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-"Lütfen 1XXX - 9XXX şeklinde ve aralığında geçerli bir posta kodu giriniz."
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"Lütfen altta verilen formatlardan birisinde geçerli bir telefon numarası "
-"giriniz: 0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx."
-"xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx veya "
-"04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "XXXXX-XXX formatında posta kodu girin."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Telefon numaraları XX-XXXX-XXXX formatında olmalıdır."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Lütfen geçerli bir Brezilya bölgesi seçin. Seçilen bölge mevcutlar arasında "
-"yoktur."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Geçersiz CPF numarası."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Bu en fazla 11 rakam veya 14 karakter gerektirmektedir."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Geçersiz CNPJ numarası."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Bu alan en az 14 rakam gerektirmektedir"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "XXX XXX formatında posta kodunu girin."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Lütfen XXX-XXX-XXX formatında geçerli bir Kanada Sosyal Güvenlik Numarası "
-"girin."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Aargau"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Basel-Land"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Berne"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Fribourg"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Cenevre"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Glarus"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Graubuenden"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Jura"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Lucerne"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Neuchatel"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Nidwalden"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Obwalden"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Schaffhausen"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Schwyz"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Solothurn"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "St. Gallen"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Thurgau"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Ticino"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Uri"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Valais"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Vaud"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Zug"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Zürih"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Lütfen X1234567<0 veya 1234567890 formatında geçerli bir İsviçre kimlik veya "
-"pasaport numarası giriniz."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Geçerli bir Şili RUT numarası girin."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Geçerli bir Şili RUT numarası girin. Format: XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Şili  RUT numarası geçersizdir."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr "XXXXXX formatında bir posta kodu yazın."
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr "ID Kartı Numarası 15 veya 18 basamaktan oluşur."
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr "Geçersiz Kimlik Kartı Numarası: Yanlış sağlama toplamı"
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr "Geçersiz Kimlik Kartı Numarası: Hatalı doğum tarihi"
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr "Geçersiz Kimlik Kartı Numarası: Hatalı konum kodu"
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr "Geçerli bir telefon numarası girin."
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr "Geçerli bir cep telefonu numarası girin."
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Prag"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "Merkezi Bohemia Bölgesi"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "Güney Bohemia Bölgesi"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "Pilsen Bölgesi"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "Carlsbad Bölgesi"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "Usti Bölgesi"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "Liberec Bölgesi"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "Hradec Bölgesi"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "Pardubice Bölgesi"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "Vysocina Bölgesi"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "South Moravian Bölgesi"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "Olomouc Bölgesi"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "Zlin Bölgesi"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "Moravian-Silesian Bölgesi"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "XXXXX ya da XXX XX formatında bir posta kodu girin."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-"XXXXXX/XXXX veya XXXXXXXXXX formatında geçerli bir doğum numarası girin."
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-"Geçersiz isteğe bağlı Cinsiyet parametresi, geçerli değerler 'f' ve 'm'dir"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "Geçerli bir doğum numarası girin."
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "Geçerli bir IC numarası girin."
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Bavaria"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Brandenburg"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Bremen"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Hessen"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Batı Pomerania"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Alt Saxony"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Saarland"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Thuringia"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "XXXXX formatında posta kodu girin."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Lütfen XXXXXXXXXXX-XXXXXXX-XXXXXXX-X formatında geçerli bir Alman kimlik "
-"numarası giriniz."
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Arava"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Albacete"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Almeria"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Avila"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Badajoz"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Illes Balears"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Barselona"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Burgos"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Caceres"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Cadiz"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Castello"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Cordoba"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "A Coruna"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Cuenca"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Girona"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Granada"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Guadalajara"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Huelva"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Huesca"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Jaen"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Leon"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "La Rioja"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Lugo"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Madrid"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Malaga"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Murcia"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Navarre"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Ourense"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Asturias"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Palencia"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Las Palmas"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Pontevedra"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Salamanca"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Santa Cruz de Tenerife"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Cantabria"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Segovia"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Seville"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Soria"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Tarragona"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Teruel"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Toledo"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Valencia"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Valladolid"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Zamora"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Ceuta"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Melilla"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Andalusia"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Aragon"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Balearic Adaları"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Basque Country"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Canary Adaları"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Castile-La Mancha"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Castile ve Leon"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Catalonia"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Extremadura"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Galicia"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Murcia Bölgesi"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Valencian Community"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "01XXX - 52XXX aralığında ve formatında geçerli bir posta kodu girin."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"6XXXXXXXX, 8XXXXXXXX ya da 9XXXXXXXX formatlarından birisine uyan geçerli "
-"bir posta kodu girin."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Lütfen geçerli bir NIF, NIE ya da CIF girin."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Lütfen geçerli bir NIF ya da NIE girin."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Yanlış NIF sağlama toplamı."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Yanlış NIE sağlama toplamı."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Yanlış CIF sağlama toplamı."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Lütfen XXXX-XXXX-XX-XXXXXXXXXX formatında geçerli bir banka hesabı numarası "
-"girin."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Banka hesabı numarası için geçersiz sağlama toplamı."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Geçerli bir Finlandiya sosyal güvenlik numarası girin."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "Telefon numaraları 0X XX XX XX XX formatında olmalıdır."
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Geçerli bir posta kodu girin."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Buckinghamshire"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Cheshire"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall ve Scilly Adaları"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Cumbria"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Devon"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Dorset"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Durham"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Doğu  Sussex"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "c"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "c"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Greater London"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Greater Manchester"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Hampshire"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Hertfordshire"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Kent"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Lancashire"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Leicestershire"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Lincolnshire"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Norfolk"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "North Yorkshire"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Northamptonshire"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Northumberland"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Nottinghamshire"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Oxfordshire"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Shropshire"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Somerset"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Staffordshire"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Suffolk"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Surrey"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Warwickshire"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "West Midlands"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "West Sussex"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "West Yorkshire"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Wiltshire"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Worcestershire"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "County Antrim"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "County Armagh"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "County Fermanagh"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "County Londonderry"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "County Tyrone"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Orta Glamorgan"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Kuzey Glamorgan"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Batı Glamorgan"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Merkezi İskoçya"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Dumfries ve Galloway"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Fife"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Grampian"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Highland"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Lothian"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Orkney Adaları"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Shetland Adaları"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Strathclyde"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Tayside"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Batı Adaları"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "England"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Kuzey İrlanda"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "İskoçya"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Wales"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr "Geçerli bir 13 haneli JMBG girin"
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr "Tarih bölümünde hata"
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr "Geçerli bir 11 haneli ÖİB girin"
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "Geçerli bir araç plaka numarası girin"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr "Geçerli bir konum kodu girin"
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr "Numara bölümü sıfır olamaz."
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr "Geçerli bir 5 rakamlı postakodu girin."
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Geçerli bir telefon numarası girin"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr "Geçerli bir alan veya mobil ağ kodu girin"
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr "Telefon numarası çok uzun."
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr "601983 ile başlayan geçerli bir 19 basamaklı JMBAG girin"
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr "Kart sorunu numarası sıfır olamaz"
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr "Grad Zagreb"
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr "Bjelovarsko-bilogorska županija"
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr "Brodsko-posavska županija"
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr "Dubrovačko-neretvanska županija"
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr "Istarska županija"
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr "Karlovačka županija"
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr "Koprivničko-križevačka županija"
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr "Krapinsko-zagorska županija"
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr "Ličko-senjska županija"
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr "Međimurska županija"
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr "Osječko-baranjska županija"
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr "Požeško-slavonska županija"
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr "Primorsko-goranska županija"
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr "Sisačko-moslavačka županija"
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr "Splitsko-dalmatinska županija"
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr "Šibensko-kninska županija"
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr "Varaždinska županija"
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr "Virovitičko-podravska županija"
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr "Vukovarsko-srijemska županija"
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr "Zadarska županija"
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr "Zagrebačka županija"
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "Geçerli bir posta kodu girin"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "Geçerli bir NIK/KTP numarası girin"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "Aceh"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "Bali"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "Banten"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "Bengkulu"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "Yogyakarta"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Jakarta"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "Gorontalo"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "Jambi"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "Jawa Barat"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "Jawa Tengah"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "Jawa Timur"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "Kalimantan Barat"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "Kalimantan Selatan"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "Kalimantan Tengah"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "Kalimantan Timur"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "Kepulauan Bangka-Belitung"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "Kepulauan Riau"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "Lampung"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "Maluku"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "Maluku Utara"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "Nusa Tenggara Barat"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "Nusa Tenggara Timur"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "Papua"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "Papua Barat"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "Riau"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "Sulawesi Barat"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "Sulawesi Selatan"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "Sulawesi Tengah"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "Sulawesi Tenggara"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "Sulawesi Utara"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "Sumatera Barat"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "Sumatera Selatan"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "Sumatera Utara"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "Magelang"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "Surakarta - Solo"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "Madiun"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "Kediri"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "Tapanuli"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "Nanggroe Aceh Darussalam"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "Kepulauan Bangka Belitung"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "Corps Consulate"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "Corps Diplomatic"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "Bandung"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "Sulawesi Utara Daratan"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "NTT - Timor"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "Sulawesi Utara Kepulauan"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "NTB - Lombok"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "Papua dan Papua Barat"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "Cirebon"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "NTB - Sumbawa"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "NTT - Flores"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "NTT - Sumba"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "Bogor"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "Pekalongan"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "Semarang"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "Pati"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "Surabaya"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "Madura"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "Malang"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "Jember"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "Banyumas"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "Federal Hükümet"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "Bojonegoro"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "Purwakarta"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "Sidoarjo"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "Garut"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "Antrim"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "Armagh"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "Carlow"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "Cavan"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "Clare"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "Cork"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "Derry"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "Donegal"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "Down"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "Dublin"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "Fermanagh"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "Galway"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "Kerry"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "Kildare"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "Kilkenny"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "Laois"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "Leitrim"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "Limerick"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "Longford"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "Louth"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "Mayo"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "Meath"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "Monaghan"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "Offaly"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "Roscommon"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "Sligo"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "Tipperary"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "Tyrone"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "Waterford"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "Westmeath"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "Wexford"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "Wicklow"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "XXXXX formatında bir posta kodu giriniz"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "Geçerli bir kimlik numarası giriniz."
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr "XXXXXX veya XXX XXX biçiminde bir posta kodu girin."
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr "Bir Hintli eyaleti veya bölgesi girin."
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-"Telefon numaraları 02X-8X veya 03X-7X veya 04X-6X formatında olmalıdır."
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Geçerli bir İzlanda kimlik numarası girin. Format: XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Geçersiz İzlanda kimlik numarası."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Geçerli bir posta kodu girin."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Geçerli bir Sosyal Güvenlik numarası girin."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Geçerli bir VAT girin."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "XXXXXXX  ya da XXX-XXXX formatında bir posta kodu girin."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Hokkaido"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Aomori"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Iwate"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Miyagi"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Akita"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Yamagata"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Fukushima"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ibaraki"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Tochigi"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Gunma"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Saitama"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Chiba"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Tokyo"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Kanagawa"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Yamanashi"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Nagano"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Niigata"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Toyama"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ishikawa"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Fukui"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Gifu"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Shizuoka"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Aichi"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Mie"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Shiga"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Kyoto"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Osaka"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Hyogo"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Nara"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Wakayama"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Tottori"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Shimane"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Okayama"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Hiroshima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Yamaguchi"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Tokushima"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Kagawa"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ehime"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Kochi"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Fukuoka"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Saga"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Nagasaki"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Kumamoto"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Oita"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Miyazaki"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Kagoshima"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "Geçerli bir Kuveyt kimlik numarası girin"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-"Kimlik kartı numaraları 4 ila 7 basamak veya büyük harf ve 7 basamak "
-"içermelidir."
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr "Bu alan tam 13 basamak içermelidir."
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr "UMCN'nin ilk 7 basamaği geçerli bir geçmiş tarihi ifade etmelidir."
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr "UMCN geçerli değil."
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr "Aerodrom"
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr "Aračinovo"
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr "Berovo"
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr "Bitola"
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr "Bogdanci"
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr "Bogovinje"
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr "Bosilovo"
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr "Brvenica"
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr "Butel"
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr "Valandovo"
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr "Vasilevo"
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr "Vevčani"
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr "Veles"
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr "Vinica"
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr "Vraneštica"
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr "Vrapčište"
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr "Gazi Baba"
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr "Gevgelija"
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr "Gostivar"
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr "Gradsko"
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr "Debar"
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr "Debarca"
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr "Delčevo"
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr "Demir Kapija"
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr "Demir Hisar"
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr "Dolneni"
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr "Drugovo"
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr "Gjorče Petrov"
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr "Želino"
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr "Zajas"
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr "Zelenikovo"
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr "Zrnovci"
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr "Ilinden"
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr "Jegunovce"
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr "Kavadarci"
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr "Karbinci"
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr "Karpoš"
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr "Kisela Voda"
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr "Kičevo"
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr "Konče"
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr "Koćani"
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr "Kratovo"
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr "Kriva Palanka"
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr "Krivogaštani"
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr "Kruševo"
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr "Kumanovo"
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr "Lipkovo"
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr "Lozovo"
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr "Mavrovo i Rostuša"
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr "Makedonska Kamenica"
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr "Makedonski Brod"
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr "Mogila"
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr "Negotino"
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr "Novaci"
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr "Novo Selo"
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr "Oslomej"
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr "Ohrid"
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr "Petrovec"
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr "Pehčevo"
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr "Plasnica"
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr "Prilep"
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr "Probištip"
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr "Radoviš"
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr "Rankovce"
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr "Resen"
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr "Rosoman"
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr "Saraj"
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr "Sveti Nikole"
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr "Sopište"
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr "Star Dojran"
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr "Staro Nagoričane"
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr "Struga"
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr "Strumica"
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr "Studeničani"
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr "Tearce"
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr "Tetovo"
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr "Centar"
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr "Centar-Župa"
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr "Čair"
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr "Čaška"
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr "Češinovo-Obleševo"
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr "Čučer-Sandevo"
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr "Štip"
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr "Šuto Orizari"
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr "Makedon kimlik kartı numarası"
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr "Bir Makedon Belediye (2 karakter kodu)"
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr "Benzersiz ana vatandaşlık numarası (13 haneli)"
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr "XXXXX biçiminde geçerli bir posta kodu girin."
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr "Geçerli bir RFC girin."
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr "RFC için geçersiz sağlama."
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr "Geçerli bir CURP girin."
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr "CURP için geçersiz sağlama."
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr "Meksika devleti (üç büyük harf)"
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr "Meksika posta kodu"
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr "Meksika RFC"
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr "Meksika CURP"
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Aguascalientes"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Baja California"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Baja California Sur"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Campeche"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Chihuahua"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Chiapas"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Coahuila"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Colima"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Distrito Federal"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Durango"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Guerrero"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Hidalgo"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Jalisco"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Michoacán"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Morelos"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Nayarit"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Nuevo León"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Oaxaca"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Puebla"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Querétaro"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Quintana Roo"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Sinaloa"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "San Luis Potosí"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Sonora"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Tabasco"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Tamaulipas"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Tlaxcala"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Veracruz"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Yucatán"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Zacatecas"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Geçerli bir posta kodu girin"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Geçerli bir SoFi numarası girin"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Drenthe"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Friesland"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Gelderland"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Groningen"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Noord-Brabant"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Noord-Holland"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Overijssel"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Utrecht"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Zuid-Holland"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Geçerli bir Norveç Sosyal Güvenlik numarası girin."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Bu alan 8 rakam gerektirmektedir."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Bu alan 11 rakam gerektirmektedir."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Ulusal Kimlik Numarası 11 rakamdan oluşmaktadır."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Ulusal Kimlik Numarası için geçersiz sağlama toplamı."
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr "Ulusal Kimlik Kartı Numarası 3 harf ve 6 rakamdan oluşur."
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr "Ulusal Kimlik Kartı Numarası yanlış sağlama toplamı."
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-"XXX-XXX-XX-XX, XXX-XX-XX-XXX veya XXXXXXXXXX biçiminde bir vergi numarası "
-"alanı (NIP) girin."
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Vergi Numarası (NIP) için geçersiz sağlama toplamı."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "Ulusal İş Kayıt Numarası (REGON) 9 veya 17 rakamdan oluşmaktadır."
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Ulusal İş Kayıt Numarası (REGON) için geçersiz sağlama toplamı."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "XX-XXX formatında bir posta kodu girin."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Alt Silesia"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Lublin"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Lodz"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Küçük Polonya"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Masovia"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Opole"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Pomerania"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Silesia"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Büyük Polonya"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Batı Pomerania"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "XXXX-XXX formatında posta kodu girin."
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-"Telefon numaraları 9 rakamdan oluşmalı, veyahut + veya 00 ile başlamalıdır."
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Geçerli bir CIF girin."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Geçerli bir CNP girin."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "ROXX-XXXX-XXXX-XXXX-XXXX-XXXX formatında geçerli bir IBAN giriniz"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Telefon numaraları XXXX-XXXXXX formatında olmalıdır."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "XXXXXX formatında bir posta kodu girin."
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr "XXXXXX biçiminde bir posta kodunu girin."
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr "XXXX XXXXXX biçiminde bir pasaport numarası girin."
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr "XX XXXXXXX biçiminde bir pasaport numarası girin."
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr "Merkez Federal İlçe"
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr "Güney Federal İlçe"
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr "Kuzey-Batı Federal İlçe"
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr "Uzak-Doğu Federal İlçe"
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr "Sibirya Federal Vilayeti"
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr "Ural Federal Vilayeti"
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr "Privolzhsky Federal Vilayeti"
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr "Kuzey Kafkasya Federal Vilayeti"
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr "Moskova"
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr "Sankt Petersburg"
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr "Moskova bölgesi"
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr "Adıgeya Cumhuriyyeti"
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr "Başkortostan Cumhuriyyeti"
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr "Buryatiya Cumhuriyyeti"
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr "Altay Cumhuriyyeti"
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr "Dağıstan, Respublika"
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr "Ingushskaya Respublika"
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr "Kabardey-Balkarskaya Respublika"
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr "Kalmykia, Respublika"
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr "Karaçay-Çerkezya Respublika"
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr "Karelya, Respublika"
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr "Komi, Respublika"
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr "Mari Ehl, Respublika"
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr "Mordovya, Respublika"
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr "Saha, Respublika (Takutistan)"
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr "Severnaya Osetya, Respublika (Alania)"
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr "Tataristan, Respublika"
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr "Tuva, Respublika (Tuva)"
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr "Udmurtskaya Respublika"
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr "Khakassiya, Respublika"
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr "Çeçenya Respublika"
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr "Chuvashskaya Respublika"
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr "Altayskiy Kray"
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr "Zabaykalskiy Kray"
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr "Kamchatskiy Kray"
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr "Krasnodarskiy Kray"
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr "Krasnoyarskiy Kray"
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr "Permskiy Kray"
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr "Primorskiy Kray"
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr "Stavropol'siyy Kray"
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr "Khabarovskiy Kray"
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr "Amurskaya oblast'"
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr "Arkhangel'skaya oblast'"
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr "Astrakhanskaya oblast'"
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr "Belgorodskaya oblast'"
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr "Bryanskaya oblast'"
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr "Vladimirskaya oblast'"
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr "Volgogradskaya oblast'"
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr "Vologodskaya oblast'"
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr "Voronezhskaya oblast'"
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr "Ivanovskaya oblast'"
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr "Irkutskaya oblast'"
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr "Kaliningradskaya oblast'"
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr "Kaluzhskaya oblast'"
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr "Kemerovo bölgesi"
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr "Kirov bölgesi"
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr "Kostromskaya bölgesi"
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr "Kurganskaya bölgesi"
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr "Kursk bölgesi"
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr "Leningrad bölgesi"
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr "Lipeck bölgesi"
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr "Magadansk bölgesi"
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr "Murmansk bölgesi"
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr "Nizhegorodsk bölgesi"
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr "Novgorod bölgesi"
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr "Novosibirsk bölgesi"
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr "Omsk bölgesi"
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr "Orenburgsk bölgesi"
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr "Orlovsk bölgesi"
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr "Penzenskaya bölgesi"
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr "Pskovskaya bölgesi"
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr "Rostov bölgesi"
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr "Rjazan bölgesi"
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr "Samara bölgesi"
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr "Saratov bölgesi"
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr "Sakhalinsk bölgesi"
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr "Sverdlovsk bölgesi"
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr "Smolensk bölgesi"
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr "Tambov bölgesi"
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr "Tversk bölgesi"
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr "Tomsk bölgesi"
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr "Tula bölgesi"
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr "Tyumen bölgesi"
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr "Ul'ianovskaya bölgesi"
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr "Chelyabinsk bölgesi"
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr "Yaroslavl bölgesi"
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr "Evreyskaya özerk bölgesi"
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr "Neneckiy özerk bölgesi"
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr "Khanty-Mansiyskiy özerk bölgesi"
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr "Chukotskiy özerk bölgesi"
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr "Yamalo-Neneckiy özerk bölgesi"
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "Geçerli bir İsveç organizasyon numarası girin."
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "Geçerli bir İsveç kimlik numarası girin."
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "Kordinat numaralarına izin verilmemektedir"
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "XXXXX formatında geçerli bir İsveç posta kodu girin."
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "Stockholm"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "Västerbotten"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "Norrbotten"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "Uppsala"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "Södermanland"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "Östergötland"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "Jönköping"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "Kronoberg"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "Kalmar"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "Gotland"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "Blekinge"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "Skåne"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "Halland"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "Västra Götaland"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "Värmland"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "Örebro"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "Västmanland"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "Dalarna"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "Gävleborg"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "Västernorrland"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "Jämtland"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr "EMSO'nun ilk 7 basamaği geçerli bir geçmiş tarihi ifade etmelidir."
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr "EMSO geçerli değil."
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr "SIXXXXXXXX biçiminde geçerli bir vergi numarası girin"
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr "+386 XXXXXXXX veya 0XXXXXXXX biçiminde telefon numarasını girin."
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Banska Bystrica"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Brezno"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Bytca"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Detva"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Galanta"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Gelnica"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Hlohovec"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ilava"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Krupina"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Levoca"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Medzilaborce"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Namestovo"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Nitra"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Partizanske"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Pezinok"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Poltar"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Presov"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Roznava"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Senec"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Sobrance"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Svidnik"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Sala"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Trebisov"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Trencin"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Zlate Moravce"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Zvolen"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Zarnovica"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Zilina"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Banska Bystrica bölgesi"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Bratislava region"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Kosice bölgesi"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Nitra region"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Presov bölgesi"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Trencin bölgesi"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Trnava bölgesi"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Zilina bölgesi"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "XXXXX formatında bir posta kodu giriniz."
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "Telefon numaraları 0XXX XXX XXXX formatında olmalıdır."
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "Lütfen geçerli TC kimlik numarası giriniz."
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "TC kimlik numarası 11 karakterden oluşmaktadır."
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "XXXXX ya da XXXXX-XXXX biçiminde bir posta kodu yazın."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "Telefon numaraları XXX-XXX-XXXX formatında olmalıdır."
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"XXX-XX-XXXX formatında geçerli bir A.B.D. Sosyal Güvenlik Numarası giriniz."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "ABD devlet veya bölge adı girin."
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Şehir Kodu (iki karakter)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "A.B.D. posta kodu (iki büyük harf)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Telefon numarası"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX formatında geçerli bir CI girin."
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "Geçerli bir CI numarası girin."
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Geçerli bir Güney Afrika Cumhuriyeti kimlik numarası girin"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Geçerli bir Güney Afrika Cumhuriyeti posta kodu girin"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Doğu Cape"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Gauteng"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "KwaZulu-Natal"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Limpopo"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Mpumalanga"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Northern Cape"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Kuzey Batı"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Batı Cape"
diff --git a/django/contrib/localflavor/locale/tt/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/tt/LC_MESSAGES/django.mo
deleted file mode 100644
index 871c1e2f38..0000000000
Binary files a/django/contrib/localflavor/locale/tt/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/tt/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/tt/LC_MESSAGES/django.po
deleted file mode 100644
index ea0e5f900d..0000000000
--- a/django/contrib/localflavor/locale/tt/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3526 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2011-01-19 16:22+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
-"tt/)\n"
-"Language: tt\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/uk/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/uk/LC_MESSAGES/django.mo
deleted file mode 100644
index 4db0645be2..0000000000
Binary files a/django/contrib/localflavor/locale/uk/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/uk/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/uk/LC_MESSAGES/django.po
deleted file mode 100644
index 6949bbda80..0000000000
--- a/django/contrib/localflavor/locale/uk/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3547 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Sergey Lysach <sergikoff88@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
-"language/uk/)\n"
-"Language: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Введіть поштовий індекс у форматі NNNN або ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "В це поле можна вводити тільки числа."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "В це поле можна вводити тільки 7 або 8 цифр."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Введіть правильний CUIT у форматі XX-XXXXXXXX-X або XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "Невірний CUIT."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "Бургенленд"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "Каринтія"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "Нижня Австрія"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "Верхня Австрія"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "Зальцбург"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "Штирія"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "Тіроль"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "Форарльберг"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Відень"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Введіть поштовий індекс у форматі ХХХХ."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-"Введіть правильний австрійський номер соціального страхування в форматі XXXX "
-"XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "Брюссель"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "Льєж"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "Лімбурґ"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "Люксембург"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Введіть поштовий індекс у форматі XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Телефонні номери мають бути у форматі XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-"Оберіть правильний бразильський штат. Штата, який ви обрали, не має серед "
-"представлених тут."
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Помилковий номер CPF."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Це поле вимагає максимум 11 цифр або 14 символів."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Помилковий номер CNPJ."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Це поле вимагає як мінімум 14 цифр"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Введіть поштовий індекс у форматі XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-"Введіть правильний канадський номер соціального страхування у форматі XXX-"
-"XXX-XXX."
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "Ааргау"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "Аппенцелль Іннерходен"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "Аппенцелль Ауссеррходен"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "Базель"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "Базель-Ленд"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "Берн"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "Фрібург"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "Женева"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "Гларус"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "Граубюнден"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "Юра"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "Люцерн"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "Невшатель"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "Нідвальден"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "Обвальден"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "Шафхаузен"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "Швіц"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "Золотурн"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "Санкт-Галлен"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "Тургау"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "Тичино"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "Урі"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "Вале"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "Во"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "Цуг"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Цюріх"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"Введіть вірний номер посвідчення особи або паспорту у форматі X1234567<0 або "
-"1234567890."
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "Введіть вірний чилійський RUT."
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "Введіть вірний чилійський RUT. Формат: XX.XXX.XXX-X."
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Чилійський RUT не правильний."
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "Прага"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Введіть поштовий індекс у форматі XXXXX або XXX XX."
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "Баден-Вюртемберг"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "Баварія"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Берлін"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "Бранденбург"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "Бремен"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Гамбург"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "Гессен"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "Мекленбург — Передня Померанія"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "Нижня Саксонія"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "Північний Рейн – Вестфалія"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "Райнланд-Пфальц"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "Саарланд"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Саксонія"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "Саксонія-Ангальт"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "Шлезвіг-Гольштайн"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "Тюрінгія"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Введіть поштовий індекс у форматі XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-"Введіть правильний номер німецького посвідчення особи в форматі XXXXXXXXXXX-"
-"XXXXXXX-XXXXXXX-X "
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "Алава"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "Альбасете"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Аліканте"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "Альмерія"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "Авіла"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "Бадахос"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "Балеарські острови"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "Барселона"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "Бургос"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "Касерес"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "Кадіс"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "Кастельйон"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Сьюдад-Реаль"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "Кордова"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "Ла-Корунья"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "Куенка"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "Жірона"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "Гранада"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "Гвадалахара"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Гіпускоа"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "Уельва"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "Уеска"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "Хаен"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "Леон"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Льєйда"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "Ла-Ріоха"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "Луго"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "Мадрід"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "Малага"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "Мурсія"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "Наварра"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "Оренсе"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "Астурія"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "Паленсія"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "Лас-Пальмас"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "Понтеведра"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "Саламанка"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "Санта-Крус-де-Тенерифе"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "Кантабрія"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "Сеговія"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "Севілья"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "Сорія"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "Таррагона"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "Теруель"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "Толедо"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "Валенсія"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "Вальядолід"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Біскайя"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "Самора"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "Сарагоса"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "Сеута"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "Мелілья"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "Андалусія"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "Арагон"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Астурія"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "Балеарські острови"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "Країна Басків (Еускаді)"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "Канарські острови"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "Кастилія — Ла-Манча"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "Кастилія і Леон"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "Каталонія"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "Естремадура"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "Галісія"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "Мурсія"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Наварра"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "Валенсія"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Введіть правильний поштовий індекс в диапазоні формату 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Введіть правильний номер телефону в одному з форматів 6XXXXXXXX,8XXXXXXXX or "
-"9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Будь ласка введіть правильний NIF, NIE, або CIF."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Будь ласка введіть правильний NIF або NIE"
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "Помилкова контрольна сума для NIF."
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "Помилкова контрольна сума для NIE."
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "Помилкова контрольна сума для CIF."
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-"Будь ласка, введіть правильний номер банківського рахунку у форматі XXXX-"
-"XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "Помилкова контрольна сума для номеру банківського рахунку."
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "Введіть правильний номер фінського соціального страхування."
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "Уведіть правильний поштовий індекс."
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Бедфордшір"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "Бакінгемшир"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "Чешир"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Корнуолл"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "Камбрія"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Дербішир"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "Девон"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "Дорсет"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "Дарем"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "Східний Сассекс"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "Ессекс"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "Глостершир"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "Великий Лондон"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "Великий Манчестер"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "Хемпшир"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "Хартфордшир"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "Кент"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "Ланкашир"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "Лестершир"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "Лінкольншир"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Мерсісайд"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "Норфолк"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "Північний Йоркшир"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "Нортгемптоншир"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "Нортумберленд"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "Ноттінгемшир"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "Оксфордшир"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "Шропшир"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "Сомерсет"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Південний Йоркшир"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "Стаффордшир"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "Саффолк"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "Суррей"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Тайн-енд-Уїр"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "Варвікшир"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "Уест Мідлендс"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "Західний Сассекс"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "Західний Йоркшир"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "Уілтшир"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "Вустершир"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "Графство Антрім"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "Графство Арма"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "Графство Даун"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "Графство Фєрмана"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "Графство Лондондеррі"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "Графство Тірон"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Клуід"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Давєд"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Гвєнт"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Гвінед"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "Мід Гламорган"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Поуіс"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "Південний Гламорган"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "Західний Гламорган"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Бордерс"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "Центральна Шотландія"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "Дамфріс і Галлоуей"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "Файф"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "Гремпіан"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "Хайленд"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "Лотіан"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "Оркнейські острови"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "Шетлендські острови"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "Стресклайд"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "Тейсайд"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "Західні острови"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Англія"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Північна Ірландія"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Шотландія"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Уельс"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Введіть правильний номер телефону."
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "Джакарта"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-"Введіть правильний номер ісландського посвідчення особи. Формат: XXXXXX-XXXX."
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "Номер ісландського посвідчення особи не вірний."
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Введіть правильну поштову адресу."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Введіть правильний номер соціального страхування"
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Введіть правильний номер VAT."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Введіть поштовий індекс у форматі XXXXXXX or XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "Хоккайдо"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "Аоморі"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "Івате"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "Міяґі"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "Акіта"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "Ямаґата"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "Фукусіма"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "Ібаракі"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "Тотіґі"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "Ґумма"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "Сайтама"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "Тіба"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "Токіо"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "Канаґава"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "Яманасі"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "Наґано"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "Ніїґата"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "Тояма"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "Ісікава"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "Фукуї"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "Ґіфу"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "Сідзуока"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "Аїті"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "Міє"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "Сіґа"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "Кіото"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "Осака"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "Хьоґо"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "Нара"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "Вакаяма"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "Тотторі"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "Сімане"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "Окаяма"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Хіросіма"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "Ямаґуті"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "Токусіма"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "Каґава"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "Ехіме"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "Коті"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "Фукуока"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "Саґа"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "Наґасакі"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "Кумамото"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "Оїта"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "Міядзакі"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "Каґосіма"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Окінава"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "Аґуаскальєнтес"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "Нижня Каліфорнія Північна"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "Нижня Каліфорнія Південна"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "Кампече"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "Чіуауа"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "Чіапас"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "Коауїла"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "Коліма"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "Федеральний округ"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "Дуранго"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "Ґерреро"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Ґуанахуато"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "Ідальґо"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "Халіско"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Мехіко"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "Мічоакан"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "Морелос"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "Наяріт"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "Нуево-Леон"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "Оахака"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "Пуебла"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "Керетаро"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "Кінтана-Роо"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "Сіналоа"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "Сан-Луїс-Потосі"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "Сонора"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "Табаско"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "Тамауліпас"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "Тлашкала"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "Веракрус"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "Юкатан"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "Сакатекас"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Уведіть правильний поштовий індекс."
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Введіть правильний номер SoFi."
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "Дренте"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Флеволанд"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "Фризляндія"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "Ґельдерланд"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "Ґронінґен"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "Північний Брабант"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "Північна Голландія"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "Оверейсел"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "Утрехт"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Зеландія"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "Південна Голландія"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Введіть правильний номер норвезького соціального страхування."
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "В це поле можна ввести тільки 8 цифр."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "В це поле можна ввести тільки 11 цифр."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Національний ідентифікаційний номер складається з 11 цифр."
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "Помилкова контрольна сума для Національного ідентифікаційного номера"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Помилкова контрольна сума для податкового номеру (NIP)."
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-"Помилкова контрольна сума для Національного ділового реєстраційного номеру "
-"(REGON)."
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Введіть поштовий індекс у форматі XX-XXX."
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "Нижньосілезьке"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Куявсько-Поморське"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "Люблінське"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Любуське"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "Лодзинське"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Малопольське"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "Мазовецьке"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "Опольське"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Підкарпатське"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Підляське"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "Поморське"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "Сілезьке"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Свентокшиське"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Вармінсько-Мазурське"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Великопольське"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "Західнопоморське"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "Введіть правильний CIF."
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "Введіть правильний CNP."
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Введіть правильний IBAN в форматі ROXX-XXXX-XXXX-XXXX-XXXX-XXXX"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "Телефонні номери мають бути у форматі XXX-XXX-XXXX."
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "Введіть правильний поштовий індекс у форматі XXXXXX"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "Банська Бистриця"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Банська Шт'явниця"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Бардейов"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Бановце-над-Бебравоу"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "Брезно"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Братіслава I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Братіслава II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Братіслава III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Братіслава IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Братіслава V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "Бітча"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Чадца"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "Детва"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Долни Кубін"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Дунайська Стреда"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "Галанта"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "Гелница"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "Глоговець"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Гуменне"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "Ілава"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Кежмарок"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Комарно"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Кошице I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Кошице II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Кошице III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Кошице IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Кошице - периферія"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "Крупіна"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Кошицький край"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Левіце"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "Левоча"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Ліптовскі Мікулаш"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Лученєць"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Малацькі"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Мартін"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "Мєдзілаборце"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Міхаловце"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Міява"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "Намєстово"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "Нітра"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Нове Мєсто-над-Вагом"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Нове Замкі"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "Партизанське"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "Пєзінок"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "П'єштяни"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "Полтар"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Попрад"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Поважська Бистриця"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "Прєшов"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Пр'євідза"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Пухов"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Рєвуца"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Рімавська Собота"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "Рожнява"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ружомберок"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Сабінов"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "Сєнєц"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Сєніца"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Скаліца"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Сніна"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "Собранце"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Спішська Нова Вєс"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Стара Любовня"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Стропков"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "Свіднік"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "Шаля"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Топольчани"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "Требішов"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "Трєнчін"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Трнава"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Турч'янське Тепліце"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Тврдошін"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Вельки Кртіш"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Вранов-над-Топльеу"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "Злате Моравце"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "Зволен"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "Жарновиця"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ж'яр-над-Гроном"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "Жиліна"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "Банкобистрицький край"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "Братиславський край"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "Кошицький край"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "Нітранський край"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "Прєшовський край"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "Тренчин"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "Трнава"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "Жилінський край"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Введіть поштовий індекс у форматі XXXXX або XXXXX-XXXX."
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-"Введіть правильний номер соціального забезпення США в форматі XXX-XX-XXXX."
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "Штат Сполучених Штатів Америки (дві великіх букви)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Телефонний номер"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "Введіть правильний Південно-Африканський ідентифікаційний номер"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Введіть правильний поштовий індекс Південної Африки"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "Східна Капська"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Вільна країна"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "Гаутенг"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "КваЗулу-Наталь"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "Лімпопо"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "Мпумаланга"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "Північна Капська"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Північно-Західна"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "Західна Капська"
diff --git a/django/contrib/localflavor/locale/ur/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/ur/LC_MESSAGES/django.mo
deleted file mode 100644
index 171d242c7c..0000000000
Binary files a/django/contrib/localflavor/locale/ur/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/ur/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/ur/LC_MESSAGES/django.po
deleted file mode 100644
index 8cbda8b8f5..0000000000
--- a/django/contrib/localflavor/locale/ur/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3526 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2011-01-19 16:22+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
-"ur/)\n"
-"Language: ur\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"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr ""
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr ""
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr ""
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr ""
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr ""
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr ""
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr ""
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr ""
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr ""
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr ""
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr ""
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr ""
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr ""
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr ""
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr ""
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr ""
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr ""
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr ""
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr ""
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr ""
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr ""
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr ""
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr ""
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr ""
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr ""
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr ""
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr ""
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr ""
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr ""
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr ""
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr ""
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr ""
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr ""
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr ""
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr ""
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr ""
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr ""
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr ""
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr ""
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr ""
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr ""
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/vi/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/vi/LC_MESSAGES/django.mo
deleted file mode 100644
index 0f954c6b0b..0000000000
Binary files a/django/contrib/localflavor/locale/vi/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/vi/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/vi/LC_MESSAGES/django.po
deleted file mode 100644
index de1db2f44f..0000000000
--- a/django/contrib/localflavor/locale/vi/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3528 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:42+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
-"language/vi/)\n"
-"Language: vi\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "Hãy nhập mã bưu điện theo mẫu NNNN hoặc ANNNNAAA."
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "Điền một chữ số duy nhất."
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "Bạn cần điền 7 hoặc 8 chữ số."
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Hãy nhập CUIT hợp lệ theo dạng XX-XXXXXXXX-X hoặc XXXXXXXXXXXX."
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "CUIT không hợp lệ."
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr ""
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr ""
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr ""
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr ""
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr ""
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr ""
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr ""
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr ""
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "Thành phố Viên"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "Hãy nhập mã bưu điện theo dạng XXXX."
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "Hãy nhập số an sinh xã hội của nước Áo theo dạng XXXX XXXXXX."
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr ""
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr ""
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr ""
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr ""
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr ""
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr ""
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr ""
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr ""
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr ""
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr ""
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr ""
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr ""
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr ""
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr ""
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr ""
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "Hãy nhập mã bưu điện theo dạng XXXXX-XXX."
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "Số điện thoại phải dưới dạng XX-XXXX-XXXX."
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr ""
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "Số CPF không hợp lệ."
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Điền nhiều nhất là 11 chữ số hoặc 14 kí tự."
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "Số CNPJ không hợp lệ."
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "Bạn phải cần điền ít nhất là 14 chữ số."
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "Hãy nhập mã bưu điện theo dạng XXX XXX."
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr ""
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr ""
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr ""
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr ""
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr ""
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr ""
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr ""
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr ""
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr ""
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr ""
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr ""
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr ""
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr ""
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr ""
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr ""
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr ""
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr ""
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr ""
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr ""
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr ""
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr ""
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr ""
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr ""
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr ""
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr ""
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "Thành phố Zurich"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr ""
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr ""
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr ""
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr ""
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr ""
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr ""
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr ""
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr ""
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr ""
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr ""
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr ""
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr ""
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr ""
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr ""
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr ""
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr ""
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr ""
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr ""
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr ""
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr ""
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr ""
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr ""
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr ""
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "Berlin"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr ""
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr ""
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "Hamburg"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr ""
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr ""
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr ""
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr ""
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr ""
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr ""
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "Bang Saxony"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr ""
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr ""
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr ""
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Hãy nhập mã bưu điện theo mẫu XXXXX."
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr ""
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr ""
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr ""
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr ""
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr ""
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr ""
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr ""
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr ""
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr ""
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr ""
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr ""
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr ""
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr ""
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr ""
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr ""
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr ""
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr ""
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr ""
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr ""
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr ""
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr ""
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr ""
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr ""
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr ""
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr ""
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr ""
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr ""
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr ""
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr ""
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr ""
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr ""
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr ""
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr ""
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr ""
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr ""
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr ""
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr ""
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr ""
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr ""
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr ""
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr ""
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr ""
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr ""
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr ""
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr ""
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr ""
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr ""
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr ""
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr ""
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr ""
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr ""
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr ""
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr ""
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr ""
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr ""
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr ""
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr ""
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr ""
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr ""
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr ""
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr ""
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr ""
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr ""
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr ""
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr ""
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr ""
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr ""
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Hãy nhập mã số bưu điện hợp lệ theo dạng 01XXX - 52XXX."
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr ""
-"Hãy nhập số điện thoại hợp lệ theo dạng 6XXXXXXXX, 8XXXXXXXX hoặc 9XXXXXXXX."
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Hãy nhập NIF, NIE, hoặc CIF hợp lệ."
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "Hãy nhập NIF hoặc NIE hợp lệ."
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr ""
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr ""
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr ""
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Hãy nhập số tài khoản ngân hàng theo dạng XXXX-XXXX-XX-XXXXXXXXXX."
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr ""
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr ""
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr ""
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr ""
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr ""
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr ""
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr ""
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr ""
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr ""
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr ""
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr ""
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr ""
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr ""
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr ""
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr ""
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr ""
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr ""
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr ""
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr ""
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr ""
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr ""
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr ""
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr ""
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr ""
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr ""
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr ""
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr ""
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr ""
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "Vùng South Yorkshire"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr ""
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr ""
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr ""
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr ""
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr ""
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr ""
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr ""
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr ""
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr ""
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr ""
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr ""
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr ""
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr ""
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr ""
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr ""
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr ""
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr ""
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr ""
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr ""
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr ""
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr ""
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr ""
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr ""
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr ""
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr ""
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr ""
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr ""
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr ""
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr ""
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr ""
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr ""
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr ""
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr ""
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr ""
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "Nước Anh"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "Bắc Ai-len"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "Sccotland"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "Xứ Wale"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr ""
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "Hãy nhập số điện thoại có hiệu lực"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr ""
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr ""
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr ""
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr ""
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr ""
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr ""
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr ""
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr ""
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr ""
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr ""
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr ""
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr ""
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr ""
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr ""
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr ""
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr ""
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr ""
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr ""
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr ""
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr ""
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr ""
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr ""
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr ""
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr ""
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr ""
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr ""
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr ""
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr ""
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr ""
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr ""
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr ""
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr ""
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr ""
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr ""
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr ""
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr ""
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr ""
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr ""
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "Hãy nhập mã bưu điện hợp lệ."
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "Hãy nhập số Bảo hiểm Xã hội hợp lệ."
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "Hãy nhập số VAT hợp lệ."
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "Hãy nhập mã bưu điện theo dạng XXXXXXX hoặc XXX-XXXX."
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr ""
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr ""
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr ""
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr ""
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr ""
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr ""
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr ""
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr ""
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr ""
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr ""
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr ""
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr ""
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr ""
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr ""
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr ""
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr ""
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr ""
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr ""
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr ""
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr ""
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr ""
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr ""
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr ""
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr ""
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr ""
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr ""
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr ""
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "Thành phố Hirosima"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr ""
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr ""
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr ""
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr ""
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr ""
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr ""
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr ""
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr ""
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr ""
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr ""
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr ""
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "Thành phố Okinawa"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr ""
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr ""
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr ""
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr ""
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr ""
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr ""
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr ""
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr ""
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr ""
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr ""
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr ""
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr ""
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr ""
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr ""
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr ""
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr ""
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr ""
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr ""
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr ""
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr ""
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr ""
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr ""
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr ""
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr ""
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr ""
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr ""
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr ""
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr ""
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr ""
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr ""
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr ""
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr ""
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "Hãy nhập mã bưu điện có hiệu lực"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "Hãy nhập số SoFi hợp lệ"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr ""
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr ""
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr ""
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr ""
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr ""
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr ""
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr ""
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr ""
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr ""
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr ""
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr ""
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "Hãy nhập số an sinh xã hội có hiệu lực"
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "Bạn cần điền 8 chữ số."
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "Bạn cần điền 11 chữ số."
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "Số CMTND gồm 11 chữ số"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr ""
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr ""
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "Hãy nhập mã bưu điện theo mẫu XX-XXX"
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr ""
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr ""
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr ""
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr ""
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr ""
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr ""
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr ""
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr ""
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr ""
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr ""
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr ""
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr ""
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr ""
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr ""
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr ""
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr ""
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr ""
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr ""
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr ""
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr ""
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr ""
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr ""
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr ""
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr ""
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr ""
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr ""
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr ""
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr ""
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr ""
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr ""
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr ""
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr ""
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr ""
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr ""
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr ""
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr ""
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr ""
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr ""
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr ""
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr ""
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr ""
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr ""
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr ""
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr ""
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr ""
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr ""
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr ""
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr ""
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr ""
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr ""
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr ""
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr ""
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr ""
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr ""
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr ""
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr ""
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr ""
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr ""
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr ""
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr ""
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr ""
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr ""
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr ""
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr ""
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr ""
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr ""
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr ""
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr ""
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr ""
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr ""
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr ""
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr ""
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr ""
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr ""
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr ""
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr ""
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr ""
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr ""
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr ""
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr ""
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr ""
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr ""
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr ""
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr ""
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr ""
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr ""
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr ""
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr ""
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr ""
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr ""
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr ""
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr ""
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr ""
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr ""
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr ""
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr ""
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr ""
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr ""
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr ""
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr ""
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr ""
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr ""
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr ""
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr ""
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr ""
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr ""
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr ""
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr ""
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr ""
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr ""
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr ""
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr ""
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Hãy nhập mã bưu điện theo mẫu XXXXX hoặc XXXXX-XXXX"
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr ""
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "Hãy nhập số an sinh xã hội dưới dạng XXX-XX-XXXX"
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr ""
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr ""
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "Số điện thoại"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr ""
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr ""
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr ""
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "Hãy nhập mã bưu điện Nam Phi có hiệu lực"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr ""
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr ""
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr ""
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr ""
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr ""
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr ""
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr ""
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "Tây Bắc"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr ""
diff --git a/django/contrib/localflavor/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/zh_CN/LC_MESSAGES/django.mo
deleted file mode 100644
index 2a30c09075..0000000000
Binary files a/django/contrib/localflavor/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/zh_CN/LC_MESSAGES/django.po
deleted file mode 100644
index 33825a390c..0000000000
--- a/django/contrib/localflavor/locale/zh_CN/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3534 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Daniel Duan <DaNmarner@gmail.com>, 2011.
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# Lele Long <schemacs@gmail.com>, 2011.
-# slene <vslene@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: Daniel Duan <DaNmarner@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
-"language/zh_CN/)\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "以 NNNN 或 ANNNNAAA 的格式输入一个邮政编码。"
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "这个字段只能输入数字。"
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "这个字段要求输入 7 或 8 位数字。"
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "以 XX-XXXXXXXX-X 或 XXXXXXXXXXXX 的格式输入一个有效的 CUIT。"
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "无效 CUIT。"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "布尔根兰州"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "卡林西亚"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "下奥地利州"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "上奥地利州"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "萨尔茨堡"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "施蒂里亚语"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "蒂罗尔"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "福拉尔贝格州"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "维也纳"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "以 XXXX 的格式输入一个邮政编码。"
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "以  XXXX XXXXXX 的格式输入一个有效的奥地利社会保障号码。"
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "安特卫普"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "布鲁塞尔"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "东佛兰德"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "佛兰芒布拉班特"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "厄诺"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "列日"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "林堡"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "卢森堡"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "纳慕尔"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "瓦隆布拉邦"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "西佛兰德"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "布鲁塞尔首都区域"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "法阑德斯地区"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "瓦龙"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "请输入有效的邮政编码，范围和格式为 1XXX - 9XXX"
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"请输入以下格式之一的有效电话号码：0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, "
-"0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx."
-"xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "以 XXXXX-XXX 的格式输入一个邮政编码。"
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "电话号码必须为 XXX-XXX-XXXX 格式。"
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "选择一个有效的巴西州。该州并不是现有的州。"
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "无效的 CPF 号码。"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "该字段要求填写最多 11 位数字或 14 个字符。"
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "无效的 CNPJ 号码。"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "这个字段要求至少 14 位数字"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "以 XXX XXX 的格式输入一个邮政编码。"
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "以 XXX-XXX-XXX 的格式输入一个有效的加拿大社会保障号码。"
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "阿尔高州"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "内阿彭策尔半州"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "外阿彭策尔半州"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "巴塞尔城半州"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "巴塞尔乡半州"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "伯尔尼州"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "弗里堡州"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "日内瓦州"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "格拉鲁斯州"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "格劳宾登州"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "汝拉州"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "琉森州"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "纳沙特尔州"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "下瓦尔登州"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "上瓦尔登州"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "沙夫豪森州"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "施维茨州"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "索洛图恩州"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "圣加仑州"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "图尔高州"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "提契诺州"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "乌里州"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "瓦莱州"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "沃州"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "楚格州"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "苏黎世州"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"输入一个有效的瑞士身份证号码或者护照卡号，格式为 X1234567<0 或 1234567890"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "输入一个有效的 Chilean RUT。"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "输入一个有效的 Chilean RUT。格式为 XX.XXX.XXX-X。"
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "Chilean RUT 无效。"
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "布拉格"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "波希米亚中部地区"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "南波希米亚地区"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "比尔森地区"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "卡尔斯巴德地区"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "乌斯季地区"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "利贝雷茨地区"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "赫拉德茨地区"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "帕尔杜比采地区"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "維索基納"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "南摩拉维亚地区"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "奥洛穆茨地区"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "兹林地区"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "摩拉维亚，西里西亚地区"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "以 XXXXX 或 XX XXX 的格式输入一个邮政编码。"
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "以 x"
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "可选参数性别无效，请在'f'（女）和'm'（男）之间选择。"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "输入一个有效的出生码。"
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "输入一个有效的 IC 号码。"
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "巴登符腾堡州"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "巴伐利亚"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "柏林"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "勃兰登堡"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "不来梅"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "汉堡"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "黑森州"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "梅克伦堡-西部米拉尼亚"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "下萨克森"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "北莱茵-威斯特法伦州"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "莱茵河法耳茨地区"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "萨尔州"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "萨克森"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "萨克森-安哈尔特"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "石勒苏益格-荷尔斯泰因"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "图林根州"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "以 XXXXX 的格式输入一个邮政编码。"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr "以 XXXXXXXXXXX-XXXXXXX-XXXXXXX-X 的格式输入一个有效的德国身份证号码。"
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "阿拉瓦"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "阿尔巴塞特"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "Alacant"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "阿尔梅里亚"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "阿维拉"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "巴达霍斯"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "巴利阿里群岛"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "巴塞罗那"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "布尔戈斯"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "卡塞雷斯"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "卡迪斯"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "卡斯特罗"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "Ciudad Real"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "科尔多瓦"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "拉科鲁尼亚"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "昆卡"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "西罗纳"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "格拉纳达"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "瓜达拉哈拉"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "Guipuzkoa"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "韦尔瓦"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "韦斯卡"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "哈恩"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "里昂"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "Lleida"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "里欧哈"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "卢戈"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "马德里"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "马拉加"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "穆尔西亚"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "纳瓦拉"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "奥伦塞"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "阿斯图里亚斯"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "帕伦西亚"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "拉斯帕尔马斯"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "庞特维德拉"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "萨拉曼卡"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "圣克鲁斯-德特内里费"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "坎塔布利亚"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "塞戈维亚"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "塞维利亚"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "索里亚"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "塔拉戈纳"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "特鲁埃尔"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "托莱多"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "瓦伦西亚"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "巴利亚多利德"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "Bizkaia"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "萨莫拉"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "萨拉戈萨"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "休达"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "梅利利亚"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "安达卢西亚"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "阿拉贡"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "摩纳哥的阿斯图里亚斯"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "巴利阿里群岛"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "巴斯克地区"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "加纳利群岛"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "卡斯蒂利亚-拉曼恰"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "卡斯蒂利亚和莱昂"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "加泰隆尼亚"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "埃斯特雷马杜拉"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "加利西亚"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "穆尔西亚地区"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "Foral Community of Navarre"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "巴伦西亚社区"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "以 01XXX - 52XXX 的格式输入一个有效范围之内的邮政编码。"
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr "以 6XXXXXXXX, 8XXXXXXXX 或 9XXXXXXXX 的格式输入一个有效的电话号码。"
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "请输入一个有效的 NIF、NIE 或 CIF。"
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "请输入一个有效的 NIF 或 NIE 。"
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "无效的 NIF 校验和。"
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "无效的 NIE 校验和。"
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "无效的 CIF 校验和。"
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "请输入一个有效的银行帐号，格式为 XXXX-XXXX-XX-XXXXXXXXXX。"
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "无效的银行帐号校验和。"
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "输入一个有效的芬兰社会保障号码。"
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "电话号码必须为 XXXX-XXXXXX 格式。"
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "输入一个有效的邮政编码。"
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "Bedfordshire"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "白金汉郡"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "柴郡"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "Cornwall and Isles of Scilly"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "坎布里亚"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "Derbyshire"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "德宏"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "多塞特"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "达勒姆"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "东苏塞克斯"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "埃塞克斯"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "格洛斯特"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "大伦敦"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "大曼彻斯特"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "新罕布什尔州"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "赫特福德郡"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "肯特"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "兰开夏"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "莱斯特郡"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "林肯郡"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "Merseyside"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "诺福克"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "北约克郡"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "北安普敦郡"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "诺森伯兰"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "诺丁汉"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "牛津郡"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "什罗普郡"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "萨默塞特"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "南约克郡"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "斯塔福德"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "萨福克"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "萨里"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "Tyne and Wear"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "沃里克郡"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "西米德兰地区"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "西萨塞克斯"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "西约克郡"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "威尔特郡"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "伍斯特郡"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "安特里姆郡"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "阿玛县"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "County Down"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "弗马纳县"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "伦敦德里县"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "泰隆郡"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "Clwyd"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "Dyfed"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "Gwent"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "Gwynedd"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "中格拉摩根"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "Powys"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "南格拉摩根"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "西格拉摩根"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "Borders"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "中苏格兰"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "邓弗里斯和加洛韦"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "法伊夫"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "嘉林"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "高原"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "洛锡安"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "康威离岛"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "设得兰群岛"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "斯特拉思克莱德"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "泰赛德"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "西岛"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "英格兰"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "北爱尔兰"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "苏格兰"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "威尔斯"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "输入一个有效的车牌号码"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "输入一个有效的电话号码"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "输入一个有效的邮政编码"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "输入一个有效的 NIK/KTP 号码"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "亚齐"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "巴厘岛"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "万丹国"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "明古鲁"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "日惹"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "雅加达"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "哥伦打洛"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "占碑"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "西爪哇"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "中爪哇"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "爪哇帖木儿"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "西加里曼丹"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "南加里曼丹"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "中加里曼丹"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "东加里曼丹"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "邦加勿里洞群岛"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "廖内群岛"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "楠榜"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "马鲁古群岛"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "北马鲁古"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "西努沙登加拉"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "东努沙登加拉"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "巴布亚"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "廖内群岛"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "苏拉威西巴拉"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr ""
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr ""
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr ""
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr ""
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr ""
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr ""
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr ""
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr ""
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr ""
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr ""
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr ""
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr ""
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr ""
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr ""
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr ""
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr ""
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr ""
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr ""
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr ""
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr ""
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr ""
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr ""
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr ""
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr ""
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr ""
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr ""
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr ""
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr ""
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr ""
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr ""
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr ""
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr ""
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr ""
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr ""
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr ""
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr ""
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr ""
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr ""
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr ""
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr ""
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr ""
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr ""
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr ""
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr ""
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr ""
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr ""
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr ""
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr ""
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr ""
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr ""
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr ""
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr ""
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr ""
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr ""
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr ""
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr ""
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr ""
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr ""
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr ""
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr ""
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr ""
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr ""
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr ""
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr ""
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "罗斯哥蒙"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "斯莱戈"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "蒂帕雷里"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "泰隆"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "沃特福德"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "韦斯特米斯"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "韦克斯福德"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "维克罗"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "以 XXXXX 格式输入一个邮政编码。"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "输入一个有效的 ID 号码。"
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "输入一个有效的冰岛身份证号码。格式为 XXXXXX-XXXX 。"
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "无效的冰岛身份证号码。"
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "输入一个有效的邮政编码。"
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "输入一个有效的社会保障号码。"
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "输入一个有效的 VAT 号码。"
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "以 XXXXXXX 或 XXX-XXXX 的格式输入一个邮政编码。"
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "北海道"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "青森"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "岩手"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "宫城"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "秋田"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "山形"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "福岛"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "茨城"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "枥木"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "群马"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "埼玉"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "千叶"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "东京"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "神奈川"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "山梨"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "长野"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "新舄"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "富山"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "石川"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "福井"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "岐阜"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "静冈"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "爱知"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "三重"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "滋贺"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "京都"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "大坂"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "兵库"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "奈良"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "和歌山"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "鸟取"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "岛根"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "冈山"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "广岛"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "山口"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "德岛"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "香川"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "爱媛"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "高知"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "福冈"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "佐贺"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "长崎"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "熊本"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "大分"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "宫崎"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "鹿儿岛"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "冲绳岛"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr ""
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "阿瓜斯卡连特斯"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "下加利福尼亚州"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "巴哈加利福尼亚"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "坎佩切"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "奇瓦瓦"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "恰帕斯"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "科阿韦拉"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "科利马"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "联邦区"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "杜兰戈"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "格雷罗"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "Guanajuato"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "伊达尔戈"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "哈利斯科州"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "米却肯州"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "莫雷洛斯"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "纳亚里特"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "新莱昂州"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "瓦哈卡"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "普埃布拉"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "克雷塔罗"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "金塔纳罗奥"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "锡那罗亚州"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "圣路易斯波托西"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "索诺拉"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "塔巴斯科"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "塔毛利帕斯"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "特拉斯卡拉"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "韦拉克鲁斯"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "尤卡坦"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "萨卡特卡斯"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "输入一个有效的邮政编码"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "输入一个有效的 SoFi 号码"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "德伦特省"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "Flevoland"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "菲仕兰"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "格尔德兰"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "格罗宁根"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "北布拉邦"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "北荷兰"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "艾瑟尔"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "乌得勒支"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "Zeeland"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "南荷兰省"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "请输入一个有效的挪威社会保障号码。"
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "这个字段要求填写 8 位数字。"
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "这个字段要求填写 11 位数字。"
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "国家身份证号码由 11 位数字组成。"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "国家身份证号码校验和错误。"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "税号（NIP）校验和错误。"
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "国家商业注册号码（REGON）由 9 位或 14 位数字组成。"
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "国家商业注册号码（REGON）校验和错误。"
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "以 XX-XXX 的格式输入一个邮政编码。"
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "下西里西亚"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "Kuyavia-Pomerania"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "卢布林"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "Lubusz"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "罗兹"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "Lesser Poland"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "马佐夫舍"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "奥波莱"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "Subcarpatia"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "Podlasie"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "波美拉尼亚"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "西里西亚"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "Swietokrzyskie"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "Warmia-Masuria"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "Greater Poland"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "西波美拉尼亚"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "以 XXXX-XXX 格式输入一个邮政编码。"
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "电话号码必须是9位数，以 + 或 00 开头。"
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "输入一个有效的 CIF。"
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "输入一个有效的 CNP。"
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "以 ROXX-XXXX-XXXX-XXXX-XXXX-XXXX 格式输入一个有效的 IBAN"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "电话号码必须为 XXXX-XXXXXX 格式。"
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "以 XXXXXX 的格式输入一个邮政编码"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "输入一个有效的瑞典机构编号。"
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "输入一个瑞典个人身份证号码。"
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "统筹号码是不允许的。"
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "以 XXXXX 格式输入一个瑞典邮政编码。"
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "斯德哥尔摩"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr ""
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr ""
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "乌普萨拉"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr ""
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr ""
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr ""
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr ""
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr ""
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr ""
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr ""
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr ""
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr ""
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr ""
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr ""
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr ""
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr ""
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr ""
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr ""
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr ""
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr ""
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "班斯卡-比斯特里察"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "Banska Stiavnica"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "Bardejov"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "Banovce nad Bebravou"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "布雷兹诺"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "Bratislava I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "Bratislava II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "Bratislava III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "Bratislava IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "Bratislava V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "比特恰"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "Cadca"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "代特瓦"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "Dolny Kubin"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "Dunajska Streda"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "加兰塔"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "盖尔尼察"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "赫洛霍韦茨"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "Humenne"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "伊拉瓦"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "Kezmarok"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "Komarno"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "Kosice I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "Kosice II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "Kosice III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "Kosice IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "Kosice - okolie"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "克鲁皮纳"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "Kysucke Nove Mesto"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "Levice"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "勒沃卡"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "Liptovsky Mikulas"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "Lucenec"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "Malacky"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "Martin"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "梅济拉博尔采"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "Michalovce"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "Myjava"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "纳梅斯托沃"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "尼特拉"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "Nove Mesto nad Vahom"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "Nove Zamky"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "帕帝查斯葛"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "佩兹那克市"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "Piestany"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "波尔塔尔"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "Poprad"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "Povazska Bystrica"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "普雷绍夫"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "Prievidza"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "Puchov"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "Revuca"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "Rimavska Sobota"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "罗日尼亚瓦"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "Ruzomberok"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "Sabinov"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "塞内茨"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "Senica"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "Skalica"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "Snina"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "索布兰采"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "Spisska Nova Ves"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "Stara Lubovna"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "Stropkov"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "斯维德尼克"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "撒拉族"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "Topolcany"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "特雷比绍夫"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "特伦钦"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "Trnava"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "Turcianske Teplice"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "Tvrdosin"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "Velky Krtis"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "Vranov nad Toplou"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "兹拉特莫拉夫采"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "兹沃伦"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "扎尔诺维察"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "Ziar nad Hronom"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "日利纳"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "班斯卡-比斯特里察地区"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "布拉迪斯拉发地区"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "科希策地区"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "尼特拉地区"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "普雷绍夫地区"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "特伦钦地区"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "特尔纳瓦地区"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "日利纳地区"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "以 XXXXX 的格式输入一个邮政编码。"
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "电话号码的格式必须是 0XXX XXX XXXX 。"
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "输入一个有效的土耳其身份证号码。"
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "土耳其身份证号码必须为11位数字。"
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "以 XXXXX 或 XXXXX-XXX 的格式输入一个邮政编码。"
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "电话号码的格式必须是 XXX-XXX-XXXX。"
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "以 XXX-XX-XXXX 的格式输入一个有效的美国社会保障号码。"
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "输入一个美国州或领地名称。"
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "美国州名(两个大写字母)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "美国邮政编码（两个小写字母）"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "电话号码"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "以 X.XXX.XXX-X,XXXXXXX-X 或 XXXXXXXX 格式输入一个有效的 CI 号码"
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "输入一个有效的 CI 号码"
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "请输入一个有效的南非身份证号码。"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "输入一个有效的南非邮政编码"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "东开普省"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "Free State"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "豪登省"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "夸祖卢-纳塔尔"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "林波波河"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "姆普马兰加省"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "北开普省"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "西北"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "西开普"
diff --git a/django/contrib/localflavor/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/localflavor/locale/zh_TW/LC_MESSAGES/django.mo
deleted file mode 100644
index 0f4a0363d3..0000000000
Binary files a/django/contrib/localflavor/locale/zh_TW/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/django/contrib/localflavor/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/zh_TW/LC_MESSAGES/django.po
deleted file mode 100644
index 09d939727d..0000000000
--- a/django/contrib/localflavor/locale/zh_TW/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,3535 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jannis Leidel <jannis@leidel.info>, 2011.
-# ming hsien tzang <tzangms@gmail.com>, 2011.
-# quantum9876 <quantum9876@gmail.com>, 2011.
-# tcc <tcchou@tcchou.org>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-03-08 12:24+0000\n"
-"Last-Translator: tcc <tcchou@tcchou.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
-"language/zh_TW/)\n"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ar/forms.py:30
-msgid "Enter a postal code in the format NNNN or ANNNNAAA."
-msgstr "以 NNNN 或 ANNNNAAA的格式輸入郵遞區號。"
-
-#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
-msgid "This field requires only numbers."
-msgstr "此欄位只允許輸入數字"
-
-#: ar/forms.py:53
-msgid "This field requires 7 or 8 digits."
-msgstr "此欄位需要 7~8 位數"
-
-#: ar/forms.py:82
-msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "以 XX-XXXXXXXX-X 或 XXXXXXXXXXXX 的格式輸入CUIT 。"
-
-#: ar/forms.py:83
-msgid "Invalid CUIT."
-msgstr "無效的 CUIT"
-
-#: at/at_states.py:5
-msgid "Burgenland"
-msgstr "布爾根蘭"
-
-#: at/at_states.py:6
-msgid "Carinthia"
-msgstr "凱恩藤州"
-
-#: at/at_states.py:7
-msgid "Lower Austria"
-msgstr "下奧地利州"
-
-#: at/at_states.py:8
-msgid "Upper Austria"
-msgstr "上奧地利州"
-
-#: at/at_states.py:9
-msgid "Salzburg"
-msgstr "薩爾茨堡"
-
-#: at/at_states.py:10
-msgid "Styria"
-msgstr "施蒂利亞州"
-
-#: at/at_states.py:11
-msgid "Tyrol"
-msgstr "蒂羅爾州"
-
-#: at/at_states.py:12
-msgid "Vorarlberg"
-msgstr "福拉爾貝格州"
-
-#: at/at_states.py:13
-msgid "Vienna"
-msgstr "維也納州"
-
-#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
-msgid "Enter a zip code in the format XXXX."
-msgstr "用 XXXX 的格式輸入郵遞區號。"
-
-#: at/forms.py:50
-msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
-msgstr "以  XXXX XXXXXX 的格式輸入奧地利社會安全號碼。"
-
-#: au/forms.py:26
-msgid "Enter a 4 digit postcode."
-msgstr ""
-
-#: au/models.py:9
-msgid "Australian State"
-msgstr ""
-
-#: au/models.py:19
-msgid "Australian Postcode"
-msgstr ""
-
-#: au/models.py:33
-msgid "Australian Phone number"
-msgstr ""
-
-#: be/be_provinces.py:5
-msgid "Antwerp"
-msgstr "安特衛普"
-
-#: be/be_provinces.py:6
-msgid "Brussels"
-msgstr "布魯塞爾"
-
-#: be/be_provinces.py:7
-msgid "East Flanders"
-msgstr "東佛蘭德省"
-
-#: be/be_provinces.py:8
-msgid "Flemish Brabant"
-msgstr "法蘭德斯-布拉班特省"
-
-#: be/be_provinces.py:9
-msgid "Hainaut"
-msgstr "埃諾省"
-
-#: be/be_provinces.py:10
-msgid "Liege"
-msgstr "烈日省"
-
-#: be/be_provinces.py:11 nl/nl_provinces.py:9
-msgid "Limburg"
-msgstr "林堡"
-
-#: be/be_provinces.py:12
-msgid "Luxembourg"
-msgstr "盧森堡"
-
-#: be/be_provinces.py:13
-msgid "Namur"
-msgstr "那慕爾"
-
-#: be/be_provinces.py:14
-msgid "Walloon Brabant"
-msgstr "布拉班特-瓦隆"
-
-#: be/be_provinces.py:15
-msgid "West Flanders"
-msgstr "西佛蘭德省"
-
-#: be/be_regions.py:5
-msgid "Brussels Capital Region"
-msgstr "布魯塞爾"
-
-#: be/be_regions.py:6
-msgid "Flemish Region"
-msgstr "法蘭德斯區"
-
-#: be/be_regions.py:7
-msgid "Wallonia"
-msgstr "瓦隆"
-
-#: be/forms.py:25
-msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
-msgstr "以 1XXX - 9XXX 為範圍、格式輸入郵遞區號。"
-
-#: be/forms.py:48
-msgid ""
-"Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
-"04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
-"xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
-msgstr ""
-"以 0x xxx xx xx, 0xx xx xx xx, 04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, "
-"04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx.xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx 或 "
-"04xxxxxxxx 其中之一為格式，輸入電話號碼。"
-
-#: br/forms.py:22
-msgid "Enter a zip code in the format XXXXX-XXX."
-msgstr "用 XXXXX-XXX 的格式輸入郵遞區號。"
-
-#: br/forms.py:31
-msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "電話號碼必須是 XX-XXXX-XXXX 格式。"
-
-#: br/forms.py:58
-msgid ""
-"Select a valid brazilian state. That state is not one of the available "
-"states."
-msgstr "您輸入的不是正確的州。請選擇一個位於巴西的管轄州。"
-
-#: br/forms.py:93
-msgid "Invalid CPF number."
-msgstr "無效的 CPF 號碼。"
-
-#: br/forms.py:94
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "此欄必須輸入 11 位數的數字，或 14 個字母。"
-
-#: br/forms.py:133
-msgid "Invalid CNPJ number."
-msgstr "無效的 CNPJ 號碼。"
-
-#: br/forms.py:135
-msgid "This field requires at least 14 digits"
-msgstr "此欄必須至少有 14 位數。"
-
-#: ca/forms.py:29
-msgid "Enter a postal code in the format XXX XXX."
-msgstr "以 XXX XXX 為格式輸入郵遞區號。"
-
-#: ca/forms.py:110
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr "以 XXX-XXX-XXX 為格式輸入加拿大社會保險號碼。"
-
-#: ch/ch_states.py:5
-msgid "Aargau"
-msgstr "阿爾高州"
-
-#: ch/ch_states.py:6
-msgid "Appenzell Innerrhoden"
-msgstr "內亞本塞州"
-
-#: ch/ch_states.py:7
-msgid "Appenzell Ausserrhoden"
-msgstr "外阿彭策爾"
-
-#: ch/ch_states.py:8
-msgid "Basel-Stadt"
-msgstr "巴澤爾城市"
-
-#: ch/ch_states.py:9
-msgid "Basel-Land"
-msgstr "巴澤爾鄉村"
-
-#: ch/ch_states.py:10
-msgid "Berne"
-msgstr "伯恩"
-
-#: ch/ch_states.py:11
-msgid "Fribourg"
-msgstr "弗里堡"
-
-#: ch/ch_states.py:12
-msgid "Geneva"
-msgstr "日內瓦"
-
-#: ch/ch_states.py:13
-msgid "Glarus"
-msgstr "格拉魯斯"
-
-#: ch/ch_states.py:14
-msgid "Graubuenden"
-msgstr "格勞賓登"
-
-#: ch/ch_states.py:15
-msgid "Jura"
-msgstr "汝拉"
-
-#: ch/ch_states.py:16
-msgid "Lucerne"
-msgstr "琉森"
-
-#: ch/ch_states.py:17
-msgid "Neuchatel"
-msgstr "納沙泰爾"
-
-#: ch/ch_states.py:18
-msgid "Nidwalden"
-msgstr "下瓦爾登"
-
-#: ch/ch_states.py:19
-msgid "Obwalden"
-msgstr "上瓦爾登"
-
-#: ch/ch_states.py:20
-msgid "Schaffhausen"
-msgstr "沙夫豪森"
-
-#: ch/ch_states.py:21
-msgid "Schwyz"
-msgstr "施維茨"
-
-#: ch/ch_states.py:22
-msgid "Solothurn"
-msgstr "索洛圖恩"
-
-#: ch/ch_states.py:23
-msgid "St. Gallen"
-msgstr "聖加侖"
-
-#: ch/ch_states.py:24
-msgid "Thurgau"
-msgstr "圖爾高州"
-
-#: ch/ch_states.py:25
-msgid "Ticino"
-msgstr "提契諾"
-
-#: ch/ch_states.py:26
-msgid "Uri"
-msgstr "烏裡州"
-
-#: ch/ch_states.py:27
-msgid "Valais"
-msgstr "瓦萊"
-
-#: ch/ch_states.py:28
-msgid "Vaud"
-msgstr "沃"
-
-#: ch/ch_states.py:29
-msgid "Zug"
-msgstr "楚格"
-
-#: ch/ch_states.py:30
-msgid "Zurich"
-msgstr "蘇黎世"
-
-#: ch/forms.py:68
-msgid ""
-"Enter a valid Swiss identity or passport card number in X1234567<0 or "
-"1234567890 format."
-msgstr ""
-"以格式為 X1234567<0 或 1234567890 輸入一個有效的瑞士身份證號碼或者或是護照號"
-"碼。"
-
-#: cl/forms.py:32
-msgid "Enter a valid Chilean RUT."
-msgstr "請輸入智利 RUT。"
-
-#: cl/forms.py:33
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-msgstr "以 XX.XXX.XXX-x 為格式輸入智利RUT。"
-
-#: cl/forms.py:34
-msgid "The Chilean RUT is not valid."
-msgstr "輸入的智利 RUT 無效。"
-
-#: cn/forms.py:84
-msgid "Enter a post code in the format XXXXXX."
-msgstr ""
-
-#: cn/forms.py:105
-msgid "ID Card Number consists of 15 or 18 digits."
-msgstr ""
-
-#: cn/forms.py:106
-msgid "Invalid ID Card Number: Wrong checksum"
-msgstr ""
-
-#: cn/forms.py:107
-msgid "Invalid ID Card Number: Wrong birthdate"
-msgstr ""
-
-#: cn/forms.py:108
-msgid "Invalid ID Card Number: Wrong location code"
-msgstr ""
-
-#: cn/forms.py:193
-msgid "Enter a valid phone number."
-msgstr ""
-
-#: cn/forms.py:210
-msgid "Enter a valid cell number."
-msgstr ""
-
-#: cz/cz_regions.py:8
-msgid "Prague"
-msgstr "布拉格"
-
-#: cz/cz_regions.py:9
-msgid "Central Bohemian Region"
-msgstr "中波希米亞州"
-
-#: cz/cz_regions.py:10
-msgid "South Bohemian Region"
-msgstr "南波希米亞州"
-
-#: cz/cz_regions.py:11
-msgid "Pilsen Region"
-msgstr "比爾森州"
-
-#: cz/cz_regions.py:12
-msgid "Carlsbad Region"
-msgstr "卡羅維發利州"
-
-#: cz/cz_regions.py:13
-msgid "Usti Region"
-msgstr "烏斯季州"
-
-#: cz/cz_regions.py:14
-msgid "Liberec Region"
-msgstr "利貝雷茨州"
-
-#: cz/cz_regions.py:15
-msgid "Hradec Region"
-msgstr "赫拉德茨-克拉洛韋州"
-
-#: cz/cz_regions.py:16
-msgid "Pardubice Region"
-msgstr "帕爾杜比采州"
-
-#: cz/cz_regions.py:17
-msgid "Vysocina Region"
-msgstr "維索基納州"
-
-#: cz/cz_regions.py:18
-msgid "South Moravian Region"
-msgstr "南摩拉維亞州"
-
-#: cz/cz_regions.py:19
-msgid "Olomouc Region"
-msgstr "奧洛穆茨州"
-
-#: cz/cz_regions.py:20
-msgid "Zlin Region"
-msgstr "茲林州"
-
-#: cz/cz_regions.py:21
-msgid "Moravian-Silesian Region"
-msgstr "摩拉維亞-西里西亞州"
-
-#: cz/forms.py:32 sk/forms.py:33
-msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "以 XXXXX 或 XXX XX 的格式輸入郵遞區號。"
-
-#: cz/forms.py:52
-msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
-msgstr "以 XXXXXX/XXXX 或 XXXXXXXXXX 輸入出生日期。"
-
-#: cz/forms.py:53
-msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "您輸入錯誤的性別參數，應輸入 'f' 或 'm'。"
-
-#: cz/forms.py:54
-msgid "Enter a valid birth number."
-msgstr "請輸入正確的出生日期。"
-
-#: cz/forms.py:115
-msgid "Enter a valid IC number."
-msgstr "請輸入正確的 IC 號碼。"
-
-#: de/de_states.py:5
-msgid "Baden-Wuerttemberg"
-msgstr "巴登符騰堡"
-
-#: de/de_states.py:6
-msgid "Bavaria"
-msgstr "巴伐利亞"
-
-#: de/de_states.py:7
-msgid "Berlin"
-msgstr "柏林"
-
-#: de/de_states.py:8
-msgid "Brandenburg"
-msgstr "勃蘭登堡"
-
-#: de/de_states.py:9
-msgid "Bremen"
-msgstr "布萊梅"
-
-#: de/de_states.py:10
-msgid "Hamburg"
-msgstr "漢堡"
-
-#: de/de_states.py:11
-msgid "Hessen"
-msgstr "黑森"
-
-#: de/de_states.py:12
-msgid "Mecklenburg-Western Pomerania"
-msgstr "梅克倫堡-前波莫瑞"
-
-#: de/de_states.py:13
-msgid "Lower Saxony"
-msgstr "下薩克森"
-
-#: de/de_states.py:14
-msgid "North Rhine-Westphalia"
-msgstr "北萊茵-威斯特法倫"
-
-#: de/de_states.py:15
-msgid "Rhineland-Palatinate"
-msgstr "萊茵蘭-普法爾茨"
-
-#: de/de_states.py:16
-msgid "Saarland"
-msgstr "薩爾蘭"
-
-#: de/de_states.py:17
-msgid "Saxony"
-msgstr "薩克森"
-
-#: de/de_states.py:18
-msgid "Saxony-Anhalt"
-msgstr "薩克森-安哈爾特"
-
-#: de/de_states.py:19
-msgid "Schleswig-Holstein"
-msgstr "石勒蘇益格-荷爾斯泰因"
-
-#: de/de_states.py:20
-msgid "Thuringia"
-msgstr "圖林根"
-
-#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
-msgid "Enter a zip code in the format XXXXX."
-msgstr "用 XXXXX 的格式輸入郵遞區號。"
-
-#: de/forms.py:46
-msgid ""
-"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
-"format."
-msgstr "以 XXXXXXXXXXX-XXXXXXX-XXXXXXX-X 的格式輸入德國身份證字號。"
-
-#: es/es_provinces.py:5
-msgid "Arava"
-msgstr "阿拉瓦"
-
-#: es/es_provinces.py:6
-msgid "Albacete"
-msgstr "阿爾瓦塞特"
-
-#: es/es_provinces.py:7
-msgid "Alacant"
-msgstr "阿利坎特"
-
-#: es/es_provinces.py:8
-msgid "Almeria"
-msgstr "阿爾梅里亞"
-
-#: es/es_provinces.py:9
-msgid "Avila"
-msgstr "阿維拉"
-
-#: es/es_provinces.py:10
-msgid "Badajoz"
-msgstr "巴達霍斯"
-
-#: es/es_provinces.py:11
-msgid "Illes Balears"
-msgstr "巴利阿里群島"
-
-#: es/es_provinces.py:12
-msgid "Barcelona"
-msgstr "巴塞羅那"
-
-#: es/es_provinces.py:13
-msgid "Burgos"
-msgstr "布爾戈斯"
-
-#: es/es_provinces.py:14
-msgid "Caceres"
-msgstr "卡塞雷斯"
-
-#: es/es_provinces.py:15
-msgid "Cadiz"
-msgstr "加迪斯"
-
-#: es/es_provinces.py:16
-msgid "Castello"
-msgstr "城堡"
-
-#: es/es_provinces.py:17
-msgid "Ciudad Real"
-msgstr "雷亞爾"
-
-#: es/es_provinces.py:18
-msgid "Cordoba"
-msgstr "科多巴"
-
-#: es/es_provinces.py:19
-msgid "A Coruna"
-msgstr "拉科魯納"
-
-#: es/es_provinces.py:20
-msgid "Cuenca"
-msgstr "昆卡"
-
-#: es/es_provinces.py:21
-msgid "Girona"
-msgstr "赫羅納"
-
-#: es/es_provinces.py:22
-msgid "Granada"
-msgstr "格拉納達"
-
-#: es/es_provinces.py:23
-msgid "Guadalajara"
-msgstr "瓜達拉哈拉"
-
-#: es/es_provinces.py:24
-msgid "Guipuzkoa"
-msgstr "吉普斯夸"
-
-#: es/es_provinces.py:25
-msgid "Huelva"
-msgstr "韋爾瓦"
-
-#: es/es_provinces.py:26
-msgid "Huesca"
-msgstr "韋斯卡"
-
-#: es/es_provinces.py:27
-msgid "Jaen"
-msgstr "哈恩"
-
-#: es/es_provinces.py:28
-msgid "Leon"
-msgstr "里昂"
-
-#: es/es_provinces.py:29
-msgid "Lleida"
-msgstr "萊里達"
-
-#: es/es_provinces.py:30 es/es_regions.py:17
-msgid "La Rioja"
-msgstr "里奧夏"
-
-#: es/es_provinces.py:31
-msgid "Lugo"
-msgstr "盧戈"
-
-#: es/es_provinces.py:32 es/es_regions.py:18
-msgid "Madrid"
-msgstr "馬德里"
-
-#: es/es_provinces.py:33
-msgid "Malaga"
-msgstr "馬拉加"
-
-#: es/es_provinces.py:34
-msgid "Murcia"
-msgstr "穆爾西亞"
-
-#: es/es_provinces.py:35
-msgid "Navarre"
-msgstr "納瓦拉"
-
-#: es/es_provinces.py:36
-msgid "Ourense"
-msgstr "奥倫斯"
-
-#: es/es_provinces.py:37
-msgid "Asturias"
-msgstr "阿斯杜里亞斯"
-
-#: es/es_provinces.py:38
-msgid "Palencia"
-msgstr "帕倫西亞"
-
-#: es/es_provinces.py:39
-msgid "Las Palmas"
-msgstr "洛斯卡布斯"
-
-#: es/es_provinces.py:40
-msgid "Pontevedra"
-msgstr "蓬特韋德拉"
-
-#: es/es_provinces.py:41
-msgid "Salamanca"
-msgstr "薩拉曼卡"
-
-#: es/es_provinces.py:42
-msgid "Santa Cruz de Tenerife"
-msgstr "聖克魯斯-德特內裡費"
-
-#: es/es_provinces.py:43 es/es_regions.py:11
-msgid "Cantabria"
-msgstr "坎塔布里亞"
-
-#: es/es_provinces.py:44
-msgid "Segovia"
-msgstr "塞哥維亞"
-
-#: es/es_provinces.py:45
-msgid "Seville"
-msgstr "塞維利亞"
-
-#: es/es_provinces.py:46
-msgid "Soria"
-msgstr "索里亞"
-
-#: es/es_provinces.py:47
-msgid "Tarragona"
-msgstr "塔拉戈納"
-
-#: es/es_provinces.py:48
-msgid "Teruel"
-msgstr "特魯埃爾"
-
-#: es/es_provinces.py:49
-msgid "Toledo"
-msgstr "托萊多"
-
-#: es/es_provinces.py:50
-msgid "Valencia"
-msgstr "巴倫西亞"
-
-#: es/es_provinces.py:51
-msgid "Valladolid"
-msgstr "瓦利阿多里德"
-
-#: es/es_provinces.py:52
-msgid "Bizkaia"
-msgstr "巴斯克"
-
-#: es/es_provinces.py:53
-msgid "Zamora"
-msgstr "薩莫拉"
-
-#: es/es_provinces.py:54
-msgid "Zaragoza"
-msgstr "薩拉戈薩"
-
-#: es/es_provinces.py:55
-msgid "Ceuta"
-msgstr "休達"
-
-#: es/es_provinces.py:56
-msgid "Melilla"
-msgstr "梅利利亞"
-
-#: es/es_regions.py:5
-msgid "Andalusia"
-msgstr "安達魯西亞"
-
-#: es/es_regions.py:6
-msgid "Aragon"
-msgstr "阿拉貢"
-
-#: es/es_regions.py:7
-msgid "Principality of Asturias"
-msgstr "Principality of Asturias"
-
-#: es/es_regions.py:8
-msgid "Balearic Islands"
-msgstr "巴利阿里群島"
-
-#: es/es_regions.py:9
-msgid "Basque Country"
-msgstr "巴斯克地區"
-
-#: es/es_regions.py:10
-msgid "Canary Islands"
-msgstr "加那利群島"
-
-#: es/es_regions.py:12
-msgid "Castile-La Mancha"
-msgstr "卡斯提爾-拉曼查"
-
-#: es/es_regions.py:13
-msgid "Castile and Leon"
-msgstr "卡斯蒂利亞和里昂"
-
-#: es/es_regions.py:14
-msgid "Catalonia"
-msgstr "加泰隆尼亞"
-
-#: es/es_regions.py:15
-msgid "Extremadura"
-msgstr "艾司德雷馬度"
-
-#: es/es_regions.py:16
-msgid "Galicia"
-msgstr "加利西亞"
-
-#: es/es_regions.py:19
-msgid "Region of Murcia"
-msgstr "穆爾西亞地區"
-
-#: es/es_regions.py:20
-msgid "Foral Community of Navarre"
-msgstr "納瓦爾王國"
-
-#: es/es_regions.py:21
-msgid "Valencian Community"
-msgstr "瓦倫西亞自治區"
-
-#: es/forms.py:26
-msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "輸入範圍 01XXX - 52XXX 的郵遞區號。"
-
-#: es/forms.py:46
-msgid ""
-"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
-"9XXXXXXXX."
-msgstr "以 6XXXXXXXX, 8XXXXXXXX 或 9XXXXXXXX 的格式輸入電話號碼。"
-
-#: es/forms.py:73
-msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "輸入正確的 NIF, NIE 或 CIF。"
-
-#: es/forms.py:74
-msgid "Please enter a valid NIF or NIE."
-msgstr "輸入正確的 NIF 或 NIE。"
-
-#: es/forms.py:75
-msgid "Invalid checksum for NIF."
-msgstr "無效的 NIF 校驗和。"
-
-#: es/forms.py:76
-msgid "Invalid checksum for NIE."
-msgstr "無效的 NIE 校驗和。"
-
-#: es/forms.py:77
-msgid "Invalid checksum for CIF."
-msgstr "無效的 CIF 校驗和。"
-
-#: es/forms.py:149
-msgid ""
-"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "請輸入一個有效的銀行值帳號，格式為 XXXX-XXXX-XX-XXXXXXXXXX。"
-
-#: es/forms.py:150
-msgid "Invalid checksum for bank account number."
-msgstr "無效的銀行帳號校驗和。"
-
-#: fi/forms.py:33
-msgid "Enter a valid Finnish social security number."
-msgstr "請輸入一個有效的芬蘭社會保險號碼。"
-
-#: fr/forms.py:35
-msgid "Phone numbers must be in 0X XX XX XX XX format."
-msgstr "以 0X XX XX XX XX 的格式輸入電話號碼。"
-
-#: gb/forms.py:25
-msgid "Enter a valid postcode."
-msgstr "輸入有效的郵遞區號"
-
-#: gb/gb_regions.py:11
-msgid "Bedfordshire"
-msgstr "貝德福郡"
-
-#: gb/gb_regions.py:12
-msgid "Buckinghamshire"
-msgstr "白金漢郡"
-
-#: gb/gb_regions.py:14
-msgid "Cheshire"
-msgstr "柴郡"
-
-#: gb/gb_regions.py:15
-msgid "Cornwall and Isles of Scilly"
-msgstr "康瓦爾和錫利群島"
-
-#: gb/gb_regions.py:16
-msgid "Cumbria"
-msgstr "坎布里亞郡"
-
-#: gb/gb_regions.py:17
-msgid "Derbyshire"
-msgstr "德比郡"
-
-#: gb/gb_regions.py:18
-msgid "Devon"
-msgstr "德文郡"
-
-#: gb/gb_regions.py:19
-msgid "Dorset"
-msgstr "多實郡"
-
-#: gb/gb_regions.py:20
-msgid "Durham"
-msgstr "達拉謨"
-
-#: gb/gb_regions.py:21
-msgid "East Sussex"
-msgstr "東薩塞克斯郡"
-
-#: gb/gb_regions.py:22
-msgid "Essex"
-msgstr "雅息士郡"
-
-#: gb/gb_regions.py:23
-msgid "Gloucestershire"
-msgstr "告羅士打郡"
-
-#: gb/gb_regions.py:24
-msgid "Greater London"
-msgstr "大倫敦"
-
-#: gb/gb_regions.py:25
-msgid "Greater Manchester"
-msgstr "大曼徹斯特郡"
-
-#: gb/gb_regions.py:26
-msgid "Hampshire"
-msgstr "漢普郡"
-
-#: gb/gb_regions.py:27
-msgid "Hertfordshire"
-msgstr "哈特福郡"
-
-#: gb/gb_regions.py:28
-msgid "Kent"
-msgstr "肯特郡"
-
-#: gb/gb_regions.py:29
-msgid "Lancashire"
-msgstr "蘭開夏"
-
-#: gb/gb_regions.py:30
-msgid "Leicestershire"
-msgstr "萊斯特郡"
-
-#: gb/gb_regions.py:31
-msgid "Lincolnshire"
-msgstr "林肯郡"
-
-#: gb/gb_regions.py:32
-msgid "Merseyside"
-msgstr "默西塞德郡"
-
-#: gb/gb_regions.py:33
-msgid "Norfolk"
-msgstr "諾福克郡"
-
-#: gb/gb_regions.py:34
-msgid "North Yorkshire"
-msgstr "北約克郡"
-
-#: gb/gb_regions.py:35
-msgid "Northamptonshire"
-msgstr "北安普敦郡"
-
-#: gb/gb_regions.py:36
-msgid "Northumberland"
-msgstr "諾森伯蘭郡"
-
-#: gb/gb_regions.py:37
-msgid "Nottinghamshire"
-msgstr "諾丁罕郡"
-
-#: gb/gb_regions.py:38
-msgid "Oxfordshire"
-msgstr "牛津郡"
-
-#: gb/gb_regions.py:39
-msgid "Shropshire"
-msgstr "施洛普郡"
-
-#: gb/gb_regions.py:40
-msgid "Somerset"
-msgstr "森麻實郡"
-
-#: gb/gb_regions.py:41
-msgid "South Yorkshire"
-msgstr "南約克郡"
-
-#: gb/gb_regions.py:42
-msgid "Staffordshire"
-msgstr "斯塔福郡"
-
-#: gb/gb_regions.py:43
-msgid "Suffolk"
-msgstr "沙福郡"
-
-#: gb/gb_regions.py:44
-msgid "Surrey"
-msgstr "舒梨郡"
-
-#: gb/gb_regions.py:45
-msgid "Tyne and Wear"
-msgstr "泰恩-威爾郡"
-
-#: gb/gb_regions.py:46
-msgid "Warwickshire"
-msgstr "瓦立克郡"
-
-#: gb/gb_regions.py:47
-msgid "West Midlands"
-msgstr "西密德蘭"
-
-#: gb/gb_regions.py:48
-msgid "West Sussex"
-msgstr "西薩塞克斯郡"
-
-#: gb/gb_regions.py:49
-msgid "West Yorkshire"
-msgstr "西約克郡"
-
-#: gb/gb_regions.py:50
-msgid "Wiltshire"
-msgstr "威爾特郡"
-
-#: gb/gb_regions.py:51
-msgid "Worcestershire"
-msgstr "伍斯特郡"
-
-#: gb/gb_regions.py:55
-msgid "County Antrim"
-msgstr "安特里姆郡"
-
-#: gb/gb_regions.py:56
-msgid "County Armagh"
-msgstr "阿馬郡"
-
-#: gb/gb_regions.py:57
-msgid "County Down"
-msgstr "唐郡"
-
-#: gb/gb_regions.py:58
-msgid "County Fermanagh"
-msgstr "弗馬納郡"
-
-#: gb/gb_regions.py:59
-msgid "County Londonderry"
-msgstr "倫敦德里郡"
-
-#: gb/gb_regions.py:60
-msgid "County Tyrone"
-msgstr "蒂龍郡"
-
-#: gb/gb_regions.py:64
-msgid "Clwyd"
-msgstr "克盧伊德"
-
-#: gb/gb_regions.py:65
-msgid "Dyfed"
-msgstr "戴菲德"
-
-#: gb/gb_regions.py:66
-msgid "Gwent"
-msgstr "格溫特"
-
-#: gb/gb_regions.py:67
-msgid "Gwynedd"
-msgstr "圭內斯"
-
-#: gb/gb_regions.py:68
-msgid "Mid Glamorgan"
-msgstr "中格拉摩根"
-
-#: gb/gb_regions.py:69
-msgid "Powys"
-msgstr "波伊斯"
-
-#: gb/gb_regions.py:70
-msgid "South Glamorgan"
-msgstr "南格拉摩根"
-
-#: gb/gb_regions.py:71
-msgid "West Glamorgan"
-msgstr "西格拉摩根"
-
-#: gb/gb_regions.py:75
-msgid "Borders"
-msgstr "博德斯"
-
-#: gb/gb_regions.py:76
-msgid "Central Scotland"
-msgstr "中央蘇格蘭"
-
-#: gb/gb_regions.py:77
-msgid "Dumfries and Galloway"
-msgstr "鄧弗里斯-加洛韋"
-
-#: gb/gb_regions.py:78
-msgid "Fife"
-msgstr "法夫"
-
-#: gb/gb_regions.py:79
-msgid "Grampian"
-msgstr "嘉林邊"
-
-#: gb/gb_regions.py:80
-msgid "Highland"
-msgstr "高地 (蘇格蘭行政區)"
-
-#: gb/gb_regions.py:81
-msgid "Lothian"
-msgstr "洛錫安"
-
-#: gb/gb_regions.py:82
-msgid "Orkney Islands"
-msgstr "奧克尼群島"
-
-#: gb/gb_regions.py:83
-msgid "Shetland Islands"
-msgstr "昔德蘭群島"
-
-#: gb/gb_regions.py:84
-msgid "Strathclyde"
-msgstr "斯特拉思克萊德"
-
-#: gb/gb_regions.py:85
-msgid "Tayside"
-msgstr "泰賽德"
-
-#: gb/gb_regions.py:86
-msgid "Western Isles"
-msgstr "埃利安錫爾"
-
-#: gb/gb_regions.py:90
-msgid "England"
-msgstr "英格蘭"
-
-#: gb/gb_regions.py:91
-msgid "Northern Ireland"
-msgstr "北愛爾蘭"
-
-#: gb/gb_regions.py:92
-msgid "Scotland"
-msgstr "蘇格蘭"
-
-#: gb/gb_regions.py:93
-msgid "Wales"
-msgstr "威爾斯"
-
-#: hr/forms.py:75
-msgid "Enter a valid 13 digit JMBG"
-msgstr ""
-
-#: hr/forms.py:76
-msgid "Error in date segment"
-msgstr ""
-
-#: hr/forms.py:123
-msgid "Enter a valid 11 digit OIB"
-msgstr ""
-
-#: hr/forms.py:152 id/forms.py:112
-msgid "Enter a valid vehicle license plate number"
-msgstr "輸入正確的居住許可號碼。"
-
-#: hr/forms.py:153
-msgid "Enter a valid location code"
-msgstr ""
-
-#: hr/forms.py:154
-msgid "Number part cannot be zero"
-msgstr ""
-
-#: hr/forms.py:190
-msgid "Enter a valid 5 digit postal code"
-msgstr ""
-
-#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
-msgid "Enter a valid phone number"
-msgstr "輸入正確的電話號碼。"
-
-#: hr/forms.py:219
-msgid "Enter a valid area or mobile network code"
-msgstr ""
-
-#: hr/forms.py:220
-msgid "The phone nubmer is too long"
-msgstr ""
-
-#: hr/forms.py:258
-msgid "Enter a valid 19 digit JMBAG starting with 601983"
-msgstr ""
-
-#: hr/forms.py:259
-msgid "Card issue number cannot be zero"
-msgstr ""
-
-#: hr/hr_choices.py:12
-msgid "Grad Zagreb"
-msgstr ""
-
-#: hr/hr_choices.py:13
-msgid "Bjelovarsko-bilogorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:14
-msgid "Brodsko-posavska županija"
-msgstr ""
-
-#: hr/hr_choices.py:15
-msgid "Dubrovačko-neretvanska županija"
-msgstr ""
-
-#: hr/hr_choices.py:16
-msgid "Istarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:17
-msgid "Karlovačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:18
-msgid "Koprivničko-križevačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:19
-msgid "Krapinsko-zagorska županija"
-msgstr ""
-
-#: hr/hr_choices.py:20
-msgid "Ličko-senjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:21
-msgid "Međimurska županija"
-msgstr ""
-
-#: hr/hr_choices.py:22
-msgid "Osječko-baranjska županija"
-msgstr ""
-
-#: hr/hr_choices.py:23
-msgid "Požeško-slavonska županija"
-msgstr ""
-
-#: hr/hr_choices.py:24
-msgid "Primorsko-goranska županija"
-msgstr ""
-
-#: hr/hr_choices.py:25
-msgid "Sisačko-moslavačka županija"
-msgstr ""
-
-#: hr/hr_choices.py:26
-msgid "Splitsko-dalmatinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:27
-msgid "Šibensko-kninska županija"
-msgstr ""
-
-#: hr/hr_choices.py:28
-msgid "Varaždinska županija"
-msgstr ""
-
-#: hr/hr_choices.py:29
-msgid "Virovitičko-podravska županija"
-msgstr ""
-
-#: hr/hr_choices.py:30
-msgid "Vukovarsko-srijemska županija"
-msgstr ""
-
-#: hr/hr_choices.py:31
-msgid "Zadarska županija"
-msgstr ""
-
-#: hr/hr_choices.py:32
-msgid "Zagrebačka županija"
-msgstr ""
-
-#: id/forms.py:31
-msgid "Enter a valid post code"
-msgstr "輸入正確的郵遞區號。"
-
-#: id/forms.py:176
-msgid "Enter a valid NIK/KTP number"
-msgstr "輸入正確的 NIK/KTP 號碼。"
-
-#: id/id_choices.py:15
-msgid "Aceh"
-msgstr "亞齊特別行政區"
-
-#: id/id_choices.py:16 id/id_choices.py:79
-msgid "Bali"
-msgstr "峇里省"
-
-#: id/id_choices.py:17 id/id_choices.py:51
-msgid "Banten"
-msgstr "萬丹省"
-
-#: id/id_choices.py:18 id/id_choices.py:60
-msgid "Bengkulu"
-msgstr "明古魯省"
-
-#: id/id_choices.py:19 id/id_choices.py:53
-msgid "Yogyakarta"
-msgstr "日惹市"
-
-#: id/id_choices.py:20 id/id_choices.py:57
-msgid "Jakarta"
-msgstr "雅加達首都特區"
-
-#: id/id_choices.py:21 id/id_choices.py:81
-msgid "Gorontalo"
-msgstr "哥倫打洛省"
-
-#: id/id_choices.py:22 id/id_choices.py:63
-msgid "Jambi"
-msgstr "占碑省"
-
-#: id/id_choices.py:23
-msgid "Jawa Barat"
-msgstr "西爪哇省"
-
-#: id/id_choices.py:24
-msgid "Jawa Tengah"
-msgstr "中爪哇省"
-
-#: id/id_choices.py:25
-msgid "Jawa Timur"
-msgstr "東爪哇省"
-
-#: id/id_choices.py:26 id/id_choices.py:94
-msgid "Kalimantan Barat"
-msgstr "西加里曼丹省"
-
-#: id/id_choices.py:27 id/id_choices.py:72
-msgid "Kalimantan Selatan"
-msgstr "南加里曼丹省"
-
-#: id/id_choices.py:28 id/id_choices.py:95
-msgid "Kalimantan Tengah"
-msgstr "中加里曼丹省"
-
-#: id/id_choices.py:29 id/id_choices.py:96
-msgid "Kalimantan Timur"
-msgstr "東加里曼丹省"
-
-#: id/id_choices.py:30
-msgid "Kepulauan Bangka-Belitung"
-msgstr "邦加-勿里洞省"
-
-#: id/id_choices.py:31 id/id_choices.py:68
-msgid "Kepulauan Riau"
-msgstr "廖內群島省"
-
-#: id/id_choices.py:32 id/id_choices.py:61
-msgid "Lampung"
-msgstr "楠榜省"
-
-#: id/id_choices.py:33 id/id_choices.py:76
-msgid "Maluku"
-msgstr "馬魯古省"
-
-#: id/id_choices.py:34 id/id_choices.py:77
-msgid "Maluku Utara"
-msgstr "北馬魯古省"
-
-#: id/id_choices.py:35
-msgid "Nusa Tenggara Barat"
-msgstr "西努沙登加拉省"
-
-#: id/id_choices.py:36
-msgid "Nusa Tenggara Timur"
-msgstr "東努沙登加拉省"
-
-#: id/id_choices.py:37
-msgid "Papua"
-msgstr "巴布亞省"
-
-#: id/id_choices.py:38
-msgid "Papua Barat"
-msgstr "西巴布亞省"
-
-#: id/id_choices.py:39 id/id_choices.py:66
-msgid "Riau"
-msgstr "廖內省"
-
-#: id/id_choices.py:40 id/id_choices.py:74
-msgid "Sulawesi Barat"
-msgstr "西蘇拉威西省"
-
-#: id/id_choices.py:41 id/id_choices.py:75
-msgid "Sulawesi Selatan"
-msgstr "南蘇拉威西省"
-
-#: id/id_choices.py:42 id/id_choices.py:82
-msgid "Sulawesi Tengah"
-msgstr "中蘇拉威西省"
-
-#: id/id_choices.py:43 id/id_choices.py:85
-msgid "Sulawesi Tenggara"
-msgstr "東南蘇拉威西省"
-
-#: id/id_choices.py:44
-msgid "Sulawesi Utara"
-msgstr "北蘇拉威西省"
-
-#: id/id_choices.py:45 id/id_choices.py:58
-msgid "Sumatera Barat"
-msgstr "西蘇門答臘省"
-
-#: id/id_choices.py:46 id/id_choices.py:62
-msgid "Sumatera Selatan"
-msgstr "中蘇門答臘省"
-
-#: id/id_choices.py:47 id/id_choices.py:64
-msgid "Sumatera Utara"
-msgstr "北蘇門答臘省"
-
-#: id/id_choices.py:52
-msgid "Magelang"
-msgstr "馬格朗"
-
-#: id/id_choices.py:54
-msgid "Surakarta - Solo"
-msgstr "梭羅市"
-
-#: id/id_choices.py:55
-msgid "Madiun"
-msgstr "茉莉芬"
-
-#: id/id_choices.py:56
-msgid "Kediri"
-msgstr "練義里"
-
-#: id/id_choices.py:59
-msgid "Tapanuli"
-msgstr "塔帕努里"
-
-#: id/id_choices.py:65
-msgid "Nanggroe Aceh Darussalam"
-msgstr "亞齊達魯薩蘭特區"
-
-#: id/id_choices.py:67
-msgid "Kepulauan Bangka Belitung"
-msgstr "邦加勿裡洞群島"
-
-#: id/id_choices.py:69
-msgid "Corps Consulate"
-msgstr "領事團"
-
-#: id/id_choices.py:70
-msgid "Corps Diplomatic"
-msgstr "外交使團"
-
-#: id/id_choices.py:71
-msgid "Bandung"
-msgstr "萬隆"
-
-#: id/id_choices.py:73
-msgid "Sulawesi Utara Daratan"
-msgstr "蘇拉威西北內地"
-
-#: id/id_choices.py:78
-msgid "NTT - Timor"
-msgstr "東努沙登加拉省 - 帝汶"
-
-#: id/id_choices.py:80
-msgid "Sulawesi Utara Kepulauan"
-msgstr "蘇拉威西群島"
-
-#: id/id_choices.py:83
-msgid "NTB - Lombok"
-msgstr "西努沙登加拉省 - 龍目"
-
-#: id/id_choices.py:84
-msgid "Papua dan Papua Barat"
-msgstr "巴布亞和西巴布亞"
-
-#: id/id_choices.py:86
-msgid "Cirebon"
-msgstr "井里汶"
-
-#: id/id_choices.py:87
-msgid "NTB - Sumbawa"
-msgstr "西努沙登加拉省 - 松巴哇"
-
-#: id/id_choices.py:88
-msgid "NTT - Flores"
-msgstr "東努沙登加拉省 - 弗洛勒斯"
-
-#: id/id_choices.py:89
-msgid "NTT - Sumba"
-msgstr "東努沙登加拉省 - 松巴"
-
-#: id/id_choices.py:90
-msgid "Bogor"
-msgstr "茂物"
-
-#: id/id_choices.py:91
-msgid "Pekalongan"
-msgstr "北加浪岸"
-
-#: id/id_choices.py:92
-msgid "Semarang"
-msgstr "三寶壟"
-
-#: id/id_choices.py:93
-msgid "Pati"
-msgstr "帕蒂"
-
-#: id/id_choices.py:97
-msgid "Surabaya"
-msgstr "泗水"
-
-#: id/id_choices.py:98
-msgid "Madura"
-msgstr "馬杜拉"
-
-#: id/id_choices.py:99
-msgid "Malang"
-msgstr "馬朗"
-
-#: id/id_choices.py:100
-msgid "Jember"
-msgstr "任抹"
-
-#: id/id_choices.py:101
-msgid "Banyumas"
-msgstr "班尤馬"
-
-#: id/id_choices.py:102
-msgid "Federal Government"
-msgstr "聯合政府"
-
-#: id/id_choices.py:103
-msgid "Bojonegoro"
-msgstr "新埔頭"
-
-#: id/id_choices.py:104
-msgid "Purwakarta"
-msgstr "普瓦卡達"
-
-#: id/id_choices.py:105
-msgid "Sidoarjo"
-msgstr "詩都阿佐"
-
-#: id/id_choices.py:106
-msgid "Garut"
-msgstr "牙律"
-
-#: ie/ie_counties.py:8
-msgid "Antrim"
-msgstr "安特里姆郡"
-
-#: ie/ie_counties.py:9
-msgid "Armagh"
-msgstr "阿馬郡"
-
-#: ie/ie_counties.py:10
-msgid "Carlow"
-msgstr "卡婁郡"
-
-#: ie/ie_counties.py:11
-msgid "Cavan"
-msgstr "卡文郡"
-
-#: ie/ie_counties.py:12
-msgid "Clare"
-msgstr "克萊爾郡"
-
-#: ie/ie_counties.py:13
-msgid "Cork"
-msgstr "科克郡"
-
-#: ie/ie_counties.py:14
-msgid "Derry"
-msgstr "德里"
-
-#: ie/ie_counties.py:15
-msgid "Donegal"
-msgstr "當尼戈爾郡"
-
-#: ie/ie_counties.py:16
-msgid "Down"
-msgstr "唐郡"
-
-#: ie/ie_counties.py:17
-msgid "Dublin"
-msgstr "都柏林郡"
-
-#: ie/ie_counties.py:18
-msgid "Fermanagh"
-msgstr "弗馬納郡"
-
-#: ie/ie_counties.py:19
-msgid "Galway"
-msgstr "高維郡"
-
-#: ie/ie_counties.py:20
-msgid "Kerry"
-msgstr "凱瑞郡"
-
-#: ie/ie_counties.py:21
-msgid "Kildare"
-msgstr "基爾代爾郡"
-
-#: ie/ie_counties.py:22
-msgid "Kilkenny"
-msgstr "基爾肯尼郡"
-
-#: ie/ie_counties.py:23
-msgid "Laois"
-msgstr "利施郡"
-
-#: ie/ie_counties.py:24
-msgid "Leitrim"
-msgstr "利特里姆郡"
-
-#: ie/ie_counties.py:25
-msgid "Limerick"
-msgstr "利默里克郡"
-
-#: ie/ie_counties.py:26
-msgid "Longford"
-msgstr "朗福德郡"
-
-#: ie/ie_counties.py:27
-msgid "Louth"
-msgstr "勞斯郡"
-
-#: ie/ie_counties.py:28
-msgid "Mayo"
-msgstr "梅歐郡"
-
-#: ie/ie_counties.py:29
-msgid "Meath"
-msgstr "西米斯郡"
-
-#: ie/ie_counties.py:30
-msgid "Monaghan"
-msgstr "莫納亨郡"
-
-#: ie/ie_counties.py:31
-msgid "Offaly"
-msgstr "奧法利郡"
-
-#: ie/ie_counties.py:32
-msgid "Roscommon"
-msgstr "羅斯康門郡"
-
-#: ie/ie_counties.py:33
-msgid "Sligo"
-msgstr "斯萊戈郡"
-
-#: ie/ie_counties.py:34
-msgid "Tipperary"
-msgstr "蒂珀雷里郡"
-
-#: ie/ie_counties.py:35
-msgid "Tyrone"
-msgstr "蒂龍郡"
-
-#: ie/ie_counties.py:36
-msgid "Waterford"
-msgstr "沃特福德郡"
-
-#: ie/ie_counties.py:37
-msgid "Westmeath"
-msgstr "西米斯郡"
-
-#: ie/ie_counties.py:38
-msgid "Wexford"
-msgstr "韋克斯福德"
-
-#: ie/ie_counties.py:39
-msgid "Wicklow"
-msgstr "威克洛郡"
-
-#: il/forms.py:31
-msgid "Enter a postal code in the format XXXXX"
-msgstr "以 XXXXX 的格式輸入郵遞區號。"
-
-#: il/forms.py:50
-msgid "Enter a valid ID number."
-msgstr "請輸入正確的 ID 號碼。"
-
-#: in_/forms.py:41
-msgid "Enter a zip code in the format XXXXXX or XXX XXX."
-msgstr ""
-
-#: in_/forms.py:64
-msgid "Enter an Indian state or territory."
-msgstr ""
-
-#: in_/forms.py:103
-msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
-msgstr ""
-
-#: is_/forms.py:22
-msgid ""
-"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "用 XXXXXX-XXXX 的格式輸入冰島身份證號碼。"
-
-#: is_/forms.py:23
-msgid "The Icelandic identification number is not valid."
-msgstr "無效的冰島身份證號碼。"
-
-#: it/forms.py:21
-msgid "Enter a valid zip code."
-msgstr "請輸入正確的郵遞區號。"
-
-#: it/forms.py:48
-msgid "Enter a valid Social Security number."
-msgstr "請輸入正確的社會安全號碼。"
-
-#: it/forms.py:73
-msgid "Enter a valid VAT number."
-msgstr "請輸入正確的 VAT 號碼。"
-
-#: jp/forms.py:19
-msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr "用 XXXXXXX 或 XXX-XXXX 的格式輸入郵遞區號。"
-
-#: jp/jp_prefectures.py:4
-msgid "Hokkaido"
-msgstr "北海道"
-
-#: jp/jp_prefectures.py:5
-msgid "Aomori"
-msgstr "青森"
-
-#: jp/jp_prefectures.py:6
-msgid "Iwate"
-msgstr "岩手"
-
-#: jp/jp_prefectures.py:7
-msgid "Miyagi"
-msgstr "宮城縣"
-
-#: jp/jp_prefectures.py:8
-msgid "Akita"
-msgstr "秋田"
-
-#: jp/jp_prefectures.py:9
-msgid "Yamagata"
-msgstr "山形"
-
-#: jp/jp_prefectures.py:10
-msgid "Fukushima"
-msgstr "福島"
-
-#: jp/jp_prefectures.py:11
-msgid "Ibaraki"
-msgstr "茨城"
-
-#: jp/jp_prefectures.py:12
-msgid "Tochigi"
-msgstr "櫪木"
-
-#: jp/jp_prefectures.py:13
-msgid "Gunma"
-msgstr "群馬"
-
-#: jp/jp_prefectures.py:14
-msgid "Saitama"
-msgstr "埼玉"
-
-#: jp/jp_prefectures.py:15
-msgid "Chiba"
-msgstr "千葉"
-
-#: jp/jp_prefectures.py:16
-msgid "Tokyo"
-msgstr "東京"
-
-#: jp/jp_prefectures.py:17
-msgid "Kanagawa"
-msgstr "神奈川"
-
-#: jp/jp_prefectures.py:18
-msgid "Yamanashi"
-msgstr "山梨"
-
-#: jp/jp_prefectures.py:19
-msgid "Nagano"
-msgstr "長野"
-
-#: jp/jp_prefectures.py:20
-msgid "Niigata"
-msgstr "新瀉"
-
-#: jp/jp_prefectures.py:21
-msgid "Toyama"
-msgstr "富山"
-
-#: jp/jp_prefectures.py:22
-msgid "Ishikawa"
-msgstr "石川"
-
-#: jp/jp_prefectures.py:23
-msgid "Fukui"
-msgstr "福井"
-
-#: jp/jp_prefectures.py:24
-msgid "Gifu"
-msgstr "岐阜"
-
-#: jp/jp_prefectures.py:25
-msgid "Shizuoka"
-msgstr "靜岡"
-
-#: jp/jp_prefectures.py:26
-msgid "Aichi"
-msgstr "愛知"
-
-#: jp/jp_prefectures.py:27
-msgid "Mie"
-msgstr "三重"
-
-#: jp/jp_prefectures.py:28
-msgid "Shiga"
-msgstr "滋賀"
-
-#: jp/jp_prefectures.py:29
-msgid "Kyoto"
-msgstr "京都"
-
-#: jp/jp_prefectures.py:30
-msgid "Osaka"
-msgstr "大阪"
-
-#: jp/jp_prefectures.py:31
-msgid "Hyogo"
-msgstr "兵庫"
-
-#: jp/jp_prefectures.py:32
-msgid "Nara"
-msgstr "奈良"
-
-#: jp/jp_prefectures.py:33
-msgid "Wakayama"
-msgstr "和歌山"
-
-#: jp/jp_prefectures.py:34
-msgid "Tottori"
-msgstr "鳥取"
-
-#: jp/jp_prefectures.py:35
-msgid "Shimane"
-msgstr "島根"
-
-#: jp/jp_prefectures.py:36
-msgid "Okayama"
-msgstr "岡山"
-
-#: jp/jp_prefectures.py:37
-msgid "Hiroshima"
-msgstr "廣島"
-
-#: jp/jp_prefectures.py:38
-msgid "Yamaguchi"
-msgstr "山口"
-
-#: jp/jp_prefectures.py:39
-msgid "Tokushima"
-msgstr "德島"
-
-#: jp/jp_prefectures.py:40
-msgid "Kagawa"
-msgstr "香川"
-
-#: jp/jp_prefectures.py:41
-msgid "Ehime"
-msgstr "愛媛縣"
-
-#: jp/jp_prefectures.py:42
-msgid "Kochi"
-msgstr "高知"
-
-#: jp/jp_prefectures.py:43
-msgid "Fukuoka"
-msgstr "福岡"
-
-#: jp/jp_prefectures.py:44
-msgid "Saga"
-msgstr "左賀"
-
-#: jp/jp_prefectures.py:45
-msgid "Nagasaki"
-msgstr "長崎"
-
-#: jp/jp_prefectures.py:46
-msgid "Kumamoto"
-msgstr "熊本"
-
-#: jp/jp_prefectures.py:47
-msgid "Oita"
-msgstr "大分"
-
-#: jp/jp_prefectures.py:48
-msgid "Miyazaki"
-msgstr "宫崎"
-
-#: jp/jp_prefectures.py:49
-msgid "Kagoshima"
-msgstr "鹿兒島"
-
-#: jp/jp_prefectures.py:50
-msgid "Okinawa"
-msgstr "琉球"
-
-#: kw/forms.py:25
-msgid "Enter a valid Kuwaiti Civil ID number"
-msgstr "請輸入一個正確的科威特身分證號碼。"
-
-#: mk/forms.py:18
-msgid ""
-"Identity card numbers must contain either 4 to 7 digits or an uppercase "
-"letter and 7 digits."
-msgstr ""
-
-#: mk/forms.py:57 si/forms.py:24
-msgid "This field should contain exactly 13 digits."
-msgstr ""
-
-#: mk/forms.py:58
-msgid "The first 7 digits of the UMCN must represent a valid past date."
-msgstr ""
-
-#: mk/forms.py:59
-msgid "The UMCN is not valid."
-msgstr ""
-
-#: mk/mk_choices.py:8
-msgid "Aerodrom"
-msgstr ""
-
-#: mk/mk_choices.py:9
-msgid "Aračinovo"
-msgstr ""
-
-#: mk/mk_choices.py:10
-msgid "Berovo"
-msgstr ""
-
-#: mk/mk_choices.py:11
-msgid "Bitola"
-msgstr ""
-
-#: mk/mk_choices.py:12
-msgid "Bogdanci"
-msgstr ""
-
-#: mk/mk_choices.py:13
-msgid "Bogovinje"
-msgstr ""
-
-#: mk/mk_choices.py:14
-msgid "Bosilovo"
-msgstr ""
-
-#: mk/mk_choices.py:15
-msgid "Brvenica"
-msgstr ""
-
-#: mk/mk_choices.py:16
-msgid "Butel"
-msgstr ""
-
-#: mk/mk_choices.py:17
-msgid "Valandovo"
-msgstr ""
-
-#: mk/mk_choices.py:18
-msgid "Vasilevo"
-msgstr ""
-
-#: mk/mk_choices.py:19
-msgid "Vevčani"
-msgstr ""
-
-#: mk/mk_choices.py:20
-msgid "Veles"
-msgstr ""
-
-#: mk/mk_choices.py:21
-msgid "Vinica"
-msgstr ""
-
-#: mk/mk_choices.py:22
-msgid "Vraneštica"
-msgstr ""
-
-#: mk/mk_choices.py:23
-msgid "Vrapčište"
-msgstr ""
-
-#: mk/mk_choices.py:24
-msgid "Gazi Baba"
-msgstr ""
-
-#: mk/mk_choices.py:25
-msgid "Gevgelija"
-msgstr ""
-
-#: mk/mk_choices.py:26
-msgid "Gostivar"
-msgstr ""
-
-#: mk/mk_choices.py:27
-msgid "Gradsko"
-msgstr ""
-
-#: mk/mk_choices.py:28
-msgid "Debar"
-msgstr ""
-
-#: mk/mk_choices.py:29
-msgid "Debarca"
-msgstr ""
-
-#: mk/mk_choices.py:30
-msgid "Delčevo"
-msgstr ""
-
-#: mk/mk_choices.py:31
-msgid "Demir Kapija"
-msgstr ""
-
-#: mk/mk_choices.py:32
-msgid "Demir Hisar"
-msgstr ""
-
-#: mk/mk_choices.py:33
-msgid "Dolneni"
-msgstr ""
-
-#: mk/mk_choices.py:34
-msgid "Drugovo"
-msgstr ""
-
-#: mk/mk_choices.py:35
-msgid "Gjorče Petrov"
-msgstr ""
-
-#: mk/mk_choices.py:36
-msgid "Želino"
-msgstr ""
-
-#: mk/mk_choices.py:37
-msgid "Zajas"
-msgstr ""
-
-#: mk/mk_choices.py:38
-msgid "Zelenikovo"
-msgstr ""
-
-#: mk/mk_choices.py:39
-msgid "Zrnovci"
-msgstr ""
-
-#: mk/mk_choices.py:40
-msgid "Ilinden"
-msgstr ""
-
-#: mk/mk_choices.py:41
-msgid "Jegunovce"
-msgstr ""
-
-#: mk/mk_choices.py:42
-msgid "Kavadarci"
-msgstr ""
-
-#: mk/mk_choices.py:43
-msgid "Karbinci"
-msgstr ""
-
-#: mk/mk_choices.py:44
-msgid "Karpoš"
-msgstr ""
-
-#: mk/mk_choices.py:45
-msgid "Kisela Voda"
-msgstr ""
-
-#: mk/mk_choices.py:46
-msgid "Kičevo"
-msgstr ""
-
-#: mk/mk_choices.py:47
-msgid "Konče"
-msgstr ""
-
-#: mk/mk_choices.py:48
-msgid "Koćani"
-msgstr ""
-
-#: mk/mk_choices.py:49
-msgid "Kratovo"
-msgstr ""
-
-#: mk/mk_choices.py:50
-msgid "Kriva Palanka"
-msgstr ""
-
-#: mk/mk_choices.py:51
-msgid "Krivogaštani"
-msgstr ""
-
-#: mk/mk_choices.py:52
-msgid "Kruševo"
-msgstr ""
-
-#: mk/mk_choices.py:53
-msgid "Kumanovo"
-msgstr ""
-
-#: mk/mk_choices.py:54
-msgid "Lipkovo"
-msgstr ""
-
-#: mk/mk_choices.py:55
-msgid "Lozovo"
-msgstr ""
-
-#: mk/mk_choices.py:56
-msgid "Mavrovo i Rostuša"
-msgstr ""
-
-#: mk/mk_choices.py:57
-msgid "Makedonska Kamenica"
-msgstr ""
-
-#: mk/mk_choices.py:58
-msgid "Makedonski Brod"
-msgstr ""
-
-#: mk/mk_choices.py:59
-msgid "Mogila"
-msgstr ""
-
-#: mk/mk_choices.py:60
-msgid "Negotino"
-msgstr ""
-
-#: mk/mk_choices.py:61
-msgid "Novaci"
-msgstr ""
-
-#: mk/mk_choices.py:62
-msgid "Novo Selo"
-msgstr ""
-
-#: mk/mk_choices.py:63
-msgid "Oslomej"
-msgstr ""
-
-#: mk/mk_choices.py:64
-msgid "Ohrid"
-msgstr ""
-
-#: mk/mk_choices.py:65
-msgid "Petrovec"
-msgstr ""
-
-#: mk/mk_choices.py:66
-msgid "Pehčevo"
-msgstr ""
-
-#: mk/mk_choices.py:67
-msgid "Plasnica"
-msgstr ""
-
-#: mk/mk_choices.py:68
-msgid "Prilep"
-msgstr ""
-
-#: mk/mk_choices.py:69
-msgid "Probištip"
-msgstr ""
-
-#: mk/mk_choices.py:70
-msgid "Radoviš"
-msgstr ""
-
-#: mk/mk_choices.py:71
-msgid "Rankovce"
-msgstr ""
-
-#: mk/mk_choices.py:72
-msgid "Resen"
-msgstr ""
-
-#: mk/mk_choices.py:73
-msgid "Rosoman"
-msgstr ""
-
-#: mk/mk_choices.py:74
-msgid "Saraj"
-msgstr ""
-
-#: mk/mk_choices.py:75
-msgid "Sveti Nikole"
-msgstr ""
-
-#: mk/mk_choices.py:76
-msgid "Sopište"
-msgstr ""
-
-#: mk/mk_choices.py:77
-msgid "Star Dojran"
-msgstr ""
-
-#: mk/mk_choices.py:78
-msgid "Staro Nagoričane"
-msgstr ""
-
-#: mk/mk_choices.py:79
-msgid "Struga"
-msgstr ""
-
-#: mk/mk_choices.py:80
-msgid "Strumica"
-msgstr ""
-
-#: mk/mk_choices.py:81
-msgid "Studeničani"
-msgstr ""
-
-#: mk/mk_choices.py:82
-msgid "Tearce"
-msgstr ""
-
-#: mk/mk_choices.py:83
-msgid "Tetovo"
-msgstr ""
-
-#: mk/mk_choices.py:84
-msgid "Centar"
-msgstr ""
-
-#: mk/mk_choices.py:85
-msgid "Centar-Župa"
-msgstr ""
-
-#: mk/mk_choices.py:86
-msgid "Čair"
-msgstr ""
-
-#: mk/mk_choices.py:87
-msgid "Čaška"
-msgstr ""
-
-#: mk/mk_choices.py:88
-msgid "Češinovo-Obleševo"
-msgstr ""
-
-#: mk/mk_choices.py:89
-msgid "Čučer-Sandevo"
-msgstr ""
-
-#: mk/mk_choices.py:90
-msgid "Štip"
-msgstr ""
-
-#: mk/mk_choices.py:91
-msgid "Šuto Orizari"
-msgstr ""
-
-#: mk/models.py:11
-msgid "Macedonian identity card number"
-msgstr ""
-
-#: mk/models.py:25
-msgid "A Macedonian municipality (2 character code)"
-msgstr ""
-
-#: mk/models.py:35
-msgid "Unique master citizen number (13 digits)"
-msgstr ""
-
-#: mx/forms.py:65
-msgid "Enter a valid zip code in the format XXXXX."
-msgstr ""
-
-#: mx/forms.py:108
-msgid "Enter a valid RFC."
-msgstr ""
-
-#: mx/forms.py:109
-msgid "Invalid checksum for RFC."
-msgstr ""
-
-#: mx/forms.py:189
-msgid "Enter a valid CURP."
-msgstr ""
-
-#: mx/forms.py:190
-msgid "Invalid checksum for CURP."
-msgstr ""
-
-#: mx/models.py:14
-msgid "Mexico state (three uppercase letters)"
-msgstr ""
-
-#: mx/models.py:27
-msgid "Mexico zip code"
-msgstr ""
-
-#: mx/models.py:44
-msgid "Mexican RFC"
-msgstr ""
-
-#: mx/models.py:61
-msgid "Mexican CURP"
-msgstr ""
-
-#: mx/mx_states.py:13
-msgid "Aguascalientes"
-msgstr "阿瓜斯卡連特斯"
-
-#: mx/mx_states.py:14
-msgid "Baja California"
-msgstr "下加利福尼亞州"
-
-#: mx/mx_states.py:15
-msgid "Baja California Sur"
-msgstr "南下加利福尼亞州"
-
-#: mx/mx_states.py:16
-msgid "Campeche"
-msgstr "坎佩切州"
-
-#: mx/mx_states.py:17
-msgid "Chihuahua"
-msgstr "奇瓦瓦"
-
-#: mx/mx_states.py:18
-msgid "Chiapas"
-msgstr "恰帕斯州"
-
-#: mx/mx_states.py:19
-msgid "Coahuila"
-msgstr "科阿韋拉州"
-
-#: mx/mx_states.py:20
-msgid "Colima"
-msgstr "科利馬"
-
-#: mx/mx_states.py:21
-msgid "Distrito Federal"
-msgstr "聯邦區"
-
-#: mx/mx_states.py:22
-msgid "Durango"
-msgstr "杜蘭戈"
-
-#: mx/mx_states.py:23
-msgid "Guerrero"
-msgstr "格雷羅州"
-
-#: mx/mx_states.py:24
-msgid "Guanajuato"
-msgstr "瓜納華托"
-
-#: mx/mx_states.py:25
-msgid "Hidalgo"
-msgstr "伊達爾戈"
-
-#: mx/mx_states.py:26
-msgid "Jalisco"
-msgstr "哈利斯科"
-
-#: mx/mx_states.py:27
-msgid "Estado de México"
-msgstr "Estado de México"
-
-#: mx/mx_states.py:28
-msgid "Michoacán"
-msgstr "米却肯"
-
-#: mx/mx_states.py:29
-msgid "Morelos"
-msgstr "莫雷洛斯"
-
-#: mx/mx_states.py:30
-msgid "Nayarit"
-msgstr "納亞里特"
-
-#: mx/mx_states.py:31
-msgid "Nuevo León"
-msgstr "新萊昂"
-
-#: mx/mx_states.py:32
-msgid "Oaxaca"
-msgstr "瓦哈卡州"
-
-#: mx/mx_states.py:33
-msgid "Puebla"
-msgstr "普埃布拉"
-
-#: mx/mx_states.py:34
-msgid "Querétaro"
-msgstr "克雷塔羅"
-
-#: mx/mx_states.py:35
-msgid "Quintana Roo"
-msgstr "金塔納羅奧"
-
-#: mx/mx_states.py:36
-msgid "Sinaloa"
-msgstr "錫那羅亞州"
-
-#: mx/mx_states.py:37
-msgid "San Luis Potosí"
-msgstr "聖路易斯波托西"
-
-#: mx/mx_states.py:38
-msgid "Sonora"
-msgstr "索諾拉"
-
-#: mx/mx_states.py:39
-msgid "Tabasco"
-msgstr "塔巴斯科"
-
-#: mx/mx_states.py:40
-msgid "Tamaulipas"
-msgstr "塔毛利帕斯"
-
-#: mx/mx_states.py:41
-msgid "Tlaxcala"
-msgstr "特拉斯卡拉"
-
-#: mx/mx_states.py:42
-msgid "Veracruz"
-msgstr "韋拉克魯斯"
-
-#: mx/mx_states.py:43
-msgid "Yucatán"
-msgstr "尤卡坦"
-
-#: mx/mx_states.py:44
-msgid "Zacatecas"
-msgstr "薩卡特卡斯"
-
-#: nl/forms.py:26
-msgid "Enter a valid postal code"
-msgstr "請輸入有效的郵遞區號。"
-
-#: nl/forms.py:82
-msgid "Enter a valid SoFi number"
-msgstr "請輸入有效的 SoFi 號碼。"
-
-#: nl/nl_provinces.py:4
-msgid "Drenthe"
-msgstr "德倫特省"
-
-#: nl/nl_provinces.py:5
-msgid "Flevoland"
-msgstr "弗萊福蘭"
-
-#: nl/nl_provinces.py:6
-msgid "Friesland"
-msgstr "弗里斯蘭"
-
-#: nl/nl_provinces.py:7
-msgid "Gelderland"
-msgstr "吉德蘭省"
-
-#: nl/nl_provinces.py:8
-msgid "Groningen"
-msgstr "格羅寧根"
-
-#: nl/nl_provinces.py:10
-msgid "Noord-Brabant"
-msgstr "北布拉班特"
-
-#: nl/nl_provinces.py:11
-msgid "Noord-Holland"
-msgstr "北荷蘭"
-
-#: nl/nl_provinces.py:12
-msgid "Overijssel"
-msgstr "上艾瑟爾"
-
-#: nl/nl_provinces.py:13
-msgid "Utrecht"
-msgstr "烏特勒支"
-
-#: nl/nl_provinces.py:14
-msgid "Zeeland"
-msgstr "西蘭省"
-
-#: nl/nl_provinces.py:15
-msgid "Zuid-Holland"
-msgstr "南荷蘭"
-
-#: no/forms.py:39
-msgid "Enter a valid Norwegian social security number."
-msgstr "請輸入一個有效的挪威社會保險號碼。"
-
-#: pe/forms.py:28
-msgid "This field requires 8 digits."
-msgstr "這個欄位是必須是 8 位數字。"
-
-#: pe/forms.py:56
-msgid "This field requires 11 digits."
-msgstr "這個欄位是必須是 11 位數字。"
-
-#: pl/forms.py:42
-msgid "National Identification Number consists of 11 digits."
-msgstr "國家身份證號碼由 11 位數字值組成。"
-
-#: pl/forms.py:43
-msgid "Wrong checksum for the National Identification Number."
-msgstr "國家身份證號碼校驗和錯誤。"
-
-#: pl/forms.py:79
-msgid "National ID Card Number consists of 3 letters and 6 digits."
-msgstr ""
-
-#: pl/forms.py:80
-msgid "Wrong checksum for the National ID Card Number."
-msgstr ""
-
-#: pl/forms.py:131
-msgid ""
-"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or "
-"XXXXXXXXXX."
-msgstr ""
-
-#: pl/forms.py:132
-msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "税號（NIP）校驗和錯誤。"
-
-#: pl/forms.py:171
-msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
-msgstr "國家身分證號碼必須由 9 或 14 位數組成。"
-
-#: pl/forms.py:172
-msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "國家商標註冊號碼（REGON）由 7 位或 9 位数字組成。"
-
-#: pl/forms.py:212
-msgid "Enter a postal code in the format XX-XXX."
-msgstr "用 XX-XXX 的格式輸入郵遞區號。"
-
-#: pl/pl_voivodeships.py:8
-msgid "Lower Silesia"
-msgstr "下西里西亞省"
-
-#: pl/pl_voivodeships.py:9
-msgid "Kuyavia-Pomerania"
-msgstr "庫亞維-濱海省"
-
-#: pl/pl_voivodeships.py:10
-msgid "Lublin"
-msgstr "盧布林"
-
-#: pl/pl_voivodeships.py:11
-msgid "Lubusz"
-msgstr "盧布斯卡省"
-
-#: pl/pl_voivodeships.py:12
-msgid "Lodz"
-msgstr "洛次"
-
-#: pl/pl_voivodeships.py:13
-msgid "Lesser Poland"
-msgstr "小波蘭省"
-
-#: pl/pl_voivodeships.py:14
-msgid "Masovia"
-msgstr "瑪佐維亞"
-
-#: pl/pl_voivodeships.py:15
-msgid "Opole"
-msgstr "奧波萊"
-
-#: pl/pl_voivodeships.py:16
-msgid "Subcarpatia"
-msgstr "外喀爾巴阡州"
-
-#: pl/pl_voivodeships.py:17
-msgid "Podlasie"
-msgstr "波德拉謝"
-
-#: pl/pl_voivodeships.py:18
-msgid "Pomerania"
-msgstr "波美拉尼亞"
-
-#: pl/pl_voivodeships.py:19
-msgid "Silesia"
-msgstr "西利西亞"
-
-#: pl/pl_voivodeships.py:20
-msgid "Swietokrzyskie"
-msgstr "聖十字省"
-
-#: pl/pl_voivodeships.py:21
-msgid "Warmia-Masuria"
-msgstr "瓦爾米亞-馬祖里"
-
-#: pl/pl_voivodeships.py:22
-msgid "Greater Poland"
-msgstr "大波蘭"
-
-#: pl/pl_voivodeships.py:23
-msgid "West Pomerania"
-msgstr "西波美拉尼亞省"
-
-#: pt/forms.py:17
-msgid "Enter a zip code in the format XXXX-XXX."
-msgstr "用 XXXXX-XXX 的格式輸入郵遞區號。"
-
-#: pt/forms.py:37
-msgid "Phone numbers must have 9 digits, or start by + or 00."
-msgstr "電話號碼必須有 9 位數，或以 + 或 00 開頭。"
-
-#: ro/forms.py:20
-msgid "Enter a valid CIF."
-msgstr "輸入有效的 CIF。"
-
-#: ro/forms.py:57
-msgid "Enter a valid CNP."
-msgstr "輸入有效的 CNP。"
-
-#: ro/forms.py:142
-msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "以 ROXX-XXXX-XXXX-XXXX-XXXX-XXXX 的格式輸入一個有效的 IBAN。"
-
-#: ro/forms.py:174
-msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "電話號碼必須是 XXXX-XXXXXX 格式。"
-
-#: ro/forms.py:199
-msgid "Enter a valid postal code in the format XXXXXX"
-msgstr "用 XXXXXX 的格式輸入郵遞區號。"
-
-#: ru/forms.py:37
-msgid "Enter a postal code in the format XXXXXX."
-msgstr ""
-
-#: ru/forms.py:50
-msgid "Enter a passport number in the format XXXX XXXXXX."
-msgstr ""
-
-#: ru/forms.py:63
-msgid "Enter a passport number in the format XX XXXXXXX."
-msgstr ""
-
-#: ru/ru_regions.py:10
-msgid "Central Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:11
-msgid "South Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:12
-msgid "North-West Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:13
-msgid "Far-East Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:14
-msgid "Siberian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:15
-msgid "Ural Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:16
-msgid "Privolzhsky Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:17
-msgid "North-Caucasian Federal County"
-msgstr ""
-
-#: ru/ru_regions.py:21
-msgid "Moskva"
-msgstr ""
-
-#: ru/ru_regions.py:22
-msgid "Saint-Peterburg"
-msgstr ""
-
-#: ru/ru_regions.py:23
-msgid "Moskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:24
-msgid "Adygeya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:25
-msgid "Bashkortostan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:26
-msgid "Buryatia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:27
-msgid "Altay, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:28
-msgid "Dagestan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:29
-msgid "Ingushskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:30
-msgid "Kabardino-Balkarskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:31
-msgid "Kalmykia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:32
-msgid "Karachaevo-Cherkesskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:33
-msgid "Karelia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:34
-msgid "Komi, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:35
-msgid "Mariy Ehl, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:36
-msgid "Mordovia, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:37
-msgid "Sakha, Respublika (Yakutiya)"
-msgstr ""
-
-#: ru/ru_regions.py:38
-msgid "Severnaya Osetia, Respublika (Alania)"
-msgstr ""
-
-#: ru/ru_regions.py:39
-msgid "Tatarstan, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:40
-msgid "Tyva, Respublika (Tuva)"
-msgstr ""
-
-#: ru/ru_regions.py:41
-msgid "Udmurtskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:42
-msgid "Khakassiya, Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:43
-msgid "Chechenskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:44
-msgid "Chuvashskaya Respublika"
-msgstr ""
-
-#: ru/ru_regions.py:45
-msgid "Altayskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:46
-msgid "Zabaykalskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:47
-msgid "Kamchatskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:48
-msgid "Krasnodarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:49
-msgid "Krasnoyarskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:50
-msgid "Permskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:51
-msgid "Primorskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:52
-msgid "Stavropol'siyy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:53
-msgid "Khabarovskiy Kray"
-msgstr ""
-
-#: ru/ru_regions.py:54
-msgid "Amurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:55
-msgid "Arkhangel'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:56
-msgid "Astrakhanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:57
-msgid "Belgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:58
-msgid "Bryanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:59
-msgid "Vladimirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:60
-msgid "Volgogradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:61
-msgid "Vologodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:62
-msgid "Voronezhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:63
-msgid "Ivanovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:64
-msgid "Irkutskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:65
-msgid "Kaliningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:66
-msgid "Kaluzhskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:67
-msgid "Kemerovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:68
-msgid "Kirovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:69
-msgid "Kostromskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:70
-msgid "Kurganskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:71
-msgid "Kurskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:72
-msgid "Leningradskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:73
-msgid "Lipeckaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:74
-msgid "Magadanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:75
-msgid "Murmanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:76
-msgid "Nizhegorodskaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:77
-msgid "Novgorodskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:78
-msgid "Novosibirskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:79
-msgid "Omskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:80
-msgid "Orenburgskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:81
-msgid "Orlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:82
-msgid "Penzenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:83
-msgid "Pskovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:84
-msgid "Rostovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:85
-msgid "Rjazanskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:86
-msgid "Samarskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:87
-msgid "Saratovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:88
-msgid "Sakhalinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:89
-msgid "Sverdlovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:90
-msgid "Smolenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:91
-msgid "Tambovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:92
-msgid "Tverskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:93
-msgid "Tomskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:94
-msgid "Tul'skaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:95
-msgid "Tyumenskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:96
-msgid "Ul'ianovskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:97
-msgid "Chelyabinskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:98
-msgid "Yaroslavskaya oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:99
-msgid "Evreyskaya avtonomnaja oblast'"
-msgstr ""
-
-#: ru/ru_regions.py:100
-msgid "Neneckiy autonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:101
-msgid "Khanty-Mansiyskiy avtonomnyy okrug - Yugra"
-msgstr ""
-
-#: ru/ru_regions.py:102
-msgid "Chukotskiy avtonomnyy okrug"
-msgstr ""
-
-#: ru/ru_regions.py:103
-msgid "Yamalo-Neneckiy avtonomnyy okrug"
-msgstr ""
-
-#: se/forms.py:54
-msgid "Enter a valid Swedish organisation number."
-msgstr "輸入有效的 SoFi 號碼"
-
-#: se/forms.py:111
-msgid "Enter a valid Swedish personal identity number."
-msgstr "請輸入一個有效的芬蘭社會保險號碼。"
-
-#: se/forms.py:112
-msgid "Co-ordination numbers are not allowed."
-msgstr "請勿輸入配位數。"
-
-#: se/forms.py:154
-msgid "Enter a Swedish postal code in the format XXXXX."
-msgstr "用 XX-XXX 的格式輸入郵遞區號。"
-
-#: se/se_counties.py:15
-msgid "Stockholm"
-msgstr "斯德哥爾摩省"
-
-#: se/se_counties.py:16
-msgid "Västerbotten"
-msgstr "西博滕省"
-
-#: se/se_counties.py:17
-msgid "Norrbotten"
-msgstr "北博滕省"
-
-#: se/se_counties.py:18
-msgid "Uppsala"
-msgstr "烏普薩拉省"
-
-#: se/se_counties.py:19
-msgid "Södermanland"
-msgstr "南曼蘭省"
-
-#: se/se_counties.py:20
-msgid "Östergötland"
-msgstr "東約特蘭省"
-
-#: se/se_counties.py:21
-msgid "Jönköping"
-msgstr "延雪平省"
-
-#: se/se_counties.py:22
-msgid "Kronoberg"
-msgstr "克魯努貝里省"
-
-#: se/se_counties.py:23
-msgid "Kalmar"
-msgstr "卡爾馬"
-
-#: se/se_counties.py:24
-msgid "Gotland"
-msgstr "哥德蘭省"
-
-#: se/se_counties.py:25
-msgid "Blekinge"
-msgstr "布萊金厄省"
-
-#: se/se_counties.py:26
-msgid "Skåne"
-msgstr "斯科訥省"
-
-#: se/se_counties.py:27
-msgid "Halland"
-msgstr "哈蘭省"
-
-#: se/se_counties.py:28
-msgid "Västra Götaland"
-msgstr "西約塔蘭省"
-
-#: se/se_counties.py:29
-msgid "Värmland"
-msgstr "韋姆蘭省"
-
-#: se/se_counties.py:30
-msgid "Örebro"
-msgstr "厄勒布魯"
-
-#: se/se_counties.py:31
-msgid "Västmanland"
-msgstr "西曼蘭省"
-
-#: se/se_counties.py:32
-msgid "Dalarna"
-msgstr "達拉納省"
-
-#: se/se_counties.py:33
-msgid "Gävleborg"
-msgstr "耶夫勒堡省"
-
-#: se/se_counties.py:34
-msgid "Västernorrland"
-msgstr "西諾爾蘭省"
-
-#: se/se_counties.py:35
-msgid "Jämtland"
-msgstr "耶姆特蘭省"
-
-#: si/forms.py:25
-msgid "The first 7 digits of the EMSO must represent a valid past date."
-msgstr ""
-
-#: si/forms.py:26
-msgid "The EMSO is not valid."
-msgstr ""
-
-#: si/forms.py:86
-msgid "Enter a valid tax number in form SIXXXXXXXX"
-msgstr ""
-
-#: si/forms.py:151
-msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
-msgstr ""
-
-#: sk/sk_districts.py:8
-msgid "Banska Bystrica"
-msgstr "班斯卡·比斯特理察"
-
-#: sk/sk_districts.py:9
-msgid "Banska Stiavnica"
-msgstr "斯洛伐克"
-
-#: sk/sk_districts.py:10
-msgid "Bardejov"
-msgstr "巴爾傑約夫"
-
-#: sk/sk_districts.py:11
-msgid "Banovce nad Bebravou"
-msgstr "巴諾維採"
-
-#: sk/sk_districts.py:12
-msgid "Brezno"
-msgstr "佈雷日諾"
-
-#: sk/sk_districts.py:13
-msgid "Bratislava I"
-msgstr "布拉提斯拉瓦 I"
-
-#: sk/sk_districts.py:14
-msgid "Bratislava II"
-msgstr "布拉提斯拉瓦 II"
-
-#: sk/sk_districts.py:15
-msgid "Bratislava III"
-msgstr "布拉提斯拉瓦 III"
-
-#: sk/sk_districts.py:16
-msgid "Bratislava IV"
-msgstr "布拉提斯拉瓦 IV"
-
-#: sk/sk_districts.py:17
-msgid "Bratislava V"
-msgstr "布拉提斯拉瓦 V"
-
-#: sk/sk_districts.py:18
-msgid "Bytca"
-msgstr "比特察"
-
-#: sk/sk_districts.py:19
-msgid "Cadca"
-msgstr "恰德察"
-
-#: sk/sk_districts.py:20
-msgid "Detva"
-msgstr "德特瓦"
-
-#: sk/sk_districts.py:21
-msgid "Dolny Kubin"
-msgstr "下庫賓"
-
-#: sk/sk_districts.py:22
-msgid "Dunajska Streda"
-msgstr "多瑙-斯特雷達"
-
-#: sk/sk_districts.py:23
-msgid "Galanta"
-msgstr "加蘭塔"
-
-#: sk/sk_districts.py:24
-msgid "Gelnica"
-msgstr "格爾尼察"
-
-#: sk/sk_districts.py:25
-msgid "Hlohovec"
-msgstr "赫洛霍維克"
-
-#: sk/sk_districts.py:26
-msgid "Humenne"
-msgstr "胡門內"
-
-#: sk/sk_districts.py:27
-msgid "Ilava"
-msgstr "伊拉瓦"
-
-#: sk/sk_districts.py:28
-msgid "Kezmarok"
-msgstr "科日馬諾克"
-
-#: sk/sk_districts.py:29
-msgid "Komarno"
-msgstr "科馬爾諾"
-
-#: sk/sk_districts.py:30
-msgid "Kosice I"
-msgstr "科希策 I"
-
-#: sk/sk_districts.py:31
-msgid "Kosice II"
-msgstr "科希策 II"
-
-#: sk/sk_districts.py:32
-msgid "Kosice III"
-msgstr "科希策 III"
-
-#: sk/sk_districts.py:33
-msgid "Kosice IV"
-msgstr "科希策 IV"
-
-#: sk/sk_districts.py:34
-msgid "Kosice - okolie"
-msgstr "科希策郊區"
-
-#: sk/sk_districts.py:35
-msgid "Krupina"
-msgstr "克魯皮納"
-
-#: sk/sk_districts.py:36
-msgid "Kysucke Nove Mesto"
-msgstr "庫舒基-新梅斯托"
-
-#: sk/sk_districts.py:37
-msgid "Levice"
-msgstr "勒維採"
-
-#: sk/sk_districts.py:38
-msgid "Levoca"
-msgstr "利沃察"
-
-#: sk/sk_districts.py:39
-msgid "Liptovsky Mikulas"
-msgstr "利普托夫-米庫拉什"
-
-#: sk/sk_districts.py:40
-msgid "Lucenec"
-msgstr "盧採內克"
-
-#: sk/sk_districts.py:41
-msgid "Malacky"
-msgstr "馬拉基"
-
-#: sk/sk_districts.py:42
-msgid "Martin"
-msgstr "馬丁"
-
-#: sk/sk_districts.py:43
-msgid "Medzilaborce"
-msgstr "梅捷拉博採"
-
-#: sk/sk_districts.py:44
-msgid "Michalovce"
-msgstr "米海洛夫策"
-
-#: sk/sk_districts.py:45
-msgid "Myjava"
-msgstr "米亞瓦"
-
-#: sk/sk_districts.py:46
-msgid "Namestovo"
-msgstr "納梅斯托沃"
-
-#: sk/sk_districts.py:47
-msgid "Nitra"
-msgstr "尼特拉"
-
-#: sk/sk_districts.py:48
-msgid "Nove Mesto nad Vahom"
-msgstr "新梅斯托"
-
-#: sk/sk_districts.py:49
-msgid "Nove Zamky"
-msgstr "新紮姆基"
-
-#: sk/sk_districts.py:50
-msgid "Partizanske"
-msgstr "帕蒂桑斯克"
-
-#: sk/sk_districts.py:51
-msgid "Pezinok"
-msgstr "佩茲諾克"
-
-#: sk/sk_districts.py:52
-msgid "Piestany"
-msgstr "皮爾斯恰尼"
-
-#: sk/sk_districts.py:53
-msgid "Poltar"
-msgstr "波塔爾"
-
-#: sk/sk_districts.py:54
-msgid "Poprad"
-msgstr "波普拉德"
-
-#: sk/sk_districts.py:55
-msgid "Povazska Bystrica"
-msgstr "瓦赫河畔比斯特里察"
-
-#: sk/sk_districts.py:56
-msgid "Presov"
-msgstr "普雷紹夫"
-
-#: sk/sk_districts.py:57
-msgid "Prievidza"
-msgstr "普列維扎"
-
-#: sk/sk_districts.py:58
-msgid "Puchov"
-msgstr "普霍夫"
-
-#: sk/sk_districts.py:59
-msgid "Revuca"
-msgstr "雷烏察"
-
-#: sk/sk_districts.py:60
-msgid "Rimavska Sobota"
-msgstr "里馬夫斯卡-索博塔"
-
-#: sk/sk_districts.py:61
-msgid "Roznava"
-msgstr "羅日納瓦"
-
-#: sk/sk_districts.py:62
-msgid "Ruzomberok"
-msgstr "魯容貝羅克"
-
-#: sk/sk_districts.py:63
-msgid "Sabinov"
-msgstr "薩比諾夫"
-
-#: sk/sk_districts.py:64
-msgid "Senec"
-msgstr "塞內克"
-
-#: sk/sk_districts.py:65
-msgid "Senica"
-msgstr "塞尼察"
-
-#: sk/sk_districts.py:66
-msgid "Skalica"
-msgstr "斯卡利察"
-
-#: sk/sk_districts.py:67
-msgid "Snina"
-msgstr "斯尼納"
-
-#: sk/sk_districts.py:68
-msgid "Sobrance"
-msgstr "索布蘭策"
-
-#: sk/sk_districts.py:69
-msgid "Spisska Nova Ves"
-msgstr "斯皮什斯卡新村"
-
-#: sk/sk_districts.py:70
-msgid "Stara Lubovna"
-msgstr "盧博夫納"
-
-#: sk/sk_districts.py:71
-msgid "Stropkov"
-msgstr "斯特羅普科夫"
-
-#: sk/sk_districts.py:72
-msgid "Svidnik"
-msgstr "斯維德尼克"
-
-#: sk/sk_districts.py:73
-msgid "Sala"
-msgstr "薩拉"
-
-#: sk/sk_districts.py:74
-msgid "Topolcany"
-msgstr "托波爾卡尼"
-
-#: sk/sk_districts.py:75
-msgid "Trebisov"
-msgstr "特雷比紹夫"
-
-#: sk/sk_districts.py:76
-msgid "Trencin"
-msgstr "特倫欽"
-
-#: sk/sk_districts.py:77
-msgid "Trnava"
-msgstr "特爾納瓦"
-
-#: sk/sk_districts.py:78
-msgid "Turcianske Teplice"
-msgstr "特普利採"
-
-#: sk/sk_districts.py:79
-msgid "Tvrdosin"
-msgstr "圖多辛"
-
-#: sk/sk_districts.py:80
-msgid "Velky Krtis"
-msgstr "大克爾季什"
-
-#: sk/sk_districts.py:81
-msgid "Vranov nad Toplou"
-msgstr "弗拉諾夫"
-
-#: sk/sk_districts.py:82
-msgid "Zlate Moravce"
-msgstr "莫拉維採"
-
-#: sk/sk_districts.py:83
-msgid "Zvolen"
-msgstr "茲沃倫"
-
-#: sk/sk_districts.py:84
-msgid "Zarnovica"
-msgstr "扎諾維採"
-
-#: sk/sk_districts.py:85
-msgid "Ziar nad Hronom"
-msgstr "日阿爾"
-
-#: sk/sk_districts.py:86
-msgid "Zilina"
-msgstr "日利纳"
-
-#: sk/sk_regions.py:8
-msgid "Banska Bystrica region"
-msgstr "班斯卡·比斯特理察州"
-
-#: sk/sk_regions.py:9
-msgid "Bratislava region"
-msgstr "布拉提斯拉瓦州"
-
-#: sk/sk_regions.py:10
-msgid "Kosice region"
-msgstr "科希策州"
-
-#: sk/sk_regions.py:11
-msgid "Nitra region"
-msgstr "尼特拉州"
-
-#: sk/sk_regions.py:12
-msgid "Presov region"
-msgstr "普列索夫州"
-
-#: sk/sk_regions.py:13
-msgid "Trencin region"
-msgstr "特倫欽州"
-
-#: sk/sk_regions.py:14
-msgid "Trnava region"
-msgstr "特爾納瓦州"
-
-#: sk/sk_regions.py:15
-msgid "Zilina region"
-msgstr "日利納州"
-
-#: tr/forms.py:21
-msgid "Enter a postal code in the format XXXXX."
-msgstr "用 XX-XXX 的格式輸入郵遞區號。"
-
-#: tr/forms.py:42
-msgid "Phone numbers must be in 0XXX XXX XXXX format."
-msgstr "電話號碼必須是 XXXX-XXXXXX 格式。"
-
-#: tr/forms.py:69
-msgid "Enter a valid Turkish Identification number."
-msgstr "請輸入一個有效的土耳其身份證號碼。"
-
-#: tr/forms.py:70
-msgid "Turkish Identification number must be 11 digits."
-msgstr "國家身份證號碼必須由 11 位數字值組成。"
-
-#: us/forms.py:21
-msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "以 XXXXX 或 XXXXX-XXXX 的格式輸入一個郵遞區號。"
-
-#: us/forms.py:30
-msgid "Phone numbers must be in XXX-XXX-XXXX format."
-msgstr "電話號碼必須是 XX-XXXX-XXXX 格式。"
-
-#: us/forms.py:59
-msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr "以 XXX-XX-XXXX 的格式輸入一有效的美国身份證字號。"
-
-#: us/forms.py:92
-msgid "Enter a U.S. state or territory."
-msgstr "輸入美國州名。"
-
-#: us/models.py:8
-msgid "U.S. state (two uppercase letters)"
-msgstr "美國州名 (兩個大寫字母)"
-
-#: us/models.py:17
-msgid "U.S. postal code (two uppercase letters)"
-msgstr "美國郵遞區號 (兩個大寫字母)"
-
-#: us/models.py:26
-msgid "Phone number"
-msgstr "電話號碼"
-
-#: uy/forms.py:29
-msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
-msgstr "以 XX-XXXXXXXX-X 或 XXXXXXXXXXXX 的格式输入一個有效的 CUIT。"
-
-#: uy/forms.py:31
-msgid "Enter a valid CI number."
-msgstr "輸入有效的 CI 號碼。"
-
-#: za/forms.py:21
-msgid "Enter a valid South African ID number"
-msgstr "請輸入一個有效的南非身份證號碼。"
-
-#: za/forms.py:55
-msgid "Enter a valid South African postal code"
-msgstr "輸入一個有效的南非郵遞區號。"
-
-#: za/za_provinces.py:4
-msgid "Eastern Cape"
-msgstr "東開普省"
-
-#: za/za_provinces.py:5
-msgid "Free State"
-msgstr "自由邦省"
-
-#: za/za_provinces.py:6
-msgid "Gauteng"
-msgstr "豪登省"
-
-#: za/za_provinces.py:7
-msgid "KwaZulu-Natal"
-msgstr "誇祖魯-納塔爾省"
-
-#: za/za_provinces.py:8
-msgid "Limpopo"
-msgstr "林波波省"
-
-#: za/za_provinces.py:9
-msgid "Mpumalanga"
-msgstr "普馬蘭加省"
-
-#: za/za_provinces.py:10
-msgid "Northern Cape"
-msgstr "北開普省"
-
-#: za/za_provinces.py:11
-msgid "North West"
-msgstr "西北省"
-
-#: za/za_provinces.py:12
-msgid "Western Cape"
-msgstr "西開普省"
diff --git a/django/contrib/localflavor/mk/forms.py b/django/contrib/localflavor/mk/forms.py
deleted file mode 100644
index 3189f0dec6..0000000000
--- a/django/contrib/localflavor/mk/forms.py
+++ /dev/null
@@ -1,102 +0,0 @@
-from __future__ import absolute_import, unicode_literals
-
-import datetime
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-from django.contrib.localflavor.mk.mk_choices import MK_MUNICIPALITIES
-
-
-class MKIdentityCardNumberField(RegexField):
-    """
-    A Macedonian ID card number. Accepts both old and new format.
-    """
-    default_error_messages = {
-        'invalid': _('Identity card numbers must contain'
-                     ' either 4 to 7 digits or an uppercase letter and 7 digits.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        kwargs['min_length'] = None
-        kwargs['max_length'] = 8
-        regex = r'(^[A-Z]{1}\d{7}$)|(^\d{4,7}$)'
-        super(MKIdentityCardNumberField, self).__init__(regex, *args, **kwargs)
-
-
-class MKMunicipalitySelect(Select):
-    """
-    A form ``Select`` widget that uses a list of Macedonian municipalities as
-    choices. The label is the name of the municipality and the value
-    is a 2 character code for the municipality.
-    """
-
-    def __init__(self, attrs=None):
-        super(MKMunicipalitySelect, self).__init__(attrs, choices = MK_MUNICIPALITIES)
-
-
-class UMCNField(RegexField):
-    """
-    A form field that validates input as a unique master citizen
-    number.
-
-    The format of the unique master citizen number has been kept the same from
-    Yugoslavia. It is still in use in other countries as well, it is not applicable
-    solely in Macedonia. For more information see:
-    https://secure.wikimedia.org/wikipedia/en/wiki/Unique_Master_Citizen_Number
-
-    A value will pass validation if it complies to the following rules:
-
-    * Consists of exactly 13 digits
-    * The first 7 digits represent a valid past date in the format DDMMYYY
-    * The last digit of the UMCN passes a checksum test
-    """
-    default_error_messages = {
-        'invalid': _('This field should contain exactly 13 digits.'),
-        'date': _('The first 7 digits of the UMCN must represent a valid past date.'),
-        'checksum': _('The UMCN is not valid.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        kwargs['min_length'] = None
-        kwargs['max_length'] = 13
-        super(UMCNField, self).__init__(r'^\d{13}$', *args, **kwargs)
-
-    def clean(self, value):
-        value = super(UMCNField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        if not self._validate_date_part(value):
-            raise ValidationError(self.error_messages['date'])
-        if self._validate_checksum(value):
-            return value
-        else:
-            raise ValidationError(self.error_messages['checksum'])
-
-    def _validate_checksum(self, value):
-        a,b,c,d,e,f,g,h,i,j,k,l,K = [int(digit) for digit in  value]
-        m = 11 - (( 7*(a+g) + 6*(b+h) + 5*(c+i) + 4*(d+j) + 3*(e+k) + 2*(f+l)) % 11)
-        if (m >= 1 and m <= 9) and K == m:
-            return True
-        elif m == 11 and K == 0:
-            return True
-        else:
-            return False
-
-    def _validate_date_part(self, value):
-        daypart, monthpart, yearpart = int(value[:2]), int(value[2:4]), int(value[4:7])
-        if yearpart >= 800:
-            yearpart += 1000
-        else:
-            yearpart += 2000
-        try:
-            date = datetime.datetime(year = yearpart, month = monthpart, day = daypart).date()
-        except ValueError:
-            return False
-        if date >= datetime.datetime.now().date():
-            return False
-        return True
diff --git a/django/contrib/localflavor/mk/mk_choices.py b/django/contrib/localflavor/mk/mk_choices.py
deleted file mode 100644
index fb705ca820..0000000000
--- a/django/contrib/localflavor/mk/mk_choices.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Macedonian municipalities per the reorganization from 2004.
-"""
-from __future__ import unicode_literals
-
-from django.utils.translation import ugettext_lazy as _
-
-MK_MUNICIPALITIES = (
-    ('AD', _('Aerodrom')),
-    ('AR', _('Aračinovo')),
-    ('BR', _('Berovo')),
-    ('TL', _('Bitola')),
-    ('BG', _('Bogdanci')),
-    ('VJ', _('Bogovinje')),
-    ('BS', _('Bosilovo')),
-    ('BN', _('Brvenica')),
-    ('BU', _('Butel')),
-    ('VA', _('Valandovo')),
-    ('VL', _('Vasilevo')),
-    ('VV', _('Vevčani')),
-    ('VE', _('Veles')),
-    ('NI', _('Vinica')),
-    ('VC', _('Vraneštica')),
-    ('VH', _('Vrapčište')),
-    ('GB', _('Gazi Baba')),
-    ('GV', _('Gevgelija')),
-    ('GT', _('Gostivar')),
-    ('GR', _('Gradsko')),
-    ('DB', _('Debar')),
-    ('DA', _('Debarca')),
-    ('DL', _('Delčevo')),
-    ('DK', _('Demir Kapija')),
-    ('DM', _('Demir Hisar')),
-    ('DE', _('Dolneni')),
-    ('DR', _('Drugovo')),
-    ('GP', _('Gjorče Petrov')),
-    ('ZE', _('Želino')),
-    ('ZA', _('Zajas')),
-    ('ZK', _('Zelenikovo')),
-    ('ZR', _('Zrnovci')),
-    ('IL', _('Ilinden')),
-    ('JG', _('Jegunovce')),
-    ('AV', _('Kavadarci')),
-    ('KB', _('Karbinci')),
-    ('KX', _('Karpoš')),
-    ('VD', _('Kisela Voda')),
-    ('KH', _('Kičevo')),
-    ('KN', _('Konče')),
-    ('OC', _('Koćani')),
-    ('KY', _('Kratovo')),
-    ('KZ', _('Kriva Palanka')),
-    ('KG', _('Krivogaštani')),
-    ('KS', _('Kruševo')),
-    ('UM', _('Kumanovo')),
-    ('LI', _('Lipkovo')),
-    ('LO', _('Lozovo')),
-    ('MR', _('Mavrovo i Rostuša')),
-    ('MK', _('Makedonska Kamenica')),
-    ('MD', _('Makedonski Brod')),
-    ('MG', _('Mogila')),
-    ('NG', _('Negotino')),
-    ('NV', _('Novaci')),
-    ('NS', _('Novo Selo')),
-    ('OS', _('Oslomej')),
-    ('OD', _('Ohrid')),
-    ('PE', _('Petrovec')),
-    ('PH', _('Pehčevo')),
-    ('PN', _('Plasnica')),
-    ('PP', _('Prilep')),
-    ('PT', _('Probištip')),
-    ('RV', _('Radoviš')),
-    ('RN', _('Rankovce')),
-    ('RE', _('Resen')),
-    ('RO', _('Rosoman')),
-    ('AJ', _('Saraj')),
-    ('SL', _('Sveti Nikole')),
-    ('SS', _('Sopište')),
-    ('SD', _('Star Dojran')),
-    ('NA', _('Staro Nagoričane')),
-    ('UG', _('Struga')),
-    ('RU', _('Strumica')),
-    ('SU', _('Studeničani')),
-    ('TR', _('Tearce')),
-    ('ET', _('Tetovo')),
-    ('CE', _('Centar')),
-    ('CZ', _('Centar-Župa')),
-    ('CI', _('Čair')),
-    ('CA', _('Čaška')),
-    ('CH', _('Češinovo-Obleševo')),
-    ('CS', _('Čučer-Sandevo')),
-    ('ST', _('Štip')),
-    ('SO', _('Šuto Orizari')),
-)
diff --git a/django/contrib/localflavor/mk/models.py b/django/contrib/localflavor/mk/models.py
deleted file mode 100644
index b636357290..0000000000
--- a/django/contrib/localflavor/mk/models.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from django.db.models.fields import CharField
-from django.utils.translation import ugettext_lazy as _
-
-from django.contrib.localflavor.mk.mk_choices import MK_MUNICIPALITIES
-from django.contrib.localflavor.mk.forms import (UMCNField as UMCNFormField,
-    MKIdentityCardNumberField as MKIdentityCardNumberFormField)
-
-
-class MKIdentityCardNumberField(CharField):
-
-    description = _("Macedonian identity card number")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 8
-        super(MKIdentityCardNumberField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class' : MKIdentityCardNumberFormField}
-        defaults.update(kwargs)
-        return super(MKIdentityCardNumberField, self).formfield(**defaults)
-
-
-class MKMunicipalityField(CharField):
-
-    description = _("A Macedonian municipality (2 character code)")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['choices'] = MK_MUNICIPALITIES
-        kwargs['max_length'] = 2
-        super(MKMunicipalityField, self).__init__(*args, **kwargs)
-
-
-class UMCNField(CharField):
-
-    description = _("Unique master citizen number (13 digits)")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 13
-        super(UMCNField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class' : UMCNFormField}
-        defaults.update(kwargs)
-        return super(UMCNField, self).formfield(**defaults)
diff --git a/django/contrib/localflavor/mx/forms.py b/django/contrib/localflavor/mx/forms.py
deleted file mode 100644
index b42bf22b89..0000000000
--- a/django/contrib/localflavor/mx/forms.py
+++ /dev/null
@@ -1,227 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Mexican-specific form helpers.
-"""
-from __future__ import unicode_literals
-import re
-
-from django.forms import ValidationError
-from django.forms.fields import Select, RegexField
-from django.utils import six
-from django.utils.translation import ugettext_lazy as _
-from django.core.validators import EMPTY_VALUES
-from django.contrib.localflavor.mx.mx_states import STATE_CHOICES
-
-DATE_RE = r'\d{2}((01|03|05|07|08|10|12)(0[1-9]|[12]\d|3[01])|02(0[1-9]|[12]\d)|(04|06|09|11)(0[1-9]|[12]\d|30))'
-
-"""
-This is the list of inconvenient words according to the `Anexo IV` of the
-document described in the next link:
-    http://www.sisi.org.mx/jspsi/documentos/2005/seguimiento/06101/0610100162005_065.doc
-"""
-
-RFC_INCONVENIENT_WORDS = [
-    'BUEI', 'BUEY', 'CACA', 'CACO', 'CAGA', 'CAGO', 'CAKA', 'CAKO',
-    'COGE', 'COJA', 'COJE', 'COJI', 'COJO', 'CULO', 'FETO', 'GUEY',
-    'JOTO', 'KACA', 'KACO', 'KAGA', 'KAGO', 'KOGE', 'KOJO', 'KAKA',
-    'KULO', 'MAME', 'MAMO', 'MEAR', 'MEAS', 'MEON', 'MION', 'MOCO',
-    'MULA', 'PEDA', 'PEDO', 'PENE', 'PUTA', 'PUTO', 'QULO', 'RATA',
-    'RUIN',
-]
-
-"""
-This is the list of inconvenient words according to the `Anexo 2` of the
-document described in the next link:
-    http://portal.veracruz.gob.mx/pls/portal/url/ITEM/444112558A57C6E0E040A8C02E00695C
-"""
-CURP_INCONVENIENT_WORDS = [
-   'BACA', 'BAKA', 'BUEI', 'BUEY', 'CACA', 'CACO', 'CAGA', 'CAGO',
-   'CAKA', 'CAKO', 'COGE', 'COGI', 'COJA', 'COJE', 'COJI', 'COJO',
-   'COLA', 'CULO', 'FALO', 'FETO', 'GETA', 'GUEI', 'GUEY', 'JETA',
-   'JOTO', 'KACA', 'KACO', 'KAGA', 'KAGO', 'KAKA', 'KAKO', 'KOGE',
-   'KOGI', 'KOJA', 'KOJE', 'KOJI', 'KOJO', 'KOLA', 'KULO', 'LILO',
-   'LOCA', 'LOCO', 'LOKA', 'LOKO', 'MAME', 'MAMO', 'MEAR', 'MEAS',
-   'MEON', 'MIAR', 'MION', 'MOCO', 'MOKO', 'MULA', 'MULO', 'NACA',
-   'NACO', 'PEDA', 'PEDO', 'PENE', 'PIPI', 'PITO', 'POPO', 'PUTA',
-   'PUTO', 'QULO', 'RATA', 'ROBA', 'ROBE', 'ROBO', 'RUIN', 'SENO',
-   'TETA', 'VACA', 'VAGA', 'VAGO', 'VAKA', 'VUEI', 'VUEY', 'WUEI',
-   'WUEY',
-]
-
-class MXStateSelect(Select):
-    """
-    A Select widget that uses a list of Mexican states as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(MXStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
-
-
-class MXZipCodeField(RegexField):
-    """
-    A form field that accepts a Mexican Zip Code.
-
-    More info about this:
-        http://en.wikipedia.org/wiki/List_of_postal_codes_in_Mexico
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid zip code in the format XXXXX.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        zip_code_re = r'^(0[1-9]|[1][0-6]|[2-9]\d)(\d{3})$'
-        super(MXZipCodeField, self).__init__(zip_code_re, *args, **kwargs)
-
-
-class MXRFCField(RegexField):
-    """
-    A form field that validates a Mexican *Registro Federal de Contribuyentes*
-    for either `Persona física` or `Persona moral`.
-
-    The Persona física RFC string is integrated by a juxtaposition of
-    characters following the next pattern:
-
-        =====  ======  ===========================================
-        Index  Format  Accepted Characters
-        =====  ======  ===========================================
-        1      X       Any letter
-        2      X       Any vowel
-        3-4    XX      Any letter
-        5-10   YYMMDD  Any valid date
-        11-12  XX      Any letter or number between 0 and 9
-        13     X       Any digit between 0 and 9 or the letter *A*
-        =====  ======  ===========================================
-
-    The Persona moral RFC string is integrated by a juxtaposition of
-    characters following the next pattern:
-
-        =====  ======  ============================================
-        Index  Format  Accepted Characters
-        =====  ======  ============================================
-        1-3    XXX     Any letter including *&* and *Ñ* chars
-        4-9    YYMMDD  Any valid date
-        10-11  XX      Any letter or number between 0 and 9
-        12     X       Any number between 0 and 9 or the letter *A*
-        =====  ======  ============================================
-
-    More info about this:
-        http://es.wikipedia.org/wiki/Registro_Federal_de_Contribuyentes_(M%C3%A9xico)
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid RFC.'),
-        'invalid_checksum': _('Invalid checksum for RFC.'),
-    }
-
-    def __init__(self, min_length=9, max_length=13, *args, **kwargs):
-        rfc_re = re.compile(r'^([A-Z&Ññ]{3}|[A-Z][AEIOU][A-Z]{2})%s([A-Z0-9]{2}[0-9A])?$' % DATE_RE,
-                            re.IGNORECASE)
-        super(MXRFCField, self).__init__(rfc_re, min_length=min_length,
-                                         max_length=max_length, *args, **kwargs)
-
-    def clean(self, value):
-        value = super(MXRFCField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = value.upper()
-        if self._has_homoclave(value):
-            if not value[-1] == self._checksum(value[:-1]):
-                raise ValidationError(self.default_error_messages['invalid_checksum'])
-        if self._has_inconvenient_word(value):
-            raise ValidationError(self.default_error_messages['invalid'])
-        return value
-
-    def _has_homoclave(self, rfc):
-        """
-        This check is done due to the existance of RFCs without a *homoclave*
-        since the current algorithm to calculate it had not been created for
-        the first RFCs ever in Mexico.
-        """
-        rfc_without_homoclave_re = re.compile(r'^[A-Z&Ññ]{3,4}%s$' % DATE_RE,
-                                              re.IGNORECASE)
-        return not rfc_without_homoclave_re.match(rfc)
-
-    def _checksum(self, rfc):
-        """
-        More info about this procedure:
-            www.sisi.org.mx/jspsi/documentos/2005/seguimiento/06101/0610100162005_065.doc
-        """
-        chars = '0123456789ABCDEFGHIJKLMN&OPQRSTUVWXYZ-Ñ'
-        if len(rfc) == 11:
-            rfc = '-' + rfc
-
-        sum_ = sum(i * chars.index(c) for i, c in zip(reversed(range(14)), rfc))
-        checksum = 11 - sum_ % 11
-
-        if checksum == 10:
-            return 'A'
-        elif checksum == 11:
-            return '0'
-
-        return six.text_type(checksum)
-
-    def _has_inconvenient_word(self, rfc):
-        first_four = rfc[:4]
-        return first_four in RFC_INCONVENIENT_WORDS
-
-
-class MXCURPField(RegexField):
-    """
-    A field that validates a Mexican Clave Única de Registro de Población.
-
-    The CURP is integrated by a juxtaposition of characters following the next
-    pattern:
-
-        =====  ======  ===================================================
-        Index  Format  Accepted Characters
-        =====  ======  ===================================================
-        1      X       Any letter
-        2      X       Any vowel
-        3-4    XX      Any letter
-        5-10   YYMMDD  Any valid date
-        11     X       Either `H` or `M`, depending on the person's gender
-        12-13  XX      Any valid acronym for a state in Mexico
-        14-16  XXX     Any consonant
-        17     X       Any number between 0 and 9 or any letter
-        18     X       Any number between 0 and 9
-        =====  ======  ===================================================
-
-    More info about this:
-        http://www.condusef.gob.mx/index.php/clave-unica-de-registro-de-poblacion-curp
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid CURP.'),
-        'invalid_checksum': _('Invalid checksum for CURP.'),
-    }
-
-    def __init__(self, min_length=18, max_length=18, *args, **kwargs):
-        states_re = r'(AS|BC|BS|CC|CL|CM|CS|CH|DF|DG|GT|GR|HG|JC|MC|MN|MS|NT|NL|OC|PL|QT|QR|SP|SL|SR|TC|TS|TL|VZ|YN|ZS|NE)'
-        consonants_re = r'[B-DF-HJ-NP-TV-Z]'
-        curp_re = (r'^[A-Z][AEIOU][A-Z]{2}%s[HM]%s%s{3}[0-9A-Z]\d$' %
-                   (DATE_RE, states_re, consonants_re))
-        curp_re = re.compile(curp_re, re.IGNORECASE)
-        super(MXCURPField, self).__init__(curp_re, min_length=min_length,
-                                          max_length=max_length, *args, **kwargs)
-
-    def clean(self, value):
-        value = super(MXCURPField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = value.upper()
-        if value[-1] != self._checksum(value[:-1]):
-            raise ValidationError(self.default_error_messages['invalid_checksum'])
-        if self._has_inconvenient_word(value):
-            raise ValidationError(self.default_error_messages['invalid'])
-        return value
-
-    def _checksum(self, value):
-        chars = '0123456789ABCDEFGHIJKLMN&OPQRSTUVWXYZ'
-
-        s = sum(i * chars.index(c) for i, c in zip(reversed(range(19)), value))
-        checksum = 10 - s % 10
-
-        if checksum == 10:
-            return '0'
-        return six.text_type(checksum)
-
-    def _has_inconvenient_word(self, curp):
-        first_four = curp[:4]
-        return first_four in CURP_INCONVENIENT_WORDS
diff --git a/django/contrib/localflavor/mx/models.py b/django/contrib/localflavor/mx/models.py
deleted file mode 100644
index 3ef8d5fb03..0000000000
--- a/django/contrib/localflavor/mx/models.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-from django.db.models.fields import CharField
-
-from django.contrib.localflavor.mx.mx_states import STATE_CHOICES
-from django.contrib.localflavor.mx.forms import (MXRFCField as MXRFCFormField,
-    MXZipCodeField as MXZipCodeFormField, MXCURPField as MXCURPFormField)
-
-
-class MXStateField(CharField):
-    """
-    A model field that stores the three-letter Mexican state abbreviation in the
-    database.
-    """
-    description = _("Mexico state (three uppercase letters)")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['choices'] = STATE_CHOICES
-        kwargs['max_length'] = 3
-        super(MXStateField, self).__init__(*args, **kwargs)
-
-
-class MXZipCodeField(CharField):
-    """
-    A model field that forms represent as a forms.MXZipCodeField field and
-    stores the five-digit Mexican zip code.
-    """
-    description = _("Mexico zip code")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 5
-        super(MXZipCodeField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': MXZipCodeFormField}
-        defaults.update(kwargs)
-        return super(MXZipCodeField, self).formfield(**defaults)
-
-
-class MXRFCField(CharField):
-    """
-    A model field that forms represent as a forms.MXRFCField field and
-    stores the value of a valid Mexican RFC.
-    """
-    description = _("Mexican RFC")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 13
-        super(MXRFCField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': MXRFCFormField}
-        defaults.update(kwargs)
-        return super(MXRFCField, self).formfield(**defaults)
-
-
-class MXCURPField(CharField):
-    """
-    A model field that forms represent as a forms.MXCURPField field and
-    stores the value of a valid Mexican CURP.
-    """
-    description = _("Mexican CURP")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 18
-        super(MXCURPField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': MXCURPFormField}
-        defaults.update(kwargs)
-        return super(MXCURPField, self).formfield(**defaults)
\ No newline at end of file
diff --git a/django/contrib/localflavor/mx/mx_states.py b/django/contrib/localflavor/mx/mx_states.py
deleted file mode 100644
index 6ae08ccb12..0000000000
--- a/django/contrib/localflavor/mx/mx_states.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-A list of Mexican states for use as `choices` in a formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-from django.utils.translation import ugettext_lazy as _
-
-# All 31 states, plus the `Distrito Federal`.
-STATE_CHOICES = (
-    ('AGU', _('Aguascalientes')),
-    ('BCN', _('Baja California')),
-    ('BCS', _('Baja California Sur')),
-    ('CAM', _('Campeche')),
-    ('CHH', _('Chihuahua')),
-    ('CHP', _('Chiapas')),
-    ('COA', _('Coahuila')),
-    ('COL', _('Colima')),
-    ('DIF', _('Distrito Federal')),
-    ('DUR', _('Durango')),
-    ('GRO', _('Guerrero')),
-    ('GUA', _('Guanajuato')),
-    ('HID', _('Hidalgo')),
-    ('JAL', _('Jalisco')),
-    ('MEX', _('Estado de México')),
-    ('MIC', _('Michoacán')),
-    ('MOR', _('Morelos')),
-    ('NAY', _('Nayarit')),
-    ('NLE', _('Nuevo León')),
-    ('OAX', _('Oaxaca')),
-    ('PUE', _('Puebla')),
-    ('QUE', _('Querétaro')),
-    ('ROO', _('Quintana Roo')),
-    ('SIN', _('Sinaloa')),
-    ('SLP', _('San Luis Potosí')),
-    ('SON', _('Sonora')),
-    ('TAB', _('Tabasco')),
-    ('TAM', _('Tamaulipas')),
-    ('TLA', _('Tlaxcala')),
-    ('VER', _('Veracruz')),
-    ('YUC', _('Yucatán')),
-    ('ZAC', _('Zacatecas')),
-)
diff --git a/django/contrib/localflavor/nl/forms.py b/django/contrib/localflavor/nl/forms.py
deleted file mode 100644
index a05dd38f7f..0000000000
--- a/django/contrib/localflavor/nl/forms.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""
-NL-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.nl.nl_provinces import PROVINCE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-pc_re = re.compile('^\d{4}[A-Z]{2}$')
-sofi_re = re.compile('^\d{9}$')
-numeric_re = re.compile('^\d+$')
-
-class NLZipCodeField(Field):
-    """
-    A Dutch postal code field.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid postal code'),
-    }
-
-    def clean(self, value):
-        super(NLZipCodeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = value.strip().upper().replace(' ', '')
-        if not pc_re.search(value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        if int(value[:4]) < 1000:
-            raise ValidationError(self.error_messages['invalid'])
-
-        return '%s %s' % (value[:4], value[4:])
-
-class NLProvinceSelect(Select):
-    """
-    A Select widget that uses a list of provinces of the Netherlands as its
-    choices.
-    """
-    def __init__(self, attrs=None):
-        super(NLProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
-
-class NLPhoneNumberField(Field):
-    """
-    A Dutch telephone number field.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid phone number'),
-    }
-
-    def clean(self, value):
-        super(NLPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        phone_nr = re.sub('[\-\s\(\)]', '', smart_text(value))
-
-        if len(phone_nr) == 10 and numeric_re.search(phone_nr):
-            return value
-
-        if phone_nr[:3] == '+31' and len(phone_nr) == 12 and \
-           numeric_re.search(phone_nr[3:]):
-            return value
-
-        raise ValidationError(self.error_messages['invalid'])
-
-class NLSoFiNumberField(Field):
-    """
-    A Dutch social security number (SoFi/BSN) field.
-
-    http://nl.wikipedia.org/wiki/Sofinummer
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid SoFi number'),
-    }
-
-    def clean(self, value):
-        super(NLSoFiNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        if not sofi_re.search(value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        if int(value) == 0:
-            raise ValidationError(self.error_messages['invalid'])
-
-        checksum = 0
-        for i in range(9, 1, -1):
-            checksum += int(value[9-i]) * i
-        checksum -= int(value[-1])
-
-        if checksum % 11 != 0:
-            raise ValidationError(self.error_messages['invalid'])
-
-        return value
diff --git a/django/contrib/localflavor/nl/nl_provinces.py b/django/contrib/localflavor/nl/nl_provinces.py
deleted file mode 100644
index 602917debc..0000000000
--- a/django/contrib/localflavor/nl/nl_provinces.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-
-PROVINCE_CHOICES = (
-    ('DR', _('Drenthe')),
-    ('FL', _('Flevoland')),
-    ('FR', _('Friesland')),
-    ('GL', _('Gelderland')),
-    ('GR', _('Groningen')),
-    ('LB', _('Limburg')),
-    ('NB', _('Noord-Brabant')),
-    ('NH', _('Noord-Holland')),
-    ('OV', _('Overijssel')),
-    ('UT', _('Utrecht')),
-    ('ZE', _('Zeeland')),
-    ('ZH', _('Zuid-Holland')),
-)
diff --git a/django/contrib/localflavor/no/forms.py b/django/contrib/localflavor/no/forms.py
deleted file mode 100644
index 4bd780a312..0000000000
--- a/django/contrib/localflavor/no/forms.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""
-Norwegian-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-import datetime
-
-from django.contrib.localflavor.no.no_municipalities import MUNICIPALITY_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class NOZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(NOZipCodeField, self).__init__(r'^\d{4}$',
-            max_length, min_length, *args, **kwargs)
-
-class NOMunicipalitySelect(Select):
-    """
-    A Select widget that uses a list of Norwegian municipalities (fylker)
-    as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(NOMunicipalitySelect, self).__init__(attrs, choices=MUNICIPALITY_CHOICES)
-
-class NOSocialSecurityNumber(Field):
-    """
-    Algorithm is documented at http://no.wikipedia.org/wiki/Personnummer
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid Norwegian social security number.'),
-    }
-
-    def clean(self, value):
-        super(NOSocialSecurityNumber, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        if not re.match(r'^\d{11}$', value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        day = int(value[:2])
-        month = int(value[2:4])
-        year2 = int(value[4:6])
-
-        inum = int(value[6:9])
-        self.birthday = None
-        try:
-            if 000 <= inum < 500:
-                self.birthday = datetime.date(1900+year2, month, day)
-            if 500 <= inum < 750 and year2 > 54:
-                self.birthday = datetime.date(1800+year2, month, day)
-            if 500 <= inum < 1000 and year2 < 40:
-                self.birthday = datetime.date(2000+year2, month, day)
-            if 900 <= inum < 1000 and year2 > 39:
-                self.birthday = datetime.date(1900+year2, month, day)
-        except ValueError:
-            raise ValidationError(self.error_messages['invalid'])
-
-        sexnum = int(value[8])
-        if sexnum % 2 == 0:
-            self.gender = 'F'
-        else:
-            self.gender = 'M'
-
-        digits = map(int, list(value))
-        weight_1 = [3, 7, 6, 1, 8, 9, 4, 5, 2, 1, 0]
-        weight_2 = [5, 4, 3, 2, 7, 6, 5, 4, 3, 2, 1]
-
-        def multiply_reduce(aval, bval):
-            return sum([(a * b) for (a, b) in zip(aval, bval)])
-
-        if multiply_reduce(digits, weight_1) % 11 != 0:
-            raise ValidationError(self.error_messages['invalid'])
-        if multiply_reduce(digits, weight_2) % 11 != 0:
-            raise ValidationError(self.error_messages['invalid'])
-
-        return value
-
diff --git a/django/contrib/localflavor/no/no_municipalities.py b/django/contrib/localflavor/no/no_municipalities.py
deleted file mode 100644
index d84915caa2..0000000000
--- a/django/contrib/localflavor/no/no_municipalities.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-An alphabetical list of Norwegian municipalities (fylker) fro use as `choices`
-in a formfield.
-
-This exists in this standalone file so that it's on ly imported into memory
-when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-MUNICIPALITY_CHOICES = (
-    ('akershus', 'Akershus'),
-    ('austagder', 'Aust-Agder'),
-    ('buskerud', 'Buskerud'),
-    ('finnmark', 'Finnmark'),
-    ('hedmark', 'Hedmark'),
-    ('hordaland', 'Hordaland'),
-    ('janmayen', 'Jan Mayen'),
-    ('moreogromsdal', 'Møre og Romsdal'),
-    ('nordtrondelag', 'Nord-Trøndelag'),
-    ('nordland', 'Nordland'),
-    ('oppland', 'Oppland'),
-    ('oslo', 'Oslo'),
-    ('rogaland', 'Rogaland'),
-    ('sognogfjordane', 'Sogn og Fjordane'),
-    ('svalbard', 'Svalbard'),
-    ('sortrondelag', 'Sør-Trøndelag'),
-    ('telemark', 'Telemark'),
-    ('troms', 'Troms'),
-    ('vestagder', 'Vest-Agder'),
-    ('vestfold', 'Vestfold'),
-    ('ostfold', 'Østfold')
-)
diff --git a/django/contrib/localflavor/pe/forms.py b/django/contrib/localflavor/pe/forms.py
deleted file mode 100644
index 5100bbf575..0000000000
--- a/django/contrib/localflavor/pe/forms.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-PE-specific Form helpers.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-from django.contrib.localflavor.pe.pe_region import REGION_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import RegexField, CharField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class PERegionSelect(Select):
-    """
-    A Select widget that uses a list of Peruvian Regions as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(PERegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
-
-class PEDNIField(CharField):
-    """
-    A field that validates `Documento Nacional de IdentidadŽ (DNI) numbers.
-    """
-    default_error_messages = {
-        'invalid': _("This field requires only numbers."),
-        'max_digits': _("This field requires 8 digits."),
-    }
-
-    def __init__(self, max_length=8, min_length=8, *args, **kwargs):
-        super(PEDNIField, self).__init__(max_length, min_length, *args,
-                **kwargs)
-
-    def clean(self, value):
-        """
-        Value must be a string in the XXXXXXXX formats.
-        """
-        value = super(PEDNIField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        if not value.isdigit():
-            raise ValidationError(self.error_messages['invalid'])
-        if len(value) != 8:
-            raise ValidationError(self.error_messages['max_digits'])
-
-        return value
-
-class PERUCField(RegexField):
-    """
-    This field validates a RUC (Registro Unico de Contribuyentes). A RUC is of
-    the form XXXXXXXXXXX.
-    """
-    default_error_messages = {
-        'invalid': _("This field requires only numbers."),
-        'max_digits': _("This field requires 11 digits."),
-    }
-
-    def __init__(self, max_length=11, min_length=11, *args, **kwargs):
-        super(PERUCField, self).__init__(max_length, min_length, *args,
-            **kwargs)
-
-    def clean(self, value):
-        """
-        Value must be an 11-digit number.
-        """
-        value = super(PERUCField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        if not value.isdigit():
-            raise ValidationError(self.error_messages['invalid'])
-        if len(value) != 11:
-            raise ValidationError(self.error_messages['max_digits'])
-        return value
-
diff --git a/django/contrib/localflavor/pe/pe_region.py b/django/contrib/localflavor/pe/pe_region.py
deleted file mode 100644
index 9270bcecf1..0000000000
--- a/django/contrib/localflavor/pe/pe_region.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-A list of Peru regions as `choices` in a formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-REGION_CHOICES = (
-    ('AMA', 'Amazonas'),
-    ('ANC', 'Ancash'),
-    ('APU', 'Apurímac'),
-    ('ARE', 'Arequipa'),
-    ('AYA', 'Ayacucho'),
-    ('CAJ', 'Cajamarca'),
-    ('CAL', 'Callao'),
-    ('CUS', 'Cusco'),
-    ('HUV', 'Huancavelica'),
-    ('HUC', 'Huánuco'),
-    ('ICA', 'Ica'),
-    ('JUN', 'Junín'),
-    ('LAL', 'La Libertad'),
-    ('LAM', 'Lambayeque'),
-    ('LIM', 'Lima'),
-    ('LOR', 'Loreto'),
-    ('MDD', 'Madre de Dios'),
-    ('MOQ', 'Moquegua'),
-    ('PAS', 'Pasco'),
-    ('PIU', 'Piura'),
-    ('PUN', 'Puno'),
-    ('SAM', 'San Martín'),
-    ('TAC', 'Tacna'),
-    ('TUM', 'Tumbes'),
-    ('UCA', 'Ucayali'),
-)
diff --git a/django/contrib/localflavor/pl/forms.py b/django/contrib/localflavor/pl/forms.py
deleted file mode 100644
index 12d9f3d763..0000000000
--- a/django/contrib/localflavor/pl/forms.py
+++ /dev/null
@@ -1,218 +0,0 @@
-"""
-Polish-specific form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.pl.pl_administrativeunits import ADMINISTRATIVE_UNIT_CHOICES
-from django.contrib.localflavor.pl.pl_voivodeships import VOIVODESHIP_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Select, RegexField
-from django.utils.translation import ugettext_lazy as _
-
-
-class PLProvinceSelect(Select):
-    """
-    A select widget with list of Polish administrative provinces as choices.
-    """
-    def __init__(self, attrs=None):
-        super(PLProvinceSelect, self).__init__(attrs, choices=VOIVODESHIP_CHOICES)
-
-class PLCountySelect(Select):
-    """
-    A select widget with list of Polish administrative units as choices.
-    """
-    def __init__(self, attrs=None):
-        super(PLCountySelect, self).__init__(attrs, choices=ADMINISTRATIVE_UNIT_CHOICES)
-
-class PLPESELField(RegexField):
-    """
-    A form field that validates as Polish Identification Number (PESEL).
-
-    Checks the following rules:
-        * the length consist of 11 digits
-        * has a valid checksum
-
-    The algorithm is documented at http://en.wikipedia.org/wiki/PESEL.
-    """
-    default_error_messages = {
-        'invalid': _('National Identification Number consists of 11 digits.'),
-        'checksum': _('Wrong checksum for the National Identification Number.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(PLPESELField, self).__init__(r'^\d{11}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        super(PLPESELField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        if not self.has_valid_checksum(value):
-            raise ValidationError(self.error_messages['checksum'])
-        return '%s' % value
-
-    def has_valid_checksum(self, number):
-        """
-        Calculates a checksum with the provided algorithm.
-        """
-        multiple_table = (1, 3, 7, 9, 1, 3, 7, 9, 1, 3, 1)
-        result = 0
-        for i in range(len(number)):
-            result += int(number[i]) * multiple_table[i]
-        return result % 10 == 0
-
-class PLNationalIDCardNumberField(RegexField):
-    """
-    A form field that validates as Polish National ID Card Number.
-
-    Checks the following rules:
-        * the length consist of 3 letter and 6 digits
-        * has a valid checksum
-
-    The algorithm is documented at http://en.wikipedia.org/wiki/Polish_identity_card.
-    """
-    default_error_messages = {
-        'invalid': _('National ID Card Number consists of 3 letters and 6 digits.'),
-        'checksum': _('Wrong checksum for the National ID Card Number.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(PLNationalIDCardNumberField, self).__init__(r'^[A-Za-z]{3}\d{6}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self,value):
-        super(PLNationalIDCardNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = value.upper()
-
-        if not self.has_valid_checksum(value):
-            raise ValidationError(self.error_messages['checksum'])
-        return '%s' % value
-
-    def has_valid_checksum(self, number):
-        """
-        Calculates a checksum with the provided algorithm.
-        """
-        letter_dict = {'A': 10, 'B': 11, 'C': 12, 'D': 13,
-                       'E': 14, 'F': 15, 'G': 16, 'H': 17,
-                       'I': 18, 'J': 19, 'K': 20, 'L': 21,
-                       'M': 22, 'N': 23, 'O': 24, 'P': 25,
-                       'Q': 26, 'R': 27, 'S': 28, 'T': 29,
-                       'U': 30, 'V': 31, 'W': 32, 'X': 33,
-                       'Y': 34, 'Z': 35}
-
-        # convert letters to integer values
-        int_table = [(not c.isdigit()) and letter_dict[c] or int(c)
-                     for c in number]
-
-        multiple_table = (7, 3, 1, -1, 7, 3, 1, 7, 3)
-        result = 0
-        for i in range(len(int_table)):
-            result += int_table[i] * multiple_table[i]
-
-        return result % 10 == 0
-
-
-class PLNIPField(RegexField):
-    """
-    A form field that validates as Polish Tax Number (NIP).
-    Valid forms are: XXX-YYY-YY-YY, XXX-YY-YY-YYY or XXXYYYYYYY.
-
-    Checksum algorithm based on documentation at
-    http://wipos.p.lodz.pl/zylla/ut/nip-rego.html
-    """
-    default_error_messages = {
-        'invalid': _('Enter a tax number field (NIP) in the format XXX-XXX-XX-XX, XXX-XX-XX-XXX or XXXXXXXXXX.'),
-        'checksum': _('Wrong checksum for the Tax Number (NIP).'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(PLNIPField, self).__init__(r'^\d{3}-\d{3}-\d{2}-\d{2}$|^\d{3}-\d{2}-\d{2}-\d{3}$|^\d{10}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self,value):
-        super(PLNIPField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub("[-]", "", value)
-        if not self.has_valid_checksum(value):
-            raise ValidationError(self.error_messages['checksum'])
-        return '%s' % value
-
-    def has_valid_checksum(self, number):
-        """
-        Calculates a checksum with the provided algorithm.
-        """
-        multiple_table = (6, 5, 7, 2, 3, 4, 5, 6, 7)
-        result = 0
-        for i in range(len(number)-1):
-            result += int(number[i]) * multiple_table[i]
-
-        result %= 11
-        if result == int(number[-1]):
-            return True
-        else:
-            return False
-
-class PLREGONField(RegexField):
-    """
-    A form field that validates its input is a REGON number.
-
-    Valid regon number consists of 9 or 14 digits.
-    See http://www.stat.gov.pl/bip/regon_ENG_HTML.htm for more information.
-    """
-    default_error_messages = {
-        'invalid': _('National Business Register Number (REGON) consists of 9 or 14 digits.'),
-        'checksum': _('Wrong checksum for the National Business Register Number (REGON).'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(PLREGONField, self).__init__(r'^\d{9,14}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self,value):
-        super(PLREGONField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        if not self.has_valid_checksum(value):
-            raise ValidationError(self.error_messages['checksum'])
-        return '%s' % value
-
-    def has_valid_checksum(self, number):
-        """
-        Calculates a checksum with the provided algorithm.
-        """
-        weights = (
-            (8, 9, 2, 3, 4, 5, 6, 7, -1),
-            (2, 4, 8, 5, 0, 9, 7, 3, 6, 1, 2, 4, 8, -1),
-            (8, 9, 2, 3, 4, 5, 6, 7, -1, 0, 0, 0, 0, 0),
-        )
-
-        weights = [table for table in weights if len(table) == len(number)]
-
-        for table in weights:
-            checksum = sum([int(n) * w for n, w in zip(number, table)])
-            if checksum % 11 % 10:
-                return False
-
-        return bool(weights)
-
-class PLPostalCodeField(RegexField):
-    """
-    A form field that validates as Polish postal code.
-    Valid code is XX-XXX where X is digit.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a postal code in the format XX-XXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(PLPostalCodeField, self).__init__(r'^\d{2}-\d{3}$',
-            max_length, min_length, *args, **kwargs)
-
diff --git a/django/contrib/localflavor/pl/pl_administrativeunits.py b/django/contrib/localflavor/pl/pl_administrativeunits.py
deleted file mode 100644
index f5263f19d2..0000000000
--- a/django/contrib/localflavor/pl/pl_administrativeunits.py
+++ /dev/null
@@ -1,386 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Polish administrative units as in http://pl.wikipedia.org/wiki/Podzia%C5%82_administracyjny_Polski
-"""
-from __future__ import unicode_literals
-
-
-ADMINISTRATIVE_UNIT_CHOICES = (
-    ('wroclaw', 'Wrocław'),
-    ('jeleniagora', 'Jelenia Góra'),
-    ('legnica', 'Legnica'),
-    ('boleslawiecki', 'bolesławiecki'),
-    ('dzierzoniowski', 'dzierżoniowski'),
-    ('glogowski', 'głogowski'),
-    ('gorowski', 'górowski'),
-    ('jaworski', 'jaworski'),
-    ('jeleniogorski', 'jeleniogórski'),
-    ('kamiennogorski', 'kamiennogórski'),
-    ('klodzki', 'kłodzki'),
-    ('legnicki', 'legnicki'),
-    ('lubanski', 'lubański'),
-    ('lubinski', 'lubiński'),
-    ('lwowecki', 'lwówecki'),
-    ('milicki', 'milicki'),
-    ('olesnicki', 'oleśnicki'),
-    ('olawski', 'oławski'),
-    ('polkowicki', 'polkowicki'),
-    ('strzelinski', 'strzeliński'),
-    ('sredzki', 'średzki'),
-    ('swidnicki', 'świdnicki'),
-    ('trzebnicki', 'trzebnicki'),
-    ('walbrzyski', 'wałbrzyski'),
-    ('wolowski', 'wołowski'),
-    ('wroclawski', 'wrocławski'),
-    ('zabkowicki', 'ząbkowicki'),
-    ('zgorzelecki', 'zgorzelecki'),
-    ('zlotoryjski', 'złotoryjski'),
-    ('bydgoszcz', 'Bydgoszcz'),
-    ('torun', 'Toruń'),
-    ('wloclawek', 'Włocławek'),
-    ('grudziadz', 'Grudziądz'),
-    ('aleksandrowski', 'aleksandrowski'),
-    ('brodnicki', 'brodnicki'),
-    ('bydgoski', 'bydgoski'),
-    ('chelminski', 'chełmiński'),
-    ('golubsko-dobrzynski', 'golubsko-dobrzyński'),
-    ('grudziadzki', 'grudziądzki'),
-    ('inowroclawski', 'inowrocławski'),
-    ('lipnowski', 'lipnowski'),
-    ('mogilenski', 'mogileński'),
-    ('nakielski', 'nakielski'),
-    ('radziejowski', 'radziejowski'),
-    ('rypinski', 'rypiński'),
-    ('sepolenski', 'sępoleński'),
-    ('swiecki', 'świecki'),
-    ('torunski', 'toruński'),
-    ('tucholski', 'tucholski'),
-    ('wabrzeski', 'wąbrzeski'),
-    ('wloclawski', 'wrocławski'),
-    ('zninski', 'źniński'),
-    ('lublin', 'Lublin'),
-    ('biala-podlaska', 'Biała Podlaska'),
-    ('chelm', 'Chełm'),
-    ('zamosc', 'Zamość'),
-    ('bialski', 'bialski'),
-    ('bilgorajski', 'biłgorajski'),
-    ('chelmski', 'chełmski'),
-    ('hrubieszowski', 'hrubieszowski'),
-    ('janowski', 'janowski'),
-    ('krasnostawski', 'krasnostawski'),
-    ('krasnicki', 'kraśnicki'),
-    ('lubartowski', 'lubartowski'),
-    ('lubelski', 'lubelski'),
-    ('leczynski', 'łęczyński'),
-    ('lukowski', 'łukowski'),
-    ('opolski', 'opolski'),
-    ('parczewski', 'parczewski'),
-    ('pulawski', 'puławski'),
-    ('radzynski', 'radzyński'),
-    ('rycki', 'rycki'),
-    ('swidnicki', 'świdnicki'),
-    ('tomaszowski', 'tomaszowski'),
-    ('wlodawski', 'włodawski'),
-    ('zamojski', 'zamojski'),
-    ('gorzow-wielkopolski', 'Gorzów Wielkopolski'),
-    ('zielona-gora', 'Zielona Góra'),
-    ('gorzowski', 'gorzowski'),
-    ('krosnienski', 'krośnieński'),
-    ('miedzyrzecki', 'międzyrzecki'),
-    ('nowosolski', 'nowosolski'),
-    ('slubicki', 'słubicki'),
-    ('strzelecko-drezdenecki', 'strzelecko-drezdenecki'),
-    ('sulecinski', 'suleńciński'),
-    ('swiebodzinski', 'świebodziński'),
-    ('wschowski', 'wschowski'),
-    ('zielonogorski', 'zielonogórski'),
-    ('zaganski', 'żagański'),
-    ('zarski', 'żarski'),
-    ('lodz', 'Łódź'),
-    ('piotrkow-trybunalski', 'Piotrków Trybunalski'),
-    ('skierniewice', 'Skierniewice'),
-    ('belchatowski', 'bełchatowski'),
-    ('brzezinski', 'brzeziński'),
-    ('kutnowski', 'kutnowski'),
-    ('laski', 'łaski'),
-    ('leczycki', 'łęczycki'),
-    ('lowicki', 'łowicki'),
-    ('lodzki wschodni', 'łódzki wschodni'),
-    ('opoczynski', 'opoczyński'),
-    ('pabianicki', 'pabianicki'),
-    ('pajeczanski', 'pajęczański'),
-    ('piotrkowski', 'piotrkowski'),
-    ('poddebicki', 'poddębicki'),
-    ('radomszczanski', 'radomszczański'),
-    ('rawski', 'rawski'),
-    ('sieradzki', 'sieradzki'),
-    ('skierniewicki', 'skierniewicki'),
-    ('tomaszowski', 'tomaszowski'),
-    ('wielunski', 'wieluński'),
-    ('wieruszowski', 'wieruszowski'),
-    ('zdunskowolski', 'zduńskowolski'),
-    ('zgierski', 'zgierski'),
-    ('krakow', 'Kraków'),
-    ('tarnow', 'Tarnów'),
-    ('nowy-sacz', 'Nowy Sącz'),
-    ('bochenski', 'bocheński'),
-    ('brzeski', 'brzeski'),
-    ('chrzanowski', 'chrzanowski'),
-    ('dabrowski', 'dąbrowski'),
-    ('gorlicki', 'gorlicki'),
-    ('krakowski', 'krakowski'),
-    ('limanowski', 'limanowski'),
-    ('miechowski', 'miechowski'),
-    ('myslenicki', 'myślenicki'),
-    ('nowosadecki', 'nowosądecki'),
-    ('nowotarski', 'nowotarski'),
-    ('olkuski', 'olkuski'),
-    ('oswiecimski', 'oświęcimski'),
-    ('proszowicki', 'proszowicki'),
-    ('suski', 'suski'),
-    ('tarnowski', 'tarnowski'),
-    ('tatrzanski', 'tatrzański'),
-    ('wadowicki', 'wadowicki'),
-    ('wielicki', 'wielicki'),
-    ('warszawa', 'Warszawa'),
-    ('ostroleka', 'Ostrołęka'),
-    ('plock', 'Płock'),
-    ('radom', 'Radom'),
-    ('siedlce', 'Siedlce'),
-    ('bialobrzeski', 'białobrzeski'),
-    ('ciechanowski', 'ciechanowski'),
-    ('garwolinski', 'garwoliński'),
-    ('gostyninski', 'gostyniński'),
-    ('grodziski', 'grodziski'),
-    ('grojecki', 'grójecki'),
-    ('kozienicki', 'kozenicki'),
-    ('legionowski', 'legionowski'),
-    ('lipski', 'lipski'),
-    ('losicki', 'łosicki'),
-    ('makowski', 'makowski'),
-    ('minski', 'miński'),
-    ('mlawski', 'mławski'),
-    ('nowodworski', 'nowodworski'),
-    ('ostrolecki', 'ostrołęcki'),
-    ('ostrowski', 'ostrowski'),
-    ('otwocki', 'otwocki'),
-    ('piaseczynski', 'piaseczyński'),
-    ('plocki', 'płocki'),
-    ('plonski', 'płoński'),
-    ('pruszkowski', 'pruszkowski'),
-    ('przasnyski', 'przasnyski'),
-    ('przysuski', 'przysuski'),
-    ('pultuski', 'pułtuski'),
-    ('radomski', 'radomski'),
-    ('siedlecki', 'siedlecki'),
-    ('sierpecki', 'sierpecki'),
-    ('sochaczewski', 'sochaczewski'),
-    ('sokolowski', 'sokołowski'),
-    ('szydlowiecki', 'szydłowiecki'),
-    ('warszawski-zachodni', 'warszawski zachodni'),
-    ('wegrowski', 'węgrowski'),
-    ('wolominski', 'wołomiński'),
-    ('wyszkowski', 'wyszkowski'),
-    ('zwolenski', 'zwoleński'),
-    ('zurominski', 'żuromiński'),
-    ('zyrardowski', 'żyrardowski'),
-    ('opole', 'Opole'),
-    ('brzeski', 'brzeski'),
-    ('glubczycki', 'głubczyski'),
-    ('kedzierzynsko-kozielski', 'kędzierzyński-kozielski'),
-    ('kluczborski', 'kluczborski'),
-    ('krapkowicki', 'krapkowicki'),
-    ('namyslowski', 'namysłowski'),
-    ('nyski', 'nyski'),
-    ('oleski', 'oleski'),
-    ('opolski', 'opolski'),
-    ('prudnicki', 'prudnicki'),
-    ('strzelecki', 'strzelecki'),
-    ('rzeszow', 'Rzeszów'),
-    ('krosno', 'Krosno'),
-    ('przemysl', 'Przemyśl'),
-    ('tarnobrzeg', 'Tarnobrzeg'),
-    ('bieszczadzki', 'bieszczadzki'),
-    ('brzozowski', 'brzozowski'),
-    ('debicki', 'dębicki'),
-    ('jaroslawski', 'jarosławski'),
-    ('jasielski', 'jasielski'),
-    ('kolbuszowski', 'kolbuszowski'),
-    ('krosnienski', 'krośnieński'),
-    ('leski', 'leski'),
-    ('lezajski', 'leżajski'),
-    ('lubaczowski', 'lubaczowski'),
-    ('lancucki', 'łańcucki'),
-    ('mielecki', 'mielecki'),
-    ('nizanski', 'niżański'),
-    ('przemyski', 'przemyski'),
-    ('przeworski', 'przeworski'),
-    ('ropczycko-sedziszowski', 'ropczycko-sędziszowski'),
-    ('rzeszowski', 'rzeszowski'),
-    ('sanocki', 'sanocki'),
-    ('stalowowolski', 'stalowowolski'),
-    ('strzyzowski', 'strzyżowski'),
-    ('tarnobrzeski', 'tarnobrzeski'),
-    ('bialystok', 'Białystok'),
-    ('lomza', 'Łomża'),
-    ('suwalki', 'Suwałki'),
-    ('augustowski', 'augustowski'),
-    ('bialostocki', 'białostocki'),
-    ('bielski', 'bielski'),
-    ('grajewski', 'grajewski'),
-    ('hajnowski', 'hajnowski'),
-    ('kolnenski', 'kolneński'),
-    ('łomzynski', 'łomżyński'),
-    ('moniecki', 'moniecki'),
-    ('sejnenski', 'sejneński'),
-    ('siemiatycki', 'siematycki'),
-    ('sokolski', 'sokólski'),
-    ('suwalski', 'suwalski'),
-    ('wysokomazowiecki', 'wysokomazowiecki'),
-    ('zambrowski', 'zambrowski'),
-    ('gdansk', 'Gdańsk'),
-    ('gdynia', 'Gdynia'),
-    ('slupsk', 'Słupsk'),
-    ('sopot', 'Sopot'),
-    ('bytowski', 'bytowski'),
-    ('chojnicki', 'chojnicki'),
-    ('czluchowski', 'człuchowski'),
-    ('kartuski', 'kartuski'),
-    ('koscierski', 'kościerski'),
-    ('kwidzynski', 'kwidzyński'),
-    ('leborski', 'lęborski'),
-    ('malborski', 'malborski'),
-    ('nowodworski', 'nowodworski'),
-    ('gdanski', 'gdański'),
-    ('pucki', 'pucki'),
-    ('slupski', 'słupski'),
-    ('starogardzki', 'starogardzki'),
-    ('sztumski', 'sztumski'),
-    ('tczewski', 'tczewski'),
-    ('wejherowski', 'wejcherowski'),
-    ('katowice', 'Katowice'),
-    ('bielsko-biala', 'Bielsko-Biała'),
-    ('bytom', 'Bytom'),
-    ('chorzow', 'Chorzów'),
-    ('czestochowa', 'Częstochowa'),
-    ('dabrowa-gornicza', 'Dąbrowa Górnicza'),
-    ('gliwice', 'Gliwice'),
-    ('jastrzebie-zdroj', 'Jastrzębie Zdrój'),
-    ('jaworzno', 'Jaworzno'),
-    ('myslowice', 'Mysłowice'),
-    ('piekary-slaskie', 'Piekary Śląskie'),
-    ('ruda-slaska', 'Ruda Śląska'),
-    ('rybnik', 'Rybnik'),
-    ('siemianowice-slaskie', 'Siemianowice Śląskie'),
-    ('sosnowiec', 'Sosnowiec'),
-    ('swietochlowice', 'Świętochłowice'),
-    ('tychy', 'Tychy'),
-    ('zabrze', 'Zabrze'),
-    ('zory', 'Żory'),
-    ('bedzinski', 'będziński'),
-    ('bielski', 'bielski'),
-    ('bierunsko-ledzinski', 'bieruńsko-lędziński'),
-    ('cieszynski', 'cieszyński'),
-    ('czestochowski', 'częstochowski'),
-    ('gliwicki', 'gliwicki'),
-    ('klobucki', 'kłobucki'),
-    ('lubliniecki', 'lubliniecki'),
-    ('mikolowski', 'mikołowski'),
-    ('myszkowski', 'myszkowski'),
-    ('pszczynski', 'pszczyński'),
-    ('raciborski', 'raciborski'),
-    ('rybnicki', 'rybnicki'),
-    ('tarnogorski', 'tarnogórski'),
-    ('wodzislawski', 'wodzisławski'),
-    ('zawiercianski', 'zawierciański'),
-    ('zywiecki', 'żywiecki'),
-    ('kielce', 'Kielce'),
-    ('buski', 'buski'),
-    ('jedrzejowski', 'jędrzejowski'),
-    ('kazimierski', 'kazimierski'),
-    ('kielecki', 'kielecki'),
-    ('konecki', 'konecki'),
-    ('opatowski', 'opatowski'),
-    ('ostrowiecki', 'ostrowiecki'),
-    ('pinczowski', 'pińczowski'),
-    ('sandomierski', 'sandomierski'),
-    ('skarzyski', 'skarżyski'),
-    ('starachowicki', 'starachowicki'),
-    ('staszowski', 'staszowski'),
-    ('wloszczowski', 'włoszczowski'),
-    ('olsztyn', 'Olsztyn'),
-    ('elblag', 'Elbląg'),
-    ('bartoszycki', 'bartoszycki'),
-    ('braniewski', 'braniewski'),
-    ('dzialdowski', 'działdowski'),
-    ('elblaski', 'elbląski'),
-    ('elcki', 'ełcki'),
-    ('gizycki', 'giżycki'),
-    ('goldapski', 'gołdapski'),
-    ('ilawski', 'iławski'),
-    ('ketrzynski', 'kętrzyński'),
-    ('lidzbarski', 'lidzbarski'),
-    ('mragowski', 'mrągowski'),
-    ('nidzicki', 'nidzicki'),
-    ('nowomiejski', 'nowomiejski'),
-    ('olecki', 'olecki'),
-    ('olsztynski', 'olsztyński'),
-    ('ostrodzki', 'ostródzki'),
-    ('piski', 'piski'),
-    ('szczycienski', 'szczycieński'),
-    ('wegorzewski', 'węgorzewski'),
-    ('poznan', 'Poznań'),
-    ('kalisz', 'Kalisz'),
-    ('konin', 'Konin'),
-    ('leszno', 'Leszno'),
-    ('chodzieski', 'chodziejski'),
-    ('czarnkowsko-trzcianecki', 'czarnkowsko-trzcianecki'),
-    ('gnieznienski', 'gnieźnieński'),
-    ('gostynski', 'gostyński'),
-    ('grodziski', 'grodziski'),
-    ('jarocinski', 'jarociński'),
-    ('kaliski', 'kaliski'),
-    ('kepinski', 'kępiński'),
-    ('kolski', 'kolski'),
-    ('koninski', 'koniński'),
-    ('koscianski', 'kościański'),
-    ('krotoszynski', 'krotoszyński'),
-    ('leszczynski', 'leszczyński'),
-    ('miedzychodzki', 'międzychodzki'),
-    ('nowotomyski', 'nowotomyski'),
-    ('obornicki', 'obornicki'),
-    ('ostrowski', 'ostrowski'),
-    ('ostrzeszowski', 'ostrzeszowski'),
-    ('pilski', 'pilski'),
-    ('pleszewski', 'pleszewski'),
-    ('poznanski', 'poznański'),
-    ('rawicki', 'rawicki'),
-    ('slupecki', 'słupecki'),
-    ('szamotulski', 'szamotulski'),
-    ('sredzki', 'średzki'),
-    ('sremski', 'śremski'),
-    ('turecki', 'turecki'),
-    ('wagrowiecki', 'wągrowiecki'),
-    ('wolsztynski', 'wolsztyński'),
-    ('wrzesinski', 'wrzesiński'),
-    ('zlotowski', 'złotowski'),
-    ('bialogardzki', 'białogardzki'),
-    ('choszczenski', 'choszczeński'),
-    ('drawski', 'drawski'),
-    ('goleniowski', 'goleniowski'),
-    ('gryficki', 'gryficki'),
-    ('gryfinski', 'gryfiński'),
-    ('kamienski', 'kamieński'),
-    ('kolobrzeski', 'kołobrzeski'),
-    ('koszalinski', 'koszaliński'),
-    ('lobeski', 'łobeski'),
-    ('mysliborski', 'myśliborski'),
-    ('policki', 'policki'),
-    ('pyrzycki', 'pyrzycki'),
-    ('slawienski', 'sławieński'),
-    ('stargardzki', 'stargardzki'),
-    ('szczecinecki', 'szczecinecki'),
-    ('swidwinski', 'świdwiński'),
-    ('walecki', 'wałecki'),
-)
-
diff --git a/django/contrib/localflavor/pl/pl_voivodeships.py b/django/contrib/localflavor/pl/pl_voivodeships.py
deleted file mode 100644
index d8caede3c8..0000000000
--- a/django/contrib/localflavor/pl/pl_voivodeships.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-Polish voivodeship as in http://en.wikipedia.org/wiki/Poland#Administrative_division
-"""
-
-from django.utils.translation import ugettext_lazy as _
-
-VOIVODESHIP_CHOICES = (
-    ('lower_silesia', _('Lower Silesia')),
-    ('kuyavia-pomerania', _('Kuyavia-Pomerania')),
-    ('lublin', _('Lublin')),
-    ('lubusz', _('Lubusz')),
-    ('lodz', _('Lodz')),
-    ('lesser_poland', _('Lesser Poland')),
-    ('masovia', _('Masovia')),
-    ('opole', _('Opole')),
-    ('subcarpatia', _('Subcarpatia')),
-    ('podlasie', _('Podlasie')),
-    ('pomerania', _('Pomerania')),
-    ('silesia', _('Silesia')),
-    ('swietokrzyskie', _('Swietokrzyskie')),
-    ('warmia-masuria', _('Warmia-Masuria')),
-    ('greater_poland', _('Greater Poland')),
-    ('west_pomerania', _('West Pomerania')),
-)
diff --git a/django/contrib/localflavor/pt/forms.py b/django/contrib/localflavor/pt/forms.py
deleted file mode 100644
index 01cdd101b2..0000000000
--- a/django/contrib/localflavor/pt/forms.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
-PT-specific Form helpers
-"""
-from __future__ import unicode_literals
-
-import re
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-phone_digits_re = re.compile(r'^(\d{9}|(00|\+)\d*)$')
-
-
-class PTZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXX-XXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(PTZipCodeField, self).__init__(r'^(\d{4}-\d{3}|\d{7})$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self,value):
-        cleaned = super(PTZipCodeField, self).clean(value)
-        if len(cleaned) == 7:
-           return '%s-%s' % (cleaned[:4],cleaned[4:])
-        else:
-           return cleaned
-
-class PTPhoneNumberField(Field):
-    """
-    Validate local Portuguese phone number (including international ones)
-    It should have 9 digits (may include spaces) or start by 00 or + (international)
-    """
-    default_error_messages = {
-        'invalid': _('Phone numbers must have 9 digits, or start by + or 00.'),
-    }
-
-    def clean(self, value):
-        super(PTPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('(\.|\s)', '', smart_text(value))
-        m = phone_digits_re.search(value)
-        if m:
-            return '%s' % value
-        raise ValidationError(self.error_messages['invalid'])
diff --git a/django/contrib/localflavor/py/forms.py b/django/contrib/localflavor/py/forms.py
deleted file mode 100644
index 8cb5faa80f..0000000000
--- a/django/contrib/localflavor/py/forms.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-PY-specific Form helpers.
-"""
-
-from __future__ import absolute_import
-
-from django.contrib.localflavor.py.py_department import DEPARTMENT_CHOICES, DEPARTMENT_ROMAN_CHOICES
-from django.forms.fields import Select
-
-
-class PyDepartmentSelect(Select):
-    """
-    A Select widget with a list of Paraguayan departments as choices.
-    """
-    def __init__(self, attrs=None):
-        super(PyDepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_CHOICES)
-
-
-class PyNumberedDepartmentSelect(Select):
-    """
-    A Select widget with a roman numbered list of Paraguayan departments as choices.
-    """
-    def __init__(self, attrs=None):
-        super(PyNumberedDepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_ROMAN_CHOICES)
diff --git a/django/contrib/localflavor/py/py_department.py b/django/contrib/localflavor/py/py_department.py
deleted file mode 100644
index 619bae3edb..0000000000
--- a/django/contrib/localflavor/py/py_department.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# http://www.statoids.com/upy.html
-from __future__ import unicode_literals
-
-DEPARTMENT_CHOICES = (
-    ('AG', 'Alto Paraguay'),
-    ('AA', 'Alto Paraná'),
-    ('AM', 'Amambay'),
-    ('AS', 'Asunción'),
-    ('BQ', 'Boquerón'),
-    ('CG', 'Caaguazú'),
-    ('CZ', 'Caazapá'),
-    ('CY', 'Canindeyú'),
-    ('CE', 'Central'),
-    ('CN', 'Concepción'),
-    ('CR', 'Cordillera'),
-    ('GU', 'Guairá'),
-    ('IT', 'Itapúa'),
-    ('MI', 'Misiones'),
-    ('NE', 'Ñeembucú'),
-    ('PG', 'Paraguarí'),
-    ('PH', 'Pdte. Hayes'),
-    ('SP', 'San Pedro'),
-)
-
-DEPARTMENT_ROMAN_CHOICES = (
-    ('CN', 'I Concepción'),
-    ('SP', 'II San Pedro'),
-    ('CR', 'III Cordillera'),
-    ('GU', 'IV Guairá'),
-    ('CG', 'V Caaguazú'),
-    ('CZ', 'VI Caazapá'),
-    ('IT', 'VII Itapúa'),
-    ('MI', 'VIII Misiones'),
-    ('PG', 'IX Paraguarí'),
-    ('AA', 'X Alto Paraná'),
-    ('CE', 'XI Central'),
-    ('NE', 'XII Ñeembucú'),
-    ('AM', 'XIII Amambay'),
-    ('CY', 'XIV Canindeyú'),
-    ('PH', 'XV Pdte. Hayes'),
-    ('AG', 'XVI Alto Paraguay'),
-    ('BQ', 'XVII Boquerón'),
-    ('AS', 'XVIII Asunción'),
-)
diff --git a/django/contrib/localflavor/ro/forms.py b/django/contrib/localflavor/ro/forms.py
deleted file mode 100644
index f6de1534c9..0000000000
--- a/django/contrib/localflavor/ro/forms.py
+++ /dev/null
@@ -1,205 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Romanian specific form helpers.
-"""
-from __future__ import absolute_import, unicode_literals
-
-import datetime
-
-from django.contrib.localflavor.ro.ro_counties import COUNTIES_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError, Field, RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class ROCIFField(RegexField):
-    """
-    A Romanian fiscal identity code (CIF) field
-
-    For CIF validation algorithm see http://www.validari.ro/cui.html
-    """
-    default_error_messages = {
-        'invalid': _("Enter a valid CIF."),
-    }
-
-    def __init__(self, max_length=10, min_length=2, *args, **kwargs):
-        super(ROCIFField, self).__init__(r'^(RO)?[0-9]{2,10}', max_length,
-                min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        CIF validation
-        """
-        value = super(ROCIFField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        # strip RO part
-        if value[0:2] == 'RO':
-            value = value[2:]
-        key = '753217532'[::-1]
-        value = value[::-1]
-        key_iter = iter(key)
-        checksum = 0
-        for digit in value[1:]:
-            checksum += int(digit) * int(next(key_iter))
-        checksum = checksum * 10 % 11
-        if checksum == 10:
-            checksum = 0
-        if checksum != int(value[0]):
-            raise ValidationError(self.error_messages['invalid'])
-        return value[::-1]
-
-class ROCNPField(RegexField):
-    """
-    A Romanian personal identity code (CNP) field
-
-    For CNP validation algorithm see http://www.validari.ro/cnp.html
-    """
-    default_error_messages = {
-        'invalid': _("Enter a valid CNP."),
-    }
-
-    def __init__(self, max_length=13, min_length=13, *args, **kwargs):
-        super(ROCNPField, self).__init__(r'^[1-9][0-9]{12}', max_length,
-            min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        CNP validations
-        """
-        value = super(ROCNPField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        # check birthdate digits
-        try:
-            datetime.date(int(value[1:3]), int(value[3:5]), int(value[5:7]))
-        except ValueError:
-            raise ValidationError(self.error_messages['invalid'])
-        # checksum
-        key = '279146358279'
-        checksum = 0
-        value_iter = iter(value)
-        for digit in key:
-            checksum += int(digit) * int(next(value_iter))
-        checksum %= 11
-        if checksum == 10:
-            checksum = 1
-        if checksum != int(value[12]):
-            raise ValidationError(self.error_messages['invalid'])
-        return value
-
-class ROCountyField(Field):
-    """
-    A form field that validates its input is a Romanian county name or
-    abbreviation. It normalizes the input to the standard vehicle registration
-    abbreviation for the given county
-
-    WARNING: This field will only accept names written with diacritics; consider
-    using ROCountySelect if this behavior is unnaceptable for you
-    Example:
-        Argeş => valid
-        Arges => invalid
-    """
-    default_error_messages = {
-        'invalid': 'Enter a Romanian county code or name.',
-    }
-
-    def clean(self, value):
-        super(ROCountyField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        try:
-            value = value.strip().upper()
-        except AttributeError:
-            pass
-        # search for county code
-        for entry in COUNTIES_CHOICES:
-            if value in entry:
-                return value
-        # search for county name
-        normalized_CC = []
-        for entry in COUNTIES_CHOICES:
-            normalized_CC.append((entry[0], entry[1].upper()))
-        for entry in normalized_CC:
-            if entry[1] == value:
-                return entry[0]
-        raise ValidationError(self.error_messages['invalid'])
-
-class ROCountySelect(Select):
-    """
-    A Select widget that uses a list of Romanian counties (judete) as its
-    choices.
-    """
-    def __init__(self, attrs=None):
-        super(ROCountySelect, self).__init__(attrs, choices=COUNTIES_CHOICES)
-
-class ROIBANField(RegexField):
-    """
-    Romanian International Bank Account Number (IBAN) field
-
-    For Romanian IBAN validation algorithm see http://validari.ro/iban.html
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format'),
-    }
-
-    def __init__(self, max_length=40, min_length=24, *args, **kwargs):
-        super(ROIBANField, self).__init__(r'^[0-9A-Za-z\-\s]{24,40}$',
-                max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Strips - and spaces, performs country code and checksum validation
-        """
-        value = super(ROIBANField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = value.replace('-', '')
-        value = value.replace(' ', '')
-        value = value.upper()
-        if value[0:2] != 'RO':
-            raise ValidationError(self.error_messages['invalid'])
-        numeric_format = ''
-        for char in value[4:] + value[0:4]:
-            if char.isalpha():
-                numeric_format += str(ord(char) - 55)
-            else:
-                numeric_format += char
-        if int(numeric_format) % 97 != 1:
-            raise ValidationError(self.error_messages['invalid'])
-        return value
-
-class ROPhoneNumberField(RegexField):
-    """Romanian phone number field"""
-    default_error_messages = {
-        'invalid': _('Phone numbers must be in XXXX-XXXXXX format.'),
-    }
-
-    def __init__(self, max_length=20, min_length=10, *args, **kwargs):
-        super(ROPhoneNumberField, self).__init__(r'^[0-9\-\(\)\s]{10,20}$',
-                max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Strips -, (, ) and spaces. Checks the final length.
-        """
-        value = super(ROPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = value.replace('-', '')
-        value = value.replace('(', '')
-        value = value.replace(')', '')
-        value = value.replace(' ', '')
-        if len(value) != 10:
-            raise ValidationError(self.error_messages['invalid'])
-        return value
-
-class ROPostalCodeField(RegexField):
-    """Romanian postal code field."""
-    default_error_messages = {
-        'invalid': _('Enter a valid postal code in the format XXXXXX'),
-    }
-
-    def __init__(self, max_length=6, min_length=6, *args, **kwargs):
-        super(ROPostalCodeField, self).__init__(r'^[0-9][0-8][0-9]{4}$',
-                max_length, min_length, *args, **kwargs)
diff --git a/django/contrib/localflavor/ro/ro_counties.py b/django/contrib/localflavor/ro/ro_counties.py
deleted file mode 100644
index 282cfc5193..0000000000
--- a/django/contrib/localflavor/ro/ro_counties.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-A list of Romanian counties as `choices` in a formfield.
-
-This exists as a standalone file so that it's only imported into memory when
-explicitly needed.
-"""
-from __future__ import unicode_literals
-
-COUNTIES_CHOICES = (
-    ('AB', 'Alba'),
-    ('AR', 'Arad'),
-    ('AG', 'Argeş'),
-    ('BC', 'Bacău'),
-    ('BH', 'Bihor'),
-    ('BN', 'Bistriţa-Năsăud'),
-    ('BT', 'Botoşani'),
-    ('BV', 'Braşov'),
-    ('BR', 'Brăila'),
-    ('B',  'Bucureşti'),
-    ('BZ', 'Buzău'),
-    ('CS', 'Caraş-Severin'),
-    ('CL', 'Călăraşi'),
-    ('CJ', 'Cluj'),
-    ('CT', 'Constanţa'),
-    ('CV', 'Covasna'),
-    ('DB', 'Dâmboviţa'),
-    ('DJ', 'Dolj'),
-    ('GL', 'Galaţi'),
-    ('GR', 'Giurgiu'),
-    ('GJ', 'Gorj'),
-    ('HR', 'Harghita'),
-    ('HD', 'Hunedoara'),
-    ('IL', 'Ialomiţa'),
-    ('IS', 'Iaşi'),
-    ('IF', 'Ilfov'),
-    ('MM', 'Maramureş'),
-    ('MH', 'Mehedinţi'),
-    ('MS', 'Mureş'),
-    ('NT', 'Neamţ'),
-    ('OT', 'Olt'),
-    ('PH', 'Prahova'),
-    ('SM', 'Satu Mare'),
-    ('SJ', 'Sălaj'),
-    ('SB', 'Sibiu'),
-    ('SV', 'Suceava'),
-    ('TR', 'Teleorman'),
-    ('TM', 'Timiş'),
-    ('TL', 'Tulcea'),
-    ('VS', 'Vaslui'),
-    ('VL', 'Vâlcea'),
-    ('VN', 'Vrancea'),
-)
diff --git a/django/contrib/localflavor/ru/forms.py b/django/contrib/localflavor/ru/forms.py
deleted file mode 100644
index 03114d0629..0000000000
--- a/django/contrib/localflavor/ru/forms.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""
-Russian-specific forms helpers
-"""
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.ru.ru_regions import RU_COUNTY_CHOICES, RU_REGIONS_CHOICES
-from django.forms.fields import RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-phone_digits_re = re.compile(r'^(?:[78]-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
-
-class RUCountySelect(Select):
-    """
-    A Select widget that uses a list of Russian Counties as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(RUCountySelect, self).__init__(attrs, choices=RU_COUNTY_CHOICES)
-
-
-class RURegionSelect(Select):
-    """
-    A Select widget that uses a list of Russian Regions as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(RURegionSelect, self).__init__(attrs, choices=RU_REGIONS_CHOICES)
-
-
-class RUPostalCodeField(RegexField):
-    """
-    Russian Postal code field.
-    Format: XXXXXX, where X is any digit, and first digit is not zero.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a postal code in the format XXXXXX.'),
-    }
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(RUPostalCodeField, self).__init__(r'^\d{6}$',
-            max_length, min_length, *args, **kwargs)
-
-
-class RUPassportNumberField(RegexField):
-    """
-    Russian internal passport number format:
-    XXXX XXXXXX where X - any digit.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a passport number in the format XXXX XXXXXX.'),
-    }
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(RUPassportNumberField, self).__init__(r'^\d{4} \d{6}$',
-            max_length, min_length, *args, **kwargs)
-
-
-class RUAlienPassportNumberField(RegexField):
-    """
-    Russian alien's passport number format:
-    XX XXXXXXX where X - any digit.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a passport number in the format XX XXXXXXX.'),
-    }
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(RUAlienPassportNumberField, self).__init__(r'^\d{2} \d{7}$',
-            max_length, min_length, *args, **kwargs)
diff --git a/django/contrib/localflavor/ru/ru_regions.py b/django/contrib/localflavor/ru/ru_regions.py
deleted file mode 100644
index d07803914f..0000000000
--- a/django/contrib/localflavor/ru/ru_regions.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- encoding: utf-8 -*-
-"""
-Sources:
-    http://ru.wikipedia.org/wiki/Коды_субъектов_Российской_Федерации
-    http://ru.wikipedia.org/wiki/Федеральные_округа_Российской_Федерации
-"""
-from django.utils.translation import ugettext_lazy as _
-
-RU_COUNTY_CHOICES = (
-    ("Central Federal County", _("Central Federal County")),
-    ("South Federal County", _("South Federal County")),
-    ("North-West Federal County", _("North-West Federal County")),
-    ("Far-East Federal County", _("Far-East Federal County")),
-    ("Siberian Federal County", _("Siberian Federal County")),
-    ("Ural Federal County", _("Ural Federal County")),
-    ("Privolzhsky Federal County", _("Privolzhsky Federal County")),
-    ("North-Caucasian Federal County", _("North-Caucasian Federal County"))
-)
-
-RU_REGIONS_CHOICES = (
-    ("77", _("Moskva")),
-    ("78", _("Saint-Peterburg")),
-    ("50", _("Moskovskaya oblast'")),
-    ("01", _("Adygeya, Respublika")),
-    ("02", _("Bashkortostan, Respublika")),
-    ("03", _("Buryatia, Respublika")),
-    ("04", _("Altay, Respublika")),
-    ("05", _("Dagestan, Respublika")),
-    ("06", _("Ingushskaya Respublika")),
-    ("07", _("Kabardino-Balkarskaya Respublika")),
-    ("08", _("Kalmykia, Respublika")),
-    ("09", _("Karachaevo-Cherkesskaya Respublika")),
-    ("10", _("Karelia, Respublika")),
-    ("11", _("Komi, Respublika")),
-    ("12", _("Mariy Ehl, Respublika")),
-    ("13", _("Mordovia, Respublika")),
-    ("14", _("Sakha, Respublika (Yakutiya)")),
-    ("15", _("Severnaya Osetia, Respublika (Alania)")),
-    ("16", _("Tatarstan, Respublika")),
-    ("17", _("Tyva, Respublika (Tuva)")),
-    ("18", _("Udmurtskaya Respublika")),
-    ("19", _("Khakassiya, Respublika")),
-    ("95", _("Chechenskaya Respublika")),
-    ("21", _("Chuvashskaya Respublika")),
-    ("22", _("Altayskiy Kray")),
-    ("80", _("Zabaykalskiy Kray")),
-    ("82", _("Kamchatskiy Kray")),
-    ("23", _("Krasnodarskiy Kray")),
-    ("24", _("Krasnoyarskiy Kray")),
-    ("81", _("Permskiy Kray")),
-    ("25", _("Primorskiy Kray")),
-    ("26", _("Stavropol'siyy Kray")),
-    ("27", _("Khabarovskiy Kray")),
-    ("28", _("Amurskaya oblast'")),
-    ("29", _("Arkhangel'skaya oblast'")),
-    ("30", _("Astrakhanskaya oblast'")),
-    ("31", _("Belgorodskaya oblast'")),
-    ("32", _("Bryanskaya oblast'")),
-    ("33", _("Vladimirskaya oblast'")),
-    ("34", _("Volgogradskaya oblast'")),
-    ("35", _("Vologodskaya oblast'")),
-    ("36", _("Voronezhskaya oblast'")),
-    ("37", _("Ivanovskaya oblast'")),
-    ("38", _("Irkutskaya oblast'")),
-    ("39", _("Kaliningradskaya oblast'")),
-    ("40", _("Kaluzhskaya oblast'")),
-    ("42", _("Kemerovskaya oblast'")),
-    ("43", _("Kirovskaya oblast'")),
-    ("44", _("Kostromskaya oblast'")),
-    ("45", _("Kurganskaya oblast'")),
-    ("46", _("Kurskaya oblast'")),
-    ("47", _("Leningradskaya oblast'")),
-    ("48", _("Lipeckaya oblast'")),
-    ("49", _("Magadanskaya oblast'")),
-    ("51", _("Murmanskaya oblast'")),
-    ("52", _("Nizhegorodskaja oblast'")),
-    ("53", _("Novgorodskaya oblast'")),
-    ("54", _("Novosibirskaya oblast'")),
-    ("55", _("Omskaya oblast'")),
-    ("56", _("Orenburgskaya oblast'")),
-    ("57", _("Orlovskaya oblast'")),
-    ("58", _("Penzenskaya oblast'")),
-    ("60", _("Pskovskaya oblast'")),
-    ("61", _("Rostovskaya oblast'")),
-    ("62", _("Rjazanskaya oblast'")),
-    ("63", _("Samarskaya oblast'")),
-    ("64", _("Saratovskaya oblast'")),
-    ("65", _("Sakhalinskaya oblast'")),
-    ("66", _("Sverdlovskaya oblast'")),
-    ("67", _("Smolenskaya oblast'")),
-    ("68", _("Tambovskaya oblast'")),
-    ("69", _("Tverskaya oblast'")),
-    ("70", _("Tomskaya oblast'")),
-    ("71", _("Tul'skaya oblast'")),
-    ("72", _("Tyumenskaya oblast'")),
-    ("73", _("Ul'ianovskaya oblast'")),
-    ("74", _("Chelyabinskaya oblast'")),
-    ("76", _("Yaroslavskaya oblast'")),
-    ("79", _("Evreyskaya avtonomnaja oblast'")),
-    ("83", _("Neneckiy autonomnyy okrug")),
-    ("86", _("Khanty-Mansiyskiy avtonomnyy okrug - Yugra")),
-    ("87", _("Chukotskiy avtonomnyy okrug")),
-    ("89", _("Yamalo-Neneckiy avtonomnyy okrug"))
-)
diff --git a/django/contrib/localflavor/se/forms.py b/django/contrib/localflavor/se/forms.py
deleted file mode 100644
index 43d06a08ec..0000000000
--- a/django/contrib/localflavor/se/forms.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Swedish specific Form helpers
-"""
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-from django.core.validators import EMPTY_VALUES
-from django.contrib.localflavor.se.se_counties import COUNTY_CHOICES
-from django.contrib.localflavor.se.utils import (id_number_checksum,
-    validate_id_birthday, format_personal_id_number, valid_organisation,
-    format_organisation_number)
-
-
-__all__ = ('SECountySelect', 'SEOrganisationNumberField',
-    'SEPersonalIdentityNumberField', 'SEPostalCodeField')
-
-SWEDISH_ID_NUMBER = re.compile(r'^(?P<century>\d{2})?(?P<year>\d{2})(?P<month>\d{2})(?P<day>\d{2})(?P<sign>[\-+])?(?P<serial>\d{3})(?P<checksum>\d)$')
-SE_POSTAL_CODE = re.compile(r'^[1-9]\d{2} ?\d{2}$')
-
-class SECountySelect(forms.Select):
-    """
-    A Select form widget that uses a list of the Swedish counties (län) as its
-    choices.
-
-    The cleaned value is the official county code -- see
-    http://en.wikipedia.org/wiki/Counties_of_Sweden for a list.
-    """
-
-    def __init__(self, attrs=None):
-        super(SECountySelect, self).__init__(attrs=attrs,
-                                             choices=COUNTY_CHOICES)
-
-class SEOrganisationNumberField(forms.CharField):
-    """
-    A form field that validates input as a Swedish organisation number
-    (organisationsnummer).
-
-    It accepts the same input as SEPersonalIdentityField (for sole
-    proprietorships (enskild firma). However, co-ordination numbers are not
-    accepted.
-
-    It also accepts ordinary Swedish organisation numbers with the format
-    NNNNNNNNNN.
-
-    The return value will be YYYYMMDDXXXX for sole proprietors, and NNNNNNNNNN
-    for other organisations.
-    """
-
-    default_error_messages = {
-        'invalid': _('Enter a valid Swedish organisation number.'),
-    }
-
-    def clean(self, value):
-        value = super(SEOrganisationNumberField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        match = SWEDISH_ID_NUMBER.match(value)
-        if not match:
-            raise forms.ValidationError(self.error_messages['invalid'])
-
-        gd = match.groupdict()
-
-        # Compare the calculated value with the checksum
-        if id_number_checksum(gd) != int(gd['checksum']):
-            raise forms.ValidationError(self.error_messages['invalid'])
-
-        # First: check if this is a real organisation_number
-        if valid_organisation(gd):
-            return format_organisation_number(gd)
-
-        # Is this a single properitor (enskild firma)?
-        try:
-            birth_day = validate_id_birthday(gd, False)
-            return format_personal_id_number(birth_day, gd)
-        except ValueError:
-            raise forms.ValidationError(self.error_messages['invalid'])
-
-
-class SEPersonalIdentityNumberField(forms.CharField):
-    """
-    A form field that validates input as a Swedish personal identity number
-    (personnummer).
-
-    The correct formats are YYYYMMDD-XXXX, YYYYMMDDXXXX, YYMMDD-XXXX,
-    YYMMDDXXXX and YYMMDD+XXXX.
-
-    A + indicates that the person is older than 100 years, which will be taken
-    into consideration when the date is validated.
-
-    The checksum will be calculated and checked. The birth date is checked to
-    be a valid date.
-
-    By default, co-ordination numbers (samordningsnummer) will be accepted. To
-    only allow real personal identity numbers, pass the keyword argument
-    coordination_number=False to the constructor.
-
-    The cleaned value will always have the format YYYYMMDDXXXX.
-    """
-
-    def __init__(self, coordination_number=True, *args, **kwargs):
-        self.coordination_number = coordination_number
-        super(SEPersonalIdentityNumberField, self).__init__(*args, **kwargs)
-
-    default_error_messages = {
-        'invalid': _('Enter a valid Swedish personal identity number.'),
-        'coordination_number': _('Co-ordination numbers are not allowed.'),
-    }
-
-    def clean(self, value):
-        value = super(SEPersonalIdentityNumberField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        match = SWEDISH_ID_NUMBER.match(value)
-        if match is None:
-            raise forms.ValidationError(self.error_messages['invalid'])
-
-        gd = match.groupdict()
-
-        # compare the calculated value with the checksum
-        if id_number_checksum(gd) != int(gd['checksum']):
-            raise forms.ValidationError(self.error_messages['invalid'])
-
-        # check for valid birthday
-        try:
-            birth_day = validate_id_birthday(gd)
-        except ValueError:
-            raise forms.ValidationError(self.error_messages['invalid'])
-
-        # make sure that co-ordination numbers do not pass if not allowed
-        if not self.coordination_number and int(gd['day']) > 60:
-            raise forms.ValidationError(self.error_messages['coordination_number'])
-
-        return format_personal_id_number(birth_day, gd)
-
-
-class SEPostalCodeField(forms.RegexField):
-    """
-    A form field that validates input as a Swedish postal code (postnummer).
-    Valid codes consist of five digits (XXXXX). The number can optionally be
-    formatted with a space after the third digit (XXX XX).
-
-    The cleaned value will never contain the space.
-    """
-
-    default_error_messages = {
-        'invalid': _('Enter a Swedish postal code in the format XXXXX.'),
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(SEPostalCodeField, self).__init__(SE_POSTAL_CODE, *args, **kwargs)
-
-    def clean(self, value):
-        return super(SEPostalCodeField, self).clean(value).replace(' ', '')
diff --git a/django/contrib/localflavor/se/se_counties.py b/django/contrib/localflavor/se/se_counties.py
deleted file mode 100644
index 20090d3b30..0000000000
--- a/django/contrib/localflavor/se/se_counties.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-An alphabetical list of Swedish counties, sorted by codes.
-
-http://en.wikipedia.org/wiki/Counties_of_Sweden
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-
-"""
-from __future__ import unicode_literals
-
-from django.utils.translation import ugettext_lazy as _
-
-COUNTY_CHOICES = (
-    ('AB', _('Stockholm')),
-    ('AC', _('Västerbotten')),
-    ('BD', _('Norrbotten')),
-    ('C', _('Uppsala')),
-    ('D', _('Södermanland')),
-    ('E', _('Östergötland')),
-    ('F', _('Jönköping')),
-    ('G', _('Kronoberg')),
-    ('H', _('Kalmar')),
-    ('I', _('Gotland')),
-    ('K', _('Blekinge')),
-    ('M', _('Skåne')),
-    ('N', _('Halland')),
-    ('O', _('Västra Götaland')),
-    ('S', _('Värmland')),
-    ('T', _('Örebro')),
-    ('U', _('Västmanland')),
-    ('W', _('Dalarna')),
-    ('X', _('Gävleborg')),
-    ('Y', _('Västernorrland')),
-    ('Z', _('Jämtland')),
-)
diff --git a/django/contrib/localflavor/se/utils.py b/django/contrib/localflavor/se/utils.py
deleted file mode 100644
index 783062ebb4..0000000000
--- a/django/contrib/localflavor/se/utils.py
+++ /dev/null
@@ -1,84 +0,0 @@
-import datetime
-from django.utils import six
-
-def id_number_checksum(gd):
-    """
-    Calculates a Swedish ID number checksum, using the
-    "Luhn"-algoritm
-    """
-    n = s = 0
-    for c in (gd['year'] + gd['month'] + gd['day'] + gd['serial']):
-        tmp = ((n % 2) and 1 or 2) * int(c)
-
-        if tmp > 9:
-            tmp = sum([int(i) for i in str(tmp)])
-
-        s += tmp
-        n += 1
-
-    if (s % 10) == 0:
-        return 0
-
-    return (((s // 10) + 1) * 10) - s
-
-def validate_id_birthday(gd, fix_coordination_number_day=True):
-    """
-    Validates the birth_day and returns the datetime.date object for
-    the birth_day.
-
-    If the date is an invalid birth day, a ValueError will be raised.
-    """
-
-    today = datetime.date.today()
-
-    day = int(gd['day'])
-    if fix_coordination_number_day and day > 60:
-        day -= 60
-
-    if gd['century'] is None:
-
-        # The century was not specified, and need to be calculated from todays date
-        current_year = today.year
-        year = int(today.strftime('%Y')) - int(today.strftime('%y')) + int(gd['year'])
-
-        if ('%s%s%02d' % (gd['year'], gd['month'], day)) > today.strftime('%y%m%d'):
-            year -= 100
-
-        # If the person is older than 100 years
-        if gd['sign'] == '+':
-            year -= 100
-    else:
-        year = int(gd['century'] + gd['year'])
-
-        # Make sure the year is valid
-        # There are no swedish personal identity numbers where year < 1800
-        if year < 1800:
-            raise ValueError
-
-    # ValueError will be raise for invalid dates
-    birth_day = datetime.date(year, int(gd['month']), day)
-
-    # birth_day must not be in the future
-    if birth_day > today:
-        raise ValueError
-
-    return birth_day
-
-def format_personal_id_number(birth_day, gd):
-    # birth_day.strftime cannot be used, since it does not support dates < 1900
-    return six.text_type(str(birth_day.year) + gd['month'] + gd['day'] + gd['serial'] + gd['checksum'])
-
-def format_organisation_number(gd):
-    if gd['century'] is None:
-        century = ''
-    else:
-        century = gd['century']
-
-    return six.text_type(century + gd['year'] + gd['month'] + gd['day'] + gd['serial'] + gd['checksum'])
-
-def valid_organisation(gd):
-    return gd['century'] in (None, 16) and \
-        int(gd['month']) >= 20 and \
-        gd['sign'] in (None, '-') and \
-        gd['year'][0] in ('2', '5', '7', '8', '9') # group identifier
-
diff --git a/django/contrib/localflavor/si/forms.py b/django/contrib/localflavor/si/forms.py
deleted file mode 100644
index bab35935fd..0000000000
--- a/django/contrib/localflavor/si/forms.py
+++ /dev/null
@@ -1,165 +0,0 @@
-"""
-Slovenian specific form helpers.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import datetime
-import re
-
-from django.contrib.localflavor.si.si_postalcodes import SI_POSTALCODES_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import CharField, Select, ChoiceField
-from django.utils.translation import ugettext_lazy as _
-
-
-class SIEMSOField(CharField):
-    """A form for validating Slovenian personal identification number.
-
-    Additionally stores gender, nationality and birthday to self.info dictionary.
-    """
-
-    default_error_messages = {
-        'invalid': _('This field should contain exactly 13 digits.'),
-        'date': _('The first 7 digits of the EMSO must represent a valid past date.'),
-        'checksum': _('The EMSO is not valid.'),
-    }
-    emso_regex = re.compile('^(\d{2})(\d{2})(\d{3})(\d{2})(\d{3})(\d)$')
-
-    def clean(self, value):
-        super(SIEMSOField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = value.strip()
-
-        m = self.emso_regex.match(value)
-        if m is None:
-            raise ValidationError(self.default_error_messages['invalid'])
-
-        # Validate EMSO
-        s = 0
-        int_values = [int(i) for i in value]
-        for a, b in zip(int_values, list(range(7, 1, -1)) * 2):
-            s += a * b
-        chk = s % 11
-        if chk == 0:
-            K = 0
-        else:
-            K = 11 - chk
-
-        if K == 10 or int_values[-1] != K:
-            raise ValidationError(self.default_error_messages['checksum'])
-
-        # Extract extra info in the identification number
-        day, month, year, nationality, gender, chksum = [int(i) for i in m.groups()]
-
-        if year < 890:
-            year += 2000
-        else:
-            year += 1000
-
-        # validate birthday
-        try:
-            birthday = datetime.date(year, month, day)
-        except ValueError:
-            raise ValidationError(self.error_messages['date'])
-        if datetime.date.today() < birthday:
-            raise ValidationError(self.error_messages['date'])
-
-        self.info = {
-            'gender': gender < 500 and 'male' or 'female',
-            'birthdate': birthday,
-            'nationality': nationality,
-        }
-        return value
-
-
-class SITaxNumberField(CharField):
-    """Slovenian tax number field.
-
-    Valid input is SIXXXXXXXX or XXXXXXXX where X is a number.
-    """
-
-    default_error_messages = {
-        'invalid': _('Enter a valid tax number in form SIXXXXXXXX'),
-    }
-    sitax_regex = re.compile('^(?:SI)?([1-9]\d{7})$')
-
-    def clean(self, value):
-        super(SITaxNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = value.strip()
-
-        m = self.sitax_regex.match(value)
-        if m is None:
-            raise ValidationError(self.default_error_messages['invalid'])
-        value = m.groups()[0]
-
-        # Validate Tax number
-        s = 0
-        int_values = [int(i) for i in value]
-        for a, b in zip(int_values, range(8, 1, -1)):
-            s += a * b
-        chk = 11 - (s % 11)
-        if chk == 10:
-            chk = 0
-
-        if int_values[-1] != chk:
-            raise ValidationError(self.default_error_messages['invalid'])
-
-        return value
-
-
-class SIPostalCodeField(ChoiceField):
-    """Slovenian post codes field.
-    """
-
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('choices', SI_POSTALCODES_CHOICES)
-        super(SIPostalCodeField, self).__init__(*args, **kwargs)
-
-
-class SIPostalCodeSelect(Select):
-    """A Select widget that uses Slovenian postal codes as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(SIPostalCodeSelect, self).__init__(attrs,
-            choices=SI_POSTALCODES_CHOICES)
-
-
-class SIPhoneNumberField(CharField):
-    """Slovenian phone number field.
-
-    Phone number must contain at least local area code.
-    Country code can be present.
-
-    Examples:
-
-    * +38640XXXXXX
-    * 0038640XXXXXX
-    * 040XXXXXX
-    * 01XXXXXX
-    * 0590XXXXX
-
-    """
-
-    default_error_messages = {
-        'invalid': _('Enter phone number in form +386XXXXXXXX or 0XXXXXXXX.'),
-    }
-    phone_regex = re.compile('^(?:(?:00|\+)386|0)(\d{7,8})$')
-
-    def clean(self, value):
-        super(SIPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-
-        value = value.replace(' ', '').replace('-', '').replace('/', '')
-        m = self.phone_regex.match(value)
-
-        if m is None:
-            raise ValidationError(self.default_error_messages['invalid'])
-        return m.groups()[0]
diff --git a/django/contrib/localflavor/si/si_postalcodes.py b/django/contrib/localflavor/si/si_postalcodes.py
deleted file mode 100644
index 4d027afcff..0000000000
--- a/django/contrib/localflavor/si/si_postalcodes.py
+++ /dev/null
@@ -1,470 +0,0 @@
-# *-* coding: utf-8 *-*
-from __future__ import unicode_literals
-
-SI_POSTALCODES = [
-    (1000, 'Ljubljana'),
-    (1215, 'Medvode'),
-    (1216, 'Smlednik'),
-    (1217, 'Vodice'),
-    (1218, 'Komenda'),
-    (1219, 'Laze v Tuhinju'),
-    (1221, 'Motnik'),
-    (1222, 'Trojane'),
-    (1223, 'Blagovica'),
-    (1225, 'Lukovica'),
-    (1230, 'Dom\u017eale'),
-    (1233, 'Dob'),
-    (1234, 'Menge\u0161'),
-    (1235, 'Radomlje'),
-    (1236, 'Trzin'),
-    (1241, 'Kamnik'),
-    (1242, 'Stahovica'),
-    (1251, 'Morav\u010de'),
-    (1252, 'Va\u010de'),
-    (1262, 'Dol pri Ljubljani'),
-    (1270, 'Litija'),
-    (1272, 'Pol\u0161nik'),
-    (1273, 'Dole pri Litiji'),
-    (1274, 'Gabrovka'),
-    (1275, '\u0160martno pri Litiji'),
-    (1276, 'Primskovo'),
-    (1281, 'Kresnice'),
-    (1282, 'Sava'),
-    (1290, 'Grosuplje'),
-    (1291, '\u0160kofljica'),
-    (1292, 'Ig'),
-    (1293, '\u0160marje - Sap'),
-    (1294, 'Vi\u0161nja Gora'),
-    (1295, 'Ivan\u010dna Gorica'),
-    (1296, '\u0160entvid pri Sti\u010dni'),
-    (1301, 'Krka'),
-    (1303, 'Zagradec'),
-    (1310, 'Ribnica'),
-    (1311, 'Turjak'),
-    (1312, 'Videm - Dobrepolje'),
-    (1313, 'Struge'),
-    (1314, 'Rob'),
-    (1315, 'Velike La\u0161\u010de'),
-    (1316, 'Ortnek'),
-    (1317, 'Sodra\u017eica'),
-    (1318, 'Lo\u0161ki Potok'),
-    (1319, 'Draga'),
-    (1330, 'Ko\u010devje'),
-    (1331, 'Dolenja vas'),
-    (1332, 'Stara Cerkev'),
-    (1336, 'Kostel'),
-    (1337, 'Osilnica'),
-    (1338, 'Ko\u010devska Reka'),
-    (1351, 'Brezovica pri Ljubljani'),
-    (1352, 'Preserje'),
-    (1353, 'Borovnica'),
-    (1354, 'Horjul'),
-    (1355, 'Polhov Gradec'),
-    (1356, 'Dobrova'),
-    (1357, 'Notranje Gorice'),
-    (1358, 'Log pri Brezovici'),
-    (1360, 'Vrhnika'),
-    (1370, 'Logatec'),
-    (1372, 'Hotedr\u0161ica'),
-    (1373, 'Rovte'),
-    (1380, 'Cerknica'),
-    (1381, 'Rakek'),
-    (1382, 'Begunje pri Cerknici'),
-    (1384, 'Grahovo'),
-    (1385, 'Nova vas'),
-    (1386, 'Stari trg pri Lo\u017eu'),
-    (1410, 'Zagorje ob Savi'),
-    (1411, 'Izlake'),
-    (1412, 'Kisovec'),
-    (1413, '\u010cem\u0161enik'),
-    (1414, 'Podkum'),
-    (1420, 'Trbovlje'),
-    (1423, 'Dobovec'),
-    (1430, 'Hrastnik'),
-    (1431, 'Dol pri Hrastniku'),
-    (1432, 'Zidani Most'),
-    (1433, 'Rade\u010de'),
-    (1434, 'Loka pri Zidanem Mostu'),
-    (2000, 'Maribor'),
-    (2201, 'Zgornja Kungota'),
-    (2204, 'Miklav\u017e na Dravskem polju'),
-    (2205, 'Star\u0161e'),
-    (2206, 'Marjeta na Dravskem polju'),
-    (2208, 'Pohorje'),
-    (2211, 'Pesnica pri Mariboru'),
-    (2212, '\u0160entilj v Slovenskih goricah'),
-    (2213, 'Zgornja Velka'),
-    (2214, 'Sladki vrh'),
-    (2215, 'Cer\u0161ak'),
-    (2221, 'Jarenina'),
-    (2222, 'Jakobski Dol'),
-    (2223, 'Jurovski Dol'),
-    (2229, 'Male\u010dnik'),
-    (2230, 'Lenart v Slovenskih goricah'),
-    (2231, 'Pernica'),
-    (2232, 'Voli\u010dina'),
-    (2233, 'Sveta Ana v Slovenskih goricah'),
-    (2234, 'Benedikt'),
-    (2235, 'Sveta Trojica v Slovenskih goricah'),
-    (2236, 'Cerkvenjak'),
-    (2241, 'Spodnji Duplek'),
-    (2242, 'Zgornja Korena'),
-    (2250, 'Ptuj'),
-    (2252, 'Dornava'),
-    (2253, 'Destrnik'),
-    (2254, 'Trnovska vas'),
-    (2255, 'Vitomarci'),
-    (2256, 'Jur\u0161inci'),
-    (2257, 'Polen\u0161ak'),
-    (2258, 'Sveti Toma\u017e'),
-    (2259, 'Ivanjkovci'),
-    (2270, 'Ormo\u017e'),
-    (2272, 'Gori\u0161nica'),
-    (2273, 'Podgorci'),
-    (2274, 'Velika Nedelja'),
-    (2275, 'Miklav\u017e pri Ormo\u017eu'),
-    (2276, 'Kog'),
-    (2277, 'Sredi\u0161\u010de ob Dravi'),
-    (2281, 'Markovci'),
-    (2282, 'Cirkulane'),
-    (2283, 'Zavr\u010d'),
-    (2284, 'Videm pri Ptuju'),
-    (2285, 'Zgornji Leskovec'),
-    (2286, 'Podlehnik'),
-    (2287, '\u017detale'),
-    (2288, 'Hajdina'),
-    (2289, 'Stoperce'),
-    (2310, 'Slovenska Bistrica'),
-    (2311, 'Ho\u010de'),
-    (2312, 'Orehova vas'),
-    (2313, 'Fram'),
-    (2314, 'Zgornja Polskava'),
-    (2315, '\u0160martno na Pohorju'),
-    (2316, 'Zgornja Lo\u017enica'),
-    (2317, 'Oplotnica'),
-    (2318, 'Laporje'),
-    (2319, 'Polj\u010dane'),
-    (2321, 'Makole'),
-    (2322, 'Maj\u0161perk'),
-    (2323, 'Ptujska Gora'),
-    (2324, 'Lovrenc na Dravskem polju'),
-    (2325, 'Kidri\u010devo'),
-    (2326, 'Cirkovce'),
-    (2327, 'Ra\u010de'),
-    (2331, 'Pragersko'),
-    (2341, 'Limbu\u0161'),
-    (2342, 'Ru\u0161e'),
-    (2343, 'Fala'),
-    (2344, 'Lovrenc na Pohorju'),
-    (2345, 'Bistrica ob Dravi'),
-    (2351, 'Kamnica'),
-    (2352, 'Selnica ob Dravi'),
-    (2353, 'Sv. Duh na Ostrem Vrhu'),
-    (2354, 'Bresternica'),
-    (2360, 'Radlje ob Dravi'),
-    (2361, 'O\u017ebalt'),
-    (2362, 'Kapla'),
-    (2363, 'Podvelka'),
-    (2364, 'Ribnica na Pohorju'),
-    (2365, 'Vuhred'),
-    (2366, 'Muta'),
-    (2367, 'Vuzenica'),
-    (2370, 'Dravograd'),
-    (2371, 'Trbonje'),
-    (2372, 'Libeli\u010de'),
-    (2373, '\u0160entjan\u017e pri Dravogradu'),
-    (2380, 'Slovenj Gradec'),
-    (2381, 'Podgorje pri Slovenj Gradcu'),
-    (2382, 'Mislinja'),
-    (2383, '\u0160martno pri Slovenj Gradcu'),
-    (2390, 'Ravne na Koro\u0161kem'),
-    (2391, 'Prevalje'),
-    (2392, 'Me\u017eica'),
-    (2393, '\u010crna na Koro\u0161kem'),
-    (2394, 'Kotlje'),
-    (3000, 'Celje'),
-    (3201, '\u0160martno v Ro\u017eni dolini'),
-    (3202, 'Ljube\u010dna'),
-    (3203, 'Nova Cerkev'),
-    (3204, 'Dobrna'),
-    (3205, 'Vitanje'),
-    (3206, 'Stranice'),
-    (3210, 'Slovenske Konjice'),
-    (3211, '\u0160kofja vas'),
-    (3212, 'Vojnik'),
-    (3213, 'Frankolovo'),
-    (3214, 'Zre\u010de'),
-    (3215, 'Lo\u010de'),
-    (3220, '\u0160tore'),
-    (3221, 'Teharje'),
-    (3222, 'Dramlje'),
-    (3223, 'Loka pri \u017dusmu'),
-    (3224, 'Dobje pri Planini'),
-    (3225, 'Planina pri Sevnici'),
-    (3230, '\u0160entjur'),
-    (3231, 'Grobelno'),
-    (3232, 'Ponikva'),
-    (3233, 'Kalobje'),
-    (3240, '\u0160marje pri Jel\u0161ah'),
-    (3241, 'Podplat'),
-    (3250, 'Roga\u0161ka Slatina'),
-    (3252, 'Rogatec'),
-    (3253, 'Pristava pri Mestinju'),
-    (3254, 'Pod\u010detrtek'),
-    (3255, 'Bu\u010de'),
-    (3256, 'Bistrica ob Sotli'),
-    (3257, 'Podsreda'),
-    (3260, 'Kozje'),
-    (3261, 'Lesi\u010dno'),
-    (3262, 'Prevorje'),
-    (3263, 'Gorica pri Slivnici'),
-    (3264, 'Sveti \u0160tefan'),
-    (3270, 'La\u0161ko'),
-    (3271, '\u0160entrupert'),
-    (3272, 'Rimske Toplice'),
-    (3273, 'Jurklo\u0161ter'),
-    (3301, 'Petrov\u010de'),
-    (3302, 'Gri\u017ee'),
-    (3303, 'Gomilsko'),
-    (3304, 'Tabor'),
-    (3305, 'Vransko'),
-    (3310, '\u017dalec'),
-    (3311, '\u0160empeter v Savinjski dolini'),
-    (3312, 'Prebold'),
-    (3313, 'Polzela'),
-    (3314, 'Braslov\u010de'),
-    (3320, 'Velenje - dostava'),
-    (3322, 'Velenje - po\u0161tni predali'),
-    (3325, '\u0160o\u0161tanj'),
-    (3326, 'Topol\u0161ica'),
-    (3327, '\u0160martno ob Paki'),
-    (3330, 'Mozirje'),
-    (3331, 'Nazarje'),
-    (3332, 'Re\u010dica ob Savinji'),
-    (3333, 'Ljubno ob Savinji'),
-    (3334, 'Lu\u010de'),
-    (3335, 'Sol\u010dava'),
-    (3341, '\u0160martno ob Dreti'),
-    (3342, 'Gornji Grad'),
-    (4000, 'Kranj'),
-    (4201, 'Zgornja Besnica'),
-    (4202, 'Naklo'),
-    (4203, 'Duplje'),
-    (4204, 'Golnik'),
-    (4205, 'Preddvor'),
-    (4206, 'Zgornje Jezersko'),
-    (4207, 'Cerklje na Gorenjskem'),
-    (4208, '\u0160en\u010dur'),
-    (4209, '\u017dabnica'),
-    (4210, 'Brnik - aerodrom'),
-    (4211, 'Mav\u010di\u010de'),
-    (4212, 'Visoko'),
-    (4220, '\u0160kofja Loka'),
-    (4223, 'Poljane nad \u0160kofjo Loko'),
-    (4224, 'Gorenja vas'),
-    (4225, 'Sovodenj'),
-    (4226, '\u017diri'),
-    (4227, 'Selca'),
-    (4228, '\u017delezniki'),
-    (4229, 'Sorica'),
-    (4240, 'Radovljica'),
-    (4243, 'Brezje'),
-    (4244, 'Podnart'),
-    (4245, 'Kropa'),
-    (4246, 'Kamna Gorica'),
-    (4247, 'Zgornje Gorje'),
-    (4248, 'Lesce'),
-    (4260, 'Bled'),
-    (4263, 'Bohinjska Bela'),
-    (4264, 'Bohinjska Bistrica'),
-    (4265, 'Bohinjsko jezero'),
-    (4267, 'Srednja vas v Bohinju'),
-    (4270, 'Jesenice'),
-    (4273, 'Blejska Dobrava'),
-    (4274, '\u017dirovnica'),
-    (4275, 'Begunje na Gorenjskem'),
-    (4276, 'Hru\u0161ica'),
-    (4280, 'Kranjska Gora'),
-    (4281, 'Mojstrana'),
-    (4282, 'Gozd Martuljek'),
-    (4283, 'Rate\u010de - Planica'),
-    (4290, 'Tr\u017ei\u010d'),
-    (4294, 'Kri\u017ee'),
-    (5000, 'Nova Gorica'),
-    (5210, 'Deskle'),
-    (5211, 'Kojsko'),
-    (5212, 'Dobrovo v Brdih'),
-    (5213, 'Kanal'),
-    (5214, 'Kal nad Kanalom'),
-    (5215, 'Ro\u010dinj'),
-    (5216, 'Most na So\u010di'),
-    (5220, 'Tolmin'),
-    (5222, 'Kobarid'),
-    (5223, 'Breginj'),
-    (5224, 'Srpenica'),
-    (5230, 'Bovec'),
-    (5231, 'Log pod Mangartom'),
-    (5232, 'So\u010da'),
-    (5242, 'Grahovo ob Ba\u010di'),
-    (5243, 'Podbrdo'),
-    (5250, 'Solkan'),
-    (5251, 'Grgar'),
-    (5252, 'Trnovo pri Gorici'),
-    (5253, '\u010cepovan'),
-    (5261, '\u0160empas'),
-    (5262, '\u010crni\u010de'),
-    (5263, 'Dobravlje'),
-    (5270, 'Ajdov\u0161\u010dina'),
-    (5271, 'Vipava'),
-    (5272, 'Podnanos'),
-    (5273, 'Col'),
-    (5274, '\u010crni Vrh nad Idrijo'),
-    (5275, 'Godovi\u010d'),
-    (5280, 'Idrija'),
-    (5281, 'Spodnja Idrija'),
-    (5282, 'Cerkno'),
-    (5283, 'Slap ob Idrijci'),
-    (5290, '\u0160empeter pri Gorici'),
-    (5291, 'Miren'),
-    (5292, 'Ren\u010de'),
-    (5293, 'Vol\u010dja Draga'),
-    (5294, 'Dornberk'),
-    (5295, 'Branik'),
-    (5296, 'Kostanjevica na Krasu'),
-    (5297, 'Prva\u010dina'),
-    (6000, 'Koper'),
-    (6210, 'Se\u017eana'),
-    (6215, 'Diva\u010da'),
-    (6216, 'Podgorje'),
-    (6217, 'Vremski Britof'),
-    (6219, 'Lokev'),
-    (6221, 'Dutovlje'),
-    (6222, '\u0160tanjel'),
-    (6223, 'Komen'),
-    (6224, 'Seno\u017ee\u010de'),
-    (6225, 'Hru\u0161evje'),
-    (6230, 'Postojna'),
-    (6232, 'Planina'),
-    (6240, 'Kozina'),
-    (6242, 'Materija'),
-    (6243, 'Obrov'),
-    (6244, 'Podgrad'),
-    (6250, 'Ilirska Bistrica'),
-    (6251, 'Ilirska Bistrica - Trnovo'),
-    (6253, 'Kne\u017eak'),
-    (6254, 'Jel\u0161ane'),
-    (6255, 'Prem'),
-    (6256, 'Ko\u0161ana'),
-    (6257, 'Pivka'),
-    (6258, 'Prestranek'),
-    (6271, 'Dekani'),
-    (6272, 'Gra\u010di\u0161\u010de'),
-    (6273, 'Marezige'),
-    (6274, '\u0160marje'),
-    (6275, '\u010crni Kal'),
-    (6276, 'Pobegi'),
-    (6280, 'Ankaran - Ancarano'),
-    (6281, '\u0160kofije'),
-    (6310, 'Izola - Isola'),
-    (6320, 'Portoro\u017e - Portorose'),
-    (6330, 'Piran - Pirano'),
-    (6333, 'Se\u010dovlje - Sicciole'),
-    (8000, 'Novo mesto'),
-    (8210, 'Trebnje'),
-    (8211, 'Dobrni\u010d'),
-    (8212, 'Velika Loka'),
-    (8213, 'Veliki Gaber'),
-    (8216, 'Mirna Pe\u010d'),
-    (8220, '\u0160marje\u0161ke Toplice'),
-    (8222, 'Oto\u010dec'),
-    (8230, 'Mokronog'),
-    (8231, 'Trebelno'),
-    (8232, '\u0160entrupert'),
-    (8233, 'Mirna'),
-    (8250, 'Bre\u017eice'),
-    (8251, '\u010cate\u017e ob Savi'),
-    (8253, 'Arti\u010de'),
-    (8254, 'Globoko'),
-    (8255, 'Pi\u0161ece'),
-    (8256, 'Sromlje'),
-    (8257, 'Dobova'),
-    (8258, 'Kapele'),
-    (8259, 'Bizeljsko'),
-    (8261, 'Jesenice na Dolenjskem'),
-    (8262, 'Kr\u0161ka vas'),
-    (8263, 'Cerklje ob Krki'),
-    (8270, 'Kr\u0161ko'),
-    (8272, 'Zdole'),
-    (8273, 'Leskovec pri Kr\u0161kem'),
-    (8274, 'Raka'),
-    (8275, '\u0160kocjan'),
-    (8276, 'Bu\u010dka'),
-    (8280, 'Brestanica'),
-    (8281, 'Senovo'),
-    (8282, 'Koprivnica'),
-    (8283, 'Blanca'),
-    (8290, 'Sevnica'),
-    (8292, 'Zabukovje'),
-    (8293, 'Studenec'),
-    (8294, 'Bo\u0161tanj'),
-    (8295, 'Tr\u017ei\u0161\u010de'),
-    (8296, 'Krmelj'),
-    (8297, '\u0160entjan\u017e'),
-    (8310, '\u0160entjernej'),
-    (8311, 'Kostanjevica na Krki'),
-    (8312, 'Podbo\u010dje'),
-    (8321, 'Brusnice'),
-    (8322, 'Stopi\u010de'),
-    (8323, 'Ur\u0161na sela'),
-    (8330, 'Metlika'),
-    (8331, 'Suhor'),
-    (8332, 'Gradac'),
-    (8333, 'Semi\u010d'),
-    (8340, '\u010crnomelj'),
-    (8341, 'Adle\u0161i\u010di'),
-    (8342, 'Stari trg ob Kolpi'),
-    (8343, 'Dragatu\u0161'),
-    (8344, 'Vinica pri \u010crnomlju'),
-    (8350, 'Dolenjske Toplice'),
-    (8351, 'Stra\u017ea'),
-    (8360, '\u017du\u017eemberk'),
-    (8361, 'Dvor'),
-    (8362, 'Hinje'),
-    (9000, 'Murska Sobota'),
-    (9201, 'Puconci'),
-    (9202, 'Ma\u010dkovci'),
-    (9203, 'Petrovci'),
-    (9204, '\u0160alovci'),
-    (9205, 'Hodo\u0161 - Hodos'),
-    (9206, 'Kri\u017eevci'),
-    (9207, 'Prosenjakovci - Partosfalva'),
-    (9208, 'Fokovci'),
-    (9220, 'Lendava - Lendva'),
-    (9221, 'Martjanci'),
-    (9222, 'Bogojina'),
-    (9223, 'Dobrovnik - Dobronak'),
-    (9224, 'Turni\u0161\u010de'),
-    (9225, 'Velika Polana'),
-    (9226, 'Moravske Toplice'),
-    (9227, 'Kobilje'),
-    (9231, 'Beltinci'),
-    (9232, '\u010cren\u0161ovci'),
-    (9233, 'Odranci'),
-    (9240, 'Ljutomer'),
-    (9241, 'Ver\u017eej'),
-    (9242, 'Kri\u017eevci pri Ljutomeru'),
-    (9243, 'Mala Nedelja'),
-    (9244, 'Sveti Jurij ob \u0160\u010davnici'),
-    (9245, 'Spodnji Ivanjci'),
-    (9250, 'Gornja Radgona'),
-    (9251, 'Ti\u0161ina'),
-    (9252, 'Radenci'),
-    (9253, 'Apa\u010de'),
-    (9261, 'Cankova'),
-    (9262, 'Roga\u0161ovci'),
-    (9263, 'Kuzma'),
-    (9264, 'Grad'),
-    (9265, 'Bodonci'),
-]
-
-SI_POSTALCODES_CHOICES = sorted(SI_POSTALCODES, key=lambda k: k[1])
diff --git a/django/contrib/localflavor/sk/forms.py b/django/contrib/localflavor/sk/forms.py
deleted file mode 100644
index 11d44cc4d2..0000000000
--- a/django/contrib/localflavor/sk/forms.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""
-Slovak-specific form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-from django.contrib.localflavor.sk.sk_districts import DISTRICT_CHOICES
-from django.contrib.localflavor.sk.sk_regions import REGION_CHOICES
-from django.forms.fields import Select, RegexField
-from django.utils.translation import ugettext_lazy as _
-
-
-class SKRegionSelect(Select):
-    """
-    A select widget widget with list of Slovak regions as choices.
-    """
-    def __init__(self, attrs=None):
-        super(SKRegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
-
-class SKDistrictSelect(Select):
-    """
-    A select widget with list of Slovak districts as choices.
-    """
-    def __init__(self, attrs=None):
-        super(SKDistrictSelect, self).__init__(attrs, choices=DISTRICT_CHOICES)
-
-class SKPostalCodeField(RegexField):
-    """
-    A form field that validates its input as Slovak postal code.
-    Valid form is XXXXX or XXX XX, where X represents integer.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a postal code in the format XXXXX or XXX XX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(SKPostalCodeField, self).__init__(r'^\d{5}$|^\d{3} \d{2}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Validates the input and returns a string that contains only numbers.
-        Returns an empty string for empty values.
-        """
-        v = super(SKPostalCodeField, self).clean(value)
-        return v.replace(' ', '')
diff --git a/django/contrib/localflavor/sk/sk_districts.py b/django/contrib/localflavor/sk/sk_districts.py
deleted file mode 100644
index 95e87967b9..0000000000
--- a/django/contrib/localflavor/sk/sk_districts.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""
-Slovak districts according to http://sk.wikipedia.org/wiki/Administrat%C3%ADvne_%C4%8Dlenenie_Slovenska
-"""
-
-from django.utils.translation import ugettext_lazy as _
-
-DISTRICT_CHOICES = (
-    ('BB', _('Banska Bystrica')),
-    ('BS', _('Banska Stiavnica')),
-    ('BJ', _('Bardejov')),
-    ('BN', _('Banovce nad Bebravou')),
-    ('BR', _('Brezno')),
-    ('BA1', _('Bratislava I')),
-    ('BA2', _('Bratislava II')),
-    ('BA3', _('Bratislava III')),
-    ('BA4', _('Bratislava IV')),
-    ('BA5', _('Bratislava V')),
-    ('BY', _('Bytca')),
-    ('CA', _('Cadca')),
-    ('DT', _('Detva')),
-    ('DK', _('Dolny Kubin')),
-    ('DS', _('Dunajska Streda')),
-    ('GA', _('Galanta')),
-    ('GL', _('Gelnica')),
-    ('HC', _('Hlohovec')),
-    ('HE', _('Humenne')),
-    ('IL', _('Ilava')),
-    ('KK', _('Kezmarok')),
-    ('KN', _('Komarno')),
-    ('KE1', _('Kosice I')),
-    ('KE2', _('Kosice II')),
-    ('KE3', _('Kosice III')),
-    ('KE4', _('Kosice IV')),
-    ('KEO', _('Kosice - okolie')),
-    ('KA', _('Krupina')),
-    ('KM', _('Kysucke Nove Mesto')),
-    ('LV', _('Levice')),
-    ('LE', _('Levoca')),
-    ('LM', _('Liptovsky Mikulas')),
-    ('LC', _('Lucenec')),
-    ('MA', _('Malacky')),
-    ('MT', _('Martin')),
-    ('ML', _('Medzilaborce')),
-    ('MI', _('Michalovce')),
-    ('MY', _('Myjava')),
-    ('NO', _('Namestovo')),
-    ('NR', _('Nitra')),
-    ('NM', _('Nove Mesto nad Vahom')),
-    ('NZ', _('Nove Zamky')),
-    ('PE', _('Partizanske')),
-    ('PK', _('Pezinok')),
-    ('PN', _('Piestany')),
-    ('PT', _('Poltar')),
-    ('PP', _('Poprad')),
-    ('PB', _('Povazska Bystrica')),
-    ('PO', _('Presov')),
-    ('PD', _('Prievidza')),
-    ('PU', _('Puchov')),
-    ('RA', _('Revuca')),
-    ('RS', _('Rimavska Sobota')),
-    ('RV', _('Roznava')),
-    ('RK', _('Ruzomberok')),
-    ('SB', _('Sabinov')),
-    ('SC', _('Senec')),
-    ('SE', _('Senica')),
-    ('SI', _('Skalica')),
-    ('SV', _('Snina')),
-    ('SO', _('Sobrance')),
-    ('SN', _('Spisska Nova Ves')),
-    ('SL', _('Stara Lubovna')),
-    ('SP', _('Stropkov')),
-    ('SK', _('Svidnik')),
-    ('SA', _('Sala')),
-    ('TO', _('Topolcany')),
-    ('TV', _('Trebisov')),
-    ('TN', _('Trencin')),
-    ('TT', _('Trnava')),
-    ('TR', _('Turcianske Teplice')),
-    ('TS', _('Tvrdosin')),
-    ('VK', _('Velky Krtis')),
-    ('VT', _('Vranov nad Toplou')),
-    ('ZM', _('Zlate Moravce')),
-    ('ZV', _('Zvolen')),
-    ('ZC', _('Zarnovica')),
-    ('ZH', _('Ziar nad Hronom')),
-    ('ZA', _('Zilina')),
-)
diff --git a/django/contrib/localflavor/sk/sk_regions.py b/django/contrib/localflavor/sk/sk_regions.py
deleted file mode 100644
index 66de814e01..0000000000
--- a/django/contrib/localflavor/sk/sk_regions.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-Slovak regions according to http://sk.wikipedia.org/wiki/Administrat%C3%ADvne_%C4%8Dlenenie_Slovenska
-"""
-
-from django.utils.translation import ugettext_lazy as _
-
-REGION_CHOICES = (
-    ('BB', _('Banska Bystrica region')),
-    ('BA', _('Bratislava region')),
-    ('KE', _('Kosice region')),
-    ('NR', _('Nitra region')),
-    ('PO', _('Presov region')),
-    ('TN', _('Trencin region')),
-    ('TT', _('Trnava region')),
-    ('ZA', _('Zilina region')),
-)
diff --git a/django/contrib/localflavor/tr/forms.py b/django/contrib/localflavor/tr/forms.py
deleted file mode 100644
index c4f928e670..0000000000
--- a/django/contrib/localflavor/tr/forms.py
+++ /dev/null
@@ -1,95 +0,0 @@
-"""
-TR-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.tr.tr_provinces import PROVINCE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select, CharField
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-phone_digits_re = re.compile(r'^(\+90|0)? ?(([1-9]\d{2})|\([1-9]\d{2}\)) ?([2-9]\d{2} ?\d{2} ?\d{2})$')
-
-class TRPostalCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a postal code in the format XXXXX.'),
-    }
-
-    def __init__(self, max_length=5, min_length=5, *args, **kwargs):
-        super(TRPostalCodeField, self).__init__(r'^\d{5}$',
-            max_length, min_length, *args, **kwargs)
-
-    def clean(self, value):
-        value = super(TRPostalCodeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        if len(value) != 5:
-            raise ValidationError(self.error_messages['invalid'])
-        province_code = int(value[:2])
-        if province_code == 0 or province_code > 81:
-            raise ValidationError(self.error_messages['invalid'])
-        return value
-
-
-class TRPhoneNumberField(CharField):
-    default_error_messages = {
-        'invalid': _('Phone numbers must be in 0XXX XXX XXXX format.'),
-    }
-
-    def clean(self, value):
-        super(TRPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('(\(|\)|\s+)', '', smart_text(value))
-        m = phone_digits_re.search(value)
-        if m:
-            return '%s%s' % (m.group(2), m.group(4))
-        raise ValidationError(self.error_messages['invalid'])
-
-class TRIdentificationNumberField(Field):
-    """
-    A Turkey Identification Number number.
-    See: http://tr.wikipedia.org/wiki/T%C3%BCrkiye_Cumhuriyeti_Kimlik_Numaras%C4%B1
-
-    Checks the following rules to determine whether the number is valid:
-
-        * The number is 11-digits.
-        * First digit is not 0.
-        * Conforms to the following two formula:
-          (sum(1st, 3rd, 5th, 7th, 9th)*7 - sum(2nd,4th,6th,8th)) % 10 = 10th digit
-          sum(1st to 10th) % 10 = 11th digit
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid Turkish Identification number.'),
-        'not_11': _('Turkish Identification number must be 11 digits.'),
-    }
-
-    def clean(self, value):
-        super(TRIdentificationNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        if len(value) != 11:
-            raise ValidationError(self.error_messages['not_11'])
-        if not re.match(r'^\d{11}$', value):
-            raise ValidationError(self.error_messages['invalid'])
-        if int(value[0]) == 0:
-            raise ValidationError(self.error_messages['invalid'])
-        chksum = (sum([int(value[i]) for i in range(0, 9, 2)]) * 7 -
-                          sum([int(value[i]) for i in range(1, 9, 2)])) % 10
-        if chksum != int(value[9]) or \
-           (sum([int(value[i]) for i in range(10)]) % 10) != int(value[10]):
-            raise ValidationError(self.error_messages['invalid'])
-        return value
-
-class TRProvinceSelect(Select):
-    """
-    A Select widget that uses a list of provinces in Turkey as its choices.
-    """
-    def __init__(self, attrs=None):
-        super(TRProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
diff --git a/django/contrib/localflavor/tr/tr_provinces.py b/django/contrib/localflavor/tr/tr_provinces.py
deleted file mode 100644
index edad74710d..0000000000
--- a/django/contrib/localflavor/tr/tr_provinces.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-from __future__ import unicode_literals
-
-PROVINCE_CHOICES = (
-    ('01', ('Adana')),
-    ('02', ('Adıyaman')),
-    ('03', ('Afyonkarahisar')),
-    ('04', ('Ağrı')),
-    ('68', ('Aksaray')),
-    ('05', ('Amasya')),
-    ('06', ('Ankara')),
-    ('07', ('Antalya')),
-    ('75', ('Ardahan')),
-    ('08', ('Artvin')),
-    ('09', ('Aydın')),
-    ('10', ('Balıkesir')),
-    ('74', ('Bartın')),
-    ('72', ('Batman')),
-    ('69', ('Bayburt')),
-    ('11', ('Bilecik')),
-    ('12', ('Bingöl')),
-    ('13', ('Bitlis')),
-    ('14', ('Bolu')),
-    ('15', ('Burdur')),
-    ('16', ('Bursa')),
-    ('17', ('Çanakkale')),
-    ('18', ('Çankırı')),
-    ('19', ('Çorum')),
-    ('20', ('Denizli')),
-    ('21', ('Diyarbakır')),
-    ('81', ('Düzce')),
-    ('22', ('Edirne')),
-    ('23', ('Elazığ')),
-    ('24', ('Erzincan')),
-    ('25', ('Erzurum')),
-    ('26', ('Eskişehir')),
-    ('27', ('Gaziantep')),
-    ('28', ('Giresun')),
-    ('29', ('Gümüşhane')),
-    ('30', ('Hakkari')),
-    ('31', ('Hatay')),
-    ('76', ('Iğdır')),
-    ('32', ('Isparta')),
-    ('33', ('Mersin')),
-    ('34', ('İstanbul')),
-    ('35', ('İzmir')),
-    ('78', ('Karabük')),
-    ('36', ('Kars')),
-    ('37', ('Kastamonu')),
-    ('38', ('Kayseri')),
-    ('39', ('Kırklareli')),
-    ('40', ('Kırşehir')),
-    ('41', ('Kocaeli')),
-    ('42', ('Konya')),
-    ('43', ('Kütahya')),
-    ('44', ('Malatya')),
-    ('45', ('Manisa')),
-    ('46', ('Kahramanmaraş')),
-    ('70', ('Karaman')),
-    ('71', ('Kırıkkale')),
-    ('79', ('Kilis')),
-    ('47', ('Mardin')),
-    ('48', ('Muğla')),
-    ('49', ('Muş')),
-    ('50', ('Nevşehir')),
-    ('51', ('Niğde')),
-    ('52', ('Ordu')),
-    ('80', ('Osmaniye')),
-    ('53', ('Rize')),
-    ('54', ('Sakarya')),
-    ('55', ('Samsun')),
-    ('56', ('Siirt')),
-    ('57', ('Sinop')),
-    ('58', ('Sivas')),
-    ('73', ('Şırnak')),
-    ('59', ('Tekirdağ')),
-    ('60', ('Tokat')),
-    ('61', ('Trabzon')),
-    ('62', ('Tunceli')),
-    ('63', ('Şanlıurfa')),
-    ('64', ('Uşak')),
-    ('65', ('Van')),
-    ('77', ('Yalova')),
-    ('66', ('Yozgat')),
-    ('67', ('Zonguldak')),
-)
diff --git a/django/contrib/localflavor/uk/forms.py b/django/contrib/localflavor/uk/forms.py
deleted file mode 100644
index 14624bc15f..0000000000
--- a/django/contrib/localflavor/uk/forms.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.contrib.localflavor.gb import forms
-
-import warnings
-warnings.warn(
-    'The "UK" prefix for United Kingdom has been deprecated in favour of the '
-    'GB code. Please use the new GB-prefixed names.', DeprecationWarning)
-
-UKPostcodeField = forms.GBPostcodeField
-UKCountySelect = forms.GBCountySelect
-UKNationSelect = forms.GBNationSelect
diff --git a/django/contrib/localflavor/uk/uk_regions.py b/django/contrib/localflavor/uk/uk_regions.py
deleted file mode 100644
index 5af19967c7..0000000000
--- a/django/contrib/localflavor/uk/uk_regions.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from django.contrib.localflavor.gb.gb_regions import (
-    ENGLAND_REGION_CHOICES, NORTHERN_IRELAND_REGION_CHOICES,
-    WALES_REGION_CHOICES, SCOTTISH_REGION_CHOICES, GB_NATIONS_CHOICES,
-    GB_REGION_CHOICES)
-
-import warnings
-warnings.warn(
-    'The "UK" prefix for United Kingdom has been deprecated in favour of the '
-    'GB code. Please use the new GB-prefixed names.', DeprecationWarning)
-
-UK_NATIONS_CHOICES = GB_NATIONS_CHOICES
-UK_REGION_CHOICES  = GB_REGION_CHOICES
diff --git a/django/contrib/localflavor/us/forms.py b/django/contrib/localflavor/us/forms.py
deleted file mode 100644
index 437bb7c466..0000000000
--- a/django/contrib/localflavor/us/forms.py
+++ /dev/null
@@ -1,126 +0,0 @@
-"""
-USA-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select, CharField
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
-ssn_re = re.compile(r"^(?P<area>\d{3})[-\ ]?(?P<group>\d{2})[-\ ]?(?P<serial>\d{4})$")
-
-class USZipCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a zip code in the format XXXXX or XXXXX-XXXX.'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(USZipCodeField, self).__init__(r'^\d{5}(?:-\d{4})?$',
-            max_length, min_length, *args, **kwargs)
-
-class USPhoneNumberField(CharField):
-    default_error_messages = {
-        'invalid': _('Phone numbers must be in XXX-XXX-XXXX format.'),
-    }
-
-    def clean(self, value):
-        super(USPhoneNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        value = re.sub('(\(|\)|\s+)', '', smart_text(value))
-        m = phone_digits_re.search(value)
-        if m:
-            return '%s-%s-%s' % (m.group(1), m.group(2), m.group(3))
-        raise ValidationError(self.error_messages['invalid'])
-
-class USSocialSecurityNumberField(Field):
-    """
-    A United States Social Security number.
-
-    Checks the following rules to determine whether the number is valid:
-
-        * Conforms to the XXX-XX-XXXX format.
-        * No group consists entirely of zeroes.
-        * The leading group is not "666" (block "666" will never be allocated).
-        * The number is not in the promotional block 987-65-4320 through
-          987-65-4329, which are permanently invalid.
-        * The number is not one known to be invalid due to otherwise widespread
-          promotional use or distribution (e.g., the Woolworth's number or the
-          1962 promotional number).
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid U.S. Social Security number in XXX-XX-XXXX format.'),
-    }
-
-    def clean(self, value):
-        super(USSocialSecurityNumberField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        match = re.match(ssn_re, value)
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-        area, group, serial = match.groupdict()['area'], match.groupdict()['group'], match.groupdict()['serial']
-
-        # First pass: no blocks of all zeroes.
-        if area == '000' or \
-           group == '00' or \
-           serial == '0000':
-            raise ValidationError(self.error_messages['invalid'])
-
-        # Second pass: promotional and otherwise permanently invalid numbers.
-        if area == '666' or \
-           (area == '987' and group == '65' and 4320 <= int(serial) <= 4329) or \
-           value == '078-05-1120' or \
-           value == '219-09-9999':
-            raise ValidationError(self.error_messages['invalid'])
-        return '%s-%s-%s' % (area, group, serial)
-
-class USStateField(Field):
-    """
-    A form field that validates its input is a U.S. state name or abbreviation.
-    It normalizes the input to the standard two-leter postal service
-    abbreviation for the given state.
-    """
-    default_error_messages = {
-        'invalid': _('Enter a U.S. state or territory.'),
-    }
-
-    def clean(self, value):
-        from .us_states import STATES_NORMALIZED
-        super(USStateField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        try:
-            value = value.strip().lower()
-        except AttributeError:
-            pass
-        else:
-            try:
-                return STATES_NORMALIZED[value.strip().lower()]
-            except KeyError:
-                pass
-        raise ValidationError(self.error_messages['invalid'])
-
-class USStateSelect(Select):
-    """
-    A Select widget that uses a list of U.S. states/territories as its choices.
-    """
-    def __init__(self, attrs=None):
-        from .us_states import STATE_CHOICES
-        super(USStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
-
-class USPSSelect(Select):
-    """
-    A Select widget that uses a list of US Postal Service codes as its
-    choices.
-    """
-    def __init__(self, attrs=None):
-        from .us_states import USPS_CHOICES
-        super(USPSSelect, self).__init__(attrs, choices=USPS_CHOICES)
diff --git a/django/contrib/localflavor/us/models.py b/django/contrib/localflavor/us/models.py
deleted file mode 100644
index 7cec205ccc..0000000000
--- a/django/contrib/localflavor/us/models.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from django.utils.translation import ugettext_lazy as _
-from django.db.models.fields import CharField
-from django.contrib.localflavor.us.us_states import STATE_CHOICES
-from django.contrib.localflavor.us.us_states import USPS_CHOICES
-
-class USStateField(CharField):
-
-    description = _("U.S. state (two uppercase letters)")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['choices'] = STATE_CHOICES
-        kwargs['max_length'] = 2
-        super(USStateField, self).__init__(*args, **kwargs)
-
-class USPostalCodeField(CharField):
-
-    description = _("U.S. postal code (two uppercase letters)")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['choices'] = USPS_CHOICES
-        kwargs['max_length'] = 2
-        super(USPostalCodeField, self).__init__(*args, **kwargs)
-
-class PhoneNumberField(CharField):
-
-    description = _("Phone number")
-
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 20
-        super(PhoneNumberField, self).__init__(*args, **kwargs)
-
-    def formfield(self, **kwargs):
-        from django.contrib.localflavor.us.forms import USPhoneNumberField
-        defaults = {'form_class': USPhoneNumberField}
-        defaults.update(kwargs)
-        return super(PhoneNumberField, self).formfield(**defaults)
diff --git a/django/contrib/localflavor/us/us_states.py b/django/contrib/localflavor/us/us_states.py
deleted file mode 100644
index 0da47d57b7..0000000000
--- a/django/contrib/localflavor/us/us_states.py
+++ /dev/null
@@ -1,326 +0,0 @@
-"""
-A mapping of state misspellings/abbreviations to normalized
-abbreviations, and alphabetical lists of US states, territories,
-military mail regions and non-US states to which the US provides
-postal service.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-
-# The 48 contiguous states, plus the District of Columbia.
-CONTIGUOUS_STATES = (
-    ('AL', 'Alabama'),
-    ('AZ', 'Arizona'),
-    ('AR', 'Arkansas'),
-    ('CA', 'California'),
-    ('CO', 'Colorado'),
-    ('CT', 'Connecticut'),
-    ('DE', 'Delaware'),
-    ('DC', 'District of Columbia'),
-    ('FL', 'Florida'),
-    ('GA', 'Georgia'),
-    ('ID', 'Idaho'),
-    ('IL', 'Illinois'),
-    ('IN', 'Indiana'),
-    ('IA', 'Iowa'),
-    ('KS', 'Kansas'),
-    ('KY', 'Kentucky'),
-    ('LA', 'Louisiana'),
-    ('ME', 'Maine'),
-    ('MD', 'Maryland'),
-    ('MA', 'Massachusetts'),
-    ('MI', 'Michigan'),
-    ('MN', 'Minnesota'),
-    ('MS', 'Mississippi'),
-    ('MO', 'Missouri'),
-    ('MT', 'Montana'),
-    ('NE', 'Nebraska'),
-    ('NV', 'Nevada'),
-    ('NH', 'New Hampshire'),
-    ('NJ', 'New Jersey'),
-    ('NM', 'New Mexico'),
-    ('NY', 'New York'),
-    ('NC', 'North Carolina'),
-    ('ND', 'North Dakota'),
-    ('OH', 'Ohio'),
-    ('OK', 'Oklahoma'),
-    ('OR', 'Oregon'),
-    ('PA', 'Pennsylvania'),
-    ('RI', 'Rhode Island'),
-    ('SC', 'South Carolina'),
-    ('SD', 'South Dakota'),
-    ('TN', 'Tennessee'),
-    ('TX', 'Texas'),
-    ('UT', 'Utah'),
-    ('VT', 'Vermont'),
-    ('VA', 'Virginia'),
-    ('WA', 'Washington'),
-    ('WV', 'West Virginia'),
-    ('WI', 'Wisconsin'),
-    ('WY', 'Wyoming'),
-)
-
-# All 50 states, plus the District of Columbia.
-US_STATES = (
-    ('AL', 'Alabama'),
-    ('AK', 'Alaska'),
-    ('AZ', 'Arizona'),
-    ('AR', 'Arkansas'),
-    ('CA', 'California'),
-    ('CO', 'Colorado'),
-    ('CT', 'Connecticut'),
-    ('DE', 'Delaware'),
-    ('DC', 'District of Columbia'),
-    ('FL', 'Florida'),
-    ('GA', 'Georgia'),
-    ('HI', 'Hawaii'),
-    ('ID', 'Idaho'),
-    ('IL', 'Illinois'),
-    ('IN', 'Indiana'),
-    ('IA', 'Iowa'),
-    ('KS', 'Kansas'),
-    ('KY', 'Kentucky'),
-    ('LA', 'Louisiana'),
-    ('ME', 'Maine'),
-    ('MD', 'Maryland'),
-    ('MA', 'Massachusetts'),
-    ('MI', 'Michigan'),
-    ('MN', 'Minnesota'),
-    ('MS', 'Mississippi'),
-    ('MO', 'Missouri'),
-    ('MT', 'Montana'),
-    ('NE', 'Nebraska'),
-    ('NV', 'Nevada'),
-    ('NH', 'New Hampshire'),
-    ('NJ', 'New Jersey'),
-    ('NM', 'New Mexico'),
-    ('NY', 'New York'),
-    ('NC', 'North Carolina'),
-    ('ND', 'North Dakota'),
-    ('OH', 'Ohio'),
-    ('OK', 'Oklahoma'),
-    ('OR', 'Oregon'),
-    ('PA', 'Pennsylvania'),
-    ('RI', 'Rhode Island'),
-    ('SC', 'South Carolina'),
-    ('SD', 'South Dakota'),
-    ('TN', 'Tennessee'),
-    ('TX', 'Texas'),
-    ('UT', 'Utah'),
-    ('VT', 'Vermont'),
-    ('VA', 'Virginia'),
-    ('WA', 'Washington'),
-    ('WV', 'West Virginia'),
-    ('WI', 'Wisconsin'),
-    ('WY', 'Wyoming'),
-)
-
-# Non-state territories.
-US_TERRITORIES = (
-    ('AS', 'American Samoa'),
-    ('GU', 'Guam'),
-    ('MP', 'Northern Mariana Islands'),
-    ('PR', 'Puerto Rico'),
-    ('VI', 'Virgin Islands'),
-)
-
-# Military postal "states". Note that 'AE' actually encompasses
-# Europe, Canada, Africa and the Middle East.
-ARMED_FORCES_STATES = (
-    ('AA', 'Armed Forces Americas'),
-    ('AE', 'Armed Forces Europe'),
-    ('AP', 'Armed Forces Pacific'),
-)
-
-# Non-US locations serviced by USPS (under Compact of Free
-# Association).
-COFA_STATES = (
-    ('FM', 'Federated States of Micronesia'),
-    ('MH', 'Marshall Islands'),
-    ('PW', 'Palau'),
-)
-
-# Obsolete abbreviations (no longer US territories/USPS service, or
-# code changed).
-OBSOLETE_STATES = (
-    ('CM', 'Commonwealth of the Northern Mariana Islands'), # Is now 'MP'
-    ('CZ', 'Panama Canal Zone'),                            # Reverted to Panama 1979
-    ('PI', 'Philippine Islands'),                           # Philippine independence 1946
-    ('TT', 'Trust Territory of the Pacific Islands'),       # Became the independent COFA states + Northern Mariana Islands 1979-1994
-)
-
-
-# All US states and territories plus DC and military mail.
-STATE_CHOICES = tuple(sorted(US_STATES + US_TERRITORIES + ARMED_FORCES_STATES, key=lambda obj: obj[1]))
-
-# All US Postal Service locations.
-USPS_CHOICES = tuple(sorted(US_STATES + US_TERRITORIES + ARMED_FORCES_STATES + COFA_STATES, key=lambda obj: obj[1]))
-
-STATES_NORMALIZED = {
-    'ak': 'AK',
-    'al': 'AL',
-    'ala': 'AL',
-    'alabama': 'AL',
-    'alaska': 'AK',
-    'american samao': 'AS',
-    'american samoa': 'AS',
-    'ar': 'AR',
-    'ariz': 'AZ',
-    'arizona': 'AZ',
-    'ark': 'AR',
-    'arkansas': 'AR',
-    'as': 'AS',
-    'az': 'AZ',
-    'ca': 'CA',
-    'calf': 'CA',
-    'calif': 'CA',
-    'california': 'CA',
-    'co': 'CO',
-    'colo': 'CO',
-    'colorado': 'CO',
-    'conn': 'CT',
-    'connecticut': 'CT',
-    'ct': 'CT',
-    'dc': 'DC',
-    'de': 'DE',
-    'del': 'DE',
-    'delaware': 'DE',
-    'deleware': 'DE',
-    'district of columbia': 'DC',
-    'fl': 'FL',
-    'fla': 'FL',
-    'florida': 'FL',
-    'ga': 'GA',
-    'georgia': 'GA',
-    'gu': 'GU',
-    'guam': 'GU',
-    'hawaii': 'HI',
-    'hi': 'HI',
-    'ia': 'IA',
-    'id': 'ID',
-    'idaho': 'ID',
-    'il': 'IL',
-    'ill': 'IL',
-    'illinois': 'IL',
-    'in': 'IN',
-    'ind': 'IN',
-    'indiana': 'IN',
-    'iowa': 'IA',
-    'kan': 'KS',
-    'kans': 'KS',
-    'kansas': 'KS',
-    'kentucky': 'KY',
-    'ks': 'KS',
-    'ky': 'KY',
-    'la': 'LA',
-    'louisiana': 'LA',
-    'ma': 'MA',
-    'maine': 'ME',
-    'marianas islands': 'MP',
-    'marianas islands of the pacific': 'MP',
-    'marinas islands of the pacific': 'MP',
-    'maryland': 'MD',
-    'mass': 'MA',
-    'massachusetts': 'MA',
-    'massachussetts': 'MA',
-    'md': 'MD',
-    'me': 'ME',
-    'mi': 'MI',
-    'mich': 'MI',
-    'michigan': 'MI',
-    'minn': 'MN',
-    'minnesota': 'MN',
-    'miss': 'MS',
-    'mississippi': 'MS',
-    'missouri': 'MO',
-    'mn': 'MN',
-    'mo': 'MO',
-    'mont': 'MT',
-    'montana': 'MT',
-    'mp': 'MP',
-    'ms': 'MS',
-    'mt': 'MT',
-    'n d': 'ND',
-    'n dak': 'ND',
-    'n h': 'NH',
-    'n j': 'NJ',
-    'n m': 'NM',
-    'n mex': 'NM',
-    'nc': 'NC',
-    'nd': 'ND',
-    'ne': 'NE',
-    'neb': 'NE',
-    'nebr': 'NE',
-    'nebraska': 'NE',
-    'nev': 'NV',
-    'nevada': 'NV',
-    'new hampshire': 'NH',
-    'new jersey': 'NJ',
-    'new mexico': 'NM',
-    'new york': 'NY',
-    'nh': 'NH',
-    'nj': 'NJ',
-    'nm': 'NM',
-    'nmex': 'NM',
-    'north carolina': 'NC',
-    'north dakota': 'ND',
-    'northern mariana islands': 'MP',
-    'nv': 'NV',
-    'ny': 'NY',
-    'oh': 'OH',
-    'ohio': 'OH',
-    'ok': 'OK',
-    'okla': 'OK',
-    'oklahoma': 'OK',
-    'or': 'OR',
-    'ore': 'OR',
-    'oreg': 'OR',
-    'oregon': 'OR',
-    'pa': 'PA',
-    'penn': 'PA',
-    'pennsylvania': 'PA',
-    'pr': 'PR',
-    'puerto rico': 'PR',
-    'rhode island': 'RI',
-    'ri': 'RI',
-    's dak': 'SD',
-    'sc': 'SC',
-    'sd': 'SD',
-    'sdak': 'SD',
-    'south carolina': 'SC',
-    'south dakota': 'SD',
-    'tenn': 'TN',
-    'tennessee': 'TN',
-    'territory of hawaii': 'HI',
-    'tex': 'TX',
-    'texas': 'TX',
-    'tn': 'TN',
-    'tx': 'TX',
-    'us virgin islands': 'VI',
-    'usvi': 'VI',
-    'ut': 'UT',
-    'utah': 'UT',
-    'va': 'VA',
-    'vermont': 'VT',
-    'vi': 'VI',
-    'viginia': 'VA',
-    'virgin islands': 'VI',
-    'virgina': 'VA',
-    'virginia': 'VA',
-    'vt': 'VT',
-    'w va': 'WV',
-    'wa': 'WA',
-    'wash': 'WA',
-    'washington': 'WA',
-    'west virginia': 'WV',
-    'wi': 'WI',
-    'wis': 'WI',
-    'wisc': 'WI',
-    'wisconsin': 'WI',
-    'wv': 'WV',
-    'wva': 'WV',
-    'wy': 'WY',
-    'wyo': 'WY',
-    'wyoming': 'WY',
-}
diff --git a/django/contrib/localflavor/uy/forms.py b/django/contrib/localflavor/uy/forms.py
deleted file mode 100644
index 658defc0f0..0000000000
--- a/django/contrib/localflavor/uy/forms.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-UY-specific form helpers.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-from django.core.validators import EMPTY_VALUES
-from django.forms.fields import Select, RegexField
-from django.forms import ValidationError
-from django.utils.translation import ugettext_lazy as _
-from django.contrib.localflavor.uy.util import get_validation_digit
-
-
-class UYDepartamentSelect(Select):
-    """
-    A Select widget that uses a list of Uruguayan departaments as its choices.
-    """
-    def __init__(self, attrs=None):
-        from django.contrib.localflavor.uy.uy_departaments import DEPARTAMENT_CHOICES
-        super(UYDepartamentSelect, self).__init__(attrs, choices=DEPARTAMENT_CHOICES)
-
-
-class UYCIField(RegexField):
-    """
-    A field that validates Uruguayan 'Cedula de identidad' (CI) numbers.
-    """
-    default_error_messages = {
-        'invalid': _("Enter a valid CI number in X.XXX.XXX-X,"
-                     "XXXXXXX-X or XXXXXXXX format."),
-        'invalid_validation_digit': _("Enter a valid CI number."),
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(UYCIField, self).__init__(r'(?P<num>(\d{6,7}|(\d\.)?\d{3}\.\d{3}))-?(?P<val>\d)',
-                                        *args, **kwargs)
-
-    def clean(self, value):
-        """
-        Validates format and validation digit.
-
-        The official format is [X.]XXX.XXX-X but usually dots and/or slash are
-        omitted so, when validating, those characters are ignored if found in
-        the correct place. The three typically used formats are supported:
-        [X]XXXXXXX, [X]XXXXXX-X and [X.]XXX.XXX-X.
-        """
-
-        value = super(UYCIField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return ''
-        match = self.regex.match(value)
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-
-        number = int(match.group('num').replace('.', ''))
-        validation_digit = int(match.group('val'))
-
-        if not validation_digit == get_validation_digit(number):
-            raise ValidationError(self.error_messages['invalid_validation_digit'])
-
-        return value
diff --git a/django/contrib/localflavor/uy/util.py b/django/contrib/localflavor/uy/util.py
deleted file mode 100644
index 0c1a8f84be..0000000000
--- a/django/contrib/localflavor/uy/util.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-def get_validation_digit(number):
-    """ Calculates the validation digit for the given number. """
-    sum = 0
-    dvs = [4, 3, 6, 7, 8, 9, 2]
-    number = str(number)
-
-    for i in range(0, len(number)):
-        sum = (int(number[-1 - i]) * dvs[i] + sum) % 10
-
-    return (10-sum) % 10
diff --git a/django/contrib/localflavor/uy/uy_departaments.py b/django/contrib/localflavor/uy/uy_departaments.py
deleted file mode 100644
index 800937c582..0000000000
--- a/django/contrib/localflavor/uy/uy_departaments.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-"""A list of Urguayan departaments as `choices` in a formfield."""
-from __future__ import unicode_literals
-
-DEPARTAMENT_CHOICES = (
-    ('G', 'Artigas'),
-    ('A', 'Canelones'),
-    ('E', 'Cerro Largo'),
-    ('L', 'Colonia'),
-    ('Q', 'Durazno'),
-    ('N', 'Flores'),
-    ('O', 'Florida'),
-    ('P', 'Lavalleja'),
-    ('B', 'Maldonado'),
-    ('S', 'Montevideo'),
-    ('I', 'Paysandú'),
-    ('J', 'Río Negro'),
-    ('F', 'Rivera'),
-    ('C', 'Rocha'),
-    ('H', 'Salto'),
-    ('M', 'San José'),
-    ('K', 'Soriano'),
-    ('R', 'Tacuarembó'),
-    ('D', 'Treinta y Tres'),
-)
diff --git a/django/contrib/localflavor/za/forms.py b/django/contrib/localflavor/za/forms.py
deleted file mode 100644
index a818c14428..0000000000
--- a/django/contrib/localflavor/za/forms.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""
-South Africa-specific Form helpers
-"""
-from __future__ import unicode_literals
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import CharField, RegexField
-from django.utils.checksums import luhn
-from django.utils.translation import gettext as _
-import re
-from datetime import date
-
-id_re = re.compile(r'^(?P<yy>\d\d)(?P<mm>\d\d)(?P<dd>\d\d)(?P<mid>\d{4})(?P<end>\d{3})')
-
-class ZAIDField(CharField):
-    """A form field for South African ID numbers -- the checksum is validated
-    using the Luhn checksum, and uses a simlistic (read: not entirely accurate)
-    check for the birthdate
-    """
-    default_error_messages = {
-        'invalid': _('Enter a valid South African ID number'),
-    }
-
-    def clean(self, value):
-        super(ZAIDField, self).clean(value)
-
-        if value in EMPTY_VALUES:
-            return ''
-
-        # strip spaces and dashes
-        value = value.strip().replace(' ', '').replace('-', '')
-
-        match = re.match(id_re, value)
-
-        if not match:
-            raise ValidationError(self.error_messages['invalid'])
-
-        g = match.groupdict()
-
-        try:
-            # The year 2000 is conveniently a leapyear.
-            # This algorithm will break in xx00 years which aren't leap years
-            # There is no way to guess the century of a ZA ID number
-            d = date(int(g['yy']) + 2000, int(g['mm']), int(g['dd']))
-        except ValueError:
-            raise ValidationError(self.error_messages['invalid'])
-
-        if not luhn(value):
-            raise ValidationError(self.error_messages['invalid'])
-
-        return value
-
-class ZAPostCodeField(RegexField):
-    default_error_messages = {
-        'invalid': _('Enter a valid South African postal code'),
-    }
-
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        super(ZAPostCodeField, self).__init__(r'^\d{4}$',
-            max_length, min_length, *args, **kwargs)
diff --git a/django/contrib/localflavor/za/za_provinces.py b/django/contrib/localflavor/za/za_provinces.py
deleted file mode 100644
index 0bc6fe14b3..0000000000
--- a/django/contrib/localflavor/za/za_provinces.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from django.utils.translation import gettext_lazy as _
-
-PROVINCE_CHOICES = (
-    ('EC', _('Eastern Cape')),
-    ('FS', _('Free State')),
-    ('GP', _('Gauteng')),
-    ('KN', _('KwaZulu-Natal')),
-    ('LP', _('Limpopo')),
-    ('MP', _('Mpumalanga')),
-    ('NC', _('Northern Cape')),
-    ('NW', _('North West')),
-    ('WC', _('Western Cape')),
-)
diff --git a/django/contrib/markup/templatetags/markup.py b/django/contrib/markup/templatetags/markup.py
deleted file mode 100644
index 389c919c07..0000000000
--- a/django/contrib/markup/templatetags/markup.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""
-Set of "markup" template filters for Django.  These filters transform plain text
-markup syntaxes to HTML; currently there is support for:
-
-    * Textile, which requires the PyTextile library available at
-      http://loopcore.com/python-textile/
-
-    * Markdown, which requires the Python-markdown library from
-      http://www.freewisdom.org/projects/python-markdown
-
-    * reStructuredText, which requires docutils from http://docutils.sf.net/
-"""
-
-from django import template
-from django.conf import settings
-from django.utils.encoding import force_bytes, force_text
-from django.utils.safestring import mark_safe
-
-register = template.Library()
-
-@register.filter(is_safe=True)
-def textile(value):
-    try:
-        import textile
-    except ImportError:
-        if settings.DEBUG:
-            raise template.TemplateSyntaxError("Error in 'textile' filter: The Python textile library isn't installed.")
-        return force_text(value)
-    else:
-        return mark_safe(force_text(textile.textile(force_bytes(value), encoding='utf-8', output='utf-8')))
-
-@register.filter(is_safe=True)
-def markdown(value, arg=''):
-    """
-    Runs Markdown over a given value, optionally using various
-    extensions python-markdown supports.
-
-    Syntax::
-
-        {{ value|markdown:"extension1_name,extension2_name..." }}
-
-    To enable safe mode, which strips raw HTML and only returns HTML
-    generated by actual Markdown syntax, pass "safe" as the first
-    extension in the list.
-
-    If the version of Markdown in use does not support extensions,
-    they will be silently ignored.
-
-    """
-    import warnings
-    warnings.warn('The markdown filter has been deprecated',
-                  category=DeprecationWarning)
-    try:
-        import markdown
-    except ImportError:
-        if settings.DEBUG:
-            raise template.TemplateSyntaxError("Error in 'markdown' filter: The Python markdown library isn't installed.")
-        return force_text(value)
-    else:
-        markdown_vers = getattr(markdown, "version_info", 0)
-        if markdown_vers < (2, 1):
-            if settings.DEBUG:
-                raise template.TemplateSyntaxError(
-                    "Error in 'markdown' filter: Django does not support versions of the Python markdown library < 2.1.")
-            return force_text(value)
-        else:
-            extensions = [e for e in arg.split(",") if e]
-            if extensions and extensions[0] == "safe":
-                extensions = extensions[1:]
-                return mark_safe(markdown.markdown(
-                    force_text(value), extensions, safe_mode=True, enable_attributes=False))
-            else:
-                return mark_safe(markdown.markdown(
-                    force_text(value), extensions, safe_mode=False))
-
-@register.filter(is_safe=True)
-def restructuredtext(value):
-    import warnings
-    warnings.warn('The restructuredtext filter has been deprecated',
-                  category=DeprecationWarning)
-    try:
-        from docutils.core import publish_parts
-    except ImportError:
-        if settings.DEBUG:
-            raise template.TemplateSyntaxError("Error in 'restructuredtext' filter: The Python docutils library isn't installed.")
-        return force_text(value)
-    else:
-        docutils_settings = getattr(settings, "RESTRUCTUREDTEXT_FILTER_SETTINGS", {})
-        parts = publish_parts(source=force_bytes(value), writer_name="html4css1", settings_overrides=docutils_settings)
-        return mark_safe(force_text(parts["fragment"]))
diff --git a/django/contrib/markup/tests.py b/django/contrib/markup/tests.py
deleted file mode 100644
index 19a3b7e9d0..0000000000
--- a/django/contrib/markup/tests.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# Quick tests for the markup templatetags (django.contrib.markup)
-import re
-import warnings
-
-from django.template import Template, Context
-from django import test
-from django.utils import unittest
-from django.utils.html import escape
-
-try:
-    import textile
-except ImportError:
-    textile = None
-
-try:
-    import markdown
-    markdown_version = getattr(markdown, "version_info", 0)
-except ImportError:
-    markdown = None
-
-try:
-    import docutils
-except ImportError:
-    docutils = None
-
-class Templates(test.TestCase):
-
-    textile_content = """Paragraph 1
-
-Paragraph 2 with "quotes" and @code@"""
-
-    markdown_content = """Paragraph 1
-
-## An h2"""
-
-    rest_content = """Paragraph 1
-
-Paragraph 2 with a link_
-
-.. _link: http://www.example.com/"""
-
-    def setUp(self):
-        self.save_warnings_state()
-        warnings.filterwarnings('ignore', category=DeprecationWarning, module='django.contrib.markup')
-
-    def tearDown(self):
-        self.restore_warnings_state()
-
-    @unittest.skipUnless(textile, 'textile not installed')
-    def test_textile(self):
-        t = Template("{% load markup %}{{ textile_content|textile }}")
-        rendered = t.render(Context({'textile_content':self.textile_content})).strip()
-        self.assertEqual(rendered.replace('\t', ''), """<p>Paragraph 1</p>
-
-<p>Paragraph 2 with &#8220;quotes&#8221; and <code>code</code></p>""")
-
-    @unittest.skipIf(textile, 'textile is installed')
-    def test_no_textile(self):
-        t = Template("{% load markup %}{{ textile_content|textile }}")
-        rendered = t.render(Context({'textile_content':self.textile_content})).strip()
-        self.assertEqual(rendered, escape(self.textile_content))
-
-    @unittest.skipUnless(markdown and markdown_version >= (2,1), 'markdown >= 2.1 not installed')
-    def test_markdown(self):
-        t = Template("{% load markup %}{{ markdown_content|markdown }}")
-        rendered = t.render(Context({'markdown_content':self.markdown_content})).strip()
-        pattern = re.compile("""<p>Paragraph 1\s*</p>\s*<h2>\s*An h2</h2>""")
-        self.assertTrue(pattern.match(rendered))
-
-    @unittest.skipUnless(markdown and markdown_version >= (2,1), 'markdown >= 2.1 not installed')
-    def test_markdown_attribute_disable(self):
-        t = Template("{% load markup %}{{ markdown_content|markdown:'safe' }}")
-        markdown_content = "{@onclick=alert('hi')}some paragraph"
-        rendered = t.render(Context({'markdown_content':markdown_content})).strip()
-        self.assertTrue('@' in rendered)
-
-    @unittest.skipUnless(markdown and markdown_version >= (2,1), 'markdown >= 2.1 not installed')
-    def test_markdown_attribute_enable(self):
-        t = Template("{% load markup %}{{ markdown_content|markdown }}")
-        markdown_content = "{@onclick=alert('hi')}some paragraph"
-        rendered = t.render(Context({'markdown_content':markdown_content})).strip()
-        self.assertFalse('@' in rendered)
-
-    @unittest.skipIf(markdown, 'markdown is installed')
-    def test_no_markdown(self):
-        t = Template("{% load markup %}{{ markdown_content|markdown }}")
-        rendered = t.render(Context({'markdown_content':self.markdown_content})).strip()
-        self.assertEqual(rendered, self.markdown_content)
-
-    @unittest.skipUnless(docutils, 'docutils not installed')
-    def test_docutils(self):
-        t = Template("{% load markup %}{{ rest_content|restructuredtext }}")
-        rendered = t.render(Context({'rest_content':self.rest_content})).strip()
-        # Different versions of docutils return slightly different HTML
-        try:
-            # Docutils v0.4 and earlier
-            self.assertEqual(rendered, """<p>Paragraph 1</p>
-<p>Paragraph 2 with a <a class="reference" href="http://www.example.com/">link</a></p>""")
-        except AssertionError:
-            # Docutils from SVN (which will become 0.5)
-            self.assertEqual(rendered, """<p>Paragraph 1</p>
-<p>Paragraph 2 with a <a class="reference external" href="http://www.example.com/">link</a></p>""")
-
-    @unittest.skipIf(docutils, 'docutils is installed')
-    def test_no_docutils(self):
-        t = Template("{% load markup %}{{ rest_content|restructuredtext }}")
-        rendered = t.render(Context({'rest_content':self.rest_content})).strip()
-        self.assertEqual(rendered, self.rest_content)
diff --git a/django/contrib/messages/locale/ar/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ar/LC_MESSAGES/django.mo
index 6b1920b79f..28d6a9ebac 100644
Binary files a/django/contrib/messages/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ar/LC_MESSAGES/django.po b/django/contrib/messages/locale/ar/LC_MESSAGES/django.po
index c07059dc5f..9129415124 100644
--- a/django/contrib/messages/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ar/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+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"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "رسالة فارغة"
diff --git a/django/contrib/messages/locale/az/LC_MESSAGES/django.mo b/django/contrib/messages/locale/az/LC_MESSAGES/django.mo
index 32bf2873d8..116509bef7 100644
Binary files a/django/contrib/messages/locale/az/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/az/LC_MESSAGES/django.po b/django/contrib/messages/locale/az/LC_MESSAGES/django.po
index 4691e60960..f7238b3ede 100644
--- a/django/contrib/messages/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/az/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "tənbəl mesaj"
diff --git a/django/contrib/messages/locale/be/LC_MESSAGES/django.mo b/django/contrib/messages/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..fc4cfaf33f
Binary files /dev/null and b/django/contrib/messages/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/be/LC_MESSAGES/django.po b/django/contrib/messages/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..9125a2d3c9
--- /dev/null
+++ b/django/contrib/messages/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,22 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-11 10:22+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: tests/base.py:101
+msgid "lazy message"
+msgstr "паведамленьне з адкладзеным перакладам"
diff --git a/django/contrib/messages/locale/bg/LC_MESSAGES/django.mo b/django/contrib/messages/locale/bg/LC_MESSAGES/django.mo
index cdd099ae85..8d61e7199e 100644
Binary files a/django/contrib/messages/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/bg/LC_MESSAGES/django.po b/django/contrib/messages/locale/bg/LC_MESSAGES/django.po
index 3de23537bd..e7f33e5ba5 100644
--- a/django/contrib/messages/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/bg/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Todor Lubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "подсказващо съобщение"
diff --git a/django/contrib/messages/locale/bn/LC_MESSAGES/django.mo b/django/contrib/messages/locale/bn/LC_MESSAGES/django.mo
index aa9ff5a81b..645e7e0c50 100644
Binary files a/django/contrib/messages/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/bn/LC_MESSAGES/django.po b/django/contrib/messages/locale/bn/LC_MESSAGES/django.po
index 97e5847090..7d27498676 100644
--- a/django/contrib/messages/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/bn/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <rafi.tahmid@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-02-14 13:16+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-09-06 21:47+0000\n"
+"Last-Translator: tahmidrafi <rafi.tahmid@gmail.com>\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
-msgstr ""
+msgstr "লেজি মেসেজ"
diff --git a/django/contrib/messages/locale/br/LC_MESSAGES/django.mo b/django/contrib/messages/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..3b6b874073
Binary files /dev/null and b/django/contrib/messages/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/br/LC_MESSAGES/django.po b/django/contrib/messages/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..b500a868c8
--- /dev/null
+++ b/django/contrib/messages/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,22 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-06-29 10:58+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: tests/base.py:101
+msgid "lazy message"
+msgstr "kemennadenn \"lazy\""
diff --git a/django/contrib/messages/locale/bs/LC_MESSAGES/django.mo b/django/contrib/messages/locale/bs/LC_MESSAGES/django.mo
index f9c9d11115..142d1b1660 100644
Binary files a/django/contrib/messages/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/bs/LC_MESSAGES/django.po b/django/contrib/messages/locale/bs/LC_MESSAGES/django.po
index 6f1556582d..874abc3ab6 100644
--- a/django/contrib/messages/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/bs/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "lijena poruka"
diff --git a/django/contrib/messages/locale/ca/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ca/LC_MESSAGES/django.mo
index dd1455aa78..10ed38a370 100644
Binary files a/django/contrib/messages/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ca/LC_MESSAGES/django.po b/django/contrib/messages/locale/ca/LC_MESSAGES/django.po
index 5ff4e7515b..b423c99605 100644
--- a/django/contrib/messages/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ca/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "missatge gandul"
diff --git a/django/contrib/messages/locale/cs/LC_MESSAGES/django.mo b/django/contrib/messages/locale/cs/LC_MESSAGES/django.mo
index f04e5c58a0..2ebd6b3143 100644
Binary files a/django/contrib/messages/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/cs/LC_MESSAGES/django.po b/django/contrib/messages/locale/cs/LC_MESSAGES/django.po
index ba50d201b9..dd49dd3607 100644
--- a/django/contrib/messages/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/cs/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "opožděně vyhodnocená zpráva"
diff --git a/django/contrib/messages/locale/cy/LC_MESSAGES/django.mo b/django/contrib/messages/locale/cy/LC_MESSAGES/django.mo
index 4135232fa7..e94d4386e3 100644
Binary files a/django/contrib/messages/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/cy/LC_MESSAGES/django.po b/django/contrib/messages/locale/cy/LC_MESSAGES/django.po
index 9df5bd96e2..eb3509d712 100644
--- a/django/contrib/messages/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/cy/LC_MESSAGES/django.po
@@ -1,20 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2011-03-15 15:34+0000\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2011-01-19 15:38+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr ""
diff --git a/django/contrib/messages/locale/da/LC_MESSAGES/django.mo b/django/contrib/messages/locale/da/LC_MESSAGES/django.mo
index e748e3c0b2..42390dde6b 100644
Binary files a/django/contrib/messages/locale/da/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/da/LC_MESSAGES/django.po b/django/contrib/messages/locale/da/LC_MESSAGES/django.po
index 2e0e1d8c77..34ce5e729f 100644
--- a/django/contrib/messages/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/da/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "doven meddelelse"
diff --git a/django/contrib/messages/locale/de/LC_MESSAGES/django.mo b/django/contrib/messages/locale/de/LC_MESSAGES/django.mo
index 77315f63e1..7007f5f856 100644
Binary files a/django/contrib/messages/locale/de/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/de/LC_MESSAGES/django.po b/django/contrib/messages/locale/de/LC_MESSAGES/django.po
index 3ac1369442..7d4e70bd36 100644
--- a/django/contrib/messages/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/de/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "Lazy Nachricht"
diff --git a/django/contrib/messages/locale/el/LC_MESSAGES/django.mo b/django/contrib/messages/locale/el/LC_MESSAGES/django.mo
index e9b4de2254..077e990fef 100644
Binary files a/django/contrib/messages/locale/el/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/el/LC_MESSAGES/django.po b/django/contrib/messages/locale/el/LC_MESSAGES/django.po
index ef15865244..8004322858 100644
--- a/django/contrib/messages/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/el/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
-"Last-Translator: Dimitris Glezos <glezos@indifex.com>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Dimitris Glezos <glezos@transifex.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "lazy μήνυμα"
diff --git a/django/contrib/messages/locale/en/LC_MESSAGES/django.mo b/django/contrib/messages/locale/en/LC_MESSAGES/django.mo
index 83b94c07c4..a0c5646f66 100644
Binary files a/django/contrib/messages/locale/en/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/en/LC_MESSAGES/django.po b/django/contrib/messages/locale/en/LC_MESSAGES/django.po
index 6f16dd0411..b1c1f9bea4 100644
--- a/django/contrib/messages/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/en/LC_MESSAGES/django.po
@@ -1,18 +1,21 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:57+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-02-14 13:16+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: tests/base.py:101
 msgid "lazy message"
-msgstr ""
+msgstr "lazy message"
diff --git a/django/contrib/messages/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/messages/locale/en_GB/LC_MESSAGES/django.mo
index 033a210830..802e35087d 100644
Binary files a/django/contrib/messages/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/messages/locale/en_GB/LC_MESSAGES/django.po
index b031780f33..2aa146559e 100644
--- a/django/contrib/messages/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/en_GB/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: jon_atkinson <jon@jonatkinson.co.uk>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "lazy message"
diff --git a/django/contrib/messages/locale/eo/LC_MESSAGES/django.mo b/django/contrib/messages/locale/eo/LC_MESSAGES/django.mo
index 06cd5726ac..9071f264d6 100644
Binary files a/django/contrib/messages/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/eo/LC_MESSAGES/django.po b/django/contrib/messages/locale/eo/LC_MESSAGES/django.po
index 8d30ab92f8..9a1e30283f 100644
--- a/django/contrib/messages/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/eo/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "pigra mesaĝo"
diff --git a/django/contrib/messages/locale/es/LC_MESSAGES/django.mo b/django/contrib/messages/locale/es/LC_MESSAGES/django.mo
index 35c44b949a..042a995311 100644
Binary files a/django/contrib/messages/locale/es/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/es/LC_MESSAGES/django.po b/django/contrib/messages/locale/es/LC_MESSAGES/django.po
index ba53f73163..e28ca082bc 100644
--- a/django/contrib/messages/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/es/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mensaje vago"
diff --git a/django/contrib/messages/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/messages/locale/es_AR/LC_MESSAGES/django.mo
index 771dcbf260..c54b0a217c 100644
Binary files a/django/contrib/messages/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/messages/locale/es_AR/LC_MESSAGES/django.po
index 1d5acedf89..e3eb576db7 100644
--- a/django/contrib/messages/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/es_AR/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mensaje lazy"
diff --git a/django/contrib/messages/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/messages/locale/es_MX/LC_MESSAGES/django.mo
index 432a23ef1e..aa8926ccb9 100644
Binary files a/django/contrib/messages/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/messages/locale/es_MX/LC_MESSAGES/django.po
index f2472ce7b6..53a6751336 100644
--- a/django/contrib/messages/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/es_MX/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mensaje flojo"
diff --git a/django/contrib/messages/locale/et/LC_MESSAGES/django.mo b/django/contrib/messages/locale/et/LC_MESSAGES/django.mo
index 686cd7e446..11652d14cd 100644
Binary files a/django/contrib/messages/locale/et/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/et/LC_MESSAGES/django.po b/django/contrib/messages/locale/et/LC_MESSAGES/django.po
index 4da6abaccc..2b6c3e2e2e 100644
--- a/django/contrib/messages/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/et/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "laisk sõnum"
diff --git a/django/contrib/messages/locale/eu/LC_MESSAGES/django.mo b/django/contrib/messages/locale/eu/LC_MESSAGES/django.mo
index e7df9ee1a9..13b9c83441 100644
Binary files a/django/contrib/messages/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/eu/LC_MESSAGES/django.po b/django/contrib/messages/locale/eu/LC_MESSAGES/django.po
index 2093840af1..7d4048d05a 100644
--- a/django/contrib/messages/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/eu/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-09 11:07+0000\n"
 "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mezu nagia"
diff --git a/django/contrib/messages/locale/fa/LC_MESSAGES/django.mo b/django/contrib/messages/locale/fa/LC_MESSAGES/django.mo
index 6e18a7ba91..340bff2650 100644
Binary files a/django/contrib/messages/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/fa/LC_MESSAGES/django.po b/django/contrib/messages/locale/fa/LC_MESSAGES/django.po
index a22202cf1d..75a590082d 100644
--- a/django/contrib/messages/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/fa/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "پیغام با تاخیر"
diff --git a/django/contrib/messages/locale/fi/LC_MESSAGES/django.mo b/django/contrib/messages/locale/fi/LC_MESSAGES/django.mo
index cae3fb4320..9fb3db2086 100644
Binary files a/django/contrib/messages/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/fi/LC_MESSAGES/django.po b/django/contrib/messages/locale/fi/LC_MESSAGES/django.po
index f2c7c2703c..cb88524143 100644
--- a/django/contrib/messages/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/fi/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "laiska viesti"
diff --git a/django/contrib/messages/locale/fr/LC_MESSAGES/django.mo b/django/contrib/messages/locale/fr/LC_MESSAGES/django.mo
index 07321659fd..622b1c1a21 100644
Binary files a/django/contrib/messages/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/fr/LC_MESSAGES/django.po b/django/contrib/messages/locale/fr/LC_MESSAGES/django.po
index 2f881ed43e..cbf5c20f45 100644
--- a/django/contrib/messages/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/fr/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "message « lazy »"
diff --git a/django/contrib/messages/locale/ga/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ga/LC_MESSAGES/django.mo
index b638b8006c..8cec2a53c9 100644
Binary files a/django/contrib/messages/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ga/LC_MESSAGES/django.po b/django/contrib/messages/locale/ga/LC_MESSAGES/django.po
index 3cdedd4a6f..3368438a85 100644
--- a/django/contrib/messages/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ga/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "teachtaireacht leisciúil"
diff --git a/django/contrib/messages/locale/gl/LC_MESSAGES/django.mo b/django/contrib/messages/locale/gl/LC_MESSAGES/django.mo
index fe2692cf03..032d138255 100644
Binary files a/django/contrib/messages/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/gl/LC_MESSAGES/django.po b/django/contrib/messages/locale/gl/LC_MESSAGES/django.po
index e03ed50cc3..fa1490d65c 100644
--- a/django/contrib/messages/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/gl/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: fasouto <fsoutomoure@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mensaxe vago"
diff --git a/django/contrib/messages/locale/he/LC_MESSAGES/django.mo b/django/contrib/messages/locale/he/LC_MESSAGES/django.mo
index b839a0c0e4..ef46a79ace 100644
Binary files a/django/contrib/messages/locale/he/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/he/LC_MESSAGES/django.po b/django/contrib/messages/locale/he/LC_MESSAGES/django.po
index e819818fd4..3dd8b2aa6a 100644
--- a/django/contrib/messages/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/he/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "הודעה 'עצלה'"
diff --git a/django/contrib/messages/locale/hi/LC_MESSAGES/django.mo b/django/contrib/messages/locale/hi/LC_MESSAGES/django.mo
index b76be2af79..ae8c913cba 100644
Binary files a/django/contrib/messages/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/hi/LC_MESSAGES/django.po b/django/contrib/messages/locale/hi/LC_MESSAGES/django.po
index 3e8c78d375..3d1468644a 100644
--- a/django/contrib/messages/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/hi/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Sandeep Satavlekar <sandysat@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "आलसी संदेश"
diff --git a/django/contrib/messages/locale/hr/LC_MESSAGES/django.mo b/django/contrib/messages/locale/hr/LC_MESSAGES/django.mo
index 529680c1c2..4593193360 100644
Binary files a/django/contrib/messages/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/hr/LC_MESSAGES/django.po b/django/contrib/messages/locale/hr/LC_MESSAGES/django.po
index d5e5ae2a3e..b6da42d60f 100644
--- a/django/contrib/messages/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/hr/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "lijena poruka (\"lazy message\")"
diff --git a/django/contrib/messages/locale/hu/LC_MESSAGES/django.mo b/django/contrib/messages/locale/hu/LC_MESSAGES/django.mo
index 35fcfdb192..cd84d470d3 100644
Binary files a/django/contrib/messages/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/hu/LC_MESSAGES/django.po b/django/contrib/messages/locale/hu/LC_MESSAGES/django.po
index 179e3dfcb1..fddb366948 100644
--- a/django/contrib/messages/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/hu/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Szilveszter Farkas <szilveszter.farkas@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "lusta üzenet"
diff --git a/django/contrib/messages/locale/ia/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ia/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..55ba41431a
Binary files /dev/null and b/django/contrib/messages/locale/ia/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ia/LC_MESSAGES/django.po b/django/contrib/messages/locale/ia/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..d7914f5446
--- /dev/null
+++ b/django/contrib/messages/locale/ia/LC_MESSAGES/django.po
@@ -0,0 +1,22 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Martijn Dekker <mcdutchie@hotmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-20 19:21+0000\n"
+"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
+"Language-Team: Interlingua (http://www.transifex.com/projects/p/django/"
+"language/ia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: tests/base.py:101
+msgid "lazy message"
+msgstr "message pigre"
diff --git a/django/contrib/messages/locale/id/LC_MESSAGES/django.mo b/django/contrib/messages/locale/id/LC_MESSAGES/django.mo
index 560066ac30..b7b58e7e31 100644
Binary files a/django/contrib/messages/locale/id/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/id/LC_MESSAGES/django.po b/django/contrib/messages/locale/id/LC_MESSAGES/django.po
index 9e4738fc25..66d725b959 100644
--- a/django/contrib/messages/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/id/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "pesan tidak segera"
diff --git a/django/contrib/messages/locale/is/LC_MESSAGES/django.mo b/django/contrib/messages/locale/is/LC_MESSAGES/django.mo
index 0ff4258c9d..9be139b987 100644
Binary files a/django/contrib/messages/locale/is/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/is/LC_MESSAGES/django.po b/django/contrib/messages/locale/is/LC_MESSAGES/django.po
index cf39e26a2a..2b2e543b8a 100644
--- a/django/contrib/messages/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/is/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "letiboð"
diff --git a/django/contrib/messages/locale/it/LC_MESSAGES/django.mo b/django/contrib/messages/locale/it/LC_MESSAGES/django.mo
index 45f258c667..d924c45b15 100644
Binary files a/django/contrib/messages/locale/it/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/it/LC_MESSAGES/django.po b/django/contrib/messages/locale/it/LC_MESSAGES/django.po
index 01abf8d5ef..1263379b69 100644
--- a/django/contrib/messages/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/it/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "messaggio lazy"
diff --git a/django/contrib/messages/locale/ja/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ja/LC_MESSAGES/django.mo
index e423037062..0f7aaf5966 100644
Binary files a/django/contrib/messages/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ja/LC_MESSAGES/django.po b/django/contrib/messages/locale/ja/LC_MESSAGES/django.po
index e0e6b3117f..58db7eafae 100644
--- a/django/contrib/messages/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ja/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "遅延メッセージ"
diff --git a/django/contrib/messages/locale/ka/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ka/LC_MESSAGES/django.mo
index 0d75daaf12..95854eb222 100644
Binary files a/django/contrib/messages/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ka/LC_MESSAGES/django.po b/django/contrib/messages/locale/ka/LC_MESSAGES/django.po
index c781abc401..804cfc206e 100644
--- a/django/contrib/messages/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ka/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "\"ზარმაცი\" შეტყობინება"
diff --git a/django/contrib/messages/locale/kk/LC_MESSAGES/django.mo b/django/contrib/messages/locale/kk/LC_MESSAGES/django.mo
index 6e781eeacf..4e1fd4afcb 100644
Binary files a/django/contrib/messages/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/kk/LC_MESSAGES/django.po b/django/contrib/messages/locale/kk/LC_MESSAGES/django.po
index 38df1669c0..dd62105035 100644
--- a/django/contrib/messages/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/kk/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "еріншек хабар"
diff --git a/django/contrib/messages/locale/kn/LC_MESSAGES/django.mo b/django/contrib/messages/locale/kn/LC_MESSAGES/django.mo
index 387f1c34c1..fd8c365335 100644
Binary files a/django/contrib/messages/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/kn/LC_MESSAGES/django.po b/django/contrib/messages/locale/kn/LC_MESSAGES/django.po
index ca5eb43726..3bf0f0d24c 100644
--- a/django/contrib/messages/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/kn/LC_MESSAGES/django.po
@@ -5,17 +5,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2011-01-19 15:38+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr ""
diff --git a/django/contrib/messages/locale/ko/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ko/LC_MESSAGES/django.mo
index 58ee0e2b1c..fc957bd4f8 100644
Binary files a/django/contrib/messages/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ko/LC_MESSAGES/django.po b/django/contrib/messages/locale/ko/LC_MESSAGES/django.po
index 59041c5cb4..9d3426b661 100644
--- a/django/contrib/messages/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ko/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "늦게 번역되는(lazy) 메시지"
diff --git a/django/contrib/messages/locale/lt/LC_MESSAGES/django.mo b/django/contrib/messages/locale/lt/LC_MESSAGES/django.mo
index edaca64a73..dca9b32fdd 100644
Binary files a/django/contrib/messages/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/lt/LC_MESSAGES/django.po b/django/contrib/messages/locale/lt/LC_MESSAGES/django.po
index 84bf411277..04478f84cd 100644
--- a/django/contrib/messages/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/lt/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: lauris <lauris@runbox.com>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "Uždelsta žinutė"
diff --git a/django/contrib/messages/locale/lv/LC_MESSAGES/django.mo b/django/contrib/messages/locale/lv/LC_MESSAGES/django.mo
index 23e15ac329..2e83d5ff12 100644
Binary files a/django/contrib/messages/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/lv/LC_MESSAGES/django.po b/django/contrib/messages/locale/lv/LC_MESSAGES/django.po
index 4123edb42e..4e827567ba 100644
--- a/django/contrib/messages/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/lv/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "ziņojums (slinkais)"
diff --git a/django/contrib/messages/locale/mk/LC_MESSAGES/django.mo b/django/contrib/messages/locale/mk/LC_MESSAGES/django.mo
index b5d6c29009..1198db24b2 100644
Binary files a/django/contrib/messages/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/mk/LC_MESSAGES/django.po b/django/contrib/messages/locale/mk/LC_MESSAGES/django.po
index d95cbc6520..12e14282f2 100644
--- a/django/contrib/messages/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/mk/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "мрзлива порака"
diff --git a/django/contrib/messages/locale/ml/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ml/LC_MESSAGES/django.mo
index 92fe1965ac..2f84a9aebd 100644
Binary files a/django/contrib/messages/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ml/LC_MESSAGES/django.po b/django/contrib/messages/locale/ml/LC_MESSAGES/django.po
index 97b6858c53..46da61be1a 100644
--- a/django/contrib/messages/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ml/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "അലസ സന്ദേശം"
diff --git a/django/contrib/messages/locale/mn/LC_MESSAGES/django.mo b/django/contrib/messages/locale/mn/LC_MESSAGES/django.mo
index 93d97c4d2b..7f320ea684 100644
Binary files a/django/contrib/messages/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/mn/LC_MESSAGES/django.po b/django/contrib/messages/locale/mn/LC_MESSAGES/django.po
index f2e3f222e5..e15d879773 100644
--- a/django/contrib/messages/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/mn/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "Удаан мессеж"
diff --git a/django/contrib/messages/locale/my/LC_MESSAGES/django.mo b/django/contrib/messages/locale/my/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..8248774367
Binary files /dev/null and b/django/contrib/messages/locale/my/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/my/LC_MESSAGES/django.po b/django/contrib/messages/locale/my/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..441ca2d102
--- /dev/null
+++ b/django/contrib/messages/locale/my/LC_MESSAGES/django.po
@@ -0,0 +1,23 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Translators:
+# Yhal Htet Aung <jumoun@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2013-03-17 06:30+0000\n"
+"Last-Translator: Yhal Htet Aung <jumoun@gmail.com>\n"
+"Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/"
+"my/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: tests/base.py:101
+msgid "lazy message"
+msgstr "ပျင်းရိမှာကြားချက်"
diff --git a/django/contrib/messages/locale/nb/LC_MESSAGES/django.mo b/django/contrib/messages/locale/nb/LC_MESSAGES/django.mo
index 7fadac9e21..284ce4f304 100644
Binary files a/django/contrib/messages/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/nb/LC_MESSAGES/django.po b/django/contrib/messages/locale/nb/LC_MESSAGES/django.po
index bfd6d721e1..b3ac45113e 100644
--- a/django/contrib/messages/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/nb/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-12 14:51+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Sigurd Gartmann <sigurdga-transifex@sigurdga.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "«lazy»-melding"
diff --git a/django/contrib/messages/locale/ne/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ne/LC_MESSAGES/django.mo
index 5fe0e387f7..2562006e93 100644
Binary files a/django/contrib/messages/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ne/LC_MESSAGES/django.po b/django/contrib/messages/locale/ne/LC_MESSAGES/django.po
index 5f6539142e..c2e264f912 100644
--- a/django/contrib/messages/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ne/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Sagar Chalise <chalisesagar@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "सम सन्देश"
diff --git a/django/contrib/messages/locale/nl/LC_MESSAGES/django.mo b/django/contrib/messages/locale/nl/LC_MESSAGES/django.mo
index d015e0b804..6aeceddb49 100644
Binary files a/django/contrib/messages/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/nl/LC_MESSAGES/django.po b/django/contrib/messages/locale/nl/LC_MESSAGES/django.po
index 81c7e870cb..073bb9023d 100644
--- a/django/contrib/messages/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/nl/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "later vertaald bericht"
diff --git a/django/contrib/messages/locale/nn/LC_MESSAGES/django.mo b/django/contrib/messages/locale/nn/LC_MESSAGES/django.mo
index 1dc65b6f88..497db79a94 100644
Binary files a/django/contrib/messages/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/nn/LC_MESSAGES/django.po b/django/contrib/messages/locale/nn/LC_MESSAGES/django.po
index 132c81a435..8cd402bb5f 100644
--- a/django/contrib/messages/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/nn/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "lat melding"
diff --git a/django/contrib/messages/locale/pa/LC_MESSAGES/django.mo b/django/contrib/messages/locale/pa/LC_MESSAGES/django.mo
index 93e3582829..03b5a15808 100644
Binary files a/django/contrib/messages/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/pa/LC_MESSAGES/django.po b/django/contrib/messages/locale/pa/LC_MESSAGES/django.po
index 847bc9051e..4b9eaf55af 100644
--- a/django/contrib/messages/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/pa/LC_MESSAGES/django.po
@@ -5,17 +5,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr ""
diff --git a/django/contrib/messages/locale/pl/LC_MESSAGES/django.mo b/django/contrib/messages/locale/pl/LC_MESSAGES/django.mo
index 522169c200..e1a2f60eb7 100644
Binary files a/django/contrib/messages/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/pl/LC_MESSAGES/django.po b/django/contrib/messages/locale/pl/LC_MESSAGES/django.po
index b2bc7e0f00..89b1d0422a 100644
--- a/django/contrib/messages/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/pl/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "testowa wiadomość z opóźnioną ewaluacją"
diff --git a/django/contrib/messages/locale/pt/LC_MESSAGES/django.mo b/django/contrib/messages/locale/pt/LC_MESSAGES/django.mo
index a1c4637553..f4b266905e 100644
Binary files a/django/contrib/messages/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/pt/LC_MESSAGES/django.po b/django/contrib/messages/locale/pt/LC_MESSAGES/django.po
index 4c25094f1d..d54970a80d 100644
--- a/django/contrib/messages/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/pt/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mensagem lazy"
diff --git a/django/contrib/messages/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/messages/locale/pt_BR/LC_MESSAGES/django.mo
index 9cb56da32c..9bcfca5d4d 100644
Binary files a/django/contrib/messages/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/messages/locale/pt_BR/LC_MESSAGES/django.po
index 791d3bea22..68a822d637 100644
--- a/django/contrib/messages/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/pt_BR/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mensagem lazy"
diff --git a/django/contrib/messages/locale/ro/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ro/LC_MESSAGES/django.mo
index 6d1293650b..8c88184a3e 100644
Binary files a/django/contrib/messages/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ro/LC_MESSAGES/django.po b/django/contrib/messages/locale/ro/LC_MESSAGES/django.po
index 9ce8ba6f9a..e2cd7f5123 100644
--- a/django/contrib/messages/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ro/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mesaj întârziat"
diff --git a/django/contrib/messages/locale/ru/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ru/LC_MESSAGES/django.mo
index 1d1d18405f..4dcb7f3839 100644
Binary files a/django/contrib/messages/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ru/LC_MESSAGES/django.po b/django/contrib/messages/locale/ru/LC_MESSAGES/django.po
index d5d6001ef6..cb93ba61a2 100644
--- a/django/contrib/messages/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ru/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "сообщение с отложенным переводом"
diff --git a/django/contrib/messages/locale/sk/LC_MESSAGES/django.mo b/django/contrib/messages/locale/sk/LC_MESSAGES/django.mo
index 013198ad3c..d1efaf9281 100644
Binary files a/django/contrib/messages/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/sk/LC_MESSAGES/django.po b/django/contrib/messages/locale/sk/LC_MESSAGES/django.po
index b6150a7a77..404d06e71a 100644
--- a/django/contrib/messages/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/sk/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "lenivá správa"
diff --git a/django/contrib/messages/locale/sl/LC_MESSAGES/django.mo b/django/contrib/messages/locale/sl/LC_MESSAGES/django.mo
index 9986470f89..50663aef2c 100644
Binary files a/django/contrib/messages/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/sl/LC_MESSAGES/django.po b/django/contrib/messages/locale/sl/LC_MESSAGES/django.po
index 1ec95ca509..bb52edb343 100644
--- a/django/contrib/messages/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/sl/LC_MESSAGES/django.po
@@ -1,23 +1,24 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+#   <>, 2012.
 # Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-02-14 13:16+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-10-31 19:07+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "leno sporočilo"
diff --git a/django/contrib/messages/locale/sq/LC_MESSAGES/django.mo b/django/contrib/messages/locale/sq/LC_MESSAGES/django.mo
index 491c526f13..7ee9043b26 100644
Binary files a/django/contrib/messages/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/sq/LC_MESSAGES/django.po b/django/contrib/messages/locale/sq/LC_MESSAGES/django.po
index c1c2e8e8ff..09e1d46e30 100644
--- a/django/contrib/messages/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/sq/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "mesazh i vagullt"
diff --git a/django/contrib/messages/locale/sr/LC_MESSAGES/django.mo b/django/contrib/messages/locale/sr/LC_MESSAGES/django.mo
index 3e4602b01f..040913cf9d 100644
Binary files a/django/contrib/messages/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/sr/LC_MESSAGES/django.po b/django/contrib/messages/locale/sr/LC_MESSAGES/django.po
index c254bbde72..8fdfd6060f 100644
--- a/django/contrib/messages/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/sr/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "порука"
diff --git a/django/contrib/messages/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/messages/locale/sr_Latn/LC_MESSAGES/django.mo
index c5f3ae758b..1856888635 100644
Binary files a/django/contrib/messages/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/messages/locale/sr_Latn/LC_MESSAGES/django.po
index cf5ada9846..a3f6038a65 100644
--- a/django/contrib/messages/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/sr_Latn/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "poruka"
diff --git a/django/contrib/messages/locale/sv/LC_MESSAGES/django.mo b/django/contrib/messages/locale/sv/LC_MESSAGES/django.mo
index 944a73683d..c2f6d8b84e 100644
Binary files a/django/contrib/messages/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/sv/LC_MESSAGES/django.po b/django/contrib/messages/locale/sv/LC_MESSAGES/django.po
index 983e119394..6c14c4c3cf 100644
--- a/django/contrib/messages/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/sv/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "\"lazy\"-meddelande"
diff --git a/django/contrib/messages/locale/sw/LC_MESSAGES/django.mo b/django/contrib/messages/locale/sw/LC_MESSAGES/django.mo
index ad26cd2fba..59edbbb254 100644
Binary files a/django/contrib/messages/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/sw/LC_MESSAGES/django.po b/django/contrib/messages/locale/sw/LC_MESSAGES/django.po
index 3c5df108d3..dec0b0976a 100644
--- a/django/contrib/messages/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/sw/LC_MESSAGES/django.po
@@ -5,17 +5,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2011-01-19 15:38+0000\n"
-"Last-Translator: Django team\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-07-06 18:49+0000\n"
+"Last-Translator: machaku <bmachaku@gmail.com>\n"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
-msgstr ""
+msgstr "ujumbe wa kivivu"
diff --git a/django/contrib/messages/locale/ta/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ta/LC_MESSAGES/django.mo
index ed1e12e1f8..f3ecf43f21 100644
Binary files a/django/contrib/messages/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ta/LC_MESSAGES/django.po b/django/contrib/messages/locale/ta/LC_MESSAGES/django.po
index 17cd5ea5ac..e58d3b5cc4 100644
--- a/django/contrib/messages/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ta/LC_MESSAGES/django.po
@@ -5,17 +5,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2011-01-19 15:38+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr ""
diff --git a/django/contrib/messages/locale/te/LC_MESSAGES/django.mo b/django/contrib/messages/locale/te/LC_MESSAGES/django.mo
index 7009c8a9e6..327865b54c 100644
Binary files a/django/contrib/messages/locale/te/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/te/LC_MESSAGES/django.po b/django/contrib/messages/locale/te/LC_MESSAGES/django.po
index 186980ad15..b1c4c2dd6a 100644
--- a/django/contrib/messages/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/te/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "మందమైన సందేశం"
diff --git a/django/contrib/messages/locale/th/LC_MESSAGES/django.mo b/django/contrib/messages/locale/th/LC_MESSAGES/django.mo
index 0bc43126cf..fe2541819c 100644
Binary files a/django/contrib/messages/locale/th/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/th/LC_MESSAGES/django.po b/django/contrib/messages/locale/th/LC_MESSAGES/django.po
index 6f952454b8..5b1a95a131 100644
--- a/django/contrib/messages/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/th/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Kowit Charoenratchatabhan <kowit.s.c@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "ข้อความเฉื่อย"
diff --git a/django/contrib/messages/locale/tr/LC_MESSAGES/django.mo b/django/contrib/messages/locale/tr/LC_MESSAGES/django.mo
index 4f5c2fd4d3..b7b5372601 100644
Binary files a/django/contrib/messages/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/tr/LC_MESSAGES/django.po b/django/contrib/messages/locale/tr/LC_MESSAGES/django.po
index a3f9bd9745..127e7cadd1 100644
--- a/django/contrib/messages/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/tr/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "tembel mesaj"
diff --git a/django/contrib/messages/locale/tt/LC_MESSAGES/django.mo b/django/contrib/messages/locale/tt/LC_MESSAGES/django.mo
index d53b767526..0699aae705 100644
Binary files a/django/contrib/messages/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/tt/LC_MESSAGES/django.po b/django/contrib/messages/locale/tt/LC_MESSAGES/django.po
index a4cc405c30..a447e83f2f 100644
--- a/django/contrib/messages/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/tt/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "ялкау хәбәр"
diff --git a/django/contrib/messages/locale/uk/LC_MESSAGES/django.mo b/django/contrib/messages/locale/uk/LC_MESSAGES/django.mo
index 5d5711ed4a..993df655d0 100644
Binary files a/django/contrib/messages/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/uk/LC_MESSAGES/django.po b/django/contrib/messages/locale/uk/LC_MESSAGES/django.po
index 156760343a..dda6baf231 100644
--- a/django/contrib/messages/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/uk/LC_MESSAGES/django.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-11 17:13+0000\n"
 "Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "повідомлення з відкладеним перекладом"
diff --git a/django/contrib/messages/locale/ur/LC_MESSAGES/django.mo b/django/contrib/messages/locale/ur/LC_MESSAGES/django.mo
index 132b33fe3d..86c4b6874c 100644
Binary files a/django/contrib/messages/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/ur/LC_MESSAGES/django.po b/django/contrib/messages/locale/ur/LC_MESSAGES/django.po
index 0a451c1647..87ba94e3e6 100644
--- a/django/contrib/messages/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/ur/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "سست پیغام"
diff --git a/django/contrib/messages/locale/vi/LC_MESSAGES/django.mo b/django/contrib/messages/locale/vi/LC_MESSAGES/django.mo
index 82c3c66b92..5f710e1de3 100644
Binary files a/django/contrib/messages/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/vi/LC_MESSAGES/django.po b/django/contrib/messages/locale/vi/LC_MESSAGES/django.po
index 82b2c8a7b6..f63100587e 100644
--- a/django/contrib/messages/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/vi/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Vuong Nguyen <autalpha@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "tin nhắn lười biếng"
diff --git a/django/contrib/messages/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/messages/locale/zh_CN/LC_MESSAGES/django.mo
index 3a48672f10..23b8b97ffa 100644
Binary files a/django/contrib/messages/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/messages/locale/zh_CN/LC_MESSAGES/django.po
index f623d9db3d..940d02e5fc 100644
--- a/django/contrib/messages/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/zh_CN/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: Lele Long <schemacs@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "惰性翻译的消息"
diff --git a/django/contrib/messages/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/messages/locale/zh_TW/LC_MESSAGES/django.mo
index 293aa09ab0..e2f4343db8 100644
Binary files a/django/contrib/messages/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/messages/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/messages/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/messages/locale/zh_TW/LC_MESSAGES/django.po
index 0e75ffe236..826ef580c7 100644
--- a/django/contrib/messages/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/zh_TW/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:16+0000\n"
 "Last-Translator: ming hsien tzang <tzangms@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tests/base.py:100
+#: tests/base.py:101
 msgid "lazy message"
 msgstr "惰式訊息"
diff --git a/django/contrib/messages/storage/__init__.py b/django/contrib/messages/storage/__init__.py
index a584acca1c..9a09aff007 100644
--- a/django/contrib/messages/storage/__init__.py
+++ b/django/contrib/messages/storage/__init__.py
@@ -1,28 +1,5 @@
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.importlib import import_module
-
-
-def get_storage(import_path):
-    """
-    Imports the message storage class described by import_path, where
-    import_path is the full Python path to the class.
-    """
-    try:
-        dot = import_path.rindex('.')
-    except ValueError:
-        raise ImproperlyConfigured("%s isn't a Python path." % import_path)
-    module, classname = import_path[:dot], import_path[dot + 1:]
-    try:
-        mod = import_module(module)
-    except ImportError as e:
-        raise ImproperlyConfigured('Error importing module %s: "%s"' %
-                                   (module, e))
-    try:
-        return getattr(mod, classname)
-    except AttributeError:
-        raise ImproperlyConfigured('Module "%s" does not define a "%s" '
-                                   'class.' % (module, classname))
+from django.utils.module_loading import import_by_path as get_storage
 
 
 # Callable with the same interface as the storage classes i.e.  accepts a
diff --git a/django/contrib/messages/storage/cookie.py b/django/contrib/messages/storage/cookie.py
index 6b5b016234..619c69249e 100644
--- a/django/contrib/messages/storage/cookie.py
+++ b/django/contrib/messages/storage/cookie.py
@@ -4,6 +4,7 @@ from django.conf import settings
 from django.contrib.messages.storage.base import BaseStorage, Message
 from django.http import SimpleCookie
 from django.utils.crypto import salted_hmac, constant_time_compare
+from django.utils.safestring import SafeData, mark_safe
 from django.utils import six
 
 
@@ -15,7 +16,9 @@ class MessageEncoder(json.JSONEncoder):
 
     def default(self, obj):
         if isinstance(obj, Message):
-            message = [self.message_key, obj.level, obj.message]
+            # Using 0/1 here instead of False/True to produce more compact json
+            is_safedata = 1 if isinstance(obj.message, SafeData) else 0
+            message = [self.message_key, is_safedata, obj.level, obj.message]
             if obj.extra_tags:
                 message.append(obj.extra_tags)
             return message
@@ -30,7 +33,9 @@ class MessageDecoder(json.JSONDecoder):
     def process_messages(self, obj):
         if isinstance(obj, list) and obj:
             if obj[0] == MessageEncoder.message_key:
-                return Message(*obj[1:])
+                if obj[1]:
+                    obj[3] = mark_safe(obj[3])
+                return Message(*obj[2:])
             return [self.process_messages(item) for item in obj]
         if isinstance(obj, dict):
             return dict([(key, self.process_messages(value))
diff --git a/django/contrib/messages/tests/__init__.py b/django/contrib/messages/tests/__init__.py
index f3f6b653d0..e57594dec9 100644
--- a/django/contrib/messages/tests/__init__.py
+++ b/django/contrib/messages/tests/__init__.py
@@ -1,4 +1,5 @@
-from django.contrib.messages.tests.cookie import CookieTest
-from django.contrib.messages.tests.fallback import FallbackTest
-from django.contrib.messages.tests.middleware import MiddlewareTest
-from django.contrib.messages.tests.session import SessionTest
+from django.contrib.messages.tests.test_cookie import CookieTest
+from django.contrib.messages.tests.test_fallback import FallbackTest
+from django.contrib.messages.tests.test_middleware import MiddlewareTest
+from django.contrib.messages.tests.test_session import SessionTest
+from django.contrib.messages.tests.test_mixins import SuccessMessageMixinTests
diff --git a/django/contrib/messages/tests/base.py b/django/contrib/messages/tests/base.py
index b3ced12773..0d689729aa 100644
--- a/django/contrib/messages/tests/base.py
+++ b/django/contrib/messages/tests/base.py
@@ -5,7 +5,6 @@ from django.contrib.messages.api import MessageFailure
 from django.contrib.messages.storage import default_storage, base
 from django.contrib.messages.storage.base import Message
 from django.core.urlresolvers import reverse
-from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils.translation import ugettext_lazy
 from django.utils.unittest import skipIf
@@ -43,7 +42,7 @@ class override_settings_tags(override_settings):
         base.LEVEL_TAGS = self.old_level_tags
 
 
-class BaseTest(TestCase):
+class BaseTests(object):
     storage_class = default_storage
     urls = 'django.contrib.messages.tests.urls'
     levels = {
diff --git a/django/contrib/messages/tests/cookie.py b/django/contrib/messages/tests/test_cookie.py
similarity index 86%
rename from django/contrib/messages/tests/cookie.py
rename to django/contrib/messages/tests/test_cookie.py
index e0668ab604..5871ecc773 100644
--- a/django/contrib/messages/tests/cookie.py
+++ b/django/contrib/messages/tests/test_cookie.py
@@ -1,11 +1,13 @@
 import json
 
 from django.contrib.messages import constants
-from django.contrib.messages.tests.base import BaseTest
+from django.contrib.messages.tests.base import BaseTests
 from django.contrib.messages.storage.cookie import (CookieStorage,
     MessageEncoder, MessageDecoder)
 from django.contrib.messages.storage.base import Message
+from django.test import TestCase
 from django.test.utils import override_settings
+from django.utils.safestring import SafeData, mark_safe
 
 
 def set_cookie_data(storage, messages, invalid=False, encode_empty=False):
@@ -40,7 +42,7 @@ def stored_cookie_messages_count(storage, response):
 
 
 @override_settings(SESSION_COOKIE_DOMAIN='.example.com')
-class CookieTest(BaseTest):
+class CookieTest(BaseTests, TestCase):
     storage_class = CookieStorage
 
     def stored_messages_count(self, storage, response):
@@ -132,3 +134,21 @@ class CookieTest(BaseTest):
         value = encoder.encode(messages)
         decoded_messages = json.loads(value, cls=MessageDecoder)
         self.assertEqual(messages, decoded_messages)
+
+    def test_safedata(self):
+        """
+        Tests that a message containing SafeData is keeping its safe status when
+        retrieved from the message storage.
+        """
+        def encode_decode(data):
+            message = Message(constants.DEBUG, data)
+            encoded = storage._encode(message)
+            decoded = storage._decode(encoded)
+            return decoded.message
+
+        storage = self.get_storage()
+
+        self.assertIsInstance(
+            encode_decode(mark_safe("<b>Hello Django!</b>")), SafeData)
+        self.assertNotIsInstance(
+            encode_decode("<b>Hello Django!</b>"), SafeData)
diff --git a/django/contrib/messages/tests/fallback.py b/django/contrib/messages/tests/test_fallback.py
similarity index 96%
rename from django/contrib/messages/tests/fallback.py
rename to django/contrib/messages/tests/test_fallback.py
index 0aa65008da..cd0b1888f3 100644
--- a/django/contrib/messages/tests/fallback.py
+++ b/django/contrib/messages/tests/test_fallback.py
@@ -1,14 +1,15 @@
 from django.contrib.messages import constants
 from django.contrib.messages.storage.fallback import (FallbackStorage,
     CookieStorage)
-from django.contrib.messages.tests.base import BaseTest
-from django.contrib.messages.tests.cookie import (set_cookie_data,
+from django.contrib.messages.tests.base import BaseTests
+from django.contrib.messages.tests.test_cookie import (set_cookie_data,
     stored_cookie_messages_count)
-from django.contrib.messages.tests.session import (set_session_data,
+from django.contrib.messages.tests.test_session import (set_session_data,
     stored_session_messages_count)
+from django.test import TestCase
 
 
-class FallbackTest(BaseTest):
+class FallbackTest(BaseTests, TestCase):
     storage_class = FallbackStorage
 
     def get_request(self):
diff --git a/django/contrib/messages/tests/middleware.py b/django/contrib/messages/tests/test_middleware.py
similarity index 100%
rename from django/contrib/messages/tests/middleware.py
rename to django/contrib/messages/tests/test_middleware.py
diff --git a/django/contrib/messages/tests/test_mixins.py b/django/contrib/messages/tests/test_mixins.py
new file mode 100644
index 0000000000..8eef4cb3dc
--- /dev/null
+++ b/django/contrib/messages/tests/test_mixins.py
@@ -0,0 +1,14 @@
+from django.test.testcases import TestCase
+from django.contrib.messages.tests.urls import ContactFormViewWithMsg
+from django.core.urlresolvers import reverse
+
+class SuccessMessageMixinTests(TestCase):
+    urls = 'django.contrib.messages.tests.urls'
+
+    def test_set_messages_success(self):
+        author = {'name': 'John Doe',
+                  'slug': 'success-msg'}
+        add_url = reverse('add_success_msg')
+        req = self.client.post(add_url, author)
+        self.assertIn(ContactFormViewWithMsg.success_message % author,
+                      req.cookies['messages'].value)
diff --git a/django/contrib/messages/tests/session.py b/django/contrib/messages/tests/test_session.py
similarity index 62%
rename from django/contrib/messages/tests/session.py
rename to django/contrib/messages/tests/test_session.py
index 741f53136d..2ce564b773 100644
--- a/django/contrib/messages/tests/session.py
+++ b/django/contrib/messages/tests/test_session.py
@@ -1,5 +1,9 @@
-from django.contrib.messages.tests.base import BaseTest
+from django.contrib.messages import constants
+from django.contrib.messages.tests.base import BaseTests
+from django.contrib.messages.storage.base import Message
 from django.contrib.messages.storage.session import SessionStorage
+from django.utils.safestring import SafeData, mark_safe
+from django.test import TestCase
 
 
 def set_session_data(storage, messages):
@@ -17,7 +21,7 @@ def stored_session_messages_count(storage):
     return len(data)
 
 
-class SessionTest(BaseTest):
+class SessionTest(BaseTests, TestCase):
     storage_class = SessionStorage
 
     def get_request(self):
@@ -36,3 +40,14 @@ class SessionTest(BaseTest):
         set_session_data(storage, example_messages)
         # Test that the message actually contains what we expect.
         self.assertEqual(list(storage), example_messages)
+
+    def test_safedata(self):
+        """
+        Tests that a message containing SafeData is keeping its safe status when
+        retrieved from the message storage.
+        """
+        storage = self.get_storage()
+
+        message = Message(constants.DEBUG, mark_safe("<b>Hello Django!</b>"))
+        set_session_data(storage, [message])
+        self.assertIsInstance(list(storage)[0].message, SafeData)
diff --git a/django/contrib/messages/tests/urls.py b/django/contrib/messages/tests/urls.py
index 6d32a614eb..0541b5a336 100644
--- a/django/contrib/messages/tests/urls.py
+++ b/django/contrib/messages/tests/urls.py
@@ -1,10 +1,13 @@
-from django.conf.urls import patterns
+from django.conf.urls import patterns, url
 from django.contrib import messages
 from django.core.urlresolvers import reverse
+from django import forms
 from django.http import HttpResponseRedirect, HttpResponse
 from django.template import RequestContext, Template
 from django.template.response import TemplateResponse
 from django.views.decorators.cache import never_cache
+from django.contrib.messages.views import SuccessMessageMixin
+from django.views.generic.edit import FormView
 
 TEMPLATE = """{% if messages %}
 <ul class="messages">
@@ -49,8 +52,21 @@ def show(request):
 def show_template_response(request):
     return TemplateResponse(request, Template(TEMPLATE))
 
+
+class ContactForm(forms.Form):
+    name = forms.CharField(required=True)
+    slug = forms.SlugField(required=True)
+
+
+class ContactFormViewWithMsg(SuccessMessageMixin, FormView):
+    form_class = ContactForm
+    success_url = show
+    success_message = "%(name)s was created successfully"
+
+
 urlpatterns = patterns('',
     ('^add/(debug|info|success|warning|error)/$', add),
+    url('^add/msg/$', ContactFormViewWithMsg.as_view(), name='add_success_msg'),
     ('^show/$', show),
     ('^template_response/add/(debug|info|success|warning|error)/$', add_template_response),
     ('^template_response/show/$', show_template_response),
diff --git a/django/contrib/messages/views.py b/django/contrib/messages/views.py
new file mode 100644
index 0000000000..d08804aa1d
--- /dev/null
+++ b/django/contrib/messages/views.py
@@ -0,0 +1,19 @@
+from django.views.generic.edit import FormMixin
+from django.contrib import messages
+
+
+class SuccessMessageMixin(FormMixin):
+    """
+    Adds a success message on successful form submission.
+    """
+    success_message = ''
+
+    def form_valid(self, form):
+        response = super(SuccessMessageMixin, self).form_valid(form)
+        success_message = self.get_success_message(form.cleaned_data)
+        if success_message:
+            messages.success(self.request, success_message)
+        return response
+
+    def get_success_message(self, cleaned_data):
+        return self.success_message % cleaned_data
diff --git a/django/contrib/redirects/locale/ar/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ar/LC_MESSAGES/django.mo
index 107adc4be8..b73544b2ce 100644
Binary files a/django/contrib/redirects/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ar/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ar/LC_MESSAGES/django.po
index 20215bbf40..a066a8c861 100644
--- a/django/contrib/redirects/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ar/LC_MESSAGES/django.po
@@ -6,33 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "إعادة التوجيه من"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "يجب أن يكون هذا مساراً مطلقاً وبدون اسم النطاق. مثال: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "إعادة التوجيه إلى"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -40,10 +40,10 @@ msgstr ""
 "يجب أن يكون هذا مسارا مطلقا (كما هو أعلاه) أو عنوانا كاملا يبدأ بالمقطع "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "إعادة التوجيه"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "إعادات التوجيه"
diff --git a/django/contrib/redirects/locale/az/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/az/LC_MESSAGES/django.mo
index 1890f46bca..98e64b40f1 100644
Binary files a/django/contrib/redirects/locale/az/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/az/LC_MESSAGES/django.po b/django/contrib/redirects/locale/az/LC_MESSAGES/django.po
index a98ca47cfb..f5ca59f20f 100644
--- a/django/contrib/redirects/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/az/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "buradan yönəlt"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Domen ünvanını çıxmaqla bu, mütləq ünvan kimi göstərilməlidir. Məsələn, \"/"
 "events/search/\"."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "bura yönəlt"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Bu həm mütləq ünvan (yuxarıdakı kimi) ola bilər, həm də \"http://\" ilə "
 "başlayan tam URL ola bilər."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "yönəlt"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "yönəldir"
diff --git a/django/contrib/redirects/locale/be/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..3df0d92b4e
Binary files /dev/null and b/django/contrib/redirects/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/be/LC_MESSAGES/django.po b/django/contrib/redirects/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..b1b5b3d1ba
--- /dev/null
+++ b/django/contrib/redirects/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,49 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-11 11:08+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: models.py:9
+msgid "redirect from"
+msgstr "накіраваць з"
+
+#: models.py:10
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Тут мусіць быць поўны шлях бяз назвы дамэна. Прыклад: «/events/search/»."
+
+#: models.py:11
+msgid "redirect to"
+msgstr "накіраваць да"
+
+#: models.py:12
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Тут, як і ўверсе, мусіць быць поўны шлях, або поўная сеціўная спасылка, якая "
+"пачынаецца з «http://»."
+
+#: models.py:15
+msgid "redirect"
+msgstr "накіраваньне"
+
+#: models.py:16
+msgid "redirects"
+msgstr "накіраваньні"
diff --git a/django/contrib/redirects/locale/bg/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/bg/LC_MESSAGES/django.mo
index 1f34a0fc31..a6a8711b14 100644
Binary files a/django/contrib/redirects/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/bg/LC_MESSAGES/django.po b/django/contrib/redirects/locale/bg/LC_MESSAGES/django.po
index 7c0c44f93d..44138b30de 100644
--- a/django/contrib/redirects/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/bg/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "препратка от"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Това трябва да бъде абсолютен път, без името на домейна.  Пример: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "препратка към"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Това може да бъде или абсолютен път (като горното) или пълен URL, започващ с "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "препратка"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "препратки"
diff --git a/django/contrib/redirects/locale/bn/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/bn/LC_MESSAGES/django.mo
index 552a949c8c..904465de4b 100644
Binary files a/django/contrib/redirects/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/bn/LC_MESSAGES/django.po b/django/contrib/redirects/locale/bn/LC_MESSAGES/django.po
index 7c37273ea9..46e732fe0a 100644
--- a/django/contrib/redirects/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/bn/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "রিডাইরেক্ট করা হবে"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,20 +29,20 @@ msgstr ""
 "এর মান অবশ্যই এবসল্যুট পথ, ডোমেইন নাম বাদ দিয়ে, হতে হবে, উদাহরণঃ '/events/"
 "search/'।"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "রিডাইরেক্ট করুন"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "এর মান এবসল্যুট পথ (উপরের মত) অথবা পুরো URL পাথ ('http://' সহ) হতে পারে।"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "রিডাইরেক্ট"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "রিডাইরেক্ট"
diff --git a/django/contrib/redirects/locale/br/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..d869c18fd6
Binary files /dev/null and b/django/contrib/redirects/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/br/LC_MESSAGES/django.po b/django/contrib/redirects/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..64453fb08e
--- /dev/null
+++ b/django/contrib/redirects/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,46 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-06-29 10:56+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: models.py:9
+msgid "redirect from"
+msgstr "adkaset eus"
+
+#: models.py:10
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+
+#: models.py:11
+msgid "redirect to"
+msgstr "adkas da"
+
+#: models.py:12
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+
+#: models.py:15
+msgid "redirect"
+msgstr "adkas"
+
+#: models.py:16
+msgid "redirects"
+msgstr "adkasoù"
diff --git a/django/contrib/redirects/locale/bs/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/bs/LC_MESSAGES/django.mo
index 88a004b598..6c400fba73 100644
Binary files a/django/contrib/redirects/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/bs/LC_MESSAGES/django.po b/django/contrib/redirects/locale/bs/LC_MESSAGES/django.po
index fadb9a4127..b5cf3d5c8a 100644
--- a/django/contrib/redirects/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/bs/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "preusmjeren sa"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Ovo mora biti apsolutna putanja bez imena domena. Na primjer: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "preusmjeri ka"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Ovo može biti ili apsolutna putanja (kao gore) ili pun URL koji počinje sa "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "preusmjeravanje"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "preusmjeravanja"
diff --git a/django/contrib/redirects/locale/ca/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ca/LC_MESSAGES/django.mo
index fa3b17281e..44b18f85d0 100644
Binary files a/django/contrib/redirects/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ca/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ca/LC_MESSAGES/django.po
index abb8690de6..988e565dd6 100644
--- a/django/contrib/redirects/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ca/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirecció des de"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Aquesta ruta hauria de ser un camí absolut, excloent-ne el nom del domini. "
 "Exemple '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirigir a"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Això pot ser bé una ruta absoluta (com a sobre) o una URL completa que "
 "comenci per 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirecció"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redireccions"
diff --git a/django/contrib/redirects/locale/cs/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/cs/LC_MESSAGES/django.mo
index 027c11b2ad..bc05d07cf4 100644
Binary files a/django/contrib/redirects/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/cs/LC_MESSAGES/django.po b/django/contrib/redirects/locale/cs/LC_MESSAGES/django.po
index 754c06fdf5..d28ddb86f4 100644
--- a/django/contrib/redirects/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/cs/LC_MESSAGES/django.po
@@ -6,33 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "přesměrovat z"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 "Toto by měla být absolutní cesta bez domény. Příklad: \"/udalosti/hledat/\"."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "přesměrovat na"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -40,10 +40,10 @@ msgstr ""
 "Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na "
 "\"http://\"."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "přesměrování"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "přesměrování"
diff --git a/django/contrib/redirects/locale/cy/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/cy/LC_MESSAGES/django.mo
index 99aced14cb..57a4cd69f8 100644
Binary files a/django/contrib/redirects/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/cy/LC_MESSAGES/django.po b/django/contrib/redirects/locale/cy/LC_MESSAGES/django.po
index 79e2437048..7d07fa2a92 100644
--- a/django/contrib/redirects/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/cy/LC_MESSAGES/django.po
@@ -2,49 +2,51 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011.
+# Maredudd ap Gwyndaf <maredudd@maredudd.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-02-14 13:40+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-03 14:11+0000\n"
+"Last-Translator: Maredudd ap Gwyndaf <maredudd@maredudd.com>\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "ailgyfeirio o"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
-"Ddylai hon bod yn lwybr hollol, heb y parth-enw. Er enghraifft: '/"
+"Dylai hon fod yn lwybr absoliwt, heb yr enw parth. Er enghraifft: '/"
 "digwyddiadau/chwilio/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "ailgyfeirio i"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
-"Gellir fod naill ai llwybr hollol (fel uwch) neu URL hollol yn ddechrau â "
+"Gellir fod naill ai yn lwybr absoliwt (fel uchod) neu URL llawn yn dechrau â "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "ailgyfeiriad"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "ailgyfeiriadau"
diff --git a/django/contrib/redirects/locale/da/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/da/LC_MESSAGES/django.mo
index a2b4240447..41c5627373 100644
Binary files a/django/contrib/redirects/locale/da/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/da/LC_MESSAGES/django.po b/django/contrib/redirects/locale/da/LC_MESSAGES/django.po
index 1f2fd909c3..6312760ba9 100644
--- a/django/contrib/redirects/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/da/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "rediriger fra"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Dette skal være en absolut sti uden domænenavnet. For eksempel: '/nyheder/"
 "soeg/'"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "rediriger til"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Dette kan enten være en absolut sti (som ovenfor), eller en komplet URL "
 "startende med 'http://'"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "rediriger"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirigeringer"
diff --git a/django/contrib/redirects/locale/de/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/de/LC_MESSAGES/django.mo
index 0c6bd70fa0..cbebb73cfc 100644
Binary files a/django/contrib/redirects/locale/de/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/de/LC_MESSAGES/django.po b/django/contrib/redirects/locale/de/LC_MESSAGES/django.po
index a895f3f27e..809f135601 100644
--- a/django/contrib/redirects/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/de/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "Umleitung von"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/"
 "events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "Umleitung nach"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Hier muss entweder ein absoluter Pfad oder eine komplette URL mit http:// am "
 "Anfang stehen."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "Umleitung"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "Umleitungen"
diff --git a/django/contrib/redirects/locale/el/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/el/LC_MESSAGES/django.mo
index 4a9828857e..d779be937f 100644
Binary files a/django/contrib/redirects/locale/el/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/el/LC_MESSAGES/django.po b/django/contrib/redirects/locale/el/LC_MESSAGES/django.po
index 1dc89ddff9..f1ce7c505f 100644
--- a/django/contrib/redirects/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/el/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "ανακατεύθυνση από"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Αυτό πρέπει να είναι ένα απόλυτο μονοπάτι, με εξαίρεση το όνομα χώρου. "
 "Παράδειγμα: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "ανακατεύθυνση προς"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Αυτό πρέπει να είναι ένα απόλυτο μονοπάτι (όπως παραπάνω), ή ένα πλήρες URL "
 "που αρχίζει με 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "ανακατεύθυνση"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "ανακατευθύνσεις"
diff --git a/django/contrib/redirects/locale/en/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/en/LC_MESSAGES/django.mo
index 83b94c07c4..bf854ed382 100644
Binary files a/django/contrib/redirects/locale/en/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
index 885b5fdb97..a0723f0b39 100644
--- a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
@@ -1,42 +1,49 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:57+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-02-14 13:39+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: models.py:9
 msgid "redirect from"
-msgstr ""
+msgstr "redirect from"
 
 #: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 
 #: models.py:11
 msgid "redirect to"
-msgstr ""
+msgstr "redirect to"
 
 #: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
 
 #: models.py:15
 msgid "redirect"
-msgstr ""
+msgstr "redirect"
 
 #: models.py:16
 msgid "redirects"
-msgstr ""
+msgstr "redirects"
diff --git a/django/contrib/redirects/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/en_GB/LC_MESSAGES/django.mo
index 61136761b8..a0beafbfe4 100644
Binary files a/django/contrib/redirects/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/redirects/locale/en_GB/LC_MESSAGES/django.po
index 5994dd0fe4..2842146805 100644
--- a/django/contrib/redirects/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/en_GB/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirect from"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirect to"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirect"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirects"
diff --git a/django/contrib/redirects/locale/eo/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/eo/LC_MESSAGES/django.mo
index 56d04e4568..bc973373a6 100644
Binary files a/django/contrib/redirects/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/eo/LC_MESSAGES/django.po b/django/contrib/redirects/locale/eo/LC_MESSAGES/django.po
index 8976a4a0b5..4fb761f25a 100644
--- a/django/contrib/redirects/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/eo/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
-"Last-Translator: Baptiste <bapdarth@yahoo.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "alidirekto de"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Tio ĉi devus esti absoluta vojo, escepte de la retregionan nomon. Ekzemplo: "
 "'/eventoj/serĉo/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "alidirekto al"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Tio ĉi povas esti aŭ absoluta vojo (kiel supre), aŭ URL komencante kun "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "alidirekto"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "alidirektoj"
diff --git a/django/contrib/redirects/locale/es/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/es/LC_MESSAGES/django.mo
index c93f43ecec..9688ebe523 100644
Binary files a/django/contrib/redirects/locale/es/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/es/LC_MESSAGES/django.po b/django/contrib/redirects/locale/es/LC_MESSAGES/django.po
index c76748ff91..268285768c 100644
--- a/django/contrib/redirects/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/es/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirigir desde"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Esta ruta debería ser absoluta, excluyendo el nombre de dominio. Ejemplo: '/"
 "events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirigir a"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Esto puede ser bien una ruta absoluta (como antes) o una URL completa que "
 "empiece con 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirección"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirecciones"
diff --git a/django/contrib/redirects/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/es_AR/LC_MESSAGES/django.mo
index 32b1fe9068..a813a10f08 100644
Binary files a/django/contrib/redirects/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/redirects/locale/es_AR/LC_MESSAGES/django.po
index 6fd08514ce..9d6bd390a1 100644
--- a/django/contrib/redirects/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/es_AR/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirigir desde"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Esta ruta debe ser absoluta, excluyendo el nombre de dominio. Ejemplo: '/"
 "events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirigir a"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Esto puede ser bien una ruta absoluta (como arriba) o una URL completa que "
 "empiece con 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirección"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirecciones"
diff --git a/django/contrib/redirects/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/es_MX/LC_MESSAGES/django.mo
index 00cc74cac1..8180d8e807 100644
Binary files a/django/contrib/redirects/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/redirects/locale/es_MX/LC_MESSAGES/django.po
index a2f30768a8..9b2418d721 100644
--- a/django/contrib/redirects/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/es_MX/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirigir desde"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Esta ruta debe ser absoluta, excluyendo el nombre del dominio. Ejemplo: '/"
 "events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirigir a"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Esto puede ser bien una ruta absoluta (como arriba) o una URL completa que "
 "empiece con 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirigir"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirecciona"
diff --git a/django/contrib/redirects/locale/et/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/et/LC_MESSAGES/django.mo
index e75de49bde..d94063312e 100644
Binary files a/django/contrib/redirects/locale/et/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/et/LC_MESSAGES/django.po b/django/contrib/redirects/locale/et/LC_MESSAGES/django.po
index 9d22d813b2..0720c4c45a 100644
--- a/django/contrib/redirects/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/et/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "ümbersuunatav asukoht"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "See peaks olema absoluutne asukoht, v.a. domeeninimi. Näide: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "suuna aadressile"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "See võib olla kas absoluutne asukoht (nagu ülemine) või täielik URL algusega "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "suunamine"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "suunamised"
diff --git a/django/contrib/redirects/locale/eu/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/eu/LC_MESSAGES/django.mo
index be6bd0fbaa..92dcd9a17e 100644
Binary files a/django/contrib/redirects/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/eu/LC_MESSAGES/django.po b/django/contrib/redirects/locale/eu/LC_MESSAGES/django.po
index f62eae0ef0..4d583e67ce 100644
--- a/django/contrib/redirects/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/eu/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "nondik berbidalia"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Honek 'bide' absolutua izan beharko luke, dominio izena kenduta. 'Adibidez: "
 "events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "Nora berbidali"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Hau 'bide' absolutua (goian bezala) edo URL osoa , 'http://'-rekin hasiz, "
 "izan daiteke."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "berbidali"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "berbidali"
diff --git a/django/contrib/redirects/locale/fa/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/fa/LC_MESSAGES/django.mo
index b0185b073d..0e8e996273 100644
Binary files a/django/contrib/redirects/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/fa/LC_MESSAGES/django.po b/django/contrib/redirects/locale/fa/LC_MESSAGES/django.po
index f81151460a..5909509689 100644
--- a/django/contrib/redirects/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/fa/LC_MESSAGES/django.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "فرم ارسال به نشانی جدید"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "می‌بایست یک مسیر مطلق و بدون نام دامنه باشد. مانند: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "ارسال به نشانی"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
 "می‌تواند یک مسیر مطلق (همانند بالا) و یا یک آدرس کامل با 'http://‎' باشد."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "باز-ارسال"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "باز-ارسال‌ها"
diff --git a/django/contrib/redirects/locale/fi/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/fi/LC_MESSAGES/django.mo
index d609793d00..1a42f8f6b4 100644
Binary files a/django/contrib/redirects/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/fi/LC_MESSAGES/django.po b/django/contrib/redirects/locale/fi/LC_MESSAGES/django.po
index 41d6aa9e0d..357ac0a240 100644
--- a/django/contrib/redirects/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/fi/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "ohjaa osoitteesta"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Tässä on käytettävä absoluuttista polkua ilman verkkotunnusta. Esimerkki: '/"
 "tapahtumat/haku/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "ohjaa osoitteeseen"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Tässä on käytettävä joko absoluuttista polkua (kuten yllä) tai täydellistä "
 "'http://'-alkuista URL-osoitetta."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "edelleenohjaus"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "edelleenohjaukset"
diff --git a/django/contrib/redirects/locale/fr/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/fr/LC_MESSAGES/django.mo
index 9954a924a2..9106177dd4 100644
Binary files a/django/contrib/redirects/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/fr/LC_MESSAGES/django.po b/django/contrib/redirects/locale/fr/LC_MESSAGES/django.po
index 44de90a193..58902fdf9d 100644
--- a/django/contrib/redirects/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/fr/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirigé depuis"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Ceci doit être un chemin absolu, sans nom de domaine. Par exemple, « /"
 "evenements/rechercher/ »."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirigé vers"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Ceci peut être soit un chemin absolu (voir ci-dessus) soit une URL complète "
 "débutant par « http:// »."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirige"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirige"
diff --git a/django/contrib/redirects/locale/ga/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ga/LC_MESSAGES/django.mo
index 3eeeb98de1..f487aab04f 100644
Binary files a/django/contrib/redirects/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ga/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ga/LC_MESSAGES/django.po
index e86d9105f2..b7b64fbd49 100644
--- a/django/contrib/redirects/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ga/LC_MESSAGES/django.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "atreoraigh ó"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "Teastaíonn dearbhchosán gan ainm fearainn. Sampla '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "atreoraigh go dtí"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "Is féidir dearbhchosán nó URL lán ag tosnú le 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "athsheol"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "atreoraithe"
diff --git a/django/contrib/redirects/locale/gl/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/gl/LC_MESSAGES/django.mo
index de0e790745..687be7b789 100644
Binary files a/django/contrib/redirects/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/gl/LC_MESSAGES/django.po b/django/contrib/redirects/locale/gl/LC_MESSAGES/django.po
index fe76d9f5e6..8164e833c3 100644
--- a/django/contrib/redirects/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/gl/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "orixe da redirección"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Debe ser unha ruta absoluta, sen o nome de dominio. Exemplo: '/events/"
 "search/'"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "destino da redirección"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Pode ser unha ruta absoluta (coma a de enriba) ou un URL completo que empece "
 "por 'http://'"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirección"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redireccións"
diff --git a/django/contrib/redirects/locale/he/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/he/LC_MESSAGES/django.mo
index 7782999e3c..cce93e2f09 100644
Binary files a/django/contrib/redirects/locale/he/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/he/LC_MESSAGES/django.po b/django/contrib/redirects/locale/he/LC_MESSAGES/django.po
index a095c4716e..ad34502fff 100644
--- a/django/contrib/redirects/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/he/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "הפניה מ"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "זה אמור להיות נתיב מלא, ללא שם המתחם. לדוגמא: '/‎/events/search'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "הפניה אל"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "יכול להיות נתיב מלא (כנ\"ל) או URL מלא המתחיל ב'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "הפניה"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "הפניות"
diff --git a/django/contrib/redirects/locale/hi/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/hi/LC_MESSAGES/django.mo
index e90a268a0f..177dd1d487 100644
Binary files a/django/contrib/redirects/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/hi/LC_MESSAGES/django.po b/django/contrib/redirects/locale/hi/LC_MESSAGES/django.po
index 0df863dd15..4d9177a42a 100644
--- a/django/contrib/redirects/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/hi/LC_MESSAGES/django.po
@@ -7,33 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Sandeep Satavlekar <sandysat@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "से अनुप्रेषित"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 "डोमेन नाम को छोड़कर बाकि सब संपूर्ण पथ होना चाहिए | उदाहरण:   '/events/search'"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "को अनुप्रेषित"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "यह या तो एक संपूर्ण पथ  (जैसा ऊपर निर्दिष्ट किया हैं ) हो सकता है या  'http://' के साथ "
 "शुरू होनेवाला पूर्ण URL हो सकता है."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "पुनः प्रेषित"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "पुनः प्रेषित"
diff --git a/django/contrib/redirects/locale/hr/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/hr/LC_MESSAGES/django.mo
index dc9cf5c6e4..aaa5ddbc9c 100644
Binary files a/django/contrib/redirects/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/hr/LC_MESSAGES/django.po b/django/contrib/redirects/locale/hr/LC_MESSAGES/django.po
index acfe2e488c..971c5b63b8 100644
--- a/django/contrib/redirects/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/hr/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "preusmjeri od"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Ovo bi trebala biti apsolutna putanja, bez imena domene. Primjer: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "preusmjeri na"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Ovo može biti ili apsolutna putanja (kao gore) ili potpuni URL koji počinje "
 "sa 'http://'"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "preusmjeri"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "preusmjeravanja"
diff --git a/django/contrib/redirects/locale/hu/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/hu/LC_MESSAGES/django.mo
index e56b1ea0bc..f23caacfa9 100644
Binary files a/django/contrib/redirects/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/hu/LC_MESSAGES/django.po b/django/contrib/redirects/locale/hu/LC_MESSAGES/django.po
index fbb1f0d92b..4e81914021 100644
--- a/django/contrib/redirects/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/hu/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "átirányítva innen"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Ennek abszolút elérési útnak kell lennie, a tartománynév nélkül. Példa: '/"
 "events/search/'"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "átirányítva ide"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Ennek vagy abszolút elérési útnak kell lennie (mint fentebb), vagy teljes "
 "URL-nek 'http://'-vel kezdve."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "átirányítás"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "átirányít"
diff --git a/django/contrib/redirects/locale/id/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/id/LC_MESSAGES/django.mo
index a4542a6cd7..f348545f1e 100644
Binary files a/django/contrib/redirects/locale/id/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/id/LC_MESSAGES/django.po b/django/contrib/redirects/locale/id/LC_MESSAGES/django.po
index 78d8e16e39..ad575d1429 100644
--- a/django/contrib/redirects/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/id/LC_MESSAGES/django.po
@@ -6,33 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "pengalihan dari"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 "Harus berupa lokasi absolut, tanpa nama domain. Contoh: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "pengalihan ke"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -40,10 +40,10 @@ msgstr ""
 "Dapat berupa lokasi absolut (seperti di atas) atau URL lengkap yang dimulai "
 "dengan 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "pengalihan"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "pengalihan"
diff --git a/django/contrib/redirects/locale/is/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/is/LC_MESSAGES/django.mo
index ac0a30041e..87ccc54c02 100644
Binary files a/django/contrib/redirects/locale/is/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/is/LC_MESSAGES/django.po b/django/contrib/redirects/locale/is/LC_MESSAGES/django.po
index 2a28a386de..09a439cb40 100644
--- a/django/contrib/redirects/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/is/LC_MESSAGES/django.po
@@ -6,32 +6,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "vísun frá"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "Þetta þarf að vera full slóð án lénsins. Dæmi: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "vísa á"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -39,10 +39,10 @@ msgstr ""
 "Þetta getur verið full slóð (eins og hér að ofan) eða veffang með 'http://' "
 "fremst."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "vísun"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "vísanir"
diff --git a/django/contrib/redirects/locale/it/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/it/LC_MESSAGES/django.mo
index c6c98519b7..ec625187d2 100644
Binary files a/django/contrib/redirects/locale/it/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/it/LC_MESSAGES/django.po b/django/contrib/redirects/locale/it/LC_MESSAGES/django.po
index e9c39784d3..1528c07148 100644
--- a/django/contrib/redirects/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/it/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirezione da"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Deve essere un percorso assoluto, senza nome di dominio. Esempio: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirezione verso"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Può essere un percorso assoluto (come sopra) o una URL completa che inizia "
 "con 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirezione"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirezioni"
diff --git a/django/contrib/redirects/locale/ja/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ja/LC_MESSAGES/django.mo
index ad72eb3746..ad22df0934 100644
Binary files a/django/contrib/redirects/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ja/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ja/LC_MESSAGES/django.po
index 76334205e7..793e80a35f 100644
--- a/django/contrib/redirects/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ja/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "リダイレクト元"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "'/events/search/' のように、ドメイン名を除いた絶対パスにします。 "
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "リダイレクト先"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "上記のような絶対パスか、 'http://' で始まる完全な URL にします。"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "リダイレクト"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "リダイレクト"
diff --git a/django/contrib/redirects/locale/ka/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ka/LC_MESSAGES/django.mo
index 19bbfed829..b1fa0bc53e 100644
Binary files a/django/contrib/redirects/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ka/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ka/LC_MESSAGES/django.po
index d2f70a082a..25c523d3ba 100644
--- a/django/contrib/redirects/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ka/LC_MESSAGES/django.po
@@ -6,33 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "გადამისამართება გვერდიდან"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 "უნდა იყოს აბსოლუტური გზა დომენის სახელის გარეშე. მაგალითი: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "გადამისამართება გვერდზე"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -40,10 +40,10 @@ msgstr ""
 "უნდა იყოს აბსოლუტური გზა (როგორც ზემოთ) ან სრული URL, რომელიც იწყება "
 "'http://' სტრიქონით."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "გადამისამართება"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "გადამისამართებები"
diff --git a/django/contrib/redirects/locale/kk/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/kk/LC_MESSAGES/django.mo
index 479c5a8a5c..45a9623cf7 100644
Binary files a/django/contrib/redirects/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/kk/LC_MESSAGES/django.po b/django/contrib/redirects/locale/kk/LC_MESSAGES/django.po
index 24c56c0da8..db764d65a6 100644
--- a/django/contrib/redirects/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/kk/LC_MESSAGES/django.po
@@ -7,42 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr " бағыттау (қайдан)"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "Бұл домен атаусыз абсолюттік жол болу керек. Мысал: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "бағыттау (қайда)"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
 "Бұл абсолюттік жол немесе 'http://'-мен басталатын толық URL бола алады."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "қайта бағыттау"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "қайта бағыттаулар"
diff --git a/django/contrib/redirects/locale/km/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/km/LC_MESSAGES/django.mo
index 5847d90c4a..3e0a52dada 100644
Binary files a/django/contrib/redirects/locale/km/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/km/LC_MESSAGES/django.po b/django/contrib/redirects/locale/km/LC_MESSAGES/django.po
index 009331fecc..77afa2f983 100644
--- a/django/contrib/redirects/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/km/LC_MESSAGES/django.po
@@ -6,21 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "នាំចេញពី"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -28,20 +28,20 @@ msgstr ""
 "គួរតែជាផ្លូវពេញ (absolute path) ហើយមិនបញ្ជូលឈ្មោះ ដមែន (domain name​)។​ឧទាហរណ៍ '/"
 "events/search/'។"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "នាំចេញទៅ"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "អាចជាផ្លូវពេញ (absolute path) ឬក៏ URL ទាំងមូលដែលចាប់ផ្តើមជាមួយ 'http://'។"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "នាំចេញ"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "នាំចេញ"
diff --git a/django/contrib/redirects/locale/kn/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/kn/LC_MESSAGES/django.mo
index 8f4dfa3721..ad4f945d9f 100644
Binary files a/django/contrib/redirects/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/kn/LC_MESSAGES/django.po b/django/contrib/redirects/locale/kn/LC_MESSAGES/django.po
index a2e15d4c80..6e92f3338a 100644
--- a/django/contrib/redirects/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/kn/LC_MESSAGES/django.po
@@ -6,32 +6,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "ಪುನರ್ನಿರ್ದೇಶನ ಇಲ್ಲಿಂದ->"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "ಇದು ಡೊಮೈನ್ ಹೊರತುಪಡಿಸಿದ ಸಂಪೂರ್ಣ ಪಥವಾಗಿರಬೇಕು ಉದಾ.'/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "ಪುನರ್ನಿರ್ದೇಶನ ಇಲ್ಲಿಗೆ->"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -39,10 +39,10 @@ msgstr ""
 "ಇದು ಮೇಲಿನಂತೆ ಸಂಪೂರ್ಣ ಪಥವಾದರೂ ಆಗಿರಬಹುದು ಅಥವಾ 'http://'ದಿಂದ ಆರಂಭವಾಗುವ ಸಂಪೂರ್ಣ "
 "URL ಆಗಿರಬಹುದು."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "ಪುನರ್ನಿರ್ದೇಶನ"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "ಪುನರ್ನಿರ್ದೇಶನ(ಗಳು)"
diff --git a/django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo
index 0dc6a43c61..5afa67610f 100644
Binary files a/django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ko/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ko/LC_MESSAGES/django.po
index c5e4a34e39..f178aa28aa 100644
--- a/django/contrib/redirects/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ko/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "에서 재전송"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "도메인명을 제외한 절대경로로 입력하세요. 예: '/events/search/'"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "(으)로 재전송"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "절대경로와 URL('http://' 포함) 모두 가능합니다."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "재전송"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "재전송"
diff --git a/django/contrib/redirects/locale/lt/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/lt/LC_MESSAGES/django.mo
index 23419be03a..a7fb1417df 100644
Binary files a/django/contrib/redirects/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/lt/LC_MESSAGES/django.po b/django/contrib/redirects/locale/lt/LC_MESSAGES/django.po
index 2af9009e78..70b4626099 100644
--- a/django/contrib/redirects/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/lt/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "nukreiptas (redirect) iš"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Turi būti absoliutus adresas neįtraukiant domaino. Pavyzdžiui: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "nukreipti(redirect) į"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Gali būti absoliutus adresas (kaip viršuj) arba pilnas URL pradedant "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "nukreipti"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "nukreipia"
diff --git a/django/contrib/redirects/locale/lv/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/lv/LC_MESSAGES/django.mo
index 7f91acbb15..96c4a7694f 100644
Binary files a/django/contrib/redirects/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/lv/LC_MESSAGES/django.po b/django/contrib/redirects/locale/lv/LC_MESSAGES/django.po
index 8a93dea3f4..19739a3b0c 100644
--- a/django/contrib/redirects/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/lv/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "pārvirzīt(redirect) no"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Tam jābūt absolūtajam ceļam, atskaitot domēna vārdu. Piemēram: '/notikumi/"
 "meklet/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "pārvirzīt(redirect) uz"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Šis var būt vai nu absolūtais ceļš (kā augstāk) vai pilnais URL, kas sākas "
 "ar 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "pārvirzīt"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "pārvirzījumi"
diff --git a/django/contrib/redirects/locale/mk/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/mk/LC_MESSAGES/django.mo
index 5b68fb711c..20219805cd 100644
Binary files a/django/contrib/redirects/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/mk/LC_MESSAGES/django.po b/django/contrib/redirects/locale/mk/LC_MESSAGES/django.po
index 60a6f64fa9..3c8c66cb72 100644
--- a/django/contrib/redirects/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/mk/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "пренасочи од"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Ова треба да биде апсолутна патека без името на домејнот. На пр. „/nastani/"
 "prebaraj/“."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "пренасочи кон"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Ова може да биде или апсолутна патека (како погоре) или цела адреса "
 "почувајќи со „http://“."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "пренасочување"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "пренасочувања"
diff --git a/django/contrib/redirects/locale/ml/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ml/LC_MESSAGES/django.mo
index 889ac27c48..e9760c6515 100644
Binary files a/django/contrib/redirects/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ml/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ml/LC_MESSAGES/django.po
index 854a600575..31168f88d0 100644
--- a/django/contrib/redirects/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ml/LC_MESSAGES/django.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "പഴയ വിലാസം"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 "ഇത് ഡൊമൈന്‍ നാമം ഉള്‍പ്പെടാത്ത ഒരു കേവലമാര്‍ഗം (വിലാസം) ആവണം. ഉദാ: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "പുതിയ വിലാസം"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "ഇതൊരു കേവല മാര്‍ഗമോ 'http://' എന്നു തുടങ്ങുന്ന പൂര്‍ണ്ണ വിലാസമോ (URL) ആവാം"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "വിലാസമാറ്റം"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "വിലാസമാറ്റങ്ങള്‍"
diff --git a/django/contrib/redirects/locale/mn/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/mn/LC_MESSAGES/django.mo
index 5d59cd8306..bce814c4ed 100644
Binary files a/django/contrib/redirects/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/mn/LC_MESSAGES/django.po b/django/contrib/redirects/locale/mn/LC_MESSAGES/django.po
index cd84eb8f05..46a88d978d 100644
--- a/django/contrib/redirects/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/mn/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirect хаанаас"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Энэ нь домэйн нэр агуулаагүй абсолют зам байх ёстой. Жишээ нь: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirect хаашаа"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Энэ нь (дээрхийн нэгэн адил) абсолют зам юм уу 'http://' гэж эхэлсэн бүтэн "
 "URL байж болно. "
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirect"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirect-ууд"
diff --git a/django/contrib/redirects/locale/nb/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/nb/LC_MESSAGES/django.mo
index 971e538809..75a87fc36f 100644
Binary files a/django/contrib/redirects/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/nb/LC_MESSAGES/django.po b/django/contrib/redirects/locale/nb/LC_MESSAGES/django.po
index c04452ecbe..24add5bbb4 100644
--- a/django/contrib/redirects/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/nb/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-12 21:48+0000\n"
-"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Last-Translator: Sigurd Gartmann <sigurdga-transifex@sigurdga.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "omadresser fra"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Dette bør være en fullstendig sti uten domenenavn. Eksempel: «/hendelser/"
 "finn/»"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "omadresser til"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Dette kan enten være en fullstendig sti (som over), eller en fullstendig "
 "nettadresse som starter med «http://»."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "omadressering"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "omadresseringer"
diff --git a/django/contrib/redirects/locale/ne/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ne/LC_MESSAGES/django.mo
index 4d1760e743..cdf473e5dd 100644
Binary files a/django/contrib/redirects/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ne/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ne/LC_MESSAGES/django.po
index ab5f53bcb4..26eef3517b 100644
--- a/django/contrib/redirects/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ne/LC_MESSAGES/django.po
@@ -1,46 +1,48 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Paras Nath Chaudhary <opnchaudhary@gmail.com>, 2012.
 # Sagar Chalise <chalisesagar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-02-14 13:40+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-10-04 11:29+0000\n"
+"Last-Translator: Paras Nath Chaudhary <opnchaudhary@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
-msgstr "बाटो फेर्ने फारम"
+msgstr "बाटो फेर्ने फरम"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
-msgstr ""
+msgstr "यो डोमेन नाम छोडेर, पूर्ण बाटो हुनुपर्छ । उदाहरण : '/events/search'"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "बाटो फेर्नेको लागि"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
+"यो कि (माथीको जस्तै )पूर्ण  बाटो हुनुपर्छ  वा 'http://' बाट  सुरुभएको पुरा हुनुपर्छ । "
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "बाटो फेर्ने"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "बाटो फेर्ने"
diff --git a/django/contrib/redirects/locale/nl/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/nl/LC_MESSAGES/django.mo
index 2ab5cfd5bb..f3f3b24bbe 100644
Binary files a/django/contrib/redirects/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/nl/LC_MESSAGES/django.po b/django/contrib/redirects/locale/nl/LC_MESSAGES/django.po
index 050b666fe4..faeceb2685 100644
--- a/django/contrib/redirects/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/nl/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "omgeleid via"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Dit moet een absoluut pad zijn, zonder de domeinnaam. Bijvoorbeeld: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "omleiden naar"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Dit kan een absoluut pad (zoals hierboven) zijn of een volledige URL "
 "beginnend met 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "omleiding"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "omleidingen"
diff --git a/django/contrib/redirects/locale/nn/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/nn/LC_MESSAGES/django.mo
index 690d96913a..bd9ac9cfd6 100644
Binary files a/django/contrib/redirects/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/nn/LC_MESSAGES/django.po b/django/contrib/redirects/locale/nn/LC_MESSAGES/django.po
index 87e0ae6acf..bc856a7536 100644
--- a/django/contrib/redirects/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/nn/LC_MESSAGES/django.po
@@ -6,33 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "omadresser frå"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 "Dette bør vere ein fullstendig sti utan domenenavn. Døme: '/hendingar/finn/"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "omadresser til"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -40,10 +40,10 @@ msgstr ""
 "Dette kan enten vere ein fullstendig sti (som over), eller ei fullstendig "
 "nettadresse som startar med 'http://'"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "omadressering"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "omadresseringar"
diff --git a/django/contrib/redirects/locale/pa/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/pa/LC_MESSAGES/django.mo
index 58e385645f..2e1dc96599 100644
Binary files a/django/contrib/redirects/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/pa/LC_MESSAGES/django.po b/django/contrib/redirects/locale/pa/LC_MESSAGES/django.po
index 4f876ac062..065e2b3328 100644
--- a/django/contrib/redirects/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/pa/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr ""
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr ""
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "ਰੀ-ਡਾਇਰੈਕਟ"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr ""
diff --git a/django/contrib/redirects/locale/pl/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/pl/LC_MESSAGES/django.mo
index 958bb56c6e..9b3ffa080e 100644
Binary files a/django/contrib/redirects/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/pl/LC_MESSAGES/django.po b/django/contrib/redirects/locale/pl/LC_MESSAGES/django.po
index 058dc91b23..d283543b5d 100644
--- a/django/contrib/redirects/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/pl/LC_MESSAGES/django.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "przekieruj z"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "Podaj pełną ścieżkę bez nazwy domeny. Przykład: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "przekierowanie do"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "Ścieżka jak wyżej lub pełny URL z http://"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "przekieruj"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "przekierowania"
diff --git a/django/contrib/redirects/locale/pt/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/pt/LC_MESSAGES/django.mo
index 27d01005d3..4ee0f7ebba 100644
Binary files a/django/contrib/redirects/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/pt/LC_MESSAGES/django.po b/django/contrib/redirects/locale/pt/LC_MESSAGES/django.po
index 5c8a82e807..c07048cc49 100644
--- a/django/contrib/redirects/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/pt/LC_MESSAGES/django.po
@@ -7,22 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirecionar de"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Isto deverá ser um caminho absoluto, excluindo o domínio. Exemplo: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirecionar para"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Isto poderá ser um caminho absoluto (como acima) ou um URL completo começado "
 "por 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirecionar"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redireciona"
diff --git a/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.mo
index d0bf6c0ff1..e7bf704ff3 100644
Binary files a/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.po
index d0d59ebd17..64b1bda305 100644
--- a/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirecionar de"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Isso deve ser um caminho absoluto, excluindo o nome de domínio. Exemplo: '/"
 "eventos/busca/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirecionar para"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Pode ser um caminho absoluto (como acima) ou uma URL completa, começando com "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirecionar"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirecionamentos"
diff --git a/django/contrib/redirects/locale/ro/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ro/LC_MESSAGES/django.mo
index ecbb2ead9d..f7746010ce 100644
Binary files a/django/contrib/redirects/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ro/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ro/LC_MESSAGES/django.po
index 3047bbcfba..fed5712b24 100644
--- a/django/contrib/redirects/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ro/LC_MESSAGES/django.po
@@ -7,23 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "redirecționat de la "
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -31,11 +31,11 @@ msgstr ""
 "Aceasta ar trebui să fie o cale absolută, excluzând numele de domeniu. "
 "Exemplu: '/evenimente/cautare/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "redirecționat către"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -43,10 +43,10 @@ msgstr ""
 "Aceasta poate fi o cale absolută (ca mai sus) sau un URL complet, începând "
 "cu 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "redirecționare"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "redirecționări"
diff --git a/django/contrib/redirects/locale/ru/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ru/LC_MESSAGES/django.mo
index 6bdbdf89dd..2ab114191f 100644
Binary files a/django/contrib/redirects/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ru/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ru/LC_MESSAGES/django.po
index a350e0d6db..9b85990d43 100644
--- a/django/contrib/redirects/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ru/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "перенаправить с"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Это должен быть абсолютный путь без доменного имени. Пример: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "перенаправить на"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Это должен быть либо абсолютный путь (как выше), либо полный URL, "
 "начинающийся с 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "перенаправление"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "перенаправления"
diff --git a/django/contrib/redirects/locale/sk/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/sk/LC_MESSAGES/django.mo
index f585c2d17d..827e623b14 100644
Binary files a/django/contrib/redirects/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/sk/LC_MESSAGES/django.po b/django/contrib/redirects/locale/sk/LC_MESSAGES/django.po
index 833b03b60f..e7730e44e8 100644
--- a/django/contrib/redirects/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/sk/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "presmerovať z"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Tu by sa mala použiť absolútna cesta bez názvu domény. Napríklad: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "presmerovať na"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Toto môže byť buď absolútna cesta (ako vyššie) alebo úplné URL začínajúce na "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "presmerovanie"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "presmerovania"
diff --git a/django/contrib/redirects/locale/sl/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/sl/LC_MESSAGES/django.mo
index 450364c340..d97db4fb60 100644
Binary files a/django/contrib/redirects/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/sl/LC_MESSAGES/django.po b/django/contrib/redirects/locale/sl/LC_MESSAGES/django.po
index 523882f1a6..bfb11d2c75 100644
--- a/django/contrib/redirects/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/sl/LC_MESSAGES/django.po
@@ -6,45 +6,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-02-14 13:40+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-10-31 19:45+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
-msgstr "preusmeritev iz"
+msgstr "preusmeri iz"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
-"Ta pot mora biti absolutna, brez imena domene. Primer: '/events/search/'."
+"Pot mora biti navedena absolutno in brez imena domene. Primer: '/events/"
+"search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "preusmeri na"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
-"To je lahko absolutna pot (kot zgoraj) ali popoln URL naslov (ki se začne s "
-"'http://')."
+"Pot je lahko navedena absolutno (kot zgoraj) ali pa kot popoln naslov URL, "
+"začet z 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
-msgstr "preusmeritev"
+msgstr "preusmeri"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "preusmeritve"
diff --git a/django/contrib/redirects/locale/sq/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/sq/LC_MESSAGES/django.mo
index 31f711afb2..e22e9c1241 100644
Binary files a/django/contrib/redirects/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/sq/LC_MESSAGES/django.po b/django/contrib/redirects/locale/sq/LC_MESSAGES/django.po
index 9bbcf52837..e21ccd46ff 100644
--- a/django/contrib/redirects/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/sq/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "ridrejtim prej"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Ky do të duhej të ishte shteg absolut, pa emrin e përkatësisë. Për shembull: "
 "'/ngjarje/kërkim/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "ridrejtim te"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Ky mund të jerë shteg absolut (si më sipër) ose URL e plotë që fillon me "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "ridrejtim"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "ridrejtime"
diff --git a/django/contrib/redirects/locale/sr/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/sr/LC_MESSAGES/django.mo
index 73d1fdca8c..0203dd5223 100644
Binary files a/django/contrib/redirects/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/sr/LC_MESSAGES/django.po b/django/contrib/redirects/locale/sr/LC_MESSAGES/django.po
index cd793333b5..c077381056 100644
--- a/django/contrib/redirects/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/sr/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "преусмерен са"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Ово мора бити апсолутна путања без имена домена. На пример: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "преусмери ка"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Ово може бити или апсолутна путања (као горе) или пун URL који почиње са "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "преусмеравање"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "преусмеравања"
diff --git a/django/contrib/redirects/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/sr_Latn/LC_MESSAGES/django.mo
index 8e13b74158..e656bc9e47 100644
Binary files a/django/contrib/redirects/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/redirects/locale/sr_Latn/LC_MESSAGES/django.po
index c274cd0fa8..1c4babe6f3 100644
--- a/django/contrib/redirects/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/sr_Latn/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "preusmeren sa"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Ovo mora biti apsolutna putanja bez imena domena. Na primer: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "preusmeri ka"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Ovo može biti ili apsolutna putanja (kao gore) ili pun URL koji počinje sa "
 "'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "preusmeravanje"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "preusmeravanja"
diff --git a/django/contrib/redirects/locale/sv/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/sv/LC_MESSAGES/django.mo
index 1a8b65039e..b12919126f 100644
Binary files a/django/contrib/redirects/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/sv/LC_MESSAGES/django.po b/django/contrib/redirects/locale/sv/LC_MESSAGES/django.po
index 080395d10b..23e6dbef72 100644
--- a/django/contrib/redirects/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/sv/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "omdirigera från"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Detta bör vara en absolut sökväg utan domännamnet. Exempel: '/handelser/"
 "sok/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "omdirigera till"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Detta kan vara antingen en absolut sökväg (som ovan) eller en fullständig "
 "URL som börjar med 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "omdirigera"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "omdirigeringar"
diff --git a/django/contrib/redirects/locale/sw/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/sw/LC_MESSAGES/django.mo
index 2e1c7a18a6..b70ace73a0 100644
Binary files a/django/contrib/redirects/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/sw/LC_MESSAGES/django.po b/django/contrib/redirects/locale/sw/LC_MESSAGES/django.po
index 7dbd6a8287..fb224e0b7c 100644
--- a/django/contrib/redirects/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/sw/LC_MESSAGES/django.po
@@ -5,22 +5,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-16 18:53+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "elekeza upya kutoka"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -28,21 +28,21 @@ msgstr ""
 "Hii inatakiwa kuwa njia kamili, ukiondo jina la domeini. Mfano:'/matukio/"
 "tafuta/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "elekeza upya kwenda"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
 "Hii inaweza kuwa njia kamili (kama hapo juu) or URL kamili yenye 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "maelekezo upya"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "maelekezo upya"
diff --git a/django/contrib/redirects/locale/ta/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ta/LC_MESSAGES/django.mo
index 0b615b9e31..e95f6e7da0 100644
Binary files a/django/contrib/redirects/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ta/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ta/LC_MESSAGES/django.po
index 60d17a6f99..d341899f2f 100644
--- a/django/contrib/redirects/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ta/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "லிருந்து திசைமாற்று"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "இது ஒரு முழுமையான பாதையாக இருக்கவேண்டும். இணையத்தளப்பெயராக இருக்கக்கூடாது. உதாரணம்:'/"
 "events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "திரும்ப அனுப்பு"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "இது முழுமையான பாதையாக (மேலே உள்ளது போல) அல்லது  \"http\"//\" என தொடங்கும் வலை  "
 "முகவரியாக இருக்கலாம்."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "திரும்ப அனுப்பு"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "திரும்ப அனுப்புகிறது. "
diff --git a/django/contrib/redirects/locale/te/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/te/LC_MESSAGES/django.mo
index a2c415cbfe..eea4e568d1 100644
Binary files a/django/contrib/redirects/locale/te/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/te/LC_MESSAGES/django.po b/django/contrib/redirects/locale/te/LC_MESSAGES/django.po
index 6eac75a090..ce282b0fa1 100644
--- a/django/contrib/redirects/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/te/LC_MESSAGES/django.po
@@ -5,41 +5,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr ""
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr ""
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr ""
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr ""
diff --git a/django/contrib/redirects/locale/th/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/th/LC_MESSAGES/django.mo
index b89ca6e21b..e7a280b254 100644
Binary files a/django/contrib/redirects/locale/th/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/th/LC_MESSAGES/django.po b/django/contrib/redirects/locale/th/LC_MESSAGES/django.po
index f2898d0c5f..8ab110c08d 100644
--- a/django/contrib/redirects/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/th/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "เปลี่ยนทิศทางจาก"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "พาธไม่รวมโดเมน ตัวอย่าง : '/events/search/'"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "เปลี่ยนทิศทางไปที่"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "มันอาจจะเป็นพาธหรือ URL แบบเต็มที่ขึ้นต้นด้วย 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "เปลี่ยนทิศทาง"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "เปลี่ยนทิศทาง"
diff --git a/django/contrib/redirects/locale/tr/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/tr/LC_MESSAGES/django.mo
index 15322a7ab4..14ed7f88db 100644
Binary files a/django/contrib/redirects/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/tr/LC_MESSAGES/django.po b/django/contrib/redirects/locale/tr/LC_MESSAGES/django.po
index dcf460a7af..c7982ec58c 100644
--- a/django/contrib/redirects/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/tr/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "eski adres"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,11 +29,11 @@ msgstr ""
 "Buraya tam dosya yolu, alan adı kullanılmadan yazılmalı. Örnek: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "yeni adres"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -41,10 +41,10 @@ msgstr ""
 "Buraya tam dosya yolu (yukarıdaki gibi), ya da 'http://' ile başlayan tam "
 "adres yazılmalı."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "yönlendirme"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "yönlendirmeler"
diff --git a/django/contrib/redirects/locale/tt/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/tt/LC_MESSAGES/django.mo
index 82bfa0e29b..eb0a0ec67d 100644
Binary files a/django/contrib/redirects/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/tt/LC_MESSAGES/django.po b/django/contrib/redirects/locale/tt/LC_MESSAGES/django.po
index 63339d8abe..0ce8e530ca 100644
--- a/django/contrib/redirects/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/tt/LC_MESSAGES/django.po
@@ -6,33 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "бу сәхифәдән юнәлтергә:"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
 "Бу домен исеменнән тыш абсолүт юл булырга тиеш. Мәсәлән: '/events/search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "бу сәхифәгә юнәлтергә:"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -40,10 +40,10 @@ msgstr ""
 "Бу я абсолүт юл (өстәге кебек), я 'http://' белән башланган тулы URL булырга "
 "тиеш."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "юнәлтү"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "юнәлтүләр"
diff --git a/django/contrib/redirects/locale/uk/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/uk/LC_MESSAGES/django.mo
index b03674375b..f27ab608b4 100644
Binary files a/django/contrib/redirects/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/uk/LC_MESSAGES/django.po b/django/contrib/redirects/locale/uk/LC_MESSAGES/django.po
index 1c4bd18243..b1522458af 100644
--- a/django/contrib/redirects/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/uk/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "перенаправлення з"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -30,11 +30,11 @@ msgstr ""
 "Це повинен бути абсолютний шлях, виключаючи ім'я домену. Приклад: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "перенаправлення до"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
@@ -42,10 +42,10 @@ msgstr ""
 "Це може бути або абсолютний шлях (як вище), або повний URL, який починається "
 "з 'http://'."
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "перенаправлення"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "перенаправлення"
diff --git a/django/contrib/redirects/locale/ur/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ur/LC_MESSAGES/django.mo
index 4e524a9f53..1bc9aff981 100644
Binary files a/django/contrib/redirects/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/ur/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ur/LC_MESSAGES/django.po
index cbc3e281e2..e6b61bbb74 100644
--- a/django/contrib/redirects/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/ur/LC_MESSAGES/django.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "سے ری ڈائریکٹ"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "یہ مطلق پاتھ ھونا چاھئے، بغیر ڈومین نام کے۔ مثلاً '/events/search/'"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "ری ڈائریکٹ از طرف"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
 "یہ مطلق پاتھ ھو سکتا ھے (جیسے اوپر ھے) یا مکمل یو آر ایل (URL) بمع 'http://'۔"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "ری ڈائریکٹ"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "ری ڈائیکٹس"
diff --git a/django/contrib/redirects/locale/vi/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/vi/LC_MESSAGES/django.mo
index 2d26956d6d..533d0840f4 100644
Binary files a/django/contrib/redirects/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/vi/LC_MESSAGES/django.po b/django/contrib/redirects/locale/vi/LC_MESSAGES/django.po
index de16c22be5..f57ea29436 100644
--- a/django/contrib/redirects/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/vi/LC_MESSAGES/django.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "Chuyển hướng từ"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
@@ -29,21 +29,21 @@ msgstr ""
 "Đây phải là đường dẫn tuyệt đối, không bao gồm tên miền. Ví dụ: '/events/"
 "search/'."
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "Chuyển hướng tới"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
 "Đây có thể là đường dẫn tuyệt đối hoặc địa chỉ đầy đủ bắt đầu với 'http://'"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "Chuyển hướng"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "Chuyển hướng"
diff --git a/django/contrib/redirects/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/zh_CN/LC_MESSAGES/django.mo
index be95e0fe9e..349139a02e 100644
Binary files a/django/contrib/redirects/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/redirects/locale/zh_CN/LC_MESSAGES/django.po
index 7e80a1afb8..37240d8ad7 100644
--- a/django/contrib/redirects/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/zh_CN/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "重定向自"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "应该是一个绝对路径，不包括域名。例如：'/events/search/'。"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "重定向到"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "可以是绝对路径（同上）或以'http://'起始的全URL。"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "重定向"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "重定向"
diff --git a/django/contrib/redirects/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/zh_TW/LC_MESSAGES/django.mo
index 0db825f766..322a25c16c 100644
Binary files a/django/contrib/redirects/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/redirects/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/redirects/locale/zh_TW/LC_MESSAGES/django.po
index e4e90c5717..eadad993d2 100644
--- a/django/contrib/redirects/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/zh_TW/LC_MESSAGES/django.po
@@ -6,41 +6,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:39+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:7
+#: models.py:9
 msgid "redirect from"
 msgstr "重導向自"
 
-#: models.py:8
+#: models.py:10
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr "應該是一個絕對路徑，不包括網域。例如：'/events/search/'。"
 
-#: models.py:9
+#: models.py:11
 msgid "redirect to"
 msgstr "重導向到"
 
-#: models.py:10
+#: models.py:12
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr "此可為一絕對路徑 (如上) 或一個以 'http://' 開頭的完整 URL。"
 
-#: models.py:13
+#: models.py:15
 msgid "redirect"
 msgstr "重導向"
 
-#: models.py:14
+#: models.py:16
 msgid "redirects"
 msgstr "重導向"
diff --git a/django/contrib/redirects/middleware.py b/django/contrib/redirects/middleware.py
index 927220d44d..03c9d97c0d 100644
--- a/django/contrib/redirects/middleware.py
+++ b/django/contrib/redirects/middleware.py
@@ -1,23 +1,38 @@
+from __future__ import unicode_literals
+
+from django.conf import settings
 from django.contrib.redirects.models import Redirect
 from django.contrib.sites.models import get_current_site
+from django.core.exceptions import ImproperlyConfigured
 from django import http
-from django.conf import settings
+
 
 class RedirectFallbackMiddleware(object):
+    def __init__(self):
+        if 'django.contrib.sites' not in settings.INSTALLED_APPS:
+            raise ImproperlyConfigured(
+                "You cannot use RedirectFallbackMiddleware when "
+                "django.contrib.sites is not installed."
+            )
+
     def process_response(self, request, response):
         if response.status_code != 404:
             return response # No need to check for a redirect for non-404 responses.
-        path = request.get_full_path()
+
+        full_path = request.get_full_path()
         current_site = get_current_site(request)
+
+        r = None
         try:
-            r = Redirect.objects.get(site__id__exact=current_site.id, old_path=path)
+            r = Redirect.objects.get(site=current_site, old_path=full_path)
         except Redirect.DoesNotExist:
-            r = None
-        if r is None and settings.APPEND_SLASH:
-            # Try removing the trailing slash.
+            pass
+        if settings.APPEND_SLASH and not request.path.endswith('/'):
+            # Try appending a trailing slash.
+            path_len = len(request.path)
+            full_path = full_path[:path_len] + '/' + full_path[path_len:]
             try:
-                r = Redirect.objects.get(site__id__exact=current_site.id,
-                    old_path=path[:path.rfind('/')]+path[path.rfind('/')+1:])
+                r = Redirect.objects.get(site=current_site, old_path=full_path)
             except Redirect.DoesNotExist:
                 pass
         if r is not None:
diff --git a/django/contrib/redirects/tests.py b/django/contrib/redirects/tests.py
index 11ffc7b748..bdcdf4a9e1 100644
--- a/django/contrib/redirects/tests.py
+++ b/django/contrib/redirects/tests.py
@@ -1,17 +1,19 @@
 from django.conf import settings
 from django.contrib.sites.models import Site
+from django.core.exceptions import ImproperlyConfigured
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils import six
 
+from .middleware import RedirectFallbackMiddleware
 from .models import Redirect
 
 
 @override_settings(
-    SITE_ID=1,
-    APPEND_SLASH=True,
+    APPEND_SLASH=False,
     MIDDLEWARE_CLASSES=list(settings.MIDDLEWARE_CLASSES) +
         ['django.contrib.redirects.middleware.RedirectFallbackMiddleware'],
+    SITE_ID=1,
 )
 class RedirectTests(TestCase):
 
@@ -23,20 +25,39 @@ class RedirectTests(TestCase):
             site=self.site, old_path='/initial', new_path='/new_target')
         self.assertEqual(six.text_type(r1), "/initial ---> /new_target")
 
-    def test_redirect_middleware(self):
-        r1 = Redirect.objects.create(
+    def test_redirect(self):
+        Redirect.objects.create(
             site=self.site, old_path='/initial', new_path='/new_target')
         response = self.client.get('/initial')
         self.assertRedirects(response,
             '/new_target', status_code=301, target_status_code=404)
-        # Works also with trailing slash
-        response = self.client.get('/initial/')
+
+    @override_settings(APPEND_SLASH=True)
+    def test_redirect_with_append_slash(self):
+        Redirect.objects.create(
+            site=self.site, old_path='/initial/', new_path='/new_target/')
+        response = self.client.get('/initial')
         self.assertRedirects(response,
-            '/new_target', status_code=301, target_status_code=404)
+            '/new_target/', status_code=301, target_status_code=404)
+
+    @override_settings(APPEND_SLASH=True)
+    def test_redirect_with_append_slash_and_query_string(self):
+        Redirect.objects.create(
+            site=self.site, old_path='/initial/?foo', new_path='/new_target/')
+        response = self.client.get('/initial?foo')
+        self.assertRedirects(response,
+            '/new_target/', status_code=301, target_status_code=404)
 
     def test_response_gone(self):
         """When the redirect target is '', return a 410"""
-        r1 = Redirect.objects.create(
+        Redirect.objects.create(
             site=self.site, old_path='/initial', new_path='')
         response = self.client.get('/initial')
         self.assertEqual(response.status_code, 410)
+
+    @override_settings(
+        INSTALLED_APPS=[app for app in settings.INSTALLED_APPS
+                        if app != 'django.contrib.sites'])
+    def test_sites_not_installed(self):
+        with self.assertRaises(ImproperlyConfigured):
+            RedirectFallbackMiddleware()
diff --git a/django/contrib/sessions/backends/db.py b/django/contrib/sessions/backends/db.py
index 47e89b66e5..30da0b7a10 100644
--- a/django/contrib/sessions/backends/db.py
+++ b/django/contrib/sessions/backends/db.py
@@ -74,7 +74,6 @@ class SessionStore(SessionBase):
     @classmethod
     def clear_expired(cls):
         Session.objects.filter(expire_date__lt=timezone.now()).delete()
-        transaction.commit_unless_managed()
 
 
 # At bottom to avoid circular import
diff --git a/django/contrib/sessions/backends/file.py b/django/contrib/sessions/backends/file.py
index 7d933c678a..9588680fea 100644
--- a/django/contrib/sessions/backends/file.py
+++ b/django/contrib/sessions/backends/file.py
@@ -1,6 +1,7 @@
 import datetime
 import errno
 import os
+import shutil
 import tempfile
 
 from django.conf import settings
@@ -147,7 +148,11 @@ class SessionStore(SessionBase):
                     os.write(output_file_fd, self.encode(session_data).encode())
                 finally:
                     os.close(output_file_fd)
-                os.rename(output_file_name, session_file_name)
+
+                # This will atomically rename the file (os.rename) if the OS
+                # supports it. Otherwise this will result in a shutil.copy2
+                # and os.unlink (for example on Windows). See #9084.
+                shutil.move(output_file_name, session_file_name)
                 renamed = True
             finally:
                 if not renamed:
diff --git a/django/contrib/sessions/locale/ar/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ar/LC_MESSAGES/django.mo
index fec1f14f86..1cc92ba91c 100644
Binary files a/django/contrib/sessions/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ar/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ar/LC_MESSAGES/django.po
index cee997b73c..0074521072 100644
--- a/django/contrib/sessions/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ar/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/az/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/az/LC_MESSAGES/django.mo
index e999c66eba..e45e51fdd7 100644
Binary files a/django/contrib/sessions/locale/az/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/az/LC_MESSAGES/django.po b/django/contrib/sessions/locale/az/LC_MESSAGES/django.po
index 3abafa30d7..8bccd1eb3f 100644
--- a/django/contrib/sessions/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/az/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/be/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..25dea52ed6
Binary files /dev/null and b/django/contrib/sessions/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/be/LC_MESSAGES/django.po b/django/contrib/sessions/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..eb0ea7f1da
--- /dev/null
+++ b/django/contrib/sessions/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,38 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-11 11:08+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: models.py:38
+msgid "session key"
+msgstr "ключ сэансу"
+
+#: models.py:40
+msgid "session data"
+msgstr "зьвесткі сэансу"
+
+#: models.py:41
+msgid "expire date"
+msgstr "тэрмін"
+
+#: models.py:46
+msgid "session"
+msgstr "сэсія"
+
+#: models.py:47
+msgid "sessions"
+msgstr "сэсіі"
diff --git a/django/contrib/sessions/locale/bg/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/bg/LC_MESSAGES/django.mo
index d97802bbb1..9baaad039e 100644
Binary files a/django/contrib/sessions/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/bg/LC_MESSAGES/django.po b/django/contrib/sessions/locale/bg/LC_MESSAGES/django.po
index 9c146b5ef9..5ab2073153 100644
--- a/django/contrib/sessions/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/bg/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/bn/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/bn/LC_MESSAGES/django.mo
index e6c21c3621..c9580262f2 100644
Binary files a/django/contrib/sessions/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/bn/LC_MESSAGES/django.po b/django/contrib/sessions/locale/bn/LC_MESSAGES/django.po
index f96517ce28..936198c54d 100644
--- a/django/contrib/sessions/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/bn/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/br/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..154914dffd
Binary files /dev/null and b/django/contrib/sessions/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/br/LC_MESSAGES/django.po b/django/contrib/sessions/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..e1c0a98aee
--- /dev/null
+++ b/django/contrib/sessions/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,38 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-06-29 11:09+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: models.py:38
+msgid "session key"
+msgstr ""
+
+#: models.py:40
+msgid "session data"
+msgstr ""
+
+#: models.py:41
+msgid "expire date"
+msgstr ""
+
+#: models.py:46
+msgid "session"
+msgstr "dalc'h"
+
+#: models.py:47
+msgid "sessions"
+msgstr "dalc'hoù"
diff --git a/django/contrib/sessions/locale/bs/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/bs/LC_MESSAGES/django.mo
index ab1684f3c9..fd8c70a0af 100644
Binary files a/django/contrib/sessions/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/bs/LC_MESSAGES/django.po b/django/contrib/sessions/locale/bs/LC_MESSAGES/django.po
index 94a93bdaa8..0bc0904115 100644
--- a/django/contrib/sessions/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/bs/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ca/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ca/LC_MESSAGES/django.mo
index df27fe2329..2d54327f4a 100644
Binary files a/django/contrib/sessions/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ca/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ca/LC_MESSAGES/django.po
index 006754b96d..182627bf66 100644
--- a/django/contrib/sessions/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ca/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/cs/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/cs/LC_MESSAGES/django.mo
index 5e8290c53d..291f58d8dd 100644
Binary files a/django/contrib/sessions/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/cs/LC_MESSAGES/django.po b/django/contrib/sessions/locale/cs/LC_MESSAGES/django.po
index c44797234b..99b215846e 100644
--- a/django/contrib/sessions/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/cs/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/cy/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/cy/LC_MESSAGES/django.mo
index df0d130e9f..6d45b0add9 100644
Binary files a/django/contrib/sessions/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/cy/LC_MESSAGES/django.po b/django/contrib/sessions/locale/cy/LC_MESSAGES/django.po
index be36ebcb03..709efc7aa4 100644
--- a/django/contrib/sessions/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/cy/LC_MESSAGES/django.po
@@ -6,16 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/da/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/da/LC_MESSAGES/django.mo
index 34953390fb..86eb4805d3 100644
Binary files a/django/contrib/sessions/locale/da/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/da/LC_MESSAGES/django.po b/django/contrib/sessions/locale/da/LC_MESSAGES/django.po
index ba65cd5487..12949a4bfb 100644
--- a/django/contrib/sessions/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/da/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/de/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/de/LC_MESSAGES/django.mo
index ba635e22bd..a2669ea196 100644
Binary files a/django/contrib/sessions/locale/de/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/de/LC_MESSAGES/django.po b/django/contrib/sessions/locale/de/LC_MESSAGES/django.po
index 2b0065030a..89b4f25941 100644
--- a/django/contrib/sessions/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/de/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/el/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/el/LC_MESSAGES/django.mo
index 506c859e57..c762208602 100644
Binary files a/django/contrib/sessions/locale/el/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/el/LC_MESSAGES/django.po b/django/contrib/sessions/locale/el/LC_MESSAGES/django.po
index dee7edc0b5..4bc3943127 100644
--- a/django/contrib/sessions/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/el/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/en/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/en/LC_MESSAGES/django.mo
index 83b94c07c4..1f590af580 100644
Binary files a/django/contrib/sessions/locale/en/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po
index 5147a71fe5..09dd449811 100644
--- a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po
@@ -1,34 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:57+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-02-14 13:40+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
 #: models.py:38
 msgid "session key"
-msgstr ""
+msgstr "session key"
 
 #: models.py:40
 msgid "session data"
-msgstr ""
+msgstr "session data"
 
 #: models.py:41
 msgid "expire date"
-msgstr ""
+msgstr "expire date"
 
 #: models.py:46
 msgid "session"
-msgstr ""
+msgstr "session"
 
 #: models.py:47
 msgid "sessions"
-msgstr ""
+msgstr "sessions"
diff --git a/django/contrib/sessions/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/en_GB/LC_MESSAGES/django.mo
index cafb285003..0f63ba1c73 100644
Binary files a/django/contrib/sessions/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/sessions/locale/en_GB/LC_MESSAGES/django.po
index bb8bb1e45d..2eb061699e 100644
--- a/django/contrib/sessions/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/en_GB/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/eo/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/eo/LC_MESSAGES/django.mo
index dd3fbd593d..65428b548b 100644
Binary files a/django/contrib/sessions/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/eo/LC_MESSAGES/django.po b/django/contrib/sessions/locale/eo/LC_MESSAGES/django.po
index 76db1a514a..0c56425558 100644
--- a/django/contrib/sessions/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/eo/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: kristjan <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/es/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/es/LC_MESSAGES/django.mo
index 73c76bb47c..2ab4c6a61c 100644
Binary files a/django/contrib/sessions/locale/es/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/es/LC_MESSAGES/django.po b/django/contrib/sessions/locale/es/LC_MESSAGES/django.po
index 76206fc435..8c03740a21 100644
--- a/django/contrib/sessions/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/es/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/es_AR/LC_MESSAGES/django.mo
index 1b6cd8ce9d..795f791532 100644
Binary files a/django/contrib/sessions/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/sessions/locale/es_AR/LC_MESSAGES/django.po
index af11fc20c1..ebb5e13189 100644
--- a/django/contrib/sessions/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/es_AR/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/es_MX/LC_MESSAGES/django.mo
index 19b79d9df9..d74c7ab2b3 100644
Binary files a/django/contrib/sessions/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/sessions/locale/es_MX/LC_MESSAGES/django.po
index dee33d0100..f0a0d8094e 100644
--- a/django/contrib/sessions/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/es_MX/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/et/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/et/LC_MESSAGES/django.mo
index 70f28077b6..5c002dbaeb 100644
Binary files a/django/contrib/sessions/locale/et/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/et/LC_MESSAGES/django.po b/django/contrib/sessions/locale/et/LC_MESSAGES/django.po
index 309cd96c34..5f516210b3 100644
--- a/django/contrib/sessions/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/et/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/eu/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/eu/LC_MESSAGES/django.mo
index 57af32db2f..9e2572e9ca 100644
Binary files a/django/contrib/sessions/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/eu/LC_MESSAGES/django.po b/django/contrib/sessions/locale/eu/LC_MESSAGES/django.po
index 5b8d0c6e1d..4da3e33fb4 100644
--- a/django/contrib/sessions/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/eu/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/fa/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/fa/LC_MESSAGES/django.mo
index 425e50588f..7bb8c0ebbb 100644
Binary files a/django/contrib/sessions/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/fa/LC_MESSAGES/django.po b/django/contrib/sessions/locale/fa/LC_MESSAGES/django.po
index 7131c9c932..01dca904d2 100644
--- a/django/contrib/sessions/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/fa/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/fi/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/fi/LC_MESSAGES/django.mo
index ae9c01bac1..47e137d390 100644
Binary files a/django/contrib/sessions/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/fi/LC_MESSAGES/django.po b/django/contrib/sessions/locale/fi/LC_MESSAGES/django.po
index 8ebafca9c9..9381a19c82 100644
--- a/django/contrib/sessions/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/fi/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/fr/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/fr/LC_MESSAGES/django.mo
index df4b39d582..fc7703e346 100644
Binary files a/django/contrib/sessions/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/fr/LC_MESSAGES/django.po b/django/contrib/sessions/locale/fr/LC_MESSAGES/django.po
index 22c41eed26..968bf4bd6a 100644
--- a/django/contrib/sessions/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/fr/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ga/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ga/LC_MESSAGES/django.mo
index 796daab3d7..fbc9a90335 100644
Binary files a/django/contrib/sessions/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ga/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ga/LC_MESSAGES/django.po
index 9cbf6d8eb7..ee43a3b8e1 100644
--- a/django/contrib/sessions/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ga/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/gl/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/gl/LC_MESSAGES/django.mo
index 87ada18c15..34429d4b3f 100644
Binary files a/django/contrib/sessions/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/gl/LC_MESSAGES/django.po b/django/contrib/sessions/locale/gl/LC_MESSAGES/django.po
index 670bfdffe8..db2b25d7b9 100644
--- a/django/contrib/sessions/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/gl/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/he/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/he/LC_MESSAGES/django.mo
index cbecaa6b65..361282958e 100644
Binary files a/django/contrib/sessions/locale/he/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/he/LC_MESSAGES/django.po b/django/contrib/sessions/locale/he/LC_MESSAGES/django.po
index 0ab9357733..a36fa372d0 100644
--- a/django/contrib/sessions/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/he/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/hi/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/hi/LC_MESSAGES/django.mo
index acf81c97c3..61d619bb1a 100644
Binary files a/django/contrib/sessions/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/hi/LC_MESSAGES/django.po b/django/contrib/sessions/locale/hi/LC_MESSAGES/django.po
index 9e608651b7..fd556154f6 100644
--- a/django/contrib/sessions/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/hi/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Sandeep Satavlekar <sandysat@gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/hr/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/hr/LC_MESSAGES/django.mo
index f2976d6f2b..c5937088a5 100644
Binary files a/django/contrib/sessions/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/hr/LC_MESSAGES/django.po b/django/contrib/sessions/locale/hr/LC_MESSAGES/django.po
index 86fe481891..8c2d163c26 100644
--- a/django/contrib/sessions/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/hr/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/hu/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/hu/LC_MESSAGES/django.mo
index f4e4c4b500..03f15253ea 100644
Binary files a/django/contrib/sessions/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/hu/LC_MESSAGES/django.po b/django/contrib/sessions/locale/hu/LC_MESSAGES/django.po
index 1a1579031b..4c7a8b6f1c 100644
--- a/django/contrib/sessions/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/hu/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/id/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/id/LC_MESSAGES/django.mo
index e9a367d752..2a05ec3214 100644
Binary files a/django/contrib/sessions/locale/id/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/id/LC_MESSAGES/django.po b/django/contrib/sessions/locale/id/LC_MESSAGES/django.po
index 2565ba1c0a..4d42685457 100644
--- a/django/contrib/sessions/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/id/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/is/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/is/LC_MESSAGES/django.mo
index c89a9300dc..64a124cbc6 100644
Binary files a/django/contrib/sessions/locale/is/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/is/LC_MESSAGES/django.po b/django/contrib/sessions/locale/is/LC_MESSAGES/django.po
index 1a7f4a6f7b..4792d6338d 100644
--- a/django/contrib/sessions/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/is/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/it/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/it/LC_MESSAGES/django.mo
index 4239c42c9a..90daaf8750 100644
Binary files a/django/contrib/sessions/locale/it/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/it/LC_MESSAGES/django.po b/django/contrib/sessions/locale/it/LC_MESSAGES/django.po
index 55d0a074b0..6009361321 100644
--- a/django/contrib/sessions/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/it/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ja/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ja/LC_MESSAGES/django.mo
index 914250fa98..35221fb737 100644
Binary files a/django/contrib/sessions/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ja/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ja/LC_MESSAGES/django.po
index 4788259381..9220c2ee14 100644
--- a/django/contrib/sessions/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ja/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ka/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ka/LC_MESSAGES/django.mo
index 0bdd3e9fac..9184207852 100644
Binary files a/django/contrib/sessions/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ka/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ka/LC_MESSAGES/django.po
index 564168373a..e0cb264d20 100644
--- a/django/contrib/sessions/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ka/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/kk/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/kk/LC_MESSAGES/django.mo
index d35c7c61cb..2688d31902 100644
Binary files a/django/contrib/sessions/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/kk/LC_MESSAGES/django.po b/django/contrib/sessions/locale/kk/LC_MESSAGES/django.po
index e10abb64d3..cc4e3a68e6 100644
--- a/django/contrib/sessions/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/kk/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Zhazira <zhazira.mt@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/km/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/km/LC_MESSAGES/django.mo
index f07d6bdfaa..014bcbbb73 100644
Binary files a/django/contrib/sessions/locale/km/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/km/LC_MESSAGES/django.po b/django/contrib/sessions/locale/km/LC_MESSAGES/django.po
index 26567a5e8f..990c17acce 100644
--- a/django/contrib/sessions/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/km/LC_MESSAGES/django.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/kn/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/kn/LC_MESSAGES/django.mo
index 48747982dc..324ba85799 100644
Binary files a/django/contrib/sessions/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/kn/LC_MESSAGES/django.po b/django/contrib/sessions/locale/kn/LC_MESSAGES/django.po
index c55c43b501..7d7f413ce1 100644
--- a/django/contrib/sessions/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/kn/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo
index 67cfc102cb..48122ae74e 100644
Binary files a/django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ko/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ko/LC_MESSAGES/django.po
index f8dd4fdb26..f9451d1081 100644
--- a/django/contrib/sessions/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ko/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/lt/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/lt/LC_MESSAGES/django.mo
index c480408d05..42cefffa32 100644
Binary files a/django/contrib/sessions/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/lt/LC_MESSAGES/django.po b/django/contrib/sessions/locale/lt/LC_MESSAGES/django.po
index 9457a67f58..11baa63c01 100644
--- a/django/contrib/sessions/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/lt/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/lv/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/lv/LC_MESSAGES/django.mo
index 11009b9815..a0188a6443 100644
Binary files a/django/contrib/sessions/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/lv/LC_MESSAGES/django.po b/django/contrib/sessions/locale/lv/LC_MESSAGES/django.po
index 6e19af61a4..a805fa980f 100644
--- a/django/contrib/sessions/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/lv/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/mk/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/mk/LC_MESSAGES/django.mo
index ce4493b82d..26996b7113 100644
Binary files a/django/contrib/sessions/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/mk/LC_MESSAGES/django.po b/django/contrib/sessions/locale/mk/LC_MESSAGES/django.po
index 05571d7a6d..531b60ca88 100644
--- a/django/contrib/sessions/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/mk/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ml/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ml/LC_MESSAGES/django.mo
index 7fec57a29f..09c12c0ba2 100644
Binary files a/django/contrib/sessions/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ml/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ml/LC_MESSAGES/django.po
index d269515820..106ee12f77 100644
--- a/django/contrib/sessions/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ml/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/mn/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/mn/LC_MESSAGES/django.mo
index ef09bcde3e..5a281d8d02 100644
Binary files a/django/contrib/sessions/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/mn/LC_MESSAGES/django.po b/django/contrib/sessions/locale/mn/LC_MESSAGES/django.po
index 7f94ff7afa..5775b8c1ad 100644
--- a/django/contrib/sessions/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/mn/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/nb/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/nb/LC_MESSAGES/django.mo
index 680b0415be..7e2edc6cf5 100644
Binary files a/django/contrib/sessions/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/nb/LC_MESSAGES/django.po b/django/contrib/sessions/locale/nb/LC_MESSAGES/django.po
index 0f57053386..f97eb99abf 100644
--- a/django/contrib/sessions/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/nb/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-12 14:10+0000\n"
 "Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ne/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ne/LC_MESSAGES/django.mo
index c5b1102116..7a9419f95a 100644
Binary files a/django/contrib/sessions/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ne/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ne/LC_MESSAGES/django.po
index 41cf2fdd1f..dc69a8f09d 100644
--- a/django/contrib/sessions/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ne/LC_MESSAGES/django.po
@@ -1,21 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
+# Paras Nath Chaudhary <opnchaudhary@gmail.com>, 2012.
 # Sagar Chalise <chalisesagar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-02-14 13:40+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-09-29 04:33+0000\n"
+"Last-Translator: Paras Nath Chaudhary <opnchaudhary@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
@@ -23,7 +24,7 @@ msgstr "अवधि साँचो"
 
 #: models.py:40
 msgid "session data"
-msgstr "अवधि मिति"
+msgstr "अवधि विवरण"
 
 #: models.py:41
 msgid "expire date"
diff --git a/django/contrib/sessions/locale/nl/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/nl/LC_MESSAGES/django.mo
index 036740f80f..70079045de 100644
Binary files a/django/contrib/sessions/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/nl/LC_MESSAGES/django.po b/django/contrib/sessions/locale/nl/LC_MESSAGES/django.po
index cd46bc0508..3660b7a5fd 100644
--- a/django/contrib/sessions/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/nl/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/nn/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/nn/LC_MESSAGES/django.mo
index da64a6eeee..26e7c20e6c 100644
Binary files a/django/contrib/sessions/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/nn/LC_MESSAGES/django.po b/django/contrib/sessions/locale/nn/LC_MESSAGES/django.po
index 9eb6a83394..bbf954b8ad 100644
--- a/django/contrib/sessions/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/nn/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/pa/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/pa/LC_MESSAGES/django.mo
index b64284617c..b2739f95a7 100644
Binary files a/django/contrib/sessions/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/pa/LC_MESSAGES/django.po b/django/contrib/sessions/locale/pa/LC_MESSAGES/django.po
index 8ada9536e5..7760b633a8 100644
--- a/django/contrib/sessions/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/pa/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/pl/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/pl/LC_MESSAGES/django.mo
index 8b11172d52..c1991b2e76 100644
Binary files a/django/contrib/sessions/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/pl/LC_MESSAGES/django.po b/django/contrib/sessions/locale/pl/LC_MESSAGES/django.po
index 8af56845a9..0063dfa3c3 100644
--- a/django/contrib/sessions/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/pl/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/pt/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/pt/LC_MESSAGES/django.mo
index aa0c92b81b..ff6a9038b5 100644
Binary files a/django/contrib/sessions/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/pt/LC_MESSAGES/django.po b/django/contrib/sessions/locale/pt/LC_MESSAGES/django.po
index fbc6a2edd9..8a0ad49223 100644
--- a/django/contrib/sessions/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/pt/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/pt_BR/LC_MESSAGES/django.mo
index 46c24a689d..61e1bdfaa8 100644
Binary files a/django/contrib/sessions/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/sessions/locale/pt_BR/LC_MESSAGES/django.po
index da64cc5780..984af16f9e 100644
--- a/django/contrib/sessions/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/pt_BR/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ro/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ro/LC_MESSAGES/django.mo
index 06b6cf464f..b5cd346a80 100644
Binary files a/django/contrib/sessions/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ro/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ro/LC_MESSAGES/django.po
index 864d8f75f3..1e6c869560 100644
--- a/django/contrib/sessions/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ro/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ru/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ru/LC_MESSAGES/django.mo
index c093ee9e18..a4c1035754 100644
Binary files a/django/contrib/sessions/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ru/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ru/LC_MESSAGES/django.po
index 3d25b2239b..1dd4caa383 100644
--- a/django/contrib/sessions/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ru/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/sk/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/sk/LC_MESSAGES/django.mo
index 4d0d5e0e9d..b5347a4238 100644
Binary files a/django/contrib/sessions/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/sk/LC_MESSAGES/django.po b/django/contrib/sessions/locale/sk/LC_MESSAGES/django.po
index 8f6b703267..ab0e6dd49b 100644
--- a/django/contrib/sessions/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/sk/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/sl/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/sl/LC_MESSAGES/django.mo
index 2f1c23b095..483915a51d 100644
Binary files a/django/contrib/sessions/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/sl/LC_MESSAGES/django.po b/django/contrib/sessions/locale/sl/LC_MESSAGES/django.po
index c5c5914234..f17f4841a0 100644
--- a/django/contrib/sessions/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/sl/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-02-14 13:40+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-10-31 19:46+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
 #: models.py:38
 msgid "session key"
@@ -28,7 +28,7 @@ msgstr "podatki seje"
 
 #: models.py:41
 msgid "expire date"
-msgstr "čas izteka"
+msgstr "čas preteka"
 
 #: models.py:46
 msgid "session"
diff --git a/django/contrib/sessions/locale/sq/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/sq/LC_MESSAGES/django.mo
index 18227ad437..7ae39d93f7 100644
Binary files a/django/contrib/sessions/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/sq/LC_MESSAGES/django.po b/django/contrib/sessions/locale/sq/LC_MESSAGES/django.po
index db65b6917b..9a32433f74 100644
--- a/django/contrib/sessions/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/sq/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/sr/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/sr/LC_MESSAGES/django.mo
index c10d6a89b2..704e1ca960 100644
Binary files a/django/contrib/sessions/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/sr/LC_MESSAGES/django.po b/django/contrib/sessions/locale/sr/LC_MESSAGES/django.po
index 55fbfc603c..d61ba642e8 100644
--- a/django/contrib/sessions/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/sr/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/sr_Latn/LC_MESSAGES/django.mo
index 8c6fd9f381..5835c474ff 100644
Binary files a/django/contrib/sessions/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/sessions/locale/sr_Latn/LC_MESSAGES/django.po
index b08b989679..33588ba282 100644
--- a/django/contrib/sessions/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/sr_Latn/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/sv/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/sv/LC_MESSAGES/django.mo
index aa6bc7b9e6..f2756c4d87 100644
Binary files a/django/contrib/sessions/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/sv/LC_MESSAGES/django.po b/django/contrib/sessions/locale/sv/LC_MESSAGES/django.po
index 9bef555877..4b89b706e6 100644
--- a/django/contrib/sessions/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/sv/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/sw/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/sw/LC_MESSAGES/django.mo
index 62985ed792..764d2da20b 100644
Binary files a/django/contrib/sessions/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/sw/LC_MESSAGES/django.po b/django/contrib/sessions/locale/sw/LC_MESSAGES/django.po
index 2bff12b6c6..dc208eb26c 100644
--- a/django/contrib/sessions/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/sw/LC_MESSAGES/django.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-09 19:39+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ta/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ta/LC_MESSAGES/django.mo
index 7d292a8036..de118e56fe 100644
Binary files a/django/contrib/sessions/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ta/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ta/LC_MESSAGES/django.po
index 742fb137ba..6e47a83622 100644
--- a/django/contrib/sessions/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ta/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/te/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/te/LC_MESSAGES/django.mo
index b3657b1bc4..e57efa7e29 100644
Binary files a/django/contrib/sessions/locale/te/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/te/LC_MESSAGES/django.po b/django/contrib/sessions/locale/te/LC_MESSAGES/django.po
index f001d6d37b..ff06dadaf8 100644
--- a/django/contrib/sessions/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/te/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/th/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/th/LC_MESSAGES/django.mo
index 29f1622318..e6d6b1d7db 100644
Binary files a/django/contrib/sessions/locale/th/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/th/LC_MESSAGES/django.po b/django/contrib/sessions/locale/th/LC_MESSAGES/django.po
index 6faaebc0d1..3c0e4be7bd 100644
--- a/django/contrib/sessions/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/th/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/tr/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/tr/LC_MESSAGES/django.mo
index 6467ee0368..a9d07bc001 100644
Binary files a/django/contrib/sessions/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/tr/LC_MESSAGES/django.po b/django/contrib/sessions/locale/tr/LC_MESSAGES/django.po
index 5afa1b7f13..be9a4035b7 100644
--- a/django/contrib/sessions/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/tr/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/tt/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/tt/LC_MESSAGES/django.mo
index e27f75966f..1f40b6aa88 100644
Binary files a/django/contrib/sessions/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/tt/LC_MESSAGES/django.po b/django/contrib/sessions/locale/tt/LC_MESSAGES/django.po
index a86e06415f..449e2e2c50 100644
--- a/django/contrib/sessions/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/tt/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/uk/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/uk/LC_MESSAGES/django.mo
index 475fbe7a43..7914513095 100644
Binary files a/django/contrib/sessions/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/uk/LC_MESSAGES/django.po b/django/contrib/sessions/locale/uk/LC_MESSAGES/django.po
index 02ea366840..9d7e239999 100644
--- a/django/contrib/sessions/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/uk/LC_MESSAGES/django.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/ur/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ur/LC_MESSAGES/django.mo
index 6f0fd6ab47..154b9a383a 100644
Binary files a/django/contrib/sessions/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/ur/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ur/LC_MESSAGES/django.po
index c1fc3a5b83..d17786a4f6 100644
--- a/django/contrib/sessions/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/ur/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/vi/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/vi/LC_MESSAGES/django.mo
index f9ee1c8269..6a0ee004bf 100644
Binary files a/django/contrib/sessions/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/vi/LC_MESSAGES/django.po b/django/contrib/sessions/locale/vi/LC_MESSAGES/django.po
index 14e963d952..01ad633e03 100644
--- a/django/contrib/sessions/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/vi/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Tran Van <vantxm@yahoo.co.uk>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/zh_CN/LC_MESSAGES/django.mo
index 49260ec01c..31fbd053c0 100644
Binary files a/django/contrib/sessions/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/sessions/locale/zh_CN/LC_MESSAGES/django.po
index bbc5a64464..71f355ead9 100644
--- a/django/contrib/sessions/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/zh_CN/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/zh_TW/LC_MESSAGES/django.mo
index 3db784b572..0a618cfe88 100644
Binary files a/django/contrib/sessions/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sessions/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/sessions/locale/zh_TW/LC_MESSAGES/django.po
index 085dc8ad77..6345613833 100644
--- a/django/contrib/sessions/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/zh_TW/LC_MESSAGES/django.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:40+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: models.py:38
 msgid "session key"
diff --git a/django/contrib/sessions/tests.py b/django/contrib/sessions/tests.py
index da79ac9de6..8bcc505ee6 100644
--- a/django/contrib/sessions/tests.py
+++ b/django/contrib/sessions/tests.py
@@ -468,6 +468,9 @@ class CacheSessionTests(SessionTestsMixin, unittest.TestCase):
         },
     }, SESSION_CACHE_ALIAS='sessions')
     def test_non_default_cache(self):
+        # Re-initalize the session backend to make use of overridden settings.
+        self.session = self.backend()
+
         self.session.save()
         self.assertEqual(get_cache('default').get(self.session.cache_key), None)
         self.assertNotEqual(get_cache('sessions').get(self.session.cache_key), None)
diff --git a/django/contrib/sitemaps/tests/__init__.py b/django/contrib/sitemaps/tests/__init__.py
index b9cf5f7a7f..fdbb9696d5 100644
--- a/django/contrib/sitemaps/tests/__init__.py
+++ b/django/contrib/sitemaps/tests/__init__.py
@@ -1,4 +1,4 @@
-from .flatpages import FlatpagesSitemapTests
-from .generic import GenericViewsSitemapTests
-from .http import HTTPSitemapTests
-from .https import HTTPSSitemapTests, HTTPSDetectionSitemapTests
+from .test_flatpages import FlatpagesSitemapTests
+from .test_generic import GenericViewsSitemapTests
+from .test_http import HTTPSitemapTests
+from .test_https import HTTPSSitemapTests, HTTPSDetectionSitemapTests
diff --git a/django/contrib/sitemaps/tests/base.py b/django/contrib/sitemaps/tests/base.py
index bbe8229aae..099dba7256 100644
--- a/django/contrib/sitemaps/tests/base.py
+++ b/django/contrib/sitemaps/tests/base.py
@@ -1,9 +1,24 @@
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.core.cache import cache
+from django.db import models
 from django.test import TestCase
 
 
+class TestModel(models.Model):
+    "A test model for "
+    name = models.CharField(max_length=100)
+
+    class Meta:
+        app_label = 'sitemaps'
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return '/testmodel/%s/' % self.id
+
+
 class SitemapTestsBase(TestCase):
     protocol = 'http'
     domain = 'example.com' if Site._meta.installed else 'testserver'
@@ -13,8 +28,8 @@ class SitemapTestsBase(TestCase):
         self.base_url = '%s://%s' % (self.protocol, self.domain)
         self.old_Site_meta_installed = Site._meta.installed
         cache.clear()
-        # Create a user that will double as sitemap content
-        User.objects.create_user('testuser', 'test@example.com', 's3krit')
+        # Create an object for sitemap content.
+        TestModel.objects.create(name='Test Object')
 
     def tearDown(self):
         Site._meta.installed = self.old_Site_meta_installed
diff --git a/django/contrib/sitemaps/tests/flatpages.py b/django/contrib/sitemaps/tests/test_flatpages.py
similarity index 100%
rename from django/contrib/sitemaps/tests/flatpages.py
rename to django/contrib/sitemaps/tests/test_flatpages.py
diff --git a/django/contrib/sitemaps/tests/generic.py b/django/contrib/sitemaps/tests/test_generic.py
similarity index 71%
rename from django/contrib/sitemaps/tests/generic.py
rename to django/contrib/sitemaps/tests/test_generic.py
index ae054c95c2..5b265736b3 100644
--- a/django/contrib/sitemaps/tests/generic.py
+++ b/django/contrib/sitemaps/tests/test_generic.py
@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
-from django.contrib.auth.models import User
 from django.test.utils import override_settings
 
-from .base import SitemapTestsBase
+from .base import TestModel, SitemapTestsBase
+
 
 @override_settings(ABSOLUTE_URL_OVERRIDES={})
 class GenericViewsSitemapTests(SitemapTestsBase):
@@ -12,8 +12,8 @@ class GenericViewsSitemapTests(SitemapTestsBase):
         "A minimal generic sitemap can be rendered"
         response = self.client.get('/generic/sitemap.xml')
         expected = ''
-        for username in User.objects.values_list("username", flat=True):
-            expected += "<url><loc>%s/users/%s/</loc></url>" % (self.base_url, username)
+        for pk in TestModel.objects.values_list("id", flat=True):
+            expected += "<url><loc>%s/testmodel/%s/</loc></url>" % (self.base_url, pk)
         expected_content = """<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 %s
diff --git a/django/contrib/sitemaps/tests/http.py b/django/contrib/sitemaps/tests/test_http.py
similarity index 95%
rename from django/contrib/sitemaps/tests/http.py
rename to django/contrib/sitemaps/tests/test_http.py
index 4a1cf66b17..1a91d970f3 100644
--- a/django/contrib/sitemaps/tests/http.py
+++ b/django/contrib/sitemaps/tests/test_http.py
@@ -4,7 +4,6 @@ import os
 from datetime import date
 
 from django.conf import settings
-from django.contrib.auth.models import User
 from django.contrib.sitemaps import Sitemap, GenericSitemap
 from django.contrib.sites.models import Site
 from django.core.exceptions import ImproperlyConfigured
@@ -14,7 +13,7 @@ from django.utils.formats import localize
 from django.utils._os import upath
 from django.utils.translation import activate, deactivate
 
-from .base import SitemapTestsBase
+from .base import TestModel, SitemapTestsBase
 
 
 class HTTPSitemapTests(SitemapTestsBase):
@@ -128,10 +127,10 @@ class HTTPSitemapTests(SitemapTestsBase):
         Check to make sure that the raw item is included with each
         Sitemap.get_url() url result.
         """
-        user_sitemap = GenericSitemap({'queryset': User.objects.all()})
-        def is_user(url):
-            return isinstance(url['item'], User)
-        item_in_url_info = all(map(is_user, user_sitemap.get_urls()))
+        test_sitemap = GenericSitemap({'queryset': TestModel.objects.all()})
+        def is_testmodel(url):
+            return isinstance(url['item'], TestModel)
+        item_in_url_info = all(map(is_testmodel, test_sitemap.get_urls()))
         self.assertTrue(item_in_url_info)
 
     def test_cached_sitemap_index(self):
diff --git a/django/contrib/sitemaps/tests/https.py b/django/contrib/sitemaps/tests/test_https.py
similarity index 100%
rename from django/contrib/sitemaps/tests/https.py
rename to django/contrib/sitemaps/tests/test_https.py
diff --git a/django/contrib/sitemaps/tests/urls/http.py b/django/contrib/sitemaps/tests/urls/http.py
index 018e46a482..56103f4ec2 100644
--- a/django/contrib/sitemaps/tests/urls/http.py
+++ b/django/contrib/sitemaps/tests/urls/http.py
@@ -4,6 +4,9 @@ from django.contrib.sitemaps import Sitemap, GenericSitemap, FlatPageSitemap, vi
 from django.contrib.auth.models import User
 from django.views.decorators.cache import cache_page
 
+from django.contrib.sitemaps.tests.base import TestModel
+
+
 class SimpleSitemap(Sitemap):
     changefreq = "never"
     priority = 0.5
@@ -18,7 +21,7 @@ simple_sitemaps = {
 }
 
 generic_sitemaps = {
-    'generic': GenericSitemap({'queryset': User.objects.all()}),
+    'generic': GenericSitemap({'queryset': TestModel.objects.all()}),
 }
 
 flatpage_sitemaps = {
diff --git a/django/contrib/sitemaps/views.py b/django/contrib/sitemaps/views.py
index cfe3aa66a9..c8d2f4dfa0 100644
--- a/django/contrib/sitemaps/views.py
+++ b/django/contrib/sitemaps/views.py
@@ -1,3 +1,5 @@
+import warnings
+
 from django.contrib.sites.models import get_current_site
 from django.core import urlresolvers
 from django.core.paginator import EmptyPage, PageNotAnInteger
@@ -6,8 +8,15 @@ from django.template.response import TemplateResponse
 from django.utils import six
 
 def index(request, sitemaps,
-          template_name='sitemap_index.xml', mimetype='application/xml',
-          sitemap_url_name='django.contrib.sitemaps.views.sitemap'):
+          template_name='sitemap_index.xml', content_type='application/xml',
+          sitemap_url_name='django.contrib.sitemaps.views.sitemap',
+          mimetype=None):
+
+    if mimetype:
+        warnings.warn("The mimetype keyword argument is deprecated, use "
+            "content_type instead", DeprecationWarning, stacklevel=2)
+        content_type = mimetype
+
     req_protocol = 'https' if request.is_secure() else 'http'
     req_site = get_current_site(request)
 
@@ -24,10 +33,17 @@ def index(request, sitemaps,
             sites.append('%s?p=%s' % (absolute_url, page))
 
     return TemplateResponse(request, template_name, {'sitemaps': sites},
-                            content_type=mimetype)
+                            content_type=content_type)
 
 def sitemap(request, sitemaps, section=None,
-            template_name='sitemap.xml', mimetype='application/xml'):
+            template_name='sitemap.xml', content_type='application/xml',
+            mimetype=None):
+
+    if mimetype:
+        warnings.warn("The mimetype keyword argument is deprecated, use "
+            "content_type instead", DeprecationWarning, stacklevel=2)
+        content_type = mimetype
+
     req_protocol = 'https' if request.is_secure() else 'http'
     req_site = get_current_site(request)
 
@@ -51,4 +67,4 @@ def sitemap(request, sitemaps, section=None,
         except PageNotAnInteger:
             raise Http404("No page '%s'" % page)
     return TemplateResponse(request, template_name, {'urlset': urls},
-                            content_type=mimetype)
+                            content_type=content_type)
diff --git a/django/contrib/sites/locale/ar/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ar/LC_MESSAGES/django.mo
index 2090369e9f..d296ff85a3 100644
Binary files a/django/contrib/sites/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ar/LC_MESSAGES/django.po b/django/contrib/sites/locale/ar/LC_MESSAGES/django.po
index 541eb23465..b8449f03f6 100644
--- a/django/contrib/sites/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ar/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:48+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "اسم النطاق"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "اسم العرض"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "موقع"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "المواقع"
diff --git a/django/contrib/sites/locale/az/LC_MESSAGES/django.mo b/django/contrib/sites/locale/az/LC_MESSAGES/django.mo
index d394765590..686bf5c026 100644
Binary files a/django/contrib/sites/locale/az/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/az/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/az/LC_MESSAGES/django.po b/django/contrib/sites/locale/az/LC_MESSAGES/django.po
index 37e1ec8f79..17b6953c03 100644
--- a/django/contrib/sites/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/az/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
 "language/az/)\n"
-"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domen"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "adı"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sayt"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "saytlar"
diff --git a/django/contrib/sites/locale/be/LC_MESSAGES/django.mo b/django/contrib/sites/locale/be/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..de58fb6894
Binary files /dev/null and b/django/contrib/sites/locale/be/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/be/LC_MESSAGES/django.po b/django/contrib/sites/locale/be/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..1dd04ca17c
--- /dev/null
+++ b/django/contrib/sites/locale/be/LC_MESSAGES/django.po
@@ -0,0 +1,34 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-08-11 11:08+0000\n"
+"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
+"language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: models.py:39
+msgid "domain name"
+msgstr "назва дамэна"
+
+#: models.py:40
+msgid "display name"
+msgstr "бачная назва"
+
+#: models.py:45
+msgid "site"
+msgstr "сайт"
+
+#: models.py:46
+msgid "sites"
+msgstr "сайты"
diff --git a/django/contrib/sites/locale/bg/LC_MESSAGES/django.mo b/django/contrib/sites/locale/bg/LC_MESSAGES/django.mo
index 6ef2373480..1a76391aea 100644
Binary files a/django/contrib/sites/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/bg/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/bg/LC_MESSAGES/django.po b/django/contrib/sites/locale/bg/LC_MESSAGES/django.po
index 8b94cb21a1..a958ca6d86 100644
--- a/django/contrib/sites/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/bg/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
 "language/bg/)\n"
-"Language: bg\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: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "име на домейна"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "наименование"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "сайт"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "сайтове"
diff --git a/django/contrib/sites/locale/bn/LC_MESSAGES/django.mo b/django/contrib/sites/locale/bn/LC_MESSAGES/django.mo
index 381e4dde87..cfef68ef1d 100644
Binary files a/django/contrib/sites/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/bn/LC_MESSAGES/django.po b/django/contrib/sites/locale/bn/LC_MESSAGES/django.po
index 17a2bb0c24..59ace9544d 100644
--- a/django/contrib/sites/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/bn/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
-"Language: bn\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: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ডোমেইন নাম"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "ডিসপ্লে নাম"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "সাইট"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "সাইটসমূহ"
diff --git a/django/contrib/sites/locale/br/LC_MESSAGES/django.mo b/django/contrib/sites/locale/br/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..5ad977ebff
Binary files /dev/null and b/django/contrib/sites/locale/br/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/br/LC_MESSAGES/django.po b/django/contrib/sites/locale/br/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..997790d382
--- /dev/null
+++ b/django/contrib/sites/locale/br/LC_MESSAGES/django.po
@@ -0,0 +1,34 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Fulup  <fulup.jakez@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-06-29 10:55+0000\n"
+"Last-Translator: Fulup <fulup.jakez@gmail.com>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
+"br/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: models.py:39
+msgid "domain name"
+msgstr "anv domani"
+
+#: models.py:40
+msgid "display name"
+msgstr "anv da ziskouez"
+
+#: models.py:45
+msgid "site"
+msgstr "lec'hienn"
+
+#: models.py:46
+msgid "sites"
+msgstr "lec'hiennoù"
diff --git a/django/contrib/sites/locale/bs/LC_MESSAGES/django.mo b/django/contrib/sites/locale/bs/LC_MESSAGES/django.mo
index e839bf477f..dd4accd2f9 100644
Binary files a/django/contrib/sites/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/bs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/bs/LC_MESSAGES/django.po b/django/contrib/sites/locale/bs/LC_MESSAGES/django.po
index 696892dc55..8d51c45014 100644
--- a/django/contrib/sites/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/bs/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ime domena"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "prikazano ime"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sajt"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sajtovi"
diff --git a/django/contrib/sites/locale/ca/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ca/LC_MESSAGES/django.mo
index 10a13f9335..0ebb2d9d56 100644
Binary files a/django/contrib/sites/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ca/LC_MESSAGES/django.po b/django/contrib/sites/locale/ca/LC_MESSAGES/django.po
index 7877e8c977..7dfcb82bbf 100644
--- a/django/contrib/sites/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ca/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
-"Language: ca\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: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nom del domini"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nom per mostrar"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "lloc"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "llocs"
diff --git a/django/contrib/sites/locale/cs/LC_MESSAGES/django.mo b/django/contrib/sites/locale/cs/LC_MESSAGES/django.mo
index 363e1dad5a..6fd2fc9935 100644
Binary files a/django/contrib/sites/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/cs/LC_MESSAGES/django.po b/django/contrib/sites/locale/cs/LC_MESSAGES/django.po
index f2b48f7907..c66e1bbc12 100644
--- a/django/contrib/sites/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/cs/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "název domény"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "zobrazený název"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "web"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "weby"
diff --git a/django/contrib/sites/locale/cy/LC_MESSAGES/django.mo b/django/contrib/sites/locale/cy/LC_MESSAGES/django.mo
index 9e421b6386..d2b9d36ee3 100644
Binary files a/django/contrib/sites/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/cy/LC_MESSAGES/django.po b/django/contrib/sites/locale/cy/LC_MESSAGES/django.po
index fdbd0c02b2..09162cbaea 100644
--- a/django/contrib/sites/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/cy/LC_MESSAGES/django.po
@@ -6,29 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English <en@li.org>\n"
-"Language: cy\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
+"cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3\n"
+"11) ? 2 : 3;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "parth-enw"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "enw arddangos"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "safle"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "safleoedd"
diff --git a/django/contrib/sites/locale/da/LC_MESSAGES/django.mo b/django/contrib/sites/locale/da/LC_MESSAGES/django.mo
index c07c4d7d97..cd2b10659a 100644
Binary files a/django/contrib/sites/locale/da/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/da/LC_MESSAGES/django.po b/django/contrib/sites/locale/da/LC_MESSAGES/django.po
index c3b4a0f68b..5772ce2586 100644
--- a/django/contrib/sites/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/da/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
-"Language: da\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: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domænenavn"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "vist navn"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "website"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "websites"
diff --git a/django/contrib/sites/locale/de/LC_MESSAGES/django.mo b/django/contrib/sites/locale/de/LC_MESSAGES/django.mo
index a5baeb8de6..c8da3ebd84 100644
Binary files a/django/contrib/sites/locale/de/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/de/LC_MESSAGES/django.po b/django/contrib/sites/locale/de/LC_MESSAGES/django.po
index d864ff7fd6..3fb0e24ccf 100644
--- a/django/contrib/sites/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/de/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
-"Language: de\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: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "Domainname"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "Anzeigename"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "Site"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "Sites"
diff --git a/django/contrib/sites/locale/el/LC_MESSAGES/django.mo b/django/contrib/sites/locale/el/LC_MESSAGES/django.mo
index a53bae1b5e..4ca27d73f2 100644
Binary files a/django/contrib/sites/locale/el/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/el/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/el/LC_MESSAGES/django.po b/django/contrib/sites/locale/el/LC_MESSAGES/django.po
index 2c1b361efb..e783a395c9 100644
--- a/django/contrib/sites/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/el/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
-"Language: el\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: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "όνομα χώρου"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "εμφανιζόμενο όνομα"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "ιστότοπος"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "ιστότοποι"
diff --git a/django/contrib/sites/locale/en/LC_MESSAGES/django.mo b/django/contrib/sites/locale/en/LC_MESSAGES/django.mo
index 83b94c07c4..f8612702dc 100644
Binary files a/django/contrib/sites/locale/en/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/en/LC_MESSAGES/django.po b/django/contrib/sites/locale/en/LC_MESSAGES/django.po
index 410b61b9c7..7d988a9140 100644
--- a/django/contrib/sites/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/en/LC_MESSAGES/django.po
@@ -1,30 +1,37 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:57+0200\n"
-"PO-Revision-Date: 2010-05-13 15:35+0200\n"
-"Last-Translator: Django team\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
+"PO-Revision-Date: 2012-02-14 13:49+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
 "Language: en\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"
 
-#: models.py:39
+#: models.py:25
+msgid "The domain name cannot contain any spaces or tabs."
+msgstr ""
+
+#: models.py:58
 msgid "domain name"
-msgstr ""
+msgstr "domain name"
 
-#: models.py:40
+#: models.py:60
 msgid "display name"
-msgstr ""
+msgstr "display name"
 
-#: models.py:45
+#: models.py:65
 msgid "site"
-msgstr ""
+msgstr "site"
 
-#: models.py:46
+#: models.py:66
 msgid "sites"
-msgstr ""
+msgstr "sites"
diff --git a/django/contrib/sites/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/sites/locale/en_GB/LC_MESSAGES/django.mo
index b761281eb5..0fb6b5c27d 100644
Binary files a/django/contrib/sites/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/en_GB/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/sites/locale/en_GB/LC_MESSAGES/django.po
index 95133f6780..5e9390ec9f 100644
--- a/django/contrib/sites/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/en_GB/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Ross Poulton <ross@rossp.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
-"Language: en_GB\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: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domain name"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "display name"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "site"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sites"
diff --git a/django/contrib/sites/locale/eo/LC_MESSAGES/django.mo b/django/contrib/sites/locale/eo/LC_MESSAGES/django.mo
index 45c6ffcffd..728e923bf7 100644
Binary files a/django/contrib/sites/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/eo/LC_MESSAGES/django.po b/django/contrib/sites/locale/eo/LC_MESSAGES/django.po
index 4348e9f9f5..4812b1f752 100644
--- a/django/contrib/sites/locale/eo/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/eo/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: kristjan <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/django/"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
 "language/eo/)\n"
-"Language: eo\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: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domajna nomo"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "vidiga nomo"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "retejo"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "retejoj"
diff --git a/django/contrib/sites/locale/es/LC_MESSAGES/django.mo b/django/contrib/sites/locale/es/LC_MESSAGES/django.mo
index b9ee258ec5..9558c38149 100644
Binary files a/django/contrib/sites/locale/es/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/es/LC_MESSAGES/django.po b/django/contrib/sites/locale/es/LC_MESSAGES/django.po
index 7d5d6a80a1..c2f7369788 100644
--- a/django/contrib/sites/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/es/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"django/language/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
+"es/)\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: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nombre de dominio"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nombre para mostrar"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sitio"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sitios"
diff --git a/django/contrib/sites/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/sites/locale/es_AR/LC_MESSAGES/django.mo
index a7a710ae54..c844797c1c 100644
Binary files a/django/contrib/sites/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/es_AR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/sites/locale/es_AR/LC_MESSAGES/django.po
index 127033de27..47a7095518 100644
--- a/django/contrib/sites/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/es_AR/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
 "django/language/es_AR/)\n"
-"Language: es_AR\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: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nombre de dominio"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nombre para visualizar"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sitio"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sitios"
diff --git a/django/contrib/sites/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/sites/locale/es_MX/LC_MESSAGES/django.mo
index 73c04285d5..31546d4fca 100644
Binary files a/django/contrib/sites/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/es_MX/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/sites/locale/es_MX/LC_MESSAGES/django.po
index 21481d63be..029909a92d 100644
--- a/django/contrib/sites/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/es_MX/LC_MESSAGES/django.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
-"Language: es_MX\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: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nombre del dominio"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nombre visible"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sitio"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sitios"
diff --git a/django/contrib/sites/locale/et/LC_MESSAGES/django.mo b/django/contrib/sites/locale/et/LC_MESSAGES/django.mo
index e50b4be72b..d7f3636bfa 100644
Binary files a/django/contrib/sites/locale/et/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/et/LC_MESSAGES/django.po b/django/contrib/sites/locale/et/LC_MESSAGES/django.po
index a72fb8a693..a6d6b5962b 100644
--- a/django/contrib/sites/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/et/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/"
 "et/)\n"
-"Language: et\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: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domeeninimi"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "hüüdnimi"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sait"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "saidid"
diff --git a/django/contrib/sites/locale/eu/LC_MESSAGES/django.mo b/django/contrib/sites/locale/eu/LC_MESSAGES/django.mo
index ccee0654c2..ed3586fc07 100644
Binary files a/django/contrib/sites/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/eu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/eu/LC_MESSAGES/django.po b/django/contrib/sites/locale/eu/LC_MESSAGES/django.po
index 322bb5a1ce..1defb626d2 100644
--- a/django/contrib/sites/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/eu/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:48+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Basque (http://www.transifex.com/projects/p/django/language/"
 "eu/)\n"
-"Language: eu\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: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "dominio izena"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "erakusteko izena"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "web gunea"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "web guneak"
diff --git a/django/contrib/sites/locale/fa/LC_MESSAGES/django.mo b/django/contrib/sites/locale/fa/LC_MESSAGES/django.mo
index 0d470b8796..2f709cb580 100644
Binary files a/django/contrib/sites/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/fa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/fa/LC_MESSAGES/django.po b/django/contrib/sites/locale/fa/LC_MESSAGES/django.po
index b2906913af..3d4e35dde9 100644
--- a/django/contrib/sites/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/fa/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Persian (http://www.transifex.com/projects/p/django/language/"
 "fa/)\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "نام دامنه"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "نام نمایش داده شده"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "وبگاه"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "وبگاه‌ها"
diff --git a/django/contrib/sites/locale/fi/LC_MESSAGES/django.mo b/django/contrib/sites/locale/fi/LC_MESSAGES/django.mo
index 460969a2c7..62ffe62a9d 100644
Binary files a/django/contrib/sites/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/fi/LC_MESSAGES/django.po b/django/contrib/sites/locale/fi/LC_MESSAGES/django.po
index 1a879732f1..b9530ccb9f 100644
--- a/django/contrib/sites/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/fi/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/"
 "fi/)\n"
-"Language: fi\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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "verkkotunnus"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "näyttönimi"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sivusto"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sivustot"
diff --git a/django/contrib/sites/locale/fr/LC_MESSAGES/django.mo b/django/contrib/sites/locale/fr/LC_MESSAGES/django.mo
index 79c7750c83..9977f02f0b 100644
Binary files a/django/contrib/sites/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/fr/LC_MESSAGES/django.po b/django/contrib/sites/locale/fr/LC_MESSAGES/django.po
index dd72a6b562..4b50d500fd 100644
--- a/django/contrib/sites/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/fr/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: French (http://www.transifex.com/projects/p/django/language/"
 "fr/)\n"
-"Language: fr\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: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nom de domaine"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nom à afficher"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "site"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sites"
diff --git a/django/contrib/sites/locale/ga/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ga/LC_MESSAGES/django.mo
index f027bdd2ce..9341e81d18 100644
Binary files a/django/contrib/sites/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ga/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ga/LC_MESSAGES/django.po b/django/contrib/sites/locale/ga/LC_MESSAGES/django.po
index 3805325618..3f80f77ab0 100644
--- a/django/contrib/sites/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ga/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Irish (http://www.transifex.com/projects/p/django/language/"
 "ga/)\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4)\n"
+"4);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ainm fearainn"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "ainm taispeáinta"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "suíomh"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "suíomhanna"
diff --git a/django/contrib/sites/locale/gl/LC_MESSAGES/django.mo b/django/contrib/sites/locale/gl/LC_MESSAGES/django.mo
index 7e8e35e696..83c915e6ee 100644
Binary files a/django/contrib/sites/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/gl/LC_MESSAGES/django.po b/django/contrib/sites/locale/gl/LC_MESSAGES/django.po
index 5c1328c2bc..cf4d2a29b5 100644
--- a/django/contrib/sites/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/gl/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django/language/"
 "gl/)\n"
-"Language: gl\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: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "dominio"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nome"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sitio"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sitios"
diff --git a/django/contrib/sites/locale/he/LC_MESSAGES/django.mo b/django/contrib/sites/locale/he/LC_MESSAGES/django.mo
index a1617c42e5..1ced51cfdb 100644
Binary files a/django/contrib/sites/locale/he/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/he/LC_MESSAGES/django.po b/django/contrib/sites/locale/he/LC_MESSAGES/django.po
index 6ea898e58a..6710d38bae 100644
--- a/django/contrib/sites/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/he/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/"
 "he/)\n"
-"Language: he\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: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "שם מתחם"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "שם לתצוגה"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "אתר"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "אתרים"
diff --git a/django/contrib/sites/locale/hi/LC_MESSAGES/django.mo b/django/contrib/sites/locale/hi/LC_MESSAGES/django.mo
index 0fda88aed9..5a3330b6fb 100644
Binary files a/django/contrib/sites/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/hi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/hi/LC_MESSAGES/django.po b/django/contrib/sites/locale/hi/LC_MESSAGES/django.po
index 28ee79f629..6df77991fa 100644
--- a/django/contrib/sites/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/hi/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/"
 "hi/)\n"
-"Language: hi\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: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "डोमेन नाम"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "प्रदर्शन नाम"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "साइट"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "साइट"
diff --git a/django/contrib/sites/locale/hr/LC_MESSAGES/django.mo b/django/contrib/sites/locale/hr/LC_MESSAGES/django.mo
index a5811a79b5..f29646b6f6 100644
Binary files a/django/contrib/sites/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/hr/LC_MESSAGES/django.po b/django/contrib/sites/locale/hr/LC_MESSAGES/django.po
index e43d9d6a95..865cb365bd 100644
--- a/django/contrib/sites/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/hr/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/"
 "hr/)\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ime domene"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "ime za prikaz"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "stranica"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "stranice"
diff --git a/django/contrib/sites/locale/hu/LC_MESSAGES/django.mo b/django/contrib/sites/locale/hu/LC_MESSAGES/django.mo
index 929572ab02..b71b893683 100644
Binary files a/django/contrib/sites/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/hu/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/hu/LC_MESSAGES/django.po b/django/contrib/sites/locale/hu/LC_MESSAGES/django.po
index 2bfe0d4c1c..d96c0ace57 100644
--- a/django/contrib/sites/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/hu/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/django/"
 "language/hu/)\n"
-"Language: hu\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: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "tartománynév"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "megjelenítendő név"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "honlap"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "honlapok"
diff --git a/django/contrib/sites/locale/id/LC_MESSAGES/django.mo b/django/contrib/sites/locale/id/LC_MESSAGES/django.mo
index ceff18fe4b..642d3fb661 100644
Binary files a/django/contrib/sites/locale/id/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/id/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/id/LC_MESSAGES/django.po b/django/contrib/sites/locale/id/LC_MESSAGES/django.po
index 0cc6276fe1..c1c53b717b 100644
--- a/django/contrib/sites/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/id/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/django/"
 "language/id/)\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nama domain"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nama yang ditampilkan"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "situs"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "situs"
diff --git a/django/contrib/sites/locale/is/LC_MESSAGES/django.mo b/django/contrib/sites/locale/is/LC_MESSAGES/django.mo
index 6bc54e8068..1d6b8f1f67 100644
Binary files a/django/contrib/sites/locale/is/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/is/LC_MESSAGES/django.po b/django/contrib/sites/locale/is/LC_MESSAGES/django.po
index 32bd603f32..5f0c7430a4 100644
--- a/django/contrib/sites/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/is/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/django/"
 "language/is/)\n"
-"Language: is\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: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "lén"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "birtingarnafn"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "vefur"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "vefir"
diff --git a/django/contrib/sites/locale/it/LC_MESSAGES/django.mo b/django/contrib/sites/locale/it/LC_MESSAGES/django.mo
index b5abefa1fc..4271a851ca 100644
Binary files a/django/contrib/sites/locale/it/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/it/LC_MESSAGES/django.po b/django/contrib/sites/locale/it/LC_MESSAGES/django.po
index 9cd18cb1c5..d1b5386070 100644
--- a/django/contrib/sites/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/it/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Italian (http://www.transifex.com/projects/p/django/language/"
 "it/)\n"
-"Language: it\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: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nome di dominio"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nome visualizzato"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sito"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "siti"
diff --git a/django/contrib/sites/locale/ja/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ja/LC_MESSAGES/django.mo
index 1dfc7fdcf8..b69434326a 100644
Binary files a/django/contrib/sites/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ja/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ja/LC_MESSAGES/django.po b/django/contrib/sites/locale/ja/LC_MESSAGES/django.po
index 8c65c5543c..3723602335 100644
--- a/django/contrib/sites/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ja/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/"
 "ja/)\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ドメイン名"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "表示名"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "サイト"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "サイト"
diff --git a/django/contrib/sites/locale/ka/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ka/LC_MESSAGES/django.mo
index f42dde3def..bfaf8b12c0 100644
Binary files a/django/contrib/sites/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ka/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ka/LC_MESSAGES/django.po b/django/contrib/sites/locale/ka/LC_MESSAGES/django.po
index 47f4825347..111522964c 100644
--- a/django/contrib/sites/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ka/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/"
 "ka/)\n"
-"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "დომენის სახელი"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "საჩვენებელი სახელი"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "საიტი"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "საიტები"
diff --git a/django/contrib/sites/locale/kk/LC_MESSAGES/django.mo b/django/contrib/sites/locale/kk/LC_MESSAGES/django.mo
index 9e7555bb41..81658f2d2a 100644
Binary files a/django/contrib/sites/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/kk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/kk/LC_MESSAGES/django.po b/django/contrib/sites/locale/kk/LC_MESSAGES/django.po
index 9400c5200d..bb2961d098 100644
--- a/django/contrib/sites/locale/kk/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/kk/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: yun_man_ger <germanilyin@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/"
 "kk/)\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "домналық атауы"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "бейнелеу атауы"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "сайт"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "сайттар"
diff --git a/django/contrib/sites/locale/km/LC_MESSAGES/django.mo b/django/contrib/sites/locale/km/LC_MESSAGES/django.mo
index 419e0d61a5..b2188dc733 100644
Binary files a/django/contrib/sites/locale/km/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/km/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/km/LC_MESSAGES/django.po b/django/contrib/sites/locale/km/LC_MESSAGES/django.po
index 8daef973a5..ea0e8b4453 100644
--- a/django/contrib/sites/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/km/LC_MESSAGES/django.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
-"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ឈ្មោះដមែន"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "ឈ្មោះសំរាប់បង្ហាញ"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "គេហទំព័រ"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "គេហទំព័រ"
diff --git a/django/contrib/sites/locale/kn/LC_MESSAGES/django.mo b/django/contrib/sites/locale/kn/LC_MESSAGES/django.mo
index 70b27dccec..d1fedf7799 100644
Binary files a/django/contrib/sites/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/kn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/kn/LC_MESSAGES/django.po b/django/contrib/sites/locale/kn/LC_MESSAGES/django.po
index 71633fa602..1b4feea6a2 100644
--- a/django/contrib/sites/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/kn/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/"
 "kn/)\n"
-"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ಡೊಮೈನ್  ಹೆಸರು"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "ತೋರಿಸುವ ಹೆಸರು"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "ತಾಣ"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "ತಾಣಗಳು"
diff --git a/django/contrib/sites/locale/ko/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ko/LC_MESSAGES/django.mo
index 58e5a16b27..38653bb289 100644
Binary files a/django/contrib/sites/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ko/LC_MESSAGES/django.po b/django/contrib/sites/locale/ko/LC_MESSAGES/django.po
index b1a9eaf589..4a95c4eaee 100644
--- a/django/contrib/sites/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ko/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Korean (http://www.transifex.com/projects/p/django/language/"
 "ko/)\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "도메인 명"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "표시명"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "사이트"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "사이트(들)"
diff --git a/django/contrib/sites/locale/lt/LC_MESSAGES/django.mo b/django/contrib/sites/locale/lt/LC_MESSAGES/django.mo
index 76e1fc06b8..9d253cbe56 100644
Binary files a/django/contrib/sites/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/lt/LC_MESSAGES/django.po b/django/contrib/sites/locale/lt/LC_MESSAGES/django.po
index 1f587e75b1..8dab745521 100644
--- a/django/contrib/sites/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/lt/LC_MESSAGES/django.po
@@ -7,30 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: mar <m@mar.lt>\n"
-"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/"
 "language/lt/)\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domeno vardas"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "rodomas vardas"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "svetainė"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "svetainės"
diff --git a/django/contrib/sites/locale/lv/LC_MESSAGES/django.mo b/django/contrib/sites/locale/lv/LC_MESSAGES/django.mo
index 7f72cf6537..56547ce90a 100644
Binary files a/django/contrib/sites/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/lv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/lv/LC_MESSAGES/django.po b/django/contrib/sites/locale/lv/LC_MESSAGES/django.po
index 9dc0f51b6d..c33da481be 100644
--- a/django/contrib/sites/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/lv/LC_MESSAGES/django.po
@@ -7,30 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/"
 "lv/)\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2)\n"
+"2);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domēna vārds"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "attēlojamais vārds"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "vietne"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "vietnes"
diff --git a/django/contrib/sites/locale/mk/LC_MESSAGES/django.mo b/django/contrib/sites/locale/mk/LC_MESSAGES/django.mo
index 5a2dac3b37..44d91fc00a 100644
Binary files a/django/contrib/sites/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/mk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/mk/LC_MESSAGES/django.po b/django/contrib/sites/locale/mk/LC_MESSAGES/django.po
index c25b07e0c1..80cab7ffa5 100644
--- a/django/contrib/sites/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/mk/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Macedonian (http://www.transifex.com/projects/p/django/"
 "language/mk/)\n"
-"Language: mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "домејн"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "име кое се прикажува"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "сајт"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "сајтови"
diff --git a/django/contrib/sites/locale/ml/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ml/LC_MESSAGES/django.mo
index 6ca5e87ae8..274c3d2f4e 100644
Binary files a/django/contrib/sites/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ml/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ml/LC_MESSAGES/django.po b/django/contrib/sites/locale/ml/LC_MESSAGES/django.po
index 78a9a5c7d9..dfc48eef3a 100644
--- a/django/contrib/sites/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ml/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/django/"
 "language/ml/)\n"
-"Language: ml\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: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ഡൊമൈന്‍ നാമം"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "പ്രദര്‍ശന നാമം"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "സൈറ്റ്"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "സൈറ്റുകള്‍"
diff --git a/django/contrib/sites/locale/mn/LC_MESSAGES/django.mo b/django/contrib/sites/locale/mn/LC_MESSAGES/django.mo
index 534aeb6272..5d54143e80 100644
Binary files a/django/contrib/sites/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/mn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/mn/LC_MESSAGES/django.po b/django/contrib/sites/locale/mn/LC_MESSAGES/django.po
index 29cc141dda..e963eab7b0 100644
--- a/django/contrib/sites/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/mn/LC_MESSAGES/django.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/django/"
 "language/mn/)\n"
-"Language: mn\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: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "домэйн нэр"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "Харагдах нэр "
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "сайт"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "сайтууд"
diff --git a/django/contrib/sites/locale/nb/LC_MESSAGES/django.mo b/django/contrib/sites/locale/nb/LC_MESSAGES/django.mo
index de40e295bc..af5a2a9b03 100644
Binary files a/django/contrib/sites/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/nb/LC_MESSAGES/django.po b/django/contrib/sites/locale/nb/LC_MESSAGES/django.po
index 4f240b05ef..419e6f2fd2 100644
--- a/django/contrib/sites/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/nb/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/"
 "language/nb/)\n"
-"Language: nb\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domenenavn"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "visningsnavn"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "nettsted"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "nettsteder"
diff --git a/django/contrib/sites/locale/ne/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ne/LC_MESSAGES/django.mo
index b357614001..5b2f3d0394 100644
Binary files a/django/contrib/sites/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ne/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ne/LC_MESSAGES/django.po b/django/contrib/sites/locale/ne/LC_MESSAGES/django.po
index 80428a6d32..8f02330501 100644
--- a/django/contrib/sites/locale/ne/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ne/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
-"Last-Translator: sagarchalise <chalisesagar@gmail.com>\n"
-"Language-Team: Nepali (http://www.transifex.net/projects/p/django/language/"
+"Last-Translator: Sagar Chalise <chalisesagar@gmail.com>\n"
+"Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/"
 "ne/)\n"
-"Language: ne\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: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "डोमेनको नाम"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "देखिने नाम"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "साइट"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "साइटहरु"
diff --git a/django/contrib/sites/locale/nl/LC_MESSAGES/django.mo b/django/contrib/sites/locale/nl/LC_MESSAGES/django.mo
index d41af11975..5318265c81 100644
Binary files a/django/contrib/sites/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/nl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/nl/LC_MESSAGES/django.po b/django/contrib/sites/locale/nl/LC_MESSAGES/django.po
index 929c29f2d8..5c568021d6 100644
--- a/django/contrib/sites/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/nl/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/"
 "nl/)\n"
-"Language: nl\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: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domeinnaam"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "weergavenaam"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "site"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sites"
diff --git a/django/contrib/sites/locale/nn/LC_MESSAGES/django.mo b/django/contrib/sites/locale/nn/LC_MESSAGES/django.mo
index 67835b4a5c..7dfdf81c47 100644
Binary files a/django/contrib/sites/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/nn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/nn/LC_MESSAGES/django.po b/django/contrib/sites/locale/nn/LC_MESSAGES/django.po
index fb51aae8d4..4e77be19f3 100644
--- a/django/contrib/sites/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/nn/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/"
 "language/nn/)\n"
-"Language: nn\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: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domenenamn"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "visingsnamn"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "nettstad"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "nettstader"
diff --git a/django/contrib/sites/locale/pa/LC_MESSAGES/django.mo b/django/contrib/sites/locale/pa/LC_MESSAGES/django.mo
index c201ffc7f2..9f5d10e317 100644
Binary files a/django/contrib/sites/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/pa/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/pa/LC_MESSAGES/django.po b/django/contrib/sites/locale/pa/LC_MESSAGES/django.po
index 527aad9051..df08a2cdf8 100644
--- a/django/contrib/sites/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/pa/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/"
 "language/pa/)\n"
-"Language: pa\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: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ਡੋਮੇਨ ਨਾਂ"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "ਵੇਖਾਉਣ ਲਈ ਨਾਂ"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "ਸਾਈਟ"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "ਸਾਈਟਾਂ"
diff --git a/django/contrib/sites/locale/pl/LC_MESSAGES/django.mo b/django/contrib/sites/locale/pl/LC_MESSAGES/django.mo
index 70d5709cc9..32f23bc84f 100644
Binary files a/django/contrib/sites/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/pl/LC_MESSAGES/django.po b/django/contrib/sites/locale/pl/LC_MESSAGES/django.po
index 7dd687f0a2..5bc3ac011c 100644
--- a/django/contrib/sites/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/pl/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Polish (http://www.transifex.com/projects/p/django/language/"
 "pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nazwa domeny"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "wyświetlana nazwa"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "strona"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "strony"
diff --git a/django/contrib/sites/locale/pt/LC_MESSAGES/django.mo b/django/contrib/sites/locale/pt/LC_MESSAGES/django.mo
index e07e731805..e035a8e7bc 100644
Binary files a/django/contrib/sites/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/pt/LC_MESSAGES/django.po b/django/contrib/sites/locale/pt/LC_MESSAGES/django.po
index a5d0731f0a..3295c7e627 100644
--- a/django/contrib/sites/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/pt/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django/"
 "language/pt/)\n"
-"Language: pt\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: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nome do domínio"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "mostrar nome"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "site"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sites"
diff --git a/django/contrib/sites/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/sites/locale/pt_BR/LC_MESSAGES/django.mo
index a5a68cfb3a..a13f2c4b50 100644
Binary files a/django/contrib/sites/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/sites/locale/pt_BR/LC_MESSAGES/django.po
index d4e199adf9..0059f28499 100644
--- a/django/contrib/sites/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/pt_BR/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
-"Language: pt_BR\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: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nome do domínio"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nome para exibição"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "site"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sites"
diff --git a/django/contrib/sites/locale/ro/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ro/LC_MESSAGES/django.mo
index 2740e31280..adfcb05c93 100644
Binary files a/django/contrib/sites/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ro/LC_MESSAGES/django.po b/django/contrib/sites/locale/ro/LC_MESSAGES/django.po
index 709012142d..ab6ed87f0c 100644
--- a/django/contrib/sites/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ro/LC_MESSAGES/django.po
@@ -7,30 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
-"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/"
 "ro/)\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
+"2:1));\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "nume domeniu"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "nume afișat"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sit"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "situri"
diff --git a/django/contrib/sites/locale/ru/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ru/LC_MESSAGES/django.mo
index 191f8a058f..c470fe7d0b 100644
Binary files a/django/contrib/sites/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ru/LC_MESSAGES/django.po b/django/contrib/sites/locale/ru/LC_MESSAGES/django.po
index 8828d52f40..15d8e45e00 100644
--- a/django/contrib/sites/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ru/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/django/language/"
 "ru/)\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "доменное имя"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "выводимое имя"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "сайт"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "сайты"
diff --git a/django/contrib/sites/locale/sk/LC_MESSAGES/django.mo b/django/contrib/sites/locale/sk/LC_MESSAGES/django.mo
index b924fb4988..f607b65a05 100644
Binary files a/django/contrib/sites/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/sk/LC_MESSAGES/django.po b/django/contrib/sites/locale/sk/LC_MESSAGES/django.po
index 3e70c63b23..b33d052f2a 100644
--- a/django/contrib/sites/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/sk/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/"
 "sk/)\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "názov domény"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "zobrazené meno"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "stránka"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "weby"
diff --git a/django/contrib/sites/locale/sl/LC_MESSAGES/django.mo b/django/contrib/sites/locale/sl/LC_MESSAGES/django.mo
index 29b312d99e..150490ccc3 100644
Binary files a/django/contrib/sites/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/sl/LC_MESSAGES/django.po b/django/contrib/sites/locale/sl/LC_MESSAGES/django.po
index 8ca8469b3d..4aa1b6ee27 100644
--- a/django/contrib/sites/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/sl/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
-"PO-Revision-Date: 2012-02-14 13:49+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"PO-Revision-Date: 2012-10-31 19:51+0000\n"
+"Last-Translator: mateju <>\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/django/"
 "language/sl/)\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3)\n"
+"%100==4 ? 2 : 3);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
-msgstr "domena"
+msgstr "ime domene"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
-msgstr "prikazno ime"
+msgstr "prikazano ime"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "stran"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "strani"
diff --git a/django/contrib/sites/locale/sq/LC_MESSAGES/django.mo b/django/contrib/sites/locale/sq/LC_MESSAGES/django.mo
index 7d163f0528..8322324dad 100644
Binary files a/django/contrib/sites/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/sq/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/sq/LC_MESSAGES/django.po b/django/contrib/sites/locale/sq/LC_MESSAGES/django.po
index d6533310fa..09d0290676 100644
--- a/django/contrib/sites/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/sq/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/"
 "sq/)\n"
-"Language: sq\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "emër përkatësie"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "emër shfaqjeje"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "site"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "site-e"
diff --git a/django/contrib/sites/locale/sr/LC_MESSAGES/django.mo b/django/contrib/sites/locale/sr/LC_MESSAGES/django.mo
index fa2d012d50..67a402d67f 100644
Binary files a/django/contrib/sites/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/sr/LC_MESSAGES/django.po b/django/contrib/sites/locale/sr/LC_MESSAGES/django.po
index 3c3ac2870f..63c1717426 100644
--- a/django/contrib/sites/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/sr/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/"
 "sr/)\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "име домена"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "приказано име"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "сајт"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "сајтови"
diff --git a/django/contrib/sites/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/sites/locale/sr_Latn/LC_MESSAGES/django.mo
index bb99d50d2d..83dfd1d63d 100644
Binary files a/django/contrib/sites/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/sr_Latn/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/sites/locale/sr_Latn/LC_MESSAGES/django.po
index b552cd1679..8935d815de 100644
--- a/django/contrib/sites/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/sr_Latn/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/"
 "language/sr@latin/)\n"
-"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ime domena"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "prikazano ime"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "sajt"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "sajtovi"
diff --git a/django/contrib/sites/locale/sv/LC_MESSAGES/django.mo b/django/contrib/sites/locale/sv/LC_MESSAGES/django.mo
index 6ac0e27345..639bcbee8d 100644
Binary files a/django/contrib/sites/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/sv/LC_MESSAGES/django.po b/django/contrib/sites/locale/sv/LC_MESSAGES/django.po
index c6a105bace..1efe6a769a 100644
--- a/django/contrib/sites/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/sv/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/"
 "sv/)\n"
-"Language: sv\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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "domännamn"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "visningsnamn"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "webbplats"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "webbplatser"
diff --git a/django/contrib/sites/locale/sw/LC_MESSAGES/django.mo b/django/contrib/sites/locale/sw/LC_MESSAGES/django.mo
index e182aade8c..07d97847c5 100644
Binary files a/django/contrib/sites/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/sw/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/sw/LC_MESSAGES/django.po b/django/contrib/sites/locale/sw/LC_MESSAGES/django.po
index 520bca1b65..197ff4ef2e 100644
--- a/django/contrib/sites/locale/sw/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/sw/LC_MESSAGES/django.po
@@ -5,29 +5,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-03-09 16:07+0000\n"
 "Last-Translator: machaku <bmachaku@gmail.com>\n"
-"Language-Team: Swahili (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/"
 "sw/)\n"
-"Language: sw\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: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "jina la domeini"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "jina la kujionesha"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "tovuti"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "tovuti"
diff --git a/django/contrib/sites/locale/ta/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ta/LC_MESSAGES/django.mo
index d79aa4465e..d1eb24fc81 100644
Binary files a/django/contrib/sites/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ta/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ta/LC_MESSAGES/django.po b/django/contrib/sites/locale/ta/LC_MESSAGES/django.po
index 2a6943a5fb..7cb3d7be38 100644
--- a/django/contrib/sites/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ta/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/"
 "ta/)\n"
-"Language: ta\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: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "களப் பெயர்"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "காட்டும்  பெயர்"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "வலைத்தளம்"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "வலைத்தளங்கள்"
diff --git a/django/contrib/sites/locale/te/LC_MESSAGES/django.mo b/django/contrib/sites/locale/te/LC_MESSAGES/django.mo
index 8b351d811d..bfbdb1a597 100644
Binary files a/django/contrib/sites/locale/te/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/te/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/te/LC_MESSAGES/django.po b/django/contrib/sites/locale/te/LC_MESSAGES/django.po
index 432f10b8f7..a4f3a73dc1 100644
--- a/django/contrib/sites/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/te/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/"
 "te/)\n"
-"Language: te\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: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "డొమైన్ నామము"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "కనిపిచ్చే పేరు"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "సైట్"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "సైట్లు"
diff --git a/django/contrib/sites/locale/th/LC_MESSAGES/django.mo b/django/contrib/sites/locale/th/LC_MESSAGES/django.mo
index 1a4687e0e9..48d7454e0c 100644
Binary files a/django/contrib/sites/locale/th/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/th/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/th/LC_MESSAGES/django.po b/django/contrib/sites/locale/th/LC_MESSAGES/django.po
index 00b71bd692..c401f1753d 100644
--- a/django/contrib/sites/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/th/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Thai (http://www.transifex.com/projects/p/django/language/"
 "th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ชื่อโดเมน"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "ชื่อที่แสดง"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "ไซต์"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "ไซต์"
diff --git a/django/contrib/sites/locale/tr/LC_MESSAGES/django.mo b/django/contrib/sites/locale/tr/LC_MESSAGES/django.mo
index 21ade9f232..6c773d68a0 100644
Binary files a/django/contrib/sites/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/tr/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/tr/LC_MESSAGES/django.po b/django/contrib/sites/locale/tr/LC_MESSAGES/django.po
index 4db6282f5b..a57dbe70b2 100644
--- a/django/contrib/sites/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/tr/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/"
 "tr/)\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "alan adı"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "görünen isim"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "site"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "siteler"
diff --git a/django/contrib/sites/locale/tt/LC_MESSAGES/django.mo b/django/contrib/sites/locale/tt/LC_MESSAGES/django.mo
index 9b533e2df4..687ec72280 100644
Binary files a/django/contrib/sites/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/tt/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/tt/LC_MESSAGES/django.po b/django/contrib/sites/locale/tt/LC_MESSAGES/django.po
index 98c152d33a..afe50c2d9b 100644
--- a/django/contrib/sites/locale/tt/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/tt/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Azat Khasanshin <lordofbazuks@gmail.com>\n"
-"Language-Team: Tatar (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/"
 "tt/)\n"
-"Language: tt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: tt\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "домен исеме"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "чагылдырылган исем"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "сайт"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "сайтлар"
diff --git a/django/contrib/sites/locale/uk/LC_MESSAGES/django.mo b/django/contrib/sites/locale/uk/LC_MESSAGES/django.mo
index fd4322d7aa..f20b990893 100644
Binary files a/django/contrib/sites/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/uk/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/uk/LC_MESSAGES/django.po b/django/contrib/sites/locale/uk/LC_MESSAGES/django.po
index da3e38669b..4302326b3d 100644
--- a/django/contrib/sites/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/uk/LC_MESSAGES/django.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/"
 "language/uk/)\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "доменне ім'я"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "відображуване ім'я"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "сайт"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "сайти"
diff --git a/django/contrib/sites/locale/ur/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ur/LC_MESSAGES/django.mo
index 846072d8cc..df83b924cd 100644
Binary files a/django/contrib/sites/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ur/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/ur/LC_MESSAGES/django.po b/django/contrib/sites/locale/ur/LC_MESSAGES/django.po
index 1c34cf9758..93aea4a319 100644
--- a/django/contrib/sites/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/ur/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/"
 "ur/)\n"
-"Language: ur\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: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "ڈومین کا نام"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "ظاھر ھونے والا نام"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "سائٹ"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "سائٹس"
diff --git a/django/contrib/sites/locale/vi/LC_MESSAGES/django.mo b/django/contrib/sites/locale/vi/LC_MESSAGES/django.mo
index 3bbce1f680..341e8f2f86 100644
Binary files a/django/contrib/sites/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/vi/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/vi/LC_MESSAGES/django.po b/django/contrib/sites/locale/vi/LC_MESSAGES/django.po
index 52490b6bc8..3df8c76938 100644
--- a/django/contrib/sites/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/vi/LC_MESSAGES/django.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Tran <hongdiepkien@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/"
 "language/vi/)\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "Tên miền"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "Tên hiển thị"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "trang web"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "các trang web"
diff --git a/django/contrib/sites/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/sites/locale/zh_CN/LC_MESSAGES/django.mo
index 24f963d926..b3f5caef1f 100644
Binary files a/django/contrib/sites/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/sites/locale/zh_CN/LC_MESSAGES/django.po
index 5d73e4c9c3..0122f699b6 100644
--- a/django/contrib/sites/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/zh_CN/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/"
 "language/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "域名"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "显示名称"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "站点"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "站点"
diff --git a/django/contrib/sites/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/sites/locale/zh_TW/LC_MESSAGES/django.mo
index 9502aca6b4..166f9120f4 100644
Binary files a/django/contrib/sites/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/django/contrib/sites/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/sites/locale/zh_TW/LC_MESSAGES/django.po
index a44f3083d8..8c1f65abc9 100644
--- a/django/contrib/sites/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/zh_TW/LC_MESSAGES/django.po
@@ -6,29 +6,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:43+0100\n"
+"POT-Creation-Date: 2012-10-15 10:57+0200\n"
 "PO-Revision-Date: 2012-02-14 13:49+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/"
 "language/zh_TW/)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: models.py:37
+#: models.py:39
 msgid "domain name"
 msgstr "網域名稱"
 
-#: models.py:38
+#: models.py:40
 msgid "display name"
 msgstr "顯示名稱"
 
-#: models.py:43
+#: models.py:45
 msgid "site"
 msgstr "網站"
 
-#: models.py:44
+#: models.py:46
 msgid "sites"
 msgstr "網站"
diff --git a/django/contrib/sites/managers.py b/django/contrib/sites/managers.py
index 3df485a040..becb35b404 100644
--- a/django/contrib/sites/managers.py
+++ b/django/contrib/sites/managers.py
@@ -35,7 +35,7 @@ class CurrentSiteManager(models.Manager):
                     (self.__class__.__name__, self.__field_name, self.model._meta.object_name))
         self.__is_validated = True
     
-    def get_query_set(self):
+    def get_queryset(self):
         if not self.__is_validated:
             self._validate_field_name()
-        return super(CurrentSiteManager, self).get_query_set().filter(**{self.__field_name + '__id__exact': settings.SITE_ID})
+        return super(CurrentSiteManager, self).get_queryset().filter(**{self.__field_name + '__id__exact': settings.SITE_ID})
diff --git a/django/contrib/sites/models.py b/django/contrib/sites/models.py
index 8590740658..879497deb3 100644
--- a/django/contrib/sites/models.py
+++ b/django/contrib/sites/models.py
@@ -1,11 +1,30 @@
+from __future__ import unicode_literals
+
+import string
+
 from django.db import models
+from django.db.models.signals import pre_save, pre_delete
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import python_2_unicode_compatible
+from django.core.exceptions import ValidationError
 
 
 SITE_CACHE = {}
 
 
+def _simple_domain_name_validator(value):
+    """
+    Validates that the given value contains no whitespaces to prevent common
+    typos.
+    """
+    if not value:
+        return
+    checks = ((s in value) for s in string.whitespace)
+    if any(checks):
+        raise ValidationError(
+            _("The domain name cannot contain any spaces or tabs."))
+
+
 class SiteManager(models.Manager):
 
     def get_current(self):
@@ -36,7 +55,8 @@ class SiteManager(models.Manager):
 @python_2_unicode_compatible
 class Site(models.Model):
 
-    domain = models.CharField(_('domain name'), max_length=100)
+    domain = models.CharField(_('domain name'), max_length=100,
+        validators=[_simple_domain_name_validator])
     name = models.CharField(_('display name'), max_length=50)
     objects = SiteManager()
 
@@ -49,20 +69,6 @@ class Site(models.Model):
     def __str__(self):
         return self.domain
 
-    def save(self, *args, **kwargs):
-        super(Site, self).save(*args, **kwargs)
-        # Cached information will likely be incorrect now.
-        if self.id in SITE_CACHE:
-            del SITE_CACHE[self.id]
-
-    def delete(self):
-        pk = self.pk
-        super(Site, self).delete()
-        try:
-            del SITE_CACHE[pk]
-        except KeyError:
-            pass
-
 
 @python_2_unicode_compatible
 class RequestSite(object):
@@ -96,3 +102,16 @@ def get_current_site(request):
     else:
         current_site = RequestSite(request)
     return current_site
+
+
+def clear_site_cache(sender, **kwargs):
+    """
+    Clears the cache (if primed) each time a site is saved or deleted
+    """
+    instance = kwargs['instance']
+    try:
+        del SITE_CACHE[instance.pk]
+    except KeyError:
+        pass
+pre_save.connect(clear_site_cache, sender=Site)
+pre_delete.connect(clear_site_cache, sender=Site)
diff --git a/django/contrib/sites/tests.py b/django/contrib/sites/tests.py
index 1bb2495e6b..6bfbfd7cf2 100644
--- a/django/contrib/sites/tests.py
+++ b/django/contrib/sites/tests.py
@@ -2,9 +2,10 @@ from __future__ import unicode_literals
 
 from django.conf import settings
 from django.contrib.sites.models import Site, RequestSite, get_current_site
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.http import HttpRequest
 from django.test import TestCase
+from django.test.utils import override_settings
 
 
 class SitesFrameworkTests(TestCase):
@@ -41,6 +42,14 @@ class SitesFrameworkTests(TestCase):
         site = Site.objects.get_current()
         self.assertEqual("Example site", site.name)
 
+    def test_delete_all_sites_clears_cache(self):
+        # When all site objects are deleted the cache should also
+        # be cleared and get_current() should raise a DoesNotExist.
+        self.assertIsInstance(Site.objects.get_current(), Site)
+        Site.objects.all().delete()
+        self.assertRaises(Site.DoesNotExist, Site.objects.get_current)
+
+    @override_settings(ALLOWED_HOSTS=['example.com'])
     def test_get_current_site(self):
         # Test that the correct Site object is returned
         request = HttpRequest()
@@ -62,3 +71,13 @@ class SitesFrameworkTests(TestCase):
         site = get_current_site(request)
         self.assertTrue(isinstance(site, RequestSite))
         self.assertEqual(site.name, "example.com")
+
+    def test_domain_name_with_whitespaces(self):
+        # Regression for #17320
+        # Domain names are not allowed contain whitespace characters
+        site = Site(name="test name", domain="test test")
+        self.assertRaises(ValidationError, site.full_clean)
+        site.domain = "test\ttest"
+        self.assertRaises(ValidationError, site.full_clean)
+        site.domain = "test\ntest"
+        self.assertRaises(ValidationError, site.full_clean)
diff --git a/django/contrib/staticfiles/finders.py b/django/contrib/staticfiles/finders.py
index 9b06c2cf60..8631570e79 100644
--- a/django/contrib/staticfiles/finders.py
+++ b/django/contrib/staticfiles/finders.py
@@ -4,7 +4,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.core.files.storage import default_storage, Storage, FileSystemStorage
 from django.utils.datastructures import SortedDict
 from django.utils.functional import empty, memoize, LazyObject
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 from django.utils._os import safe_join
 from django.utils import six
 
@@ -258,17 +258,7 @@ def _get_finder(import_path):
     Imports the staticfiles finder class described by import_path, where
     import_path is the full Python path to the class.
     """
-    module, attr = import_path.rsplit('.', 1)
-    try:
-        mod = import_module(module)
-    except ImportError as e:
-        raise ImproperlyConfigured('Error importing module %s: "%s"' %
-                                   (module, e))
-    try:
-        Finder = getattr(mod, attr)
-    except AttributeError:
-        raise ImproperlyConfigured('Module "%s" does not define a "%s" '
-                                   'class.' % (module, attr))
+    Finder = import_by_path(import_path)
     if not issubclass(Finder, BaseFinder):
         raise ImproperlyConfigured('Finder "%s" is not a subclass of "%s"' %
                                    (Finder, BaseFinder))
diff --git a/django/contrib/staticfiles/handlers.py b/django/contrib/staticfiles/handlers.py
index 9067a0e75e..5174586ba1 100644
--- a/django/contrib/staticfiles/handlers.py
+++ b/django/contrib/staticfiles/handlers.py
@@ -6,6 +6,7 @@ except ImportError:     # Python 2
     from urlparse import urlparse
 
 from django.conf import settings
+from django.core.handlers.base import get_path_info
 from django.core.handlers.wsgi import WSGIHandler
 
 from django.contrib.staticfiles import utils
@@ -67,6 +68,6 @@ class StaticFilesHandler(WSGIHandler):
         return super(StaticFilesHandler, self).get_response(request)
 
     def __call__(self, environ, start_response):
-        if not self._should_handle(environ['PATH_INFO']):
+        if not self._should_handle(get_path_info(environ)):
             return self.application(environ, start_response)
         return super(StaticFilesHandler, self).__call__(environ, start_response)
diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py
index 0e16e9d649..6116f31efc 100644
--- a/django/contrib/staticfiles/management/commands/collectstatic.py
+++ b/django/contrib/staticfiles/management/commands/collectstatic.py
@@ -60,9 +60,6 @@ class Command(NoArgsCommand):
             self.local = False
         else:
             self.local = True
-        # Use ints for file times (ticket #14665), if supported
-        if hasattr(os, 'stat_float_times'):
-            os.stat_float_times(False)
 
     def set_options(self, **options):
         """
@@ -120,7 +117,7 @@ class Command(NoArgsCommand):
                                                   dry_run=self.dry_run)
             for original_path, processed_path, processed in processor:
                 if processed:
-                    self.log("Post-processed '%s' as '%s" %
+                    self.log("Post-processed '%s' as '%s'" %
                              (original_path, processed_path), level=1)
                     self.post_processed_files.append(original_path)
                 else:
@@ -231,7 +228,9 @@ Type 'yes' to continue, or 'no' to cancel: """
                     else:
                         full_path = None
                     # Skip the file if the source file is younger
-                    if target_last_modified >= source_last_modified:
+                    # Avoid sub-second precision (see #14665, #19540)
+                    if (target_last_modified.replace(microsecond=0)
+                            >= source_last_modified.replace(microsecond=0)):
                         if not ((self.symlink and full_path
                                  and not os.path.islink(full_path)) or
                                 (not self.symlink and full_path
diff --git a/django/contrib/staticfiles/management/commands/findstatic.py b/django/contrib/staticfiles/management/commands/findstatic.py
index dc1e88d778..eaf63f7179 100644
--- a/django/contrib/staticfiles/management/commands/findstatic.py
+++ b/django/contrib/staticfiles/management/commands/findstatic.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import os
 from optparse import make_option
 from django.core.management.base import LabelCommand
-from django.utils.encoding import smart_text
+from django.utils.encoding import force_text
 
 from django.contrib.staticfiles import finders
 
@@ -19,13 +19,16 @@ class Command(LabelCommand):
     def handle_label(self, path, **options):
         verbosity = int(options.get('verbosity', 1))
         result = finders.find(path, all=options['all'])
-        path = smart_text(path)
+        path = force_text(path)
         if result:
             if not isinstance(result, (list, tuple)):
                 result = [result]
-            output = '\n  '.join(
-                (smart_text(os.path.realpath(path)) for path in result))
-            self.stdout.write("Found '%s' here:\n  %s" % (path, output))
+            result = (force_text(os.path.realpath(path)) for path in result)
+            if verbosity >= 1:
+                output = '\n  '.join(result)
+                return "Found '%s' here:\n  %s" % (path, output)
+            else:
+                return '\n'.join(result)
         else:
             if verbosity >= 1:
                 self.stderr.write("No matching file found for '%s'." % path)
diff --git a/django/contrib/staticfiles/storage.py b/django/contrib/staticfiles/storage.py
index 7e87a89f5b..f444e12c19 100644
--- a/django/contrib/staticfiles/storage.py
+++ b/django/contrib/staticfiles/storage.py
@@ -71,7 +71,7 @@ class CachedFilesMixin(object):
                     pattern, template = pattern
                 else:
                     template = self.default_template
-                compiled = re.compile(pattern)
+                compiled = re.compile(pattern, re.IGNORECASE)
                 self._patterns.setdefault(extension, []).append((compiled, template))
 
     def file_hash(self, name, content=None):
diff --git a/django/contrib/staticfiles/templatetags/staticfiles.py b/django/contrib/staticfiles/templatetags/staticfiles.py
index 71339ea8cd..ab922757e2 100644
--- a/django/contrib/staticfiles/templatetags/staticfiles.py
+++ b/django/contrib/staticfiles/templatetags/staticfiles.py
@@ -34,4 +34,4 @@ def do_static(parser, token):
 
 
 def static(path):
-    return StaticNode.handle_simple(path)
+    return staticfiles_storage.url(path)
diff --git a/django/contrib/staticfiles/views.py b/django/contrib/staticfiles/views.py
index 85459812ad..f5c42fedf8 100644
--- a/django/contrib/staticfiles/views.py
+++ b/django/contrib/staticfiles/views.py
@@ -17,7 +17,7 @@ from django.views import static
 
 from django.contrib.staticfiles import finders
 
-def serve(request, path, document_root=None, insecure=False, **kwargs):
+def serve(request, path, insecure=False, **kwargs):
     """
     Serve static files below a given point in the directory structure or
     from locations inferred from the staticfiles finders.
@@ -32,7 +32,7 @@ def serve(request, path, document_root=None, insecure=False, **kwargs):
     """
     if not settings.DEBUG and not insecure:
         raise ImproperlyConfigured("The staticfiles view can only be used in "
-                                   "debug mode or if the the --insecure "
+                                   "debug mode or if the --insecure "
                                    "option of 'runserver' is used")
     normalized_path = posixpath.normpath(unquote(path)).lstrip('/')
     absolute_path = finders.find(normalized_path)
diff --git a/django/contrib/syndication/views.py b/django/contrib/syndication/views.py
index 996b7dfb40..3bfba3ba08 100644
--- a/django/contrib/syndication/views.py
+++ b/django/contrib/syndication/views.py
@@ -11,6 +11,7 @@ from django.utils import feedgenerator, tzinfo
 from django.utils.encoding import force_text, iri_to_uri, smart_text
 from django.utils.html import escape
 from django.utils.http import http_date
+from django.utils import six
 from django.utils.timezone import is_naive
 
 
@@ -69,15 +70,14 @@ class Feed(object):
         except AttributeError:
             return default
         if callable(attr):
-            # Check __code__.co_argcount rather than try/excepting the
-            # function and catching the TypeError, because something inside
-            # the function may raise the TypeError. This technique is more
-            # accurate.
-            if hasattr(attr, '__code__'):
-                argcount = attr.__code__.co_argcount
-            else:
-                argcount = attr.__call__.__code__.co_argcount
-            if argcount == 2: # one argument is 'self'
+            # Check co_argcount rather than try/excepting the function and
+            # catching the TypeError, because something inside the function
+            # may raise the TypeError. This technique is more accurate.
+            try:
+                code = six.get_function_code(attr)
+            except AttributeError:
+                code = six.get_function_code(attr.__call__)
+            if code.co_argcount == 2:       # one argument is 'self'
                 return attr(obj)
             else:
                 return attr()
@@ -100,6 +100,16 @@ class Feed(object):
     def get_object(self, request, *args, **kwargs):
         return None
 
+    def get_context_data(self, **kwargs):
+        """
+        Returns a dictionary to use as extra context if either
+        ``self.description_template`` or ``self.item_template`` are used.
+
+        Default implementation preserves the old behavior
+        of using {'obj': item, 'site': current_site} as the context.
+        """
+        return {'obj': kwargs.get('item'), 'site': kwargs.get('site')}
+
     def get_feed(self, obj, request):
         """
         Returns a feedgenerator.DefaultFeed object, fully populated, for
@@ -146,12 +156,14 @@ class Feed(object):
                 pass
 
         for item in self.__get_dynamic_attr('items', obj):
+            context = self.get_context_data(item=item, site=current_site,
+                                            obj=obj, request=request)
             if title_tmp is not None:
-                title = title_tmp.render(RequestContext(request, {'obj': item, 'site': current_site}))
+                title = title_tmp.render(RequestContext(request, context))
             else:
                 title = self.__get_dynamic_attr('item_title', item)
             if description_tmp is not None:
-                description = description_tmp.render(RequestContext(request, {'obj': item, 'site': current_site}))
+                description = description_tmp.render(RequestContext(request, context))
             else:
                 description = self.__get_dynamic_attr('item_description', item)
             link = add_domain(
@@ -184,6 +196,8 @@ class Feed(object):
                 link = link,
                 description = description,
                 unique_id = self.__get_dynamic_attr('item_guid', item, link),
+                unique_id_is_permalink = self.__get_dynamic_attr(
+                    'item_guid_is_permalink', item),
                 enclosure = enc,
                 pubdate = pubdate,
                 author_name = author_name,
diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py
index 562bcc21bb..1242372dcf 100644
--- a/django/core/cache/__init__.py
+++ b/django/core/cache/__init__.py
@@ -25,6 +25,8 @@ from django.core.cache.backends.base import (
     InvalidCacheBackendError, CacheKeyWarning, BaseCache)
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import importlib
+from django.utils.module_loading import import_by_path
+
 
 __all__ = [
     'get_cache', 'cache', 'DEFAULT_CACHE_ALIAS'
@@ -86,11 +88,10 @@ def parse_backend_conf(backend, **kwargs):
     else:
         try:
             # Trying to import the given backend, in case it's a dotted path
-            mod_path, cls_name = backend.rsplit('.', 1)
-            mod = importlib.import_module(mod_path)
-            backend_cls = getattr(mod, cls_name)
-        except (AttributeError, ImportError, ValueError):
-            raise InvalidCacheBackendError("Could not find backend '%s'" % backend)
+            backend_cls = import_by_path(backend)
+        except ImproperlyConfigured as e:
+            raise InvalidCacheBackendError("Could not find backend '%s': %s" % (
+                backend, e))
         location = kwargs.pop('LOCATION', '')
         return backend, location, kwargs
 
@@ -126,10 +127,8 @@ def get_cache(backend, **kwargs):
             backend_cls = mod.CacheClass
         else:
             backend, location, params = parse_backend_conf(backend, **kwargs)
-            mod_path, cls_name = backend.rsplit('.', 1)
-            mod = importlib.import_module(mod_path)
-            backend_cls = getattr(mod, cls_name)
-    except (AttributeError, ImportError) as e:
+            backend_cls = import_by_path(backend)
+    except (AttributeError, ImportError, ImproperlyConfigured) as e:
         raise InvalidCacheBackendError(
             "Could not find backend '%s': %s" % (backend, e))
     cache = backend_cls(location, params)
diff --git a/django/core/cache/backends/base.py b/django/core/cache/backends/base.py
index 7234d3c4db..53b0270a57 100644
--- a/django/core/cache/backends/base.py
+++ b/django/core/cache/backends/base.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 import warnings
 
 from django.core.exceptions import ImproperlyConfigured, DjangoRuntimeWarning
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 
 
 class InvalidCacheBackendError(ImproperlyConfigured):
@@ -40,9 +40,7 @@ def get_key_func(key_func):
         if callable(key_func):
             return key_func
         else:
-            key_func_module_path, key_func_name = key_func.rsplit('.', 1)
-            key_func_module = import_module(key_func_module_path)
-            return getattr(key_func_module, key_func_name)
+            return import_by_path(key_func)
     return default_key_func
 
 
diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py
index c93bc90b18..7749284122 100644
--- a/django/core/cache/backends/db.py
+++ b/django/core/cache/backends/db.py
@@ -10,7 +10,7 @@ except ImportError:
 
 from django.conf import settings
 from django.core.cache.backends.base import BaseCache
-from django.db import connections, router, transaction, DatabaseError
+from django.db import connections, transaction, router, DatabaseError
 from django.utils import timezone, six
 from django.utils.encoding import force_bytes
 
@@ -23,10 +23,10 @@ class Options(object):
     def __init__(self, table):
         self.db_table = table
         self.app_label = 'django_cache'
-        self.module_name = 'cacheentry'
+        self.model_name = 'cacheentry'
         self.verbose_name = 'cache entry'
         self.verbose_name_plural = 'cache entries'
-        self.object_name =  'CacheEntry'
+        self.object_name = 'CacheEntry'
         self.abstract = False
         self.managed = True
         self.proxy = False
@@ -70,7 +70,6 @@ class DatabaseCache(BaseDatabaseCache):
             cursor = connections[db].cursor()
             cursor.execute("DELETE FROM %s "
                            "WHERE cache_key = %%s" % table, [key])
-            transaction.commit_unless_managed(using=db)
             return default
         value = connections[db].ops.process_clob(row[1])
         return pickle.loads(base64.b64decode(force_bytes(value)))
@@ -109,25 +108,24 @@ class DatabaseCache(BaseDatabaseCache):
         # string, not bytes. Refs #19274.
         if six.PY3:
             b64encoded = b64encoded.decode('latin1')
-        cursor.execute("SELECT cache_key, expires FROM %s "
-                       "WHERE cache_key = %%s" % table, [key])
         try:
-            result = cursor.fetchone()
-            if result and (mode == 'set' or
-                    (mode == 'add' and result[1] < now)):
-                cursor.execute("UPDATE %s SET value = %%s, expires = %%s "
-                               "WHERE cache_key = %%s" % table,
-                               [b64encoded, connections[db].ops.value_to_db_datetime(exp), key])
-            else:
-                cursor.execute("INSERT INTO %s (cache_key, value, expires) "
-                               "VALUES (%%s, %%s, %%s)" % table,
-                               [key, b64encoded, connections[db].ops.value_to_db_datetime(exp)])
+            with transaction.atomic(using=db):
+                cursor.execute("SELECT cache_key, expires FROM %s "
+                               "WHERE cache_key = %%s" % table, [key])
+                result = cursor.fetchone()
+                exp = connections[db].ops.value_to_db_datetime(exp)
+                if result and (mode == 'set' or (mode == 'add' and result[1] < now)):
+                    cursor.execute("UPDATE %s SET value = %%s, expires = %%s "
+                                   "WHERE cache_key = %%s" % table,
+                                   [b64encoded, exp, key])
+                else:
+                    cursor.execute("INSERT INTO %s (cache_key, value, expires) "
+                                   "VALUES (%%s, %%s, %%s)" % table,
+                                   [key, b64encoded, exp])
         except DatabaseError:
             # To be threadsafe, updates/inserts are allowed to fail silently
-            transaction.rollback_unless_managed(using=db)
             return False
         else:
-            transaction.commit_unless_managed(using=db)
             return True
 
     def delete(self, key, version=None):
@@ -139,7 +137,6 @@ class DatabaseCache(BaseDatabaseCache):
         cursor = connections[db].cursor()
 
         cursor.execute("DELETE FROM %s WHERE cache_key = %%s" % table, [key])
-        transaction.commit_unless_managed(using=db)
 
     def has_key(self, key, version=None):
         key = self.make_key(key, version=version)
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 2c3f198847..c942acd52f 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -1,6 +1,7 @@
 "Memcached cache backend"
 
 import time
+import pickle
 from threading import local
 
 from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError
@@ -138,23 +139,6 @@ class BaseMemcachedCache(BaseCache):
     def clear(self):
         self._cache.flush_all()
 
-class CacheClass(BaseMemcachedCache):
-    def __init__(self, server, params):
-        import warnings
-        warnings.warn(
-            "memcached.CacheClass has been split into memcached.MemcachedCache and memcached.PyLibMCCache. Please update your cache backend setting.",
-            DeprecationWarning
-        )
-        try:
-            import memcache
-        except ImportError:
-            raise InvalidCacheBackendError(
-                "Memcached cache backend requires either the 'memcache' or 'cmemcache' library"
-                )
-        super(CacheClass, self).__init__(server, params,
-                                         library=memcache,
-                                         value_not_found_exception=ValueError)
-
 class MemcachedCache(BaseMemcachedCache):
     "An implementation of a cache binding using python-memcached"
     def __init__(self, server, params):
@@ -163,6 +147,12 @@ class MemcachedCache(BaseMemcachedCache):
                                              library=memcache,
                                              value_not_found_exception=ValueError)
 
+    @property
+    def _cache(self):
+        if getattr(self, '_client', None) is None:
+            self._client = self._lib.Client(self._servers, pickleProtocol=pickle.HIGHEST_PROTOCOL)
+        return self._client
+
 class PyLibMCCache(BaseMemcachedCache):
     "An implementation of a cache binding using pylibmc"
     def __init__(self, server, params):
diff --git a/django/core/cache/utils.py b/django/core/cache/utils.py
new file mode 100644
index 0000000000..4310825ad4
--- /dev/null
+++ b/django/core/cache/utils.py
@@ -0,0 +1,15 @@
+from __future__ import absolute_import, unicode_literals
+
+import hashlib
+from django.utils.encoding import force_bytes
+from django.utils.http import urlquote
+
+TEMPLATE_FRAGMENT_KEY_TEMPLATE = 'template.cache.%s.%s'
+
+
+def make_template_fragment_key(fragment_name, vary_on=None):
+    if vary_on is None:
+        vary_on = ()
+    key = ':'.join([urlquote(var) for var in vary_on])
+    args = hashlib.md5(force_bytes(key))
+    return TEMPLATE_FRAGMENT_KEY_TEMPLATE % (fragment_name, args.hexdigest())
diff --git a/django/core/files/images.py b/django/core/files/images.py
index 7d7eac65db..0d87ae853e 100644
--- a/django/core/files/images.py
+++ b/django/core/files/images.py
@@ -3,9 +3,11 @@ Utility functions for handling images.
 
 Requires PIL, as you might imagine.
 """
+import zlib
 
 from django.core.files import File
 
+
 class ImageFile(File):
     """
     A mixin for use alongside django.core.files.base.File, which provides
@@ -26,6 +28,7 @@ class ImageFile(File):
             self._dimensions_cache = get_image_dimensions(self, close=close)
         return self._dimensions_cache
 
+
 def get_image_dimensions(file_or_path, close=False):
     """
     Returns the (width, height) of an image, given an open file or a path.  Set
@@ -55,7 +58,15 @@ def get_image_dimensions(file_or_path, close=False):
             data = file.read(chunk_size)
             if not data:
                 break
-            p.feed(data)
+            try:
+                p.feed(data)
+            except zlib.error as e:
+                # ignore zlib complaining on truncated stream, just feed more
+                # data to parser (ticket #19457).
+                if e.args[0].startswith("Error -5"):
+                    pass
+                else:
+                    raise
             if p.image:
                 return p.image.size
             chunk_size = chunk_size*2
diff --git a/django/core/files/storage.py b/django/core/files/storage.py
index 650373f0c3..89caf3675d 100644
--- a/django/core/files/storage.py
+++ b/django/core/files/storage.py
@@ -8,12 +8,12 @@ import itertools
 from datetime import datetime
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
+from django.core.exceptions import SuspiciousOperation
 from django.core.files import locks, File
 from django.core.files.move import file_move_safe
 from django.utils.encoding import force_text, filepath_to_uri
 from django.utils.functional import LazyObject
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 from django.utils.text import get_valid_filename
 from django.utils._os import safe_join, abspathu
 
@@ -37,13 +37,17 @@ class Storage(object):
 
     def save(self, name, content):
         """
-        Saves new content to the file specified by name. The content should be a
-        proper File object, ready to be read from the beginning.
+        Saves new content to the file specified by name. The content should be
+        a proper File object or any python file-like object, ready to be read
+        from the beginning.
         """
         # Get the proper name for the file, as it will actually be saved.
         if name is None:
             name = content.name
 
+        if not hasattr(content, 'chunks'):
+            content = File(content)
+
         name = self.get_available_name(name)
         name = self._save(name, content)
 
@@ -277,21 +281,7 @@ class FileSystemStorage(Storage):
         return datetime.fromtimestamp(os.path.getmtime(self.path(name)))
 
 def get_storage_class(import_path=None):
-    if import_path is None:
-        import_path = settings.DEFAULT_FILE_STORAGE
-    try:
-        dot = import_path.rindex('.')
-    except ValueError:
-        raise ImproperlyConfigured("%s isn't a storage module." % import_path)
-    module, classname = import_path[:dot], import_path[dot+1:]
-    try:
-        mod = import_module(module)
-    except ImportError as e:
-        raise ImproperlyConfigured('Error importing storage module %s: "%s"' % (module, e))
-    try:
-        return getattr(mod, classname)
-    except AttributeError:
-        raise ImproperlyConfigured('Storage module "%s" does not define a "%s" class.' % (module, classname))
+    return import_by_path(import_path or settings.DEFAULT_FILE_STORAGE)
 
 class DefaultStorage(LazyObject):
     def _setup(self):
diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py
index c422945d6f..f5e95cf2fd 100644
--- a/django/core/files/uploadhandler.py
+++ b/django/core/files/uploadhandler.py
@@ -7,10 +7,9 @@ from __future__ import unicode_literals
 from io import BytesIO
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
 from django.core.files.uploadedfile import TemporaryUploadedFile, InMemoryUploadedFile
-from django.utils import importlib
 from django.utils.encoding import python_2_unicode_compatible
+from django.utils.module_loading import import_by_path
 
 __all__ = ['UploadFileException','StopUpload', 'SkipFile', 'FileUploadHandler',
            'TemporaryFileUploadHandler', 'MemoryFileUploadHandler',
@@ -201,17 +200,4 @@ def load_handler(path, *args, **kwargs):
         <TemporaryFileUploadHandler object at 0x...>
 
     """
-    i = path.rfind('.')
-    module, attr = path[:i], path[i+1:]
-    try:
-        mod = importlib.import_module(module)
-    except ImportError as e:
-        raise ImproperlyConfigured('Error importing upload handler module %s: "%s"' % (module, e))
-    except ValueError:
-        raise ImproperlyConfigured('Error importing upload handler module.'
-            'Is FILE_UPLOAD_HANDLERS a correctly defined list or tuple?')
-    try:
-        cls = getattr(mod, attr)
-    except AttributeError:
-        raise ImproperlyConfigured('Module "%s" does not define a "%s" upload handler backend' % (module, attr))
-    return cls(*args, **kwargs)
+    return import_by_path(path)(*args, **kwargs)
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index 0caf6b29fa..900ea8e6b7 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -5,10 +5,15 @@ import sys
 import types
 
 from django import http
+from django.conf import settings
+from django.core import urlresolvers
 from django.core import signals
+from django.core.exceptions import MiddlewareNotUsed, PermissionDenied
+from django.db import connections, transaction
 from django.utils.encoding import force_text
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 from django.utils import six
+from django.views import debug
 
 logger = logging.getLogger('django.request')
 
@@ -32,8 +37,6 @@ class BaseHandler(object):
 
         Must be called after the environment is fixed (see __call__ in subclasses).
         """
-        from django.conf import settings
-        from django.core import exceptions
         self._view_middleware = []
         self._template_response_middleware = []
         self._response_middleware = []
@@ -41,21 +44,10 @@ class BaseHandler(object):
 
         request_middleware = []
         for middleware_path in settings.MIDDLEWARE_CLASSES:
-            try:
-                mw_module, mw_classname = middleware_path.rsplit('.', 1)
-            except ValueError:
-                raise exceptions.ImproperlyConfigured('%s isn\'t a middleware module' % middleware_path)
-            try:
-                mod = import_module(mw_module)
-            except ImportError as e:
-                raise exceptions.ImproperlyConfigured('Error importing middleware %s: "%s"' % (mw_module, e))
-            try:
-                mw_class = getattr(mod, mw_classname)
-            except AttributeError:
-                raise exceptions.ImproperlyConfigured('Middleware module "%s" does not define a "%s" class' % (mw_module, mw_classname))
+            mw_class = import_by_path(middleware_path)
             try:
                 mw_instance = mw_class()
-            except exceptions.MiddlewareNotUsed:
+            except MiddlewareNotUsed:
                 continue
 
             if hasattr(mw_instance, 'process_request'):
@@ -73,115 +65,118 @@ class BaseHandler(object):
         # as a flag for initialization being complete.
         self._request_middleware = request_middleware
 
+    def make_view_atomic(self, view):
+        if getattr(view, 'transactions_per_request', True):
+            for db in connections.all():
+                if db.settings_dict['ATOMIC_REQUESTS']:
+                    view = transaction.atomic(using=db.alias)(view)
+        return view
+
     def get_response(self, request):
         "Returns an HttpResponse object for the given HttpRequest"
-        from django.core import exceptions, urlresolvers
-        from django.conf import settings
 
+        # Setup default url resolver for this thread, this code is outside
+        # the try/except so we don't get a spurious "unbound local
+        # variable" exception in the event an exception is raised before
+        # resolver is set
+        urlconf = settings.ROOT_URLCONF
+        urlresolvers.set_urlconf(urlconf)
+        resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
         try:
-            # Setup default url resolver for this thread, this code is outside
-            # the try/except so we don't get a spurious "unbound local
-            # variable" exception in the event an exception is raised before
-            # resolver is set
-            urlconf = settings.ROOT_URLCONF
-            urlresolvers.set_urlconf(urlconf)
-            resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
-            try:
-                response = None
-                # Apply request middleware
-                for middleware_method in self._request_middleware:
-                    response = middleware_method(request)
+            response = None
+            # Apply request middleware
+            for middleware_method in self._request_middleware:
+                response = middleware_method(request)
+                if response:
+                    break
+
+            if response is None:
+                if hasattr(request, 'urlconf'):
+                    # Reset url resolver with a custom urlconf.
+                    urlconf = request.urlconf
+                    urlresolvers.set_urlconf(urlconf)
+                    resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
+
+                resolver_match = resolver.resolve(request.path_info)
+                callback, callback_args, callback_kwargs = resolver_match
+                request.resolver_match = resolver_match
+
+                # Apply view middleware
+                for middleware_method in self._view_middleware:
+                    response = middleware_method(request, callback, callback_args, callback_kwargs)
                     if response:
                         break
 
-                if response is None:
-                    if hasattr(request, 'urlconf'):
-                        # Reset url resolver with a custom urlconf.
-                        urlconf = request.urlconf
-                        urlresolvers.set_urlconf(urlconf)
-                        resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
-
-                    resolver_match = resolver.resolve(request.path_info)
-                    callback, callback_args, callback_kwargs = resolver_match
-                    request.resolver_match = resolver_match
-
-                    # Apply view middleware
-                    for middleware_method in self._view_middleware:
-                        response = middleware_method(request, callback, callback_args, callback_kwargs)
+            if response is None:
+                wrapped_callback = self.make_view_atomic(callback)
+                try:
+                    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+                except Exception as e:
+                    # If the view raised an exception, run it through exception
+                    # middleware, and if the exception middleware returns a
+                    # response, use that. Otherwise, reraise the exception.
+                    for middleware_method in self._exception_middleware:
+                        response = middleware_method(request, e)
                         if response:
                             break
+                    if response is None:
+                        raise
 
-                if response is None:
-                    try:
-                        response = callback(request, *callback_args, **callback_kwargs)
-                    except Exception as e:
-                        # If the view raised an exception, run it through exception
-                        # middleware, and if the exception middleware returns a
-                        # response, use that. Otherwise, reraise the exception.
-                        for middleware_method in self._exception_middleware:
-                            response = middleware_method(request, e)
-                            if response:
-                                break
-                        if response is None:
-                            raise
+            # Complain if the view returned None (a common error).
+            if response is None:
+                if isinstance(callback, types.FunctionType):    # FBV
+                    view_name = callback.__name__
+                else:                                           # CBV
+                    view_name = callback.__class__.__name__ + '.__call__'
+                raise ValueError("The view %s.%s didn't return an HttpResponse object." % (callback.__module__, view_name))
 
-                # Complain if the view returned None (a common error).
-                if response is None:
-                    if isinstance(callback, types.FunctionType):    # FBV
-                        view_name = callback.__name__
-                    else:                                           # CBV
-                        view_name = callback.__class__.__name__ + '.__call__'
-                    raise ValueError("The view %s.%s didn't return an HttpResponse object." % (callback.__module__, view_name))
+            # If the response supports deferred rendering, apply template
+            # response middleware and then render the response
+            if hasattr(response, 'render') and callable(response.render):
+                for middleware_method in self._template_response_middleware:
+                    response = middleware_method(request, response)
+                response = response.render()
 
-                # If the response supports deferred rendering, apply template
-                # response middleware and then render the response
-                if hasattr(response, 'render') and callable(response.render):
-                    for middleware_method in self._template_response_middleware:
-                        response = middleware_method(request, response)
-                    response = response.render()
-
-            except http.Http404 as e:
-                logger.warning('Not Found: %s', request.path,
-                            extra={
-                                'status_code': 404,
-                                'request': request
-                            })
-                if settings.DEBUG:
-                    from django.views import debug
-                    response = debug.technical_404_response(request, e)
-                else:
-                    try:
-                        callback, param_dict = resolver.resolve404()
-                        response = callback(request, **param_dict)
-                    except:
-                        signals.got_request_exception.send(sender=self.__class__, request=request)
-                        response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
-            except exceptions.PermissionDenied:
-                logger.warning(
-                    'Forbidden (Permission denied): %s', request.path,
-                    extra={
-                        'status_code': 403,
-                        'request': request
-                    })
+        except http.Http404 as e:
+            logger.warning('Not Found: %s', request.path,
+                        extra={
+                            'status_code': 404,
+                            'request': request
+                        })
+            if settings.DEBUG:
+                response = debug.technical_404_response(request, e)
+            else:
                 try:
-                    callback, param_dict = resolver.resolve403()
+                    callback, param_dict = resolver.resolve404()
                     response = callback(request, **param_dict)
                 except:
-                    signals.got_request_exception.send(
-                            sender=self.__class__, request=request)
-                    response = self.handle_uncaught_exception(request,
-                            resolver, sys.exc_info())
-            except SystemExit:
-                # Allow sys.exit() to actually exit. See tickets #1023 and #4701
-                raise
-            except: # Handle everything else, including SuspiciousOperation, etc.
-                # Get the exception info now, in case another exception is thrown later.
-                signals.got_request_exception.send(sender=self.__class__, request=request)
-                response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
-        finally:
-            # Reset URLconf for this thread on the way out for complete
-            # isolation of request.urlconf
-            urlresolvers.set_urlconf(None)
+                    signals.got_request_exception.send(sender=self.__class__, request=request)
+                    response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
+
+        except PermissionDenied:
+            logger.warning(
+                'Forbidden (Permission denied): %s', request.path,
+                extra={
+                    'status_code': 403,
+                    'request': request
+                })
+            try:
+                callback, param_dict = resolver.resolve403()
+                response = callback(request, **param_dict)
+            except:
+                signals.got_request_exception.send(
+                        sender=self.__class__, request=request)
+                response = self.handle_uncaught_exception(request,
+                        resolver, sys.exc_info())
+
+        except SystemExit:
+            # Allow sys.exit() to actually exit. See tickets #1023 and #4701
+            raise
+
+        except: # Handle everything else, including SuspiciousOperation, etc.
+            # Get the exception info now, in case another exception is thrown later.
+            signals.got_request_exception.send(sender=self.__class__, request=request)
+            response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
 
         try:
             # Apply response middleware, regardless of the response
@@ -204,8 +199,6 @@ class BaseHandler(object):
         caused by anything, so assuming something like the database is always
         available would be an error.
         """
-        from django.conf import settings
-
         if settings.DEBUG_PROPAGATE_EXCEPTIONS:
             raise
 
@@ -218,7 +211,6 @@ class BaseHandler(object):
         )
 
         if settings.DEBUG:
-            from django.views import debug
             return debug.technical_500_response(request, *exc_info)
 
         # If Http500 handler is not installed, re-raise last exception
@@ -238,6 +230,20 @@ class BaseHandler(object):
             response = func(request, response)
         return response
 
+
+def get_path_info(environ):
+    """
+    Returns the HTTP request's PATH_INFO as a unicode string.
+    """
+    path_info = environ.get('PATH_INFO', str('/'))
+    # Under Python 3, strings in environ are decoded with ISO-8859-1;
+    # re-encode to recover the original bytestring provided by the webserver.
+    if six.PY3:
+        path_info = path_info.encode('iso-8859-1')
+    # It'd be better to implement URI-to-IRI decoding, see #19508.
+    return path_info.decode('utf-8')
+
+
 def get_script_name(environ):
     """
     Returns the equivalent of the HTTP request's SCRIPT_NAME environment
@@ -246,7 +252,6 @@ def get_script_name(environ):
     from the client's perspective), unless the FORCE_SCRIPT_NAME setting is
     set (to anything).
     """
-    from django.conf import settings
     if settings.FORCE_SCRIPT_NAME is not None:
         return force_text(settings.FORCE_SCRIPT_NAME)
 
@@ -255,9 +260,14 @@ def get_script_name(environ):
     # rewrites. Unfortunately not every Web server (lighttpd!) passes this
     # information through all the time, so FORCE_SCRIPT_NAME, above, is still
     # needed.
-    script_url = environ.get('SCRIPT_URL', '')
-    if not script_url:
-        script_url = environ.get('REDIRECT_URL', '')
+    script_url = environ.get('SCRIPT_URL', environ.get('REDIRECT_URL', str('')))
     if script_url:
-        return force_text(script_url[:-len(environ.get('PATH_INFO', ''))])
-    return force_text(environ.get('SCRIPT_NAME', ''))
+        script_name = script_url[:-len(environ.get('PATH_INFO', str('')))]
+    else:
+        script_name = environ.get('SCRIPT_NAME', str(''))
+    # Under Python 3, strings in environ are decoded with ISO-8859-1;
+    # re-encode to recover the original bytestring provided by the webserver.
+    if six.PY3:
+        script_name = script_name.encode('iso-8859-1')
+    # It'd be better to implement URI-to-IRI decoding, see #19508.
+    return script_name.decode('utf-8')
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index 4c0710549a..3c88aeac6d 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -128,19 +128,16 @@ class LimitedStream(object):
 class WSGIRequest(http.HttpRequest):
     def __init__(self, environ):
         script_name = base.get_script_name(environ)
-        path_info = force_text(environ.get('PATH_INFO', '/'))
-        if not path_info or path_info == script_name:
+        path_info = base.get_path_info(environ)
+        if not path_info:
             # Sometimes PATH_INFO exists, but is empty (e.g. accessing
             # the SCRIPT_NAME URL without a trailing slash). We really need to
             # operate as if they'd requested '/'. Not amazingly nice to force
             # the path like this, but should be harmless.
-            #
-            # (The comparison of path_info to script_name is to work around an
-            # apparent bug in flup 1.0.1. See Django ticket #8490).
             path_info = '/'
         self.environ = environ
         self.path_info = path_info
-        self.path = '%s%s' % (script_name, path_info)
+        self.path = '%s/%s' % (script_name.rstrip('/'), path_info.lstrip('/'))
         self.META = environ
         self.META['PATH_INFO'] = path_info
         self.META['SCRIPT_NAME'] = script_name
@@ -253,8 +250,8 @@ class WSGIHandler(base.BaseHandler):
             response = http.HttpResponseBadRequest()
         else:
             response = self.get_response(request)
-        finally:
-            signals.request_finished.send(sender=self.__class__)
+
+        response._handler_class = self.__class__
 
         try:
             status_text = STATUS_CODE_TEXT[response.status_code]
diff --git a/django/core/mail/__init__.py b/django/core/mail/__init__.py
index 08f9702934..fcff803376 100644
--- a/django/core/mail/__init__.py
+++ b/django/core/mail/__init__.py
@@ -4,8 +4,7 @@ Tools for sending email.
 from __future__ import unicode_literals
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 
 # Imported for backwards compatibility, and for the sake
 # of a cleaner namespace. These symbols used to be in
@@ -27,18 +26,7 @@ def get_connection(backend=None, fail_silently=False, **kwds):
     Both fail_silently and other keyword arguments are used in the
     constructor of the backend.
     """
-    path = backend or settings.EMAIL_BACKEND
-    try:
-        mod_name, klass_name = path.rsplit('.', 1)
-        mod = import_module(mod_name)
-    except ImportError as e:
-        raise ImproperlyConfigured(('Error importing email backend module %s: "%s"'
-                                    % (mod_name, e)))
-    try:
-        klass = getattr(mod, klass_name)
-    except AttributeError:
-        raise ImproperlyConfigured(('Module "%s" does not define a '
-                                    '"%s" class' % (mod_name, klass_name)))
+    klass = import_by_path(backend or settings.EMAIL_BACKEND)
     return klass(fail_silently=fail_silently, **kwds)
 
 
diff --git a/django/core/mail/backends/smtp.py b/django/core/mail/backends/smtp.py
index b6f7f560ed..e456b7864e 100644
--- a/django/core/mail/backends/smtp.py
+++ b/django/core/mail/backends/smtp.py
@@ -1,6 +1,6 @@
 """SMTP email backend class."""
 import smtplib
-import socket
+import ssl
 import threading
 
 from django.conf import settings
@@ -60,12 +60,15 @@ class EmailBackend(BaseEmailBackend):
 
     def close(self):
         """Closes the connection to the email server."""
+        if self.connection is None:
+            return
         try:
             try:
                 self.connection.quit()
-            except socket.sslerror:
+            except (ssl.SSLError, smtplib.SMTPServerDisconnected):
                 # This happens when calling quit() on a TLS connection
-                # sometimes.
+                # sometimes, or when the connection was already disconnected
+                # by the server.
                 self.connection.close()
             except:
                 if self.fail_silently:
diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
index fab5059376..7638937c94 100644
--- a/django/core/management/__init__.py
+++ b/django/core/management/__init__.py
@@ -391,79 +391,9 @@ class ManagementUtility(object):
         else:
             self.fetch_command(subcommand).run_from_argv(self.argv)
 
-def setup_environ(settings_mod, original_settings_path=None):
-    """
-    Configures the runtime environment. This can also be used by external
-    scripts wanting to set up a similar environment to manage.py.
-    Returns the project directory (assuming the passed settings module is
-    directly in the project directory).
-
-    The "original_settings_path" parameter is optional, but recommended, since
-    trying to work out the original path from the module can be problematic.
-    """
-    warnings.warn(
-        "The 'setup_environ' function is deprecated, "
-        "you likely need to update your 'manage.py'; "
-        "please see the Django 1.4 release notes "
-        "(https://docs.djangoproject.com/en/dev/releases/1.4/).",
-        DeprecationWarning)
-
-    # Add this project to sys.path so that it's importable in the conventional
-    # way. For example, if this file (manage.py) lives in a directory
-    # "myproject", this code would add "/path/to/myproject" to sys.path.
-    if '__init__.py' in upath(settings_mod.__file__):
-        p = os.path.dirname(upath(settings_mod.__file__))
-    else:
-        p = upath(settings_mod.__file__)
-    project_directory, settings_filename = os.path.split(p)
-    if project_directory == os.curdir or not project_directory:
-        project_directory = os.getcwd()
-    project_name = os.path.basename(project_directory)
-
-    # Strip filename suffix to get the module name.
-    settings_name = os.path.splitext(settings_filename)[0]
-
-    # Strip $py for Jython compiled files (like settings$py.class)
-    if settings_name.endswith("$py"):
-        settings_name = settings_name[:-3]
-
-    # Set DJANGO_SETTINGS_MODULE appropriately.
-    if original_settings_path:
-        os.environ['DJANGO_SETTINGS_MODULE'] = original_settings_path
-    else:
-        # If DJANGO_SETTINGS_MODULE is already set, use it.
-        os.environ['DJANGO_SETTINGS_MODULE'] = os.environ.get(
-            'DJANGO_SETTINGS_MODULE',
-            '%s.%s' % (project_name, settings_name)
-        )
-
-    # Import the project module. We add the parent directory to PYTHONPATH to
-    # avoid some of the path errors new users can have.
-    sys.path.append(os.path.join(project_directory, os.pardir))
-    import_module(project_name)
-    sys.path.pop()
-
-    return project_directory
-
 def execute_from_command_line(argv=None):
     """
     A simple method that runs a ManagementUtility.
     """
     utility = ManagementUtility(argv)
     utility.execute()
-
-def execute_manager(settings_mod, argv=None):
-    """
-    Like execute_from_command_line(), but for use by manage.py, a
-    project-specific django-admin.py utility.
-    """
-    warnings.warn(
-        "The 'execute_manager' function is deprecated, "
-        "you likely need to update your 'manage.py'; "
-        "please see the Django 1.4 release notes "
-        "(https://docs.djangoproject.com/en/dev/releases/1.4/).",
-        DeprecationWarning)
-
-    setup_environ(settings_mod)
-    utility = ManagementUtility(argv)
-    utility.execute()
diff --git a/django/core/management/base.py b/django/core/management/base.py
index 895753ea12..e6a968bbad 100644
--- a/django/core/management/base.py
+++ b/django/core/management/base.py
@@ -143,6 +143,23 @@ class BaseCommand(object):
         ``self.validate(app)`` from ``handle()``, where ``app`` is the
         application's Python module.
 
+    ``leave_locale_alone``
+        A boolean indicating whether the locale set in settings should be
+        preserved during the execution of the command instead of being
+        forcibly set to 'en-us'.
+
+        Default value is ``False``.
+
+        Make sure you know what you are doing if you decide to change the value
+        of this option in your custom command if it creates database content
+        that is locale-sensitive and such content shouldn't contain any
+        translations (like it happens e.g. with django.contrim.auth
+        permissions) as making the locale differ from the de facto default
+        'en-us' might cause unintended effects.
+
+        This option can't be False when the can_import_settings option is set
+        to False too because attempting to set the locale needs access to
+        settings. This condition will generate a CommandError.
     """
     # Metadata about this command.
     option_list = (
@@ -163,6 +180,7 @@ class BaseCommand(object):
     can_import_settings = True
     requires_model_validation = True
     output_transaction = False  # Whether to wrap the output in a "BEGIN; COMMIT;"
+    leave_locale_alone = False
 
     def __init__(self):
         self.style = color_style()
@@ -221,9 +239,12 @@ class BaseCommand(object):
         try:
             self.execute(*args, **options.__dict__)
         except Exception as e:
-            if options.traceback:
-                self.stderr.write(traceback.format_exc())
-            self.stderr.write('%s: %s' % (e.__class__.__name__, e))
+            # self.stderr is not guaranteed to be set here
+            stderr = getattr(self, 'stderr', OutputWrapper(sys.stderr, self.style.ERROR))
+            if options.traceback or not isinstance(e, CommandError):
+                stderr.write(traceback.format_exc())
+            else:
+                stderr.write('%s: %s' % (e.__class__.__name__, e))
             sys.exit(1)
 
     def execute(self, *args, **options):
@@ -232,18 +253,28 @@ class BaseCommand(object):
         needed (as controlled by the attribute
         ``self.requires_model_validation``, except if force-skipped).
         """
-
-        # Switch to English, because django-admin.py creates database content
-        # like permissions, and those shouldn't contain any translations.
-        # But only do this if we can assume we have a working settings file,
-        # because django.utils.translation requires settings.
-        saved_lang = None
         self.stdout = OutputWrapper(options.get('stdout', sys.stdout))
         self.stderr = OutputWrapper(options.get('stderr', sys.stderr), self.style.ERROR)
 
         if self.can_import_settings:
+            from django.conf import settings
+
+        saved_locale = None
+        if not self.leave_locale_alone:
+            # Only mess with locales if we can assume we have a working
+            # settings file, because django.utils.translation requires settings
+            # (The final saying about whether the i18n machinery is active will be
+            # found in the value of the USE_I18N setting)
+            if not self.can_import_settings:
+                raise CommandError("Incompatible values of 'leave_locale_alone' "
+                                   "(%s) and 'can_import_settings' (%s) command "
+                                   "options." % (self.leave_locale_alone,
+                                                 self.can_import_settings))
+            # Switch to US English, because django-admin.py creates database
+            # content like permissions, and those shouldn't contain any
+            # translations.
             from django.utils import translation
-            saved_lang = translation.get_language()
+            saved_locale = translation.get_language()
             translation.activate('en-us')
 
         try:
@@ -262,8 +293,8 @@ class BaseCommand(object):
                 if self.output_transaction:
                     self.stdout.write('\n' + self.style.SQL_KEYWORD("COMMIT;"))
         finally:
-            if saved_lang is not None:
-                translation.activate(saved_lang)
+            if saved_locale is not None:
+                translation.activate(saved_locale)
 
     def validate(self, app=None, display_num_errors=False):
         """
diff --git a/django/core/management/commands/cleanup.py b/django/core/management/commands/cleanup.py
index f83c64be8f..e158ebb541 100644
--- a/django/core/management/commands/cleanup.py
+++ b/django/core/management/commands/cleanup.py
@@ -7,5 +7,5 @@ class Command(clearsessions.Command):
     def handle_noargs(self, **options):
         warnings.warn(
             "The `cleanup` command has been deprecated in favor of `clearsessions`.",
-            PendingDeprecationWarning)
+            DeprecationWarning)
         super(Command, self).handle_noargs(**options)
diff --git a/django/core/management/commands/compilemessages.py b/django/core/management/commands/compilemessages.py
index e1d8a33332..cb41492004 100644
--- a/django/core/management/commands/compilemessages.py
+++ b/django/core/management/commands/compilemessages.py
@@ -2,9 +2,10 @@ from __future__ import unicode_literals
 
 import codecs
 import os
-import sys
 from optparse import make_option
+
 from django.core.management.base import BaseCommand, CommandError
+from django.core.management.utils import find_command, popen_wrapper
 from django.utils._os import npath
 
 def has_bom(fn):
@@ -14,7 +15,11 @@ def has_bom(fn):
             sample.startswith(codecs.BOM_UTF16_LE) or \
             sample.startswith(codecs.BOM_UTF16_BE)
 
-def compile_messages(stderr, locale=None):
+def compile_messages(stdout, locale=None):
+    program = 'msgfmt'
+    if find_command(program) is None:
+        raise CommandError("Can't find %s. Make sure you have GNU gettext tools 0.15 or newer installed." % program)
+
     basedirs = [os.path.join('conf', 'locale'), 'locale']
     if os.environ.get('DJANGO_SETTINGS_MODULE'):
         from django.conf import settings
@@ -28,39 +33,39 @@ def compile_messages(stderr, locale=None):
 
     for basedir in basedirs:
         if locale:
-            basedir = os.path.join(basedir, locale, 'LC_MESSAGES')
-        for dirpath, dirnames, filenames in os.walk(basedir):
-            for f in filenames:
-                if f.endswith('.po'):
-                    stderr.write('processing file %s in %s\n' % (f, dirpath))
+            dirs = [os.path.join(basedir, l, 'LC_MESSAGES') for l in (locale if isinstance(locale, list) else [locale])]
+        else:
+            dirs = [basedir]
+        for ldir in dirs:
+            for dirpath, dirnames, filenames in os.walk(ldir):
+                for f in filenames:
+                    if not f.endswith('.po'):
+                        continue
+                    stdout.write('processing file %s in %s\n' % (f, dirpath))
                     fn = os.path.join(dirpath, f)
                     if has_bom(fn):
                         raise CommandError("The %s file has a BOM (Byte Order Mark). Django only supports .po files encoded in UTF-8 and without any BOM." % fn)
                     pf = os.path.splitext(fn)[0]
-                    # Store the names of the .mo and .po files in an environment
-                    # variable, rather than doing a string replacement into the
-                    # command, so that we can take advantage of shell quoting, to
-                    # quote any malicious characters/escaping.
-                    # See http://cyberelk.net/tim/articles/cmdline/ar01s02.html
-                    os.environ['djangocompilemo'] = npath(pf + '.mo')
-                    os.environ['djangocompilepo'] = npath(pf + '.po')
-                    if sys.platform == 'win32': # Different shell-variable syntax
-                        cmd = 'msgfmt --check-format -o "%djangocompilemo%" "%djangocompilepo%"'
-                    else:
-                        cmd = 'msgfmt --check-format -o "$djangocompilemo" "$djangocompilepo"'
-                    os.system(cmd)
+                    args = [program, '--check-format', '-o', npath(pf + '.mo'), npath(pf + '.po')]
+                    output, errors, status = popen_wrapper(args)
+                    if status:
+                        if errors:
+                            msg = "Execution of %s failed: %s" % (program, errors)
+                        else:
+                            msg = "Execution of %s failed" % program
+                        raise CommandError(msg)
 
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
-        make_option('--locale', '-l', dest='locale',
-            help='The locale to process. Default is to process all.'),
+        make_option('--locale', '-l', dest='locale', action='append',
+                    help='locale(s) to process (e.g. de_AT). Default is to process all. Can be used multiple times, accepts a comma-separated list of locale names.'),
     )
     help = 'Compiles .po files to .mo files for use with builtin gettext support.'
 
     requires_model_validation = False
-    can_import_settings = False
+    leave_locale_alone = True
 
     def handle(self, **options):
         locale = options.get('locale')
-        compile_messages(self.stderr, locale=locale)
+        compile_messages(self.stdout, locale=locale)
diff --git a/django/core/management/commands/createcachetable.py b/django/core/management/commands/createcachetable.py
index 411042ee76..94b6b09400 100644
--- a/django/core/management/commands/createcachetable.py
+++ b/django/core/management/commands/createcachetable.py
@@ -53,14 +53,13 @@ class Command(LabelCommand):
         for i, line in enumerate(table_output):
             full_statement.append('    %s%s' % (line, i < len(table_output)-1 and ',' or ''))
         full_statement.append(');')
-        curs = connection.cursor()
-        try:
-            curs.execute("\n".join(full_statement))
-        except DatabaseError as e:
-            transaction.rollback_unless_managed(using=db)
-            raise CommandError(
-                "Cache table '%s' could not be created.\nThe error was: %s." %
-                    (tablename, force_text(e)))
-        for statement in index_output:
-            curs.execute(statement)
-        transaction.commit_unless_managed(using=db)
+        with transaction.commit_on_success_unless_managed():
+            curs = connection.cursor()
+            try:
+                curs.execute("\n".join(full_statement))
+            except DatabaseError as e:
+                raise CommandError(
+                    "Cache table '%s' could not be created.\nThe error was: %s." %
+                        (tablename, force_text(e)))
+            for statement in index_output:
+                curs.execute(statement)
diff --git a/django/core/management/commands/diffsettings.py b/django/core/management/commands/diffsettings.py
index aa7395e5ee..9e70e9ad8f 100644
--- a/django/core/management/commands/diffsettings.py
+++ b/django/core/management/commands/diffsettings.py
@@ -1,14 +1,22 @@
+from optparse import make_option
+
 from django.core.management.base import NoArgsCommand
 
 def module_to_dict(module, omittable=lambda k: k.startswith('_')):
-    "Converts a module namespace to a Python dictionary. Used by get_settings_diff."
-    return dict([(k, repr(v)) for k, v in module.__dict__.items() if not omittable(k)])
+    """Converts a module namespace to a Python dictionary."""
+    return dict((k, repr(v)) for k, v in module.__dict__.items() if not omittable(k))
 
 class Command(NoArgsCommand):
     help = """Displays differences between the current settings.py and Django's
     default settings. Settings that don't appear in the defaults are
     followed by "###"."""
 
+    option_list = NoArgsCommand.option_list + (
+        make_option('--all', action='store_true', dest='all', default=False,
+                    help='Display all settings, regardless of their value. '
+                         'Default values are prefixed by "###".'),
+    )
+
     requires_model_validation = False
 
     def handle_noargs(self, **options):
@@ -22,9 +30,11 @@ class Command(NoArgsCommand):
         default_settings = module_to_dict(global_settings)
 
         output = []
-        for key in sorted(user_settings.keys()):
+        for key in sorted(user_settings):
             if key not in default_settings:
                 output.append("%s = %s  ###" % (key, user_settings[key]))
             elif user_settings[key] != default_settings[key]:
                 output.append("%s = %s" % (key, user_settings[key]))
+            elif options['all']:
+                output.append("### %s = %s" % (key, user_settings[key]))
         return '\n'.join(output)
diff --git a/django/core/management/commands/flush.py b/django/core/management/commands/flush.py
index b8b78434ce..10066417a1 100644
--- a/django/core/management/commands/flush.py
+++ b/django/core/management/commands/flush.py
@@ -1,3 +1,4 @@
+import sys
 from optparse import make_option
 
 from django.conf import settings
@@ -8,6 +9,7 @@ from django.core.management.color import no_style
 from django.core.management.sql import sql_flush, emit_post_sync_signal
 from django.utils.importlib import import_module
 from django.utils.six.moves import input
+from django.utils import six
 
 
 class Command(NoArgsCommand):
@@ -57,19 +59,19 @@ Are you sure you want to do this?
 
         if confirm == 'yes':
             try:
-                cursor = connection.cursor()
-                for sql in sql_list:
-                    cursor.execute(sql)
+                with transaction.commit_on_success_unless_managed():
+                    cursor = connection.cursor()
+                    for sql in sql_list:
+                        cursor.execute(sql)
             except Exception as e:
-                transaction.rollback_unless_managed(using=db)
-                raise CommandError("""Database %s couldn't be flushed. Possible reasons:
-  * The database isn't running or isn't configured correctly.
-  * At least one of the expected database tables doesn't exist.
-  * The SQL was invalid.
-Hint: Look at the output of 'django-admin.py sqlflush'. That's the SQL this command wasn't able to run.
-The full error: %s""" % (connection.settings_dict['NAME'], e))
-            transaction.commit_unless_managed(using=db)
-
+                new_msg = (
+                    "Database %s couldn't be flushed. Possible reasons:\n"
+                    "  * The database isn't running or isn't configured correctly.\n"
+                    "  * At least one of the expected database tables doesn't exist.\n"
+                    "  * The SQL was invalid.\n"
+                    "Hint: Look at the output of 'django-admin.py sqlflush'. That's the SQL this command wasn't able to run.\n"
+                    "The full error: %s") % (connection.settings_dict['NAME'], e)
+                six.reraise(CommandError, CommandError(new_msg), sys.exc_info()[2])
             # Emit the post sync signal. This allows individual
             # applications to respond as if the database had been
             # sync'd from scratch.
@@ -82,8 +84,6 @@ The full error: %s""" % (connection.settings_dict['NAME'], e))
             emit_post_sync_signal(set(all_models), verbosity, interactive, db)
 
             # Reinstall the initial_data fixture.
-            kwargs = options.copy()
-            kwargs['database'] = db
             if options.get('load_initial_data'):
                 # Reinstall the initial_data fixture.
                 call_command('loaddata', 'initial_data', **options)
diff --git a/django/core/management/commands/inspectdb.py b/django/core/management/commands/inspectdb.py
index 936d5e89ab..dc26bb11d2 100644
--- a/django/core/management/commands/inspectdb.py
+++ b/django/core/management/commands/inspectdb.py
@@ -6,7 +6,8 @@ from optparse import make_option
 
 from django.core.management.base import NoArgsCommand, CommandError
 from django.db import connections, DEFAULT_DB_ALIAS
-from django.utils import six
+from django.utils.datastructures import SortedDict
+
 
 class Command(NoArgsCommand):
     help = "Introspects the database tables in the given database and outputs a Django model module."
@@ -34,13 +35,14 @@ class Command(NoArgsCommand):
         table_name_filter = options.get('table_name_filter')
 
         table2model = lambda table_name: table_name.title().replace('_', '').replace(' ', '').replace('-', '')
-        strip_prefix = lambda s: s.startswith("u'") and s[1:] or s
+        strip_prefix = lambda s: s[1:] if s.startswith("u'") else s
 
         cursor = connection.cursor()
         yield "# This is an auto-generated Django model module."
         yield "# You'll have to do the following manually to clean this up:"
-        yield "#     * Rearrange models' order"
-        yield "#     * Make sure each model has one field with primary_key=True"
+        yield "#   * Rearrange models' order"
+        yield "#   * Make sure each model has one field with primary_key=True"
+        yield "#   * Remove `managed = False` lines for those models you wish to give write DB access"
         yield "# Feel free to rename the models, but don't rename db_table values or field names."
         yield "#"
         yield "# Also note: You'll have to insert the output of 'django-admin.py sqlcustom [appname]'"
@@ -67,7 +69,7 @@ class Command(NoArgsCommand):
             used_column_names = [] # Holds column names used in the table so far
             for i, row in enumerate(connection.introspection.get_table_description(cursor, table_name)):
                 comment_notes = [] # Holds Field notes, to be displayed in a Python comment.
-                extra_params = {}  # Holds Field parameters such as 'db_column'.
+                extra_params = SortedDict()  # Holds Field parameters such as 'db_column'.
                 column_name = row[0]
                 is_relation = i in relations
 
@@ -86,7 +88,7 @@ class Command(NoArgsCommand):
                         extra_params['unique'] = True
 
                 if is_relation:
-                    rel_to = relations[i][1] == table_name and "'self'" or table2model(relations[i][1])
+                    rel_to = "self" if relations[i][1] == table_name else table2model(relations[i][1])
                     if rel_to in known_models:
                         field_type = 'ForeignKey(%s' % rel_to
                     else:
@@ -108,9 +110,12 @@ class Command(NoArgsCommand):
                 # Add 'null' and 'blank', if the 'null_ok' flag was present in the
                 # table description.
                 if row[6]: # If it's NULL...
-                    extra_params['blank'] = True
-                    if not field_type in ('TextField(', 'CharField('):
-                        extra_params['null'] = True
+                    if field_type == 'BooleanField(':
+                        field_type = 'NullBooleanField('
+                    else:
+                        extra_params['blank'] = True
+                        if not field_type in ('TextField(', 'CharField('):
+                            extra_params['null'] = True
 
                 field_desc = '%s = models.%s' % (att_name, field_type)
                 if extra_params:
@@ -188,7 +193,7 @@ class Command(NoArgsCommand):
         description, this routine will return the given field type name, as
         well as any additional keyword parameters and notes for the field.
         """
-        field_params = {}
+        field_params = SortedDict()
         field_notes = []
 
         try:
@@ -205,11 +210,18 @@ class Command(NoArgsCommand):
 
         # Add max_length for all CharFields.
         if field_type == 'CharField' and row[3]:
-            field_params['max_length'] = row[3]
+            field_params['max_length'] = int(row[3])
 
         if field_type == 'DecimalField':
-            field_params['max_digits'] = row[4]
-            field_params['decimal_places'] = row[5]
+            if row[4] is None or row[5] is None:
+                field_notes.append(
+                    'max_digits and decimal_places have been guessed, as this '
+                    'database handles decimal fields as float')
+                field_params['max_digits'] = row[4] if row[4] is not None else 10
+                field_params['decimal_places'] = row[5] if row[5] is not None else 5
+            else:
+                field_params['max_digits'] = row[4]
+                field_params['decimal_places'] = row[5]
 
         return field_type, field_params, field_notes
 
@@ -220,5 +232,6 @@ class Command(NoArgsCommand):
         to the given database table name.
         """
         return ["    class Meta:",
+                "        managed = False",
                 "        db_table = '%s'" % table_name,
                 ""]
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index ed47b8fbf1..c95d11cf60 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -41,8 +41,6 @@ class Command(BaseCommand):
         self.ignore = options.get('ignore')
         self.using = options.get('database')
 
-        connection = connections[self.using]
-
         if not len(fixture_labels):
             raise CommandError(
                 "No database fixture specified. Please provide the path of at "
@@ -51,13 +49,18 @@ class Command(BaseCommand):
 
         self.verbosity = int(options.get('verbosity'))
 
-        # commit is a stealth option - it isn't really useful as
-        # a command line option, but it can be useful when invoking
-        # loaddata from within another script.
-        # If commit=True, loaddata will use its own transaction;
-        # if commit=False, the data load SQL will become part of
-        # the transaction in place when loaddata was invoked.
-        commit = options.get('commit', True)
+        with transaction.commit_on_success_unless_managed(using=self.using):
+            self.loaddata(fixture_labels)
+
+        # Close the DB connection -- unless we're still in a transaction. This
+        # is required as a workaround for an  edge case in MySQL: if the same
+        # connection is used to create tables, load data, and query, the query
+        # can return incorrect results. See Django #7572, MySQL #37735.
+        if transaction.get_autocommit(self.using):
+            connections[self.using].close()
+
+    def loaddata(self, fixture_labels):
+        connection = connections[self.using]
 
         # Keep a count of the installed objects and fixtures
         self.fixture_count = 0
@@ -65,18 +68,6 @@ class Command(BaseCommand):
         self.fixture_object_count = 0
         self.models = set()
 
-        # Get a cursor (even though we don't need one yet). This has
-        # the side effect of initializing the test database (if
-        # it isn't already initialized).
-        cursor = connection.cursor()
-
-        # Start transaction management. All fixtures are installed in a
-        # single transaction to ensure that all references are resolved.
-        if commit:
-            transaction.commit_unless_managed(using=self.using)
-            transaction.enter_transaction_management(using=self.using)
-            transaction.managed(True, using=self.using)
-
         class SingleZipReader(zipfile.ZipFile):
             def __init__(self, *args, **kwargs):
                 zipfile.ZipFile.__init__(self, *args, **kwargs)
@@ -105,26 +96,17 @@ class Command(BaseCommand):
 
         app_fixtures = [os.path.join(os.path.dirname(path), 'fixtures') for path in app_module_paths]
 
+        with connection.constraint_checks_disabled():
+            for fixture_label in fixture_labels:
+                self.load_label(fixture_label, app_fixtures)
+
+        # Since we disabled constraint checks, we must manually check for
+        # any invalid keys that might have been added
+        table_names = [model._meta.db_table for model in self.models]
         try:
-            with connection.constraint_checks_disabled():
-                for fixture_label in fixture_labels:
-                    self.load_label(fixture_label, app_fixtures)
-
-            # Since we disabled constraint checks, we must manually check for
-            # any invalid keys that might have been added
-            table_names = [model._meta.db_table for model in self.models]
-            try:
-                connection.check_constraints(table_names=table_names)
-            except Exception as e:
-                e.args = ("Problem installing fixtures: %s" % e,)
-                raise
-
-        except (SystemExit, KeyboardInterrupt):
-            raise
+            connection.check_constraints(table_names=table_names)
         except Exception as e:
-            if commit:
-                transaction.rollback(using=self.using)
-                transaction.leave_transaction_management(using=self.using)
+            e.args = ("Problem installing fixtures: %s" % e,)
             raise
 
         # If we found even one object in a fixture, we need to reset the
@@ -134,12 +116,10 @@ class Command(BaseCommand):
             if sequence_sql:
                 if self.verbosity >= 2:
                     self.stdout.write("Resetting sequences\n")
+                cursor = connection.cursor()
                 for line in sequence_sql:
                     cursor.execute(line)
-
-        if commit:
-            transaction.commit(using=self.using)
-            transaction.leave_transaction_management(using=self.using)
+                cursor.close()
 
         if self.verbosity >= 1:
             if self.fixture_object_count == self.loaded_object_count:
@@ -149,13 +129,6 @@ class Command(BaseCommand):
                 self.stdout.write("Installed %d object(s) (of %d) from %d fixture(s)" % (
                     self.loaded_object_count, self.fixture_object_count, self.fixture_count))
 
-        # Close the DB connection. This is required as a workaround for an
-        # edge case in MySQL: if the same connection is used to
-        # create tables, load data, and query, the query can return
-        # incorrect results. See Django #7572, MySQL #37735.
-        if commit:
-            connection.close()
-
     def load_label(self, fixture_label, app_fixtures):
 
         parts = fixture_label.split('.')
diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py
index 606cbe0b85..a7e98173ac 100644
--- a/django/core/management/commands/makemessages.py
+++ b/django/core/management/commands/makemessages.py
@@ -5,118 +5,148 @@ import re
 import sys
 from itertools import dropwhile
 from optparse import make_option
-from subprocess import PIPE, Popen
 
 import django
 from django.core.management.base import CommandError, NoArgsCommand
+from django.core.management.utils import (handle_extensions, find_command,
+    popen_wrapper)
+from django.utils.functional import total_ordering
 from django.utils.text import get_text_list
 from django.utils.jslex import prepare_js_for_gettext
 
 plural_forms_re = re.compile(r'^(?P<value>"Plural-Forms.+?\\n")\s*$', re.MULTILINE | re.DOTALL)
 STATUS_OK = 0
 
-def handle_extensions(extensions=('html',), ignored=('py',)):
-    """
-    Organizes multiple extensions that are separated with commas or passed by
-    using --extension/-e multiple times. Note that the .py extension is ignored
-    here because of the way non-*.py files are handled in make_messages() (they
-    are copied to file.ext.py files to trick xgettext to parse them as Python
-    files).
 
-    For example: running 'django-admin makemessages -e js,txt -e xhtml -a'
-    would result in an extension list: ['.js', '.txt', '.xhtml']
+def check_programs(*programs):
+    for program in programs:
+        if find_command(program) is None:
+            raise CommandError("Can't find %s. Make sure you have GNU "
+                    "gettext tools 0.15 or newer installed." % program)
 
-    >>> handle_extensions(['.html', 'html,js,py,py,py,.py', 'py,.py'])
-    set(['.html', '.js'])
-    >>> handle_extensions(['.html, txt,.tpl'])
-    set(['.html', '.tpl', '.txt'])
-    """
-    ext_list = []
-    for ext in extensions:
-        ext_list.extend(ext.replace(' ', '').split(','))
-    for i, ext in enumerate(ext_list):
-        if not ext.startswith('.'):
-            ext_list[i] = '.%s' % ext_list[i]
-    return set([x for x in ext_list if x.strip('.') not in ignored])
 
-def _popen(cmd):
-    """
-    Friendly wrapper around Popen for Windows
-    """
-    p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt', universal_newlines=True)
-    output, errors = p.communicate()
-    return output, errors, p.returncode
+@total_ordering
+class TranslatableFile(object):
+    def __init__(self, dirpath, file_name):
+        self.file = file_name
+        self.dirpath = dirpath
 
-def find_files(root, ignore_patterns, verbosity, stdout=sys.stdout, symlinks=False):
-    """
-    Helper function to get all files in the given root.
-    """
-    dir_suffix = '%s*' % os.sep
-    norm_patterns = [p[:-len(dir_suffix)] if p.endswith(dir_suffix) else p for p in ignore_patterns]
-    all_files = []
-    for dirpath, dirnames, filenames in os.walk(root, topdown=True, followlinks=symlinks):
-        for dirname in dirnames[:]:
-            if is_ignored(os.path.normpath(os.path.join(dirpath, dirname)), norm_patterns):
-                dirnames.remove(dirname)
-                if verbosity > 1:
-                    stdout.write('ignoring directory %s\n' % dirname)
-        for filename in filenames:
-            if is_ignored(os.path.normpath(os.path.join(dirpath, filename)), ignore_patterns):
-                if verbosity > 1:
-                    stdout.write('ignoring file %s in %s\n' % (filename, dirpath))
-            else:
-                all_files.extend([(dirpath, filename)])
-    all_files.sort()
-    return all_files
+    def __repr__(self):
+        return "<TranslatableFile: %s>" % os.sep.join([self.dirpath, self.file])
 
-def is_ignored(path, ignore_patterns):
-    """
-    Helper function to check if the given path should be ignored or not.
-    """
-    for pattern in ignore_patterns:
-        if fnmatch.fnmatchcase(path, pattern):
-            return True
-    return False
+    def __eq__(self, other):
+        return self.dirpath == other.dirpath and self.file == other.file
 
-def copy_plural_forms(msgs, locale, domain, verbosity, stdout=sys.stdout):
-    """
-    Copies plural forms header contents from a Django catalog of locale to
-    the msgs string, inserting it at the right place. msgs should be the
-    contents of a newly created .po file.
-    """
-    django_dir = os.path.normpath(os.path.join(os.path.dirname(django.__file__)))
-    if domain == 'djangojs':
-        domains = ('djangojs', 'django')
-    else:
-        domains = ('django',)
-    for domain in domains:
-        django_po = os.path.join(django_dir, 'conf', 'locale', locale, 'LC_MESSAGES', '%s.po' % domain)
-        if os.path.exists(django_po):
-            with open(django_po, 'rU') as fp:
-                m = plural_forms_re.search(fp.read())
-            if m:
-                if verbosity > 1:
-                    stdout.write("copying plural forms: %s\n" % m.group('value'))
-                lines = []
-                seen = False
-                for line in msgs.split('\n'):
-                    if not line and not seen:
-                        line = '%s\n' % m.group('value')
-                        seen = True
-                    lines.append(line)
-                msgs = '\n'.join(lines)
-                break
-    return msgs
+    def __lt__(self, other):
+        if self.dirpath == other.dirpath:
+            return self.file < other.file
+        return self.dirpath < other.dirpath
 
-def write_pot_file(potfile, msgs, file, work_file, is_templatized):
+    def process(self, command, potfile, domain, keep_pot=False):
+        """
+        Extract translatable literals from self.file for :param domain:
+        creating or updating the :param potfile: POT file.
+
+        Uses the xgettext GNU gettext utility.
+        """
+
+        from django.utils.translation import templatize
+
+        if command.verbosity > 1:
+            command.stdout.write('processing file %s in %s\n' % (self.file, self.dirpath))
+        _, file_ext = os.path.splitext(self.file)
+        if domain == 'djangojs' and file_ext in command.extensions:
+            is_templatized = True
+            orig_file = os.path.join(self.dirpath, self.file)
+            with open(orig_file) as fp:
+                src_data = fp.read()
+            src_data = prepare_js_for_gettext(src_data)
+            thefile = '%s.c' % self.file
+            work_file = os.path.join(self.dirpath, thefile)
+            with open(work_file, "w") as fp:
+                fp.write(src_data)
+            args = [
+                'xgettext',
+                '-d', domain,
+                '--language=C',
+                '--keyword=gettext_noop',
+                '--keyword=gettext_lazy',
+                '--keyword=ngettext_lazy:1,2',
+                '--keyword=pgettext:1c,2',
+                '--keyword=npgettext:1c,2,3',
+                '--from-code=UTF-8',
+                '--add-comments=Translators',
+                '--output=-'
+            ]
+            if command.wrap:
+                args.append(command.wrap)
+            if command.location:
+                args.append(command.location)
+            args.append(work_file)
+        elif domain == 'django' and (file_ext == '.py' or file_ext in command.extensions):
+            thefile = self.file
+            orig_file = os.path.join(self.dirpath, self.file)
+            is_templatized = file_ext in command.extensions
+            if is_templatized:
+                with open(orig_file, "rU") as fp:
+                    src_data = fp.read()
+                thefile = '%s.py' % self.file
+                content = templatize(src_data, orig_file[2:])
+                with open(os.path.join(self.dirpath, thefile), "w") as fp:
+                    fp.write(content)
+            work_file = os.path.join(self.dirpath, thefile)
+            args = [
+                'xgettext',
+                '-d', domain,
+                '--language=Python',
+                '--keyword=gettext_noop',
+                '--keyword=gettext_lazy',
+                '--keyword=ngettext_lazy:1,2',
+                '--keyword=ugettext_noop',
+                '--keyword=ugettext_lazy',
+                '--keyword=ungettext_lazy:1,2',
+                '--keyword=pgettext:1c,2',
+                '--keyword=npgettext:1c,2,3',
+                '--keyword=pgettext_lazy:1c,2',
+                '--keyword=npgettext_lazy:1c,2,3',
+                '--from-code=UTF-8',
+                '--add-comments=Translators',
+                '--output=-'
+            ]
+            if command.wrap:
+                args.append(command.wrap)
+            if command.location:
+                args.append(command.location)
+            args.append(work_file)
+        else:
+            return
+        msgs, errors, status = popen_wrapper(args)
+        if errors:
+            if status != STATUS_OK:
+                if is_templatized:
+                    os.unlink(work_file)
+                if not keep_pot and os.path.exists(potfile):
+                    os.unlink(potfile)
+                raise CommandError(
+                    "errors happened while running xgettext on %s\n%s" %
+                    (self.file, errors))
+            elif command.verbosity > 0:
+                # Print warnings
+                command.stdout.write(errors)
+        if msgs:
+            if is_templatized:
+                old = '#: ' + work_file[2:]
+                new = '#: ' + orig_file[2:]
+                msgs = msgs.replace(old, new)
+            write_pot_file(potfile, msgs)
+        if is_templatized:
+            os.unlink(work_file)
+
+def write_pot_file(potfile, msgs):
     """
     Write the :param potfile: POT file with the :param msgs: contents,
     previously making sure its format is valid.
     """
-    if is_templatized:
-        old = '#: ' + work_file[2:]
-        new = '#: ' + file[2:]
-        msgs = msgs.replace(old, new)
     if os.path.exists(potfile):
         # Strip the header
         msgs = '\n'.join(dropwhile(len, msgs.split('\n')))
@@ -125,217 +155,12 @@ def write_pot_file(potfile, msgs, file, work_file, is_templatized):
     with open(potfile, 'a') as fp:
         fp.write(msgs)
 
-def process_file(file, dirpath, potfile, domain, verbosity,
-                 extensions, wrap, location, stdout=sys.stdout):
-    """
-    Extract translatable literals from :param file: for :param domain:
-    creating or updating the :param potfile: POT file.
-
-    Uses the xgettext GNU gettext utility.
-    """
-
-    from django.utils.translation import templatize
-
-    if verbosity > 1:
-        stdout.write('processing file %s in %s\n' % (file, dirpath))
-    _, file_ext = os.path.splitext(file)
-    if domain == 'djangojs' and file_ext in extensions:
-        is_templatized = True
-        orig_file = os.path.join(dirpath, file)
-        with open(orig_file) as fp:
-            src_data = fp.read()
-        src_data = prepare_js_for_gettext(src_data)
-        thefile = '%s.c' % file
-        work_file = os.path.join(dirpath, thefile)
-        with open(work_file, "w") as fp:
-            fp.write(src_data)
-        cmd = (
-            'xgettext -d %s -L C %s %s --keyword=gettext_noop '
-            '--keyword=gettext_lazy --keyword=ngettext_lazy:1,2 '
-            '--keyword=pgettext:1c,2 --keyword=npgettext:1c,2,3 '
-            '--from-code UTF-8 --add-comments=Translators -o - "%s"' %
-            (domain, wrap, location, work_file))
-    elif domain == 'django' and (file_ext == '.py' or file_ext in extensions):
-        thefile = file
-        orig_file = os.path.join(dirpath, file)
-        is_templatized = file_ext in extensions
-        if is_templatized:
-            with open(orig_file, "rU") as fp:
-                src_data = fp.read()
-            thefile = '%s.py' % file
-            content = templatize(src_data, orig_file[2:])
-            with open(os.path.join(dirpath, thefile), "w") as fp:
-                fp.write(content)
-        work_file = os.path.join(dirpath, thefile)
-        cmd = (
-            'xgettext -d %s -L Python %s %s --keyword=gettext_noop '
-            '--keyword=gettext_lazy --keyword=ngettext_lazy:1,2 '
-            '--keyword=ugettext_noop --keyword=ugettext_lazy '
-            '--keyword=ungettext_lazy:1,2 --keyword=pgettext:1c,2 '
-            '--keyword=npgettext:1c,2,3 --keyword=pgettext_lazy:1c,2 '
-            '--keyword=npgettext_lazy:1c,2,3 --from-code UTF-8 '
-            '--add-comments=Translators -o - "%s"' %
-            (domain, wrap, location, work_file))
-    else:
-        return
-    msgs, errors, status = _popen(cmd)
-    if errors:
-        if status != STATUS_OK:
-            if is_templatized:
-                os.unlink(work_file)
-            if os.path.exists(potfile):
-                os.unlink(potfile)
-            raise CommandError(
-                "errors happened while running xgettext on %s\n%s" %
-                (file, errors))
-        elif verbosity > 0:
-            # Print warnings
-            stdout.write(errors)
-    if msgs:
-        write_pot_file(potfile, msgs, orig_file, work_file, is_templatized)
-    if is_templatized:
-        os.unlink(work_file)
-
-def write_po_file(pofile, potfile, domain, locale, verbosity, stdout,
-                  copy_pforms, wrap, location, no_obsolete):
-    """
-    Creates of updates the :param pofile: PO file for :param domain: and :param
-    locale:.  Uses contents of the existing :param potfile:.
-
-    Uses mguniq, msgmerge, and msgattrib GNU gettext utilities.
-    """
-    msgs, errors, status = _popen('msguniq %s %s --to-code=utf-8 "%s"' %
-                                    (wrap, location, potfile))
-    if errors:
-        if status != STATUS_OK:
-            os.unlink(potfile)
-            raise CommandError(
-                "errors happened while running msguniq\n%s" % errors)
-        elif verbosity > 0:
-            stdout.write(errors)
-
-    if os.path.exists(pofile):
-        with open(potfile, 'w') as fp:
-            fp.write(msgs)
-        msgs, errors, status = _popen('msgmerge %s %s -q "%s" "%s"' %
-                                        (wrap, location, pofile, potfile))
-        if errors:
-            if status != STATUS_OK:
-                os.unlink(potfile)
-                raise CommandError(
-                    "errors happened while running msgmerge\n%s" % errors)
-            elif verbosity > 0:
-                stdout.write(errors)
-    elif copy_pforms:
-        msgs = copy_plural_forms(msgs, locale, domain, verbosity, stdout)
-    msgs = msgs.replace(
-        "#. #-#-#-#-#  %s.pot (PACKAGE VERSION)  #-#-#-#-#\n" % domain, "")
-    with open(pofile, 'w') as fp:
-        fp.write(msgs)
-    os.unlink(potfile)
-    if no_obsolete:
-        msgs, errors, status = _popen(
-            'msgattrib %s %s -o "%s" --no-obsolete "%s"' %
-            (wrap, location, pofile, pofile))
-        if errors:
-            if status != STATUS_OK:
-                raise CommandError(
-                    "errors happened while running msgattrib\n%s" % errors)
-            elif verbosity > 0:
-                stdout.write(errors)
-
-def make_messages(locale=None, domain='django', verbosity=1, all=False,
-        extensions=None, symlinks=False, ignore_patterns=None, no_wrap=False,
-        no_location=False, no_obsolete=False, stdout=sys.stdout):
-    """
-    Uses the ``locale/`` directory from the Django Git tree or an
-    application/project to process all files with translatable literals for
-    the :param domain: domain and :param locale: locale.
-    """
-    # Need to ensure that the i18n framework is enabled
-    from django.conf import settings
-    if settings.configured:
-        settings.USE_I18N = True
-    else:
-        settings.configure(USE_I18N = True)
-
-    if ignore_patterns is None:
-        ignore_patterns = []
-
-    invoked_for_django = False
-    if os.path.isdir(os.path.join('conf', 'locale')):
-        localedir = os.path.abspath(os.path.join('conf', 'locale'))
-        invoked_for_django = True
-        # Ignoring all contrib apps
-        ignore_patterns += ['contrib/*']
-    elif os.path.isdir('locale'):
-        localedir = os.path.abspath('locale')
-    else:
-        raise CommandError("This script should be run from the Django Git "
-                "tree or your project or app tree. If you did indeed run it "
-                "from the Git checkout or your project or application, "
-                "maybe you are just missing the conf/locale (in the django "
-                "tree) or locale (for project and application) directory? It "
-                "is not created automatically, you have to create it by hand "
-                "if you want to enable i18n for your project or application.")
-
-    if domain not in ('django', 'djangojs'):
-        raise CommandError("currently makemessages only supports domains 'django' and 'djangojs'")
-
-    if (locale is None and not all) or domain is None:
-        message = "Type '%s help %s' for usage information." % (os.path.basename(sys.argv[0]), sys.argv[1])
-        raise CommandError(message)
-
-    # We require gettext version 0.15 or newer.
-    output, errors, status = _popen('xgettext --version')
-    if status != STATUS_OK:
-        raise CommandError("Error running xgettext. Note that Django "
-                    "internationalization requires GNU gettext 0.15 or newer.")
-    match = re.search(r'(?P<major>\d+)\.(?P<minor>\d+)', output)
-    if match:
-        xversion = (int(match.group('major')), int(match.group('minor')))
-        if xversion < (0, 15):
-            raise CommandError("Django internationalization requires GNU "
-                    "gettext 0.15 or newer. You are using version %s, please "
-                    "upgrade your gettext toolset." % match.group())
-
-    locales = []
-    if locale is not None:
-        locales.append(str(locale))
-    elif all:
-        locale_dirs = filter(os.path.isdir, glob.glob('%s/*' % localedir))
-        locales = [os.path.basename(l) for l in locale_dirs]
-
-    wrap = '--no-wrap' if no_wrap else ''
-    location = '--no-location' if no_location else ''
-
-    for locale in locales:
-        if verbosity > 0:
-            stdout.write("processing language %s\n" % locale)
-        basedir = os.path.join(localedir, locale, 'LC_MESSAGES')
-        if not os.path.isdir(basedir):
-            os.makedirs(basedir)
-
-        pofile = os.path.join(basedir, '%s.po' % str(domain))
-        potfile = os.path.join(basedir, '%s.pot' % str(domain))
-
-        if os.path.exists(potfile):
-            os.unlink(potfile)
-
-        for dirpath, file in find_files(".", ignore_patterns, verbosity,
-                stdout, symlinks=symlinks):
-            process_file(file, dirpath, potfile, domain, verbosity, extensions,
-                    wrap, location, stdout)
-
-        if os.path.exists(potfile):
-            write_po_file(pofile, potfile, domain, locale, verbosity, stdout,
-                    not invoked_for_django, wrap, location, no_obsolete)
-
 
 class Command(NoArgsCommand):
     option_list = NoArgsCommand.option_list + (
-        make_option('--locale', '-l', default=None, dest='locale',
-            help='Creates or updates the message files for the given locale (e.g. pt_BR).'),
+        make_option('--locale', '-l', default=None, dest='locale', action='append',
+            help='Creates or updates the message files for the given locale(s) (e.g. pt_BR). '
+                 'Can be used multiple times, accepts a comma-separated list of locale names.'),
         make_option('--domain', '-d', default='django', dest='domain',
             help='The domain of the message files (default: "django").'),
         make_option('--all', '-a', action='store_true', dest='all',
@@ -348,13 +173,15 @@ class Command(NoArgsCommand):
         make_option('--ignore', '-i', action='append', dest='ignore_patterns',
             default=[], metavar='PATTERN', help='Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.'),
         make_option('--no-default-ignore', action='store_false', dest='use_default_ignore_patterns',
-            default=True, help="Don't ignore the common glob-style patterns 'CVS', '.*' and '*~'."),
+            default=True, help="Don't ignore the common glob-style patterns 'CVS', '.*', '*~' and '*.pyc'."),
         make_option('--no-wrap', action='store_true', dest='no_wrap',
-            default=False, help="Don't break long message lines into several lines"),
+            default=False, help="Don't break long message lines into several lines."),
         make_option('--no-location', action='store_true', dest='no_location',
-            default=False, help="Don't write '#: filename:line' lines"),
+            default=False, help="Don't write '#: filename:line' lines."),
         make_option('--no-obsolete', action='store_true', dest='no_obsolete',
-            default=False, help="Remove obsolete message strings"),
+            default=False, help="Remove obsolete message strings."),
+        make_option('--keep-pot', action='store_true', dest='keep_pot',
+            default=False, help="Keep .pot file after making messages. Useful when debugging."),
     )
     help = ("Runs over the entire source tree of the current directory and "
 "pulls out all strings marked for translation. It creates (or updates) a message "
@@ -363,31 +190,234 @@ class Command(NoArgsCommand):
 "--locale or --all options.")
 
     requires_model_validation = False
-    can_import_settings = False
+    leave_locale_alone = True
 
     def handle_noargs(self, *args, **options):
         locale = options.get('locale')
-        domain = options.get('domain')
-        verbosity = int(options.get('verbosity'))
+        self.domain = options.get('domain')
+        self.verbosity = int(options.get('verbosity'))
         process_all = options.get('all')
         extensions = options.get('extensions')
-        symlinks = options.get('symlinks')
+        self.symlinks = options.get('symlinks')
         ignore_patterns = options.get('ignore_patterns')
         if options.get('use_default_ignore_patterns'):
-            ignore_patterns += ['CVS', '.*', '*~']
-        ignore_patterns = list(set(ignore_patterns))
-        no_wrap = options.get('no_wrap')
-        no_location = options.get('no_location')
-        no_obsolete = options.get('no_obsolete')
-        if domain == 'djangojs':
+            ignore_patterns += ['CVS', '.*', '*~', '*.pyc']
+        self.ignore_patterns = list(set(ignore_patterns))
+        self.wrap = '--no-wrap' if options.get('no_wrap') else ''
+        self.location = '--no-location' if options.get('no_location') else ''
+        self.no_obsolete = options.get('no_obsolete')
+        self.keep_pot = options.get('keep_pot')
+
+        if self.domain not in ('django', 'djangojs'):
+            raise CommandError("currently makemessages only supports domains "
+                               "'django' and 'djangojs'")
+        if self.domain == 'djangojs':
             exts = extensions if extensions else ['js']
         else:
             exts = extensions if extensions else ['html', 'txt']
-        extensions = handle_extensions(exts)
+        self.extensions = handle_extensions(exts)
 
-        if verbosity > 1:
+        if (locale is None and not process_all) or self.domain is None:
+            raise CommandError("Type '%s help %s' for usage information." % (
+                                os.path.basename(sys.argv[0]), sys.argv[1]))
+
+        if self.verbosity > 1:
             self.stdout.write('examining files with the extensions: %s\n'
-                             % get_text_list(list(extensions), 'and'))
+                             % get_text_list(list(self.extensions), 'and'))
 
-        make_messages(locale, domain, verbosity, process_all, extensions,
-            symlinks, ignore_patterns, no_wrap, no_location, no_obsolete, self.stdout)
+        # Need to ensure that the i18n framework is enabled
+        from django.conf import settings
+        if settings.configured:
+            settings.USE_I18N = True
+        else:
+            settings.configure(USE_I18N = True)
+
+        self.invoked_for_django = False
+        if os.path.isdir(os.path.join('conf', 'locale')):
+            localedir = os.path.abspath(os.path.join('conf', 'locale'))
+            self.invoked_for_django = True
+            # Ignoring all contrib apps
+            self.ignore_patterns += ['contrib/*']
+        elif os.path.isdir('locale'):
+            localedir = os.path.abspath('locale')
+        else:
+            raise CommandError("This script should be run from the Django Git "
+                    "tree or your project or app tree. If you did indeed run it "
+                    "from the Git checkout or your project or application, "
+                    "maybe you are just missing the conf/locale (in the django "
+                    "tree) or locale (for project and application) directory? It "
+                    "is not created automatically, you have to create it by hand "
+                    "if you want to enable i18n for your project or application.")
+
+        check_programs('xgettext')
+        # We require gettext version 0.15 or newer.
+        output, errors, status = popen_wrapper(['xgettext', '--version'])
+        if status != STATUS_OK:
+            raise CommandError("Error running xgettext. Note that Django "
+                        "internationalization requires GNU gettext 0.15 or newer.")
+        match = re.search(r'(?P<major>\d+)\.(?P<minor>\d+)', output)
+        if match:
+            xversion = (int(match.group('major')), int(match.group('minor')))
+            if xversion < (0, 15):
+                raise CommandError("Django internationalization requires GNU "
+                        "gettext 0.15 or newer. You are using version %s, please "
+                        "upgrade your gettext toolset." % match.group())
+
+        potfile = self.build_pot_file(localedir)
+
+        # Build po files for each selected locale
+        locales = []
+        if locale is not None:
+            locales += locale.split(',') if not isinstance(locale, list) else locale
+        elif process_all:
+            locale_dirs = filter(os.path.isdir, glob.glob('%s/*' % localedir))
+            locales = [os.path.basename(l) for l in locale_dirs]
+
+        if locales:
+            check_programs('msguniq', 'msgmerge', 'msgattrib')
+
+        try:
+            for locale in locales:
+                if self.verbosity > 0:
+                    self.stdout.write("processing locale %s\n" % locale)
+                self.write_po_file(potfile, locale)
+        finally:
+            if not self.keep_pot and os.path.exists(potfile):
+                os.unlink(potfile)
+
+    def build_pot_file(self, localedir):
+        file_list = self.find_files(".")
+
+        potfile = os.path.join(localedir, '%s.pot' % str(self.domain))
+        if os.path.exists(potfile):
+            # Remove a previous undeleted potfile, if any
+            os.unlink(potfile)
+
+        for f in file_list:
+            f.process(self, potfile, self.domain, self.keep_pot)
+        return potfile
+
+    def find_files(self, root):
+        """
+        Helper method to get all files in the given root.
+        """
+
+        def is_ignored(path, ignore_patterns):
+            """
+            Check if the given path should be ignored or not.
+            """
+            for pattern in ignore_patterns:
+                if fnmatch.fnmatchcase(path, pattern):
+                    return True
+            return False
+
+        dir_suffix = '%s*' % os.sep
+        norm_patterns = [p[:-len(dir_suffix)] if p.endswith(dir_suffix) else p for p in self.ignore_patterns]
+        all_files = []
+        for dirpath, dirnames, filenames in os.walk(root, topdown=True, followlinks=self.symlinks):
+            for dirname in dirnames[:]:
+                if is_ignored(os.path.normpath(os.path.join(dirpath, dirname)), norm_patterns):
+                    dirnames.remove(dirname)
+                    if self.verbosity > 1:
+                        self.stdout.write('ignoring directory %s\n' % dirname)
+            for filename in filenames:
+                if is_ignored(os.path.normpath(os.path.join(dirpath, filename)), self.ignore_patterns):
+                    if self.verbosity > 1:
+                        self.stdout.write('ignoring file %s in %s\n' % (filename, dirpath))
+                else:
+                    all_files.append(TranslatableFile(dirpath, filename))
+        return sorted(all_files)
+
+    def write_po_file(self, potfile, locale):
+        """
+        Creates or updates the PO file for self.domain and :param locale:.
+        Uses contents of the existing :param potfile:.
+
+        Uses mguniq, msgmerge, and msgattrib GNU gettext utilities.
+        """
+        args = ['msguniq', '--to-code=utf-8']
+        if self.wrap:
+            args.append(self.wrap)
+        if self.location:
+            args.append(self.location)
+        args.append(potfile)
+        msgs, errors, status = popen_wrapper(args)
+        if errors:
+            if status != STATUS_OK:
+                raise CommandError(
+                    "errors happened while running msguniq\n%s" % errors)
+            elif self.verbosity > 0:
+                self.stdout.write(errors)
+
+        basedir = os.path.join(os.path.dirname(potfile), locale, 'LC_MESSAGES')
+        if not os.path.isdir(basedir):
+            os.makedirs(basedir)
+        pofile = os.path.join(basedir, '%s.po' % str(self.domain))
+
+        if os.path.exists(pofile):
+            with open(potfile, 'w') as fp:
+                fp.write(msgs)
+            args = ['msgmerge', '-q']
+            if self.wrap:
+                args.append(self.wrap)
+            if self.location:
+                args.append(self.location)
+            args.extend([pofile, potfile])
+            msgs, errors, status = popen_wrapper(args)
+            if errors:
+                if status != STATUS_OK:
+                    raise CommandError(
+                        "errors happened while running msgmerge\n%s" % errors)
+                elif self.verbosity > 0:
+                    self.stdout.write(errors)
+        elif not self.invoked_for_django:
+            msgs = self.copy_plural_forms(msgs, locale)
+        msgs = msgs.replace(
+            "#. #-#-#-#-#  %s.pot (PACKAGE VERSION)  #-#-#-#-#\n" % self.domain, "")
+        with open(pofile, 'w') as fp:
+            fp.write(msgs)
+
+        if self.no_obsolete:
+            args = ['msgattrib', '-o', pofile, '--no-obsolete']
+            if self.wrap:
+                args.append(self.wrap)
+            if self.location:
+                args.append(self.location)
+            args.append(pofile)
+            msgs, errors, status = popen_wrapper(args)
+            if errors:
+                if status != STATUS_OK:
+                    raise CommandError(
+                        "errors happened while running msgattrib\n%s" % errors)
+                elif self.verbosity > 0:
+                    self.stdout.write(errors)
+
+    def copy_plural_forms(self, msgs, locale):
+        """
+        Copies plural forms header contents from a Django catalog of locale to
+        the msgs string, inserting it at the right place. msgs should be the
+        contents of a newly created .po file.
+        """
+        django_dir = os.path.normpath(os.path.join(os.path.dirname(django.__file__)))
+        if self.domain == 'djangojs':
+            domains = ('djangojs', 'django')
+        else:
+            domains = ('django',)
+        for domain in domains:
+            django_po = os.path.join(django_dir, 'conf', 'locale', locale, 'LC_MESSAGES', '%s.po' % domain)
+            if os.path.exists(django_po):
+                with open(django_po, 'rU') as fp:
+                    m = plural_forms_re.search(fp.read())
+                if m:
+                    if self.verbosity > 1:
+                        self.stdout.write("copying plural forms: %s\n" % m.group('value'))
+                    lines = []
+                    seen = False
+                    for line in msgs.split('\n'):
+                        if not line and not seen:
+                            line = '%s\n' % m.group('value')
+                            seen = True
+                        lines.append(line)
+                    msgs = '\n'.join(lines)
+                    break
+        return msgs
diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
index 391e0b440a..0ca15fdb6f 100644
--- a/django/core/management/commands/runserver.py
+++ b/django/core/management/commands/runserver.py
@@ -93,7 +93,7 @@ class Command(BaseCommand):
         self.stdout.write((
             "%(started_at)s\n"
             "Django version %(version)s, using settings %(settings)r\n"
-            "Development server is running at http://%(addr)s:%(port)s/\n"
+            "Starting development server at http://%(addr)s:%(port)s/\n"
             "Quit the server with %(quit_command)s.\n"
         ) % {
             "started_at": datetime.now().strftime('%B %d, %Y - %X'),
diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py
index 52a8cab7e4..851d4e3cfb 100644
--- a/django/core/management/commands/shell.py
+++ b/django/core/management/commands/shell.py
@@ -9,6 +9,8 @@ class Command(NoArgsCommand):
     option_list = NoArgsCommand.option_list + (
         make_option('--plain', action='store_true', dest='plain',
             help='Tells Django to use plain Python, not IPython or bpython.'),
+        make_option('--no-startup', action='store_true', dest='no_startup',
+            help='When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.'),
         make_option('-i', '--interface', action='store', type='choice', choices=shells,
                     dest='interface',
             help='Specify an interactive interpreter interface. Available options: "ipython" and "bpython"'),
@@ -19,8 +21,10 @@ class Command(NoArgsCommand):
 
     def ipython(self):
         try:
-            from IPython import embed
-            embed()
+            from IPython.frontend.terminal.ipapp import TerminalIPythonApp
+            app = TerminalIPythonApp.instance()
+            app.initialize(argv=[])
+            app.start()
         except ImportError:
             # IPython < 0.11
             # Explicitly pass an empty list as arguments, because otherwise
@@ -54,6 +58,7 @@ class Command(NoArgsCommand):
         get_models()
 
         use_plain = options.get('plain', False)
+        no_startup = options.get('no_startup', False)
         interface = options.get('interface', None)
 
         try:
@@ -81,13 +86,16 @@ class Command(NoArgsCommand):
 
             # We want to honor both $PYTHONSTARTUP and .pythonrc.py, so follow system
             # conventions and get $PYTHONSTARTUP first then .pythonrc.py.
-            if not use_plain:
-                for pythonrc in (os.environ.get("PYTHONSTARTUP"),
-                                 os.path.expanduser('~/.pythonrc.py')):
-                    if pythonrc and os.path.isfile(pythonrc):
-                        try:
-                            with open(pythonrc) as handle:
-                                exec(compile(handle.read(), pythonrc, 'exec'))
-                        except NameError:
-                            pass
+            if not no_startup:
+                for pythonrc in (os.environ.get("PYTHONSTARTUP"), '~/.pythonrc.py'):
+                    if not pythonrc:
+                        continue
+                    pythonrc = os.path.expanduser(pythonrc)
+                    if not os.path.isfile(pythonrc):
+                        continue
+                    try:
+                        with open(pythonrc) as handle:
+                            exec(compile(handle.read(), pythonrc, 'exec'), imported_objects)
+                    except NameError:
+                        pass
             code.interact(local=imported_objects)
diff --git a/django/core/management/commands/sqldropindexes.py b/django/core/management/commands/sqldropindexes.py
new file mode 100644
index 0000000000..fce77211fb
--- /dev/null
+++ b/django/core/management/commands/sqldropindexes.py
@@ -0,0 +1,23 @@
+from __future__ import unicode_literals
+
+from optparse import make_option
+
+from django.core.management.base import AppCommand
+from django.core.management.sql import sql_destroy_indexes
+from django.db import connections, DEFAULT_DB_ALIAS
+
+class Command(AppCommand):
+    help = "Prints the DROP INDEX SQL statements for the given model module name(s)."
+
+    option_list = AppCommand.option_list + (
+        make_option('--database', action='store', dest='database',
+            default=DEFAULT_DB_ALIAS, help='Nominates a database to print the '
+                'SQL for.  Defaults to the "default" database.'),
+
+    )
+
+    output_transaction = True
+
+    def handle_app(self, app, **options):
+        return '\n'.join(sql_destroy_indexes(app, self.style, connections[options.get('database')]))
+
diff --git a/django/core/management/commands/startapp.py b/django/core/management/commands/startapp.py
index 5581331b7b..692ad09a43 100644
--- a/django/core/management/commands/startapp.py
+++ b/django/core/management/commands/startapp.py
@@ -9,8 +9,7 @@ class Command(TemplateCommand):
             "directory.")
 
     def handle(self, app_name=None, target=None, **options):
-        if app_name is None:
-            raise CommandError("you must provide an app name")
+        self.validate_name(app_name, "app")
 
         # Check that the app_name cannot be imported.
         try:
diff --git a/django/core/management/commands/startproject.py b/django/core/management/commands/startproject.py
index a1a9b33a43..b143e6c380 100644
--- a/django/core/management/commands/startproject.py
+++ b/django/core/management/commands/startproject.py
@@ -10,8 +10,7 @@ class Command(TemplateCommand):
             "given directory.")
 
     def handle(self, project_name=None, target=None, *args, **options):
-        if project_name is None:
-            raise CommandError("you must provide a project name")
+        self.validate_name(project_name, "project")
 
         # Check that the project_name cannot be imported.
         try:
diff --git a/django/core/management/commands/syncdb.py b/django/core/management/commands/syncdb.py
index d6f6fc6b76..155c3fb67b 100644
--- a/django/core/management/commands/syncdb.py
+++ b/django/core/management/commands/syncdb.py
@@ -85,26 +85,25 @@ class Command(NoArgsCommand):
         # Create the tables for each model
         if verbosity >= 1:
             self.stdout.write("Creating tables ...\n")
-        for app_name, model_list in manifest.items():
-            for model in model_list:
-                # Create the model's database table, if it doesn't already exist.
-                if verbosity >= 3:
-                    self.stdout.write("Processing %s.%s model\n" % (app_name, model._meta.object_name))
-                sql, references = connection.creation.sql_create_model(model, self.style, seen_models)
-                seen_models.add(model)
-                created_models.add(model)
-                for refto, refs in references.items():
-                    pending_references.setdefault(refto, []).extend(refs)
-                    if refto in seen_models:
-                        sql.extend(connection.creation.sql_for_pending_references(refto, self.style, pending_references))
-                sql.extend(connection.creation.sql_for_pending_references(model, self.style, pending_references))
-                if verbosity >= 1 and sql:
-                    self.stdout.write("Creating table %s\n" % model._meta.db_table)
-                for statement in sql:
-                    cursor.execute(statement)
-                tables.append(connection.introspection.table_name_converter(model._meta.db_table))
-
-        transaction.commit_unless_managed(using=db)
+        with transaction.commit_on_success_unless_managed(using=db):
+            for app_name, model_list in manifest.items():
+                for model in model_list:
+                    # Create the model's database table, if it doesn't already exist.
+                    if verbosity >= 3:
+                        self.stdout.write("Processing %s.%s model\n" % (app_name, model._meta.object_name))
+                    sql, references = connection.creation.sql_create_model(model, self.style, seen_models)
+                    seen_models.add(model)
+                    created_models.add(model)
+                    for refto, refs in references.items():
+                        pending_references.setdefault(refto, []).extend(refs)
+                        if refto in seen_models:
+                            sql.extend(connection.creation.sql_for_pending_references(refto, self.style, pending_references))
+                    sql.extend(connection.creation.sql_for_pending_references(model, self.style, pending_references))
+                    if verbosity >= 1 and sql:
+                        self.stdout.write("Creating table %s\n" % model._meta.db_table)
+                    for statement in sql:
+                        cursor.execute(statement)
+                    tables.append(connection.introspection.table_name_converter(model._meta.db_table))
 
         # Send the post_syncdb signal, so individual apps can do whatever they need
         # to do at this point.
@@ -125,16 +124,14 @@ class Command(NoArgsCommand):
                         if verbosity >= 2:
                             self.stdout.write("Installing custom SQL for %s.%s model\n" % (app_name, model._meta.object_name))
                         try:
-                            for sql in custom_sql:
-                                cursor.execute(sql)
+                            with transaction.commit_on_success_unless_managed(using=db):
+                                for sql in custom_sql:
+                                    cursor.execute(sql)
                         except Exception as e:
                             self.stderr.write("Failed to install custom SQL for %s.%s model: %s\n" % \
                                                 (app_name, model._meta.object_name, e))
                             if show_traceback:
                                 traceback.print_exc()
-                            transaction.rollback_unless_managed(using=db)
-                        else:
-                            transaction.commit_unless_managed(using=db)
                     else:
                         if verbosity >= 3:
                             self.stdout.write("No custom SQL for %s.%s model\n" % (app_name, model._meta.object_name))
@@ -150,14 +147,12 @@ class Command(NoArgsCommand):
                         if verbosity >= 2:
                             self.stdout.write("Installing index for %s.%s model\n" % (app_name, model._meta.object_name))
                         try:
-                            for sql in index_sql:
-                                cursor.execute(sql)
+                            with transaction.commit_on_success_unless_managed(using=db):
+                                for sql in index_sql:
+                                    cursor.execute(sql)
                         except Exception as e:
                             self.stderr.write("Failed to install index for %s.%s model: %s\n" % \
                                                 (app_name, model._meta.object_name, e))
-                            transaction.rollback_unless_managed(using=db)
-                        else:
-                            transaction.commit_unless_managed(using=db)
 
         # Load initial_data fixtures (unless that has been disabled)
         if load_initial_data:
diff --git a/django/core/management/commands/test.py b/django/core/management/commands/test.py
index 48b330aa6d..2b8e8019eb 100644
--- a/django/core/management/commands/test.py
+++ b/django/core/management/commands/test.py
@@ -1,3 +1,4 @@
+import logging
 import sys
 import os
 from optparse import make_option, OptionParser
@@ -6,6 +7,7 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.test.utils import get_runner
 
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--noinput',
@@ -57,6 +59,21 @@ class Command(BaseCommand):
                             version=self.get_version(),
                             option_list=options)
 
+    def execute(self, *args, **options):
+        if int(options['verbosity']) > 0:
+            # ensure that deprecation warnings are displayed during testing
+            # the following state is assumed:
+            # logging.capturewarnings is true
+            # a "default" level warnings filter has been added for
+            # DeprecationWarning. See django.conf.LazySettings._configure_logging
+            logger = logging.getLogger('py.warnings')
+            handler = logging.StreamHandler()
+            logger.addHandler(handler)
+        super(Command, self).execute(*args, **options)
+        if int(options['verbosity']) > 0:
+            # remove the testing-specific handler
+            logger.removeHandler(handler)
+
     def handle(self, *test_labels, **options):
         from django.conf import settings
         from django.test.utils import get_runner
diff --git a/django/core/management/sql.py b/django/core/management/sql.py
index e46f4ae4f5..ac60ed470c 100644
--- a/django/core/management/sql.py
+++ b/django/core/management/sql.py
@@ -137,6 +137,13 @@ def sql_indexes(app, style, connection):
         output.extend(connection.creation.sql_indexes_for_model(model, style))
     return output
 
+def sql_destroy_indexes(app, style, connection):
+    "Returns a list of the DROP INDEX SQL statements for all models in the given app."
+    output = []
+    for model in models.get_models(app):
+        output.extend(connection.creation.sql_destroy_indexes_for_model(model, style))
+    return output
+
 
 def sql_all(app, style, connection):
     "Returns a list of CREATE TABLE SQL, initial-data inserts, and CREATE INDEX SQL for the given module."
@@ -173,8 +180,8 @@ def custom_sql_for_model(model, style, connection):
 
     # Find custom SQL, if it's available.
     backend_name = connection.settings_dict['ENGINE'].split('.')[-1]
-    sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), backend_name)),
-                 os.path.join(app_dir, "%s.sql" % opts.object_name.lower())]
+    sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.model_name, backend_name)),
+                 os.path.join(app_dir, "%s.sql" % opts.model_name)]
     for sql_file in sql_files:
         if os.path.exists(sql_file):
             with codecs.open(sql_file, 'U', encoding=settings.FILE_CHARSET) as fp:
diff --git a/django/core/management/templates.py b/django/core/management/templates.py
index f522097b8c..0f45399109 100644
--- a/django/core/management/templates.py
+++ b/django/core/management/templates.py
@@ -21,7 +21,7 @@ from django.template import Template, Context
 from django.utils import archive
 from django.utils._os import rmtree_errorhandler
 from django.core.management.base import BaseCommand, CommandError
-from django.core.management.commands.makemessages import handle_extensions
+from django.core.management.utils import handle_extensions
 
 
 _drive_re = re.compile('^([a-z]):', re.I)
@@ -61,22 +61,16 @@ class TemplateCommand(BaseCommand):
     can_import_settings = False
     # The supported URL schemes
     url_schemes = ['http', 'https', 'ftp']
+    # Can't perform any active locale changes during this command, because
+    # setting might not be available at all.
+    leave_locale_alone = True
 
     def handle(self, app_or_project, name, target=None, **options):
         self.app_or_project = app_or_project
         self.paths_to_remove = []
         self.verbosity = int(options.get('verbosity'))
 
-        # If it's not a valid directory name.
-        if not re.search(r'^[_a-zA-Z]\w*$', name):
-            # Provide a smart error message, depending on the error.
-            if not re.search(r'^[_a-zA-Z]', name):
-                message = ('make sure the name begins '
-                           'with a letter or underscore')
-            else:
-                message = 'use only numbers, letters and underscores'
-            raise CommandError("%r is not a valid %s name. Please %s." %
-                               (name, app_or_project, message))
+        self.validate_name(name, app_or_project)
 
         # if some directory is given, make sure it's nicely expanded
         if target is None:
@@ -111,10 +105,15 @@ class TemplateCommand(BaseCommand):
         base_name = '%s_name' % app_or_project
         base_subdir = '%s_template' % app_or_project
         base_directory = '%s_directory' % app_or_project
+        if django.VERSION[-1] == 0:
+            docs_version = 'dev'
+        else:
+            docs_version = '%d.%d' % django.VERSION[:2]
 
         context = Context(dict(options, **{
             base_name: name,
             base_directory: top_dir,
+            'docs_version': docs_version,
         }), autoescape=False)
 
         # Setup a stub settings environment for template rendering
@@ -211,6 +210,20 @@ class TemplateCommand(BaseCommand):
         raise CommandError("couldn't handle %s template %s." %
                            (self.app_or_project, template))
 
+    def validate_name(self, name, app_or_project):
+        if name is None:
+            raise CommandError("you must provide %s %s name" % (
+                "an" if app_or_project == "app" else "a", app_or_project))
+        # If it's not a valid directory name.
+        if not re.search(r'^[_a-zA-Z]\w*$', name):
+            # Provide a smart error message, depending on the error.
+            if not re.search(r'^[_a-zA-Z]', name):
+                message = 'make sure the name begins with a letter or underscore'
+            else:
+                message = 'use only numbers, letters and underscores'
+            raise CommandError("%r is not a valid %s name. Please %s." %
+                               (name, app_or_project, message))
+
     def download(self, url):
         """
         Downloads the given URL and returns the file name.
diff --git a/django/core/management/utils.py b/django/core/management/utils.py
new file mode 100644
index 0000000000..7159d1123f
--- /dev/null
+++ b/django/core/management/utils.py
@@ -0,0 +1,79 @@
+from __future__ import absolute_import
+
+import os
+from subprocess import PIPE, Popen
+import sys
+
+from django.utils.encoding import force_text, DEFAULT_LOCALE_ENCODING
+from django.utils import six
+
+from .base import CommandError
+
+
+def popen_wrapper(args, os_err_exc_type=CommandError):
+    """
+    Friendly wrapper around Popen.
+
+    Returns stdout output, stderr output and OS status code.
+    """
+    try:
+        p = Popen(args, shell=False, stdout=PIPE, stderr=PIPE,
+                close_fds=os.name != 'nt', universal_newlines=True)
+    except OSError as e:
+        six.reraise(os_err_exc_type, os_err_exc_type('Error executing %s: %s' %
+                    (args[0], e.strerror)), sys.exc_info()[2])
+    output, errors = p.communicate()
+    return (
+        output,
+        force_text(errors, DEFAULT_LOCALE_ENCODING, strings_only=True),
+        p.returncode
+    )
+
+
+def handle_extensions(extensions=('html',), ignored=('py',)):
+    """
+    Organizes multiple extensions that are separated with commas or passed by
+    using --extension/-e multiple times. Note that the .py extension is ignored
+    here because of the way non-*.py files are handled in make_messages() (they
+    are copied to file.ext.py files to trick xgettext to parse them as Python
+    files).
+
+    For example: running 'django-admin makemessages -e js,txt -e xhtml -a'
+    would result in an extension list: ['.js', '.txt', '.xhtml']
+
+    >>> handle_extensions(['.html', 'html,js,py,py,py,.py', 'py,.py'])
+    set(['.html', '.js'])
+    >>> handle_extensions(['.html, txt,.tpl'])
+    set(['.html', '.tpl', '.txt'])
+    """
+    ext_list = []
+    for ext in extensions:
+        ext_list.extend(ext.replace(' ', '').split(','))
+    for i, ext in enumerate(ext_list):
+        if not ext.startswith('.'):
+            ext_list[i] = '.%s' % ext_list[i]
+    return set([x for x in ext_list if x.strip('.') not in ignored])
+
+def find_command(cmd, path=None, pathext=None):
+    if path is None:
+        path = os.environ.get('PATH', []).split(os.pathsep)
+    if isinstance(path, six.string_types):
+        path = [path]
+    # check if there are funny path extensions for executables, e.g. Windows
+    if pathext is None:
+        pathext = os.environ.get('PATHEXT', '.COM;.EXE;.BAT;.CMD').split(os.pathsep)
+    # don't use extensions if the command ends with one of them
+    for ext in pathext:
+        if cmd.endswith(ext):
+            pathext = ['']
+            break
+    # check if we find the command on PATH
+    for p in path:
+        f = os.path.join(p, cmd)
+        if os.path.isfile(f):
+            return f
+        for ext in pathext:
+            fext = f + ext
+            if os.path.isfile(fext):
+                return fext
+    return None
diff --git a/django/core/management/validation.py b/django/core/management/validation.py
index c0452c5aa6..94d604346b 100644
--- a/django/core/management/validation.py
+++ b/django/core/management/validation.py
@@ -27,7 +27,6 @@ def get_validation_errors(outfile, app=None):
     """
     from django.db import models, connection
     from django.db.models.loading import get_app_errors
-    from django.db.models.fields.related import RelatedObject
     from django.db.models.deletion import SET_NULL, SET_DEFAULT
 
     e = ModelErrorCollection(outfile)
@@ -50,12 +49,16 @@ def get_validation_errors(outfile, app=None):
             # No need to perform any other validation checks on a swapped model.
             continue
 
-        # This is the current User model. Check known validation problems with User models
+        # If this is the current User model, check known validation problems with User models
         if settings.AUTH_USER_MODEL == '%s.%s' % (opts.app_label, opts.object_name):
             # Check that the USERNAME FIELD isn't included in REQUIRED_FIELDS.
             if cls.USERNAME_FIELD in cls.REQUIRED_FIELDS:
                 e.add(opts, 'The field named as the USERNAME_FIELD should not be included in REQUIRED_FIELDS on a swappable User model.')
 
+            # Check that the username field is unique
+            if not opts.get_field(cls.USERNAME_FIELD).unique:
+                e.add(opts, 'The USERNAME_FIELD must be unique. Add unique=True to the field parameters.')
+
         # Model isn't swapped; do field-specific validation.
         for f in opts.local_fields:
             if f.name == 'id' and not f.primary_key and opts.pk.name == 'id':
@@ -150,11 +153,19 @@ def get_validation_errors(outfile, app=None):
                     continue
 
                 # Make sure the related field specified by a ForeignKey is unique
-                if not f.rel.to._meta.get_field(f.rel.field_name).unique:
-                    e.add(opts, "Field '%s' under model '%s' must have a unique=True constraint." % (f.rel.field_name, f.rel.to.__name__))
+                if f.requires_unique_target:
+                    if len(f.foreign_related_fields) > 1:
+                        has_unique_field = False
+                        for rel_field in f.foreign_related_fields:
+                            has_unique_field = has_unique_field or rel_field.unique
+                        if not has_unique_field:
+                            e.add(opts, "Field combination '%s' under model '%s' must have a unique=True constraint" % (','.join([rel_field.name for rel_field in f.foreign_related_fields]), f.rel.to.__name__))
+                    else:
+                        if not f.foreign_related_fields[0].unique:
+                            e.add(opts, "Field '%s' under model '%s' must have a unique=True constraint." % (f.foreign_related_fields[0].name, f.rel.to.__name__))
 
                 rel_opts = f.rel.to._meta
-                rel_name = RelatedObject(f.rel.to, cls, f).get_accessor_name()
+                rel_name = f.related.get_accessor_name()
                 rel_query_name = f.related_query_name()
                 if not f.rel.is_hidden():
                     for r in rel_opts.fields:
@@ -278,7 +289,7 @@ def get_validation_errors(outfile, app=None):
                 )
 
             rel_opts = f.rel.to._meta
-            rel_name = RelatedObject(f.rel.to, cls, f).get_accessor_name()
+            rel_name = f.related.get_accessor_name()
             rel_query_name = f.related_query_name()
             # If rel_name is none, there is no reverse accessor (this only
             # occurs for symmetrical m2m relations to self). If this is the
diff --git a/django/core/serializers/__init__.py b/django/core/serializers/__init__.py
index cf7e66190f..c48050415d 100644
--- a/django/core/serializers/__init__.py
+++ b/django/core/serializers/__init__.py
@@ -4,7 +4,7 @@ Interfaces for serializing Django objects.
 Usage::
 
     from django.core import serializers
-    json = serializers.serialize("json", some_query_set)
+    json = serializers.serialize("json", some_queryset)
     objects = list(serializers.deserialize("json", json))
 
 To add your own serializers, use the SERIALIZATION_MODULES setting::
diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py
index ed65f2922c..64357bf9d5 100644
--- a/django/core/serializers/json.py
+++ b/django/core/serializers/json.py
@@ -8,6 +8,7 @@ from __future__ import absolute_import
 import datetime
 import decimal
 import json
+import sys
 
 from django.core.serializers.base import DeserializationError
 from django.core.serializers.python import Serializer as PythonSerializer
@@ -72,7 +73,7 @@ def Deserializer(stream_or_string, **options):
         raise
     except Exception as e:
         # Map to deserializer error
-        raise DeserializationError(e)
+        six.reraise(DeserializationError, DeserializationError(e), sys.exc_info()[2])
 
 
 class DjangoJSONEncoder(json.JSONEncoder):
diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py
index 37fa906280..cdfac5044b 100644
--- a/django/core/serializers/python.py
+++ b/django/core/serializers/python.py
@@ -88,7 +88,7 @@ def Deserializer(object_list, **options):
     for d in object_list:
         # Look up the model and starting build a dict of data for it.
         Model = _get_model(d["model"])
-        data = {Model._meta.pk.attname: Model._meta.pk.to_python(d["pk"])}
+        data = {Model._meta.pk.attname: Model._meta.pk.to_python(d.get("pk", None))}
         m2m_data = {}
         model_fields = Model._meta.get_all_field_names()
 
@@ -143,7 +143,7 @@ def Deserializer(object_list, **options):
 
 def _get_model(model_identifier):
     """
-    Helper to look up a model from an "app_label.module_name" string.
+    Helper to look up a model from an "app_label.model_name" string.
     """
     try:
         Model = models.get_model(*model_identifier.split("."))
diff --git a/django/core/serializers/pyyaml.py b/django/core/serializers/pyyaml.py
index 4c11626bad..478f14b53f 100644
--- a/django/core/serializers/pyyaml.py
+++ b/django/core/serializers/pyyaml.py
@@ -6,6 +6,7 @@ Requires PyYaml (http://pyyaml.org/), but that's checked for in __init__.
 
 import decimal
 import yaml
+import sys
 from io import StringIO
 
 from django.db import models
@@ -14,8 +15,15 @@ from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
 from django.utils import six
 
+# Use the C (faster) implementation if possible
+try:
+    from yaml import CSafeLoader as SafeLoader
+    from yaml import CSafeDumper as SafeDumper
+except ImportError:
+    from yaml import SafeLoader, SafeDumper
 
-class DjangoSafeDumper(yaml.SafeDumper):
+
+class DjangoSafeDumper(SafeDumper):
     def represent_decimal(self, data):
         return self.represent_scalar('tag:yaml.org,2002:str', str(data))
 
@@ -58,10 +66,10 @@ def Deserializer(stream_or_string, **options):
     else:
         stream = stream_or_string
     try:
-        for obj in PythonDeserializer(yaml.safe_load(stream), **options):
+        for obj in PythonDeserializer(yaml.load(stream, Loader=SafeLoader), **options):
             yield obj
     except GeneratorExit:
         raise
     except Exception as e:
         # Map to deserializer error
-        raise DeserializationError(e)
+        six.reraise(DeserializationError, DeserializationError(e), sys.exc_info()[2])
diff --git a/django/core/serializers/xml_serializer.py b/django/core/serializers/xml_serializer.py
index ea333a22bd..988c3360e9 100644
--- a/django/core/serializers/xml_serializer.py
+++ b/django/core/serializers/xml_serializer.py
@@ -10,6 +10,8 @@ from django.db import models, DEFAULT_DB_ALIAS
 from django.utils.xmlutils import SimplerXMLGenerator
 from django.utils.encoding import smart_text
 from xml.dom import pulldom
+from xml.sax import handler
+from xml.sax.expatreader import ExpatParser as _ExpatParser
 
 class Serializer(base.Serializer):
     """
@@ -151,8 +153,13 @@ class Deserializer(base.Deserializer):
 
     def __init__(self, stream_or_string, **options):
         super(Deserializer, self).__init__(stream_or_string, **options)
-        self.event_stream = pulldom.parse(self.stream)
+        self.event_stream = pulldom.parse(self.stream, self._make_parser())
         self.db = options.pop('using', DEFAULT_DB_ALIAS)
+        self.ignore = options.pop('ignorenonexistent', False)
+
+    def _make_parser(self):
+        """Create a hardened XML parser (no custom/external entities)."""
+        return DefusedExpatParser()
 
     def __next__(self):
         for event, node in self.event_stream:
@@ -182,6 +189,7 @@ class Deserializer(base.Deserializer):
         # {m2m_accessor_attribute : [list_of_related_objects]})
         m2m_data = {}
 
+        model_fields = Model._meta.get_all_field_names()
         # Deseralize each field.
         for field_node in node.getElementsByTagName("field"):
             # If the field is missing the name attribute, bail (are you
@@ -192,7 +200,9 @@ class Deserializer(base.Deserializer):
 
             # Get the field from the Model. This will raise a
             # FieldDoesNotExist if, well, the field doesn't exist, which will
-            # be propagated correctly.
+            # be propagated correctly unless ignorenonexistent=True is used.
+            if self.ignore and field_name not in model_fields:
+                continue
             field = Model._meta.get_field(field_name)
 
             # As is usually the case, relation fields get the special treatment.
@@ -292,3 +302,90 @@ def getInnerText(node):
         else:
            pass
     return "".join(inner_text)
+
+
+# Below code based on Christian Heimes' defusedxml
+
+
+class DefusedExpatParser(_ExpatParser):
+    """
+    An expat parser hardened against XML bomb attacks.
+
+    Forbids DTDs, external entity references
+
+    """
+    def __init__(self, *args, **kwargs):
+        _ExpatParser.__init__(self, *args, **kwargs)
+        self.setFeature(handler.feature_external_ges, False)
+        self.setFeature(handler.feature_external_pes, False)
+
+    def start_doctype_decl(self, name, sysid, pubid, has_internal_subset):
+        raise DTDForbidden(name, sysid, pubid)
+
+    def entity_decl(self, name, is_parameter_entity, value, base,
+                    sysid, pubid, notation_name):
+        raise EntitiesForbidden(name, value, base, sysid, pubid, notation_name)
+
+    def unparsed_entity_decl(self, name, base, sysid, pubid, notation_name):
+        # expat 1.2
+        raise EntitiesForbidden(name, None, base, sysid, pubid, notation_name)
+
+    def external_entity_ref_handler(self, context, base, sysid, pubid):
+        raise ExternalReferenceForbidden(context, base, sysid, pubid)
+
+    def reset(self):
+        _ExpatParser.reset(self)
+        parser = self._parser
+        parser.StartDoctypeDeclHandler = self.start_doctype_decl
+        parser.EntityDeclHandler = self.entity_decl
+        parser.UnparsedEntityDeclHandler = self.unparsed_entity_decl
+        parser.ExternalEntityRefHandler = self.external_entity_ref_handler
+
+
+class DefusedXmlException(ValueError):
+    """Base exception."""
+    def __repr__(self):
+        return str(self)
+
+
+class DTDForbidden(DefusedXmlException):
+    """Document type definition is forbidden."""
+    def __init__(self, name, sysid, pubid):
+        super(DTDForbidden, self).__init__()
+        self.name = name
+        self.sysid = sysid
+        self.pubid = pubid
+
+    def __str__(self):
+        tpl = "DTDForbidden(name='{}', system_id={!r}, public_id={!r})"
+        return tpl.format(self.name, self.sysid, self.pubid)
+
+
+class EntitiesForbidden(DefusedXmlException):
+    """Entity definition is forbidden."""
+    def __init__(self, name, value, base, sysid, pubid, notation_name):
+        super(EntitiesForbidden, self).__init__()
+        self.name = name
+        self.value = value
+        self.base = base
+        self.sysid = sysid
+        self.pubid = pubid
+        self.notation_name = notation_name
+
+    def __str__(self):
+        tpl = "EntitiesForbidden(name='{}', system_id={!r}, public_id={!r})"
+        return tpl.format(self.name, self.sysid, self.pubid)
+
+
+class ExternalReferenceForbidden(DefusedXmlException):
+    """Resolving an external reference is forbidden."""
+    def __init__(self, context, base, sysid, pubid):
+        super(ExternalReferenceForbidden, self).__init__()
+        self.context = context
+        self.base = base
+        self.sysid = sysid
+        self.pubid = pubid
+
+    def __str__(self):
+        tpl = "ExternalReferenceForbidden(system_id='{}', public_id={})"
+        return tpl.format(self.sysid, self.pubid)
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index 7387d13199..d329221ce4 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -9,7 +9,7 @@ been reviewed for security issues. DON'T USE IT FOR PRODUCTION USE!
 
 from __future__ import unicode_literals
 
-import os
+from io import BytesIO
 import socket
 import sys
 import traceback
@@ -21,13 +21,18 @@ from django.utils.six.moves import socketserver
 from wsgiref import simple_server
 from wsgiref.util import FileWrapper   # for backwards compatibility
 
-import django
-from django.core.exceptions import ImproperlyConfigured
 from django.core.management.color import color_style
 from django.core.wsgi import get_wsgi_application
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
+from django.utils import six
 
-__all__ = ['WSGIServer', 'WSGIRequestHandler']
+__all__ = ('WSGIServer', 'WSGIRequestHandler', 'MAX_SOCKET_CHUNK_SIZE')
+
+
+# If data is too large, socket will choke, so write chunks no larger than 32MB
+# at a time. The rationale behind the 32MB can be found on Django's Trac:
+# https://code.djangoproject.com/ticket/5596#comment:4
+MAX_SOCKET_CHUNK_SIZE = 32 * 1024 * 1024  # 32 MB
 
 
 def get_internal_wsgi_application():
@@ -49,22 +54,11 @@ def get_internal_wsgi_application():
     app_path = getattr(settings, 'WSGI_APPLICATION')
     if app_path is None:
         return get_wsgi_application()
-    module_name, attr = app_path.rsplit('.', 1)
-    try:
-        mod = import_module(module_name)
-    except ImportError as e:
-        raise ImproperlyConfigured(
-            "WSGI application '%s' could not be loaded; "
-            "could not import module '%s': %s" % (app_path, module_name, e))
-    try:
-        app = getattr(mod, attr)
-    except AttributeError as e:
-        raise ImproperlyConfigured(
-            "WSGI application '%s' could not be loaded; "
-            "can't find '%s' in module '%s': %s"
-            % (app_path, attr, module_name, e))
 
-    return app
+    return import_by_path(
+        app_path,
+        error_prefix="WSGI application '%s' could not be loaded; " % app_path
+    )
 
 
 class WSGIServerException(Exception):
@@ -90,25 +84,26 @@ class ServerHandler(simple_server.ServerHandler, object):
             self.bytes_sent += len(data)
 
         # XXX check Content-Length and truncate if too many bytes written?
-
-        # If data is too large, socket will choke, so write chunks no larger
-        # than 32MB at a time.
-        length = len(data)
-        if length > 33554432:
-            offset = 0
-            while offset < length:
-                chunk_size = min(33554432, length)
-                self._write(data[offset:offset+chunk_size])
-                self._flush()
-                offset += chunk_size
-        else:
-            self._write(data)
+        data = BytesIO(data)
+        for chunk in iter(lambda: data.read(MAX_SOCKET_CHUNK_SIZE), b''):
+            self._write(chunk)
             self._flush()
 
     def error_output(self, environ, start_response):
         super(ServerHandler, self).error_output(environ, start_response)
         return ['\n'.join(traceback.format_exception(*sys.exc_info()))]
 
+    # Backport of http://hg.python.org/cpython/rev/d5af1b235dab. See #16241.
+    # This can be removed when support for Python <= 2.7.3 is deprecated.
+    def finish_response(self):
+        try:
+            if not self.result_is_file() or not self.sendfile():
+                for data in self.result:
+                    self.write(data)
+                self.finish_content()
+        finally:
+            self.close()
+
 
 class WSGIServer(simple_server.WSGIServer, object):
     """BaseHTTPServer that implements the Python WSGI protocol"""
@@ -123,7 +118,7 @@ class WSGIServer(simple_server.WSGIServer, object):
         try:
             super(WSGIServer, self).server_bind()
         except Exception as e:
-            raise WSGIServerException(e)
+            six.reraise(WSGIServerException, WSGIServerException(e), sys.exc_info()[2])
         self.setup_environ()
 
 
diff --git a/django/core/signing.py b/django/core/signing.py
index 92ab968123..bbe53aafe3 100644
--- a/django/core/signing.py
+++ b/django/core/signing.py
@@ -41,11 +41,10 @@ import time
 import zlib
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
 from django.utils import baseconv
 from django.utils.crypto import constant_time_compare, salted_hmac
 from django.utils.encoding import force_bytes, force_str, force_text
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 
 
 class BadSignature(Exception):
@@ -76,18 +75,7 @@ def base64_hmac(salt, value, key):
 
 
 def get_cookie_signer(salt='django.core.signing.get_cookie_signer'):
-    modpath = settings.SIGNING_BACKEND
-    module, attr = modpath.rsplit('.', 1)
-    try:
-        mod = import_module(module)
-    except ImportError as e:
-        raise ImproperlyConfigured(
-            'Error importing cookie signer %s: "%s"' % (modpath, e))
-    try:
-        Signer = getattr(mod, attr)
-    except AttributeError as e:
-        raise ImproperlyConfigured(
-            'Error importing cookie signer %s: "%s"' % (modpath, e))
+    Signer = import_by_path(settings.SIGNING_BACKEND)
     return Signer('django.http.cookies' + settings.SECRET_KEY, salt=salt)
 
 
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index c657fd9a54..c3d93bb247 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -375,6 +375,9 @@ class RegexURLResolver(LocaleRegexProvider):
     def _reverse_with_prefix(self, lookup_view, _prefix, *args, **kwargs):
         if args and kwargs:
             raise ValueError("Don't mix *args and **kwargs in call to reverse()!")
+        text_args = [force_text(v) for v in args]
+        text_kwargs = dict((k, force_text(v)) for (k, v) in kwargs.items())
+
         try:
             lookup_view = get_callable(lookup_view, True)
         except (ImportError, AttributeError) as e:
@@ -387,8 +390,7 @@ class RegexURLResolver(LocaleRegexProvider):
                 if args:
                     if len(args) != len(params) + len(prefix_args):
                         continue
-                    unicode_args = [force_text(val) for val in args]
-                    candidate = (prefix_norm + result) % dict(zip(prefix_args + params, unicode_args))
+                    candidate_subs = dict(zip(prefix_args + params, text_args))
                 else:
                     if set(kwargs.keys()) | set(defaults.keys()) != set(params) | set(defaults.keys()) | set(prefix_args):
                         continue
@@ -399,10 +401,16 @@ class RegexURLResolver(LocaleRegexProvider):
                             break
                     if not matches:
                         continue
-                    unicode_kwargs = dict([(k, force_text(v)) for (k, v) in kwargs.items()])
-                    candidate = (prefix_norm.replace('%', '%%') + result) % unicode_kwargs
-                if re.search('^%s%s' % (prefix_norm, pattern), candidate, re.UNICODE):
-                    return candidate
+                    candidate_subs = text_kwargs
+                # WSGI provides decoded URLs, without %xx escapes, and the URL
+                # resolver operates on such URLs. First substitute arguments
+                # without quoting to build a decoded URL and look for a match.
+                # Then, if we have a match, redo the substitution with quoted
+                # arguments in order to return a properly encoded URL.
+                candidate_pat = prefix_norm.replace('%', '%%') + result
+                if re.search('^%s%s' % (prefix_norm, pattern), candidate_pat % candidate_subs, re.UNICODE):
+                    candidate_subs = dict((k, urlquote(v)) for (k, v) in candidate_subs.items())
+                    return candidate_pat % candidate_subs
         # lookup_view can be URL label, or dotted path, or callable, Any of
         # these can be passed in at the top, but callables are not friendly in
         # error messages.
@@ -521,6 +529,15 @@ def get_script_prefix():
     """
     return getattr(_prefixes, "value", '/')
 
+def clear_script_prefix():
+    """
+    Unsets the script prefix for the current thread.
+    """
+    try:
+        del _prefixes.value
+    except AttributeError:
+        pass
+
 def set_urlconf(urlconf_name):
     """
     Sets the URLconf for the current thread (overriding the default one in
diff --git a/django/core/validators.py b/django/core/validators.py
index 251b5d8856..d0b713be32 100644
--- a/django/core/validators.py
+++ b/django/core/validators.py
@@ -7,7 +7,7 @@ except ImportError:     # Python 2
     from urlparse import urlsplit, urlunsplit
 
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 from django.utils.encoding import force_text
 from django.utils.ipv6 import is_valid_ipv6_address
 from django.utils import six
@@ -50,6 +50,7 @@ class URLValidator(RegexValidator):
         r'\[?[A-F0-9]*:[A-F0-9:]+\]?)'  # ...or ipv6
         r'(?::\d+)?'  # optional port
         r'(?:/?|[/?]\S+)$', re.IGNORECASE)
+    message = _('Enter a valid URL.')
 
     def __call__(self, value):
         try:
@@ -78,30 +79,53 @@ def validate_integer(value):
         raise ValidationError('')
 
 
-class EmailValidator(RegexValidator):
+class EmailValidator(object):
+    message = _('Enter a valid email address.')
+    code = 'invalid'
+    user_regex = re.compile(
+        r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*$"  # dot-atom
+        r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"$)', # quoted-string
+        re.IGNORECASE)
+    domain_regex = re.compile(
+        r'(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?$)'  # domain
+        # literal form, ipv4 address (SMTP 4.1.3)
+        r'|^\[(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}\]$',
+        re.IGNORECASE)
+    domain_whitelist = ['localhost']
+
+    def __init__(self, message=None, code=None, whitelist=None):
+        if message is not None:
+            self.message = message
+        if code is not None:
+            self.code = code
+        if whitelist is not None:
+            self.domain_whitelist = whitelist
 
     def __call__(self, value):
-        try:
-            super(EmailValidator, self).__call__(value)
-        except ValidationError as e:
-            # Trivial case failed. Try for possible IDN domain-part
-            if value and '@' in value:
-                parts = value.split('@')
-                try:
-                    parts[-1] = parts[-1].encode('idna').decode('ascii')
-                except UnicodeError:
-                    raise e
-                super(EmailValidator, self).__call__('@'.join(parts))
-            else:
-                raise
+        value = force_text(value)
 
-email_re = re.compile(
-    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
-    # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5
-    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"'
-    r')@((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)$)'  # domain
-    r'|\[(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}\]$', re.IGNORECASE)  # literal form, ipv4 address (SMTP 4.1.3)
-validate_email = EmailValidator(email_re, _('Enter a valid email address.'), 'invalid')
+        if not value or '@' not in value:
+            raise ValidationError(self.message, code=self.code)
+
+        user_part, domain_part = value.rsplit('@', 1)
+
+        if not self.user_regex.match(user_part):
+            raise ValidationError(self.message, code=self.code)
+
+        if (not domain_part in self.domain_whitelist and
+                not self.domain_regex.match(domain_part)):
+            # Try for possible IDN domain-part
+            try:
+                domain_part = domain_part.encode('idna').decode('ascii')
+                if not self.domain_regex.match(domain_part):
+                    raise ValidationError(self.message, code=self.code)
+                else:
+                    return
+            except UnicodeError:
+                pass
+            raise ValidationError(self.message, code=self.code)
+
+validate_email = EmailValidator()
 
 slug_re = re.compile(r'^[-a-zA-Z0-9_]+$')
 validate_slug = RegexValidator(slug_re, _("Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."), 'invalid')
@@ -186,12 +210,18 @@ class MinValueValidator(BaseValidator):
 class MinLengthValidator(BaseValidator):
     compare = lambda self, a, b: a < b
     clean = lambda self, x: len(x)
-    message = _('Ensure this value has at least %(limit_value)d characters (it has %(show_value)d).')
+    message = ungettext_lazy(
+        'Ensure this value has at least %(limit_value)d character (it has %(show_value)d).',
+        'Ensure this value has at least %(limit_value)d characters (it has %(show_value)d).',
+        'limit_value')
     code = 'min_length'
 
 
 class MaxLengthValidator(BaseValidator):
     compare = lambda self, a, b: a > b
     clean = lambda self, x: len(x)
-    message = _('Ensure this value has at most %(limit_value)d characters (it has %(show_value)d).')
+    message = ungettext_lazy(
+        'Ensure this value has at most %(limit_value)d character (it has %(show_value)d).',
+        'Ensure this value has at most %(limit_value)d characters (it has %(show_value)d).',
+        'limit_value')
     code = 'max_length'
diff --git a/django/core/xheaders.py b/django/core/xheaders.py
index b650a3a6d4..3766628c98 100644
--- a/django/core/xheaders.py
+++ b/django/core/xheaders.py
@@ -20,5 +20,5 @@ def populate_xheaders(request, response, model, object_id):
     if (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS
             or (hasattr(request, 'user') and request.user.is_active
                 and request.user.is_staff)):
-        response['X-Object-Type'] = "%s.%s" % (model._meta.app_label, model._meta.object_name.lower())
+        response['X-Object-Type'] = "%s.%s" % (model._meta.app_label, model._meta.model_name)
         response['X-Object-Id'] = str(object_id)
diff --git a/django/db/__init__.py b/django/db/__init__.py
index b1980488df..08c901ab7b 100644
--- a/django/db/__init__.py
+++ b/django/db/__init__.py
@@ -1,8 +1,13 @@
+import warnings
+
 from django.conf import settings
 from django.core import signals
 from django.core.exceptions import ImproperlyConfigured
-from django.db.utils import (ConnectionHandler, ConnectionRouter,
-    load_backend, DEFAULT_DB_ALIAS, DatabaseError, IntegrityError)
+from django.db.utils import (DEFAULT_DB_ALIAS,
+    DataError, OperationalError, IntegrityError, InternalError,
+    ProgrammingError, NotSupportedError, DatabaseError,
+    InterfaceError, Error,
+    load_backend, ConnectionHandler, ConnectionRouter)
 
 __all__ = ('backend', 'connection', 'connections', 'router', 'DatabaseError',
     'IntegrityError', 'DEFAULT_DB_ALIAS')
@@ -36,30 +41,40 @@ class DefaultConnectionProxy(object):
     def __setattr__(self, name, value):
         return setattr(connections[DEFAULT_DB_ALIAS], name, value)
 
+    def __delattr__(self, name):
+        return delattr(connections[DEFAULT_DB_ALIAS], name)
+
 connection = DefaultConnectionProxy()
 backend = load_backend(connection.settings_dict['ENGINE'])
 
-# Register an event that closes the database connection
-# when a Django request is finished.
 def close_connection(**kwargs):
-    for conn in connections.all():
-        conn.close()
-signals.request_finished.connect(close_connection)
+    warnings.warn(
+        "close_connection is superseded by close_old_connections.",
+        PendingDeprecationWarning, stacklevel=2)
+    # Avoid circular imports
+    from django.db import transaction
+    for conn in connections:
+        # If an error happens here the connection will be left in broken
+        # state. Once a good db connection is again available, the
+        # connection state will be cleaned up.
+        transaction.abort(conn)
+        connections[conn].close()
 
-# Register an event that resets connection.queries
-# when a Django request is started.
+# Register an event to reset saved queries when a Django request is started.
 def reset_queries(**kwargs):
     for conn in connections.all():
         conn.queries = []
 signals.request_started.connect(reset_queries)
 
-# Register an event that rolls back the connections
-# when a Django request has an exception.
-def _rollback_on_exception(**kwargs):
-    from django.db import transaction
-    for conn in connections:
+# Register an event to reset transaction state and close connections past
+# their lifetime. NB: abort() doesn't do anything outside of a transaction.
+def close_old_connections(**kwargs):
+    for conn in connections.all():
+        # Remove this when the legacy transaction management goes away.
         try:
-            transaction.rollback_unless_managed(using=conn)
+            conn.abort()
         except DatabaseError:
             pass
-signals.got_request_exception.connect(_rollback_on_exception)
+        conn.close_if_unusable_or_obsolete()
+signals.request_started.connect(close_old_connections)
+signals.request_finished.connect(close_old_connections)
diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py
index 0b5ba55cd0..0b9e75cbbc 100644
--- a/django/db/backends/__init__.py
+++ b/django/db/backends/__init__.py
@@ -1,19 +1,25 @@
+import datetime
+import time
+
 from django.db.utils import DatabaseError
 
 try:
     from django.utils.six.moves import _thread as thread
 except ImportError:
     from django.utils.six.moves import _dummy_thread as thread
+from collections import namedtuple
 from contextlib import contextmanager
 
 from django.conf import settings
 from django.db import DEFAULT_DB_ALIAS
+from django.db.backends.signals import connection_created
 from django.db.backends import util
 from django.db.transaction import TransactionManagementError
+from django.db.utils import DatabaseErrorWrapper
 from django.utils.functional import cached_property
 from django.utils.importlib import import_module
 from django.utils import six
-from django.utils.timezone import is_aware
+from django.utils import timezone
 
 
 class BaseDatabaseWrapper(object):
@@ -34,12 +40,34 @@ class BaseDatabaseWrapper(object):
         self.alias = alias
         self.use_debug_cursor = None
 
-        # Transaction related attributes
-        self.transaction_state = []
+        # Savepoint management related attributes
         self.savepoint_state = 0
-        self._dirty = None
-        self._thread_ident = thread.get_ident()
+
+        # Transaction management related attributes
+        self.autocommit = False
+        self.transaction_state = []
+        # Tracks if the connection is believed to be in transaction. This is
+        # set somewhat aggressively, as the DBAPI doesn't make it easy to
+        # deduce if the connection is in transaction or not.
+        self._dirty = False
+        # Tracks if the connection is in a transaction managed by 'atomic'.
+        self.in_atomic_block = False
+        # List of savepoints created by 'atomic'
+        self.savepoint_ids = []
+        # Tracks if the outermost 'atomic' block should commit on exit,
+        # ie. if autocommit was active on entry.
+        self.commit_on_exit = True
+        # Tracks if the transaction should be rolled back to the next
+        # available savepoint because of an exception in an inner block.
+        self.needs_rollback = False
+
+        # Connection termination related attributes
+        self.close_at = None
+        self.errors_occurred = False
+
+        # Thread-safety related attributes
         self.allow_thread_sharing = allow_thread_sharing
+        self._thread_ident = thread.get_ident()
 
     def __eq__(self, other):
         return self.alias == other.alias
@@ -47,47 +75,196 @@ class BaseDatabaseWrapper(object):
     def __ne__(self, other):
         return not self == other
 
-    __hash__ = object.__hash__
+    def __hash__(self):
+        return hash(self.alias)
+
+    ##### Backend-specific methods for creating connections and cursors #####
+
+    def get_connection_params(self):
+        """Returns a dict of parameters suitable for get_new_connection."""
+        raise NotImplementedError
+
+    def get_new_connection(self, conn_params):
+        """Opens a connection to the database."""
+        raise NotImplementedError
+
+    def init_connection_state(self):
+        """Initializes the database connection settings."""
+        raise NotImplementedError
+
+    def create_cursor(self):
+        """Creates a cursor. Assumes that a connection is established."""
+        raise NotImplementedError
+
+    ##### Backend-specific methods for creating connections #####
+
+    def connect(self):
+        """Connects to the database. Assumes that the connection is closed."""
+        # In case the previous connection was closed while in an atomic block
+        self.in_atomic_block = False
+        self.savepoint_ids = []
+        # Reset parameters defining when to close the connection
+        max_age = self.settings_dict['CONN_MAX_AGE']
+        self.close_at = None if max_age is None else time.time() + max_age
+        self.errors_occurred = False
+        # Establish the connection
+        conn_params = self.get_connection_params()
+        self.connection = self.get_new_connection(conn_params)
+        self.init_connection_state()
+        if self.settings_dict['AUTOCOMMIT']:
+            self.set_autocommit(True)
+        connection_created.send(sender=self.__class__, connection=self)
+
+    def ensure_connection(self):
+        """
+        Guarantees that a connection to the database is established.
+        """
+        if self.connection is None:
+            with self.wrap_database_errors():
+                self.connect()
+
+    ##### Backend-specific wrappers for PEP-249 connection methods #####
+
+    def _cursor(self):
+        self.ensure_connection()
+        with self.wrap_database_errors():
+            return self.create_cursor()
 
     def _commit(self):
         if self.connection is not None:
-            return self.connection.commit()
+            with self.wrap_database_errors():
+                return self.connection.commit()
 
     def _rollback(self):
         if self.connection is not None:
-            return self.connection.rollback()
+            with self.wrap_database_errors():
+                return self.connection.rollback()
 
-    def _enter_transaction_management(self, managed):
-        """
-        A hook for backend-specific changes required when entering manual
-        transaction handling.
-        """
-        pass
+    def _close(self):
+        if self.connection is not None:
+            with self.wrap_database_errors():
+                return self.connection.close()
 
-    def _leave_transaction_management(self, managed):
+    ##### Generic wrappers for PEP-249 connection methods #####
+
+    def cursor(self):
         """
-        A hook for backend-specific changes required when leaving manual
-        transaction handling. Will usually be implemented only when
-        _enter_transaction_management() is also required.
+        Creates a cursor, opening a connection if necessary.
         """
-        pass
+        self.validate_thread_sharing()
+        if (self.use_debug_cursor or
+            (self.use_debug_cursor is None and settings.DEBUG)):
+            cursor = self.make_debug_cursor(self._cursor())
+        else:
+            cursor = util.CursorWrapper(self._cursor(), self)
+        return cursor
+
+    def commit(self):
+        """
+        Commits a transaction and resets the dirty flag.
+        """
+        self.validate_thread_sharing()
+        self.validate_no_atomic_block()
+        self._commit()
+        self.set_clean()
+
+    def rollback(self):
+        """
+        Rolls back a transaction and resets the dirty flag.
+        """
+        self.validate_thread_sharing()
+        self.validate_no_atomic_block()
+        self._rollback()
+        self.set_clean()
+
+    def close(self):
+        """
+        Closes the connection to the database.
+        """
+        self.validate_thread_sharing()
+        # Don't call validate_no_atomic_block() to avoid making it difficult
+        # to get rid of a connection in an invalid state. The next connect()
+        # will reset the transaction state anyway.
+        try:
+            self._close()
+        finally:
+            self.connection = None
+        self.set_clean()
+
+    ##### Backend-specific savepoint management methods #####
 
     def _savepoint(self, sid):
-        if not self.features.uses_savepoints:
-            return
         self.cursor().execute(self.ops.savepoint_create_sql(sid))
 
     def _savepoint_rollback(self, sid):
-        if not self.features.uses_savepoints:
-            return
         self.cursor().execute(self.ops.savepoint_rollback_sql(sid))
 
     def _savepoint_commit(self, sid):
-        if not self.features.uses_savepoints:
-            return
         self.cursor().execute(self.ops.savepoint_commit_sql(sid))
 
-    def enter_transaction_management(self, managed=True):
+    def _savepoint_allowed(self):
+        # Savepoints cannot be created outside a transaction
+        return self.features.uses_savepoints and not self.autocommit
+
+    ##### Generic savepoint management methods #####
+
+    def savepoint(self):
+        """
+        Creates a savepoint inside the current transaction. Returns an
+        identifier for the savepoint that will be used for the subsequent
+        rollback or commit. Does nothing if savepoints are not supported.
+        """
+        if not self._savepoint_allowed():
+            return
+
+        thread_ident = thread.get_ident()
+        tid = str(thread_ident).replace('-', '')
+
+        self.savepoint_state += 1
+        sid = "s%s_x%d" % (tid, self.savepoint_state)
+
+        self.validate_thread_sharing()
+        self._savepoint(sid)
+
+        return sid
+
+    def savepoint_rollback(self, sid):
+        """
+        Rolls back to a savepoint. Does nothing if savepoints are not supported.
+        """
+        if not self._savepoint_allowed():
+            return
+
+        self.validate_thread_sharing()
+        self._savepoint_rollback(sid)
+
+    def savepoint_commit(self, sid):
+        """
+        Releases a savepoint. Does nothing if savepoints are not supported.
+        """
+        if not self._savepoint_allowed():
+            return
+
+        self.validate_thread_sharing()
+        self._savepoint_commit(sid)
+
+    def clean_savepoints(self):
+        """
+        Resets the counter used to generate unique savepoint ids in this thread.
+        """
+        self.savepoint_state = 0
+
+    ##### Backend-specific transaction management methods #####
+
+    def _set_autocommit(self, autocommit):
+        """
+        Backend-specific implementation to enable or disable autocommit.
+        """
+        raise NotImplementedError
+
+    ##### Generic transaction management methods #####
+
+    def enter_transaction_management(self, managed=True, forced=False):
         """
         Enters transaction management for a running thread. It must be balanced with
         the appropriate leave_transaction_management call, since the actual state is
@@ -96,15 +273,22 @@ class BaseDatabaseWrapper(object):
         The state and dirty flag are carried over from the surrounding block or
         from the settings, if there is no surrounding block (dirty is always false
         when no current block is running).
-        """
-        if self.transaction_state:
-            self.transaction_state.append(self.transaction_state[-1])
-        else:
-            self.transaction_state.append(settings.TRANSACTIONS_MANAGED)
 
-        if self._dirty is None:
-            self._dirty = False
-        self._enter_transaction_management(managed)
+        If you switch off transaction management and there is a pending
+        commit/rollback, the data will be commited, unless "forced" is True.
+        """
+        self.validate_no_atomic_block()
+
+        self.ensure_connection()
+
+        self.transaction_state.append(managed)
+
+        if not managed and self.is_dirty() and not forced:
+            self.commit()
+            self.set_clean()
+
+        if managed == self.autocommit:
+            self.set_autocommit(not managed)
 
     def leave_transaction_management(self):
         """
@@ -112,34 +296,57 @@ class BaseDatabaseWrapper(object):
         over to the surrounding block, as a commit will commit all changes, even
         those from outside. (Commits are on connection level.)
         """
+        self.validate_no_atomic_block()
+
+        self.ensure_connection()
+
         if self.transaction_state:
             del self.transaction_state[-1]
         else:
             raise TransactionManagementError(
                 "This code isn't under transaction management")
-        # We will pass the next status (after leaving the previous state
-        # behind) to subclass hook.
-        self._leave_transaction_management(self.is_managed())
+
+        if self.transaction_state:
+            managed = self.transaction_state[-1]
+        else:
+            managed = not self.settings_dict['AUTOCOMMIT']
+
         if self._dirty:
             self.rollback()
+            if managed == self.autocommit:
+                self.set_autocommit(not managed)
             raise TransactionManagementError(
                 "Transaction managed block ended with pending COMMIT/ROLLBACK")
-        self._dirty = False
 
-    def validate_thread_sharing(self):
+        if managed == self.autocommit:
+            self.set_autocommit(not managed)
+
+    def set_autocommit(self, autocommit):
         """
-        Validates that the connection isn't accessed by another thread than the
-        one which originally created it, unless the connection was explicitly
-        authorized to be shared between threads (via the `allow_thread_sharing`
-        property). Raises an exception if the validation fails.
+        Enable or disable autocommit.
         """
-        if (not self.allow_thread_sharing
-            and self._thread_ident != thread.get_ident()):
-                raise DatabaseError("DatabaseWrapper objects created in a "
-                    "thread can only be used in that same thread. The object "
-                    "with alias '%s' was created in thread id %s and this is "
-                    "thread id %s."
-                    % (self.alias, self._thread_ident, thread.get_ident()))
+        self.validate_no_atomic_block()
+        self.ensure_connection()
+        self._set_autocommit(autocommit)
+        self.autocommit = autocommit
+
+    def validate_no_atomic_block(self):
+        """
+        Raise an error if an atomic block is active.
+        """
+        if self.in_atomic_block:
+            raise TransactionManagementError(
+                "This is forbidden when an 'atomic' block is active.")
+
+    def abort(self):
+        """
+        Roll back any ongoing transaction and clean the transaction state
+        stack.
+        """
+        if self._dirty:
+            self.rollback()
+        while self.transaction_state:
+            self.leave_transaction_management()
 
     def is_dirty(self):
         """
@@ -154,11 +361,8 @@ class BaseDatabaseWrapper(object):
         to decide in a managed block of code to decide whether there are open
         changes waiting for commit.
         """
-        if self._dirty is not None:
+        if not self.autocommit:
             self._dirty = True
-        else:
-            raise TransactionManagementError("This code isn't under transaction "
-                "management")
 
     def set_clean(self):
         """
@@ -166,112 +370,16 @@ class BaseDatabaseWrapper(object):
         to decide in a managed block of code to decide whether a commit or rollback
         should happen.
         """
-        if self._dirty is not None:
-            self._dirty = False
-        else:
-            raise TransactionManagementError("This code isn't under transaction management")
+        self._dirty = False
         self.clean_savepoints()
 
-    def clean_savepoints(self):
-        self.savepoint_state = 0
-
-    def is_managed(self):
-        """
-        Checks whether the transaction manager is in manual or in auto state.
-        """
-        if self.transaction_state:
-            return self.transaction_state[-1]
-        return settings.TRANSACTIONS_MANAGED
-
-    def managed(self, flag=True):
-        """
-        Puts the transaction manager into a manual state: managed transactions have
-        to be committed explicitly by the user. If you switch off transaction
-        management and there is a pending commit/rollback, the data will be
-        commited.
-        """
-        top = self.transaction_state
-        if top:
-            top[-1] = flag
-            if not flag and self.is_dirty():
-                self._commit()
-                self.set_clean()
-        else:
-            raise TransactionManagementError("This code isn't under transaction "
-                "management")
-
-    def commit_unless_managed(self):
-        """
-        Commits changes if the system is not in managed transaction mode.
-        """
-        self.validate_thread_sharing()
-        if not self.is_managed():
-            self._commit()
-            self.clean_savepoints()
-        else:
-            self.set_dirty()
-
-    def rollback_unless_managed(self):
-        """
-        Rolls back changes if the system is not in managed transaction mode.
-        """
-        self.validate_thread_sharing()
-        if not self.is_managed():
-            self._rollback()
-        else:
-            self.set_dirty()
-
-    def commit(self):
-        """
-        Does the commit itself and resets the dirty flag.
-        """
-        self.validate_thread_sharing()
-        self._commit()
-        self.set_clean()
-
-    def rollback(self):
-        """
-        This function does the rollback itself and resets the dirty flag.
-        """
-        self.validate_thread_sharing()
-        self._rollback()
-        self.set_clean()
-
-    def savepoint(self):
-        """
-        Creates a savepoint (if supported and required by the backend) inside the
-        current transaction. Returns an identifier for the savepoint that will be
-        used for the subsequent rollback or commit.
-        """
-        thread_ident = thread.get_ident()
-
-        self.savepoint_state += 1
-
-        tid = str(thread_ident).replace('-', '')
-        sid = "s%s_x%d" % (tid, self.savepoint_state)
-        self._savepoint(sid)
-        return sid
-
-    def savepoint_rollback(self, sid):
-        """
-        Rolls back the most recent savepoint (if one exists). Does nothing if
-        savepoints are not supported.
-        """
-        self.validate_thread_sharing()
-        if self.savepoint_state:
-            self._savepoint_rollback(sid)
-
-    def savepoint_commit(self, sid):
-        """
-        Commits the most recent savepoint (if one exists). Does nothing if
-        savepoints are not supported.
-        """
-        self.validate_thread_sharing()
-        if self.savepoint_state:
-            self._savepoint_commit(sid)
+    ##### Foreign key constraints checks handling #####
 
     @contextmanager
     def constraint_checks_disabled(self):
+        """
+        Context manager that disables foreign key constraint checking.
+        """
         disabled = self.disable_constraint_checking()
         try:
             yield
@@ -281,42 +389,114 @@ class BaseDatabaseWrapper(object):
 
     def disable_constraint_checking(self):
         """
-        Backends can implement as needed to temporarily disable foreign key constraint
-        checking.
+        Backends can implement as needed to temporarily disable foreign key
+        constraint checking.
         """
         pass
 
     def enable_constraint_checking(self):
         """
-        Backends can implement as needed to re-enable foreign key constraint checking.
+        Backends can implement as needed to re-enable foreign key constraint
+        checking.
         """
         pass
 
     def check_constraints(self, table_names=None):
         """
-        Backends can override this method if they can apply constraint checking (e.g. via "SET CONSTRAINTS
-        ALL IMMEDIATE"). Should raise an IntegrityError if any invalid foreign key references are encountered.
+        Backends can override this method if they can apply constraint
+        checking (e.g. via "SET CONSTRAINTS ALL IMMEDIATE"). Should raise an
+        IntegrityError if any invalid foreign key references are encountered.
         """
         pass
 
-    def close(self):
-        self.validate_thread_sharing()
-        if self.connection is not None:
-            self.connection.close()
-            self.connection = None
+    ##### Connection termination handling #####
 
-    def cursor(self):
-        self.validate_thread_sharing()
-        if (self.use_debug_cursor or
-            (self.use_debug_cursor is None and settings.DEBUG)):
-            cursor = self.make_debug_cursor(self._cursor())
-        else:
-            cursor = util.CursorWrapper(self._cursor(), self)
-        return cursor
+    def is_usable(self):
+        """
+        Tests if the database connection is usable.
+        This function may assume that self.connection is not None.
+        """
+        raise NotImplementedError
+
+    def close_if_unusable_or_obsolete(self):
+        """
+        Closes the current connection if unrecoverable errors have occurred,
+        or if it outlived its maximum age.
+        """
+        if self.connection is not None:
+            # If the application didn't restore the original autocommit setting,
+            # don't take chances, drop the connection.
+            if self.autocommit != self.settings_dict['AUTOCOMMIT']:
+                self.close()
+                return
+
+            if self.errors_occurred:
+                if self.is_usable():
+                    self.errors_occurred = False
+                else:
+                    self.close()
+                    return
+
+            if self.close_at is not None and time.time() >= self.close_at:
+                self.close()
+                return
+
+    ##### Thread safety handling #####
+
+    def validate_thread_sharing(self):
+        """
+        Validates that the connection isn't accessed by another thread than the
+        one which originally created it, unless the connection was explicitly
+        authorized to be shared between threads (via the `allow_thread_sharing`
+        property). Raises an exception if the validation fails.
+        """
+        if not (self.allow_thread_sharing
+                or self._thread_ident == thread.get_ident()):
+            raise DatabaseError("DatabaseWrapper objects created in a "
+                "thread can only be used in that same thread. The object "
+                "with alias '%s' was created in thread id %s and this is "
+                "thread id %s."
+                % (self.alias, self._thread_ident, thread.get_ident()))
+
+    ##### Miscellaneous #####
+
+    def wrap_database_errors(self):
+        """
+        Context manager and decorator that re-throws backend-specific database
+        exceptions using Django's common wrappers.
+        """
+        return DatabaseErrorWrapper(self)
 
     def make_debug_cursor(self, cursor):
+        """
+        Creates a cursor that logs all queries in self.queries.
+        """
         return util.CursorDebugWrapper(cursor, self)
 
+    @contextmanager
+    def temporary_connection(self):
+        """
+        Context manager that ensures that a connection is established, and
+        if it opened one, closes it to avoid leaving a dangling connection.
+        This is useful for operations outside of the request-response cycle.
+
+        Provides a cursor: with self.temporary_connection() as cursor: ...
+        """
+        must_close = self.connection is None
+        cursor = self.cursor()
+        try:
+            yield cursor
+        finally:
+            cursor.close()
+            if must_close:
+                self.close()
+
+    def _start_transaction_under_autocommit(self):
+        """
+        Only required when autocommits_when_autocommit_is_off = True.
+        """
+        raise NotImplementedError
+
     def schema_editor(self):
         "Returns a new instance of this backend's SchemaEditor"
         raise NotImplementedError()
@@ -340,7 +520,6 @@ class BaseDatabaseFeatures(object):
     can_use_chunked_reads = True
     can_return_id_from_insert = False
     has_bulk_insert = False
-    uses_autocommit = False
     uses_savepoints = False
     can_combine_inserts_with_and_without_auto_increment_pk = False
 
@@ -389,6 +568,9 @@ class BaseDatabaseFeatures(object):
     # Can datetimes with timezones be used?
     supports_timezones = True
 
+    # Does the database have a copy of the zoneinfo database?
+    has_zoneinfo_database = True
+
     # When performing a GROUP BY, is an ORDER BY NULL required
     # to remove any ordering?
     requires_explicit_null_ordering_when_grouping = False
@@ -421,6 +603,10 @@ class BaseDatabaseFeatures(object):
     # Support for the DISTINCT ON clause
     can_distinct_on_fields = False
 
+    # Does the backend decide to commit before SAVEPOINT statements
+    # when autocommit is disabled? http://bugs.python.org/issue8145#msg109965
+    autocommits_when_autocommit_is_off = False
+
     # Can we roll back DDL in a transaction?
     can_rollback_ddl = False
 
@@ -447,17 +633,15 @@ class BaseDatabaseFeatures(object):
             # otherwise autocommit will cause the confimation to
             # fail.
             self.connection.enter_transaction_management()
-            self.connection.managed(True)
             cursor = self.connection.cursor()
             cursor.execute('CREATE TABLE ROLLBACK_TEST (X INT)')
-            self.connection._commit()
+            self.connection.commit()
             cursor.execute('INSERT INTO ROLLBACK_TEST (X) VALUES (8)')
-            self.connection._rollback()
+            self.connection.rollback()
             cursor.execute('SELECT COUNT(X) FROM ROLLBACK_TEST')
             count, = cursor.fetchone()
             cursor.execute('DROP TABLE ROLLBACK_TEST')
-            self.connection._commit()
-            self.connection._dirty = False
+            self.connection.commit()
         finally:
             self.connection.leave_transaction_management()
         return count == 0
@@ -530,7 +714,7 @@ class BaseDatabaseOperations(object):
     def date_trunc_sql(self, lookup_type, field_name):
         """
         Given a lookup_type of 'year', 'month' or 'day', returns the SQL that
-        truncates the given date field field_name to a DATE object with only
+        truncates the given date field field_name to a date object with only
         the given specificity.
         """
         raise NotImplementedError()
@@ -544,6 +728,23 @@ class BaseDatabaseOperations(object):
         """
         return "%s"
 
+    def datetime_extract_sql(self, lookup_type, field_name, tzname):
+        """
+        Given a lookup_type of 'year', 'month', 'day', 'hour', 'minute' or
+        'second', returns the SQL that extracts a value from the given
+        datetime field field_name, and a tuple of parameters.
+        """
+        raise NotImplementedError()
+
+    def datetime_trunc_sql(self, lookup_type, field_name, tzname):
+        """
+        Given a lookup_type of 'year', 'month', 'day', 'hour', 'minute' or
+        'second', returns the SQL that truncates the given datetime field
+        field_name to a datetime object with only the given specificity, and
+        a tuple of parameters.
+        """
+        raise NotImplementedError()
+
     def deferrable_sql(self):
         """
         Returns the SQL necessary to make a constraint "initially deferred"
@@ -632,11 +833,13 @@ class BaseDatabaseOperations(object):
         # Convert params to contain Unicode values.
         to_unicode = lambda s: force_text(s, strings_only=True, errors='replace')
         if isinstance(params, (list, tuple)):
-            u_params = tuple([to_unicode(val) for val in params])
+            u_params = tuple(to_unicode(val) for val in params)
+        elif params is None:
+            u_params = ()
         else:
-            u_params = dict([(to_unicode(k), to_unicode(v)) for k, v in params.items()])
+            u_params = dict((to_unicode(k), to_unicode(v)) for k, v in params.items())
 
-        return force_text(sql) % u_params
+        return six.text_type("QUERY = %r - PARAMS = %r") % (sql, u_params)
 
     def last_insert_id(self, cursor, table_name, pk_name):
         """
@@ -740,19 +943,19 @@ class BaseDatabaseOperations(object):
         "uses_savepoints" feature is True. The "sid" parameter is a string
         for the savepoint id.
         """
-        raise NotImplementedError
+        return "SAVEPOINT %s" % self.quote_name(sid)
 
     def savepoint_commit_sql(self, sid):
         """
         Returns the SQL for committing the given savepoint.
         """
-        raise NotImplementedError
+        return "RELEASE SAVEPOINT %s" % self.quote_name(sid)
 
     def savepoint_rollback_sql(self, sid):
         """
         Returns the SQL for rolling back the given savepoint.
         """
-        raise NotImplementedError
+        return "ROLLBACK TO SAVEPOINT %s" % self.quote_name(sid)
 
     def set_time_zone_sql(self):
         """
@@ -803,6 +1006,9 @@ class BaseDatabaseOperations(object):
         return "BEGIN;"
 
     def end_transaction_sql(self, success=True):
+        """
+        Returns the SQL statement required to end a transaction.
+        """
         if not success:
             return "ROLLBACK;"
         return "COMMIT;"
@@ -860,7 +1066,7 @@ class BaseDatabaseOperations(object):
         """
         if value is None:
             return None
-        if is_aware(value):
+        if timezone.is_aware(value):
             raise ValueError("Django does not support timezone-aware times.")
         return six.text_type(value)
 
@@ -873,29 +1079,33 @@ class BaseDatabaseOperations(object):
             return None
         return util.format_number(value, max_digits, decimal_places)
 
-    def year_lookup_bounds(self, value):
-        """
-        Returns a two-elements list with the lower and upper bound to be used
-        with a BETWEEN operator to query a field value using a year lookup
-
-        `value` is an int, containing the looked-up year.
-        """
-        first = '%s-01-01 00:00:00'
-        second = '%s-12-31 23:59:59.999999'
-        return [first % value, second % value]
-
     def year_lookup_bounds_for_date_field(self, value):
         """
         Returns a two-elements list with the lower and upper bound to be used
-        with a BETWEEN operator to query a DateField value using a year lookup
+        with a BETWEEN operator to query a DateField value using a year
+        lookup.
 
         `value` is an int, containing the looked-up year.
-
-        By default, it just calls `self.year_lookup_bounds`. Some backends need
-        this hook because on their DB date fields can't be compared to values
-        which include a time part.
         """
-        return self.year_lookup_bounds(value)
+        first = datetime.date(value, 1, 1)
+        second = datetime.date(value, 12, 31)
+        return [first, second]
+
+    def year_lookup_bounds_for_datetime_field(self, value):
+        """
+        Returns a two-elements list with the lower and upper bound to be used
+        with a BETWEEN operator to query a DateTimeField value using a year
+        lookup.
+
+        `value` is an int, containing the looked-up year.
+        """
+        first = datetime.datetime(value, 1, 1)
+        second = datetime.datetime(value, 12, 31, 23, 59, 59, 999999)
+        if settings.USE_TZ:
+            tz = timezone.get_current_timezone()
+            first = timezone.make_aware(first, tz)
+            second = timezone.make_aware(second, tz)
+        return [first, second]
 
     def convert_values(self, value, field):
         """
@@ -937,6 +1147,12 @@ class BaseDatabaseOperations(object):
         """
         return params
 
+
+# Structure returned by the DB-API cursor.description interface (PEP 249)
+FieldInfo = namedtuple('FieldInfo',
+    'name type_code display_size internal_size precision scale null_ok'
+)
+
 class BaseDatabaseIntrospection(object):
     """
     This class encapsulates all backend-specific introspection utilities
diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py
index 9c3095d0aa..21cea1fef8 100644
--- a/django/db/backends/creation.py
+++ b/django/db/backends/creation.py
@@ -1,12 +1,15 @@
 import hashlib
 import sys
 import time
+import warnings
 
 from django.conf import settings
 from django.db.utils import load_backend
 from django.utils.encoding import force_bytes
 from django.utils.six.moves import input
 
+from .util import truncate_name
+
 # The prefix to put on the default database name when creating
 # the test database.
 TEST_DATABASE_PREFIX = 'test_'
@@ -77,9 +80,9 @@ class BaseDatabaseCreation(object):
                     tablespace, inline=True)
                 if tablespace_sql:
                     field_output.append(tablespace_sql)
-            if f.rel:
+            if f.rel and f.db_constraint:
                 ref_output, pending = self.sql_for_inline_foreign_key_references(
-                    f, known_models, style)
+                    model, f, known_models, style)
                 if pending:
                     pending_references.setdefault(f.rel.to, []).append(
                         (model, f))
@@ -118,15 +121,16 @@ class BaseDatabaseCreation(object):
 
         return final_output, pending_references
 
-    def sql_for_inline_foreign_key_references(self, field, known_models, style):
+    def sql_for_inline_foreign_key_references(self, model, field, known_models, style):
         """
         Return the SQL snippet defining the foreign key reference for a field.
         """
         qn = self.connection.ops.quote_name
-        if field.rel.to in known_models:
+        rel_to = field.rel.to
+        if rel_to in known_models or rel_to == model:
             output = [style.SQL_KEYWORD('REFERENCES') + ' ' +
-                style.SQL_TABLE(qn(field.rel.to._meta.db_table)) + ' (' +
-                style.SQL_FIELD(qn(field.rel.to._meta.get_field(
+                style.SQL_TABLE(qn(rel_to._meta.db_table)) + ' (' +
+                style.SQL_FIELD(qn(rel_to._meta.get_field(
                     field.rel.field_name).column)) + ')' +
                 self.connection.ops.deferrable_sql()
             ]
@@ -143,8 +147,6 @@ class BaseDatabaseCreation(object):
         """
         Returns any ALTER TABLE statements to add constraints after the fact.
         """
-        from django.db.backends.util import truncate_name
-
         opts = model._meta
         if not opts.managed or opts.proxy or opts.swapped:
             return []
@@ -194,8 +196,6 @@ class BaseDatabaseCreation(object):
             return []
 
     def sql_indexes_for_fields(self, model, fields, style):
-        from django.db.backends.util import truncate_name
-
         if len(fields) == 1 and fields[0].db_tablespace:
             tablespace_sql = self.connection.ops.tablespace_sql(fields[0].db_tablespace)
         elif model._meta.db_tablespace:
@@ -242,7 +242,6 @@ class BaseDatabaseCreation(object):
         return output
 
     def sql_remove_table_constraints(self, model, references_to_delete, style):
-        from django.db.backends.util import truncate_name
         if not model._meta.managed or model._meta.proxy or model._meta.swapped:
             return []
         output = []
@@ -263,6 +262,52 @@ class BaseDatabaseCreation(object):
         del references_to_delete[model]
         return output
 
+    def sql_destroy_indexes_for_model(self, model, style):
+        """
+        Returns the DROP INDEX SQL statements for a single model.
+        """
+        if not model._meta.managed or model._meta.proxy or model._meta.swapped:
+            return []
+        output = []
+        for f in model._meta.local_fields:
+            output.extend(self.sql_destroy_indexes_for_field(model, f, style))
+        for fs in model._meta.index_together:
+            fields = [model._meta.get_field_by_name(f)[0] for f in fs]
+            output.extend(self.sql_destroy_indexes_for_fields(model, fields, style))
+        return output
+
+    def sql_destroy_indexes_for_field(self, model, f, style):
+        """
+        Return the DROP INDEX SQL statements for a single model field.
+        """
+        if f.db_index and not f.unique:
+            return self.sql_destroy_indexes_for_fields(model, [f], style)
+        else:
+            return []
+
+    def sql_destroy_indexes_for_fields(self, model, fields, style):
+        if len(fields) == 1 and fields[0].db_tablespace:
+            tablespace_sql = self.connection.ops.tablespace_sql(fields[0].db_tablespace)
+        elif model._meta.db_tablespace:
+            tablespace_sql = self.connection.ops.tablespace_sql(model._meta.db_tablespace)
+        else:
+            tablespace_sql = ""
+        if tablespace_sql:
+            tablespace_sql = " " + tablespace_sql
+
+        field_names = []
+        qn = self.connection.ops.quote_name
+        for f in fields:
+            field_names.append(style.SQL_FIELD(qn(f.column)))
+
+        index_name = "%s_%s" % (model._meta.db_table, self._digest([f.name for f in fields]))
+
+        return [
+            style.SQL_KEYWORD("DROP INDEX") + " " +
+            style.SQL_TABLE(qn(truncate_name(index_name, self.connection.ops.max_name_length()))) + " " +
+            ";",
+        ]
+
     def create_test_db(self, verbosity=1, autoclobber=False):
         """
         Creates a test database, prompting the user for confirmation if the
@@ -340,11 +385,8 @@ class BaseDatabaseCreation(object):
 
         qn = self.connection.ops.quote_name
 
-        # Create the test database and connect to it. We need to autocommit
-        # if the database supports it because PostgreSQL doesn't allow
-        # CREATE/DROP DATABASE statements within transactions.
+        # Create the test database and connect to it.
         cursor = self.connection.cursor()
-        self._prepare_for_test_db_ddl()
         try:
             cursor.execute(
                 "CREATE DATABASE %s %s" % (qn(test_database_name), suffix))
@@ -411,7 +453,6 @@ class BaseDatabaseCreation(object):
         # to do so, because it's not allowed to delete a database while being
         # connected to it.
         cursor = self.connection.cursor()
-        self._prepare_for_test_db_ddl()
         # Wait to avoid "database is being accessed by other users" errors.
         time.sleep(1)
         cursor.execute("DROP DATABASE %s"
@@ -424,16 +465,10 @@ class BaseDatabaseCreation(object):
         anymore by Django code. Kept for compatibility with user code that
         might use it.
         """
-        pass
-
-    def _prepare_for_test_db_ddl(self):
-        """
-        Internal implementation - Hook for tasks that should be performed
-        before the ``CREATE DATABASE``/``DROP DATABASE`` clauses used by
-        testing code to create/ destroy test databases. Needed e.g. in
-        PostgreSQL to rollback and close any active transaction.
-        """
-        pass
+        warnings.warn(
+            "set_autocommit was moved from BaseDatabaseCreation to "
+            "BaseDatabaseWrapper.", PendingDeprecationWarning, stacklevel=2)
+        return self.connection.set_autocommit(True)
 
     def sql_table_creation_suffix(self):
         """
diff --git a/django/db/backends/dummy/base.py b/django/db/backends/dummy/base.py
index 12a940d3a2..9a220ffd8b 100644
--- a/django/db/backends/dummy/base.py
+++ b/django/db/backends/dummy/base.py
@@ -31,6 +31,10 @@ class DatabaseOperations(BaseDatabaseOperations):
 class DatabaseClient(BaseDatabaseClient):
     runshell = complain
 
+class DatabaseCreation(BaseDatabaseCreation):
+    create_test_db = ignore
+    destroy_test_db = ignore
+
 class DatabaseIntrospection(BaseDatabaseIntrospection):
     get_table_list = complain
     get_table_description = complain
@@ -44,19 +48,16 @@ class DatabaseWrapper(BaseDatabaseWrapper):
     # implementations. Anything that tries to actually
     # do something raises complain; anything that tries
     # to rollback or undo something raises ignore.
+    _cursor = complain
     _commit = complain
     _rollback = ignore
-    enter_transaction_management = complain
-    leave_transaction_management = ignore
+    _close = ignore
+    _savepoint = ignore
+    _savepoint_commit = complain
+    _savepoint_rollback = ignore
+    _set_autocommit = complain
     set_dirty = complain
     set_clean = complain
-    commit_unless_managed = complain
-    rollback_unless_managed = ignore
-    savepoint = ignore
-    savepoint_commit = complain
-    savepoint_rollback = ignore
-    close = ignore
-    cursor = complain
 
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
@@ -64,6 +65,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         self.features = BaseDatabaseFeatures(self)
         self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
-        self.creation = BaseDatabaseCreation(self)
+        self.creation = DatabaseCreation(self)
         self.introspection = DatabaseIntrospection(self)
         self.validation = BaseDatabaseValidation(self)
+
+    def is_usable(self):
+        return True
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index f782ca80ae..90f5018f8b 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -30,13 +30,14 @@ if (version < (1, 2, 1) or (version[:3] == (1, 2, 1) and
 from MySQLdb.converters import conversions, Thing2Literal
 from MySQLdb.constants import FIELD_TYPE, CLIENT
 
+from django.conf import settings
 from django.db import utils
 from django.db.backends import *
-from django.db.backends.signals import connection_created
 from django.db.backends.mysql.client import DatabaseClient
 from django.db.backends.mysql.creation import DatabaseCreation
 from django.db.backends.mysql.introspection import DatabaseIntrospection
 from django.db.backends.mysql.validation import DatabaseValidation
+from django.utils.encoding import force_str, force_text
 from django.db.backends.mysql.schema import DatabaseSchemaEditor
 from django.utils.encoding import force_str
 from django.utils.functional import cached_property
@@ -45,7 +46,6 @@ from django.utils import six
 from django.utils import timezone
 
 # Raise exceptions for database warnings if DEBUG is on
-from django.conf import settings
 if settings.DEBUG:
     warnings.filterwarnings("error", category=Database.Warning)
 
@@ -118,31 +118,24 @@ class CursorWrapper(object):
 
     def execute(self, query, args=None):
         try:
+            # args is None means no string interpolation
             return self.cursor.execute(query, args)
-        except Database.IntegrityError as e:
-            six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
         except Database.OperationalError as e:
             # Map some error codes to IntegrityError, since they seem to be
             # misclassified and Django would prefer the more logical place.
             if e[0] in self.codes_for_integrityerror:
                 six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
-        except Database.DatabaseError as e:
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
+            raise
 
     def executemany(self, query, args):
         try:
             return self.cursor.executemany(query, args)
-        except Database.IntegrityError as e:
-            six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
         except Database.OperationalError as e:
             # Map some error codes to IntegrityError, since they seem to be
             # misclassified and Django would prefer the more logical place.
             if e[0] in self.codes_for_integrityerror:
                 six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
-        except Database.DatabaseError as e:
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
+            raise
 
     def __getattr__(self, attr):
         if attr in self.__dict__:
@@ -195,6 +188,12 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "Confirm support for introspected foreign keys"
         return self._mysql_storage_engine != 'MyISAM'
 
+    @cached_property
+    def has_zoneinfo_database(self):
+        cursor = self.connection.cursor()
+        cursor.execute("SELECT 1 FROM mysql.time_zone LIMIT 1")
+        return cursor.fetchone() is not None
+
 class DatabaseOperations(BaseDatabaseOperations):
     compiler_module = "django.db.backends.mysql.compiler"
 
@@ -220,6 +219,39 @@ class DatabaseOperations(BaseDatabaseOperations):
             sql = "CAST(DATE_FORMAT(%s, '%s') AS DATETIME)" % (field_name, format_str)
         return sql
 
+    def datetime_extract_sql(self, lookup_type, field_name, tzname):
+        if settings.USE_TZ:
+            field_name = "CONVERT_TZ(%s, 'UTC', %%s)" % field_name
+            params = [tzname]
+        else:
+            params = []
+        # http://dev.mysql.com/doc/mysql/en/date-and-time-functions.html
+        if lookup_type == 'week_day':
+            # DAYOFWEEK() returns an integer, 1-7, Sunday=1.
+            # Note: WEEKDAY() returns 0-6, Monday=0.
+            sql = "DAYOFWEEK(%s)" % field_name
+        else:
+            sql = "EXTRACT(%s FROM %s)" % (lookup_type.upper(), field_name)
+        return sql, params
+
+    def datetime_trunc_sql(self, lookup_type, field_name, tzname):
+        if settings.USE_TZ:
+            field_name = "CONVERT_TZ(%s, 'UTC', %%s)" % field_name
+            params = [tzname]
+        else:
+            params = []
+        fields = ['year', 'month', 'day', 'hour', 'minute', 'second']
+        format = ('%%Y-', '%%m', '-%%d', ' %%H:', '%%i', ':%%s') # Use double percents to escape.
+        format_def = ('0000-', '01', '-01', ' 00:', '00', ':00')
+        try:
+            i = fields.index(lookup_type) + 1
+        except ValueError:
+            sql = field_name
+        else:
+            format_str = ''.join([f for f in format[:i]] + [f for f in format_def[i:]])
+            sql = "CAST(DATE_FORMAT(%s, '%s') AS DATETIME)" % (field_name, format_str)
+        return sql, params
+
     def date_interval_sql(self, sql, connector, timedelta):
         return "(%s %s INTERVAL '%d 0:0:%d:%d' DAY_MICROSECOND)" % (sql, connector,
                 timedelta.days, timedelta.seconds, timedelta.microseconds)
@@ -242,7 +274,7 @@ class DatabaseOperations(BaseDatabaseOperations):
         # With MySQLdb, cursor objects have an (undocumented) "_last_executed"
         # attribute where the exact query sent to the database is saved.
         # See MySQLdb/cursors.py in the source distribution.
-        return cursor._last_executed.decode('utf-8')
+        return force_text(cursor._last_executed, errors='replace')
 
     def no_limit_value(self):
         # 2**64 - 1, as recommended by the MySQL documentation
@@ -316,11 +348,10 @@ class DatabaseOperations(BaseDatabaseOperations):
         # MySQL doesn't support microseconds
         return six.text_type(value.replace(microsecond=0))
 
-    def year_lookup_bounds(self, value):
+    def year_lookup_bounds_for_datetime_field(self, value):
         # Again, no microseconds
-        first = '%s-01-01 00:00:00'
-        second = '%s-12-31 23:59:59.99'
-        return [first % value, second % value]
+        first, second = super(DatabaseOperations, self).year_lookup_bounds_for_datetime_field(value)
+        return [first.replace(microsecond=0), second.replace(microsecond=0)]
 
     def max_name_length(self):
         return 64
@@ -329,15 +360,6 @@ class DatabaseOperations(BaseDatabaseOperations):
         items_sql = "(%s)" % ", ".join(["%s"] * len(fields))
         return "VALUES " + ", ".join([items_sql] * num_values)
 
-    def savepoint_create_sql(self, sid):
-        return "SAVEPOINT %s" % sid
-
-    def savepoint_commit_sql(self, sid):
-        return "RELEASE SAVEPOINT %s" % sid
-
-    def savepoint_rollback_sql(self, sid):
-        return "ROLLBACK TO SAVEPOINT %s" % sid
-
 class DatabaseWrapper(BaseDatabaseWrapper):
     vendor = 'mysql'
     operators = {
@@ -357,10 +379,11 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         'iendswith': 'LIKE %s',
     }
 
+    Database = Database
+
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
 
-        self.server_version = None
         self.features = DatabaseFeatures(self)
         self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
@@ -368,15 +391,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         self.introspection = DatabaseIntrospection(self)
         self.validation = DatabaseValidation(self)
 
-    def _valid_connection(self):
-        if self.connection is not None:
-            try:
-                self.connection.ping()
-                return True
-            except DatabaseError:
-                self.close()
-        return False
-
     def get_connection_params(self):
         kwargs = {
             'conv': django_conversions,
@@ -417,12 +431,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         cursor.execute('SET SQL_AUTO_IS_NULL = 0')
         cursor.close()
 
-    def _cursor(self):
-        if not self._valid_connection():
-            conn_params = self.get_connection_params()
-            self.connection = self.get_new_connection(conn_params)
-            self.init_connection_state()
-            connection_created.send(sender=self.__class__, connection=self)
+    def create_cursor(self):
         cursor = self.connection.cursor()
         return CursorWrapper(cursor)
 
@@ -432,24 +441,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         except Database.NotSupportedError:
             pass
 
-    @cached_property
-    def mysql_version(self):
-        if not self.server_version:
-            new_connection = False
-            if not self._valid_connection():
-                # Ensure we have a connection with the DB by using a temporary
-                # cursor
-                new_connection = True
-                self.cursor().close()
-            server_info = self.connection.get_server_info()
-            if new_connection:
-                # Make sure we close the connection
-                self.close()
-            m = server_version_re.match(server_info)
-            if not m:
-                raise Exception('Unable to determine MySQL version from version string %r' % server_info)
-            self.server_version = tuple([int(x) for x in m.groups()])
-        return self.server_version
+    def _set_autocommit(self, autocommit):
+        self.connection.autocommit(autocommit)
 
     def disable_constraint_checking(self):
         """
@@ -503,3 +496,20 @@ class DatabaseWrapper(BaseDatabaseWrapper):
     def schema_editor(self):
         "Returns a new instance of this backend's SchemaEditor"
         return DatabaseSchemaEditor(self)
+
+    def is_usable(self):
+        try:
+            self.connection.ping()
+        except DatabaseError:
+            return False
+        else:
+            return True
+
+    @cached_property
+    def mysql_version(self):
+        with self.temporary_connection():
+            server_info = self.connection.get_server_info()
+        match = server_version_re.match(server_info)
+        if not match:
+            raise Exception('Unable to determine MySQL version from version string %r' % server_info)
+        return tuple([int(x) for x in match.groups()])
diff --git a/django/db/backends/mysql/compiler.py b/django/db/backends/mysql/compiler.py
index d8e9b3a202..50a085212b 100644
--- a/django/db/backends/mysql/compiler.py
+++ b/django/db/backends/mysql/compiler.py
@@ -17,6 +17,12 @@ class SQLCompiler(compiler.SQLCompiler):
             values.append(value)
         return row[:index_extra_select] + tuple(values)
 
+    def as_subquery_condition(self, alias, columns):
+        qn = self.quote_name_unless_alias
+        qn2 = self.connection.ops.quote_name
+        sql, params = self.as_sql()
+        return '(%s) IN (%s)' % (', '.join(['%s.%s' % (qn(alias), qn2(column)) for column in columns]), sql), params
+
 class SQLInsertCompiler(compiler.SQLInsertCompiler, SQLCompiler):
     pass
 
@@ -31,3 +37,6 @@ class SQLAggregateCompiler(compiler.SQLAggregateCompiler, SQLCompiler):
 
 class SQLDateCompiler(compiler.SQLDateCompiler, SQLCompiler):
     pass
+
+class SQLDateTimeCompiler(compiler.SQLDateTimeCompiler, SQLCompiler):
+    pass
diff --git a/django/db/backends/mysql/creation.py b/django/db/backends/mysql/creation.py
index 53bd57effc..3a57c29479 100644
--- a/django/db/backends/mysql/creation.py
+++ b/django/db/backends/mysql/creation.py
@@ -7,6 +7,7 @@ class DatabaseCreation(BaseDatabaseCreation):
     # If a column type is set to None, it won't be included in the output.
     data_types = {
         'AutoField':         'integer AUTO_INCREMENT',
+        'BinaryField':       'longblob',
         'BooleanField':      'bool',
         'CharField':         'varchar(%(max_length)s)',
         'CommaSeparatedIntegerField': 'varchar(%(max_length)s)',
@@ -38,29 +39,32 @@ class DatabaseCreation(BaseDatabaseCreation):
             suffix.append('COLLATE %s' % self.connection.settings_dict['TEST_COLLATION'])
         return ' '.join(suffix)
 
-    def sql_for_inline_foreign_key_references(self, field, known_models, style):
+    def sql_for_inline_foreign_key_references(self, model, field, known_models, style):
         "All inline references are pending under MySQL"
         return [], True
 
-    def sql_for_inline_many_to_many_references(self, model, field, style):
-        from django.db import models
-        opts = model._meta
-        qn = self.connection.ops.quote_name
+    def sql_destroy_indexes_for_fields(self, model, fields, style):
+        if len(fields) == 1 and fields[0].db_tablespace:
+            tablespace_sql = self.connection.ops.tablespace_sql(fields[0].db_tablespace)
+        elif model._meta.db_tablespace:
+            tablespace_sql = self.connection.ops.tablespace_sql(model._meta.db_tablespace)
+        else:
+            tablespace_sql = ""
+        if tablespace_sql:
+            tablespace_sql = " " + tablespace_sql
 
-        table_output = [
-            '    %s %s %s,' %
-                (style.SQL_FIELD(qn(field.m2m_column_name())),
-                style.SQL_COLTYPE(models.ForeignKey(model).db_type(connection=self.connection)),
-                style.SQL_KEYWORD('NOT NULL')),
-            '    %s %s %s,' %
-            (style.SQL_FIELD(qn(field.m2m_reverse_name())),
-            style.SQL_COLTYPE(models.ForeignKey(field.rel.to).db_type(connection=self.connection)),
-            style.SQL_KEYWORD('NOT NULL'))
+        field_names = []
+        qn = self.connection.ops.quote_name
+        for f in fields:
+            field_names.append(style.SQL_FIELD(qn(f.column)))
+
+        index_name = "%s_%s" % (model._meta.db_table, self._digest([f.name for f in fields]))
+
+        from ..util import truncate_name
+
+        return [
+            style.SQL_KEYWORD("DROP INDEX") + " " +
+            style.SQL_TABLE(qn(truncate_name(index_name, self.connection.ops.max_name_length()))) + " " +
+            style.SQL_KEYWORD("ON") + " " +
+            style.SQL_TABLE(qn(model._meta.db_table)) + ";",
         ]
-        deferred = [
-            (field.m2m_db_table(), field.m2m_column_name(), opts.db_table,
-                opts.pk.column),
-            (field.m2m_db_table(), field.m2m_reverse_name(),
-                field.rel.to._meta.db_table, field.rel.to._meta.pk.column)
-            ]
-        return table_output, deferred
diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py
index 477478ca9d..3cb55a239d 100644
--- a/django/db/backends/mysql/introspection.py
+++ b/django/db/backends/mysql/introspection.py
@@ -1,7 +1,8 @@
 import re
 from .base import FIELD_TYPE
 
-from django.db.backends import BaseDatabaseIntrospection
+from django.db.backends import BaseDatabaseIntrospection, FieldInfo
+from django.utils.encoding import force_text
 
 
 foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)` \(`([^`]*)`\)")
@@ -21,6 +22,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
         FIELD_TYPE.LONGLONG: 'BigIntegerField',
         FIELD_TYPE.SHORT: 'IntegerField',
         FIELD_TYPE.STRING: 'CharField',
+        FIELD_TYPE.TIME: 'TimeField',
         FIELD_TYPE.TIMESTAMP: 'DateTimeField',
         FIELD_TYPE.TINY: 'IntegerField',
         FIELD_TYPE.TINY_BLOB: 'TextField',
@@ -46,8 +48,19 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
                 AND character_maximum_length IS NOT NULL""", [table_name])
         length_map = dict(cursor.fetchall())
 
+        # Also getting precision and scale from information_schema (see #5014)
+        cursor.execute("""
+            SELECT column_name, numeric_precision, numeric_scale FROM information_schema.columns
+            WHERE table_name = %s AND table_schema = DATABASE()
+                AND data_type='decimal'""", [table_name])
+        numeric_map = dict([(line[0], tuple([int(n) for n in line[1:]])) for line in cursor.fetchall()])
+
         cursor.execute("SELECT * FROM %s LIMIT 1" % self.connection.ops.quote_name(table_name))
-        return [line[:3] + (length_map.get(line[0], line[3]),) + line[4:]
+        return [FieldInfo(*((force_text(line[0]),)
+                            + line[1:3]
+                            + (length_map.get(line[0], line[3]),)
+                            + numeric_map.get(line[0], line[4:6])
+                            + (line[6],)))
             for line in cursor.description]
 
     def _name_to_index(self, cursor, table_name):
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 129b5d827b..66860d3d01 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -5,8 +5,8 @@ Requires cx_Oracle: http://cx-oracle.sourceforge.net/
 """
 from __future__ import unicode_literals
 
-import datetime
 import decimal
+import re
 import sys
 import warnings
 
@@ -44,25 +44,23 @@ except ImportError as e:
     from django.core.exceptions import ImproperlyConfigured
     raise ImproperlyConfigured("Error loading cx_Oracle module: %s" % e)
 
-from django.conf import settings
 from django.db import utils
 from django.db.backends import *
-from django.db.backends.signals import connection_created
 from django.db.backends.oracle.client import DatabaseClient
 from django.db.backends.oracle.creation import DatabaseCreation
 from django.db.backends.oracle.introspection import DatabaseIntrospection
 from django.db.backends.oracle.schema import DatabaseSchemaEditor
 from django.utils.encoding import force_bytes, force_text
-from django.utils import six
-from django.utils import timezone
+
 
 DatabaseError = Database.DatabaseError
 IntegrityError = Database.IntegrityError
 
-
-# Check whether cx_Oracle was compiled with the WITH_UNICODE option.  This will
-# also be True in Python 3.0.
-if int(Database.version.split('.', 1)[0]) >= 5 and not hasattr(Database, 'UNICODE'):
+# Check whether cx_Oracle was compiled with the WITH_UNICODE option if cx_Oracle is pre-5.1. This will
+# also be True for cx_Oracle 5.1 and in Python 3.0. See #19606
+if int(Database.version.split('.', 1)[0]) >= 5 and \
+        (int(Database.version.split('.', 2)[1]) >= 1 or
+         not hasattr(Database, 'UNICODE')):
     convert_unicode = force_text
 else:
     convert_unicode = force_bytes
@@ -78,6 +76,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     can_return_id_from_insert = True
     allow_sliced_subqueries = False
     supports_subqueries_in_group_by = False
+    supports_transactions = True
     supports_timezones = False
     supports_bitwise_or = False
     can_defer_constraint_checks = True
@@ -127,12 +126,12 @@ WHEN (new.%(col_name)s IS NULL)
         """
 
     def date_extract_sql(self, lookup_type, field_name):
-        # http://download-east.oracle.com/docs/cd/B10501_01/server.920/a96540/functions42a.htm#1017163
         if lookup_type == 'week_day':
             # TO_CHAR(field, 'D') returns an integer from 1-7, where 1=Sunday.
             return "TO_CHAR(%s, 'D')" % field_name
         else:
-            return "EXTRACT(%s FROM %s)" % (lookup_type, field_name)
+            # http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions050.htm
+            return "EXTRACT(%s FROM %s)" % (lookup_type.upper(), field_name)
 
     def date_interval_sql(self, sql, connector, timedelta):
         """
@@ -149,13 +148,58 @@ WHEN (new.%(col_name)s IS NULL)
                 timedelta.microseconds, day_precision)
 
     def date_trunc_sql(self, lookup_type, field_name):
-        # Oracle uses TRUNC() for both dates and numbers.
-        # http://download-east.oracle.com/docs/cd/B10501_01/server.920/a96540/functions155a.htm#SQLRF06151
-        if lookup_type == 'day':
-            sql = 'TRUNC(%s)' % field_name
+        # http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions230.htm#i1002084
+        if lookup_type in ('year', 'month'):
+            return "TRUNC(%s, '%s')" % (field_name, lookup_type.upper())
         else:
-            sql = "TRUNC(%s, '%s')" % (field_name, lookup_type)
-        return sql
+            return "TRUNC(%s)" % field_name
+
+    # Oracle crashes with "ORA-03113: end-of-file on communication channel"
+    # if the time zone name is passed in parameter. Use interpolation instead.
+    # https://groups.google.com/forum/#!msg/django-developers/zwQju7hbG78/9l934yelwfsJ
+    # This regexp matches all time zone names from the zoneinfo database.
+    _tzname_re = re.compile(r'^[\w/:+-]+$')
+
+    def _convert_field_to_tz(self, field_name, tzname):
+        if not self._tzname_re.match(tzname):
+            raise ValueError("Invalid time zone name: %s" % tzname)
+        # Convert from UTC to local time, returning TIMESTAMP WITH TIME ZONE.
+        result = "(FROM_TZ(%s, '0:00') AT TIME ZONE '%s')" % (field_name, tzname)
+        # Extracting from a TIMESTAMP WITH TIME ZONE ignore the time zone.
+        # Convert to a DATETIME, which is called DATE by Oracle. There's no
+        # built-in function to do that; the easiest is to go through a string.
+        result = "TO_CHAR(%s, 'YYYY-MM-DD HH24:MI:SS')" % result
+        result = "TO_DATE(%s, 'YYYY-MM-DD HH24:MI:SS')" % result
+        # Re-convert to a TIMESTAMP because EXTRACT only handles the date part
+        # on DATE values, even though they actually store the time part.
+        return "CAST(%s AS TIMESTAMP)" % result
+
+    def datetime_extract_sql(self, lookup_type, field_name, tzname):
+        if settings.USE_TZ:
+            field_name = self._convert_field_to_tz(field_name, tzname)
+        if lookup_type == 'week_day':
+            # TO_CHAR(field, 'D') returns an integer from 1-7, where 1=Sunday.
+            sql = "TO_CHAR(%s, 'D')" % field_name
+        else:
+            # http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions050.htm
+            sql = "EXTRACT(%s FROM %s)" % (lookup_type.upper(), field_name)
+        return sql, []
+
+    def datetime_trunc_sql(self, lookup_type, field_name, tzname):
+        if settings.USE_TZ:
+            field_name = self._convert_field_to_tz(field_name, tzname)
+        # http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions230.htm#i1002084
+        if lookup_type in ('year', 'month'):
+            sql = "TRUNC(%s, '%s')" % (field_name, lookup_type.upper())
+        elif lookup_type == 'day':
+            sql = "TRUNC(%s)" % field_name
+        elif lookup_type == 'hour':
+            sql = "TRUNC(%s, 'HH24')" % field_name
+        elif lookup_type == 'minute':
+            sql = "TRUNC(%s, 'MI')" % field_name
+        else:
+            sql = field_name    # Cast to DATE removes sub-second precision.
+        return sql, []
 
     def convert_values(self, value, field):
         if isinstance(value, Database.LOB):
@@ -220,10 +264,12 @@ WHEN (new.%(col_name)s IS NULL)
     def last_executed_query(self, cursor, sql, params):
         # http://cx-oracle.sourceforge.net/html/cursor.html#Cursor.statement
         # The DB API definition does not define this attribute.
-        if six.PY3:
-            return cursor.statement
-        else:
-            return cursor.statement.decode("utf-8")
+        statement = cursor.statement
+        if not six.PY3 and not isinstance(statement, unicode):
+            statement = statement.decode('utf-8')
+        # Unlike Psycopg's `query` and MySQLdb`'s `_last_executed`, CxOracle's
+        # `statement` doesn't contain the query parameters. refs #20010.
+        return super(DatabaseOperations, self).last_executed_query(cursor, statement, params)
 
     def last_insert_id(self, cursor, table_name, pk_name):
         sq_name = self._get_sequence_name(table_name)
@@ -453,10 +499,11 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         'iendswith': "LIKEC UPPER(%s) ESCAPE '\\'",
     })
 
+    Database = Database
+
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
 
-        self.oracle_version = None
         self.features = DatabaseFeatures(self)
         use_returning_into = self.settings_dict["OPTIONS"].get('use_returning_into', True)
         self.features.can_return_id_from_insert = use_returning_into
@@ -466,17 +513,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         self.introspection = DatabaseIntrospection(self)
         self.validation = BaseDatabaseValidation(self)
 
-    def check_constraints(self, table_names=None):
-        """
-        To check constraints, we set constraints to immediate. Then, when, we're done we must ensure they
-        are returned to deferred.
-        """
-        self.cursor().execute('SET CONSTRAINTS ALL IMMEDIATE')
-        self.cursor().execute('SET CONSTRAINTS ALL DEFERRED')
-
-    def _valid_connection(self):
-        return self.connection is not None
-
     def _connect_string(self):
         settings_dict = self.settings_dict
         if not settings_dict['HOST'].strip():
@@ -490,9 +526,6 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         return "%s/%s@%s" % (settings_dict['USER'],
                              settings_dict['PASSWORD'], dsn)
 
-    def create_cursor(self, conn):
-        return FormatStylePlaceholderCursor(conn)
-
     def get_connection_params(self):
         conn_params = self.settings_dict['OPTIONS'].copy()
         if 'use_returning_into' in conn_params:
@@ -504,7 +537,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         return Database.connect(conn_string, **conn_params)
 
     def init_connection_state(self):
-        cursor = self.create_cursor(self.connection)
+        cursor = self.create_cursor()
         # Set the territory first. The territory overrides NLS_DATE_FORMAT
         # and NLS_TIMESTAMP_FORMAT to the territory default. When all of
         # these are set in single statement it isn't clear what is supposed
@@ -525,7 +558,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
             # This check is performed only once per DatabaseWrapper
             # instance per thread, since subsequent connections will use
             # the same settings.
-            cursor = self.create_cursor(self.connection)
+            cursor = self.create_cursor()
             try:
                 cursor.execute("SELECT 1 FROM DUAL WHERE DUMMY %s"
                                % self._standard_operators['contains'],
@@ -536,18 +569,15 @@ class DatabaseWrapper(BaseDatabaseWrapper):
                 self.operators = self._standard_operators
             cursor.close()
 
-        try:
-            self.oracle_version = int(self.connection.version.split('.')[0])
-            # There's no way for the DatabaseOperations class to know the
-            # currently active Oracle version, so we do some setups here.
-            # TODO: Multi-db support will need a better solution (a way to
-            # communicate the current version).
-            if self.oracle_version <= 9:
-                self.ops.regex_lookup = self.ops.regex_lookup_9
-            else:
-                self.ops.regex_lookup = self.ops.regex_lookup_10
-        except ValueError:
-            pass
+        # There's no way for the DatabaseOperations class to know the
+        # currently active Oracle version, so we do some setups here.
+        # TODO: Multi-db support will need a better solution (a way to
+        # communicate the current version).
+        if self.oracle_version is not None and self.oracle_version <= 9:
+            self.ops.regex_lookup = self.ops.regex_lookup_9
+        else:
+            self.ops.regex_lookup = self.ops.regex_lookup_10
+
         try:
             self.connection.stmtcachesize = 20
         except:
@@ -555,26 +585,13 @@ class DatabaseWrapper(BaseDatabaseWrapper):
             # stmtcachesize is available only in 4.3.2 and up.
             pass
 
-    def _cursor(self):
-        if not self._valid_connection():
-            conn_params = self.get_connection_params()
-            self.connection = self.get_new_connection(conn_params)
-            self.init_connection_state()
-            connection_created.send(sender=self.__class__, connection=self)
-        return self.create_cursor(self.connection)
-
-    # Oracle doesn't support savepoint commits.  Ignore them.
-    def _savepoint_commit(self, sid):
-        pass
+    def create_cursor(self):
+        return FormatStylePlaceholderCursor(self.connection)
 
     def _commit(self):
         if self.connection is not None:
             try:
                 return self.connection.commit()
-            except Database.IntegrityError as e:
-                # In case cx_Oracle implements (now or in a future version)
-                # raising this specific exception
-                six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
             except Database.DatabaseError as e:
                 # cx_Oracle 5.0.4 raises a cx_Oracle.DatabaseError exception
                 # with the following attributes and values:
@@ -587,12 +604,48 @@ class DatabaseWrapper(BaseDatabaseWrapper):
                 if hasattr(x, 'code') and hasattr(x, 'message') \
                    and x.code == 2091 and 'ORA-02291' in x.message:
                     six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-                six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
+                raise
     
     def schema_editor(self):
         "Returns a new instance of this backend's SchemaEditor"
         return DatabaseSchemaEditor(self)
 
+    # Oracle doesn't support savepoint commits.  Ignore them.
+    def _savepoint_commit(self, sid):
+        pass
+
+    def _set_autocommit(self, autocommit):
+        self.connection.autocommit = autocommit
+
+    def check_constraints(self, table_names=None):
+        """
+        To check constraints, we set constraints to immediate. Then, when, we're done we must ensure they
+        are returned to deferred.
+        """
+        self.cursor().execute('SET CONSTRAINTS ALL IMMEDIATE')
+        self.cursor().execute('SET CONSTRAINTS ALL DEFERRED')
+
+    def is_usable(self):
+        try:
+            if hasattr(self.connection, 'ping'):    # Oracle 10g R2 and higher
+                self.connection.ping()
+            else:
+                # Use a cx_Oracle cursor directly, bypassing Django's utilities.
+                self.connection.cursor().execute("SELECT 1 FROM DUAL")
+        except DatabaseError:
+            return False
+        else:
+            return True
+
+    @cached_property
+    def oracle_version(self):
+        with self.temporary_connection():
+            version = self.connection.version
+        try:
+            return int(version.split('.')[0])
+        except ValueError:
+            return None
+
 
 class OracleParam(object):
     """
@@ -624,6 +677,8 @@ class OracleParam(object):
             param = "0"
         if hasattr(param, 'bind_parameter'):
             self.force_bytes = param.bind_parameter(cursor)
+        elif isinstance(param, six.memoryview):
+            self.force_bytes = param
         else:
             self.force_bytes = convert_unicode(param, cursor.charset,
                                              strings_only)
@@ -707,28 +762,27 @@ class FormatStylePlaceholderCursor(object):
         return [p.force_bytes for p in params]
 
     def execute(self, query, params=None):
-        if params is None:
-            params = []
-        else:
-            params = self._format_params(params)
-        args = [(':arg%d' % i) for i in range(len(params))]
         # cx_Oracle wants no trailing ';' for SQL statements.  For PL/SQL, it
         # it does want a trailing ';' but not a trailing '/'.  However, these
         # characters must be included in the original query in case the query
         # is being passed to SQL*Plus.
         if query.endswith(';') or query.endswith('/'):
             query = query[:-1]
-        query = convert_unicode(query % tuple(args), self.charset)
+        if params is None:
+            params = []
+            query = convert_unicode(query, self.charset)
+        else:
+            params = self._format_params(params)
+            args = [(':arg%d' % i) for i in range(len(params))]
+            query = convert_unicode(query % tuple(args), self.charset)
         self._guess_input_sizes([params])
         try:
             return self.cursor.execute(query, self._param_generator(params))
-        except Database.IntegrityError as e:
-            six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
         except Database.DatabaseError as e:
             # cx_Oracle <= 4.4.0 wrongly raises a DatabaseError for ORA-01400.
             if hasattr(e.args[0], 'code') and e.args[0].code == 1400 and not isinstance(e, IntegrityError):
                 six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
+            raise
 
     def executemany(self, query, params=None):
         # cx_Oracle doesn't support iterators, convert them to lists
@@ -751,13 +805,11 @@ class FormatStylePlaceholderCursor(object):
         try:
             return self.cursor.executemany(query,
                                 [self._param_generator(p) for p in formatted])
-        except Database.IntegrityError as e:
-            six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
         except Database.DatabaseError as e:
             # cx_Oracle <= 4.4.0 wrongly raises a DatabaseError for ORA-01400.
             if hasattr(e.args[0], 'code') and e.args[0].code == 1400 and not isinstance(e, IntegrityError):
                 six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
+            raise
 
     def fetchone(self):
         row = self.cursor.fetchone()
diff --git a/django/db/backends/oracle/compiler.py b/django/db/backends/oracle/compiler.py
index 24030cdffc..cbee27951c 100644
--- a/django/db/backends/oracle/compiler.py
+++ b/django/db/backends/oracle/compiler.py
@@ -71,3 +71,6 @@ class SQLAggregateCompiler(compiler.SQLAggregateCompiler, SQLCompiler):
 
 class SQLDateCompiler(compiler.SQLDateCompiler, SQLCompiler):
     pass
+
+class SQLDateTimeCompiler(compiler.SQLDateTimeCompiler, SQLCompiler):
+    pass
diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py
index 50e8d655a0..c8a436c8cd 100644
--- a/django/db/backends/oracle/creation.py
+++ b/django/db/backends/oracle/creation.py
@@ -17,6 +17,7 @@ class DatabaseCreation(BaseDatabaseCreation):
 
     data_types = {
         'AutoField':                    'NUMBER(11)',
+        'BinaryField':                  'BLOB',
         'BooleanField':                 'NUMBER(1)',
         'CharField':                    'NVARCHAR2(%(max_length)s)',
         'CommaSeparatedIntegerField':   'VARCHAR2(%(max_length)s)',
@@ -279,6 +280,3 @@ class DatabaseCreation(BaseDatabaseCreation):
             settings_dict['NAME'],
             self._test_database_user(),
         )
-
-    def set_autocommit(self):
-        self.connection.connection.autocommit = True
diff --git a/django/db/backends/oracle/introspection.py b/django/db/backends/oracle/introspection.py
index 7d477f6924..ff56dca5c2 100644
--- a/django/db/backends/oracle/introspection.py
+++ b/django/db/backends/oracle/introspection.py
@@ -1,4 +1,4 @@
-from django.db.backends import BaseDatabaseIntrospection
+from django.db.backends import BaseDatabaseIntrospection, FieldInfo
 import cx_Oracle
 import re
 
@@ -7,6 +7,7 @@ foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REF
 class DatabaseIntrospection(BaseDatabaseIntrospection):
     # Maps type objects to Django Field types.
     data_types_reverse = {
+        cx_Oracle.BLOB: 'BinaryField',
         cx_Oracle.CLOB: 'TextField',
         cx_Oracle.DATETIME: 'DateField',
         cx_Oracle.FIXED_CHAR: 'CharField',
@@ -47,7 +48,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
         cursor.execute("SELECT * FROM %s WHERE ROWNUM < 2" % self.connection.ops.quote_name(table_name))
         description = []
         for desc in cursor.description:
-            description.append((desc[0].lower(),) + desc[1:])
+            description.append(FieldInfo(*((desc[0].lower(),) + desc[1:])))
         return description
 
     def table_name_converter(self, name):
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py
index b9addfc926..de86758653 100644
--- a/django/db/backends/postgresql_psycopg2/base.py
+++ b/django/db/backends/postgresql_psycopg2/base.py
@@ -8,7 +8,6 @@ import sys
 
 from django.db import utils
 from django.db.backends import *
-from django.db.backends.signals import connection_created
 from django.db.backends.postgresql_psycopg2.operations import DatabaseOperations
 from django.db.backends.postgresql_psycopg2.client import DatabaseClient
 from django.db.backends.postgresql_psycopg2.creation import DatabaseCreation
@@ -16,6 +15,7 @@ from django.db.backends.postgresql_psycopg2.version import get_version
 from django.db.backends.postgresql_psycopg2.introspection import DatabaseIntrospection
 from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
 from django.utils.encoding import force_str
+from django.utils.functional import cached_property
 from django.utils.safestring import SafeText, SafeBytes
 from django.utils import six
 from django.utils.timezone import utc
@@ -41,40 +41,6 @@ def utc_tzinfo_factory(offset):
         raise AssertionError("database connection isn't set to UTC")
     return utc
 
-class CursorWrapper(object):
-    """
-    A thin wrapper around psycopg2's normal cursor class so that we can catch
-    particular exception instances and reraise them with the right types.
-    """
-
-    def __init__(self, cursor):
-        self.cursor = cursor
-
-    def execute(self, query, args=None):
-        try:
-            return self.cursor.execute(query, args)
-        except Database.IntegrityError as e:
-            six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-        except Database.DatabaseError as e:
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
-
-    def executemany(self, query, args):
-        try:
-            return self.cursor.executemany(query, args)
-        except Database.IntegrityError as e:
-            six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-        except Database.DatabaseError as e:
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
-
-    def __getattr__(self, attr):
-        if attr in self.__dict__:
-            return self.__dict__[attr]
-        else:
-            return getattr(self.cursor, attr)
-
-    def __iter__(self):
-        return iter(self.cursor)
-
 class DatabaseFeatures(BaseDatabaseFeatures):
     needs_datetime_string_cast = False
     can_return_id_from_insert = True
@@ -84,7 +50,9 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     has_select_for_update = True
     has_select_for_update_nowait = True
     has_bulk_insert = True
+    uses_savepoints = True
     supports_tablespaces = True
+    supports_transactions = True
     can_distinct_on_fields = True
     can_rollback_ddl = True
     supports_combined_alters = True
@@ -108,56 +76,21 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         'iendswith': 'LIKE UPPER(%s)',
     }
 
+    Database = Database
+
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
 
+        opts = self.settings_dict["OPTIONS"]
+        RC = psycopg2.extensions.ISOLATION_LEVEL_READ_COMMITTED
+        self.isolation_level = opts.get('isolation_level', RC)
+
         self.features = DatabaseFeatures(self)
-        autocommit = self.settings_dict["OPTIONS"].get('autocommit', False)
-        self.features.uses_autocommit = autocommit
-        if autocommit:
-            level = psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT
-        else:
-            level = psycopg2.extensions.ISOLATION_LEVEL_READ_COMMITTED
-        self._set_isolation_level(level)
         self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
         self.creation = DatabaseCreation(self)
         self.introspection = DatabaseIntrospection(self)
         self.validation = BaseDatabaseValidation(self)
-        self._pg_version = None
-
-    def check_constraints(self, table_names=None):
-        """
-        To check constraints, we set constraints to immediate. Then, when, we're done we must ensure they
-        are returned to deferred.
-        """
-        self.cursor().execute('SET CONSTRAINTS ALL IMMEDIATE')
-        self.cursor().execute('SET CONSTRAINTS ALL DEFERRED')
-
-    def close(self):
-        self.validate_thread_sharing()
-        if self.connection is None:
-            return
-
-        try:
-            self.connection.close()
-            self.connection = None
-        except Database.Error:
-            # In some cases (database restart, network connection lost etc...)
-            # the connection to the database is lost without giving Django a
-            # notification. If we don't set self.connection to None, the error
-            # will occur a every request.
-            self.connection = None
-            logger.warning('psycopg2 error while closing the connection.',
-                exc_info=sys.exc_info()
-            )
-            raise
-
-    def _get_pg_version(self):
-        if self._pg_version is None:
-            self._pg_version = get_version(self.connection)
-        return self._pg_version
-    pg_version = property(_get_pg_version)
 
     def get_connection_params(self):
         settings_dict = self.settings_dict
@@ -172,6 +105,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         conn_params.update(settings_dict['OPTIONS'])
         if 'autocommit' in conn_params:
             del conn_params['autocommit']
+        if 'isolation_level' in conn_params:
+            del conn_params['isolation_level']
         if settings_dict['USER']:
             conn_params['user'] = settings_dict['USER']
         if settings_dict['PASSWORD']:
@@ -200,60 +135,81 @@ class DatabaseWrapper(BaseDatabaseWrapper):
 
             if conn_tz != tz:
                 # Set the time zone in autocommit mode (see #17062)
-                self.connection.set_isolation_level(
-                        psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
+                self.set_autocommit(True)
                 self.connection.cursor().execute(
                         self.ops.set_time_zone_sql(), [tz])
         self.connection.set_isolation_level(self.isolation_level)
-        self._get_pg_version()
 
-    def _cursor(self):
-        if self.connection is None:
-            conn_params = self.get_connection_params()
-            self.connection = self.get_new_connection(conn_params)
-            self.init_connection_state()
-            connection_created.send(sender=self.__class__, connection=self)
+    def create_cursor(self):
         cursor = self.connection.cursor()
         cursor.tzinfo_factory = utc_tzinfo_factory if settings.USE_TZ else None
-        return CursorWrapper(cursor)
+        return cursor
 
-    def _enter_transaction_management(self, managed):
-        """
-        Switch the isolation level when needing transaction support, so that
-        the same transaction is visible across all the queries.
-        """
-        if self.features.uses_autocommit and managed and not self.isolation_level:
-            self._set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_READ_COMMITTED)
+    def close(self):
+        self.validate_thread_sharing()
+        if self.connection is None:
+            return
 
-    def _leave_transaction_management(self, managed):
-        """
-        If the normal operating mode is "autocommit", switch back to that when
-        leaving transaction management.
-        """
-        if self.features.uses_autocommit and not managed and self.isolation_level:
-            self._set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
-
-    def _set_isolation_level(self, level):
-        """
-        Do all the related feature configurations for changing isolation
-        levels. This doesn't touch the uses_autocommit feature, since that
-        controls the movement *between* isolation levels.
-        """
-        assert level in range(5)
         try:
-            if self.connection is not None:
-                self.connection.set_isolation_level(level)
+            self.connection.close()
+            self.connection = None
+        except Database.Error:
+            # In some cases (database restart, network connection lost etc...)
+            # the connection to the database is lost without giving Django a
+            # notification. If we don't set self.connection to None, the error
+            # will occur a every request.
+            self.connection = None
+            logger.warning('psycopg2 error while closing the connection.',
+                exc_info=sys.exc_info()
+            )
+            raise
         finally:
-            self.isolation_level = level
-            self.features.uses_savepoints = bool(level)
+            self.set_clean()
 
-    def _commit(self):
-        if self.connection is not None:
-            try:
-                return self.connection.commit()
-            except Database.IntegrityError as e:
-                six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
+    def _set_isolation_level(self, isolation_level):
+        assert isolation_level in range(1, 5)     # Use set_autocommit for level = 0
+        if self.psycopg2_version >= (2, 4, 2):
+            self.connection.set_session(isolation_level=isolation_level)
+        else:
+            self.connection.set_isolation_level(isolation_level)
+
+    def _set_autocommit(self, autocommit):
+        if self.psycopg2_version >= (2, 4, 2):
+            self.connection.autocommit = autocommit
+        else:
+            if autocommit:
+                level = psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT
+            else:
+                level = self.isolation_level
+            self.connection.set_isolation_level(level)
+
+    def check_constraints(self, table_names=None):
+        """
+        To check constraints, we set constraints to immediate. Then, when, we're done we must ensure they
+        are returned to deferred.
+        """
+        self.cursor().execute('SET CONSTRAINTS ALL IMMEDIATE')
+        self.cursor().execute('SET CONSTRAINTS ALL DEFERRED')
+
+    def is_usable(self):
+        try:
+            # Use a psycopg cursor directly, bypassing Django's utilities.
+            self.connection.cursor().execute("SELECT 1")
+        except DatabaseError:
+            return False
+        else:
+            return True
 
     def schema_editor(self):
         "Returns a new instance of this backend's SchemaEditor"
         return DatabaseSchemaEditor(self)
+
+    @cached_property
+    def psycopg2_version(self):
+        version = psycopg2.__version__.split(' ', 1)[0]
+        return tuple(int(v) for v in version.split('.'))
+
+    @cached_property
+    def pg_version(self):
+        with self.temporary_connection():
+            return get_version(self.connection)
diff --git a/django/db/backends/postgresql_psycopg2/creation.py b/django/db/backends/postgresql_psycopg2/creation.py
index f131d14abe..819dd7a29e 100644
--- a/django/db/backends/postgresql_psycopg2/creation.py
+++ b/django/db/backends/postgresql_psycopg2/creation.py
@@ -11,6 +11,7 @@ class DatabaseCreation(BaseDatabaseCreation):
     # If a column type is set to None, it won't be included in the output.
     data_types = {
         'AutoField':         'serial',
+        'BinaryField':       'bytea',
         'BooleanField':      'boolean',
         'CharField':         'varchar(%(max_length)s)',
         'CommaSeparatedIntegerField': 'varchar(%(max_length)s)',
@@ -46,7 +47,8 @@ class DatabaseCreation(BaseDatabaseCreation):
         return ''
 
     def sql_indexes_for_field(self, model, f, style):
-        if f.db_index and not f.unique:
+        output = []
+        if f.db_index or f.unique:
             qn = self.connection.ops.quote_name
             db_table = model._meta.db_table
             tablespace = f.db_tablespace or model._meta.db_tablespace
@@ -65,7 +67,8 @@ class DatabaseCreation(BaseDatabaseCreation):
                         "(%s%s)" % (style.SQL_FIELD(qn(f.column)), opclass) +
                         "%s;" % tablespace_sql)
 
-            output = [get_index_sql('%s_%s' % (db_table, f.column))]
+            if not f.unique:
+                output = [get_index_sql('%s_%s' % (db_table, f.column))]
 
             # Fields with database column types of `varchar` and `text` need
             # a second index that specifies their operator class, which is
@@ -78,15 +81,4 @@ class DatabaseCreation(BaseDatabaseCreation):
             elif db_type.startswith('text'):
                 output.append(get_index_sql('%s_%s_like' % (db_table, f.column),
                                             ' text_pattern_ops'))
-        else:
-            output = []
         return output
-
-    def set_autocommit(self):
-        self._prepare_for_test_db_ddl()
-
-    def _prepare_for_test_db_ddl(self):
-        """Rollback and close the active transaction."""
-        self.connection.connection.rollback()
-        self.connection.connection.set_isolation_level(
-                psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
diff --git a/django/db/backends/postgresql_psycopg2/introspection.py b/django/db/backends/postgresql_psycopg2/introspection.py
index d43b95406c..c4974b89ca 100644
--- a/django/db/backends/postgresql_psycopg2/introspection.py
+++ b/django/db/backends/postgresql_psycopg2/introspection.py
@@ -1,12 +1,14 @@
 from __future__ import unicode_literals
 
-from django.db.backends import BaseDatabaseIntrospection
+from django.db.backends import BaseDatabaseIntrospection, FieldInfo
+from django.utils.encoding import force_text
 
 
 class DatabaseIntrospection(BaseDatabaseIntrospection):
     # Maps type codes to Django Field types.
     data_types_reverse = {
         16: 'BooleanField',
+        17: 'BinaryField',
         20: 'BigIntegerField',
         21: 'SmallIntegerField',
         23: 'IntegerField',
@@ -45,7 +47,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
             WHERE table_name = %s""", [table_name])
         null_map = dict(cursor.fetchall())
         cursor.execute("SELECT * FROM %s LIMIT 1" % self.connection.ops.quote_name(table_name))
-        return [line[:6] + (null_map[line[0]]=='YES',)
+        return [FieldInfo(*((force_text(line[0]),) + line[1:6] + (null_map[force_text(line[0])]=='YES',)))
                 for line in cursor.description]
 
     def get_relations(self, cursor, table_name):
@@ -66,6 +68,23 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
             relations[row[0][0] - 1] = (row[1][0] - 1, row[2])
         return relations
 
+    def get_key_columns(self, cursor, table_name):
+        key_columns = []
+        cursor.execute("""
+            SELECT kcu.column_name, ccu.table_name AS referenced_table, ccu.column_name AS referenced_column
+            FROM information_schema.constraint_column_usage ccu
+            LEFT JOIN information_schema.key_column_usage kcu
+                ON ccu.constraint_catalog = kcu.constraint_catalog
+                    AND ccu.constraint_schema = kcu.constraint_schema
+                    AND ccu.constraint_name = kcu.constraint_name
+            LEFT JOIN information_schema.table_constraints tc
+                ON ccu.constraint_catalog = tc.constraint_catalog
+                    AND ccu.constraint_schema = tc.constraint_schema
+                    AND ccu.constraint_name = tc.constraint_name
+            WHERE kcu.table_name = %s AND tc.constraint_type = 'FOREIGN KEY'""" , [table_name])
+        key_columns.extend(cursor.fetchall())
+        return key_columns
+
     def get_indexes(self, cursor, table_name):
         # This query retrieves each index on the given table, including the
         # first associated field name
diff --git a/django/db/backends/postgresql_psycopg2/operations.py b/django/db/backends/postgresql_psycopg2/operations.py
index 40fe629110..b17a0c17bb 100644
--- a/django/db/backends/postgresql_psycopg2/operations.py
+++ b/django/db/backends/postgresql_psycopg2/operations.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+from django.conf import settings
 from django.db.backends import BaseDatabaseOperations
 
 
@@ -8,7 +9,7 @@ class DatabaseOperations(BaseDatabaseOperations):
         super(DatabaseOperations, self).__init__(connection)
 
     def date_extract_sql(self, lookup_type, field_name):
-        # http://www.postgresql.org/docs/8.0/static/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT
+        # http://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT
         if lookup_type == 'week_day':
             # For consistency across backends, we return Sunday=1, Saturday=7.
             return "EXTRACT('dow' FROM %s) + 1" % field_name
@@ -33,9 +34,33 @@ class DatabaseOperations(BaseDatabaseOperations):
         return '(%s)' % conn.join([sql, 'interval \'%s\'' % mods])
 
     def date_trunc_sql(self, lookup_type, field_name):
-        # http://www.postgresql.org/docs/8.0/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC
+        # http://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC
         return "DATE_TRUNC('%s', %s)" % (lookup_type, field_name)
 
+    def datetime_extract_sql(self, lookup_type, field_name, tzname):
+        if settings.USE_TZ:
+            field_name = "%s AT TIME ZONE %%s" % field_name
+            params = [tzname]
+        else:
+            params = []
+        # http://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT
+        if lookup_type == 'week_day':
+            # For consistency across backends, we return Sunday=1, Saturday=7.
+            sql = "EXTRACT('dow' FROM %s) + 1" % field_name
+        else:
+            sql = "EXTRACT('%s' FROM %s)" % (lookup_type, field_name)
+        return sql, params
+
+    def datetime_trunc_sql(self, lookup_type, field_name, tzname):
+        if settings.USE_TZ:
+            field_name = "%s AT TIME ZONE %%s" % field_name
+            params = [tzname]
+        else:
+            params = []
+        # http://www.postgresql.org/docs/current/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC
+        sql = "DATE_TRUNC('%s', %s)" % (lookup_type, field_name)
+        return sql, params
+
     def deferrable_sql(self):
         return " DEFERRABLE INITIALLY DEFERRED"
 
@@ -150,30 +175,9 @@ class DatabaseOperations(BaseDatabaseOperations):
                         style.SQL_TABLE(qn(f.m2m_db_table()))))
         return output
 
-    def savepoint_create_sql(self, sid):
-        return "SAVEPOINT %s" % sid
-
-    def savepoint_commit_sql(self, sid):
-        return "RELEASE SAVEPOINT %s" % sid
-
-    def savepoint_rollback_sql(self, sid):
-        return "ROLLBACK TO SAVEPOINT %s" % sid
-
     def prep_for_iexact_query(self, x):
         return x
 
-    def check_aggregate_support(self, aggregate):
-        """Check that the backend fully supports the provided aggregate.
-
-        The implementation of population statistics (STDDEV_POP and VAR_POP)
-        under Postgres 8.2 - 8.2.4 is known to be faulty. Raise
-        NotImplementedError if this is the database in use.
-        """
-        if aggregate.sql_function in ('STDDEV_POP', 'VAR_POP'):
-            pg_version = self.connection.pg_version
-            if pg_version >= 80200 and pg_version <= 80204:
-                raise NotImplementedError('PostgreSQL 8.2 to 8.2.4 is known to have a faulty implementation of %s. Please upgrade your version of PostgreSQL.' % aggregate.sql_function)
-
     def max_name_length(self):
         """
         Returns the maximum length of an identifier.
diff --git a/django/db/backends/schema.py b/django/db/backends/schema.py
index bbd4f8b23f..5e4eb6bf17 100644
--- a/django/db/backends/schema.py
+++ b/django/db/backends/schema.py
@@ -64,9 +64,7 @@ class BaseDatabaseSchemaEditor(object):
         Marks the start of a schema-altering run.
         """
         self.deferred_sql = []
-        self.connection.commit_unless_managed()
-        self.connection.enter_transaction_management()
-        self.connection.managed(True)
+        self.connection.set_autocommit(False)
 
     def commit(self):
         """
@@ -75,7 +73,7 @@ class BaseDatabaseSchemaEditor(object):
         for sql in self.deferred_sql:
             self.execute(sql)
         self.connection.commit()
-        self.connection.leave_transaction_management()
+        self.connection.set_autocommit(True)
 
     def rollback(self):
         """
@@ -84,7 +82,7 @@ class BaseDatabaseSchemaEditor(object):
         if not self.connection.features.can_rollback_ddl:
             raise RuntimeError("Cannot rollback schema changes on this backend")
         self.connection.rollback()
-        self.connection.leave_transaction_management()
+        self.connection.set_autocommit(True)
 
     # Core utility functions
 
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index aedf953cfd..f1ebd3f408 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -10,15 +10,15 @@ import datetime
 import decimal
 import warnings
 import re
-import sys
 
 from django.db import utils
 from django.db.backends import *
-from django.db.backends.signals import connection_created
 from django.db.backends.sqlite3.client import DatabaseClient
 from django.db.backends.sqlite3.creation import DatabaseCreation
 from django.db.backends.sqlite3.introspection import DatabaseIntrospection
 from django.db.backends.sqlite3.schema import DatabaseSchemaEditor
+from django.db.models import fields
+from django.db.models.sql import aggregates
 from django.utils.dateparse import parse_date, parse_datetime, parse_time
 from django.utils.functional import cached_property
 from django.utils.safestring import SafeBytes
@@ -34,6 +34,10 @@ except ImportError as exc:
     from django.core.exceptions import ImproperlyConfigured
     raise ImproperlyConfigured("Error loading either pysqlite2 or sqlite3 modules (tried in that order): %s" % exc)
 
+try:
+    import pytz
+except ImportError:
+    pytz = None
 
 DatabaseError = Database.DatabaseError
 IntegrityError = Database.IntegrityError
@@ -98,6 +102,11 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     can_combine_inserts_with_and_without_auto_increment_pk = False
     supports_foreign_keys = False
     supports_check_constraints = False
+    autocommits_when_autocommit_is_off = True
+
+    @cached_property
+    def uses_savepoints(self):
+        return Database.sqlite_version_info >= (3, 6, 8)
 
     @cached_property
     def supports_stddev(self):
@@ -118,6 +127,10 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         cursor.execute('DROP TABLE STDDEV_TEST')
         return has_support
 
+    @cached_property
+    def has_zoneinfo_database(self):
+        return pytz is not None
+
 class DatabaseOperations(BaseDatabaseOperations):
     def bulk_batch_size(self, fields, objs):
         """
@@ -130,12 +143,23 @@ class DatabaseOperations(BaseDatabaseOperations):
         limit = 999 if len(fields) > 1 else 500
         return (limit // len(fields)) if len(fields) > 0 else len(objs)
 
+    def check_aggregate_support(self, aggregate):
+        bad_fields = (fields.DateField, fields.DateTimeField, fields.TimeField)
+        bad_aggregates = (aggregates.Sum, aggregates.Avg,
+                          aggregates.Variance, aggregates.StdDev)
+        if (isinstance(aggregate.source, bad_fields) and
+                isinstance(aggregate, bad_aggregates)):
+            raise NotImplementedError(
+                'You cannot use Sum, Avg, StdDev and Variance aggregations '
+                'on date/time fields in sqlite3 '
+                'since date/time is saved as text.')
+
     def date_extract_sql(self, lookup_type, field_name):
         # sqlite doesn't support extract, so we fake it with the user-defined
-        # function django_extract that's registered in connect(). Note that
+        # function django_date_extract that's registered in connect(). Note that
         # single quotes are used because this is a string (and could otherwise
         # cause a collision with a field name).
-        return "django_extract('%s', %s)" % (lookup_type.lower(), field_name)
+        return "django_date_extract('%s', %s)" % (lookup_type.lower(), field_name)
 
     def date_interval_sql(self, sql, connector, timedelta):
         # It would be more straightforward if we could use the sqlite strftime
@@ -144,7 +168,7 @@ class DatabaseOperations(BaseDatabaseOperations):
         # values differently. So instead we register our own function that
         # formats the datetime combined with the delta in a manner suitable
         # for comparisons.
-        return  'django_format_dtdelta(%s, "%s", "%d", "%d", "%d")' % (sql,
+        return 'django_format_dtdelta(%s, "%s", "%d", "%d", "%d")' % (sql,
             connector, timedelta.days, timedelta.seconds, timedelta.microseconds)
 
     def date_trunc_sql(self, lookup_type, field_name):
@@ -154,6 +178,26 @@ class DatabaseOperations(BaseDatabaseOperations):
         # cause a collision with a field name).
         return "django_date_trunc('%s', %s)" % (lookup_type.lower(), field_name)
 
+    def datetime_extract_sql(self, lookup_type, field_name, tzname):
+        # Same comment as in date_extract_sql.
+        if settings.USE_TZ:
+            if pytz is None:
+                from django.core.exceptions import ImproperlyConfigured
+                raise ImproperlyConfigured("This query requires pytz, "
+                                           "but it isn't installed.")
+        return "django_datetime_extract('%s', %s, %%s)" % (
+            lookup_type.lower(), field_name), [tzname]
+
+    def datetime_trunc_sql(self, lookup_type, field_name, tzname):
+        # Same comment as in date_trunc_sql.
+        if settings.USE_TZ:
+            if pytz is None:
+                from django.core.exceptions import ImproperlyConfigured
+                raise ImproperlyConfigured("This query requires pytz, "
+                                           "but it isn't installed.")
+        return "django_datetime_trunc('%s', %s, %%s)" % (
+            lookup_type.lower(), field_name), [tzname]
+
     def drop_foreignkey_sql(self):
         return ""
 
@@ -204,11 +248,6 @@ class DatabaseOperations(BaseDatabaseOperations):
 
         return six.text_type(value)
 
-    def year_lookup_bounds(self, value):
-        first = '%s-01-01'
-        second = '%s-12-31 23:59:59.999999'
-        return [first % value, second % value]
-
     def convert_values(self, value, field):
         """SQLite returns floats when it should be returning decimals,
         and gets dates and datetimes wrong.
@@ -259,6 +298,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         'iendswith': "LIKE %s ESCAPE '\\'",
     }
 
+    Database = Database
+
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
 
@@ -300,9 +341,10 @@ class DatabaseWrapper(BaseDatabaseWrapper):
 
     def get_new_connection(self, conn_params):
         conn = Database.connect(**conn_params)
-        # Register extract, date_trunc, and regexp functions.
-        conn.create_function("django_extract", 2, _sqlite_extract)
+        conn.create_function("django_date_extract", 2, _sqlite_date_extract)
         conn.create_function("django_date_trunc", 2, _sqlite_date_trunc)
+        conn.create_function("django_datetime_extract", 3, _sqlite_datetime_extract)
+        conn.create_function("django_datetime_trunc", 3, _sqlite_datetime_trunc)
         conn.create_function("regexp", 2, _sqlite_regexp)
         conn.create_function("django_format_dtdelta", 5, _sqlite_format_dtdelta)
         return conn
@@ -310,17 +352,36 @@ class DatabaseWrapper(BaseDatabaseWrapper):
     def init_connection_state(self):
         pass
 
-    def _sqlite_create_connection(self):
-        conn_params = self.get_connection_params()
-        self.connection = self.get_new_connection(conn_params)
-        self.init_connection_state()
-        connection_created.send(sender=self.__class__, connection=self)
-
-    def _cursor(self):
-        if self.connection is None:
-            self._sqlite_create_connection()
+    def create_cursor(self):
         return self.connection.cursor(factory=SQLiteCursorWrapper)
 
+    def close(self):
+        self.validate_thread_sharing()
+        # If database is in memory, closing the connection destroys the
+        # database. To prevent accidental data loss, ignore close requests on
+        # an in-memory db.
+        if self.settings_dict['NAME'] != ":memory:":
+            BaseDatabaseWrapper.close(self)
+
+    def _savepoint_allowed(self):
+        # When 'isolation_level' is not None, sqlite3 commits before each
+        # savepoint; it's a bug. When it is None, savepoints don't make sense
+        # because autocommit is enabled. The only exception is inside atomic
+        # blocks. To work around that bug, on SQLite, atomic starts a
+        # transaction explicitly rather than simply disable autocommit.
+        return self.in_atomic_block
+
+    def _set_autocommit(self, autocommit):
+        if autocommit:
+            level = None
+        else:
+            # sqlite3's internal default is ''. It's different from None.
+            # See Modules/_sqlite/connection.c.
+            level = ''
+        # 'isolation_level' is a misleading API.
+        # SQLite always runs at the SERIALIZABLE isolation level.
+        self.connection.isolation_level = level
+
     def check_constraints(self, table_names=None):
         """
         Checks each table name in `table_names` for rows with invalid foreign key references. This method is
@@ -355,13 +416,17 @@ class DatabaseWrapper(BaseDatabaseWrapper):
                         % (table_name, bad_row[0], table_name, column_name, bad_row[1],
                         referenced_table_name, referenced_column_name))
 
-    def close(self):
-        self.validate_thread_sharing()
-        # If database is in memory, closing the connection destroys the
-        # database. To prevent accidental data loss, ignore close requests on
-        # an in-memory db.
-        if self.settings_dict['NAME'] != ":memory:":
-            BaseDatabaseWrapper.close(self)
+    def is_usable(self):
+        return True
+
+    def _start_transaction_under_autocommit(self):
+        """
+        Start a transaction explicitly in autocommit mode.
+
+        Staying in autocommit mode works around a bug of sqlite3 that breaks
+        savepoints when autocommit is disabled.
+        """
+        self.cursor().execute("BEGIN")
 
     def schema_editor(self):
         "Returns a new instance of this backend's SchemaEditor"
@@ -375,28 +440,20 @@ class SQLiteCursorWrapper(Database.Cursor):
     This fixes it -- but note that if you want to use a literal "%s" in a query,
     you'll need to use "%%s".
     """
-    def execute(self, query, params=()):
+    def execute(self, query, params=None):
+        if params is None:
+            return Database.Cursor.execute(self, query)
         query = self.convert_query(query)
-        try:
-            return Database.Cursor.execute(self, query, params)
-        except Database.IntegrityError as e:
-            six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-        except Database.DatabaseError as e:
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
+        return Database.Cursor.execute(self, query, params)
 
     def executemany(self, query, param_list):
         query = self.convert_query(query)
-        try:
-            return Database.Cursor.executemany(self, query, param_list)
-        except Database.IntegrityError as e:
-            six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
-        except Database.DatabaseError as e:
-            six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
+        return Database.Cursor.executemany(self, query, param_list)
 
     def convert_query(self, query):
-        return FORMAT_QMARK_REGEX.sub('?', query).replace('%%','%')
+        return FORMAT_QMARK_REGEX.sub('?', query).replace('%%', '%')
 
-def _sqlite_extract(lookup_type, dt):
+def _sqlite_date_extract(lookup_type, dt):
     if dt is None:
         return None
     try:
@@ -413,12 +470,46 @@ def _sqlite_date_trunc(lookup_type, dt):
         dt = util.typecast_timestamp(dt)
     except (ValueError, TypeError):
         return None
+    if lookup_type == 'year':
+        return "%i-01-01" % dt.year
+    elif lookup_type == 'month':
+        return "%i-%02i-01" % (dt.year, dt.month)
+    elif lookup_type == 'day':
+        return "%i-%02i-%02i" % (dt.year, dt.month, dt.day)
+
+def _sqlite_datetime_extract(lookup_type, dt, tzname):
+    if dt is None:
+        return None
+    try:
+        dt = util.typecast_timestamp(dt)
+    except (ValueError, TypeError):
+        return None
+    if tzname is not None:
+        dt = timezone.localtime(dt, pytz.timezone(tzname))
+    if lookup_type == 'week_day':
+        return (dt.isoweekday() % 7) + 1
+    else:
+        return getattr(dt, lookup_type)
+
+def _sqlite_datetime_trunc(lookup_type, dt, tzname):
+    try:
+        dt = util.typecast_timestamp(dt)
+    except (ValueError, TypeError):
+        return None
+    if tzname is not None:
+        dt = timezone.localtime(dt, pytz.timezone(tzname))
     if lookup_type == 'year':
         return "%i-01-01 00:00:00" % dt.year
     elif lookup_type == 'month':
         return "%i-%02i-01 00:00:00" % (dt.year, dt.month)
     elif lookup_type == 'day':
         return "%i-%02i-%02i 00:00:00" % (dt.year, dt.month, dt.day)
+    elif lookup_type == 'hour':
+        return "%i-%02i-%02i %02i:00:00" % (dt.year, dt.month, dt.day, dt.hour)
+    elif lookup_type == 'minute':
+        return "%i-%02i-%02i %02i:%02i:00" % (dt.year, dt.month, dt.day, dt.hour, dt.minute)
+    elif lookup_type == 'second':
+        return "%i-%02i-%02i %02i:%02i:%02i" % (dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second)
 
 def _sqlite_format_dtdelta(dt, conn, days, secs, usecs):
     try:
diff --git a/django/db/backends/sqlite3/creation.py b/django/db/backends/sqlite3/creation.py
index 9dacac72e1..a9fb273f7a 100644
--- a/django/db/backends/sqlite3/creation.py
+++ b/django/db/backends/sqlite3/creation.py
@@ -9,6 +9,7 @@ class DatabaseCreation(BaseDatabaseCreation):
     # schema inspection is more useful.
     data_types = {
         'AutoField':                    'integer',
+        'BinaryField':                  'BLOB',
         'BooleanField':                 'bool',
         'CharField':                    'varchar(%(max_length)s)',
         'CommaSeparatedIntegerField':   'varchar(%(max_length)s)',
@@ -71,9 +72,6 @@ class DatabaseCreation(BaseDatabaseCreation):
             # Remove the SQLite database file
             os.remove(test_database_name)
 
-    def set_autocommit(self):
-        self.connection.connection.isolation_level = None
-
     def test_db_signature(self):
         """
         Returns a tuple that uniquely identifies a test database.
diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py
index c364468516..bb47c88182 100644
--- a/django/db/backends/sqlite3/introspection.py
+++ b/django/db/backends/sqlite3/introspection.py
@@ -1,5 +1,5 @@
 import re
-from django.db.backends import BaseDatabaseIntrospection
+from django.db.backends import BaseDatabaseIntrospection, FieldInfo
 
 field_size_re = re.compile(r'^\s*(?:var)?char\s*\(\s*(\d+)\s*\)\s*$')
 
@@ -30,6 +30,7 @@ class FlexibleFieldLookupDict(object):
         'real': 'FloatField',
         'text': 'TextField',
         'char': 'CharField',
+        'blob': 'BinaryField',
         'date': 'DateField',
         'datetime': 'DateTimeField',
         'time': 'TimeField',
@@ -60,7 +61,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
 
     def get_table_description(self, cursor, table_name):
         "Returns a description of the table, with the DB-API cursor.description interface."
-        return [(info['name'], info['type'], None, info['size'], None, None,
+        return [FieldInfo(info['name'], info['type'], None, info['size'], None, None,
                  info['null_ok']) for info in self._table_info(cursor, table_name)]
 
     def get_relations(self, cursor, table_name):
diff --git a/django/db/backends/util.py b/django/db/backends/util.py
index 1ba23060e0..084f4c200b 100644
--- a/django/db/backends/util.py
+++ b/django/db/backends/util.py
@@ -19,14 +19,15 @@ class CursorWrapper(object):
         self.cursor = cursor
         self.db = db
 
-    def set_dirty(self):
-        if self.db.is_managed():
-            self.db.set_dirty()
-
     def __getattr__(self, attr):
         if attr in ('execute', 'executemany', 'callproc'):
-            self.set_dirty()
-        return getattr(self.cursor, attr)
+            self.db.set_dirty()
+        cursor_attr = getattr(self.cursor, attr)
+        if attr in ('callproc', 'close', 'execute', 'executemany',
+                    'fetchone', 'fetchmany', 'fetchall', 'nextset'):
+            return self.db.wrap_database_errors()(cursor_attr)
+        else:
+            return cursor_attr
 
     def __iter__(self):
         return iter(self.cursor)
@@ -34,11 +35,15 @@ class CursorWrapper(object):
 
 class CursorDebugWrapper(CursorWrapper):
 
-    def execute(self, sql, params=()):
-        self.set_dirty()
+    def execute(self, sql, params=None):
+        self.db.set_dirty()
         start = time()
         try:
-            return self.cursor.execute(sql, params)
+            with self.db.wrap_database_errors():
+                if params is None:
+                    # params default might be backend specific
+                    return self.cursor.execute(sql)
+                return self.cursor.execute(sql, params)
         finally:
             stop = time()
             duration = stop - start
@@ -52,10 +57,11 @@ class CursorDebugWrapper(CursorWrapper):
             )
 
     def executemany(self, sql, param_list):
-        self.set_dirty()
+        self.db.set_dirty()
         start = time()
         try:
-            return self.cursor.executemany(sql, param_list)
+            with self.db.wrap_database_errors():
+                return self.cursor.executemany(sql, param_list)
         finally:
             stop = time()
             duration = stop - start
@@ -147,6 +153,6 @@ def format_number(value, max_digits, decimal_places):
     if isinstance(value, decimal.Decimal):
         context = decimal.getcontext().copy()
         context.prec = max_digits
-        return '%s' % str(value.quantize(decimal.Decimal(".1") ** decimal_places, context=context))
+        return "{0:f}".format(value.quantize(decimal.Decimal(".1") ** decimal_places, context=context))
     else:
         return "%.*f" % (decimal_places, value)
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 2ad89b3ed5..6c5ccd4bd2 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -1,6 +1,4 @@
-from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
-from django.db import connection
 from django.db.models.loading import get_apps, get_app, get_models, get_model, register_models
 from django.db.models.query import Q
 from django.db.models.expressions import F
@@ -10,7 +8,7 @@ from django.db.models.aggregates import *
 from django.db.models.fields import *
 from django.db.models.fields.subclassing import SubfieldBase
 from django.db.models.fields.files import FileField, ImageField
-from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel
+from django.db.models.fields.related import ForeignKey, ForeignObject, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel
 from django.db.models.deletion import CASCADE, PROTECT, SET, SET_NULL, SET_DEFAULT, DO_NOTHING, ProtectedError
 from django.db.models import signals
 from django.utils.decorators import wraps
diff --git a/django/db/models/aggregates.py b/django/db/models/aggregates.py
index a2349cf5c6..b89db1c563 100644
--- a/django/db/models/aggregates.py
+++ b/django/db/models/aggregates.py
@@ -1,6 +1,19 @@
 """
 Classes to represent the definitions of aggregate functions.
 """
+from django.db.models.constants import LOOKUP_SEP
+
+def refs_aggregate(lookup_parts, aggregates):
+    """
+    A little helper method to check if the lookup_parts contains references
+    to the given aggregates set. Because the LOOKUP_SEP is contained in the
+    default annotation names we must check each prefix of the lookup_parts
+    for match.
+    """
+    for i in range(len(lookup_parts) + 1):
+        if LOOKUP_SEP.join(lookup_parts[0:i]) in aggregates:
+            return True
+    return False
 
 class Aggregate(object):
     """
diff --git a/django/db/models/base.py b/django/db/models/base.py
index db228b3b58..8a87a63ffe 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -9,9 +9,8 @@ import django.db.models.manager  # Imported to register signal handler.
 from django.conf import settings
 from django.core.exceptions import (ObjectDoesNotExist,
     MultipleObjectsReturned, FieldError, ValidationError, NON_FIELD_ERRORS)
-from django.core import validators
 from django.db.models.fields import AutoField, FieldDoesNotExist
-from django.db.models.fields.related import (ManyToOneRel,
+from django.db.models.fields.related import (ForeignObjectRel, ManyToOneRel,
     OneToOneField, add_lazy_relation)
 from django.db import (router, transaction, DatabaseError,
     DEFAULT_DB_ALIAS)
@@ -58,12 +57,21 @@ class ModelBase(type):
     """
     def __new__(cls, name, bases, attrs):
         super_new = super(ModelBase, cls).__new__
+
         # six.with_metaclass() inserts an extra class called 'NewBase' in the
-        # inheritance tree: Model -> NewBase -> object. Ignore this class.
+        # inheritance tree: Model -> NewBase -> object. But the initialization
+        # should be executed only once for a given model class.
+
+        # attrs will never be empty for classes declared in the standard way
+        # (ie. with the `class` keyword). This is quite robust.
+        if name == 'NewBase' and attrs == {}:
+            return super_new(cls, name, bases, attrs)
+
+        # Also ensure initialization is only performed for subclasses of Model
+        # (excluding Model class itself).
         parents = [b for b in bases if isinstance(b, ModelBase) and
                 not (b.__name__ == 'NewBase' and b.__mro__ == (b, object))]
         if not parents:
-            # If this isn't a subclass of Model, don't do anything special.
             return super_new(cls, name, bases, attrs)
 
         # Create the class.
@@ -155,7 +163,7 @@ class ModelBase(type):
                 else:
                     base = parent
             if base is None:
-                    raise TypeError("Proxy model '%s' has no non-abstract model base class." % name)
+                raise TypeError("Proxy model '%s' has no non-abstract model base class." % name)
             if (new_class._meta.local_fields or
                     new_class._meta.local_many_to_many):
                 raise FieldError("Proxy model '%s' contains model fields." % name)
@@ -191,7 +199,7 @@ class ModelBase(type):
                 if base in o2o_map:
                     field = o2o_map[base]
                 elif not is_proxy:
-                    attr_name = '%s_ptr' % base._meta.module_name
+                    attr_name = '%s_ptr' % base._meta.model_name
                     field = OneToOneField(base, name=attr_name,
                             auto_created=True, parent_link=True)
                     new_class.add_to_class(attr_name, field)
@@ -314,7 +322,7 @@ class ModelState(object):
         self.adding = True
 
 
-class Model(six.with_metaclass(ModelBase, object)):
+class Model(six.with_metaclass(ModelBase)):
     _deferred = False
 
     def __init__(self, *args, **kwargs):
@@ -328,12 +336,12 @@ class Model(six.with_metaclass(ModelBase, object)):
         # The reason for the kwargs check is that standard iterator passes in by
         # args, and instantiation for iteration is 33% faster.
         args_len = len(args)
-        if args_len > len(self._meta.fields):
+        if args_len > len(self._meta.concrete_fields):
             # Daft, but matches old exception sans the err msg.
             raise IndexError("Number of args exceeds number of fields")
 
-        fields_iter = iter(self._meta.fields)
         if not kwargs:
+            fields_iter = iter(self._meta.concrete_fields)
             # The ordering of the zip calls matter - zip throws StopIteration
             # when an iter throws it. So if the first iter throws it, the second
             # is *not* consumed. We rely on this, so don't change the order
@@ -342,6 +350,7 @@ class Model(six.with_metaclass(ModelBase, object)):
                 setattr(self, field.attname, val)
         else:
             # Slower, kwargs-ready version.
+            fields_iter = iter(self._meta.fields)
             for val, field in zip(args, fields_iter):
                 setattr(self, field.attname, val)
                 kwargs.pop(field.name, None)
@@ -358,11 +367,12 @@ class Model(six.with_metaclass(ModelBase, object)):
             # data-descriptor object (DeferredAttribute) without triggering its
             # __get__ method.
             if (field.attname not in kwargs and
-                    isinstance(self.__class__.__dict__.get(field.attname), DeferredAttribute)):
+                    (isinstance(self.__class__.__dict__.get(field.attname), DeferredAttribute)
+                     or field.column is None)):
                 # This field will be populated on request.
                 continue
             if kwargs:
-                if isinstance(field.rel, ManyToOneRel):
+                if isinstance(field.rel, ForeignObjectRel):
                     try:
                         # Assume object instance was passed in.
                         rel_obj = kwargs.pop(field.name)
@@ -389,6 +399,7 @@ class Model(six.with_metaclass(ModelBase, object)):
                         val = field.get_default()
             else:
                 val = field.get_default()
+
             if is_related_object:
                 # If we are passed a related instance, set it using the
                 # field.name instead of field.attname (e.g. "user" instead of
@@ -523,7 +534,7 @@ class Model(six.with_metaclass(ModelBase, object)):
         # automatically do a "update_fields" save on the loaded fields.
         elif not force_insert and self._deferred and using == self._state.db:
             field_names = set()
-            for field in self._meta.fields:
+            for field in self._meta.concrete_fields:
                 if not field.primary_key and not hasattr(field, 'through'):
                     field_names.add(field.attname)
             deferred_fields = [
@@ -540,116 +551,139 @@ class Model(six.with_metaclass(ModelBase, object)):
                        force_update=force_update, update_fields=update_fields)
     save.alters_data = True
 
-    def save_base(self, raw=False, cls=None, origin=None, force_insert=False,
+    def save_base(self, raw=False, force_insert=False,
                   force_update=False, using=None, update_fields=None):
         """
-        Does the heavy-lifting involved in saving. Subclasses shouldn't need to
-        override this method. It's separate from save() in order to hide the
-        need for overrides of save() to pass around internal-only parameters
-        ('raw', 'cls', and 'origin').
+        Handles the parts of saving which should be done only once per save,
+        yet need to be done in raw saves, too. This includes some sanity
+        checks and signal sending.
+
+        The 'raw' argument is telling save_base not to save any parent
+        models and not to do any changes to the values before save. This
+        is used by fixture loading.
         """
         using = using or router.db_for_write(self.__class__, instance=self)
         assert not (force_insert and (force_update or update_fields))
         assert update_fields is None or len(update_fields) > 0
-        if cls is None:
-            cls = self.__class__
-            meta = cls._meta
-            if not meta.proxy:
-                origin = cls
-        else:
-            meta = cls._meta
-
-        if origin and not meta.auto_created:
+        cls = origin = self.__class__
+        # Skip proxies, but keep the origin as the proxy model.
+        if cls._meta.proxy:
+            cls = cls._meta.concrete_model
+        meta = cls._meta
+        if not meta.auto_created:
             signals.pre_save.send(sender=origin, instance=self, raw=raw, using=using,
                                   update_fields=update_fields)
-
-        # If we are in a raw save, save the object exactly as presented.
-        # That means that we don't try to be smart about saving attributes
-        # that might have come from the parent class - we just save the
-        # attributes we have been given to the class we have been given.
-        # We also go through this process to defer the save of proxy objects
-        # to their actual underlying model.
-        if not raw or meta.proxy:
-            if meta.proxy:
-                org = cls
-            else:
-                org = None
-            for parent, field in meta.parents.items():
-                # At this point, parent's primary key field may be unknown
-                # (for example, from administration form which doesn't fill
-                # this field). If so, fill it.
-                if field and getattr(self, parent._meta.pk.attname) is None and getattr(self, field.attname) is not None:
-                    setattr(self, parent._meta.pk.attname, getattr(self, field.attname))
-
-                self.save_base(cls=parent, origin=org, using=using,
-                               update_fields=update_fields)
-
-                if field:
-                    setattr(self, field.attname, self._get_pk_val(parent._meta))
-            if meta.proxy:
-                return
-
-        if not meta.proxy:
-            non_pks = [f for f in meta.local_fields if not f.primary_key]
-
-            if update_fields:
-                non_pks = [f for f in non_pks if f.name in update_fields or f.attname in update_fields]
-
-            # First, try an UPDATE. If that doesn't update anything, do an INSERT.
-            pk_val = self._get_pk_val(meta)
-            pk_set = pk_val is not None
-            record_exists = True
-            manager = cls._base_manager
-            if pk_set:
-                # Determine if we should do an update (pk already exists, forced update,
-                # no force_insert)
-                if ((force_update or update_fields) or (not force_insert and
-                        manager.using(using).filter(pk=pk_val).exists())):
-                    if force_update or non_pks:
-                        values = [(f, None, (raw and getattr(self, f.attname) or f.pre_save(self, False))) for f in non_pks]
-                        if values:
-                            rows = manager.using(using).filter(pk=pk_val)._update(values)
-                            if force_update and not rows:
-                                raise DatabaseError("Forced update did not affect any rows.")
-                            if update_fields and not rows:
-                                raise DatabaseError("Save with update_fields did not affect any rows.")
-                else:
-                    record_exists = False
-            if not pk_set or not record_exists:
-                if meta.order_with_respect_to:
-                    # If this is a model with an order_with_respect_to
-                    # autopopulate the _order field
-                    field = meta.order_with_respect_to
-                    order_value = manager.using(using).filter(**{field.name: getattr(self, field.attname)}).count()
-                    self._order = order_value
-
-                fields = meta.local_fields
-                if not pk_set:
-                    if force_update or update_fields:
-                        raise ValueError("Cannot force an update in save() with no primary key.")
-                    fields = [f for f in fields if not isinstance(f, AutoField)]
-
-                record_exists = False
-
-                update_pk = bool(meta.has_auto_field and not pk_set)
-                result = manager._insert([self], fields=fields, return_id=update_pk, using=using, raw=raw)
-
-                if update_pk:
-                    setattr(self, meta.pk.attname, result)
-            transaction.commit_unless_managed(using=using)
-
+        with transaction.commit_on_success_unless_managed(using=using, savepoint=False):
+            if not raw:
+                self._save_parents(cls, using, update_fields)
+            updated = self._save_table(raw, cls, force_insert, force_update, using, update_fields)
         # Store the database on which the object was saved
         self._state.db = using
         # Once saved, this is no longer a to-be-added instance.
         self._state.adding = False
 
         # Signal that the save is complete
-        if origin and not meta.auto_created:
-            signals.post_save.send(sender=origin, instance=self, created=(not record_exists),
+        if not meta.auto_created:
+            signals.post_save.send(sender=origin, instance=self, created=(not updated),
                                    update_fields=update_fields, raw=raw, using=using)
 
     save_base.alters_data = True
 
+    def _save_parents(self, cls, using, update_fields):
+        """
+        Saves all the parents of cls using values from self.
+        """
+        meta = cls._meta
+        for parent, field in meta.parents.items():
+            # Make sure the link fields are synced between parent and self.
+            if (field and getattr(self, parent._meta.pk.attname) is None
+                    and getattr(self, field.attname) is not None):
+                setattr(self, parent._meta.pk.attname, getattr(self, field.attname))
+            self._save_parents(cls=parent, using=using, update_fields=update_fields)
+            self._save_table(cls=parent, using=using, update_fields=update_fields)
+            # Set the parent's PK value to self.
+            if field:
+                setattr(self, field.attname, self._get_pk_val(parent._meta))
+                # Since we didn't have an instance of the parent handy set
+                # attname directly, bypassing the descriptor. Invalidate
+                # the related object cache, in case it's been accidentally
+                # populated. A fresh instance will be re-built from the
+                # database if necessary.
+                cache_name = field.get_cache_name()
+                if hasattr(self, cache_name):
+                    delattr(self, cache_name)
+
+    def _save_table(self, raw=False, cls=None, force_insert=False,
+                    force_update=False, using=None, update_fields=None):
+        """
+        Does the heavy-lifting involved in saving. Updates or inserts the data
+        for a single table.
+        """
+        meta = cls._meta
+        non_pks = [f for f in meta.local_concrete_fields if not f.primary_key]
+
+        if update_fields:
+            non_pks = [f for f in non_pks
+                       if f.name in update_fields or f.attname in update_fields]
+
+        pk_val = self._get_pk_val(meta)
+        pk_set = pk_val is not None
+        if not pk_set and (force_update or update_fields):
+            raise ValueError("Cannot force an update in save() with no primary key.")
+        updated = False
+        # If possible, try an UPDATE. If that doesn't update anything, do an INSERT.
+        if pk_set and not force_insert:
+            base_qs = cls._base_manager.using(using)
+            values = [(f, None, (raw and getattr(self, f.attname) or f.pre_save(self, False)))
+                      for f in non_pks]
+            if not values:
+                # We can end up here when saving a model in inheritance chain where
+                # update_fields doesn't target any field in current model. In that
+                # case we just say the update succeeded. Another case ending up here
+                # is a model with just PK - in that case check that the PK still
+                # exists.
+                updated = update_fields is not None or base_qs.filter(pk=pk_val).exists()
+            else:
+                updated = self._do_update(base_qs, using, pk_val, values)
+            if force_update and not updated:
+                raise DatabaseError("Forced update did not affect any rows.")
+            if update_fields and not updated:
+                raise DatabaseError("Save with update_fields did not affect any rows.")
+        if not updated:
+            if meta.order_with_respect_to:
+                # If this is a model with an order_with_respect_to
+                # autopopulate the _order field
+                field = meta.order_with_respect_to
+                order_value = cls._base_manager.using(using).filter(
+                    **{field.name: getattr(self, field.attname)}).count()
+                self._order = order_value
+
+            fields = meta.local_concrete_fields
+            if not pk_set:
+                fields = [f for f in fields if not isinstance(f, AutoField)]
+
+            update_pk = bool(meta.has_auto_field and not pk_set)
+            result = self._do_insert(cls._base_manager, using, fields, update_pk, raw)
+            if update_pk:
+                setattr(self, meta.pk.attname, result)
+        return updated
+
+    def _do_update(self, base_qs, using, pk_val, values):
+        """
+        This method will try to update the model. If the model was updated (in
+        the sense that an update query was done and a matching row was found
+        from the DB) the method will return True.
+        """
+        return base_qs.filter(pk=pk_val)._update(values) > 0
+
+    def _do_insert(self, manager, using, fields, update_pk, raw):
+        """
+        Do an INSERT. If update_pk is defined then this method should return
+        the new pk for the model.
+        """
+        return manager._insert([self], fields=fields, return_id=update_pk,
+                               using=using, raw=raw)
+
     def delete(self, using=None):
         using = using or router.db_for_write(self.__class__, instance=self)
         assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname)
@@ -880,7 +914,7 @@ class Model(six.with_metaclass(ModelBase, object)):
     def full_clean(self, exclude=None):
         """
         Calls clean_fields, clean, and validate_unique, on the model,
-        and raises a ``ValidationError`` for any errors that occured.
+        and raises a ``ValidationError`` for any errors that occurred.
         """
         errors = {}
         if exclude is None:
@@ -925,7 +959,7 @@ class Model(six.with_metaclass(ModelBase, object)):
             # Skip validation for empty fields with blank=True. The developer
             # is responsible for making sure they have a valid value.
             raw_value = getattr(self, f.attname)
-            if f.blank and raw_value in validators.EMPTY_VALUES:
+            if f.blank and raw_value in f.empty_values:
                 continue
             try:
                 setattr(self, f.attname, f.clean(raw_value, self))
@@ -949,9 +983,9 @@ def method_set_order(ordered_obj, self, id_list, using=None):
     order_name = ordered_obj._meta.order_with_respect_to.name
     # FIXME: It would be nice if there was an "update many" version of update
     # for situations like this.
-    for i, j in enumerate(id_list):
-        ordered_obj.objects.filter(**{'pk': j, order_name: rel_val}).update(_order=i)
-    transaction.commit_unless_managed(using=using)
+    with transaction.commit_on_success_unless_managed(using=using):
+        for i, j in enumerate(id_list):
+            ordered_obj.objects.filter(**{'pk': j, order_name: rel_val}).update(_order=i)
 
 
 def method_get_order(ordered_obj, self):
@@ -967,7 +1001,7 @@ def method_get_order(ordered_obj, self):
 ##############################################
 
 def get_absolute_url(opts, func, self, *args, **kwargs):
-    return settings.ABSOLUTE_URL_OVERRIDES.get('%s.%s' % (opts.app_label, opts.module_name), func)(self, *args, **kwargs)
+    return settings.ABSOLUTE_URL_OVERRIDES.get('%s.%s' % (opts.app_label, opts.model_name), func)(self, *args, **kwargs)
 
 
 ########
diff --git a/django/db/models/constants.py b/django/db/models/constants.py
index 629497eb3d..a7e6c252d9 100644
--- a/django/db/models/constants.py
+++ b/django/db/models/constants.py
@@ -4,4 +4,3 @@ Constants used across the ORM in general.
 
 # Separator used to split filter strings apart.
 LOOKUP_SEP = '__'
-
diff --git a/django/db/models/deletion.py b/django/db/models/deletion.py
index 6dff4a2882..e0bfb9d879 100644
--- a/django/db/models/deletion.py
+++ b/django/db/models/deletion.py
@@ -1,4 +1,3 @@
-from functools import wraps
 from operator import attrgetter
 
 from django.db import connections, transaction, IntegrityError
@@ -50,43 +49,22 @@ def DO_NOTHING(collector, field, sub_objs, using):
     pass
 
 
-def force_managed(func):
-    @wraps(func)
-    def decorated(self, *args, **kwargs):
-        if not transaction.is_managed(using=self.using):
-            transaction.enter_transaction_management(using=self.using)
-            forced_managed = True
-        else:
-            forced_managed = False
-        try:
-            func(self, *args, **kwargs)
-            if forced_managed:
-                transaction.commit(using=self.using)
-            else:
-                transaction.commit_unless_managed(using=self.using)
-        finally:
-            if forced_managed:
-                transaction.leave_transaction_management(using=self.using)
-    return decorated
-
-
 class Collector(object):
     def __init__(self, using):
         self.using = using
         # Initially, {model: set([instances])}, later values become lists.
         self.data = {}
-        self.batches = {} # {model: {field: set([instances])}}
-        self.field_updates = {} # {model: {(field, value): set([instances])}}
+        self.field_updates = {}  # {model: {(field, value): set([instances])}}
         # fast_deletes is a list of queryset-likes that can be deleted without
         # fetching the objects into memory.
-        self.fast_deletes = [] 
+        self.fast_deletes = []
 
         # Tracks deletion-order dependency for databases without transactions
         # or ability to defer constraint checks. Only concrete model classes
         # should be included, as the dependencies exist only between actual
         # database tables; proxy models are represented here by their concrete
         # parent.
-        self.dependencies = {} # {model: set([models])}
+        self.dependencies = {}  # {model: set([models])}
 
     def add(self, objs, source=None, nullable=False, reverse_dependency=False):
         """
@@ -115,13 +93,6 @@ class Collector(object):
                 source._meta.concrete_model, set()).add(model._meta.concrete_model)
         return new_objs
 
-    def add_batch(self, model, field, objs):
-        """
-        Schedules a batch delete. Every instance of 'model' that is related to
-        an instance of 'obj' through 'field' will be deleted.
-        """
-        self.batches.setdefault(model, {}).setdefault(field, set()).update(objs)
-
     def add_field_update(self, field, value, objs):
         """
         Schedules a field update. 'objs' must be a homogenous iterable
@@ -224,17 +195,13 @@ class Collector(object):
                     self.fast_deletes.append(sub_objs)
                 elif sub_objs:
                     field.rel.on_delete(self, field, sub_objs, self.using)
-
-            # TODO This entire block is only needed as a special case to
-            # support cascade-deletes for GenericRelation. It should be
-            # removed/fixed when the ORM gains a proper abstraction for virtual
-            # or composite fields, and GFKs are reworked to fit into that.
-            for relation in model._meta.many_to_many:
-                if not relation.rel.through:
-                    sub_objs = relation.bulk_related_objects(new_objs, self.using)
+            for field in model._meta.virtual_fields:
+                if hasattr(field, 'bulk_related_objects'):
+                    # Its something like generic foreign key.
+                    sub_objs = field.bulk_related_objects(new_objs, self.using)
                     self.collect(sub_objs,
                                  source=model,
-                                 source_attr=relation.rel.related_name,
+                                 source_attr=field.rel.related_name,
                                  nullable=True)
 
     def related_objects(self, related, objs):
@@ -270,7 +237,6 @@ class Collector(object):
         self.data = SortedDict([(model, self.data[model])
                                 for model in sorted_models])
 
-    @force_managed
     def delete(self):
         # sort instance collections
         for model, instances in self.data.items():
@@ -281,46 +247,40 @@ class Collector(object):
         # end of a transaction.
         self.sort()
 
-        # send pre_delete signals
-        for model, obj in self.instances_with_model():
-            if not model._meta.auto_created:
-                signals.pre_delete.send(
-                    sender=model, instance=obj, using=self.using
-                )
+        with transaction.commit_on_success_unless_managed(using=self.using):
+            # send pre_delete signals
+            for model, obj in self.instances_with_model():
+                if not model._meta.auto_created:
+                    signals.pre_delete.send(
+                        sender=model, instance=obj, using=self.using
+                    )
 
-        # fast deletes
-        for qs in self.fast_deletes:
-            qs._raw_delete(using=self.using)
+            # fast deletes
+            for qs in self.fast_deletes:
+                qs._raw_delete(using=self.using)
 
-        # update fields
-        for model, instances_for_fieldvalues in six.iteritems(self.field_updates):
-            query = sql.UpdateQuery(model)
-            for (field, value), instances in six.iteritems(instances_for_fieldvalues):
-                query.update_batch([obj.pk for obj in instances],
-                                   {field.name: value}, self.using)
+            # update fields
+            for model, instances_for_fieldvalues in six.iteritems(self.field_updates):
+                query = sql.UpdateQuery(model)
+                for (field, value), instances in six.iteritems(instances_for_fieldvalues):
+                    query.update_batch([obj.pk for obj in instances],
+                                       {field.name: value}, self.using)
 
-        # reverse instance collections
-        for instances in six.itervalues(self.data):
-            instances.reverse()
+            # reverse instance collections
+            for instances in six.itervalues(self.data):
+                instances.reverse()
 
-        # delete batches
-        for model, batches in six.iteritems(self.batches):
-            query = sql.DeleteQuery(model)
-            for field, instances in six.iteritems(batches):
-                query.delete_batch([obj.pk for obj in instances], self.using, field)
+            # delete instances
+            for model, instances in six.iteritems(self.data):
+                query = sql.DeleteQuery(model)
+                pk_list = [obj.pk for obj in instances]
+                query.delete_batch(pk_list, self.using)
 
-        # delete instances
-        for model, instances in six.iteritems(self.data):
-            query = sql.DeleteQuery(model)
-            pk_list = [obj.pk for obj in instances]
-            query.delete_batch(pk_list, self.using)
-
-        # send post_delete signals
-        for model, obj in self.instances_with_model():
-            if not model._meta.auto_created:
-                signals.post_delete.send(
-                    sender=model, instance=obj, using=self.using
-                )
+                if not model._meta.auto_created:
+                    for obj in instances:
+                        signals.post_delete.send(
+                            sender=model, instance=obj, using=self.using
+                        )
 
         # update collected instances
         for model, instances_for_fieldvalues in six.iteritems(self.field_updates):
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index 3566d777c6..6e0f3c434e 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -1,4 +1,7 @@
 import datetime
+
+from django.db.models.aggregates import refs_aggregate
+from django.db.models.constants import LOOKUP_SEP
 from django.utils import tree
 
 class ExpressionNode(tree.Node):
@@ -37,6 +40,18 @@ class ExpressionNode(tree.Node):
             obj.add(other, connector)
         return obj
 
+    def contains_aggregate(self, existing_aggregates):
+        if self.children:
+            return any(child.contains_aggregate(existing_aggregates)
+                       for child in self.children
+                       if hasattr(child, 'contains_aggregate'))
+        else:
+            return refs_aggregate(self.name.split(LOOKUP_SEP),
+                                  existing_aggregates)
+
+    def prepare_database_save(self, unused):
+        return self
+
     ###################
     # VISITOR METHODS #
     ###################
@@ -113,9 +128,6 @@ class ExpressionNode(tree.Node):
             "Use .bitand() and .bitor() for bitwise logical operations."
         )
 
-    def prepare_database_save(self, unused):
-        return self
-
 class F(ExpressionNode):
     """
     An expression representing the value of the given field.
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 30770a0639..13174796c1 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -1,14 +1,15 @@
 from __future__ import unicode_literals
 
-import collections
 import copy
 import datetime
 import decimal
 import math
 import warnings
+from base64 import b64decode, b64encode
 from itertools import tee
 
 from django.db import connection
+from django.db.models.loading import get_model
 from django.db.models.query_utils import QueryWrapper
 from django.conf import settings
 from django import forms
@@ -16,20 +17,26 @@ from django.core import exceptions, validators
 from django.utils.datastructures import DictWrapper
 from django.utils.dateparse import parse_date, parse_datetime, parse_time
 from django.utils.functional import curry, total_ordering
+from django.utils.itercompat import is_iterator
 from django.utils.text import capfirst
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import smart_text, force_text
+from django.utils.encoding import smart_text, force_text, force_bytes
 from django.utils.ipv6 import clean_ipv6_address
 from django.utils import six
 
+class Empty(object):
+    pass
+
 class NOT_PROVIDED:
     pass
 
 # The values to use for "blank" in SelectFields. Will be appended to the start
 # of most "choices" lists.
 BLANK_CHOICE_DASH = [("", "---------")]
-BLANK_CHOICE_NONE = [("", "None")]
+
+def _load_field(app_label, model_name, field_name):
+    return get_model(app_label, model_name)._meta.get_field_by_name(field_name)[0]
 
 class FieldDoesNotExist(Exception):
     pass
@@ -49,6 +56,11 @@ class FieldDoesNotExist(Exception):
 #
 #     getattr(obj, opts.pk.attname)
 
+def _empty(of_cls):
+    new = Empty()
+    new.__class__ = of_cls
+    return new
+
 @total_ordering
 class Field(object):
     """Base class for all field types"""
@@ -56,6 +68,7 @@ class Field(object):
     # Designates whether empty strings fundamentally are allowed at the
     # database level.
     empty_strings_allowed = True
+    empty_values = list(validators.EMPTY_VALUES)
 
     # These track each time a Field instance is created. Used to retain order.
     # The auto_creation_counter is used for fields that Django implicitly
@@ -135,7 +148,8 @@ class Field(object):
             return self.creation_counter < other.creation_counter
         return NotImplemented
 
-    __hash__ = object.__hash__
+    def __hash__(self):
+        return hash(self.creation_counter)
 
     def __deepcopy__(self, memodict):
         # We don't have to deepcopy very much here, since most things are not
@@ -146,6 +160,34 @@ class Field(object):
         memodict[id(self)] = obj
         return obj
 
+    def __copy__(self):
+        # We need to avoid hitting __reduce__, so define this
+        # slightly weird copy construct.
+        obj = Empty()
+        obj.__class__ = self.__class__
+        obj.__dict__ = self.__dict__.copy()
+        return obj
+
+    def __reduce__(self):
+        """
+        Pickling should return the model._meta.fields instance of the field,
+        not a new copy of that field. So, we use the app cache to load the
+        model and then the field back.
+        """
+        if not hasattr(self, 'model'):
+            # Fields are sometimes used without attaching them to models (for
+            # example in aggregation). In this case give back a plain field
+            # instance. The code below will create a new empty instance of
+            # class self.__class__, then update its dict with self.__dict__
+            # values - so, this is very close to normal pickle.
+            return _empty, (self.__class__,), self.__dict__
+        if self.model._deferred:
+            # Deferred model will not be found from the app cache. This could
+            # be fixed by reconstructing the deferred model on unpickle.
+            raise RuntimeError("Fields of deferred models can't be reduced")
+        return _load_field, (self.model._meta.app_label, self.model._meta.object_name,
+                             self.name)
+
     def to_python(self, value):
         """
         Converts the input value into the expected Python data type, raising
@@ -155,7 +197,7 @@ class Field(object):
         return value
 
     def run_validators(self, value):
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return
 
         errors = []
@@ -182,7 +224,7 @@ class Field(object):
             # Skip validation for non-editable fields.
             return
 
-        if self._choices and value not in validators.EMPTY_VALUES:
+        if self._choices and value not in self.empty_values:
             for option_key, option_value in self.choices:
                 if isinstance(option_value, (list, tuple)):
                     # This is an optgroup, so look inside the group for
@@ -198,7 +240,7 @@ class Field(object):
         if value is None and not self.null:
             raise exceptions.ValidationError(self.error_messages['null'])
 
-        if not self.blank and value in validators.EMPTY_VALUES:
+        if not self.blank and value in self.empty_values:
             raise exceptions.ValidationError(self.error_messages['blank'])
 
     def clean(self, value, model_instance):
@@ -270,10 +312,13 @@ class Field(object):
         if self.verbose_name is None and self.name:
             self.verbose_name = self.name.replace('_', ' ')
 
-    def contribute_to_class(self, cls, name):
+    def contribute_to_class(self, cls, name, virtual_only=False):
         self.set_attributes_from_name(name)
         self.model = cls
-        cls._meta.add_field(self)
+        if virtual_only:
+            cls._meta.add_virtual_field(self)
+        else:
+            cls._meta.add_field(self)
         if self.choices:
             setattr(cls, 'get_%s_display' % self.name,
                     curry(cls._get_FIELD_display, field=self))
@@ -332,9 +377,10 @@ class Field(object):
             return value._prepare()
 
         if lookup_type in (
-                'regex', 'iregex', 'month', 'day', 'week_day', 'search',
-                'contains', 'icontains', 'iexact', 'startswith', 'istartswith',
-                'endswith', 'iendswith', 'isnull'
+                'iexact', 'contains', 'icontains',
+                'startswith', 'istartswith', 'endswith', 'iendswith',
+                'month', 'day', 'week_day', 'hour', 'minute', 'second',
+                'isnull', 'search', 'regex', 'iregex',
             ):
             return value
         elif lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte'):
@@ -360,9 +406,9 @@ class Field(object):
         if hasattr(value, 'get_compiler'):
             value = value.get_compiler(connection=connection)
         if hasattr(value, 'as_sql') or hasattr(value, '_as_sql'):
-            # If the value has a relabel_aliases method, it will need to
-            # be invoked before the final SQL is evaluated
-            if hasattr(value, 'relabel_aliases'):
+            # If the value has a relabeled_clone method it means the
+            # value will be handled later on.
+            if hasattr(value, 'relabeled_clone'):
                 return value
             if hasattr(value, 'as_sql'):
                 sql, params = value.as_sql()
@@ -370,8 +416,8 @@ class Field(object):
                 sql, params = value._as_sql(connection=connection)
             return QueryWrapper(('(%s)' % sql), params)
 
-        if lookup_type in ('regex', 'iregex', 'month', 'day', 'week_day',
-                           'search'):
+        if lookup_type in ('month', 'day', 'week_day', 'hour', 'minute',
+                           'second', 'search', 'regex', 'iregex'):
             return [value]
         elif lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte'):
             return [self.get_db_prep_value(value, connection=connection,
@@ -390,10 +436,12 @@ class Field(object):
         elif lookup_type == 'isnull':
             return []
         elif lookup_type == 'year':
-            if self.get_internal_type() == 'DateField':
+            if isinstance(self, DateTimeField):
+                return connection.ops.year_lookup_bounds_for_datetime_field(value)
+            elif isinstance(self, DateField):
                 return connection.ops.year_lookup_bounds_for_date_field(value)
             else:
-                return connection.ops.year_lookup_bounds(value)
+                return [value]          # this isn't supposed to happen
 
     def has_default(self):
         """
@@ -463,7 +511,7 @@ class Field(object):
         return bound_field_class(self, fieldmapping, original)
 
     def _get_choices(self):
-        if isinstance(self._choices, collections.Iterator):
+        if is_iterator(self._choices):
             choices, self._choices = tee(self._choices)
             return choices
         else:
@@ -484,7 +532,7 @@ class Field(object):
     def save_form_data(self, instance, data):
         setattr(instance, self.name, data)
 
-    def formfield(self, form_class=forms.CharField, **kwargs):
+    def formfield(self, form_class=None, **kwargs):
         """
         Returns a django.forms.Field instance for this database Field.
         """
@@ -505,7 +553,8 @@ class Field(object):
             defaults['coerce'] = self.to_python
             if self.null:
                 defaults['empty_value'] = None
-            form_class = forms.TypedChoiceField
+            if form_class is None or not issubclass(form_class, forms.TypedChoiceField):
+                form_class = forms.TypedChoiceField
             # Many of the subclass-specific formfield arguments (min_value,
             # max_value) don't apply for choice fields, so be sure to only pass
             # the values that TypedChoiceField will understand.
@@ -515,6 +564,8 @@ class Field(object):
                              'error_messages', 'show_hidden_initial'):
                     del kwargs[k]
         defaults.update(kwargs)
+        if form_class is None:
+            form_class = forms.CharField
         return form_class(**defaults)
 
     def value_from_object(self, obj):
@@ -592,8 +643,6 @@ class BooleanField(Field):
 
     def __init__(self, *args, **kwargs):
         kwargs['blank'] = True
-        if 'default' not in kwargs and not kwargs.get('null'):
-            kwargs['default'] = False
         Field.__init__(self, *args, **kwargs)
 
     def get_internal_type(self):
@@ -742,9 +791,9 @@ class DateField(Field):
                       is_next=False))
 
     def get_prep_lookup(self, lookup_type, value):
-        # For "__month", "__day", and "__week_day" lookups, convert the value
-        # to an int so the database backend always sees a consistent type.
-        if lookup_type in ('month', 'day', 'week_day'):
+        # For dates lookups, convert the value to an int
+        # so the database backend always sees a consistent type.
+        if lookup_type in ('month', 'day', 'week_day', 'hour', 'minute', 'second'):
             return int(value)
         return super(DateField, self).get_prep_lookup(lookup_type, value)
 
@@ -1304,3 +1353,41 @@ class URLField(CharField):
         }
         defaults.update(kwargs)
         return super(URLField, self).formfield(**defaults)
+
+class BinaryField(Field):
+    description = _("Raw binary data")
+    empty_values = [None, b'']
+
+    def __init__(self, *args, **kwargs):
+        kwargs['editable'] = False
+        super(BinaryField, self).__init__(*args, **kwargs)
+        if self.max_length is not None:
+            self.validators.append(validators.MaxLengthValidator(self.max_length))
+
+    def get_internal_type(self):
+        return "BinaryField"
+
+    def get_default(self):
+        if self.has_default() and not callable(self.default):
+            return self.default
+        default = super(BinaryField, self).get_default()
+        if default == '':
+            return b''
+        return default
+
+    def get_db_prep_value(self, value, connection, prepared=False):
+        value = super(BinaryField, self
+            ).get_db_prep_value(value, connection, prepared)
+        if value is not None:
+            return connection.Database.Binary(value)
+        return value
+
+    def value_to_string(self, obj):
+        """Binary data is serialized as base64"""
+        return b64encode(force_bytes(self._get_val_from_obj(obj))).decode('ascii')
+
+    def to_python(self, value):
+        # If it's a string, it should be base64-encoded data
+        if isinstance(value, six.text_type):
+            return six.memoryview(b64decode(force_bytes(value)))
+        return value
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index f16632ef25..e631f177e9 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -3,7 +3,6 @@ import os
 
 from django import forms
 from django.db.models.fields import Field
-from django.core.exceptions import ValidationError
 from django.core.files.base import File
 from django.core.files.storage import default_storage
 from django.core.files.images import ImageFile
@@ -31,7 +30,6 @@ class FieldFile(File):
         return not self.__eq__(other)
 
     def __hash__(self):
-        # Required because we defined a custom __eq__.
         return hash(self.name)
 
     # The standard File contains most of the necessary properties, but
@@ -207,10 +205,6 @@ class FileDescriptor(object):
 
 class FileField(Field):
 
-    default_error_messages = {
-        'max_length': _('Filename is %(extra)d characters too long.')
-    }
-
     # The class to wrap instance attributes in. Accessing the file object off
     # the instance will always return an instance of attr_class.
     attr_class = FieldFile
@@ -233,25 +227,6 @@ class FileField(Field):
         kwargs['max_length'] = kwargs.get('max_length', 100)
         super(FileField, self).__init__(verbose_name, name, **kwargs)
 
-    def validate(self, value, model_instance):
-        """
-        Validates that the generated file name still fits within max_length.
-        """
-        # The generated file name stored in the database is generally longer
-        # than the uploaded file name. Using the length of generated name in
-        # the error message would be confusing. However, in the common case
-        # (ie. upload_to='path/to/upload/dir'), the length of the generated
-        # name equals the length of the uploaded name plus a constant. Thus
-        # we can tell the user how much shorter the name should be (roughly).
-        if value and value._committed:
-            filename = value.name
-        else:
-            filename = self.generate_filename(model_instance, value.name)
-        length = len(filename)
-        if self.max_length and length > self.max_length:
-            error_values = {'extra': length - self.max_length}
-            raise ValidationError(self.error_messages['max_length'] % error_values)
-
     def get_internal_type(self):
         return "FileField"
 
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index 3bd426d2b3..c92bdb6468 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -1,22 +1,21 @@
 from operator import attrgetter
 
-from django.db import connection, router
+from django.db import connection, connections, router
 from django.db.backends import util
 from django.db.models import signals, get_model
 from django.db.models.fields import (AutoField, Field, IntegerField,
     PositiveIntegerField, PositiveSmallIntegerField, FieldDoesNotExist)
-from django.db.models.related import RelatedObject
+from django.db.models.related import RelatedObject, PathInfo
 from django.db.models.query import QuerySet
-from django.db.models.query_utils import QueryWrapper
 from django.db.models.deletion import CASCADE
 from django.utils.encoding import smart_text
 from django.utils import six
+from django.utils.deprecation import RenameMethodsBase
 from django.utils.translation import ugettext_lazy as _, string_concat
 from django.utils.functional import curry, cached_property
 from django.core import exceptions
 from django import forms
 
-
 RECURSIVE_RELATIONSHIP_CONSTANT = 'self'
 
 pending_lookups = {}
@@ -93,22 +92,27 @@ signals.class_prepared.connect(do_pending_lookups)
 
 
 #HACK
-class RelatedField(object):
-    def contribute_to_class(self, cls, name):
+class RelatedField(Field):
+    def db_type(self, connection):
+        '''By default related field will not have a column
+           as it relates columns to another table'''
+        return None
+
+    def contribute_to_class(self, cls, name, virtual_only=False):
         sup = super(RelatedField, self)
 
         # Store the opts for related_query_name()
         self.opts = cls._meta
 
         if hasattr(sup, 'contribute_to_class'):
-            sup.contribute_to_class(cls, name)
+            sup.contribute_to_class(cls, name, virtual_only=virtual_only)
 
         if not cls._meta.abstract and self.rel.related_name:
-            self.rel.related_name = self.rel.related_name % {
-                    'class': cls.__name__.lower(),
-                    'app_label': cls._meta.app_label.lower(),
-                }
-
+            related_name = self.rel.related_name % {
+                'class': cls.__name__.lower(),
+                'app_label': cls._meta.app_label.lower()
+            }
+            self.rel.related_name = related_name
         other = self.rel.to
         if isinstance(other, six.string_types) or other._meta.pk is None:
             def resolve_related_class(field, model, cls):
@@ -119,10 +123,10 @@ class RelatedField(object):
             self.do_related_class(other, cls)
 
     def set_attributes_from_rel(self):
-        self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name)
+        self.name = self.name or (self.rel.to._meta.model_name + '_' + self.rel.to._meta.pk.name)
         if self.verbose_name is None:
             self.verbose_name = self.rel.to._meta.verbose_name
-        self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name
+        self.rel.set_field_name()
 
     def do_related_class(self, other, cls):
         self.set_attributes_from_rel()
@@ -130,103 +134,22 @@ class RelatedField(object):
         if not cls._meta.abstract:
             self.contribute_to_related_class(other, self.related)
 
-    def get_prep_lookup(self, lookup_type, value):
-        if hasattr(value, 'prepare'):
-            return value.prepare()
-        if hasattr(value, '_prepare'):
-            return value._prepare()
-        # FIXME: lt and gt are explicitly allowed to make
-        # get_(next/prev)_by_date work; other lookups are not allowed since that
-        # gets messy pretty quick. This is a good candidate for some refactoring
-        # in the future.
-        if lookup_type in ['exact', 'gt', 'lt', 'gte', 'lte']:
-            return self._pk_trace(value, 'get_prep_lookup', lookup_type)
-        if lookup_type in ('range', 'in'):
-            return [self._pk_trace(v, 'get_prep_lookup', lookup_type) for v in value]
-        elif lookup_type == 'isnull':
-            return []
-        raise TypeError("Related Field has invalid lookup: %s" % lookup_type)
-
-    def get_db_prep_lookup(self, lookup_type, value, connection, prepared=False):
-        if not prepared:
-            value = self.get_prep_lookup(lookup_type, value)
-        if hasattr(value, 'get_compiler'):
-            value = value.get_compiler(connection=connection)
-        if hasattr(value, 'as_sql') or hasattr(value, '_as_sql'):
-            # If the value has a relabel_aliases method, it will need to
-            # be invoked before the final SQL is evaluated
-            if hasattr(value, 'relabel_aliases'):
-                return value
-            if hasattr(value, 'as_sql'):
-                sql, params = value.as_sql()
-            else:
-                sql, params = value._as_sql(connection=connection)
-            return QueryWrapper(('(%s)' % sql), params)
-
-        # FIXME: lt and gt are explicitly allowed to make
-        # get_(next/prev)_by_date work; other lookups are not allowed since that
-        # gets messy pretty quick. This is a good candidate for some refactoring
-        # in the future.
-        if lookup_type in ['exact', 'gt', 'lt', 'gte', 'lte']:
-            return [self._pk_trace(value, 'get_db_prep_lookup', lookup_type,
-                            connection=connection, prepared=prepared)]
-        if lookup_type in ('range', 'in'):
-            return [self._pk_trace(v, 'get_db_prep_lookup', lookup_type,
-                            connection=connection, prepared=prepared)
-                    for v in value]
-        elif lookup_type == 'isnull':
-            return []
-        raise TypeError("Related Field has invalid lookup: %s" % lookup_type)
-
-    def _pk_trace(self, value, prep_func, lookup_type, **kwargs):
-        # Value may be a primary key, or an object held in a relation.
-        # If it is an object, then we need to get the primary key value for
-        # that object. In certain conditions (especially one-to-one relations),
-        # the primary key may itself be an object - so we need to keep drilling
-        # down until we hit a value that can be used for a comparison.
-        v = value
-
-        # In the case of an FK to 'self', this check allows to_field to be used
-        # for both forwards and reverse lookups across the FK. (For normal FKs,
-        # it's only relevant for forward lookups).
-        if isinstance(v, self.rel.to):
-            field_name = getattr(self.rel, "field_name", None)
-        else:
-            field_name = None
-        try:
-            while True:
-                if field_name is None:
-                    field_name = v._meta.pk.name
-                v = getattr(v, field_name)
-                field_name = None
-        except AttributeError:
-            pass
-        except exceptions.ObjectDoesNotExist:
-            v = None
-
-        field = self
-        while field.rel:
-            if hasattr(field.rel, 'field_name'):
-                field = field.rel.to._meta.get_field(field.rel.field_name)
-            else:
-                field = field.rel.to._meta.pk
-
-        if lookup_type in ('range', 'in'):
-            v = [v]
-        v = getattr(field, prep_func)(lookup_type, v, **kwargs)
-        if isinstance(v, list):
-            v = v[0]
-        return v
-
     def related_query_name(self):
         # This method defines the name that can be used to identify this
         # related object in a table-spanning query. It uses the lower-cased
         # object_name by default, but this can be overridden with the
         # "related_name" option.
-        return self.rel.related_name or self.opts.object_name.lower()
+        return self.rel.related_name or self.opts.model_name
 
 
-class SingleRelatedObjectDescriptor(object):
+class RenameRelatedObjectDescriptorMethods(RenameMethodsBase):
+    renamed_methods = (
+        ('get_query_set', 'get_queryset', PendingDeprecationWarning),
+        ('get_prefetch_query_set', 'get_prefetch_queryset', PendingDeprecationWarning),
+    )
+
+
+class SingleRelatedObjectDescriptor(six.with_metaclass(RenameRelatedObjectDescriptorMethods)):
     # This class provides the functionality that makes the related-object
     # managers available as attributes on a model class, for fields that have
     # a single "remote" value, on the class pointed to by a related field.
@@ -239,16 +162,16 @@ class SingleRelatedObjectDescriptor(object):
     def is_cached(self, instance):
         return hasattr(instance, self.cache_name)
 
-    def get_query_set(self, **db_hints):
+    def get_queryset(self, **db_hints):
         db = router.db_for_read(self.related.model, **db_hints)
         return self.related.model._base_manager.using(db)
 
-    def get_prefetch_query_set(self, instances):
+    def get_prefetch_queryset(self, instances):
         rel_obj_attr = attrgetter(self.related.field.attname)
         instance_attr = lambda obj: obj._get_pk_val()
         instances_dict = dict((instance_attr(inst), inst) for inst in instances)
-        params = {'%s__pk__in' % self.related.field.name: list(instances_dict)}
-        qs = self.get_query_set(instance=instances[0]).filter(**params)
+        query = {'%s__in' % self.related.field.name: instances}
+        qs = self.get_queryset(instance=instances[0]).filter(**query)
         # Since we're going to assign directly in the cache,
         # we must manage the reverse relation cache manually.
         rel_obj_cache_name = self.related.field.get_cache_name()
@@ -267,9 +190,11 @@ class SingleRelatedObjectDescriptor(object):
             if related_pk is None:
                 rel_obj = None
             else:
-                params = {'%s__pk' % self.related.field.name: related_pk}
+                params = {}
+                for lh_field, rh_field in self.related.field.related_fields:
+                    params['%s__%s' % (self.related.field.name, rh_field.name)] = getattr(instance, rh_field.attname)
                 try:
-                    rel_obj = self.get_query_set(instance=instance).get(**params)
+                    rel_obj = self.get_queryset(instance=instance).get(**params)
                 except self.related.model.DoesNotExist:
                     rel_obj = None
                 else:
@@ -307,13 +232,14 @@ class SingleRelatedObjectDescriptor(object):
                     raise ValueError('Cannot assign "%r": instance is on database "%s", value is on database "%s"' %
                                         (value, instance._state.db, value._state.db))
 
-        related_pk = getattr(instance, self.related.field.rel.get_related_field().attname)
-        if related_pk is None:
+        related_pk = tuple([getattr(instance, field.attname) for field in self.related.field.foreign_related_fields])
+        if None in related_pk:
             raise ValueError('Cannot assign "%r": "%s" instance isn\'t saved in the database.' %
                                 (value, instance._meta.object_name))
 
         # Set the value of the related field to the value of the related object's related field
-        setattr(value, self.related.field.attname, related_pk)
+        for index, field in enumerate(self.related.field.local_related_fields):
+            setattr(value, field.attname, related_pk[index])
 
         # Since we already know what the related object is, seed the related
         # object caches now, too. This avoids another db hit if you get the
@@ -322,7 +248,7 @@ class SingleRelatedObjectDescriptor(object):
         setattr(value, self.related.field.get_cache_name(), instance)
 
 
-class ReverseSingleRelatedObjectDescriptor(object):
+class ReverseSingleRelatedObjectDescriptor(six.with_metaclass(RenameRelatedObjectDescriptorMethods)):
     # This class provides the functionality that makes the related-object
     # managers available as attributes on a model class, for fields that have
     # a single "remote" value, on the class that defines the related field.
@@ -335,7 +261,7 @@ class ReverseSingleRelatedObjectDescriptor(object):
     def is_cached(self, instance):
         return hasattr(instance, self.cache_name)
 
-    def get_query_set(self, **db_hints):
+    def get_queryset(self, **db_hints):
         db = router.db_for_read(self.field.rel.to, **db_hints)
         rel_mgr = self.field.rel.to._default_manager
         # If the related manager indicates that it should be used for
@@ -345,16 +271,12 @@ class ReverseSingleRelatedObjectDescriptor(object):
         else:
             return QuerySet(self.field.rel.to).using(db)
 
-    def get_prefetch_query_set(self, instances):
-        other_field = self.field.rel.get_related_field()
-        rel_obj_attr = attrgetter(other_field.attname)
-        instance_attr = attrgetter(self.field.attname)
+    def get_prefetch_queryset(self, instances):
+        rel_obj_attr = self.field.get_foreign_related_value
+        instance_attr = self.field.get_local_related_value
         instances_dict = dict((instance_attr(inst), inst) for inst in instances)
-        if other_field.rel:
-            params = {'%s__pk__in' % self.field.rel.field_name: list(instances_dict)}
-        else:
-            params = {'%s__in' % self.field.rel.field_name: list(instances_dict)}
-        qs = self.get_query_set(instance=instances[0]).filter(**params)
+        query = {'%s__in' % self.field.related_query_name(): instances}
+        qs = self.get_queryset(instance=instances[0]).filter(**query)
         # Since we're going to assign directly in the cache,
         # we must manage the reverse relation cache manually.
         if not self.field.rel.multiple:
@@ -370,16 +292,15 @@ class ReverseSingleRelatedObjectDescriptor(object):
         try:
             rel_obj = getattr(instance, self.cache_name)
         except AttributeError:
-            val = getattr(instance, self.field.attname)
-            if val is None:
+            val = self.field.get_local_related_value(instance)
+            if None in val:
                 rel_obj = None
             else:
-                other_field = self.field.rel.get_related_field()
-                if other_field.rel:
-                    params = {'%s__%s' % (self.field.rel.field_name, other_field.rel.field_name): val}
-                else:
-                    params = {'%s__exact' % self.field.rel.field_name: val}
-                qs = self.get_query_set(instance=instance)
+                params = dict(
+                    (rh_field.attname, getattr(instance, lh_field.attname))
+                    for lh_field, rh_field in self.field.related_fields)
+                params.update(self.field.get_extra_descriptor_filter(instance))
+                qs = self.get_queryset(instance=instance)
                 # Assuming the database enforces foreign keys, this won't fail.
                 rel_obj = qs.get(**params)
                 if not self.field.rel.multiple:
@@ -433,11 +354,11 @@ class ReverseSingleRelatedObjectDescriptor(object):
                 setattr(related, self.field.related.get_cache_name(), None)
 
         # Set the value of the related field
-        try:
-            val = getattr(value, self.field.rel.get_related_field().attname)
-        except AttributeError:
-            val = None
-        setattr(instance, self.field.attname, val)
+        for lh_field, rh_field in self.field.related_fields:
+            try:
+                setattr(instance, lh_field.attname, getattr(value, rh_field.attname))
+            except AttributeError:
+                setattr(instance, lh_field.attname, None)
 
         # Since we already know what the related object is, seed the related
         # object caches now, too. This avoids another db hit if you get the
@@ -480,34 +401,36 @@ class ForeignRelatedObjectsDescriptor(object):
         superclass = self.related.model._default_manager.__class__
         rel_field = self.related.field
         rel_model = self.related.model
-        attname = rel_field.rel.get_related_field().attname
 
         class RelatedManager(superclass):
             def __init__(self, instance):
                 super(RelatedManager, self).__init__()
                 self.instance = instance
-                self.core_filters = {
-                    '%s__%s' % (rel_field.name, attname): getattr(instance, attname)
-                }
+                self.core_filters= {'%s__exact' % rel_field.name: instance}
                 self.model = rel_model
 
-            def get_query_set(self):
+            def get_queryset(self):
                 try:
                     return self.instance._prefetched_objects_cache[rel_field.related_query_name()]
                 except (AttributeError, KeyError):
                     db = self._db or router.db_for_read(self.model, instance=self.instance)
-                    qs = super(RelatedManager, self).get_query_set().using(db).filter(**self.core_filters)
-                    qs._known_related_object = (rel_field.name, self.instance)
+                    qs = super(RelatedManager, self).get_queryset().using(db).filter(**self.core_filters)
+                    empty_strings_as_null = connections[db].features.interprets_empty_strings_as_nulls
+                    for field in rel_field.foreign_related_fields:
+                        val = getattr(self.instance, field.attname)
+                        if val is None or (val == '' and empty_strings_as_null):
+                            return qs.none()
+                    qs._known_related_objects = {rel_field: {self.instance.pk: self.instance}}
                     return qs
 
-            def get_prefetch_query_set(self, instances):
-                rel_obj_attr = attrgetter(rel_field.attname)
-                instance_attr = attrgetter(attname)
+            def get_prefetch_queryset(self, instances):
+                rel_obj_attr = rel_field.get_local_related_value
+                instance_attr = rel_field.get_foreign_related_value
                 instances_dict = dict((instance_attr(inst), inst) for inst in instances)
                 db = self._db or router.db_for_read(self.model, instance=instances[0])
-                query = {'%s__%s__in' % (rel_field.name, attname): list(instances_dict)}
-                qs = super(RelatedManager, self).get_query_set().using(db).filter(**query)
-                # Since we just bypassed this class' get_query_set(), we must manage
+                query = {'%s__in' % rel_field.name: instances}
+                qs = super(RelatedManager, self).get_queryset().using(db).filter(**query)
+                # Since we just bypassed this class' get_queryset(), we must manage
                 # the reverse relation manually.
                 for rel_obj in qs:
                     instance = instances_dict[rel_obj_attr(rel_obj)]
@@ -540,10 +463,10 @@ class ForeignRelatedObjectsDescriptor(object):
             # remove() and clear() are only provided if the ForeignKey can have a value of null.
             if rel_field.null:
                 def remove(self, *objs):
-                    val = getattr(self.instance, attname)
+                    val = rel_field.get_foreign_related_value(self.instance)
                     for obj in objs:
                         # Is obj actually part of this descriptor set?
-                        if getattr(obj, rel_field.attname) == val:
+                        if rel_field.get_local_related_value(obj) == val:
                             setattr(obj, rel_field.name, None)
                             obj.save()
                         else:
@@ -567,16 +490,26 @@ def create_many_related_manager(superclass, rel):
             super(ManyRelatedManager, self).__init__()
             self.model = model
             self.query_field_name = query_field_name
-            self.core_filters = {'%s__pk' % query_field_name: instance._get_pk_val()}
+
+            source_field = through._meta.get_field(source_field_name)
+            source_related_fields = source_field.related_fields
+
+            self.core_filters = {}
+            for lh_field, rh_field in source_related_fields:
+                self.core_filters['%s__%s' % (query_field_name, rh_field.name)] = getattr(instance, rh_field.attname)
+
             self.instance = instance
             self.symmetrical = symmetrical
+            self.source_field = source_field
             self.source_field_name = source_field_name
             self.target_field_name = target_field_name
             self.reverse = reverse
             self.through = through
             self.prefetch_cache_name = prefetch_cache_name
-            self._fk_val = self._get_fk_val(instance, source_field_name)
-            if self._fk_val is None:
+            self.related_val = source_field.get_foreign_related_value(instance)
+            # Used for single column related auto created models
+            self._fk_val = self.related_val[0]
+            if None in self.related_val:
                 raise ValueError('"%r" needs to have a value for field "%s" before '
                                  'this many-to-many relationship can be used.' %
                                  (instance, source_field_name))
@@ -601,20 +534,18 @@ def create_many_related_manager(superclass, rel):
             else:
                 return obj.pk
 
-        def get_query_set(self):
+        def get_queryset(self):
             try:
                 return self.instance._prefetched_objects_cache[self.prefetch_cache_name]
             except (AttributeError, KeyError):
                 db = self._db or router.db_for_read(self.instance.__class__, instance=self.instance)
-                return super(ManyRelatedManager, self).get_query_set().using(db)._next_is_sticky().filter(**self.core_filters)
+                return super(ManyRelatedManager, self).get_queryset().using(db)._next_is_sticky().filter(**self.core_filters)
 
-        def get_prefetch_query_set(self, instances):
+        def get_prefetch_queryset(self, instances):
             instance = instances[0]
-            from django.db import connections
             db = self._db or router.db_for_read(instance.__class__, instance=instance)
-            query = {'%s__pk__in' % self.query_field_name:
-                         set(obj._get_pk_val() for obj in instances)}
-            qs = super(ManyRelatedManager, self).get_query_set().using(db)._next_is_sticky().filter(**query)
+            query = {'%s__in' % self.query_field_name: instances}
+            qs = super(ManyRelatedManager, self).get_queryset().using(db)._next_is_sticky().filter(**query)
 
             # M2M: need to annotate the query in order to get the primary model
             # that the secondary model was actually related to. We know that
@@ -624,16 +555,15 @@ def create_many_related_manager(superclass, rel):
             # For non-autocreated 'through' models, can't assume we are
             # dealing with PK values.
             fk = self.through._meta.get_field(self.source_field_name)
-            source_col = fk.column
             join_table = self.through._meta.db_table
             connection = connections[db]
             qn = connection.ops.quote_name
-            qs = qs.extra(select={'_prefetch_related_val':
-                                      '%s.%s' % (qn(join_table), qn(source_col))})
-            select_attname = fk.rel.get_related_field().get_attname()
+            qs = qs.extra(select=dict(
+                ('_prefetch_related_val_%s' % f.attname,
+                '%s.%s' % (qn(join_table), qn(f.column))) for f in fk.local_related_fields))
             return (qs,
-                    attrgetter('_prefetch_related_val'),
-                    attrgetter(select_attname),
+                    lambda result: tuple([getattr(result, '_prefetch_related_val_%s' % f.attname) for f in fk.local_related_fields]),
+                    lambda inst: tuple([getattr(inst, f.attname) for f in fk.foreign_related_fields]),
                     False,
                     self.prefetch_cache_name)
 
@@ -785,7 +715,7 @@ def create_many_related_manager(superclass, rel):
                     instance=self.instance, reverse=self.reverse,
                     model=self.model, pk_set=None, using=db)
             self.through._default_manager.using(db).filter(**{
-                source_field_name: self._fk_val
+                source_field_name: self.related_val
             }).delete()
             if self.reverse or source_field_name == self.source_field_name:
                 # Don't send the signal when we are clearing the
@@ -902,22 +832,24 @@ class ReverseManyRelatedObjectsDescriptor(object):
             raise AttributeError("Cannot set values on a ManyToManyField which specifies an intermediary model.  Use %s.%s's Manager instead." % (opts.app_label, opts.object_name))
 
         manager = self.__get__(instance)
+        # clear() can change expected output of 'value' queryset, we force evaluation
+        # of queryset before clear; ticket #19816
+        value = tuple(value)
         manager.clear()
         manager.add(*value)
 
-
-class ManyToOneRel(object):
-    def __init__(self, to, field_name, related_name=None, limit_choices_to=None,
-        parent_link=False, on_delete=None):
+class ForeignObjectRel(object):
+    def __init__(self, field, to, related_name=None, limit_choices_to=None,
+                 parent_link=False, on_delete=None):
         try:
             to._meta
         except AttributeError:  # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT
             assert isinstance(to, six.string_types), "'to' must be either a model, a model name or the string %r" % RECURSIVE_RELATIONSHIP_CONSTANT
-        self.to, self.field_name = to, field_name
+
+        self.field = field
+        self.to = to
         self.related_name = related_name
-        if limit_choices_to is None:
-            limit_choices_to = {}
-        self.limit_choices_to = limit_choices_to
+        self.limit_choices_to = {} if limit_choices_to is None else limit_choices_to
         self.multiple = True
         self.parent_link = parent_link
         self.on_delete = on_delete
@@ -926,6 +858,30 @@ class ManyToOneRel(object):
         "Should the related object be hidden?"
         return self.related_name and self.related_name[-1] == '+'
 
+    def get_joining_columns(self):
+        return self.field.get_reverse_joining_columns()
+
+    def get_extra_restriction(self, where_class, alias, related_alias):
+        return self.field.get_extra_restriction(where_class, related_alias, alias)
+
+    def set_field_name(self):
+        """
+        Sets the related field's name, this is not available until later stages
+        of app loading, so set_field_name is called from
+        set_attributes_from_rel()
+        """
+        # By default foreign object doesn't relate to any remote field (for
+        # example custom multicolumn joins currently have no remote field).
+        self.field_name = None
+
+class ManyToOneRel(ForeignObjectRel):
+    def __init__(self, field, to, field_name, related_name=None, limit_choices_to=None,
+                 parent_link=False, on_delete=None):
+        super(ManyToOneRel, self).__init__(
+            field, to, related_name=related_name, limit_choices_to=limit_choices_to,
+            parent_link=parent_link, on_delete=on_delete)
+        self.field_name = field_name
+
     def get_related_field(self):
         """
         Returns the Field in the 'to' object to which this relationship is
@@ -937,11 +893,14 @@ class ManyToOneRel(object):
                     self.field_name)
         return data[0]
 
+    def set_field_name(self):
+        self.field_name = self.field_name or self.to._meta.pk.name
+
 
 class OneToOneRel(ManyToOneRel):
-    def __init__(self, to, field_name, related_name=None, limit_choices_to=None,
-        parent_link=False, on_delete=None):
-        super(OneToOneRel, self).__init__(to, field_name,
+    def __init__(self, field, to, field_name, related_name=None, limit_choices_to=None,
+                 parent_link=False, on_delete=None):
+        super(OneToOneRel, self).__init__(field, to, field_name,
                 related_name=related_name, limit_choices_to=limit_choices_to,
                 parent_link=parent_link, on_delete=on_delete
         )
@@ -950,7 +909,9 @@ class OneToOneRel(ManyToOneRel):
 
 class ManyToManyRel(object):
     def __init__(self, to, related_name=None, limit_choices_to=None,
-            symmetrical=True, through=None):
+                 symmetrical=True, through=None, db_constraint=True):
+        if through and not db_constraint:
+            raise ValueError("Can't supply a through model and db_constraint=False")
         self.to = to
         self.related_name = related_name
         if limit_choices_to is None:
@@ -959,6 +920,7 @@ class ManyToManyRel(object):
         self.symmetrical = symmetrical
         self.multiple = True
         self.through = through
+        self.db_constraint = db_constraint
 
     def is_hidden(self):
         "Should the related object be hidden?"
@@ -973,14 +935,207 @@ class ManyToManyRel(object):
         return self.to._meta.pk
 
 
-class ForeignKey(RelatedField, Field):
+class ForeignObject(RelatedField):
+    requires_unique_target = True
+    generate_reverse_relation = True
+
+    def __init__(self, to, from_fields, to_fields, **kwargs):
+        self.from_fields = from_fields
+        self.to_fields = to_fields
+
+        if 'rel' not in kwargs:
+            kwargs['rel'] = ForeignObjectRel(
+                self, to,
+                related_name=kwargs.pop('related_name', None),
+                limit_choices_to=kwargs.pop('limit_choices_to', None),
+                parent_link=kwargs.pop('parent_link', False),
+                on_delete=kwargs.pop('on_delete', CASCADE),
+            )
+        kwargs['verbose_name'] = kwargs.get('verbose_name', None)
+
+        super(ForeignObject, self).__init__(**kwargs)
+
+    def resolve_related_fields(self):
+        if len(self.from_fields) < 1 or len(self.from_fields) != len(self.to_fields):
+            raise ValueError('Foreign Object from and to fields must be the same non-zero length')
+        related_fields = []
+        for index in range(len(self.from_fields)):
+            from_field_name = self.from_fields[index]
+            to_field_name = self.to_fields[index]
+            from_field = (self if from_field_name == 'self'
+                          else self.opts.get_field_by_name(from_field_name)[0])
+            to_field = (self.rel.to._meta.pk if to_field_name is None
+                        else self.rel.to._meta.get_field_by_name(to_field_name)[0])
+            related_fields.append((from_field, to_field))
+        return related_fields
+
+    @property
+    def related_fields(self):
+        if not hasattr(self, '_related_fields'):
+            self._related_fields = self.resolve_related_fields()
+        return self._related_fields
+
+    @property
+    def reverse_related_fields(self):
+        return [(rhs_field, lhs_field) for lhs_field, rhs_field in self.related_fields]
+
+    @property
+    def local_related_fields(self):
+        return tuple([lhs_field for lhs_field, rhs_field in self.related_fields])
+
+    @property
+    def foreign_related_fields(self):
+        return tuple([rhs_field for lhs_field, rhs_field in self.related_fields])
+
+    def get_local_related_value(self, instance):
+        return self.get_instance_value_for_fields(instance, self.local_related_fields)
+
+    def get_foreign_related_value(self, instance):
+        return self.get_instance_value_for_fields(instance, self.foreign_related_fields)
+
+    @staticmethod
+    def get_instance_value_for_fields(instance, fields):
+        return tuple([getattr(instance, field.attname) for field in fields])
+
+    def get_attname_column(self):
+        attname, column = super(ForeignObject, self).get_attname_column()
+        return attname, None
+
+    def get_joining_columns(self, reverse_join=False):
+        source = self.reverse_related_fields if reverse_join else self.related_fields
+        return tuple([(lhs_field.column, rhs_field.column) for lhs_field, rhs_field in source])
+
+    def get_reverse_joining_columns(self):
+        return self.get_joining_columns(reverse_join=True)
+
+    def get_extra_descriptor_filter(self, instance):
+        """
+        Returns an extra filter condition for related object fetching when
+        user does 'instance.fieldname', that is the extra filter is used in
+        the descriptor of the field.
+
+        The filter should be something usable in .filter(**kwargs) call, and
+        will be ANDed together with the joining columns condition.
+
+        A parallel method is get_extra_relation_restriction() which is used in
+        JOIN and subquery conditions.
+        """
+        return {}
+
+    def get_extra_restriction(self, where_class, alias, related_alias):
+        """
+        Returns a pair condition used for joining and subquery pushdown. The
+        condition is something that responds to as_sql(qn, connection) method.
+
+        Note that currently referring both the 'alias' and 'related_alias'
+        will not work in some conditions, like subquery pushdown.
+
+        A parallel method is get_extra_descriptor_filter() which is used in
+        instance.fieldname related object fetching.
+        """
+        return None
+
+    def get_path_info(self):
+        """
+        Get path from this field to the related model.
+        """
+        opts = self.rel.to._meta
+        from_opts = self.model._meta
+        return [PathInfo(from_opts, opts, self.foreign_related_fields, self, False, True)]
+
+    def get_reverse_path_info(self):
+        """
+        Get path from the related model to this field's model.
+        """
+        opts = self.model._meta
+        from_opts = self.rel.to._meta
+        pathinfos = [PathInfo(from_opts, opts, (opts.pk,), self.rel, not self.unique, False)]
+        return pathinfos
+
+    def get_lookup_constraint(self, constraint_class, alias, targets, sources, lookup_type,
+                              raw_value):
+        from django.db.models.sql.where import SubqueryConstraint, Constraint, AND, OR
+        root_constraint = constraint_class()
+        assert len(targets) == len(sources)
+
+        def get_normalized_value(value):
+
+            from django.db.models import Model
+            if isinstance(value, Model):
+                value_list = []
+                for source in sources:
+                    # Account for one-to-one relations when sent a different model
+                    while not isinstance(value, source.model):
+                        source = source.rel.to._meta.get_field(source.rel.field_name)
+                    value_list.append(getattr(value, source.attname))
+                return tuple(value_list)
+            elif not isinstance(value, tuple):
+                return (value,)
+            return value
+
+        is_multicolumn = len(self.related_fields) > 1
+        if (hasattr(raw_value, '_as_sql') or
+                hasattr(raw_value, 'get_compiler')):
+            root_constraint.add(SubqueryConstraint(alias, [target.column for target in targets],
+                                                   [source.name for source in sources], raw_value),
+                                AND)
+        elif lookup_type == 'isnull':
+            root_constraint.add(
+                (Constraint(alias, targets[0].column, targets[0]), lookup_type, raw_value), AND)
+        elif (lookup_type == 'exact' or (lookup_type in ['gt', 'lt', 'gte', 'lte']
+                                         and not is_multicolumn)):
+            value = get_normalized_value(raw_value)
+            for index, source in enumerate(sources):
+                root_constraint.add(
+                    (Constraint(alias, targets[index].column, sources[index]), lookup_type,
+                     value[index]), AND)
+        elif lookup_type in ['range', 'in'] and not is_multicolumn:
+            values = [get_normalized_value(value) for value in raw_value]
+            value = [val[0] for val in values]
+            root_constraint.add(
+                (Constraint(alias, targets[0].column, sources[0]), lookup_type, value), AND)
+        elif lookup_type == 'in':
+            values = [get_normalized_value(value) for value in raw_value]
+            for value in values:
+                value_constraint = constraint_class()
+                for index, target in enumerate(targets):
+                    value_constraint.add(
+                        (Constraint(alias, target.column, sources[index]), 'exact', value[index]),
+                        AND)
+                root_constraint.add(value_constraint, OR)
+        else:
+            raise TypeError('Related Field got invalid lookup: %s' % lookup_type)
+        return root_constraint
+
+    @property
+    def attnames(self):
+        return tuple([field.attname for field in self.local_related_fields])
+
+    def get_defaults(self):
+        return tuple([field.get_default() for field in self.local_related_fields])
+
+    def contribute_to_class(self, cls, name, virtual_only=False):
+        super(ForeignObject, self).contribute_to_class(cls, name, virtual_only=virtual_only)
+        setattr(cls, self.name, ReverseSingleRelatedObjectDescriptor(self))
+
+    def contribute_to_related_class(self, cls, related):
+        # Internal FK's - i.e., those with a related name ending with '+' -
+        # and swapped models don't get a related descriptor.
+        if not self.rel.is_hidden() and not related.model._meta.swapped:
+            setattr(cls, related.get_accessor_name(), ForeignRelatedObjectsDescriptor(related))
+            if self.rel.limit_choices_to:
+                cls._meta.related_fkey_lookups.append(self.rel.limit_choices_to)
+
+
+class ForeignKey(ForeignObject):
     empty_strings_allowed = False
     default_error_messages = {
         'invalid': _('Model %(model)s with pk %(pk)r does not exist.')
     }
     description = _("Foreign Key (type determined by related field)")
 
-    def __init__(self, to, to_field=None, rel_class=ManyToOneRel, **kwargs):
+    def __init__(self, to, to_field=None, rel_class=ManyToOneRel,
+                 db_constraint=True, **kwargs):
         try:
             to_name = to._meta.object_name.lower()
         except AttributeError:  # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT
@@ -991,18 +1146,33 @@ class ForeignKey(RelatedField, Field):
             # the to_field during FK construction. It won't be guaranteed to
             # be correct until contribute_to_class is called. Refs #12190.
             to_field = to_field or (to._meta.pk and to._meta.pk.name)
-        kwargs['verbose_name'] = kwargs.get('verbose_name', None)
 
         if 'db_index' not in kwargs:
             kwargs['db_index'] = True
 
-        kwargs['rel'] = rel_class(to, to_field,
+        self.db_constraint = db_constraint
+
+        kwargs['rel'] = rel_class(
+            self, to, to_field,
             related_name=kwargs.pop('related_name', None),
             limit_choices_to=kwargs.pop('limit_choices_to', None),
             parent_link=kwargs.pop('parent_link', False),
             on_delete=kwargs.pop('on_delete', CASCADE),
         )
-        Field.__init__(self, **kwargs)
+        super(ForeignKey, self).__init__(to, ['self'], [to_field], **kwargs)
+
+    @property
+    def related_field(self):
+        return self.foreign_related_fields[0]
+
+    def get_reverse_path_info(self):
+        """
+        Get path from the related model to this field's model.
+        """
+        opts = self.model._meta
+        from_opts = self.rel.to._meta
+        pathinfos = [PathInfo(from_opts, opts, (opts.pk,), self.rel, not self.unique, False)]
+        return pathinfos
 
     def validate(self, value, model_instance):
         if self.rel.parent_link:
@@ -1023,21 +1193,26 @@ class ForeignKey(RelatedField, Field):
     def get_attname(self):
         return '%s_id' % self.name
 
+    def get_attname_column(self):
+        attname = self.get_attname()
+        column = self.db_column or attname
+        return attname, column
+
     def get_validator_unique_lookup_type(self):
-        return '%s__%s__exact' % (self.name, self.rel.get_related_field().name)
+        return '%s__%s__exact' % (self.name, self.related_field.name)
 
     def get_default(self):
         "Here we check if the default value is an object and return the to_field if so."
         field_default = super(ForeignKey, self).get_default()
         if isinstance(field_default, self.rel.to):
-            return getattr(field_default, self.rel.get_related_field().attname)
+            return getattr(field_default, self.related_field.attname)
         return field_default
 
     def get_db_prep_save(self, value, connection):
         if value == '' or value == None:
             return None
         else:
-            return self.rel.get_related_field().get_db_prep_save(value,
+            return self.related_field.get_db_prep_save(value,
                 connection=connection)
 
     def value_to_string(self, obj):
@@ -1050,19 +1225,10 @@ class ForeignKey(RelatedField, Field):
                 choice_list = self.get_choices_default()
                 if len(choice_list) == 2:
                     return smart_text(choice_list[1][0])
-        return Field.value_to_string(self, obj)
-
-    def contribute_to_class(self, cls, name):
-        super(ForeignKey, self).contribute_to_class(cls, name)
-        setattr(cls, self.name, ReverseSingleRelatedObjectDescriptor(self))
+        return super(ForeignKey, self).value_to_string(obj)
 
     def contribute_to_related_class(self, cls, related):
-        # Internal FK's - i.e., those with a related name ending with '+' -
-        # and swapped models don't get a related descriptor.
-        if not self.rel.is_hidden() and not related.model._meta.swapped:
-            setattr(cls, related.get_accessor_name(), ForeignRelatedObjectsDescriptor(related))
-            if self.rel.limit_choices_to:
-                cls._meta.related_fkey_lookups.append(self.rel.limit_choices_to)
+        super(ForeignKey, self).contribute_to_related_class(cls, related)
         if self.rel.field_name is None:
             self.rel.field_name = cls._meta.pk.name
 
@@ -1087,7 +1253,7 @@ class ForeignKey(RelatedField, Field):
         # in which case the column type is simply that of an IntegerField.
         # If the database needs similar types for key fields however, the only
         # thing we can do is making AutoField an IntegerField.
-        rel_field = self.rel.get_related_field()
+        rel_field = self.related_field
         if (isinstance(rel_field, AutoField) or
                 (not connection.features.related_fields_match_type and
                 isinstance(rel_field, (PositiveIntegerField,
@@ -1151,7 +1317,7 @@ def create_many_to_many_intermediary_model(field, klass):
         from_ = 'from_%s' % to.lower()
         to = 'to_%s' % to.lower()
     else:
-        from_ = klass._meta.object_name.lower()
+        from_ = klass._meta.model_name
         to = to.lower()
     meta = type('Meta', (object,), {
         'db_table': field._get_m2m_db_table(klass._meta),
@@ -1164,18 +1330,18 @@ def create_many_to_many_intermediary_model(field, klass):
         'verbose_name_plural': '%(from)s-%(to)s relationships' % {'from': from_, 'to': to},
     })
     # Construct and return the new class.
-    return type(name, (models.Model,), {
+    return type(str(name), (models.Model,), {
         'Meta': meta,
         '__module__': klass.__module__,
-        from_: models.ForeignKey(klass, related_name='%s+' % name, db_tablespace=field.db_tablespace),
-        to: models.ForeignKey(to_model, related_name='%s+' % name, db_tablespace=field.db_tablespace)
+        from_: models.ForeignKey(klass, related_name='%s+' % name, db_tablespace=field.db_tablespace, db_constraint=field.rel.db_constraint),
+        to: models.ForeignKey(to_model, related_name='%s+' % name, db_tablespace=field.db_tablespace, db_constraint=field.rel.db_constraint)
     })
 
 
-class ManyToManyField(RelatedField, Field):
+class ManyToManyField(RelatedField):
     description = _("Many-to-many relationship")
 
-    def __init__(self, to, **kwargs):
+    def __init__(self, to, db_constraint=True, **kwargs):
         try:
             assert not to._meta.abstract, "%s cannot define a relation with abstract class %s" % (self.__class__.__name__, to._meta.object_name)
         except AttributeError:  # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT
@@ -1190,17 +1356,43 @@ class ManyToManyField(RelatedField, Field):
             related_name=kwargs.pop('related_name', None),
             limit_choices_to=kwargs.pop('limit_choices_to', None),
             symmetrical=kwargs.pop('symmetrical', to == RECURSIVE_RELATIONSHIP_CONSTANT),
-            through=kwargs.pop('through', None))
+            through=kwargs.pop('through', None),
+            db_constraint=db_constraint,
+        )
 
         self.db_table = kwargs.pop('db_table', None)
         if kwargs['rel'].through is not None:
             assert self.db_table is None, "Cannot specify a db_table if an intermediary model is used."
 
-        Field.__init__(self, **kwargs)
+        super(ManyToManyField, self).__init__(**kwargs)
 
         msg = _('Hold down "Control", or "Command" on a Mac, to select more than one.')
         self.help_text = string_concat(self.help_text, ' ', msg)
 
+    def _get_path_info(self, direct=False):
+        """
+        Called by both direct an indirect m2m traversal.
+        """
+        pathinfos = []
+        int_model = self.rel.through
+        linkfield1 = int_model._meta.get_field_by_name(self.m2m_field_name())[0]
+        linkfield2 = int_model._meta.get_field_by_name(self.m2m_reverse_field_name())[0]
+        if direct:
+            join1infos = linkfield1.get_reverse_path_info()
+            join2infos = linkfield2.get_path_info()
+        else:
+            join1infos = linkfield2.get_reverse_path_info()
+            join2infos = linkfield1.get_path_info()
+        pathinfos.extend(join1infos)
+        pathinfos.extend(join2infos)
+        return pathinfos
+
+    def get_path_info(self):
+        return self._get_path_info(direct=True)
+
+    def get_reverse_path_info(self):
+        return self._get_path_info(direct=False)
+
     def get_choices_default(self):
         return Field.get_choices(self, include_blank=False)
 
diff --git a/django/db/models/loading.py b/django/db/models/loading.py
index a36608e3e1..412bd76e0d 100644
--- a/django/db/models/loading.py
+++ b/django/db/models/loading.py
@@ -230,7 +230,7 @@ class AppCache(object):
         for model in models:
             # Store as 'name: model' pair in a dictionary
             # in the app_models dictionary
-            model_name = model._meta.object_name.lower()
+            model_name = model._meta.model_name
             model_dict = self.app_models.setdefault(app_label, SortedDict())
             if model_name in model_dict:
                 # The same model may be imported via different paths (e.g.
diff --git a/django/db/models/manager.py b/django/db/models/manager.py
index 8da8af487c..43a8264f11 100644
--- a/django/db/models/manager.py
+++ b/django/db/models/manager.py
@@ -1,9 +1,10 @@
 import copy
 from django.db import router
-from django.db.models.query import QuerySet, EmptyQuerySet, insert_query, RawQuerySet
+from django.db.models.query import QuerySet, insert_query, RawQuerySet
 from django.db.models import signals
 from django.db.models.fields import FieldDoesNotExist
-
+from django.utils import six
+from django.utils.deprecation import RenameMethodsBase
 
 def ensure_default_manager(sender, **kwargs):
     """
@@ -47,7 +48,14 @@ def ensure_default_manager(sender, **kwargs):
 signals.class_prepared.connect(ensure_default_manager)
 
 
-class Manager(object):
+class RenameManagerMethods(RenameMethodsBase):
+    renamed_methods = (
+        ('get_query_set', 'get_queryset', PendingDeprecationWarning),
+        ('get_prefetch_query_set', 'get_prefetch_queryset', PendingDeprecationWarning),
+    )
+
+
+class Manager(six.with_metaclass(RenameManagerMethods)):
     # Tracks each time a Manager instance is created. Used to retain order.
     creation_counter = 0
 
@@ -112,110 +120,113 @@ class Manager(object):
     # PROXIES TO QUERYSET #
     #######################
 
-    def get_empty_query_set(self):
-        return EmptyQuerySet(self.model, using=self._db)
-
-    def get_query_set(self):
+    def get_queryset(self):
         """Returns a new QuerySet object.  Subclasses can override this method
         to easily customize the behavior of the Manager.
         """
         return QuerySet(self.model, using=self._db)
 
     def none(self):
-        return self.get_empty_query_set()
+        return self.get_queryset().none()
 
     def all(self):
-        return self.get_query_set()
+        return self.get_queryset()
 
     def count(self):
-        return self.get_query_set().count()
+        return self.get_queryset().count()
 
     def dates(self, *args, **kwargs):
-        return self.get_query_set().dates(*args, **kwargs)
+        return self.get_queryset().dates(*args, **kwargs)
+
+    def datetimes(self, *args, **kwargs):
+        return self.get_queryset().datetimes(*args, **kwargs)
 
     def distinct(self, *args, **kwargs):
-        return self.get_query_set().distinct(*args, **kwargs)
+        return self.get_queryset().distinct(*args, **kwargs)
 
     def extra(self, *args, **kwargs):
-        return self.get_query_set().extra(*args, **kwargs)
+        return self.get_queryset().extra(*args, **kwargs)
 
     def get(self, *args, **kwargs):
-        return self.get_query_set().get(*args, **kwargs)
+        return self.get_queryset().get(*args, **kwargs)
 
     def get_or_create(self, **kwargs):
-        return self.get_query_set().get_or_create(**kwargs)
+        return self.get_queryset().get_or_create(**kwargs)
 
     def create(self, **kwargs):
-        return self.get_query_set().create(**kwargs)
+        return self.get_queryset().create(**kwargs)
 
     def bulk_create(self, *args, **kwargs):
-        return self.get_query_set().bulk_create(*args, **kwargs)
+        return self.get_queryset().bulk_create(*args, **kwargs)
 
     def filter(self, *args, **kwargs):
-        return self.get_query_set().filter(*args, **kwargs)
+        return self.get_queryset().filter(*args, **kwargs)
 
     def aggregate(self, *args, **kwargs):
-        return self.get_query_set().aggregate(*args, **kwargs)
+        return self.get_queryset().aggregate(*args, **kwargs)
 
     def annotate(self, *args, **kwargs):
-        return self.get_query_set().annotate(*args, **kwargs)
+        return self.get_queryset().annotate(*args, **kwargs)
 
     def complex_filter(self, *args, **kwargs):
-        return self.get_query_set().complex_filter(*args, **kwargs)
+        return self.get_queryset().complex_filter(*args, **kwargs)
 
     def exclude(self, *args, **kwargs):
-        return self.get_query_set().exclude(*args, **kwargs)
+        return self.get_queryset().exclude(*args, **kwargs)
 
     def in_bulk(self, *args, **kwargs):
-        return self.get_query_set().in_bulk(*args, **kwargs)
+        return self.get_queryset().in_bulk(*args, **kwargs)
 
     def iterator(self, *args, **kwargs):
-        return self.get_query_set().iterator(*args, **kwargs)
+        return self.get_queryset().iterator(*args, **kwargs)
+
+    def earliest(self, *args, **kwargs):
+        return self.get_queryset().earliest(*args, **kwargs)
 
     def latest(self, *args, **kwargs):
-        return self.get_query_set().latest(*args, **kwargs)
+        return self.get_queryset().latest(*args, **kwargs)
 
     def order_by(self, *args, **kwargs):
-        return self.get_query_set().order_by(*args, **kwargs)
+        return self.get_queryset().order_by(*args, **kwargs)
 
     def select_for_update(self, *args, **kwargs):
-        return self.get_query_set().select_for_update(*args, **kwargs)
+        return self.get_queryset().select_for_update(*args, **kwargs)
 
     def select_related(self, *args, **kwargs):
-        return self.get_query_set().select_related(*args, **kwargs)
+        return self.get_queryset().select_related(*args, **kwargs)
 
     def prefetch_related(self, *args, **kwargs):
-        return self.get_query_set().prefetch_related(*args, **kwargs)
+        return self.get_queryset().prefetch_related(*args, **kwargs)
 
     def values(self, *args, **kwargs):
-        return self.get_query_set().values(*args, **kwargs)
+        return self.get_queryset().values(*args, **kwargs)
 
     def values_list(self, *args, **kwargs):
-        return self.get_query_set().values_list(*args, **kwargs)
+        return self.get_queryset().values_list(*args, **kwargs)
 
     def update(self, *args, **kwargs):
-        return self.get_query_set().update(*args, **kwargs)
+        return self.get_queryset().update(*args, **kwargs)
 
     def reverse(self, *args, **kwargs):
-        return self.get_query_set().reverse(*args, **kwargs)
+        return self.get_queryset().reverse(*args, **kwargs)
 
     def defer(self, *args, **kwargs):
-        return self.get_query_set().defer(*args, **kwargs)
+        return self.get_queryset().defer(*args, **kwargs)
 
     def only(self, *args, **kwargs):
-        return self.get_query_set().only(*args, **kwargs)
+        return self.get_queryset().only(*args, **kwargs)
 
     def using(self, *args, **kwargs):
-        return self.get_query_set().using(*args, **kwargs)
+        return self.get_queryset().using(*args, **kwargs)
 
     def exists(self, *args, **kwargs):
-        return self.get_query_set().exists(*args, **kwargs)
+        return self.get_queryset().exists(*args, **kwargs)
 
     def _insert(self, objs, fields, **kwargs):
         return insert_query(self.model, objs, fields, **kwargs)
 
     def _update(self, values, **kwargs):
-        return self.get_query_set()._update(values, **kwargs)
+        return self.get_queryset()._update(values, **kwargs)
 
     def raw(self, raw_query, params=None, *args, **kwargs):
         return RawQuerySet(raw_query=raw_query, model=self.model, params=params, using=self._db, *args, **kwargs)
@@ -258,5 +269,9 @@ class SwappedManagerDescriptor(object):
 
 
 class EmptyManager(Manager):
-    def get_query_set(self):
-        return self.get_empty_query_set()
+    def __init__(self, model):
+        super(EmptyManager, self).__init__()
+        self.model = model
+
+    def get_queryset(self):
+        return super(EmptyManager, self).get_queryset().none()
diff --git a/django/db/models/options.py b/django/db/models/options.py
index e3b4b7ba1b..a878fe28c4 100644
--- a/django/db/models/options.py
+++ b/django/db/models/options.py
@@ -2,14 +2,15 @@ from __future__ import unicode_literals
 
 import re
 from bisect import bisect
+import warnings
 
 from django.conf import settings
-from django.db.models.related import RelatedObject
 from django.db.models.fields.related import ManyToManyRel
 from django.db.models.fields import AutoField, FieldDoesNotExist
 from django.db.models.fields.proxy import OrderWrt
 from django.db.models.loading import get_models, app_cache_ready
 from django.utils import six
+from django.utils.functional import cached_property
 from django.utils.datastructures import SortedDict
 from django.utils.encoding import force_text, smart_text, python_2_unicode_compatible
 from django.utils.translation import activate, deactivate_all, get_language, string_concat
@@ -28,7 +29,7 @@ class Options(object):
     def __init__(self, meta, app_label=None):
         self.local_fields, self.local_many_to_many = [], []
         self.virtual_fields = []
-        self.module_name, self.verbose_name = None, None
+        self.model_name, self.verbose_name = None, None
         self.verbose_name_plural = None
         self.db_table = ''
         self.ordering = []
@@ -81,7 +82,7 @@ class Options(object):
         self.installed = re.sub('\.models$', '', cls.__module__) in settings.INSTALLED_APPS
         # First, construct the default values for these options.
         self.object_name = cls.__name__
-        self.module_name = self.object_name.lower()
+        self.model_name = self.object_name.lower()
         self.verbose_name = get_verbose_name(self.object_name)
 
         # Next, apply any overridden values from 'class Meta'.
@@ -119,11 +120,21 @@ class Options(object):
             self.verbose_name_plural = string_concat(self.verbose_name, 's')
         del self.meta
 
-        # If the db_table wasn't provided, use the app_label + module_name.
+        # If the db_table wasn't provided, use the app_label + model_name.
         if not self.db_table:
-            self.db_table = "%s_%s" % (self.app_label, self.module_name)
+            self.db_table = "%s_%s" % (self.app_label, self.model_name)
             self.db_table = truncate_name(self.db_table, connection.ops.max_name_length())
 
+    @property
+    def module_name(self):
+        """
+        This property has been deprecated in favor of `model_name`. refs #19689
+        """
+        warnings.warn(
+            "Options.module_name has been deprecated in favor of model_name",
+            PendingDeprecationWarning, stacklevel=2)
+        return self.model_name
+
     def _prepare(self, model):
         if self.order_with_respect_to:
             self.order_with_respect_to = self.get_field(self.order_with_respect_to)
@@ -165,6 +176,22 @@ class Options(object):
             if hasattr(self, '_field_cache'):
                 del self._field_cache
                 del self._field_name_cache
+                # The fields, concrete_fields and local_concrete_fields are
+                # implemented as cached properties for performance reasons.
+                # The attrs will not exists if the cached property isn't
+                # accessed yet, hence the try-excepts.
+                try:
+                    del self.fields
+                except AttributeError:
+                    pass
+                try:
+                    del self.concrete_fields
+                except AttributeError:
+                    pass
+                try:
+                    del self.local_concrete_fields
+                except AttributeError:
+                    pass
 
         if hasattr(self, '_name_map'):
             del self._name_map
@@ -196,7 +223,7 @@ class Options(object):
         return '<Options for %s>' % self.object_name
 
     def __str__(self):
-        return "%s.%s" % (smart_text(self.app_label), smart_text(self.module_name))
+        return "%s.%s" % (smart_text(self.app_label), smart_text(self.model_name))
 
     def verbose_name_raw(self):
         """
@@ -215,16 +242,30 @@ class Options(object):
         """
         Has this model been swapped out for another? If so, return the model
         name of the replacement; otherwise, return None.
+
+        For historical reasons, model name lookups using get_model() are
+        case insensitive, so we make sure we are case insensitive here.
         """
         if self.swappable:
-            model_label = '%s.%s' % (self.app_label, self.object_name)
+            model_label = '%s.%s' % (self.app_label, self.model_name)
             swapped_for = getattr(settings, self.swappable, None)
-            if swapped_for not in (None, model_label):
-                return swapped_for
+            if swapped_for:
+                try:
+                    swapped_label, swapped_object = swapped_for.split('.')
+                except ValueError:
+                    # setting not in the format app_label.model_name
+                    # raising ImproperlyConfigured here causes problems with
+                    # test cleanup code - instead it is raised in get_user_model
+                    # or as part of validation.
+                    return swapped_for
+
+                if '%s.%s' % (swapped_label, swapped_object.lower()) not in (None, model_label):
+                    return swapped_for
         return None
     swapped = property(_swapped)
 
-    def _fields(self):
+    @cached_property
+    def fields(self):
         """
         The getter for self.fields. This returns the list of field objects
         available to this model (including through parent models).
@@ -237,7 +278,14 @@ class Options(object):
         except AttributeError:
             self._fill_fields_cache()
         return self._field_name_cache
-    fields = property(_fields)
+
+    @cached_property
+    def concrete_fields(self):
+        return [f for f in self.fields if f.column is not None]
+
+    @cached_property
+    def local_concrete_fields(self):
+        return [f for f in self.local_fields if f.column is not None]
 
     def get_fields_with_model(self):
         """
@@ -251,6 +299,10 @@ class Options(object):
             self._fill_fields_cache()
         return self._field_cache
 
+    def get_concrete_fields_with_model(self):
+        return [(field, model) for field, model in self.get_fields_with_model() if
+                field.column is not None]
+
     def _fill_fields_cache(self):
         cache = []
         for parent in self.parents:
@@ -356,18 +408,21 @@ class Options(object):
             cache[f.name] = (f, model, True, True)
         for f, model in self.get_fields_with_model():
             cache[f.name] = (f, model, True, False)
+        for f in self.virtual_fields:
+            if hasattr(f, 'related'):
+                cache[f.name] = (f.related, None if f.model == self.model else f.model, True, False)
         if app_cache_ready():
             self._name_map = cache
         return cache
 
     def get_add_permission(self):
-        return 'add_%s' % self.object_name.lower()
+        return 'add_%s' % self.model_name
 
     def get_change_permission(self):
-        return 'change_%s' % self.object_name.lower()
+        return 'change_%s' % self.model_name
 
     def get_delete_permission(self):
-        return 'delete_%s' % self.object_name.lower()
+        return 'delete_%s' % self.model_name
 
     def get_all_related_objects(self, local_only=False, include_hidden=False,
                                 include_proxy_eq=False):
@@ -411,12 +466,12 @@ class Options(object):
         for klass in get_models(include_auto_created=True, only_installed=False):
             if not klass._meta.swapped:
                 for f in klass._meta.local_fields:
-                    if f.rel and not isinstance(f.rel.to, six.string_types):
+                    if f.rel and not isinstance(f.rel.to, six.string_types) and f.generate_reverse_relation:
                         if self == f.rel.to._meta:
-                            cache[RelatedObject(f.rel.to, klass, f)] = None
-                            proxy_cache[RelatedObject(f.rel.to, klass, f)] = None
+                            cache[f.related] = None
+                            proxy_cache[f.related] = None
                         elif self.concrete_model == f.rel.to._meta.concrete_model:
-                            proxy_cache[RelatedObject(f.rel.to, klass, f)] = None
+                            proxy_cache[f.related] = None
         self._related_objects_cache = cache
         self._related_objects_proxy_cache = proxy_cache
 
@@ -457,7 +512,7 @@ class Options(object):
                     if (f.rel
                             and not isinstance(f.rel.to, six.string_types)
                             and self == f.rel.to._meta):
-                        cache[RelatedObject(f.rel.to, klass, f)] = None
+                        cache[f.related] = None
         if app_cache_ready():
             self._related_many_to_many_cache = cache
         return cache
diff --git a/django/db/models/query.py b/django/db/models/query.py
index f56d5d2842..c36d81cc31 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -7,6 +7,7 @@ import itertools
 import sys
 import warnings
 
+from django.conf import settings
 from django.core import exceptions
 from django.db import connections, router, transaction, IntegrityError
 from django.db.models.constants import LOOKUP_SEP
@@ -17,6 +18,7 @@ from django.db.models.deletion import Collector
 from django.db.models import sql
 from django.utils.functional import partition
 from django.utils import six
+from django.utils import timezone
 
 # Used to control how many objects are worked with at once in some cases (e.g.
 # when deleting objects).
@@ -29,13 +31,13 @@ REPR_OUTPUT_SIZE = 20
 # Pull into this namespace for backwards compatibility.
 EmptyResultSet = sql.EmptyResultSet
 
+
 class QuerySet(object):
     """
     Represents a lazy database lookup for a set of objects.
     """
     def __init__(self, model=None, query=None, using=None):
         self.model = model
-        # EmptyQuerySet instantiates QuerySet with model as None
         self._db = using
         self.query = query or sql.Query(self.model)
         self._result_cache = None
@@ -44,7 +46,7 @@ class QuerySet(object):
         self._for_write = False
         self._prefetch_related_lookups = []
         self._prefetch_done = False
-        self._known_related_object = None       # (attname, rel_obj)
+        self._known_related_objects = {}        # {rel_field, {pk: rel_obj}}
 
     ########################
     # PYTHON MAGIC METHODS #
@@ -209,26 +211,30 @@ class QuerySet(object):
                 stop = None
             qs.query.set_limits(start, stop)
             return k.step and list(qs)[::k.step] or qs
-        try:
-            qs = self._clone()
-            qs.query.set_limits(k, k + 1)
-            return list(qs)[0]
-        except self.model.DoesNotExist as e:
-            raise IndexError(e.args)
+
+        qs = self._clone()
+        qs.query.set_limits(k, k + 1)
+        return list(qs)[0]
 
     def __and__(self, other):
         self._merge_sanity_check(other)
         if isinstance(other, EmptyQuerySet):
-            return other._clone()
+            return other
+        if isinstance(self, EmptyQuerySet):
+            return self
         combined = self._clone()
+        combined._merge_known_related_objects(other)
         combined.query.combine(other.query, sql.AND)
         return combined
 
     def __or__(self, other):
         self._merge_sanity_check(other)
-        combined = self._clone()
+        if isinstance(self, EmptyQuerySet):
+            return other
         if isinstance(other, EmptyQuerySet):
-            return combined
+            return self
+        combined = self._clone()
+        combined._merge_known_related_objects(other)
         combined.query.combine(other.query, sql.OR)
         return combined
 
@@ -255,13 +261,13 @@ class QuerySet(object):
 
         only_load = self.query.get_loaded_field_names()
         if not fill_cache:
-            fields = self.model._meta.fields
+            fields = self.model._meta.concrete_fields
 
         load_fields = []
         # If only/defer clauses have been specified,
         # build the list of fields that are to be loaded.
         if only_load:
-            for field, model in self.model._meta.get_fields_with_model():
+            for field, model in self.model._meta.get_concrete_fields_with_model():
                 if model is None:
                     model = self.model
                 try:
@@ -274,7 +280,7 @@ class QuerySet(object):
                     load_fields.append(field.name)
 
         index_start = len(extra_select)
-        aggregate_start = index_start + len(load_fields or self.model._meta.fields)
+        aggregate_start = index_start + len(load_fields or self.model._meta.concrete_fields)
 
         skip = None
         if load_fields and not fill_cache:
@@ -289,10 +295,9 @@ class QuerySet(object):
                     init_list.append(field.attname)
             model_cls = deferred_class_factory(self.model, skip)
 
-        # Cache db, model and known_related_object outside the loop
+        # Cache db and model outside the loop
         db = self.db
         model = self.model
-        kro_attname, kro_instance = self._known_related_object or (None, None)
         compiler = self.query.get_compiler(using=db)
         if fill_cache:
             klass_info = get_klass_info(model, max_depth=max_depth,
@@ -307,7 +312,11 @@ class QuerySet(object):
                 if skip:
                     obj = model_cls(**dict(zip(init_list, row_data)))
                 else:
-                    obj = model(*row_data)
+                    try:
+                        obj = model(*row_data)
+                    except IndexError:
+                        import ipdb; ipdb.set_trace()
+                        pass
 
                 # Store the source database of the object
                 obj._state.db = db
@@ -323,9 +332,16 @@ class QuerySet(object):
                 for i, aggregate in enumerate(aggregate_select):
                     setattr(obj, aggregate, row[i + aggregate_start])
 
-            # Add the known related object to the model, if there is one
-            if kro_instance:
-                setattr(obj, kro_attname, kro_instance)
+            # Add the known related objects to the model, if there are any
+            if self._known_related_objects:
+                for field, rel_objs in self._known_related_objects.items():
+                    pk = getattr(obj, field.get_attname())
+                    try:
+                        rel_obj = rel_objs[pk]
+                    except KeyError:
+                        pass               # may happen in qs1 | qs2 scenarios
+                    else:
+                        setattr(obj, field.name, rel_obj)
 
             yield obj
 
@@ -418,12 +434,7 @@ class QuerySet(object):
         self._for_write = True
         connection = connections[self.db]
         fields = self.model._meta.local_fields
-        if not transaction.is_managed(using=self.db):
-            transaction.enter_transaction_management(using=self.db)
-            forced_managed = True
-        else:
-            forced_managed = False
-        try:
+        with transaction.commit_on_success_unless_managed(using=self.db):
             if (connection.features.can_combine_inserts_with_and_without_auto_increment_pk
                 and self.model._meta.has_auto_field):
                 self._batched_insert(objs, fields, batch_size)
@@ -434,13 +445,6 @@ class QuerySet(object):
                 if objs_without_pk:
                     fields= [f for f in fields if not isinstance(f, AutoField)]
                     self._batched_insert(objs_without_pk, fields, batch_size)
-            if forced_managed:
-                transaction.commit(using=self.db)
-            else:
-                transaction.commit_unless_managed(using=self.db)
-        finally:
-            if forced_managed:
-                transaction.leave_transaction_management(using=self.db)
 
         return objs
 
@@ -462,14 +466,14 @@ class QuerySet(object):
             return self.get(**lookup), False
         except self.model.DoesNotExist:
             try:
-                params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
+                params = dict((k, v) for k, v in kwargs.items() if LOOKUP_SEP not in k)
                 params.update(defaults)
                 obj = self.model(**params)
                 sid = transaction.savepoint(using=self.db)
                 obj.save(force_insert=True, using=self.db)
                 transaction.savepoint_commit(sid, using=self.db)
                 return obj, True
-            except IntegrityError as e:
+            except IntegrityError:
                 transaction.savepoint_rollback(sid, using=self.db)
                 exc_info = sys.exc_info()
                 try:
@@ -478,21 +482,28 @@ class QuerySet(object):
                     # Re-raise the IntegrityError with its original traceback.
                     six.reraise(*exc_info)
 
-    def latest(self, field_name=None):
+    def _earliest_or_latest(self, field_name=None, direction="-"):
         """
-        Returns the latest object, according to the model's 'get_latest_by'
-        option or optional given field_name.
+        Returns the latest object, according to the model's
+        'get_latest_by' option or optional given field_name.
         """
-        latest_by = field_name or self.model._meta.get_latest_by
-        assert bool(latest_by), "latest() requires either a field_name parameter or 'get_latest_by' in the model"
+        order_by = field_name or getattr(self.model._meta, 'get_latest_by')
+        assert bool(order_by), "earliest() and latest() require either a "\
+            "field_name parameter or 'get_latest_by' in the model"
         assert self.query.can_filter(), \
-                "Cannot change a query once a slice has been taken."
+            "Cannot change a query once a slice has been taken."
         obj = self._clone()
         obj.query.set_limits(high=1)
-        obj.query.clear_ordering()
-        obj.query.add_ordering('-%s' % latest_by)
+        obj.query.clear_ordering(force_empty=True)
+        obj.query.add_ordering('%s%s' % (direction, order_by))
         return obj.get()
 
+    def earliest(self, field_name=None):
+        return self._earliest_or_latest(field_name=field_name, direction="")
+
+    def latest(self, field_name=None):
+        return self._earliest_or_latest(field_name=field_name, direction="-")
+
     def in_bulk(self, id_list):
         """
         Returns a dictionary mapping each of the given IDs to the object with
@@ -522,7 +533,7 @@ class QuerySet(object):
         # Disable non-supported fields.
         del_query.query.select_for_update = False
         del_query.query.select_related = False
-        del_query.query.clear_ordering()
+        del_query.query.clear_ordering(force_empty=True)
 
         collector = Collector(using=del_query.db)
         collector.collect(del_query)
@@ -550,20 +561,8 @@ class QuerySet(object):
         self._for_write = True
         query = self.query.clone(sql.UpdateQuery)
         query.add_update_values(kwargs)
-        if not transaction.is_managed(using=self.db):
-            transaction.enter_transaction_management(using=self.db)
-            forced_managed = True
-        else:
-            forced_managed = False
-        try:
+        with transaction.commit_on_success_unless_managed(using=self.db):
             rows = query.get_compiler(self.db).execute_sql(None)
-            if forced_managed:
-                transaction.commit(using=self.db)
-            else:
-                transaction.commit_unless_managed(using=self.db)
-        finally:
-            if forced_managed:
-                transaction.leave_transaction_management(using=self.db)
         self._result_cache = None
         return rows
     update.alters_data = True
@@ -612,21 +611,40 @@ class QuerySet(object):
 
     def dates(self, field_name, kind, order='ASC'):
         """
-        Returns a list of datetime objects representing all available dates for
+        Returns a list of date objects representing all available dates for
         the given field_name, scoped to 'kind'.
         """
-        assert kind in ("month", "year", "day"), \
+        assert kind in ("year", "month", "day"), \
                 "'kind' must be one of 'year', 'month' or 'day'."
         assert order in ('ASC', 'DESC'), \
                 "'order' must be either 'ASC' or 'DESC'."
         return self._clone(klass=DateQuerySet, setup=True,
                 _field_name=field_name, _kind=kind, _order=order)
 
+    def datetimes(self, field_name, kind, order='ASC', tzinfo=None):
+        """
+        Returns a list of datetime objects representing all available
+        datetimes for the given field_name, scoped to 'kind'.
+        """
+        assert kind in ("year", "month", "day", "hour", "minute", "second"), \
+                "'kind' must be one of 'year', 'month', 'day', 'hour', 'minute' or 'second'."
+        assert order in ('ASC', 'DESC'), \
+                "'order' must be either 'ASC' or 'DESC'."
+        if settings.USE_TZ:
+            if tzinfo is None:
+                tzinfo = timezone.get_current_timezone()
+        else:
+            tzinfo = None
+        return self._clone(klass=DateTimeQuerySet, setup=True,
+                _field_name=field_name, _kind=kind, _order=order, _tzinfo=tzinfo)
+
     def none(self):
         """
         Returns an empty QuerySet.
         """
-        return self._clone(klass=EmptyQuerySet)
+        clone = self._clone()
+        clone.query.set_empty()
+        return clone
 
     ##################################################################
     # PUBLIC METHODS THAT ALTER ATTRIBUTES AND RETURN A NEW QUERYSET #
@@ -703,7 +721,7 @@ class QuerySet(object):
         """
         if 'depth' in kwargs:
             warnings.warn('The "depth" keyword argument has been deprecated.\n'
-                    'Use related field names instead.', PendingDeprecationWarning)
+                    'Use related field names instead.', DeprecationWarning, stacklevel=2)
         depth = kwargs.pop('depth', 0)
         if kwargs:
             raise TypeError('Unexpected keyword arguments to select_related: %s'
@@ -736,13 +754,6 @@ class QuerySet(object):
             clone._prefetch_related_lookups.extend(lookups)
         return clone
 
-    def dup_select_related(self, other):
-        """
-        Copies the related selection status from the QuerySet 'other' to the
-        current QuerySet.
-        """
-        self.query.select_related = other.query.select_related
-
     def annotate(self, *args, **kwargs):
         """
         Return a query set in which the returned objects have been annotated
@@ -781,7 +792,7 @@ class QuerySet(object):
         assert self.query.can_filter(), \
                 "Cannot reorder a query once a slice has been taken."
         obj = self._clone()
-        obj.query.clear_ordering()
+        obj.query.clear_ordering(force_empty=False)
         obj.query.add_ordering(*field_names)
         return obj
 
@@ -902,7 +913,7 @@ class QuerySet(object):
         c = klass(model=self.model, query=query, using=self._db)
         c._for_write = self._for_write
         c._prefetch_related_lookups = self._prefetch_related_lookups[:]
-        c._known_related_object = self._known_related_object
+        c._known_related_objects = self._known_related_objects
         c.__dict__.update(kwargs)
         if setup and hasattr(c, '_setup_query'):
             c._setup_query()
@@ -942,13 +953,20 @@ class QuerySet(object):
         """
         pass
 
+    def _merge_known_related_objects(self, other):
+        """
+        Keep track of all known related objects from either QuerySet instance.
+        """
+        for field, objects in other._known_related_objects.items():
+            self._known_related_objects.setdefault(field, {}).update(objects)
+
     def _setup_aggregate_query(self, aggregates):
         """
         Prepare the query for computing a result that contains aggregate annotations.
         """
         opts = self.model._meta
         if self.query.group_by is None:
-            field_names = [f.attname for f in opts.fields]
+            field_names = [f.attname for f in opts.concrete_fields]
             self.query.add_fields(field_names, False)
             self.query.set_group_by()
 
@@ -968,6 +986,18 @@ class QuerySet(object):
     # empty" result.
     value_annotation = True
 
+class InstanceCheckMeta(type):
+    def __instancecheck__(self, instance):
+        return instance.query.is_empty()
+
+class EmptyQuerySet(six.with_metaclass(InstanceCheckMeta)):
+    """
+    Marker class usable for checking if a queryset is empty by .none():
+        isinstance(qs.none(), EmptyQuerySet) -> True
+    """
+
+    def __init__(self, *args, **kwargs):
+        raise TypeError("EmptyQuerySet can't be instantiated")
 
 class ValuesQuerySet(QuerySet):
     def __init__(self, *args, **kwargs):
@@ -1029,7 +1059,7 @@ class ValuesQuerySet(QuerySet):
         else:
             # Default to all fields.
             self.extra_names = None
-            self.field_names = [f.attname for f in self.model._meta.fields]
+            self.field_names = [f.attname for f in self.model._meta.concrete_fields]
             self.aggregate_names = None
 
         self.query.select = []
@@ -1156,7 +1186,7 @@ class DateQuerySet(QuerySet):
         self.query.clear_deferred_loading()
         self.query = self.query.clone(klass=sql.DateQuery, setup=True)
         self.query.select = []
-        self.query.add_date_select(self._field_name, self._kind, self._order)
+        self.query.add_select(self._field_name, self._kind, self._order)
 
     def _clone(self, klass=None, setup=False, **kwargs):
         c = super(DateQuerySet, self)._clone(klass, False, **kwargs)
@@ -1167,137 +1197,31 @@ class DateQuerySet(QuerySet):
         return c
 
 
-class EmptyQuerySet(QuerySet):
-    def __init__(self, model=None, query=None, using=None):
-        super(EmptyQuerySet, self).__init__(model, query, using)
-        self._result_cache = []
+class DateTimeQuerySet(QuerySet):
+    def iterator(self):
+        return self.query.get_compiler(self.db).results_iter()
 
-    def __and__(self, other):
-        return self._clone()
+    def _setup_query(self):
+        """
+        Sets up any special features of the query attribute.
 
-    def __or__(self, other):
-        return other._clone()
-
-    def count(self):
-        return 0
-
-    def delete(self):
-        pass
+        Called by the _clone() method after initializing the rest of the
+        instance.
+        """
+        self.query.clear_deferred_loading()
+        self.query = self.query.clone(klass=sql.DateTimeQuery, setup=True, tzinfo=self._tzinfo)
+        self.query.select = []
+        self.query.add_select(self._field_name, self._kind, self._order)
 
     def _clone(self, klass=None, setup=False, **kwargs):
-        c = super(EmptyQuerySet, self)._clone(klass, setup=setup, **kwargs)
-        c._result_cache = []
+        c = super(DateTimeQuerySet, self)._clone(klass, False, **kwargs)
+        c._field_name = self._field_name
+        c._kind = self._kind
+        c._tzinfo = self._tzinfo
+        if setup and hasattr(c, '_setup_query'):
+            c._setup_query()
         return c
 
-    def iterator(self):
-        # This slightly odd construction is because we need an empty generator
-        # (it raises StopIteration immediately).
-        yield next(iter([]))
-
-    def all(self):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def filter(self, *args, **kwargs):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def exclude(self, *args, **kwargs):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def complex_filter(self, filter_obj):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def select_related(self, *fields, **kwargs):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def annotate(self, *args, **kwargs):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def order_by(self, *field_names):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def distinct(self, fields=None):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def extra(self, select=None, where=None, params=None, tables=None,
-              order_by=None, select_params=None):
-        """
-        Always returns EmptyQuerySet.
-        """
-        assert self.query.can_filter(), \
-                "Cannot change a query once a slice has been taken"
-        return self
-
-    def reverse(self):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def defer(self, *fields):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def only(self, *fields):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def update(self, **kwargs):
-        """
-        Don't update anything.
-        """
-        return 0
-
-    def aggregate(self, *args, **kwargs):
-        """
-        Return a dict mapping the aggregate names to None
-        """
-        for arg in args:
-            kwargs[arg.default_alias] = arg
-        return dict([(key, None) for key in kwargs])
-
-    def values(self, *fields):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    def values_list(self, *fields, **kwargs):
-        """
-        Always returns EmptyQuerySet.
-        """
-        return self
-
-    # EmptyQuerySet is always an empty result in where-clauses (and similar
-    # situations).
-    value_annotation = False
 
 def get_klass_info(klass, max_depth=0, cur_depth=0, requested=None,
                    only_load=None, from_parent=None):
@@ -1346,7 +1270,7 @@ def get_klass_info(klass, max_depth=0, cur_depth=0, requested=None,
         skip = set()
         init_list = []
         # Build the list of fields that *haven't* been requested
-        for field, model in klass._meta.get_fields_with_model():
+        for field, model in klass._meta.get_concrete_fields_with_model():
             if field.name not in load_fields:
                 skip.add(field.attname)
             elif from_parent and issubclass(from_parent, model.__class__):
@@ -1365,22 +1289,22 @@ def get_klass_info(klass, max_depth=0, cur_depth=0, requested=None,
     else:
         # Load all fields on klass
 
-        field_count = len(klass._meta.fields)
+        field_count = len(klass._meta.concrete_fields)
         # Check if we need to skip some parent fields.
-        if from_parent and len(klass._meta.local_fields) != len(klass._meta.fields):
+        if from_parent and len(klass._meta.local_concrete_fields) != len(klass._meta.concrete_fields):
             # Only load those fields which haven't been already loaded into
             # 'from_parent'.
             non_seen_models = [p for p in klass._meta.get_parent_list()
                                if not issubclass(from_parent, p)]
             # Load local fields, too...
             non_seen_models.append(klass)
-            field_names = [f.attname for f in klass._meta.fields
+            field_names = [f.attname for f in klass._meta.concrete_fields
                            if f.model in non_seen_models]
             field_count = len(field_names)
         # Try to avoid populating field_names variable for perfomance reasons.
         # If field_names variable is set, we use **kwargs based model init
         # which is slower than normal init.
-        if field_count == len(klass._meta.fields):
+        if field_count == len(klass._meta.concrete_fields):
             field_names = ()
 
     restricted = requested is not None
@@ -1688,7 +1612,7 @@ def prefetch_related_objects(result_cache, related_lookups):
             continue
         done_lookups.add(lookup)
 
-        # Top level, the list of objects to decorate is the the result cache
+        # Top level, the list of objects to decorate is the result cache
         # from the primary QuerySet. It won't be for deeper levels.
         obj_list = result_cache
 
@@ -1777,9 +1701,9 @@ def prefetch_related_objects(result_cache, related_lookups):
 def get_prefetcher(instance, attr):
     """
     For the attribute 'attr' on the given instance, finds
-    an object that has a get_prefetch_query_set().
+    an object that has a get_prefetch_queryset().
     Returns a 4 tuple containing:
-    (the object with get_prefetch_query_set (or None),
+    (the object with get_prefetch_queryset (or None),
      the descriptor object representing this relationship (or None),
      a boolean that is False if the attribute was not found at all,
      a boolean that is True if the attribute has already been fetched)
@@ -1802,8 +1726,8 @@ def get_prefetcher(instance, attr):
         attr_found = True
         if rel_obj_descriptor:
             # singly related object, descriptor object has the
-            # get_prefetch_query_set() method.
-            if hasattr(rel_obj_descriptor, 'get_prefetch_query_set'):
+            # get_prefetch_queryset() method.
+            if hasattr(rel_obj_descriptor, 'get_prefetch_queryset'):
                 prefetcher = rel_obj_descriptor
                 if rel_obj_descriptor.is_cached(instance):
                     is_fetched = True
@@ -1812,7 +1736,7 @@ def get_prefetcher(instance, attr):
                 # the attribute on the instance rather than the class to
                 # support many related managers
                 rel_obj = getattr(instance, attr)
-                if hasattr(rel_obj, 'get_prefetch_query_set'):
+                if hasattr(rel_obj, 'get_prefetch_queryset'):
                     prefetcher = rel_obj
     return prefetcher, rel_obj_descriptor, attr_found, is_fetched
 
@@ -1828,7 +1752,7 @@ def prefetch_one_level(instances, prefetcher, attname):
     prefetches that must be done due to prefetch_related lookups
     found from default managers.
     """
-    # prefetcher must have a method get_prefetch_query_set() which takes a list
+    # prefetcher must have a method get_prefetch_queryset() which takes a list
     # of instances, and returns a tuple:
 
     # (queryset of instances of self.model that are related to passed in instances,
@@ -1841,7 +1765,7 @@ def prefetch_one_level(instances, prefetcher, attname):
     # in a dictionary.
 
     rel_qs, rel_obj_attr, instance_attr, single, cache_name =\
-        prefetcher.get_prefetch_query_set(instances)
+        prefetcher.get_prefetch_queryset(instances)
     # We have to handle the possibility that the default manager itself added
     # prefetch_related lookups to the QuerySet we just got back. We don't want to
     # trigger the prefetch_related functionality by evaluating the query.
diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py
index c1a690a524..a33c44833c 100644
--- a/django/db/models/query_utils.py
+++ b/django/db/models/query_utils.py
@@ -25,7 +25,7 @@ class QueryWrapper(object):
     parameters. Can be used to pass opaque data to a where-clause, for example.
     """
     def __init__(self, sql, params):
-        self.data = sql, params
+        self.data = sql, list(params)
 
     def as_sql(self, qn=None, connection=None):
         return self.data
@@ -47,6 +47,7 @@ class Q(tree.Node):
         if not isinstance(other, Q):
             raise TypeError(other)
         obj = type(self)()
+        obj.connector = conn
         obj.add(self, conn)
         obj.add(other, conn)
         return obj
@@ -63,6 +64,16 @@ class Q(tree.Node):
         obj.negate()
         return obj
 
+    def clone(self):
+        clone = self.__class__._new_instance(
+            children=[], connector=self.connector, negated=self.negated)
+        for child in self.children:
+            if hasattr(child, 'clone'):
+                clone.children.append(child.clone())
+            else:
+                clone.children.append(child)
+        return clone
+
 class DeferredAttribute(object):
     """
     A wrapper for a deferred-loading field. When the value is read from this
diff --git a/django/db/models/related.py b/django/db/models/related.py
index a0dcec7132..6c93076c48 100644
--- a/django/db/models/related.py
+++ b/django/db/models/related.py
@@ -1,16 +1,14 @@
+from collections import namedtuple
+
 from django.utils.encoding import smart_text
 from django.db.models.fields import BLANK_CHOICE_DASH
 
-class BoundRelatedObject(object):
-    def __init__(self, related_object, field_mapping, original):
-        self.relation = related_object
-        self.field_mappings = field_mapping[related_object.name]
-
-    def template_name(self):
-        raise NotImplementedError
-
-    def __repr__(self):
-        return repr(self.__dict__)
+# PathInfo is used when converting lookups (fk__somecol). The contents
+# describe the relation in Model terms (model Options and Fields for both
+# sides of the relation. The join_field is the field backing the relation.
+PathInfo = namedtuple('PathInfo',
+                      'from_opts to_opts target_fields join_field '
+                      'm2m direct')
 
 class RelatedObject(object):
     def __init__(self, parent_model, model, field):
@@ -18,8 +16,8 @@ class RelatedObject(object):
         self.model = model
         self.opts = model._meta
         self.field = field
-        self.name = '%s:%s' % (self.opts.app_label, self.opts.module_name)
-        self.var_name = self.opts.object_name.lower()
+        self.name = '%s:%s' % (self.opts.app_label, self.opts.model_name)
+        self.var_name = self.opts.model_name
 
     def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH,
                     limit_to_currently_related=False):
@@ -33,7 +31,7 @@ class RelatedObject(object):
         queryset = self.model._default_manager.all()
         if limit_to_currently_related:
             queryset = queryset.complex_filter(
-                {'%s__isnull' % self.parent_model._meta.module_name: False})
+                {'%s__isnull' % self.parent_model._meta.model_name: False})
         lst = [(x._get_pk_val(), smart_text(x)) for x in queryset]
         return first_choice + lst
 
@@ -49,9 +47,6 @@ class RelatedObject(object):
     def __repr__(self):
         return "<RelatedObject: %s related to %s>" % (self.name, self.field.name)
 
-    def bind(self, field_mapping, original, bound_related_object_class=BoundRelatedObject):
-        return bound_related_object_class(self, field_mapping, original)
-
     def get_accessor_name(self):
         # This method encapsulates the logic that decides what name to give an
         # accessor descriptor that retrieves related many-to-one or
@@ -61,9 +56,12 @@ class RelatedObject(object):
             # If this is a symmetrical m2m relation on self, there is no reverse accessor.
             if getattr(self.field.rel, 'symmetrical', False) and self.model == self.parent_model:
                 return None
-            return self.field.rel.related_name or (self.opts.object_name.lower() + '_set')
+            return self.field.rel.related_name or (self.opts.model_name + '_set')
         else:
-            return self.field.rel.related_name or (self.opts.object_name.lower())
+            return self.field.rel.related_name or (self.opts.model_name)
 
     def get_cache_name(self):
         return "_%s_cache" % self.get_accessor_name()
+
+    def get_path_info(self):
+        return self.field.get_reverse_path_info()
diff --git a/django/db/models/signals.py b/django/db/models/signals.py
index 2ef54a7ca7..09f93d0f77 100644
--- a/django/db/models/signals.py
+++ b/django/db/models/signals.py
@@ -12,6 +12,6 @@ post_save = Signal(providing_args=["instance", "raw", "created", "using", "updat
 pre_delete = Signal(providing_args=["instance", "using"], use_caching=True)
 post_delete = Signal(providing_args=["instance", "using"], use_caching=True)
 
-post_syncdb = Signal(providing_args=["class", "app", "created_models", "verbosity", "interactive"], use_caching=True)
+post_syncdb = Signal(providing_args=["class", "app", "created_models", "verbosity", "interactive", "db"], use_caching=True)
 
 m2m_changed = Signal(providing_args=["action", "instance", "reverse", "model", "pk_set", "using"], use_caching=True)
diff --git a/django/db/models/sql/aggregates.py b/django/db/models/sql/aggregates.py
index b41314a686..1b65847b7f 100644
--- a/django/db/models/sql/aggregates.py
+++ b/django/db/models/sql/aggregates.py
@@ -1,6 +1,7 @@
 """
 Classes to represent the default SQL aggregate functions
 """
+import copy
 
 from django.db.models.fields import IntegerField, FloatField
 
@@ -62,27 +63,30 @@ class Aggregate(object):
 
         self.field = tmp
 
-    def relabel_aliases(self, change_map):
+    def relabeled_clone(self, change_map):
+        clone = copy.copy(self)
         if isinstance(self.col, (list, tuple)):
-            self.col = (change_map.get(self.col[0], self.col[0]), self.col[1])
+            clone.col = (change_map.get(self.col[0], self.col[0]), self.col[1])
+        return clone
 
     def as_sql(self, qn, connection):
-        "Return the aggregate, rendered as SQL."
+        "Return the aggregate, rendered as SQL with parameters."
+        params = []
 
         if hasattr(self.col, 'as_sql'):
-            field_name = self.col.as_sql(qn, connection)
+            field_name, params = self.col.as_sql(qn, connection)
         elif isinstance(self.col, (list, tuple)):
             field_name = '.'.join([qn(c) for c in self.col])
         else:
             field_name = self.col
 
-        params = {
+        substitutions = {
             'function': self.sql_function,
             'field': field_name
         }
-        params.update(self.extra)
+        substitutions.update(self.extra)
 
-        return self.sql_template % params
+        return self.sql_template % substitutions, params
 
 
 class Avg(Aggregate):
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 4d846fb438..3444b74ac3 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -1,17 +1,19 @@
-from django.utils.six.moves import zip
+import datetime
 
+from django.conf import settings
 from django.core.exceptions import FieldError
-from django.db import transaction
 from django.db.backends.util import truncate_name
 from django.db.models.constants import LOOKUP_SEP
-from django.db.models.query_utils import select_related_descend
+from django.db.models.query_utils import select_related_descend, QueryWrapper
 from django.db.models.sql.constants import (SINGLE, MULTI, ORDER_DIR,
-        GET_ITERATOR_CHUNK_SIZE, REUSE_ALL, SelectInfo)
+        GET_ITERATOR_CHUNK_SIZE, SelectInfo)
 from django.db.models.sql.datastructures import EmptyResultSet
 from django.db.models.sql.expressions import SQLEvaluator
 from django.db.models.sql.query import get_order_dir, Query
 from django.db.utils import DatabaseError
 from django.utils import six
+from django.utils.six.moves import zip
+from django.utils import timezone
 
 
 class SQLCompiler(object):
@@ -30,7 +32,7 @@ class SQLCompiler(object):
         # cleaned. We are not using a clone() of the query here.
         """
         if not self.query.tables:
-            self.query.join((None, self.query.model._meta.db_table, None, None))
+            self.query.join((None, self.query.model._meta.db_table, None))
         if (not self.query.select and self.query.default_cols and not
                 self.query.included_inherited_models):
             self.query.setup_inherited_models()
@@ -71,7 +73,7 @@ class SQLCompiler(object):
         # as the pre_sql_setup will modify query state in a way that forbids
         # another run of it.
         self.refcounts_before = self.query.alias_refcount.copy()
-        out_cols = self.get_columns(with_col_aliases)
+        out_cols, s_params = self.get_columns(with_col_aliases)
         ordering, ordering_group_by = self.get_ordering()
 
         distinct_fields = self.get_distinct()
@@ -84,6 +86,7 @@ class SQLCompiler(object):
 
         where, w_params = self.query.where.as_sql(qn=qn, connection=self.connection)
         having, h_params = self.query.having.as_sql(qn=qn, connection=self.connection)
+        having_group_by = self.query.having.get_cols()
         params = []
         for val in six.itervalues(self.query.extra_select):
             params.extend(val[1])
@@ -94,6 +97,7 @@ class SQLCompiler(object):
             result.append(self.connection.ops.distinct_sql(distinct_fields))
 
         result.append(', '.join(out_cols + self.query.ordering_aliases))
+        params.extend(s_params)
 
         result.append('FROM')
         result.extend(from_)
@@ -103,7 +107,7 @@ class SQLCompiler(object):
             result.append('WHERE %s' % where)
             params.extend(w_params)
 
-        grouping, gb_params = self.get_grouping(ordering_group_by)
+        grouping, gb_params = self.get_grouping(having_group_by, ordering_group_by)
         if grouping:
             if distinct_fields:
                 raise NotImplementedError(
@@ -161,9 +165,10 @@ class SQLCompiler(object):
 
     def get_columns(self, with_aliases=False):
         """
-        Returns the list of columns to use in the select statement. If no
-        columns have been specified, returns all columns relating to fields in
-        the model.
+        Returns the list of columns to use in the select statement, as well as
+        a list any extra parameters that need to be included. If no columns
+        have been specified, returns all columns relating to fields in the
+        model.
 
         If 'with_aliases' is true, any column names that are duplicated
         (without the table names) are given unique aliases. This is needed in
@@ -172,6 +177,7 @@ class SQLCompiler(object):
         qn = self.quote_name_unless_alias
         qn2 = self.connection.ops.quote_name
         result = ['(%s) AS %s' % (col[0], qn2(alias)) for alias, col in six.iteritems(self.query.extra_select)]
+        params = []
         aliases = set(self.query.extra_select.keys())
         if with_aliases:
             col_aliases = aliases.copy()
@@ -201,7 +207,9 @@ class SQLCompiler(object):
                         aliases.add(r)
                         col_aliases.add(col[1])
                 else:
-                    result.append(col.as_sql(qn, self.connection))
+                    col_sql, col_params = col.as_sql(qn, self.connection)
+                    result.append(col_sql)
+                    params.extend(col_params)
 
                     if hasattr(col, 'alias'):
                         aliases.add(col.alias)
@@ -214,15 +222,13 @@ class SQLCompiler(object):
             aliases.update(new_aliases)
 
         max_name_length = self.connection.ops.max_name_length()
-        result.extend([
-            '%s%s' % (
-                aggregate.as_sql(qn, self.connection),
-                alias is not None
-                    and ' AS %s' % qn(truncate_name(alias, max_name_length))
-                    or ''
-            )
-            for alias, aggregate in self.query.aggregate_select.items()
-        ])
+        for alias, aggregate in self.query.aggregate_select.items():
+            agg_sql, agg_params = aggregate.as_sql(qn, self.connection)
+            if alias is None:
+                result.append(agg_sql)
+            else:
+                result.append('%s AS %s' % (agg_sql, qn(truncate_name(alias, max_name_length))))
+            params.extend(agg_params)
 
         for (table, col), _ in self.query.related_select_cols:
             r = '%s.%s' % (qn(table), qn(col))
@@ -237,7 +243,7 @@ class SQLCompiler(object):
                 col_aliases.add(col)
 
         self._select_aliases = aliases
-        return result
+        return result, params
 
     def get_default_columns(self, with_aliases=False, col_aliases=None,
             start_alias=None, opts=None, as_pairs=False, from_parent=None):
@@ -255,33 +261,23 @@ class SQLCompiler(object):
         result = []
         if opts is None:
             opts = self.query.model._meta
-        # Skip all proxy to the root proxied model
-        opts = opts.concrete_model._meta
         qn = self.quote_name_unless_alias
         qn2 = self.connection.ops.quote_name
         aliases = set()
         only_load = self.deferred_to_columns()
+        if not start_alias:
+            start_alias = self.query.get_initial_alias()
+        # The 'seen_models' is used to optimize checking the needed parent
+        # alias for a given field. This also includes None -> start_alias to
+        # be used by local fields.
+        seen_models = {None: start_alias}
 
-        if start_alias:
-            seen = {None: start_alias}
-        for field, model in opts.get_fields_with_model():
+        for field, model in opts.get_concrete_fields_with_model():
             if from_parent and model is not None and issubclass(from_parent, model):
                 # Avoid loading data for already loaded parents.
                 continue
-            if start_alias:
-                try:
-                    alias = seen[model]
-                except KeyError:
-                    link_field = opts.get_ancestor_link(model)
-                    alias = self.query.join((start_alias, model._meta.db_table,
-                            link_field.column, model._meta.pk.column),
-                            join_field=link_field)
-                    seen[model] = alias
-            else:
-                # If we're starting from the base model of the queryset, the
-                # aliases will have already been set up in pre_sql_setup(), so
-                # we can save time here.
-                alias = self.query.included_inherited_models[model]
+            alias = self.query.join_parent_model(opts, model, start_alias,
+                                                 seen_models)
             table = self.query.alias_map[alias].table_name
             if table in only_load and field.column not in only_load[table]:
                 continue
@@ -317,9 +313,10 @@ class SQLCompiler(object):
 
         for name in self.query.distinct_fields:
             parts = name.split(LOOKUP_SEP)
-            field, col, alias, _, _ = self._setup_joins(parts, opts, None)
-            col, alias = self._final_join_removal(col, alias)
-            result.append("%s.%s" % (qn(alias), qn2(col)))
+            field, cols, alias, _, _ = self._setup_joins(parts, opts, None)
+            cols, alias = self._final_join_removal(cols, alias)
+            for col in cols:
+                result.append("%s.%s" % (qn(alias), qn2(col)))
         return result
 
 
@@ -390,15 +387,16 @@ class SQLCompiler(object):
             elif get_order_dir(field)[0] not in self.query.extra_select:
                 # 'col' is of the form 'field' or 'field1__field2' or
                 # '-field1__field2__field', etc.
-                for table, col, order in self.find_ordering_name(field,
+                for table, cols, order in self.find_ordering_name(field,
                         self.query.model._meta, default_order=asc):
-                    if (table, col) not in processed_pairs:
-                        elt = '%s.%s' % (qn(table), qn2(col))
-                        processed_pairs.add((table, col))
-                        if distinct and elt not in select_aliases:
-                            ordering_aliases.append(elt)
-                        result.append('%s %s' % (elt, order))
-                        group_by.append((elt, []))
+                    for col in cols:
+                        if (table, col) not in processed_pairs:
+                            elt = '%s.%s' % (qn(table), qn2(col))
+                            processed_pairs.add((table, col))
+                            if distinct and elt not in select_aliases:
+                                ordering_aliases.append(elt)
+                            result.append('%s %s' % (elt, order))
+                            group_by.append((elt, []))
             else:
                 elt = qn2(col)
                 if distinct and col not in select_aliases:
@@ -417,7 +415,7 @@ class SQLCompiler(object):
         """
         name, order = get_order_dir(name, default_order)
         pieces = name.split(LOOKUP_SEP)
-        field, col, alias, joins, opts = self._setup_joins(pieces, opts, alias)
+        field, cols, alias, joins, opts = self._setup_joins(pieces, opts, alias)
 
         # If we get to this point and the field is a relation to another model,
         # append the default ordering for that model.
@@ -435,8 +433,8 @@ class SQLCompiler(object):
                 results.extend(self.find_ordering_name(item, opts, alias,
                         order, already_seen))
             return results
-        col, alias = self._final_join_removal(col, alias)
-        return [(alias, col, order)]
+        cols, alias = self._final_join_removal(cols, alias)
+        return [(alias, cols, order)]
 
     def _setup_joins(self, pieces, opts, alias):
         """
@@ -449,13 +447,13 @@ class SQLCompiler(object):
         """
         if not alias:
             alias = self.query.get_initial_alias()
-        field, target, opts, joins, _ = self.query.setup_joins(
-            pieces, opts, alias, REUSE_ALL)
+        field, targets, opts, joins, _ = self.query.setup_joins(
+            pieces, opts, alias)
         # We will later on need to promote those joins that were added to the
         # query afresh above.
         joins_to_promote = [j for j in joins if self.query.alias_refcount[j] < 2]
         alias = joins[-1]
-        col = target.column
+        cols = [target.column for target in targets]
         if not field.rel:
             # To avoid inadvertent trimming of a necessary alias, use the
             # refcount to show that we are referencing a non-relation field on
@@ -466,9 +464,9 @@ class SQLCompiler(object):
         # Ordering or distinct must not affect the returned set, and INNER
         # JOINS for nullable fields could do this.
         self.query.promote_joins(joins_to_promote)
-        return field, col, alias, joins, opts
+        return field, cols, alias, joins, opts
 
-    def _final_join_removal(self, col, alias):
+    def _final_join_removal(self, cols, alias):
         """
         A helper method for get_distinct and get_ordering. This method will
         trim extra not-needed joins from the tail of the join chain.
@@ -480,12 +478,14 @@ class SQLCompiler(object):
         if alias:
             while 1:
                 join = self.query.alias_map[alias]
-                if col != join.rhs_join_col:
+                lhs_cols, rhs_cols = zip(*[(lhs_col, rhs_col) for lhs_col, rhs_col in join.join_cols])
+                if set(cols) != set(rhs_cols):
                     break
+
+                cols = [lhs_cols[rhs_cols.index(col)] for col in cols]
                 self.query.unref_alias(alias)
                 alias = join.lhs_alias
-                col = join.lhs_join_col
-        return col, alias
+        return cols, alias
 
     def get_from_clause(self):
         """
@@ -507,22 +507,30 @@ class SQLCompiler(object):
             if not self.query.alias_refcount[alias]:
                 continue
             try:
-                name, alias, join_type, lhs, lhs_col, col, _, join_field = self.query.alias_map[alias]
+                name, alias, join_type, lhs, join_cols, _, join_field = self.query.alias_map[alias]
             except KeyError:
                 # Extra tables can end up in self.tables, but not in the
                 # alias_map if they aren't in a join. That's OK. We skip them.
                 continue
             alias_str = (alias != name and ' %s' % alias or '')
             if join_type and not first:
-                if join_field and hasattr(join_field, 'get_extra_join_sql'):
-                    extra_cond, extra_params = join_field.get_extra_join_sql(
-                        self.connection, qn, lhs, alias)
+                extra_cond = join_field.get_extra_restriction(
+                    self.query.where_class, alias, lhs)
+                if extra_cond:
+                    extra_sql, extra_params = extra_cond.as_sql(
+                        qn, self.connection)
+                    extra_sql = 'AND (%s)' % extra_sql
                     from_params.extend(extra_params)
                 else:
-                    extra_cond = ""
-                result.append('%s %s%s ON (%s.%s = %s.%s%s)' %
-                              (join_type, qn(name), alias_str, qn(lhs),
-                               qn2(lhs_col), qn(alias), qn2(col), extra_cond))
+                    extra_sql = ""
+                result.append('%s %s%s ON ('
+                        % (join_type, qn(name), alias_str))
+                for index, (lhs_col, rhs_col) in enumerate(join_cols):
+                    if index != 0:
+                        result.append(' AND ')
+                    result.append('%s.%s = %s.%s' %
+                    (qn(lhs), qn2(lhs_col), qn(alias), qn2(rhs_col)))
+                result.append('%s)' % extra_sql)
             else:
                 connector = not first and ', ' or ''
                 result.append('%s%s%s' % (connector, qn(name), alias_str))
@@ -538,7 +546,7 @@ class SQLCompiler(object):
                 first = False
         return result, from_params
 
-    def get_grouping(self, ordering_group_by):
+    def get_grouping(self, having_group_by, ordering_group_by):
         """
         Returns a tuple representing the SQL elements in the "group by" clause.
         """
@@ -548,23 +556,25 @@ class SQLCompiler(object):
             select_cols = self.query.select + self.query.related_select_cols
             # Just the column, not the fields.
             select_cols = [s[0] for s in select_cols]
-            if (len(self.query.model._meta.fields) == len(self.query.select)
+            if (len(self.query.model._meta.concrete_fields) == len(self.query.select)
                     and self.connection.features.allows_group_by_pk):
                 self.query.group_by = [
                     (self.query.model._meta.db_table, self.query.model._meta.pk.column)
                 ]
                 select_cols = []
             seen = set()
-            cols = self.query.group_by + select_cols
+            cols = self.query.group_by + having_group_by + select_cols
             for col in cols:
+                col_params = ()
                 if isinstance(col, (list, tuple)):
                     sql = '%s.%s' % (qn(col[0]), qn(col[1]))
                 elif hasattr(col, 'as_sql'):
-                    sql = col.as_sql(qn, self.connection)
+                    sql, col_params = col.as_sql(qn, self.connection)
                 else:
                     sql = '(%s)' % str(col)
                 if sql not in seen:
                     result.append(sql)
+                    params.extend(col_params)
                     seen.add(sql)
 
             # Still, we need to add all stuff in ordering (except if the backend can
@@ -623,34 +633,14 @@ class SQLCompiler(object):
                 continue
             table = f.rel.to._meta.db_table
             promote = nullable or f.null
-            if model:
-                int_opts = opts
-                alias = root_alias
-                alias_chain = []
-                for int_model in opts.get_base_chain(model):
-                    # Proxy model have elements in base chain
-                    # with no parents, assign the new options
-                    # object and skip to the next base in that
-                    # case
-                    if not int_opts.parents[int_model]:
-                        int_opts = int_model._meta
-                        continue
-                    lhs_col = int_opts.parents[int_model].column
-                    int_opts = int_model._meta
-                    alias = self.query.join((alias, int_opts.db_table, lhs_col,
-                            int_opts.pk.column),
-                            promote=promote)
-                    alias_chain.append(alias)
-            else:
-                alias = root_alias
-
-            alias = self.query.join((alias, table, f.column,
-                    f.rel.get_related_field().column),
-                    promote=promote, join_field=f)
+            alias = self.query.join_parent_model(opts, model, root_alias, {})
+            join_cols = f.get_joining_columns()
+            alias = self.query.join((alias, table, join_cols),
+                    outer_if_first=promote, join_field=f)
             columns, aliases = self.get_default_columns(start_alias=alias,
                     opts=f.rel.to._meta, as_pairs=True)
             self.query.related_select_cols.extend(
-                SelectInfo(col, field) for col, field in zip(columns, f.rel.to._meta.fields))
+                SelectInfo(col, field) for col, field in zip(columns, f.rel.to._meta.concrete_fields))
             if restricted:
                 next = requested.get(f.name, {})
             else:
@@ -670,30 +660,11 @@ class SQLCompiler(object):
                                               only_load.get(model), reverse=True):
                     continue
 
+                alias = self.query.join_parent_model(opts, f.rel.to, root_alias, {})
                 table = model._meta.db_table
-                int_opts = opts
-                alias = root_alias
-                alias_chain = []
-                chain = opts.get_base_chain(f.rel.to)
-                if chain is not None:
-                    for int_model in chain:
-                        # Proxy model have elements in base chain
-                        # with no parents, assign the new options
-                        # object and skip to the next base in that
-                        # case
-                        if not int_opts.parents[int_model]:
-                            int_opts = int_model._meta
-                            continue
-                        lhs_col = int_opts.parents[int_model].column
-                        int_opts = int_model._meta
-                        alias = self.query.join(
-                            (alias, int_opts.db_table, lhs_col, int_opts.pk.column),
-                            promote=True,
-                        )
-                        alias_chain.append(alias)
                 alias = self.query.join(
-                    (alias, table, f.rel.get_related_field().column, f.column),
-                    promote=True, join_field=f
+                    (alias, table, f.get_joining_columns(reverse_join=True)),
+                    outer_if_first=True, join_field=f
                 )
                 from_parent = (opts.model if issubclass(model, opts.model)
                                else None)
@@ -701,7 +672,7 @@ class SQLCompiler(object):
                     opts=model._meta, as_pairs=True, from_parent=from_parent)
                 self.query.related_select_cols.extend(
                     SelectInfo(col, field) for col, field
-                    in zip(columns, model._meta.fields))
+                    in zip(columns, model._meta.concrete_fields))
                 next = requested.get(f.related_query_name(), {})
                 # Use True here because we are looking at the _reverse_ side of
                 # the relation, which is always nullable.
@@ -727,11 +698,6 @@ class SQLCompiler(object):
         resolve_columns = hasattr(self, 'resolve_columns')
         fields = None
         has_aggregate_select = bool(self.query.aggregate_select)
-        # Set transaction dirty if we're using SELECT FOR UPDATE to ensure
-        # a subsequent commit/rollback is executed, so any database locks
-        # are released.
-        if self.query.select_for_update and transaction.is_managed(self.using):
-            transaction.set_dirty(self.using)
         for rows in self.execute_sql(MULTI):
             for row in rows:
                 if resolve_columns:
@@ -750,7 +716,7 @@ class SQLCompiler(object):
                         if self.query.select:
                             fields = [f.field for f in self.query.select]
                         else:
-                            fields = self.query.model._meta.fields
+                            fields = self.query.model._meta.concrete_fields
                         fields = fields + [f.field for f in self.query.related_select_cols]
 
                         # If the field was deferred, exclude it from being passed
@@ -820,8 +786,29 @@ class SQLCompiler(object):
             return list(result)
         return result
 
+    def as_subquery_condition(self, alias, columns):
+        qn = self.quote_name_unless_alias
+        qn2 = self.connection.ops.quote_name
+        if len(columns) == 1:
+            sql, params = self.as_sql()
+            return '%s.%s IN (%s)' % (qn(alias), qn2(columns[0]), sql), params
+
+        for index, select_col in enumerate(self.query.select):
+            lhs = '%s.%s' % (qn(select_col.col[0]), qn2(select_col.col[1]))
+            rhs = '%s.%s' % (qn(alias), qn2(columns[index]))
+            self.query.where.add(
+                QueryWrapper('%s = %s' % (lhs, rhs), []), 'AND')
+
+        sql, params = self.as_sql()
+        return 'EXISTS (%s)' % sql, params
+
 
 class SQLInsertCompiler(SQLCompiler):
+
+    def __init__(self, *args, **kwargs):
+        self.return_id = False
+        super(SQLInsertCompiler, self).__init__(*args, **kwargs)
+
     def placeholder(self, field, val):
         if field is None:
             # A field value of None means the value is raw.
@@ -1041,17 +1028,44 @@ class SQLAggregateCompiler(SQLCompiler):
         if qn is None:
             qn = self.quote_name_unless_alias
 
-        sql = ('SELECT %s FROM (%s) subquery' % (
-            ', '.join([
-                aggregate.as_sql(qn, self.connection)
-                for aggregate in self.query.aggregate_select.values()
-            ]),
-            self.query.subquery)
-        )
-        params = self.query.sub_params
-        return (sql, params)
+        sql, params = [], []
+        for aggregate in self.query.aggregate_select.values():
+            agg_sql, agg_params = aggregate.as_sql(qn, self.connection)
+            sql.append(agg_sql)
+            params.extend(agg_params)
+        sql = ', '.join(sql)
+        params = tuple(params)
+
+        sql = 'SELECT %s FROM (%s) subquery' % (sql, self.query.subquery)
+        params = params + self.query.sub_params
+        return sql, params
 
 class SQLDateCompiler(SQLCompiler):
+    def results_iter(self):
+        """
+        Returns an iterator over the results from executing this query.
+        """
+        resolve_columns = hasattr(self, 'resolve_columns')
+        if resolve_columns:
+            from django.db.models.fields import DateField
+            fields = [DateField()]
+        else:
+            from django.db.backends.util import typecast_date
+            needs_string_cast = self.connection.features.needs_datetime_string_cast
+
+        offset = len(self.query.extra_select)
+        for rows in self.execute_sql(MULTI):
+            for row in rows:
+                date = row[offset]
+                if resolve_columns:
+                    date = self.resolve_columns(row, fields)[offset]
+                elif needs_string_cast:
+                    date = typecast_date(str(date))
+                if isinstance(date, datetime.datetime):
+                    date = date.date()
+                yield date
+
+class SQLDateTimeCompiler(SQLCompiler):
     def results_iter(self):
         """
         Returns an iterator over the results from executing this query.
@@ -1067,13 +1081,21 @@ class SQLDateCompiler(SQLCompiler):
         offset = len(self.query.extra_select)
         for rows in self.execute_sql(MULTI):
             for row in rows:
-                date = row[offset]
+                datetime = row[offset]
                 if resolve_columns:
-                    date = self.resolve_columns(row, fields)[offset]
+                    datetime = self.resolve_columns(row, fields)[offset]
                 elif needs_string_cast:
-                    date = typecast_timestamp(str(date))
-                yield date
-
+                    datetime = typecast_timestamp(str(datetime))
+                # Datetimes are artifically returned in UTC on databases that
+                # don't support time zone. Restore the zone used in the query.
+                if settings.USE_TZ:
+                    if datetime is None:
+                        raise ValueError("Database returned an invalid value "
+                                         "in QuerySet.dates(). Are time zone "
+                                         "definitions installed?")
+                    datetime = datetime.replace(tzinfo=None)
+                    datetime = timezone.make_aware(datetime, self.query.tzinfo)
+                yield datetime
 
 def order_modified_iter(cursor, trim, sentinel):
     """
diff --git a/django/db/models/sql/constants.py b/django/db/models/sql/constants.py
index 1c34f70169..904f7b2c8b 100644
--- a/django/db/models/sql/constants.py
+++ b/django/db/models/sql/constants.py
@@ -11,7 +11,8 @@ import re
 QUERY_TERMS = set([
     'exact', 'iexact', 'contains', 'icontains', 'gt', 'gte', 'lt', 'lte', 'in',
     'startswith', 'istartswith', 'endswith', 'iendswith', 'range', 'year',
-    'month', 'day', 'week_day', 'isnull', 'search', 'regex', 'iregex',
+    'month', 'day', 'week_day', 'hour', 'minute', 'second', 'isnull', 'search',
+    'regex', 'iregex',
 ])
 
 # Size of each "chunk" for get_iterator calls.
@@ -24,13 +25,7 @@ GET_ITERATOR_CHUNK_SIZE = 100
 # dictionary in the Query class).
 JoinInfo = namedtuple('JoinInfo',
                       'table_name rhs_alias join_type lhs_alias '
-                      'lhs_join_col rhs_join_col nullable join_field')
-
-# PathInfo is used when converting lookups (fk__somecol). The contents
-# describe the join in Model terms (model Options and Fields for both
-# sides of the join. The rel_field is the field we are joining along.
-PathInfo = namedtuple('PathInfo',
-                      'from_field to_field from_opts to_opts join_field')
+                      'join_cols nullable join_field')
 
 # Pairs of column clauses to select, and (possibly None) field for the clause.
 SelectInfo = namedtuple('SelectInfo', 'col field')
@@ -44,6 +39,3 @@ ORDER_DIR = {
     'ASC': ('ASC', 'DESC'),
     'DESC': ('DESC', 'ASC'),
 }
-
-# A marker for join-reusability.
-REUSE_ALL = object()
diff --git a/django/db/models/sql/datastructures.py b/django/db/models/sql/datastructures.py
index b8e06daf01..daaabbe6da 100644
--- a/django/db/models/sql/datastructures.py
+++ b/django/db/models/sql/datastructures.py
@@ -12,8 +12,10 @@ class MultiJoin(Exception):
     multi-valued join was attempted (if the caller wants to treat that
     exceptionally).
     """
-    def __init__(self, level):
-        self.level = level
+    def __init__(self, names_pos, path_with_names):
+        self.level = names_pos
+        # The path travelled, this includes the path to the multijoin.
+        self.names_with_path = path_with_names
 
 class Empty(object):
     pass
@@ -30,14 +32,31 @@ class Date(object):
         self.col = col
         self.lookup_type = lookup_type
 
-    def relabel_aliases(self, change_map):
-        c = self.col
-        if isinstance(c, (list, tuple)):
-            self.col = (change_map.get(c[0], c[0]), c[1])
+    def relabeled_clone(self, change_map):
+        return self.__class__((change_map.get(self.col[0], self.col[0]), self.col[1]))
 
     def as_sql(self, qn, connection):
         if isinstance(self.col, (list, tuple)):
             col = '%s.%s' % tuple([qn(c) for c in self.col])
         else:
             col = self.col
-        return connection.ops.date_trunc_sql(self.lookup_type, col)
+        return connection.ops.date_trunc_sql(self.lookup_type, col), []
+
+class DateTime(object):
+    """
+    Add a datetime selection column.
+    """
+    def __init__(self, col, lookup_type, tzname):
+        self.col = col
+        self.lookup_type = lookup_type
+        self.tzname = tzname
+
+    def relabeled_clone(self, change_map):
+        return self.__class__((change_map.get(self.col[0], self.col[0]), self.col[1]))
+
+    def as_sql(self, qn, connection):
+        if isinstance(self.col, (list, tuple)):
+            col = '%s.%s' % tuple([qn(c) for c in self.col])
+        else:
+            col = self.col
+        return connection.ops.datetime_trunc_sql(self.lookup_type, col, self.tzname)
diff --git a/django/db/models/sql/expressions.py b/django/db/models/sql/expressions.py
index af7e45e74e..62adf79d87 100644
--- a/django/db/models/sql/expressions.py
+++ b/django/db/models/sql/expressions.py
@@ -1,35 +1,42 @@
 from django.core.exceptions import FieldError
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.fields import FieldDoesNotExist
-from django.db.models.sql.constants import REUSE_ALL
+import copy
 
 class SQLEvaluator(object):
-    def __init__(self, expression, query, allow_joins=True, reuse=REUSE_ALL):
+    def __init__(self, expression, query, allow_joins=True, reuse=None):
         self.expression = expression
         self.opts = query.get_meta()
-        self.cols = []
-
-        self.contains_aggregate = False
         self.reuse = reuse
+        self.cols = []
         self.expression.prepare(self, query, allow_joins)
 
+    def relabeled_clone(self, change_map):
+        clone = copy.copy(self)
+        clone.cols = []
+        for node, col in self.cols:
+            if hasattr(col, 'relabeled_clone'):
+                clone.cols.append((node, col.relabeled_clone(change_map)))
+            else:
+                clone.cols.append((node,
+                                   (change_map.get(col[0], col[0]), col[1])))
+        return clone
+
+    def get_cols(self):
+        cols = []
+        for node, col in self.cols:
+            if hasattr(node, 'get_cols'):
+                cols.extend(node.get_cols())
+            elif isinstance(col, tuple):
+                cols.append(col)
+        return cols
+
     def prepare(self):
         return self
 
     def as_sql(self, qn, connection):
         return self.expression.evaluate(self, qn, connection)
 
-    def relabel_aliases(self, change_map):
-        new_cols = []
-        for node, col in self.cols:
-            if hasattr(col, "relabel_aliases"):
-                col.relabel_aliases(change_map)
-                new_cols.append((node, col))
-            else:
-                new_cols.append((node,
-                                (change_map.get(col[0], col[0]), col[1])))
-        self.cols = new_cols
-
     #####################################################
     # Vistor methods for initial expression preparation #
     #####################################################
@@ -44,19 +51,18 @@ class SQLEvaluator(object):
             raise FieldError("Joined field references are not permitted in this query")
 
         field_list = node.name.split(LOOKUP_SEP)
-        if (len(field_list) == 1 and
-            node.name in query.aggregate_select.keys()):
-            self.contains_aggregate = True
+        if node.name in query.aggregates:
             self.cols.append((node, query.aggregate_select[node.name]))
         else:
             try:
-                field, source, opts, join_list, path = query.setup_joins(
+                field, sources, opts, join_list, path = query.setup_joins(
                     field_list, query.get_meta(),
                     query.get_initial_alias(), self.reuse)
-                col, _, join_list = query.trim_joins(source, join_list, path)
-                if self.reuse is not None and self.reuse != REUSE_ALL:
+                targets, _, join_list = query.trim_joins(sources, join_list, path)
+                if self.reuse is not None:
                     self.reuse.update(join_list)
-                self.cols.append((node, (join_list[-1], col)))
+                for t in targets:
+                    self.cols.append((node, (join_list[-1], t.column)))
             except FieldDoesNotExist:
                 raise FieldError("Cannot resolve keyword %r into field. "
                                  "Choices are: %s" % (self.name,
@@ -95,9 +101,9 @@ class SQLEvaluator(object):
         if col is None:
             raise ValueError("Given node not found")
         if hasattr(col, 'as_sql'):
-            return col.as_sql(qn, connection), ()
+            return col.as_sql(qn, connection)
         else:
-            return '%s.%s' % (qn(col[0]), qn(col[1])), ()
+            return '%s.%s' % (qn(col[0]), qn(col[1])), []
 
     def evaluate_date_modifier_node(self, node, qn, connection):
         timedelta = node.children.pop()
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index ff56211c5d..acb9f248d6 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -15,16 +15,17 @@ from django.utils.tree import Node
 from django.utils import six
 from django.db import connections, DEFAULT_DB_ALIAS
 from django.db.models.constants import LOOKUP_SEP
+from django.db.models.aggregates import refs_aggregate
 from django.db.models.expressions import ExpressionNode
 from django.db.models.fields import FieldDoesNotExist
-from django.db.models.loading import get_model
+from django.db.models.related import PathInfo
 from django.db.models.sql import aggregates as base_aggregates_module
 from django.db.models.sql.constants import (QUERY_TERMS, ORDER_DIR, SINGLE,
-        ORDER_PATTERN, REUSE_ALL, JoinInfo, SelectInfo, PathInfo)
+        ORDER_PATTERN, JoinInfo, SelectInfo)
 from django.db.models.sql.datastructures import EmptyResultSet, Empty, MultiJoin
 from django.db.models.sql.expressions import SQLEvaluator
 from django.db.models.sql.where import (WhereNode, Constraint, EverythingNode,
-    ExtraWhere, AND, OR)
+    ExtraWhere, AND, OR, EmptyWhere)
 from django.core.exceptions import FieldError
 
 __all__ = ['Query', 'RawQuery']
@@ -187,54 +188,6 @@ class Query(object):
         memo[id(self)] = result
         return result
 
-    def __getstate__(self):
-        """
-        Pickling support.
-        """
-        obj_dict = self.__dict__.copy()
-        obj_dict['related_select_cols'] = []
-
-        # Fields can't be pickled, so if a field list has been
-        # specified, we pickle the list of field names instead.
-        # None is also a possible value; that can pass as-is
-        obj_dict['select'] = [
-            (s.col, s.field is not None and s.field.name or None)
-            for s in obj_dict['select']
-        ]
-        # alias_map can also contain references to fields.
-        new_alias_map = {}
-        for alias, join_info in obj_dict['alias_map'].items():
-            if join_info.join_field is None:
-                new_alias_map[alias] = join_info
-            else:
-                model = join_info.join_field.model._meta
-                field_id = (model.app_label, model.object_name, join_info.join_field.name)
-                new_alias_map[alias] = join_info._replace(join_field=field_id)
-        obj_dict['alias_map'] = new_alias_map
-        return obj_dict
-
-    def __setstate__(self, obj_dict):
-        """
-        Unpickling support.
-        """
-        # Rebuild list of field instances
-        opts = obj_dict['model']._meta
-        obj_dict['select'] = [
-            SelectInfo(tpl[0], tpl[1] is not None and opts.get_field(tpl[1]) or None)
-            for tpl in obj_dict['select']
-        ]
-        new_alias_map = {}
-        for alias, join_info in obj_dict['alias_map'].items():
-            if join_info.join_field is None:
-                new_alias_map[alias] = join_info
-            else:
-                field_id = join_info.join_field
-                new_alias_map[alias] = join_info._replace(
-                    join_field=get_model(field_id[0], field_id[1])._meta.get_field(field_id[2]))
-        obj_dict['alias_map'] = new_alias_map
-
-        self.__dict__.update(obj_dict)
-
     def prepare(self):
         return self
 
@@ -278,13 +231,13 @@ class Query(object):
         obj.select = self.select[:]
         obj.related_select_cols = []
         obj.tables = self.tables[:]
-        obj.where = copy.deepcopy(self.where, memo=memo)
+        obj.where = self.where.clone()
         obj.where_class = self.where_class
         if self.group_by is None:
             obj.group_by = None
         else:
             obj.group_by = self.group_by[:]
-        obj.having = copy.deepcopy(self.having, memo=memo)
+        obj.having = self.having.clone()
         obj.order_by = self.order_by[:]
         obj.low_mark, obj.high_mark = self.low_mark, self.high_mark
         obj.distinct = self.distinct
@@ -292,7 +245,8 @@ class Query(object):
         obj.select_for_update = self.select_for_update
         obj.select_for_update_nowait = self.select_for_update_nowait
         obj.select_related = self.select_related
-        obj.aggregates = copy.deepcopy(self.aggregates, memo=memo)
+        obj.related_select_cols = []
+        obj.aggregates = self.aggregates.copy()
         if self.aggregate_select_mask is None:
             obj.aggregate_select_mask = None
         else:
@@ -315,7 +269,7 @@ class Query(object):
             obj._extra_select_cache = self._extra_select_cache.copy()
         obj.extra_tables = self.extra_tables
         obj.extra_order_by = self.extra_order_by
-        obj.deferred_loading = copy.deepcopy(self.deferred_loading, memo=memo)
+        obj.deferred_loading = copy.copy(self.deferred_loading[0]), self.deferred_loading[1]
         if self.filter_is_sticky and self.used_aliases:
             obj.used_aliases = self.used_aliases.copy()
         else:
@@ -498,15 +452,17 @@ class Query(object):
         # Now, add the joins from rhs query into the new query (skipping base
         # table).
         for alias in rhs.tables[1:]:
-            table, _, join_type, lhs, lhs_col, col, nullable, join_field = rhs.alias_map[alias]
+            table, _, join_type, lhs, join_cols, nullable, join_field = rhs.alias_map[alias]
             promote = (join_type == self.LOUTER)
             # If the left side of the join was already relabeled, use the
             # updated alias.
             lhs = change_map.get(lhs, lhs)
             new_alias = self.join(
-                (lhs, table, lhs_col, col), reuse=reuse, promote=promote,
+                (lhs, table, join_cols), reuse=reuse,
                 outer_if_first=not conjunction, nullable=nullable,
                 join_field=join_field)
+            if promote:
+                self.promote_joins([new_alias])
             # We can't reuse the same join again in the query. If we have two
             # distinct joins for the same connection in rhs query, then the
             # combined query must have two joins, too.
@@ -519,36 +475,20 @@ class Query(object):
                 # the join type for the unused alias.
                 self.unref_alias(new_alias)
 
-        # So that we don't exclude valid results in an "or" query combination,
+        # So that we don't exclude valid results in an OR query combination,
         # all joins exclusive to either the lhs or the rhs must be converted
-        # to an outer join.
+        # to an outer join. RHS joins were already set to outer joins above,
+        # so check which joins were used only in the lhs query.
         if not conjunction:
-            l_tables = set(self.tables)
-            r_tables = set(rhs.tables)
-            # Update r_tables aliases.
-            for alias in change_map:
-                if alias in r_tables:
-                    # r_tables may contain entries that have a refcount of 0
-                    # if the query has references to a table that can be
-                    # trimmed because only the foreign key is used.
-                    # We only need to fix the aliases for the tables that
-                    # actually have aliases.
-                    if rhs.alias_refcount[alias]:
-                        r_tables.remove(alias)
-                        r_tables.add(change_map[alias])
-            # Find aliases that are exclusive to rhs or lhs.
-            # These are promoted to outer joins.
-            outer_tables = (l_tables | r_tables) - (l_tables & r_tables)
-            for alias in outer_tables:
-                # Again, some of the tables won't have aliases due to
-                # the trimming of unnecessary tables.
-                if self.alias_refcount.get(alias) or rhs.alias_refcount.get(alias):
-                    self.promote_joins([alias], True)
+            rhs_used_joins = set(change_map.values())
+            to_promote = [alias for alias in self.tables
+                          if alias not in rhs_used_joins]
+            self.promote_joins(to_promote, True)
 
         # Now relabel a copy of the rhs where-clause and add it to the current
         # one.
         if rhs.where:
-            w = copy.deepcopy(rhs.where)
+            w = rhs.where.clone()
             w.relabel_aliases(change_map)
             if not self.where:
                 # Since 'self' matches everything, add an explicit "include
@@ -570,9 +510,8 @@ class Query(object):
                 new_col = change_map.get(col[0], col[0]), col[1]
                 self.select.append(SelectInfo(new_col, field))
             else:
-                item = copy.deepcopy(col)
-                item.relabel_aliases(change_map)
-                self.select.append(SelectInfo(item, field))
+                new_col = col.relabeled_clone(change_map)
+                self.select.append(SelectInfo(new_col, field))
 
         if connector == OR:
             # It would be nice to be able to handle this, but the queries don't
@@ -743,7 +682,7 @@ class Query(object):
         aliases = list(aliases)
         while aliases:
             alias = aliases.pop(0)
-            if self.alias_map[alias].rhs_join_col is None:
+            if self.alias_map[alias].join_cols[0][1] is None:
                 # This is the base table (first FROM entry) - this table
                 # isn't really joined at all in the query, so we should not
                 # alter its join type.
@@ -772,17 +711,17 @@ class Query(object):
             unref_amount = cur_refcount - to_counts.get(alias, 0)
             self.unref_alias(alias, unref_amount)
 
-    def promote_unused_aliases(self, initial_refcounts, used_aliases):
+    def promote_disjunction(self, aliases_before, alias_usage_counts,
+                            num_childs):
         """
-        Given a "before" copy of the alias_refcounts dictionary (as
-        'initial_refcounts') and a collection of aliases that may have been
-        changed or created, works out which aliases have been created since
-        then and which ones haven't been used and promotes all of those
-        aliases, plus any children of theirs in the alias tree, to outer joins.
+        This method is to be used for promoting joins in ORed filters.
+
+        The principle for promotion is: any alias which is used (it is in
+        alias_usage_counts), is not used by every child of the ORed filter,
+        and isn't pre-existing needs to be promoted to LOUTER join.
         """
-        for alias in self.tables:
-            if alias in used_aliases and (alias not in initial_refcounts or
-                    self.alias_refcount[alias] == initial_refcounts[alias]):
+        for alias, use_count in alias_usage_counts.items():
+            if use_count < num_childs and alias not in aliases_before:
                 self.promote_joins([alias])
 
     def change_aliases(self, change_map):
@@ -798,8 +737,7 @@ class Query(object):
                 old_alias = col[0]
                 return (change_map.get(old_alias, old_alias), col[1])
             else:
-                col.relabel_aliases(change_map)
-                return col
+                return col.relabeled_clone(change_map)
         # 1. Update references in "select" (normal columns plus aliases),
         # "group by", "where" and "having".
         self.where.relabel_aliases(change_map)
@@ -880,7 +818,7 @@ class Query(object):
             alias = self.tables[0]
             self.ref_alias(alias)
         else:
-            alias = self.join((None, self.model._meta.db_table, None, None))
+            alias = self.join((None, self.model._meta.db_table, None))
         return alias
 
     def count_active_tables(self):
@@ -891,30 +829,24 @@ class Query(object):
         """
         return len([1 for count in self.alias_refcount.values() if count])
 
-    def join(self, connection, reuse=REUSE_ALL, promote=False,
-             outer_if_first=False, nullable=False, join_field=None):
+    def join(self, connection, reuse=None, outer_if_first=False,
+             nullable=False, join_field=None):
         """
         Returns an alias for the join in 'connection', either reusing an
         existing alias for that join or creating a new one. 'connection' is a
-        tuple (lhs, table, lhs_col, col) where 'lhs' is either an existing
-        table alias or a table name. The join correspods to the SQL equivalent
-        of::
+        tuple (lhs, table, join_cols) where 'lhs' is either an existing
+        table alias or a table name. 'join_cols' is a tuple of tuples containing
+        columns to join on ((l_id1, r_id1), (l_id2, r_id2)). The join corresponds
+        to the SQL equivalent of::
 
-            lhs.lhs_col = table.col
+            lhs.l_id1 = table.r_id1 AND lhs.l_id2 = table.r_id2
 
-        The 'reuse' parameter can be used in three ways: it can be REUSE_ALL
-        which means all joins (matching the connection) are reusable, it can
-        be a set containing the aliases that can be reused, or it can be None
-        which means a new join is always created.
-
-        If 'promote' is True, the join type for the alias will be LOUTER (if
-        the alias previously existed, the join type will be promoted from INNER
-        to LOUTER, if necessary).
+        The 'reuse' parameter can be either None which means all joins
+        (matching the connection) are reusable, or it can be a set containing
+        the aliases that can be reused.
 
         If 'outer_if_first' is True and a new join is created, it will have the
-        LOUTER join type. Used for example when adding ORed filters, where we
-        want to use LOUTER joins except if some other join already restricts
-        the join to INNER join.
+        LOUTER join type.
 
         A join is always created as LOUTER if the lhs alias is LOUTER to make
         sure we do not generate chains like t1 LOUTER t2 INNER t3.
@@ -924,12 +856,11 @@ class Query(object):
 
         The 'join_field' is the field we are joining along (if any).
         """
-        lhs, table, lhs_col, col = connection
+        lhs, table, join_cols = connection
+        assert lhs is None or join_field is not None
         existing = self.join_map.get(connection, ())
-        if reuse == REUSE_ALL:
+        if reuse is None:
             reuse = existing
-        elif reuse is None:
-            reuse = set()
         else:
             reuse = [a for a in existing if a in reuse]
         for alias in reuse:
@@ -940,8 +871,6 @@ class Query(object):
                 # join_field used for the under work join.
                 continue
             self.ref_alias(alias)
-            if promote or (lhs and self.alias_map[lhs].join_type == self.LOUTER):
-                self.promote_joins([alias])
             return alias
 
         # No reuse is possible, so we need a new alias.
@@ -950,14 +879,13 @@ class Query(object):
             # Not all tables need to be joined to anything. No join type
             # means the later columns are ignored.
             join_type = None
-        elif (promote or outer_if_first
-              or self.alias_map[lhs].join_type == self.LOUTER):
-            # We need to use LOUTER join if asked by promote or outer_if_first,
-            # or if the LHS table is left-joined in the query.
+        elif outer_if_first or self.alias_map[lhs].join_type == self.LOUTER:
+            # We need to use LOUTER join if asked by outer_if_first or if the
+            # LHS table is left-joined in the query.
             join_type = self.LOUTER
         else:
             join_type = self.INNER
-        join = JoinInfo(table, alias, join_type, lhs, lhs_col, col, nullable,
+        join = JoinInfo(table, alias, join_type, lhs, join_cols or ((None, None),), nullable,
                         join_field)
         self.alias_map[alias] = join
         if connection in self.join_map:
@@ -978,18 +906,47 @@ class Query(object):
         whereas column determination is a later part, and side-effect, of
         as_sql()).
         """
-        # Skip all proxy models
-        opts = self.model._meta.concrete_model._meta
+        opts = self.model._meta
         root_alias = self.tables[0]
         seen = {None: root_alias}
 
         for field, model in opts.get_fields_with_model():
             if model not in seen:
-                link_field = opts.get_ancestor_link(model)
-                seen[model] = self.join((root_alias, model._meta.db_table,
-                        link_field.column, model._meta.pk.column))
+                self.join_parent_model(opts, model, root_alias, seen)
         self.included_inherited_models = seen
 
+    def join_parent_model(self, opts, model, alias, seen):
+        """
+        Makes sure the given 'model' is joined in the query. If 'model' isn't
+        a parent of 'opts' or if it is None this method is a no-op.
+
+        The 'alias' is the root alias for starting the join, 'seen' is a dict
+        of model -> alias of existing joins. It must also contain a mapping
+        of None -> some alias. This will be returned in the no-op case.
+        """
+        if model in seen:
+            return seen[model]
+        int_opts = opts
+        chain = opts.get_base_chain(model)
+        if chain is None:
+            return alias
+        for int_model in chain:
+            if int_model in seen:
+                return seen[int_model]
+            # Proxy model have elements in base chain
+            # with no parents, assign the new options
+            # object and skip to the next base in that
+            # case
+            if not int_opts.parents[int_model]:
+                int_opts = int_model._meta
+                continue
+            link_field = int_opts.get_ancestor_link(int_model)
+            int_opts = int_model._meta
+            connection = (alias, int_opts.db_table, link_field.get_joining_columns())
+            alias = seen[int_model] = self.join(connection, nullable=False,
+                                                join_field=link_field)
+        return alias or seen[None]
+
     def remove_inherited_models(self):
         """
         Undoes the effects of setup_inherited_models(). Should be called
@@ -1000,19 +957,6 @@ class Query(object):
                 self.unref_alias(alias)
         self.included_inherited_models = {}
 
-    def need_force_having(self, q_object):
-        """
-        Returns whether or not all elements of this q_object need to be put
-        together in the HAVING clause.
-        """
-        for child in q_object.children:
-            if isinstance(child, Node):
-                if self.need_force_having(child):
-                    return True
-            else:
-                if child[0].split(LOOKUP_SEP)[0] in self.aggregates:
-                    return True
-        return False
 
     def add_aggregate(self, aggregate, model, alias, is_summary):
         """
@@ -1039,17 +983,19 @@ class Query(object):
             #   - this is an annotation over a model field
             # then we need to explore the joins that are required.
 
-            field, source, opts, join_list, path = self.setup_joins(
-                field_list, opts, self.get_initial_alias(), REUSE_ALL)
+            field, sources, opts, join_list, path = self.setup_joins(
+                field_list, opts, self.get_initial_alias())
 
             # Process the join chain to see if it can be trimmed
-            col, _, join_list = self.trim_joins(source, join_list, path)
+            targets, _, join_list = self.trim_joins(sources, join_list, path)
 
             # If the aggregate references a model or field that requires a join,
             # those joins must be LEFT OUTER - empty join rows must be returned
             # in order for zeros to be returned for those aggregates.
             self.promote_joins(join_list, True)
 
+            col = targets[0].column
+            source = sources[0]
             col = (join_list[-1], col)
         else:
             # The simplest cases. No joins required -
@@ -1061,24 +1007,32 @@ class Query(object):
         # Add the aggregate to the query
         aggregate.add_to_query(self, alias, col=col, source=source, is_summary=is_summary)
 
-    def add_filter(self, filter_expr, connector=AND, negate=False,
-            can_reuse=None, force_having=False):
+    def build_filter(self, filter_expr, branch_negated=False, current_negated=False,
+                     can_reuse=None):
         """
-        Add a single filter to the query. The 'filter_expr' is a pair:
-        (filter_string, value). E.g. ('name__contains', 'fred')
+        Builds a WhereNode for a single filter clause, but doesn't add it
+        to this Query. Query.add_q() will then add this filter to the where
+        or having Node.
 
-        If 'negate' is True, this is an exclude() filter. It's important to
-        note that this method does not negate anything in the where-clause
-        object when inserting the filter constraints. This is because negated
-        filters often require multiple calls to add_filter() and the negation
-        should only happen once. So the caller is responsible for this (the
-        caller will normally be add_q(), so that as an example).
+        The 'branch_negated' tells us if the current branch contains any
+        negations. This will be used to determine if subqueries are needed.
 
-        If 'can_reuse' is a set, we are processing a component of a
-        multi-component filter (e.g. filter(Q1, Q2)). In this case, 'can_reuse'
-        will be a set of table aliases that can be reused in this filter, even
-        if we would otherwise force the creation of new aliases for a join
-        (needed for nested Q-filters). The set is updated by this method.
+        The 'current_negated' is used to determine if the current filter is
+        negated or not and this will be used to determine if IS NULL filtering
+        is needed.
+
+        The difference between current_netageted and branch_negated is that
+        branch_negated is set on first negation, but current_negated is
+        flipped for each negation.
+
+        Note that add_filter will not do any negating itself, that is done
+        upper in the code by add_q().
+
+        The 'can_reuse' is a set of reusable joins for multijoins.
+
+        The method will create a filter clause that can be added to the current
+        query. However, if the filter isn't added to the query then the caller
+        is responsible for unreffing the joins used.
         """
         arg, value = filter_expr
         parts = arg.split(LOOKUP_SEP)
@@ -1087,10 +1041,10 @@ class Query(object):
 
         # Work out the lookup type and remove it from the end of 'parts',
         # if necessary.
-        lookup_type = 'exact' # Default lookup type
+        lookup_type = 'exact'  # Default lookup type
         num_parts = len(parts)
         if (len(parts) > 1 and parts[-1] in self.query_terms
-            and arg not in self.aggregates):
+                and arg not in self.aggregates):
             # Traverse the lookup query to distinguish related fields from
             # lookup types.
             lookup_model = self.model
@@ -1111,10 +1065,7 @@ class Query(object):
                         lookup_type = parts.pop()
                         break
 
-        # By default, this is a WHERE clause. If an aggregate is referenced
-        # in the value, the filter will be promoted to a HAVING
-        having_clause = False
-
+        clause = self.where_class()
         # Interpret '__exact=None' as the sql 'is NULL'; otherwise, reject all
         # uses of None as a query value.
         if value is None:
@@ -1127,174 +1078,173 @@ class Query(object):
         elif isinstance(value, ExpressionNode):
             # If value is a query expression, evaluate it
             value = SQLEvaluator(value, self, reuse=can_reuse)
-            having_clause = value.contains_aggregate
+        # For Oracle '' is equivalent to null. The check needs to be done
+        # at this stage because join promotion can't be done at compiler
+        # stage. Using DEFAULT_DB_ALIAS isn't nice, but it is the best we
+        # can do here. Similar thing is done in is_nullable(), too.
+        if (connections[DEFAULT_DB_ALIAS].features.interprets_empty_strings_as_nulls and
+                lookup_type == 'exact' and value == ''):
+            value = True
+            lookup_type = 'isnull'
 
         for alias, aggregate in self.aggregates.items():
             if alias in (parts[0], LOOKUP_SEP.join(parts)):
-                entry = self.where_class()
-                entry.add((aggregate, lookup_type, value), AND)
-                if negate:
-                    entry.negate()
-                self.having.add(entry, connector)
-                return
+                clause.add((aggregate, lookup_type, value), AND)
+                return clause
 
         opts = self.get_meta()
         alias = self.get_initial_alias()
-        allow_many = not negate
+        allow_many = not branch_negated
 
         try:
-            field, target, opts, join_list, path = self.setup_joins(
+            field, sources, opts, join_list, path = self.setup_joins(
                     parts, opts, alias, can_reuse, allow_many,
                     allow_explicit_fk=True)
             if can_reuse is not None:
                 can_reuse.update(join_list)
         except MultiJoin as e:
-            self.split_exclude(filter_expr, LOOKUP_SEP.join(parts[:e.level]),
-                    can_reuse)
-            return
+            return self.split_exclude(filter_expr, LOOKUP_SEP.join(parts[:e.level]),
+                                      can_reuse, e.names_with_path)
 
-        table_promote = False
-        join_promote = False
-
-        if (lookup_type == 'isnull' and value is True and not negate and
+        if (lookup_type == 'isnull' and value is True and not current_negated and
                 len(join_list) > 1):
             # If the comparison is against NULL, we may need to use some left
             # outer joins when creating the join chain. This is only done when
             # needed, as it's less efficient at the database level.
             self.promote_joins(join_list)
-            join_promote = True
 
         # Process the join list to see if we can remove any inner joins from
         # the far end (fewer tables in a query is better). Note that join
         # promotion must happen before join trimming to have the join type
         # information available when reusing joins.
-        col, alias, join_list = self.trim_joins(target, join_list, path)
+        targets, alias, join_list = self.trim_joins(sources, join_list, path)
 
-        if connector == OR:
-            # Some joins may need to be promoted when adding a new filter to a
-            # disjunction. We walk the list of new joins and where it diverges
-            # from any previous joins (ref count is 1 in the table list), we
-            # make the new additions (and any existing ones not used in the new
-            # join list) an outer join.
-            join_it = iter(join_list)
-            table_it = iter(self.tables)
-            next(join_it), next(table_it)
-            unconditional = False
-            for join in join_it:
-                table = next(table_it)
-                # Once we hit an outer join, all subsequent joins must
-                # also be promoted, regardless of whether they have been
-                # promoted as a result of this pass through the tables.
-                unconditional = (unconditional or
-                    self.alias_map[join].join_type == self.LOUTER)
-                if join == table and self.alias_refcount[join] > 1:
-                    # We have more than one reference to this join table.
-                    # This means that we are dealing with two different query
-                    # subtrees, so we don't need to do any join promotion.
-                    continue
-                join_promote = join_promote or self.promote_joins([join], unconditional)
-                if table != join:
-                    table_promote = self.promote_joins([table])
-                # We only get here if we have found a table that exists
-                # in the join list, but isn't on the original tables list.
-                # This means we've reached the point where we only have
-                # new tables, so we can break out of this promotion loop.
-                break
-            self.promote_joins(join_it, join_promote)
-            self.promote_joins(table_it, table_promote or join_promote)
-
-        if having_clause or force_having:
-            if (alias, col) not in self.group_by:
-                self.group_by.append((alias, col))
-            self.having.add((Constraint(alias, col, field), lookup_type, value),
-                connector)
+        if hasattr(field, 'get_lookup_constraint'):
+            constraint = field.get_lookup_constraint(self.where_class, alias, targets, sources,
+                                                     lookup_type, value)
         else:
-            self.where.add((Constraint(alias, col, field), lookup_type, value),
-                connector)
-
-        if negate:
+            constraint = (Constraint(alias, targets[0].column, field), lookup_type, value)
+        clause.add(constraint, AND)
+        if current_negated and (lookup_type != 'isnull' or value is False):
             self.promote_joins(join_list)
-            if lookup_type != 'isnull':
-                if len(join_list) > 1:
-                    for alias in join_list:
-                        if self.alias_map[alias].join_type == self.LOUTER:
-                            j_col = self.alias_map[alias].rhs_join_col
-                            # The join promotion logic should never produce
-                            # a LOUTER join for the base join - assert that.
-                            assert j_col is not None
-                            entry = self.where_class()
-                            entry.add(
-                                (Constraint(alias, j_col, None), 'isnull', True),
-                                AND
-                            )
-                            entry.negate()
-                            self.where.add(entry, AND)
-                            break
-                if self.is_nullable(field):
-                    # In SQL NULL = anyvalue returns unknown, and NOT unknown
-                    # is still unknown. However, in Python None = anyvalue is False
-                    # (and not False is True...), and we want to return this Python's
-                    # view of None handling. So we need to specifically exclude the
-                    # NULL values, and because we are inside NOT branch they will
-                    # be included in the final resultset. We are essentially creating
-                    # SQL like this here: NOT (col IS NOT NULL), where the first NOT
-                    # is added in upper layers of the code.
-                    self.where.add((Constraint(alias, col, None), 'isnull', False), AND)
+            if (lookup_type != 'isnull' and (
+                    self.is_nullable(targets[0]) or
+                    self.alias_map[join_list[-1]].join_type == self.LOUTER)):
+                # The condition added here will be SQL like this:
+                # NOT (col IS NOT NULL), where the first NOT is added in
+                # upper layers of code. The reason for addition is that if col
+                # is null, then col != someval will result in SQL "unknown"
+                # which isn't the same as in Python. The Python None handling
+                # is wanted, and it can be gotten by
+                # (col IS NULL OR col != someval)
+                #   <=>
+                # NOT (col IS NOT NULL AND col = someval).
+                clause.add((Constraint(alias, targets[0].column, None), 'isnull', False), AND)
+        return clause
 
+    def add_filter(self, filter_clause):
+        self.where.add(self.build_filter(filter_clause), 'AND')
 
-    def add_q(self, q_object, used_aliases=None, force_having=False):
+    def need_having(self, obj):
+        """
+        Returns whether or not all elements of this q_object need to be put
+        together in the HAVING clause.
+        """
+        if not isinstance(obj, Node):
+            return (refs_aggregate(obj[0].split(LOOKUP_SEP), self.aggregates)
+                    or (hasattr(obj[1], 'contains_aggregate')
+                        and obj[1].contains_aggregate(self.aggregates)))
+        return any(self.need_having(c) for c in obj.children)
+
+    def split_having_parts(self, q_object, negated=False):
+        """
+        Returns a list of q_objects which need to go into the having clause
+        instead of the where clause. Removes the splitted out nodes from the
+        given q_object. Note that the q_object is altered, so cloning it is
+        needed.
+        """
+        having_parts = []
+        for c in q_object.children[:]:
+            # When constucting the having nodes we need to take care to
+            # preserve the negation status from the upper parts of the tree
+            if isinstance(c, Node):
+                # For each negated child, flip the in_negated flag.
+                in_negated = c.negated ^ negated
+                if c.connector == OR and self.need_having(c):
+                    # A subtree starting from OR clause must go into having in
+                    # whole if any part of that tree references an aggregate.
+                    q_object.children.remove(c)
+                    having_parts.append(c)
+                    c.negated = in_negated
+                else:
+                    having_parts.extend(
+                        self.split_having_parts(c, in_negated)[1])
+            elif self.need_having(c):
+                q_object.children.remove(c)
+                new_q = self.where_class(children=[c], negated=negated)
+                having_parts.append(new_q)
+        return q_object, having_parts
+
+    def add_q(self, q_object):
+        """
+        A preprocessor for the internal _add_q(). Responsible for
+        splitting the given q_object into where and having parts and
+        setting up some internal variables.
+        """
+        if not self.need_having(q_object):
+            where_part, having_parts = q_object, []
+        else:
+            where_part, having_parts = self.split_having_parts(
+                q_object.clone(), q_object.negated)
+        used_aliases = self.used_aliases
+        clause = self._add_q(where_part, used_aliases)
+        self.where.add(clause, AND)
+        for hp in having_parts:
+            clause = self._add_q(hp, used_aliases)
+            self.having.add(clause, AND)
+        if self.filter_is_sticky:
+            self.used_aliases = used_aliases
+
+    def _add_q(self, q_object, used_aliases, branch_negated=False,
+               current_negated=False):
         """
         Adds a Q-object to the current filter.
 
         Can also be used to add anything that has an 'add_to_query()' method.
         """
-        if used_aliases is None:
-            used_aliases = self.used_aliases
-        if hasattr(q_object, 'add_to_query'):
-            # Complex custom objects are responsible for adding themselves.
-            q_object.add_to_query(self, used_aliases)
-        else:
-            if self.where and q_object.connector != AND and len(q_object) > 1:
-                self.where.start_subtree(AND)
-                subtree = True
+        connector = q_object.connector
+        current_negated = current_negated ^ q_object.negated
+        branch_negated = branch_negated or q_object.negated
+        # Note that if the connector happens to match what we have already in
+        # the tree, the add will be a no-op.
+        target_clause = self.where_class(connector=connector,
+                                         negated=q_object.negated)
+
+        if connector == OR:
+            alias_usage_counts = dict()
+            aliases_before = set(self.tables)
+        for child in q_object.children:
+            if connector == OR:
+                refcounts_before = self.alias_refcount.copy()
+            if isinstance(child, Node):
+                child_clause = self._add_q(
+                    child, used_aliases, branch_negated,
+                    current_negated)
             else:
-                subtree = False
-            connector = AND
-            if q_object.connector == OR and not force_having:
-                force_having = self.need_force_having(q_object)
-            for child in q_object.children:
-                if connector == OR:
-                    refcounts_before = self.alias_refcount.copy()
-                if force_having:
-                    self.having.start_subtree(connector)
-                else:
-                    self.where.start_subtree(connector)
-                if isinstance(child, Node):
-                    self.add_q(child, used_aliases, force_having=force_having)
-                else:
-                    self.add_filter(child, connector, q_object.negated,
-                            can_reuse=used_aliases, force_having=force_having)
-                if force_having:
-                    self.having.end_subtree()
-                else:
-                    self.where.end_subtree()
+                child_clause = self.build_filter(
+                    child, can_reuse=used_aliases, branch_negated=branch_negated,
+                    current_negated=current_negated)
+            target_clause.add(child_clause, connector)
+            if connector == OR:
+                used = alias_diff(refcounts_before, self.alias_refcount)
+                for alias in used:
+                    alias_usage_counts[alias] = alias_usage_counts.get(alias, 0) + 1
+        if connector == OR:
+            self.promote_disjunction(aliases_before, alias_usage_counts,
+                                     len(q_object.children))
+        return target_clause
 
-                if connector == OR:
-                    # Aliases that were newly added or not used at all need to
-                    # be promoted to outer joins if they are nullable relations.
-                    # (they shouldn't turn the whole conditional into the empty
-                    # set just because they don't match anything).
-                    self.promote_unused_aliases(refcounts_before, used_aliases)
-                connector = q_object.connector
-            if q_object.negated:
-                self.where.negate()
-            if subtree:
-                self.where.end_subtree()
-        if self.filter_is_sticky:
-            self.used_aliases = used_aliases
-
-    def names_to_path(self, names, opts, allow_many=False,
-                      allow_explicit_fk=True):
+    def names_to_path(self, names, opts, allow_many, allow_explicit_fk):
         """
         Walks the names path and turns them PathInfo tuples. Note that a
         single name in 'names' can generate multiple PathInfos (m2m for
@@ -1308,8 +1258,7 @@ class Query(object):
         (the last used join field), and target (which is a field guaranteed to
         contain the same value as the final field).
         """
-        path = []
-        multijoin_pos = None
+        path, names_with_path = [], []
         for pos, name in enumerate(names):
             if name == 'pk':
                 name = opts.pk.name
@@ -1340,95 +1289,27 @@ class Query(object):
                         opts = int_model._meta
                     else:
                         final_field = opts.parents[int_model]
-                        target = final_field.rel.get_related_field()
+                        targets = (final_field.rel.get_related_field(),)
                         opts = int_model._meta
-                        path.append(PathInfo(final_field, target, final_field.model._meta,
-                                             opts, final_field))
-            # We have five different cases to solve: foreign keys, reverse
-            # foreign keys, m2m fields (also reverse) and non-relational
-            # fields. We are mostly just using the related field API to
-            # fetch the from and to fields. The m2m fields are handled as
-            # two foreign keys, first one reverse, the second one direct.
-            if direct and not field.rel and not m2m:
+                        path.append(PathInfo(final_field.model._meta, opts, targets, final_field, False, True))
+            if hasattr(field, 'get_path_info'):
+                pathinfos = field.get_path_info()
+                if not allow_many:
+                    for inner_pos, p in enumerate(pathinfos):
+                        if p.m2m:
+                            names_with_path.append((name, pathinfos[0:inner_pos + 1]))
+                            raise MultiJoin(pos + 1, names_with_path)
+                last = pathinfos[-1]
+                path.extend(pathinfos)
+                final_field = last.join_field
+                opts = last.to_opts
+                targets = last.target_fields
+                names_with_path.append((name, pathinfos))
+            else:
                 # Local non-relational field.
-                final_field = target = field
-                break
-            elif direct and not m2m:
-                # Foreign Key
-                opts = field.rel.to._meta
-                target = field.rel.get_related_field()
                 final_field = field
-                from_opts = field.model._meta
-                path.append(PathInfo(field, target, from_opts, opts, field))
-            elif not direct and not m2m:
-                # Revere foreign key
-                final_field = to_field = field.field
-                opts = to_field.model._meta
-                from_field = to_field.rel.get_related_field()
-                from_opts = from_field.model._meta
-                path.append(
-                    PathInfo(from_field, to_field, from_opts, opts, to_field))
-                if from_field.model is to_field.model:
-                    # Recursive foreign key to self.
-                    target = opts.get_field_by_name(
-                        field.field.rel.field_name)[0]
-                else:
-                    target = opts.pk
-            elif direct and m2m:
-                if not field.rel.through:
-                    # Gotcha! This is just a fake m2m field - a generic relation
-                    # field).
-                    from_field = opts.pk
-                    opts = field.rel.to._meta
-                    target = opts.get_field_by_name(field.object_id_field_name)[0]
-                    final_field = field
-                    # Note that we are using different field for the join_field
-                    # than from_field or to_field. This is a hack, but we need the
-                    # GenericRelation to generate the extra SQL.
-                    path.append(PathInfo(from_field, target, field.model._meta, opts,
-                                         field))
-                else:
-                    # m2m field. We are travelling first to the m2m table along a
-                    # reverse relation, then from m2m table to the target table.
-                    from_field1 = opts.get_field_by_name(
-                        field.m2m_target_field_name())[0]
-                    opts = field.rel.through._meta
-                    to_field1 = opts.get_field_by_name(field.m2m_field_name())[0]
-                    path.append(
-                        PathInfo(from_field1, to_field1, from_field1.model._meta,
-                                 opts, to_field1))
-                    final_field = from_field2 = opts.get_field_by_name(
-                        field.m2m_reverse_field_name())[0]
-                    opts = field.rel.to._meta
-                    target = to_field2 = opts.get_field_by_name(
-                        field.m2m_reverse_target_field_name())[0]
-                    path.append(
-                        PathInfo(from_field2, to_field2, from_field2.model._meta,
-                                 opts, from_field2))
-            elif not direct and m2m:
-                # This one is just like above, except we are travelling the
-                # fields in opposite direction.
-                field = field.field
-                from_field1 = opts.get_field_by_name(
-                    field.m2m_reverse_target_field_name())[0]
-                int_opts = field.rel.through._meta
-                to_field1 = int_opts.get_field_by_name(
-                    field.m2m_reverse_field_name())[0]
-                path.append(
-                    PathInfo(from_field1, to_field1, from_field1.model._meta,
-                             int_opts, to_field1))
-                final_field = from_field2 = int_opts.get_field_by_name(
-                    field.m2m_field_name())[0]
-                opts = field.opts
-                target = to_field2 = opts.get_field_by_name(
-                    field.m2m_target_field_name())[0]
-                path.append(PathInfo(from_field2, to_field2, from_field2.model._meta,
-                                     opts, from_field2))
-
-            if m2m and multijoin_pos is None:
-                multijoin_pos = pos
-            if not direct and not path[-1].to_field.unique and multijoin_pos is None:
-                multijoin_pos = pos
+                targets = (field,)
+                break
 
         if pos != len(names) - 1:
             if pos == len(names) - 2:
@@ -1437,11 +1318,9 @@ class Query(object):
                     "the lookup type?" % (name, names[pos + 1]))
             else:
                 raise FieldError("Join on field %r not permitted." % name)
-        if multijoin_pos is not None and len(path) >= multijoin_pos and not allow_many:
-            raise MultiJoin(multijoin_pos + 1)
-        return path, final_field, target
+        return path, final_field, targets
 
-    def setup_joins(self, names, opts, alias, can_reuse, allow_many=True,
+    def setup_joins(self, names, opts, alias, can_reuse=None, allow_many=True,
                     allow_explicit_fk=False):
         """
         Compute the necessary table joins for the passage through the fields
@@ -1450,9 +1329,9 @@ class Query(object):
         the table to start the joining from.
 
         The 'can_reuse' defines the reverse foreign key joins we can reuse. It
-        can be sql.constants.REUSE_ALL in which case all joins are reusable
-        or a set of aliases that can be reused. Note that Non-reverse foreign
-        keys are always reusable.
+        can be None in which case all joins are reusable or a set of aliases
+        that can be reused. Note that non-reverse foreign keys are always
+        reusable when using setup_joins().
 
         If 'allow_many' is False, then any reverse foreign key seen will
         generate a MultiJoin exception.
@@ -1472,31 +1351,33 @@ class Query(object):
         """
         joins = [alias]
         # First, generate the path for the names
-        path, final_field, target = self.names_to_path(
+        path, final_field, targets = self.names_to_path(
             names, opts, allow_many, allow_explicit_fk)
         # Then, add the path to the query's joins. Note that we can't trim
         # joins at this stage - we will need the information about join type
         # of the trimmed joins.
         for pos, join in enumerate(path):
-            from_field, to_field, from_opts, opts, join_field = join
-            direct = join_field == from_field
-            if direct:
-                nullable = self.is_nullable(from_field)
+            opts = join.to_opts
+            if join.direct:
+                nullable = self.is_nullable(join.join_field)
             else:
                 nullable = True
-            connection = alias, opts.db_table, from_field.column, to_field.column
-            alias = self.join(connection, reuse=can_reuse, nullable=nullable,
-                              join_field=join_field)
+            connection = alias, opts.db_table, join.join_field.get_joining_columns()
+            reuse = can_reuse if join.m2m else None
+            alias = self.join(connection, reuse=reuse,
+                              nullable=nullable, join_field=join.join_field)
             joins.append(alias)
-        return final_field, target, opts, joins, path
+        if hasattr(final_field, 'field'):
+            final_field = final_field.field
+        return final_field, targets, opts, joins, path
 
-    def trim_joins(self, target, joins, path):
+    def trim_joins(self, targets, joins, path):
         """
         The 'target' parameter is the final field being joined to, 'joins'
         is the full list of join aliases. The 'path' contain the PathInfos
         used to create the joins.
 
-        Returns the final active column and table alias and the new active
+        Returns the final target field and table alias and the new active
         joins.
 
         We will always trim any direct join if we have the target column
@@ -1504,16 +1385,18 @@ class Query(object):
         trimmed as we don't know if there is anything on the other side of
         the join.
         """
-        for info in reversed(path):
-            direct = info.join_field == info.from_field
-            if info.to_field == target and direct:
-                target = info.from_field
-                self.unref_alias(joins.pop())
-            else:
+        for pos, info in enumerate(reversed(path)):
+            if len(joins) == 1 or not info.direct:
                 break
-        return target.column, joins[-1], joins
+            join_targets = set(t.column for t in info.join_field.foreign_related_fields)
+            cur_targets = set(t.column for t in targets)
+            if not cur_targets.issubset(join_targets):
+                break
+            targets = tuple(r[0] for r in info.join_field.related_fields if r[1].column in cur_targets)
+            self.unref_alias(joins.pop())
+        return targets, joins[-1], joins
 
-    def split_exclude(self, filter_expr, prefix, can_reuse):
+    def split_exclude(self, filter_expr, prefix, can_reuse, names_with_path):
         """
         When doing an exclude against any kind of N-to-many relation, we need
         to use a subquery. This method constructs the nested query, given the
@@ -1521,56 +1404,73 @@ class Query(object):
         N-to-many relation field.
 
         As an example we could have original filter ~Q(child__name='foo').
-        We would get here with filter_expr = child_name, prefix = child and
-        can_reuse is a set of joins we can reuse for filtering in the original
-        query.
+        We would get here with filter_expr = child__name, prefix = child and
+        can_reuse is a set of joins usable for filters in the original query.
 
-        We will turn this into
-            WHERE pk NOT IN (SELECT parent_id FROM thetable
-                             WHERE name = 'foo' AND parent_id IS NOT NULL)
+        We will turn this into equivalent of:
+            WHERE NOT (pk IN (SELECT parent_id FROM thetable
+                              WHERE name = 'foo' AND parent_id IS NOT NULL))
 
         It might be worth it to consider using WHERE NOT EXISTS as that has
         saner null handling, and is easier for the backend's optimizer to
         handle.
         """
+        # Generate the inner query.
         query = Query(self.model)
-        query.add_filter(filter_expr)
+        query.where.add(query.build_filter(filter_expr), AND)
         query.bump_prefix()
         query.clear_ordering(True)
-        query.set_start(prefix)
-        # Adding extra check to make sure the selected field will not be null
+        # Try to have as simple as possible subquery -> trim leading joins from
+        # the subquery.
+        trimmed_joins = query.trim_start(names_with_path)
+        # Add extra check to make sure the selected field will not be null
         # since we are adding a IN <subquery> clause. This prevents the
         # database from tripping over IN (...,NULL,...) selects and returning
         # nothing
-        alias, col = query.select[0].col
-        query.where.add((Constraint(alias, col, None), 'isnull', False), AND)
-        # We need to trim the last part from the prefix.
-        trimmed_prefix = LOOKUP_SEP.join(prefix.split(LOOKUP_SEP)[0:-1])
-        if not trimmed_prefix:
-            rel, _, direct, m2m = self.model._meta.get_field_by_name(prefix)
-            if not m2m:
-                trimmed_prefix = rel.field.rel.field_name
-            else:
-                if direct:
-                    trimmed_prefix = rel.m2m_target_field_name()
-                else:
-                    trimmed_prefix = rel.field.m2m_reverse_target_field_name()
+        if self.is_nullable(query.select[0].field):
+            alias, col = query.select[0].col
+            query.where.add((Constraint(alias, col, query.select[0].field), 'isnull', False), AND)
 
-        self.add_filter(('%s__in' % trimmed_prefix, query), negate=True,
-                can_reuse=can_reuse)
+        # Still make sure that the trimmed parts in the inner query and
+        # trimmed prefix are in sync. So, use the trimmed_joins to make sure
+        # as many path elements are in the prefix as there were trimmed joins.
+        # In addition, convert the path elements back to names so that
+        # add_filter() can handle them.
+        trimmed_prefix = []
+        paths_in_prefix = trimmed_joins
+        for name, path in names_with_path:
+            if paths_in_prefix - len(path) < 0:
+                break
+            trimmed_prefix.append(name)
+            paths_in_prefix -= len(path)
+        join_field = path[paths_in_prefix].join_field
+        # TODO: This should be made properly multicolumn
+        # join aware. It is likely better to not use build_filter
+        # at all, instead construct joins up to the correct point,
+        # then construct the needed equality constraint manually,
+        # or maybe using SubqueryConstraint would work, too.
+        # The foreign_related_fields attribute is right here, we
+        # don't ever split joins for direct case.
+        trimmed_prefix.append(
+            join_field.field.foreign_related_fields[0].name)
+        trimmed_prefix = LOOKUP_SEP.join(trimmed_prefix)
+        condition = self.build_filter(
+            ('%s__in' % trimmed_prefix, query),
+            current_negated=True, branch_negated=True, can_reuse=can_reuse)
+        # Intentionally leave the other alias as blank, if the condition
+        # refers it, things will break here.
+        extra_restriction = join_field.get_extra_restriction(
+            self.where_class, None, [t for t in query.tables if query.alias_refcount[t]][0])
+        if extra_restriction:
+            query.where.add(extra_restriction, 'AND')
+        return condition
 
-        # If there's more than one join in the inner query (before any initial
-        # bits were trimmed -- which means the last active table is more than
-        # two places into the alias list), we need to also handle the
-        # possibility that the earlier joins don't match anything by adding a
-        # comparison to NULL (e.g. in
-        # Tag.objects.exclude(parent__parent__name='t1'), a tag with no parent
-        # would otherwise be overlooked).
-        active_positions = len([count for count
-                                in query.alias_refcount.items() if count])
-        if active_positions > 1:
-            self.add_filter(('%s__isnull' % trimmed_prefix, False), negate=True,
-                    can_reuse=can_reuse)
+    def set_empty(self):
+        self.where = EmptyWhere()
+        self.having = EmptyWhere()
+
+    def is_empty(self):
+        return isinstance(self.where, EmptyWhere) or isinstance(self.having, EmptyWhere)
 
     def set_limits(self, low=None, high=None):
         """
@@ -1642,20 +1542,17 @@ class Query(object):
 
         try:
             for name in field_names:
-                field, target, u2, joins, u3 = self.setup_joins(
-                        name.split(LOOKUP_SEP), opts, alias, REUSE_ALL, allow_m2m,
+                field, targets, u2, joins, path = self.setup_joins(
+                        name.split(LOOKUP_SEP), opts, alias, None, allow_m2m,
                         True)
-                final_alias = joins[-1]
-                col = target.column
-                if len(joins) > 1:
-                    join = self.alias_map[final_alias]
-                    if col == join.rhs_join_col:
-                        self.unref_alias(final_alias)
-                        final_alias = join.lhs_alias
-                        col = join.lhs_join_col
-                        joins = joins[:-1]
+
+                # Trim last join if possible
+                targets, final_alias, remaining_joins = self.trim_joins(targets, joins[-2:], path)
+                joins = joins[:-2] + remaining_joins
+
                 self.promote_joins(joins[1:])
-                self.select.append(SelectInfo((final_alias, col), field))
+                for target in targets:
+                    self.select.append(SelectInfo((final_alias, target.column), target))
         except MultiJoin:
             raise FieldError("Invalid field name: '%s'" % name)
         except FieldError:
@@ -1690,7 +1587,7 @@ class Query(object):
         else:
             self.default_ordering = False
 
-    def clear_ordering(self, force_empty=False):
+    def clear_ordering(self, force_empty):
         """
         Removes any ordering settings. If 'force_empty' is True, there will be
         no ordering in the resulting query (not even the model's default).
@@ -1729,8 +1626,9 @@ class Query(object):
         else:
             opts = self.model._meta
             if not self.select:
-                count = self.aggregates_module.Count((self.join((None, opts.db_table, None, None)), opts.pk.column),
-                                         is_summary=True, distinct=True)
+                count = self.aggregates_module.Count(
+                    (self.join((None, opts.db_table, None)), opts.pk.column),
+                    is_summary=True, distinct=True)
             else:
                 # Because of SQL portability issues, multi-column, distinct
                 # counts need a sub-query -- see get_count() for details.
@@ -1920,42 +1818,38 @@ class Query(object):
             return self.extra
     extra_select = property(_extra_select)
 
-    def set_start(self, start):
+    def trim_start(self, names_with_path):
         """
-        Sets the table from which to start joining. The start position is
-        specified by the related attribute from the base model. This will
-        automatically set to the select column to be the column linked from the
-        previous table.
+        Trims joins from the start of the join path. The candidates for trim
+        are the PathInfos in names_with_path structure. Outer joins are not
+        eligible for removal. Also sets the select column so the start
+        matches the join.
 
-        This method is primarily for internal use and the error checking isn't
-        as friendly as add_filter(). Mostly useful for querying directly
-        against the join table of many-to-many relation in a subquery.
-        """
-        opts = self.model._meta
-        alias = self.get_initial_alias()
-        field, col, opts, joins, extra = self.setup_joins(
-                start.split(LOOKUP_SEP), opts, alias, REUSE_ALL)
-        select_col = self.alias_map[joins[1]].lhs_join_col
-        select_alias = alias
-
-        # The call to setup_joins added an extra reference to everything in
-        # joins. Reverse that.
-        for alias in joins:
-            self.unref_alias(alias)
-
-        # We might be able to trim some joins from the front of this query,
-        # providing that we only traverse "always equal" connections (i.e. rhs
-        # is *always* the same value as lhs).
-        for alias in joins[1:]:
-            join_info = self.alias_map[alias]
-            if (join_info.lhs_join_col != select_col
-                    or join_info.join_type != self.INNER):
+        This method is mostly useful for generating the subquery joins & col
+        in "WHERE somecol IN (subquery)". This construct is needed by
+        split_exclude().
+        _"""
+        all_paths = []
+        for _, paths in names_with_path:
+            all_paths.extend(paths)
+        direct_join = True
+        for pos, path in enumerate(all_paths):
+            if self.alias_map[self.tables[pos + 1]].join_type == self.LOUTER:
+                direct_join = False
+                pos -= 1
                 break
-            self.unref_alias(select_alias)
-            select_alias = join_info.rhs_alias
-            select_col = join_info.rhs_join_col
-        self.select = [SelectInfo((select_alias, select_col), None)]
+            self.unref_alias(self.tables[pos])
+        if path.direct:
+            direct_join = not direct_join
+        join_side = 0 if direct_join else 1
+        select_alias = self.tables[pos + 1]
+        join_field = path.join_field
+        if hasattr(join_field, 'field'):
+            join_field = join_field.field
+        select_fields = [r[join_side] for r in join_field.related_fields]
+        self.select = [SelectInfo((select_alias, f.column), f) for f in select_fields]
         self.remove_inherited_models()
+        return pos
 
     def is_nullable(self, field):
         """
@@ -2006,3 +1900,11 @@ def is_reverse_o2o(field):
     expected to be some sort of relation field or related object.
     """
     return not hasattr(field, 'rel') and field.field.unique
+
+def alias_diff(refcounts_before, refcounts_after):
+    """
+    Given the before and after copies of refcounts works out which aliases
+    have been added to the after copy.
+    """
+    return set(t for t in refcounts_after
+               if refcounts_after[t] > refcounts_before.get(t, 0))
diff --git a/django/db/models/sql/subqueries.py b/django/db/models/sql/subqueries.py
index 39d1ee0116..78727e394a 100644
--- a/django/db/models/sql/subqueries.py
+++ b/django/db/models/sql/subqueries.py
@@ -2,22 +2,23 @@
 Query subclasses which provide extra functionality beyond simple data retrieval.
 """
 
+from django.conf import settings
 from django.core.exceptions import FieldError
 from django.db import connections
 from django.db.models.constants import LOOKUP_SEP
-from django.db.models.fields import DateField, FieldDoesNotExist
+from django.db.models.fields import DateField, DateTimeField, FieldDoesNotExist
 from django.db.models.sql.constants import *
-from django.db.models.sql.datastructures import Date
+from django.db.models.sql.datastructures import Date, DateTime
 from django.db.models.sql.query import Query
 from django.db.models.sql.where import AND, Constraint
-from django.utils.datastructures import SortedDict
 from django.utils.functional import Promise
 from django.utils.encoding import force_text
 from django.utils import six
+from django.utils import timezone
 
 
 __all__ = ['DeleteQuery', 'UpdateQuery', 'InsertQuery', 'DateQuery',
-        'AggregateQuery']
+        'DateTimeQuery', 'AggregateQuery']
 
 class DeleteQuery(Query):
     """
@@ -44,7 +45,7 @@ class DeleteQuery(Query):
         for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
             where = self.where_class()
             where.add((Constraint(None, field.column, field), 'in',
-                    pk_list[offset:offset + GET_ITERATOR_CHUNK_SIZE]), AND)
+                       pk_list[offset:offset + GET_ITERATOR_CHUNK_SIZE]), AND)
             self.do_query(self.model._meta.db_table, where, using=using)
 
     def delete_qs(self, query, using):
@@ -116,8 +117,8 @@ class UpdateQuery(Query):
         for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
             self.where = self.where_class()
             self.where.add((Constraint(None, pk_field.column, pk_field), 'in',
-                    pk_list[offset:offset + GET_ITERATOR_CHUNK_SIZE]),
-                    AND)
+                            pk_list[offset:offset + GET_ITERATOR_CHUNK_SIZE]),
+                           AND)
             self.get_compiler(using).execute_sql(None)
 
     def add_update_values(self, values):
@@ -223,26 +224,24 @@ class DateQuery(Query):
 
     compiler = 'SQLDateCompiler'
 
-    def add_date_select(self, field_name, lookup_type, order='ASC'):
+    def add_select(self, field_name, lookup_type, order='ASC'):
         """
-        Converts the query into a date extraction query.
+        Converts the query into an extraction query.
         """
         try:
             result = self.setup_joins(
                 field_name.split(LOOKUP_SEP),
                 self.get_meta(),
                 self.get_initial_alias(),
-                False
             )
         except FieldError:
             raise FieldDoesNotExist("%s has no field named '%s'" % (
                 self.model._meta.object_name, field_name
             ))
         field = result[0]
-        assert isinstance(field, DateField), "%r isn't a DateField." \
-                % field.name
+        self._check_field(field)                # overridden in DateTimeQuery
         alias = result[3][-1]
-        select = Date((alias, field.column), lookup_type)
+        select = self._get_select((alias, field.column), lookup_type)
         self.clear_select_clause()
         self.select = [SelectInfo(select, None)]
         self.distinct = True
@@ -251,6 +250,36 @@ class DateQuery(Query):
         if field.null:
             self.add_filter(("%s__isnull" % field_name, False))
 
+    def _check_field(self, field):
+        assert isinstance(field, DateField), \
+            "%r isn't a DateField." % field.name
+        if settings.USE_TZ:
+            assert not isinstance(field, DateTimeField), \
+                "%r is a DateTimeField, not a DateField." % field.name
+
+    def _get_select(self, col, lookup_type):
+        return Date(col, lookup_type)
+
+class DateTimeQuery(DateQuery):
+    """
+    A DateTimeQuery is like a DateQuery but for a datetime field. If time zone
+    support is active, the tzinfo attribute contains the time zone to use for
+    converting the values before truncating them. Otherwise it's set to None.
+    """
+
+    compiler = 'SQLDateTimeCompiler'
+
+    def _check_field(self, field):
+        assert isinstance(field, DateTimeField), \
+                "%r isn't a DateTimeField." % field.name
+
+    def _get_select(self, col, lookup_type):
+        if self.tzinfo is None:
+            tzname = None
+        else:
+            tzname = timezone._get_timezone_name(self.tzinfo)
+        return DateTime(col, lookup_type, tzname)
+
 class AggregateQuery(Query):
     """
     An AggregateQuery takes another query as a parameter to the FROM
diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py
index 47f4ffaba9..029226383d 100644
--- a/django/db/models/sql/where.py
+++ b/django/db/models/sql/where.py
@@ -4,15 +4,17 @@ Code to manage the creation and SQL rendering of 'where' constraints.
 
 from __future__ import absolute_import
 
-import collections
 import datetime
 from itertools import repeat
 
-from django.utils import tree
-from django.db.models.fields import Field
-from django.db.models.sql.datastructures import EmptyResultSet
+from django.conf import settings
+from django.db.models.fields import DateTimeField, Field
+from django.db.models.sql.datastructures import EmptyResultSet, Empty
 from django.db.models.sql.aggregates import Aggregate
+from django.utils.itercompat import is_iterator
 from django.utils.six.moves import xrange
+from django.utils import timezone
+from django.utils import tree
 
 # Connection types
 AND = 'AND'
@@ -32,26 +34,31 @@ class WhereNode(tree.Node):
     The class is tied to the Query class that created it (in order to create
     the correct SQL).
 
-    The children in this tree are usually either Q-like objects or lists of
-    [table_alias, field_name, db_type, lookup_type, value_annotation, params].
-    However, a child could also be any class with as_sql() and relabel_aliases() methods.
+    A child is usually a tuple of:
+        (Constraint(alias, targetcol, field), lookup_type, value)
+    where value can be either raw Python value, or Query, ExpressionNode or
+    something else knowing how to turn itself into SQL.
+
+    However, a child could also be any class with as_sql() and either
+    relabeled_clone() method or relabel_aliases() and clone() methods. The
+    second alternative should be used if the alias is not the only mutable
+    variable.
     """
     default = AND
 
-    def add(self, data, connector):
+    def _prepare_data(self, data):
         """
-        Add a node to the where-tree. If the data is a list or tuple, it is
-        expected to be of the form (obj, lookup_type, value), where obj is
-        a Constraint object, and is then slightly munged before being stored
-        (to avoid storing any reference to field objects). Otherwise, the 'data'
-        is stored unchanged and can be any class with an 'as_sql()' method.
+        Prepare data for addition to the tree. If the data is a list or tuple,
+        it is expected to be of the form (obj, lookup_type, value), where obj
+        is a Constraint object, and is then slightly munged before being
+        stored (to avoid storing any reference to field objects). Otherwise,
+        the 'data' is stored unchanged and can be any class with an 'as_sql()'
+        method.
         """
         if not isinstance(data, (list, tuple)):
-            super(WhereNode, self).add(data, connector)
-            return
-
+            return data
         obj, lookup_type, value = data
-        if isinstance(value, collections.Iterator):
+        if is_iterator(value):
             # Consume any generators immediately, so that we can determine
             # emptiness and transform any non-empty values correctly.
             value = list(value)
@@ -60,7 +67,8 @@ class WhereNode(tree.Node):
         # about the value(s) to the query construction. Specifically, datetime
         # and empty values need special handling. Other types could be used
         # here in the future (using Python types is suggested for consistency).
-        if isinstance(value, datetime.datetime):
+        if (isinstance(value, datetime.datetime)
+            or (isinstance(obj.field, DateTimeField) and lookup_type != 'isnull')):
             value_annotation = datetime.datetime
         elif hasattr(value, 'value_annotation'):
             value_annotation = value.value_annotation
@@ -69,9 +77,7 @@ class WhereNode(tree.Node):
 
         if hasattr(obj, "prepare"):
             value = obj.prepare(lookup_type, value)
-
-        super(WhereNode, self).add(
-                (obj, lookup_type, value_annotation, value), connector)
+        return (obj, lookup_type, value_annotation, value)
 
     def as_sql(self, qn, connection):
         """
@@ -145,6 +151,18 @@ class WhereNode(tree.Node):
                 sql_string = '(%s)' % sql_string
         return sql_string, result_params
 
+    def get_cols(self):
+        cols = []
+        for child in self.children:
+            if hasattr(child, 'get_cols'):
+                cols.extend(child.get_cols())
+            else:
+                if isinstance(child[0], Constraint):
+                    cols.append((child[0].alias, child[0].col))
+                if hasattr(child[3], 'get_cols'):
+                    cols.extend(child[3].get_cols())
+        return cols
+
     def make_atom(self, child, qn, connection):
         """
         Turn a tuple (Constraint(table_alias, column_name, db_type),
@@ -169,15 +187,13 @@ class WhereNode(tree.Node):
 
         if isinstance(lvalue, tuple):
             # A direct database column lookup.
-            field_sql = self.sql_for_columns(lvalue, qn, connection)
+            field_sql, field_params = self.sql_for_columns(lvalue, qn, connection), []
         else:
             # A smart object with an as_sql() method.
-            field_sql = lvalue.as_sql(qn, connection)
+            field_sql, field_params = lvalue.as_sql(qn, connection)
 
-        if value_annotation is datetime.datetime:
-            cast_sql = connection.ops.datetime_cast_sql()
-        else:
-            cast_sql = '%s'
+        is_datetime_field = value_annotation is datetime.datetime
+        cast_sql = connection.ops.datetime_cast_sql() if is_datetime_field else '%s'
 
         if hasattr(params, 'as_sql'):
             extra, params = params.as_sql(qn, connection)
@@ -185,6 +201,8 @@ class WhereNode(tree.Node):
         else:
             extra = ''
 
+        params = field_params + params
+
         if (len(params) == 1 and params[0] == '' and lookup_type == 'exact'
             and connection.features.interprets_empty_strings_as_nulls):
             lookup_type = 'isnull'
@@ -221,12 +239,17 @@ class WhereNode(tree.Node):
                         params)
         elif lookup_type in ('range', 'year'):
             return ('%s BETWEEN %%s and %%s' % field_sql, params)
+        elif is_datetime_field and lookup_type in ('month', 'day', 'week_day',
+                                                   'hour', 'minute', 'second'):
+            tzname = timezone.get_current_timezone_name() if settings.USE_TZ else None
+            sql, tz_params = connection.ops.datetime_extract_sql(lookup_type, field_sql, tzname)
+            return ('%s = %%s' % sql, tz_params + params)
         elif lookup_type in ('month', 'day', 'week_day'):
-            return ('%s = %%s' % connection.ops.date_extract_sql(lookup_type, field_sql),
-                    params)
+            return ('%s = %%s'
+                    % connection.ops.date_extract_sql(lookup_type, field_sql), params)
         elif lookup_type == 'isnull':
-            return ('%s IS %sNULL' % (field_sql,
-                (not value_annotation and 'NOT ' or '')), ())
+            assert value_annotation in (True, False), "Invalid value_annotation for isnull"
+            return ('%s IS %sNULL' % (field_sql, ('' if value_annotation else 'NOT ')), ())
         elif lookup_type == 'search':
             return (connection.ops.fulltext_search_sql(field_sql), params)
         elif lookup_type in ('regex', 'iregex'):
@@ -238,7 +261,7 @@ class WhereNode(tree.Node):
         """
         Returns the SQL fragment used for the left-hand side of a column
         constraint (for example, the "T1.foo" portion in the clause
-        "WHERE ... T1.foo = 6").
+        "WHERE ... T1.foo = 6") and a list of parameters.
         """
         table_alias, name, db_type = data
         if table_alias:
@@ -247,30 +270,45 @@ class WhereNode(tree.Node):
             lhs = qn(name)
         return connection.ops.field_cast_sql(db_type) % lhs
 
-    def relabel_aliases(self, change_map, node=None):
+    def relabel_aliases(self, change_map):
         """
         Relabels the alias values of any children. 'change_map' is a dictionary
         mapping old (current) alias values to the new values.
         """
-        if not node:
-            node = self
-        for pos, child in enumerate(node.children):
+        for pos, child in enumerate(self.children):
             if hasattr(child, 'relabel_aliases'):
+                # For example another WhereNode
                 child.relabel_aliases(change_map)
-            elif isinstance(child, tree.Node):
-                self.relabel_aliases(change_map, child)
             elif isinstance(child, (list, tuple)):
-                if isinstance(child[0], (list, tuple)):
-                    elt = list(child[0])
-                    if elt[0] in change_map:
-                        elt[0] = change_map[elt[0]]
-                        node.children[pos] = (tuple(elt),) + child[1:]
-                else:
-                    child[0].relabel_aliases(change_map)
+                # tuple starting with Constraint
+                child = (child[0].relabeled_clone(change_map),) + child[1:]
+                if hasattr(child[3], 'relabeled_clone'):
+                    child = (child[0], child[1], child[2]) + (
+                        child[3].relabeled_clone(change_map),)
+                self.children[pos] = child
 
-                # Check if the query value also requires relabelling
-                if hasattr(child[3], 'relabel_aliases'):
-                    child[3].relabel_aliases(change_map)
+    def clone(self):
+        """
+        Creates a clone of the tree. Must only be called on root nodes (nodes
+        with empty subtree_parents). Childs must be either (Contraint, lookup,
+        value) tuples, or objects supporting .clone().
+        """
+        clone = self.__class__._new_instance(
+            children=[], connector=self.connector, negated=self.negated)
+        for child in self.children:
+            if hasattr(child, 'clone'):
+                clone.children.append(child.clone())
+            else:
+                clone.children.append(child)
+        return clone
+
+class EmptyWhere(WhereNode):
+
+    def add(self, data, connector):
+        return
+
+    def as_sql(self, qn=None, connection=None):
+        raise EmptyResultSet
 
 class EverythingNode(object):
     """
@@ -280,8 +318,6 @@ class EverythingNode(object):
     def as_sql(self, qn=None, connection=None):
         return '', []
 
-    def relabel_aliases(self, change_map, node=None):
-        return
 
 class NothingNode(object):
     """
@@ -290,8 +326,6 @@ class NothingNode(object):
     def as_sql(self, qn=None, connection=None):
         raise EmptyResultSet
 
-    def relabel_aliases(self, change_map, node=None):
-        return
 
 class ExtraWhere(object):
     def __init__(self, sqls, params):
@@ -300,7 +334,8 @@ class ExtraWhere(object):
 
     def as_sql(self, qn=None, connection=None):
         sqls = ["(%s)" % sql for sql in self.sqls]
-        return " AND ".join(sqls), tuple(self.params or ())
+        return " AND ".join(sqls), list(self.params or ())
+
 
 class Constraint(object):
     """
@@ -310,30 +345,6 @@ class Constraint(object):
     def __init__(self, alias, col, field):
         self.alias, self.col, self.field = alias, col, field
 
-    def __getstate__(self):
-        """Save the state of the Constraint for pickling.
-
-        Fields aren't necessarily pickleable, because they can have
-        callable default values. So, instead of pickling the field
-        store a reference so we can restore it manually
-        """
-        obj_dict = self.__dict__.copy()
-        if self.field:
-            obj_dict['model'] = self.field.model
-            obj_dict['field_name'] = self.field.name
-        del obj_dict['field']
-        return obj_dict
-
-    def __setstate__(self, data):
-        """Restore the constraint """
-        model = data.pop('model', None)
-        field_name = data.pop('field_name', None)
-        self.__dict__.update(data)
-        if model is not None:
-            self.field = model._meta.get_field(field_name)
-        else:
-            self.field = None
-
     def prepare(self, lookup_type, value):
         if self.field:
             return self.field.get_prep_lookup(lookup_type, value)
@@ -363,6 +374,36 @@ class Constraint(object):
 
         return (self.alias, self.col, db_type), params
 
-    def relabel_aliases(self, change_map):
-        if self.alias in change_map:
-            self.alias = change_map[self.alias]
+    def relabeled_clone(self, change_map):
+        if self.alias not in change_map:
+            return self
+        else:
+            new = Empty()
+            new.__class__ = self.__class__
+            new.alias, new.col, new.field = change_map[self.alias], self.col, self.field
+            return new
+
+class SubqueryConstraint(object):
+    def __init__(self, alias, columns, targets, query_object):
+        self.alias = alias
+        self.columns = columns
+        self.targets = targets
+        self.query_object = query_object
+
+    def as_sql(self, qn, connection):
+        query = self.query_object
+
+        # QuerySet was sent
+        if hasattr(query, 'values'):
+            if query._db and connection.alias != query._db:
+                raise ValueError("Can't do subqueries with queries on different DBs.")
+            query = query.values(*self.targets).query
+            query.clear_ordering(True)
+
+        query_compiler = query.get_compiler(connection=connection)
+        return query_compiler.as_subquery_condition(self.alias, self.columns)
+
+    def relabeled_clone(self, relabels):
+        return self.__class__(
+            relabels.get(self.alias, self.alias),
+            self.columns, self.query_object)
diff --git a/django/db/transaction.py b/django/db/transaction.py
index f3ce2b2335..48e7f900dd 100644
--- a/django/db/transaction.py
+++ b/django/db/transaction.py
@@ -12,9 +12,12 @@ Managed transactions don't do those commits, but will need some kind of manual
 or implicit commits or rollbacks.
 """
 
+import warnings
+
 from functools import wraps
 
-from django.db import connections, DEFAULT_DB_ALIAS
+from django.db import connections, DatabaseError, DEFAULT_DB_ALIAS
+from django.utils.decorators import available_attrs
 
 
 class TransactionManagementError(Exception):
@@ -24,7 +27,36 @@ class TransactionManagementError(Exception):
     """
     pass
 
-def enter_transaction_management(managed=True, using=None):
+################
+# Private APIs #
+################
+
+def get_connection(using=None):
+    """
+    Get a database connection by name, or the default database connection
+    if no name is provided.
+    """
+    if using is None:
+        using = DEFAULT_DB_ALIAS
+    return connections[using]
+
+###########################
+# Deprecated private APIs #
+###########################
+
+def abort(using=None):
+    """
+    Roll back any ongoing transactions and clean the transaction management
+    state of the connection.
+
+    This method is to be used only in cases where using balanced
+    leave_transaction_management() calls isn't possible. For example after a
+    request has finished, the transaction state isn't known, yet the connection
+    must be cleaned up for the next request.
+    """
+    get_connection(using).abort()
+
+def enter_transaction_management(managed=True, using=None, forced=False):
     """
     Enters transaction management for a running thread. It must be balanced with
     the appropriate leave_transaction_management call, since the actual state is
@@ -34,10 +66,7 @@ def enter_transaction_management(managed=True, using=None):
     from the settings, if there is no surrounding block (dirty is always false
     when no current block is running).
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.enter_transaction_management(managed)
+    get_connection(using).enter_transaction_management(managed, forced)
 
 def leave_transaction_management(using=None):
     """
@@ -45,20 +74,14 @@ def leave_transaction_management(using=None):
     over to the surrounding block, as a commit will commit all changes, even
     those from outside. (Commits are on connection level.)
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.leave_transaction_management()
+    get_connection(using).leave_transaction_management()
 
 def is_dirty(using=None):
     """
     Returns True if the current transaction requires a commit for changes to
     happen.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    return connection.is_dirty()
+    return get_connection(using).is_dirty()
 
 def set_dirty(using=None):
     """
@@ -66,10 +89,7 @@ def set_dirty(using=None):
     to decide in a managed block of code to decide whether there are open
     changes waiting for commit.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.set_dirty()
+    get_connection(using).set_dirty()
 
 def set_clean(using=None):
     """
@@ -77,73 +97,51 @@ def set_clean(using=None):
     to decide in a managed block of code to decide whether a commit or rollback
     should happen.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.set_clean()
-
-def clean_savepoints(using=None):
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.clean_savepoints()
+    get_connection(using).set_clean()
 
 def is_managed(using=None):
-    """
-    Checks whether the transaction manager is in manual or in auto state.
-    """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    return connection.is_managed()
+    warnings.warn("'is_managed' is deprecated.",
+        PendingDeprecationWarning, stacklevel=2)
 
 def managed(flag=True, using=None):
-    """
-    Puts the transaction manager into a manual state: managed transactions have
-    to be committed explicitly by the user. If you switch off transaction
-    management and there is a pending commit/rollback, the data will be
-    commited.
-    """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.managed(flag)
+    warnings.warn("'managed' no longer serves a purpose.",
+        PendingDeprecationWarning, stacklevel=2)
 
 def commit_unless_managed(using=None):
-    """
-    Commits changes if the system is not in managed transaction mode.
-    """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.commit_unless_managed()
+    warnings.warn("'commit_unless_managed' is now a no-op.",
+        PendingDeprecationWarning, stacklevel=2)
 
 def rollback_unless_managed(using=None):
+    warnings.warn("'rollback_unless_managed' is now a no-op.",
+        PendingDeprecationWarning, stacklevel=2)
+
+###############
+# Public APIs #
+###############
+
+def get_autocommit(using=None):
     """
-    Rolls back changes if the system is not in managed transaction mode.
+    Get the autocommit status of the connection.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.rollback_unless_managed()
+    return get_connection(using).autocommit
+
+def set_autocommit(autocommit, using=None):
+    """
+    Set the autocommit status of the connection.
+    """
+    return get_connection(using).set_autocommit(autocommit)
 
 def commit(using=None):
     """
-    Does the commit itself and resets the dirty flag.
+    Commits a transaction and resets the dirty flag.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.commit()
+    get_connection(using).commit()
 
 def rollback(using=None):
     """
-    This function does the rollback itself and resets the dirty flag.
+    Rolls back a transaction and resets the dirty flag.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.rollback()
+    get_connection(using).rollback()
 
 def savepoint(using=None):
     """
@@ -151,34 +149,193 @@ def savepoint(using=None):
     current transaction. Returns an identifier for the savepoint that will be
     used for the subsequent rollback or commit.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    return connection.savepoint()
+    return get_connection(using).savepoint()
 
 def savepoint_rollback(sid, using=None):
     """
     Rolls back the most recent savepoint (if one exists). Does nothing if
     savepoints are not supported.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.savepoint_rollback(sid)
+    get_connection(using).savepoint_rollback(sid)
 
 def savepoint_commit(sid, using=None):
     """
     Commits the most recent savepoint (if one exists). Does nothing if
     savepoints are not supported.
     """
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-    connection = connections[using]
-    connection.savepoint_commit(sid)
+    get_connection(using).savepoint_commit(sid)
 
-##############
-# DECORATORS #
-##############
+def clean_savepoints(using=None):
+    """
+    Resets the counter used to generate unique savepoint ids in this thread.
+    """
+    get_connection(using).clean_savepoints()
+
+#################################
+# Decorators / context managers #
+#################################
+
+class Atomic(object):
+    """
+    This class guarantees the atomic execution of a given block.
+
+    An instance can be used either as a decorator or as a context manager.
+
+    When it's used as a decorator, __call__ wraps the execution of the
+    decorated function in the instance itself, used as a context manager.
+
+    When it's used as a context manager, __enter__ creates a transaction or a
+    savepoint, depending on whether a transaction is already in progress, and
+    __exit__ commits the transaction or releases the savepoint on normal exit,
+    and rolls back the transaction or to the savepoint on exceptions.
+
+    It's possible to disable the creation of savepoints if the goal is to
+    ensure that some code runs within a transaction without creating overhead.
+
+    A stack of savepoints identifiers is maintained as an attribute of the
+    connection. None denotes the absence of a savepoint.
+
+    This allows reentrancy even if the same AtomicWrapper is reused. For
+    example, it's possible to define `oa = @atomic('other')` and use `@oa` or
+    `with oa:` multiple times.
+
+    Since database connections are thread-local, this is thread-safe.
+    """
+
+    def __init__(self, using, savepoint):
+        self.using = using
+        self.savepoint = savepoint
+
+    def __enter__(self):
+        connection = get_connection(self.using)
+
+        # Ensure we have a connection to the database before testing
+        # autocommit status.
+        connection.ensure_connection()
+
+        if not connection.in_atomic_block:
+            # Reset state when entering an outermost atomic block.
+            connection.commit_on_exit = True
+            connection.needs_rollback = False
+            if not connection.autocommit:
+                # Some database adapters (namely sqlite3) don't handle
+                # transactions and savepoints properly when autocommit is off.
+                # Turning autocommit back on isn't an option; it would trigger
+                # a premature commit. Give up if that happens.
+                if connection.features.autocommits_when_autocommit_is_off:
+                    raise TransactionManagementError(
+                        "Your database backend doesn't behave properly when "
+                        "autocommit is off. Turn it on before using 'atomic'.")
+                # When entering an atomic block with autocommit turned off,
+                # Django should only use savepoints and shouldn't commit.
+                # This requires at least a savepoint for the outermost block.
+                if not self.savepoint:
+                    raise TransactionManagementError(
+                        "The outermost 'atomic' block cannot use "
+                        "savepoint = False when autocommit is off.")
+                # Pretend we're already in an atomic block to bypass the code
+                # that disables autocommit to enter a transaction, and make a
+                # note to deal with this case in __exit__.
+                connection.in_atomic_block = True
+                connection.commit_on_exit = False
+
+        if connection.in_atomic_block:
+            # We're already in a transaction; create a savepoint, unless we
+            # were told not to or we're already waiting for a rollback. The
+            # second condition avoids creating useless savepoints and prevents
+            # overwriting needs_rollback until the rollback is performed.
+            if self.savepoint and not connection.needs_rollback:
+                sid = connection.savepoint()
+                connection.savepoint_ids.append(sid)
+            else:
+                connection.savepoint_ids.append(None)
+        else:
+            # We aren't in a transaction yet; create one.
+            # The usual way to start a transaction is to turn autocommit off.
+            # However, some database adapters (namely sqlite3) don't handle
+            # transactions and savepoints properly when autocommit is off.
+            # In such cases, start an explicit transaction instead, which has
+            # the side-effect of disabling autocommit.
+            if connection.features.autocommits_when_autocommit_is_off:
+                connection._start_transaction_under_autocommit()
+                connection.autocommit = False
+            else:
+                connection.set_autocommit(False)
+            connection.in_atomic_block = True
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        connection = get_connection(self.using)
+
+        if connection.savepoint_ids:
+            sid = connection.savepoint_ids.pop()
+        else:
+            # Prematurely unset this flag to allow using commit or rollback.
+            connection.in_atomic_block = False
+
+        try:
+            if exc_value is None and not connection.needs_rollback:
+                if connection.in_atomic_block:
+                    # Release savepoint if there is one
+                    if sid is not None:
+                        try:
+                            connection.savepoint_commit(sid)
+                        except DatabaseError:
+                            connection.savepoint_rollback(sid)
+                            raise
+                else:
+                    # Commit transaction
+                    try:
+                        connection.commit()
+                    except DatabaseError:
+                        connection.rollback()
+                        raise
+            else:
+                # This flag will be set to True again if there isn't a savepoint
+                # allowing to perform the rollback at this level.
+                connection.needs_rollback = False
+                if connection.in_atomic_block:
+                    # Roll back to savepoint if there is one, mark for rollback
+                    # otherwise.
+                    if sid is None:
+                        connection.needs_rollback = True
+                    else:
+                        connection.savepoint_rollback(sid)
+                else:
+                    # Roll back transaction
+                    connection.rollback()
+
+        finally:
+            # Outermost block exit when autocommit was enabled.
+            if not connection.in_atomic_block:
+                if connection.features.autocommits_when_autocommit_is_off:
+                    connection.autocommit = True
+                else:
+                    connection.set_autocommit(True)
+            # Outermost block exit when autocommit was disabled.
+            elif not connection.savepoint_ids and not connection.commit_on_exit:
+                connection.in_atomic_block = False
+
+    def __call__(self, func):
+        @wraps(func, assigned=available_attrs(func))
+        def inner(*args, **kwargs):
+            with self:
+                return func(*args, **kwargs)
+        return inner
+
+
+def atomic(using=None, savepoint=True):
+    # Bare decorator: @atomic -- although the first argument is called
+    # `using`, it's actually the function being decorated.
+    if callable(using):
+        return Atomic(DEFAULT_DB_ALIAS, savepoint)(using)
+    # Decorator: @atomic(...) or context manager: with atomic(...): ...
+    else:
+        return Atomic(using, savepoint)
+
+
+############################################
+# Deprecated decorators / context managers #
+############################################
 
 class Transaction(object):
     """
@@ -235,9 +392,11 @@ def autocommit(using=None):
     this decorator is useful if you globally activated transaction management in
     your settings file and want the default behavior in some view functions.
     """
+    warnings.warn("autocommit is deprecated in favor of set_autocommit.",
+        PendingDeprecationWarning, stacklevel=2)
+
     def entering(using):
         enter_transaction_management(managed=False, using=using)
-        managed(False, using=using)
 
     def exiting(exc_value, using):
         leave_transaction_management(using=using)
@@ -251,9 +410,11 @@ def commit_on_success(using=None):
     a rollback is made. This is one of the most common ways to do transaction
     control in Web apps.
     """
+    warnings.warn("commit_on_success is deprecated in favor of atomic.",
+        PendingDeprecationWarning, stacklevel=2)
+
     def entering(using):
         enter_transaction_management(using=using)
-        managed(True, using=using)
 
     def exiting(exc_value, using):
         try:
@@ -279,11 +440,36 @@ def commit_manually(using=None):
     own -- it's up to the user to call the commit and rollback functions
     themselves.
     """
+    warnings.warn("commit_manually is deprecated in favor of set_autocommit.",
+        PendingDeprecationWarning, stacklevel=2)
+
     def entering(using):
         enter_transaction_management(using=using)
-        managed(True, using=using)
 
     def exiting(exc_value, using):
         leave_transaction_management(using=using)
 
     return _transaction_func(entering, exiting, using)
+
+def commit_on_success_unless_managed(using=None, savepoint=False):
+    """
+    Transitory API to preserve backwards-compatibility while refactoring.
+
+    Once the legacy transaction management is fully deprecated, this should
+    simply be replaced by atomic. Until then, it's necessary to guarantee that
+    a commit occurs on exit, which atomic doesn't do when it's nested.
+
+    Unlike atomic, savepoint defaults to False because that's closer to the
+    legacy behavior.
+    """
+    connection = get_connection(using)
+    if connection.autocommit or connection.in_atomic_block:
+        return atomic(using, savepoint)
+    else:
+        def entering(using):
+            pass
+
+        def exiting(exc_value, using):
+            set_dirty(using=using)
+
+        return _transaction_func(entering, exiting, using)
diff --git a/django/db/utils.py b/django/db/utils.py
index 842fd354d6..936b42039d 100644
--- a/django/db/utils.py
+++ b/django/db/utils.py
@@ -1,26 +1,111 @@
+from functools import wraps
 import os
 import pkgutil
 from threading import local
+import warnings
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 from django.utils._os import upath
 from django.utils import six
 
 
 DEFAULT_DB_ALIAS = 'default'
 
-# Define some exceptions that mirror the PEP249 interface.
-# We will rethrow any backend-specific errors using these
-# common wrappers
-class DatabaseError(Exception):
+
+class Error(Exception if six.PY3 else StandardError):
     pass
 
+
+class InterfaceError(Error):
+    pass
+
+
+class DatabaseError(Error):
+    pass
+
+
+class DataError(DatabaseError):
+    pass
+
+
+class OperationalError(DatabaseError):
+    pass
+
+
 class IntegrityError(DatabaseError):
     pass
 
 
+class InternalError(DatabaseError):
+    pass
+
+
+class ProgrammingError(DatabaseError):
+    pass
+
+
+class NotSupportedError(DatabaseError):
+    pass
+
+
+class DatabaseErrorWrapper(object):
+    """
+    Context manager and decorator that re-throws backend-specific database
+    exceptions using Django's common wrappers.
+    """
+
+    def __init__(self, wrapper):
+        """
+        wrapper is a database wrapper.
+
+        It must have a Database attribute defining PEP-249 exceptions.
+        """
+        self.wrapper = wrapper
+
+    def __enter__(self):
+        pass
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        if exc_type is None:
+            return
+        for dj_exc_type in (
+                DataError,
+                OperationalError,
+                IntegrityError,
+                InternalError,
+                ProgrammingError,
+                NotSupportedError,
+                DatabaseError,
+                InterfaceError,
+                Error,
+            ):
+            db_exc_type = getattr(self.wrapper.Database, dj_exc_type.__name__)
+            if issubclass(exc_type, db_exc_type):
+                # Under Python 2.6, exc_value can still be a string.
+                try:
+                    args = tuple(exc_value.args)
+                except AttributeError:
+                    args = (exc_value,)
+                dj_exc_value = dj_exc_type(*args)
+                if six.PY3:
+                    dj_exc_value.__cause__ = exc_value
+                # Only set the 'errors_occurred' flag for errors that may make
+                # the connection unusable.
+                if dj_exc_type not in (DataError, IntegrityError):
+                    self.wrapper.errors_occurred = True
+                six.reraise(dj_exc_type, dj_exc_value, traceback)
+
+    def __call__(self, func):
+        @wraps(func)
+        def inner(*args, **kwargs):
+            with self:
+                return func(*args, **kwargs)
+        return inner
+
+
 def load_backend(backend_name):
     # Look for a fully qualified database backend name
     try:
@@ -74,9 +159,17 @@ class ConnectionHandler(object):
         except KeyError:
             raise ConnectionDoesNotExist("The connection %s doesn't exist" % alias)
 
+        conn.setdefault('ATOMIC_REQUESTS', False)
+        if settings.TRANSACTIONS_MANAGED:
+            warnings.warn(
+                "TRANSACTIONS_MANAGED is deprecated. Use AUTOCOMMIT instead.",
+                PendingDeprecationWarning, stacklevel=2)
+            conn.setdefault('AUTOCOMMIT', False)
+        conn.setdefault('AUTOCOMMIT', True)
         conn.setdefault('ENGINE', 'django.db.backends.dummy')
         if conn['ENGINE'] == 'django.db.backends.' or not conn['ENGINE']:
             conn['ENGINE'] = 'django.db.backends.dummy'
+        conn.setdefault('CONN_MAX_AGE', 600)
         conn.setdefault('OPTIONS', {})
         conn.setdefault('TIME_ZONE', 'UTC' if settings.USE_TZ else settings.TIME_ZONE)
         for setting in ['NAME', 'USER', 'PASSWORD', 'HOST', 'PORT']:
@@ -98,6 +191,9 @@ class ConnectionHandler(object):
     def __setitem__(self, key, value):
         setattr(self._connections, key, value)
 
+    def __delitem__(self, key):
+        delattr(self._connections, key)
+
     def __iter__(self):
         return iter(self.databases)
 
@@ -110,17 +206,7 @@ class ConnectionRouter(object):
         self.routers = []
         for r in routers:
             if isinstance(r, six.string_types):
-                try:
-                    module_name, klass_name = r.rsplit('.', 1)
-                    module = import_module(module_name)
-                except ImportError as e:
-                    raise ImproperlyConfigured('Error importing database router %s: "%s"' % (klass_name, e))
-                try:
-                    router_class = getattr(module, klass_name)
-                except AttributeError:
-                    raise ImproperlyConfigured('Module "%s" does not define a database router name "%s"' % (module, klass_name))
-                else:
-                    router = router_class()
+                router = import_by_path(r)()
             else:
                 router = r
             self.routers.append(router)
diff --git a/django/dispatch/saferef.py b/django/dispatch/saferef.py
index 7423669c96..c7731d41fe 100644
--- a/django/dispatch/saferef.py
+++ b/django/dispatch/saferef.py
@@ -152,7 +152,8 @@ class BoundMethodWeakref(object):
 
     __repr__ = __str__
 
-    __hash__ = object.__hash__
+    def __hash__(self):
+        return hash(self.key)
 
     def __bool__( self ):
         """Whether we are still a valid reference"""
diff --git a/django/forms/__init__.py b/django/forms/__init__.py
index ec37a475e3..2588098330 100644
--- a/django/forms/__init__.py
+++ b/django/forms/__init__.py
@@ -1,13 +1,5 @@
 """
 Django validation and HTML form handling.
-
-TODO:
-    Default value for field
-    Field labels
-    Nestable Forms
-    FatalValidationError -- short-circuits all other validators on a form
-    ValidationWarning
-    "This form field requires foo.js" and form.js_includes()
 """
 
 from __future__ import absolute_import
diff --git a/django/forms/extras/widgets.py b/django/forms/extras/widgets.py
index c5ca1424c8..0b96dc4153 100644
--- a/django/forms/extras/widgets.py
+++ b/django/forms/extras/widgets.py
@@ -9,6 +9,7 @@ import re
 from django.forms.widgets import Widget, Select
 from django.utils import datetime_safe
 from django.utils.dates import MONTHS
+from django.utils.encoding import force_str
 from django.utils.safestring import mark_safe
 from django.utils.formats import get_format
 from django.utils import six
@@ -69,7 +70,7 @@ class SelectDateWidget(Widget):
                 if settings.USE_L10N:
                     try:
                         input_format = get_format('DATE_INPUT_FORMATS')[0]
-                        v = datetime.datetime.strptime(value, input_format)
+                        v = datetime.datetime.strptime(force_str(value), input_format)
                         year_val, month_val, day_val = v.year, v.month, v.day
                     except ValueError:
                         pass
@@ -135,11 +136,3 @@ class SelectDateWidget(Widget):
         s = Select(choices=choices)
         select_html = s.render(field % name, val, local_attrs)
         return select_html
-
-    def _has_changed(self, initial, data):
-        try:
-            input_format = get_format('DATE_INPUT_FORMATS')[0]
-            data = datetime_safe.datetime.strptime(data, input_format).date()
-        except (TypeError, ValueError):
-            pass
-        return super(SelectDateWidget, self)._has_changed(initial, data)
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 4438812a37..146a10d635 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -8,6 +8,7 @@ import copy
 import datetime
 import os
 import re
+import sys
 try:
     from urllib.parse import urlsplit, urlunsplit
 except ImportError:     # Python 2
@@ -18,15 +19,17 @@ from io import BytesIO
 from django.core import validators
 from django.core.exceptions import ValidationError
 from django.forms.util import ErrorList, from_current_timezone, to_current_timezone
-from django.forms.widgets import (TextInput, PasswordInput, HiddenInput,
+from django.forms.widgets import (
+    TextInput, NumberInput, EmailInput, URLInput, HiddenInput,
     MultipleHiddenInput, ClearableFileInput, CheckboxInput, Select,
     NullBooleanSelect, SelectMultiple, DateInput, DateTimeInput, TimeInput,
-    SplitDateTimeWidget, SplitHiddenDateTimeWidget, FILE_INPUT_CONTRADICTION)
+    SplitDateTimeWidget, SplitHiddenDateTimeWidget, FILE_INPUT_CONTRADICTION
+)
 from django.utils import formats
-from django.utils.encoding import smart_text, force_text
+from django.utils.encoding import smart_text, force_str, force_text
 from django.utils.ipv6 import clean_ipv6_address
 from django.utils import six
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
 # Provide this import for backwards compatibility.
 from django.core.validators import EMPTY_VALUES
@@ -47,16 +50,18 @@ class Field(object):
     widget = TextInput # Default widget to use when rendering this type of Field.
     hidden_widget = HiddenInput # Default widget to use when rendering this as "hidden".
     default_validators = [] # Default set of validators
+    # Add an 'invalid' entry to default_error_message if you want a specific
+    # field error message not raised by the field validators.
     default_error_messages = {
         'required': _('This field is required.'),
-        'invalid': _('Enter a valid value.'),
     }
+    empty_values = list(validators.EMPTY_VALUES)
 
     # Tracks each time a Field instance is created. Used to retain order.
     creation_counter = 0
 
     def __init__(self, required=True, widget=None, label=None, initial=None,
-                 help_text=None, error_messages=None, show_hidden_initial=False,
+                 help_text='', error_messages=None, show_hidden_initial=False,
                  validators=[], localize=False):
         # required -- Boolean that specifies whether the field is required.
         #             True by default.
@@ -77,14 +82,9 @@ class Field(object):
         #                        hidden widget with initial value after widget.
         # validators -- List of addtional validators to use
         # localize -- Boolean that specifies if the field should be localized.
-        if label is not None:
-            label = smart_text(label)
         self.required, self.label, self.initial = required, label, initial
         self.show_hidden_initial = show_hidden_initial
-        if help_text is None:
-            self.help_text = ''
-        else:
-            self.help_text = smart_text(help_text)
+        self.help_text = help_text
         widget = widget or self.widget
         if isinstance(widget, type):
             widget = widget()
@@ -115,6 +115,7 @@ class Field(object):
         self.error_messages = messages
 
         self.validators = self.default_validators + validators
+        super(Field, self).__init__()
 
     def prepare_value(self, value):
         return value
@@ -123,11 +124,11 @@ class Field(object):
         return value
 
     def validate(self, value):
-        if value in validators.EMPTY_VALUES and self.required:
+        if value in self.empty_values and self.required:
             raise ValidationError(self.error_messages['required'])
 
     def run_validators(self, value):
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return
         errors = []
         for v in self.validators:
@@ -175,6 +176,21 @@ class Field(object):
         """
         return {}
 
+    def _has_changed(self, initial, data):
+        """
+        Return True if data differs from initial.
+        """
+        # For purposes of seeing whether something has changed, None is
+        # the same as an empty string, if the data or inital value we get
+        # is None, replace it w/ ''.
+        initial_value = initial if initial is not None else ''
+        try:
+            data = self.to_python(data)
+        except ValidationError:
+            return True
+        data_value = data if data is not None else ''
+        return initial_value != data_value
+
     def __deepcopy__(self, memo):
         result = copy.copy(self)
         memo[id(self)] = result
@@ -193,7 +209,7 @@ class CharField(Field):
 
     def to_python(self, value):
         "Returns a Unicode object."
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return ''
         return smart_text(value)
 
@@ -207,12 +223,11 @@ class CharField(Field):
 class IntegerField(Field):
     default_error_messages = {
         'invalid': _('Enter a whole number.'),
-        'max_value': _('Ensure this value is less than or equal to %(limit_value)s.'),
-        'min_value': _('Ensure this value is greater than or equal to %(limit_value)s.'),
     }
 
     def __init__(self, max_value=None, min_value=None, *args, **kwargs):
         self.max_value, self.min_value = max_value, min_value
+        kwargs.setdefault('widget', NumberInput if not kwargs.get('localize') else self.widget)
         super(IntegerField, self).__init__(*args, **kwargs)
 
         if max_value is not None:
@@ -226,7 +241,7 @@ class IntegerField(Field):
         of int(). Returns None for empty values.
         """
         value = super(IntegerField, self).to_python(value)
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return None
         if self.localize:
             value = formats.sanitize_separators(value)
@@ -236,6 +251,16 @@ class IntegerField(Field):
             raise ValidationError(self.error_messages['invalid'])
         return value
 
+    def widget_attrs(self, widget):
+        attrs = super(IntegerField, self).widget_attrs(widget)
+        if isinstance(widget, NumberInput):
+            if self.min_value is not None:
+                attrs['min'] = self.min_value
+            if self.max_value is not None:
+                attrs['max'] = self.max_value
+        return attrs
+
+
 class FloatField(IntegerField):
     default_error_messages = {
         'invalid': _('Enter a number.'),
@@ -247,7 +272,7 @@ class FloatField(IntegerField):
         of float(). Returns None for empty values.
         """
         value = super(IntegerField, self).to_python(value)
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return None
         if self.localize:
             value = formats.sanitize_separators(value)
@@ -257,25 +282,33 @@ class FloatField(IntegerField):
             raise ValidationError(self.error_messages['invalid'])
         return value
 
-class DecimalField(Field):
+    def widget_attrs(self, widget):
+        attrs = super(FloatField, self).widget_attrs(widget)
+        if isinstance(widget, NumberInput):
+            attrs.setdefault('step', 'any')
+        return attrs
+
+
+class DecimalField(IntegerField):
     default_error_messages = {
         'invalid': _('Enter a number.'),
-        'max_value': _('Ensure this value is less than or equal to %(limit_value)s.'),
-        'min_value': _('Ensure this value is greater than or equal to %(limit_value)s.'),
-        'max_digits': _('Ensure that there are no more than %s digits in total.'),
-        'max_decimal_places': _('Ensure that there are no more than %s decimal places.'),
-        'max_whole_digits': _('Ensure that there are no more than %s digits before the decimal point.')
+        'max_digits': ungettext_lazy(
+            'Ensure that there are no more than %(max)s digit in total.',
+            'Ensure that there are no more than %(max)s digits in total.',
+            'max'),
+        'max_decimal_places': ungettext_lazy(
+            'Ensure that there are no more than %(max)s decimal place.',
+            'Ensure that there are no more than %(max)s decimal places.',
+            'max'),
+        'max_whole_digits': ungettext_lazy(
+            'Ensure that there are no more than %(max)s digit before the decimal point.',
+            'Ensure that there are no more than %(max)s digits before the decimal point.',
+            'max'),
     }
 
     def __init__(self, max_value=None, min_value=None, max_digits=None, decimal_places=None, *args, **kwargs):
-        self.max_value, self.min_value = max_value, min_value
         self.max_digits, self.decimal_places = max_digits, decimal_places
-        Field.__init__(self, *args, **kwargs)
-
-        if max_value is not None:
-            self.validators.append(validators.MaxValueValidator(max_value))
-        if min_value is not None:
-            self.validators.append(validators.MinValueValidator(min_value))
+        super(DecimalField, self).__init__(max_value, min_value, *args, **kwargs)
 
     def to_python(self, value):
         """
@@ -284,7 +317,7 @@ class DecimalField(Field):
         than max_digits in the number, and no more than decimal_places digits
         after the decimal point.
         """
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return None
         if self.localize:
             value = formats.sanitize_separators(value)
@@ -297,7 +330,7 @@ class DecimalField(Field):
 
     def validate(self, value):
         super(DecimalField, self).validate(value)
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return
         # Check for NaN, Inf and -Inf values. We can't compare directly for NaN,
         # since it is never equal to itself. However, NaN is the only value that
@@ -317,13 +350,30 @@ class DecimalField(Field):
         whole_digits = digits - decimals
 
         if self.max_digits is not None and digits > self.max_digits:
-            raise ValidationError(self.error_messages['max_digits'] % self.max_digits)
+            raise ValidationError(self.error_messages['max_digits'] % {
+                                  'max': self.max_digits})
         if self.decimal_places is not None and decimals > self.decimal_places:
-            raise ValidationError(self.error_messages['max_decimal_places'] % self.decimal_places)
-        if self.max_digits is not None and self.decimal_places is not None and whole_digits > (self.max_digits - self.decimal_places):
-            raise ValidationError(self.error_messages['max_whole_digits'] % (self.max_digits - self.decimal_places))
+            raise ValidationError(self.error_messages['max_decimal_places'] % {
+                                  'max': self.decimal_places})
+        if (self.max_digits is not None and self.decimal_places is not None
+                and whole_digits > (self.max_digits - self.decimal_places)):
+            raise ValidationError(self.error_messages['max_whole_digits'] % {
+                                  'max': (self.max_digits - self.decimal_places)})
         return value
 
+    def widget_attrs(self, widget):
+        attrs = super(DecimalField, self).widget_attrs(widget)
+        if isinstance(widget, NumberInput):
+            if self.max_digits is not None:
+                max_length = self.max_digits + 1  # for the sign
+                if self.decimal_places is None or self.decimal_places > 0:
+                    max_length += 1  # for the dot
+                attrs['maxlength'] = max_length
+            if self.decimal_places:
+                attrs['step'] = '0.%s1' % ('0' * (self.decimal_places-1))
+        return attrs
+
+
 class BaseTemporalField(Field):
 
     def __init__(self, input_formats=None, *args, **kwargs):
@@ -348,6 +398,7 @@ class BaseTemporalField(Field):
     def strptime(self, value, format):
         raise NotImplementedError('Subclasses must define this method.')
 
+
 class DateField(BaseTemporalField):
     widget = DateInput
     input_formats = formats.get_format_lazy('DATE_INPUT_FORMATS')
@@ -360,7 +411,7 @@ class DateField(BaseTemporalField):
         Validates that the input can be converted to a date. Returns a Python
         datetime.date object.
         """
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return None
         if isinstance(value, datetime.datetime):
             return value.date()
@@ -369,7 +420,8 @@ class DateField(BaseTemporalField):
         return super(DateField, self).to_python(value)
 
     def strptime(self, value, format):
-        return datetime.datetime.strptime(value, format).date()
+        return datetime.datetime.strptime(force_str(value), format).date()
+
 
 class TimeField(BaseTemporalField):
     widget = TimeInput
@@ -383,14 +435,14 @@ class TimeField(BaseTemporalField):
         Validates that the input can be converted to a time. Returns a Python
         datetime.time object.
         """
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return None
         if isinstance(value, datetime.time):
             return value
         return super(TimeField, self).to_python(value)
 
     def strptime(self, value, format):
-        return datetime.datetime.strptime(value, format).time()
+        return datetime.datetime.strptime(force_str(value), format).time()
 
 class DateTimeField(BaseTemporalField):
     widget = DateTimeInput
@@ -409,7 +461,7 @@ class DateTimeField(BaseTemporalField):
         Validates that the input can be converted to a datetime. Returns a
         Python datetime.datetime object.
         """
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return None
         if isinstance(value, datetime.datetime):
             return from_current_timezone(value)
@@ -421,14 +473,14 @@ class DateTimeField(BaseTemporalField):
             # components: date and time.
             if len(value) != 2:
                 raise ValidationError(self.error_messages['invalid'])
-            if value[0] in validators.EMPTY_VALUES and value[1] in validators.EMPTY_VALUES:
+            if value[0] in self.empty_values and value[1] in self.empty_values:
                 return None
             value = '%s %s' % tuple(value)
         result = super(DateTimeField, self).to_python(value)
         return from_current_timezone(result)
 
     def strptime(self, value, format):
-        return datetime.datetime.strptime(value, format)
+        return datetime.datetime.strptime(force_str(value), format)
 
 class RegexField(CharField):
     def __init__(self, regex, max_length=None, min_length=None, error_message=None, *args, **kwargs):
@@ -460,9 +512,7 @@ class RegexField(CharField):
     regex = property(_get_regex, _set_regex)
 
 class EmailField(CharField):
-    default_error_messages = {
-        'invalid': _('Enter a valid email address.'),
-    }
+    widget = EmailInput
     default_validators = [validators.validate_email]
 
     def clean(self, value):
@@ -475,7 +525,10 @@ class FileField(Field):
         'invalid': _("No file was submitted. Check the encoding type on the form."),
         'missing': _("No file was submitted."),
         'empty': _("The submitted file is empty."),
-        'max_length': _('Ensure this filename has at most %(max)d characters (it has %(length)d).'),
+        'max_length': ungettext_lazy(
+            'Ensure this filename has at most %(max)d character (it has %(length)d).',
+            'Ensure this filename has at most %(max)d characters (it has %(length)d).',
+            'max'),
         'contradiction': _('Please either submit a file or check the clear checkbox, not both.')
     }
 
@@ -485,7 +538,7 @@ class FileField(Field):
         super(FileField, self).__init__(*args, **kwargs)
 
     def to_python(self, data):
-        if data in validators.EMPTY_VALUES:
+        if data in self.empty_values:
             return None
 
         # UploadedFile objects should have name and size attributes.
@@ -516,7 +569,7 @@ class FileField(Field):
                 return False
             # If the field is required, clearing is not possible (the widget
             # shouldn't return False data in that case anyway). False is not
-            # in validators.EMPTY_VALUES; if a False value makes it this far
+            # in self.empty_value; if a False value makes it this far
             # it should be validated from here on out as None (so it will be
             # caught by the required check).
             data = None
@@ -529,6 +582,12 @@ class FileField(Field):
             return initial
         return data
 
+    def _has_changed(self, initial, data):
+        if data is None:
+            return False
+        return True
+
+
 class ImageField(FileField):
     default_error_messages = {
         'invalid_image': _("Upload a valid image. The file you uploaded was either not an image or a corrupted image."),
@@ -570,12 +629,13 @@ class ImageField(FileField):
             # raised. Catch and re-raise.
             raise
         except Exception: # Python Imaging Library doesn't recognize it as an image
-            raise ValidationError(self.error_messages['invalid_image'])
+            six.reraise(ValidationError, ValidationError(self.error_messages['invalid_image']), sys.exc_info()[2])
         if hasattr(f, 'seek') and callable(f.seek):
             f.seek(0)
         return f
 
 class URLField(CharField):
+    widget = URLInput
     default_error_messages = {
         'invalid': _('Enter a valid URL.'),
     }
@@ -618,6 +678,7 @@ class URLField(CharField):
             value = urlunsplit(url_fields)
         return value
 
+
 class BooleanField(Field):
     widget = CheckboxInput
 
@@ -631,10 +692,20 @@ class BooleanField(Field):
             value = False
         else:
             value = bool(value)
-        value = super(BooleanField, self).to_python(value)
+        return super(BooleanField, self).to_python(value)
+
+    def validate(self, value):
         if not value and self.required:
             raise ValidationError(self.error_messages['required'])
-        return value
+
+    def _has_changed(self, initial, data):
+        # Sometimes data or initial could be None or '' which should be the
+        # same thing as False.
+        if initial == 'False':
+            # show_hidden_initial may have transformed False to 'False'
+            initial = False
+        return bool(initial) != bool(data)
+
 
 class NullBooleanField(BooleanField):
     """
@@ -660,6 +731,15 @@ class NullBooleanField(BooleanField):
     def validate(self, value):
         pass
 
+    def _has_changed(self, initial, data):
+        # None (unknown) and False (No) are not the same
+        if initial is not None:
+            initial = bool(initial)
+        if data is not None:
+            data = bool(data)
+        return initial != data
+
+
 class ChoiceField(Field):
     widget = Select
     default_error_messages = {
@@ -667,7 +747,7 @@ class ChoiceField(Field):
     }
 
     def __init__(self, choices=(), required=True, widget=None, label=None,
-                 initial=None, help_text=None, *args, **kwargs):
+                 initial=None, help_text='', *args, **kwargs):
         super(ChoiceField, self).__init__(required=required, widget=widget, label=label,
                                         initial=initial, help_text=help_text, *args, **kwargs)
         self.choices = choices
@@ -690,7 +770,7 @@ class ChoiceField(Field):
 
     def to_python(self, value):
         "Returns a Unicode object."
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return ''
         return smart_text(value)
 
@@ -704,14 +784,15 @@ class ChoiceField(Field):
 
     def valid_value(self, value):
         "Check to see if the provided value is a valid choice"
+        text_value = force_text(value)
         for k, v in self.choices:
             if isinstance(v, (list, tuple)):
                 # This is an optgroup, so look inside the group for options
                 for k2, v2 in v:
-                    if value == smart_text(k2):
+                    if value == k2 or text_value == force_text(k2):
                         return True
             else:
-                if value == smart_text(k):
+                if value == k or text_value == force_text(k):
                     return True
         return False
 
@@ -727,8 +808,7 @@ class TypedChoiceField(ChoiceField):
         right type.
         """
         value = super(TypedChoiceField, self).to_python(value)
-        super(TypedChoiceField, self).validate(value)
-        if value == self.empty_value or value in validators.EMPTY_VALUES:
+        if value == self.empty_value or value in self.empty_values:
             return self.empty_value
         try:
             value = self.coerce(value)
@@ -736,8 +816,6 @@ class TypedChoiceField(ChoiceField):
             raise ValidationError(self.error_messages['invalid_choice'] % {'value': value})
         return value
 
-    def validate(self, value):
-        pass
 
 class MultipleChoiceField(ChoiceField):
     hidden_widget = MultipleHiddenInput
@@ -765,6 +843,18 @@ class MultipleChoiceField(ChoiceField):
             if not self.valid_value(val):
                 raise ValidationError(self.error_messages['invalid_choice'] % {'value': val})
 
+    def _has_changed(self, initial, data):
+        if initial is None:
+            initial = []
+        if data is None:
+            data = []
+        if len(initial) != len(data):
+            return True
+        initial_set = set([force_text(value) for value in initial])
+        data_set = set([force_text(value) for value in data])
+        return data_set != initial_set
+
+
 class TypedMultipleChoiceField(MultipleChoiceField):
     def __init__(self, *args, **kwargs):
         self.coerce = kwargs.pop('coerce', lambda val: val)
@@ -777,8 +867,7 @@ class TypedMultipleChoiceField(MultipleChoiceField):
         right type.
         """
         value = super(TypedMultipleChoiceField, self).to_python(value)
-        super(TypedMultipleChoiceField, self).validate(value)
-        if value == self.empty_value or value in validators.EMPTY_VALUES:
+        if value == self.empty_value or value in self.empty_values:
             return self.empty_value
         new_value = []
         for choice in value:
@@ -789,7 +878,11 @@ class TypedMultipleChoiceField(MultipleChoiceField):
         return new_value
 
     def validate(self, value):
-        pass
+        if value != self.empty_value:
+            super(TypedMultipleChoiceField, self).validate(value)
+        elif self.required:
+            raise ValidationError(self.error_messages['required'])
+
 
 class ComboField(Field):
     """
@@ -859,7 +952,7 @@ class MultiValueField(Field):
         clean_data = []
         errors = ErrorList()
         if not value or isinstance(value, (list, tuple)):
-            if not value or not [v for v in value if v not in validators.EMPTY_VALUES]:
+            if not value or not [v for v in value if v not in self.empty_values]:
                 if self.required:
                     raise ValidationError(self.error_messages['required'])
                 else:
@@ -871,7 +964,7 @@ class MultiValueField(Field):
                 field_value = value[i]
             except IndexError:
                 field_value = None
-            if self.required and field_value in validators.EMPTY_VALUES:
+            if self.required and field_value in self.empty_values:
                 raise ValidationError(self.error_messages['required'])
             try:
                 clean_data.append(field.clean(field_value))
@@ -899,10 +992,22 @@ class MultiValueField(Field):
         """
         raise NotImplementedError('Subclasses must implement this method.')
 
+    def _has_changed(self, initial, data):
+        if initial is None:
+            initial = ['' for x in range(0, len(data))]
+        else:
+            if not isinstance(initial, list):
+                initial = self.widget.decompress(initial)
+        for field, initial, data in zip(self.fields, initial, data):
+            if field._has_changed(initial, data):
+                return True
+        return False
+
+
 class FilePathField(ChoiceField):
     def __init__(self, path, match=None, recursive=False, allow_files=True,
                  allow_folders=False, required=True, widget=None, label=None,
-                 initial=None, help_text=None, *args, **kwargs):
+                 initial=None, help_text='', *args, **kwargs):
         self.path, self.match, self.recursive = path, match, recursive
         self.allow_files, self.allow_folders = allow_files, allow_folders
         super(FilePathField, self).__init__(choices=(), required=required,
@@ -973,9 +1078,9 @@ class SplitDateTimeField(MultiValueField):
         if data_list:
             # Raise a validation error if time or date is empty
             # (possible if SplitDateTimeField has required=False).
-            if data_list[0] in validators.EMPTY_VALUES:
+            if data_list[0] in self.empty_values:
                 raise ValidationError(self.error_messages['invalid_date'])
-            if data_list[1] in validators.EMPTY_VALUES:
+            if data_list[1] in self.empty_values:
                 raise ValidationError(self.error_messages['invalid_time'])
             result = datetime.datetime.combine(*data_list)
             return from_current_timezone(result)
@@ -983,34 +1088,28 @@ class SplitDateTimeField(MultiValueField):
 
 
 class IPAddressField(CharField):
-    default_error_messages = {
-        'invalid': _('Enter a valid IPv4 address.'),
-    }
     default_validators = [validators.validate_ipv4_address]
 
+    def to_python(self, value):
+        if value in self.empty_values:
+            return ''
+        return value.strip()
+
 
 class GenericIPAddressField(CharField):
-    default_error_messages = {}
-
     def __init__(self, protocol='both', unpack_ipv4=False, *args, **kwargs):
         self.unpack_ipv4 = unpack_ipv4
-        self.default_validators, invalid_error_message = \
-            validators.ip_address_validators(protocol, unpack_ipv4)
-        self.default_error_messages['invalid'] = invalid_error_message
+        self.default_validators = validators.ip_address_validators(protocol, unpack_ipv4)[0]
         super(GenericIPAddressField, self).__init__(*args, **kwargs)
 
     def to_python(self, value):
-        if value in validators.EMPTY_VALUES:
+        if value in self.empty_values:
             return ''
+        value = value.strip()
         if value and ':' in value:
-                return clean_ipv6_address(value,
-                    self.unpack_ipv4, self.error_messages['invalid'])
+            return clean_ipv6_address(value, self.unpack_ipv4)
         return value
 
 
 class SlugField(CharField):
-    default_error_messages = {
-        'invalid': _("Enter a valid 'slug' consisting of letters, numbers,"
-                     " underscores or hyphens."),
-    }
     default_validators = [validators.validate_slug]
diff --git a/django/forms/forms.py b/django/forms/forms.py
index 3299c2becc..f3a0fe6b38 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -5,6 +5,7 @@ Form classes
 from __future__ import absolute_import, unicode_literals
 
 import copy
+import warnings
 
 from django.core.exceptions import ValidationError
 from django.forms.fields import Field, FileField
@@ -14,6 +15,7 @@ from django.utils.datastructures import SortedDict
 from django.utils.html import conditional_escape, format_html
 from django.utils.encoding import smart_text, force_text, python_2_unicode_compatible
 from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext as _
 from django.utils import six
 
 
@@ -31,12 +33,12 @@ def get_declared_fields(bases, attrs, with_base_fields=True):
     """
     Create a list of form field instances from the passed in 'attrs', plus any
     similar fields on the base classes (in 'bases'). This is used by both the
-    Form and ModelForm metclasses.
+    Form and ModelForm metaclasses.
 
     If 'with_base_fields' is True, all fields from the bases are used.
     Otherwise, only fields in the 'declared_fields' attribute on the bases are
     used. The distinction is useful in ModelForm subclassing.
-    Also integrates any additional media definitions
+    Also integrates any additional media definitions.
     """
     fields = [(field_name, attrs.pop(field_name)) for field_name, obj in list(six.iteritems(attrs)) if isinstance(obj, Field)]
     fields.sort(key=lambda x: x[1].creation_counter)
@@ -111,12 +113,12 @@ class BaseForm(object):
             raise KeyError('Key %r not found in Form' % name)
         return BoundField(self, field, name)
 
-    def _get_errors(self):
+    @property
+    def errors(self):
         "Returns an ErrorDict for the data provided for the form"
         if self._errors is None:
             self.full_clean()
         return self._errors
-    errors = property(_get_errors)
 
     def is_valid(self):
         """
@@ -148,10 +150,13 @@ class BaseForm(object):
         for name, field in self.fields.items():
             html_class_attr = ''
             bf = self[name]
-            bf_errors = self.error_class([conditional_escape(error) for error in bf.errors]) # Escape and cache in local variable.
+            # Escape and cache in local variable.
+            bf_errors = self.error_class([conditional_escape(error) for error in bf.errors])
             if bf.is_hidden:
                 if bf_errors:
-                    top_errors.extend(['(Hidden field %s) %s' % (name, force_text(e)) for e in bf_errors])
+                    top_errors.extend(
+                        [_('(Hidden field %(name)s) %(error)s') % {'name': name, 'error': force_text(e)}
+                         for e in bf_errors])
                 hidden_fields.append(six.text_type(bf))
             else:
                 # Create a 'class="..."' atribute if the row should have any
@@ -322,7 +327,8 @@ class BaseForm(object):
         """
         return bool(self.changed_data)
 
-    def _get_changed_data(self):
+    @property
+    def changed_data(self):
         if self._changed_data is None:
             self._changed_data = []
             # XXX: For now we're asking the individual widgets whether or not the
@@ -339,14 +345,25 @@ class BaseForm(object):
                 else:
                     initial_prefixed_name = self.add_initial_prefix(name)
                     hidden_widget = field.hidden_widget()
-                    initial_value = hidden_widget.value_from_datadict(
-                        self.data, self.files, initial_prefixed_name)
-                if field.widget._has_changed(initial_value, data_value):
+                    try:
+                        initial_value = field.to_python(hidden_widget.value_from_datadict(
+                            self.data, self.files, initial_prefixed_name))
+                    except ValidationError:
+                        # Always assume data has changed if validation fails.
+                        self._changed_data.append(name)
+                        continue
+                if hasattr(field.widget, '_has_changed'):
+                    warnings.warn("The _has_changed method on widgets is deprecated,"
+                        " define it at field level instead.",
+                        PendingDeprecationWarning, stacklevel=2)
+                    if field.widget._has_changed(initial_value, data_value):
+                        self._changed_data.append(name)
+                elif field._has_changed(initial_value, data_value):
                     self._changed_data.append(name)
         return self._changed_data
-    changed_data = property(_get_changed_data)
 
-    def _get_media(self):
+    @property
+    def media(self):
         """
         Provide a description of all media required to render the widgets on this form
         """
@@ -354,7 +371,6 @@ class BaseForm(object):
         for field in self.fields.values():
             media = media + field.widget.media
         return media
-    media = property(_get_media)
 
     def is_multipart(self):
         """
@@ -426,13 +442,13 @@ class BoundField(object):
     def __getitem__(self, idx):
         return list(self.__iter__())[idx]
 
-    def _errors(self):
+    @property
+    def errors(self):
         """
         Returns an ErrorList for this field. Returns an empty ErrorList
         if there are none.
         """
         return self.form.errors.get(self.name, self.form.error_class())
-    errors = property(_errors)
 
     def as_widget(self, widget=None, attrs=None, only_initial=False):
         """
@@ -473,12 +489,12 @@ class BoundField(object):
         """
         return self.as_widget(self.field.hidden_widget(), attrs, **kwargs)
 
-    def _data(self):
+    @property
+    def data(self):
         """
         Returns the data for this BoundField, or None if it wasn't given.
         """
         return self.field.widget.value_from_datadict(self.form.data, self.form.files, self.html_name)
-    data = property(_data)
 
     def value(self):
         """
@@ -503,7 +519,7 @@ class BoundField(object):
 
         If attrs are given, they're used as HTML attributes on the <label> tag.
         """
-        contents = contents or conditional_escape(self.label)
+        contents = contents or self.label
         widget = self.field.widget
         id_ = widget.attrs.get('id') or self.auto_id
         if id_:
@@ -511,6 +527,8 @@ class BoundField(object):
             contents = format_html('<label for="{0}"{1}>{2}</label>',
                                    widget.id_for_label(id_), attrs, contents
                                    )
+        else:
+            contents = conditional_escape(contents)
         return mark_safe(contents)
 
     def css_classes(self, extra_classes=None):
@@ -526,12 +544,13 @@ class BoundField(object):
             extra_classes.add(self.form.required_css_class)
         return ' '.join(extra_classes)
 
-    def _is_hidden(self):
+    @property
+    def is_hidden(self):
         "Returns True if this BoundField's widget is hidden."
         return self.field.widget.is_hidden
-    is_hidden = property(_is_hidden)
 
-    def _auto_id(self):
+    @property
+    def auto_id(self):
         """
         Calculates and returns the ID attribute for this BoundField, if the
         associated Form has specified auto_id. Returns an empty string otherwise.
@@ -542,9 +561,9 @@ class BoundField(object):
         elif auto_id:
             return self.html_name
         return ''
-    auto_id = property(_auto_id)
 
-    def _id_for_label(self):
+    @property
+    def id_for_label(self):
         """
         Wrapper around the field widget's `id_for_label` method.
         Useful, for example, for focusing on this field regardless of whether
@@ -553,4 +572,3 @@ class BoundField(object):
         widget = self.field.widget
         id_ = widget.attrs.get('id') or self.auto_id
         return widget.id_for_label(id_)
-    id_for_label = property(_id_for_label)
diff --git a/django/forms/formsets.py b/django/forms/formsets.py
index 3893cc54ba..2ab197dee2 100644
--- a/django/forms/formsets.py
+++ b/django/forms/formsets.py
@@ -21,6 +21,9 @@ MAX_NUM_FORM_COUNT = 'MAX_NUM_FORMS'
 ORDERING_FIELD_NAME = 'ORDER'
 DELETION_FIELD_NAME = 'DELETE'
 
+# default maximum number of forms in a formset, to prevent memory exhaustion
+DEFAULT_MAX_NUM = 1000
+
 class ManagementForm(Form):
     """
     ``ManagementForm`` is used to keep track of how many form instances
@@ -30,6 +33,9 @@ class ManagementForm(Form):
     def __init__(self, *args, **kwargs):
         self.base_fields[TOTAL_FORM_COUNT] = IntegerField(widget=HiddenInput)
         self.base_fields[INITIAL_FORM_COUNT] = IntegerField(widget=HiddenInput)
+        # MAX_NUM_FORM_COUNT is output with the rest of the management form,
+        # but only for the convenience of client-side code. The POST
+        # value of MAX_NUM_FORM_COUNT returned from the client is not checked.
         self.base_fields[MAX_NUM_FORM_COUNT] = IntegerField(required=False, widget=HiddenInput)
         super(ManagementForm, self).__init__(*args, **kwargs)
 
@@ -91,17 +97,20 @@ class BaseFormSet(object):
     def total_form_count(self):
         """Returns the total number of forms in this FormSet."""
         if self.is_bound:
-            return self.management_form.cleaned_data[TOTAL_FORM_COUNT]
+            # return absolute_max if it is lower than the actual total form
+            # count in the data; this is DoS protection to prevent clients
+            # from forcing the server to instantiate arbitrary numbers of
+            # forms
+            return min(self.management_form.cleaned_data[TOTAL_FORM_COUNT], self.absolute_max)
         else:
             initial_forms = self.initial_form_count()
             total_forms = initial_forms + self.extra
             # Allow all existing related objects/inlines to be displayed,
             # but don't allow extra beyond max_num.
-            if self.max_num is not None:
-                if initial_forms > self.max_num >= 0:
-                    total_forms = initial_forms
-                elif total_forms > self.max_num >= 0:
-                    total_forms = self.max_num
+            if initial_forms > self.max_num >= 0:
+                total_forms = initial_forms
+            elif total_forms > self.max_num >= 0:
+                total_forms = self.max_num
         return total_forms
 
     def initial_form_count(self):
@@ -109,15 +118,14 @@ class BaseFormSet(object):
         if self.is_bound:
             return self.management_form.cleaned_data[INITIAL_FORM_COUNT]
         else:
-            # Use the length of the inital data if it's there, 0 otherwise.
+            # Use the length of the initial data if it's there, 0 otherwise.
             initial_forms = self.initial and len(self.initial) or 0
-            if self.max_num is not None and (initial_forms > self.max_num >= 0):
-                initial_forms = self.max_num
         return initial_forms
 
     def _construct_forms(self):
         # instantiate all the forms and put them in self.forms
         self.forms = []
+        # DoS protection is included in total_form_count()
         for i in xrange(self.total_form_count()):
             self.forms.append(self._construct_form(i))
 
@@ -157,18 +165,15 @@ class BaseFormSet(object):
         return self.forms[self.initial_form_count():]
 
     @property
-    def empty_form(self, **kwargs):
-        defaults = {
-            'auto_id': self.auto_id,
-            'prefix': self.add_prefix('__prefix__'),
-            'empty_permitted': True,
-        }
-        defaults.update(kwargs)
-        form = self.form(**defaults)
+    def empty_form(self):
+        form = self.form(
+            auto_id=self.auto_id,
+            prefix=self.add_prefix('__prefix__'),
+            empty_permitted=True,
+        )
         self.add_fields(form, None)
         return form
 
-    # Maybe this should just go away?
     @property
     def cleaned_data(self):
         """
@@ -181,11 +186,10 @@ class BaseFormSet(object):
     @property
     def deleted_forms(self):
         """
-        Returns a list of forms that have been marked for deletion. Raises an
-        AttributeError if deletion is not allowed.
+        Returns a list of forms that have been marked for deletion.
         """
         if not self.is_valid() or not self.can_delete:
-            raise AttributeError("'%s' object has no attribute 'deleted_forms'" % self.__class__.__name__)
+            return []
         # construct _deleted_form_indexes which is just a list of form indexes
         # that have had their deletion widget set to True
         if not hasattr(self, '_deleted_form_indexes'):
@@ -295,8 +299,11 @@ class BaseFormSet(object):
         for i in range(0, self.total_form_count()):
             form = self.forms[i]
             self._errors.append(form.errors)
-        # Give self.clean() a chance to do cross-form validation.
         try:
+            if (self.validate_max and self.total_form_count() > self.max_num) or \
+                self.management_form.cleaned_data[TOTAL_FORM_COUNT] > self.absolute_max:
+                raise ValidationError(_("Please submit %s or fewer forms." % self.max_num))
+            # Give self.clean() a chance to do cross-form validation.
             self.clean()
         except ValidationError as e:
             self._non_form_errors = self.error_class(e.messages)
@@ -335,7 +342,10 @@ class BaseFormSet(object):
         Returns True if the formset needs to be multipart, i.e. it
         has FileInput. Otherwise, False.
         """
-        return self.forms and self.forms[0].is_multipart()
+        if self.forms:
+            return self.forms[0].is_multipart()
+        else:
+            return self.empty_form.is_multipart()
 
     @property
     def media(self):
@@ -344,7 +354,7 @@ class BaseFormSet(object):
         if self.forms:
             return self.forms[0].media
         else:
-            return Media()
+            return self.empty_form.media
 
     def as_table(self):
         "Returns this formset rendered as HTML <tr>s -- excluding the <table></table>."
@@ -365,11 +375,18 @@ class BaseFormSet(object):
         return mark_safe('\n'.join([six.text_type(self.management_form), forms]))
 
 def formset_factory(form, formset=BaseFormSet, extra=1, can_order=False,
-                    can_delete=False, max_num=None):
+                    can_delete=False, max_num=None, validate_max=False):
     """Return a FormSet for the given form class."""
+    if max_num is None:
+        max_num = DEFAULT_MAX_NUM
+    # hard limit on forms instantiated, to prevent memory-exhaustion attacks
+    # limit is simply max_num + DEFAULT_MAX_NUM (which is 2*DEFAULT_MAX_NUM
+    # if max_num is None in the first place)
+    absolute_max = max_num + DEFAULT_MAX_NUM
     attrs = {'form': form, 'extra': extra,
              'can_order': can_order, 'can_delete': can_delete,
-             'max_num': max_num}
+             'max_num': max_num, 'absolute_max': absolute_max,
+             'validate_max' : validate_max}
     return type(form.__name__ + str('FormSet'), (formset,), attrs)
 
 def all_valid(formsets):
diff --git a/django/forms/models.py b/django/forms/models.py
index e9b71ccf26..5e7797809a 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -6,7 +6,6 @@ and database field objects.
 from __future__ import absolute_import, unicode_literals
 
 from django.core.exceptions import ValidationError, NON_FIELD_ERRORS, FieldError
-from django.core.validators import EMPTY_VALUES
 from django.forms.fields import Field, ChoiceField
 from django.forms.forms import BaseForm, get_declared_fields
 from django.forms.formsets import BaseFormSet, formset_factory
@@ -111,7 +110,7 @@ def model_to_dict(instance, fields=None, exclude=None):
     from django.db.models.fields.related import ManyToManyField
     opts = instance._meta
     data = {}
-    for f in opts.fields + opts.many_to_many:
+    for f in opts.concrete_fields + opts.many_to_many:
         if not f.editable:
             continue
         if fields and not f.name in fields:
@@ -141,11 +140,16 @@ def fields_for_model(model, fields=None, exclude=None, widgets=None, formfield_c
     ``exclude`` is an optional list of field names. If provided, the named
     fields will be excluded from the returned fields, even if they are listed
     in the ``fields`` argument.
+
+    ``widgets`` is a dictionary of model field names mapped to a widget
+
+    ``formfield_callback`` is a callable that takes a model field and returns
+    a form field.
     """
     field_list = []
     ignored = []
     opts = model._meta
-    for f in sorted(opts.fields + opts.many_to_many):
+    for f in sorted(opts.concrete_fields + opts.many_to_many):
         if not f.editable:
             continue
         if fields is not None and not f.name in fields:
@@ -201,6 +205,21 @@ class ModelFormMetaclass(type):
         if 'media' not in attrs:
             new_class.media = media_property(new_class)
         opts = new_class._meta = ModelFormOptions(getattr(new_class, 'Meta', None))
+
+        # We check if a string was passed to `fields` or `exclude`,
+        # which is likely to be a mistake where the user typed ('foo') instead
+        # of ('foo',)
+        for opt in ['fields', 'exclude']:
+            value = getattr(opts, opt)
+            if isinstance(value, six.string_types):
+                msg = ("%(model)s.Meta.%(opt)s cannot be a string. "
+                       "Did you mean to type: ('%(value)s',)?" % {
+                           'model': new_class.__name__,
+                           'opt': opt,
+                           'value': value,
+                       })
+                raise TypeError(msg)
+
         if opts.model:
             # If a model is defined, extract form fields from it.
             fields = fields_for_model(opts.model, opts.fields,
@@ -228,9 +247,9 @@ class BaseModelForm(BaseForm):
                  initial=None, error_class=ErrorList, label_suffix=':',
                  empty_permitted=False, instance=None):
         opts = self._meta
+        if opts.model is None:
+            raise ValueError('ModelForm has no model class specified.')
         if instance is None:
-            if opts.model is None:
-                raise ValueError('ModelForm has no model class specified.')
             # if we didn't get an instance, instantiate a new one
             self.instance = opts.model()
             object_data = {}
@@ -296,7 +315,7 @@ class BaseModelForm(BaseForm):
             else:
                 form_field = self.fields[field]
                 field_value = self.cleaned_data.get(field, None)
-                if not f.blank and not form_field.required and field_value in EMPTY_VALUES:
+                if not f.blank and not form_field.required and field_value in form_field.empty_values:
                     exclude.append(f.name)
         return exclude
 
@@ -371,6 +390,21 @@ class ModelForm(six.with_metaclass(ModelFormMetaclass, BaseModelForm)):
 
 def modelform_factory(model, form=ModelForm, fields=None, exclude=None,
                       formfield_callback=None,  widgets=None):
+    """
+    Returns a ModelForm containing form fields for the given model.
+
+    ``fields`` is an optional list of field names. If provided, only the named
+    fields will be included in the returned fields.
+
+    ``exclude`` is an optional list of field names. If provided, the named
+    fields will be excluded from the returned fields, even if they are listed
+    in the ``fields`` argument.
+
+    ``widgets`` is a dictionary of model field names mapped to a widget.
+
+    ``formfield_callback`` is a callable that takes a model field and returns
+    a form field.
+    """
     # Create the inner Meta class. FIXME: ideally, we should be able to
     # construct a ModelForm without creating and passing in a temporary
     # inner class.
@@ -459,7 +493,7 @@ class BaseModelFormSet(BaseFormSet):
             if self.queryset is not None:
                 qs = self.queryset
             else:
-                qs = self.model._default_manager.get_query_set()
+                qs = self.model._default_manager.get_queryset()
 
             # If the queryset isn't already ordered we need to add an
             # artificial ordering here to make sure that all formsets
@@ -493,6 +527,8 @@ class BaseModelFormSet(BaseFormSet):
             self.save_m2m = save_m2m
         return self.save_existing_objects(commit) + self.save_new_objects(commit)
 
+    save.alters_data = True
+
     def clean(self):
         self.validate_unique()
 
@@ -500,9 +536,9 @@ class BaseModelFormSet(BaseFormSet):
         # Collect unique_checks and date_checks to run from all the forms.
         all_unique_checks = set()
         all_date_checks = set()
-        for form in self.forms:
-            if not form.is_valid():
-                continue
+        forms_to_delete = self.deleted_forms
+        valid_forms = [form for form in self.forms if form.is_valid() and form not in forms_to_delete]
+        for form in valid_forms:
             exclude = form._get_validation_exclusions()
             unique_checks, date_checks = form.instance._get_unique_checks(exclude=exclude)
             all_unique_checks = all_unique_checks.union(set(unique_checks))
@@ -512,9 +548,7 @@ class BaseModelFormSet(BaseFormSet):
         # Do each of the unique checks (unique and unique_together)
         for uclass, unique_check in all_unique_checks:
             seen_data = set()
-            for form in self.forms:
-                if not form.is_valid():
-                    continue
+            for form in valid_forms:
                 # get data for each field of each of unique_check
                 row_data = tuple([form.cleaned_data[field] for field in unique_check if field in form.cleaned_data])
                 if row_data and not None in row_data:
@@ -534,9 +568,7 @@ class BaseModelFormSet(BaseFormSet):
         for date_check in all_date_checks:
             seen_data = set()
             uclass, lookup, field, unique_for = date_check
-            for form in self.forms:
-                if not form.is_valid():
-                    continue
+            for form in valid_forms:
                 # see if we have data for both fields
                 if (form.cleaned_data and form.cleaned_data[field] is not None
                     and form.cleaned_data[unique_for] is not None):
@@ -591,10 +623,7 @@ class BaseModelFormSet(BaseFormSet):
             return []
 
         saved_instances = []
-        try:
-            forms_to_delete = self.deleted_forms
-        except AttributeError:
-            forms_to_delete = []
+        forms_to_delete = self.deleted_forms
         for form in self.initial_forms:
             pk_name = self._pk_field.name
             raw_pk_value = form._raw_value(pk_name)
@@ -654,24 +683,30 @@ class BaseModelFormSet(BaseFormSet):
                 except IndexError:
                     pk_value = None
             if isinstance(pk, OneToOneField) or isinstance(pk, ForeignKey):
-                qs = pk.rel.to._default_manager.get_query_set()
+                qs = pk.rel.to._default_manager.get_queryset()
             else:
-                qs = self.model._default_manager.get_query_set()
+                qs = self.model._default_manager.get_queryset()
             qs = qs.using(form.instance._state.db)
-            form.fields[self._pk_field.name] = ModelChoiceField(qs, initial=pk_value, required=False, widget=HiddenInput)
+            if form._meta.widgets:
+                widget = form._meta.widgets.get(self._pk_field.name, HiddenInput)
+            else:
+                widget = HiddenInput
+            form.fields[self._pk_field.name] = ModelChoiceField(qs, initial=pk_value, required=False, widget=widget)
         super(BaseModelFormSet, self).add_fields(form, index)
 
 def modelformset_factory(model, form=ModelForm, formfield_callback=None,
-                         formset=BaseModelFormSet,
-                         extra=1, can_delete=False, can_order=False,
-                         max_num=None, fields=None, exclude=None):
+                         formset=BaseModelFormSet, extra=1, can_delete=False,
+                         can_order=False, max_num=None, fields=None,
+                         exclude=None, widgets=None, validate_max=False):
     """
     Returns a FormSet class for the given Django model class.
     """
     form = modelform_factory(model, form=form, fields=fields, exclude=exclude,
-                             formfield_callback=formfield_callback)
+                             formfield_callback=formfield_callback,
+                             widgets=widgets)
     FormSet = formset_factory(form, formset, extra=extra, max_num=max_num,
-                              can_order=can_order, can_delete=can_delete)
+                              can_order=can_order, can_delete=can_delete,
+                              validate_max=validate_max)
     FormSet.model = model
     return FormSet
 
@@ -682,17 +717,17 @@ class BaseInlineFormSet(BaseModelFormSet):
     """A formset for child objects related to a parent."""
     def __init__(self, data=None, files=None, instance=None,
                  save_as_new=False, prefix=None, queryset=None, **kwargs):
-        from django.db.models.fields.related import RelatedObject
         if instance is None:
             self.instance = self.fk.rel.to()
         else:
             self.instance = instance
         self.save_as_new = save_as_new
-        # is there a better way to get the object descriptor?
-        self.rel_name = RelatedObject(self.fk.rel.to, self.model, self.fk).get_accessor_name()
         if queryset is None:
             queryset = self.model._default_manager
-        qs = queryset.filter(**{self.fk.name: self.instance})
+        if self.instance.pk:
+            qs = queryset.filter(**{self.fk.name: self.instance})
+        else:
+            qs = queryset.none()
         super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix,
                                                 queryset=qs, **kwargs)
 
@@ -807,7 +842,7 @@ def inlineformset_factory(parent_model, model, form=ModelForm,
                           formset=BaseInlineFormSet, fk_name=None,
                           fields=None, exclude=None,
                           extra=3, can_order=False, can_delete=True, max_num=None,
-                          formfield_callback=None):
+                          formfield_callback=None, widgets=None, validate_max=False):
     """
     Returns an ``InlineFormSet`` for the given kwargs.
 
@@ -828,6 +863,8 @@ def inlineformset_factory(parent_model, model, form=ModelForm,
         'fields': fields,
         'exclude': exclude,
         'max_num': max_num,
+        'widgets': widgets,
+        'validate_max': validate_max,
     }
     FormSet = modelformset_factory(model, **kwargs)
     FormSet.fk = fk
@@ -836,15 +873,12 @@ def inlineformset_factory(parent_model, model, form=ModelForm,
 
 # Fields #####################################################################
 
-class InlineForeignKeyHiddenInput(HiddenInput):
-    def _has_changed(self, initial, data):
-        return False
-
 class InlineForeignKeyField(Field):
     """
     A basic integer field that deals with validating the given value to a
     given parent instance in an inline.
     """
+    widget = HiddenInput
     default_error_messages = {
         'invalid_choice': _('The inline foreign key did not match the parent instance primary key.'),
     }
@@ -859,11 +893,10 @@ class InlineForeignKeyField(Field):
             else:
                 kwargs["initial"] = self.parent_instance.pk
         kwargs["required"] = False
-        kwargs["widget"] = InlineForeignKeyHiddenInput
         super(InlineForeignKeyField, self).__init__(*args, **kwargs)
 
     def clean(self, value):
-        if value in EMPTY_VALUES:
+        if value in self.empty_values:
             if self.pk_field:
                 return None
             # if there is no value act as we did before.
@@ -877,6 +910,9 @@ class InlineForeignKeyField(Field):
             raise ValidationError(self.error_messages['invalid_choice'])
         return self.parent_instance
 
+    def _has_changed(self, initial, data):
+        return False
+
 class ModelChoiceIterator(object):
     def __init__(self, field):
         self.field = field
@@ -897,7 +933,8 @@ class ModelChoiceIterator(object):
                 yield self.choice(obj)
 
     def __len__(self):
-        return len(self.queryset)
+        return len(self.queryset) +\
+                    (1 if self.field.empty_label is not None else 0)
 
     def choice(self, obj):
         return (self.field.prepare_value(obj), self.field.label_from_instance(obj))
@@ -913,7 +950,7 @@ class ModelChoiceField(ChoiceField):
 
     def __init__(self, queryset, empty_label="---------", cache_choices=False,
                  required=True, widget=None, label=None, initial=None,
-                 help_text=None, to_field_name=None, *args, **kwargs):
+                 help_text='', to_field_name=None, *args, **kwargs):
         if required and (initial is not None):
             self.empty_label = None
         else:
@@ -979,7 +1016,7 @@ class ModelChoiceField(ChoiceField):
         return super(ModelChoiceField, self).prepare_value(value)
 
     def to_python(self, value):
-        if value in EMPTY_VALUES:
+        if value in self.empty_values:
             return None
         try:
             key = self.to_field_name or 'pk'
@@ -991,20 +1028,25 @@ class ModelChoiceField(ChoiceField):
     def validate(self, value):
         return Field.validate(self, value)
 
+    def _has_changed(self, initial, data):
+        initial_value = initial if initial is not None else ''
+        data_value = data if data is not None else ''
+        return force_text(self.prepare_value(initial_value)) != force_text(data_value)
+
 class ModelMultipleChoiceField(ModelChoiceField):
     """A MultipleChoiceField whose choices are a model QuerySet."""
     widget = SelectMultiple
     hidden_widget = MultipleHiddenInput
     default_error_messages = {
         'list': _('Enter a list of values.'),
-        'invalid_choice': _('Select a valid choice. %s is not one of the'
+        'invalid_choice': _('Select a valid choice. %(value)s is not one of the'
                             ' available choices.'),
-        'invalid_pk_value': _('"%s" is not a valid value for a primary key.')
+        'invalid_pk_value': _('"%(pk)s" is not a valid value for a primary key.')
     }
 
     def __init__(self, queryset, cache_choices=False, required=True,
                  widget=None, label=None, initial=None,
-                 help_text=None, *args, **kwargs):
+                 help_text='', *args, **kwargs):
         super(ModelMultipleChoiceField, self).__init__(queryset, None,
             cache_choices, required, widget, label, initial, help_text,
             *args, **kwargs)
@@ -1021,18 +1063,31 @@ class ModelMultipleChoiceField(ModelChoiceField):
             try:
                 self.queryset.filter(**{key: pk})
             except ValueError:
-                raise ValidationError(self.error_messages['invalid_pk_value'] % pk)
+                raise ValidationError(self.error_messages['invalid_pk_value'] % {'pk': pk})
         qs = self.queryset.filter(**{'%s__in' % key: value})
         pks = set([force_text(getattr(o, key)) for o in qs])
         for val in value:
             if force_text(val) not in pks:
-                raise ValidationError(self.error_messages['invalid_choice'] % val)
+                raise ValidationError(self.error_messages['invalid_choice'] % {'value': val})
         # Since this overrides the inherited ModelChoiceField.clean
         # we run custom validators here
         self.run_validators(value)
         return qs
 
     def prepare_value(self, value):
-        if hasattr(value, '__iter__') and not isinstance(value, six.text_type):
+        if (hasattr(value, '__iter__') and
+                not isinstance(value, six.text_type) and
+                not hasattr(value, '_meta')):
             return [super(ModelMultipleChoiceField, self).prepare_value(v) for v in value]
         return super(ModelMultipleChoiceField, self).prepare_value(value)
+
+    def _has_changed(self, initial, data):
+        if initial is None:
+            initial = []
+        if data is None:
+            data = []
+        if len(initial) != len(data):
+            return True
+        initial_set = set([force_text(value) for value in self.prepare_value(initial)])
+        data_set = set([force_text(value) for value in data])
+        return data_set != initial_set
diff --git a/django/forms/util.py b/django/forms/util.py
index 9b1bcebe33..f1b864e6b3 100644
--- a/django/forms/util.py
+++ b/django/forms/util.py
@@ -6,6 +6,8 @@ from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.safestring import mark_safe
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
+from django.utils import six
+import sys
 
 # Import ValidationError so that it can be imported from this
 # module to maintain backwards compatibility.
@@ -20,7 +22,7 @@ def flatatt(attrs):
 
     The result is passed through 'mark_safe'.
     """
-    return format_html_join('', ' {0}="{1}"', attrs.items())
+    return format_html_join('', ' {0}="{1}"', sorted(attrs.items()))
 
 @python_2_unicode_compatible
 class ErrorDict(dict):
@@ -78,11 +80,12 @@ def from_current_timezone(value):
         try:
             return timezone.make_aware(value, current_timezone)
         except Exception:
-            raise ValidationError(_('%(datetime)s couldn\'t be interpreted '
-                                    'in time zone %(current_timezone)s; it '
-                                    'may be ambiguous or it may not exist.')
-                                  % {'datetime': value,
-                                     'current_timezone': current_timezone})
+            msg = _(
+                '%(datetime)s couldn\'t be interpreted '
+                'in time zone %(current_timezone)s; it '
+                'may be ambiguous or it may not exist.') % {'datetime': value, 'current_timezone':
+                current_timezone}
+            six.reraise(ValidationError, ValidationError(msg), sys.exc_info()[2])
     return value
 
 def to_current_timezone(value):
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index c761ea857d..e72ab014b8 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -11,6 +11,7 @@ try:
     from urllib.parse import urljoin
 except ImportError:     # Python 2
     from urlparse import urljoin
+import warnings
 
 from django.conf import settings
 from django.forms.util import flatatt, to_current_timezone
@@ -22,7 +23,8 @@ from django.utils.safestring import mark_safe
 from django.utils import datetime_safe, formats, six
 
 __all__ = (
-    'Media', 'MediaDefiningClass', 'Widget', 'TextInput', 'PasswordInput',
+    'Media', 'MediaDefiningClass', 'Widget', 'TextInput',
+    'EmailInput', 'URLInput', 'NumberInput', 'PasswordInput',
     'HiddenInput', 'MultipleHiddenInput', 'ClearableFileInput',
     'FileInput', 'DateInput', 'DateTimeInput', 'TimeInput', 'Textarea', 'CheckboxInput',
     'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect',
@@ -208,25 +210,6 @@ class Widget(six.with_metaclass(MediaDefiningClass)):
         """
         return data.get(name, None)
 
-    def _has_changed(self, initial, data):
-        """
-        Return True if data differs from initial.
-        """
-        # For purposes of seeing whether something has changed, None is
-        # the same as an empty string, if the data or inital value we get
-        # is None, replace it w/ ''.
-        if data is None:
-            data_value = ''
-        else:
-            data_value = data
-        if initial is None:
-            initial_value = ''
-        else:
-            initial_value = initial
-        if force_text(initial_value) != force_text(data_value):
-            return True
-        return False
-
     def id_for_label(self, id_):
         """
         Returns the HTML ID attribute of this Widget for use by a <label>,
@@ -270,6 +253,18 @@ class TextInput(Input):
         super(TextInput, self).__init__(attrs)
 
 
+class NumberInput(TextInput):
+    input_type = 'number'
+
+
+class EmailInput(TextInput):
+    input_type = 'email'
+
+
+class URLInput(TextInput):
+    input_type = 'url'
+
+
 class PasswordInput(TextInput):
     input_type = 'password'
 
@@ -325,10 +320,6 @@ class FileInput(Input):
         "File widgets take data from FILES, not POST"
         return files.get(name, None)
 
-    def _has_changed(self, initial, data):
-        if data is None:
-            return False
-        return True
 
 FILE_INPUT_CONTRADICTION = object()
 
@@ -341,6 +332,8 @@ class ClearableFileInput(FileInput):
 
     template_with_clear = '%(clear)s <label for="%(clear_checkbox_id)s">%(clear_checkbox_label)s</label>'
 
+    url_markup_template = '<a href="{0}">{1}</a>'
+
     def clear_checkbox_name(self, name):
         """
         Given the name of the file input, return the name of the clear checkbox
@@ -366,7 +359,7 @@ class ClearableFileInput(FileInput):
 
         if value and hasattr(value, "url"):
             template = self.template_with_initial
-            substitutions['initial'] = format_html('<a href="{0}">{1}</a>',
+            substitutions['initial'] = format_html(self.url_markup_template,
                                                    value.url,
                                                    force_text(value))
             if not self.is_required:
@@ -426,17 +419,6 @@ class DateInput(TextInput):
             return value.strftime(self.format)
         return value
 
-    def _has_changed(self, initial, data):
-        # If our field has show_hidden_initial=True, initial will be a string
-        # formatted by HiddenInput using formats.localize_input, which is not
-        # necessarily the format used for this widget. Attempt to convert it.
-        try:
-            input_format = formats.get_format('DATE_INPUT_FORMATS')[0]
-            initial = datetime.datetime.strptime(initial, input_format).date()
-        except (TypeError, ValueError):
-            pass
-        return super(DateInput, self)._has_changed(self._format_value(initial), data)
-
 
 class DateTimeInput(TextInput):
     def __init__(self, attrs=None, format=None):
@@ -456,17 +438,6 @@ class DateTimeInput(TextInput):
             return value.strftime(self.format)
         return value
 
-    def _has_changed(self, initial, data):
-        # If our field has show_hidden_initial=True, initial will be a string
-        # formatted by HiddenInput using formats.localize_input, which is not
-        # necessarily the format used for this widget. Attempt to convert it.
-        try:
-            input_format = formats.get_format('DATETIME_INPUT_FORMATS')[0]
-            initial = datetime.datetime.strptime(initial, input_format)
-        except (TypeError, ValueError):
-            pass
-        return super(DateTimeInput, self)._has_changed(self._format_value(initial), data)
-
 
 class TimeInput(TextInput):
     def __init__(self, attrs=None, format=None):
@@ -485,17 +456,6 @@ class TimeInput(TextInput):
             return value.strftime(self.format)
         return value
 
-    def _has_changed(self, initial, data):
-        # If our field has show_hidden_initial=True, initial will be a string
-        # formatted by HiddenInput using formats.localize_input, which is not
-        # necessarily the format used for this  widget. Attempt to convert it.
-        try:
-            input_format = formats.get_format('TIME_INPUT_FORMATS')[0]
-            initial = datetime.datetime.strptime(initial, input_format).time()
-        except (TypeError, ValueError):
-            pass
-        return super(TimeInput, self)._has_changed(self._format_value(initial), data)
-
 
 # Defined at module level so that CheckboxInput is picklable (#17976)
 def boolean_check(v):
@@ -530,10 +490,6 @@ class CheckboxInput(Widget):
             value = values.get(value.lower(), value)
         return bool(value)
 
-    def _has_changed(self, initial, data):
-        # Sometimes data or initial could be None or '' which should be the
-        # same thing as False.
-        return bool(initial) != bool(data)
 
 class Select(Widget):
     allow_multiple_selected = False
@@ -609,14 +565,6 @@ class NullBooleanSelect(Select):
                 'False': False,
                 False: False}.get(value, None)
 
-    def _has_changed(self, initial, data):
-        # For a NullBooleanSelect, None (unknown) and False (No)
-        # are not the same
-        if initial is not None:
-            initial = bool(initial)
-        if data is not None:
-            data = bool(data)
-        return initial != data
 
 class SelectMultiple(Select):
     allow_multiple_selected = True
@@ -636,26 +584,18 @@ class SelectMultiple(Select):
             return data.getlist(name)
         return data.get(name, None)
 
-    def _has_changed(self, initial, data):
-        if initial is None:
-            initial = []
-        if data is None:
-            data = []
-        if len(initial) != len(data):
-            return True
-        initial_set = set([force_text(value) for value in initial])
-        data_set = set([force_text(value) for value in data])
-        return data_set != initial_set
 
 @python_2_unicode_compatible
-class RadioInput(SubWidget):
+class ChoiceInput(SubWidget):
     """
-    An object used by RadioFieldRenderer that represents a single
-    <input type='radio'>.
+    An object used by ChoiceFieldRenderer that represents a single
+    <input type='$input_type'>.
     """
+    input_type = None  # Subclasses must define this
 
     def __init__(self, name, value, attrs, choice, index):
-        self.name, self.value = name, value
+        self.name = name
+        self.value = value
         self.attrs = attrs
         self.choice_value = force_text(choice[0])
         self.choice_label = force_text(choice[1])
@@ -672,8 +612,7 @@ class RadioInput(SubWidget):
             label_for = format_html(' for="{0}_{1}"', self.attrs['id'], self.index)
         else:
             label_for = ''
-        choice_label = force_text(self.choice_label)
-        return format_html('<label{0}>{1} {2}</label>', label_for, self.tag(), choice_label)
+        return format_html('<label{0}>{1} {2}</label>', label_for, self.tag(), self.choice_label)
 
     def is_checked(self):
         return self.value == self.choice_value
@@ -681,48 +620,96 @@ class RadioInput(SubWidget):
     def tag(self):
         if 'id' in self.attrs:
             self.attrs['id'] = '%s_%s' % (self.attrs['id'], self.index)
-        final_attrs = dict(self.attrs, type='radio', name=self.name, value=self.choice_value)
+        final_attrs = dict(self.attrs, type=self.input_type, name=self.name, value=self.choice_value)
         if self.is_checked():
             final_attrs['checked'] = 'checked'
         return format_html('<input{0} />', flatatt(final_attrs))
 
+
+class RadioChoiceInput(ChoiceInput):
+    input_type = 'radio'
+
+    def __init__(self, *args, **kwargs):
+        super(RadioChoiceInput, self).__init__(*args, **kwargs)
+        self.value = force_text(self.value)
+
+
+class RadioInput(RadioChoiceInput):
+    def __init__(self, *args, **kwargs):
+        msg = "RadioInput has been deprecated. Use RadioChoiceInput instead."
+        warnings.warn(msg, PendingDeprecationWarning, stacklevel=2)
+        super(RadioInput, self).__init__(*args, **kwargs)
+
+
+class CheckboxChoiceInput(ChoiceInput):
+    input_type = 'checkbox'
+
+    def __init__(self, *args, **kwargs):
+        super(CheckboxChoiceInput, self).__init__(*args, **kwargs)
+        self.value = set(force_text(v) for v in self.value)
+
+    def is_checked(self):
+        return self.choice_value in self.value
+
+
 @python_2_unicode_compatible
-class RadioFieldRenderer(object):
+class ChoiceFieldRenderer(object):
     """
     An object used by RadioSelect to enable customization of radio widgets.
     """
 
+    choice_input_class = None
+
     def __init__(self, name, value, attrs, choices):
-        self.name, self.value, self.attrs = name, value, attrs
+        self.name = name
+        self.value = value
+        self.attrs = attrs
         self.choices = choices
 
     def __iter__(self):
         for i, choice in enumerate(self.choices):
-            yield RadioInput(self.name, self.value, self.attrs.copy(), choice, i)
+            yield self.choice_input_class(self.name, self.value, self.attrs.copy(), choice, i)
 
     def __getitem__(self, idx):
         choice = self.choices[idx] # Let the IndexError propogate
-        return RadioInput(self.name, self.value, self.attrs.copy(), choice, idx)
+        return self.choice_input_class(self.name, self.value, self.attrs.copy(), choice, idx)
 
     def __str__(self):
         return self.render()
 
     def render(self):
-        """Outputs a <ul> for this set of radio fields."""
-        return format_html('<ul>\n{0}\n</ul>',
-                           format_html_join('\n', '<li>{0}</li>',
-                                            [(force_text(w),) for w in self]
-                                            ))
+        """
+        Outputs a <ul> for this set of choice fields.
+        If an id was given to the field, it is applied to the <ul> (each
+        item in the list will get an id of `$id_$i`).
+        """
+        id_ = self.attrs.get('id', None)
+        start_tag = format_html('<ul id="{0}">', id_) if id_ else '<ul>'
+        output = [start_tag]
+        for widget in self:
+            output.append(format_html('<li>{0}</li>', force_text(widget)))
+        output.append('</ul>')
+        return mark_safe('\n'.join(output))
 
-class RadioSelect(Select):
-    renderer = RadioFieldRenderer
+
+class RadioFieldRenderer(ChoiceFieldRenderer):
+    choice_input_class = RadioChoiceInput
+
+
+class CheckboxFieldRenderer(ChoiceFieldRenderer):
+    choice_input_class = CheckboxChoiceInput
+
+
+class RendererMixin(object):
+    renderer = None  # subclasses must define this
+    _empty_value = None
 
     def __init__(self, *args, **kwargs):
         # Override the default renderer if we were passed one.
         renderer = kwargs.pop('renderer', None)
         if renderer:
             self.renderer = renderer
-        super(RadioSelect, self).__init__(*args, **kwargs)
+        super(RendererMixin, self).__init__(*args, **kwargs)
 
     def subwidgets(self, name, value, attrs=None, choices=()):
         for widget in self.get_renderer(name, value, attrs, choices):
@@ -730,55 +717,35 @@ class RadioSelect(Select):
 
     def get_renderer(self, name, value, attrs=None, choices=()):
         """Returns an instance of the renderer."""
-        if value is None: value = ''
-        str_value = force_text(value) # Normalize to string.
+        if value is None:
+            value = self._empty_value
         final_attrs = self.build_attrs(attrs)
         choices = list(chain(self.choices, choices))
-        return self.renderer(name, str_value, final_attrs, choices)
+        return self.renderer(name, value, final_attrs, choices)
 
     def render(self, name, value, attrs=None, choices=()):
         return self.get_renderer(name, value, attrs, choices).render()
 
     def id_for_label(self, id_):
-        # RadioSelect is represented by multiple <input type="radio"> fields,
-        # each of which has a distinct ID. The IDs are made distinct by a "_X"
-        # suffix, where X is the zero-based index of the radio field. Thus,
-        # the label for a RadioSelect should reference the first one ('_0').
+        # Widgets using this RendererMixin are made of a collection of
+        # subwidgets, each with their own <label>, and distinct ID.
+        # The IDs are made distinct by y "_X" suffix, where X is the zero-based
+        # index of the choice field. Thus, the label for the main widget should
+        # reference the first subwidget, hence the "_0" suffix.
         if id_:
             id_ += '_0'
         return id_
 
-class CheckboxSelectMultiple(SelectMultiple):
-    def render(self, name, value, attrs=None, choices=()):
-        if value is None: value = []
-        has_id = attrs and 'id' in attrs
-        final_attrs = self.build_attrs(attrs, name=name)
-        output = ['<ul>']
-        # Normalize to strings
-        str_values = set([force_text(v) for v in value])
-        for i, (option_value, option_label) in enumerate(chain(self.choices, choices)):
-            # If an ID attribute was given, add a numeric index as a suffix,
-            # so that the checkboxes don't all have the same ID attribute.
-            if has_id:
-                final_attrs = dict(final_attrs, id='%s_%s' % (attrs['id'], i))
-                label_for = format_html(' for="{0}"', final_attrs['id'])
-            else:
-                label_for = ''
 
-            cb = CheckboxInput(final_attrs, check_test=lambda value: value in str_values)
-            option_value = force_text(option_value)
-            rendered_cb = cb.render(name, option_value)
-            option_label = force_text(option_label)
-            output.append(format_html('<li><label{0}>{1} {2}</label></li>',
-                                      label_for, rendered_cb, option_label))
-        output.append('</ul>')
-        return mark_safe('\n'.join(output))
+class RadioSelect(RendererMixin, Select):
+    renderer = RadioFieldRenderer
+    _empty_value = ''
+
+
+class CheckboxSelectMultiple(RendererMixin, SelectMultiple):
+    renderer = CheckboxFieldRenderer
+    _empty_value = []
 
-    def id_for_label(self, id_):
-        # See the comment for RadioSelect.id_for_label()
-        if id_:
-            id_ += '_0'
-        return id_
 
 class MultiWidget(Widget):
     """
@@ -841,17 +808,6 @@ class MultiWidget(Widget):
     def value_from_datadict(self, data, files, name):
         return [widget.value_from_datadict(data, files, name + '_%s' % i) for i, widget in enumerate(self.widgets)]
 
-    def _has_changed(self, initial, data):
-        if initial is None:
-            initial = ['' for x in range(0, len(data))]
-        else:
-            if not isinstance(initial, list):
-                initial = self.decompress(initial)
-        for widget, initial, data in zip(self.widgets, initial, data):
-            if widget._has_changed(initial, data):
-                return True
-        return False
-
     def format_output(self, rendered_widgets):
         """
         Given a list of rendered widgets (as strings), returns a Unicode string
diff --git a/django/http/cookie.py b/django/http/cookie.py
index 78adb09ce8..50ff549caf 100644
--- a/django/http/cookie.py
+++ b/django/http/cookie.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.utils.encoding import force_str
+from django.utils import six
 from django.utils.six.moves import http_cookies
 
 
@@ -48,7 +49,9 @@ else:
         if not _cookie_allows_colon_in_names:
             def load(self, rawdata):
                 self.bad_cookies = set()
-                super(SimpleCookie, self).load(force_str(rawdata))
+                if not six.PY3 and isinstance(rawdata, six.text_type):
+                    rawdata = force_str(rawdata)
+                super(SimpleCookie, self).load(rawdata)
                 for key in self.bad_cookies:
                     del self[key]
 
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index edf98f6e49..0c07335f27 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -8,6 +8,7 @@ from __future__ import unicode_literals
 
 import base64
 import cgi
+import sys
 
 from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
@@ -209,7 +210,8 @@ class MultiPartParser(object):
                                     chunk = base64.b64decode(chunk)
                                 except Exception as e:
                                     # Since this is only a chunk, any error is an unfixable error.
-                                    raise MultiPartParserError("Could not decode base64 data: %r" % e)
+                                    msg = "Could not decode base64 data: %r" % e
+                                    six.reraise(MultiPartParserError, MultiPartParserError(msg), sys.exc_info()[2])
 
                             for i, handler in enumerate(handlers):
                                 chunk_length = len(chunk)
@@ -439,11 +441,6 @@ class BoundaryIter(six.Iterator):
         if not unused_char:
             raise InputStreamExhausted()
         self._stream.unget(unused_char)
-        try:
-            from mx.TextTools import FS
-            self._fs = FS(boundary).find
-        except ImportError:
-            self._fs = lambda data: data.find(boundary)
 
     def __iter__(self):
         return self
@@ -499,7 +496,7 @@ class BoundaryIter(six.Iterator):
          * the end of current encapsulation
          * the start of the next encapsulation
         """
-        index = self._fs(data)
+        index = data.find(self._boundary)
         if index < 0:
             return None
         else:
diff --git a/django/http/request.py b/django/http/request.py
index 8f74bddb71..749b9f2561 100644
--- a/django/http/request.py
+++ b/django/http/request.py
@@ -4,7 +4,6 @@ import copy
 import os
 import re
 import sys
-import warnings
 from io import BytesIO
 from pprint import pformat
 try:
@@ -44,6 +43,7 @@ class HttpRequest(object):
         self.path = ''
         self.path_info = ''
         self.method = None
+        self.resolver_match = None
         self._post_parse_error = False
 
     def __repr__(self):
@@ -64,11 +64,15 @@ class HttpRequest(object):
             if server_port != ('443' if self.is_secure() else '80'):
                 host = '%s:%s' % (host, server_port)
 
-        # Disallow potentially poisoned hostnames.
-        if not host_validation_re.match(host.lower()):
-            raise SuspiciousOperation('Invalid HTTP_HOST header: %s' % host)
-
-        return host
+        allowed_hosts = ['*'] if settings.DEBUG else settings.ALLOWED_HOSTS
+        domain, port = split_domain_port(host)
+        if domain and validate_host(domain, allowed_hosts):
+            return host
+        else:
+            msg = "Invalid HTTP_HOST header: %r." % host
+            if domain:
+                msg += "You may need to add %r to ALLOWED_HOSTS." % domain
+            raise SuspiciousOperation(msg)
 
     def get_full_path(self):
         # RFC 3986 requires query string arguments to be in the ASCII range.
@@ -187,11 +191,6 @@ class HttpRequest(object):
             self._stream = BytesIO(self._body)
         return self._body
 
-    @property
-    def raw_post_data(self):
-        warnings.warn('HttpRequest.raw_post_data has been deprecated. Use HttpRequest.body instead.', DeprecationWarning)
-        return self.body
-
     def _mark_post_parse_error(self):
         self._post = QueryDict('')
         self._files = MultiValueDict()
@@ -455,3 +454,55 @@ def bytes_to_text(s, encoding):
         return six.text_type(s, encoding, 'replace')
     else:
         return s
+
+
+def split_domain_port(host):
+    """
+    Return a (domain, port) tuple from a given host.
+
+    Returned domain is lower-cased. If the host is invalid, the domain will be
+    empty.
+    """
+    host = host.lower()
+
+    if not host_validation_re.match(host):
+        return '', ''
+
+    if host[-1] == ']':
+        # It's an IPv6 address without a port.
+        return host, ''
+    bits = host.rsplit(':', 1)
+    if len(bits) == 2:
+        return tuple(bits)
+    return bits[0], ''
+
+
+def validate_host(host, allowed_hosts):
+    """
+    Validate the given host for this site.
+
+    Check that the host looks valid and matches a host or host pattern in the
+    given list of ``allowed_hosts``. Any pattern beginning with a period
+    matches a domain and all its subdomains (e.g. ``.example.com`` matches
+    ``example.com`` and any subdomain), ``*`` matches anything, and anything
+    else must match exactly.
+
+    Note: This function assumes that the given host is lower-cased and has
+    already had the port, if any, stripped off.
+
+    Return ``True`` for a valid host, ``False`` otherwise.
+
+    """
+    for pattern in allowed_hosts:
+        pattern = pattern.lower()
+        match = (
+            pattern == '*' or
+            pattern.startswith('.') and (
+                host.endswith(pattern) or host == pattern[1:]
+                ) or
+            pattern == host
+            )
+        if match:
+            return True
+
+    return False
diff --git a/django/http/response.py b/django/http/response.py
index df0a955b18..88ac8848c2 100644
--- a/django/http/response.py
+++ b/django/http/response.py
@@ -10,6 +10,7 @@ except ImportError:
     from urlparse import urlparse
 
 from django.conf import settings
+from django.core import signals
 from django.core import signing
 from django.core.exceptions import SuspiciousOperation
 from django.http.cookie import SimpleCookie
@@ -40,9 +41,13 @@ class HttpResponseBase(six.Iterator):
         self._headers = {}
         self._charset = settings.DEFAULT_CHARSET
         self._closable_objects = []
+        # This parameter is set by the handler. It's necessary to preserve the
+        # historical behavior of request_finished.
+        self._handler_class = None
         if mimetype:
             warnings.warn("Using mimetype keyword argument is deprecated, use"
-                          " content_type instead", PendingDeprecationWarning)
+                          " content_type instead",
+                          DeprecationWarning, stacklevel=2)
             content_type = mimetype
         if not content_type:
             content_type = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE,
@@ -225,7 +230,11 @@ class HttpResponseBase(six.Iterator):
     # See http://blog.dscpl.com.au/2012/10/obligations-for-calling-close-on.html
     def close(self):
         for closable in self._closable_objects:
-            closable.close()
+            try:
+                closable.close()
+            except Exception:
+                pass
+        signals.request_finished.send(sender=self._handler_class)
 
     def write(self, content):
         raise Exception("This %s instance is not writable" % self.__class__.__name__)
@@ -296,7 +305,7 @@ class HttpResponse(HttpResponseBase):
                 'Creating streaming responses with `HttpResponse` is '
                 'deprecated. Use `StreamingHttpResponse` instead '
                 'if you need the streaming behavior.',
-                PendingDeprecationWarning, stacklevel=2)
+                DeprecationWarning, stacklevel=2)
         if not hasattr(self, '_iterator'):
             self._iterator = iter(self._container)
         return self
@@ -352,14 +361,14 @@ class CompatibleStreamingHttpResponse(StreamingHttpResponse):
 
     These responses will stream only if no middleware attempts to access the
     `content` attribute. Otherwise, they will behave like a regular response,
-    and raise a `PendingDeprecationWarning`.
+    and raise a `DeprecationWarning`.
     """
     @property
     def content(self):
         warnings.warn(
             'Accessing the `content` attribute on a streaming response is '
             'deprecated. Use the `streaming_content` attribute instead.',
-            PendingDeprecationWarning)
+            DeprecationWarning, stacklevel=2)
         content = b''.join(self)
         self.streaming_content = [content]
         return content
@@ -369,7 +378,7 @@ class CompatibleStreamingHttpResponse(StreamingHttpResponse):
         warnings.warn(
             'Accessing the `content` attribute on a streaming response is '
             'deprecated. Use the `streaming_content` attribute instead.',
-            PendingDeprecationWarning)
+            DeprecationWarning, stacklevel=2)
         self.streaming_content = [content]
 
 
@@ -383,6 +392,8 @@ class HttpResponseRedirectBase(HttpResponse):
         super(HttpResponseRedirectBase, self).__init__(*args, **kwargs)
         self['Location'] = iri_to_uri(redirect_to)
 
+    url = property(lambda self: self['Location'])
+
 
 class HttpResponseRedirect(HttpResponseRedirectBase):
     status_code = 302
diff --git a/django/middleware/cache.py b/django/middleware/cache.py
index de2b86f630..83860e15f3 100644
--- a/django/middleware/cache.py
+++ b/django/middleware/cache.py
@@ -93,7 +93,7 @@ class UpdateCacheMiddleware(object):
         if not self._should_update_cache(request, response):
             # We don't need to update the cache, just return.
             return response
-        if not response.status_code == 200:
+        if response.streaming or response.status_code != 200:
             return response
         # Try to get the timeout from the "max-age" section of the "Cache-
         # Control" header before reverting to using the default cache_timeout
diff --git a/django/middleware/common.py b/django/middleware/common.py
index ccc9fbfaad..92f8cb3992 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -1,13 +1,14 @@
 import hashlib
 import logging
 import re
+import warnings
 
 from django.conf import settings
-from django import http
 from django.core.mail import mail_managers
+from django.core import urlresolvers
+from django import http
 from django.utils.http import urlquote
 from django.utils import six
-from django.core import urlresolvers
 
 
 logger = logging.getLogger('django.request')
@@ -102,25 +103,15 @@ class CommonMiddleware(object):
         return http.HttpResponsePermanentRedirect(newurl)
 
     def process_response(self, request, response):
-        "Send broken link emails and calculate the Etag, if needed."
-        if response.status_code == 404:
-            if settings.SEND_BROKEN_LINK_EMAILS and not settings.DEBUG:
-                # If the referrer was from an internal link or a non-search-engine site,
-                # send a note to the managers.
-                domain = request.get_host()
-                referer = request.META.get('HTTP_REFERER', None)
-                is_internal = _is_internal_request(domain, referer)
-                path = request.get_full_path()
-                if referer and not _is_ignorable_404(path) and (is_internal or '?' not in referer):
-                    ua = request.META.get('HTTP_USER_AGENT', '<none>')
-                    ip = request.META.get('REMOTE_ADDR', '<none>')
-                    mail_managers("Broken %slink on %s" % ((is_internal and 'INTERNAL ' or ''), domain),
-                        "Referrer: %s\nRequested URL: %s\nUser agent: %s\nIP address: %s\n" \
-                                  % (referer, request.get_full_path(), ua, ip),
-                                  fail_silently=True)
-                return response
+        """
+        Calculate the ETag, if needed.
+        """
+        if settings.SEND_BROKEN_LINK_EMAILS:
+            warnings.warn("SEND_BROKEN_LINK_EMAILS is deprecated. "
+                "Use BrokenLinkEmailsMiddleware instead.",
+                PendingDeprecationWarning, stacklevel=2)
+            BrokenLinkEmailsMiddleware().process_response(request, response)
 
-        # Use ETags, if requested.
         if settings.USE_ETAGS:
             if response.has_header('ETag'):
                 etag = response['ETag']
@@ -139,29 +130,38 @@ class CommonMiddleware(object):
 
         return response
 
-def _is_ignorable_404(uri):
-    """
-    Returns True if a 404 at the given URL *shouldn't* notify the site managers.
-    """
-    if getattr(settings, 'IGNORABLE_404_STARTS', ()):
-        import warnings
-        warnings.warn('The IGNORABLE_404_STARTS setting has been deprecated '
-                      'in favor of IGNORABLE_404_URLS.', DeprecationWarning)
-        for start in settings.IGNORABLE_404_STARTS:
-            if uri.startswith(start):
-                return True
-    if getattr(settings, 'IGNORABLE_404_ENDS', ()):
-        import warnings
-        warnings.warn('The IGNORABLE_404_ENDS setting has been deprecated '
-                      'in favor of IGNORABLE_404_URLS.', DeprecationWarning)
-        for end in settings.IGNORABLE_404_ENDS:
-            if uri.endswith(end):
-                return True
-    return any(pattern.search(uri) for pattern in settings.IGNORABLE_404_URLS)
 
-def _is_internal_request(domain, referer):
-    """
-    Returns true if the referring URL is the same domain as the current request.
-    """
-    # Different subdomains are treated as different domains.
-    return referer is not None and re.match("^https?://%s/" % re.escape(domain), referer)
+class BrokenLinkEmailsMiddleware(object):
+
+    def process_response(self, request, response):
+        """
+        Send broken link emails for relevant 404 NOT FOUND responses.
+        """
+        if response.status_code == 404 and not settings.DEBUG:
+            domain = request.get_host()
+            path = request.get_full_path()
+            referer = request.META.get('HTTP_REFERER', '')
+            is_internal = self.is_internal_request(domain, referer)
+            is_not_search_engine = '?' not in referer
+            is_ignorable = self.is_ignorable_404(path)
+            if referer and (is_internal or is_not_search_engine) and not is_ignorable:
+                ua = request.META.get('HTTP_USER_AGENT', '<none>')
+                ip = request.META.get('REMOTE_ADDR', '<none>')
+                mail_managers(
+                    "Broken %slink on %s" % (('INTERNAL ' if is_internal else ''), domain),
+                    "Referrer: %s\nRequested URL: %s\nUser agent: %s\nIP address: %s\n" % (referer, path, ua, ip),
+                    fail_silently=True)
+        return response
+
+    def is_internal_request(self, domain, referer):
+        """
+        Returns True if the referring URL is the same domain as the current request.
+        """
+        # Different subdomains are treated as different domains.
+        return re.match("^https?://%s/" % re.escape(domain), referer)
+
+    def is_ignorable_404(self, uri):
+        """
+        Returns True if a 404 at the given URL *shouldn't* notify the site managers.
+        """
+        return any(pattern.search(uri) for pattern in settings.IGNORABLE_404_URLS)
diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py
index b2eb0df3f5..423034478b 100644
--- a/django/middleware/csrf.py
+++ b/django/middleware/csrf.py
@@ -41,10 +41,10 @@ def _get_new_csrf_key():
 
 def get_token(request):
     """
-    Returns the the CSRF token required for a POST form. The token is an
+    Returns the CSRF token required for a POST form. The token is an
     alphanumeric value.
 
-    A side effect of calling this function is to make the the csrf_protect
+    A side effect of calling this function is to make the csrf_protect
     decorator and the CsrfViewMiddleware add a CSRF cookie and a 'Vary: Cookie'
     header to the outgoing response.  For this reason, you may need to use this
     function lazily, as is done by the csrf context processor.
@@ -210,7 +210,8 @@ class CsrfViewMiddleware(object):
                             max_age = 60 * 60 * 24 * 7 * 52,
                             domain=settings.CSRF_COOKIE_DOMAIN,
                             path=settings.CSRF_COOKIE_PATH,
-                            secure=settings.CSRF_COOKIE_SECURE
+                            secure=settings.CSRF_COOKIE_SECURE,
+                            httponly=settings.CSRF_COOKIE_HTTPONLY
                             )
         # Content varies with the CSRF cookie, so set the Vary header.
         patch_vary_headers(response, ('Cookie',))
diff --git a/django/middleware/locale.py b/django/middleware/locale.py
index 628782b181..9b2ef8ff32 100644
--- a/django/middleware/locale.py
+++ b/django/middleware/locale.py
@@ -17,6 +17,14 @@ class LocaleMiddleware(object):
     is available, of course).
     """
 
+    def __init__(self):
+        self._supported_languages = dict(settings.LANGUAGES)
+        self._is_language_prefix_patterns_used = False
+        for url_pattern in get_resolver(None).url_patterns:
+            if isinstance(url_pattern, LocaleRegexURLResolver):
+                self._is_language_prefix_patterns_used = True
+                break
+
     def process_request(self, request):
         check_path = self.is_language_prefix_patterns_used()
         language = translation.get_language_from_request(
@@ -26,22 +34,27 @@ class LocaleMiddleware(object):
 
     def process_response(self, request, response):
         language = translation.get_language()
-        if (response.status_code == 404 and
-                not translation.get_language_from_path(request.path_info)
-                    and self.is_language_prefix_patterns_used()):
+        language_from_path = translation.get_language_from_path(
+                request.path_info, supported=self._supported_languages
+        )
+        if (response.status_code == 404 and not language_from_path
+                and self.is_language_prefix_patterns_used()):
             urlconf = getattr(request, 'urlconf', None)
             language_path = '/%s%s' % (language, request.path_info)
-            if settings.APPEND_SLASH and not language_path.endswith('/'):
-                language_path = language_path + '/'
+            path_valid = is_valid_path(language_path, urlconf)
+            if (not path_valid and settings.APPEND_SLASH
+                    and not language_path.endswith('/')):
+                path_valid = is_valid_path("%s/" % language_path, urlconf)
 
-            if is_valid_path(language_path, urlconf):
+            if path_valid:
                 language_url = "%s://%s/%s%s" % (
                     request.is_secure() and 'https' or 'http',
                     request.get_host(), language, request.get_full_path())
                 return HttpResponseRedirect(language_url)
-        translation.deactivate()
 
-        patch_vary_headers(response, ('Accept-Language',))
+        if not (self.is_language_prefix_patterns_used()
+                and language_from_path):
+            patch_vary_headers(response, ('Accept-Language',))
         if 'Content-Language' not in response:
             response['Content-Language'] = language
         return response
@@ -51,7 +64,4 @@ class LocaleMiddleware(object):
         Returns `True` if the `LocaleRegexURLResolver` is used
         at root level of the urlpatterns, else it returns `False`.
         """
-        for url_pattern in get_resolver(None).url_patterns:
-            if isinstance(url_pattern, LocaleRegexURLResolver):
-                return True
-        return False
+        return self._is_language_prefix_patterns_used
diff --git a/django/middleware/transaction.py b/django/middleware/transaction.py
index 96b1538d9d..95cc9a21f3 100644
--- a/django/middleware/transaction.py
+++ b/django/middleware/transaction.py
@@ -1,4 +1,7 @@
-from django.db import transaction
+import warnings
+
+from django.core.exceptions import MiddlewareNotUsed
+from django.db import connection, transaction
 
 class TransactionMiddleware(object):
     """
@@ -7,21 +10,47 @@ class TransactionMiddleware(object):
     commit, the commit is done when a successful response is created. If an
     exception happens, the database is rolled back.
     """
+
+    def __init__(self):
+        warnings.warn(
+            "TransactionMiddleware is deprecated in favor of ATOMIC_REQUESTS.",
+            PendingDeprecationWarning, stacklevel=2)
+        if connection.settings_dict['ATOMIC_REQUESTS']:
+            raise MiddlewareNotUsed
+
     def process_request(self, request):
         """Enters transaction management"""
         transaction.enter_transaction_management()
-        transaction.managed(True)
 
     def process_exception(self, request, exception):
         """Rolls back the database and leaves transaction management"""
         if transaction.is_dirty():
+            # This rollback might fail because of network failure for example.
+            # If rollback isn't possible it is impossible to clean the
+            # connection's state. So leave the connection in dirty state and
+            # let request_finished signal deal with cleaning the connection.
             transaction.rollback()
         transaction.leave_transaction_management()
 
     def process_response(self, request, response):
         """Commits and leaves transaction management."""
-        if transaction.is_managed():
+        if not transaction.get_autocommit():
             if transaction.is_dirty():
-                transaction.commit()
+                # Note: it is possible that the commit fails. If the reason is
+                # closed connection or some similar reason, then there is
+                # little hope to proceed nicely. However, in some cases (
+                # deferred foreign key checks for exampl) it is still possible
+                # to rollback().
+                try:
+                    transaction.commit()
+                except Exception:
+                    # If the rollback fails, the transaction state will be
+                    # messed up. It doesn't matter, the connection will be set
+                    # to clean state after the request finishes. And, we can't
+                    # clean the state here properly even if we wanted to, the
+                    # connection is in transaction but we can't rollback...
+                    transaction.rollback()
+                    transaction.leave_transaction_management()
+                    raise
             transaction.leave_transaction_management()
         return response
diff --git a/django/shortcuts/__init__.py b/django/shortcuts/__init__.py
index 9f896347a4..21bd7a06d2 100644
--- a/django/shortcuts/__init__.py
+++ b/django/shortcuts/__init__.py
@@ -3,6 +3,7 @@ This module collects helper functions and classes that "span" multiple levels
 of MVC. In other words, these functions/classes introduce controlled coupling
 for convenience's sake.
 """
+import warnings
 
 from django.template import loader, RequestContext
 from django.http import HttpResponse, Http404
@@ -17,7 +18,14 @@ def render_to_response(*args, **kwargs):
     Returns a HttpResponse whose content is filled with the result of calling
     django.template.loader.render_to_string() with the passed arguments.
     """
-    httpresponse_kwargs = {'content_type': kwargs.pop('mimetype', None)}
+    httpresponse_kwargs = {'content_type': kwargs.pop('content_type', None)}
+
+    mimetype = kwargs.pop('mimetype', None)
+    if mimetype:
+        warnings.warn("The mimetype keyword argument is deprecated, use "
+            "content_type instead", DeprecationWarning, stacklevel=2)
+        httpresponse_kwargs['content_type'] = mimetype
+
     return HttpResponse(loader.render_to_string(*args, **kwargs), **httpresponse_kwargs)
 
 def render(request, *args, **kwargs):
diff --git a/django/template/base.py b/django/template/base.py
index 0a2b2c9437..c5bddaf63e 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -250,7 +250,11 @@ class Parser(object):
             elif token.token_type == 1: # TOKEN_VAR
                 if not token.contents:
                     self.empty_variable(token)
-                filter_expression = self.compile_filter(token.contents)
+                try:
+                    filter_expression = self.compile_filter(token.contents)
+                except TemplateSyntaxError as e:
+                    if not self.compile_filter_error(token, e):
+                        raise
                 var_node = self.create_variable_node(filter_expression)
                 self.extend_nodelist(nodelist, var_node, token)
             elif token.token_type == 2: # TOKEN_BLOCK
@@ -330,6 +334,9 @@ class Parser(object):
     def unclosed_block_tag(self, parse_until):
         raise self.error(None, "Unclosed tags: %s " % ', '.join(parse_until))
 
+    def compile_filter_error(self, token, e):
+        pass
+
     def compile_function_error(self, token, e):
         pass
 
@@ -756,7 +763,7 @@ class Variable(object):
             for bit in self.lookups:
                 try:  # dictionary lookup
                     current = current[bit]
-                except (TypeError, AttributeError, KeyError):
+                except (TypeError, AttributeError, KeyError, ValueError):
                     try:  # attribute lookup
                         current = getattr(current, bit)
                     except (TypeError, AttributeError):
@@ -854,7 +861,7 @@ class TextNode(Node):
     def render(self, context):
         return self.s
 
-def _render_value_in_context(value, context):
+def render_value_in_context(value, context):
     """
     Converts any value to a string to become part of a rendered template. This
     means escaping, if required, and conversion to a unicode object. If value
@@ -884,7 +891,7 @@ class VariableNode(Node):
             # control (e.g. exception rendering). In that case, we fail
             # quietly.
             return ''
-        return _render_value_in_context(output, context)
+        return render_value_in_context(output, context)
 
 # Regex for token keyword arguments
 kwarg_re = re.compile(r"(?:(\w+)=)?(.+)")
diff --git a/django/template/context.py b/django/template/context.py
index 81aa194447..1ef7e889bc 100644
--- a/django/template/context.py
+++ b/django/template/context.py
@@ -1,6 +1,5 @@
 from copy import copy
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.importlib import import_module
+from django.utils.module_loading import import_by_path
 
 # Cache of actual callables.
 _standard_context_processors = None
@@ -146,16 +145,7 @@ def get_standard_processors():
         collect.extend(_builtin_context_processors)
         collect.extend(settings.TEMPLATE_CONTEXT_PROCESSORS)
         for path in collect:
-            i = path.rfind('.')
-            module, attr = path[:i], path[i+1:]
-            try:
-                mod = import_module(module)
-            except ImportError as e:
-                raise ImproperlyConfigured('Error importing request processor module %s: "%s"' % (module, e))
-            try:
-                func = getattr(mod, attr)
-            except AttributeError:
-                raise ImproperlyConfigured('Module "%s" does not define a "%s" callable request processor' % (module, attr))
+            func = import_by_path(path)
             processors.append(func)
         _standard_context_processors = tuple(processors)
     return _standard_context_processors
diff --git a/django/template/debug.py b/django/template/debug.py
index c7ac007b48..043dd91b4e 100644
--- a/django/template/debug.py
+++ b/django/template/debug.py
@@ -64,6 +64,10 @@ class DebugParser(Parser):
         msg = "Unclosed tag '%s'. Looking for one of: %s " % (command, ', '.join(parse_until))
         raise self.source_error(source, msg)
 
+    def compile_filter_error(self, token, e):
+        if not hasattr(e, 'django_template_source'):
+            e.django_template_source = token.source
+
     def compile_function_error(self, token, e):
         if not hasattr(e, 'django_template_source'):
             e.django_template_source = token.source
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index dac4e5ddb4..88526e5a20 100644
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@@ -49,15 +49,6 @@ def stringfilter(func):
     # when multiple decorators are applied).
     _dec._decorated_function = getattr(func, '_decorated_function', func)
 
-    for attr in ('is_safe', 'needs_autoescape'):
-        if hasattr(func, attr):
-            import warnings
-            warnings.warn("Setting the %s attribute of a template filter "
-                          "function is deprecated; use @register.filter(%s=%s) "
-                          "instead" % (attr, attr, getattr(func, attr)),
-                          DeprecationWarning)
-            setattr(_dec, attr, getattr(func, attr))
-
     return wraps(func)(_dec)
 
 
@@ -560,7 +551,7 @@ def slice_filter(value, arg):
     Returns a slice of the list.
 
     Uses the same syntax as Python's list slicing; see
-    http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
+    http://www.diveintopython3.net/native-datatypes.html#slicinglists
     for an introduction.
     """
     try:
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index aca2f41f2d..b272322e1b 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -5,13 +5,15 @@ import sys
 import re
 from datetime import datetime
 from itertools import groupby, cycle as itertools_cycle
+import warnings
 
 from django.conf import settings
 from django.template.base import (Node, NodeList, Template, Context, Library,
     TemplateSyntaxError, VariableDoesNotExist, InvalidTemplateLibrary,
     BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END,
     SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END,
-    VARIABLE_ATTRIBUTE_SEPARATOR, get_library, token_kwargs, kwarg_re)
+    VARIABLE_ATTRIBUTE_SEPARATOR, get_library, token_kwargs, kwarg_re,
+    render_value_in_context)
 from django.template.smartif import IfParser, Literal
 from django.template.defaultfilters import date
 from django.utils.encoding import smart_text
@@ -54,15 +56,15 @@ class CsrfTokenNode(Node):
             # misconfiguration, so we raise a warning
             from django.conf import settings
             if settings.DEBUG:
-                import warnings
                 warnings.warn("A {% csrf_token %} was used in a template, but the context did not provide the value.  This is usually caused by not using RequestContext.")
             return ''
 
 class CycleNode(Node):
-    def __init__(self, cyclevars, variable_name=None, silent=False):
+    def __init__(self, cyclevars, variable_name=None, silent=False, escape=False):
         self.cyclevars = cyclevars
         self.variable_name = variable_name
         self.silent = silent
+        self.escape = escape        # only while the "future" version exists
 
     def render(self, context):
         if self not in context.render_context:
@@ -74,7 +76,9 @@ class CycleNode(Node):
             context[self.variable_name] = value
         if self.silent:
             return ''
-        return value
+        if not self.escape:
+            value = mark_safe(value)
+        return render_value_in_context(value, context)
 
 class DebugNode(Node):
     def render(self, context):
@@ -97,14 +101,17 @@ class FilterNode(Node):
         return filtered
 
 class FirstOfNode(Node):
-    def __init__(self, vars):
-        self.vars = vars
+    def __init__(self, variables, escape=False):
+        self.vars = variables
+        self.escape = escape        # only while the "future" version exists
 
     def render(self, context):
         for var in self.vars:
             value = var.resolve(context, True)
             if value:
-                return smart_text(value)
+                if not self.escape:
+                    value = mark_safe(value)
+                return render_value_in_context(value, context)
         return ''
 
 class ForNode(Node):
@@ -208,32 +215,45 @@ class IfChangedNode(Node):
 
     def __init__(self, nodelist_true, nodelist_false, *varlist):
         self.nodelist_true, self.nodelist_false = nodelist_true, nodelist_false
-        self._last_seen = None
         self._varlist = varlist
-        self._id = str(id(self))
 
     def render(self, context):
-        if 'forloop' in context and self._id not in context['forloop']:
-            self._last_seen = None
-            context['forloop'][self._id] = 1
+        # Init state storage
+        state_frame = self._get_context_stack_frame(context)
+        if self not in state_frame:
+            state_frame[self] = None
+
+        nodelist_true_output = None
         try:
             if self._varlist:
                 # Consider multiple parameters.  This automatically behaves
                 # like an OR evaluation of the multiple variables.
                 compare_to = [var.resolve(context, True) for var in self._varlist]
             else:
-                compare_to = self.nodelist_true.render(context)
+                # The "{% ifchanged %}" syntax (without any variables) compares the rendered output.
+                compare_to = nodelist_true_output = self.nodelist_true.render(context)
         except VariableDoesNotExist:
             compare_to = None
 
-        if compare_to != self._last_seen:
-            self._last_seen = compare_to
-            content = self.nodelist_true.render(context)
-            return content
+        if compare_to != state_frame[self]:
+            state_frame[self] = compare_to
+            return nodelist_true_output or self.nodelist_true.render(context)  # render true block if not already rendered
         elif self.nodelist_false:
             return self.nodelist_false.render(context)
         return ''
 
+    def _get_context_stack_frame(self, context):
+        # The Context object behaves like a stack where each template tag can create a new scope.
+        # Find the place where to store the state to detect changes.
+        if 'forloop' in context:
+            # Ifchanged is bound to the local for loop.
+            # When there is a loop-in-loop, the state is bound to the inner loop,
+            # so it resets when the outer loop continues.
+            return context['forloop']
+        else:
+            # Using ifchanged outside loops. Effectively this is a no-op because the state is associated with 'self'.
+            return context.render_context
+
 class IfEqualNode(Node):
     child_nodelists = ('nodelist_true', 'nodelist_false')
 
@@ -409,7 +429,8 @@ class URLNode(Node):
         url = ''
         try:
             url = reverse(view_name, args=args, kwargs=kwargs, current_app=context.current_app)
-        except NoReverseMatch as e:
+        except NoReverseMatch:
+            exc_info = sys.exc_info()
             if settings.SETTINGS_MODULE:
                 project_name = settings.SETTINGS_MODULE.split('.')[0]
                 try:
@@ -421,10 +442,10 @@ class URLNode(Node):
                         # Re-raise the original exception, not the one with
                         # the path relative to the project. This makes a
                         # better error message.
-                        raise e
+                        six.reraise(*exc_info)
             else:
                 if self.asvar is None:
-                    raise e
+                    raise
 
         if self.asvar:
             context[self.asvar] = url
@@ -453,7 +474,7 @@ class WidthRatioNode(Node):
         except VariableDoesNotExist:
             return ''
         except (ValueError, TypeError):
-            raise TemplateSyntaxError("widthratio final argument must be an number")
+            raise TemplateSyntaxError("widthratio final argument must be a number")
         try:
             value = float(value)
             max_value = float(max_value)
@@ -489,6 +510,7 @@ def autoescape(parser, token):
     """
     Force autoescape behavior for this block.
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     args = token.contents.split()
     if len(args) != 2:
         raise TemplateSyntaxError("'autoescape' tag requires exactly one argument.")
@@ -508,7 +530,7 @@ def comment(parser, token):
     return CommentNode()
 
 @register.tag
-def cycle(parser, token):
+def cycle(parser, token, escape=False):
     """
     Cycles among the given strings each time this tag is encountered.
 
@@ -541,6 +563,12 @@ def cycle(parser, token):
         {% endfor %}
 
     """
+    if not escape:
+        warnings.warn(
+            "'The `cycle` template tag is changing to escape its arguments; "
+            "the non-autoescaping version is deprecated. Load it "
+            "from the `future` tag library to start using the new behavior.",
+            PendingDeprecationWarning, stacklevel=2)
 
     # Note: This returns the exact same node on each {% cycle name %} call;
     # that is, the node object returned from {% cycle a b c as name %} and the
@@ -588,13 +616,13 @@ def cycle(parser, token):
     if as_form:
         name = args[-1]
         values = [parser.compile_filter(arg) for arg in args[1:-2]]
-        node = CycleNode(values, name, silent=silent)
+        node = CycleNode(values, name, silent=silent, escape=escape)
         if not hasattr(parser, '_namedCycleNodes'):
             parser._namedCycleNodes = {}
         parser._namedCycleNodes[name] = node
     else:
         values = [parser.compile_filter(arg) for arg in args[1:]]
-        node = CycleNode(values)
+        node = CycleNode(values, escape=escape)
     return node
 
 @register.tag
@@ -633,6 +661,7 @@ def do_filter(parser, token):
     Instead, use the ``autoescape`` tag to manage autoescaping for blocks of
     template code.
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     _, rest = token.contents.split(None, 1)
     filter_expr = parser.compile_filter("var|%s" % (rest))
     for func, unused in filter_expr.filters:
@@ -643,7 +672,7 @@ def do_filter(parser, token):
     return FilterNode(filter_expr, nodelist)
 
 @register.tag
-def firstof(parser, token):
+def firstof(parser, token, escape=False):
     """
     Outputs the first variable passed that is not False, without escaping.
 
@@ -657,11 +686,11 @@ def firstof(parser, token):
 
         {% if var1 %}
             {{ var1|safe }}
-        {% else %}{% if var2 %}
+        {% elif var2 %}
             {{ var2|safe }}
-        {% else %}{% if var3 %}
+        {% elif var3 %}
             {{ var3|safe }}
-        {% endif %}{% endif %}{% endif %}
+        {% endif %}
 
     but obviously much cleaner!
 
@@ -677,10 +706,17 @@ def firstof(parser, token):
         {% endfilter %}
 
     """
+    if not escape:
+        warnings.warn(
+            "'The `firstof` template tag is changing to escape its arguments; "
+            "the non-autoescaping version is deprecated. Load it "
+            "from the `future` tag library to start using the new behavior.",
+            PendingDeprecationWarning, stacklevel=2)
+
     bits = token.split_contents()[1:]
     if len(bits) < 1:
         raise TemplateSyntaxError("'firstof' statement requires at least one argument")
-    return FirstOfNode([parser.compile_filter(bit) for bit in bits])
+    return FirstOfNode([parser.compile_filter(bit) for bit in bits], escape=escape)
 
 @register.tag('for')
 def do_for(parser, token):
@@ -746,7 +782,7 @@ def do_for(parser, token):
         ==========================  ================================================
 
     """
-    bits = token.contents.split()
+    bits = token.split_contents()
     if len(bits) < 4:
         raise TemplateSyntaxError("'for' statements should have at least four"
                                   " words: %s" % token.contents)
@@ -954,7 +990,7 @@ def ifchanged(parser, token):
                 {% endifchanged %}
             {% endfor %}
     """
-    bits = token.contents.split()
+    bits = token.split_contents()
     nodelist_true = parser.parse(('else', 'endifchanged'))
     token = parser.next_token()
     if token.contents == 'else':
@@ -1011,6 +1047,7 @@ def load(parser, token):
         {% load byline from news %}
 
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     bits = token.contents.split()
     if len(bits) >= 4 and bits[-2] == "from":
         try:
@@ -1109,17 +1146,16 @@ def regroup(parser, token):
         {% regroup people|dictsort:"gender" by gender as grouped %}
 
     """
-    firstbits = token.contents.split(None, 3)
-    if len(firstbits) != 4:
+    bits = token.split_contents()
+    if len(bits) != 6:
         raise TemplateSyntaxError("'regroup' tag takes five arguments")
-    target = parser.compile_filter(firstbits[1])
-    if firstbits[2] != 'by':
+    target = parser.compile_filter(bits[1])
+    if bits[2] != 'by':
         raise TemplateSyntaxError("second argument to 'regroup' tag must be 'by'")
-    lastbits_reversed = firstbits[3][::-1].split(None, 2)
-    if lastbits_reversed[1][::-1] != 'as':
+    if bits[4] != 'as':
         raise TemplateSyntaxError("next-to-last argument to 'regroup' tag must"
                                   " be 'as'")
-    var_name = lastbits_reversed[0][::-1]
+    var_name = bits[5]
     # RegroupNode will take each item in 'target', put it in the context under
     # 'var_name', evaluate 'var_name'.'expression' in the current context, and
     # group by the resulting value. After all items are processed, it will
@@ -1128,7 +1164,7 @@ def regroup(parser, token):
     # doesn't provide a context-aware equivalent of Python's getattr.
     expression = parser.compile_filter(var_name +
                                        VARIABLE_ATTRIBUTE_SEPARATOR +
-                                       lastbits_reversed[2][::-1])
+                                       bits[3])
     return RegroupNode(target, expression, var_name)
 
 @register.tag
@@ -1184,6 +1220,7 @@ def templatetag(parser, token):
         ``closecomment``    ``#}``
         ==================  =======
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     bits = token.contents.split()
     if len(bits) != 2:
         raise TemplateSyntaxError("'templatetag' statement takes one argument")
@@ -1319,13 +1356,13 @@ def widthratio(parser, token):
 
     For example::
 
-        <img src='bar.gif' height='10' width='{% widthratio this_value max_value 100 %}' />
+        <img src='bar.gif' height='10' width='{% widthratio this_value max_value max_width %}' />
 
-    Above, if ``this_value`` is 175 and ``max_value`` is 200, the image in
-    the above example will be 88 pixels wide (because 175/200 = .875;
-    .875 * 100 = 87.5 which is rounded up to 88).
+    If ``this_value`` is 175, ``max_value`` is 200, and ``max_width`` is 100,
+    the image in the above example will be 88 pixels wide
+    (because 175/200 = .875; .875 * 100 = 87.5 which is rounded up to 88).
     """
-    bits = token.contents.split()
+    bits = token.split_contents()
     if len(bits) != 4:
         raise TemplateSyntaxError("widthratio takes three arguments")
     tag, this_value_expr, max_value_expr, max_width = bits
diff --git a/django/template/loader.py b/django/template/loader.py
index cfffb4014e..6df4e43c4f 100644
--- a/django/template/loader.py
+++ b/django/template/loader.py
@@ -27,8 +27,8 @@
 
 from django.core.exceptions import ImproperlyConfigured
 from django.template.base import Origin, Template, Context, TemplateDoesNotExist, add_to_builtins
-from django.utils.importlib import import_module
 from django.conf import settings
+from django.utils.module_loading import import_by_path
 from django.utils import six
 
 template_source_loaders = None
@@ -91,15 +91,7 @@ def find_template_loader(loader):
     else:
         args = []
     if isinstance(loader, six.string_types):
-        module, attr = loader.rsplit('.', 1)
-        try:
-            mod = import_module(module)
-        except ImportError as e:
-            raise ImproperlyConfigured('Error importing template source loader %s: "%s"' % (loader, e))
-        try:
-            TemplateLoader = getattr(mod, attr)
-        except AttributeError as e:
-            raise ImproperlyConfigured('Error importing template source loader %s: "%s"' % (loader, e))
+        TemplateLoader = import_by_path(loader)
 
         if hasattr(TemplateLoader, 'load_template_source'):
             func = TemplateLoader(*args)
diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py
index d295d058d0..767f0e5ff8 100644
--- a/django/template/loader_tags.py
+++ b/django/template/loader_tags.py
@@ -1,3 +1,5 @@
+from collections import defaultdict
+
 from django.conf import settings
 from django.template.base import TemplateSyntaxError, Library, Node, TextNode,\
     token_kwargs, Variable
@@ -15,19 +17,16 @@ class ExtendsError(Exception):
 class BlockContext(object):
     def __init__(self):
         # Dictionary of FIFO queues.
-        self.blocks = {}
+        self.blocks = defaultdict(list)
 
     def add_blocks(self, blocks):
         for name, block in six.iteritems(blocks):
-            if name in self.blocks:
-                self.blocks[name].insert(0, block)
-            else:
-                self.blocks[name] = [block]
+            self.blocks[name].insert(0, block)
 
     def pop(self, name):
         try:
             return self.blocks[name].pop()
-        except (IndexError, KeyError):
+        except IndexError:
             return None
 
     def push(self, name, block):
@@ -36,7 +35,7 @@ class BlockContext(object):
     def get_block(self, name):
         try:
             return self.blocks[name][-1]
-        except (IndexError, KeyError):
+        except IndexError:
             return None
 
 class BlockNode(Node):
@@ -175,6 +174,7 @@ def do_block(parser, token):
     """
     Define a block that can be overridden by child templates.
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     bits = token.contents.split()
     if len(bits) != 2:
         raise TemplateSyntaxError("'%s' tag takes only one argument" % bits[0])
diff --git a/django/template/loaders/app_directories.py b/django/template/loaders/app_directories.py
index 887f8a0b72..cea01558d9 100644
--- a/django/template/loaders/app_directories.py
+++ b/django/template/loaders/app_directories.py
@@ -61,5 +61,3 @@ class Loader(BaseLoader):
             except IOError:
                 pass
         raise TemplateDoesNotExist(template_name)
-
-_loader = Loader()
diff --git a/django/template/loaders/cached.py b/django/template/loaders/cached.py
index 4c25acd599..c61045de06 100644
--- a/django/template/loaders/cached.py
+++ b/django/template/loaders/cached.py
@@ -6,6 +6,7 @@ to load templates from them in order, caching the result.
 import hashlib
 from django.template.base import TemplateDoesNotExist
 from django.template.loader import BaseLoader, get_template_from_string, find_template_loader, make_origin
+from django.utils.encoding import force_bytes
 
 class Loader(BaseLoader):
     is_usable = True
@@ -40,9 +41,11 @@ class Loader(BaseLoader):
         key = template_name
         if template_dirs:
             # If template directories were specified, use a hash to differentiate
-            key = '-'.join([template_name, hashlib.sha1('|'.join(template_dirs)).hexdigest()])
+            key = '-'.join([template_name, hashlib.sha1(force_bytes('|'.join(template_dirs))).hexdigest()])
 
-        if key not in self.template_cache:
+        try:
+            template = self.template_cache[key]
+        except KeyError:
             template, origin = self.find_template(template_name, template_dirs)
             if not hasattr(template, 'render'):
                 try:
@@ -54,7 +57,7 @@ class Loader(BaseLoader):
                     # of the actual template that does not exist.
                     return template, origin
             self.template_cache[key] = template
-        return self.template_cache[key], None
+        return template, None
 
     def reset(self):
         "Empty the template cache."
diff --git a/django/template/loaders/eggs.py b/django/template/loaders/eggs.py
index 7e35b34ec4..b7dcc75be3 100644
--- a/django/template/loaders/eggs.py
+++ b/django/template/loaders/eggs.py
@@ -31,5 +31,3 @@ class Loader(BaseLoader):
                     resource = resource.decode(settings.FILE_CHARSET)
                 return (resource, 'egg:%s:%s' % (app, pkg_name))
         raise TemplateDoesNotExist(template_name)
-
-_loader = Loader()
diff --git a/django/template/loaders/filesystem.py b/django/template/loaders/filesystem.py
index e87cfef987..1a7f0d2cd7 100644
--- a/django/template/loaders/filesystem.py
+++ b/django/template/loaders/filesystem.py
@@ -44,5 +44,3 @@ class Loader(BaseLoader):
             error_msg = "Your TEMPLATE_DIRS setting is empty. Change it to point to at least one template directory."
         raise TemplateDoesNotExist(error_msg)
     load_template_source.is_usable = True
-
-_loader = Loader()
diff --git a/django/templatetags/cache.py b/django/templatetags/cache.py
index 36db4807c7..215f1179dc 100644
--- a/django/templatetags/cache.py
+++ b/django/templatetags/cache.py
@@ -1,18 +1,15 @@
 from __future__ import unicode_literals
 
-import hashlib
-from django.template import Library, Node, TemplateSyntaxError, Variable, VariableDoesNotExist
-from django.template import resolve_variable
+from django.core.cache.utils import make_template_fragment_key
+from django.template import Library, Node, TemplateSyntaxError, VariableDoesNotExist
 from django.core.cache import cache
-from django.utils.encoding import force_bytes
-from django.utils.http import urlquote
 
 register = Library()
 
 class CacheNode(Node):
     def __init__(self, nodelist, expire_time_var, fragment_name, vary_on):
         self.nodelist = nodelist
-        self.expire_time_var = Variable(expire_time_var)
+        self.expire_time_var = expire_time_var
         self.fragment_name = fragment_name
         self.vary_on = vary_on
 
@@ -25,10 +22,8 @@ class CacheNode(Node):
             expire_time = int(expire_time)
         except (ValueError, TypeError):
             raise TemplateSyntaxError('"cache" tag got a non-integer timeout value: %r' % expire_time)
-        # Build a key for this fragment and all vary-on's.
-        key = ':'.join([urlquote(resolve_variable(var, context)) for var in self.vary_on])
-        args = hashlib.md5(force_bytes(key))
-        cache_key = 'template.cache.%s.%s' % (self.fragment_name, args.hexdigest())
+        vary_on = [var.resolve(context) for var in self.vary_on]
+        cache_key = make_template_fragment_key(self.fragment_name, vary_on)
         value = cache.get(cache_key)
         if value is None:
             value = self.nodelist.render(context)
@@ -59,7 +54,10 @@ def do_cache(parser, token):
     """
     nodelist = parser.parse(('endcache',))
     parser.delete_first_token()
-    tokens = token.contents.split()
+    tokens = token.split_contents()
     if len(tokens) < 3:
         raise TemplateSyntaxError("'%r' tag requires at least 2 arguments." % tokens[0])
-    return CacheNode(nodelist, tokens[1], tokens[2], tokens[3:])
+    return CacheNode(nodelist,
+        parser.compile_filter(tokens[1]),
+        tokens[2], # fragment_name can't be a variable.
+        [parser.compile_filter(token) for token in tokens[3:]])
diff --git a/django/templatetags/future.py b/django/templatetags/future.py
index e6a0127e71..7203f394bf 100644
--- a/django/templatetags/future.py
+++ b/django/templatetags/future.py
@@ -1,14 +1,65 @@
 from django.template import Library
-from django.template.defaulttags import url as default_url, ssi as default_ssi
+from django.template import defaulttags
 
 register = Library()
 
+
 @register.tag
 def ssi(parser, token):
     # Used for deprecation path during 1.3/1.4, will be removed in 2.0
-    return default_ssi(parser, token)
+    return defaulttags.ssi(parser, token)
+
 
 @register.tag
 def url(parser, token):
     # Used for deprecation path during 1.3/1.4, will be removed in 2.0
-    return default_url(parser, token)
+    return defaulttags.url(parser, token)
+
+
+@register.tag
+def cycle(parser, token):
+    """
+    This is the future version of `cycle` with auto-escaping.
+
+    By default all strings are escaped.
+
+    If you want to disable auto-escaping of variables you can use::
+
+        {% autoescape off %}
+            {% cycle var1 var2 var3 as somecycle %}
+        {% autoescape %}
+
+    Or if only some variables should be escaped, you can use::
+
+        {% cycle var1 var2|safe var3|safe  as somecycle %}
+    """
+    return defaulttags.cycle(parser, token, escape=True)
+
+
+@register.tag
+def firstof(parser, token):
+    """
+    This is the future version of `firstof` with auto-escaping.
+
+    This is equivalent to::
+
+        {% if var1 %}
+            {{ var1 }}
+        {% elif var2 %}
+            {{ var2 }}
+        {% elif var3 %}
+            {{ var3 }}
+        {% endif %}
+
+    If you want to disable auto-escaping of variables you can use::
+
+        {% autoescape off %}
+            {% firstof var1 var2 var3 "<strong>fallback value</strong>" %}
+        {% autoescape %}
+
+    Or if only some variables should be escaped, you can use::
+
+        {% firstof var1 var2|safe var3 "<strong>fallback value</strong>"|safe %}
+
+    """
+    return defaulttags.firstof(parser, token, escape=True)
diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py
index 5576beb4a3..14f0382fc7 100644
--- a/django/templatetags/i18n.py
+++ b/django/templatetags/i18n.py
@@ -1,9 +1,11 @@
 from __future__ import unicode_literals
 import re
+import sys
 
+from django.conf import settings
 from django.template import (Node, Variable, TemplateSyntaxError,
     TokenParser, Library, TOKEN_TEXT, TOKEN_VAR)
-from django.template.base import _render_value_in_context
+from django.template.base import render_value_in_context
 from django.template.defaulttags import token_kwargs
 from django.utils import six
 from django.utils import translation
@@ -17,14 +19,13 @@ class GetAvailableLanguagesNode(Node):
         self.variable = variable
 
     def render(self, context):
-        from django.conf import settings
         context[self.variable] = [(k, translation.ugettext(v)) for k, v in settings.LANGUAGES]
         return ''
 
 
 class GetLanguageInfoNode(Node):
     def __init__(self, lang_code, variable):
-        self.lang_code = Variable(lang_code)
+        self.lang_code = lang_code
         self.variable = variable
 
     def render(self, context):
@@ -35,7 +36,7 @@ class GetLanguageInfoNode(Node):
 
 class GetLanguageInfoListNode(Node):
     def __init__(self, languages, variable):
-        self.languages = Variable(languages)
+        self.languages = languages
         self.variable = variable
 
     def get_language_info(self, language):
@@ -87,7 +88,7 @@ class TranslateNode(Node):
             self.filter_expression.var.message_context = (
                 self.message_context.resolve(context))
         output = self.filter_expression.resolve(context)
-        value = _render_value_in_context(output, context)
+        value = render_value_in_context(output, context)
         if self.asvar:
             context[self.asvar] = value
             return ''
@@ -143,7 +144,10 @@ class BlockTranslateNode(Node):
                 result = translation.pgettext(message_context, singular)
             else:
                 result = translation.ugettext(singular)
-        data = dict([(v, _render_value_in_context(context.get(v, ''), context)) for v in vars])
+        default_value = settings.TEMPLATE_STRING_IF_INVALID
+        render_value = lambda v: render_value_in_context(
+            context.get(v, default_value), context)
+        data = dict([(v, render_value(v)) for v in vars])
         context.pop()
         try:
             result = result % data
@@ -185,6 +189,7 @@ def do_get_available_languages(parser, token):
     your setting file (or the default settings) and
     put it into the named variable.
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     args = token.contents.split()
     if len(args) != 3 or args[1] != 'as':
         raise TemplateSyntaxError("'get_available_languages' requires 'as variable' (got %r)" % args)
@@ -204,10 +209,10 @@ def do_get_language_info(parser, token):
         {{ l.name_local }}
         {{ l.bidi|yesno:"bi-directional,uni-directional" }}
     """
-    args = token.contents.split()
+    args = token.split_contents()
     if len(args) != 5 or args[1] != 'for' or args[3] != 'as':
         raise TemplateSyntaxError("'%s' requires 'for string as variable' (got %r)" % (args[0], args[1:]))
-    return GetLanguageInfoNode(args[2], args[4])
+    return GetLanguageInfoNode(parser.compile_filter(args[2]), args[4])
 
 @register.tag("get_language_info_list")
 def do_get_language_info_list(parser, token):
@@ -227,10 +232,10 @@ def do_get_language_info_list(parser, token):
           {{ l.bidi|yesno:"bi-directional,uni-directional" }}
         {% endfor %}
     """
-    args = token.contents.split()
+    args = token.split_contents()
     if len(args) != 5 or args[1] != 'for' or args[3] != 'as':
         raise TemplateSyntaxError("'%s' requires 'for sequence as variable' (got %r)" % (args[0], args[1:]))
-    return GetLanguageInfoListNode(args[2], args[4])
+    return GetLanguageInfoListNode(parser.compile_filter(args[2]), args[4])
 
 @register.filter
 def language_name(lang_code):
@@ -257,6 +262,7 @@ def do_get_current_language(parser, token):
     put it's value into the ``language`` context
     variable.
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     args = token.contents.split()
     if len(args) != 3 or args[1] != 'as':
         raise TemplateSyntaxError("'get_current_language' requires 'as variable' (got %r)" % args)
@@ -275,6 +281,7 @@ def do_get_current_language_bidi(parser, token):
     put it's value into the ``bidi`` context variable.
     True indicates right-to-left layout, otherwise left-to-right
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     args = token.contents.split()
     if len(args) != 3 or args[1] != 'as':
         raise TemplateSyntaxError("'get_current_language_bidi' requires 'as variable' (got %r)" % args)
@@ -418,8 +425,10 @@ def do_block_translate(parser, token):
                 value = remaining_bits.pop(0)
                 value = parser.compile_filter(value)
             except Exception:
-                raise TemplateSyntaxError('"context" in %r tag expected '
-                                          'exactly one argument.' % bits[0])
+                msg = (
+                    '"context" in %r tag expected '
+                    'exactly one argument.') % bits[0]
+                six.reraise(TemplateSyntaxError, TemplateSyntaxError(msg), sys.exc_info()[2])
         else:
             raise TemplateSyntaxError('Unknown argument for %r tag: %r.' %
                                       (bits[0], option))
diff --git a/django/templatetags/static.py b/django/templatetags/static.py
index 5b0e40eba6..68437e7e60 100644
--- a/django/templatetags/static.py
+++ b/django/templatetags/static.py
@@ -27,6 +27,7 @@ class PrefixNode(template.Node):
         """
         Class method to parse prefix node and return a Node.
         """
+        # token.split_contents() isn't useful here because tags using this method don't accept variable as arguments
         tokens = token.contents.split()
         if len(tokens) > 1 and tokens[1] != 'as':
             raise template.TemplateSyntaxError(
diff --git a/django/templatetags/tz.py b/django/templatetags/tz.py
index 96210f189d..05088e1a89 100644
--- a/django/templatetags/tz.py
+++ b/django/templatetags/tz.py
@@ -190,6 +190,7 @@ def get_current_timezone_tag(parser, token):
     This will fetch the currently active time zone and put its name
     into the ``TIME_ZONE`` context variable.
     """
+    # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments
     args = token.contents.split()
     if len(args) != 3 or args[1] != 'as':
         raise TemplateSyntaxError("'get_current_timezone' requires "
diff --git a/django/test/_doctest.py b/django/test/_doctest.py
index 82d4a6d08e..9b8ddc9696 100644
--- a/django/test/_doctest.py
+++ b/django/test/_doctest.py
@@ -883,7 +883,7 @@ class DocTestFinder:
         if module is None:
             return True
         elif inspect.isfunction(object):
-            return module.__dict__ is object.__globals__
+            return module.__dict__ is six.get_function_globals(object)
         elif inspect.isclass(object):
             return module.__name__ == object.__module__
         elif inspect.getmodule(object) is not None:
@@ -1021,7 +1021,7 @@ class DocTestFinder:
 
         # Find the line number for functions & methods.
         if inspect.ismethod(obj): obj = obj.__func__
-        if inspect.isfunction(obj): obj = obj.__code__
+        if inspect.isfunction(obj): obj = six.get_function_code(obj)
         if inspect.istraceback(obj): obj = obj.tb_frame
         if inspect.isframe(obj): obj = obj.f_code
         if inspect.iscode(obj):
diff --git a/django/test/client.py b/django/test/client.py
index 6d12321075..46f55d7cdc 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -16,17 +16,18 @@ from django.conf import settings
 from django.contrib.auth import authenticate, login
 from django.core.handlers.base import BaseHandler
 from django.core.handlers.wsgi import WSGIRequest
-from django.core.signals import got_request_exception
+from django.core.signals import (request_started, request_finished,
+    got_request_exception)
+from django.db import close_old_connections
 from django.http import SimpleCookie, HttpRequest, QueryDict
 from django.template import TemplateDoesNotExist
 from django.test import signals
 from django.utils.functional import curry
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_str
 from django.utils.http import urlencode
 from django.utils.importlib import import_module
 from django.utils.itercompat import is_iterable
 from django.utils import six
-from django.db import close_connection
 from django.test.utils import ContextList
 
 __all__ = ('Client', 'RequestFactory', 'encode_file', 'encode_multipart')
@@ -72,6 +73,16 @@ class FakePayload(object):
         self.__len += len(content)
 
 
+def closing_iterator_wrapper(iterable, close):
+    try:
+        for item in iterable:
+            yield item
+    finally:
+        request_finished.disconnect(close_old_connections)
+        close()                                 # will fire request_finished
+        request_finished.connect(close_old_connections)
+
+
 class ClientHandler(BaseHandler):
     """
     A HTTP Handler that can be used for testing purposes.
@@ -84,26 +95,31 @@ class ClientHandler(BaseHandler):
 
     def __call__(self, environ):
         from django.conf import settings
-        from django.core import signals
 
         # Set up middleware if needed. We couldn't do this earlier, because
         # settings weren't available.
         if self._request_middleware is None:
             self.load_middleware()
 
-        signals.request_started.send(sender=self.__class__)
-        try:
-            request = WSGIRequest(environ)
-            # sneaky little hack so that we can easily get round
-            # CsrfViewMiddleware.  This makes life easier, and is probably
-            # required for backwards compatibility with external tests against
-            # admin views.
-            request._dont_enforce_csrf_checks = not self.enforce_csrf_checks
-            response = self.get_response(request)
-        finally:
-            signals.request_finished.disconnect(close_connection)
-            signals.request_finished.send(sender=self.__class__)
-            signals.request_finished.connect(close_connection)
+        request_started.disconnect(close_old_connections)
+        request_started.send(sender=self.__class__)
+        request_started.connect(close_old_connections)
+        request = WSGIRequest(environ)
+        # sneaky little hack so that we can easily get round
+        # CsrfViewMiddleware.  This makes life easier, and is probably
+        # required for backwards compatibility with external tests against
+        # admin views.
+        request._dont_enforce_csrf_checks = not self.enforce_csrf_checks
+        response = self.get_response(request)
+        # We're emulating a WSGI server; we must call the close method
+        # on completion.
+        if response.streaming:
+            response.streaming_content = closing_iterator_wrapper(
+                response.streaming_content, response.close)
+        else:
+            request_finished.disconnect(close_old_connections)
+            response.close()                    # will fire request_finished
+            request_finished.connect(close_old_connections)
 
         return response
 
@@ -205,15 +221,15 @@ class RequestFactory(object):
         # See http://www.python.org/dev/peps/pep-3333/#environ-variables
         environ = {
             'HTTP_COOKIE':       self.cookies.output(header='', sep='; '),
-            'PATH_INFO':         '/',
-            'REMOTE_ADDR':       '127.0.0.1',
-            'REQUEST_METHOD':    'GET',
-            'SCRIPT_NAME':       '',
-            'SERVER_NAME':       'testserver',
-            'SERVER_PORT':       '80',
-            'SERVER_PROTOCOL':   'HTTP/1.1',
+            'PATH_INFO':         str('/'),
+            'REMOTE_ADDR':       str('127.0.0.1'),
+            'REQUEST_METHOD':    str('GET'),
+            'SCRIPT_NAME':       str(''),
+            'SERVER_NAME':       str('testserver'),
+            'SERVER_PORT':       str('80'),
+            'SERVER_PROTOCOL':   str('HTTP/1.1'),
             'wsgi.version':      (1, 0),
-            'wsgi.url_scheme':   'http',
+            'wsgi.url_scheme':   str('http'),
             'wsgi.input':        FakePayload(b''),
             'wsgi.errors':       self.errors,
             'wsgi.multiprocess': True,
@@ -241,21 +257,25 @@ class RequestFactory(object):
             return force_bytes(data, encoding=charset)
 
     def _get_path(self, parsed):
+        path = force_str(parsed[2])
         # If there are parameters, add them
         if parsed[3]:
-            return unquote(parsed[2] + ";" + parsed[3])
-        else:
-            return unquote(parsed[2])
+            path += str(";") + force_str(parsed[3])
+        path = unquote(path)
+        # WSGI requires latin-1 encoded strings. See get_path_info().
+        if six.PY3:
+            path = path.encode('utf-8').decode('iso-8859-1')
+        return path
 
     def get(self, path, data={}, **extra):
         "Construct a GET request."
 
         parsed = urlparse(path)
         r = {
-            'CONTENT_TYPE':    'text/html; charset=utf-8',
+            'CONTENT_TYPE':    str('text/html; charset=utf-8'),
             'PATH_INFO':       self._get_path(parsed),
-            'QUERY_STRING':    urlencode(data, doseq=True) or parsed[4],
-            'REQUEST_METHOD': 'GET',
+            'QUERY_STRING':    urlencode(data, doseq=True) or force_str(parsed[4]),
+            'REQUEST_METHOD':  str('GET'),
         }
         r.update(extra)
         return self.request(**r)
@@ -271,8 +291,8 @@ class RequestFactory(object):
             'CONTENT_LENGTH': len(post_data),
             'CONTENT_TYPE':   content_type,
             'PATH_INFO':      self._get_path(parsed),
-            'QUERY_STRING':   parsed[4],
-            'REQUEST_METHOD': 'POST',
+            'QUERY_STRING':   force_str(parsed[4]),
+            'REQUEST_METHOD': str('POST'),
             'wsgi.input':     FakePayload(post_data),
         }
         r.update(extra)
@@ -283,10 +303,10 @@ class RequestFactory(object):
 
         parsed = urlparse(path)
         r = {
-            'CONTENT_TYPE':    'text/html; charset=utf-8',
+            'CONTENT_TYPE':    str('text/html; charset=utf-8'),
             'PATH_INFO':       self._get_path(parsed),
-            'QUERY_STRING':    urlencode(data, doseq=True) or parsed[4],
-            'REQUEST_METHOD': 'HEAD',
+            'QUERY_STRING':    urlencode(data, doseq=True) or force_str(parsed[4]),
+            'REQUEST_METHOD':  str('HEAD'),
         }
         r.update(extra)
         return self.request(**r)
@@ -301,6 +321,11 @@ class RequestFactory(object):
         "Construct a PUT request."
         return self.generic('PUT', path, data, content_type, **extra)
 
+    def patch(self, path, data='', content_type='application/octet-stream',
+            **extra):
+        "Construct a PATCH request."
+        return self.generic('PATCH', path, data, content_type, **extra)
+
     def delete(self, path, data='', content_type='application/octet-stream',
             **extra):
         "Construct a DELETE request."
@@ -312,13 +337,13 @@ class RequestFactory(object):
         data = force_bytes(data, settings.DEFAULT_CHARSET)
         r = {
             'PATH_INFO':      self._get_path(parsed),
-            'QUERY_STRING':   parsed[4],
-            'REQUEST_METHOD': method,
+            'QUERY_STRING':   force_str(parsed[4]),
+            'REQUEST_METHOD': str(method),
         }
         if data:
             r.update({
                 'CONTENT_LENGTH': len(data),
-                'CONTENT_TYPE':   content_type,
+                'CONTENT_TYPE':   str(content_type),
                 'wsgi.input':     FakePayload(data),
             })
         r.update(extra)
@@ -478,6 +503,17 @@ class Client(RequestFactory):
             response = self._handle_redirects(response, **extra)
         return response
 
+    def patch(self, path, data='', content_type='application/octet-stream',
+            follow=False, **extra):
+        """
+        Send a resource to the server using PATCH.
+        """
+        response = super(Client, self).patch(
+            path, data=data, content_type=content_type, **extra)
+        if follow:
+            response = self._handle_redirects(response, **extra)
+        return response
+
     def delete(self, path, data='', content_type='application/octet-stream',
             follow=False, **extra):
         """
@@ -546,7 +582,7 @@ class Client(RequestFactory):
 
         response.redirect_chain = []
         while response.status_code in (301, 302, 303, 307):
-            url = response['Location']
+            url = response.url
             redirect_chain = response.redirect_chain
             redirect_chain.append((url, response.status_code))
 
diff --git a/django/test/html.py b/django/test/html.py
index 274810cab4..0d30bd2d1c 100644
--- a/django/test/html.py
+++ b/django/test/html.py
@@ -85,7 +85,8 @@ class Element(object):
             return False
         return True
 
-    __hash__ = object.__hash__
+    def __hash__(self):
+        return hash((self.name,) + tuple(a for a in self.attributes))
 
     def __ne__(self, element):
         return not self.__eq__(element)
@@ -182,6 +183,14 @@ class Parser(HTMLParser):
             self.handle_endtag(tag)
 
     def handle_starttag(self, tag, attrs):
+        # Special case handling of 'class' attribute, so that comparisons of DOM
+        # instances are not sensitive to ordering of classes.
+        attrs = [
+            (name, " ".join(sorted(value.split(" "))))
+            if name == "class"
+            else (name, value)
+            for name, value in attrs
+            ]
         element = Element(tag, attrs)
         self.current.append(element)
         if tag not in self.SELF_CLOSING_TAGS:
@@ -213,7 +222,7 @@ def parse_html(html):
     """
     Takes a string that contains *valid* HTML and turns it into a Python object
     structure that can be easily compared against other HTML on semantic
-    equivilance. Syntactical differences like which quotation is used on
+    equivalence. Syntactical differences like which quotation is used on
     arguments will be ignored.
 
     """
diff --git a/django/test/simple.py b/django/test/simple.py
index bf0219d53f..6804b4958c 100644
--- a/django/test/simple.py
+++ b/django/test/simple.py
@@ -10,7 +10,7 @@ from django.utils import unittest
 from django.utils.importlib import import_module
 from django.utils.module_loading import module_has_submodule
 
-__all__ = ('DjangoTestSuiteRunner')
+__all__ = ('DjangoTestSuiteRunner',)
 
 # The module name for tests outside models.py
 TEST_MODULE = 'tests'
@@ -42,6 +42,13 @@ def get_tests(app_module):
     return test_module
 
 
+def make_doctest(module):
+    return doctest.DocTestSuite(module,
+       checker=doctestOutputChecker,
+       runner=DocTestRunner,
+    )
+
+
 def build_suite(app_module):
     """
     Create a complete Django test suite for the provided application module.
@@ -56,9 +63,7 @@ def build_suite(app_module):
         suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(
             app_module))
         try:
-            suite.addTest(doctest.DocTestSuite(app_module,
-                                               checker=doctestOutputChecker,
-                                               runner=DocTestRunner))
+            suite.addTest(make_doctest(app_module))
         except ValueError:
             # No doc tests in models.py
             pass
@@ -75,9 +80,7 @@ def build_suite(app_module):
             suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(
                 test_module))
             try:
-                suite.addTest(doctest.DocTestSuite(
-                    test_module, checker=doctestOutputChecker,
-                    runner=DocTestRunner))
+                suite.addTest(make_doctest(test_module))
             except ValueError:
                 # No doc tests in tests.py
                 pass
@@ -130,9 +133,7 @@ def build_test(label):
     tests = []
     for module in app_module, test_module:
         try:
-            doctests = doctest.DocTestSuite(module,
-                                            checker=doctestOutputChecker,
-                                            runner=DocTestRunner)
+            doctests = make_doctest(module)
             # Now iterate over the suite, looking for doctests whose name
             # matches the pattern that was given
             for test in doctests:
diff --git a/django/test/testcases.py b/django/test/testcases.py
index 3af6b8c346..a9fcc2bab6 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -1,12 +1,13 @@
 from __future__ import unicode_literals
 
+from copy import copy
 import difflib
+import errno
+from functools import wraps
 import json
 import os
 import re
 import sys
-from copy import copy
-from functools import wraps
 try:
     from urllib.parse import urlsplit, urlunsplit
 except ImportError:     # Python 2
@@ -14,7 +15,7 @@ except ImportError:     # Python 2
 import select
 import socket
 import threading
-import errno
+import warnings
 
 from django.conf import settings
 from django.contrib.staticfiles.handlers import StaticFilesHandler
@@ -23,32 +24,29 @@ from django.core.exceptions import ValidationError, ImproperlyConfigured
 from django.core.handlers.wsgi import WSGIHandler
 from django.core.management import call_command
 from django.core.management.color import no_style
-from django.core.signals import request_started
 from django.core.servers.basehttp import (WSGIRequestHandler, WSGIServer,
     WSGIServerException)
-from django.core.urlresolvers import clear_url_caches
-from django.core.validators import EMPTY_VALUES
-from django.db import (transaction, connection, connections, DEFAULT_DB_ALIAS,
-    reset_queries)
+from django.core.urlresolvers import clear_url_caches, set_urlconf
+from django.db import connection, connections, DEFAULT_DB_ALIAS, transaction
 from django.forms.fields import CharField
 from django.http import QueryDict
 from django.test import _doctest as doctest
 from django.test.client import Client
 from django.test.html import HTMLParseError, parse_html
 from django.test.signals import template_rendered
-from django.test.utils import (get_warnings_state, restore_warnings_state,
+from django.test.utils import (CaptureQueriesContext, ContextList,
     override_settings, compare_xml, strip_quotes)
-from django.test.utils import ContextList
-from django.utils import unittest as ut2
+from django.utils import six, unittest as ut2
 from django.utils.encoding import force_text
-from django.utils import six
+from django.utils.unittest import skipIf # Imported here for backward compatibility
 from django.utils.unittest.util import safe_repr
-from django.utils.unittest import skipIf
 from django.views.static import serve
 
+
 __all__ = ('DocTestRunner', 'OutputChecker', 'TestCase', 'TransactionTestCase',
            'SimpleTestCase', 'skipIfDBFeature', 'skipUnlessDBFeature')
 
+
 normalize_long_ints = lambda s: re.sub(r'(?<![\w])(\d+)L(?![\w])', '\\1', s)
 normalize_decimals = lambda s: re.sub(r"Decimal\('(\d+(\.\d*)?)'\)",
                                 lambda m: "Decimal(\"%s\")" % m.groups()[0], s)
@@ -69,7 +67,7 @@ real_commit = transaction.commit
 real_rollback = transaction.rollback
 real_enter_transaction_management = transaction.enter_transaction_management
 real_leave_transaction_management = transaction.leave_transaction_management
-real_managed = transaction.managed
+real_abort = transaction.abort
 
 def nop(*args, **kwargs):
     return
@@ -79,14 +77,14 @@ def disable_transaction_methods():
     transaction.rollback = nop
     transaction.enter_transaction_management = nop
     transaction.leave_transaction_management = nop
-    transaction.managed = nop
+    transaction.abort = nop
 
 def restore_transaction_methods():
     transaction.commit = real_commit
     transaction.rollback = real_rollback
     transaction.enter_transaction_management = real_enter_transaction_management
     transaction.leave_transaction_management = real_leave_transaction_management
-    transaction.managed = real_managed
+    transaction.abort = real_abort
 
 
 def assert_and_parse_html(self, html, user_msg, msg):
@@ -156,37 +154,18 @@ class DocTestRunner(doctest.DocTestRunner):
         doctest.DocTestRunner.__init__(self, *args, **kwargs)
         self.optionflags = doctest.ELLIPSIS
 
-    def report_unexpected_exception(self, out, test, example, exc_info):
-        doctest.DocTestRunner.report_unexpected_exception(self, out, test,
-                                                          example, exc_info)
-        # Rollback, in case of database errors. Otherwise they'd have
-        # side effects on other tests.
-        for conn in connections:
-            transaction.rollback_unless_managed(using=conn)
 
-
-class _AssertNumQueriesContext(object):
+class _AssertNumQueriesContext(CaptureQueriesContext):
     def __init__(self, test_case, num, connection):
         self.test_case = test_case
         self.num = num
-        self.connection = connection
-
-    def __enter__(self):
-        self.old_debug_cursor = self.connection.use_debug_cursor
-        self.connection.use_debug_cursor = True
-        self.starting_queries = len(self.connection.queries)
-        request_started.disconnect(reset_queries)
-        return self
+        super(_AssertNumQueriesContext, self).__init__(connection)
 
     def __exit__(self, exc_type, exc_value, traceback):
-        self.connection.use_debug_cursor = self.old_debug_cursor
-        request_started.connect(reset_queries)
+        super(_AssertNumQueriesContext, self).__exit__(exc_type, exc_value, traceback)
         if exc_type is not None:
             return
-
-        final_queries = len(self.connection.queries)
-        executed = final_queries - self.starting_queries
-
+        executed = len(self)
         self.test_case.assertEqual(
             executed, self.num, "%d queries executed, %d expected" % (
                 executed, self.num
@@ -241,6 +220,11 @@ class _AssertTemplateNotUsedContext(_AssertTemplateUsedContext):
 
 
 class SimpleTestCase(ut2.TestCase):
+
+    _warn_txt = ("save_warnings_state/restore_warnings_state "
+        "django.test.*TestCase methods are deprecated. Use Python's "
+        "warnings.catch_warnings context manager instead.")
+
     def __call__(self, result=None):
         """
         Wrapper around default __call__ method to perform common Django test
@@ -279,14 +263,16 @@ class SimpleTestCase(ut2.TestCase):
         """
         Saves the state of the warnings module
         """
-        self._warnings_state = get_warnings_state()
+        warnings.warn(self._warn_txt, DeprecationWarning, stacklevel=2)
+        self._warnings_state = warnings.filters[:]
 
     def restore_warnings_state(self):
         """
         Restores the state of the warnings module to the state
         saved by save_warnings_state()
         """
-        restore_warnings_state(self._warnings_state)
+        warnings.warn(self._warn_txt, DeprecationWarning, stacklevel=2)
+        warnings.filters = self._warnings_state[:]
 
     def settings(self, **kwargs):
         """
@@ -324,7 +310,7 @@ class SimpleTestCase(ut2.TestCase):
                     raised error messages.
             field_args: the args passed to instantiate the field
             field_kwargs: the kwargs passed to instantiate the field
-            empty_value: the expected clean output for inputs in EMPTY_VALUES
+            empty_value: the expected clean output for inputs in empty_values
 
         """
         if field_args is None:
@@ -349,7 +335,7 @@ class SimpleTestCase(ut2.TestCase):
             self.assertEqual(context_manager.exception.messages, errors)
         # test required inputs
         error_required = [force_text(required.error_messages['required'])]
-        for e in EMPTY_VALUES:
+        for e in required.empty_values:
             with self.assertRaises(ValidationError) as context_manager:
                 required.clean(e)
             self.assertEqual(context_manager.exception.messages,
@@ -393,6 +379,32 @@ class SimpleTestCase(ut2.TestCase):
                 safe_repr(dom1, True), safe_repr(dom2, True))
             self.fail(self._formatMessage(msg, standardMsg))
 
+    def assertInHTML(self, needle, haystack, count = None, msg_prefix=''):
+        needle = assert_and_parse_html(self, needle, None,
+            'First argument is not valid HTML:')
+        haystack = assert_and_parse_html(self, haystack, None,
+            'Second argument is not valid HTML:')
+        real_count = haystack.count(needle)
+        if count is not None:
+            self.assertEqual(real_count, count,
+                msg_prefix + "Found %d instances of '%s' in response"
+                " (expected %d)" % (real_count, needle, count))
+        else:
+            self.assertTrue(real_count != 0,
+                msg_prefix + "Couldn't find '%s' in response" % needle)
+
+    def assertJSONEqual(self, raw, expected_data, msg=None):
+        try:
+            data = json.loads(raw)
+        except ValueError:
+            self.fail("First argument is not valid JSON: %r" % raw)
+        if isinstance(expected_data, six.string_types):
+            try:
+                expected_data = json.loads(expected_data)
+            except ValueError:
+                self.fail("Second argument is not valid JSON: %r" % expected_data)
+        self.assertEqual(data, expected_data, msg=msg)
+
     def assertXMLEqual(self, xml1, xml2, msg=None):
         """
         Asserts that two XML snippets are semantically the same.
@@ -467,14 +479,10 @@ class TransactionTestCase(SimpleTestCase):
                 conn.ops.sequence_reset_by_name_sql(no_style(),
                                                     conn.introspection.sequence_list())
             if sql_list:
-                try:
+                with transaction.commit_on_success_unless_managed(using=db_name):
                     cursor = conn.cursor()
                     for sql in sql_list:
                         cursor.execute(sql)
-                except Exception:
-                    transaction.rollback_unless_managed(using=db_name)
-                    raise
-                transaction.commit_unless_managed(using=db_name)
 
     def _fixture_setup(self):
         for db_name in self._databases_names(include_mirrors=False):
@@ -489,6 +497,7 @@ class TransactionTestCase(SimpleTestCase):
                              **{'verbosity': 0, 'database': db_name, 'skip_validation': True})
 
     def _urlconf_setup(self):
+        set_urlconf(None)
         if hasattr(self, 'urls'):
             self._old_root_urlconf = settings.ROOT_URLCONF
             settings.ROOT_URLCONF = self.urls
@@ -514,16 +523,12 @@ class TransactionTestCase(SimpleTestCase):
             conn.close()
 
     def _fixture_teardown(self):
-        # Roll back any pending transactions in order to avoid a deadlock
-        # during flush when TEST_MIRROR is used (#18984).
-        for conn in connections.all():
-            conn.rollback_unless_managed()
-
         for db in self._databases_names(include_mirrors=False):
             call_command('flush', verbosity=0, interactive=False, database=db,
                          skip_validation=True, reset_sequences=False)
 
     def _urlconf_teardown(self):
+        set_urlconf(None)
         if hasattr(self, '_old_root_urlconf'):
             settings.ROOT_URLCONF = self._old_root_urlconf
             clear_url_caches()
@@ -565,7 +570,7 @@ class TransactionTestCase(SimpleTestCase):
                 " code was %d (expected %d)" %
                     (response.status_code, status_code))
 
-            url = response['Location']
+            url = response.url
             scheme, netloc, path, query, fragment = urlsplit(url)
 
             redirect_response = response.client.get(path, QueryDict(query))
@@ -609,14 +614,17 @@ class TransactionTestCase(SimpleTestCase):
         self.assertEqual(response.status_code, status_code,
             msg_prefix + "Couldn't retrieve content: Response code was %d"
             " (expected %d)" % (response.status_code, status_code))
-        text = force_text(text, encoding=response._charset)
+
         if response.streaming:
             content = b''.join(response.streaming_content)
         else:
             content = response.content
-        content = content.decode(response._charset)
-        # Avoid ResourceWarning about unclosed files.
-        response.close()
+        if not isinstance(text, bytes) or html:
+            text = force_text(text, encoding=response._charset)
+            content = content.decode(response._charset)
+            text_repr = "'%s'" % text
+        else:
+            text_repr = repr(text)
         if html:
             content = assert_and_parse_html(self, content, None,
                 "Response's content is not valid HTML:")
@@ -625,11 +633,11 @@ class TransactionTestCase(SimpleTestCase):
         real_count = content.count(text)
         if count is not None:
             self.assertEqual(real_count, count,
-                msg_prefix + "Found %d instances of '%s' in response"
-                " (expected %d)" % (real_count, text, count))
+                msg_prefix + "Found %d instances of %s in response"
+                " (expected %d)" % (real_count, text_repr, count))
         else:
             self.assertTrue(real_count != 0,
-                msg_prefix + "Couldn't find '%s' in response" % text)
+                msg_prefix + "Couldn't find %s in response" % text_repr)
 
     def assertNotContains(self, response, text, status_code=200,
                           msg_prefix='', html=False):
@@ -651,15 +659,21 @@ class TransactionTestCase(SimpleTestCase):
         self.assertEqual(response.status_code, status_code,
             msg_prefix + "Couldn't retrieve content: Response code was %d"
             " (expected %d)" % (response.status_code, status_code))
-        text = force_text(text, encoding=response._charset)
-        content = response.content.decode(response._charset)
+
+        content = response.content
+        if not isinstance(text, bytes) or html:
+            text = force_text(text, encoding=response._charset)
+            content = content.decode(response._charset)
+            text_repr = "'%s'" % text
+        else:
+            text_repr = repr(text)
         if html:
             content = assert_and_parse_html(self, content, None,
                 'Response\'s content is not valid HTML:')
             text = assert_and_parse_html(self, text, None,
                 'Second argument is not valid HTML:')
         self.assertEqual(content.count(text), 0,
-            msg_prefix + "Response should not contain '%s'" % text)
+            msg_prefix + "Response should not contain %s" % text_repr)
 
     def assertFormError(self, response, form, field, errors, msg_prefix=''):
         """
@@ -810,14 +824,13 @@ class TestCase(TransactionTestCase):
 
         assert not self.reset_sequences, 'reset_sequences cannot be used on TestCase instances'
 
+        self.atomics = {}
         for db_name in self._databases_names():
-            transaction.enter_transaction_management(using=db_name)
-            transaction.managed(True, using=db_name)
+            self.atomics[db_name] = transaction.atomic(using=db_name)
+            self.atomics[db_name].__enter__()
+        # Remove this when the legacy transaction management goes away.
         disable_transaction_methods()
 
-        from django.contrib.sites.models import Site
-        Site.objects.clear_cache()
-
         for db in self._databases_names(include_mirrors=False):
             if hasattr(self, 'fixtures'):
                 call_command('loaddata', *self.fixtures,
@@ -832,10 +845,12 @@ class TestCase(TransactionTestCase):
         if not connections_support_transactions():
             return super(TestCase, self)._fixture_teardown()
 
+        # Remove this when the legacy transaction management goes away.
         restore_transaction_methods()
-        for db in self._databases_names():
-            transaction.rollback(using=db)
-            transaction.leave_transaction_management(using=db)
+        for db_name in reversed(self._databases_names()):
+            # Hack to force a rollback
+            connections[db_name].needs_rollback = True
+            self.atomics[db_name].__exit__(None, None, None)
 
 
 def _deferredSkip(condition, reason):
@@ -1017,7 +1032,6 @@ class LiveServerThread(threading.Thread):
         http requests.
         """
         if self.connections_override:
-            from django.db import connections
             # Override this thread's database connections with the ones
             # provided by the main thread.
             for alias, conn in self.connections_override.items():
@@ -1115,8 +1129,8 @@ class LiveServerTestCase(TransactionTestCase):
                     for port in range(extremes[0], extremes[1] + 1):
                         possible_ports.append(port)
         except Exception:
-            raise ImproperlyConfigured('Invalid address ("%s") for live '
-                'server.' % specified_address)
+            msg = 'Invalid address ("%s") for live server.' % specified_address
+            six.reraise(ImproperlyConfigured, ImproperlyConfigured(msg), sys.exc_info()[2])
         cls.server_thread = LiveServerThread(
             host, possible_ports, connections_override)
         cls.server_thread.daemon = True
diff --git a/django/test/utils.py b/django/test/utils.py
index 8114ae0e6a..d839c0403c 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -4,12 +4,15 @@ from xml.dom.minidom import parseString, Node
 
 from django.conf import settings, UserSettingsHolder
 from django.core import mail
-from django.test.signals import template_rendered, setting_changed
+from django.core.signals import request_started
+from django.db import reset_queries
 from django.template import Template, loader, TemplateDoesNotExist
 from django.template.loaders import cached
-from django.utils.translation import deactivate
+from django.test.signals import template_rendered, setting_changed
+from django.utils.encoding import force_str
 from django.utils.functional import wraps
 from django.utils import six
+from django.utils.translation import deactivate
 
 
 __all__ = (
@@ -77,6 +80,9 @@ def setup_test_environment():
     mail.original_email_backend = settings.EMAIL_BACKEND
     settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
 
+    settings._original_allowed_hosts = settings.ALLOWED_HOSTS
+    settings.ALLOWED_HOSTS = ['*']
+
     mail.outbox = []
 
     deactivate()
@@ -95,9 +101,17 @@ def teardown_test_environment():
     settings.EMAIL_BACKEND = mail.original_email_backend
     del mail.original_email_backend
 
+    settings.ALLOWED_HOSTS = settings._original_allowed_hosts
+    del settings._original_allowed_hosts
+
     del mail.outbox
 
 
+warn_txt = ("get_warnings_state/restore_warnings_state functions from "
+    "django.test.utils are deprecated. Use Python's warnings.catch_warnings() "
+    "context manager instead.")
+
+
 def get_warnings_state():
     """
     Returns an object containing the state of the warnings module
@@ -105,6 +119,7 @@ def get_warnings_state():
     # There is no public interface for doing this, but this implementation of
     # get_warnings_state and restore_warnings_state appears to work on Python
     # 2.4 to 2.7.
+    warnings.warn(warn_txt, DeprecationWarning, stacklevel=2)
     return warnings.filters[:]
 
 
@@ -113,6 +128,7 @@ def restore_warnings_state(state):
     Restores the state of the warnings module when passed an object that was
     returned by get_warnings_state()
     """
+    warnings.warn(warn_txt, DeprecationWarning, stacklevel=2)
     warnings.filters = state[:]
 
 
@@ -126,7 +142,7 @@ def get_runner(settings, test_runner_class=None):
         test_module_name = '.'.join(test_path[:-1])
     else:
         test_module_name = '.'
-    test_module = __import__(test_module_name, {}, {}, test_path[-1])
+    test_module = __import__(test_module_name, {}, {}, force_str(test_path[-1]))
     test_runner = getattr(test_module, test_path[-1])
     return test_runner
 
@@ -325,5 +341,42 @@ def strip_quotes(want, got):
         got = got.strip()[2:-1]
     return want, got
 
+
 def str_prefix(s):
     return s % {'_': '' if six.PY3 else 'u'}
+
+
+class CaptureQueriesContext(object):
+    """
+    Context manager that captures queries executed by the specified connection.
+    """
+    def __init__(self, connection):
+        self.connection = connection
+
+    def __iter__(self):
+        return iter(self.captured_queries)
+
+    def __getitem__(self, index):
+        return self.captured_queries[index]
+
+    def __len__(self):
+        return len(self.captured_queries)
+
+    @property
+    def captured_queries(self):
+        return self.connection.queries[self.initial_queries:self.final_queries]
+
+    def __enter__(self):
+        self.use_debug_cursor = self.connection.use_debug_cursor
+        self.connection.use_debug_cursor = True
+        self.initial_queries = len(self.connection.queries)
+        self.final_queries = None
+        request_started.disconnect(reset_queries)
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.connection.use_debug_cursor = self.use_debug_cursor
+        request_started.connect(reset_queries)
+        if exc_type is not None:
+            return
+        self.final_queries = len(self.connection.queries)
diff --git a/django/utils/autoreload.py b/django/utils/autoreload.py
index 617fc9da7d..cc9cc1304a 100644
--- a/django/utils/autoreload.py
+++ b/django/utils/autoreload.py
@@ -63,6 +63,8 @@ def code_changed():
         except AttributeError:
             pass
     for filename in filenames + _error_files:
+        if not filename:
+            continue
         if filename.endswith(".pyc") or filename.endswith(".pyo"):
             filename = filename[:-1]
         if filename.endswith("$py.class"):
diff --git a/django/utils/cache.py b/django/utils/cache.py
index 0fceaa96e6..917949d4d3 100644
--- a/django/utils/cache.py
+++ b/django/utils/cache.py
@@ -181,7 +181,7 @@ def _generate_cache_key(request, method, headerlist, key_prefix):
     for header in headerlist:
         value = request.META.get(header, None)
         if value is not None:
-            ctx.update(value)
+            ctx.update(force_bytes(value))
     path = hashlib.md5(force_bytes(iri_to_uri(request.get_full_path())))
     cache_key = 'views.decorators.cache.cache_page.%s.%s.%s.%s' % (
         key_prefix, method, path.hexdigest(), ctx.hexdigest())
@@ -236,8 +236,18 @@ def learn_cache_key(request, response, cache_timeout=None, key_prefix=None, cach
     if cache is None:
         cache = get_cache(settings.CACHE_MIDDLEWARE_ALIAS)
     if response.has_header('Vary'):
-        headerlist = ['HTTP_'+header.upper().replace('-', '_')
-                      for header in cc_delim_re.split(response['Vary'])]
+        is_accept_language_redundant = settings.USE_I18N or settings.USE_L10N
+        # If i18n or l10n are used, the generated cache key will be suffixed
+        # with the current locale. Adding the raw value of Accept-Language is
+        # redundant in that case and would result in storing the same content
+        # under multiple keys in the cache. See #18191 for details.
+        headerlist = []
+        for header in cc_delim_re.split(response['Vary']):
+            header = header.upper().replace('-', '_')
+            if header == 'ACCEPT_LANGUAGE' and is_accept_language_redundant:
+                continue
+            headerlist.append('HTTP_' + header)
+        headerlist.sort()
         cache.set(cache_key, headerlist, cache_timeout)
         return _generate_cache_key(request, request.method, headerlist, key_prefix)
     else:
diff --git a/django/utils/checksums.py b/django/utils/checksums.py
index 6bbdccc58c..8617e22609 100644
--- a/django/utils/checksums.py
+++ b/django/utils/checksums.py
@@ -1,5 +1,5 @@
 """
-Common checksum routines (used in multiple localflavor/ cases, for example).
+Common checksum routines.
 """
 
 __all__ = ['luhn',]
diff --git a/django/utils/copycompat.py b/django/utils/copycompat.py
deleted file mode 100644
index 6ccf6c3ae5..0000000000
--- a/django/utils/copycompat.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
-Fixes Python 2.4's failure to deepcopy unbound functions.
-"""
-
-import copy
-import types
-import warnings
-
-warnings.warn("django.utils.copycompat is deprecated; use the native copy module instead",
-              DeprecationWarning)
-
-# Monkeypatch copy's deepcopy registry to handle functions correctly.
-if (hasattr(copy, '_deepcopy_dispatch') and types.FunctionType not in copy._deepcopy_dispatch):
-    copy._deepcopy_dispatch[types.FunctionType] = copy._deepcopy_atomic
-
-# Pose as the copy module now.
-del copy, types
-from copy import *
diff --git a/django/utils/crypto.py b/django/utils/crypto.py
index 57bc60dc4f..5d0f381ffa 100644
--- a/django/utils/crypto.py
+++ b/django/utils/crypto.py
@@ -72,10 +72,10 @@ def get_random_string(length=12,
         # is better than absolute predictability.
         random.seed(
             hashlib.sha256(
-                "%s%s%s" % (
+                ("%s%s%s" % (
                     random.getstate(),
                     time.time(),
-                    settings.SECRET_KEY)
+                    settings.SECRET_KEY)).encode('utf-8')
                 ).digest())
     return ''.join([random.choice(allowed_chars) for i in range(length)])
 
@@ -85,6 +85,11 @@ def constant_time_compare(val1, val2):
     Returns True if the two strings are equal, False otherwise.
 
     The time taken is independent of the number of characters that match.
+
+    For the sake of simplicity, this function executes in constant time only
+    when the two strings have the same length. It short-circuits when they
+    have different lengths. Since Django only uses it to compare hashes of
+    known expected length, this is acceptable.
     """
     if len(val1) != len(val2):
         return False
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index f81fb88a19..64c218fe43 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -217,7 +217,7 @@ class SortedDict(dict):
         # using collections.OrderedDict (Python 2.7 and up), which we'll
         # eventually switch to
         warnings.warn(
-            "SortedDict.value_for_index is deprecated", PendingDeprecationWarning,
+            "SortedDict.value_for_index is deprecated", DeprecationWarning,
             stacklevel=2
         )
         return self[self.keyOrder[index]]
@@ -225,7 +225,7 @@ class SortedDict(dict):
     def insert(self, index, key, value):
         """Inserts the key, value pair before the item with the given index."""
         warnings.warn(
-            "SortedDict.insert is deprecated", PendingDeprecationWarning,
+            "SortedDict.insert is deprecated", DeprecationWarning,
             stacklevel=2
         )
         if key in self.keyOrder:
diff --git a/django/utils/decorators.py b/django/utils/decorators.py
index e653a736af..91444f0de6 100644
--- a/django/utils/decorators.py
+++ b/django/utils/decorators.py
@@ -2,12 +2,16 @@
 
 from functools import wraps, update_wrapper, WRAPPER_ASSIGNMENTS
 
+from django.utils import six
+
+
 class classonlymethod(classmethod):
     def __get__(self, instance, owner):
         if instance is not None:
             raise AttributeError("This method is available only on the view class.")
         return super(classonlymethod, self).__get__(instance, owner)
 
+
 def method_decorator(decorator):
     """
     Converts a function decorator into a method decorator
@@ -68,9 +72,13 @@ def decorator_from_middleware(middleware_class):
 def available_attrs(fn):
     """
     Return the list of functools-wrappable attributes on a callable.
-    This is required as a workaround for http://bugs.python.org/issue3445.
+    This is required as a workaround for http://bugs.python.org/issue3445
+    under Python 2.
     """
-    return tuple(a for a in WRAPPER_ASSIGNMENTS if hasattr(fn, a))
+    if six.PY3:
+        return WRAPPER_ASSIGNMENTS
+    else:
+        return tuple(a for a in WRAPPER_ASSIGNMENTS if hasattr(fn, a))
 
 
 def make_middleware_decorator(middleware_class):
diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py
new file mode 100644
index 0000000000..edbb5ca5ea
--- /dev/null
+++ b/django/utils/deprecation.py
@@ -0,0 +1,62 @@
+import inspect
+import warnings
+
+
+class warn_about_renamed_method(object):
+    def __init__(self, class_name, old_method_name, new_method_name, deprecation_warning):
+        self.class_name = class_name
+        self.old_method_name = old_method_name
+        self.new_method_name = new_method_name
+        self.deprecation_warning = deprecation_warning
+
+    def __call__(self, f):
+        def wrapped(*args, **kwargs):
+            warnings.warn(
+                "`%s.%s` is deprecated, use `%s` instead." %
+                (self.class_name, self.old_method_name, self.new_method_name),
+                self.deprecation_warning, 2)
+            return f(*args, **kwargs)
+        return wrapped
+
+
+class RenameMethodsBase(type):
+    """
+    Handles the deprecation paths when renaming a method.
+
+    It does the following:
+        1) Define the new method if missing and complain about it.
+        2) Define the old method if missing.
+        3) Complain whenever an old method is called.
+
+    See #15363 for more details.
+    """
+
+    renamed_methods = ()
+
+    def __new__(cls, name, bases, attrs):
+        new_class = super(RenameMethodsBase, cls).__new__(cls, name, bases, attrs)
+
+        for base in inspect.getmro(new_class):
+            class_name = base.__name__
+            for renamed_method in cls.renamed_methods:
+                old_method_name = renamed_method[0]
+                old_method = base.__dict__.get(old_method_name)
+                new_method_name = renamed_method[1]
+                new_method = base.__dict__.get(new_method_name)
+                deprecation_warning = renamed_method[2]
+                wrapper = warn_about_renamed_method(class_name, *renamed_method)
+
+                # Define the new method if missing and complain about it
+                if not new_method and old_method:
+                    warnings.warn(
+                        "`%s.%s` method should be renamed `%s`." %
+                        (class_name, old_method_name, new_method_name),
+                        deprecation_warning, 2)
+                    setattr(base, new_method_name, old_method)
+                    setattr(base, old_method_name, wrapper(old_method))
+
+                # Define the old method as a wrapped call to the new method.
+                if not old_method and new_method:
+                    setattr(base, old_method_name, wrapper(new_method))
+
+        return new_class
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 15215849b2..adab0d0712 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -36,7 +36,7 @@ class StrAndUnicode(object):
     def __init__(self, *args, **kwargs):
         warnings.warn("StrAndUnicode is deprecated. Define a __str__ method "
                       "and apply the @python_2_unicode_compatible decorator "
-                      "instead.", PendingDeprecationWarning, stacklevel=2)
+                      "instead.", DeprecationWarning, stacklevel=2)
         super(StrAndUnicode, self).__init__(*args, **kwargs)
 
     if six.PY3:
@@ -142,6 +142,8 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'):
 
     If strings_only is True, don't convert (some) non-string-like objects.
     """
+    if isinstance(s, six.memoryview):
+        s = bytes(s)
     if isinstance(s, bytes):
         if encoding == 'utf-8':
             return s
@@ -232,13 +234,19 @@ def filepath_to_uri(path):
         return path
     # I know about `os.sep` and `os.altsep` but I want to leave
     # some flexibility for hardcoding separators.
-    return quote(force_bytes(path.replace("\\", "/")), safe=b"/~!*()'")
+    return quote(force_bytes(path).replace(b"\\", b"/"), safe=b"/~!*()'")
 
-# The encoding of the default system locale but falls back to the
-# given fallback encoding if the encoding is unsupported by python or could
-# not be determined.  See tickets #10335 and #5846
-try:
-    DEFAULT_LOCALE_ENCODING = locale.getdefaultlocale()[1] or 'ascii'
-    codecs.lookup(DEFAULT_LOCALE_ENCODING)
-except:
-    DEFAULT_LOCALE_ENCODING = 'ascii'
+def get_system_encoding():
+    """
+    The encoding of the default system locale but falls back to the given
+    fallback encoding if the encoding is unsupported by python or could
+    not be determined.  See tickets #10335 and #5846
+    """
+    try:
+        encoding = locale.getdefaultlocale()[1] or 'ascii'
+        codecs.lookup(encoding)
+    except Exception:
+        encoding = 'ascii'
+    return encoding
+
+DEFAULT_LOCALE_ENCODING = get_system_encoding()
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index f9126a6782..7eba842a89 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -113,8 +113,8 @@ class SyndicationFeed(object):
 
     def add_item(self, title, link, description, author_email=None,
         author_name=None, author_link=None, pubdate=None, comments=None,
-        unique_id=None, enclosure=None, categories=(), item_copyright=None,
-        ttl=None, **kwargs):
+        unique_id=None, unique_id_is_permalink=None, enclosure=None,
+        categories=(), item_copyright=None, ttl=None, **kwargs):
         """
         Adds an item to the feed. All args are expected to be Python Unicode
         objects except pubdate, which is a datetime.datetime object, and
@@ -136,6 +136,7 @@ class SyndicationFeed(object):
             'pubdate': pubdate,
             'comments': to_unicode(comments),
             'unique_id': to_unicode(unique_id),
+            'unique_id_is_permalink': unique_id_is_permalink,
             'enclosure': enclosure,
             'categories': categories or (),
             'item_copyright': to_unicode(item_copyright),
@@ -280,7 +281,11 @@ class Rss201rev2Feed(RssFeed):
         if item['comments'] is not None:
             handler.addQuickElement("comments", item['comments'])
         if item['unique_id'] is not None:
-            handler.addQuickElement("guid", item['unique_id'])
+            guid_attrs = {}
+            if isinstance(item.get('unique_id_is_permalink'), bool):
+                guid_attrs['isPermaLink'] = str(
+                    item['unique_id_is_permalink']).lower()
+            handler.addQuickElement("guid", item['unique_id'], guid_attrs)
         if item['ttl'] is not None:
             handler.addQuickElement("ttl", item['ttl'])
 
diff --git a/django/utils/formats.py b/django/utils/formats.py
index 03b9918edf..cc66149026 100644
--- a/django/utils/formats.py
+++ b/django/utils/formats.py
@@ -1,5 +1,6 @@
 import decimal
 import datetime
+import unicodedata
 
 from django.conf import settings
 from django.utils import dateformat, numberformat, datetime_safe
@@ -18,7 +19,7 @@ _format_modules_cache = {}
 
 ISO_INPUT_FORMATS = {
     'DATE_INPUT_FORMATS': ('%Y-%m-%d',),
-    'TIME_INPUT_FORMATS': ('%H:%M:%S', '%H:%M'),
+    'TIME_INPUT_FORMATS': ('%H:%M:%S', '%H:%M:%S.%f', '%H:%M'),
     'DATETIME_INPUT_FORMATS': (
         '%Y-%m-%d %H:%M:%S',
         '%Y-%m-%d %H:%M:%S.%f',
@@ -192,16 +193,17 @@ def sanitize_separators(value):
     Sanitizes a value according to the current decimal and
     thousand separator setting. Used with form field input.
     """
-    if settings.USE_L10N:
+    if settings.USE_L10N and isinstance(value, six.string_types):
+        parts = []
         decimal_separator = get_format('DECIMAL_SEPARATOR')
-        if isinstance(value, six.string_types):
-            parts = []
-            if decimal_separator in value:
-                value, decimals = value.split(decimal_separator, 1)
-                parts.append(decimals)
-            if settings.USE_THOUSAND_SEPARATOR:
-                parts.append(value.replace(get_format('THOUSAND_SEPARATOR'), ''))
-            else:
-                parts.append(value)
-            value = '.'.join(reversed(parts))
+        if decimal_separator in value:
+            value, decimals = value.split(decimal_separator, 1)
+            parts.append(decimals)
+        if settings.USE_THOUSAND_SEPARATOR:
+            thousand_sep = get_format('THOUSAND_SEPARATOR')
+            for replacement in set([
+                    thousand_sep, unicodedata.normalize('NFKD', thousand_sep)]):
+                value = value.replace(replacement, '')
+        parts.append(value)
+        value = '.'.join(reversed(parts))
     return value
diff --git a/django/utils/functional.py b/django/utils/functional.py
index 661518e3cc..13aec9cb82 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -1,18 +1,20 @@
 import copy
 import operator
-from functools import wraps, update_wrapper
+from functools import wraps
 import sys
 
 from django.utils import six
 
+
 # You can't trivially replace this with `functools.partial` because this binds
 # to classes and returns bound instances, whereas functools.partial (on
 # CPython) is a type and its instances don't bind.
 def curry(_curried_func, *args, **kwargs):
     def _curried(*moreargs, **morekwargs):
-        return _curried_func(*(args+moreargs), **dict(kwargs, **morekwargs))
+        return _curried_func(*(args + moreargs), **dict(kwargs, **morekwargs))
     return _curried
 
+
 def memoize(func, cache, num_args):
     """
     Wrap a function so that results for any argument tuple are stored in
@@ -31,6 +33,7 @@ def memoize(func, cache, num_args):
         return result
     return wrapper
 
+
 class cached_property(object):
     """
     Decorator that converts a method with a single self argument into a
@@ -39,10 +42,13 @@ class cached_property(object):
     def __init__(self, func):
         self.func = func
 
-    def __get__(self, instance, type):
+    def __get__(self, instance, type=None):
+        if instance is None:
+            return self
         res = instance.__dict__[self.func.__name__] = self.func(instance)
         return res
 
+
 class Promise(object):
     """
     This is just a base class for the proxy class created in
@@ -51,6 +57,7 @@ class Promise(object):
     """
     pass
 
+
 def lazy(func, *resultclasses):
     """
     Turns any callable into a lazy evaluated callable. You need to give result
@@ -86,9 +93,9 @@ def lazy(func, *resultclasses):
                 cls.__dispatch[resultclass] = {}
                 for type_ in reversed(resultclass.mro()):
                     for (k, v) in type_.__dict__.items():
-                        # All __promise__ return the same wrapper method, but they
-                        # also do setup, inserting the method into the dispatch
-                        # dict.
+                        # All __promise__ return the same wrapper method, but
+                        # they also do setup, inserting the method into the
+                        # dispatch dict.
                         meth = cls.__promise__(resultclass, k, v)
                         if hasattr(cls, k):
                             continue
@@ -109,8 +116,8 @@ def lazy(func, *resultclasses):
         __prepare_class__ = classmethod(__prepare_class__)
 
         def __promise__(cls, klass, funcname, method):
-            # Builds a wrapper around some magic method and registers that magic
-            # method for the given type and method name.
+            # Builds a wrapper around some magic method and registers that
+            # magic method for the given type and method name.
             def __wrapper__(self, *args, **kw):
                 # Automatically triggers the evaluation of a lazy value and
                 # applies the given magic method of the result type.
@@ -150,15 +157,15 @@ def lazy(func, *resultclasses):
                 other = other.__cast()
             return self.__cast() < other
 
-        __hash__ = object.__hash__
+        def __hash__(self):
+            return hash(self.__cast())
 
         def __mod__(self, rhs):
             if self._delegate_bytes and not six.PY3:
                 return bytes(self) % rhs
             elif self._delegate_text:
                 return six.text_type(self) % rhs
-            else:
-                raise AssertionError('__mod__ not supported for non-string types')
+            return self.__cast() % rhs
 
         def __deepcopy__(self, memo):
             # Instances of this class are effectively immutable. It's just a
@@ -174,9 +181,11 @@ def lazy(func, *resultclasses):
 
     return __wrapper__
 
+
 def _lazy_proxy_unpickle(func, args, kwargs, *resultclasses):
     return lazy(func, *resultclasses)(*args, **kwargs)
 
+
 def allow_lazy(func, *resultclasses):
     """
     A decorator that allows a function to be called with one or more lazy
@@ -195,6 +204,8 @@ def allow_lazy(func, *resultclasses):
     return wrapper
 
 empty = object()
+
+
 def new_method_proxy(func):
     def inner(self, *args):
         if self._wrapped is empty:
@@ -202,6 +213,7 @@ def new_method_proxy(func):
         return func(self._wrapped, *args)
     return inner
 
+
 class LazyObject(object):
     """
     A wrapper for another class that can be used to delay instantiation of the
@@ -210,6 +222,10 @@ class LazyObject(object):
     By subclassing, you have the opportunity to intercept and alter the
     instantiation. If you don't need to do that, use SimpleLazyObject.
     """
+
+    # Avoid infinite recursion when tracing __init__ (#19456).
+    _wrapped = None
+
     def __init__(self):
         self._wrapped = empty
 
@@ -237,13 +253,27 @@ class LazyObject(object):
         """
         raise NotImplementedError
 
-    # introspection support:
+    # Introspection support
     __dir__ = new_method_proxy(dir)
 
+    # Dictionary methods support
+    @new_method_proxy
+    def __getitem__(self, key):
+        return self[key]
+
+    @new_method_proxy
+    def __setitem__(self, key, value):
+        self[key] = value
+
+    @new_method_proxy
+    def __delitem__(self, key):
+        del self[key]
+
 
 # Workaround for http://bugs.python.org/issue12370
 _super = super
 
+
 class SimpleLazyObject(LazyObject):
     """
     A lazy object initialised from any function.
@@ -286,8 +316,8 @@ class SimpleLazyObject(LazyObject):
     # Because we have messed with __class__ below, we confuse pickle as to what
     # class we are pickling. It also appears to stop __reduce__ from being
     # called. So, we define __getstate__ in a way that cooperates with the way
-    # that pickle interprets this class.  This fails when the wrapped class is a
-    # builtin, but it is better than nothing.
+    # that pickle interprets this class.  This fails when the wrapped class is
+    # a builtin, but it is better than nothing.
     def __getstate__(self):
         if self._wrapped is empty:
             self._setup()
@@ -303,8 +333,17 @@ class SimpleLazyObject(LazyObject):
     def __reduce__(self):
         return (self.__newobj__, (self.__class__,), self.__getstate__())
 
-    # Need to pretend to be the wrapped class, for the sake of objects that care
-    # about this (especially in equality tests)
+    # Return a meaningful representation of the lazy object for debugging
+    # without evaluating the wrapped object.
+    def __repr__(self):
+        if self._wrapped is empty:
+            repr_attr = self._setupfunc
+        else:
+            repr_attr = self._wrapped
+        return '<SimpleLazyObject: %r>' % repr_attr
+
+    # Need to pretend to be the wrapped class, for the sake of objects that
+    # care about this (especially in equality tests)
     __class__ = property(new_method_proxy(operator.attrgetter("__class__")))
     __eq__ = new_method_proxy(operator.eq)
     __hash__ = new_method_proxy(hash)
@@ -332,6 +371,7 @@ class lazy_property(property):
                 return getattr(instance, name)()
         return property(fget, fset, fdel, doc)
 
+
 def partition(predicate, values):
     """
     Splits the values into two sets, based on the return value of the function
@@ -345,7 +385,7 @@ def partition(predicate, values):
         results[predicate(item)].append(item)
     return results
 
-if sys.version_info >= (2,7,2):
+if sys.version_info >= (2, 7, 2):
     from functools import total_ordering
 else:
     # For Python < 2.7.2. Python 2.6 does not have total_ordering, and
diff --git a/django/utils/hashcompat.py b/django/utils/hashcompat.py
deleted file mode 100644
index 62b1dfd12b..0000000000
--- a/django/utils/hashcompat.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""
-The md5 and sha modules are deprecated since Python 2.5, replaced by the
-hashlib module containing both hash algorithms. Here, we provide a common
-interface to the md5 and sha constructors, depending on system version.
-"""
-
-import warnings
-warnings.warn("django.utils.hashcompat is deprecated; use hashlib instead",
-              DeprecationWarning)
-
-import hashlib
-md5_constructor = hashlib.md5
-md5_hmac = md5_constructor
-sha_constructor = hashlib.sha1
-sha_hmac = sha_constructor
diff --git a/django/utils/html.py b/django/utils/html.py
index 25605bea04..650e8485ab 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -26,14 +26,14 @@ DOTS = ['&middot;', '*', '\u2022', '&#149;', '&bull;', '&#8226;']
 unencoded_ampersands_re = re.compile(r'&(?!(\w+|#\d+);)')
 unquoted_percents_re = re.compile(r'%(?![0-9A-Fa-f]{2})')
 word_split_re = re.compile(r'(\s+)')
-simple_url_re = re.compile(r'^https?://\w', re.IGNORECASE)
+simple_url_re = re.compile(r'^https?://\[?\w', re.IGNORECASE)
 simple_url_2_re = re.compile(r'^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org)$', re.IGNORECASE)
 simple_email_re = re.compile(r'^\S+@\S+\.\S+$')
 link_target_attribute_re = re.compile(r'(<a [^>]*?)target=[^\s>]+')
 html_gunk_re = re.compile(r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<strong><\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE)
 hard_coded_bullets_re = re.compile(r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join([re.escape(x) for x in DOTS]), re.DOTALL)
 trailing_empty_content_re = re.compile(r'(?:<p>(?:&nbsp;|\s|<br \/>)*?</p>\s*)+\Z')
-strip_tags_re = re.compile(r'</?\S([^=]*=(\s*"[^"]*"|\s*\'[^\']*\'|\S*)|[^>])*?>', re.IGNORECASE)
+strip_tags_re = re.compile(r'</?\S([^=>]*=(\s*"[^"]*"|\s*\'[^\']*\'|\S*)|[^>])*?>', re.IGNORECASE)
 
 
 def escape(text):
@@ -87,8 +87,8 @@ def format_html(format_string, *args, **kwargs):
 
 def format_html_join(sep, format_string, args_generator):
     """
-    A wrapper format_html, for the common case of a group of arguments that need
-    to be formatted using the same format string, and then joined using
+    A wrapper of format_html, for the common case of a group of arguments that
+    need to be formatted using the same format string, and then joined using
     'sep'. 'sep' is also passed through conditional_escape.
 
     'args_generator' should be an iterator that returns the sequence of 'args'
diff --git a/django/utils/http.py b/django/utils/http.py
index 0ab5198804..15fac6bfca 100644
--- a/django/utils/http.py
+++ b/django/utils/http.py
@@ -144,7 +144,7 @@ def parse_http_date(date):
         result = datetime.datetime(year, month, day, hour, min, sec)
         return calendar.timegm(result.utctimetuple())
     except Exception:
-        raise ValueError("%r is not a valid date" % date)
+        six.reraise(ValueError, ValueError("%r is not a valid date" % date), sys.exc_info()[2])
 
 def parse_http_date_safe(date):
     """
@@ -217,7 +217,7 @@ def parse_etags(etag_str):
 
 def quote_etag(etag):
     """
-    Wraps a string in double quotes escaping contents as necesary.
+    Wraps a string in double quotes escaping contents as necessary.
     """
     return '"%s"' % etag.replace('\\', '\\\\').replace('"', '\\"')
 
diff --git a/django/utils/ipv6.py b/django/utils/ipv6.py
index 7624bb9c76..8881574eaa 100644
--- a/django/utils/ipv6.py
+++ b/django/utils/ipv6.py
@@ -5,7 +5,7 @@ from django.core.exceptions import ValidationError
 from django.utils.six.moves import xrange
 
 def clean_ipv6_address(ip_str, unpack_ipv4=False,
-        error_message="This is not a valid IPv6 address"):
+        error_message="This is not a valid IPv6 address."):
     """
     Cleans a IPv6 address string.
 
diff --git a/django/utils/itercompat.py b/django/utils/itercompat.py
index aa329c152e..c50dcfb779 100644
--- a/django/utils/itercompat.py
+++ b/django/utils/itercompat.py
@@ -4,10 +4,12 @@ Where possible, we try to use the system-native version and only fall back to
 these implementations if necessary.
 """
 
-from django.utils.six.moves import builtins
+import collections
 import itertools
+import sys
 import warnings
 
+
 def is_iterable(x):
     "A implementation independent way of checking for iterables"
     try:
@@ -17,17 +19,18 @@ def is_iterable(x):
     else:
         return True
 
+def is_iterator(x):
+    """An implementation independent way of checking for iterators
+
+    Python 2.6 has a different implementation of collections.Iterator which
+    accepts anything with a `next` method. 2.7+ requires and `__iter__` method
+    as well.
+    """
+    if sys.version_info >= (2, 7):
+        return isinstance(x, collections.Iterator)
+    return isinstance(x, collections.Iterator) and hasattr(x, '__iter__')
+
 def product(*args, **kwds):
     warnings.warn("django.utils.itercompat.product is deprecated; use the native version instead",
-                  PendingDeprecationWarning)
+                  DeprecationWarning, stacklevel=2)
     return itertools.product(*args, **kwds)
-
-def all(iterable):
-    warnings.warn("django.utils.itercompat.all is deprecated; use the native version instead",
-                  DeprecationWarning)
-    return builtins.all(iterable)
-
-def any(iterable):
-    warnings.warn("django.utils.itercompat.any is deprecated; use the native version instead",
-                  DeprecationWarning)
-    return builtins.any(iterable)
diff --git a/django/utils/log.py b/django/utils/log.py
index 736154a178..b291b86706 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -117,7 +117,7 @@ class AdminEmailHandler(logging.Handler):
                          connection=self.connection())
 
     def connection(self):
-        return get_connection(backend=self.email_backend)
+        return get_connection(backend=self.email_backend, fail_silently=True)
 
     def format_subject(self, subject):
         """
@@ -152,4 +152,4 @@ class RequireDebugFalse(logging.Filter):
 
 class RequireDebugTrue(logging.Filter):
     def filter(self, record):
-       return settings.DEBUG
+        return settings.DEBUG
diff --git a/django/utils/module_loading.py b/django/utils/module_loading.py
index f8aadb34df..ede585e562 100644
--- a/django/utils/module_loading.py
+++ b/django/utils/module_loading.py
@@ -2,6 +2,35 @@ import imp
 import os
 import sys
 
+from django.core.exceptions import ImproperlyConfigured
+from django.utils import six
+from django.utils.importlib import import_module
+
+
+def import_by_path(dotted_path, error_prefix=''):
+    """
+    Import a dotted module path and return the attribute/class designated by the
+    last name in the path. Raise ImproperlyConfigured if something goes wrong.
+    """
+    try:
+        module_path, class_name = dotted_path.rsplit('.', 1)
+    except ValueError:
+        raise ImproperlyConfigured("%s%s doesn't look like a module path" % (
+            error_prefix, dotted_path))
+    try:
+        module = import_module(module_path)
+    except ImportError as e:
+        msg = '%sError importing module %s: "%s"' % (
+            error_prefix, module_path, e)
+        six.reraise(ImproperlyConfigured, ImproperlyConfigured(msg),
+                    sys.exc_info()[2])
+    try:
+        attr = getattr(module, class_name)
+    except AttributeError:
+        raise ImproperlyConfigured('%sModule "%s" does not define a "%s" attribute/class' % (
+            error_prefix, module_path, class_name))
+    return attr
+
 
 def module_has_submodule(package, module_name):
     """See if 'module' is in 'package'."""
diff --git a/django/utils/simplejson.py b/django/utils/simplejson.py
index a851a4f8ef..d4032a6b34 100644
--- a/django/utils/simplejson.py
+++ b/django/utils/simplejson.py
@@ -9,7 +9,7 @@ from __future__ import absolute_import
 
 import warnings
 warnings.warn("django.utils.simplejson is deprecated; use json instead.",
-              PendingDeprecationWarning)
+              DeprecationWarning, stacklevel=2)
 
 try:
     import simplejson
diff --git a/django/utils/six.py b/django/utils/six.py
index 9e3823128f..a5eca73ecf 100644
--- a/django/utils/six.py
+++ b/django/utils/six.py
@@ -1,5 +1,24 @@
 """Utilities for writing code that runs on Python 2 and 3"""
 
+# Copyright (c) 2010-2013 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 import operator
 import sys
 import types
@@ -26,7 +45,7 @@ else:
     text_type = unicode
     binary_type = str
 
-    if sys.platform == "java":
+    if sys.platform.startswith("java"):
         # Jython always uses 32 bits.
         MAXSIZE = int((1 << 31) - 1)
     else:
@@ -133,6 +152,9 @@ _moved_attributes = [
     MovedModule("html_entities", "htmlentitydefs", "html.entities"),
     MovedModule("html_parser", "HTMLParser", "html.parser"),
     MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
     MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
     MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
     MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
@@ -164,7 +186,7 @@ for attr in _moved_attributes:
     setattr(_MovedItems, attr.name, attr)
 del attr
 
-moves = sys.modules["django.utils.six.moves"] = _MovedItems("moves")
+moves = sys.modules[__name__ + ".moves"] = _MovedItems("moves")
 
 
 def add_move(move):
@@ -187,22 +209,28 @@ if PY3:
     _meth_func = "__func__"
     _meth_self = "__self__"
 
+    _func_closure = "__closure__"
     _func_code = "__code__"
     _func_defaults = "__defaults__"
+    _func_globals = "__globals__"
 
     _iterkeys = "keys"
     _itervalues = "values"
     _iteritems = "items"
+    _iterlists = "lists"
 else:
     _meth_func = "im_func"
     _meth_self = "im_self"
 
+    _func_closure = "func_closure"
     _func_code = "func_code"
     _func_defaults = "func_defaults"
+    _func_globals = "func_globals"
 
     _iterkeys = "iterkeys"
     _itervalues = "itervalues"
     _iteritems = "iteritems"
+    _iterlists = "iterlists"
 
 
 try:
@@ -213,14 +241,18 @@ except NameError:
 next = advance_iterator
 
 
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
 if PY3:
     def get_unbound_function(unbound):
         return unbound
 
     Iterator = object
-
-    def callable(obj):
-        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
 else:
     def get_unbound_function(unbound):
         return unbound.im_func
@@ -237,21 +269,27 @@ _add_doc(get_unbound_function,
 
 get_method_function = operator.attrgetter(_meth_func)
 get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
 get_function_code = operator.attrgetter(_func_code)
 get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
 
 
-def iterkeys(d):
+def iterkeys(d, **kw):
     """Return an iterator over the keys of a dictionary."""
-    return iter(getattr(d, _iterkeys)())
+    return iter(getattr(d, _iterkeys)(**kw))
 
-def itervalues(d):
+def itervalues(d, **kw):
     """Return an iterator over the values of a dictionary."""
-    return iter(getattr(d, _itervalues)())
+    return iter(getattr(d, _itervalues)(**kw))
 
-def iteritems(d):
+def iteritems(d, **kw):
     """Return an iterator over the (key, value) pairs of a dictionary."""
-    return iter(getattr(d, _iteritems)())
+    return iter(getattr(d, _iteritems)(**kw))
+
+def iterlists(d, **kw):
+    """Return an iterator over the (key, [values]) pairs of a dictionary."""
+    return iter(getattr(d, _iterlists)(**kw))
 
 
 if PY3:
@@ -295,17 +333,17 @@ if PY3:
     del builtins
 
 else:
-    def exec_(code, globs=None, locs=None):
+    def exec_(_code_, _globs_=None, _locs_=None):
         """Execute code in a namespace."""
-        if globs is None:
+        if _globs_ is None:
             frame = sys._getframe(1)
-            globs = frame.f_globals
-            if locs is None:
-                locs = frame.f_locals
+            _globs_ = frame.f_globals
+            if _locs_ is None:
+                _locs_ = frame.f_locals
             del frame
-        elif locs is None:
-            locs = globs
-        exec("""exec code in globs, locs""")
+        elif _locs_ is None:
+            _locs_ = _globs_
+        exec("""exec _code_ in _globs_, _locs_""")
 
 
     exec_("""def reraise(tp, value, tb=None):
@@ -369,21 +407,28 @@ def with_metaclass(meta, base=object):
 ### Additional customizations for Django ###
 
 if PY3:
-    _iterlists = "lists"
     _assertRaisesRegex = "assertRaisesRegex"
+    _assertRegex = "assertRegex"
+    memoryview = memoryview
 else:
-    _iterlists = "iterlists"
     _assertRaisesRegex = "assertRaisesRegexp"
-
-
-def iterlists(d):
-    """Return an iterator over the values of a MultiValueDict."""
-    return getattr(d, _iterlists)()
+    _assertRegex = "assertRegexpMatches"
+    # memoryview and buffer are not stricly equivalent, but should be fine for
+    # django core usage (mainly BinaryField). However, Jython doesn't support
+    # buffer (see http://bugs.jython.org/issue1521), so we have to be careful.
+    if sys.platform.startswith('java'):
+        memoryview = memoryview
+    else:
+        memoryview = buffer
 
 
 def assertRaisesRegex(self, *args, **kwargs):
     return getattr(self, _assertRaisesRegex)(*args, **kwargs)
 
 
+def assertRegex(self, *args, **kwargs):
+    return getattr(self, _assertRegex)(*args, **kwargs)
+
+
 add_move(MovedModule("_dummy_thread", "dummy_thread"))
 add_move(MovedModule("_thread", "thread"))
diff --git a/django/utils/termcolors.py b/django/utils/termcolors.py
index 4f74b564a5..bb14837716 100644
--- a/django/utils/termcolors.py
+++ b/django/utils/termcolors.py
@@ -52,8 +52,8 @@ def colorize(text='', opts=(), **kwargs):
         if o in opt_dict:
             code_list.append(opt_dict[o])
     if 'noreset' not in opts:
-        text = text + '\x1b[%sm' % RESET
-    return ('\x1b[%sm' % ';'.join(code_list)) + text
+        text = '%s\x1b[%sm' % (text or '', RESET)
+    return '%s%s' % (('\x1b[%sm' % ';'.join(code_list)), text or '')
 
 def make_style(opts=(), **kwargs):
     """
diff --git a/django/utils/text.py b/django/utils/text.py
index d75ca8dbca..4fe92ab509 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -24,7 +24,7 @@ capfirst = allow_lazy(capfirst, six.text_type)
 
 # Set up regular expressions
 re_words = re.compile(r'&.*?;|<.*?>|(\w[\w-]*)', re.U|re.S)
-re_tag = re.compile(r'<(/)?([^ ]+?)(?: (/)| .*?)?>', re.S)
+re_tag = re.compile(r'<(/)?([^ ]+?)(?:(\s*/)| .*?)?>', re.S)
 
 
 def wrap(text, width):
@@ -209,20 +209,6 @@ class Truncator(SimpleLazyObject):
         # Return string
         return out
 
-def truncate_words(s, num, end_text='...'):
-    warnings.warn('This function has been deprecated. Use the Truncator class '
-        'in django.utils.text instead.', category=DeprecationWarning)
-    truncate = end_text and ' %s' % end_text or ''
-    return Truncator(s).words(num, truncate=truncate)
-truncate_words = allow_lazy(truncate_words, six.text_type)
-
-def truncate_html_words(s, num, end_text='...'):
-    warnings.warn('This function has been deprecated. Use the Truncator class '
-        'in django.utils.text instead.', category=DeprecationWarning)
-    truncate = end_text and ' %s' % end_text or ''
-    return Truncator(s).words(num, truncate=truncate, html=True)
-truncate_html_words = allow_lazy(truncate_html_words, six.text_type)
-
 def get_valid_filename(s):
     """
     Returns the given string converted to a string that can be used for a clean
@@ -370,7 +356,6 @@ def smart_split(text):
     text = force_text(text)
     for bit in smart_split_re.finditer(text):
         yield bit.group(0)
-smart_split = allow_lazy(smart_split, six.text_type)
 
 def _replace_entity(match):
     text = match.group(1)
diff --git a/django/utils/timesince.py b/django/utils/timesince.py
index 1721f097bd..d70ab2ffe1 100644
--- a/django/utils/timesince.py
+++ b/django/utils/timesince.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import datetime
 
 from django.utils.timezone import is_aware, utc
-from django.utils.translation import ungettext, ugettext
+from django.utils.translation import ugettext, ungettext_lazy
 
 def timesince(d, now=None, reversed=False):
     """
@@ -19,12 +19,12 @@ def timesince(d, now=None, reversed=False):
     Adapted from http://blog.natbat.co.uk/archive/2003/Jun/14/time_since
     """
     chunks = (
-      (60 * 60 * 24 * 365, lambda n: ungettext('year', 'years', n)),
-      (60 * 60 * 24 * 30, lambda n: ungettext('month', 'months', n)),
-      (60 * 60 * 24 * 7, lambda n : ungettext('week', 'weeks', n)),
-      (60 * 60 * 24, lambda n : ungettext('day', 'days', n)),
-      (60 * 60, lambda n: ungettext('hour', 'hours', n)),
-      (60, lambda n: ungettext('minute', 'minutes', n))
+        (60 * 60 * 24 * 365, ungettext_lazy('%d year', '%d years')),
+        (60 * 60 * 24 * 30, ungettext_lazy('%d month', '%d months')),
+        (60 * 60 * 24 * 7, ungettext_lazy('%d week', '%d weeks')),
+        (60 * 60 * 24, ungettext_lazy('%d day', '%d days')),
+        (60 * 60, ungettext_lazy('%d hour', '%d hours')),
+        (60, ungettext_lazy('%d minute', '%d minutes'))
     )
     # Convert datetime.date to datetime.datetime for comparison.
     if not isinstance(d, datetime.datetime):
@@ -40,19 +40,19 @@ def timesince(d, now=None, reversed=False):
     since = delta.days * 24 * 60 * 60 + delta.seconds
     if since <= 0:
         # d is in the future compared to now, stop processing.
-        return '0 ' + ugettext('minutes')
+        return ugettext('0 minutes')
     for i, (seconds, name) in enumerate(chunks):
         count = since // seconds
         if count != 0:
             break
-    s = ugettext('%(number)d %(type)s') % {'number': count, 'type': name(count)}
+    result = name % count
     if i + 1 < len(chunks):
         # Now get the second item
         seconds2, name2 = chunks[i + 1]
         count2 = (since - (seconds * count)) // seconds2
         if count2 != 0:
-            s += ugettext(', %(number)d %(type)s') % {'number': count2, 'type': name2(count2)}
-    return s
+            result += ugettext(', ') + name2 % count2
+    return result
 
 def timeuntil(d, now=None):
     """
diff --git a/django/utils/timezone.py b/django/utils/timezone.py
index 68c214d26f..3493e056fb 100644
--- a/django/utils/timezone.py
+++ b/django/utils/timezone.py
@@ -80,7 +80,8 @@ class LocalTimezone(tzinfo):
             return ZERO
 
     def tzname(self, dt):
-        return _time.tzname[self._isdst(dt)]
+        is_dst = False if dt is None else self._isdst(dt)
+        return _time.tzname[is_dst]
 
     def _isdst(self, dt):
         tt = (dt.year, dt.month, dt.day,
@@ -111,6 +112,7 @@ def get_default_timezone():
         if isinstance(settings.TIME_ZONE, six.string_types) and pytz is not None:
             _localtime = pytz.timezone(settings.TIME_ZONE)
         else:
+            # This relies on os.environ['TZ'] being set to settings.TIME_ZONE.
             _localtime = LocalTimezone()
     return _localtime
 
@@ -144,8 +146,7 @@ def _get_timezone_name(timezone):
         return timezone.zone
     except AttributeError:
         # for regular tzinfo objects
-        local_now = datetime.now(timezone)
-        return timezone.tzname(local_now)
+        return timezone.tzname(None)
 
 # Timezone selection functions.
 
@@ -198,10 +199,10 @@ class override(object):
             activate(self.timezone)
 
     def __exit__(self, exc_type, exc_value, traceback):
-        if self.old_timezone is not None:
-            _active.value = self.old_timezone
+        if self.old_timezone is None:
+            deactivate()
         else:
-            del _active.value
+            _active.value = self.old_timezone
 
 
 # Templates
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index f3cc6348f6..10a6cd60fc 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -21,6 +21,11 @@ __all__ = [
     'npgettext', 'npgettext_lazy',
 ]
 
+
+class TranslatorCommentWarning(SyntaxWarning):
+    pass
+
+
 # Here be dragons, so a short explanation of the logic won't hurt:
 # We are trying to solve two problems: (1) access settings, in particular
 # settings.USE_I18N, as late as possible, so that modules can be imported
@@ -80,11 +85,46 @@ def npgettext(context, singular, plural, number):
     return _trans.npgettext(context, singular, plural, number)
 
 gettext_lazy = lazy(gettext, str)
-ngettext_lazy = lazy(ngettext, str)
 ugettext_lazy = lazy(ugettext, six.text_type)
-ungettext_lazy = lazy(ungettext, six.text_type)
 pgettext_lazy = lazy(pgettext, six.text_type)
-npgettext_lazy = lazy(npgettext, six.text_type)
+
+def lazy_number(func, resultclass, number=None, **kwargs):
+    if isinstance(number, int):
+        kwargs['number'] = number
+        proxy = lazy(func, resultclass)(**kwargs)
+    else:
+        class NumberAwareString(resultclass):
+            def __mod__(self, rhs):
+                if isinstance(rhs, dict) and number:
+                    try:
+                        number_value = rhs[number]
+                    except KeyError:
+                        raise KeyError('Your dictionary lacks key \'%s\'. '
+                            'Please provide it, because it is required to '
+                            'determine whether string is singular or plural.'
+                            % number)
+                else:
+                    number_value = rhs
+                kwargs['number'] = number_value
+                translated = func(**kwargs)
+                try:
+                    translated = translated % rhs
+                except TypeError:
+                    # String doesn't contain a placeholder for the number
+                    pass
+                return translated
+
+        proxy = lazy(lambda **kwargs: NumberAwareString(), NumberAwareString)(**kwargs)
+    return proxy
+
+def ngettext_lazy(singular, plural, number=None):
+    return lazy_number(ngettext, str, singular=singular, plural=plural, number=number)
+
+def ungettext_lazy(singular, plural, number=None):
+    return lazy_number(ungettext, six.text_type, singular=singular, plural=plural, number=number)
+
+def npgettext_lazy(context, singular, plural, number=None):
+    return lazy_number(npgettext, six.text_type, context=context, singular=singular, plural=plural, number=number)
 
 def activate(language):
     return _trans.activate(language)
@@ -125,8 +165,8 @@ def to_locale(language):
 def get_language_from_request(request, check_path=False):
     return _trans.get_language_from_request(request, check_path)
 
-def get_language_from_path(path):
-    return _trans.get_language_from_path(path)
+def get_language_from_path(path, supported=None):
+    return _trans.get_language_from_path(path, supported=supported)
 
 def templatize(src, origin=None):
     return _trans.templatize(src, origin)
@@ -147,4 +187,10 @@ def get_language_info(lang_code):
     try:
         return LANG_INFO[lang_code]
     except KeyError:
-        raise KeyError("Unknown language code %r." % lang_code)
+        if '-' not in lang_code:
+            raise KeyError("Unknown language code %s." % lang_code)
+        generic_lang_code = lang_code.split('-')[0]
+        try:
+            return LANG_INFO[generic_lang_code]
+        except KeyError:
+            raise KeyError("Unknown language code %s and %s." % (lang_code, generic_lang_code))
diff --git a/django/utils/translation/trans_null.py b/django/utils/translation/trans_null.py
index 5c51468204..7ef07793a4 100644
--- a/django/utils/translation/trans_null.py
+++ b/django/utils/translation/trans_null.py
@@ -58,6 +58,6 @@ def to_locale(language):
 def get_language_from_request(request, check_path=False):
     return settings.LANGUAGE_CODE
 
-def get_language_from_path(request):
+def get_language_from_path(request, supported=None):
     return None
 
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index cf6270cc0c..ad172407de 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -7,6 +7,7 @@ import re
 import sys
 import gettext as gettext_module
 from threading import local
+import warnings
 
 from django.utils.importlib import import_module
 from django.utils.encoding import force_str, force_text
@@ -14,6 +15,7 @@ from django.utils._os import upath
 from django.utils.safestring import mark_safe, SafeData
 from django.utils import six
 from django.utils.six import StringIO
+from django.utils.translation import TranslatorCommentWarning
 
 
 # Translations are cached in a dictionary for every language+app tuple.
@@ -41,6 +43,7 @@ accept_language_re = re.compile(r'''
 
 language_code_prefix_re = re.compile(r'^/([\w-]+)(/|$)')
 
+
 def to_locale(language, to_lower=False):
     """
     Turns a language name (en-us) into a locale name (en_US). If 'to_lower' is
@@ -353,6 +356,20 @@ def check_for_language(lang_code):
             return True
     return False
 
+def get_supported_language_variant(lang_code, supported=None):
+    """
+    Returns the language-code that's listed in supported languages, possibly
+    selecting a more generic variant. Raises LookupError if nothing found.
+    """
+    if supported is None:
+        from django.conf import settings
+        supported = dict(settings.LANGUAGES)
+    if lang_code and lang_code not in supported:
+        lang_code = lang_code.split('-')[0] # e.g. if fr-ca is not supported fallback to fr
+    if lang_code and lang_code in supported and check_for_language(lang_code):
+        return lang_code
+    raise LookupError(lang_code)
+
 def get_language_from_path(path, supported=None):
     """
     Returns the language-code if there is a valid language-code
@@ -393,11 +410,10 @@ def get_language_from_request(request, check_path=False):
 
     lang_code = request.COOKIES.get(settings.LANGUAGE_COOKIE_NAME)
 
-    if lang_code and lang_code not in supported:
-        lang_code = lang_code.split('-')[0] # e.g. if fr-ca is not supported fallback to fr
-
-    if lang_code and lang_code in supported and check_for_language(lang_code):
-        return lang_code
+    try:
+        return get_supported_language_variant(lang_code, supported)
+    except LookupError:
+        pass
 
     accept = request.META.get('HTTP_ACCEPT_LANGUAGE', '')
     for accept_lang, unused in parse_accept_lang_header(accept):
@@ -431,7 +447,10 @@ def get_language_from_request(request, check_path=False):
                     _accepted[normalized] = lang
                     return lang
 
-    return settings.LANGUAGE_CODE
+    try:
+        return get_supported_language_variant(settings.LANGUAGE_CODE, supported)
+    except LookupError:
+        return settings.LANGUAGE_CODE
 
 dot_re = re.compile(r'\S')
 def blankout(src, char):
@@ -468,6 +487,9 @@ def templatize(src, origin=None):
     plural = []
     incomment = False
     comment = []
+    lineno_comment_map = {}
+    comment_lineno_cache = None
+
     for t in Lexer(src, origin).tokenize():
         if incomment:
             if t.token_type == TOKEN_BLOCK and t.contents == 'endcomment':
@@ -529,7 +551,27 @@ def templatize(src, origin=None):
                     plural.append(contents)
                 else:
                     singular.append(contents)
+
         else:
+            # Handle comment tokens (`{# ... #}`) plus other constructs on
+            # the same line:
+            if comment_lineno_cache is not None:
+                cur_lineno = t.lineno + t.contents.count('\n')
+                if comment_lineno_cache == cur_lineno:
+                    if t.token_type != TOKEN_COMMENT:
+                        for c in lineno_comment_map[comment_lineno_cache]:
+                            filemsg = ''
+                            if origin:
+                                filemsg = 'file %s, ' % origin
+                            warn_msg = ("The translator-targeted comment '%s' "
+                                "(%sline %d) was ignored, because it wasn't the last item "
+                                "on the line.") % (c, filemsg, comment_lineno_cache)
+                            warnings.warn(warn_msg, TranslatorCommentWarning)
+                        lineno_comment_map[comment_lineno_cache] = []
+                else:
+                    out.write('# %s' % ' | '.join(lineno_comment_map[comment_lineno_cache]))
+                comment_lineno_cache = None
+
             if t.token_type == TOKEN_BLOCK:
                 imatch = inline_re.match(t.contents)
                 bmatch = block_re.match(t.contents)
@@ -586,7 +628,10 @@ def templatize(src, origin=None):
                     else:
                         out.write(blankout(p, 'F'))
             elif t.token_type == TOKEN_COMMENT:
-                out.write(' # %s' % t.contents)
+                if t.contents.lstrip().startswith(TRANSLATOR_COMMENT_MARK):
+                    lineno_comment_map.setdefault(t.lineno,
+                                                  []).append(t.contents)
+                    comment_lineno_cache = t.lineno
             else:
                 out.write(blankout(t.contents, 'X'))
     return force_str(out.getvalue())
diff --git a/django/utils/tree.py b/django/utils/tree.py
index ce490224e0..4152b4600b 100644
--- a/django/utils/tree.py
+++ b/django/utils/tree.py
@@ -19,14 +19,9 @@ class Node(object):
         """
         Constructs a new Node. If no connector is given, the default will be
         used.
-
-        Warning: You probably don't want to pass in the 'negated' parameter. It
-        is NOT the same as constructing a node and calling negate() on the
-        result.
         """
         self.children = children and children[:] or []
         self.connector = connector or self.default
-        self.subtree_parents = []
         self.negated = negated
 
     # We need this because of django.db.models.query_utils.Q. Q. __init__() is
@@ -59,7 +54,6 @@ class Node(object):
         obj = Node(connector=self.connector, negated=self.negated)
         obj.__class__ = self.__class__
         obj.children = copy.deepcopy(self.children, memodict)
-        obj.subtree_parents = copy.deepcopy(self.subtree_parents, memodict)
         return obj
 
     def __len__(self):
@@ -83,74 +77,60 @@ class Node(object):
         """
         return other in self.children
 
-    def add(self, node, conn_type):
+    def _prepare_data(self, data):
         """
-        Adds a new node to the tree. If the conn_type is the same as the root's
-        current connector type, the node is added to the first level.
-        Otherwise, the whole tree is pushed down one level and a new root
-        connector is created, connecting the existing tree and the new node.
+        A subclass hook for doing subclass specific transformations of the
+        given data on combine() or add().
         """
-        if node in self.children and conn_type == self.connector:
-            return
-        if len(self.children) < 2:
-            self.connector = conn_type
+        return data
+
+    def add(self, data, conn_type, squash=True):
+        """
+        Combines this tree and the data represented by data using the
+        connector conn_type. The combine is done by squashing the node other
+        away if possible.
+
+        This tree (self) will never be pushed to a child node of the
+        combined tree, nor will the connector or negated properties change.
+
+        The function returns a node which can be used in place of data
+        regardless if the node other got squashed or not.
+
+        If `squash` is False the data is prepared and added as a child to
+        this tree without further logic.
+        """
+        if data in self.children:
+            return data
+        data = self._prepare_data(data)
+        if not squash:
+            self.children.append(data)
+            return data
         if self.connector == conn_type:
-            if isinstance(node, Node) and (node.connector == conn_type or
-                    len(node) == 1):
-                self.children.extend(node.children)
+            # We can reuse self.children to append or squash the node other.
+            if (isinstance(data, Node) and not data.negated
+                    and (data.connector == conn_type or len(data) == 1)):
+                # We can squash the other node's children directly into this
+                # node. We are just doing (AB)(CD) == (ABCD) here, with the
+                # addition that if the length of the other node is 1 the
+                # connector doesn't matter. However, for the len(self) == 1
+                # case we don't want to do the squashing, as it would alter
+                # self.connector.
+                self.children.extend(data.children)
+                return self
             else:
-                self.children.append(node)
+                # We could use perhaps additional logic here to see if some
+                # children could be used for pushdown here.
+                self.children.append(data)
+                return data
         else:
             obj = self._new_instance(self.children, self.connector,
-                    self.negated)
+                                     self.negated)
             self.connector = conn_type
-            self.children = [obj, node]
+            self.children = [obj, data]
+            return data
 
     def negate(self):
         """
-        Negate the sense of the root connector. This reorganises the children
-        so that the current node has a single child: a negated node containing
-        all the previous children. This slightly odd construction makes adding
-        new children behave more intuitively.
-
-        Interpreting the meaning of this negate is up to client code. This
-        method is useful for implementing "not" arrangements.
+        Negate the sense of the root connector.
         """
-        self.children = [self._new_instance(self.children, self.connector,
-                not self.negated)]
-        self.connector = self.default
-
-    def start_subtree(self, conn_type):
-        """
-        Sets up internal state so that new nodes are added to a subtree of the
-        current node. The conn_type specifies how the sub-tree is joined to the
-        existing children.
-        """
-        if len(self.children) == 1:
-            self.connector = conn_type
-        elif self.connector != conn_type:
-            self.children = [self._new_instance(self.children, self.connector,
-                    self.negated)]
-            self.connector = conn_type
-            self.negated = False
-
-        self.subtree_parents.append(self.__class__(self.children,
-                self.connector, self.negated))
-        self.connector = self.default
-        self.negated = False
-        self.children = []
-
-    def end_subtree(self):
-        """
-        Closes off the most recently unmatched start_subtree() call.
-
-        This puts the current state into a node of the parent tree and returns
-        the current instances state to be the parent.
-        """
-        obj = self.subtree_parents.pop()
-        node = self.__class__(self.children, self.connector)
-        self.connector = obj.connector
-        self.negated = obj.negated
-        self.children = obj.children
-        self.children.append(node)
-
+        self.negated = not self.negated
diff --git a/django/utils/tzinfo.py b/django/utils/tzinfo.py
index 654c99778e..fd221ea48b 100644
--- a/django/utils/tzinfo.py
+++ b/django/utils/tzinfo.py
@@ -71,9 +71,9 @@ class LocalTimezone(tzinfo):
             return timedelta(0)
 
     def tzname(self, dt):
+        is_dst = False if dt is None else self._isdst(dt)
         try:
-            return force_text(time.tzname[self._isdst(dt)],
-                                 DEFAULT_LOCALE_ENCODING)
+            return force_text(time.tzname[is_dst], DEFAULT_LOCALE_ENCODING)
         except UnicodeDecodeError:
             return None
 
diff --git a/django/utils/unittest/case.py b/django/utils/unittest/case.py
index f906a4cb68..fffd3c2524 100644
--- a/django/utils/unittest/case.py
+++ b/django/utils/unittest/case.py
@@ -324,7 +324,7 @@ class TestCase(unittest.TestCase):
             success = False
             try:
                 self.setUp()
-            except SkipTest, e:
+            except SkipTest as e:
                 self._addSkip(result, str(e))
             except Exception:
                 result.addError(self, sys.exc_info())
@@ -333,7 +333,7 @@ class TestCase(unittest.TestCase):
                     testMethod()
                 except self.failureException:
                     result.addFailure(self, sys.exc_info())
-                except _ExpectedFailure, e:
+                except _ExpectedFailure as e:
                     addExpectedFailure = getattr(result, 'addExpectedFailure', None)
                     if addExpectedFailure is not None:
                         addExpectedFailure(self, e.exc_info)
@@ -349,7 +349,7 @@ class TestCase(unittest.TestCase):
                         warnings.warn("Use of a TestResult without an addUnexpectedSuccess method is deprecated",
                                       DeprecationWarning)
                         result.addFailure(self, sys.exc_info())
-                except SkipTest, e:
+                except SkipTest as e:
                     self._addSkip(result, str(e))
                 except Exception:
                     result.addError(self, sys.exc_info())
@@ -770,16 +770,16 @@ class TestCase(unittest.TestCase):
         """
         try:
             difference1 = set1.difference(set2)
-        except TypeError, e:
+        except TypeError as e:
             self.fail('invalid type when attempting set difference: %s' % e)
-        except AttributeError, e:
+        except AttributeError as e:
             self.fail('first argument does not support set difference: %s' % e)
 
         try:
             difference2 = set2.difference(set1)
-        except TypeError, e:
+        except TypeError as e:
             self.fail('invalid type when attempting set difference: %s' % e)
-        except AttributeError, e:
+        except AttributeError as e:
             self.fail('second argument does not support set difference: %s' % e)
 
         if not (difference1 or difference2):
@@ -980,7 +980,7 @@ class TestCase(unittest.TestCase):
             return _AssertRaisesContext(expected_exception, self, expected_regexp)
         try:
             callable_obj(*args, **kwargs)
-        except expected_exception, exc_value:
+        except expected_exception as exc_value:
             if isinstance(expected_regexp, basestring):
                 expected_regexp = re.compile(expected_regexp)
             if not expected_regexp.search(str(exc_value)):
diff --git a/django/utils/unittest/loader.py b/django/utils/unittest/loader.py
index 1ca910f019..0bdd106d39 100644
--- a/django/utils/unittest/loader.py
+++ b/django/utils/unittest/loader.py
@@ -89,7 +89,7 @@ class TestLoader(unittest.TestLoader):
         if use_load_tests and load_tests is not None:
             try:
                 return load_tests(self, tests, None)
-            except Exception, e:
+            except Exception as e:
                 return _make_failed_load_tests(module.__name__, e,
                                                self.suiteClass)
         return tests
@@ -295,7 +295,7 @@ class TestLoader(unittest.TestLoader):
                 else:
                     try:
                         yield load_tests(self, tests, pattern)
-                    except Exception, e:
+                    except Exception as e:
                         yield _make_failed_load_tests(package.__name__, e,
                                                       self.suiteClass)
 
diff --git a/django/utils/unittest/main.py b/django/utils/unittest/main.py
index 0f25a98a22..659310babf 100644
--- a/django/utils/unittest/main.py
+++ b/django/utils/unittest/main.py
@@ -150,7 +150,7 @@ class TestProgram(object):
             else:
                 self.testNames = (self.defaultTest,)
             self.createTests()
-        except getopt.error, msg:
+        except getopt.error as msg:
             self.usageExit(msg)
 
     def createTests(self):
diff --git a/django/utils/unittest/suite.py b/django/utils/unittest/suite.py
index f39569bbc2..da8ac2e2a8 100644
--- a/django/utils/unittest/suite.py
+++ b/django/utils/unittest/suite.py
@@ -138,7 +138,7 @@ class TestSuite(BaseTestSuite):
         if setUpClass is not None:
             try:
                 setUpClass()
-            except Exception, e:
+            except Exception as e:
                 if isinstance(result, _DebugResult):
                     raise
                 currentClass._classSetupFailed = True
@@ -172,7 +172,7 @@ class TestSuite(BaseTestSuite):
         if setUpModule is not None:
             try:
                 setUpModule()
-            except Exception, e:
+            except Exception as e:
                 if isinstance(result, _DebugResult):
                     raise
                 result._moduleSetUpFailed = True
@@ -203,7 +203,7 @@ class TestSuite(BaseTestSuite):
         if tearDownModule is not None:
             try:
                 tearDownModule()
-            except Exception, e:
+            except Exception as e:
                 if isinstance(result, _DebugResult):
                     raise
                 errorName = 'tearDownModule (%s)' % previousModule
@@ -225,7 +225,7 @@ class TestSuite(BaseTestSuite):
         if tearDownClass is not None:
             try:
                 tearDownClass()
-            except Exception, e:
+            except Exception as e:
                 if isinstance(result, _DebugResult):
                     raise
                 className = util.strclass(previousClass)
diff --git a/django/views/debug.py b/django/views/debug.py
index aaa7e40efe..9b95b524d2 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -13,8 +13,8 @@ from django.http import (HttpResponse, HttpResponseServerError,
 from django.template import Template, Context, TemplateDoesNotExist
 from django.template.defaultfilters import force_escape, pprint
 from django.utils.html import escape
-from django.utils.importlib import import_module
 from django.utils.encoding import force_bytes, smart_text
+from django.utils.module_loading import import_by_path
 from django.utils import six
 
 HIDDEN_SETTINGS = re.compile('API|TOKEN|KEY|SECRET|PASS|PROFANITIES_LIST|SIGNATURE')
@@ -76,17 +76,8 @@ def get_exception_reporter_filter(request):
     global default_exception_reporter_filter
     if default_exception_reporter_filter is None:
         # Load the default filter for the first time and cache it.
-        modpath = settings.DEFAULT_EXCEPTION_REPORTER_FILTER
-        modname, classname = modpath.rsplit('.', 1)
-        try:
-            mod = import_module(modname)
-        except ImportError as e:
-            raise ImproperlyConfigured(
-            'Error importing default exception reporter filter %s: "%s"' % (modpath, e))
-        try:
-            default_exception_reporter_filter = getattr(mod, classname)()
-        except AttributeError:
-            raise ImproperlyConfigured('Default exception reporter filter module "%s" does not define a "%s" class' % (modname, classname))
+        default_exception_reporter_filter = import_by_path(
+            settings.DEFAULT_EXCEPTION_REPORTER_FILTER)()
     if request:
         return getattr(request, 'exception_reporter_filter', default_exception_reporter_filter)
     else:
@@ -172,13 +163,12 @@ class SafeExceptionReporterFilter(ExceptionReporterFilter):
                 break
             current_frame = current_frame.f_back
 
-        cleansed = []
+        cleansed = {}
         if self.is_active(request) and sensitive_variables:
             if sensitive_variables == '__ALL__':
                 # Cleanse all variables
                 for name, value in tb_frame.f_locals.items():
-                    cleansed.append((name, CLEANSED_SUBSTITUTE))
-                return cleansed
+                    cleansed[name] = CLEANSED_SUBSTITUTE
             else:
                 # Cleanse specified variables
                 for name, value in tb_frame.f_locals.items():
@@ -187,16 +177,25 @@ class SafeExceptionReporterFilter(ExceptionReporterFilter):
                     elif isinstance(value, HttpRequest):
                         # Cleanse the request's POST parameters.
                         value = self.get_request_repr(value)
-                    cleansed.append((name, value))
-                return cleansed
+                    cleansed[name] = value
         else:
             # Potentially cleanse only the request if it's one of the frame variables.
             for name, value in tb_frame.f_locals.items():
                 if isinstance(value, HttpRequest):
                     # Cleanse the request's POST parameters.
                     value = self.get_request_repr(value)
-                cleansed.append((name, value))
-            return cleansed
+                cleansed[name] = value
+
+        if (tb_frame.f_code.co_name == 'sensitive_variables_wrapper'
+            and 'sensitive_variables_wrapper' in tb_frame.f_locals):
+            # For good measure, obfuscate the decorated function's arguments in
+            # the sensitive_variables decorator's frame, in case the variables
+            # associated with those arguments were meant to be obfuscated from
+            # the decorated function's frame.
+            cleansed['func_args'] = CLEANSED_SUBSTITUTE
+            cleansed['func_kwargs'] = CLEANSED_SUBSTITUTE
+
+        return cleansed.items()
 
 class ExceptionReporter(object):
     """
@@ -430,9 +429,12 @@ def technical_404_response(request, exception):
     except (IndexError, TypeError, KeyError):
         tried = []
     else:
-        if not tried:
-            # tried exists but is an empty list. The URLconf must've been empty.
-            return empty_urlconf(request)
+        if (not tried                           # empty URLconf
+            or (request.path == '/'
+                and len(tried) == 1             # default URLconf
+                and len(tried[0]) == 1
+                and tried[0][0].app_name == tried[0][0].namespace == 'admin')):
+            return default_urlconf(request)
 
     urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
     if isinstance(urlconf, types.ModuleType):
@@ -450,12 +452,10 @@ def technical_404_response(request, exception):
     })
     return HttpResponseNotFound(t.render(c), content_type='text/html')
 
-def empty_urlconf(request):
+def default_urlconf(request):
     "Create an empty URLconf 404 error response."
-    t = Template(EMPTY_URLCONF_TEMPLATE, name='Empty URLConf template')
-    c = Context({
-        'project_name': settings.SETTINGS_MODULE.split('.')[0]
-    })
+    t = Template(DEFAULT_URLCONF_TEMPLATE, name='Default URLconf template')
+    c = Context({})
     return HttpResponse(t.render(c), content_type='text/html')
 
 #
@@ -926,7 +926,7 @@ Exception Value: {{ exception_value|force_escape }}
 </html>
 """
 
-TECHNICAL_500_TEXT_TEMPLATE = """{% firstof exception_type 'Report' %}{% if request %} at {{ request.path_info }}{% endif %}
+TECHNICAL_500_TEXT_TEMPLATE = """{% load firstof from future %}{% firstof exception_type 'Report' %}{% if request %} at {{ request.path_info }}{% endif %}
 {% firstof exception_value 'No exception supplied' %}
 {% if request %}
 Request Method: {{ request.META.REQUEST_METHOD }}
@@ -1059,7 +1059,7 @@ TECHNICAL_404_TEMPLATE = """
 </html>
 """
 
-EMPTY_URLCONF_TEMPLATE = """
+DEFAULT_URLCONF_TEMPLATE = """
 <!DOCTYPE html>
 <html lang="en"><head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
@@ -1079,7 +1079,6 @@ EMPTY_URLCONF_TEMPLATE = """
     tbody td, tbody th { vertical-align:top; padding:2px 3px; }
     thead th { padding:1px 6px 1px 3px; background:#fefefe; text-align:left; font-weight:normal; font-size:11px; border:1px solid #ddd; }
     tbody th { width:12em; text-align:right; color:#666; padding-right:.5em; }
-    ul { margin-left: 2em; margin-top: 1em; }
     #summary { background: #e0ebff; }
     #summary h2 { font-weight: normal; color: #666; }
     #explanation { background:#eee; }
@@ -1095,11 +1094,10 @@ EMPTY_URLCONF_TEMPLATE = """
 </div>
 
 <div id="instructions">
-  <p>Of course, you haven't actually done any work yet. Here's what to do next:</p>
-  <ul>
-    <li>If you plan to use a database, edit the <code>DATABASES</code> setting in <code>{{ project_name }}/settings.py</code>.</li>
-    <li>Start your first app by running <code>python manage.py startapp [appname]</code>.</li>
-  </ul>
+  <p>
+    Of course, you haven't actually done any work yet.
+    Next, start your first app by running <code>python manage.py startapp [appname]</code>.
+  </p>
 </div>
 
 <div id="explanation">
diff --git a/django/views/decorators/cache.py b/django/views/decorators/cache.py
index 06925c1f4a..001e21c0a5 100644
--- a/django/views/decorators/cache.py
+++ b/django/views/decorators/cache.py
@@ -18,54 +18,17 @@ def cache_page(*args, **kwargs):
     Additionally, all headers from the response's Vary header will be taken
     into account on caching -- just like the middleware does.
     """
-    # We need backwards compatibility with code which spells it this way:
-    #   def my_view(): pass
-    #   my_view = cache_page(my_view, 123)
-    # and this way:
-    #   my_view = cache_page(123)(my_view)
-    # and this:
-    #   my_view = cache_page(my_view, 123, key_prefix="foo")
-    # and this:
-    #   my_view = cache_page(123, key_prefix="foo")(my_view)
-    # and possibly this way (?):
-    #   my_view = cache_page(123, my_view)
-    # and also this way:
-    #   my_view = cache_page(my_view)
-    # and also this way:
-    #   my_view = cache_page()(my_view)
-
     # We also add some asserts to give better error messages in case people are
     # using other ways to call cache_page that no longer work.
+    if len(args) != 1 or callable(args[0]):
+        raise TypeError("cache_page has a single mandatory positional argument: timeout")
+    cache_timeout = args[0]
     cache_alias = kwargs.pop('cache', None)
     key_prefix = kwargs.pop('key_prefix', None)
-    assert not kwargs, "The only keyword arguments are cache and key_prefix"
-    def warn():
-        import warnings
-        warnings.warn('The cache_page decorator must be called like: '
-                      'cache_page(timeout, [cache=cache name], [key_prefix=key prefix]). '
-                      'All other ways are deprecated.',
-                      DeprecationWarning,
-                      stacklevel=2)
+    if kwargs:
+        raise TypeError("cache_page has two optional keyword arguments: cache and key_prefix")
 
-    if len(args) > 1:
-        assert len(args) == 2, "cache_page accepts at most 2 arguments"
-        warn()
-        if callable(args[0]):
-            return decorator_from_middleware_with_args(CacheMiddleware)(cache_timeout=args[1], cache_alias=cache_alias, key_prefix=key_prefix)(args[0])
-        elif callable(args[1]):
-            return decorator_from_middleware_with_args(CacheMiddleware)(cache_timeout=args[0], cache_alias=cache_alias, key_prefix=key_prefix)(args[1])
-        else:
-            assert False, "cache_page must be passed a view function if called with two arguments"
-    elif len(args) == 1:
-        if callable(args[0]):
-            warn()
-            return decorator_from_middleware_with_args(CacheMiddleware)(cache_alias=cache_alias, key_prefix=key_prefix)(args[0])
-        else:
-            # The One True Way
-            return decorator_from_middleware_with_args(CacheMiddleware)(cache_timeout=args[0], cache_alias=cache_alias, key_prefix=key_prefix)
-    else:
-        warn()
-        return decorator_from_middleware_with_args(CacheMiddleware)(cache_alias=cache_alias, key_prefix=key_prefix)
+    return decorator_from_middleware_with_args(CacheMiddleware)(cache_timeout=cache_timeout, cache_alias=cache_alias, key_prefix=key_prefix)
 
 
 def cache_control(**kwargs):
diff --git a/django/views/decorators/csrf.py b/django/views/decorators/csrf.py
index 60664ff932..7a7eb6bba6 100644
--- a/django/views/decorators/csrf.py
+++ b/django/views/decorators/csrf.py
@@ -48,24 +48,6 @@ uses the csrf_token template tag, or the CsrfViewMiddleware is used.
 """
 
 
-def csrf_response_exempt(view_func):
-    """
-    Modifies a view function so that its response is exempt
-    from the post-processing of the CSRF middleware.
-    """
-    warnings.warn("csrf_response_exempt is deprecated. It no longer performs a "
-                  "function, and calls to it can be removed.",
-                  DeprecationWarning)
-    return view_func
-
-def csrf_view_exempt(view_func):
-    """
-    Marks a view function as being exempt from CSRF view protection.
-    """
-    warnings.warn("csrf_view_exempt is deprecated. Use csrf_exempt instead.",
-                  DeprecationWarning)
-    return csrf_exempt(view_func)
-
 def csrf_exempt(view_func):
     """
     Marks a view function as being exempt from the CSRF view protection.
diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py
index 5c222963d3..78ae6b1442 100644
--- a/django/views/decorators/debug.py
+++ b/django/views/decorators/debug.py
@@ -26,12 +26,12 @@ def sensitive_variables(*variables):
     """
     def decorator(func):
         @functools.wraps(func)
-        def sensitive_variables_wrapper(*args, **kwargs):
+        def sensitive_variables_wrapper(*func_args, **func_kwargs):
             if variables:
                 sensitive_variables_wrapper.sensitive_variables = variables
             else:
                 sensitive_variables_wrapper.sensitive_variables = '__ALL__'
-            return func(*args, **kwargs)
+            return func(*func_args, **func_kwargs)
         return sensitive_variables_wrapper
     return decorator
 
diff --git a/django/views/defaults.py b/django/views/defaults.py
index ec7a233ff7..89228c50c9 100644
--- a/django/views/defaults.py
+++ b/django/views/defaults.py
@@ -1,3 +1,5 @@
+import warnings
+
 from django import http
 from django.template import (Context, RequestContext,
                              loader, Template, TemplateDoesNotExist)
@@ -63,12 +65,9 @@ def permission_denied(request, template_name='403.html'):
 
 
 def shortcut(request, content_type_id, object_id):
-    # TODO: Remove this in Django 2.0.
-    # This is a legacy view that depends on the contenttypes framework.
-    # The core logic was moved to django.contrib.contenttypes.views after
-    # Django 1.0, but this remains here for backwards compatibility.
-    # Note that the import is *within* this function, rather than being at
-    # module level, because we don't want to assume people have contenttypes
-    # installed.
+    warnings.warn(
+        "django.views.defaults.shortcut will be removed in Django 1.8. "
+        "Import it from django.contrib.contenttypes.views instead.",
+        PendingDeprecationWarning, stacklevel=2)
     from django.contrib.contenttypes.views import shortcut as real_shortcut
     return real_shortcut(request, content_type_id, object_id)
diff --git a/django/views/generic/base.py b/django/views/generic/base.py
index 9c82a29d8a..d50d6bbc55 100644
--- a/django/views/generic/base.py
+++ b/django/views/generic/base.py
@@ -113,6 +113,7 @@ class TemplateResponseMixin(object):
     """
     template_name = None
     response_class = TemplateResponse
+    content_type = None
 
     def render_to_response(self, context, **response_kwargs):
         """
@@ -122,6 +123,7 @@ class TemplateResponseMixin(object):
         If any keyword arguments are provided, they will be
         passed to the constructor of the response class.
         """
+        response_kwargs.setdefault('content_type', self.content_type)
         return self.response_class(
             request = self.request,
             template = self.get_template_names(),
diff --git a/django/views/generic/dates.py b/django/views/generic/dates.py
index e1b0eb99fe..29efc7dfac 100644
--- a/django/views/generic/dates.py
+++ b/django/views/generic/dates.py
@@ -5,7 +5,7 @@ from django.conf import settings
 from django.db import models
 from django.core.exceptions import ImproperlyConfigured
 from django.http import Http404
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str, force_text
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext as _
 from django.utils import timezone
@@ -379,15 +379,18 @@ class BaseDateListView(MultipleObjectMixin, DateMixin, View):
 
     def get_date_list(self, queryset, date_type=None, ordering='ASC'):
         """
-        Get a date list by calling `queryset.dates()`, checking along the way
-        for empty lists that aren't allowed.
+        Get a date list by calling `queryset.dates/datetimes()`, checking
+        along the way for empty lists that aren't allowed.
         """
         date_field = self.get_date_field()
         allow_empty = self.get_allow_empty()
         if date_type is None:
             date_type = self.get_date_list_period()
 
-        date_list = queryset.dates(date_field, date_type, ordering)
+        if self.uses_datetime_field:
+            date_list = queryset.datetimes(date_field, date_type, ordering)
+        else:
+            date_list = queryset.dates(date_field, date_type, ordering)
         if date_list is not None and not date_list and not allow_empty:
             name = force_text(queryset.model._meta.verbose_name_plural)
             raise Http404(_("No %(verbose_name_plural)s available") %
@@ -673,7 +676,7 @@ def _date_from_string(year, year_format, month='', month_format='', day='', day_
     format = delim.join((year_format, month_format, day_format))
     datestr = delim.join((year, month, day))
     try:
-        return datetime.datetime.strptime(datestr, format).date()
+        return datetime.datetime.strptime(force_str(datestr), format).date()
     except ValueError:
         raise Http404(_("Invalid date string '%(datestr)s' given format '%(format)s'") % {
             'datestr': datestr,
diff --git a/django/views/generic/detail.py b/django/views/generic/detail.py
index c27b92b85e..58302bbe23 100644
--- a/django/views/generic/detail.py
+++ b/django/views/generic/detail.py
@@ -84,7 +84,7 @@ class SingleObjectMixin(ContextMixin):
         if self.context_object_name:
             return self.context_object_name
         elif isinstance(obj, models.Model):
-            return obj._meta.object_name.lower()
+            return obj._meta.model_name
         else:
             return None
 
@@ -144,13 +144,13 @@ class SingleObjectTemplateResponseMixin(TemplateResponseMixin):
         if isinstance(self.object, models.Model):
             names.append("%s/%s%s.html" % (
                 self.object._meta.app_label,
-                self.object._meta.object_name.lower(),
+                self.object._meta.model_name,
                 self.template_name_suffix
             ))
         elif hasattr(self, 'model') and self.model is not None and issubclass(self.model, models.Model):
             names.append("%s/%s%s.html" % (
                 self.model._meta.app_label,
-                self.model._meta.object_name.lower(),
+                self.model._meta.model_name,
                 self.template_name_suffix
             ))
         return names
diff --git a/django/views/generic/edit.py b/django/views/generic/edit.py
index 97a6c0a698..5b97fc81c9 100644
--- a/django/views/generic/edit.py
+++ b/django/views/generic/edit.py
@@ -242,8 +242,9 @@ class DeletionMixin(object):
         redirects to the success URL.
         """
         self.object = self.get_object()
+        success_url = self.get_success_url()
         self.object.delete()
-        return HttpResponseRedirect(self.get_success_url())
+        return HttpResponseRedirect(success_url)
 
     # Add support for browsers which only accept GET and POST for now.
     def post(self, *args, **kwargs):
@@ -251,7 +252,7 @@ class DeletionMixin(object):
 
     def get_success_url(self):
         if self.success_url:
-            return self.success_url
+            return self.success_url % self.object.__dict__
         else:
             raise ImproperlyConfigured(
                 "No URL to redirect to. Provide a success_url.")
diff --git a/django/views/generic/list.py b/django/views/generic/list.py
index 1f286168f6..08c4bbcda0 100644
--- a/django/views/generic/list.py
+++ b/django/views/generic/list.py
@@ -97,7 +97,7 @@ class MultipleObjectMixin(ContextMixin):
         if self.context_object_name:
             return self.context_object_name
         elif hasattr(object_list, 'model'):
-            return '%s_list' % object_list.model._meta.object_name.lower()
+            return '%s_list' % object_list.model._meta.model_name
         else:
             return None
 
@@ -177,7 +177,7 @@ class MultipleObjectTemplateResponseMixin(TemplateResponseMixin):
         # generated ones.
         if hasattr(self.object_list, 'model'):
             opts = self.object_list.model._meta
-            names.append("%s/%s%s.html" % (opts.app_label, opts.object_name.lower(), self.template_name_suffix))
+            names.append("%s/%s%s.html" % (opts.app_label, opts.model_name, self.template_name_suffix))
 
         return names
 
diff --git a/django/views/i18n.py b/django/views/i18n.py
index c87e3a82db..c7ee1b33bd 100644
--- a/django/views/i18n.py
+++ b/django/views/i18n.py
@@ -1,11 +1,12 @@
+import json
 import os
 import gettext as gettext_module
 
 from django import http
 from django.conf import settings
+from django.template import Context, Template
 from django.utils import importlib
 from django.utils.translation import check_for_language, activate, to_locale, get_language
-from django.utils.text import javascript_quote
 from django.utils.encoding import smart_text
 from django.utils.formats import get_format_modules, get_format
 from django.utils._os import upath
@@ -38,6 +39,7 @@ def set_language(request):
                 response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang_code)
     return response
 
+
 def get_formats():
     """
     Returns all formats strings required for i18n to work
@@ -53,120 +55,142 @@ def get_formats():
     for module in [settings] + get_format_modules(reverse=True):
         for attr in FORMAT_SETTINGS:
             result[attr] = get_format(attr)
-    src = []
+    formats = {}
     for k, v in result.items():
         if isinstance(v, (six.string_types, int)):
-            src.append("formats['%s'] = '%s';\n" % (javascript_quote(k), javascript_quote(smart_text(v))))
+            formats[k] = smart_text(v)
         elif isinstance(v, (tuple, list)):
-            v = [javascript_quote(smart_text(value)) for value in v]
-            src.append("formats['%s'] = ['%s'];\n" % (javascript_quote(k), "', '".join(v)))
-    return ''.join(src)
+            formats[k] = [smart_text(value) for value in v]
+    return formats
 
-NullSource = """
-/* gettext identity library */
 
-function gettext(msgid) { return msgid; }
-function ngettext(singular, plural, count) { return (count == 1) ? singular : plural; }
-function gettext_noop(msgid) { return msgid; }
-function pgettext(context, msgid) { return msgid; }
-function npgettext(context, singular, plural, count) { return (count == 1) ? singular : plural; }
-"""
+js_catalog_template = r"""
+{% autoescape off %}
+(function (globals) {
 
-LibHead = """
-/* gettext library */
+  var django = globals.django || (globals.django = {});
 
-var catalog = new Array();
-"""
+  {% if plural %}
+  django.pluralidx = function (n) {
+    var v={{ plural }};
+    if (typeof(v) == 'boolean') {
+      return v ? 1 : 0;
+    } else {
+      return v;
+    }
+  };
+  {% else %}
+  django.pluralidx = function (count) { return (count == 1) ? 0 : 1; };
+  {% endif %}
 
-LibFoot = """
+  {% if catalog_str %}
+  /* gettext library */
 
-function gettext(msgid) {
-  var value = catalog[msgid];
-  if (typeof(value) == 'undefined') {
-    return msgid;
-  } else {
-    return (typeof(value) == 'string') ? value : value[0];
-  }
-}
+  django.catalog = {{ catalog_str }};
 
-function ngettext(singular, plural, count) {
-  value = catalog[singular];
-  if (typeof(value) == 'undefined') {
-    return (count == 1) ? singular : plural;
-  } else {
-    return value[pluralidx(count)];
-  }
-}
+  django.gettext = function (msgid) {
+    var value = django.catalog[msgid];
+    if (typeof(value) == 'undefined') {
+      return msgid;
+    } else {
+      return (typeof(value) == 'string') ? value : value[0];
+    }
+  };
 
-function gettext_noop(msgid) { return msgid; }
+  django.ngettext = function (singular, plural, count) {
+    value = django.catalog[singular];
+    if (typeof(value) == 'undefined') {
+      return (count == 1) ? singular : plural;
+    } else {
+      return value[django.pluralidx(count)];
+    }
+  };
 
-function pgettext(context, msgid) {
-  var value = gettext(context + '\\x04' + msgid);
-  if (value.indexOf('\\x04') != -1) {
-    value = msgid;
-  }
-  return value;
-}
+  django.gettext_noop = function (msgid) { return msgid; };
 
-function npgettext(context, singular, plural, count) {
-  var value = ngettext(context + '\\x04' + singular, context + '\\x04' + plural, count);
-  if (value.indexOf('\\x04') != -1) {
-    value = ngettext(singular, plural, count);
-  }
-  return value;
-}
-"""
+  django.pgettext = function (context, msgid) {
+    var value = django.gettext(context + '\x04' + msgid);
+    if (value.indexOf('\x04') != -1) {
+      value = msgid;
+    }
+    return value;
+  };
 
-LibFormatHead = """
-/* formatting library */
+  django.npgettext = function (context, singular, plural, count) {
+    var value = django.ngettext(context + '\x04' + singular, context + '\x04' + plural, count);
+    if (value.indexOf('\x04') != -1) {
+      value = django.ngettext(singular, plural, count);
+    }
+    return value;
+  };
+  {% else %}
+  /* gettext identity library */
 
-var formats = new Array();
+  django.gettext = function (msgid) { return msgid; };
+  django.ngettext = function (singular, plural, count) { return (count == 1) ? singular : plural; };
+  django.gettext_noop = function (msgid) { return msgid; };
+  django.pgettext = function (context, msgid) { return msgid; };
+  django.npgettext = function (context, singular, plural, count) { return (count == 1) ? singular : plural; };
+  {% endif %}
 
-"""
+  django.interpolate = function (fmt, obj, named) {
+    if (named) {
+      return fmt.replace(/%\(\w+\)s/g, function(match){return String(obj[match.slice(2,-2)])});
+    } else {
+      return fmt.replace(/%s/g, function(match){return String(obj.shift())});
+    }
+  };
 
-LibFormatFoot = """
-function get_format(format_type) {
-    var value = formats[format_type];
+
+  /* formatting library */
+
+  django.formats = {{ formats_str }};
+
+  django.get_format = function (format_type) {
+    var value = django.formats[format_type];
     if (typeof(value) == 'undefined') {
       return format_type;
     } else {
       return value;
     }
-}
+  };
+
+  /* add to global namespace */
+  globals.pluralidx = django.pluralidx;
+  globals.gettext = django.gettext;
+  globals.ngettext = django.ngettext;
+  globals.gettext_noop = django.gettext_noop;
+  globals.pgettext = django.pgettext;
+  globals.npgettext = django.npgettext;
+  globals.interpolate = django.interpolate;
+  globals.get_format = django.get_format;
+
+}(this));
+{% endautoescape %}
 """
 
-SimplePlural = """
-function pluralidx(count) { return (count == 1) ? 0 : 1; }
-"""
 
-InterPolate = r"""
-function interpolate(fmt, obj, named) {
-  if (named) {
-    return fmt.replace(/%\(\w+\)s/g, function(match){return String(obj[match.slice(2,-2)])});
-  } else {
-    return fmt.replace(/%s/g, function(match){return String(obj.shift())});
-  }
-}
-"""
+def render_javascript_catalog(catalog=None, plural=None):
+    template = Template(js_catalog_template)
+    indent = lambda s: s.replace('\n', '\n  ')
+    context = Context({
+        'catalog_str': indent(json.dumps(
+            catalog, sort_keys=True, indent=2)) if catalog else None,
+        'formats_str': indent(json.dumps(
+            get_formats(), sort_keys=True, indent=2)),
+        'plural': plural,
+    })
+
+    return http.HttpResponse(template.render(context), 'text/javascript')
 
-PluralIdx = r"""
-function pluralidx(n) {
-  var v=%s;
-  if (typeof(v) == 'boolean') {
-    return v ? 1 : 0;
-  } else {
-    return v;
-  }
-}
-"""
 
 def null_javascript_catalog(request, domain=None, packages=None):
     """
     Returns "identity" versions of the JavaScript i18n functions -- i.e.,
     versions that don't actually do anything.
     """
-    src = [NullSource, InterPolate, LibFormatHead, get_formats(), LibFormatFoot]
-    return http.HttpResponse(''.join(src), 'text/javascript')
+    return render_javascript_catalog()
+
 
 def javascript_catalog(request, domain='djangojs', packages=None):
     """
@@ -243,42 +267,32 @@ def javascript_catalog(request, domain='djangojs', packages=None):
                     locale_t.update(catalog._catalog)
             if locale_t:
                 t = locale_t
-    src = [LibHead]
     plural = None
     if '' in t:
         for l in t[''].split('\n'):
             if l.startswith('Plural-Forms:'):
-                plural = l.split(':',1)[1].strip()
+                plural = l.split(':', 1)[1].strip()
     if plural is not None:
         # this should actually be a compiled function of a typical plural-form:
         # Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;
-        plural = [el.strip() for el in plural.split(';') if el.strip().startswith('plural=')][0].split('=',1)[1]
-        src.append(PluralIdx % plural)
-    else:
-        src.append(SimplePlural)
-    csrc = []
+        plural = [el.strip() for el in plural.split(';') if el.strip().startswith('plural=')][0].split('=', 1)[1]
+
     pdict = {}
+    maxcnts = {}
+    catalog = {}
     for k, v in t.items():
         if k == '':
             continue
         if isinstance(k, six.string_types):
-            csrc.append("catalog['%s'] = '%s';\n" % (javascript_quote(k), javascript_quote(v)))
+            catalog[k] = v
         elif isinstance(k, tuple):
-            if k[0] not in pdict:
-                pdict[k[0]] = k[1]
-            else:
-                pdict[k[0]] = max(k[1], pdict[k[0]])
-            csrc.append("catalog['%s'][%d] = '%s';\n" % (javascript_quote(k[0]), k[1], javascript_quote(v)))
+            msgid = k[0]
+            cnt = k[1]
+            maxcnts[msgid] = max(cnt, maxcnts.get(msgid, 0))
+            pdict.setdefault(msgid, {})[cnt] = v
         else:
             raise TypeError(k)
-    csrc.sort()
     for k, v in pdict.items():
-        src.append("catalog['%s'] = [%s];\n" % (javascript_quote(k), ','.join(["''"]*(v+1))))
-    src.extend(csrc)
-    src.append(LibFoot)
-    src.append(InterPolate)
-    src.append(LibFormatHead)
-    src.append(get_formats())
-    src.append(LibFormatFoot)
-    src = ''.join(src)
-    return http.HttpResponse(src, 'text/javascript')
+        catalog[k] = [v.get(i, '') for i in range(maxcnts[msgid] + 1)]
+
+    return render_javascript_catalog(catalog, plural)
diff --git a/django/views/static.py b/django/views/static.py
index f61ba28bd5..12af130796 100644
--- a/django/views/static.py
+++ b/django/views/static.py
@@ -58,12 +58,13 @@ def serve(request, path, document_root=None, show_indexes=False):
         raise Http404(_('"%(path)s" does not exist') % {'path': fullpath})
     # Respect the If-Modified-Since header.
     statobj = os.stat(fullpath)
-    mimetype, encoding = mimetypes.guess_type(fullpath)
-    mimetype = mimetype or 'application/octet-stream'
     if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'),
                               statobj.st_mtime, statobj.st_size):
         return HttpResponseNotModified()
-    response = CompatibleStreamingHttpResponse(open(fullpath, 'rb'), content_type=mimetype)
+    content_type, encoding = mimetypes.guess_type(fullpath)
+    content_type = content_type or 'application/octet-stream'
+    response = CompatibleStreamingHttpResponse(open(fullpath, 'rb'),
+                                               content_type=content_type)
     response["Last-Modified"] = http_date(statobj.st_mtime)
     if stat.S_ISREG(statobj.st_mode):
         response["Content-Length"] = statobj.st_size
diff --git a/docs/Makefile b/docs/Makefile
index f6293a8e7f..2a8bcd7101 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -10,7 +10,7 @@ BUILDDIR      = _build
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -n -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index 3d85147952..572bcd2e29 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -65,19 +65,13 @@ class VersionDirective(Directive):
 
     def run(self):
         env = self.state.document.settings.env
-        arg0 = self.arguments[0]
-        is_nextversion = env.config.django_next_version == arg0
         ret = []
         node = addnodes.versionmodified()
         ret.append(node)
-        if not is_nextversion:
-            if len(self.arguments) == 1:
-                linktext = 'Please see the release notes </releases/%s>' % (arg0)
-                xrefs = roles.XRefRole()('doc', linktext, linktext, self.lineno, self.state)
-                node.extend(xrefs[0])
-            node['version'] = arg0
-        else:
+        if self.arguments[0] == env.config.django_next_version:
             node['version'] = "Development version"
+        else:
+            node['version'] = self.arguments[0]
         node['type'] = self.name
         if len(self.arguments) == 2:
             inodes, messages = self.state.inline_text(self.arguments[1], self.lineno+1)
@@ -126,7 +120,7 @@ class DjangoHTMLTranslator(SmartyPantsHTMLTranslator):
     # which is a bit less obvious that I'd like.
     #
     # FIXME: these messages are all hardcoded in English. We need to change
-    # that to accomodate other language docs, but I can't work out how to make
+    # that to accommodate other language docs, but I can't work out how to make
     # that work.
     #
     version_text = {
@@ -210,7 +204,7 @@ class DjangoStandaloneHTMLBuilder(StandaloneHTMLBuilder):
                         if t == "templatefilter" and l == "ref/templates/builtins"],
         }
         outfilename = os.path.join(self.outdir, "templatebuiltins.js")
-        with open(outfilename, 'wb') as fp:
+        with open(outfilename, 'w') as fp:
             fp.write('var django_template_builtins = ')
             json.dump(templatebuiltins, fp)
             fp.write(';\n')
diff --git a/docs/_ext/literals_to_xrefs.py b/docs/_ext/literals_to_xrefs.py
index d7b3cfc549..6feeca992e 100644
--- a/docs/_ext/literals_to_xrefs.py
+++ b/docs/_ext/literals_to_xrefs.py
@@ -110,7 +110,7 @@ def fixliterals(fname):
     
 #
 # The following is taken from django.utils.termcolors and is copied here to
-# avoid the dependancy.
+# avoid the dependency.
 #
 
 
diff --git a/docs/_theme/djangodocs/static/djangodocs.css b/docs/_theme/djangodocs/static/djangodocs.css
index 4efb7e04f3..c8d223382d 100644
--- a/docs/_theme/djangodocs/static/djangodocs.css
+++ b/docs/_theme/djangodocs/static/djangodocs.css
@@ -90,8 +90,8 @@ table.docutils thead th p { margin: 0; padding: 0; }
 table.docutils { border-collapse:collapse; }
 
 /*** code blocks ***/
-.literal { white-space:nowrap; }
-.literal { color:#234f32; }
+.literal { color:#234f32; white-space:nowrap; }
+dt > tt.literal { white-space: normal; }
 #sidebar .literal { color:white; background:transparent; font-size:11px; }
 h4 .literal { color: #234f32; font-size: 13px; }
 pre { font-size:small; background:#E0FFB8; border:1px solid #94da3a; border-width:1px 0; margin: 1em 0; padding: .3em .4em; overflow: hidden; line-height: 1.3em;}
@@ -115,7 +115,7 @@ div.admonition-behind-the-scenes { padding-left:65px; background:url(docicons-be
 
 /*** versoinadded/changes ***/
 div.versionadded, div.versionchanged {  }
-div.versionadded span.title, div.versionchanged span.title { font-weight: bold; }
+div.versionadded span.title, div.versionchanged span.title, div.deprecated span.title { font-weight: bold; }
 
 /*** p-links ***/
 a.headerlink { color: #c60f0f; font-size: 0.8em; padding: 0 4px 0 4px; text-decoration: none; visibility: hidden; }
diff --git a/docs/conf.py b/docs/conf.py
index f58e4ecb2e..a654e3c4d6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -70,8 +70,8 @@ else:
 
     release = django_release()
 
-# The next version to be released
-django_next_version = '1.7'
+# The "development version" of Django
+django_next_version = '1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -110,6 +110,7 @@ intersphinx_mapping = {
     'python': ('http://docs.python.org/2.7', None),
     'sphinx': ('http://sphinx.pocoo.org/', None),
     'six': ('http://packages.python.org/six/', None),
+    'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
 }
 
 # Python's docs don't change every week.
diff --git a/docs/faq/admin.txt b/docs/faq/admin.txt
index 30d452cbe2..1d9a7c7427 100644
--- a/docs/faq/admin.txt
+++ b/docs/faq/admin.txt
@@ -49,7 +49,7 @@ How do I limit admin access so that objects can only be edited by the users who
 The :class:`~django.contrib.admin.ModelAdmin` class also provides customization
 hooks that allow you to control the visibility and editability of objects in the
 admin. Using the same trick of extracting the user from the request, the
-:meth:`~django.contrib.admin.ModelAdmin.queryset` and
+:meth:`~django.contrib.admin.ModelAdmin.get_queryset` and
 :meth:`~django.contrib.admin.ModelAdmin.has_change_permission` can be used to
 control the visibility and editability of objects in the admin.
 
diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index dc569840d1..5db3141f82 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -188,3 +188,31 @@ If you want to find Django-capable people in your local area, try
 https://people.djangoproject.com/ .
 
 .. _developers for hire page: https://code.djangoproject.com/wiki/DevelopersForHire
+
+How do I cite Django?
+---------------------
+
+It's difficult to give an official citation format, for two reasons: citation
+formats can vary wildly between publications, and citation standards for
+software are still a matter of some debate.
+
+For example, `APA style`_,  would dictate something like::
+
+    Django (Version 1.5) [Computer Software]. (2013). Retrieved from http://djangoproject.com.
+
+However, the only true guide is what your publisher will accept, so get a copy
+of those guidelines and fill in the gaps as best you can.
+
+If your referencing style guide requires a publisher name, use "Django Software
+Foundation".
+
+If you need a publishing location, use "Lawrence, Kansas".
+
+If you need a web address, use http://djangoproject.com.
+
+If you need a name, just use "Django", without any tagline.
+
+If you need a publication date, use the year of release of the version you're
+referencing (e.g., 2013 for v1.5)
+
+.. _APA style: http://www.apastyle.org
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index a92c9d87ea..5a4cab94cf 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -68,8 +68,10 @@ Django version Python versions
 1.1            2.3, 2.4, 2.5, 2.6
 1.2            2.4, 2.5, 2.6, 2.7
 1.3            2.4, 2.5, 2.6, 2.7
-**1.4**        **2.5, 2.6, 2.7**
-*1.5 (future)* *2.6, 2.7* and *3.2.3, 3.3 (experimental)*
+1.4            2.5, 2.6, 2.7
+1.5            2.6.5, 2.7 and 3.2.3, 3.3 (experimental)
+**1.6**        **2.6.5, 2.7** and **3.2.3, 3.3**
+*1.7 (future)* *2.7, 3.3 (to be confirmed)*
 ============== ===============
 
 Can I use Django with Python 3?
diff --git a/docs/faq/usage.txt b/docs/faq/usage.txt
index 151454398d..be3839e08f 100644
--- a/docs/faq/usage.txt
+++ b/docs/faq/usage.txt
@@ -52,10 +52,11 @@ Using a :class:`~django.db.models.FileField` or an
 
 #. All that will be stored in your database is a path to the file
    (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the
-   convenience :attr:`~django.core.files.File.url` attribute provided by
-   Django. For example, if your :class:`~django.db.models.ImageField` is
-   called ``mug_shot``, you can get the absolute path to your image in a
-   template with ``{{ object.mug_shot.url }}``.
+   convenience :attr:`~django.db.models.fields.files.FieldFile.url` attribute
+   provided by Django. For example, if your
+   :class:`~django.db.models.ImageField` is called ``mug_shot``, you can get
+   the absolute path to your image in a template with
+   ``{{ object.mug_shot.url }}``.
 
 How do I make a variable available to all my templates?
 -------------------------------------------------------
diff --git a/docs/howto/auth-remote-user.txt b/docs/howto/auth-remote-user.txt
index deab794cb1..d59bb25a85 100644
--- a/docs/howto/auth-remote-user.txt
+++ b/docs/howto/auth-remote-user.txt
@@ -27,6 +27,8 @@ use of the ``REMOTE_USER`` value using the ``RemoteUserMiddleware`` and
 Configuration
 =============
 
+.. class:: django.contrib.auth.middleware.RemoteUserMiddleware
+
 First, you must add the
 :class:`django.contrib.auth.middleware.RemoteUserMiddleware` to the
 :setting:`MIDDLEWARE_CLASSES` setting **after** the
diff --git a/docs/howto/custom-management-commands.txt b/docs/howto/custom-management-commands.txt
index 12e8ec2494..7a31fc44e3 100644
--- a/docs/howto/custom-management-commands.txt
+++ b/docs/howto/custom-management-commands.txt
@@ -2,6 +2,8 @@
 Writing custom django-admin commands
 ====================================
 
+.. module:: django.core.management
+
 Applications can register their own actions with ``manage.py``. For example,
 you might want to add a ``manage.py`` action for a Django app that you're
 distributing. In this document, we will be building a custom ``closepoll``
@@ -63,12 +65,18 @@ look like this:
 
                 self.stdout.write('Successfully closed poll "%s"' % poll_id)
 
+.. _management-commands-output:
+
 .. note::
     When you are using management commands and wish to provide console
     output, you should write to ``self.stdout`` and ``self.stderr``,
     instead of printing to ``stdout`` and ``stderr`` directly. By
     using these proxies, it becomes much easier to test your custom
-    command.
+    command. Note also that you don't need to end messages with a newline
+    character, it will be added automatically, unless you specify the ``ending``
+    parameter::
+
+        self.stdout.write("Unterminated line", ending='')
 
 The new custom command can be called using ``python manage.py closepoll
 <poll_id>``.
@@ -110,54 +118,61 @@ In addition to being able to add custom command line options, all
 :doc:`management commands</ref/django-admin>` can accept some
 default options such as :djadminopt:`--verbosity` and :djadminopt:`--traceback`.
 
-.. admonition:: Management commands and locales
+.. _management-commands-and-locales:
 
-    The :meth:`BaseCommand.execute` method sets the hardcoded ``en-us`` locale
-    because the commands shipped with Django perform several tasks
-    (for example, user-facing content rendering and database population) that
-    require a system-neutral string language (for which we use ``en-us``).
+Management commands and locales
+===============================
 
-    If your custom management command uses another locale, you should manually
-    activate and deactivate it in your :meth:`~BaseCommand.handle` or
-    :meth:`~NoArgsCommand.handle_noargs` method using the functions provided by
-    the I18N support code:
+By default, the :meth:`BaseCommand.execute` method sets the hardcoded 'en-us'
+locale because some commands shipped with Django perform several tasks
+(for example, user-facing content rendering and database population) that
+require a system-neutral string language (for which we use 'en-us').
 
-    .. code-block:: python
+If, for some reason, your custom management command needs to use a fixed locale
+different from 'en-us', you should manually activate and deactivate it in your
+:meth:`~BaseCommand.handle` or :meth:`~NoArgsCommand.handle_noargs` method using
+the functions provided by the I18N support code:
 
-        from django.core.management.base import BaseCommand, CommandError
-        from django.utils import translation
+.. code-block:: python
 
-        class Command(BaseCommand):
-            ...
-            can_import_settings = True
+    from django.core.management.base import BaseCommand, CommandError
+    from django.utils import translation
 
-            def handle(self, *args, **options):
+    class Command(BaseCommand):
+        ...
+        can_import_settings = True
 
-                # Activate a fixed locale, e.g. Russian
-                translation.activate('ru')
+        def handle(self, *args, **options):
 
-                # Or you can activate the LANGUAGE_CODE
-                # chosen in the settings:
-                #
-                #from django.conf import settings
-                #translation.activate(settings.LANGUAGE_CODE)
+            # Activate a fixed locale, e.g. Russian
+            translation.activate('ru')
 
-                # Your command logic here
-                # ...
+            # Or you can activate the LANGUAGE_CODE # chosen in the settings:
+            #
+            #from django.conf import settings
+            #translation.activate(settings.LANGUAGE_CODE)
 
-                translation.deactivate()
+            # Your command logic here
+            # ...
 
-    Take into account though, that system management commands typically have to
-    be very careful about running in non-uniform locales, so:
+            translation.deactivate()
 
-    * Make sure the :setting:`USE_I18N` setting is always ``True`` when running
-      the command (this is one good example of the potential problems stemming
-      from a dynamic runtime environment that Django commands avoid offhand by
-      always using a fixed locale).
+Another need might be that your command simply should use the locale set in
+settings and Django should be kept from forcing it to 'en-us'. You can achieve
+it by using the :data:`BaseCommand.leave_locale_alone` option.
 
-    * Review the code of your command and the code it calls for behavioral
-      differences when locales are changed and evaluate its impact on
-      predictable behavior of your command.
+When working on the scenarios described above though, take into account that
+system management commands typically have to be very careful about running in
+non-uniform locales, so you might need to:
+
+* Make sure the :setting:`USE_I18N` setting is always ``True`` when running
+  the command (this is a good example of the potential problems stemming
+  from a dynamic runtime environment that Django commands avoid offhand by
+  always using a fixed locale).
+
+* Review the code of your command and the code it calls for behavioral
+  differences when locales are changed and evaluate its impact on
+  predictable behavior of your command.
 
 Command objects
 ===============
@@ -220,6 +235,29 @@ All attributes can be set in your derived class and can be used in
   rather than all applications' models, call
   :meth:`~BaseCommand.validate` from :meth:`~BaseCommand.handle`.
 
+.. attribute:: BaseCommand.leave_locale_alone
+
+  A boolean indicating whether the locale set in settings should be preserved
+  during the execution of the command instead of being forcibly set to 'en-us'.
+
+  Default value is ``False``.
+
+  Make sure you know what you are doing if you decide to change the value of
+  this option in your custom command if it creates database content that
+  is locale-sensitive and such content shouldn't contain any translations (like
+  it happens e.g. with django.contrim.auth permissions) as making the locale
+  differ from the de facto default 'en-us' might cause unintended effects. See
+  the `Management commands and locales`_ section above for further details.
+
+  This option can't be ``False`` when the
+  :data:`~BaseCommand.can_import_settings` option is set to ``False`` too
+  because attempting to set the locale needs access to settings. This condition
+  will generate a :class:`CommandError`.
+
+.. versionadded:: 1.6
+
+The ``leave_locale_alone`` option was added in Django 1.6.
+
 Methods
 -------
 
@@ -261,6 +299,13 @@ the :meth:`~BaseCommand.handle` method must be implemented.
 
     The actual logic of the command. Subclasses must implement this method.
 
+.. method:: BaseCommand.validate(app=None, display_num_errors=False)
+
+    Validates the given app, raising :class:`CommandError` for any errors.
+
+    If ``app`` is None, then all installed apps are validated.
+
+
 .. _ref-basecommand-subclasses:
 
 BaseCommand subclasses
diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt
index 1e9d5d8701..8993872cff 100644
--- a/docs/howto/custom-model-fields.txt
+++ b/docs/howto/custom-model-fields.txt
@@ -19,7 +19,7 @@ only the common types, such as ``VARCHAR`` and ``INTEGER``. For more obscure
 column types, such as geographic polygons or even user-created types such as
 `PostgreSQL custom types`_, you can define your own Django ``Field`` subclasses.
 
-.. _PostgreSQL custom types: http://www.postgresql.org/docs/8.2/interactive/sql-createtype.html
+.. _PostgreSQL custom types: http://www.postgresql.org/docs/current/interactive/sql-createtype.html
 
 Alternatively, you may have a complex Python object that can somehow be
 serialized to fit into a standard database column type. This is another case
@@ -153,8 +153,8 @@ class, from which everything is descended.
 
 Initializing your new field is a matter of separating out any arguments that are
 specific to your case from the common arguments and passing the latter to the
-:meth:`~django.db.models.Field.__init__` method of
-:class:`~django.db.models.Field` (or your parent class).
+``__init__()`` method of :class:`~django.db.models.Field` (or your parent
+class).
 
 In our example, we'll call our field ``HandField``. (It's a good idea to call
 your :class:`~django.db.models.Field` subclass ``<Something>Field``, so it's
@@ -199,20 +199,20 @@ The :meth:`~django.db.models.Field.__init__` method takes the following
 parameters:
 
 * :attr:`~django.db.models.Field.verbose_name`
-* :attr:`~django.db.models.Field.name`
+* ``name``
 * :attr:`~django.db.models.Field.primary_key`
-* :attr:`~django.db.models.Field.max_length`
+* :attr:`~django.db.models.CharField.max_length`
 * :attr:`~django.db.models.Field.unique`
 * :attr:`~django.db.models.Field.blank`
 * :attr:`~django.db.models.Field.null`
 * :attr:`~django.db.models.Field.db_index`
-* :attr:`~django.db.models.Field.rel`: Used for related fields (like
-  :class:`ForeignKey`). For advanced use only.
+* ``rel``: Used for related fields (like :class:`ForeignKey`). For advanced
+  use only.
 * :attr:`~django.db.models.Field.default`
 * :attr:`~django.db.models.Field.editable`
-* :attr:`~django.db.models.Field.serialize`: If ``False``, the field will
-  not be serialized when the model is passed to Django's :doc:`serializers
-  </topics/serialization>`. Defaults to ``True``.
+* ``serialize``: If ``False``, the field will not be serialized when the model
+  is passed to Django's :doc:`serializers </topics/serialization>`. Defaults to
+  ``True``.
 * :attr:`~django.db.models.Field.unique_for_date`
 * :attr:`~django.db.models.Field.unique_for_month`
 * :attr:`~django.db.models.Field.unique_for_year`
@@ -222,9 +222,9 @@ parameters:
 * :attr:`~django.db.models.Field.db_tablespace`: Only for index creation, if the
   backend supports :doc:`tablespaces </topics/db/tablespaces>`. You can usually
   ignore this option.
-* :attr:`~django.db.models.Field.auto_created`: True if the field was
-  automatically created, as for the `OneToOneField` used by model
-  inheritance. For advanced use only.
+* ``auto_created``: ``True`` if the field was automatically created, as for the
+  :class:`~django.db.models.OneToOneField` used by model inheritance. For
+  advanced use only.
 
 All of the options without an explanation in the above list have the same
 meaning they do for normal Django fields. See the :doc:`field documentation
@@ -443,7 +443,7 @@ Python object type we want to store in the model's attribute. If anything is
 going wrong during value conversion, you should raise a
 :exc:`~django.core.exceptions.ValidationError` exception.
 
-**Remember:** If your custom field needs the :meth:`to_python` method to be
+**Remember:** If your custom field needs the :meth:`.to_python` method to be
 called when it is created, you should be using `The SubfieldBase metaclass`_
 mentioned earlier. Otherwise :meth:`.to_python` won't be called
 automatically.
@@ -602,12 +602,11 @@ Returns the default form field to use when this field is displayed in a model.
 This method is called by the :class:`~django.forms.ModelForm` helper.
 
 All of the ``kwargs`` dictionary is passed directly to the form field's
-:meth:`~django.forms.Field__init__` method. Normally, all you need to do is
-set up a good default for the ``form_class`` argument and then delegate further
-handling to the parent class. This might require you to write a custom form
-field (and even a form widget). See the :doc:`forms documentation
-</topics/forms/index>` for information about this, and take a look at the code in
-:mod:`django.contrib.localflavor` for some examples of custom widgets.
+``__init__()`` method. Normally, all you need to do is set up a good default
+for the ``form_class`` argument and then delegate further handling to the
+parent class. This might require you to write a custom form field (and even a
+form widget). See the :doc:`forms documentation </topics/forms/index>` for
+information about this.
 
 Continuing our ongoing example, we can write the :meth:`.formfield` method as::
 
@@ -668,7 +667,7 @@ Converting field data for serialization
 .. method:: Field.value_to_string(self, obj)
 
 This method is used by the serializers to convert the field into a string for
-output. Calling :meth:`Field._get_val_from_obj(obj)` is the best way to get the
+output. Calling ``Field._get_val_from_obj(obj)`` is the best way to get the
 value to serialize. For example, since our ``HandField`` uses strings for its
 data storage anyway, we can reuse some existing conversion code::
 
@@ -692,12 +691,12 @@ smoothly:
    a field that's similar to what you want and extend it a little bit,
    instead of creating an entirely new field from scratch.
 
-2. Put a :meth:`__str__` or :meth:`__unicode__` method on the class you're
+2. Put a ``__str__()`` or ``__unicode__()`` method on the class you're
    wrapping up as a field. There are a lot of places where the default
    behavior of the field code is to call
    :func:`~django.utils.encoding.force_text` on the value. (In our
    examples in this document, ``value`` would be a ``Hand`` instance, not a
-   ``HandField``). So if your :meth:`__unicode__` method automatically
+   ``HandField``). So if your ``__unicode__()`` method automatically
    converts to the string form of your Python object, you can save yourself
    a lot of work.
 
diff --git a/docs/howto/custom-template-tags.txt b/docs/howto/custom-template-tags.txt
index 70b6288bee..0d35654a04 100644
--- a/docs/howto/custom-template-tags.txt
+++ b/docs/howto/custom-template-tags.txt
@@ -114,6 +114,8 @@ your function. Example:
 Registering custom filters
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. method:: django.template.Library.filter
+
 Once you've written your filter definition, you need to register it with
 your ``Library`` instance, to make it available to Django's template language:
 
@@ -151,6 +153,8 @@ are described in :ref:`filters and auto-escaping <filters-auto-escaping>` and
 Template filters that expect strings
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. method:: django.template.defaultfilters.stringfilter
+
 If you're writing a template filter that only expects a string as the first
 argument, you should use the decorator ``stringfilter``. This will
 convert an object to its string value before being passed to your function:
@@ -328,33 +332,11 @@ Template filter code falls into one of two situations:
    handle the auto-escaping issues and return a safe string, the
    ``is_safe`` flag won't change anything either way.
 
-.. versionchanged:: 1.4
-
-``is_safe`` and ``needs_autoescape`` used to be attributes of the filter
-function; this syntax is deprecated.
-
-.. code-block:: python
-
-    @register.filter
-    def myfilter(value):
-        return value
-    myfilter.is_safe = True
-
-.. code-block:: python
-
-    @register.filter
-    def initial_letter_filter(text, autoescape=None):
-        # ...
-        return mark_safe(result)
-    initial_letter_filter.needs_autoescape = True
-
 .. _filters-timezones:
 
 Filters and time zones
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 1.4
-
 If you write a custom filter that operates on :class:`~datetime.datetime`
 objects, you'll usually register it with the ``expects_localtime`` flag set to
 ``True``:
@@ -722,6 +704,8 @@ cannot resolve the string passed to it in the current context of the page.
 Simple tags
 ~~~~~~~~~~~
 
+.. method:: django.template.Library.simple_tag
+
 Many template tags take a number of arguments -- strings or template variables
 -- and return a string after doing some processing based solely on
 the input arguments and some external information. For example, the
@@ -784,8 +768,6 @@ Or, using decorator syntax:
 For more information on how the ``takes_context`` option works, see the section
 on :ref:`inclusion tags<howto-custom-template-tags-inclusion-tags>`.
 
-.. versionadded:: 1.4
-
 If you need to rename your tag, you can provide a custom name for it:
 
 .. code-block:: python
@@ -796,8 +778,6 @@ If you need to rename your tag, you can provide a custom name for it:
     def some_function(value):
         return value - 2
 
-.. versionadded:: 1.4
-
 ``simple_tag`` functions may accept any number of positional or keyword
 arguments. For example:
 
@@ -885,16 +865,14 @@ template loader, we'd register the tag like this:
     # Here, register is a django.template.Library instance, as before
     register.inclusion_tag('results.html')(show_results)
 
-.. versionchanged:: 1.4
+Alternatively it is possible to register the inclusion tag using a
+:class:`django.template.Template` instance:
 
-    Alternatively it is possible to register the inclusion tag using a
-    :class:`django.template.Template` instance:
+.. code-block:: python
 
-    .. code-block:: python
-
-        from django.template.loader import get_template
-        t = get_template('results.html')
-        register.inclusion_tag(t)(show_results)
+    from django.template.loader import get_template
+    t = get_template('results.html')
+    register.inclusion_tag(t)(show_results)
 
 As always, decorator syntax works as well, so we could have written:
 
@@ -952,8 +930,6 @@ The ``takes_context`` parameter defaults to ``False``. When it's set to
 ``True``, the tag is passed the context object, as in this example. That's the
 only difference between this case and the previous ``inclusion_tag`` example.
 
-.. versionadded:: 1.4
-
 ``inclusion_tag`` functions may accept any number of positional or keyword
 arguments. For example:
 
@@ -1066,8 +1042,6 @@ context-updating template tag, you might want to consider using an
 Assignment tags
 ~~~~~~~~~~~~~~~
 
-.. versionadded:: 1.4
-
 To ease the creation of tags setting a variable in the context, Django provides
 a helper function, ``assignment_tag``. This function works the same way as
 :ref:`simple_tag<howto-custom-template-tags-simple-tags>`, except that it
diff --git a/docs/howto/deployment/checklist.txt b/docs/howto/deployment/checklist.txt
new file mode 100644
index 0000000000..b092048870
--- /dev/null
+++ b/docs/howto/deployment/checklist.txt
@@ -0,0 +1,205 @@
+====================
+Deployment checklist
+====================
+
+The Internet is a hostile environment. Before deploying your Django project,
+you should take some time to review your settings, with security, performance,
+and operations in mind.
+
+Django includes many :doc:`security features </topics/security>`. Some are
+built-in and always enabled. Others are optional because they aren't always
+appropriate, or because they're inconvenient for development. For example,
+forcing HTTPS may not be suitable for all websites, and it's impractical for
+local development.
+
+Performance optimizations are another category of trade-offs with convenience.
+For instance, caching is useful in production, less so for local development.
+Error reporting needs are also widely different.
+
+The following checklist includes settings that:
+
+- must be set properly for Django to provide the expected level of security;
+- are expected to be different in each environment;
+- enable optional security features;
+- enable performance optimizations;
+- provide error reporting.
+
+Many of these settings are sensitive and should be treated as confidential. If
+you're releasing the source code for your project, a common practice is to
+publish suitable settings for development, and to use a private settings
+module for production.
+
+Critical settings
+=================
+
+:setting:`SECRET_KEY`
+---------------------
+
+**The secret key must be a large random value and it must be kept secret.**
+
+Make sure that the key used in production isn't used anywhere else and avoid
+committing it to source control. This reduces the number of vectors from which
+an attacker may acquire the key.
+
+Instead of hardcoding the secret key in your settings module, consider loading
+it from an environment variable::
+
+    import os
+    SECRET_KEY = os.environ['SECRET_KEY']
+
+or from a file::
+
+    with open('/etc/secret_key.txt') as f:
+        SECRET_KEY = f.read().strip()
+
+:setting:`DEBUG`
+----------------
+
+**You must never enable debug in production.**
+
+You're certainly developing your project with :setting:`DEBUG = True <DEBUG>`,
+since this enables handy features like full tracebacks in your browser.
+
+For a production environment, though, this is a really bad idea, because it
+leaks lots of information about your project: excerpts of your source code,
+local variables, settings, libraries used, etc.
+
+Environment-specific settings
+=============================
+
+:setting:`ALLOWED_HOSTS`
+------------------------
+
+When :setting:`DEBUG = False <DEBUG>`, Django doesn't work at all without a
+suitable value for :setting:`ALLOWED_HOSTS`.
+
+This setting is required to protect your site against some CSRF attacks. If
+you use a wildcard, you must perform your own validation of the ``Host`` HTTP
+header, or otherwise ensure that you aren't vulnerable to this category of
+attacks.
+
+:setting:`CACHES`
+-----------------
+
+If you're using a cache, connection parameters may be different in development
+and in production.
+
+Cache servers often have weak authentication. Make sure they only accept
+connections from your application servers.
+
+:setting:`DATABASES`
+--------------------
+
+Database connection parameters are probably different in development and in
+production.
+
+Database passwords are very sensitive. You should protect them exactly like
+:setting:`SECRET_KEY`.
+
+For maximum security, make sure database servers only accept connections from
+your application servers.
+
+If you haven't set up backups for your database, do it right now!
+
+:setting:`EMAIL_BACKEND` and related settings
+---------------------------------------------
+
+If your site sends emails, these values need to be set correctly.
+
+:setting:`STATIC_ROOT` and :setting:`STATIC_URL`
+------------------------------------------------
+
+Static files are automatically served by the development server. In
+production, you must define a :setting:`STATIC_ROOT` directory where
+:djadmin:`collectstatic` will copy them.
+
+See :doc:`/howto/static-files/index` for more information.
+
+:setting:`MEDIA_ROOT` and :setting:`MEDIA_URL`
+----------------------------------------------
+
+Media files are uploaded by your users. They're untrusted! Make sure your web
+server never attempt to interpret them. For instance, if a user uploads a
+``.php`` file , the web server shouldn't execute it.
+
+Now is a good time to check your backup strategy for these files.
+
+HTTPS
+=====
+
+Any website which allows users to log in should enforce site-wide HTTPS to
+avoid transmitting access tokens in clear. In Django, access tokens include
+the login/password, the session cookie, and password reset tokens. (You can't
+do much to protect password reset tokens if you're sending them by email.)
+
+Protecting sensitive areas such as the user account or the admin isn't
+sufficient, because the same session cookie is used for HTTP and HTTPS. Your
+web server must redirect all HTTP traffic to HTTPS, and only transmit HTTPS
+requests to Django.
+
+Once you've set up HTTPS, enable the following settings.
+
+:setting:`CSRF_COOKIE_SECURE`
+-----------------------------
+
+Set this to ``True`` to avoid transmitting the CSRF cookie over HTTP
+accidentally.
+
+:setting:`SESSION_COOKIE_SECURE`
+--------------------------------
+
+Set this to ``True`` to avoid transmitting the session cookie over HTTP
+accidentally.
+
+Performance optimizations
+=========================
+
+Setting :setting:`DEBUG = False <DEBUG>` disables several features that are
+only useful in development. In addition, you can tune the following settings.
+
+:setting:`TEMPLATE_LOADERS`
+---------------------------
+
+Enabling the cached template loader often improves performance drastically, as
+it avoids compiling each template every time it needs to be rendered. See the
+:ref:`template loaders docs <template-loaders>` for more information.
+
+Error reporting
+===============
+
+By the time you push your code to production, it's hopefully robust, but you
+can't rule out unexpected errors. Thankfully, Django can capture errors and
+notify you accordingly.
+
+:setting:`LOGGING`
+------------------
+
+Review your logging configuration before putting your website in production,
+and check that it works as expected as soon as you have received some traffic.
+
+See :doc:`/topics/logging` for details on logging.
+
+:setting:`ADMINS` and :setting:`MANAGERS`
+-----------------------------------------
+
+:setting:`ADMINS` will be notified of 500 errors by email.
+
+:setting:`MANAGERS` will be notified of 404 errors.
+:setting:`IGNORABLE_404_URLS` can help filter out spurious reports.
+
+See :doc:`/howto/error-reporting` for details on error reporting by email.
+
+.. admonition: Error reporting by email doesn't scale very well
+
+    Consider using an error monitoring system such as Sentry_ before your
+    inbox is flooded by reports. Sentry can also aggregate logs.
+
+    .. _Sentry: http://sentry.readthedocs.org/en/latest/
+
+Miscellaneous
+=============
+
+:setting:`ALLOWED_INCLUDE_ROOTS`
+--------------------------------
+
+This setting is required if you're using the :ttag:`ssi` template tag.
diff --git a/docs/howto/deployment/index.txt b/docs/howto/deployment/index.txt
index 8e27a031d5..ed4bcf3d4a 100644
--- a/docs/howto/deployment/index.txt
+++ b/docs/howto/deployment/index.txt
@@ -11,6 +11,7 @@ ways to easily deploy Django:
 
    wsgi/index
    fastcgi
+   checklist
 
 If you're new to deploying Django and/or Python, we'd recommend you try
 :doc:`mod_wsgi </howto/deployment/wsgi/modwsgi>` first. In most cases it'll be
diff --git a/docs/howto/deployment/wsgi/apache-auth.txt b/docs/howto/deployment/wsgi/apache-auth.txt
index 5f700f1cb3..d06e89cd0e 100644
--- a/docs/howto/deployment/wsgi/apache-auth.txt
+++ b/docs/howto/deployment/wsgi/apache-auth.txt
@@ -4,7 +4,7 @@ Authenticating against Django's user database from Apache
 
 Since keeping multiple authentication databases in sync is a common problem when
 dealing with Apache, you can configure Apache to authenticate against Django's
-:doc:`authentication system </topics/auth>` directly. This requires Apache
+:doc:`authentication system </topics/auth/index>` directly. This requires Apache
 version >= 2.2 and mod_wsgi >= 2.0. For example, you could:
 
 * Serve static/media files directly from Apache only to authenticated users.
@@ -69,9 +69,9 @@ application :doc:`that is created by django-admin.py startproject
         LoadModule auth_basic_module modules/mod_auth_basic.so
         LoadModule authz_user_module modules/mod_authz_user.so
 
-Finally, edit your WSGI script ``mysite.wsgi`` to tie Apache's
-authentication to your site's authentication mechanisms by importing the
-check_user function:
+Finally, edit your WSGI script ``mysite.wsgi`` to tie Apache's authentication
+to your site's authentication mechanisms by importing the ``check_password``
+function:
 
 .. code-block:: python
 
diff --git a/docs/howto/deployment/wsgi/gunicorn.txt b/docs/howto/deployment/wsgi/gunicorn.txt
index c4483291a3..14c80af0a0 100644
--- a/docs/howto/deployment/wsgi/gunicorn.txt
+++ b/docs/howto/deployment/wsgi/gunicorn.txt
@@ -48,6 +48,12 @@ ensure that is to run this command from the same directory as your
 Using Gunicorn's Django integration
 ===================================
 
+.. note::
+
+    If you are using Django 1.4 or newer, it’s highly recommended to simply run
+    your application with the WSGI interface using the ``gunicorn`` command
+    as described above.
+
 To use Gunicorn's built-in Django integration, first add ``"gunicorn"`` to
 :setting:`INSTALLED_APPS`. Then run ``python manage.py run_gunicorn``.
 
diff --git a/docs/howto/deployment/wsgi/index.txt b/docs/howto/deployment/wsgi/index.txt
index 769d406b1b..ad32366bf8 100644
--- a/docs/howto/deployment/wsgi/index.txt
+++ b/docs/howto/deployment/wsgi/index.txt
@@ -8,9 +8,10 @@ servers and applications.
 .. _WSGI: http://www.wsgi.org
 
 Django's :djadmin:`startproject` management command sets up a simple default
-WSGI configuration for you, which you can tweak as needed for your project, and
-direct any WSGI-compliant webserver to use. Django includes getting-started
-documentation for the following WSGI servers:
+WSGI configuration for you, which you can tweak as needed for your project,
+and direct any WSGI-compliant application server to use.
+
+Django includes getting-started documentation for the following WSGI servers:
 
 .. toctree::
    :maxdepth: 1
@@ -23,34 +24,76 @@ documentation for the following WSGI servers:
 The ``application`` object
 --------------------------
 
-One key concept of deploying with WSGI is to specify a central ``application``
-callable object which the webserver uses to communicate with your code. This is
-commonly specified as an object named ``application`` in a Python module
-accessible to the server.
+The key concept of deploying with WSGI is the ``application`` callable which
+the application server uses to communicate with your code. It's commonly
+provided as an object named ``application`` in a Python module accessible to
+the server.
 
-.. versionchanged:: 1.4
+The :djadmin:`startproject` command creates a file
+:file:`<project_name>/wsgi.py` that contains such an ``application`` callable.
 
-The :djadmin:`startproject` command creates a :file:`projectname/wsgi.py` that
-contains such an application callable.
+It's used both by Django's development server and in production WSGI
+deployments.
+
+WSGI servers obtain the path to the ``application`` callable from their
+configuration. Django's built-in servers, namely the :djadmin:`runserver` and
+:djadmin:`runfcgi` commands, read it from the :setting:`WSGI_APPLICATION`
+setting. By default, it's set to ``<project_name>.wsgi.application``, which
+points to the ``application`` callable in :file:`<project_name>/wsgi.py`.
+
+Configuring the settings module
+-------------------------------
+
+When the WSGI server loads your application, Django needs to import the
+settings module — that's where your entire application is defined.
+
+Django uses the :envvar:`DJANGO_SETTINGS_MODULE` environment variable to
+locate the appropriate settings module. It must contain the dotted path to the
+settings module. You can use a different value for development and production;
+it all depends on how you organize your settings.
+
+If this variable isn't set, the default :file:`wsgi.py` sets it to
+``mysite.settings``, where ``mysite`` is the name of your project. That's how
+:djadmin:`runserver` discovers the default settings file by default.
 
 .. note::
 
-   Upgrading from a previous release of Django and don't have a :file:`wsgi.py`
-   file in your project? You can simply add one to your project's top-level
-   Python package (probably next to :file:`settings.py` and :file:`urls.py`)
-   with the contents below. If you want :djadmin:`runserver` to also make use
-   of this WSGI file, you can also add ``WSGI_APPLICATION =
-   "mysite.wsgi.application"`` in your settings (replacing ``mysite`` with the
-   name of your project).
+    Since environment variables are process-wide, this doesn't work when you
+    run multiple Django sites in the same process. This happens with mod_wsgi.
 
-Initially this file contains::
+    To avoid this problem, use mod_wsgi's daemon mode with each site in its
+    own daemon process, or override the value from the environment by
+    enforcing ``os.environ["DJANGO_SETTINGS_MODULE"] = "mysite.settings"`` in
+    your :file:`wsgi.py`.
+
+
+Applying WSGI middleware
+------------------------
+
+To apply `WSGI middleware`_ you can simply wrap the application object. For
+instance you could add these lines at the bottom of :file:`wsgi.py`::
+
+    from helloworld.wsgi import HelloWorldApplication
+    application = HelloWorldApplication(application)
+
+You could also replace the Django WSGI application with a custom WSGI
+application that later delegates to the Django WSGI application, if you want
+to combine a Django application with a WSGI application of another framework.
+
+.. _`WSGI middleware`: http://www.python.org/dev/peps/pep-3333/#middleware-components-that-play-both-sides
+
+Upgrading from Django < 1.4
+---------------------------
+
+If you're upgrading from Django 1.3.x or earlier, you don't have a
+:file:`wsgi.py` file in your project.
+
+You can simply add one to your project's top-level Python package (probably
+next to :file:`settings.py` and :file:`urls.py`) with the contents below::
 
     import os
-
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mysite.settings")
 
-    # This application object is used by the development server
-    # as well as any WSGI server configured to use this file.
     from django.core.wsgi import get_wsgi_application
     application = get_wsgi_application()
 
@@ -60,14 +103,6 @@ environment variable. You'll need to edit this line to replace ``mysite`` with
 the name of your project package, so the path to your settings module is
 correct.
 
-To apply `WSGI middleware`_ you can simply wrap the application object
-in the same file::
-
-    from helloworld.wsgi import HelloWorldApplication
-    application = HelloWorldApplication(application)
-
-You could also replace the Django WSGI application with a custom WSGI
-application that later delegates to the Django WSGI application, if you want to
-combine a Django application with a WSGI application of another framework.
-
-.. _`WSGI middleware`: http://www.python.org/dev/peps/pep-3333/#middleware-components-that-play-both-sides
+Also add ``WSGI_APPLICATION = "mysite.wsgi.application"`` in your settings, so
+that :djadmin:`runserver` finds your ``application`` callable. Don't forget to
+replace ``mysite`` with the name of your project in this line.
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index ead04a4643..7749192358 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -18,8 +18,8 @@ The `official mod_wsgi documentation`_ is fantastic; it's your source for all
 the details about how to use mod_wsgi. You'll probably want to start with the
 `installation and configuration documentation`_.
 
-.. _official mod_wsgi documentation: http://www.modwsgi.org/
-.. _installation and configuration documentation: http://www.modwsgi.org/wiki/InstallationInstructions
+.. _official mod_wsgi documentation: http://code.google.com/p/modwsgi/
+.. _installation and configuration documentation: http://code.google.com/p/modwsgi/wiki/InstallationInstructions
 
 Basic configuration
 ===================
diff --git a/docs/howto/deployment/wsgi/uwsgi.txt b/docs/howto/deployment/wsgi/uwsgi.txt
index b5d438450e..5b40d5f2f7 100644
--- a/docs/howto/deployment/wsgi/uwsgi.txt
+++ b/docs/howto/deployment/wsgi/uwsgi.txt
@@ -9,6 +9,14 @@ container server coded in pure C.
 
 .. _uWSGI: http://projects.unbit.it/uwsgi/
 
+.. seealso::
+
+    The uWSGI docs offer a `tutorial`_ covering Django, nginx, and uWSGI (one
+    possible deployment setup of many). The docs below are focused on how to
+    integrate Django with uWSGI.
+
+    .. _tutorial: https://uwsgi.readthedocs.org/en/latest/tutorials/Django_and_nginx.html
+
 Prerequisite: uWSGI
 ===================
 
diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt
index 78e797b607..27f11f4936 100644
--- a/docs/howto/error-reporting.txt
+++ b/docs/howto/error-reporting.txt
@@ -39,8 +39,8 @@ By default, Django will send email from root@localhost. However, some mail
 providers reject all email from this address. To use a different sender
 address, modify the :setting:`SERVER_EMAIL` setting.
 
-To disable this behavior, just remove all entries from the :setting:`ADMINS`
-setting.
+To activate this behavior, put the email addresses of the recipients in the
+:setting:`ADMINS` setting.
 
 .. seealso::
 
@@ -54,18 +54,24 @@ setting.
 Django can also be configured to email errors about broken links (404 "page
 not found" errors). Django sends emails about 404 errors when:
 
-* :setting:`DEBUG` is ``False``
+* :setting:`DEBUG` is ``False``;
 
-* :setting:`SEND_BROKEN_LINK_EMAILS` is ``True``
-
-* Your :setting:`MIDDLEWARE_CLASSES` setting includes ``CommonMiddleware``
-  (which it does by default).
+* Your :setting:`MIDDLEWARE_CLASSES` setting includes
+  :class:`django.middleware.common.BrokenLinkEmailsMiddleware`.
 
 If those conditions are met, Django will email the users listed in the
 :setting:`MANAGERS` setting whenever your code raises a 404 and the request has
 a referer. (It doesn't bother to email for 404s that don't have a referer --
 those are usually just people typing in broken URLs or broken Web 'bots).
 
+.. note::
+
+    :class:`~django.middleware.common.BrokenLinkEmailsMiddleware` must appear
+    before other middleware that intercepts 404 errors, such as
+    :class:`~django.middleware.locale.LocaleMiddleware` or
+    :class:`~django.contrib.flatpages.middleware.FlatpageFallbackMiddleware`.
+    Put it towards the top of your :setting:`MIDDLEWARE_CLASSES` setting.
+
 You can tell Django to stop reporting particular 404s by tweaking the
 :setting:`IGNORABLE_404_URLS` setting. It should be a tuple of compiled
 regular expression objects. For example::
@@ -92,30 +98,17 @@ crawlers often request::
 (Note that these are regular expressions, so we put a backslash in front of
 periods to escape them.)
 
-The best way to disable this behavior is to set
-:setting:`SEND_BROKEN_LINK_EMAILS` to ``False``.
-
 .. seealso::
 
    404 errors are logged using the logging framework. By default, these log
    records are ignored, but you can use them for error reporting by writing a
    handler and :doc:`configuring logging </topics/logging>` appropriately.
 
-.. seealso::
-
-   .. versionchanged:: 1.4
-
-   Previously, two settings were used to control which URLs not to report:
-   :setting:`IGNORABLE_404_STARTS` and :setting:`IGNORABLE_404_ENDS`. They
-   were replaced by :setting:`IGNORABLE_404_URLS`.
-
 .. _filtering-error-reports:
 
 Filtering error reports
 -----------------------
 
-.. versionadded:: 1.4
-
 Filtering sensitive information
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -123,7 +116,7 @@ Error reports are really helpful for debugging errors, so it is generally
 useful to record as much relevant information about those errors as possible.
 For example, by default Django records the `full traceback`_ for the
 exception raised, each `traceback frame`_'s local variables, and the
-:class:`HttpRequest`'s :ref:`attributes<httprequest-attributes>`.
+:class:`~django.http.HttpRequest`'s :ref:`attributes<httprequest-attributes>`.
 
 However, sometimes certain types of information may be too sensitive and thus
 may not be appropriate to be kept track of, for example a user's password or
@@ -163,13 +156,27 @@ production environment (that is, where :setting:`DEBUG` is set to ``False``):
         def my_function():
             ...
 
+    .. admonition:: When using mutiple decorators
+
+        If the variable you want to hide is also a function argument (e.g.
+        '``user``' in the following example), and if the decorated function has
+        mutiple decorators, then make sure to place ``@sensitive_variables`` at
+        the top of the decorator chain. This way it will also hide the function
+        argument as it gets passed through the other decorators::
+
+            @sensitive_variables('user', 'pw', 'cc')
+            @some_decorator
+            @another_decorator
+            def process_info(user):
+                ...
+
 .. function:: sensitive_post_parameters(*parameters)
 
-    If one of your views receives an :class:`HttpRequest` object with
-    :attr:`POST parameters<HttpRequest.POST>` susceptible to contain sensitive
-    information, you may prevent the values of those parameters from being
-    included in the error reports using the ``sensitive_post_parameters``
-    decorator::
+    If one of your views receives an :class:`~django.http.HttpRequest` object
+    with :attr:`POST parameters<django.http.HttpRequest.POST>` susceptible to
+    contain sensitive information, you may prevent the values of those
+    parameters from being included in the error reports using the
+    ``sensitive_post_parameters`` decorator::
 
         from django.views.decorators.debug import sensitive_post_parameters
 
@@ -193,12 +200,8 @@ production environment (that is, where :setting:`DEBUG` is set to ``False``):
         def my_view(request):
             ...
 
-.. note::
-
-    .. versionchanged:: 1.4
-
-    Since version 1.4, all POST parameters are systematically filtered out of
-    error reports for certain :mod:`contrib.views.auth` views (``login``,
+    All POST parameters are systematically filtered out of error reports for
+    certain :mod:`django.contrib.auth.views` views (``login``,
     ``password_reset_confirm``, ``password_change``, and ``add_view`` and
     ``user_change_password`` in the ``auth`` admin) to prevent the leaking of
     sensitive information such as user passwords.
diff --git a/docs/howto/index.txt b/docs/howto/index.txt
index d39222be26..9d5b067a82 100644
--- a/docs/howto/index.txt
+++ b/docs/howto/index.txt
@@ -21,7 +21,8 @@ you quickly accomplish common tasks.
    legacy-databases
    outputting-csv
    outputting-pdf
-   static-files
+   static-files/index
+   static-files/deployment
 
 .. seealso::
 
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index eca2e2c4f9..cea07bfea3 100644
--- a/docs/howto/initial-data.txt
+++ b/docs/howto/initial-data.txt
@@ -153,8 +153,8 @@ each app, Django looks for a file called
 ``<appname>/sql/<modelname>.<backend>.sql``, where ``<appname>`` is
 your app directory, ``<modelname>`` is the model's name in lowercase
 and ``<backend>`` is the last part of the module name provided for the
-:setting:`ENGINE` in your settings file (e.g., if you have defined a
-database with an :setting:`ENGINE` value of
+:setting:`ENGINE <DATABASE-ENGINE>` in your settings file (e.g., if you have
+defined a database with an :setting:`ENGINE <DATABASE-ENGINE>` value of
 ``django.db.backends.sqlite3``, Django will look for
 ``<appname>/sql/<modelname>.sqlite3.sql``).
 
diff --git a/docs/howto/legacy-databases.txt b/docs/howto/legacy-databases.txt
index 1b04e6d77c..6846e4b2df 100644
--- a/docs/howto/legacy-databases.txt
+++ b/docs/howto/legacy-databases.txt
@@ -21,7 +21,7 @@ setting and assigning values to the following keys for the ``'default'``
 connection:
 
 * :setting:`NAME`
-* :setting:`ENGINE`
+* :setting:`ENGINE <DATABASE-ENGINE>`
 * :setting:`USER`
 * :setting:`PASSWORD`
 * :setting:`HOST`
@@ -49,6 +49,35 @@ Once you've cleaned up your models, name the file ``models.py`` and put it in
 the Python package that holds your app. Then add the app to your
 :setting:`INSTALLED_APPS` setting.
 
+If your plan is that your Django application(s) modify data (i.e. edit, remove
+records and create new ones) in the existing database tables corresponding to
+any of the introspected models then one of the manual review and edit steps
+you need to perform on the resulting ``models.py`` file is to change the
+Python declaration of each one of these models to specify it is a
+:attr:`managed <django.db.models.Options.managed>` one. For example, consider
+this generated model definition:
+
+.. parsed-literal::
+
+      class Person(models.Model):
+          id = models.IntegerField(primary_key=True)
+          first_name = models.ChaField(max_length=70)
+          class Meta:
+	       **managed = False**
+	       db_table = 'CENSUS_PERSONS'
+
+If you wanted to modify existing data on your ``CENSUS_PERSONS`` SQL table
+with Django you'd need to change the ``managed`` option highlighted above to
+``True`` (or simply remove it to let it because ``True`` is its default value).
+
+This serves as an explicit opt-in to give your nascent Django project write
+access to your precious data on a model by model basis.
+
+.. versionchanged:: 1.6
+
+The behavior by which introspected models are created as unmanaged ones is new
+in Django 1.6.
+
 Install the core Django tables
 ==============================
 
diff --git a/docs/howto/outputting-csv.txt b/docs/howto/outputting-csv.txt
index bcc6f3827b..1f9efb5a4b 100644
--- a/docs/howto/outputting-csv.txt
+++ b/docs/howto/outputting-csv.txt
@@ -20,7 +20,7 @@ Here's an example::
 
     def some_view(request):
         # Create the HttpResponse object with the appropriate CSV header.
-        response = HttpResponse(mimetype='text/csv')
+        response = HttpResponse(content_type='text/csv')
         response['Content-Disposition'] = 'attachment; filename="somefilename.csv"'
 
         writer = csv.writer(response)
@@ -92,7 +92,7 @@ Here's an example, which generates the same CSV file as above::
 
     def some_view(request):
         # Create the HttpResponse object with the appropriate CSV header.
-        response = HttpResponse(mimetype='text/csv')
+        response = HttpResponse(content_type='text/csv')
         response['Content-Disposition'] = 'attachment; filename="somefilename.csv"'
 
         # The data is hard-coded here, but you could load it from a database or
@@ -111,7 +111,7 @@ Here's an example, which generates the same CSV file as above::
 
 The only difference between this example and the previous example is that this
 one uses template loading instead of the CSV module. The rest of the code --
-such as the ``mimetype='text/csv'`` -- is the same.
+such as the ``content_type='text/csv'`` -- is the same.
 
 Then, create the template ``my_template_name.txt``, with this template code:
 
diff --git a/docs/howto/outputting-pdf.txt b/docs/howto/outputting-pdf.txt
index 9d87b97710..d15f94f7f4 100644
--- a/docs/howto/outputting-pdf.txt
+++ b/docs/howto/outputting-pdf.txt
@@ -51,7 +51,7 @@ Here's a "Hello World" example::
 
     def some_view(request):
         # Create the HttpResponse object with the appropriate PDF headers.
-        response = HttpResponse(mimetype='application/pdf')
+        response = HttpResponse(content_type='application/pdf')
         response['Content-Disposition'] = 'attachment; filename="somefilename.pdf"'
 
         # Create the PDF object, using the response object as its "file."
@@ -120,7 +120,7 @@ Here's the above "Hello World" example rewritten to use :mod:`io`::
 
     def some_view(request):
         # Create the HttpResponse object with the appropriate PDF headers.
-        response = HttpResponse(mimetype='application/pdf')
+        response = HttpResponse(content_type='application/pdf')
         response['Content-Disposition'] = 'attachment; filename="somefilename.pdf"'
 
         buffer = BytesIO()
diff --git a/docs/howto/static-files.txt b/docs/howto/static-files.txt
deleted file mode 100644
index 964b5fab61..0000000000
--- a/docs/howto/static-files.txt
+++ /dev/null
@@ -1,508 +0,0 @@
-=====================
-Managing static files
-=====================
-
-Django developers mostly concern themselves with the dynamic parts of web
-applications -- the views and templates that render anew for each request. But
-web applications have other parts: the static files (images, CSS,
-Javascript, etc.) that are needed to render a complete web page.
-
-For small projects, this isn't a big deal, because you can just keep the
-static files somewhere your web server can find it. However, in bigger
-projects -- especially those comprised of multiple apps -- dealing with the
-multiple sets of static files provided by each application starts to get
-tricky.
-
-That's what ``django.contrib.staticfiles`` is for: it collects static files
-from each of your applications (and any other places you specify) into a
-single location that can easily be served in production.
-
-.. note::
-
-    If you've used the `django-staticfiles`_ third-party app before, then
-    ``django.contrib.staticfiles`` will look very familiar. That's because
-    they're essentially the same code: ``django.contrib.staticfiles`` started
-    its life as `django-staticfiles`_ and was merged into Django 1.3.
-
-    If you're upgrading from ``django-staticfiles``, please see `Upgrading from
-    django-staticfiles`_, below, for a few minor changes you'll need to make.
-
-.. _django-staticfiles: http://pypi.python.org/pypi/django-staticfiles/
-
-Using ``django.contrib.staticfiles``
-====================================
-
-Basic usage
------------
-
-1. Put your static files somewhere that ``staticfiles`` will find them.
-
-   By default, this means within ``static/`` subdirectories of apps in your
-   :setting:`INSTALLED_APPS`.
-
-   Your project will probably also have static assets that aren't tied to a
-   particular app. The :setting:`STATICFILES_DIRS` setting is a tuple of
-   filesystem directories to check when loading static files. It's a search
-   path that is by default empty. See the :setting:`STATICFILES_DIRS` docs
-   how to extend this list of additional paths.
-
-   Additionally, see the documentation for the :setting:`STATICFILES_FINDERS`
-   setting for details on how ``staticfiles`` finds your files.
-
-2. Make sure that ``django.contrib.staticfiles`` is included in your
-   :setting:`INSTALLED_APPS`.
-
-   For :ref:`local development<staticfiles-development>`, if you are using
-   :ref:`runserver<staticfiles-runserver>` or adding
-   :ref:`staticfiles_urlpatterns<staticfiles-development>` to your
-   URLconf, you're done with the setup -- your static files will
-   automatically be served at the default (for
-   :djadmin:`newly created<startproject>` projects) :setting:`STATIC_URL`
-   of ``/static/``.
-
-3. You'll probably need to refer to these files in your templates. The
-   easiest method is to use the included context processor which allows
-   template code like:
-
-   .. code-block:: html+django
-
-       <img src="{{ STATIC_URL }}images/hi.jpg" alt="Hi!" />
-
-   See :ref:`staticfiles-in-templates` for more details, **including** an
-   alternate method using a template tag.
-
-Deploying static files in a nutshell
-------------------------------------
-
-When you're ready to move out of local development and deploy your project:
-
-1. Set the :setting:`STATIC_URL` setting to the public URL for your static
-   files (in most cases, the default value of ``/static/`` is just fine).
-
-2. Set the :setting:`STATIC_ROOT` setting to point to the filesystem path
-   you'd like your static files collected to when you use the
-   :djadmin:`collectstatic` management command. For example::
-
-       STATIC_ROOT = "/home/jacob/projects/mysite.com/sitestatic"
-
-3. Run the :djadmin:`collectstatic` management command::
-
-       ./manage.py collectstatic
-
-   This'll churn through your static file storage and copy them into the
-   directory given by :setting:`STATIC_ROOT`.
-
-4. Deploy those files by configuring your webserver of choice to serve the
-   files in :setting:`STATIC_ROOT` at :setting:`STATIC_URL`.
-
-   :ref:`staticfiles-production` covers some common deployment strategies
-   for static files.
-
-Those are the **basics**. For more details on common configuration options,
-read on; for a detailed reference of the settings, commands, and other bits
-included with the framework see
-:doc:`the staticfiles reference </ref/contrib/staticfiles>`.
-
-.. note::
-
-   In previous versions of Django, it was common to place static assets in
-   :setting:`MEDIA_ROOT` along with user-uploaded files, and serve them both
-   at :setting:`MEDIA_URL`. Part of the purpose of introducing the
-   ``staticfiles`` app is to make it easier to keep static files separate
-   from user-uploaded files.
-
-   For this reason, you need to make your :setting:`MEDIA_ROOT` and
-   :setting:`MEDIA_URL` different from your :setting:`STATIC_ROOT` and
-   :setting:`STATIC_URL`. You will need to arrange for serving of files in
-   :setting:`MEDIA_ROOT` yourself; ``staticfiles`` does not deal with
-   user-uploaded files at all. You can, however, use
-   :func:`django.views.static.serve` view for serving :setting:`MEDIA_ROOT`
-   in development; see :ref:`staticfiles-other-directories`.
-
-.. _staticfiles-in-templates:
-
-Referring to static files in templates
-======================================
-
-At some point, you'll probably need to link to static files in your templates.
-You could, of course, simply hardcode the path to you assets in the templates:
-
-.. code-block:: html
-
-    <img src="http://static.example.com/static/myimage.jpg" alt="Sample image" />
-
-Of course, there are some serious problems with this: it doesn't work well in
-development, and it makes it *very* hard to change where you've deployed your
-static files. If, for example, you wanted to switch to using a content
-delivery network (CDN), then you'd need to change more or less every single
-template.
-
-A far better way is to use the value of the :setting:`STATIC_URL` setting
-directly in your templates. This means that a switch of static files servers
-only requires changing that single value. Much better!
-
-Django includes multiple built-in ways of using this setting in your
-templates: a context processor and a template tag.
-
-With a context processor
-------------------------
-
-The included context processor is the easy way. Simply make sure
-``'django.core.context_processors.static'`` is in your
-:setting:`TEMPLATE_CONTEXT_PROCESSORS`. It's there by default, and if you're
-editing that setting by hand it should look something like::
-
-    TEMPLATE_CONTEXT_PROCESSORS = (
-        'django.core.context_processors.debug',
-        'django.core.context_processors.i18n',
-        'django.core.context_processors.media',
-        'django.core.context_processors.static',
-        'django.contrib.auth.context_processors.auth',
-        'django.contrib.messages.context_processors.messages',
-    )
-
-Once that's done, you can refer to :setting:`STATIC_URL` in your templates:
-
-.. code-block:: html+django
-
-     <img src="{{ STATIC_URL }}images/hi.jpg" alt="Hi!" />
-
-If ``{{ STATIC_URL }}`` isn't working in your template, you're probably not
-using :class:`~django.template.RequestContext` when rendering the template.
-
-As a brief refresher, context processors add variables into the contexts of
-every template. However, context processors require that you use
-:class:`~django.template.RequestContext` when rendering templates. This happens
-automatically if you're using a :doc:`generic view </ref/class-based-views/index>`,
-but in views written by hand you'll need to explicitly use ``RequestContext``
-To see how that works, and to read more details, check out
-:ref:`subclassing-context-requestcontext`.
-
-Another option is the :ttag:`get_static_prefix` template tag that is part of
-Django's core.
-
-With a template tag
--------------------
-
-The more powerful tool is the :ttag:`static<staticfiles-static>` template
-tag. It builds the URL for the given relative path by using the configured
-:setting:`STATICFILES_STORAGE` storage.
-
-.. code-block:: html+django
-
-    {% load staticfiles %}
-    <img src="{% static "images/hi.jpg" %}" alt="Hi!"/>
-
-It is also able to consume standard context variables, e.g. assuming a
-``user_stylesheet`` variable is passed to the template:
-
-.. code-block:: html+django
-
-    {% load staticfiles %}
-    <link rel="stylesheet" href="{% static user_stylesheet %}" type="text/css" media="screen" />
-
-.. note::
-
-    There is also a template tag named :ttag:`static` in Django's core set
-    of :ref:`built in template tags<ref-templates-builtins-tags>` which has
-    the same argument signature but only uses `urlparse.urljoin()`_ with the
-    :setting:`STATIC_URL` setting and the given path. This has the
-    disadvantage of not being able to easily switch the storage backend
-    without changing the templates, so in doubt use the ``staticfiles``
-    :ttag:`static<staticfiles-static>`
-    template tag.
-
-.. _`urlparse.urljoin()`: http://docs.python.org/library/urlparse.html#urlparse.urljoin
-
-.. _staticfiles-development:
-
-Serving static files in development
-===================================
-
-The static files tools are mostly designed to help with getting static files
-successfully deployed into production. This usually means a separate,
-dedicated static file server, which is a lot of overhead to mess with when
-developing locally. Thus, the ``staticfiles`` app ships with a
-**quick and dirty helper view** that you can use to serve files locally in
-development.
-
-This view is automatically enabled and will serve your static files at
-:setting:`STATIC_URL` when you use the built-in
-:ref:`runserver<staticfiles-runserver>` management command.
-
-To enable this view if you are using some other server for local development,
-you'll add a couple of lines to your URLconf. The first line goes at the top
-of the file, and the last line at the bottom::
-
-    from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-    # ... the rest of your URLconf goes here ...
-
-    urlpatterns += staticfiles_urlpatterns()
-
-This will inspect your :setting:`STATIC_URL` setting and wire up the view
-to serve static files accordingly. Don't forget to set the
-:setting:`STATICFILES_DIRS` setting appropriately to let
-``django.contrib.staticfiles`` know where to look for files additionally to
-files in app directories.
-
-.. warning::
-
-    This will only work if :setting:`DEBUG` is ``True``.
-
-    That's because this view is **grossly inefficient** and probably
-    **insecure**. This is only intended for local development, and should
-    **never be used in production**.
-
-    Additionally, when using ``staticfiles_urlpatterns`` your
-    :setting:`STATIC_URL` setting can't be empty or a full URL, such as
-    ``http://static.example.com/``.
-
-For a few more details on how the ``staticfiles`` can be used during
-development, see :ref:`staticfiles-development-view`.
-
-.. _staticfiles-other-directories:
-
-Serving other directories
--------------------------
-
-.. currentmodule:: django.views.static
-.. function:: serve(request, path, document_root, show_indexes=False)
-
-There may be files other than your project's static assets that, for
-convenience, you'd like to have Django serve for you in local development.
-The :func:`~django.views.static.serve` view can be used to serve any directory
-you give it. (Again, this view is **not** hardened for production
-use, and should be used only as a development aid; you should serve these files
-in production using a real front-end webserver).
-
-The most likely example is user-uploaded content in :setting:`MEDIA_ROOT`.
-``staticfiles`` is intended for static assets and has no built-in handling
-for user-uploaded files, but you can have Django serve your
-:setting:`MEDIA_ROOT` by appending something like this to your URLconf::
-
-    from django.conf import settings
-
-    # ... the rest of your URLconf goes here ...
-
-    if settings.DEBUG:
-        urlpatterns += patterns('',
-            url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
-                'document_root': settings.MEDIA_ROOT,
-            }),
-       )
-
-Note, the snippet assumes your :setting:`MEDIA_URL` has a value of
-``'/media/'``. This will call the :func:`~django.views.static.serve` view,
-passing in the path from the URLconf and the (required) ``document_root``
-parameter.
-
-.. currentmodule:: django.conf.urls.static
-.. function:: static(prefix, view='django.views.static.serve', **kwargs)
-
-Since it can become a bit cumbersome to define this URL pattern, Django
-ships with a small URL helper function
-:func:`~django.conf.urls.static.static` that takes as parameters the prefix
-such as :setting:`MEDIA_URL` and a dotted path to a view, such as
-``'django.views.static.serve'``. Any other function parameter will be
-transparently passed to the view.
-
-An example for serving :setting:`MEDIA_URL` (``'/media/'``) during
-development::
-
-    from django.conf import settings
-    from django.conf.urls.static import static
-
-    urlpatterns = patterns('',
-        # ... the rest of your URLconf goes here ...
-    ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-
-.. note::
-
-    This helper function will only be operational in debug mode and if
-    the given prefix is local (e.g. ``/static/``) and not a URL (e.g.
-    ``http://static.example.com/``).
-
-.. _staticfiles-production:
-
-Serving static files in production
-==================================
-
-The basic outline of putting static files into production is simple: run the
-:djadmin:`collectstatic` command when static files change, then arrange for
-the collected static files directory (:setting:`STATIC_ROOT`) to be moved to
-the static file server and served.
-
-Of course, as with all deployment tasks, the devil's in the details. Every
-production setup will be a bit different, so you'll need to adapt the basic
-outline to fit your needs. Below are a few common patterns that might help.
-
-Serving the app and your static files from the same server
-----------------------------------------------------------
-
-If you want to serve your static files from the same server that's already
-serving your site, the basic outline gets modified to look something like:
-
-* Push your code up to the deployment server.
-* On the server, run :djadmin:`collectstatic` to copy all the static files
-  into :setting:`STATIC_ROOT`.
-* Point your web server at :setting:`STATIC_ROOT`. For example, here's
-  :ref:`how to do this under Apache and mod_wsgi <serving-files>`.
-
-You'll probably want to automate this process, especially if you've got
-multiple web servers. There's any number of ways to do this automation, but
-one option that many Django developers enjoy is `Fabric`__.
-
-__ http://fabfile.org/
-
-Below, and in the following sections, we'll show off a few example fabfiles
-(i.e. Fabric scripts) that automate these file deployment options. The syntax
-of a fabfile is fairly straightforward but won't be covered here; consult
-`Fabric's documentation`__, for a complete explanation of the syntax..
-
-__ http://docs.fabfile.org/
-
-So, a fabfile to deploy static files to a couple of web servers might look
-something like::
-
-    from fabric.api import *
-
-    # Hosts to deploy onto
-    env.hosts = ['www1.example.com', 'www2.example.com']
-
-    # Where your project code lives on the server
-    env.project_root = '/home/www/myproject'
-
-    def deploy_static():
-        with cd(env.project_root):
-            run('./manage.py collectstatic -v0 --noinput')
-
-Serving static files from a dedicated server
---------------------------------------------
-
-Most larger Django apps use a separate Web server -- i.e., one that's not also
-running Django -- for serving static files. This server often runs a different
-type of web server -- faster but less full-featured. Some good choices are:
-
-* lighttpd_
-* Nginx_
-* TUX_
-* Cherokee_
-* A stripped-down version of Apache_
-
-.. _lighttpd: http://www.lighttpd.net/
-.. _Nginx: http://wiki.nginx.org/Main
-.. _TUX: http://en.wikipedia.org/wiki/TUX_web_server
-.. _Apache: http://httpd.apache.org/
-.. _Cherokee: http://www.cherokee-project.com/
-
-Configuring these servers is out of scope of this document; check each
-server's respective documentation for instructions.
-
-Since your static file server won't be running Django, you'll need to modify
-the deployment strategy to look something like:
-
-* When your static files change, run :djadmin:`collectstatic` locally.
-* Push your local :setting:`STATIC_ROOT` up to the static file server
-  into the directory that's being served. ``rsync`` is a good
-  choice for this step since it only needs to transfer the
-  bits of static files that have changed.
-
-Here's how this might look in a fabfile::
-
-    from fabric.api import *
-    from fabric.contrib import project
-
-    # Where the static files get collected locally
-    env.local_static_root = '/tmp/static'
-
-    # Where the static files should go remotely
-    env.remote_static_root = '/home/www/static.example.com'
-
-    @roles('static')
-    def deploy_static():
-        local('./manage.py collectstatic')
-        project.rsync_project(
-            remote_dir = env.remote_static_root,
-            local_dir = env.local_static_root,
-            delete = True
-        )
-
-.. _staticfiles-from-cdn:
-
-Serving static files from a cloud service or CDN
-------------------------------------------------
-
-Another common tactic is to serve static files from a cloud storage provider
-like Amazon's S3__ and/or a CDN (content delivery network). This lets you
-ignore the problems of serving static files, and can often make for
-faster-loading webpages (especially when using a CDN).
-
-When using these services, the basic workflow would look a bit like the above,
-except that instead of using ``rsync`` to transfer your static files to the
-server you'd need to transfer the static files to the storage provider or CDN.
-
-There's any number of ways you might do this, but if the provider has an API a
-:doc:`custom file storage backend </howto/custom-file-storage>` will make the
-process incredibly simple. If you've written or are using a 3rd party custom
-storage backend, you can tell :djadmin:`collectstatic` to use it by setting
-:setting:`STATICFILES_STORAGE` to the storage engine.
-
-For example, if you've written an S3 storage backend in
-``myproject.storage.S3Storage`` you could use it with::
-
-    STATICFILES_STORAGE = 'myproject.storage.S3Storage'
-
-Once that's done, all you have to do is run :djadmin:`collectstatic` and your
-static files would be pushed through your storage package up to S3. If you
-later needed to switch to a different storage provider, it could be as simple
-as changing your :setting:`STATICFILES_STORAGE` setting.
-
-For details on how you'd write one of these backends,
-:doc:`/howto/custom-file-storage`.
-
-.. seealso::
-
-    The `django-storages`__ project is a 3rd party app that provides many
-    storage backends for many common file storage APIs (including `S3`__).
-
-__ http://s3.amazonaws.com/
-__ http://code.larlet.fr/django-storages/
-__ http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html
-
-Upgrading from ``django-staticfiles``
-=====================================
-
-``django.contrib.staticfiles`` began its life as `django-staticfiles`_. If
-you're upgrading from `django-staticfiles`_ older than 1.0 (e.g. 0.3.4) to
-``django.contrib.staticfiles``, you'll need to make a few changes:
-
-* Application files should now live in a ``static`` directory in each app
-  (`django-staticfiles`_ used the name ``media``, which was slightly
-  confusing).
-
-* The management commands ``build_static`` and ``resolve_static`` are now
-  called :djadmin:`collectstatic` and :djadmin:`findstatic`.
-
-* The settings ``STATICFILES_PREPEND_LABEL_APPS``,
-  ``STATICFILES_MEDIA_DIRNAMES`` and ``STATICFILES_EXCLUDED_APPS`` were
-  removed.
-
-* The setting ``STATICFILES_RESOLVERS`` was removed, and replaced by the
-  new :setting:`STATICFILES_FINDERS`.
-
-* The default for :setting:`STATICFILES_STORAGE` was renamed from
-  ``staticfiles.storage.StaticFileStorage`` to
-  ``staticfiles.storage.StaticFilesStorage``
-
-* If using :ref:`runserver<staticfiles-runserver>` for local development
-  (and the :setting:`DEBUG` setting is ``True``), you no longer need to add
-  anything to your URLconf for serving static files in development.
-
-Learn more
-==========
-
-This document has covered the basics and some common usage patterns. For
-complete details on all the settings, commands, template tags, and other pieces
-include in ``django.contrib.staticfiles``, see :doc:`the staticfiles reference
-</ref/contrib/staticfiles>`.
diff --git a/docs/howto/static-files/deployment.txt b/docs/howto/static-files/deployment.txt
new file mode 100644
index 0000000000..865a5c6b41
--- /dev/null
+++ b/docs/howto/static-files/deployment.txt
@@ -0,0 +1,159 @@
+======================
+Deploying static files
+======================
+
+.. seealso::
+
+    For an introduction to the use of :mod:`django.contrib.staticfiles`, see
+    :doc:`/howto/static-files/index`.
+
+.. _staticfiles-production:
+
+Serving static files in production
+==================================
+
+The basic outline of putting static files into production is simple: run the
+:djadmin:`collectstatic` command when static files change, then arrange for
+the collected static files directory (:setting:`STATIC_ROOT`) to be moved to
+the static file server and served. Depending on :setting:`STATICFILES_STORAGE`,
+files may need to be moved to a new location manually or the :func:`post_process
+<django.contrib.staticfiles.storage.StaticFilesStorage.post_process>` method
+of the ``Storage`` class might take care of that.
+
+Of course, as with all deployment tasks, the devil's in the details. Every
+production setup will be a bit different, so you'll need to adapt the basic
+outline to fit your needs. Below are a few common patterns that might help.
+
+Serving the site and your static files from the same server
+-----------------------------------------------------------
+
+If you want to serve your static files from the same server that's already
+serving your site, the process may look something like:
+
+* Push your code up to the deployment server.
+* On the server, run :djadmin:`collectstatic` to copy all the static files
+  into :setting:`STATIC_ROOT`.
+* Configure your web server to serve the files in :setting:`STATIC_ROOT`
+  under the URL :setting:`STATIC_URL`. For example, here's
+  :ref:`how to do this with Apache and mod_wsgi <serving-files>`.
+
+You'll probably want to automate this process, especially if you've got
+multiple web servers. There's any number of ways to do this automation, but
+one option that many Django developers enjoy is `Fabric
+<http://fabfile.org/>`_.
+
+Below, and in the following sections, we'll show off a few example fabfiles
+(i.e. Fabric scripts) that automate these file deployment options. The syntax
+of a fabfile is fairly straightforward but won't be covered here; consult
+`Fabric's documentation <http://docs.fabfile.org/>`_, for a complete
+explanation of the syntax.
+
+So, a fabfile to deploy static files to a couple of web servers might look
+something like::
+
+    from fabric.api import *
+
+    # Hosts to deploy onto
+    env.hosts = ['www1.example.com', 'www2.example.com']
+
+    # Where your project code lives on the server
+    env.project_root = '/home/www/myproject'
+
+    def deploy_static():
+        with cd(env.project_root):
+            run('./manage.py collectstatic -v0 --noinput')
+
+Serving static files from a dedicated server
+--------------------------------------------
+
+Most larger Django sites use a separate Web server -- i.e., one that's not also
+running Django -- for serving static files. This server often runs a different
+type of web server -- faster but less full-featured. Some common choices are:
+
+* lighttpd_
+* Nginx_
+* TUX_
+* Cherokee_
+* A stripped-down version of Apache_
+
+.. _lighttpd: http://www.lighttpd.net/
+.. _Nginx: http://wiki.nginx.org/Main
+.. _TUX: http://en.wikipedia.org/wiki/TUX_web_server
+.. _Apache: http://httpd.apache.org/
+.. _Cherokee: http://www.cherokee-project.com/
+
+Configuring these servers is out of scope of this document; check each
+server's respective documentation for instructions.
+
+Since your static file server won't be running Django, you'll need to modify
+the deployment strategy to look something like:
+
+* When your static files change, run :djadmin:`collectstatic` locally.
+
+* Push your local :setting:`STATIC_ROOT` up to the static file server into the
+  directory that's being served. `rsync <https://rsync.samba.org/>`_ is a
+  common choice for this step since it only needs to transfer the bits of
+  static files that have changed.
+
+Here's how this might look in a fabfile::
+
+    from fabric.api import *
+    from fabric.contrib import project
+
+    # Where the static files get collected locally. Your STATIC_ROOT setting.
+    env.local_static_root = '/tmp/static'
+
+    # Where the static files should go remotely
+    env.remote_static_root = '/home/www/static.example.com'
+
+    @roles('static')
+    def deploy_static():
+        local('./manage.py collectstatic')
+        project.rsync_project(
+            remote_dir = env.remote_static_root,
+            local_dir = env.local_static_root,
+            delete = True
+        )
+
+.. _staticfiles-from-cdn:
+
+Serving static files from a cloud service or CDN
+------------------------------------------------
+
+Another common tactic is to serve static files from a cloud storage provider
+like Amazon's S3 and/or a CDN (content delivery network). This lets you
+ignore the problems of serving static files and can often make for
+faster-loading webpages (especially when using a CDN).
+
+When using these services, the basic workflow would look a bit like the above,
+except that instead of using ``rsync`` to transfer your static files to the
+server you'd need to transfer the static files to the storage provider or CDN.
+
+There's any number of ways you might do this, but if the provider has an API a
+:doc:`custom file storage backend </howto/custom-file-storage>` will make the
+process incredibly simple. If you've written or are using a 3rd party custom
+storage backend, you can tell :djadmin:`collectstatic` to use it by setting
+:setting:`STATICFILES_STORAGE` to the storage engine.
+
+For example, if you've written an S3 storage backend in
+``myproject.storage.S3Storage`` you could use it with::
+
+    STATICFILES_STORAGE = 'myproject.storage.S3Storage'
+
+Once that's done, all you have to do is run :djadmin:`collectstatic` and your
+static files would be pushed through your storage package up to S3. If you
+later needed to switch to a different storage provider, it could be as simple
+as changing your :setting:`STATICFILES_STORAGE` setting.
+
+For details on how you'd write one of these backends, see
+:doc:`/howto/custom-file-storage`. There are 3rd party apps available that
+provide storage backends for many common file storage APIs. A good starting
+point is the `overview at djangopackages.com
+<https://www.djangopackages.com/grids/g/storage-backends/>`_.
+
+Learn more
+==========
+
+For complete details on all the settings, commands, template tags, and other
+pieces included in :mod:`django.contrib.staticfiles`, see :doc:`the
+staticfiles reference </ref/contrib/staticfiles>`.
diff --git a/docs/howto/static-files/index.txt b/docs/howto/static-files/index.txt
new file mode 100644
index 0000000000..2c98566e88
--- /dev/null
+++ b/docs/howto/static-files/index.txt
@@ -0,0 +1,119 @@
+===================================
+Managing static files (CSS, images)
+===================================
+
+Websites generally need to serve additional files such as images, JavaScript,
+or CSS. In Django, we refer to these files as "static files".  Django provides
+:mod:`django.contrib.staticfiles` to help you manage them.
+
+This page describes how you can serve these static files.
+
+Configuring static files
+========================
+
+1. Make sure that ``django.contrib.staticfiles`` is included in your
+   :setting:`INSTALLED_APPS`.
+
+2. In your settings file, define :setting:`STATIC_URL`, for example::
+
+      STATIC_URL = '/static/'
+
+3. In your templates, either hardcode the url like
+   ``/static/my_app/myexample.jpg`` or, preferably, use the
+   :ttag:`static<staticfiles-static>` template tag to build the URL for the given
+   relative path by using the configured :setting:`STATICFILES_STORAGE` storage
+   (this makes it much easier when you want to switch to a content delivery
+   network (CDN) for serving static files).
+
+   .. _staticfiles-in-templates:
+
+   .. code-block:: html+django
+
+        {% load staticfiles %}
+        <img src="{% static "my_app/myexample.jpg" %}" alt="My image"/>
+
+3. Store your static files in a folder called ``static`` in your app. For
+   example ``my_app/static/my_app/myimage.jpg``.
+
+Now, if you use ``./manage.py runserver``, all static files should be served
+automatically at the :setting:`STATIC_URL` and be shown correctly.
+
+Your project will probably also have static assets that aren't tied to a
+particular app. In addition to using a ``static/`` directory inside your apps,
+you can define a list of directories (:setting:`STATICFILES_DIRS`) in your
+settings file where Django will also look for static files. For example::
+
+    STATICFILES_DIRS = (
+        os.path.join(BASE_DIR, "static"),
+        '/var/www/static/',
+    )
+
+See the documentation for the :setting:`STATICFILES_FINDERS` setting for
+details on how ``staticfiles`` finds your files.
+
+.. admonition:: Static file namespacing
+
+    Now we *might* be able to get away with putting our static files directly
+    in ``my_app/static/`` (rather than creating another ``my_app``
+    subdirectory), but it would actually be a bad idea. Django will use the
+    last static file it finds whose name matches, and if you had a static file
+    with the same name in a *different* application, Django would be unable to
+    distinguish between them. We need to be able to point Django at the right
+    one, and the easiest way to ensure this is by *namespacing* them. That is,
+    by putting those static files inside *another* directory named for the
+    application itself.
+
+
+Serving files uploaded by a user
+================================
+
+During development, you can serve user-uploaded media files from
+:setting:`MEDIA_ROOT` using the :func:`django.contrib.staticfiles.views.serve`
+view. This is not suitable for production use! For some common deployment
+strategies, see :doc:`/howto/static-files/deployment`.
+
+For example, if your :setting:`MEDIA_URL` is defined as '/media/', you can do
+this by adding the following snippet to your urls.py::
+
+    from django.conf import settings
+    from django.conf.urls.static import static
+
+    urlpatterns = patterns('',
+        # ... the rest of your URLconf goes here ...
+    ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+
+.. note::
+
+    This helper function works only in debug mode and only if
+    the given prefix is local (e.g. ``/static/``) and not a URL (e.g.
+    ``http://static.example.com/``).
+
+Deployment
+==========
+
+:mod:`django.contrib.staticfiles` provides a convenience management command
+for gathering static files in a single directory so you can serve them easily.
+
+1. Set the :setting:`STATIC_ROOT` setting to the directory from which you'd
+   like to serve these files, for example::
+
+       STATIC_ROOT = "/var/www/example.com/static/"
+
+2. Run the :djadmin:`collectstatic` management command::
+
+       ./manage.py collectstatic
+
+   This will copy all files from your static folders into the
+   :setting:`STATIC_ROOT` directory.
+
+3. Use a webserver of your choice to serve the
+   files. :doc:`/howto/static-files/deployment` covers some common deployment
+   strategies for static files.
+
+Learn more
+==========
+
+This document has covered the basics and some common usage patterns. For
+complete details on all the settings, commands, template tags, and other pieces
+included in :mod:`django.contrib.staticfiles`, see :doc:`the staticfiles
+reference </ref/contrib/staticfiles>`.
diff --git a/docs/index.txt b/docs/index.txt
index 9fea8ff3f2..6473aa3168 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -45,7 +45,8 @@ Are you new to Django or to programming? This is the place to start!
   :doc:`Part 2 <intro/tutorial02>` |
   :doc:`Part 3 <intro/tutorial03>` |
   :doc:`Part 4 <intro/tutorial04>` |
-  :doc:`Part 5 <intro/tutorial05>`
+  :doc:`Part 5 <intro/tutorial05>` |
+  :doc:`Part 6 <intro/tutorial06>`
 
 * **Advanced Tutorials:**
   :doc:`How to write reusable apps <intro/reusable-apps>` |
@@ -98,6 +99,7 @@ to know about views via the links below:
   :doc:`Decorators <topics/http/decorators>`
 
 * **Reference:**
+  :doc:`Built-in Views <ref/views>` |
   :doc:`Request/response objects <ref/request-response>` |
   :doc:`TemplateResponse objects <ref/template-response>`
 
@@ -180,13 +182,17 @@ testing of Django applications:
   :doc:`Overview <ref/django-admin>` |
   :doc:`Adding custom commands <howto/custom-management-commands>`
 
-* **Testing:**  :doc:`Overview <topics/testing>`
+* **Testing:**
+  :doc:`Introduction <topics/testing/index>` |
+  :doc:`Writing and running tests <topics/testing/overview>` |
+  :doc:`Advanced topics <topics/testing/advanced>` |
+  :doc:`Doctests <topics/testing/doctests>`
 
 * **Deployment:**
   :doc:`Overview <howto/deployment/index>` |
   :doc:`WSGI servers <howto/deployment/wsgi/index>` |
   :doc:`FastCGI/SCGI/AJP <howto/deployment/fastcgi>` |
-  :doc:`Handling static files <howto/static-files>` |
+  :doc:`Deploying static files <howto/static-files/deployment>` |
   :doc:`Tracking code errors by email <howto/error-reporting>`
 
 The admin
@@ -217,8 +223,11 @@ Django offers a robust internationalization and localization framework to
 assist you in the development of applications for multiple languages and world
 regions:
 
-* :doc:`Internationalization <topics/i18n/index>`
-* :doc:`"Local flavor" <ref/contrib/localflavor>`
+* :doc:`Overview <topics/i18n/index>` |
+  :doc:`Internationalization <topics/i18n/translation>` |
+  :ref:`Localization <how-to-create-language-files>`
+* :doc:`"Local flavor" <topics/localflavor>`
+* :doc:`Time zones </topics/i18n/timezones>`
 
 Python compatibility
 ====================
@@ -242,12 +251,11 @@ Common Web application tools
 Django offers multiple tools commonly needed in the development of Web
 applications:
 
-* :doc:`Authentication <topics/auth>`
+* :doc:`Authentication <topics/auth/index>`
 * :doc:`Caching <topics/cache>`
 * :doc:`Logging <topics/logging>`
 * :doc:`Sending emails <topics/email>`
 * :doc:`Syndication feeds (RSS/Atom) <ref/contrib/syndication>`
-* :doc:`Comments <ref/contrib/comments/index>`, :doc:`comment moderation <ref/contrib/comments/moderation>` and :doc:`custom comments <ref/contrib/comments/custom>`
 * :doc:`Pagination <topics/pagination>`
 * :doc:`Messages framework <ref/contrib/messages>`
 * :doc:`Serialization <topics/serialization>`
@@ -263,7 +271,6 @@ Learn about some other core functionalities of the Django framework:
 
 * :doc:`Conditional content processing <topics/conditional-view-processing>`
 * :doc:`Content types and generic relations <ref/contrib/contenttypes>`
-* :doc:`Databrowse <ref/contrib/databrowse>`
 * :doc:`Flatpages <ref/contrib/flatpages>`
 * :doc:`Redirects <ref/contrib/redirects>`
 * :doc:`Signals <topics/signals>`
diff --git a/docs/internals/_images/djangotickets.png b/docs/internals/_images/djangotickets.png
deleted file mode 100644
index 34a2a41852..0000000000
Binary files a/docs/internals/_images/djangotickets.png and /dev/null differ
diff --git a/docs/internals/_images/triage_process.graffle b/docs/internals/_images/triage_process.graffle
new file mode 100644
index 0000000000..291c0397f7
--- /dev/null
+++ b/docs/internals/_images/triage_process.graffle
@@ -0,0 +1,2141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>ActiveLayerIndex</key>
+	<integer>0</integer>
+	<key>ApplicationVersion</key>
+	<array>
+		<string>com.omnigroup.OmniGrafflePro</string>
+		<string>139.16.0.171715</string>
+	</array>
+	<key>AutoAdjust</key>
+	<true/>
+	<key>BackgroundGraphic</key>
+	<dict>
+		<key>Bounds</key>
+		<string>{{0, 0}, {559.28997802734375, 782.8900146484375}}</string>
+		<key>Class</key>
+		<string>SolidGraphic</string>
+		<key>ID</key>
+		<integer>2</integer>
+		<key>Style</key>
+		<dict>
+			<key>shadow</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+			<key>stroke</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+		</dict>
+	</dict>
+	<key>BaseZoom</key>
+	<integer>0</integer>
+	<key>CanvasOrigin</key>
+	<string>{0, 0}</string>
+	<key>ColumnAlign</key>
+	<integer>1</integer>
+	<key>ColumnSpacing</key>
+	<real>36</real>
+	<key>CreationDate</key>
+	<string>2012-12-22 15:48:38 +0000</string>
+	<key>Creator</key>
+	<string>Aymeric Augustin</string>
+	<key>DisplayScale</key>
+	<string>1.000 cm = 1.000 cm</string>
+	<key>GraphDocumentVersion</key>
+	<integer>8</integer>
+	<key>GraphicsList</key>
+	<array>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
+				<integer>132</integer>
+			</dict>
+			<key>ID</key>
+			<integer>151</integer>
+			<key>Points</key>
+			<array>
+				<string>{252, 288}</string>
+				<string>{315, 324}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>82</integer>
+				<key>Info</key>
+				<integer>1</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>104</integer>
+			<key>OrthogonalBarAutomatic</key>
+			<true/>
+			<key>OrthogonalBarPoint</key>
+			<string>{0, 0}</string>
+			<key>OrthogonalBarPosition</key>
+			<real>-1</real>
+			<key>Points</key>
+			<array>
+				<string>{134.4999955076145, 414}</string>
+				<string>{90, 414}</string>
+				<string>{81, 522}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>0</string>
+					<key>Legacy</key>
+					<true/>
+					<key>LineType</key>
+					<integer>2</integer>
+					<key>Pattern</key>
+					<integer>1</integer>
+					<key>TailArrow</key>
+					<string>0</string>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>103</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{135, 405}, {18, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>103</integer>
+			<key>Shape</key>
+			<string>Circle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>Pattern</key>
+					<integer>1</integer>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{72, 522}, {342, 36}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>HFlip</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>102</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>Pattern</key>
+					<integer>1</integer>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Pad</key>
+				<integer>4</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red102\green102\blue102;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\i\fs24 \cf2 The ticket has a patch which applies cleanly and includes all needed tests and docs. A core developer can commit it as is.}</string>
+			</dict>
+			<key>VFlip</key>
+			<string>YES</string>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>98</integer>
+			<key>OrthogonalBarAutomatic</key>
+			<true/>
+			<key>OrthogonalBarPoint</key>
+			<string>{0, 0}</string>
+			<key>OrthogonalBarPosition</key>
+			<real>-1</real>
+			<key>Points</key>
+			<array>
+				<string>{134.4999955076145, 324}</string>
+				<string>{90, 324}</string>
+				<string>{81, 198}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>0</string>
+					<key>Legacy</key>
+					<true/>
+					<key>LineType</key>
+					<integer>2</integer>
+					<key>Pattern</key>
+					<integer>1</integer>
+					<key>TailArrow</key>
+					<string>0</string>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>97</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{135, 315}, {18, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>97</integer>
+			<key>Shape</key>
+			<string>Circle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>Pattern</key>
+					<integer>1</integer>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{72, 144}, {99, 54}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>HFlip</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>96</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>Pattern</key>
+					<integer>1</integer>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Pad</key>
+				<integer>4</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red102\green102\blue102;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\i\fs24 \cf2 The ticket is a bug and should be fixed.}</string>
+			</dict>
+			<key>VFlip</key>
+			<string>YES</string>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{243, 279}, {18, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>91</integer>
+			<key>Shape</key>
+			<string>Circle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>Pattern</key>
+					<integer>1</integer>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>90</integer>
+			<key>Points</key>
+			<array>
+				<string>{252, 278.49999548068274}</string>
+				<string>{252, 198}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>0</string>
+					<key>Legacy</key>
+					<true/>
+					<key>LineType</key>
+					<integer>1</integer>
+					<key>Pattern</key>
+					<integer>1</integer>
+					<key>TailArrow</key>
+					<string>0</string>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>91</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{189, 144}, {243, 54}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>HFlip</key>
+			<string>YES</string>
+			<key>ID</key>
+			<integer>89</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.6</string>
+						<key>g</key>
+						<string>0.6</string>
+						<key>r</key>
+						<string>0.6</string>
+					</dict>
+					<key>Pattern</key>
+					<integer>1</integer>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Pad</key>
+				<integer>4</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red102\green102\blue102;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\i\fs24 \cf2 The ticket was already reported, was already rejected, isn't a bug, doesn't contain enough information, or can't be reproduced.}</string>
+			</dict>
+			<key>VFlip</key>
+			<string>YES</string>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
+				<integer>10</integer>
+			</dict>
+			<key>ID</key>
+			<integer>60</integer>
+			<key>Points</key>
+			<array>
+				<string>{144, 396}</string>
+				<string>{144, 450}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>11</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>82</integer>
+			<key>Points</key>
+			<array>
+				<string>{198, 288}</string>
+				<string>{252, 288}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>0</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>12</integer>
+				<key>Info</key>
+				<integer>3</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
+				<integer>11</integer>
+			</dict>
+			<key>ID</key>
+			<integer>54</integer>
+			<key>Points</key>
+			<array>
+				<string>{144, 306}</string>
+				<string>{144, 360}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>12</integer>
+				<key>Info</key>
+				<integer>1</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
+				<integer>130</integer>
+			</dict>
+			<key>ID</key>
+			<integer>131</integer>
+			<key>Points</key>
+			<array>
+				<string>{198, 468}</string>
+				<string>{315, 468}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.501961</string>
+						<key>g</key>
+						<string>0.25098</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>10</integer>
+				<key>Info</key>
+				<integer>3</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
+				<integer>135</integer>
+				<key>Info</key>
+				<integer>4</integer>
+			</dict>
+			<key>ID</key>
+			<integer>136</integer>
+			<key>Points</key>
+			<array>
+				<string>{252, 288}</string>
+				<string>{315, 432}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>82</integer>
+				<key>Info</key>
+				<integer>1</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
+				<integer>137</integer>
+				<key>Info</key>
+				<integer>4</integer>
+			</dict>
+			<key>ID</key>
+			<integer>138</integer>
+			<key>Points</key>
+			<array>
+				<string>{252, 288}</string>
+				<string>{315, 396}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>82</integer>
+				<key>Info</key>
+				<integer>1</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
+				<integer>139</integer>
+				<key>Info</key>
+				<integer>4</integer>
+			</dict>
+			<key>ID</key>
+			<integer>140</integer>
+			<key>Points</key>
+			<array>
+				<string>{252, 288}</string>
+				<string>{315, 360}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>82</integer>
+				<key>Info</key>
+				<integer>1</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
+				<integer>123</integer>
+				<key>Info</key>
+				<integer>4</integer>
+			</dict>
+			<key>ID</key>
+			<integer>124</integer>
+			<key>Points</key>
+			<array>
+				<string>{252, 288}</string>
+				<string>{315, 288}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>82</integer>
+				<key>Info</key>
+				<integer>1</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{270, 576}, {81, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>128</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\i\fs24 \cf0 status}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{72.000000000000057, 596}, {99, 14}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FitText</key>
+			<string>Vertical</string>
+			<key>Flow</key>
+			<string>Resize</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>45</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>2</integer>
+				<key>Pad</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red0\green64\blue128;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qr
+
+\f0\b\fs24 \cf2 Committers}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>44</integer>
+			<key>Points</key>
+			<array>
+				<string>{183.59999999999997, 603}</string>
+				<string>{221.39999999999998, 603}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.501961</string>
+						<key>g</key>
+						<string>0.25098</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>LineType</key>
+					<integer>1</integer>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{72.000000000000057, 578}, {99, 14}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FitText</key>
+			<string>Vertical</string>
+			<key>Flow</key>
+			<string>Resize</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>43</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Align</key>
+				<integer>2</integer>
+				<key>Pad</key>
+				<integer>0</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red0\green128\blue0;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qr
+
+\f0\b\fs24 \cf2 Ticket triagers }</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>42</integer>
+			<key>Points</key>
+			<array>
+				<string>{183.59999999999997, 585}</string>
+				<string>{221.39999999999998, 585}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>HeadArrow</key>
+					<string>FilledArrow</string>
+					<key>Legacy</key>
+					<true/>
+					<key>LineType</key>
+					<integer>1</integer>
+					<key>TailArrow</key>
+					<string>0</string>
+					<key>Width</key>
+					<real>2</real>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{270, 594}, {81, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>129</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>1</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 in progress}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{351, 576}, {81, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>125</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0</string>
+						<key>r</key>
+						<string>1</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 stopped}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{351, 594}, {81, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>127</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 completed}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>36</integer>
+			<key>Points</key>
+			<array>
+				<string>{288, 243}</string>
+				<string>{432, 243}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>HeadArrow</key>
+					<string>0</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>ID</key>
+			<integer>33</integer>
+			<key>Points</key>
+			<array>
+				<string>{72, 243}</string>
+				<string>{216, 243}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>stroke</key>
+				<dict>
+					<key>HeadArrow</key>
+					<string>0</string>
+					<key>Legacy</key>
+					<true/>
+					<key>TailArrow</key>
+					<string>0</string>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{315, 315}, {90.000000000000014, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>132</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0</string>
+						<key>r</key>
+						<string>1</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 wontfix}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{315, 423}, {90.000000000000014, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>135</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0</string>
+						<key>r</key>
+						<string>1</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 worksforme}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{315, 387}, {90.000000000000014, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>137</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0</string>
+						<key>r</key>
+						<string>1</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 needsinfo}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{315, 351}, {90.000000000000014, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>139</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0</string>
+						<key>r</key>
+						<string>1</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 invalid}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{315, 459}, {90.000000000000014, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>130</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 fixed}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{315, 279}, {90.000000000000014, 18}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>123</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>0</string>
+						<key>g</key>
+						<string>0</string>
+						<key>r</key>
+						<string>1</string>
+					</dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 duplicate}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{90, 270}, {108, 36}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>12</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>1</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>CornerRadius</key>
+					<real>5</real>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Unreviewed}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{90, 360}, {108, 36}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>11</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>1</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>CornerRadius</key>
+					<real>5</real>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Accepted}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{90, 450}, {108, 36}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>10</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>a</key>
+						<string>0.3</string>
+						<key>b</key>
+						<string>1</string>
+						<key>g</key>
+						<string>0.501961</string>
+						<key>r</key>
+						<string>0</string>
+					</dict>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>CornerRadius</key>
+					<real>5</real>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Ready for Checkin}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{72, 216}, {144, 288}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>13</real>
+			</dict>
+			<key>ID</key>
+			<integer>99</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict/>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs28 \cf0 Open tickets\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\fs12 \cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\i\fs24 \cf0 triage state}</string>
+			</dict>
+			<key>TextPlacement</key>
+			<integer>0</integer>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{288, 216}, {144, 288}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>15</real>
+			</dict>
+			<key>ID</key>
+			<integer>32</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict/>
+			<key>Text</key>
+			<dict>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs28 \cf0 Closed tickets\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\fs12 \cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\i\fs24 \cf0 resolution}</string>
+			</dict>
+			<key>TextPlacement</key>
+			<integer>0</integer>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{270, 576}, {162, 36}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>126</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{72, 576}, {162, 36}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>ID</key>
+			<integer>88</integer>
+			<key>Magnets</key>
+			<array>
+				<string>{0, 1}</string>
+				<string>{0, -1}</string>
+				<string>{1, 0}</string>
+				<string>{-1, 0}</string>
+			</array>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>GradientCenter</key>
+					<string>{0, 0.15238095234285712}</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+		</dict>
+	</array>
+	<key>GridInfo</key>
+	<dict>
+		<key>ShowsGrid</key>
+		<string>YES</string>
+		<key>SnapsToGrid</key>
+		<string>YES</string>
+	</dict>
+	<key>GuidesLocked</key>
+	<string>NO</string>
+	<key>GuidesVisible</key>
+	<string>YES</string>
+	<key>HPages</key>
+	<integer>1</integer>
+	<key>ImageCounter</key>
+	<integer>1</integer>
+	<key>KeepToScale</key>
+	<false/>
+	<key>Layers</key>
+	<array>
+		<dict>
+			<key>Lock</key>
+			<string>NO</string>
+			<key>Name</key>
+			<string>Calque 1</string>
+			<key>Print</key>
+			<string>YES</string>
+			<key>View</key>
+			<string>YES</string>
+		</dict>
+	</array>
+	<key>LayoutInfo</key>
+	<dict>
+		<key>Animate</key>
+		<string>NO</string>
+		<key>circoMinDist</key>
+		<real>18</real>
+		<key>circoSeparation</key>
+		<real>0.0</real>
+		<key>layoutEngine</key>
+		<string>dot</string>
+		<key>neatoSeparation</key>
+		<real>0.0</real>
+		<key>twopiSeparation</key>
+		<real>0.0</real>
+	</dict>
+	<key>LinksVisible</key>
+	<string>NO</string>
+	<key>MagnetsVisible</key>
+	<string>NO</string>
+	<key>MasterSheets</key>
+	<array/>
+	<key>ModificationDate</key>
+	<string>2013-04-08 16:32:00 +0000</string>
+	<key>Modifier</key>
+	<string>Aymeric Augustin</string>
+	<key>NotesVisible</key>
+	<string>NO</string>
+	<key>Orientation</key>
+	<integer>2</integer>
+	<key>OriginVisible</key>
+	<string>NO</string>
+	<key>PageBreaks</key>
+	<string>YES</string>
+	<key>PrintInfo</key>
+	<dict>
+		<key>NSBottomMargin</key>
+		<array>
+			<string>float</string>
+			<string>41</string>
+		</array>
+		<key>NSHorizonalPagination</key>
+		<array>
+			<string>coded</string>
+			<string>BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG</string>
+		</array>
+		<key>NSLeftMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSPaperSize</key>
+		<array>
+			<string>size</string>
+			<string>{595.28997802734375, 841.8900146484375}</string>
+		</array>
+		<key>NSPrintReverseOrientation</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSRightMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSTopMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+	</dict>
+	<key>PrintOnePage</key>
+	<false/>
+	<key>ReadOnly</key>
+	<string>NO</string>
+	<key>RowAlign</key>
+	<integer>1</integer>
+	<key>RowSpacing</key>
+	<real>36</real>
+	<key>SheetTitle</key>
+	<string>Canevas 1</string>
+	<key>SmartAlignmentGuidesActive</key>
+	<string>YES</string>
+	<key>SmartDistanceGuidesActive</key>
+	<string>YES</string>
+	<key>UniqueID</key>
+	<integer>1</integer>
+	<key>UseEntirePage</key>
+	<false/>
+	<key>VPages</key>
+	<integer>1</integer>
+	<key>WindowInfo</key>
+	<dict>
+		<key>CurrentSheet</key>
+		<integer>0</integer>
+		<key>ExpandedCanvases</key>
+		<array/>
+		<key>Frame</key>
+		<string>{{1, 4}, {1190, 874}}</string>
+		<key>ListView</key>
+		<true/>
+		<key>OutlineWidth</key>
+		<integer>142</integer>
+		<key>RightSidebar</key>
+		<false/>
+		<key>ShowRuler</key>
+		<true/>
+		<key>Sidebar</key>
+		<true/>
+		<key>SidebarWidth</key>
+		<integer>120</integer>
+		<key>VisibleRegion</key>
+		<string>{{-195, 118.01801649706192}, {950.4504382015291, 662.16215362855348}}</string>
+		<key>Zoom</key>
+		<real>1.1100000143051147</real>
+		<key>ZoomValues</key>
+		<array>
+			<array>
+				<string>Canevas 1</string>
+				<real>1.1100000143051147</real>
+				<real>1.0499999523162842</real>
+			</array>
+		</array>
+	</dict>
+</dict>
+</plist>
diff --git a/docs/internals/_images/triage_process.pdf b/docs/internals/_images/triage_process.pdf
new file mode 100644
index 0000000000..f731e3e584
Binary files /dev/null and b/docs/internals/_images/triage_process.pdf differ
diff --git a/docs/internals/_images/triage_process.svg b/docs/internals/_images/triage_process.svg
new file mode 100644
index 0000000000..787f5ca647
--- /dev/null
+++ b/docs/internals/_images/triage_process.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="52 133 400 501" width="400pt" height="501pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2013-04-08 16:32Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.2 --></metadata><defs><filter id="Shadow" filterUnits="userSpaceOnUse"><feGaussianBlur in="SourceAlpha" result="blur" stdDeviation="3.488"/><feOffset in="blur" result="offset" dx="0" dy="4"/><feFlood flood-color="black" flood-opacity=".75" result="flood"/><feComposite in="flood" in2="offset" operator="in"/></filter><font-face font-family="Helvetica" font-size="14" units-per-em="1000" underline-position="-75.683594" underline-thickness="49.316406" slope="0" x-height="522.94922" cap-height="717.28516" ascent="770.01953" descent="-229.98047" font-weight="500"><font-face-src><font-face-name name="Helvetica"/></font-face-src></font-face><font-face font-family="Helvetica" font-size="12" units-per-em="1000" underline-position="-75.683594" underline-thickness="49.316406" slope="-1e3" x-height="522.94922" cap-height="717.28516" ascent="770.01953" descent="-229.98047" font-style="italic" font-weight="500"><font-face-src><font-face-name name="Helvetica-Oblique"/></font-face-src></font-face><font-face font-family="Helvetica" font-size="12" units-per-em="1000" underline-position="-75.683594" underline-thickness="49.316406" slope="0" x-height="522.94922" cap-height="717.28516" ascent="770.01953" descent="-229.98047" font-weight="500"><font-face-src><font-face-name name="Helvetica"/></font-face-src></font-face><marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="FilledArrow_Marker" viewBox="-1 -3 7 6" markerWidth="7" markerHeight="6" color="green"><g><path d="M 4.8000002 0 L 0 -1.8000001 L 0 1.8000001 Z" fill="currentColor" stroke="currentColor" stroke-width="1"/></g></marker><font-face font-family="Helvetica" font-size="12" units-per-em="1000" underline-position="-75.683594" underline-thickness="49.316406" slope="0" x-height="532.22656" cap-height="719.72656" ascent="770.01953" descent="-229.98047" font-weight="bold"><font-face-src><font-face-name name="Helvetica-Bold"/></font-face-src></font-face><marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="FilledArrow_Marker_2" viewBox="-1 -3 7 6" markerWidth="7" markerHeight="6" color="#004080"><g><path d="M 4.8000002 0 L 0 -1.8000001 L 0 1.8000001 Z" fill="currentColor" stroke="currentColor" stroke-width="1"/></g></marker></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canevas 1</title><rect fill="white" width="559.28998" height="782.89"/><g><title>Calque 1</title><g><use xl:href="#id88_Graphic" filter="url(#Shadow)"/><use xl:href="#id126_Graphic" filter="url(#Shadow)"/><use xl:href="#id32_Graphic" filter="url(#Shadow)"/><use xl:href="#id99_Graphic" filter="url(#Shadow)"/><use xl:href="#id10_Graphic" filter="url(#Shadow)"/><use xl:href="#id11_Graphic" filter="url(#Shadow)"/><use xl:href="#id12_Graphic" filter="url(#Shadow)"/><use xl:href="#id123_Graphic" filter="url(#Shadow)"/><use xl:href="#id130_Graphic" filter="url(#Shadow)"/><use xl:href="#id139_Graphic" filter="url(#Shadow)"/><use xl:href="#id137_Graphic" filter="url(#Shadow)"/><use xl:href="#id135_Graphic" filter="url(#Shadow)"/><use xl:href="#id132_Graphic" filter="url(#Shadow)"/></g><g id="id88_Graphic"><rect x="72" y="576" width="162" height="36" fill="white"/></g><g id="id126_Graphic"><rect x="270" y="576" width="162" height="36" fill="white"/></g><g id="id32_Graphic"><rect x="288" y="216" width="144" height="288" fill="white"/><rect x="288" y="216" width="144" height="288" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(293 221)" fill="black"><tspan font-family="Helvetica" font-size="14" font-weight="500" x="23.427734" y="14" textLength="87.14453">Closed tickets</tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" x="40.984375" y="35" textLength="52.03125">resolution</tspan></text></g><g id="id99_Graphic"><rect x="72" y="216" width="144" height="288" fill="white"/><rect x="72" y="216" width="144" height="288" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(77 221)" fill="black"><tspan font-family="Helvetica" font-size="14" font-weight="500" x="28.093262" y="14" textLength="77.813477">Open tickets</tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" x="37.316406" y="35" textLength="59.367188">triage state</tspan></text></g><g id="id10_Graphic"><path d="M 95 450 L 193 450 C 195.76142 450 198 452.23858 198 455 L 198 481 C 198 483.76142 195.76142 486 193 486 L 95 486 C 92.238576 486 90 483.76142 90 481 C 90 481 90 481 90 481 L 90 455 C 90 452.23858 92.238576 450 95 450 C 95 450 95 450 95 450 Z" fill="#0080ff" fill-opacity=".30000001"/><path d="M 95 450 L 193 450 C 195.76142 450 198 452.23858 198 455 L 198 481 C 198 483.76142 195.76142 486 193 486 L 95 486 C 92.238576 486 90 483.76142 90 481 C 90 481 90 481 90 481 L 90 455 C 90 452.23858 92.238576 450 95 450 C 95 450 95 450 95 450 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(95 454)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="22.987305" y="11" textLength="55.359375">Ready for </tspan><tspan font-family="Helvetica" font-size="12" font-weight="500" x="27.323242" y="25" textLength="43.353516">Checkin</tspan></text></g><g id="id11_Graphic"><path d="M 95 360 L 193 360 C 195.76142 360 198 362.23858 198 365 L 198 391 C 198 393.76142 195.76142 396 193 396 L 95 396 C 92.238576 396 90 393.76142 90 391 C 90 391 90 391 90 391 L 90 365 C 90 362.23858 92.238576 360 95 360 C 95 360 95 360 95 360 Z" fill="#0080ff" fill-opacity=".30000001"/><path d="M 95 360 L 193 360 C 195.76142 360 198 362.23858 198 365 L 198 391 C 198 393.76142 195.76142 396 193 396 L 95 396 C 92.238576 396 90 393.76142 90 391 C 90 391 90 391 90 391 L 90 365 C 90 362.23858 92.238576 360 95 360 C 95 360 95 360 95 360 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(95 371)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="23.983398" y="11" textLength="50.033203">Accepted</tspan></text></g><g id="id12_Graphic"><path d="M 95 270 L 193 270 C 195.76142 270 198 272.23858 198 275 L 198 301 C 198 303.76142 195.76142 306 193 306 L 95 306 C 92.238576 306 90 303.76142 90 301 C 90 301 90 301 90 301 L 90 275 C 90 272.23858 92.238576 270 95 270 C 95 270 95 270 95 270 Z" fill="#0080ff" fill-opacity=".30000001"/><path d="M 95 270 L 193 270 C 195.76142 270 198 272.23858 198 275 L 198 301 C 198 303.76142 195.76142 306 193 306 L 95 306 C 92.238576 306 90 303.76142 90 301 C 90 301 90 301 90 301 L 90 275 C 90 272.23858 92.238576 270 95 270 C 95 270 95 270 95 270 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(95 281)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="17.318359" y="11" textLength="63.36328">Unreviewed</tspan></text></g><g id="id123_Graphic"><rect x="315" y="279" width="90" height="18" fill="red" fill-opacity=".30000001"/><rect x="315" y="279" width="90" height="18" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(320 281)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="15.982422" y="11" textLength="48.035156">duplicate</tspan></text></g><g id="id130_Graphic"><rect x="315" y="459" width="90" height="18" fill="green" fill-opacity=".30000001"/><rect x="315" y="459" width="90" height="18" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(320 461)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="27.326172" y="11" textLength="6">fi</tspan><tspan font-family="Helvetica" font-size="12" font-weight="500" x="33.326172" y="11" textLength="19.347656">xed</tspan></text></g><g id="id139_Graphic"><rect x="315" y="351" width="90" height="18" fill="red" fill-opacity=".30000001"/><rect x="315" y="351" width="90" height="18" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(320 353)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="22.990234" y="11" textLength="34.019531">invalid</tspan></text></g><g id="id137_Graphic"><rect x="315" y="387" width="90" height="18" fill="red" fill-opacity=".30000001"/><rect x="315" y="387" width="90" height="18" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(320 389)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="13.978516" y="11" textLength="52.04297">needsinfo</tspan></text></g><g id="id135_Graphic"><rect x="315" y="423" width="90" height="18" fill="red" fill-opacity=".30000001"/><rect x="315" y="423" width="90" height="18" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(320 425)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="8.995117" y="11" textLength="62.009766">worksforme</tspan></text></g><g id="id132_Graphic"><rect x="315" y="315" width="90" height="18" fill="red" fill-opacity=".30000001"/><rect x="315" y="315" width="90" height="18" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><text transform="translate(320 317)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="21.326172" y="11" textLength="31.347656">wontfi</tspan><tspan font-family="Helvetica" font-size="12" font-weight="500" x="52.673828" y="11" textLength="6">x</tspan></text></g><line x1="72" y1="243" x2="216" y2="243" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><line x1="288" y1="243" x2="432" y2="243" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><rect x="351" y="594" width="81" height="18" fill="green" fill-opacity=".30000001"/><text transform="translate(356 596)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="7.817383" y="11" textLength="55.365234">completed</tspan></text><rect x="351" y="576" width="81" height="18" fill="red" fill-opacity=".30000001"/><text transform="translate(356 578)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="14.1484375" y="11" textLength="42.703125">stopped</tspan></text><rect x="270" y="594" width="81" height="18" fill="#0080ff" fill-opacity=".30000001"/><text transform="translate(275 596)" fill="black"><tspan font-family="Helvetica" font-size="12" font-weight="500" x="5.819336" y="11" textLength="59.361328">in progress</tspan></text><line x1="183.6" y1="585" x2="208.5" y2="585" marker-end="url(#FilledArrow_Marker)" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><text transform="translate(72 578)" fill="green"><tspan font-family="Helvetica" font-size="12" font-weight="bold" fill="green" x="17.173828" y="11" textLength="7.330078">T</tspan><tspan font-family="Helvetica" font-size="12" font-weight="bold" fill="green" x="24.292969" y="11" textLength="78.041016">icket triagers </tspan></text><line x1="183.6" y1="603" x2="208.5" y2="603" marker-end="url(#FilledArrow_Marker_2)" stroke="#004080" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><text transform="translate(72 596)" fill="#004080"><tspan font-family="Helvetica" font-size="12" font-weight="bold" fill="#004080" x="32.320312" y="11" textLength="66.679688">Committers</tspan></text><rect x="270" y="576" width="81" height="18" fill="white"/><text transform="translate(275 578)" fill="black"><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" x="19.492188" y="11" textLength="32.015625">status</tspan></text><line x1="252" y1="288" x2="302.1" y2="288" marker-end="url(#FilledArrow_Marker)" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="252" y1="288" x2="306.50529" y2="350.29176" marker-end="url(#FilledArrow_Marker)" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="252" y1="288" x2="308.50006" y2="384.85725" marker-end="url(#FilledArrow_Marker)" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="252" y1="288" x2="309.82944" y2="420.18157" marker-end="url(#FilledArrow_Marker)" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="198" y1="468" x2="302.1" y2="468" marker-end="url(#FilledArrow_Marker_2)" stroke="#004080" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="144" y1="306" x2="144" y2="347.1" marker-end="url(#FilledArrow_Marker)" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="198" y1="288" x2="252" y2="288" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="144" y1="396" x2="144" y2="437.1" marker-end="url(#FilledArrow_Marker)" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><rect x="189" y="144" width="243" height="54" fill="white"/><path d="M 432 198 L 189 198 L 189 144 L 432 144 Z" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><text transform="translate(193 150)" fill="#666"><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="19.789062" y="11" textLength="198.75586">The ticket was already reported, was </tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x=".8017578" y="25" textLength="236.73047">already rejected, isn't a bug, doesn't contain </tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="1.2792969" y="39" textLength="232.4414">enough information, or can't be reproduced.</tspan></text><line x1="252" y1="278.5" x2="252" y2="198" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><path d="M 258.36395 281.63605 C 261.87869 285.15076 261.87869 290.84924 258.36395 294.36395 C 254.84924 297.87869 249.15076 297.87869 245.63605 294.36395 C 242.12131 290.84924 242.12131 285.15076 245.63605 281.63605 C 249.15076 278.12131 254.84924 278.12131 258.36395 281.63605" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><rect x="72" y="144" width="99" height="54" fill="white"/><path d="M 171 198 L 72 198 L 72 144 L 171 144 Z" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><text transform="translate(76 150)" fill="#666"><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="8.486328" y="11" textLength="77.36133">The ticket is a </tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="4.4638672" y="25" textLength="85.40625">bug and should </tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="22.81836" y="39" textLength="22.68164">be fi</tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="45.5" y="39" textLength="22.68164">xed.</tspan></text><path d="M 150.36395 317.63605 C 153.87869 321.15076 153.87869 326.84924 150.36395 330.36395 C 146.84924 333.87869 141.15076 333.87869 137.63605 330.36395 C 134.12131 326.84924 134.12131 321.15076 137.63605 317.63605 C 141.15076 314.12131 146.84924 314.12131 150.36395 317.63605" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><path d="M 134.499996 324 L 127.499996 324 L 90 324 L 81 324 L 81 198" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><rect x="72" y="522" width="342" height="36" fill="white"/><path d="M 414 558 L 72 558 L 72 522 L 414 522 Z" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><text transform="translate(76 526)" fill="#666"><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="7.241211" y="11" textLength="322.85156">The ticket has a patch which applies cleanly and includes all </tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="5.9052734" y="25" textLength="127.42383">needed tests and docs. </tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="132.67285" y="25" textLength="8.0039062">A</tspan><tspan font-family="Helvetica" font-size="12" font-style="italic" font-weight="500" fill="#666" x="140.02051" y="25" textLength="188.07422"> core developer can commit it as is.</tspan></text><path d="M 150.36395 407.63605 C 153.87869 411.15076 153.87869 416.84924 150.36395 420.36395 C 146.84924 423.8787 141.15076 423.8787 137.63605 420.36395 C 134.12131 416.84924 134.12131 411.15076 137.63605 407.63605 C 141.15076 404.1213 146.84924 404.1213 150.36395 407.63605" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><path d="M 134.499996 414 L 127.499996 414 L 90 414 L 81 414 L 81 522" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" stroke-dasharray="4,4"/><line x1="252" y1="288" x2="303.79966" y2="317.5998" marker-end="url(#FilledArrow_Marker)" stroke="green" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></g></g></svg>
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 7900dd8cd0..a0649f38a2 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -14,8 +14,9 @@ Journal-World`_ of Lawrence, Kansas, USA.
     programming", and in technical circles as "the guy who invented Django."
 
     He was lead developer at World Online for 2.5 years, during which time
-    Django was developed and implemented on World Online's sites. He's now the
-    leader and founder of EveryBlock_, a "news feed for your block".
+    Django was developed and implemented on World Online's sites. He was the
+    leader and founder of EveryBlock_, a "news feed for your block." He now 
+    develops for Soundslice_.
 
     Adrian lives in Chicago, USA.
 
@@ -40,13 +41,15 @@ Journal-World`_ of Lawrence, Kansas, USA.
 `Wilson Miner`_
     Wilson's design-fu is what makes Django look so nice. He designed the
     Web site you're looking at right now, as well as Django's acclaimed admin
-    interface. Wilson is the designer for EveryBlock_.
+    interface. Wilson was the designer for EveryBlock and Rdio_. He now 
+    designs for Facebook.
 
     Wilson lives in San Francisco, USA.
 
 .. _lawrence journal-world: http://ljworld.com/
 .. _adrian holovaty: http://holovaty.com/
 .. _everyblock: http://everyblock.com/
+.. _soundslice: http://www.soundslice.com/
 .. _simon willison: http://simonwillison.net/
 .. _web-development blog: `simon willison`_
 .. _jacob kaplan-moss: http://jacobian.org/
@@ -85,6 +88,8 @@ Malcolm Tredinnick
     When he's not busy being an International Man of Mystery, Malcolm lives in
     Sydney, Australia.
 
+    *Malcolm passed away on March 17, 2013.*
+
 `Russell Keith-Magee`_
     Russell studied physics as an undergraduate, and studied neural networks for
     his PhD. His first job was with a startup in the defense industry developing
@@ -100,9 +105,9 @@ Malcolm Tredinnick
 .. _russell keith-magee: http://cecinestpasun.com/
 
 Joseph Kocherhans
-    Joseph is currently a developer at EveryBlock_, and previously worked for
-    the Lawrence Journal-World where he built most of the backend for their
-    Marketplace site. He often disappears for several days into the woods,
+    Joseph was the director of lead development at EveryBlock and previously 
+    developed at the Lawrence Journal-World. He is treasurer of the `Django 
+    Software Foundation`_. He often disappears for several days into the woods,
     attempts to teach himself computational linguistics, and annoys his
     neighbors with his Charango_ playing.
 
@@ -113,6 +118,7 @@ Joseph Kocherhans
 
     Joseph lives in Chicago, USA.
 
+.. _django software foundation: https://www.djangoproject.com/foundation/
 .. _charango: http://en.wikipedia.org/wiki/Charango
 
 `Luke Plant`_
@@ -419,6 +425,22 @@ Jeremy Dunck
 
 .. _Preston Holmes: http://www.ptone.com/
 
+`Simon Charette`_
+    Simon is a mathematic student who discovered Django while searching for a
+    replacement framework to an in-house PHP entity. Since that faithful day
+    Django has been a big part of his life. So far, he's been involved in some
+    ORM and forms API fixes.
+
+    Apart from contributing to multiple open source projects he spends most of
+    his spare-time playing `Ultimate Frisbee`_ and working part-time
+    at this awesome place called `Reptiletech`_.
+
+    Simon lives in Montréal, Québec, Canada.
+
+.. _Simon Charette: https://github.com/charettes
+.. _Ultimate Frisbee: http://www.montrealultimate.ca
+.. _Reptiletech: http://www.reptiletech.com
+
 Specialists
 -----------
 
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index 67dda02f8b..bc2f97a485 100644
--- a/docs/internals/contributing/committing-code.txt
+++ b/docs/internals/contributing/committing-code.txt
@@ -116,7 +116,7 @@ Practicality beats purity, so it is up to each committer to decide how much
 history mangling to do for a pull request. The main points are engaging the
 community, getting work done, and having a usable commit history.
 
-.. _committing-guidlines:
+.. _committing-guidelines:
 
 Committing guidelines
 ---------------------
diff --git a/docs/internals/contributing/new-contributors.txt b/docs/internals/contributing/new-contributors.txt
index b752503248..0d4ad0cf3f 100644
--- a/docs/internals/contributing/new-contributors.txt
+++ b/docs/internals/contributing/new-contributors.txt
@@ -140,12 +140,3 @@ FAQ
    Short answer: No. It's always better to get another set of eyes on a
    ticket. If you're having trouble getting that second set of eyes, see
    question 1, above.
-
-3. **My ticket has been in DDN forever! What should I do?**
-
-   Design Decision Needed requires consensus about the right solution.  At the
-   very least it needs consensus among the core developers, and ideally it has
-   consensus from the community as well. The best way to accomplish this is to
-   start a thread on the django-developers mailing list, and for very complex
-   issues to start a wiki page summarizing the problem and the possible
-   solutions.
diff --git a/docs/internals/contributing/triaging-tickets.txt b/docs/internals/contributing/triaging-tickets.txt
index 84f70fd731..bc6148ca46 100644
--- a/docs/internals/contributing/triaging-tickets.txt
+++ b/docs/internals/contributing/triaging-tickets.txt
@@ -50,9 +50,9 @@ attribute easily tells us what and who each ticket is waiting on.
 
 Since a picture is worth a thousand words, let's start there:
 
-.. image:: /internals/_images/djangotickets.png
-   :height: 451
-   :width: 590
+.. image:: /internals/_images/triage_process.*
+   :height: 501
+   :width: 400
    :alt: Django's ticket triage workflow
 
 We've got two roles in this diagram:
@@ -119,7 +119,14 @@ Beyond that there are several considerations:
 * **Accepted + No Flags**
 
   The ticket is valid, but no one has submitted a patch for it yet. Often this
-  means you could safely start writing a patch for it.
+  means you could safely start writing a patch for it. This is generally more
+  true for the case of accepted bugs than accepted features. A ticket for a bug
+  that has been accepted means that the issue has been verified by at least one
+  triager as a legitimate bug - and should probably be fixed if possible. An
+  accepted new feature may only mean that one triager thought the feature would
+  be good to have, but this alone does not represent a consensus view or imply
+  with any certainty that a patch will be accepted for that feature. Seek more
+  feedback before writing an extensive patch if you are in doubt.
 
 * **Accepted + Has Patch**
 
@@ -128,30 +135,13 @@ Beyond that there are several considerations:
   and docs, running the test suite with the included patch, and leaving
   feedback on the ticket.
 
-* **Accepted + Has Patch + (any other flag)**
+* **Accepted + Has Patch + Needs ...**
 
   This means the ticket has been reviewed, and has been found to need further
   work. "Needs tests" and "Needs documentation" are self-explanatory. "Patch
   needs improvement" will generally be accompanied by a comment on the ticket
   explaining what is needed to improve the code.
 
-Design Decision Needed
-~~~~~~~~~~~~~~~~~~~~~~
-
-This stage is for issues which may be contentious, may be backwards
-incompatible, or otherwise involve high-level design decisions. These issues
-should be discussed either in the ticket comments or on `django-developers`_.
-
-If a ticket has been marked as "DDN", decisions are generally eventually
-made by the core committers, however that is not a requirement. See the
-:ref:`New contributors' FAQ<new-contributors-faq>` for "My ticket has been in
-DDN forever! What should I do?"
-
-This stage will often be used for feature requests. It can also be used for
-issues that *might* be bugs, depending on opinion or interpretation. Obvious
-bugs (such as crashes, incorrect query results, or non-compliance with a
-standard) skip this stage and move straight to "Accepted".
-
 Ready For Checkin
 ~~~~~~~~~~~~~~~~~
 
@@ -165,39 +155,54 @@ RFC forever! What should I do?"
 Someday/Maybe
 ~~~~~~~~~~~~~
 
-Generally only used for vague/high-level features or design ideas. These
-tickets are uncommon and overall less useful since they don't describe
+This stage isn't shown on the diagram. It's only used by core developers to
+keep track of high-level ideas or long term feature requests.
+
+These tickets are uncommon and overall less useful since they don't describe
 concrete actionable issues. They are enhancement requests that we might
 consider adding someday to the framework if an excellent patch is submitted.
-These tickets are not a high priority.
+They are not a high priority.
 
 Other triage attributes
 -----------------------
 
 A number of flags, appearing as checkboxes in Trac, can be set on a ticket:
 
-* Has patch
-    This means the ticket has an associated
-    :doc:`patch<writing-code/submitting-patches>`. These will be reviewed
-    to see if the patch is "good".
+Has patch
+~~~~~~~~~
 
-* Needs documentation:
-    This flag is used for tickets with patches that need associated
-    documentation. Complete documentation of features is a prerequisite
-    before we can check them into the codebase.
+This means the ticket has an associated
+:doc:`patch<writing-code/submitting-patches>`. These will be reviewed
+to see if the patch is "good".
 
-* Needs tests
-    This flags the patch as needing associated unit tests. Again, this
-    is a required part of a valid patch.
+Needs documentation
+~~~~~~~~~~~~~~~~~~~
 
-* Patch needs improvement
-    This flag means that although the ticket *has* a patch, it's not quite
-    ready for checkin. This could mean the patch no longer applies
-    cleanly, there is a flaw in the implementation, or that the code
-    doesn't meet our standards.
+This flag is used for tickets with patches that need associated
+documentation. Complete documentation of features is a prerequisite
+before we can check them into the codebase.
 
-* Easy pickings
-    Tickets that would require small, easy, patches.
+Needs tests
+~~~~~~~~~~~
+
+This flags the patch as needing associated unit tests. Again, this
+is a required part of a valid patch.
+
+Patch needs improvement
+~~~~~~~~~~~~~~~~~~~~~~~
+
+This flag means that although the ticket *has* a patch, it's not quite
+ready for checkin. This could mean the patch no longer applies
+cleanly, there is a flaw in the implementation, or that the code
+doesn't meet our standards.
+
+Easy pickings
+~~~~~~~~~~~~~
+
+Tickets that would require small, easy, patches.
+
+Type
+~~~~
 
 Tickets should be categorized by *type* between:
 
@@ -211,19 +216,47 @@ Tickets should be categorized by *type* between:
     For when nothing is broken but something could be made cleaner,
     better, faster, stronger.
 
-Tickets should also be classified into *components* indicating which area of
+Component
+~~~~~~~~~
+
+Tickets should be classified into *components* indicating which area of
 the Django codebase they belong to. This makes tickets better organized and
 easier to find.
 
+Severity
+~~~~~~~~
+
 The *severity* attribute is used to identify blockers, that is, issues which
 should get fixed before releasing the next version of Django. Typically those
 issues are bugs causing regressions from earlier versions or potentially
 causing severe data losses. This attribute is quite rarely used and the vast
 majority of tickets have a severity of "Normal".
 
-Finally, it is possible to use the *version* attribute to indicate in which
+Version
+~~~~~~~
+
+It is possible to use the *version* attribute to indicate in which
 version the reported bug was identified.
 
+UI/UX
+~~~~~
+
+This flag is used for tickets that relate to User Interface and User
+Experiences questions. For example, this flag would be appropriate for
+user-facing features in forms or the admin interface.
+
+Cc
+~~
+
+You may add your username or email address to this field to be notified when
+new contributions are made to the ticket.
+
+Keywords
+~~~~~~~~
+
+With this field you may label a ticket with multiple keywords. This can be
+useful, for example, to group several tickets of a same theme.
+
 .. _closing-tickets:
 
 Closing Tickets
@@ -301,20 +334,23 @@ developers and bring the issue to django-developers_ instead.
 How can I help with triaging?
 -----------------------------
 
-Although the core developers make the big decisions in the ticket triage
-process, there's a lot that general community members can do to help the
-triage process. Really, **ANYONE** can help.
+The triage process is primarily driven by community members. Really,
+**ANYONE** can help.
 
-Start by `creating an account on Trac`_. If you have an account but have
-forgotten your password, you can reset it using the `password reset page`_.
+Core developers may provide feedback on issues they're familiar with, or make
+decisions on controversial ones, but they aren't responsible for triaging
+tickets in general.
+
+To get involved, start by `creating an account on Trac`_. If you have an
+account but have forgotten your password, you can reset it using the `password
+reset page`_.
 
 Then, you can help out by:
 
 * Closing "Unreviewed" tickets as "invalid", "worksforme" or "duplicate."
 
-* Promoting "Unreviewed" tickets to "Design decision needed" if a design
-  decision needs to be made, or "Accepted" in case of obvious bugs or
-  sensible, clearly defined, feature requests.
+* Closing "Unreviewed" tickets as "needsinfo" when they're feature requests
+  requiring a discussion on `django-developers`_.
 
 * Correcting the "Needs tests", "Needs documentation", or "Has patch"
   flags for tickets where they are incorrectly set.
@@ -322,22 +358,18 @@ Then, you can help out by:
 * Setting the "`Easy pickings`_" flag for tickets that are small and
   relatively straightforward.
 
+* Set the *type* of tickets that are still uncategorized.
+
 * Checking that old tickets are still valid. If a ticket hasn't seen
   any activity in a long time, it's possible that the problem has been
   fixed but the ticket hasn't yet been closed.
 
-* Contacting the owners of tickets that have been claimed but have not
-  seen any recent activity. If the owner doesn't respond after a week
-  or so, remove the owner's claim on the ticket.
-
 * Identifying trends and themes in the tickets. If there a lot of bug
   reports about a particular part of Django, it may indicate we should
   consider refactoring that part of the code. If a trend is emerging,
   you should raise it for discussion (referencing the relevant tickets)
   on `django-developers`_.
 
-* Set the *type* of tickets that are still uncategorized.
-
 * Verify if patches submitted by other users are correct. If they do and
   also contain appropriate documentation and tests then move them to the
   "Ready for Checkin" stage. If they don't then leave a comment to explain
diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt
index a699e39bd8..21146600b4 100644
--- a/docs/internals/contributing/writing-code/coding-style.txt
+++ b/docs/internals/contributing/writing-code/coding-style.txt
@@ -136,14 +136,17 @@ Model style
   * ``def get_absolute_url()``
   * Any custom methods
 
-* If ``choices`` is defined for a given model field, define the choices as
-  a tuple of tuples, with an all-uppercase name, either near the top of
-  the model module or just above the model class. Example::
+* If ``choices`` is defined for a given model field, define each choice as
+  a tuple of tuples, with an all-uppercase name as a class attribute on the
+  model. Example::
 
-      DIRECTION_CHOICES = (
-          ('U', 'Up'),
-          ('D', 'Down'),
-      )
+    class MyModel(models.Model):
+        DIRECTION_UP = 'U'
+        DIRECTION_DOWN = 'D'
+        DIRECTION_CHOICES = (
+            (DIRECTION_UP, 'Up'),
+            (DIRECTION_DOWN, 'Down'),
+        )
 
 Use of ``django.conf.settings``
 -------------------------------
@@ -177,9 +180,9 @@ That means that the ability for third parties to import the module at the top
 level is incompatible with the ability to configure the settings object
 manually, or makes it very difficult in some circumstances.
 
-Instead of the above code, a level of laziness or indirection must be used, such
-as :class:`django.utils.functional.LazyObject`,
-:func:`django.utils.functional.lazy` or ``lambda``.
+Instead of the above code, a level of laziness or indirection must be used,
+such as ``django.utils.functional.LazyObject``,
+``django.utils.functional.lazy()`` or ``lambda``.
 
 Miscellaneous
 -------------
diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt
index a90dc32605..ed8aad99b3 100644
--- a/docs/internals/contributing/writing-code/submitting-patches.txt
+++ b/docs/internals/contributing/writing-code/submitting-patches.txt
@@ -176,8 +176,10 @@ Compressing JavaScript
 ~~~~~~~~~~~~~~~~~~~~~~
 
 To simplify the process of providing optimized javascript code, Django
-includes a handy script which should be used to create a "minified" version.
-This script is located at ``django/contrib/admin/static/admin/js/compress.py``.
+includes a handy python script which should be used to create a "minified"
+version. To run it::
+
+    python django/contrib/admin/bin/compress.py
 
 Behind the scenes, ``compress.py`` is a front-end for Google's
 `Closure Compiler`_ which is written in Java. However, the Closure Compiler
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index 4e702ff83e..f56bf1cdeb 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -7,16 +7,14 @@ code base. It's our policy to make sure all tests pass at all times.
 
 The tests cover:
 
-* Models and the database API (``tests/modeltests``),
-* Everything else in core Django code (``tests/regressiontests``),
-* :ref:`contrib-apps` (``django/contrib/<app>/tests`` or
-  ``tests/regressiontests/<app>_...``).
+* Models, the database API and everything else in core Django core (``tests/``),
+* :ref:`contrib-apps` (``django/contrib/<app>/tests`` or ``tests/<app>_...``).
 
 We appreciate any and all contributions to the test suite!
 
 The Django tests all use the testing infrastructure that ships with Django for
-testing applications. See :doc:`Testing Django applications </topics/testing>`
-for an explanation of how to write new tests.
+testing applications. See :doc:`Testing Django applications
+</topics/testing/overview>` for an explanation of how to write new tests.
 
 .. _running-unit-tests:
 
@@ -105,9 +103,9 @@ internationalization, type:
 
     ./runtests.py --settings=path.to.settings generic_relations i18n
 
-How do you find out the names of individual tests? Look in
-``tests/modeltests`` and ``tests/regressiontests`` — each directory name
-there is the name of a test. Contrib app names are also valid test names.
+How do you find out the names of individual tests? Look in ``tests/`` — each
+directory name there is the name of a test. Contrib app names are also valid
+test names.
 
 If you just want to run a particular class of tests, you can specify a list of
 paths to individual test classes. For example, to run the ``TranslationTests``
@@ -128,13 +126,13 @@ Running the Selenium tests
 
 Some admin tests require Selenium 2, Firefox and Python >= 2.6 to work via a
 real Web browser. To allow those tests to run and not be skipped, you must
-install the selenium_ package (version > 2.13) into your Python path.
-
-Then, run the tests normally, for example:
+install the selenium_ package (version > 2.13) into your Python path and run
+the tests with the ``--selenium`` option:
 
 .. code-block:: bash
 
-    ./runtests.py --settings=test_sqlite admin_inlines
+    ./runtests.py --settings=test_sqlite --selenium admin_inlines
+
 
 .. _running-unit-tests-dependencies:
 
@@ -145,9 +143,6 @@ If you want to run the full suite of tests, you'll need to install a number of
 dependencies:
 
 *  PyYAML_
-*  Markdown_
-*  Textile_
-*  Docutils_
 *  setuptools_
 *  memcached_, plus a :ref:`supported Python binding <memcached>`
 *  gettext_ (:ref:`gettext_on_windows`)
@@ -160,9 +155,6 @@ Each of these dependencies is optional. If you're missing any of them, the
 associated tests will be skipped.
 
 .. _PyYAML: http://pyyaml.org/wiki/PyYAML
-.. _Markdown: http://pypi.python.org/pypi/Markdown/1.7
-.. _Textile: http://pypi.python.org/pypi/textile
-.. _docutils: http://pypi.python.org/pypi/docutils/0.4
 .. _setuptools: http://pypi.python.org/pypi/setuptools/
 .. _memcached: http://memcached.org/
 .. _gettext: http://www.gnu.org/software/gettext/manual/gettext.html
@@ -200,7 +192,7 @@ multiple modules by using a ``tests`` directory in the normal Python way.
 For the tests to be found, a ``models.py`` file must exist, even if it's empty.
 If you have URLs that need to be mapped, put them in ``tests/urls.py``.
 
-To run tests for just one contrib app (e.g. ``markup``), use the same
+To run tests for just one contrib app (e.g. ``auth``), use the same
 method as above::
 
-    ./runtests.py --settings=settings markup
+    ./runtests.py --settings=settings auth
diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt
index d4a95ae45a..dcfdd9e85b 100644
--- a/docs/internals/contributing/writing-code/working-with-git.txt
+++ b/docs/internals/contributing/writing-code/working-with-git.txt
@@ -81,7 +81,7 @@ commit them::
     git commit
 
 When writing the commit message, follow the :ref:`commit message
-guidelines <committing-guidlines>` to ease the work of the committer. If
+guidelines <committing-guidelines>` to ease the work of the committer. If
 you're uncomfortable with English, try at least to describe precisely what the
 commit does.
 
@@ -121,7 +121,7 @@ a pull request at GitHub. A good pull request means:
 
 * well-formed messages for each commit: a summary line and then paragraphs
   wrapped at 72 characters thereafter -- see the :ref:`committing guidelines
-  <committing-guidlines>` for more details,
+  <committing-guidelines>` for more details,
 
 * documentation and tests, if needed -- actually tests are always needed,
   except for documentation changes.
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 414da30ff8..1533e25dc8 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -14,13 +14,13 @@ See the :doc:`Django 1.2 release notes</releases/1.2>` for more details on
 these changes.
 
 * ``CsrfResponseMiddleware`` and ``CsrfMiddleware`` will be removed.  Use
-  the {% csrf_token %} template tag inside forms to enable CSRF
+  the ``{% csrf_token %}`` template tag inside forms to enable CSRF
   protection. ``CsrfViewMiddleware`` remains and is enabled by default.
 
 * The old imports for CSRF functionality (``django.contrib.csrf.*``),
   which moved to core in 1.2, will be removed.
 
-* The :mod:`django.contrib.gis.db.backend` module will be removed in favor
+* The ``django.contrib.gis.db.backend`` module will be removed in favor
   of the specific backends.
 
 * ``SMTPConnection`` will be removed in favor of a generic Email backend API.
@@ -111,7 +111,7 @@ See the :doc:`Django 1.3 release notes</releases/1.3>` for more details on
 these changes.
 
 * Starting Django without a :setting:`SECRET_KEY` will result in an exception
-  rather than a `DeprecationWarning`. (This is accelerated from the usual
+  rather than a ``DeprecationWarning``. (This is accelerated from the usual
   deprecation path; see the :doc:`Django 1.4 release notes</releases/1.4>`.)
 
 * The ``mod_python`` request handler will be removed. The ``mod_wsgi``
@@ -122,23 +122,23 @@ these changes.
   The :attr:`~django.test.client.Response.templates` attribute should be
   used instead.
 
-* The :class:`~django.test.simple.DjangoTestRunner` will be removed.
+* The ``django.test.simple.DjangoTestRunner`` will be removed.
   Instead use a unittest-native class.  The features of the
-  :class:`django.test.simple.DjangoTestRunner` (including fail-fast and
+  ``django.test.simple.DjangoTestRunner`` (including fail-fast and
   Ctrl-C test termination) can currently be provided by the unittest-native
-  :class:`TextTestRunner`.
+  :class:`~unittest.TextTestRunner`.
 
 * The undocumented function
-  :func:`django.contrib.formtools.utils.security_hash` will be removed,
-  instead use :func:`django.contrib.formtools.utils.form_hmac`
+  ``django.contrib.formtools.utils.security_hash`` will be removed,
+  instead use ``django.contrib.formtools.utils.form_hmac``
 
 * The function-based generic view modules will be removed in favor of their
   class-based equivalents, outlined :doc:`here
   </topics/class-based-views/index>`.
 
-* The :class:`~django.core.servers.basehttp.AdminMediaHandler` will be
+* The ``django.core.servers.basehttp.AdminMediaHandler`` will be
   removed.  In its place use
-  :class:`~django.contrib.staticfiles.handlers.StaticFilesHandler`.
+  ``django.contrib.staticfiles.handlers.StaticFilesHandler``.
 
 * The template tags library ``adminmedia`` and the template tag ``{%
   admin_media_prefix %}`` will be removed in favor of the generic static files
@@ -150,8 +150,7 @@ these changes.
   an implied string. In 1.4, this behavior is provided by a version of the tag
   in the ``future`` template tag library.
 
-* The :djadmin:`reset` and :djadmin:`sqlreset` management commands
-  will be removed.
+* The ``reset`` and ``sqlreset`` management commands will be removed.
 
 * Authentication backends will need to support an inactive user
   being passed to all methods dealing with permissions.
@@ -162,15 +161,14 @@ these changes.
   a :class:`~django.contrib.gis.geos.GEOSException` when called
   on a geometry with no SRID value.
 
-* :class:`~django.http.CompatCookie` will be removed in favor of
-  :class:`~django.http.SimpleCookie`.
+* ``django.http.CompatCookie`` will be removed in favor of
+  ``django.http.SimpleCookie``.
 
-* :class:`django.core.context_processors.PermWrapper` and
-  :class:`django.core.context_processors.PermLookupDict` will be removed in
+* ``django.core.context_processors.PermWrapper`` and
+  ``django.core.context_processors.PermLookupDict`` will be removed in
   favor of the corresponding
-  :class:`django.contrib.auth.context_processors.PermWrapper` and
-  :class:`django.contrib.auth.context_processors.PermLookupDict`,
-  respectively.
+  ``django.contrib.auth.context_processors.PermWrapper`` and
+  ``django.contrib.auth.context_processors.PermLookupDict``, respectively.
 
 * The :setting:`MEDIA_URL` or :setting:`STATIC_URL` settings will be
   required to end with a trailing slash to ensure there is a consistent
@@ -200,30 +198,37 @@ these changes.
 See the :doc:`Django 1.4 release notes</releases/1.4>` for more details on
 these changes.
 
+* ``django.contrib.databrowse`` will be removed.
+
+* ``django.contrib.localflavor`` will be removed following an accelerated
+  deprecation.
+
+* ``django.contrib.markup`` will be removed following an accelerated
+  deprecation.
+
 * The compatibility modules ``django.utils.copycompat`` and
   ``django.utils.hashcompat`` as well as the functions
   ``django.utils.itercompat.all`` and ``django.utils.itercompat.any`` will
   be removed. The Python builtin versions should be used instead.
 
-* The :func:`~django.views.decorators.csrf.csrf_response_exempt` and
-  :func:`~django.views.decorators.csrf.csrf_view_exempt` decorators will
+* The ``csrf_response_exempt`` and ``csrf_view_exempt`` decorators will
   be removed. Since 1.4 ``csrf_response_exempt`` has been a no-op (it
   returns the same function), and ``csrf_view_exempt`` has been a
   synonym for ``django.views.decorators.csrf.csrf_exempt``, which should
   be used to replace it.
 
-* The :class:`~django.core.cache.backends.memcached.CacheClass` backend
+* The ``django.core.cache.backends.memcached.CacheClass`` backend
   was split into two in Django 1.3 in order to introduce support for
-  PyLibMC. The historical :class:`~django.core.cache.backends.memcached.CacheClass`
-  will be removed in favor of :class:`~django.core.cache.backends.memcached.MemcachedCache`.
+  PyLibMC. The historical ``CacheClass`` will be removed in favor of
+  ``django.core.cache.backends.memcached.MemcachedCache``.
 
 * The UK-prefixed objects of ``django.contrib.localflavor.uk`` will only
   be accessible through their GB-prefixed names (GB is the correct
   ISO 3166 code for United Kingdom).
 
-* The :setting:`IGNORABLE_404_STARTS` and :setting:`IGNORABLE_404_ENDS`
-  settings have been superseded by :setting:`IGNORABLE_404_URLS` in
-  the 1.4 release. They will be removed.
+* The ``IGNORABLE_404_STARTS`` and ``IGNORABLE_404_ENDS`` settings have been
+  superseded by :setting:`IGNORABLE_404_URLS` in the 1.4 release. They will be
+  removed.
 
 * The :doc:`form wizard </ref/contrib/formtools/form-wizard>` has been
   refactored to use class-based views with pluggable backends in 1.4.
@@ -237,8 +242,8 @@ these changes.
   :setting:`LOGGING` setting should include this filter explicitly if
   it is desired.
 
-* The builtin truncation functions :func:`django.utils.text.truncate_words`
-  and :func:`django.utils.text.truncate_html_words` will be removed in
+* The builtin truncation functions ``django.utils.text.truncate_words()``
+  and ``django.utils.text.truncate_html_words()`` will be removed in
   favor of the ``django.utils.text.Truncator`` class.
 
 * The :class:`~django.contrib.gis.geoip.GeoIP` class was moved to
@@ -251,11 +256,8 @@ these changes.
   :data:`~django.conf.urls.handler500`, are now available through
   :mod:`django.conf.urls` .
 
-* The Databrowse contrib module will be removed.
-
-* The functions :func:`~django.core.management.setup_environ` and
-  :func:`~django.core.management.execute_manager` will be removed from
-  :mod:`django.core.management`. This also means that the old (pre-1.4)
+* The functions ``setup_environ()`` and ``execute_manager()`` will be removed
+  from :mod:`django.core.management`. This also means that the old (pre-1.4)
   style of :file:`manage.py` file will no longer work.
 
 * Setting the ``is_safe`` and ``needs_autoescape`` flags as attributes of
@@ -265,8 +267,11 @@ these changes.
   in 1.4. The backward compatibility will be removed --
   ``HttpRequest.raw_post_data`` will no longer work.
 
-* ``django.contrib.markup`` will be removed following an accelerated
-  deprecation.
+* The value for the ``post_url_continue`` parameter in
+  ``ModelAdmin.response_add()`` will have to be either ``None`` (to redirect
+  to the newly created object's edit page) or a pre-formatted url. String
+  formats, such as the previous default ``'../%s/'``, will not be accepted any
+  more.
 
 1.7
 ---
@@ -284,8 +289,14 @@ these changes.
   specified as a plain string instead of a tuple will be removed and raise an
   exception.
 
-* The ``mimetype`` argument to :class:`~django.http.HttpResponse` ``__init__``
-  will be removed (``content_type`` should be used instead).
+* The ``mimetype`` argument to the ``__init__`` methods of
+  :class:`~django.http.HttpResponse`,
+  :class:`~django.template.response.SimpleTemplateResponse`, and
+  :class:`~django.template.response.TemplateResponse`, will be removed.
+  ``content_type`` should be used instead. This also applies to the
+  :func:`~django.shortcuts.render_to_response` shortcut and
+  the sitemamp views, :func:`~django.contrib.sitemaps.views.index` and
+  :func:`~django.contrib.sitemaps.views.sitemap`.
 
 * When :class:`~django.http.HttpResponse` is instantiated with an iterator,
   or when :attr:`~django.http.HttpResponse.content` is set to an iterator,
@@ -302,6 +313,68 @@ these changes.
 * The ``depth`` keyword argument will be removed from
   :meth:`~django.db.models.query.QuerySet.select_related`.
 
+* The undocumented ``get_warnings_state()``/``restore_warnings_state()``
+  functions from :mod:`django.test.utils` and the ``save_warnings_state()``/
+  ``restore_warnings_state()``
+  :ref:`django.test.*TestCase <django-testcase-subclasses>` methods are
+  deprecated. Use the :class:`warnings.catch_warnings` context manager
+  available starting with Python 2.6 instead.
+
+* The undocumented ``check_for_test_cookie`` method in
+  :class:`~django.contrib.auth.forms.AuthenticationForm` will be removed
+  following an accelerated deprecation. Users subclassing this form should
+  remove calls to this method, and instead ensure that their auth related views
+  are CSRF protected, which ensures that cookies are enabled.
+
+1.8
+---
+
+* ``django.contrib.comments`` will be removed.
+
+* The following transaction management APIs will be removed:
+
+  - ``TransactionMiddleware``,
+  - the decorators and context managers ``autocommit``, ``commit_on_success``,
+    and ``commit_manually``, defined in ``django.db.transaction``,
+  - the functions ``commit_unless_managed`` and ``rollback_unless_managed``,
+    also defined in ``django.db.transaction``,
+  - the ``TRANSACTIONS_MANAGED`` setting.
+
+  Upgrade paths are described in the :ref:`transaction management docs
+  <transactions-upgrading-from-1.5>`.
+
+* The :ttag:`cycle` and :ttag:`firstof` template tags will auto-escape their
+  arguments. In 1.6 and 1.7, this behavior is provided by the version of these
+  tags in the ``future`` template tag library.
+
+* The ``SEND_BROKEN_LINK_EMAILS`` setting will be removed. Add the
+  :class:`django.middleware.common.BrokenLinkEmailsMiddleware` middleware to
+  your :setting:`MIDDLEWARE_CLASSES` setting instead.
+
+* ``Model._meta.module_name`` was renamed to ``model_name``.
+
+* Remove the backward compatible shims introduced to rename ``get_query_set``
+  and similar queryset methods. This affects the following classes:
+  ``BaseModelAdmin``, ``ChangeList``, ``BaseCommentNode``,
+  ``GenericForeignKey``, ``Manager``, ``SingleRelatedObjectDescriptor`` and
+  ``ReverseSingleRelatedObjectDescriptor``.
+
+* Remove the backward compatible shims introduced to rename the attributes
+  ``ChangeList.root_query_set`` and ``ChangeList.query_set``.
+
+* ``django.conf.urls.shortcut`` and ``django.views.defaults.shortcut`` will be
+  removed.
+
+* The following private APIs will be removed:
+
+  - ``django.db.close_connection()``
+  - ``django.db.backends.creation.BaseDatabaseCreation.set_autocommit()``
+  - ``django.db.transaction.is_managed()``
+  - ``django.db.transaction.managed()``
+
+* ``django.forms.widgets.RadioInput`` will be removed in favor of
+  ``django.forms.widgets.RadioChoiceInput``.
+
 2.0
 ---
 
diff --git a/docs/internals/git.txt b/docs/internals/git.txt
index 948f9a1f7e..2b1a279d89 100644
--- a/docs/internals/git.txt
+++ b/docs/internals/git.txt
@@ -134,7 +134,7 @@ part of Django itself, and so are no longer separately maintained:
   of Django since the 0.95 release.
 
 * ``multi-auth``: A refactoring of :doc:`Django's bundled
-  authentication framework </topics/auth>` which added support for
+  authentication framework </topics/auth/index>` which added support for
   :ref:`authentication backends <authentication-backends>`. This has
   been part of Django since the 0.95 release.
 
diff --git a/docs/internals/howto-release-django.txt b/docs/internals/howto-release-django.txt
new file mode 100644
index 0000000000..a49251da76
--- /dev/null
+++ b/docs/internals/howto-release-django.txt
@@ -0,0 +1,320 @@
+=====================
+How is Django Formed?
+=====================
+
+This document explains how to release Django. If you're unlucky enough to
+be driving a release, you should follow these instructions to get the
+package out.
+
+**Please, keep these instructions up-to-date if you make changes!** The point
+here is to be descriptive, not proscriptive, so feel free to streamline or
+otherwise make changes, but **update this document accordingly!**
+
+Overview
+========
+
+There are three types of releases that you might need to make
+
+* Security releases, disclosing and fixing a vulnerability. This'll
+  generally involve two or three simultaneous releases -- e.g.
+  1.5.x, 1.6.x, and, depending on timing, perhaps a 1.7 alpha/beta/rc.
+
+* Regular version releases, either a final release (e.g. 1.5) or a
+  bugfix update (e.g. 1.5.1).
+
+* Pre-releases, e.g. 1.6 beta or something.
+
+In general the steps are about the same regardless, but there are a few
+differences noted. The short version is:
+
+#. If this is a security release, pre-notify the security distribution list
+   at least one week before the actual release.
+
+#. Proofread (and create if needed) the release notes, looking for
+   organization, writing errors, deprecation timelines, etc. Draft a blog post
+   and email announcement.
+
+#. Update version numbers and create the release package(s)!
+
+#. Upload the package(s) to the ``djangoproject.com`` server.
+
+#. Unless this is a pre-release, add the new version(s) to PyPI.
+
+#. Declare the new version in the admin on ``djangoproject.com``.
+
+#. Post the blog entry and send out the email announcements.
+
+#. Update version numbers post-release.
+
+There are a lot of details, so please read on.
+
+Prerequisites
+=============
+
+You'll need a few things hooked up to make this work:
+
+* A GPG key recorded as an acceptable releaser in the `Django releasers`__
+  document. (If this key is not your default signing key, you'll need to add
+  ``-u you@example.com`` to every GPG signing command below, where
+  ``you@example.com`` is the email address associated with the key you want to
+  use.)
+
+* Access to Django's record on PyPI.
+
+* Access to the ``djangoproject.com`` server to upload files and trigger a
+  deploy.
+
+* Access to the admin on ``djangoproject.com`` as a "Site maintainer".
+
+* Access to post to ``django-announce``.
+
+* If this is a security release, access to the pre-notification distribution
+  list.
+
+If this is your first release, you'll need to coordinate with James and/or
+Jacob to get all these things lined up.
+
+__ https://www.djangoproject.com/m/pgp/django-releasers.txt
+
+Pre-release tasks
+=================
+
+A few items need to be taken care of before even beginning the release process.
+This stuff starts about a week before the release; most of it can be done
+any time leading up to the actual release:
+
+#. If this is a security release, send out pre-notification **one week**
+   before the release. We maintain a list of who gets these pre-notification
+   emails at *FIXME WHERE?*. This email should be signed by the key you'll use
+   for the release, and should include patches for each issue being fixed.
+
+#. As the release approaches, watch Trac to make sure no release blockers
+   are left for the upcoming release.
+
+#. Check with the other committers to make sure they don't have any
+   un-committed changes for the release.
+
+#. Proofread the release notes, including looking at the online
+   version to catch any broken links or reST errors, and make sure the
+   release notes contain the correct date.
+
+#. Double-check that the release notes mention deprecation timelines
+   for any APIs noted as deprecated, and that they mention any changes
+   in Python version support.
+
+#. Double-check that the release notes index has a link to the notes
+   for the new release; this will be in ``docs/releases/index.txt``.
+
+Preparing for release
+=====================
+
+Write the announcement blog post for the release. You can enter it into the
+admin at any time and mark it as inactive. Here are a few examples: `example
+security release announcement`__, `example regular release announcement`__,
+`example pre-release announcement`__.
+
+__ https://www.djangoproject.com/weblog/2013/feb/19/security/
+__ https://www.djangoproject.com/weblog/2012/mar/23/14/
+__ https://www.djangoproject.com/weblog/2012/nov/27/15-beta-1/
+
+Actually rolling the release
+============================
+
+OK, this is the fun part, where we actually push out a release!
+
+#. Check `Jenkins`__ is green for the version(s) you're putting out. You
+   probably shouldn't issue a release until it's green.
+
+   __ http://ci.djangoproject.com
+
+#. A release always begins from a release branch, so you should make sure
+   you're on a stable branch and up-to-date. For example::
+
+        git checkout stable/1.5.x
+        git pull
+
+#. If this is a security release, merge the appropriate patches from
+   ``django-private``. Rebase these patches as necessary to make each one a
+   simple commit on the release branch rather than a merge commit. To ensure
+   this, merge them with the ``--ff-only`` flag; for example::
+
+        git checkout stable/1.5.x
+        git merge --ff-only security/1.5.x
+
+   (This assumes ``security/1.5.x`` is a branch in the ``django-private`` repo
+   containing the necessary security patches for the next release in the 1.5
+   series.)
+
+   If git refuses to merge with ``--ff-only``, switch to the security-patch
+   branch and rebase it on the branch you are about to merge it into (``git
+   checkout security/1.5.x; git rebase stable/1.5.x``) and then switch back and
+   do the merge. Make sure the commit message for each security fix explains
+   that the commit is a security fix and that an announcement will follow
+   (`example security commit`__)
+
+   __ https://github.com/django/django/commit/3ef4bbf495cc6c061789132e3d50a8231a89406b
+
+#. Update version numbers for the release. This has to happen in three
+   places: ``django/__init__.py``, ``docs/conf.py``, and ``setup.py``.
+   Please see `notes on setting the VERSION tuple`_ below for details
+   on ``VERSION``. Here's `an example commit updating version numbers`__
+
+   __ https://github.com/django/django/commit/18d920ea4839fb54f9d2a5dcb555b6a5666ee469
+
+#. If this is a pre-release package, update the "Development Status" trove
+   classifier in ``setup.py`` to reflect this. Otherwise, make sure the
+   classifier is set to ``Development Status :: 5 - Production/Stable``.
+
+#. Tag the release using ``git tag``. For example::
+
+        git tag --sign --message="Django 1.5.1" 1.5.1
+
+   You can check your work by running ``git tag --verify <tag>``.
+
+#. Push your work, including the tag: ``git push --tags``.
+
+#. Make sure you have an absolutely clean tree by running ``git clean -dfx``.
+
+#. Run ``python setup.py sdist`` to generate the release package. This will
+   create the release package in a ``dist/`` directory.
+
+#. Generate the hashes of the release package::
+
+        $ md5sum dist/Django-<version>.tar.gz
+        $ sha1sum dist/Django-<version>.tar.gz
+
+   *FIXME: perhaps we should switch to sha256?*
+
+#. Create a "checksums" file containing the hashes and release information.
+   You can start with `a previous checksums file`__ and replace the
+   dates, keys, links, and checksums. *FIXME: make a template file.*
+
+   __ https://www.djangoproject.com/m/pgp/Django-1.5b1.checksum.txt
+
+#. Sign the checksum file (``gpg --clearsign
+   Django-<version>.checksum.txt``). This generates a signed document,
+   ``Django-<version>.checksum.txt.asc`` which you can then verify using ``gpg
+   --verify Django-<version>.checksum.txt.asc``.
+
+If you're issuing multiple releases, repeat these steps for each release.
+
+Making the release(s) available to the public
+=============================================
+
+Now you're ready to actually put the release out there. To do this:
+
+#. Upload the release package(s) to the djangoproject server; releases go
+   in ``/home/www/djangoproject.com/src/media/releases``, under a
+   directory for the appropriate version number (e.g.
+   ``/home/www/djangoproject.com/src/media/releases/1.5`` for a ``1.5.x``
+   release.).
+
+#. Upload the checksum file(s); these go in
+   ``/home/www/djangoproject.com/src/media/pgp``.
+
+#. Test that the release packages install correctly using ``easy_install``
+   and ``pip``. Here's one method (which requires `virtualenvwrapper`__)::
+
+        $ mktmpenv
+        $ easy_install https://www.djangoproject.com/m/releases/1.5/Django-1.5.1.tar.gz
+        $ deactivate
+        $ mktmpenv
+        $ pip install https://www.djangoproject.com/m/releases/1.5/Django-1.5.1.tar.gz
+        $ deactivate
+
+   This just tests that the tarballs are available (i.e. redirects are up) and
+   that they install correctly, but it'll catch silly mistakes.
+
+   __ https://pypi.python.org/pypi/virtualenvwrapper
+
+#. Ask a few people on IRC to verify the checksums by visiting the checksums
+   file (e.g. https://www.djangoproject.com/m/pgp/Django-1.5b1.checksum.txt)
+   and following the instructions in it. For bonus points, they can also unpack
+   the downloaded release tarball and verify that its contents appear to be
+   correct (proper version numbers, no stray ``.pyc`` or other undesirable
+   files).
+
+#. If this is a release that should land on PyPI (i.e. anything except for
+   a pre-release), register the new package with PyPI by running
+   ``python setup.py register``.
+
+#. Upload the sdist you generated a few steps back through the PyPI web
+   interface. You'll log into PyPI, click "Django" in the right sidebar,
+   find the release you just registered, and click "files" to upload the
+   sdist.
+
+   .. note::
+
+        Why can't we just use ``setup.py sdist upload``? Well, if we do it above
+        that pushes the sdist to PyPI before we've had a chance to sign, review
+        and test it. And we can't just ``setup.py upload`` without ``sdist``
+        because ``setup.py`` prevents that. Nor can we ``sdist upload`` because
+        that would generate a *new* sdist that might not match the file we just
+        signed. Finally, uploading through the web interface is somewhat more
+        secure: it sends the file over HTTPS.
+
+#. Go to the `Add release page in the admin`__, enter the new release number
+   exactly as it appears in the name of the tarball (Django-<version>.tar.gz).
+   So for example enter "1.5.1" or "1.4-rc-2", etc.
+
+   __ https://www.djangoproject.com/admin/releases/release/add/
+
+#. Make the blog post announcing the release live.
+
+#. For a new version release (e.g. 1.5, 1.6), update the default stable version
+   of the docs by flipping the ``is_default`` flag to ``True`` on the
+   appropriate ``DocumentRelease`` object in the ``docs.djangoproject.com``
+   database (this will automatically flip it to ``False`` for all
+   others). *FIXME: I had to do this via fab managepy:shell,docs but we should
+   probably make it possible to do via the admin.*
+
+#. Post the release announcement to the django-announce,
+   django-developers and django-users mailing lists. This should
+   include links to the announcement blog post and the release notes.
+
+Post-release
+============
+
+You're almost done! All that's left to do now is:
+
+#. Update the ``VERSION`` tuple in ``django/__init__.py`` again,
+   incrementing to whatever the next expected release will be. For
+   example, after releasing 1.5.1, update ``VERSION`` to
+   ``VERSION = (1, 5, 2, 'alpha', 0)``.
+
+#. For the first alpha release of a new version (when we create the
+   ``stable/1.?.x`` git branch), you'll want to create a new
+   ``DocumentRelease`` object in the ``docs.djangoproject.com`` database for
+   the new version's docs, and update the ``docs/fixtures/doc_releases.json``
+   JSON fixture. *FIXME: what is the purpose of maintaining this fixture?*
+
+#. Add the release in `Trac's versions list`_ if necessary. Not all versions
+   are declared; take example on previous releases.
+
+.. _Trac's versions list: https://code.djangoproject.com/admin/ticket/versions
+
+Notes on setting the VERSION tuple
+==================================
+
+Django's version reporting is controlled by the ``VERSION`` tuple in
+``django/__init__.py``. This is a five-element tuple, whose elements
+are:
+
+#. Major version.
+#. Minor version.
+#. Micro version.
+#. Status -- can be one of "alpha", "beta", "rc" or "final".
+#. Series number, for alpha/beta/RC packages which run in sequence
+   (allowing, for example, "beta 1", "beta 2", etc.).
+
+For a final release, the status is always "final" and the series
+number is always 0. A series number of 0 with an "alpha" status will
+be reported as "pre-alpha".
+
+Some examples:
+
+* ``(1, 2, 1, 'final', 0)`` --> "1.2.1"
+
+* ``(1, 3, 0, 'alpha', 0)`` --> "1.3 pre-alpha"
+
+* ``(1, 3, 0, 'beta', 2)`` --> "1.3 beta 2"
diff --git a/docs/internals/index.txt b/docs/internals/index.txt
index 3ff4eb62d0..9a80a90286 100644
--- a/docs/internals/index.txt
+++ b/docs/internals/index.txt
@@ -22,3 +22,4 @@ the hood".
    release-process
    deprecation
    git
+   howto-release-django
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
index 8affddb5e0..29ce3914b4 100644
--- a/docs/internals/release-process.txt
+++ b/docs/internals/release-process.txt
@@ -13,12 +13,12 @@ Since version 1.0, Django's release numbering works as follows:
 
 * ``A`` is the *major version* number, which is only incremented for major
   changes to Django, and these changes are not necessarily
-  backwards-compatible. That is, code you wrote for Django 1.2 may break
+  backwards-compatible. That is, code you wrote for Django 1.6 may break
   when we release Django 2.0.
 
 * ``B`` is the *minor version* number, which is incremented for large yet
-  backwards compatible changes.  Code written for Django 1.2 will continue
-  to work under Django 1.3. Exceptions to this rule will be listed in the
+  backwards compatible changes.  Code written for Django 1.6 will continue
+  to work under Django 1.7. Exceptions to this rule will be listed in the
   release notes.
 
 * ``C`` is the *micro version* number, which is incremented for bug and
@@ -27,67 +27,62 @@ Since version 1.0, Django's release numbering works as follows:
   can't be fixed without breaking backwards-compatibility. If this happens,
   the release notes will provide detailed upgrade instructions.
 
-* In some cases, we'll make alpha, beta, or release candidate releases.
-  These are of the form ``A.B alpha/beta/rc N``, which means the ``Nth``
-  alpha/beta/release candidate of version ``A.B``.
+* Before a new minor release, we'll make alpha, beta, and release candidate
+  releases. These are of the form ``A.B alpha/beta/rc N``, which means the
+  ``Nth`` alpha/beta/release candidate of version ``A.B``.
 
-In git, each Django release will have a tag indicating its version
-number, signed with the Django release key. Additionally, each release
-series (X.Y) has its own branch, and bugfix/security releases will be
+In git, each Django release will have a tag indicating its version number,
+signed with the Django release key. Additionally, each release series has its
+own branch, called ``stable/A.B.x``, and bugfix/security releases will be
 issued from those branches.
 
-For more information about how the Django project issues new releases
-for security purposes, please see :doc:`our security policies
-<security>`.
+For more information about how the Django project issues new releases for
+security purposes, please see :doc:`our security policies <security>`.
 
 Major releases
 --------------
 
 Major releases (1.0, 2.0, etc.) will happen very infrequently (think "years",
-not "months"), and will probably represent major, sweeping changes to Django.
+not "months"), and may represent major, sweeping changes to Django.
 
 Minor releases
 --------------
 
-Minor release (1.1, 1.2, etc.) will happen roughly every nine months -- see
-`release process`_, below for details.
+Minor release (1.5, 1.6, etc.) will happen roughly every nine months -- see
+`release process`_, below for details. These releases will contain new
+features, improvements to existing features, and such.
 
 .. _internal-release-deprecation-policy:
 
-These releases will contain new features, improvements to existing features, and
-such. A minor release may deprecate certain features from previous releases. If a
-feature in version ``A.B`` is deprecated, it will continue to work in version
-``A.B+1``. In version ``A.B+2``, use of the feature will raise a
-``DeprecationWarning`` but will continue to work. Version ``A.B+3`` will
-remove the feature entirely.
+A minor release may deprecate certain features from previous releases. If a
+feature is deprecated in version ``A.B``, it will continue to work in versions
+``A.B`` and  ``A.B+1`` but raise warnings. It will be removed in version
+``A.B+2``.
 
-So, for example, if we decided to remove a function that existed in Django 1.0:
+So, for example, if we decided to start the deprecation of a function in
+Django 1.5:
 
-* Django 1.1 will contain a backwards-compatible replica of the function
-  which will raise a ``PendingDeprecationWarning``. This warning is silent
-  by default; you need to explicitly turn on display of these warnings.
+* Django 1.5 will contain a backwards-compatible replica of the function which
+  will raise a ``PendingDeprecationWarning``. This warning is silent by
+  default; you can turn on display of these warnings with the ``-Wd`` option
+  of Python.
 
-* Django 1.2 will contain the backwards-compatible replica, but the warning
+* Django 1.6 will contain the backwards-compatible replica, but the warning
   will be promoted to a full-fledged ``DeprecationWarning``. This warning is
   *loud* by default, and will likely be quite annoying.
 
-* Django 1.3 will remove the feature outright.
+* Django 1.7 will remove the feature outright.
 
 Micro releases
 --------------
 
-Micro releases (1.0.1, 1.0.2, 1.1.1, etc.) will be issued at least once half-way
-between minor releases, and probably more often as needed.
+Micro releases (1.5.1, 1.6.2, 1.6.1, etc.) will be issued as needed, often to
+fix security issues.
 
 These releases will be 100% compatible with the associated minor release, unless
 this is impossible for security reasons. So the answer to "should I upgrade to
 the latest micro release?" will always be "yes."
 
-Each minor release of Django will have a "release maintainer" appointed. This
-person will be responsible for making sure that bug fixes are applied to both
-trunk and the maintained micro-release branch. This person will also work with
-the release manager to decide when to release the micro releases.
-
 .. _backwards-compatibility-policy:
 
 Supported versions
@@ -96,10 +91,10 @@ Supported versions
 At any moment in time, Django's developer team will support a set of releases to
 varying levels:
 
-* The current development trunk will get new features and bug fixes
+* The current development master will get new features and bug fixes
   requiring major refactoring.
 
-* Patches applied to the trunk will also be applied to the last minor
+* Patches applied to the master branch must also be applied to the last minor
   release, to be released as the next micro release, when they fix critical
   problems:
 
@@ -111,40 +106,42 @@ varying levels:
 
   * Major functionality bugs in newly-introduced features.
 
-  The rule of thumb is that fixes will be backported to the last minor
-  release for bugs that would have prevented a release in the first place.
+  The rule of thumb is that fixes will be backported to the last minor release
+  for bugs that would have prevented a release in the first place (release
+  blockers).
 
-* Security fixes will be applied to the current trunk and the previous two
+* Security fixes will be applied to the current master and the previous two
   minor releases.
 
+* Committers may choose to backport bugfixes at their own discretion,
+  provided they do not introduce backwards incompatibilities.
+
 * Documentation fixes generally will be more freely backported to the last
-  release branch, at the discretion of the committer, and they don't need to
-  meet the "critical fixes only" bar. That's because it's highly advantageous
-  to have the docs for the last release be up-to-date and correct, and the
-  downside of backporting (risk of introducing regressions) is much less of a
-  concern.
+  release branch. That's because it's highly advantageous to have the docs for
+  the last release be up-to-date and correct, and the risk of introducing
+  regressions is much less of a concern.
 
 As a concrete example, consider a moment in time halfway between the release of
-Django 1.3 and 1.4. At this point in time:
+Django 1.6 and 1.7. At this point in time:
 
-* Features will be added to development trunk, to be released as Django 1.4.
+* Features will be added to development master, to be released as Django 1.7.
 
-* Critical bug fixes will be applied to a ``1.3.X`` branch, and released as
-  1.3.1, 1.3.2, etc.
+* Critical bug fixes will be applied to the ``stable/1.6.X`` branch, and
+  released as 1.6.1, 1.6.2, etc.
 
-* Security fixes will be applied to trunk, a ``1.3.X`` branch and a
-  ``1.2.X`` branch. They will trigger the release of ``1.3.1``, ``1.2.1``,
-  etc.
+* Security fixes will be applied to ``master``, to the ``stable/1.6.X``
+  branch, and to the ``stable/1.5.X`` branch. They will trigger the release of
+  ``1.6.1``, ``1.5.1``, etc.
 
-* Documentation fixes will be applied to trunk, and, if easily backported, to
-  the ``1.3.X`` branch.
+* Documentation fixes will be applied to master, and, if easily backported, to
+  the ``1.6.X`` branch. Bugfixes may also be backported.
 
 .. _release-process:
 
 Release process
 ===============
 
-Django uses a time-based release schedule, with minor (i.e. 1.1, 1.2, etc.)
+Django uses a time-based release schedule, with minor (i.e. 1.6, 1.7, etc.)
 releases every nine months, or more, depending on features.
 
 After each release, and after a suitable cooling-off period of a few weeks, the
@@ -190,45 +187,56 @@ At the end of phase two, any unfinished "maybe" features will be postponed until
 the next release. Though it shouldn't happen, any "must-have" features will
 extend phase two, and thus postpone the final release.
 
-Phase two will culminate with an alpha release.
+Phase two will culminate with an alpha release. At this point, the
+``stable/A.B.x`` branch will be forked from ``master``.
 
 Phase three: bugfixes
 ~~~~~~~~~~~~~~~~~~~~~
 
 The last third of a release is spent fixing bugs -- no new features will be
-accepted during this time. We'll release a beta release about halfway through,
-and an rc complete with string freeze two weeks before the end of the schedule.
+accepted during this time. We'll try to release a beta release after one month
+and a release candidate after two months.
+
+The release candidate marks the string freeze, and it happens at least two
+weeks before the final release. After this point, new translatable strings
+must not be added.
+
+During this phase, committers will be more and more conservative with
+backports, to avoid introducing regressions. After the release candidate, only
+release blockers and documentation fixes should be backported.
+
+In parallel to this phase, ``master`` can receive new features, to be released
+in the ``A.B+1`` cycle.
 
 Bug-fix releases
 ----------------
 
-After a minor release (e.g. 1.1), the previous release will go into bugfix
+After a minor release (e.g. 1.6), the previous release will go into bugfix
 mode.
 
-A branch will be created of the form ``branches/releases/1.0.X`` to track
-bugfixes to the previous release. Critical bugs fixed on trunk must
-*also* be fixed on the bugfix branch; this means that commits need to cleanly
-separate bug fixes from feature additions. The developer who commits a fix to
-trunk will be responsible for also applying the fix to the current bugfix
-branch.  Each bugfix branch will have a maintainer who will work with the
-committers to keep them honest on backporting bug fixes.
+A branch will be created of the form ``stable/1.5.x`` to track bugfixes to the
+previous release. Critical bugs fixed on master must *also* be fixed on the
+bugfix branch; this means that commits need to cleanly separate bug fixes from
+feature additions. The developer who commits a fix to master will be
+responsible for also applying the fix to the current bugfix branch.
 
 How this all fits together
 --------------------------
 
 Let's look at a hypothetical example for how this all first together. Imagine,
-if you will, a point about halfway between 1.1 and 1.2. At this point,
+if you will, a point about halfway between 1.5 and 1.6. At this point,
 development will be happening in a bunch of places:
 
-* On trunk, development towards 1.2 proceeds with small additions, bugs
+* On master, development towards 1.6 proceeds with small additions, bugs
   fixes, etc. being checked in daily.
 
-* On the branch "branches/releases/1.1.X", fixes for critical bugs found in
-  the 1.1 release are checked in as needed. At some point, this branch will
-  be released as "1.1.1", "1.1.2", etc.
+* On the branch ``stable/1.5.x``, fixes for critical bugs found in
+  the 1.5 release are checked in as needed. At some point, this branch will
+  be released as "1.5.1", "1.5.2", etc.
 
-* On the branch "branches/releases/1.0.X", security fixes are made if
-  needed and released as "1.0.2", "1.0.3", etc.
+* On the branch ``stable/1.4.x``, security fixes are made if
+  needed and released as "1.4.2", "1.4.3", etc.
 
-* On feature branches, development of major features is done. These
-  branches will be merged into trunk before the end of phase two.
+* Development of major features is done in branches in forks of the main
+  repository. These branches will be merged into ``master`` before "1.6
+  alpha 1".
diff --git a/docs/intro/_images/admin02.png b/docs/intro/_images/admin02.png
index 4b49ebb490..b9810ab7ba 100644
Binary files a/docs/intro/_images/admin02.png and b/docs/intro/_images/admin02.png differ
diff --git a/docs/intro/_images/admin02t.png b/docs/intro/_images/admin02t.png
index d7519d19ab..c0c6a56928 100644
Binary files a/docs/intro/_images/admin02t.png and b/docs/intro/_images/admin02t.png differ
diff --git a/docs/intro/_images/admin03.png b/docs/intro/_images/admin03.png
index 635226c61c..5cf567d5ce 100644
Binary files a/docs/intro/_images/admin03.png and b/docs/intro/_images/admin03.png differ
diff --git a/docs/intro/_images/admin03t.png b/docs/intro/_images/admin03t.png
index 94273cb583..ad15ea60cd 100644
Binary files a/docs/intro/_images/admin03t.png and b/docs/intro/_images/admin03t.png differ
diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt
index a343814c02..8747375b0a 100644
--- a/docs/intro/contributing.txt
+++ b/docs/intro/contributing.txt
@@ -20,8 +20,8 @@ For this tutorial, we expect that you have at least a basic understanding of
 how Django works. This means you should be comfortable going through the
 existing tutorials on :doc:`writing your first Django app</intro/tutorial01>`.
 In addition, you should have a good understanding of Python itself. But if you
-don't, `Dive Into Python`__ is a fantastic (and free) online book for beginning
-Python programmers.
+don't, "Dive Into Python" (for `Python 2`__, for `Python 3`__) is a fantastic
+(and free) online book for beginning Python programmers.
 
 Those of you who are unfamiliar with version control systems and Trac will find
 that this tutorial and its links include just enough information to get started.
@@ -38,6 +38,7 @@ so that it can be of use to the widest audience.
     chat with other Django users who might be able to help.
 
 __ http://diveintopython.net/toc/index.html
+__ http://diveintopython3.net/
 __ http://groups.google.com/group/django-developers
 __ irc://irc.freenode.net/django-dev
 
@@ -96,9 +97,10 @@ Download the Django source code repository using the following command::
 
         pip install -e /path/to/your/local/clone/django/
 
-    to link your cloned checkout into a virtual environment. This is a great
-    option to isolate your development copy of Django from the rest of your
-    system and avoids potential package conflicts.
+    (where ``django`` is the directory of your clone that contains
+    ``setup.py``) to link your cloned checkout into a virtual environment. This
+    is a great option to isolate your development copy of Django from the rest
+    of your system and avoids potential package conflicts.
 
 __ http://www.virtualenv.org
 
@@ -237,7 +239,7 @@ widget. Before we make those changes though, we're going to write a couple
 tests to verify that our modification functions correctly and continues to
 function correctly in the future.
 
-Navigate to Django's ``tests/regressiontests/admin_widgets/`` folder and
+Navigate to Django's ``tests/admin_widgets/`` folder and
 open the ``tests.py`` file. Add the following code on line 269 right before the
 ``AdminFileWidgetTest`` class::
 
@@ -281,7 +283,7 @@ correctly in a couple different situations.
     computer programming, so there's lots of information out there:
 
     * A good first look at writing tests for Django can be found in the
-      documentation on :doc:`Testing Django applications</topics/testing/>`.
+      documentation on :doc:`Testing Django applications </topics/testing/overview>`.
     * Dive Into Python (a free online book for beginning Python developers)
       includes a great `introduction to Unit Testing`__.
     * After reading those, if you want something a little meatier to sink
@@ -467,10 +469,10 @@ This patch file contains all your changes and should look this:
 
      Relationship fields
      ===================
-    diff --git a/tests/regressiontests/admin_widgets/tests.py b/tests/regressiontests/admin_widgets/tests.py
+    diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
     index 4b11543..94acc6d 100644
-    --- a/tests/regressiontests/admin_widgets/tests.py
-    +++ b/tests/regressiontests/admin_widgets/tests.py
+    --- a/tests/admin_widgets/tests.py
+    +++ b/tests/admin_widgets/tests.py
     @@ -265,6 +265,35 @@ class AdminSplitDateTimeWidgetTest(DjangoTestCase):
                          '<p class="datetime">Datum: <input value="01.12.2007" type="text" class="vDateField" name="test_0" size="10" /><br />Zeit: <input value="09:30:00" type="text" class="vTimeField" name="test_1" size="8" /></p>',
                      )
diff --git a/docs/intro/index.txt b/docs/intro/index.txt
index ea6a3c4d29..9e88402f6d 100644
--- a/docs/intro/index.txt
+++ b/docs/intro/index.txt
@@ -14,6 +14,7 @@ place: read this material to quickly get up and running.
    tutorial03
    tutorial04
    tutorial05
+   tutorial06
    reusable-apps
    whatsnext
    contributing
@@ -28,12 +29,14 @@ place: read this material to quickly get up and running.
     `list of Python resources for non-programmers`_
 
     If you already know a few other languages and want to get up to speed with
-    Python quickly, we recommend `Dive Into Python`_ (also available in a
+    Python quickly, we recommend "Dive Into Python" (for `Python 2`_, for
+    `Python 3`_, also available in a
     `dead-tree version`_). If that's not quite your style, there are quite
     a few other `books about Python`_.
 
     .. _python: http://python.org/
     .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
-    .. _dive into python: http://diveintopython.net/
+    .. _Python 2: http://diveintopython.net/
+    .. _Python 3: http://diveintopython3.net/
     .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
     .. _books about Python: http://wiki.python.org/moin/PythonBooks
diff --git a/docs/intro/install.txt b/docs/intro/install.txt
index f9b122e62d..3cbc8d88ab 100644
--- a/docs/intro/install.txt
+++ b/docs/intro/install.txt
@@ -78,11 +78,13 @@ Verifying
 ---------
 
 To verify that Django can be seen by Python, type ``python`` from your shell.
-Then at the Python prompt, try to import Django::
+Then at the Python prompt, try to import Django:
+
+.. parsed-literal::
 
     >>> import django
     >>> print(django.get_version())
-    1.5
+    |version|
 
 You may have another version of Django installed.
 
@@ -90,6 +92,3 @@ That's it!
 ----------
 
 That's it -- you can now :doc:`move onto the tutorial </intro/tutorial01>`.
-
-
-
diff --git a/docs/intro/overview.txt b/docs/intro/overview.txt
index ba49e3ccf2..8753817256 100644
--- a/docs/intro/overview.txt
+++ b/docs/intro/overview.txt
@@ -56,7 +56,9 @@ Enjoy the free API
 ==================
 
 With that, you've got a free, and rich, :doc:`Python API </topics/db/queries>` to
-access your data. The API is created on the fly, no code generation necessary::
+access your data. The API is created on the fly, no code generation necessary:
+
+.. code-block:: python
 
     # Import the models we created from our "news" app
     >>> from news.models import Reporter, Article
@@ -176,7 +178,7 @@ decouple URLs from Python code.
 Here's what a URLconf might look like for the ``Reporter``/``Article``
 example above::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns
 
     urlpatterns = patterns('',
         (r'^articles/(\d{4})/$', 'news.views.year_archive'),
@@ -269,16 +271,18 @@ Finally, Django uses the concept of "template inheritance": That's what the
 following blocks." In short, that lets you dramatically cut down on redundancy
 in templates: each template has to define only what's unique to that template.
 
-Here's what the "base.html" template might look like:
+Here's what the "base.html" template, including the use of :doc:`static files
+</howto/static-files/index>`, might look like:
 
 .. code-block:: html+django
 
+    {% load staticfiles %}
     <html>
     <head>
         <title>{% block title %}{% endblock %}</title>
     </head>
     <body>
-        <img src="sitelogo.png" alt="Logo" />
+        <img src="{% static "images/sitelogo.png" %}" alt="Logo" />
         {% block content %}{% endblock %}
     </body>
     </html>
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index 6aade4997e..1e0f1da0c5 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -2,11 +2,11 @@
 Advanced tutorial: How to write reusable apps
 =============================================
 
-This advanced tutorial begins where :doc:`Tutorial 5 </intro/tutorial05>` left
-off. We'll be turning our Web-poll into a standalone Python package you can
-reuse in new projects and share with other people.
+This advanced tutorial begins where :doc:`Tutorial 6 </intro/tutorial06>`
+left off. We'll be turning our Web-poll into a standalone Python package
+you can reuse in new projects and share with other people.
 
-If you haven't recently completed Tutorials 1–5, we encourage you to review
+If you haven't recently completed Tutorials 1–6, we encourage you to review
 these so that your example project matches the one described below.
 
 Reusability matters
@@ -50,8 +50,8 @@ projects and ready to publish for others to install and use.
     Python package easy for others to install. It can be a little confusing, we
     know.
 
-Completing your reusable app
-============================
+Your project and your reusable app
+==================================
 
 After the previous tutorials, our project should look like this::
 
@@ -63,82 +63,36 @@ After the previous tutorials, our project should look like this::
             urls.py
             wsgi.py
         polls/
-            admin.py
             __init__.py
+            admin.py
             models.py
             tests.py
-            urls.py
-            views.py
-
-You also have a directory somewhere called ``mytemplates`` which you created in
-:doc:`Tutorial 2 </intro/tutorial02>`. You specified its location in the
-TEMPLATE_DIRS setting. This directory should look like this::
-
-    mytemplates/
-        admin/
-            base_site.html
-        polls/
-            detail.html
-            index.html
-            results.html
-
-The polls app is already a Python package, thanks to the ``polls/__init__.py``
-file. That's a great start, but we can't just pick up this package and drop it
-into a new project. The polls templates are currently stored in the
-project-wide ``mytemplates`` directory. To make the app self-contained, it
-should also contain the necessary templates.
-
-Inside the ``polls`` app, create a new ``templates`` directory. Now move the
-``polls`` template directory from ``mytemplates`` into the new
-``templates``. Your project should now look like this::
-
-    mysite/
-        manage.py
-        mysite/
-            __init__.py
-            settings.py
-            urls.py
-            wsgi.py
-        polls/
-            admin.py
-            __init__.py
-            models.py
+            static/
+                style.css
+                images/
+                    background.gif
             templates/
                 polls/
                     detail.html
                     index.html
                     results.html
-            tests.py
             urls.py
             views.py
+        templates/
+            admin/
+                base_site.html
 
-Your project-wide templates directory should now look like this::
-
-    mytemplates/
-        admin/
-            base_site.html
-
-Looking good! Now would be a good time to confirm that your polls application
-still works correctly.  How does Django know how to find the new location of
-the polls templates even though we didn't modify :setting:`TEMPLATE_DIRS`?
-Django has a :setting:`TEMPLATE_LOADERS` setting which contains a list
-of callables that know how to import templates from various sources.  One of
-the defaults is :class:`django.template.loaders.app_directories.Loader` which
-looks for a "templates" subdirectory in each of the :setting:`INSTALLED_APPS`.
+You created ``mysite/templates`` in :doc:`Tutorial 2 </intro/tutorial02>`,
+and ``polls/templates`` in :doc:`Tutorial 3 </intro/tutorial03>`. Now perhaps
+it is clearer why we chose to have separate template directories for the
+project and application: everything that is part of the polls application is in
+``polls``. It makes the application self-contained and easier to drop into a
+new project.
 
 The ``polls`` directory could now be copied into a new Django project and
 immediately reused. It's not quite ready to be published though. For that, we
 need to package the app to make it easy for others to install.
 
-.. admonition:: Why nested?
-
-   Why create a ``polls`` directory under ``templates`` when we're
-   already inside the polls app? This directory is needed to avoid conflicts in
-   Django's ``app_directories`` template loader.  For example, if two
-   apps had a template called ``base.html``, without the extra directory it
-   wouldn't be possible to distinguish between the two. It's a good convention
-   to use the name of your app for this directory.
-
 .. _installing-reusable-apps-prerequisites:
 
 Installing some prerequisites
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index 9419f9c4eb..7f69945300 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -19,10 +19,15 @@ tell Django is installed and which version by running the following command:
 
     python -c "import django; print(django.get_version())"
 
-You should see either the version of your Django installation or an error
-telling "No module named django". Check also that the version number matches
-the version of this tutorial. If they don't match, you can refer to the
-tutorial for your version of Django or update Django to the newest version.
+If Django is installed, you should see the version of your installation. If it
+isn't, you'll get an error telling "No module named django".
+
+This tutorial is written for Django |version| and Python 2.x. If the Django
+version doesn't match, you can refer to the tutorial for your version of Django
+or update Django to the newest version. If you are using Python 3.x, be aware
+that your code may need to differ from what is in the tutorial and you should
+continue using the tutorial only if you know what you are doing with Python
+3.x.
 
 See :doc:`How to install Django </topics/install>` for advice on how to remove
 older versions of Django and install a newer one.
@@ -127,13 +132,16 @@ The development server
 
 Let's verify this worked. Change into the outer :file:`mysite` directory, if
 you haven't already, and run the command ``python manage.py runserver``. You'll
-see the following output on the command line::
+see the following output on the command line:
+
+.. parsed-literal::
 
     Validating models...
-    0 errors found.
 
-    Django version 1.4, using settings 'mysite.settings'
-    Development server is running at http://127.0.0.1:8000/
+    0 errors found
+    |today| - 15:50:53
+    Django version |version|, using settings 'mysite.settings'
+    Starting development server at http://127.0.0.1:8000/
     Quit the server with CONTROL-C.
 
 You've started the Django development server, a lightweight Web server written
@@ -141,7 +149,7 @@ purely in Python. We've included this with Django so you can develop things
 rapidly, without having to deal with configuring a production server -- such as
 Apache -- until you're ready for production.
 
-Now's a good time to note: DON'T use this server in anything resembling a
+Now's a good time to note: **Don't** use this server in anything resembling a
 production environment. It's intended only for use while developing. (We're in
 the business of making Web frameworks, not Web servers.)
 
@@ -177,39 +185,33 @@ Database setup
 --------------
 
 Now, edit :file:`mysite/settings.py`. It's a normal Python module with
-module-level variables representing Django settings. Change the
-following keys in the :setting:`DATABASES` ``'default'`` item to match
-your database connection settings.
+module-level variables representing Django settings.
+
+By default, the configuration uses SQLite. If you're new to databases, or
+you're just interested in trying Django, this is the easiest choice. SQLite is
+included in Python, so you won't need to install anything else to support your
+database.
+
+If you wish to use another database, install the appropriate :ref:`database
+bindings <database-installation>`, and change the following keys in the
+:setting:`DATABASES` ``'default'`` item to match your database connection
+settings:
 
 * :setting:`ENGINE <DATABASE-ENGINE>` -- Either
+  ``'django.db.backends.sqlite3'``,
   ``'django.db.backends.postgresql_psycopg2'``,
-  ``'django.db.backends.mysql'``, ``'django.db.backends.sqlite3'`` or
+  ``'django.db.backends.mysql'``, or
   ``'django.db.backends.oracle'``. Other backends are :setting:`also available
   <DATABASE-ENGINE>`.
 
-* :setting:`NAME` -- The name of your database. If you're using
-  SQLite, the database will be a file on your computer; in that
-  case, :setting:`NAME` should be the full absolute path,
-  including filename, of that file. If the file doesn't exist, it
-  will automatically be created when you synchronize the database
-  for the first time (see below).
+* :setting:`NAME` -- The name of your database. If you're using SQLite, the
+  database will be a file on your computer; in that case, :setting:`NAME`
+  should be the full absolute path, including filename, of that file. The
+  default value, ``os.path.join(BASE_DIR, 'db.sqlite3')``, will store the file
+  in your project directory.
 
-  When specifying the path, always use forward slashes, even on
-  Windows (e.g. ``C:/homes/user/mysite/sqlite3.db``).
-
-* :setting:`USER` -- Your database username (not used for SQLite).
-
-* :setting:`PASSWORD` -- Your database password (not used for
-  SQLite).
-
-* :setting:`HOST` -- The host your database is on. Leave this as
-  an empty string (or possibly ``127.0.0.1``) if your database server is on the
-  same physical machine (not used for SQLite). See :setting:`HOST` for details.
-
-If you're new to databases, we recommend simply using SQLite by setting
-:setting:`ENGINE` to ``'django.db.backends.sqlite3'`` and :setting:`NAME` to
-the place where you'd like to store the database. SQLite is included in Python,
-so you won't need to install anything else to support your database.
+If you are not using SQLite as your database, additional settings such as :setting:`USER`, :setting:`PASSWORD`, :setting:`HOST` must be added.
+For more details, see the reference documentation for :setting:`DATABASES`.
 
 .. note::
 
@@ -220,17 +222,20 @@ so you won't need to install anything else to support your database.
     If you're using SQLite, you don't need to create anything beforehand - the
     database file will be created automatically when it is needed.
 
-While you're editing :file:`settings.py`, set :setting:`TIME_ZONE` to your
-time zone. The default value is the Central time zone in the U.S. (Chicago).
+While you're editing :file:`mysite/settings.py`, set :setting:`TIME_ZONE` to
+your time zone.
 
-Also, note the :setting:`INSTALLED_APPS` setting toward the bottom of
-the file. That holds the names of all Django applications that are
-activated in this Django instance. Apps can be used in multiple projects, and
-you can package and distribute them for use by others in their projects.
+Also, note the :setting:`INSTALLED_APPS` setting at the top of the file. That
+holds the names of all Django applications that are activated in this Django
+instance. Apps can be used in multiple projects, and you can package and
+distribute them for use by others in their projects.
 
 By default, :setting:`INSTALLED_APPS` contains the following apps, all of which
 come with Django:
 
+* :mod:`django.contrib.admin` -- The admin site. You'll use it in :doc:`part 2
+  of this tutorial </intro/tutorial02>`.
+
 * :mod:`django.contrib.auth` -- An authentication system.
 
 * :mod:`django.contrib.contenttypes` -- A framework for content types.
@@ -255,11 +260,12 @@ that, run the following command:
 
     python manage.py syncdb
 
-The :djadmin:`syncdb` command looks at the :setting:`INSTALLED_APPS` setting and
-creates any necessary database tables according to the database settings in your
-:file:`settings.py` file. You'll see a message for each database table it
-creates, and you'll get a prompt asking you if you'd like to create a superuser
-account for the authentication system. Go ahead and do that.
+The :djadmin:`syncdb` command looks at the :setting:`INSTALLED_APPS` setting
+and creates any necessary database tables according to the database settings
+in your :file:`mysite/settings.py` file. You'll see a message for each
+database table it creates, and you'll get a prompt asking you if you'd like to
+create a superuser account for the authentication system. Go ahead and do
+that.
 
 If you're interested, run the command-line client for your database and type
 ``\dt`` (PostgreSQL), ``SHOW TABLES;`` (MySQL), or ``.schema`` (SQLite) to
@@ -282,10 +288,10 @@ Creating models
 Now that your environment -- a "project" -- is set up, you're set to start
 doing work.
 
-Each application you write in Django consists of a Python package, somewhere
-on your `Python path`_, that follows a certain convention. Django comes with a
-utility that automatically generates the basic directory structure of an app,
-so you can focus on writing code rather than creating directories.
+Each application you write in Django consists of a Python package that follows
+a certain convention. Django comes with a utility that automatically generates
+the basic directory structure of an app, so you can focus on writing code
+rather than creating directories.
 
 .. admonition:: Projects vs. apps
 
@@ -310,6 +316,7 @@ That'll create a directory :file:`polls`, which is laid out like this::
 
     polls/
         __init__.py
+        admin.py
         models.py
         tests.py
         views.py
@@ -343,7 +350,7 @@ These concepts are represented by simple Python classes. Edit the
     class Choice(models.Model):
         poll = models.ForeignKey(Poll)
         choice_text = models.CharField(max_length=200)
-        votes = models.IntegerField()
+        votes = models.IntegerField(default=0)
 
 The code is straightforward. Each model is represented by a class that
 subclasses :class:`django.db.models.Model`. Each model has a number of class
@@ -355,7 +362,7 @@ class -- e.g., :class:`~django.db.models.CharField` for character fields and
 type of data each field holds.
 
 The name of each :class:`~django.db.models.Field` instance (e.g. ``question`` or
-``pub_date`` ) is the field's name, in machine-friendly format. You'll use this
+``pub_date``) is the field's name, in machine-friendly format. You'll use this
 value in your Python code, and your database will use it as the column name.
 
 You can use an optional first positional argument to a
@@ -366,10 +373,14 @@ example, we've only defined a human-readable name for ``Poll.pub_date``. For all
 other fields in this model, the field's machine-readable name will suffice as
 its human-readable name.
 
-Some :class:`~django.db.models.Field` classes have required elements.
+Some :class:`~django.db.models.Field` classes have required arguments.
 :class:`~django.db.models.CharField`, for example, requires that you give it a
-:attr:`~django.db.models.Field.max_length`. That's used not only in the database
-schema, but in validation, as we'll soon see.
+:attr:`~django.db.models.CharField.max_length`. That's used not only in the
+database schema, but in validation, as we'll soon see.
+
+A :class:`~django.db.models.Field` can also have various optional arguments; in
+this case, we've set the :attr:`~django.db.models.Field.default` value of
+``votes`` to 0.
 
 Finally, note a relationship is defined, using
 :class:`~django.db.models.ForeignKey`. That tells Django each ``Choice`` is related
@@ -395,26 +406,21 @@ But first we need to tell our project that the ``polls`` app is installed.
     you can distribute apps, because they don't have to be tied to a given
     Django installation.
 
-Edit the :file:`settings.py` file again, and change the
-:setting:`INSTALLED_APPS` setting to include the string ``'polls'``. So
-it'll look like this::
+Edit the :file:`mysite/settings.py` file again, and change the
+:setting:`INSTALLED_APPS` setting to include the string ``'polls'``. So it'll
+look like this::
 
     INSTALLED_APPS = (
+        'django.contrib.admin',
         'django.contrib.auth',
         'django.contrib.contenttypes',
         'django.contrib.sessions',
-        'django.contrib.sites',
         'django.contrib.messages',
         'django.contrib.staticfiles',
-        # Uncomment the next line to enable the admin:
-        # 'django.contrib.admin',
-        # Uncomment the next line to enable admin documentation:
-        # 'django.contrib.admindocs',
         'polls',
     )
 
-Now Django knows to include the ``polls`` app. Let's run another
-command:
+Now Django knows to include the ``polls`` app. Let's run another command:
 
 .. code-block:: bash
 
@@ -427,13 +433,13 @@ statements for the polls app):
 
     BEGIN;
     CREATE TABLE "polls_poll" (
-        "id" serial NOT NULL PRIMARY KEY,
+        "id" integer NOT NULL PRIMARY KEY,
         "question" varchar(200) NOT NULL,
-        "pub_date" timestamp with time zone NOT NULL
+        "pub_date" datetime NOT NULL
     );
     CREATE TABLE "polls_choice" (
-        "id" serial NOT NULL PRIMARY KEY,
-        "poll_id" integer NOT NULL REFERENCES "polls_poll" ("id") DEFERRABLE INITIALLY DEFERRED,
+        "id" integer NOT NULL PRIMARY KEY,
+        "poll_id" integer NOT NULL REFERENCES "polls_poll" ("id"),
         "choice_text" varchar(200) NOT NULL,
         "votes" integer NOT NULL
     );
@@ -441,7 +447,8 @@ statements for the polls app):
 
 Note the following:
 
-* The exact output will vary depending on the database you are using.
+* The exact output will vary depending on the database you are using. The
+  example above is generated for SQLite.
 
 * Table names are automatically generated by combining the name of the app
   (``polls``) and the lowercase name of the model -- ``poll`` and
@@ -459,8 +466,7 @@ Note the following:
   types such as ``auto_increment`` (MySQL), ``serial`` (PostgreSQL), or
   ``integer primary key`` (SQLite) are handled for you automatically. Same
   goes for quoting of field names -- e.g., using double quotes or single
-  quotes. The author of this tutorial runs PostgreSQL, so the example
-  output is in PostgreSQL syntax.
+  quotes.
 
 * The :djadmin:`sql` command doesn't actually run the SQL in your database -
   it just prints it to the screen so that you can see what SQL Django thinks
@@ -519,7 +525,7 @@ API Django gives you. To invoke the Python shell, use this command:
 
 We're using this instead of simply typing "python", because :file:`manage.py`
 sets the ``DJANGO_SETTINGS_MODULE`` environment variable, which gives Django
-the Python import path to your :file:`settings.py` file.
+the Python import path to your :file:`mysite/settings.py` file.
 
 .. admonition:: Bypassing manage.py
 
@@ -645,8 +651,10 @@ Save these changes and start a new Python interactive shell by running
     >>> Poll.objects.filter(question__startswith='What')
     [<Poll: What's up?>]
 
-    # Get the poll whose year is 2012.
-    >>> Poll.objects.get(pub_date__year=2012)
+    # Get the poll that was published this year.
+    >>> from django.utils import timezone
+    >>> current_year = timezone.now().year
+    >>> Poll.objects.get(pub_date__year=current_year)
     <Poll: What's up?>
 
     # Request an ID that doesn't exist, this will raise an exception.
@@ -697,8 +705,9 @@ Save these changes and start a new Python interactive shell by running
     # The API automatically follows relationships as far as you need.
     # Use double underscores to separate relationships.
     # This works as many levels deep as you want; there's no limit.
-    # Find all Choices for any poll whose pub_date is in 2012.
-    >>> Choice.objects.filter(poll__pub_date__year=2012)
+    # Find all Choices for any poll whose pub_date is in this year
+    # (reusing the 'current_year' variable we created above).
+    >>> Choice.objects.filter(poll__pub_date__year=current_year)
     [<Choice: Not much>, <Choice: The sky>, <Choice: Just hacking again>]
 
     # Let's delete one of the choices. Use delete() for that.
diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
index 2c8d25ae6f..1987c51a67 100644
--- a/docs/intro/tutorial02.txt
+++ b/docs/intro/tutorial02.txt
@@ -21,49 +21,11 @@ automatically-generated admin site.
     The admin isn't intended to be used by site visitors. It's for site
     managers.
 
-Activate the admin site
-=======================
-
-The Django admin site is not activated by default -- it's an opt-in thing. To
-activate the admin site for your installation, do these three things:
-
-* Uncomment ``"django.contrib.admin"`` in the :setting:`INSTALLED_APPS` setting.
-
-* Run ``python manage.py syncdb``. Since you have added a new application
-  to :setting:`INSTALLED_APPS`, the database tables need to be updated.
-
-* Edit your ``mysite/urls.py`` file and uncomment the lines that reference
-  the admin -- there are three lines in total to uncomment. This file is a
-  URLconf; we'll dig into URLconfs in the next tutorial. For now, all you
-  need to know is that it maps URL roots to applications. In the end, you
-  should have a ``urls.py`` file that looks like this:
-
-  .. parsed-literal::
-
-      from django.conf.urls import patterns, include, url
-
-      # Uncomment the next two lines to enable the admin:
-      **from django.contrib import admin**
-      **admin.autodiscover()**
-
-      urlpatterns = patterns('',
-          # Examples:
-          # url(r'^$', '{{ project_name }}.views.home', name='home'),
-          # url(r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')),
-
-          # Uncomment the admin/doc line below to enable admin documentation:
-          # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-          # Uncomment the next line to enable the admin:
-          **url(r'^admin/', include(admin.site.urls)),**
-      )
-
-  (The bold lines are the ones that needed to be uncommented.)
-
 Start the development server
 ============================
 
-Let's start the development server and explore the admin site.
+The Django admin site is activated by default. Let's start the development
+server and explore it.
 
 Recall from Tutorial 1 that you start the development server like so:
 
@@ -77,6 +39,10 @@ http://127.0.0.1:8000/admin/. You should see the admin's login screen:
 .. image:: _images/admin01.png
    :alt: Django admin login screen
 
+Since :doc:`translation </topics/i18n/translation>` is turned on by default,
+the login screen may be displayed in your own language, depending on your
+browser's settings and on whether Django has a translation for this language.
+
 .. admonition:: Doesn't match what you see?
 
     If at this point, instead of the above login page, you get an error
@@ -93,35 +59,33 @@ http://127.0.0.1:8000/admin/. You should see the admin's login screen:
 Enter the admin site
 ====================
 
-Now, try logging in. (You created a superuser account in the first part of this
+Now, try logging in. You created a superuser account in the first part of this
 tutorial, remember?  If you didn't create one or forgot the password you can
-:ref:`create another one <topics-auth-creating-superusers>`.) You should see
-the Django admin index page:
+:ref:`create another one <topics-auth-creating-superusers>`.
+
+You should see the Django admin index page:
 
 .. image:: _images/admin02t.png
    :alt: Django admin index page
 
-You should see a few types of editable content, including groups, users
-and sites. These are core features Django ships with by default.
+You should see a few types of editable content: groups and users. They are
+provided by :mod:`django.contrib.auth`, the authentication framework shipped
+by Django.
 
 Make the poll app modifiable in the admin
 =========================================
 
 But where's our poll app? It's not displayed on the admin index page.
 
-Just one thing to do: We need to tell the admin that ``Poll``
-objects have an admin interface. To do this, create a file called
-``admin.py`` in your ``polls`` directory, and edit it to look like this::
+Just one thing to do: we need to tell the admin that ``Poll``
+objects have an admin interface. To do this, open the :file:`polls/admin.py`
+file, and edit it to look like this::
 
     from django.contrib import admin
     from polls.models import Poll
 
     admin.site.register(Poll)
 
-You'll need to restart the development server to see your changes. Normally,
-the server auto-reloads code every time you modify a file, but the action of
-creating a new file doesn't trigger the auto-reloading logic.
-
 Explore the free admin functionality
 ====================================
 
@@ -145,7 +109,7 @@ Click the "What's up?" poll to edit it:
 
 Things to note here:
 
-* The form is automatically generated from the Poll model.
+* The form is automatically generated from the ``Poll`` model.
 
 * The different model field types (:class:`~django.db.models.DateTimeField`,
   :class:`~django.db.models.CharField`) correspond to the appropriate HTML
@@ -302,7 +266,7 @@ registration code to read::
 This tells Django: "``Choice`` objects are edited on the ``Poll`` admin page. By
 default, provide enough fields for 3 choices."
 
-Load the "Add poll" page to see how that looks, you may need to restart your development server:
+Load the "Add poll" page to see how that looks:
 
 .. image:: _images/admin11t.png
    :alt: Add poll page now has choices on it
@@ -375,7 +339,7 @@ of an arbitrary method is not supported. Also note that the column header for
 underscores replaced with spaces), and that each line contains the string
 representation of the output.
 
-You can improve that by giving that method (in ``models.py``) a few
+You can improve that by giving that method (in :file:`polls/models.py`) a few
 attributes, as follows::
 
     class Poll(models.Model):
@@ -386,8 +350,8 @@ attributes, as follows::
         was_published_recently.boolean = True
         was_published_recently.short_description = 'Published recently?'
 
-Edit your admin.py file again and add an improvement to the Poll change list page: Filters. Add the
-following line to ``PollAdmin``::
+Edit your :file:`polls/admin.py` file again and add an improvement to the Poll
+change list page: Filters. Add the following line to ``PollAdmin``::
 
     list_filter = ['pub_date']
 
@@ -398,9 +362,9 @@ That adds a "Filter" sidebar that lets people filter the change list by the
    :alt: Polls change list page, updated
 
 The type of filter displayed depends on the type of field you're filtering on.
-Because ``pub_date`` is a :class:`~django.db.models.fields.DateTimeField`,
-Django knows to give appropriate filter options: "Any date," "Today," "Past 7
-days," "This month," "This year."
+Because ``pub_date`` is a :class:`~django.db.models.DateTimeField`, Django
+knows to give appropriate filter options: "Any date," "Today," "Past 7 days,"
+"This month," "This year."
 
 This is shaping up well. Let's add some search capability::
 
@@ -435,31 +399,28 @@ That's easy to change, though, using Django's template system. The Django admin
 is powered by Django itself, and its interfaces use Django's own template
 system.
 
-Open your settings file (``mysite/settings.py``, remember) and look at the
-:setting:`TEMPLATE_DIRS` setting. :setting:`TEMPLATE_DIRS` is a tuple of
-filesystem directories to check when loading Django templates. It's a search
-path.
+.. _ref-customizing-your-projects-templates:
 
-Create a ``mytemplates`` directory in your project directory. Templates can
+Customizing your *project's* templates
+--------------------------------------
+
+Create a ``templates`` directory in your project directory. Templates can
 live anywhere on your filesystem that Django can access. (Django runs as
 whatever user your server runs.) However, keeping your templates within the
 project is a good convention to follow.
 
-By default, :setting:`TEMPLATE_DIRS` is empty. So, let's add a line to it, to
-tell Django where our templates live::
+Open your settings file (:file:`mysite/settings.py`, remember) and add a
+:setting:`TEMPLATE_DIRS` setting::
 
-    TEMPLATE_DIRS = (
-        '/path/to/mysite/mytemplates', # Change this to your own directory.
-    )
+    TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'templates')]
 
-Now copy the template ``admin/base_site.html`` from within the default Django
-admin template directory in the source code of Django itself
-(``django/contrib/admin/templates``) into an ``admin`` subdirectory of
-whichever directory you're using in :setting:`TEMPLATE_DIRS`. For example, if
-your :setting:`TEMPLATE_DIRS` includes ``'/path/to/mysite/mytemplates'``, as
-above, then copy ``django/contrib/admin/templates/admin/base_site.html`` to
-``/path/to/mysite/mytemplates/admin/base_site.html``. Don't forget that
-``admin`` subdirectory.
+:setting:`TEMPLATE_DIRS` is an iterable of filesystem directories to check when
+loading Django templates; it's a search path.
+
+Now create a directory called ``admin`` inside ``templates``, and copy the
+template ``admin/base_site.html`` from within the default Django admin
+template directory in the source code of Django itself
+(``django/contrib/admin/templates``) into that directory.
 
 .. admonition:: Where are the Django source files?
 
@@ -489,11 +450,24 @@ override a template, just do the same thing you did with ``base_site.html`` --
 copy it from the default directory into your custom directory, and make
 changes.
 
+Customizing your *application's* templates
+------------------------------------------
+
 Astute readers will ask: But if :setting:`TEMPLATE_DIRS` was empty by default,
 how was Django finding the default admin templates? The answer is that, by
 default, Django automatically looks for a ``templates/`` subdirectory within
-each app package, for use as a fallback. See the :ref:`template loader
-documentation <template-loaders>` for full information.
+each application package, for use as a fallback (don't forget that
+``django.contrib.admin`` is an application).
+
+Our poll application is not very complex and doesn't need custom admin
+templates. But if it grew more sophisticated and required modification of
+Django's standard admin templates for some of its functionality, it would be
+more sensible to modify the *application's* templates, rather than those in the
+*project*. That way, you could include the polls application in any new project
+and be assured that it would find the custom templates it needed.
+
+See the :ref:`template loader documentation <template-loaders>` for more
+information about how Django finds its templates.
 
 Customize the admin index page
 ==============================
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 3159ee88c2..86cc5f97e6 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -39,7 +39,24 @@ In our poll application, we'll have the following four views:
 * Vote action -- handles voting for a particular choice in a particular
   poll.
 
-In Django, each view is represented by a simple Python function.
+In Django, web pages and other content are delivered by views. Each view is
+represented by a simple Python function (or method, in the case of class-based
+views). Django will choose a view by examining the URL that's requested (to be
+precise, the part of the URL after the domain name).
+
+Now in your time on the web you may have come across such beauties as
+"ME2/Sites/dirmod.asp?sid=&type=gen&mod=Core+Pages&gid=A6CD4967199A42D9B65B1B".
+You will be pleased to know that Django allows us much more elegant
+*URL patterns* than that.
+
+A URL pattern is simply the general form of a URL - for example:
+``/newsarchive/<year>/<month>/``.
+
+To get from a URL to a view, Django uses what are known as 'URLconfs'. A
+URLconf maps URL patterns (described as regular expressions) to views.
+
+This tutorial provides basic instruction in the use of URLconfs, and you can
+refer to :mod:`django.core.urlresolvers` for more information.
 
 Write your first view
 =====================
@@ -52,19 +69,8 @@ and put the following Python code in it::
     def index(request):
         return HttpResponse("Hello, world. You're at the poll index.")
 
-This is the simplest view possible in Django. Now we have a problem, how does
-this view get called? For that we need to map it to a URL, in Django this is
-done in a configuration file called a URLconf.
-
-.. admonition:: What is a URLconf?
-
-    In Django, web pages and other content are delivered by views and
-    determining which view is called is done by Python modules informally
-    titled 'URLconfs'. These modules are pure Python code and are a simple
-    mapping between URL patterns (as simple regular expressions) to Python
-    callback functions (your views). This tutorial provides basic instruction
-    in their use, and you can refer to :mod:`django.core.urlresolvers` for
-    more information.
+This is the simplest view possible in Django. To call the view, we need to map
+it to a URL - and for this we need a URLconf.
 
 To create a URLconf in the polls directory, create a file called ``urls.py``.
 Your app directory should now look like::
@@ -101,7 +107,7 @@ with::
         url(r'^admin/', include(admin.site.urls)),
     )
 
-You have now wired an `index` view into the URLconf. Go to
+You have now wired an ``index`` view into the URLconf. Go to
 http://localhost:8000/polls/ in your browser, and you should see the text
 "*Hello, world. You're at the poll index.*", which you defined in the
 ``index`` view.
@@ -113,7 +119,7 @@ At this point, it's worth reviewing what these arguments are for.
 :func:`~django.conf.urls.url` argument: regex
 ---------------------------------------------
 
-The term `regex` is a commonly used short form meaning `regular expression`,
+The term "regex" is a commonly used short form meaning "regular expression",
 which is a syntax for matching patterns in strings, or in this case, url
 patterns. Django starts at the first regular expression and makes its way down
 the list,  comparing the requested URL against each regular expression until it
@@ -274,10 +280,48 @@ commas, according to publication date::
 
 There's a problem here, though: the page's design is hard-coded in the view. If
 you want to change the way the page looks, you'll have to edit this Python code.
-So let's use Django's template system to separate the design from Python.
+So let's use Django's template system to separate the design from Python by
+creating a template that the view can use.
+
+First, create a directory called ``templates`` in your ``polls`` directory.
+Django will look for templates in there.
+
+Django's :setting:`TEMPLATE_LOADERS` setting contains a list of callables that
+know how to import templates from various sources. One of the defaults is
+:class:`django.template.loaders.app_directories.Loader` which looks for a
+"templates" subdirectory in each of the :setting:`INSTALLED_APPS` - this is how
+Django knows to find the polls templates even though we didn't modify
+:setting:`TEMPLATE_DIRS`, as we did in :ref:`Tutorial 2
+<ref-customizing-your-projects-templates>`.
+
+.. admonition:: Organizing templates
+
+    We *could* have all our templates together, in one big templates directory,
+    and it would work perfectly well. However, this template belongs to the
+    polls application, so unlike the admin template we created in the previous
+    tutorial, we'll put this one in the application's template directory
+    (``polls/templates``) rather than the project's (``templates``). We'll
+    discuss in more detail in the :doc:`reusable apps tutorial
+    </intro/reusable-apps>` *why* we do this.
+
+Within the ``templates`` directory you have just created, create another
+directory called ``polls``, and within that create a file called
+``index.html``. In other words, your template should be at
+``polls/templates/polls/index.html``. Because of how the ``app_directories``
+template loader works as described above, you can refer to this template within
+Django simply as ``polls/index.html``.
+
+.. admonition:: Template namespacing
+
+    Now we *might* be able to get away with putting our templates directly in
+    ``polls/templates`` (rather than creating another ``polls`` subdirectory),
+    but it would actually be a bad idea. Django will choose the first template
+    it finds whose name matches, and if you had a template with the same name
+    in a *different* application, Django would be unable to distinguish between
+    them. We need to be able to point Django at the right one, and the easiest
+    way to ensure this is by *namespacing* them. That is, by putting those
+    templates inside *another* directory named for the application itself.
 
-First, create a directory ``polls`` in your template directory you specified
-in setting:`TEMPLATE_DIRS`. Within that, create a file called ``index.html``.
 Put the following code in that template:
 
 .. code-block:: html+django
@@ -311,15 +355,9 @@ That code loads the template called  ``polls/index.html`` and passes it a
 context. The context is a dictionary mapping template variable names to Python
 objects.
 
-Load the page in your Web browser, and you should see a bulleted-list
-containing the "What's up" poll from Tutorial 1. The link points to the poll's
-detail page.
-
-.. admonition:: Organizing Templates
-
-    Rather than one big templates directory, you can also store templates
-    within each app. We'll discuss this in more detail in the :doc:`reusable
-    apps tutorial</intro/reusable-apps>`.
+Load the page by pointing your browser at "/polls/", and you should see a
+bulleted-list containing the "What's up" poll from Tutorial 1. The link points
+to the poll's detail page.
 
 A shortcut: :func:`~django.shortcuts.render`
 --------------------------------------------
@@ -367,7 +405,8 @@ The new concept here: The view raises the :exc:`~django.http.Http404` exception
 if a poll with the requested ID doesn't exist.
 
 We'll discuss what you could put in that ``polls/detail.html`` template a bit
-later, but if you'd like to quickly get the above example working, just::
+later, but if you'd like to quickly get the above example working, a file
+containing just::
 
     {{ poll }}
 
@@ -536,8 +575,9 @@ view, and so might an app on the same project that is for a blog. How does one
 make it so that Django knows which app view to create for a url when using the
 ``{% url %}`` template tag?
 
-The answer is to add namespaces to your root URLconf. In the
-``mysite/urls.py`` file, go ahead and change it to include namespacing::
+The answer is to add namespaces to your root URLconf. In the ``mysite/urls.py``
+file (the project's ``urls.py``, not the application's), go ahead and change
+it to include namespacing::
 
     from django.conf.urls import patterns, include, url
 
diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
index 1619b599bb..87d8e584ad 100644
--- a/docs/intro/tutorial04.txt
+++ b/docs/intro/tutorial04.txt
@@ -33,7 +33,7 @@ A quick rundown:
   ``value`` of each radio button is the associated poll choice's ID. The
   ``name`` of each radio button is ``"choice"``. That means, when somebody
   selects one of the radio buttons and submits the form, it'll send the
-  POST data ``choice=3``. This is HTML Forms 101.
+  POST data ``choice=3``. This is the basic concept of HTML forms.
 
 * We set the form's ``action`` to ``{% url 'polls:vote' poll.id %}``, and we
   set ``method="post"``. Using ``method="post"`` (as opposed to
@@ -98,9 +98,10 @@ This code includes a few things we haven't covered yet in this tutorial:
   <django.http.HttpRequest.POST>` in our code, to ensure that data is only
   altered via a POST call.
 
-* ``request.POST['choice']`` will raise :exc:`KeyError` if ``choice`` wasn't
-  provided in POST data. The above code checks for :exc:`KeyError` and
-  redisplays the poll form with an error message if ``choice`` isn't given.
+* ``request.POST['choice']`` will raise :exc:`~exceptions.KeyError` if
+  ``choice`` wasn't provided in POST data. The above code checks for
+  :exc:`~exceptions.KeyError` and redisplays the poll form with an error
+  message if ``choice`` isn't given.
 
 * After incrementing the choice count, the code returns an
   :class:`~django.http.HttpResponseRedirect` rather than a normal
@@ -198,6 +199,9 @@ Read on for details.
 
     You should know basic math before you start using a calculator.
 
+Amend URLconf
+-------------
+
 First, open the ``polls/urls.py`` URLconf and change it like so::
 
     from django.conf.urls import patterns, url
@@ -224,6 +228,9 @@ First, open the ``polls/urls.py`` URLconf and change it like so::
         url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote', name='vote'),
     )
 
+Amend views
+-----------
+
 We're using two generic views here:
 :class:`~django.views.generic.list.ListView` and
 :class:`~django.views.generic.detail.DetailView`. Respectively, those
@@ -233,12 +240,12 @@ two views abstract the concepts of "display a list of objects" and
 * Each generic view needs to know what model it will be acting
   upon. This is provided using the ``model`` parameter.
 
-* The :class:`~django.views.generic.list.DetailView` generic view
+* The :class:`~django.views.generic.detail.DetailView` generic view
   expects the primary key value captured from the URL to be called
   ``"pk"``, so we've changed ``poll_id`` to ``pk`` for the generic
   views.
 
-By default, the :class:`~django.views.generic.list.DetailView` generic
+By default, the :class:`~django.views.generic.detail.DetailView` generic
 view uses a template called ``<app name>/<model name>_detail.html``.
 In our case, it'll use the template ``"polls/poll_detail.html"``. The
 ``template_name`` argument is used to tell Django to use a specific
@@ -246,7 +253,7 @@ template name instead of the autogenerated default template name. We
 also specify the ``template_name`` for the ``results`` list view --
 this ensures that the results view and the detail view have a
 different appearance when rendered, even though they're both a
-:class:`~django.views.generic.list.DetailView` behind the scenes.
+:class:`~django.views.generic.detail.DetailView` behind the scenes.
 
 Similarly, the :class:`~django.views.generic.list.ListView` generic
 view uses a default template called ``<app name>/<model
@@ -256,7 +263,7 @@ name>_list.html``; we use ``template_name`` to tell
 
 In previous parts of the tutorial, the templates have been provided
 with a context that contains the ``poll`` and ``latest_poll_list``
-context variables. For DetailView the ``poll`` variable is provided
+context variables. For ``DetailView`` the ``poll`` variable is provided
 automatically -- since we're using a Django model (``Poll``), Django
 is able to determine an appropriate name for the context variable.
 However, for ListView, the automatically generated context variable is
@@ -266,9 +273,10 @@ As an alternative approach, you could change your templates to match
 the new default context variables -- but it's a lot easier to just
 tell Django to use the variable you want.
 
-You can now delete the ``index()``, ``detail()`` and ``results()``
-views from ``polls/views.py``. We don't need them anymore -- they have
-been replaced by generic views.
+You can now delete the ``index()``, ``detail()`` and ``results()`` views from
+``polls/views.py``. We don't need them anymore -- they have been replaced by
+generic views. You can also delete the import for ``HttpResponse``, which is no
+longer required.
 
 Run the server, and use your new polling app based on generic views.
 
diff --git a/docs/intro/tutorial05.txt b/docs/intro/tutorial05.txt
index 163b7cdd0f..3b0a95f253 100644
--- a/docs/intro/tutorial05.txt
+++ b/docs/intro/tutorial05.txt
@@ -121,7 +121,7 @@ the next time you make a change, either when you add a new feature or fix a bug.
 
 So let's do that right away.
 
-.. _test-driven development: http://en.wikipedia.org/wiki/Test-driven_development/
+.. _test-driven development: http://en.wikipedia.org/wiki/Test-driven_development
 
 Writing our first test
 ======================
@@ -159,8 +159,7 @@ can do in an automated test, so let's turn that into an automated test.
 The best place for an application's tests is in the application's ``tests.py``
 file - the testing system will look there for tests automatically.
 
-Put the following in the ``tests.py`` file in the ``polls`` application (you'll
-notice  ``tests.py`` contains some dummy tests, you can remove those)::
+Put the following in the ``tests.py`` file in the ``polls`` application::
 
     import datetime
 
@@ -632,7 +631,7 @@ a piece of code, it usually means that code should be refactored or removed.
 Coverage will help to identify dead code. See
 :ref:`topics-testing-code-coverage` for details.
 
-:doc:`Testing Django applications </topics/testing>` has comprehensive
+:doc:`Testing Django applications </topics/testing/index>` has comprehensive
 information about testing.
 
 .. _Selenium: http://seleniumhq.org/
@@ -641,10 +640,9 @@ information about testing.
 What's next?
 ============
 
-The beginner tutorial ends here for the time being. In the meantime, you might
-want to check out some pointers on :doc:`where to go from here
-</intro/whatsnext>`.
+For full details on testing, see :doc:`Testing in Django
+</topics/testing/index>`.
 
-If you are familiar with Python packaging and interested in learning how to
-turn polls into a "reusable app", check out :doc:`Advanced tutorial: How to
-write reusable apps</intro/reusable-apps>`.
+When you're comfortable with testing Django views, read
+:doc:`part 6 of this tutorial</intro/tutorial06>` to learn about
+static files management.
diff --git a/docs/intro/tutorial06.txt b/docs/intro/tutorial06.txt
new file mode 100644
index 0000000000..6b3d0f35e2
--- /dev/null
+++ b/docs/intro/tutorial06.txt
@@ -0,0 +1,125 @@
+=====================================
+Writing your first Django app, part 6
+=====================================
+
+This tutorial begins where :doc:`Tutorial 5 </intro/tutorial05>` left off.
+We've built a tested Web-poll application, and we'll now add a stylesheet and
+an image.
+
+Aside from the HTML generated by the server, web applications generally need
+to serve additional files — such as images, JavaScript, or CSS — necessary to
+render the complete web page. In Django, we refer to these files as "static
+files".
+
+For small projects, this isn't a big deal, because you can just keep the
+static files somewhere your web server can find it. However, in bigger
+projects -- especially those comprised of multiple apps -- dealing with the
+multiple sets of static files provided by each application starts to get
+tricky.
+
+That's what ``django.contrib.staticfiles`` is for: it collects static files
+from each of your applications (and any other places you specify) into a
+single location that can easily be served in production.
+
+Customize your *app's* look and feel
+====================================
+
+First, create a directory called ``static`` in your ``polls`` directory. Django
+will look for static files there, similarly to how Django finds templates
+inside ``polls/templates/``.
+
+Django's :setting:`STATICFILES_FINDERS` setting contains a list
+of finders that know how to discover static files from various
+sources. One of the defaults is ``AppDirectoriesFinder`` which
+looks for a "static" subdirectory in each of the
+:setting:`INSTALLED_APPS`, like the one in ``polls`` we just created. The admin
+site uses the same directory structure for its static files.
+
+Within the ``static`` directory you have just created, create another directory
+called ``polls`` and within that create a file called ``style.css``. In other
+words, your stylesheet should be at ``polls/static/polls/style.css``. Because
+of how the ``AppDirectoriesFinder`` staticfile finder works, you can refer to
+this static file in Django simply as ``polls/style.css``, similar to how you
+reference the path for templates.
+
+.. admonition:: Static file namespacing
+
+    Just like templates, we *might* be able to get away with putting our static
+    files directly in ``polls/static`` (rather than creating another ``polls``
+    subdirectory), but it would actually be a bad idea. Django will choose the
+    first static file it finds whose name matches, and if you had a static file
+    with the same name in a *different* application, Django would be unable to
+    distinguish between them. We need to be able to point Django at the right
+    one, and the easiest way to ensure this is by *namespacing* them. That is,
+    by putting those static files inside *another* directory named for the
+    application itself.
+
+Put the following code in that stylesheet (``polls/static/polls/style.css``):
+
+.. code-block:: css
+
+    li a {
+        color: green;
+    }
+
+Next, add the following at the top of ``polls/templates/polls/index.html``:
+
+.. code-block:: html+django
+
+    {% load staticfiles %}
+
+    <link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}" />
+
+``{% load staticfiles %}`` loads the :ttag:`{% static %} <staticfiles-static>`
+template tag from the ``staticfiles`` template library. The ``{% static %}``
+template tag generates the absolute URL of the static file.
+
+That's all you need to do for development. Reload
+``http://localhost:8000/polls/`` and you should see that the poll links are
+green (Django style!) which means that your stylesheet was properly loaded.
+
+Adding a background-image
+=========================
+
+Next, we'll create a subdirectory for images. Create an ``images`` subdirectory
+in the ``polls/static/polls/`` directory. Inside this directory, put an image
+called ``background.gif``. In other words, put your image in
+``polls/static/polls/images/background.gif``.
+
+Then, add to your stylesheet (``polls/static/polls/style.css``):
+
+.. code-block:: css
+
+    body {
+        background: white url("images/background.gif") no-repeat right bottom;
+    }
+
+Reload ``http://localhost:8000/polls/`` and you should see the background
+loaded in the bottom right of the screen.
+
+.. warning::
+
+    Of course the ``{% static %}`` template tag is not available for use in
+    static files like your stylesheet which aren't generated by Django. You
+    should always use **relative paths** to link your static files between each
+    other, because then you can change :setting:`STATIC_URL` (used by the
+    :ttag:`static` template tag to generate its URLs) without having to modify
+    a bunch of paths in your static files as well.
+
+These are the **basics**. For more details on settings and other bits included
+with the framework see
+:doc:`the static files howto </howto/static-files/index>` and the
+:doc:`the staticfiles reference </ref/contrib/staticfiles>`. :doc:`Deploying
+static files </howto/static-files/deployment>` discusses how to use static
+files on a real server.
+
+What's next?
+============
+
+The beginner tutorial ends here for the time being. In the meantime, you might
+want to check out some pointers on :doc:`where to go from here
+</intro/whatsnext>`.
+
+If you are familiar with Python packaging and interested in learning how to
+turn polls into a "reusable app", check out :doc:`Advanced tutorial: How to
+write reusable apps</intro/reusable-apps>`.
diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index 500a858d47..a677bc9efd 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -4,8 +4,8 @@ What to read next
 
 So you've read all the :doc:`introductory material </intro/index>` and have
 decided you'd like to keep using Django. We've only just scratched the surface
-with this intro (in fact, if you've read every single word you've still read
-less than 10% of the overall documentation).
+with this intro (in fact, if you've read every single word, you've read about
+5% of the overall documentation).
 
 So what's next?
 
@@ -23,9 +23,9 @@ to write a document about how to read the document about documentation.)
 Finding documentation
 =====================
 
-Django's got a *lot* of documentation -- almost 200,000 words -- so finding what
-you need can sometimes be tricky. A few good places to start are the :ref:`search`
-and the :ref:`genindex`.
+Django's got a *lot* of documentation -- almost 450,000 words and counting --
+so finding what you need can sometimes be tricky. A few good places to start
+are the :ref:`search` and the :ref:`genindex`.
 
 Or you can just browse around!
 
diff --git a/docs/make.bat b/docs/make.bat
index d7f54b2059..65602aa160 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -6,7 +6,7 @@ if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
 set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set ALLSPHINXOPTS=-n -d %BUILDDIR%/doctrees %SPHINXOPTS% .
 if NOT "%PAPER%" == "" (
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
 	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
diff --git a/docs/misc/api-stability.txt b/docs/misc/api-stability.txt
index 4f232e795b..8517866769 100644
--- a/docs/misc/api-stability.txt
+++ b/docs/misc/api-stability.txt
@@ -4,17 +4,19 @@ API stability
 
 :doc:`The release of Django 1.0 </releases/1.0>` comes with a promise of API
 stability and forwards-compatibility. In a nutshell, this means that code you
-develop against Django 1.0 will continue to work against 1.1 unchanged, and you
-should need to make only minor changes for any 1.X release.
+develop against a 1.X version of Django will continue to work with future
+1.X releases. You may need to make minor changes when upgrading the version of
+Django your project uses: see the "Backwards incompatible changes" section of
+the :doc:`release note </releases/index>` for the version or versions to which
+you are upgrading.
 
 What "stable" means
 ===================
 
 In this context, stable means:
 
-- All the public APIs -- everything documented in the linked documents below,
-  and all methods that don't begin with an underscore -- will not be moved or
-  renamed without providing backwards-compatible aliases.
+- All the public APIs (everything in this documentation) will not be moved
+  or renamed without providing backwards-compatible aliases.
 
 - If new features are added to these APIs -- which is quite possible --
   they will not break or change the meaning of existing methods. In other
@@ -35,77 +37,7 @@ Stable APIs
 ===========
 
 In general, everything covered in the documentation -- with the exception of
-anything in the :doc:`internals area </internals/index>` is considered stable as
-of 1.0. This includes these APIs:
-
-- :doc:`Authorization </topics/auth>`
-
-- :doc:`Caching </topics/cache>`.
-
-- :doc:`Model definition, managers, querying and transactions
-  </topics/db/index>`
-
-- :doc:`Sending email </topics/email>`.
-
-- :doc:`File handling and storage </topics/files>`
-
-- :doc:`Forms </topics/forms/index>`
-
-- :doc:`HTTP request/response handling </topics/http/index>`, including file
-  uploads, middleware, sessions, URL resolution, view, and shortcut APIs.
-
-- :doc:`Generic views </topics/class-based-views/index>`.
-
-- :doc:`Internationalization </topics/i18n/index>`.
-
-- :doc:`Pagination </topics/pagination>`
-
-- :doc:`Serialization </topics/serialization>`
-
-- :doc:`Signals </topics/signals>`
-
-- :doc:`Templates </topics/templates>`, including the language, Python-level
-  :doc:`template APIs </ref/templates/index>`, and :doc:`custom template tags
-  and libraries </howto/custom-template-tags>`. We may add new template
-  tags in the future and the names may inadvertently clash with
-  external template tags. Before adding any such tags, we'll ensure that
-  Django raises an error if it tries to load tags with duplicate names.
-
-- :doc:`Testing </topics/testing>`
-
-- :doc:`django-admin utility </ref/django-admin>`.
-
-- :doc:`Built-in middleware </ref/middleware>`
-
-- :doc:`Request/response objects </ref/request-response>`.
-
-- :doc:`Settings </ref/settings>`. Note, though that while the :doc:`list of
-  built-in settings </ref/settings>` can be considered complete we may -- and
-  probably will -- add new settings in future versions. This is one of those
-  places where "'stable' does not mean 'complete.'"
-
-- :doc:`Built-in signals </ref/signals>`. Like settings, we'll probably add
-  new signals in the future, but the existing ones won't break.
-
-- :doc:`Unicode handling </ref/unicode>`.
-
-- Everything covered by the :doc:`HOWTO guides </howto/index>`.
-
-``django.utils``
-----------------
-
-Most of the modules in ``django.utils`` are designed for internal use. Only
-the following parts of :doc:`django.utils </ref/utils>` can be considered stable:
-
-- ``django.utils.cache``
-- ``django.utils.datastructures.SortedDict`` -- only this single class; the
-  rest of the module is for internal use.
-- ``django.utils.encoding``
-- ``django.utils.feedgenerator``
-- ``django.utils.http``
-- ``django.utils.safestring``
-- ``django.utils.translation``
-- ``django.utils.tzinfo``
+anything in the :doc:`internals area </internals/index>` is considered stable.
 
 Exceptions
 ==========
@@ -118,24 +50,8 @@ Security fixes
 
 If we become aware of a security problem -- hopefully by someone following our
 :ref:`security reporting policy <reporting-security-issues>` -- we'll do
-everything necessary to fix it. This might mean breaking backwards compatibility; security trumps the compatibility guarantee.
-
-Contributed applications (``django.contrib``)
----------------------------------------------
-
-While we'll make every effort to keep these APIs stable -- and have no plans to
-break any contrib apps -- this is an area that will have more flux between
-releases. As the Web evolves, Django must evolve with it.
-
-However, any changes to contrib apps will come with an important guarantee:
-we'll make sure it's always possible to use an older version of a contrib app if
-we need to make changes. Thus, if Django 1.5 ships with a backwards-incompatible
-``django.contrib.flatpages``, we'll make sure you can still use the Django 1.4
-version alongside Django 1.5. This will continue to allow for easy upgrades.
-
-Historically, apps in ``django.contrib`` have been more stable than the core, so
-in practice we probably won't have to ever make this exception. However, it's
-worth noting if you're building apps that depend on ``django.contrib``.
+everything necessary to fix it. This might mean breaking backwards
+compatibility; security trumps the compatibility guarantee.
 
 APIs marked as internal
 -----------------------
@@ -149,56 +65,3 @@ Certain APIs are explicitly marked as "internal" in a couple of ways:
 - Functions, methods, and other objects prefixed by a leading underscore
   (``_``). This is the standard Python way of indicating that something is
   private; if any method starts with a single ``_``, it's an internal API.
-
-.. _misc-api-stability-localflavor:
-
-Local flavors
--------------
-
-:mod:`django.contrib.localflavor` contains assorted pieces of code
-that are useful for particular countries or cultures. This data is
-local in nature, and is subject to change on timelines that will
-almost never correlate with Django's own release schedules. For
-example, a common change is to split a province into two new
-provinces, or to rename an existing province.
-
-These changes present two competing compatibility issues. Moving
-forward, displaying the names of deprecated, renamed and dissolved
-provinces in a selection widget is bad from a user interface
-perspective. However, maintaining full backwards compatibility
-requires that we support historical values that may be stored in a
-database -- including values that may no longer be valid.
-
-Therefore, Django has the following policy with respect to changes in
-local flavor:
-
-* At the time of a Django release, the data and algorithms
-  contained in :mod:`django.contrib.localflavor` will, to the best
-  of our ability, reflect the officially gazetted policies of the
-  appropriate local government authority. If a province has been
-  added, altered, or removed, that change will be reflected in
-  Django's localflavor.
-
-* These changes will *not* be backported to the previous stable
-  release. Upgrading a minor version of Django should not require
-  any data migration or audits for UI changes; therefore, if you
-  want to get the latest province list, you will either need to
-  upgrade your Django install, or backport the province list you
-  need.
-
-* For one release, the affected localflavor module will raise a
-  ``RuntimeWarning`` when it is imported.
-
-* The change will be announced in the release notes as a backwards
-  incompatible change requiring attention. The change will also be
-  annotated in the documentation for the localflavor module.
-
-* Where necessary and feasible, a migration script will be provided
-  to aid the migration process.
-
-For example, Django 1.2 contains an Indonesian localflavor. It has a
-province list that includes "Nanggroe Aceh Darussalam (NAD)" as a
-province. The Indonesian government has changed the official name of
-the province to "Aceh (ACE)". As a result, Django 1.3 does *not*
-contain "Nanggroe Aceh Darussalam (NAD)" in the province list, but
-*does* contain "Aceh (ACE)".
diff --git a/docs/ref/authbackends.txt b/docs/ref/authbackends.txt
deleted file mode 100644
index 55a536e819..0000000000
--- a/docs/ref/authbackends.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-=======================
-Authentication backends
-=======================
-
-.. module:: django.contrib.auth.backends
-   :synopsis: Django's built-in authentication backend classes.
-
-This document details the authentication backends that come with Django. For
-information on how to use them and how to write your own authentication
-backends, see the :ref:`Other authentication sources section
-<authentication-backends>` of the :doc:`User authentication guide
-</topics/auth>`.
-
-
-Available authentication backends
-=================================
-
-The following backends are available in :mod:`django.contrib.auth.backends`:
-
-.. class:: ModelBackend
-
-    This is the default authentication backend used by Django.  It
-    authenticates using usernames and passwords stored in the
-    :class:`~django.contrib.auth.models.User` model.
-
-
-.. class:: RemoteUserBackend
-
-    Use this backend to take advantage of external-to-Django-handled
-    authentication.  It authenticates using usernames passed in
-    :attr:`request.META['REMOTE_USER'] <django.http.HttpRequest.META>`.  See
-    the :doc:`Authenticating against REMOTE_USER </howto/auth-remote-user>`
-    documentation.
diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt
index cc9aa852f1..2073458314 100644
--- a/docs/ref/class-based-views/base.txt
+++ b/docs/ref/class-based-views/base.txt
@@ -49,9 +49,13 @@ View
 
     **Attributes**
 
-    .. attribute:: http_method_names = ['get', 'post', 'put', 'delete', 'head', 'options', 'trace']
+    .. attribute:: http_method_names
 
-        The default list of HTTP method names that this view will accept.
+        The list of HTTP method names that this view will accept.
+
+        Default::
+
+            ['get', 'post', 'put', 'delete', 'head', 'options', 'trace']
 
     **Methods**
 
@@ -68,12 +72,11 @@ View
 
         The default implementation will inspect the HTTP method and attempt to
         delegate to a method that matches the HTTP method; a ``GET`` will be
-        delegated to :meth:`~View.get()`, a ``POST`` to :meth:`~View.post()`,
-        and so on.
+        delegated to ``get()``, a ``POST`` to ``post()``, and so on.
 
-        By default, a ``HEAD`` request will be delegated to :meth:`~View.get()`.
+        By default, a ``HEAD`` request will be delegated to ``get()``.
         If you need to handle ``HEAD`` requests in a different way than ``GET``,
-        you can override the :meth:`~View.head()` method. See
+        you can override the ``head()`` method. See
         :ref:`supporting-other-http-methods` for an example.
 
         The default implementation also sets ``request``, ``args`` and
@@ -98,8 +101,13 @@ TemplateView
 
 .. class:: django.views.generic.base.TemplateView
 
-    Renders a given template, passing it a ``{{ params }}`` template variable,
-    which is a dictionary of the parameters captured in the URL.
+    Renders a given template, with the context containing parameters captured
+    in the URL.
+
+    .. versionchanged:: 1.5
+        The context used to be populated with a ``{{ params }}`` dictionary of
+        the parameters captured in the URL. Now those parameters are first-level
+        context variables.
 
     **Ancestors (MRO)**
 
@@ -111,9 +119,9 @@ TemplateView
 
     **Method Flowchart**
 
-    1. :meth:`dispatch()`
-    2. :meth:`http_method_not_allowed()`
-    3. :meth:`get_context_data()`
+    1. :meth:`~django.views.generic.base.View.dispatch()`
+    2. :meth:`~django.views.generic.base.View.http_method_not_allowed()`
+    3. :meth:`~django.views.generic.base.ContextMixin.get_context_data()`
 
     **Example views.py**::
 
@@ -169,8 +177,8 @@ RedirectView
 
     **Method Flowchart**
 
-    1. :meth:`dispatch()`
-    2. :meth:`http_method_not_allowed()`
+    1. :meth:`~django.views.generic.base.View.dispatch()`
+    2. :meth:`~django.views.generic.base.View.http_method_not_allowed()`
     3. :meth:`get_redirect_url()`
 
     **Example views.py**::
@@ -230,9 +238,8 @@ RedirectView
 
         Constructs the target URL for redirection.
 
-        The default implementation uses :attr:`~RedirectView.url` as a starting
+        The default implementation uses :attr:`url` as a starting
         string, performs expansion of ``%`` parameters in that string, as well
-        as the appending of query string if requested by
-        :attr:`~RedirectView.query_string`. Subclasses may implement any
-        behavior they wish, as long as the method returns a redirect-ready URL
-        string.
+        as the appending of query string if requested by :attr:`query_string`.
+        Subclasses may implement any behavior they wish, as long as the method
+        returns a redirect-ready URL string.
diff --git a/docs/ref/class-based-views/flattened-index.txt b/docs/ref/class-based-views/flattened-index.txt
index aa2f51f156..df00f87aa0 100644
--- a/docs/ref/class-based-views/flattened-index.txt
+++ b/docs/ref/class-based-views/flattened-index.txt
@@ -23,7 +23,7 @@ View
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 
 TemplateView
@@ -32,17 +32,18 @@ TemplateView
 
 **Attributes** (with optional accessor):
 
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.base.View.http_method_names`
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 
 **Methods**
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.base.TemplateView.get`
-* :meth:`~django.views.generic.base.TemplateView.get_context_data`
-* :meth:`~django.views.generic.base.View.head`
+* ``get()``
+* :meth:`~django.views.generic.base.ContextMixin.get_context_data`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
 
@@ -60,15 +61,15 @@ RedirectView
 **Methods**
 
 * :meth:`~django.views.generic.base.View.as_view`
-* :meth:`~django.views.generic.base.RedirectView.delete`
+* ``delete()``
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.base.RedirectView.get`
+* ``get()``
 * :meth:`~django.views.generic.base.RedirectView.get_redirect_url`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
-* :meth:`~django.views.generic.base.RedirectView.options`
-* :meth:`~django.views.generic.base.RedirectView.post`
-* :meth:`~django.views.generic.base.RedirectView.put`
+* ``options()``
+* ``post()``
+* ``put()``
 
 Detail Views
 ------------
@@ -79,12 +80,13 @@ DetailView
 
 **Attributes** (with optional accessor):
 
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.context_object_name` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.base.View.http_method_names`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.model`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.pk_url_kwarg`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.queryset` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_field` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_slug_field`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_url_kwarg`
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
@@ -95,10 +97,10 @@ DetailView
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.detail.BaseDetailView.get`
+* ``get()``
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
 
@@ -112,6 +114,7 @@ ListView
 **Attributes** (with optional accessor):
 
 * :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_allow_empty`]
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.context_object_name` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.base.View.http_method_names`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.model`
@@ -119,7 +122,7 @@ ListView
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_orphans` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_orphans`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginator_class`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.queryset` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 * :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
 
@@ -130,7 +133,7 @@ ListView
 * :meth:`~django.views.generic.list.BaseListView.get`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -144,10 +147,11 @@ FormView
 
 **Attributes** (with optional accessor):
 
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.edit.FormMixin.form_class` [:meth:`~django.views.generic.edit.FormMixin.get_form_class`]
 * :attr:`~django.views.generic.base.View.http_method_names`
 * :attr:`~django.views.generic.edit.FormMixin.initial` [:meth:`~django.views.generic.edit.FormMixin.get_initial`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.edit.FormMixin.success_url` [:meth:`~django.views.generic.edit.FormMixin.get_success_url`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 
@@ -161,11 +165,9 @@ FormView
 * :meth:`~django.views.generic.edit.FormMixin.get_context_data`
 * :meth:`~django.views.generic.edit.FormMixin.get_form`
 * :meth:`~django.views.generic.edit.FormMixin.get_form_kwargs`
-* :meth:`~django.views.generic.base.View.head`
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.edit.ProcessFormView.post`
 * :meth:`~django.views.generic.edit.ProcessFormView.put`
-* :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
 
 CreateView
 ~~~~~~~~~~
@@ -173,6 +175,7 @@ CreateView
 
 **Attributes** (with optional accessor):
 
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.context_object_name` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.edit.FormMixin.form_class` [:meth:`~django.views.generic.edit.FormMixin.get_form_class`]
 * :attr:`~django.views.generic.base.View.http_method_names`
@@ -180,7 +183,7 @@ CreateView
 * :attr:`~django.views.generic.detail.SingleObjectMixin.model`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.pk_url_kwarg`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.queryset` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_field` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_slug_field`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_url_kwarg`
 * :attr:`~django.views.generic.edit.FormMixin.success_url` [:meth:`~django.views.generic.edit.FormMixin.get_success_url`]
@@ -199,10 +202,10 @@ CreateView
 * :meth:`~django.views.generic.edit.FormMixin.get_form`
 * :meth:`~django.views.generic.edit.FormMixin.get_form_kwargs`
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.edit.ProcessFormView.post`
-* :meth:`~django.views.generic.edit.ProcessFormView.put`
+* ``put()``
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
 
 UpdateView
@@ -211,6 +214,7 @@ UpdateView
 
 **Attributes** (with optional accessor):
 
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.context_object_name` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.edit.FormMixin.form_class` [:meth:`~django.views.generic.edit.FormMixin.get_form_class`]
 * :attr:`~django.views.generic.base.View.http_method_names`
@@ -218,7 +222,7 @@ UpdateView
 * :attr:`~django.views.generic.detail.SingleObjectMixin.model`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.pk_url_kwarg`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.queryset` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_field` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_slug_field`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_url_kwarg`
 * :attr:`~django.views.generic.edit.FormMixin.success_url` [:meth:`~django.views.generic.edit.FormMixin.get_success_url`]
@@ -237,10 +241,10 @@ UpdateView
 * :meth:`~django.views.generic.edit.FormMixin.get_form`
 * :meth:`~django.views.generic.edit.FormMixin.get_form_kwargs`
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.edit.ProcessFormView.post`
-* :meth:`~django.views.generic.edit.ProcessFormView.put`
+* ``put()``
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
 
 DeleteView
@@ -249,12 +253,13 @@ DeleteView
 
 **Attributes** (with optional accessor):
 
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.context_object_name` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.base.View.http_method_names`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.model`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.pk_url_kwarg`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.queryset` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_field` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_slug_field`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_url_kwarg`
 * :attr:`~django.views.generic.edit.DeletionMixin.success_url` [:meth:`~django.views.generic.edit.DeletionMixin.get_success_url`]
@@ -265,14 +270,14 @@ DeleteView
 **Methods**
 
 * :meth:`~django.views.generic.base.View.as_view`
-* :meth:`~django.views.generic.edit.DeletionMixin.delete`
+* ``delete()``
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.detail.BaseDetailView.get`
+* ``get()``
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
-* :meth:`~django.views.generic.edit.DeletionMixin.post`
+* ``post()``
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
 
 Date-based views
@@ -286,6 +291,7 @@ ArchiveIndexView
 
 * :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_allow_empty`]
 * :attr:`~django.views.generic.dates.DateMixin.allow_future` [:meth:`~django.views.generic.dates.DateMixin.get_allow_future`]
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.context_object_name` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.dates.DateMixin.date_field` [:meth:`~django.views.generic.dates.DateMixin.get_date_field`]
 * :attr:`~django.views.generic.base.View.http_method_names`
@@ -294,7 +300,7 @@ ArchiveIndexView
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_orphans` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_orphans`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginator_class`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.queryset` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 * :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
 
@@ -302,13 +308,13 @@ ArchiveIndexView
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
+* ``get()``
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_queryset`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -321,16 +327,17 @@ YearArchiveView
 
 * :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_allow_empty`]
 * :attr:`~django.views.generic.dates.DateMixin.allow_future` [:meth:`~django.views.generic.dates.DateMixin.get_allow_future`]
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.context_object_name` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.dates.DateMixin.date_field` [:meth:`~django.views.generic.dates.DateMixin.get_date_field`]
 * :attr:`~django.views.generic.base.View.http_method_names`
-* :attr:`~django.views.generic.dates.BaseYearArchiveView.make_object_list` [:meth:`~django.views.generic.dates.BaseYearArchiveView.get_make_object_list`]
+* :attr:`~django.views.generic.dates.YearArchiveView.make_object_list` [:meth:`~django.views.generic.dates.YearArchiveView.get_make_object_list`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.model`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_by` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_by`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_orphans` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_orphans`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginator_class`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.queryset` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 * :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
 * :attr:`~django.views.generic.dates.YearMixin.year` [:meth:`~django.views.generic.dates.YearMixin.get_year`]
@@ -340,13 +347,13 @@ YearArchiveView
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
+* ``get()``
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_queryset`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -359,6 +366,7 @@ MonthArchiveView
 
 * :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_allow_empty`]
 * :attr:`~django.views.generic.dates.DateMixin.allow_future` [:meth:`~django.views.generic.dates.DateMixin.get_allow_future`]
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.context_object_name` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.dates.DateMixin.date_field` [:meth:`~django.views.generic.dates.DateMixin.get_date_field`]
 * :attr:`~django.views.generic.base.View.http_method_names`
@@ -369,7 +377,7 @@ MonthArchiveView
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_orphans` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_orphans`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginator_class`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.queryset` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 * :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
 * :attr:`~django.views.generic.dates.YearMixin.year` [:meth:`~django.views.generic.dates.YearMixin.get_year`]
@@ -379,7 +387,7 @@ MonthArchiveView
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
+* ``get()``
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
@@ -387,7 +395,7 @@ MonthArchiveView
 * :meth:`~django.views.generic.dates.MonthMixin.get_next_month`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
 * :meth:`~django.views.generic.dates.MonthMixin.get_previous_month`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -400,6 +408,7 @@ WeekArchiveView
 
 * :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_allow_empty`]
 * :attr:`~django.views.generic.dates.DateMixin.allow_future` [:meth:`~django.views.generic.dates.DateMixin.get_allow_future`]
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.context_object_name` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.dates.DateMixin.date_field` [:meth:`~django.views.generic.dates.DateMixin.get_date_field`]
 * :attr:`~django.views.generic.base.View.http_method_names`
@@ -408,7 +417,7 @@ WeekArchiveView
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_orphans` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_orphans`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginator_class`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.queryset` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 * :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
 * :attr:`~django.views.generic.dates.WeekMixin.week` [:meth:`~django.views.generic.dates.WeekMixin.get_week`]
@@ -420,13 +429,13 @@ WeekArchiveView
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
+* ``get()``
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_queryset`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -439,6 +448,7 @@ DayArchiveView
 
 * :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_allow_empty`]
 * :attr:`~django.views.generic.dates.DateMixin.allow_future` [:meth:`~django.views.generic.dates.DateMixin.get_allow_future`]
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.context_object_name` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.dates.DateMixin.date_field` [:meth:`~django.views.generic.dates.DateMixin.get_date_field`]
 * :attr:`~django.views.generic.dates.DayMixin.day` [:meth:`~django.views.generic.dates.DayMixin.get_day`]
@@ -451,7 +461,7 @@ DayArchiveView
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_orphans` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_orphans`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginator_class`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.queryset` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 * :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
 * :attr:`~django.views.generic.dates.YearMixin.year` [:meth:`~django.views.generic.dates.YearMixin.get_year`]
@@ -461,7 +471,7 @@ DayArchiveView
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
+* ``get()``
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
@@ -471,7 +481,7 @@ DayArchiveView
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
 * :meth:`~django.views.generic.dates.DayMixin.get_previous_day`
 * :meth:`~django.views.generic.dates.MonthMixin.get_previous_month`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -484,6 +494,7 @@ TodayArchiveView
 
 * :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_allow_empty`]
 * :attr:`~django.views.generic.dates.DateMixin.allow_future` [:meth:`~django.views.generic.dates.DateMixin.get_allow_future`]
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.context_object_name` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.dates.DateMixin.date_field` [:meth:`~django.views.generic.dates.DateMixin.get_date_field`]
 * :attr:`~django.views.generic.dates.DayMixin.day` [:meth:`~django.views.generic.dates.DayMixin.get_day`]
@@ -496,7 +507,7 @@ TodayArchiveView
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_orphans` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_orphans`]
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginator_class`
 * :attr:`~django.views.generic.list.MultipleObjectMixin.queryset` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
 * :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
 * :attr:`~django.views.generic.dates.YearMixin.year` [:meth:`~django.views.generic.dates.YearMixin.get_year`]
@@ -506,7 +517,7 @@ TodayArchiveView
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
+* ``get()``
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
@@ -516,7 +527,7 @@ TodayArchiveView
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
 * :meth:`~django.views.generic.dates.DayMixin.get_previous_day`
 * :meth:`~django.views.generic.dates.MonthMixin.get_previous_month`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -528,6 +539,7 @@ DateDetailView
 **Attributes** (with optional accessor):
 
 * :attr:`~django.views.generic.dates.DateMixin.allow_future` [:meth:`~django.views.generic.dates.DateMixin.get_allow_future`]
+* :attr:`~django.views.generic.base.TemplateResponseMixin.content_type`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.context_object_name` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_context_object_name`]
 * :attr:`~django.views.generic.dates.DateMixin.date_field` [:meth:`~django.views.generic.dates.DateMixin.get_date_field`]
 * :attr:`~django.views.generic.dates.DayMixin.day` [:meth:`~django.views.generic.dates.DayMixin.get_day`]
@@ -538,7 +550,7 @@ DateDetailView
 * :attr:`~django.views.generic.dates.MonthMixin.month_format` [:meth:`~django.views.generic.dates.MonthMixin.get_month_format`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.pk_url_kwarg`
 * :attr:`~django.views.generic.detail.SingleObjectMixin.queryset` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_queryset`]
-* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class`
+* :attr:`~django.views.generic.base.TemplateResponseMixin.response_class` [:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_field` [:meth:`~django.views.generic.detail.SingleObjectMixin.get_slug_field`]
 * :attr:`~django.views.generic.detail.SingleObjectMixin.slug_url_kwarg`
 * :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` [:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names`]
@@ -551,13 +563,13 @@ DateDetailView
 
 * :meth:`~django.views.generic.base.View.as_view`
 * :meth:`~django.views.generic.base.View.dispatch`
-* :meth:`~django.views.generic.detail.BaseDetailView.get`
+* ``get()``
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_data`
 * :meth:`~django.views.generic.dates.DayMixin.get_next_day`
 * :meth:`~django.views.generic.dates.MonthMixin.get_next_month`
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
 * :meth:`~django.views.generic.dates.DayMixin.get_previous_day`
 * :meth:`~django.views.generic.dates.MonthMixin.get_previous_month`
-* :meth:`~django.views.generic.base.View.head`
+* ``head()``
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
diff --git a/docs/ref/class-based-views/generic-date-based.txt b/docs/ref/class-based-views/generic-date-based.txt
index 0ae0bcdf42..4144c382f8 100644
--- a/docs/ref/class-based-views/generic-date-based.txt
+++ b/docs/ref/class-based-views/generic-date-based.txt
@@ -42,6 +42,20 @@ ArchiveIndexView
     * :class:`django.views.generic.dates.DateMixin`
     * :class:`django.views.generic.base.View`
 
+    **Context**
+
+    In addition to the context provided by
+    :class:`django.views.generic.list.MultipleObjectMixin` (via
+    :class:`django.views.generic.dates.BaseDateListView`), the template's
+    context will be:
+
+    * ``date_list``: A
+      :meth:`DateQuerySet<django.db.models.query.QuerySet.dates>` object
+      containing all years that have objects available according to
+      ``queryset``, represented as
+      :class:`datetime.datetime<python:datetime.datetime>` objects, in
+      descending order.
+
     **Notes**
 
     * Uses a default ``context_object_name`` of ``latest``.
@@ -109,7 +123,6 @@ YearArchiveView
         Determine if an object list will be returned as part of the context.
         Returns :attr:`~YearArchiveView.make_object_list` by default.
 
-
     **Context**
 
     In addition to the context provided by
@@ -118,7 +131,7 @@ YearArchiveView
     context will be:
 
     * ``date_list``: A
-      :meth:`DateQuerySet<django.db.models.query.QuerySet.dates>` object object
+      :meth:`DateQuerySet<django.db.models.query.QuerySet.dates>` object
       containing all months that have objects available according to
       ``queryset``, represented as
       :class:`datetime.datetime<python:datetime.datetime>` objects, in
@@ -580,7 +593,7 @@ DateDetailView
     * :class:`django.views.generic.dates.MonthMixin`
     * :class:`django.views.generic.dates.DayMixin`
     * :class:`django.views.generic.dates.DateMixin`
-    * :class:`django.views.generic.detail.BaseDetailView`
+    * ``django.views.generic.detail.BaseDetailView``
     * :class:`django.views.generic.detail.SingleObjectMixin`
     * :class:`django.views.generic.base.View`
 
diff --git a/docs/ref/class-based-views/generic-display.txt b/docs/ref/class-based-views/generic-display.txt
index 12603ff0df..b827c0005c 100644
--- a/docs/ref/class-based-views/generic-display.txt
+++ b/docs/ref/class-based-views/generic-display.txt
@@ -19,22 +19,22 @@ DetailView
 
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
-    * :class:`django.views.generic.detail.BaseDetailView`
+    * ``django.views.generic.detail.BaseDetailView``
     * :class:`django.views.generic.detail.SingleObjectMixin`
     * :class:`django.views.generic.base.View`
 
     **Method Flowchart**
 
-    1. :meth:`dispatch()`
-    2. :meth:`http_method_not_allowed()`
-    3. :meth:`get_template_names()`
-    4. :meth:`get_slug_field()`
-    5. :meth:`get_queryset()`
-    6. :meth:`get_object()`
-    7. :meth:`get_context_object_name()`
-    8. :meth:`get_context_data()`
-    9. :meth:`get()`
-    10. :meth:`render_to_response()`
+    1. :meth:`~django.views.generic.base.View.dispatch()`
+    2. :meth:`~django.views.generic.base.View.http_method_not_allowed()`
+    3. :meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names()`
+    4. :meth:`~django.views.generic.detail.SingleObjectMixin.get_slug_field()`
+    5. :meth:`~django.views.generic.detail.SingleObjectMixin.get_queryset()`
+    6. :meth:`~django.views.generic.detail.SingleObjectMixin.get_object()`
+    7. :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_object_name()`
+    8. :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_data()`
+    9. ``get()``
+    10. :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response()`
 
     **Example views.py**::
 
@@ -86,14 +86,14 @@ ListView
 
     **Method Flowchart**
 
-    1. :meth:`dispatch()`
-    2. :meth:`http_method_not_allowed()`
-    3. :meth:`get_template_names()`
-    4. :meth:`get_queryset()`
-    5. :meth:`get_objects()`
-    6. :meth:`get_context_data()`
-    7. :meth:`get()`
-    8. :meth:`render_to_response()`
+    1. :meth:`~django.views.generic.base.View.dispatch()`
+    2. :meth:`~django.views.generic.base.View.http_method_not_allowed()`
+    3. :meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names()`
+    4. :meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset()`
+    5. :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name()`
+    6. :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data()`
+    7. ``get()``
+    8. :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response()`
 
 
     **Example views.py**::
@@ -140,7 +140,7 @@ ListView
 
     .. method:: get(request, *args, **kwargs)
 
-        Adds :attr:`object_list` to the context. If
+        Adds ``object_list`` to the context. If
         :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty`
         is True then display an empty list. If
         :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` is
diff --git a/docs/ref/class-based-views/generic-editing.txt b/docs/ref/class-based-views/generic-editing.txt
index 7ce5c1d1be..1dbb427036 100644
--- a/docs/ref/class-based-views/generic-editing.txt
+++ b/docs/ref/class-based-views/generic-editing.txt
@@ -12,7 +12,7 @@ editing content:
 
 .. note::
 
-    Some of the examples on this page assume that an ``Article`` model has been
+    Some of the examples on this page assume that an ``Author`` model has been
     defined as follows in ``myapp/models.py``::
 
         from django.core.urlresolvers import reverse
@@ -38,7 +38,7 @@ FormView
 
     * :class:`django.views.generic.edit.FormView`
     * :class:`django.views.generic.base.TemplateResponseMixin`
-    * :class:`django.views.generic.edit.BaseFormView`
+    * ``django.views.generic.edit.BaseFormView``
     * :class:`django.views.generic.edit.FormMixin`
     * :class:`django.views.generic.edit.ProcessFormView`
     * :class:`django.views.generic.base.View`
@@ -86,7 +86,7 @@ CreateView
     * :class:`django.views.generic.edit.CreateView`
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
-    * :class:`django.views.generic.edit.BaseCreateView`
+    * ``django.views.generic.edit.BaseCreateView``
     * :class:`django.views.generic.edit.ModelFormMixin`
     * :class:`django.views.generic.edit.FormMixin`
     * :class:`django.views.generic.detail.SingleObjectMixin`
@@ -97,11 +97,11 @@ CreateView
 
     .. attribute:: template_name_suffix
 
-        The CreateView page displayed to a GET request uses a
-        ``template_name_suffix`` of ``'_form.html'``. For
-        example, changing this attribute to ``'_create_form.html'`` for a view
-        creating objects for the the example `Author` model would cause the the
-        default `template_name` to be ``'myapp/author_create_form.html'``.
+        The ``CreateView`` page displayed to a ``GET`` request uses a
+        ``template_name_suffix`` of ``'_form'``. For
+        example, changing this attribute to ``'_create_form'`` for a view
+        creating objects for the example ``Author`` model would cause the
+        default ``template_name`` to be ``'myapp/author_create_form.html'``.
 
     **Example views.py**::
 
@@ -128,7 +128,7 @@ UpdateView
     * :class:`django.views.generic.edit.UpdateView`
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
-    * :class:`django.views.generic.edit.BaseUpdateView`
+    * ``django.views.generic.edit.BaseUpdateView``
     * :class:`django.views.generic.edit.ModelFormMixin`
     * :class:`django.views.generic.edit.FormMixin`
     * :class:`django.views.generic.detail.SingleObjectMixin`
@@ -139,11 +139,11 @@ UpdateView
 
     .. attribute:: template_name_suffix
 
-        The UpdateView page displayed to a GET request uses a
-        ``template_name_suffix`` of ``'_form.html'``. For
-        example, changing this attribute to ``'_update_form.html'`` for a view
-        updating objects for the the example `Author` model would cause the the
-        default `template_name` to be ``'myapp/author_update_form.html'``.
+        The ``UpdateView`` page displayed to a ``GET`` request uses a
+        ``template_name_suffix`` of ``'_form'``. For
+        example, changing this attribute to ``'_update_form'`` for a view
+        updating objects for the example ``Author`` model would cause the
+        default ``template_name`` to be ``'myapp/author_update_form.html'``.
 
     **Example views.py**::
 
@@ -170,9 +170,9 @@ DeleteView
     * :class:`django.views.generic.edit.DeleteView`
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
     * :class:`django.views.generic.base.TemplateResponseMixin`
-    * :class:`django.views.generic.edit.BaseDeleteView`
+    * ``django.views.generic.edit.BaseDeleteView``
     * :class:`django.views.generic.edit.DeletionMixin`
-    * :class:`django.views.generic.detail.BaseDetailView`
+    * ``django.views.generic.detail.BaseDetailView``
     * :class:`django.views.generic.detail.SingleObjectMixin`
     * :class:`django.views.generic.base.View`
 
@@ -180,11 +180,11 @@ DeleteView
 
     .. attribute:: template_name_suffix
 
-        The DeleteView page displayed to a GET request uses a
-        ``template_name_suffix`` of ``'_confirm_delete.html'``. For
-        example, changing this attribute to ``'_check_delete.html'`` for a view
-        deleting objects for the the example `Author` model would cause the the
-        default `template_name` to be ``'myapp/author_check_delete.html'``.
+        The ``DeleteView`` page displayed to a ``GET`` request uses a
+        ``template_name_suffix`` of ``'_confirm_delete'``. For
+        example, changing this attribute to ``'_check_delete'`` for a view
+        deleting objects for the example ``Author`` model would cause the
+        default ``template_name`` to be ``'myapp/author_check_delete.html'``.
 
 
     **Example views.py**::
diff --git a/docs/ref/class-based-views/mixins-date-based.txt b/docs/ref/class-based-views/mixins-date-based.txt
index 561e525e70..75f2a77615 100644
--- a/docs/ref/class-based-views/mixins-date-based.txt
+++ b/docs/ref/class-based-views/mixins-date-based.txt
@@ -35,8 +35,8 @@ YearMixin
         Tries the following sources, in order:
 
         * The value of the :attr:`YearMixin.year` attribute.
-        * The value of the `year` argument captured in the URL pattern.
-        * The value of the `year` GET query argument.
+        * The value of the ``year`` argument captured in the URL pattern.
+        * The value of the ``year`` ``GET`` query argument.
 
         Raises a 404 if no valid year specification can be found.
 
@@ -87,8 +87,8 @@ MonthMixin
         Tries the following sources, in order:
 
         * The value of the :attr:`MonthMixin.month` attribute.
-        * The value of the `month` argument captured in the URL pattern.
-        * The value of the `month` GET query argument.
+        * The value of the ``month`` argument captured in the URL pattern.
+        * The value of the ``month`` ``GET`` query argument.
 
         Raises a 404 if no valid month specification can be found.
 
@@ -100,7 +100,7 @@ MonthMixin
         :attr:`~BaseDateListView.allow_empty` and
         :attr:`~DateMixin.allow_future`.
 
-    .. method:: get_prev_month(date)
+    .. method:: get_previous_month(date)
 
         Returns a date object containing the first day of the month before the
         date provided. This function can also return ``None`` or raise an
@@ -139,8 +139,8 @@ DayMixin
         Tries the following sources, in order:
 
         * The value of the :attr:`DayMixin.day` attribute.
-        * The value of the `day` argument captured in the URL pattern.
-        * The value of the `day` GET query argument.
+        * The value of the ``day`` argument captured in the URL pattern.
+        * The value of the ``day`` ``GET`` query argument.
 
         Raises a 404 if no valid day specification can be found.
 
@@ -152,7 +152,7 @@ DayMixin
         :attr:`~BaseDateListView.allow_empty` and
         :attr:`~DateMixin.allow_future`.
 
-    .. method:: get_prev_day(date)
+    .. method:: get_previous_day(date)
 
         Returns a date object containing the previous valid day. This function
         can also return ``None`` or raise an :class:`~django.http.Http404`
@@ -192,8 +192,8 @@ WeekMixin
         Tries the following sources, in order:
 
         * The value of the :attr:`WeekMixin.week` attribute.
-        * The value of the `week` argument captured in the URL pattern
-        * The value of the `week` GET query argument.
+        * The value of the ``week`` argument captured in the URL pattern
+        * The value of the ``week`` ``GET`` query argument.
 
         Raises a 404 if no valid week specification can be found.
 
@@ -287,8 +287,9 @@ BaseDateListView
         available. If this is ``True`` and no objects are available, the view
         will display an empty page instead of raising a 404.
 
-        This is identical to :attr:`MultipleObjectMixin.allow_empty`, except
-        for the default value, which is ``False``.
+        This is identical to
+        :attr:`django.views.generic.list.MultipleObjectMixin.allow_empty`,
+        except for the default value, which is ``False``.
 
     .. attribute:: date_list_period
 
diff --git a/docs/ref/class-based-views/mixins-editing.txt b/docs/ref/class-based-views/mixins-editing.txt
index 95dd24f442..a4175369aa 100644
--- a/docs/ref/class-based-views/mixins-editing.txt
+++ b/docs/ref/class-based-views/mixins-editing.txt
@@ -40,11 +40,6 @@ FormMixin
         Retrieve initial data for the form. By default, returns a copy of
         :attr:`~django.views.generic.edit.FormMixin.initial`.
 
-        .. versionchanged:: 1.4
-            In Django 1.3, this method was returning the
-            :attr:`~django.views.generic.edit.FormMixin.initial` class variable
-            itself.
-
     .. method:: get_form_class()
 
         Retrieve the form class to instantiate. By default
@@ -88,9 +83,8 @@ FormMixin
 
     .. note::
 
-        Views mixing :class:`FormMixin` must provide an implementation of
-        :meth:`~django.views.generic.FormMixin.form_valid` and
-        :meth:`~django.views.generic.FormMixin.form_invalid`.
+        Views mixing ``FormMixin`` must provide an implementation of
+        :meth:`form_valid` and :meth:`form_invalid`.
 
 
 ModelFormMixin
@@ -98,15 +92,16 @@ ModelFormMixin
 
 .. class:: django.views.generic.edit.ModelFormMixin
 
-    A form mixin that works on ModelForms, rather than a standalone form.
+    A form mixin that works on ``ModelForms``, rather than a standalone form.
 
     Since this is a subclass of
     :class:`~django.views.generic.detail.SingleObjectMixin`, instances of this
-    mixin have access to the :attr:`~SingleObjectMixin.model` and
-    :attr:`~SingleObjectMixin.queryset` attributes, describing the type of
-    object that the ModelForm is manipulating. The view also provides
-    ``self.object``, the instance being manipulated. If the instance is being
-    created, ``self.object`` will be ``None``.
+    mixin have access to the
+    :attr:`~django.views.generic.detail.SingleObjectMixin.model` and
+    :attr:`~django.views.generic.detail.SingleObjectMixin.queryset` attributes,
+    describing the type of object that the ``ModelForm`` is manipulating. The
+    view also provides ``self.object``, the instance being manipulated. If the
+    instance is being created, ``self.object`` will be ``None``.
 
     **Mixins**
 
@@ -115,6 +110,12 @@ ModelFormMixin
 
     **Methods and Attributes**
 
+    .. attribute:: model
+
+        A model class. Can be explicitly provided, otherwise will be determined
+        by examining ``self.object`` or
+        :attr:`~django.views.generic.detail.SingleObjectMixin.queryset`.
+
     .. attribute:: success_url
 
         The URL to redirect to when the form is successfully processed.
@@ -127,22 +128,25 @@ ModelFormMixin
     .. method:: get_form_class()
 
         Retrieve the form class to instantiate. If
-        :attr:`FormMixin.form_class` is provided, that class will be used.
-        Otherwise, a ModelForm will be instantiated using the model associated
-        with the :attr:`~SingleObjectMixin.queryset`, or with the
-        :attr:`~SingleObjectMixin.model`, depending on which attribute is
-        provided.
+        :attr:`~django.views.generic.edit.FormMixin.form_class` is provided,
+        that class will be used. Otherwise, a ``ModelForm`` will be
+        instantiated using the model associated with the
+        :attr:`~django.views.generic.detail.SingleObjectMixin.queryset`, or
+        with the :attr:`~django.views.generic.detail.SingleObjectMixin.model`,
+        depending on which attribute is provided.
 
     .. method:: get_form_kwargs()
 
         Add the current instance (``self.object``) to the standard
-        :meth:`FormMixin.get_form_kwargs`.
+        :meth:`~django.views.generic.edit.FormMixin.get_form_kwargs`.
 
     .. method:: get_success_url()
 
         Determine the URL to redirect to when the form is successfully
-        validated. Returns :attr:`ModelFormMixin.success_url` if it is provided;
-        otherwise, attempts to use the ``get_absolute_url()`` of the object.
+        validated. Returns
+        :attr:`django.views.generic.edit.ModelFormMixin.success_url` if it is
+        provided; otherwise, attempts to use the ``get_absolute_url()`` of the
+        object.
 
     .. method:: form_valid(form)
 
@@ -184,7 +188,10 @@ ProcessFormView
         Constructs a form, checks the form for validity, and handles it
         accordingly.
 
-    The PUT action is also handled, as an analog of POST.
+    .. method:: put(*args, **kwargs)
+
+        The ``PUT`` action is also handled and just passes all parameters
+        through to :meth:`post`.
 
 .. class:: django.views.generic.edit.DeletionMixin
 
@@ -197,7 +204,14 @@ ProcessFormView
         The url to redirect to when the nominated object has been
         successfully deleted.
 
-    .. method:: get_success_url(obj)
+        .. versionadded:: 1.6
+
+        ``success_url`` may contain dictionary string formatting, which
+        will be interpolated against the object's field attributes. For
+        example, you could use ``success_url="/parent/%(parent_id)s/"`` to
+        redirect to a URL composed out of the ``parent_id`` field on a model.
+
+    .. method:: get_success_url()
 
         Returns the url to redirect to when the nominated object has been
         successfully deleted. Returns
diff --git a/docs/ref/class-based-views/mixins-multiple-object.txt b/docs/ref/class-based-views/mixins-multiple-object.txt
index c85c962bce..b28bd11a71 100644
--- a/docs/ref/class-based-views/mixins-multiple-object.txt
+++ b/docs/ref/class-based-views/mixins-multiple-object.txt
@@ -61,14 +61,13 @@ MultipleObjectMixin
     .. attribute:: queryset
 
         A ``QuerySet`` that represents the objects. If provided, the value of
-        :attr:`MultipleObjectMixin.queryset` supersedes the value provided for
-        :attr:`MultipleObjectMixin.model`.
+        ``queryset`` supersedes the value provided for :attr:`model`.
 
     .. attribute:: paginate_by
 
         An integer specifying how many objects should be displayed per page. If
         this is given, the view will paginate objects with
-        :attr:`MultipleObjectMixin.paginate_by` objects per page. The view will
+        ``paginate_by`` objects per page. The view will
         expect either a ``page`` query string parameter (via ``request.GET``)
         or a ``page`` variable specified in the URLconf.
 
@@ -77,10 +76,9 @@ MultipleObjectMixin
         .. versionadded:: 1.6
 
         An integer specifying the number of "overflow" objects the last page
-        can contain. This extends the :attr:`MultipleObjectMixin.paginate_by`
-        limit on the last page by up to
-        :attr:`MultipleObjectMixin.paginate_orphans`, in order to keep the last
-        page from having a very small number of objects.
+        can contain. This extends the :attr:`paginate_by` limit on the last
+        page by up to ``paginate_orphans``, in order to keep the last page from
+        having a very small number of objects.
 
     .. attribute:: page_kwarg
 
@@ -97,7 +95,7 @@ MultipleObjectMixin
        :class:`django.core.paginator.Paginator` is used. If the custom paginator
        class doesn't have the same constructor interface as
        :class:`django.core.paginator.Paginator`, you will also need to
-       provide an implementation for :meth:`MultipleObjectMixin.get_paginator`.
+       provide an implementation for :meth:`get_paginator`.
 
     .. attribute:: context_object_name
 
@@ -122,20 +120,20 @@ MultipleObjectMixin
 
         Returns the number of items to paginate by, or ``None`` for no
         pagination. By default this simply returns the value of
-        :attr:`MultipleObjectMixin.paginate_by`.
+        :attr:`paginate_by`.
 
     .. method:: get_paginator(queryset, per_page, orphans=0, allow_empty_first_page=True)
 
         Returns an instance of the paginator to use for this view. By default,
         instantiates an instance of :attr:`paginator_class`.
 
-    .. method:: get_paginate_by()
+    .. method:: get_paginate_orphans()
 
         .. versionadded:: 1.6
 
         An integer specifying the number of "overflow" objects the last page
         can contain. By default this simply returns the value of
-        :attr:`MultipleObjectMixin.paginate_orphans`.
+        :attr:`paginate_orphans`.
 
     .. method:: get_allow_empty()
 
@@ -149,7 +147,7 @@ MultipleObjectMixin
         Return the context variable name that will be used to contain
         the list of data that this view is manipulating. If
         ``object_list`` is a queryset of Django objects and
-        :attr:`~MultipleObjectMixin.context_object_name` is not set,
+        :attr:`context_object_name` is not set,
         the context name will be the ``object_name`` of the model that
         the queryset is composed from, with postfix ``'_list'``
         appended. For example, the model ``Article`` would have a
diff --git a/docs/ref/class-based-views/mixins-simple.txt b/docs/ref/class-based-views/mixins-simple.txt
index d2f0df241e..51b0386654 100644
--- a/docs/ref/class-based-views/mixins-simple.txt
+++ b/docs/ref/class-based-views/mixins-simple.txt
@@ -48,7 +48,7 @@ TemplateResponseMixin
     .. attribute:: template_name
 
         The full name of a template to use as defined by a string. Not defining
-        a template_name will raise a
+        a ``template_name`` will raise a
         :class:`django.core.exceptions.ImproperlyConfigured` exception.
 
     .. attribute:: response_class
@@ -64,6 +64,15 @@ TemplateResponseMixin
         instantiation, create a ``TemplateResponse`` subclass and assign it to
         ``response_class``.
 
+    .. attribute:: content_type
+
+        .. versionadded:: 1.5
+            The ``content_type`` attribute was added.
+
+        The content type to use for the response. ``content_type`` is passed
+        as a keyword argument to ``response_class``. Default is ``None`` --
+        meaning that Django uses :setting:`DEFAULT_CONTENT_TYPE`.
+
     **Methods**
 
     .. method:: render_to_response(context, **response_kwargs)
@@ -73,15 +82,13 @@ TemplateResponseMixin
         If any keyword arguments are provided, they will be passed to the
         constructor of the response class.
 
-        Calls :meth:`~TemplateResponseMixin.get_template_names()` to obtain the
-        list of template names that will be searched looking for an existent
-        template.
+        Calls :meth:`get_template_names()` to obtain the list of template names
+        that will be searched looking for an existent template.
 
     .. method:: get_template_names()
 
         Returns a list of template names to search for when rendering the
         template.
 
-        If :attr:`TemplateResponseMixin.template_name` is specified, the
-        default implementation will return a list containing
-        :attr:`TemplateResponseMixin.template_name` (if it is specified).
+        If :attr:`template_name` is specified, the default implementation will
+        return a list containing :attr:`template_name` (if it is specified).
diff --git a/docs/ref/class-based-views/mixins-single-object.txt b/docs/ref/class-based-views/mixins-single-object.txt
index 77f52b96c6..bbe930d79e 100644
--- a/docs/ref/class-based-views/mixins-single-object.txt
+++ b/docs/ref/class-based-views/mixins-single-object.txt
@@ -21,8 +21,7 @@ SingleObjectMixin
     .. attribute:: queryset
 
         A ``QuerySet`` that represents the objects. If provided, the value of
-        :attr:`SingleObjectMixin.queryset` supersedes the value provided for
-        :attr:`SingleObjectMixin.model`.
+        ``queryset`` supersedes the value provided for :attr:`model`.
 
     .. attribute:: slug_field
 
@@ -31,15 +30,11 @@ SingleObjectMixin
 
     .. attribute:: slug_url_kwarg
 
-        .. versionadded:: 1.4
-
         The name of the URLConf keyword argument that contains the slug. By
         default, ``slug_url_kwarg`` is ``'slug'``.
 
     .. attribute:: pk_url_kwarg
 
-        .. versionadded:: 1.4
-
         The name of the URLConf keyword argument that contains the primary key.
         By default, ``pk_url_kwarg`` is ``'pk'``.
 
@@ -51,38 +46,38 @@ SingleObjectMixin
 
         Returns the single object that this view will display. If
         ``queryset`` is provided, that queryset will be used as the
-        source of objects; otherwise,
-        :meth:`~SingleObjectMixin.get_queryset` will be used.
-        ``get_object()`` looks for a
-        :attr:`SingleObjectMixin.pk_url_kwarg` argument in the arguments
-        to the view; if this argument is found, this method performs a
-        primary-key based lookup using that value. If this argument is not
-        found, it looks for a :attr:`SingleObjectMixin.slug_url_kwarg`
-        argument, and performs a slug lookup using the
-        :attr:`SingleObjectMixin.slug_field`.
+        source of objects; otherwise, :meth:`get_queryset` will be used.
+        ``get_object()`` looks for a :attr:`pk_url_kwarg` argument in the
+        arguments to the view; if this argument is found, this method performs
+        a primary-key based lookup using that value. If this argument is not
+        found, it looks for a :attr:`slug_url_kwarg` argument, and performs a
+        slug lookup using the :attr:`slug_field`.
 
     .. method:: get_queryset()
 
         Returns the queryset that will be used to retrieve the object that
-        this view will display. By default,
-        :meth:`~SingleObjectMixin.get_queryset` returns the value of the
-        :attr:`~SingleObjectMixin.queryset` attribute if it is set, otherwise
-        it constructs a :class:`QuerySet` by calling the `all()` method on the
-        :attr:`~SingleObjectMixin.model` attribute's default manager.
+        this view will display. By default, :meth:`get_queryset` returns the
+        value of the :attr:`queryset` attribute if it is set, otherwise
+        it constructs a :class:`~django.db.models.query.QuerySet` by calling
+        the ``all()`` method on the :attr:`model` attribute's default manager.
 
     .. method:: get_context_object_name(obj)
 
         Return the context variable name that will be used to contain the
-        data that this view is manipulating. If
-        :attr:`~SingleObjectMixin.context_object_name` is not set, the context
-        name will be constructed from the ``object_name`` of the model that
-        the queryset is composed from. For example, the model ``Article``
-        would have context object named ``'article'``.
+        data that this view is manipulating. If :attr:`context_object_name` is
+        not set, the context name will be constructed from the ``object_name``
+        of the model that the queryset is composed from. For example, the model
+        ``Article`` would have context object named ``'article'``.
 
     .. method:: get_context_data(**kwargs)
 
         Returns context data for displaying the list of objects.
 
+    .. method:: get_slug_field()
+
+        Returns the name of a slug field to be used to look up by slug. By
+        default this simply returns the value of :attr:`slug_field`.
+
     **Context**
 
     * ``object``: The object that this view is displaying. If
diff --git a/docs/ref/clickjacking.txt b/docs/ref/clickjacking.txt
index b70fe9f90d..ce27148ad3 100644
--- a/docs/ref/clickjacking.txt
+++ b/docs/ref/clickjacking.txt
@@ -10,9 +10,6 @@ against `clickjacking`_.  This type of attack occurs when a malicious site
 tricks a user into clicking on a concealed element of another site which they
 have loaded in a hidden frame or iframe.
 
-.. versionadded:: 1.4
-   The clickjacking middleware and decorators were added.
-
 .. _clickjacking: http://en.wikipedia.org/wiki/Clickjacking
 
 An example of clickjacking
@@ -33,10 +30,10 @@ Preventing clickjacking
 
 Modern browsers honor the `X-Frame-Options`_ HTTP header that indicates whether
 or not a resource is allowed to load within a frame or iframe. If the response
-contains the header with a value of SAMEORIGIN then the browser will only load
-the resource in a frame if the request originated from the same site. If the
-header is set to DENY then the browser will block the resource from loading in a
-frame no matter which site made the request.
+contains the header with a value of ``SAMEORIGIN`` then the browser will only
+load the resource in a frame if the request originated from the same site. If
+the header is set to ``DENY`` then the browser will block the resource from
+loading in a frame no matter which site made the request.
 
 .. _X-Frame-Options: https://developer.mozilla.org/en/The_X-FRAME-OPTIONS_response_header
 
@@ -54,7 +51,7 @@ How to use it
 Setting X-Frame-Options for all responses
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To set the same X-Frame-Options value for all responses in your site, add
+To set the same ``X-Frame-Options`` value for all responses in your site, put
 ``'django.middleware.clickjacking.XFrameOptionsMiddleware'`` to
 :setting:`MIDDLEWARE_CLASSES`::
 
@@ -64,15 +61,19 @@ To set the same X-Frame-Options value for all responses in your site, add
         ...
     )
 
-By default, the middleware will set the X-Frame-Options header to SAMEORIGIN for
-every outgoing ``HttpResponse``. If you want DENY instead, set the
-:setting:`X_FRAME_OPTIONS` setting::
+.. versionchanged:: 1.6
+    This middleware is enabled in the settings file generated by
+    :djadmin:`startproject`.
+
+By default, the middleware will set the ``X-Frame-Options`` header to
+``SAMEORIGIN`` for every outgoing ``HttpResponse``. If you want ``DENY``
+instead, set the :setting:`X_FRAME_OPTIONS` setting::
 
     X_FRAME_OPTIONS = 'DENY'
 
 When using the middleware there may be some views where you do **not** want the
-X-Frame-Options header set. For those cases, you can use a view decorator that
-tells the middleware not to set the header::
+``X-Frame-Options`` header set. For those cases, you can use a view decorator
+that tells the middleware not to set the header::
 
     from django.http import HttpResponse
     from django.views.decorators.clickjacking import xframe_options_exempt
@@ -85,7 +86,7 @@ tells the middleware not to set the header::
 Setting X-Frame-Options per view
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To set the X-Frame-Options header on a per view basis, Django provides these
+To set the ``X-Frame-Options`` header on a per view basis, Django provides these
 decorators::
 
     from django.http import HttpResponse
@@ -106,23 +107,23 @@ a decorator overrides the middleware.
 Limitations
 ===========
 
-The `X-Frame-Options` header will only protect against clickjacking in a modern
-browser. Older browsers will quietly ignore the header and need `other
+The ``X-Frame-Options`` header will only protect against clickjacking in a
+modern browser. Older browsers will quietly ignore the header and need `other
 clickjacking prevention techniques`_.
 
 Browsers that support X-Frame-Options
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Internet Explorer 8+
-* Firefox	3.6.9+
-* Opera	10.5+
-* Safari	4+
-* Chrome	4.1+
+* Firefox 3.6.9+
+* Opera 10.5+
+* Safari 4+
+* Chrome 4.1+
 
 See also
 ~~~~~~~~
 
-A `complete list`_ of browsers supporting X-Frame-Options.
+A `complete list`_ of browsers supporting ``X-Frame-Options``.
 
 .. _complete list: https://developer.mozilla.org/en/The_X-FRAME-OPTIONS_response_header#Browser_compatibility
 .. _other clickjacking prevention techniques: http://en.wikipedia.org/wiki/Clickjacking#Prevention
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt
index d7eef623d5..c79f978850 100644
--- a/docs/ref/contrib/admin/actions.txt
+++ b/docs/ref/contrib/admin/actions.txt
@@ -175,7 +175,7 @@ That's easy enough to do::
         make_published.short_description = "Mark selected stories as published"
 
 Notice first that we've moved ``make_published`` into a method and renamed the
-`modeladmin` parameter to `self`, and second that we've now put the string
+``modeladmin`` parameter to ``self``, and second that we've now put the string
 ``'make_published'`` in ``actions`` instead of a direct function reference. This
 tells the :class:`ModelAdmin` to look up the action as a method.
 
@@ -223,7 +223,7 @@ objects as JSON::
     from django.core import serializers
 
     def export_as_json(modeladmin, request, queryset):
-        response = HttpResponse(mimetype="text/javascript")
+        response = HttpResponse(content_type="application/json")
         serializers.serialize("json", queryset, stream=response)
         return response
 
@@ -356,5 +356,3 @@ Conditionally enabling or disabling actions
                     if 'delete_selected' in actions:
                         del actions['delete_selected']
                 return actions
-
-
diff --git a/docs/ref/contrib/admin/admindocs.txt b/docs/ref/contrib/admin/admindocs.txt
index 4a50856f3d..b3e26eca48 100644
--- a/docs/ref/contrib/admin/admindocs.txt
+++ b/docs/ref/contrib/admin/admindocs.txt
@@ -24,7 +24,7 @@ the following:
 
 * Add :mod:`django.contrib.admindocs` to your :setting:`INSTALLED_APPS`.
 * Add ``(r'^admin/doc/', include('django.contrib.admindocs.urls'))`` to
-  your :data:`urlpatterns`. Make sure it's included *before* the
+  your ``urlpatterns``. Make sure it's included *before* the
   ``r'^admin/'`` entry, so that requests to ``/admin/doc/`` don't get
   handled by the latter entry.
 * Install the docutils Python module (http://docutils.sf.net/).
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 6f79e97a3c..c567bc1db4 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -14,7 +14,13 @@ Django's admin interface.
 Overview
 ========
 
-There are seven steps in activating the Django admin site:
+The admin is enabled in the default project template used by
+:djadmin:`startproject`.
+
+.. versionchanged:: 1.6
+    In previous versions, the admin wasn't enabled by default.
+
+For reference, here are the requirements:
 
 1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS`
    setting.
@@ -136,6 +142,13 @@ subclass::
     e.g. if all the dates are in one month, it'll show the day-level
     drill-down only.
 
+    .. note::
+
+        ``date_hierarchy`` uses :meth:`QuerySet.datetimes()
+        <django.db.models.query.QuerySet.datetimes>` internally. Please refer
+        to its documentation for some caveats when time zone support is
+        enabled (:setting:`USE_TZ = True <USE_TZ>`).
+
 .. attribute:: ModelAdmin.exclude
 
     This attribute, if given, should be a list of field names to exclude from
@@ -170,7 +183,7 @@ subclass::
     ``fields`` option (for more complex layout needs see the
     :attr:`~ModelAdmin.fieldsets` option described in the next section). For
     example, you could define a simpler version of the admin form for the
-    ``django.contrib.flatpages.FlatPage`` model as follows::
+    :class:`django.contrib.flatpages.models.FlatPage` model as follows::
 
         class FlatPageAdmin(admin.ModelAdmin):
             fields = ('url', 'title', 'content')
@@ -180,7 +193,10 @@ subclass::
     values defined in :attr:`ModelAdmin.readonly_fields` to be displayed as
     read-only.
 
-    .. versionadded:: 1.4
+    The ``fields`` option, unlike :attr:`~ModelAdmin.list_display`, may only
+    contain names of fields on the model or the form specified by
+    :attr:`~ModelAdmin.form`. It may contain callables only if they are listed
+    in :attr:`~ModelAdmin.readonly_fields`.
 
     To display multiple fields on the same line, wrap those fields in their own
     tuple. In this example, the ``url`` and ``title`` fields will display on the
@@ -214,8 +230,8 @@ subclass::
     a dictionary of information about the fieldset, including a list of fields
     to be displayed in it.
 
-    A full example, taken from the :class:`django.contrib.flatpages.FlatPage`
-    model::
+    A full example, taken from the
+    :class:`django.contrib.flatpages.models.FlatPage` model::
 
         class FlatPageAdmin(admin.ModelAdmin):
             fieldsets = (
@@ -249,10 +265,10 @@ subclass::
             'fields': ('first_name', 'last_name', 'address', 'city', 'state'),
             }
 
-        Just like with the :attr:`~ModelAdmin.fields` option, to display
-        multiple fields on the same line, wrap those fields in their own
-        tuple. In this example, the ``first_name`` and ``last_name`` fields
-        will display on the same line::
+        As with the :attr:`~ModelAdmin.fields` option, to display multiple
+        fields on the same line, wrap those fields in their own tuple. In this
+        example, the ``first_name`` and ``last_name`` fields will display on
+        the same line::
 
             {
             'fields': (('first_name', 'last_name'), 'address', 'city', 'state'),
@@ -261,13 +277,17 @@ subclass::
         ``fields`` can contain values defined in
         :attr:`~ModelAdmin.readonly_fields` to be displayed as read-only.
 
+        If you add the name of a callable to ``fields``, the same rule applies
+        as with the :attr:`~ModelAdmin.fields` option: the callable must be
+        listed in :attr:`~ModelAdmin.readonly_fields`.
+
     * ``classes``
         A list containing extra CSS classes to apply to the fieldset.
 
         Example::
 
             {
-            'classes': ['wide', 'extrapretty'],
+            'classes': ('wide', 'extrapretty'),
             }
 
         Two useful classes defined by the default admin site stylesheet are
@@ -359,7 +379,7 @@ subclass::
 
     Note that the key in the dictionary is the actual field class, *not* a
     string. The value is another dictionary; these arguments will be passed to
-    :meth:`~django.forms.Field.__init__`. See :doc:`/ref/forms/api` for
+    the form field's ``__init__()`` method. See :doc:`/ref/forms/api` for
     details.
 
     .. warning::
@@ -451,17 +471,25 @@ subclass::
     * If the string given is a method of the model, ``ModelAdmin`` or a
       callable, Django will HTML-escape the output by default. If you'd
       rather not escape the output of the method, give the method an
-      ``allow_tags`` attribute whose value is ``True``.
+      ``allow_tags`` attribute whose value is ``True``. However, to avoid an
+      XSS vulnerability, you should use :func:`~django.utils.html.format_html`
+      to escape user-provided inputs.
 
       Here's a full example model::
 
+          from django.utils.html import format_html
+
           class Person(models.Model):
               first_name = models.CharField(max_length=50)
               last_name = models.CharField(max_length=50)
               color_code = models.CharField(max_length=6)
 
               def colored_name(self):
-                  return '<span style="color: #%s;">%s %s</span>' % (self.color_code, self.first_name, self.last_name)
+                  return format_html('<span style="color: #{0};">{1} {2}</span>',
+                                     self.color_code,
+                                     self.first_name,
+                                     self.last_name)
+
               colored_name.allow_tags = True
 
           class PersonAdmin(admin.ModelAdmin):
@@ -502,12 +530,17 @@ subclass::
 
       For example::
 
+        from django.utils.html import format_html
+
         class Person(models.Model):
             first_name = models.CharField(max_length=50)
             color_code = models.CharField(max_length=6)
 
             def colored_first_name(self):
-                return '<span style="color: #%s;">%s</span>' % (self.color_code, self.first_name)
+                return format_html('<span style="color: #{0};">{1}</span>',
+                                   self.color_code,
+                                   self.first_name)
+
             colored_first_name.allow_tags = True
             colored_first_name.admin_order_field = 'first_name'
 
@@ -517,6 +550,13 @@ subclass::
       The above will tell Django to order by the ``first_name`` field when
       trying to sort by ``colored_first_name`` in the admin.
 
+    * .. versionadded:: 1.6
+
+      The field names in ``list_display`` will also appear as CSS classes in
+      the HTML output, in the form of ``column-<field_name>`` on each ``<th>``
+      element. This can be used to set column widths in a CSS file for example.
+
+
 .. attribute:: ModelAdmin.list_display_links
 
     Set ``list_display_links`` to control which fields in ``list_display``
@@ -586,9 +626,7 @@ subclass::
           class PersonAdmin(UserAdmin):
               list_filter = ('company__name',)
 
-    .. versionadded:: 1.4
-
-    * a class inheriting from :mod:`django.contrib.admin.SimpleListFilter`,
+    * a class inheriting from ``django.contrib.admin.SimpleListFilter``,
       which you need to provide the ``title`` and ``parameter_name``
       attributes to and override the ``lookups`` and ``queryset`` methods,
       e.g.::
@@ -665,7 +703,7 @@ subclass::
                       Only show the lookups if there actually is
                       anyone born in the corresponding decades.
                       """
-                      qs = model_admin.queryset(request)
+                      qs = model_admin.get_queryset(request)
                       if qs.filter(birthday__gte=date(1980, 1, 1),
                                     birthday__lte=date(1989, 12, 31)).exists():
                           yield ('80s', _('in the eighties'))
@@ -673,11 +711,9 @@ subclass::
                                     birthday__lte=date(1999, 12, 31)).exists():
                           yield ('90s', _('in the nineties'))
 
-    .. versionadded:: 1.4
-
     * a tuple, where the first element is a field name and the second
       element is a class inheriting from
-      :mod:`django.contrib.admin.FieldListFilter`, for example::
+      ``django.contrib.admin.FieldListFilter``, for example::
 
           from django.contrib.admin import BooleanFieldListFilter
 
@@ -691,8 +727,6 @@ subclass::
         The ``FieldListFilter`` API is considered internal and might be
         changed.
 
-    .. versionadded:: 1.4
-
     It is possible to specify a custom template for rendering a list filter::
 
         class FilterWithCustomTemplate(SimpleListFilter):
@@ -703,8 +737,6 @@ subclass::
 
 .. attribute:: ModelAdmin.list_max_show_all
 
-    .. versionadded:: 1.4
-
     Set ``list_max_show_all`` to control how many items can appear on a "Show
     all" admin change list page. The admin will display a "Show all" link on the
     change list only if the total result count is less than or equal to this
@@ -738,15 +770,9 @@ subclass::
     If this isn't provided, the Django admin will use the model's default
     ordering.
 
-    .. versionadded:: 1.4
-
     If you need to specify a dynamic order (for example depending on user or
     language) you can implement a :meth:`~ModelAdmin.get_ordering` method.
 
-    .. versionchanged:: 1.4
-
-    Django honors all elements in the list/tuple; before 1.4, only the first
-    was respected.
 
 .. attribute:: ModelAdmin.paginator
 
@@ -827,25 +853,33 @@ subclass::
     added last after all editable fields.
 
     A read-only field can not only display data from a model's field, it can
-    also display the output of a a model's method or a method of the
+    also display the output of a model's method or a method of the
     ``ModelAdmin`` class itself. This is very similar to the way
     :attr:`ModelAdmin.list_display` behaves. This provides an easy way to use
     the admin interface to provide feedback on the status of the objects being
     edited, for example::
 
+        from django.utils.html import format_html_join
+        from django.utils.safestring import mark_safe
+
         class PersonAdmin(ModelAdmin):
             readonly_fields = ('address_report',)
 
             def address_report(self, instance):
-                return ", ".join(instance.get_full_address()) or \
-                   "<span class='errors'>I can't determine this address.</span>"
+                # assuming get_full_address() returns a list of strings
+                # for each line of the address and you want to separate each
+                # line by a linebreak
+                return format_html_join(
+                    mark_safe('<br/>'),
+                    '{0}',
+                    ((line,) for line in instance.get_full_address()),
+                ) or "<span class='errors'>I can't determine this address.</span>"
 
             # short_description functions like a model field's verbose_name
             address_report.short_description = "Address"
             # in this example, we have used HTML tags in the output
             address_report.allow_tags = True
 
-
 .. attribute:: ModelAdmin.save_as
 
     Set ``save_as`` to enable a "save as" feature on admin change forms.
@@ -959,10 +993,9 @@ templates used by the :class:`ModelAdmin` views:
 
 .. attribute:: ModelAdmin.delete_selected_confirmation_template
 
-    Path to a custom template, used by the :meth:`delete_selected`
-    action method for displaying a confirmation page when deleting one
-    or more objects. See the :doc:`actions
-    documentation</ref/contrib/admin/actions>`.
+    Path to a custom template, used by the ``delete_selected`` action method
+    for displaying a confirmation page when deleting one or more objects. See
+    the :doc:`actions documentation</ref/contrib/admin/actions>`.
 
 .. attribute:: ModelAdmin.object_history_template
 
@@ -1017,8 +1050,6 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.get_ordering(self, request)
 
-    .. versionadded:: 1.4
-
     The ``get_ordering`` method takes a``request`` as parameter and
     is expected to return a ``list`` or ``tuple`` for ordering similar
     to the :attr:`ordering` attribute. For example::
@@ -1033,8 +1064,6 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.save_related(self, request, form, formsets, change)
 
-    .. versionadded:: 1.4
-
     The ``save_related`` method is given the ``HttpRequest``, the parent
     ``ModelForm`` instance, the list of inline formsets and a boolean value
     based on whether the parent is being added or changed. Here you can do any
@@ -1050,8 +1079,6 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.get_prepopulated_fields(self, request, obj=None)
 
-    .. versionadded:: 1.4
-
     The ``get_prepopulated_fields`` method is given the ``HttpRequest`` and the
     ``obj`` being edited (or ``None`` on an add form) and is expected to return
     a ``dictionary``, as described above in the :attr:`ModelAdmin.prepopulated_fields`
@@ -1059,8 +1086,6 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.get_list_display(self, request)
 
-    .. versionadded:: 1.4
-
     The ``get_list_display`` method is given the ``HttpRequest`` and is
     expected to return a ``list`` or ``tuple`` of field names that will be
     displayed on the changelist view as described above in the
@@ -1068,14 +1093,19 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.get_list_display_links(self, request, list_display)
 
-    .. versionadded:: 1.4
-
     The ``get_list_display_links`` method is given the ``HttpRequest`` and
     the ``list`` or ``tuple`` returned by :meth:`ModelAdmin.get_list_display`.
     It is expected to return a ``list`` or ``tuple`` of field names on the
     changelist that will be linked to the change view, as described in the
     :attr:`ModelAdmin.list_display_links` section.
 
+.. method:: ModelAdmin.get_fieldsets(self, request, obj=None)
+
+    The ``get_fieldsets`` method is given the ``HttpRequest`` and the ``obj``
+    being edited (or ``None`` on an add form) and is expected to return a list
+    of two-tuples, in which each two-tuple represents a ``<fieldset>`` on the
+    admin form page, as described above in the :attr:`ModelAdmin.fieldsets` section.
+
 .. method:: ModelAdmin.get_list_filter(self, request)
 
     .. versionadded:: 1.5
@@ -1134,9 +1164,8 @@ templates used by the :class:`ModelAdmin` views:
 
     Since this is usually not what you want, Django provides a convenience
     wrapper to check permissions and mark the view as non-cacheable. This
-    wrapper is :meth:`AdminSite.admin_view` (i.e.
-    ``self.admin_site.admin_view`` inside a ``ModelAdmin`` instance); use it
-    like so::
+    wrapper is ``AdminSite.admin_view()`` (i.e. ``self.admin_site.admin_view``
+    inside a ``ModelAdmin`` instance); use it like so::
 
         class MyModelAdmin(admin.ModelAdmin):
             def get_urls(self):
@@ -1156,7 +1185,7 @@ templates used by the :class:`ModelAdmin` views:
 
     If the page is cacheable, but you still want the permission check to be
     performed, you can pass a ``cacheable=True`` argument to
-    :meth:`AdminSite.admin_view`::
+    ``AdminSite.admin_view()``::
 
         (r'^my_view/$', self.admin_site.admin_view(self.my_view, cacheable=True))
 
@@ -1297,20 +1326,23 @@ templates used by the :class:`ModelAdmin` views:
     be interpreted as meaning that the current user is not permitted to delete
     any object of this type).
 
-.. method:: ModelAdmin.queryset(self, request)
+.. method:: ModelAdmin.get_queryset(self, request)
 
-    The ``queryset`` method on a ``ModelAdmin`` returns a
+    The ``get_queryset`` method on a ``ModelAdmin`` returns a
     :class:`~django.db.models.query.QuerySet` of all model instances that
     can be edited by the admin site. One use case for overriding this method
     is to show objects owned by the logged-in user::
 
         class MyModelAdmin(admin.ModelAdmin):
-            def queryset(self, request):
-                qs = super(MyModelAdmin, self).queryset(request)
+            def get_queryset(self, request):
+                qs = super(MyModelAdmin, self).get_queryset(request)
                 if request.user.is_superuser:
                     return qs
                 return qs.filter(author=request.user)
 
+    .. versionchanged:: 1.6
+        The ``get_queryset`` method was previously named ``queryset``.
+
 .. method:: ModelAdmin.message_user(request, message, level=messages.INFO, extra_tags='', fail_silently=False)
 
     Sends a message to the user using the :mod:`django.contrib.messages`
@@ -1341,10 +1373,6 @@ Other methods
 
     Django view for the model instance edition page. See note below.
 
-    .. versionchanged:: 1.4
-
-    The ``form_url`` parameter was added.
-
 .. method:: ModelAdmin.changelist_view(self, request, extra_context=None)
 
     Django view for the model instances change list/actions page. See note
@@ -1386,12 +1414,10 @@ provided some extra mapping data that would not otherwise be available::
             return super(MyModelAdmin, self).change_view(request, object_id,
                 form_url, extra_context=extra_context)
 
-.. versionadded:: 1.4
-
-These views now return :class:`~django.template.response.TemplateResponse`
+These views return :class:`~django.template.response.TemplateResponse`
 instances which allow you to easily customize the response data before
-rendering. For more details, see the
-:doc:`TemplateResponse documentation </ref/template-response>`.
+rendering. For more details, see the :doc:`TemplateResponse documentation
+</ref/template-response>`.
 
 .. _modeladmin-media-definitions:
 
@@ -1414,15 +1440,33 @@ The :doc:`staticfiles app </ref/contrib/staticfiles>` prepends
 ``None``) to any media paths. The same rules apply as :ref:`regular media
 definitions on forms <form-media-paths>`.
 
-Django admin Javascript makes use of the `jQuery`_ library. To avoid
-conflicts with user-supplied scripts or libraries, Django's jQuery is
-namespaced as ``django.jQuery``. If you want to use jQuery in your own admin
-JavaScript without including a second copy, you can use the ``django.jQuery``
-object on changelist and add/edit views.
+jQuery
+~~~~~~
 
-If you require the jQuery library to be in the global namespace, for example
-when using third-party jQuery plugins, or need a newer version of jQuery, you
-will have to include your own copy of jQuery.
+Django admin Javascript makes use of the `jQuery`_ library.
+
+To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
+(version 1.9.1) is namespaced as ``django.jQuery``. If you want to use jQuery
+in your own admin JavaScript without including a second copy, you can use the
+``django.jQuery`` object on changelist and add/edit views.
+
+.. versionchanged:: 1.6
+    The embedded jQuery has been upgraded from 1.4.2 to 1.9.1.
+
+The :class:`ModelAdmin` class requires jQuery by default, so there is no need
+to add jQuery to your ``ModelAdmin``'s list of media resources unless you have
+a specifc need. For example, if you require the jQuery library to be in the
+global namespace (for example when using third-party jQuery plugins) or if you
+need a newer version of jQuery, you will have to include your own copy.
+
+Django provides both uncompressed and 'minified' versions of jQuery, as
+``jquery.js`` and ``jquery.min.js`` respectively.
+
+:class:`ModelAdmin` and :class:`InlineModelAdmin` have a ``media`` property
+that returns a list of ``Media`` objects which store paths to the JavaScript
+files for the forms and/or formsets. If :setting:`DEBUG` is ``True`` it will
+return the uncompressed versions of the various JavaScript files, including
+``jquery.js``; if not, it will return the 'minified' versions.
 
 .. _jQuery: http://jquery.com
 
@@ -1508,15 +1552,12 @@ adds some of its own (the shared features are actually defined in the
 - :attr:`~ModelAdmin.filter_vertical`
 - :attr:`~ModelAdmin.ordering`
 - :attr:`~ModelAdmin.prepopulated_fields`
-- :meth:`~ModelAdmin.queryset`
+- :meth:`~ModelAdmin.get_queryset`
 - :attr:`~ModelAdmin.radio_fields`
 - :attr:`~ModelAdmin.readonly_fields`
 - :attr:`~InlineModelAdmin.raw_id_fields`
 - :meth:`~ModelAdmin.formfield_for_foreignkey`
 - :meth:`~ModelAdmin.formfield_for_manytomany`
-
-.. versionadded:: 1.4
-
 - :meth:`~ModelAdmin.has_add_permission`
 - :meth:`~ModelAdmin.has_change_permission`
 - :meth:`~ModelAdmin.has_delete_permission`
@@ -1542,8 +1583,8 @@ The ``InlineModelAdmin`` class adds:
 .. attribute:: InlineModelAdmin.form
 
     The value for ``form`` defaults to ``ModelForm``. This is what is passed
-    through to ``inlineformset_factory`` when creating the formset for this
-    inline.
+    through to :func:`~django.forms.models.inlineformset_factory` when
+    creating the formset for this inline.
 
 .. attribute:: InlineModelAdmin.extra
 
@@ -1825,31 +1866,32 @@ Because of the modular design of the admin templates, it is usually neither
 necessary nor advisable to replace an entire template. It is almost always
 better to override only the section of the template which you need to change.
 
-To continue the example above, we want to add a new link next to the ``History``
-tool for the ``Page`` model. After looking at ``change_form.html`` we determine
-that we only need to override the ``object-tools`` block. Therefore here is our
-new ``change_form.html`` :
+To continue the example above, we want to add a new link next to the
+``History`` tool for the ``Page`` model. After looking at ``change_form.html``
+we determine that we only need to override the ``object-tools-items`` block.
+Therefore here is our new ``change_form.html`` :
 
 .. code-block:: html+django
 
     {% extends "admin/change_form.html" %}
-    {% load i18n %}
-    {% block object-tools %}
-    {% if change %}{% if not is_popup %}
-      <ul class="object-tools">
-        <li><a href="history/" class="historylink">{% trans "History" %}</a></li>
-        <li><a href="mylink/" class="historylink">My Link</a></li>
+    {% load i18n admin_urls %}
+    {% block object-tools-items %}
+        <li>
+            <a href="{% url opts|admin_urlname:'history' original.pk|admin_urlquote %}" class="historylink">{% trans "History" %}</a>
+        </li>
+        <li>
+            <a href="mylink/" class="historylink">My Link</a>
+        </li>
         {% if has_absolute_url %}
-            <li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">
-                {% trans "View on site" %}</a>
+            <li>
+                <a href="{% url 'admin:view_on_site' content_type_id original.pk %}" class="viewsitelink">{% trans "View on site" %}</a>
             </li>
         {% endif%}
-      </ul>
-    {% endif %}{% endif %}
     {% endblock %}
 
 And that's it! If we placed this file in the ``templates/admin/my_app``
-directory, our link would appear on every model's change form.
+directory, our link would appear on the change form for all models within
+my_app.
 
 Templates which may be overridden per app or model
 --------------------------------------------------
@@ -1870,7 +1912,7 @@ and 500 pages.
 
 .. note::
 
-    Some of the admin templates, such as ``change_list_request.html`` are used
+    Some of the admin templates, such as ``change_list_results.html`` are used
     to render custom inclusion tags. These may be overridden, but in such cases
     you are probably better off creating your own version of the tag in
     question and giving it a different name. That way you can use it
@@ -1952,7 +1994,7 @@ In this example, we register the default ``AdminSite`` instance
 ``django.contrib.admin.site`` at the URL ``/admin/`` ::
 
     # urls.py
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, include
     from django.contrib import admin
 
     admin.autodiscover()
@@ -1968,7 +2010,7 @@ In this example, we register the ``AdminSite`` instance
 ``myproject.admin.admin_site`` at the URL ``/myadmin/`` ::
 
     # urls.py
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, include
     from myproject.admin import admin_site
 
     urlpatterns = patterns('',
@@ -1992,7 +2034,7 @@ separate versions of the admin site -- using the ``AdminSite`` instances
 respectively::
 
     # urls.py
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, include
     from myproject.admin import basic_site, advanced_site
 
     urlpatterns = patterns('',
@@ -2043,8 +2085,6 @@ your URLconf. Specifically, add these four patterns:
 the URLs starting with ``^admin/`` before the line that includes the admin app
 itself).
 
-.. versionchanged:: 1.4
-
 The presence of the ``admin_password_reset`` named URL will cause a "forgotten
 your password?" link to appear on the default admin log-in page under the
 password box.
@@ -2108,8 +2148,6 @@ if you specifically wanted the admin view from the admin instance named
 For more details, see the documentation on :ref:`reversing namespaced URLs
 <topics-http-reversing-url-namespaces>`.
 
-.. versionadded:: 1.4
-
 To allow easier reversing of the admin urls in templates, Django provides an
 ``admin_urlname`` filter which takes an action as argument:
 
@@ -2121,5 +2159,5 @@ To allow easier reversing of the admin urls in templates, Django provides an
 
 The action in the examples above match the last part of the URL names for
 :class:`ModelAdmin` instances described above. The ``opts`` variable can be any
-object which has an ``app_label`` and ``module_name`` and is usually supplied
-by the admin views for the current model.
+object which has an ``app_label`` and ``model_name`` attributes and is usually
+supplied by the admin views for the current model.
diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
index 619b38e5ac..40b3629f63 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -1,4 +1,435 @@
 ``django.contrib.auth``
 =======================
 
-See :doc:`/topics/auth`.
+This document provides API reference material for the components of Django's
+authentication system. For more details on the usage of these components or
+how to customize authentication and authorization see the :doc:`authentication
+topic guide </topics/auth/index>`.
+
+.. currentmodule:: django.contrib.auth
+
+User
+====
+
+Fields
+------
+
+.. class:: models.User
+
+    :class:`~django.contrib.auth.models.User` objects have the following
+    fields:
+
+    .. attribute:: username
+
+        Required. 30 characters or fewer. Usernames may contain alphanumeric,
+        ``_``, ``@``, ``+``, ``.`` and ``-`` characters.
+
+    .. attribute:: first_name
+
+        Optional. 30 characters or fewer.
+
+    .. attribute:: last_name
+
+        Optional. 30 characters or fewer.
+
+    .. attribute:: email
+
+        Optional. Email address.
+
+    .. attribute:: password
+
+        Required. A hash of, and metadata about, the password. (Django doesn't
+        store the raw password.) Raw passwords can be arbitrarily long and can
+        contain any character. See the :doc:`password documentation
+        </topics/auth/passwords>`.
+
+    .. attribute:: groups
+
+        Many-to-many relationship to :class:`~django.contrib.auth.models.Group`
+
+    .. attribute:: user_permissions
+
+         Many-to-many relationship to :class:`~django.contrib.auth.models.Permission`
+
+    .. attribute:: is_staff
+
+        Boolean. Designates whether this user can access the admin site.
+
+    .. attribute:: is_active
+
+        Boolean. Designates whether this user account should be considered
+        active. We recommend that you set this flag to ``False`` instead of
+        deleting accounts; that way, if your applications have any foreign keys
+        to users, the foreign keys won't break.
+
+        This doesn't necessarily control whether or not the user can log in.
+        Authentication backends aren't required to check for the ``is_active``
+        flag, and the default backends do not. If you want to reject a login
+        based on ``is_active`` being ``False``, it's up to you to check that in
+        your own login view or a custom authentication backend. However, the
+        :class:`~django.contrib.auth.forms.AuthenticationForm` used by the
+        :func:`~django.contrib.auth.views.login` view (which is the default)
+        *does* perform this check, as do the permission-checking methods such
+        as :meth:`~django.contrib.auth.models.User.has_perm` and the
+        authentication in the Django admin. All of those functions/methods will
+        return ``False`` for inactive users.
+
+    .. attribute:: is_superuser
+
+        Boolean. Designates that this user has all permissions without
+        explicitly assigning them.
+
+    .. attribute:: last_login
+
+        A datetime of the user's last login. Is set to the current date/time by
+        default.
+
+    .. attribute:: date_joined
+
+        A datetime designating when the account was created. Is set to the
+        current date/time by default when the account is created.
+
+Methods
+-------
+
+.. class:: models.User
+
+    .. method:: get_username()
+
+        Returns the username for the user. Since the User model can be swapped
+        out, you should use  this method instead of referencing the username
+        attribute directly.
+
+    .. method:: is_anonymous()
+
+        Always returns ``False``. This is a way of differentiating
+        :class:`~django.contrib.auth.models.User` and
+        :class:`~django.contrib.auth.models.AnonymousUser` objects.
+        Generally, you should prefer using
+        :meth:`~django.contrib.auth.models.User.is_authenticated()` to this
+        method.
+
+    .. method:: is_authenticated()
+
+        Always returns ``True`` (as opposed to
+        ``AnonymousUser.is_authenticated()`` which always returns ``False``).
+        This is a way to tell if the user has been authenticated. This does not
+        imply any permissions, and doesn't check if the user is active - it
+        only indicates that ``request.user`` has been populated by the
+        :class:`~django.contrib.auth.middleware.AuthenticationMiddleware` with
+        a :class:`~django.contrib.auth.models.User` object representing the
+        currently logged-in user.
+
+    .. method:: get_full_name()
+
+        Returns the :attr:`~django.contrib.auth.models.User.first_name` plus
+        the :attr:`~django.contrib.auth.models.User.last_name`, with a space in
+        between.
+
+    .. method:: set_password(raw_password)
+
+        Sets the user's password to the given raw string, taking care of the
+        password hashing. Doesn't save the
+        :class:`~django.contrib.auth.models.User` object.
+
+    .. method:: check_password(raw_password)
+
+        Returns ``True`` if the given raw string is the correct password for
+        the user. (This takes care of the password hashing in making the
+        comparison.)
+
+    .. method:: set_unusable_password()
+
+        Marks the user as having no password set.  This isn't the same as
+        having a blank string for a password.
+        :meth:`~django.contrib.auth.models.User.check_password()` for this user
+        will never return ``True``. Doesn't save the
+        :class:`~django.contrib.auth.models.User` object.
+
+        You may need this if authentication for your application takes place
+        against an existing external source such as an LDAP directory.
+
+    .. method:: has_usable_password()
+
+        Returns ``False`` if
+        :meth:`~django.contrib.auth.models.User.set_unusable_password()` has
+        been called for this user.
+
+    .. method:: get_group_permissions(obj=None)
+
+        Returns a set of permission strings that the user has, through his/her
+        groups.
+
+        If ``obj`` is passed in, only returns the group permissions for
+        this specific object.
+
+    .. method:: get_all_permissions(obj=None)
+
+        Returns a set of permission strings that the user has, both through
+        group and user permissions.
+
+        If ``obj`` is passed in, only returns the permissions for this
+        specific object.
+
+    .. method:: has_perm(perm, obj=None)
+
+        Returns ``True`` if the user has the specified permission, where perm
+        is in the format ``"<app label>.<permission codename>"``. (see
+        documentation on :ref:`permissions <topic-authorization>`). If the user is
+        inactive, this method will always return ``False``.
+
+        If ``obj`` is passed in, this method won't check for a permission for
+        the model, but for this specific object.
+
+    .. method:: has_perms(perm_list, obj=None)
+
+        Returns ``True`` if the user has each of the specified permissions,
+        where each perm is in the format
+        ``"<app label>.<permission codename>"``. If the user is inactive,
+        this method will always return ``False``.
+
+        If ``obj`` is passed in, this method won't check for permissions for
+        the model, but for the specific object.
+
+    .. method:: has_module_perms(package_name)
+
+        Returns ``True`` if the user has any permissions in the given package
+        (the Django app label). If the user is inactive, this method will
+        always return ``False``.
+
+    .. method:: email_user(subject, message, from_email=None)
+
+        Sends an email to the user. If ``from_email`` is ``None``, Django uses
+        the :setting:`DEFAULT_FROM_EMAIL`.
+
+    .. method:: get_profile()
+
+        .. deprecated:: 1.5
+            With the introduction of :ref:`custom User models <auth-custom-user>`,
+            the use of :setting:`AUTH_PROFILE_MODULE` to define a single profile
+            model is no longer supported. See the
+            :doc:`Django 1.5 release notes</releases/1.5>` for more information.
+
+        Returns a site-specific profile for this user. Raises
+        ``django.contrib.auth.models.SiteProfileNotAvailable`` if the
+        current site doesn't allow profiles, or
+        :exc:`django.core.exceptions.ObjectDoesNotExist` if the user does not
+        have a profile.
+
+Manager methods
+---------------
+
+.. class:: models.UserManager
+
+    The :class:`~django.contrib.auth.models.User` model has a custom manager
+    that has the following helper methods (in addition to the methods provided
+    by :class:`~django.contrib.auth.models.BaseUserManager`):
+
+    .. method:: create_user(username, email=None, password=None, **extra_fields)
+
+        Creates, saves and returns a :class:`~django.contrib.auth.models.User`.
+
+        The :attr:`~django.contrib.auth.models.User.username` and
+        :attr:`~django.contrib.auth.models.User.password` are set as given. The
+        domain portion of :attr:`~django.contrib.auth.models.User.email` is
+        automatically converted to lowercase, and the returned
+        :class:`~django.contrib.auth.models.User` object will have
+        :attr:`~django.contrib.auth.models.User.is_active` set to ``True``.
+
+        If no password is provided,
+        :meth:`~django.contrib.auth.models.User.set_unusable_password()` will
+        be called.
+
+        The ``extra_fields`` keyword arguments are passed through to the
+        :class:`~django.contrib.auth.models.User`'s ``__init__`` method to
+        allow setting arbitrary fields on a :ref:`custom User model
+        <auth-custom-user>`.
+
+        See :ref:`Creating users <topics-auth-creating-users>` for example usage.
+
+    .. method:: create_superuser(self, username, email, password, **extra_fields)
+
+        Same as :meth:`create_user`, but sets :attr:`~models.User.is_staff` and
+        :attr:`~models.User.is_superuser` to ``True``.
+
+
+Anonymous users
+===============
+
+.. class:: models.AnonymousUser
+
+    :class:`django.contrib.auth.models.AnonymousUser` is a class that
+    implements the :class:`django.contrib.auth.models.User` interface, with
+    these differences:
+
+    * :ref:`id <automatic-primary-key-fields>` is always ``None``.
+    * :attr:`~django.contrib.auth.models.User.is_staff` and
+      :attr:`~django.contrib.auth.models.User.is_superuser` are always
+      ``False``.
+    * :attr:`~django.contrib.auth.models.User.is_active` is always ``False``.
+    * :attr:`~django.contrib.auth.models.User.groups` and
+      :attr:`~django.contrib.auth.models.User.user_permissions` are always
+      empty.
+    * :meth:`~django.contrib.auth.models.User.is_anonymous()` returns ``True``
+      instead of ``False``.
+    * :meth:`~django.contrib.auth.models.User.is_authenticated()` returns
+      ``False`` instead of ``True``.
+    * :meth:`~django.contrib.auth.models.User.set_password()`,
+      :meth:`~django.contrib.auth.models.User.check_password()`,
+      :meth:`~django.db.models.Model.save` and
+      :meth:`~django.db.models.Model.delete()` raise
+      :exc:`~exceptions.NotImplementedError`.
+
+In practice, you probably won't need to use
+:class:`~django.contrib.auth.models.AnonymousUser` objects on your own, but
+they're used by Web requests, as explained in the next section.
+
+Permission
+==========
+
+.. class:: models.Permission
+
+Fields
+------
+
+:class:`~django.contrib.auth.models.Permission` objects have the following
+fields:
+
+.. attribute:: name
+
+    Required. 50 characters or fewer. Example: ``'Can vote'``.
+
+.. attribute:: content_type
+
+    Required. A reference to the ``django_content_type`` database table, which
+    contains a record for each installed Django model.
+
+.. attribute:: codename
+
+    Required. 100 characters or fewer. Example: ``'can_vote'``.
+
+Methods
+-------
+
+:class:`~django.contrib.auth.models.Permission` objects have the standard
+data-access methods like any other :doc:`Django model </ref/models/instances>`.
+
+Group
+=====
+
+.. class:: models.Group
+
+Fields
+------
+
+:class:`~django.contrib.auth.models.Group` objects have the following fields:
+
+.. attribute:: name
+
+    Required. 80 characters or fewer. Any characters are permitted. Example:
+    ``'Awesome Users'``.
+
+.. attribute:: permissions
+
+    Many-to-many field to :class:`~django.contrib.auth.models.Permission`::
+
+        group.permissions = [permission_list]
+        group.permissions.add(permission, permission, ...)
+        group.permissions.remove(permission, permission, ...)
+        group.permissions.clear()
+
+.. _topics-auth-signals:
+
+Login and logout signals
+========================
+
+.. module:: django.contrib.auth.signals
+
+The auth framework uses the following :doc:`signals </topics/signals>` that
+can be used for notification when a user logs in or out.
+
+.. function:: user_logged_in
+
+    Sent when a user logs in successfully.
+
+    Arguments sent with this signal:
+
+    ``sender``
+        The class of the user that just logged in.
+
+    ``request``
+        The current :class:`~django.http.HttpRequest` instance.
+
+    ``user``
+        The user instance that just logged in.
+
+.. function:: user_logged_out
+
+    Sent when the logout method is called.
+
+    ``sender``
+        As above: the class of the user that just logged out or ``None``
+        if the user was not authenticated.
+
+    ``request``
+        The current :class:`~django.http.HttpRequest` instance.
+
+    ``user``
+        The user instance that just logged out or ``None`` if the
+        user was not authenticated.
+
+.. function:: user_login_failed
+
+    .. versionadded:: 1.5
+
+    Sent when the user failed to login successfully
+
+    ``sender``
+        The name of the module used for authentication.
+
+    ``credentials``
+        A dictionary of keyword arguments containing the user credentials that were
+        passed to :func:`~django.contrib.auth.authenticate()` or your own custom
+        authentication backend. Credentials matching a set of 'sensitive' patterns,
+        (including password) will not be sent in the clear as part of the signal.
+
+.. _authentication-backends-reference:
+
+Authentication backends
+=======================
+
+.. module:: django.contrib.auth.backends
+   :synopsis: Django's built-in authentication backend classes.
+
+This section details the authentication backends that come with Django. For
+information on how to use them and how to write your own authentication
+backends, see the :ref:`Other authentication sources section
+<authentication-backends>` of the :doc:`User authentication guide
+</topics/auth/index>`.
+
+
+Available authentication backends
+---------------------------------
+
+The following backends are available in :mod:`django.contrib.auth.backends`:
+
+.. class:: ModelBackend
+
+    This is the default authentication backend used by Django.  It
+    authenticates using credentials consisting of a user identifier and
+    password.  For Django's default user model, the user identifier is the
+    username, for custom user models it is the field specified by
+    USERNAME_FIELD (see :doc:`Customizing Users and authentication
+    </topics/auth/customizing>`).
+
+    It also handles the default permissions model as defined for
+    :class:`~django.contrib.auth.models.User` and
+    :class:`~django.contrib.auth.models.PermissionsMixin`.
+
+.. class:: RemoteUserBackend
+
+    Use this backend to take advantage of external-to-Django-handled
+    authentication.  It authenticates using usernames passed in
+    :attr:`request.META['REMOTE_USER'] <django.http.HttpRequest.META>`.  See
+    the :doc:`Authenticating against REMOTE_USER </howto/auth-remote-user>`
+    documentation.
diff --git a/docs/ref/contrib/comments/custom.txt b/docs/ref/contrib/comments/custom.txt
index 0ef37a9a0b..fd70a6a224 100644
--- a/docs/ref/contrib/comments/custom.txt
+++ b/docs/ref/contrib/comments/custom.txt
@@ -4,6 +4,18 @@ Customizing the comments framework
 
 .. currentmodule:: django.contrib.comments
 
+.. warning::
+
+    Django's comment framework has been deprecated and is no longer supported.
+    Most users will be better served with a custom solution, or a hosted
+    product like Disqus__.
+
+    The code formerly known as ``django.contrib.comments`` is `still available
+    in an external repository`__.
+
+    __ https://disqus.com/
+    __ https://github.com/django/django-contrib-comments
+
 If the built-in comment framework doesn't quite fit your needs, you can extend
 the comment app's behavior to add custom data and logic. The comments framework
 lets you extend the built-in comment model, the built-in comment form, and the
@@ -66,15 +78,17 @@ In the ``models.py`` we'll define a ``CommentWithTitle`` model::
     class CommentWithTitle(Comment):
         title = models.CharField(max_length=300)
 
-Most custom comment models will subclass the :class:`Comment` model. However,
+Most custom comment models will subclass the
+:class:`~django.contrib.comments.models.Comment` model. However,
 if you want to substantially remove or change the fields available in the
-:class:`Comment` model, but don't want to rewrite the templates, you could
-try subclassing from :class:`BaseCommentAbstractModel`.
+:class:`~django.contrib.comments.models.Comment` model, but don't want to
+rewrite the templates, you could try subclassing from
+``BaseCommentAbstractModel``.
 
 Next, we'll define a custom comment form in ``forms.py``. This is a little more
 tricky: we have to both create a form and override
-:meth:`CommentForm.get_comment_model` and
-:meth:`CommentForm.get_comment_create_data` to return deal with our custom title
+``CommentForm.get_comment_model()`` and
+``CommentForm.get_comment_create_data()`` to return deal with our custom title
 field::
 
     from django import forms
@@ -139,7 +153,7 @@ however.
 
     Return the :class:`~django.db.models.Model` class to use for comments. This
     model should inherit from
-    :class:`django.contrib.comments.models.BaseCommentAbstractModel`, which
+    ``django.contrib.comments.models.BaseCommentAbstractModel``, which
     defines necessary core fields.
 
     The default implementation returns
@@ -170,33 +184,33 @@ however.
     attribute when rendering your comment form.
 
     The default implementation returns a reverse-resolved URL pointing
-    to the :func:`post_comment` view.
+    to the ``post_comment()`` view.
 
     .. note::
 
         If you provide a custom comment model and/or form, but you
-        want to use the default :func:`post_comment` view, you will
+        want to use the default ``post_comment()`` view, you will
         need to be aware that it requires the model and form to have
         certain additional attributes and methods: see the
-        :func:`post_comment` view documentation for details.
+        ``django.contrib.comments.views.post_comment()`` view for details.
 
 .. function:: get_flag_url()
 
     Return the URL for the "flag this comment" view.
 
     The default implementation returns a reverse-resolved URL pointing
-    to the :func:`django.contrib.comments.views.moderation.flag` view.
+    to the ``django.contrib.comments.views.moderation.flag()`` view.
 
 .. function:: get_delete_url()
 
     Return the URL for the "delete this comment" view.
 
     The default implementation returns a reverse-resolved URL pointing
-    to the :func:`django.contrib.comments.views.moderation.delete` view.
+    to the ``django.contrib.comments.views.moderation.delete()`` view.
 
 .. function:: get_approve_url()
 
     Return the URL for the "approve this comment from moderation" view.
 
     The default implementation returns a reverse-resolved URL pointing
-    to the :func:`django.contrib.comments.views.moderation.approve` view.
+    to the ``django.contrib.comments.views.moderation.approve()`` view.
diff --git a/docs/ref/contrib/comments/example.txt b/docs/ref/contrib/comments/example.txt
index 2bff778c2f..abf79c5f14 100644
--- a/docs/ref/contrib/comments/example.txt
+++ b/docs/ref/contrib/comments/example.txt
@@ -4,6 +4,18 @@
 Example of using the built-in comments app
 ===========================================
 
+.. warning::
+
+    Django's comment framework has been deprecated and is no longer supported.
+    Most users will be better served with a custom solution, or a hosted
+    product like Disqus__.
+
+    The code formerly known as ``django.contrib.comments`` is `still available
+    in an external repository`__.
+
+    __ https://disqus.com/
+    __ https://github.com/django/django-contrib-comments
+
 Follow the first three steps of the quick start guide in the
 :doc:`documentation </ref/contrib/comments/index>`.
 
@@ -136,12 +148,12 @@ Feeds
 =====
 
 Suppose you want to export a :doc:`feed </ref/contrib/syndication>` of the
-latest comments, you can use the built-in :class:`LatestCommentFeed`. Just
+latest comments, you can use the built-in ``LatestCommentFeed``. Just
 enable it in your project's ``urls.py``:
 
 .. code-block:: python
 
-  from django.conf.urls import patterns, url, include
+  from django.conf.urls import patterns
   from django.contrib.comments.feeds import LatestCommentFeed
 
   urlpatterns = patterns('',
@@ -166,7 +178,7 @@ features (all of which or only certain can be enabled):
 * Close comments after a particular (user-defined) number of days.
 * Email new comments to the site-staff.
 
-To enable comment moderation, we subclass the :class:`CommentModerator` and
+To enable comment moderation, we subclass the ``CommentModerator`` and
 register it with the moderation features we want. Let's suppose we want to
 close comments after 7 days of posting and also send out an email to the
 site staff. In ``blog/models.py``, we register a comment moderator in the
diff --git a/docs/ref/contrib/comments/forms.txt b/docs/ref/contrib/comments/forms.txt
index c21a27bb9e..f2624ca870 100644
--- a/docs/ref/contrib/comments/forms.txt
+++ b/docs/ref/contrib/comments/forms.txt
@@ -5,6 +5,18 @@ Comment form classes
 .. module:: django.contrib.comments.forms
    :synopsis: Forms for dealing with the built-in comment model.
 
+.. warning::
+
+    Django's comment framework has been deprecated and is no longer supported.
+    Most users will be better served with a custom solution, or a hosted
+    product like Disqus__.
+
+    The code formerly known as ``django.contrib.comments`` is `still available
+    in an external repository`__.
+
+    __ https://disqus.com/
+    __ https://github.com/django/django-contrib-comments
+
 The ``django.contrib.comments.forms`` module contains a handful of forms
 you'll use when writing custom views dealing with comments, or when writing
 :doc:`custom comment apps </ref/contrib/comments/custom>`.
@@ -43,4 +55,4 @@ forms that you can subclass to reuse pieces of the form handling logic:
    Handles the details of the comment itself.
 
    This class contains the ``name``, ``email``, ``url``, and the ``comment``
-   field itself, along with the associated validation logic.
\ No newline at end of file
+   field itself, along with the associated validation logic.
diff --git a/docs/ref/contrib/comments/index.txt b/docs/ref/contrib/comments/index.txt
index 8275092d2f..6db69d8168 100644
--- a/docs/ref/contrib/comments/index.txt
+++ b/docs/ref/contrib/comments/index.txt
@@ -7,6 +7,18 @@ Django's comments framework
 
 .. highlightlang:: html+django
 
+.. warning::
+
+    Django's comment framework has been deprecated and is no longer supported.
+    Most users will be better served with a custom solution, or a hosted
+    product like Disqus__.
+
+    The code formerly known as ``django.contrib.comments`` is `still available
+    in an external repository`__.
+
+    __ https://disqus.com/
+    __ https://github.com/django/django-contrib-comments
+
 Django includes a simple, yet customizable comments framework. The built-in
 comments framework can be used to attach comments to any model, so you can use
 it for comments on blog entries, photos, book chapters, or anything else.
@@ -34,7 +46,8 @@ To get started using the ``comments`` app, follow these steps:
 #. Use the `comment template tags`_ below to embed comments in your
    templates.
 
-You might also want to examine :doc:`/ref/contrib/comments/settings`.
+You might also want to examine :ref:`the available settings
+<settings-comments>`.
 
 Comment template tags
 =====================
@@ -335,6 +348,13 @@ output the CSRF token and cookie.
 
 .. _honeypot: http://en.wikipedia.org/wiki/Honeypot_(computing)
 
+
+Configuration
+=============
+
+See :ref:`comment settings <settings-comments>`.
+
+
 More information
 ================
 
@@ -342,7 +362,6 @@ More information
    :maxdepth: 1
 
    models
-   settings
    signals
    custom
    forms
diff --git a/docs/ref/contrib/comments/models.txt b/docs/ref/contrib/comments/models.txt
index e773790d65..cae9c11971 100644
--- a/docs/ref/contrib/comments/models.txt
+++ b/docs/ref/contrib/comments/models.txt
@@ -5,18 +5,30 @@ The built-in comment models
 .. module:: django.contrib.comments.models
    :synopsis: The built-in comment models
 
+.. warning::
+
+    Django's comment framework has been deprecated and is no longer supported.
+    Most users will be better served with a custom solution, or a hosted
+    product like Disqus__.
+
+    The code formerly known as ``django.contrib.comments`` is `still available
+    in an external repository`__.
+
+    __ https://disqus.com/
+    __ https://github.com/django/django-contrib-comments
+
 .. class:: Comment
 
     Django's built-in comment model. Has the following fields:
 
     .. attribute:: content_object
 
-        A :class:`~django.contrib.contettypes.generic.GenericForeignKey`
+        A :class:`~django.contrib.contenttypes.generic.GenericForeignKey`
         attribute pointing to the object the comment is attached to. You can use
         this to get at the related object (i.e. ``my_comment.content_object``).
 
         Since this field is a
-        :class:`~django.contrib.contettypes.generic.GenericForeignKey`, it's
+        :class:`~django.contrib.contenttypes.generic.GenericForeignKey`, it's
         actually syntactic sugar on top of two underlying attributes, described
         below.
 
@@ -77,4 +89,3 @@ The built-in comment models
 
         ``True`` if the comment was removed. Used to keep track of removed
         comments instead of just deleting them.
-
diff --git a/docs/ref/contrib/comments/moderation.txt b/docs/ref/contrib/comments/moderation.txt
index 39b3ea7913..796e257200 100644
--- a/docs/ref/contrib/comments/moderation.txt
+++ b/docs/ref/contrib/comments/moderation.txt
@@ -5,6 +5,18 @@ Generic comment moderation
 .. module:: django.contrib.comments.moderation
    :synopsis: Support for automatic comment moderation.
 
+.. warning::
+
+    Django's comment framework has been deprecated and is no longer supported.
+    Most users will be better served with a custom solution, or a hosted
+    product like Disqus__.
+
+    The code formerly known as ``django.contrib.comments`` is `still available
+    in an external repository`__.
+
+    __ https://disqus.com/
+    __ https://github.com/django/django-contrib-comments
+
 Django's bundled comments application is extremely useful on its own,
 but the amount of comment spam circulating on the Web today
 essentially makes it necessary to have some sort of automatic
@@ -81,8 +93,8 @@ Built-in moderation options
     .. attribute:: auto_close_field
 
         If this is set to the name of a
-        :class:`~django.db.models.fields.DateField` or
-        :class:`~django.db.models.fields.DateTimeField` on the model for which
+        :class:`~django.db.models.DateField` or
+        :class:`~django.db.models.DateTimeField` on the model for which
         comments are being moderated, new comments for objects of that model
         will be disallowed (immediately deleted) when a certain number of days
         have passed after the date specified in that field. Must be
@@ -117,7 +129,7 @@ Built-in moderation options
     .. attribute:: enable_field
 
         If this is set to the name of a
-        :class:`~django.db.models.fields.BooleanField` on the model
+        :class:`~django.db.models.BooleanField` on the model
         for which comments are being moderated, new comments on
         objects of that model will be disallowed (immediately deleted)
         whenever the value of that field is ``False`` on the object
@@ -185,15 +197,14 @@ via two methods:
     be moderated using the options defined in the
     ``CommentModerator`` subclass. If any of the models are
     already registered for moderation, the exception
-    :exc:`AlreadyModerated` will be raised.
+    ``AlreadyModerated`` will be raised.
 
 .. function:: moderator.unregister(model_or_iterable)
 
     Takes one argument: a model class or list of model classes,
     and removes the model or models from the set of models which
     are being moderated. If any of the models are not currently
-    being moderated, the exception
-    :exc:`NotModerated` will be raised.
+    being moderated, the exception ``NotModerated`` will be raised.
 
 
 Customizing the moderation system
@@ -207,8 +218,8 @@ models with an instance of the subclass.
 
 .. class:: Moderator
 
-    In addition to the :meth:`Moderator.register` and
-    :meth:`Moderator.unregister` methods detailed above, the following methods
+    In addition to the :func:`moderator.register` and
+    :func:`moderator.unregister` methods detailed above, the following methods
     on :class:`Moderator` can be overridden to achieve customized behavior:
 
     .. method:: connect
diff --git a/docs/ref/contrib/comments/settings.txt b/docs/ref/contrib/comments/settings.txt
deleted file mode 100644
index 1f1aecafd4..0000000000
--- a/docs/ref/contrib/comments/settings.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-================
-Comment settings
-================
-
-These settings configure the behavior of the comments framework:
-
-.. setting:: COMMENTS_HIDE_REMOVED
-
-COMMENTS_HIDE_REMOVED
----------------------
-
-If ``True`` (default), removed comments will be excluded from comment
-lists/counts (as taken from template tags). Otherwise, the template author is
-responsible for some sort of a "this comment has been removed by the site staff"
-message.
-
-.. setting:: COMMENT_MAX_LENGTH
-
-COMMENT_MAX_LENGTH
-------------------
-
-The maximum length of the comment field, in characters. Comments longer than
-this will be rejected. Defaults to 3000.
-
-.. setting:: COMMENTS_APP
-
-COMMENTS_APP
-------------
-
-An app which provides :doc:`customization of the comments framework
-</ref/contrib/comments/custom>`.  Use the same dotted-string notation
-as in :setting:`INSTALLED_APPS`.  Your custom :setting:`COMMENTS_APP`
-must also be listed in :setting:`INSTALLED_APPS`.
diff --git a/docs/ref/contrib/comments/signals.txt b/docs/ref/contrib/comments/signals.txt
index 8274539ed7..f9df8980d7 100644
--- a/docs/ref/contrib/comments/signals.txt
+++ b/docs/ref/contrib/comments/signals.txt
@@ -5,6 +5,18 @@ Signals sent by the comments app
 .. module:: django.contrib.comments.signals
    :synopsis: Signals sent by the comment module.
 
+.. warning::
+
+    Django's comment framework has been deprecated and is no longer supported.
+    Most users will be better served with a custom solution, or a hosted
+    product like Disqus__.
+
+    The code formerly known as ``django.contrib.comments`` is `still available
+    in an external repository`__.
+
+    __ https://disqus.com/
+    __ https://github.com/django/django-contrib-comments
+
 The comment app sends a series of :doc:`signals </topics/signals>` to allow for
 comment moderation and similar activities. See :doc:`the introduction to signals
 </topics/signals>` for information about how to register for and receive these
@@ -81,8 +93,8 @@ Arguments sent with this signal:
     :meth:`~django.db.models.Model.save` again.
 
 ``flag``
-    The :class:`~django.contrib.comments.models.CommentFlag` that's been
-    attached to the comment.
+    The ``django.contrib.comments.models.CommentFlag`` that's been attached to
+    the comment.
 
 ``created``
     ``True`` if this is a new flag; ``False`` if it's a duplicate flag.
diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt
index dfbeabc302..388172c43e 100644
--- a/docs/ref/contrib/contenttypes.txt
+++ b/docs/ref/contrib/contenttypes.txt
@@ -182,7 +182,7 @@ The ``ContentTypeManager``
 
         Clears an internal cache used by
         :class:`~django.contrib.contenttypes.models.ContentType` to keep track
-        of which models for which it has created
+        of models for which it has created
         :class:`~django.contrib.contenttypes.models.ContentType` instances. You
         probably won't ever need to call this method yourself; Django will call
         it automatically when it's needed.
@@ -234,14 +234,16 @@ lookup::
 
 .. versionadded:: 1.5
 
-Prior to Django 1.5 :meth:`~ContentTypeManager.get_for_model()` and
-:meth:`~ContentTypeManager.get_for_models()` always returned the
-:class:`~django.contrib.contenttypes.models.ContentType` associated with the
-concrete model of the specified one(s). That means there was no way to retreive
-the :class:`~django.contrib.contenttypes.models.ContentType` of a proxy model
+Prior to Django 1.5,
+:meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_model` and
+:meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_models`
+always returned the :class:`~django.contrib.contenttypes.models.ContentType`
+associated with the concrete model of the specified one(s). That means there
+was no way to retrieve the
+:class:`~django.contrib.contenttypes.models.ContentType` of a proxy model
 using those methods. As of Django 1.5 you can now pass a boolean flag –
-respectively ``for_concrete_model`` and ``for_concrete_models`` – to specify
-wether or not you want to retreive the
+``for_concrete_model`` and ``for_concrete_models`` respectively – to specify
+wether or not you want to retrieve the
 :class:`~django.contrib.contenttypes.models.ContentType` for the concrete or
 direct model.
 
@@ -275,7 +277,7 @@ A normal :class:`~django.db.models.ForeignKey` can only "point
 to" one other model, which means that if the ``TaggedItem`` model used a
 :class:`~django.db.models.ForeignKey` it would have to
 choose one and only one model to store tags for. The contenttypes
-application provides a special field type which
+application provides a special field type (``GenericForeignKey``) which
 works around this and allows the relationship to be with any
 model:
 
@@ -285,7 +287,8 @@ model:
     :class:`~django.contrib.contenttypes.generic.GenericForeignKey`:
 
     1. Give your model a :class:`~django.db.models.ForeignKey`
-       to :class:`~django.contrib.contenttypes.models.ContentType`.
+       to :class:`~django.contrib.contenttypes.models.ContentType`. The usual
+       name for this field is "content_type".
 
     2. Give your model a field that can store primary key values from the
        models you'll be relating to. For most models, this means a
@@ -450,14 +453,18 @@ need to calculate them without using the aggregation API.
 Generic relations in forms and admin
 ------------------------------------
 
-The :mod:`django.contrib.contenttypes.generic` module provides
-:class:`~django.contrib.contenttypes.generic.BaseGenericInlineFormSet`,
-:class:`~django.contrib.contenttypes.generic.GenericTabularInline`
-and :class:`~django.contrib.contenttypes.generic.GenericStackedInline`
-(the last two are subclasses of
-:class:`~django.contrib.contenttypes.generic.GenericInlineModelAdmin`).
-This enables the use of generic relations in forms and the admin. See the
-:doc:`model formset </topics/forms/modelforms>` and
+The :mod:`django.contrib.contenttypes.generic` module provides:
+
+* ``BaseGenericInlineFormSet``
+* :class:`~django.contrib.contenttypes.generic.GenericTabularInline`
+  and :class:`~django.contrib.contenttypes.generic.GenericStackedInline`
+  (subclasses of
+  :class:`~django.contrib.contenttypes.generic.GenericInlineModelAdmin`)
+* A formset factory, :func:`generic_inlineformset_factory`, for use with
+  :class:`GenericForeignKey`
+
+These classes and functions enable the use of generic relations in forms
+and the admin. See the :doc:`model formset </topics/forms/modelforms>` and
 :ref:`admin <using-generic-relations-as-an-inline>` documentation for more
 information.
 
@@ -478,3 +485,20 @@ information.
 
         The name of the integer field that represents the ID of the related
         object. Defaults to ``object_id``.
+
+.. class:: GenericTabularInline
+.. class:: GenericStackedInline
+
+    Subclasses of :class:`GenericInlineModelAdmin` with stacked and tabular
+    layouts, respectively.
+
+.. function:: generic_inlineformset_factory(model, form=ModelForm, formset=BaseGenericInlineFormSet, ct_field="content_type", fk_field="object_id", fields=None, exclude=None, extra=3, can_order=False, can_delete=True, max_num=None, formfield_callback=None, validate_max=False)
+
+    Returns a ``GenericInlineFormSet`` using
+    :func:`~django.forms.models.modelformset_factory`.
+
+    You must provide ``ct_field`` and ``object_id`` if they different from the
+    defaults, ``content_type`` and ``object_id`` respectively. Other parameters
+    are similar to those documented in
+    :func:`~django.forms.models.modelformset_factory` and
+    :func:`~django.forms.models.inlineformset_factory`.
diff --git a/docs/ref/contrib/csrf.txt b/docs/ref/contrib/csrf.txt
index 32d8a705bc..968ef0b07b 100644
--- a/docs/ref/contrib/csrf.txt
+++ b/docs/ref/contrib/csrf.txt
@@ -181,7 +181,7 @@ protecting the CSRF token from being sent to other domains.
     correctly on that version. Make sure you are running at least jQuery 1.5.1.
 
 You can use `settings.crossDomain <http://api.jquery.com/jQuery.ajax>`_ in
-jQuery 1.5 and newer in order to replace the `sameOrigin` logic above:
+jQuery 1.5 and newer in order to replace the ``sameOrigin`` logic above:
 
 .. code-block:: javascript
 
@@ -410,8 +410,6 @@ Utilities
 
 .. function:: ensure_csrf_cookie(view)
 
-    .. versionadded:: 1.4
-
     This decorator forces a view to send the CSRF cookie.
 
 Scenarios
@@ -490,64 +488,11 @@ developers of other reusable apps that want the same guarantees also use the
 Settings
 ========
 
-A number of settings can be used to control Django's CSRF behavior.
+A number of settings can be used to control Django's CSRF behavior:
 
-CSRF_COOKIE_DOMAIN
-------------------
-
-Default: ``None``
-
-The domain to be used when setting the CSRF cookie.  This can be useful for
-easily allowing cross-subdomain requests to be excluded from the normal cross
-site request forgery protection.  It should be set to a string such as
-``".example.com"`` to allow a POST request from a form on one subdomain to be
-accepted by a view served from another subdomain.
-
-Please note that, with or without use of this setting, this CSRF protection
-mechanism is not safe against cross-subdomain attacks -- see `Limitations`_.
-
-CSRF_COOKIE_NAME
-----------------
-
-Default: ``'csrftoken'``
-
-The name of the cookie to use for the CSRF authentication token. This can be
-whatever you want.
-
-CSRF_COOKIE_PATH
-----------------
-
-.. versionadded:: 1.4
-
-Default: ``'/'``
-
-The path set on the CSRF cookie. This should either match the URL path of your
-Django installation or be a parent of that path.
-
-This is useful if you have multiple Django instances running under the same
-hostname. They can use different cookie paths, and each instance will only see
-its own CSRF cookie.
-
-CSRF_COOKIE_SECURE
-------------------
-
-.. versionadded:: 1.4
-
-Default: ``False``
-
-Whether to use a secure cookie for the CSRF cookie. If this is set to ``True``,
-the cookie will be marked as "secure," which means browsers may ensure that the
-cookie is only sent under an HTTPS connection.
-
-CSRF_FAILURE_VIEW
------------------
-
-Default: ``'django.views.csrf.csrf_failure'``
-
-A dotted path to the view function to be used when an incoming request
-is rejected by the CSRF protection.  The function should have this signature::
-
-  def csrf_failure(request, reason="")
-
-where ``reason`` is a short message (intended for developers or logging, not for
-end users) indicating the reason the request was rejected.
+* :setting:`CSRF_COOKIE_DOMAIN`
+* :setting:`CSRF_COOKIE_HTTPONLY`
+* :setting:`CSRF_COOKIE_NAME`
+* :setting:`CSRF_COOKIE_PATH`
+* :setting:`CSRF_COOKIE_SECURE`
+* :setting:`CSRF_FAILURE_VIEW`
diff --git a/docs/ref/contrib/databrowse.txt b/docs/ref/contrib/databrowse.txt
deleted file mode 100644
index 3d411bb7b4..0000000000
--- a/docs/ref/contrib/databrowse.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-==========
-Databrowse
-==========
-
-.. module:: django.contrib.databrowse
-   :synopsis: Databrowse is a Django application that lets you browse your data.
-
-.. deprecated:: 1.4
-    This module has been deprecated.
-
-Databrowse is a Django application that lets you browse your data.
-
-As the Django admin dynamically creates an admin interface by introspecting
-your models, Databrowse dynamically creates a rich, browsable Web site by
-introspecting your models.
-
-How to use Databrowse
-=====================
-
-1. Point Django at the default Databrowse templates. There are two ways to
-   do this:
-
-   * Add ``'django.contrib.databrowse'`` to your :setting:`INSTALLED_APPS`
-     setting. This will work if your :setting:`TEMPLATE_LOADERS` setting
-     includes the ``app_directories`` template loader (which is the case by
-     default). See the :ref:`template loader docs <template-loaders>` for
-     more.
-
-   * Otherwise, determine the full filesystem path to the
-     :file:`django/contrib/databrowse/templates` directory, and add that
-     directory to your :setting:`TEMPLATE_DIRS` setting.
-
-2. Register a number of models with the Databrowse site::
-
-       from django.contrib import databrowse
-       from myapp.models import SomeModel, SomeOtherModel, YetAnotherModel
-
-       databrowse.site.register(SomeModel)
-       databrowse.site.register(SomeOtherModel, YetAnotherModel)
-
-   Note that you should register the model *classes*, not instances.
-
-   .. versionchanged:: 1.4
-
-   Since Django 1.4, it is possible to register several models in the same
-   call to :func:`~databrowse.site.register`.
-
-   It doesn't matter where you put this, as long as it gets executed at some
-   point. A good place for it is in your :doc:`URLconf file
-   </topics/http/urls>` (``urls.py``).
-
-3. Change your URLconf to import the :mod:`~django.contrib.databrowse` module::
-
-       from django.contrib import databrowse
-
-   ...and add the following line to your URLconf::
-
-       (r'^databrowse/(.*)', databrowse.site.root),
-
-   The prefix doesn't matter -- you can use ``databrowse/`` or ``db/`` or
-   whatever you'd like.
-
-4. Run the Django server and visit ``/databrowse/`` in your browser.
-
-Requiring user login
-====================
-
-You can restrict access to logged-in users with only a few extra lines of
-code. Simply add the following import to your URLconf::
-
-    from django.contrib.auth.decorators import login_required
-
-Then modify the :doc:`URLconf </topics/http/urls>` so that the
-:func:`databrowse.site.root` view is decorated with
-:func:`django.contrib.auth.decorators.login_required`::
-
-    (r'^databrowse/(.*)', login_required(databrowse.site.root)),
-
-If you haven't already added support for user logins to your :doc:`URLconf
-</topics/http/urls>`, as described in the :doc:`user authentication docs
-</ref/contrib/auth>`, then you will need to do so now with the following
-mapping::
-
-    (r'^accounts/login/$', 'django.contrib.auth.views.login'),
-
-The final step is to create the login form required by
-:func:`django.contrib.auth.views.login`. The
-:doc:`user authentication docs </ref/contrib/auth>` provide full details and a
-sample template that can be used for this purpose.
diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt
index 7ff9165642..292b304acb 100644
--- a/docs/ref/contrib/flatpages.txt
+++ b/docs/ref/contrib/flatpages.txt
@@ -117,17 +117,9 @@ can do all of the work.
       :class:`~django.template.RequestContext` in rendering the
       template.
 
-    .. versionchanged:: 1.4
-       The middleware will only add a trailing slash and redirect (by looking
-       at the :setting:`APPEND_SLASH` setting) if the resulting URL refers to
-       a valid flatpage. Previously requesting a non-existent flatpage
-       would redirect to the same URL with an apppended slash first and
-       subsequently raise a 404.
-
-    .. versionchanged:: 1.4
-       Redirects by the middleware are permanent (301 status code) instead of
-       temporary (302) to match behavior of the
-       :class:`~django.middleware.common.CommonMiddleware`.
+    The middleware will only add a trailing slash and redirect (by looking
+    at the :setting:`APPEND_SLASH` setting) if the resulting URL refers to
+    a valid flatpage. Redirects are permanent (301 status code).
 
     If it doesn't find a match, the request continues to be processed as usual.
 
@@ -194,7 +186,7 @@ Via the Python API
     If you add or modify flatpages via your own code, you will likely want to
     check for duplicate flatpage URLs within the same site. The flatpage form
     used in the admin performs this validation check, and can be imported from
-    :class:`django.contrib.flatpages.forms.FlatPageForm` and used in your own
+    ``django.contrib.flatpages.forms.FlatPageForm`` and used in your own
     views.
 
 Flatpage templates
@@ -264,7 +256,7 @@ Displaying ``registration_required`` flatpages
 By default, the :ttag:`get_flatpages` templatetag will only show
 flatpages that are marked ``registration_required = False``. If you
 want to display registration-protected flatpages, you need to specify
-an authenticated user using a``for`` clause.
+an authenticated user using a ``for`` clause.
 
 For example:
 
diff --git a/docs/ref/contrib/formtools/form-preview.txt b/docs/ref/contrib/formtools/form-preview.txt
index 784213ecba..011e72c2e0 100644
--- a/docs/ref/contrib/formtools/form-preview.txt
+++ b/docs/ref/contrib/formtools/form-preview.txt
@@ -25,9 +25,8 @@ application takes care of the following workflow:
    a. If it's valid, displays a preview page.
    b. If it's not valid, redisplays the form with error messages.
 3. When the "confirmation" form is submitted from the preview page, calls
-   a hook that you define -- a
-   :meth:`~django.contrib.formtools.preview.FormPreview.done()` method that gets
-   passed the valid data.
+   a hook that you define -- a ``done()`` method that gets passed the valid
+   data.
 
 The framework enforces the required preview by passing a shared-secret hash to
 the preview page via hidden form fields. If somebody tweaks the form parameters
@@ -51,8 +50,7 @@ How to use ``FormPreview``
      directory to your :setting:`TEMPLATE_DIRS` setting.
 
 2. Create a :class:`~django.contrib.formtools.preview.FormPreview` subclass that
-   overrides the :meth:`~django.contrib.formtools.preview.FormPreview.done()`
-   method::
+   overrides the ``done()`` method::
 
        from django.contrib.formtools.preview import FormPreview
        from myapp.models import SomeModel
@@ -92,13 +90,15 @@ How to use ``FormPreview``
 A :class:`~django.contrib.formtools.preview.FormPreview` class is a simple Python class
 that represents the preview workflow.
 :class:`~django.contrib.formtools.preview.FormPreview` classes must subclass
-``django.contrib.formtools.preview.FormPreview`` and override the
-:meth:`~django.contrib.formtools.preview.FormPreview.done()` method. They can live
-anywhere in your codebase.
+``django.contrib.formtools.preview.FormPreview`` and override the ``done()``
+method. They can live anywhere in your codebase.
 
 ``FormPreview`` templates
 =========================
 
+.. attribute:: FormPreview.form_template
+.. attribute:: FormPreview.preview_template
+
 By default, the form is rendered via the template :file:`formtools/form.html`,
 and the preview page is rendered via the template :file:`formtools/preview.html`.
 These values can be overridden for a particular form preview by setting
diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt
index 3edc019d05..f85ae8356d 100644
--- a/docs/ref/contrib/formtools/form-wizard.txt
+++ b/docs/ref/contrib/formtools/form-wizard.txt
@@ -54,7 +54,8 @@ you just have to do these things:
 4. Add ``django.contrib.formtools`` to your
    :setting:`INSTALLED_APPS` list in your settings file.
 
-5. Point your URLconf at your :class:`WizardView` :meth:`~WizardView.as_view` method.
+5. Point your URLconf at your :class:`WizardView` :meth:`~WizardView.as_view`
+   method.
 
 Defining ``Form`` classes
 -------------------------
@@ -89,6 +90,9 @@ the message itself. Here's what the :file:`forms.py` might look like::
 Creating a ``WizardView`` subclass
 ----------------------------------
 
+.. class:: SessionWizardView
+.. class:: CookieWizardView
+
 The next step is to create a
 :class:`django.contrib.formtools.wizard.views.WizardView` subclass. You can
 also use the :class:`SessionWizardView` or :class:`CookieWizardView` classes
@@ -225,9 +229,11 @@ Here's a full example template:
 Hooking the wizard into a URLconf
 ---------------------------------
 
+.. method:: WizardView.as_view
+
 Finally, we need to specify which forms to use in the wizard, and then
 deploy the new :class:`WizardView` object at a URL in the ``urls.py``. The
-wizard's :meth:`as_view` method takes a list of your
+wizard's ``as_view()`` method takes a list of your
 :class:`~django.forms.Form` classes as an argument during instantiation::
 
     from django.conf.urls import patterns
@@ -239,6 +245,13 @@ wizard's :meth:`as_view` method takes a list of your
         (r'^contact/$', ContactWizard.as_view([ContactForm1, ContactForm2])),
     )
 
+.. versionchanged:: 1.6
+
+You can also pass the form list as a class attribute named ``form_list``::
+
+    class ContactWizard(WizardView):
+        form_list = [ContactForm1, ContactForm2]
+
 .. _wizard-template-for-each-form:
 
 Using a different template for each form
@@ -289,6 +302,14 @@ The ``urls.py`` file would contain something like::
         (r'^checkout/$', OrderWizard.as_view(FORMS, condition_dict={'cc': pay_by_credit_card})),
     )
 
+.. versionchanged:: 1.6
+
+The ``condiction_dict`` can be passed as attribute for the ``as_view()`
+method or as a class attribute named ``condition_dict``::
+
+    class OrderWizard(WizardView):
+        condition_dict = {'cc': pay_by_credit_card}
+
 Note that the ``OrderWizard`` object is initialized with a list of pairs.
 The first element in the pair is a string that corresponds to the name of the
 step and the second is the form class.
@@ -312,11 +333,16 @@ Advanced ``WizardView`` methods
     counter as string representing the current step of the wizard. (E.g., the
     first form is ``'0'`` and the second form is ``'1'``)
 
-.. method:: WizardView.get_form_prefix(step)
+.. method:: WizardView.get_form_prefix(step=None, form=None)
 
-    Given the step, returns a form prefix to use. By default, this simply uses
-    the step itself. For more, see the :ref:`form prefix documentation
-    <form-prefix>`.
+    Returns the prefix which will be used when calling the form for the given
+    step. ``step`` contains the step name, ``form`` the form class which will
+    be called with the returned prefix.
+
+    If no ``step`` is given, it will be determined automatically. By default,
+    this simply uses the step itself and the ``form`` parameter is not used.
+
+    For more, see the :ref:`form prefix documentation <form-prefix>`.
 
 .. method:: WizardView.get_form_initial(step)
 
@@ -346,9 +372,9 @@ Advanced ``WizardView`` methods
     used as the form for step ``step``.
 
     Returns an :class:`~django.db.models.Model` object which will be passed as
-    the :attr:`~django.forms.ModelForm.instance` argument when instantiating the
-    ModelForm for step ``step``.  If no instance object was provided while
-    initializing the form wizard, ``None`` will be returned.
+    the ``instance`` argument when instantiating the ``ModelForm`` for step
+    ``step``.  If no instance object was provided while initializing the form
+    wizard, ``None`` will be returned.
 
     The default implementation::
 
@@ -443,6 +469,17 @@ Advanced ``WizardView`` methods
         def process_step_files(self, form):
             return self.get_form_step_files(form)
 
+.. method:: WizardView.render_goto_step(step, goto_step, **kwargs)
+
+    .. versionadded:: 1.6
+
+    This method is called when the step should be changed to something else
+    than the next step. By default, this method just stores the requested
+    step ``goto_step`` in the storage and then renders the new step.
+
+    If you want to store the entered data of the current step before rendering
+    the next step, you can overwrite this method.
+
 .. method:: WizardView.render_revalidation_failure(step, form, **kwargs)
 
     When the wizard thinks all steps have passed it revalidates all forms with
@@ -514,10 +551,10 @@ Providing initial data for the forms
 .. attribute:: WizardView.initial_dict
 
     Initial data for a wizard's :class:`~django.forms.Form` objects can be
-    provided using the optional :attr:`~Wizard.initial_dict` keyword argument.
-    This argument should be a dictionary mapping the steps to dictionaries
-    containing the initial data for each step. The dictionary of initial data
-    will be passed along to the constructor of the step's
+    provided using the optional :attr:`~WizardView.initial_dict` keyword
+    argument. This argument should be a dictionary mapping the steps to
+    dictionaries containing the initial data for each step. The dictionary of
+    initial data will be passed along to the constructor of the step's
     :class:`~django.forms.Form`::
 
         >>> from myapp.forms import ContactForm1, ContactForm2
@@ -526,7 +563,9 @@ Providing initial data for the forms
         ...     '0': {'subject': 'Hello', 'sender': 'user@example.com'},
         ...     '1': {'message': 'Hi there!'}
         ... }
-        >>> wiz = ContactWizard.as_view([ContactForm1, ContactForm2], initial_dict=initial)
+        >>> # This example is illustrative only and isn't meant to be run in
+        >>> # the shell since it requires an HttpRequest to pass to the view.
+        >>> wiz = ContactWizard.as_view([ContactForm1, ContactForm2], initial_dict=initial)(request)
         >>> form1 = wiz.get_form('0')
         >>> form2 = wiz.get_form('1')
         >>> form1.initial
@@ -537,16 +576,23 @@ Providing initial data for the forms
     The ``initial_dict`` can also take a list of dictionaries for a specific
     step if the step is a ``FormSet``.
 
+    .. versionchanged:: 1.6
+
+    The ``initial_dict`` can also be added as a class attribute named
+    ``initial_dict`` to avoid having the initial data in the ``urls.py``.
+
 .. _wizard-files:
 
 Handling files
 ==============
 
+.. attribute:: WizardView.file_storage
+
 To handle :class:`~django.forms.FileField` within any step form of the wizard,
-you have to add a :attr:`file_storage` to your :class:`WizardView` subclass.
+you have to add a ``file_storage`` to your :class:`WizardView` subclass.
 
 This storage will temporarily store the uploaded files for the wizard. The
-:attr:`file_storage` attribute should be a
+``file_storage`` attribute should be a
 :class:`~django.core.files.storage.Storage` subclass.
 
 Django provides a built-in storage class (see :ref:`the built-in filesystem
@@ -646,6 +692,8 @@ Usage of ``NamedUrlWizardView``
 ===============================
 
 .. class:: NamedUrlWizardView
+.. class:: NamedUrlSessionWizardView
+.. class:: NamedUrlCookieWizardView
 
 There is a :class:`WizardView` subclass which adds named-urls support to the
 wizard. By doing this, you can have single urls for every step. You can also
diff --git a/docs/ref/contrib/formtools/index.txt b/docs/ref/contrib/formtools/index.txt
index f36470654a..e768c0e655 100644
--- a/docs/ref/contrib/formtools/index.txt
+++ b/docs/ref/contrib/formtools/index.txt
@@ -1,6 +1,8 @@
 django.contrib.formtools
 ========================
 
+.. module:: django.contrib.formtools
+
 A set of high-level abstractions for Django forms (:mod:`django.forms`).
 
 .. toctree::
diff --git a/docs/ref/contrib/gis/commands.txt b/docs/ref/contrib/gis/commands.txt
index 3dd161ce1d..015a1f9741 100644
--- a/docs/ref/contrib/gis/commands.txt
+++ b/docs/ref/contrib/gis/commands.txt
@@ -47,7 +47,8 @@ of using ``ogrinspect`` :ref:`in the tutorial <ogrinspect-intro>`.
    The key for specifying which layer in the OGR
    :class:`~django.contrib.gis.gdal.DataSource` source to use.
    Defaults to 0 (the first layer). May be an integer or a string identifier
-   for the :class:`~django.contrib.gis.gdal.Layer`.
+   for the :class:`~django.contrib.gis.gdal.Layer`. When inspecting databases,
+   ``layer`` is generally the table name you want to inspect.
 
 .. django-admin-option:: --mapping
 
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index 519f79f0d4..be413c9df8 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -4,20 +4,23 @@
 GeoDjango Database API
 ======================
 
-.. module:: django.contrib.gis.db.models
-   :synopsis: GeoDjango's database API.
-
 .. _spatial-backends:
 
 Spatial Backends
 ================
 
+.. module:: django.contrib.gis.db.backends
+   :synopsis: GeoDjango's spatial database backends.
+
 GeoDjango currently provides the following spatial database backends:
 
-* :mod:`django.contrib.gis.db.backends.postgis`
-* :mod:`django.contrib.gis.db.backends.mysql`
-* :mod:`django.contrib.gis.db.backends.oracle`
-* :mod:`django.contrib.gis.db.backends.spatialite`
+* ``django.contrib.gis.db.backends.postgis``
+* ``django.contrib.gis.db.backends.mysql``
+* ``django.contrib.gis.db.backends.oracle``
+* ``django.contrib.gis.db.backends.spatialite``
+
+.. module:: django.contrib.gis.db.models
+   :synopsis: GeoDjango's database API.
 
 .. _mysql-spatial-limitations:
 
diff --git a/docs/ref/contrib/gis/feeds.txt b/docs/ref/contrib/gis/feeds.txt
index 7c3a2d011c..7b1b6ebccf 100644
--- a/docs/ref/contrib/gis/feeds.txt
+++ b/docs/ref/contrib/gis/feeds.txt
@@ -27,7 +27,7 @@ API Reference
 .. class:: Feed
 
    In addition to methods provided by
-   the :class:`django.contrib.syndication.feeds.Feed`
+   the :class:`django.contrib.syndication.views.Feed`
    base class, GeoDjango's ``Feed`` class provides
    the following overrides.  Note that these overrides may be done in multiple ways::
 
@@ -71,11 +71,11 @@ API Reference
    can be a ``GEOSGeometry`` instance, or a tuple that represents a
    point coordinate or bounding box.  For example::
 
-       class ZipcodeFeed(Feed):
+        class ZipcodeFeed(Feed):
 
-           def item_geometry(self, obj):
-	       # Returns the polygon.
-               return obj.poly
+            def item_geometry(self, obj):
+                # Returns the polygon.
+                return obj.poly
 
 ``SyndicationFeed`` Subclasses
 ------------------------------
diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt
index c4b29bead7..c68030673b 100644
--- a/docs/ref/contrib/gis/gdal.txt
+++ b/docs/ref/contrib/gis/gdal.txt
@@ -13,7 +13,7 @@ of GDAL is the `OGR`__ Simple Features Library, which specializes
 in reading and writing vector geographic data in a variety of standard
 formats.
 
-GeoDjango provides a high-level Python interface for some of the 
+GeoDjango provides a high-level Python interface for some of the
 capabilities of OGR, including the reading and coordinate transformation
 of vector spatial data.
 
@@ -22,7 +22,7 @@ of vector spatial data.
      Although the module is named ``gdal``, GeoDjango only supports
      some of the capabilities of OGR.  Thus, none of GDAL's features
      with respect to raster (image) data are supported at this time.
-   
+
 __ http://www.gdal.org/
 __ http://www.gdal.org/ogr/
 
@@ -68,13 +68,13 @@ each feature in that layer.
    also supports a variety of more complex data sources, including
    databases, that may be accessed by passing a special name string instead
    of a path.  For more information, see the `OGR Vector Formats`__
-   documentation.  The :attr:`name` property of a ``DataSource`` 
+   documentation.  The :attr:`name` property of a ``DataSource``
    instance gives the OGR name of the underlying data source that it is
    using.
 
-   Once you've created your ``DataSource``, you can find out how many 
-   layers of data it contains by accessing the :attr:`layer_count` property, 
-   or (equivalently) by using the ``len()`` function.  For information on 
+   Once you've created your ``DataSource``, you can find out how many
+   layers of data it contains by accessing the :attr:`layer_count` property,
+   or (equivalently) by using the ``len()`` function.  For information on
    accessing the layers of data themselves, see the next section::
 
        >>> from django.contrib.gis.gdal import DataSource
@@ -105,7 +105,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html
    Python container of ``Layer`` objects.  For example, you can access a
    specific layer by its index (e.g. ``ds[0]`` to access the first
    layer), or you can iterate over all the layers in the container in a
-   ``for`` loop.  The ``Layer`` itself acts as a container for geometric 
+   ``for`` loop.  The ``Layer`` itself acts as a container for geometric
    features.
 
    Typically, all the features in a given layer have the same geometry type.
@@ -120,7 +120,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html
 
    The example output is from the cities data source, loaded above, which
    evidently contains one layer, called ``"cities"``, which contains three
-   point features.  For simplicity, the examples below assume that you've 
+   point features.  For simplicity, the examples below assume that you've
    stored that layer in the variable ``layer``::
 
        >>> layer = ds[0]
@@ -169,7 +169,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html
 
        >>> [ft.__name__ for ft in layer.field_types]
        ['OFTString', 'OFTReal', 'OFTReal', 'OFTDate']
- 
+
    .. attribute:: field_widths
 
    Returns a list of the maximum field widths for each of the fields in
@@ -181,7 +181,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html
    .. attribute:: field_precisions
 
    Returns a list of the numeric precisions for each of the fields in
-   this layer.  This is meaningless (and set to zero) for non-numeric 
+   this layer.  This is meaningless (and set to zero) for non-numeric
    fields::
 
        >>> layer.field_precisions
@@ -189,7 +189,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html
 
    .. attribute:: extent
 
-   Returns the spatial extent of this layer, as an :class:`Envelope` 
+   Returns the spatial extent of this layer, as an :class:`Envelope`
    object::
 
       >>> layer.extent.tuple
@@ -214,7 +214,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html
 
    Property that may be used to retrieve or set a spatial filter for this
    layer.  A spatial filter can only be set with an :class:`OGRGeometry`
-   instance, a 4-tuple extent, or ``None``.  When set with something 
+   instance, a 4-tuple extent, or ``None``.  When set with something
    other than ``None``, only features that intersect the filter will be
    returned when iterating over the layer::
 
@@ -258,9 +258,9 @@ __ http://www.gdal.org/ogr/ogr_formats.html
    given capability (a string).  Examples of valid capability strings
    include: ``'RandomRead'``, ``'SequentialWrite'``, ``'RandomWrite'``,
    ``'FastSpatialFilter'``, ``'FastFeatureCount'``, ``'FastGetExtent'``,
-   ``'CreateField'``, ``'Transactions'``, ``'DeleteFeature'``, and 
+   ``'CreateField'``, ``'Transactions'``, ``'DeleteFeature'``, and
    ``'FastSetNextByIndex'``.
-   
+
 ``Feature``
 -----------
 
@@ -295,14 +295,14 @@ __ http://www.gdal.org/ogr/ogr_formats.html
 
    Returns the type of geometry for this feature, as an :class:`OGRGeomType`
    object.  This will be the same for all features in a given layer, and
-   is equivalent to the :attr:`Layer.geom_type` property of the 
-   :class:`Layer`` object the feature came from.
+   is equivalent to the :attr:`Layer.geom_type` property of the
+   :class:`Layer` object the feature came from.
 
    .. attribute:: num_fields
 
    Returns the number of fields of data associated with the feature.
    This will be the same for all features in a given layer, and is
-   equivalent to the :attr:`Layer.num_fields` property of the 
+   equivalent to the :attr:`Layer.num_fields` property of the
    :class:`Layer` object the feature came from.
 
    .. attribute:: fields
@@ -350,7 +350,7 @@ __ http://www.gdal.org/ogr/ogr_formats.html
    .. attribute:: type
 
    Returns the OGR type of this field, as an integer.  The
-   ``FIELD_CLASSES`` dictionary maps these values onto 
+   ``FIELD_CLASSES`` dictionary maps these values onto
    subclasses of ``Field``::
 
        >>> city['Density'].type
@@ -365,8 +365,8 @@ __ http://www.gdal.org/ogr/ogr_formats.html
 
    .. attribute:: value
 
-   Returns the value of this field.  The ``Field`` class itself 
-   returns the value as a string, but each subclass returns the 
+   Returns the value of this field.  The ``Field`` class itself
+   returns the value as a string, but each subclass returns the
    value in the most appropriate form::
 
        >>> city['Population'].value
@@ -433,10 +433,10 @@ OGR Geometries
 ``OGRGeometry``
 ---------------
 
-:class:`OGRGeometry` objects share similar functionality with 
+:class:`OGRGeometry` objects share similar functionality with
 :class:`~django.contrib.gis.geos.GEOSGeometry` objects, and are thin
-wrappers around OGR's internal geometry representation.  Thus, 
-they allow for more efficient access to data when using :class:`DataSource`. 
+wrappers around OGR's internal geometry representation.  Thus,
+they allow for more efficient access to data when using :class:`DataSource`.
 Unlike its GEOS counterpart, :class:`OGRGeometry` supports spatial reference
 systems and coordinate transformation::
 
@@ -446,10 +446,10 @@ systems and coordinate transformation::
 .. class:: OGRGeometry(geom_input[, srs=None])
 
    This object is a wrapper for the `OGR Geometry`__ class.
-   These objects are instantiated directly from the given ``geom_input`` 
+   These objects are instantiated directly from the given ``geom_input``
    parameter, which may be a string containing WKT, HEX, GeoJSON, a ``buffer``
    containing WKB data, or an :class:`OGRGeomType` object. These objects
-   are also returned from the :class:`Feature.geom` attribute, when 
+   are also returned from the :class:`Feature.geom` attribute, when
    reading vector data from :class:`Layer` (which is in turn a part of
    a :class:`DataSource`).
 
@@ -557,14 +557,14 @@ systems and coordinate transformation::
 
    .. attribute:: srid
 
-   Returns or sets the spatial reference identifier corresponding to 
+   Returns or sets the spatial reference identifier corresponding to
    :class:`SpatialReference` of this geometry.  Returns ``None`` if
    there is no spatial reference information associated with this
    geometry, or if an SRID cannot be determined.
 
    .. attribute:: geos
 
-   Returns a :class:`~django.contrib.gis.geos.GEOSGeometry` object 
+   Returns a :class:`~django.contrib.gis.geos.GEOSGeometry` object
    corresponding to this geometry.
 
    .. attribute:: gml
@@ -634,8 +634,8 @@ systems and coordinate transformation::
    or any other input accepted by :class:`SpatialReference` (including
    spatial reference WKT and PROJ.4 strings, or an integer SRID).
    By default nothing is returned and the geometry is transformed in-place.
-   However, if the `clone` keyword is set to ``True`` then a transformed clone
-   of this geometry is returned instead.
+   However, if the ``clone`` keyword is set to ``True`` then a transformed
+   clone of this geometry is returned instead.
 
    .. method:: intersects(other)
 
@@ -762,9 +762,9 @@ systems and coordinate transformation::
 
    .. attribute:: z
 
-   Returns a list of Z coordinates in this line, or ``None`` if the 
+   Returns a list of Z coordinates in this line, or ``None`` if the
    line does not have Z coordinates::
- 
+
        >>> OGRGeometry('LINESTRING (1 2 3,4 5 6)').z
        [3.0, 6.0]
 
@@ -885,7 +885,7 @@ Coordinate System Objects
 
    Spatial reference objects are initialized on the given ``srs_input``,
    which may be one of the following:
- 
+
    * OGC Well Known Text (WKT) (a string)
    * EPSG code (integer or string)
    * PROJ.4 string
@@ -912,7 +912,7 @@ Coordinate System Objects
    .. method:: __getitem__(target)
 
    Returns the value of the given string attribute node, ``None`` if the node
-   doesn't exist.  Can also take a tuple as a parameter, (target, child), 
+   doesn't exist.  Can also take a tuple as a parameter, (target, child),
    where child is the index of the attribute in the WKT.  For example::
 
        >>> wkt = 'GEOGCS["WGS 84", DATUM["WGS_1984, ... AUTHORITY["EPSG","4326"]]')
@@ -1011,7 +1011,7 @@ Coordinate System Objects
 
    .. attribute:: units
 
-   Returns a 2-tuple of the units value and the units name, 
+   Returns a 2-tuple of the units value and the units name,
    and will automatically determines whether to return the linear
    or angular units.
 
@@ -1073,7 +1073,7 @@ Coordinate System Objects
 
 .. class:: CoordTransform(source, target)
 
-Represents a coordinate system transform.  It is initialized with two 
+Represents a coordinate system transform.  It is initialized with two
 :class:`SpatialReference`, representing the source and target coordinate
 systems, respectively.  These objects should be used when performing
 the same coordinate transformation repeatedly on different geometries::
diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt
index e37c4c60b0..2444849a19 100644
--- a/docs/ref/contrib/gis/geoip.txt
+++ b/docs/ref/contrib/gis/geoip.txt
@@ -7,22 +7,13 @@ Geolocation with GeoIP
 .. module:: django.contrib.gis.geoip
    :synopsis: High-level Python interface for MaxMind's GeoIP C library.
 
-.. versionchanged:: 1.4
-
-.. note::
-
-    In Django 1.4, the :class:`GeoIP` object was moved out of
-    :mod:`django.contrib.gis.utils` and into its own module, 
-    :mod:`django.contrib.gis.geoip`. A shortcut is still provided
-    in ``utils``, but will be removed in Django 1.6.
-
 The :class:`GeoIP` object is a ctypes wrapper for the
 `MaxMind GeoIP C API`__. [#]_  This interface is a BSD-licensed alternative
 to the GPL-licensed `Python GeoIP`__ interface provided by MaxMind.
 
 In order to perform IP-based geolocation, the :class:`GeoIP` object requires
-the GeoIP C libary and either the GeoIP `Country`__ or `City`__ 
-datasets in binary format (the CSV files will not work!).  These datasets may be 
+the GeoIP C libary and either the GeoIP `Country`__ or `City`__
+datasets in binary format (the CSV files will not work!).  These datasets may be
 `downloaded from MaxMind`__.  Grab the ``GeoLiteCountry/GeoIP.dat.gz`` and
 ``GeoLiteCity.dat.gz`` files and unzip them in a directory corresponding to what
 you set :setting:`GEOIP_PATH` with in your settings.  See the example and
@@ -58,7 +49,7 @@ usage::
      >>> g.lat_lon('salon.com')
      (37.789798736572266, -122.39420318603516)
      >>> g.lon_lat('uh.edu')
-     (-95.415199279785156, 29.77549934387207) 
+     (-95.415199279785156, 29.77549934387207)
      >>> g.geos('24.124.1.80').wkt
      'POINT (-95.2087020874023438 39.0392990112304688)'
 
@@ -104,30 +95,30 @@ Defaults to ``'GeoLiteCity.dat'``.
 
 .. class:: GeoIP([path=None, cache=0, country=None, city=None])
 
-The ``GeoIP`` object does not require any parameters to use the default 
+The ``GeoIP`` object does not require any parameters to use the default
 settings.  However, at the very least the :setting:`GEOIP_PATH` setting
-should be set with the path of the location of your GeoIP data sets.  The 
-following intialization keywords may be used to customize any of the 
-defaults. 
+should be set with the path of the location of your GeoIP data sets.  The
+following intialization keywords may be used to customize any of the
+defaults.
 
 ===================  =======================================================
 Keyword Arguments    Description
 ===================  =======================================================
-``path``             Base directory to where GeoIP data is located or the 
-                     full path to where the city or country data files 
-                     (.dat) are located.  Assumes that both the city and 
-                     country data sets are located in this directory; 
+``path``             Base directory to where GeoIP data is located or the
+                     full path to where the city or country data files
+                     (.dat) are located.  Assumes that both the city and
+                     country data sets are located in this directory;
                      overrides the :setting:`GEOIP_PATH` settings attribute.
 
 ``cache``            The cache settings when opening up the GeoIP datasets,
                      and may be an integer in (0, 1, 2, 4) corresponding to
-                     the ``GEOIP_STANDARD``, ``GEOIP_MEMORY_CACHE``, 
-                     ``GEOIP_CHECK_CACHE``, and ``GEOIP_INDEX_CACHE`` 
-                     ``GeoIPOptions`` C API settings, respectively. 
+                     the ``GEOIP_STANDARD``, ``GEOIP_MEMORY_CACHE``,
+                     ``GEOIP_CHECK_CACHE``, and ``GEOIP_INDEX_CACHE``
+                     ``GeoIPOptions`` C API settings, respectively.
                      Defaults to 0 (``GEOIP_STANDARD``).
- 
+
 ``country``          The name of the GeoIP country data file.  Defaults
-                     to ``GeoIP.dat``.  Setting this keyword overrides the 
+                     to ``GeoIP.dat``.  Setting this keyword overrides the
                      :setting:`GEOIP_COUNTRY` settings attribute.
 
 ``city``             The name of the GeoIP city data file.  Defaults to
@@ -142,9 +133,9 @@ Querying
 --------
 
 All the following querying routines may take either a string IP address
-or a fully qualified domain name (FQDN).  For example, both 
-``'205.186.163.125'`` and ``'djangoproject.com'`` would be valid query 
-parameters. 
+or a fully qualified domain name (FQDN).  For example, both
+``'205.186.163.125'`` and ``'djangoproject.com'`` would be valid query
+parameters.
 
 .. method:: GeoIP.city(query)
 
@@ -153,7 +144,7 @@ of the values in the dictionary may be undefined (``None``).
 
 .. method:: GeoIP.country(query)
 
-Returns a dictionary with the country code and country for the given 
+Returns a dictionary with the country code and country for the given
 query.
 
 .. method:: GeoIP.country_code(query)
@@ -202,7 +193,7 @@ and country), and the version of the GeoIP C library (if supported).
 GeoIP-Python API compatibility methods
 ----------------------------------------
 
-These methods exist to ease compatibility with any code using MaxMind's 
+These methods exist to ease compatibility with any code using MaxMind's
 existing Python API.
 
 .. classmethod:: GeoIP.open(path, cache)
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 69280dc028..97217e3c38 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -683,7 +683,7 @@ Keyword Argument       Description
                        a method name clashes with an existing
                        ``GeoQuerySet`` method -- if you wanted to use the
                        ``area()`` method on model with a ``PolygonField``
-		       named ``area``, for example.
+                       named ``area``, for example.
 =====================  =====================================================
 
 Measurement
@@ -949,6 +949,9 @@ __ http://geohash.org/
 
 *Availability*: PostGIS, SpatiaLite
 
+.. versionchanged:: 1.5
+    ``geojson`` support for Spatialite > 3.0 has been added.
+
 Attaches a ``geojson`` attribute to every model in the queryset that contains the
 `GeoJSON`__ representation of the geometry.
 
@@ -1043,7 +1046,7 @@ Keyword Argument       Description
 =====================  =====================================================
 ``relative``           If set to ``True``, the path data will be implemented
                        in terms of relative moves.  Defaults to ``False``,
-		       meaning that absolute moves are used instead.
+                       meaning that absolute moves are used instead.
 
 ``precision``          This keyword may be used to specify the number of
                        significant digits for the coordinates in the SVG
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index 7d7c32781c..4d44638488 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -142,10 +142,9 @@ Geometry Objects
 
 .. class:: GEOSGeometry(geo_input[, srid=None])
 
-  :param geo_input: Geometry input value
-  :type geo_input: string or buffer
+  :param geo_input: Geometry input value (string or buffer)
   :param srid: spatial reference identifier
-  :type srid: integer
+  :type srid: int
 
 This is the base class for all GEOS geometry objects.  It initializes on the
 given ``geo_input`` argument, and then assumes the proper geometry subclass
@@ -800,7 +799,7 @@ Example::
    :param string: string that contains spatial data
    :type string: string
    :param srid: spatial reference identifier
-   :type srid: integer
+   :type srid: int
    :rtype: a :class:`GEOSGeometry` corresponding to the spatial data in the string
 
 Example::
@@ -966,3 +965,10 @@ location (e.g., ``/home/bob/lib/libgeos_c.so``).
 
     The setting must be the *full* path to the **C** shared library; in
     other words you want to use ``libgeos_c.so``, not ``libgeos.so``.
+
+Exceptions
+==========
+
+.. exception:: GEOSException
+
+The base GEOS exception, indicates a GEOS-related error.
diff --git a/docs/ref/contrib/gis/install/create_template_postgis-debian.sh b/docs/ref/contrib/gis/install/create_template_postgis-debian.sh
index 3e621837fa..c59834c87e 100755
--- a/docs/ref/contrib/gis/install/create_template_postgis-debian.sh
+++ b/docs/ref/contrib/gis/install/create_template_postgis-debian.sh
@@ -3,13 +3,6 @@
 GEOGRAPHY=0
 POSTGIS_SQL=postgis.sql
 
-# For Ubuntu 8.x and 9.x releases.
-if [ -d "/usr/share/postgresql-8.3-postgis" ]
-then
-    POSTGIS_SQL_PATH=/usr/share/postgresql-8.3-postgis
-    POSTGIS_SQL=lwpostgis.sql
-fi
-
 # For Ubuntu 10.04
 if [ -d "/usr/share/postgresql/8.4/contrib" ]
 then
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index c78f0c0e62..74ebf6a35f 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -88,16 +88,16 @@ internal geometry representation used by GeoDjango (it's behind the "lazy"
 geometries).  Specifically, the C API library is called (e.g., ``libgeos_c.so``)
 directly from Python using ctypes.
 
-First, download GEOS 3.3.5 from the refractions Web site and untar the source
+First, download GEOS 3.3.8 from the refractions Web site and untar the source
 archive::
 
-    $ wget http://download.osgeo.org/geos/geos-3.3.5.tar.bz2
-    $ tar xjf geos-3.3.5.tar.bz2
+    $ wget http://download.osgeo.org/geos/geos-3.3.8.tar.bz2
+    $ tar xjf geos-3.3.8.tar.bz2
 
 Next, change into the directory where GEOS was unpacked, run the configure
 script, compile, and install::
 
-    $ cd geos-3.3.5
+    $ cd geos-3.3.8
     $ ./configure
     $ make
     $ sudo make install
@@ -181,9 +181,9 @@ supports :ref:`GDAL's vector data <ref-gdal>` capabilities [#]_.
 
 First download the latest GDAL release version and untar the archive::
 
-    $ wget http://download.osgeo.org/gdal/gdal-1.9.1.tar.gz
-    $ tar xzf gdal-1.9.1.tar.gz
-    $ cd gdal-1.9.1
+    $ wget http://download.osgeo.org/gdal/gdal-1.9.2.tar.gz
+    $ tar xzf gdal-1.9.2.tar.gz
+    $ cd gdal-1.9.2
 
 Configure, make and install::
 
@@ -216,7 +216,7 @@ Can't find GDAL library
 When GeoDjango can't find the GDAL library, the ``HAS_GDAL`` flag
 will be false:
 
-.. code-block:: pycon
+.. code-block:: python
 
     >>> from django.contrib.gis import gdal
     >>> gdal.HAS_GDAL
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index 100dc2edd0..62369d8253 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -46,8 +46,8 @@ how to install.
 
 Spatial database
 ----------------
-PostgreSQL (with PostGIS), MySQL, Oracle, and SQLite (with SpatiaLite) are
-the spatial databases currently supported.
+PostgreSQL (with PostGIS), MySQL (mostly with MyISAM engine), Oracle, and SQLite
+(with SpatiaLite) are the spatial databases currently supported.
 
 .. note::
 
@@ -61,8 +61,8 @@ supported versions, and any notes for each of the supported database backends:
 ==================  ==============================  ==================  =========================================
 Database            Library Requirements            Supported Versions  Notes
 ==================  ==============================  ==================  =========================================
-PostgreSQL          GEOS, PROJ.4, PostGIS           8.2+                Requires PostGIS.
-MySQL               GEOS                            5.x                 Not OGC-compliant; limited functionality.
+PostgreSQL          GEOS, PROJ.4, PostGIS           8.4+                Requires PostGIS.
+MySQL               GEOS                            5.x                 Not OGC-compliant; :ref:`limited functionality <mysql-spatial-limitations>`.
 Oracle              GEOS                            10.2, 11            XE not supported; not tested with 9.
 SQLite              GEOS, GDAL, PROJ.4, SpatiaLite  3.6.+               Requires SpatiaLite 2.3+, pysqlite2 2.5+
 ==================  ==============================  ==================  =========================================
@@ -330,7 +330,7 @@ described above, ``psycopg2`` may be installed using the following command::
 
 .. note::
 
-    If you don't have ``pip``, follow the the :ref:`installation instructions
+    If you don't have ``pip``, follow the :ref:`installation instructions
     <installing-official-release>` to install it.
 
 .. _fink:
@@ -392,7 +392,7 @@ GeoDjango on Windows.
 .. note::
 
     These instructions assume that you are using 32-bit versions of
-    all programs.  While 64-bit versions of Python and PostgreSQL 9.0
+    all programs.  While 64-bit versions of Python and PostgreSQL 9.x
     are available, 64-bit versions of spatial libraries, like
     GEOS and GDAL, are not yet provided by the :ref:`OSGeo4W` installer.
 
@@ -415,7 +415,7 @@ __ http://python.org/download/
 PostgreSQL
 ^^^^^^^^^^
 
-First, download the latest `PostgreSQL 9.0 installer`__ from the
+First, download the latest `PostgreSQL 9.x installer`__ from the
 `EnterpriseDB`__ Web site.  After downloading, simply run the installer,
 follow the on-screen directions, and keep the default options unless
 you know the consequences of changing them.
@@ -435,7 +435,7 @@ install :ref:`postgisasb`.
 
     If installed successfully, the PostgreSQL server will run in the
     background each time the system as started as a Windows service.
-    A :menuselection:`PostgreSQL 9.0` start menu group will created
+    A :menuselection:`PostgreSQL 9.x` start menu group will created
     and contains shortcuts for the ASB as well as the 'SQL Shell',
     which will launch a ``psql`` command window.
 
@@ -448,10 +448,10 @@ PostGIS
 ^^^^^^^
 
 From within the Application Stack Builder (to run outside of the installer,
-:menuselection:`Start --> Programs --> PostgreSQL 9.0`), select
-:menuselection:`PostgreSQL Database Server 9.0 on port 5432` from the drop down
+:menuselection:`Start --> Programs --> PostgreSQL 9.x`), select
+:menuselection:`PostgreSQL Database Server 9.x on port 5432` from the drop down
 menu.  Next, expand the :menuselection:`Categories --> Spatial Extensions` menu
-tree and select :menuselection:`PostGIS 1.5 for PostgreSQL 9.0`.
+tree and select :menuselection:`PostGIS 1.5 for PostgreSQL 9.x`.
 
 After clicking next, you will be prompted to select your mirror, PostGIS
 will be downloaded, and the PostGIS installer will begin.  Select only the
@@ -530,6 +530,6 @@ Finally, :ref:`install Django <installing-official-release>` on your system.
 
 .. rubric:: Footnotes
 .. [#] GeoDjango uses the :func:`~ctypes.util.find_library` routine from
-       :mod:`ctypes.util` to locate shared libraries.
+       ``ctypes.util`` to locate shared libraries.
 .. [#] The ``psycopg2`` Windows installers are packaged and maintained by
        `Jason Erickson <http://www.stickpeople.com/projects/python/win-psycopg/>`_.
diff --git a/docs/ref/contrib/gis/install/postgis.txt b/docs/ref/contrib/gis/install/postgis.txt
index 6d7fe88203..c651fe8fca 100644
--- a/docs/ref/contrib/gis/install/postgis.txt
+++ b/docs/ref/contrib/gis/install/postgis.txt
@@ -28,9 +28,9 @@ Building from source
 
 First download the source archive, and extract::
 
-    $ wget http://postgis.refractions.net/download/postgis-2.0.1.tar.gz
-    $ tar xzf postgis-2.0.1.tar.gz
-    $ cd postgis-2.0.1
+    $ wget http://download.osgeo.org/postgis/source/postgis-2.0.3.tar.gz
+    $ tar xzf postgis-2.0.3.tar.gz
+    $ cd postgis-2.0.3
 
 Next, configure, make and install PostGIS::
 
@@ -56,10 +56,10 @@ Post-installation
 .. _spatialdb_template:
 .. _spatialdb_template91:
 
-Creating a spatial database with PostGIS 2.0 and PostgreSQL 9.1
----------------------------------------------------------------
+Creating a spatial database with PostGIS 2.0 and PostgreSQL 9.1+
+----------------------------------------------------------------
 
-PostGIS 2 includes an extension for Postgres 9.1 that can be used to enable
+PostGIS 2 includes an extension for Postgres 9.1+ that can be used to enable
 spatial functionality::
 
     $ createdb  <db name>
@@ -166,8 +166,8 @@ Managing the database
 ---------------------
 
 To administer the database, you can either use the pgAdmin III program
-(:menuselection:`Start --> PostgreSQL 9.0 --> pgAdmin III`) or the
-SQL Shell (:menuselection:`Start --> PostgreSQL 9.0 --> SQL Shell`).
+(:menuselection:`Start --> PostgreSQL 9.x --> pgAdmin III`) or the
+SQL Shell (:menuselection:`Start --> PostgreSQL 9.x --> SQL Shell`).
 For example, to create a ``geodjango`` spatial database and user, the following
 may be executed from the SQL Shell as the ``postgres`` user::
 
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index 8c5274e6d3..81b619e338 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -195,7 +195,7 @@ details.
 Geography Type
 ^^^^^^^^^^^^^^
 
-In PostGIS 1.5, the geography type was introduced -- it provides 
+In PostGIS 1.5, the geography type was introduced -- it provides
 native support for spatial features represented with geographic
 coordinates (e.g., WGS84 longitude/latitude). [#fngeography]_
 Unlike the plane used by a geometry type, the geography type uses a spherical
@@ -236,13 +236,12 @@ if we had an ``Address`` model with a ``ForeignKey`` to our ``Zipcode``
 model::
 
     from django.contrib.gis.db import models
-    from django.contrib.localflavor.us.models import USStateField
 
     class Address(models.Model):
         num = models.IntegerField()
         street = models.CharField(max_length=100)
         city = models.CharField(max_length=100)
-        state = USStateField()
+        state = models.CharField(max_length=2)
         zipcode = models.ForeignKey(Zipcode)
         objects = models.GeoManager()
 
diff --git a/docs/ref/contrib/gis/testing.txt b/docs/ref/contrib/gis/testing.txt
index 86979f0308..2a6dcef46f 100644
--- a/docs/ref/contrib/gis/testing.txt
+++ b/docs/ref/contrib/gis/testing.txt
@@ -140,6 +140,8 @@ with the rest of :ref:`Django's unit tests <running-unit-tests>`.
 Run only GeoDjango tests
 ------------------------
 
+.. class:: django.contrib.gis.tests.GeoDjangoTestSuiteRunner
+
 To run *only* the tests for GeoDjango, the :setting:`TEST_RUNNER`
 setting must be changed to use the
 :class:`~django.contrib.gis.tests.GeoDjangoTestSuiteRunner`::
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 5000622ad4..56d90c8593 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -115,13 +115,12 @@ In addition, modify the :setting:`INSTALLED_APPS` setting to include
 and ``world`` (your newly created application)::
 
     INSTALLED_APPS = (
+        'django.contrib.admin',
         'django.contrib.auth',
         'django.contrib.contenttypes',
         'django.contrib.sessions',
-        'django.contrib.sites',
         'django.contrib.messages',
         'django.contrib.staticfiles',
-        'django.contrib.admin',
         'django.contrib.gis',
         'world'
     )
@@ -226,7 +225,7 @@ model to represent this data::
 
     class WorldBorder(models.Model):
         # Regular Django fields corresponding to the attributes in the
-	# world borders shapefile.
+        # world borders shapefile.
         name = models.CharField(max_length=50)
         area = models.IntegerField()
         pop2005 = models.IntegerField('Population 2005')
@@ -236,13 +235,13 @@ model to represent this data::
         un = models.IntegerField('United Nations Code')
         region = models.IntegerField('Region Code')
         subregion = models.IntegerField('Sub-Region Code')
-    	lon = models.FloatField()
-    	lat = models.FloatField()
+        lon = models.FloatField()
+        lat = models.FloatField()
 
-	# GeoDjango-specific: a geometry field (MultiPolygonField), and
+        # GeoDjango-specific: a geometry field (MultiPolygonField), and
         # overriding the default manager with a GeoManager instance.
-	mpoly = models.MultiPolygonField()
-	objects = models.GeoManager()
+        mpoly = models.MultiPolygonField()
+        objects = models.GeoManager()
 
         # Returns the string representation of the model.
         def __unicode__(self):
@@ -250,7 +249,7 @@ model to represent this data::
 
 Please note two important things:
 
-1. The ``models`` module is imported from :mod:`django.contrib.gis.db`.
+1. The ``models`` module is imported from ``django.contrib.gis.db``.
 2. You must override the model's default manager with
    :class:`~django.contrib.gis.db.models.GeoManager` to perform spatial queries.
 
diff --git a/docs/ref/contrib/humanize.txt b/docs/ref/contrib/humanize.txt
index 57978288b1..aca6ed990d 100644
--- a/docs/ref/contrib/humanize.txt
+++ b/docs/ref/contrib/humanize.txt
@@ -100,10 +100,8 @@ Examples (when 'today' is 17 Feb 2007):
 naturaltime
 -----------
 
-.. versionadded:: 1.4
-
 For datetime values, returns a string representing how many seconds,
-minutes or hours ago it was -- falling back to the :tfilter:`timesince` 
+minutes or hours ago it was -- falling back to the :tfilter:`timesince`
 format if the value is more than a day old. In case the datetime value is in
 the future the return value will automatically use an appropriate phrase.
 
diff --git a/docs/ref/contrib/index.txt b/docs/ref/contrib/index.txt
index efe4393f64..e5cea01ead 100644
--- a/docs/ref/contrib/index.txt
+++ b/docs/ref/contrib/index.txt
@@ -27,13 +27,10 @@ those packages have.
    comments/index
    contenttypes
    csrf
-   databrowse
    flatpages
    formtools/index
    gis/index
    humanize
-   localflavor
-   markup
    messages
    redirects
    sitemaps
@@ -56,7 +53,7 @@ auth
 
 Django's authentication framework.
 
-See :doc:`/topics/auth`.
+See :doc:`/topics/auth/index`.
 
 comments
 ========
@@ -123,22 +120,6 @@ A set of Django template filters useful for adding a "human touch" to data.
 
 See the :doc:`humanize documentation </ref/contrib/humanize>`.
 
-localflavor
-===========
-
-A collection of various Django snippets that are useful only for a particular
-country or culture. For example, ``django.contrib.localflavor.us.forms``
-contains a ``USZipCodeField`` that you can use to validate U.S. zip codes.
-
-See the :doc:`localflavor documentation </ref/contrib/localflavor>`.
-
-markup
-======
-
-A collection of template filters that implement common markup languages
-
-See the :doc:`markup documentation </ref/contrib/markup>`.
-
 messages
 ========
 
diff --git a/docs/ref/contrib/markup.txt b/docs/ref/contrib/markup.txt
deleted file mode 100644
index 9215c64f93..0000000000
--- a/docs/ref/contrib/markup.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-=====================
-django.contrib.markup
-=====================
-
-.. module:: django.contrib.markup
-   :synopsis: A collection of template filters that implement common markup languages.
-
-.. deprecated:: 1.5
-    This module has been deprecated.
-
-Django provides template filters that implement the following markup
-languages:
-
-* ``textile`` -- implements `Textile`_ -- requires `PyTextile`_
-* ``markdown`` -- implements `Markdown`_ -- requires `Python-markdown`_ (>=2.1)
-* ``restructuredtext`` -- implements `reST (reStructured Text)`_
-  -- requires `doc-utils`_
-
-In each case, the filter expects formatted markup as a string and
-returns a string representing the marked-up text. For example, the
-``textile`` filter converts text that is marked-up in Textile format
-to HTML.
-
-To activate these filters, add ``'django.contrib.markup'`` to your
-:setting:`INSTALLED_APPS` setting. Once you've done that, use
-``{% load markup %}`` in a template, and you'll have access to these filters.
-For more documentation, read the source code in
-:file:`django/contrib/markup/templatetags/markup.py`.
-
-.. warning::
-
-    The output of markup filters is marked "safe" and will not be escaped when
-    rendered in a template. Always be careful to sanitize your inputs and make
-    sure you are not leaving yourself vulnerable to cross-site scripting or
-    other types of attacks.
-
-.. _Textile: http://en.wikipedia.org/wiki/Textile_%28markup_language%29
-.. _Markdown: http://en.wikipedia.org/wiki/Markdown
-.. _reST (reStructured Text): http://en.wikipedia.org/wiki/ReStructuredText
-.. _PyTextile: http://loopcore.com/python-textile/
-.. _Python-markdown: http://pypi.python.org/pypi/Markdown
-.. _doc-utils: http://docutils.sf.net/
-
-reStructured Text
------------------
-
-When using the ``restructuredtext`` markup filter you can define a
-:setting:`RESTRUCTUREDTEXT_FILTER_SETTINGS` in your django settings to
-override the default writer settings. See the `restructuredtext writer
-settings`_ for details on what these settings are.
-
-.. warning::
-
-   reStructured Text has features that allow raw HTML to be included, and that
-   allow arbitrary files to be included. These can lead to XSS vulnerabilities
-   and leaking of private information. It is your responsibility to check the
-   features of this library and configure appropriately to avoid this. See the
-   `Deploying Docutils Securely
-   <http://docutils.sourceforge.net/docs/howto/security.html>`_ documentation.
-
-.. _restructuredtext writer settings: http://docutils.sourceforge.net/docs/user/config.html#html4css1-writer
-
-Markdown
---------
-
-The Python Markdown library supports options named "safe_mode" and
-"enable_attributes". Both relate to the security of the output. To enable both
-options in tandem, the markdown filter supports the "safe" argument::
-
-    {{ markdown_content_var|markdown:"safe" }}
-
-.. warning::
-
-    Versions of the Python-Markdown library prior to 2.1 do not support the
-    optional disabling of attributes. This is a security flaw. Therefore,
-    ``django.contrib.markup`` has dropped support for versions of
-    Python-Markdown < 2.1 in Django 1.5.
diff --git a/docs/ref/contrib/messages.txt b/docs/ref/contrib/messages.txt
index 4fa733edb5..0a376bca18 100644
--- a/docs/ref/contrib/messages.txt
+++ b/docs/ref/contrib/messages.txt
@@ -78,8 +78,8 @@ Django provides three built-in storage classes:
 
 :class:`~django.contrib.messages.storage.fallback.FallbackStorage` is the
 default storage class. If it isn't suitable to your needs, you can select
-another storage class by setting `MESSAGE_STORAGE`_ to its full import path,
-for example::
+another storage class by setting :setting:`MESSAGE_STORAGE` to its full import
+path, for example::
 
     MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
 
@@ -87,6 +87,8 @@ To write your own storage class, subclass the ``BaseStorage`` class in
 ``django.contrib.messages.storage.base`` and implement the ``_get`` and
 ``_store`` methods.
 
+.. _message-level:
+
 Message levels
 --------------
 
@@ -108,7 +110,7 @@ Constant    Purpose
 ``ERROR``   An action was **not** successful or some other failure occurred
 =========== ========
 
-The `MESSAGE_LEVEL`_ setting can be used to change the minimum recorded level
+The :setting:`MESSAGE_LEVEL` setting can be used to change the minimum recorded level
 (or it can be `changed per request`_). Attempts to add messages of a level less
 than this will be ignored.
 
@@ -136,7 +138,7 @@ Level Constant  Tag
 ==============  ===========
 
 To change the default tags for a message level (either built-in or custom),
-set the `MESSAGE_TAGS`_ setting to a dictionary containing the levels
+set the :setting:`MESSAGE_TAGS` setting to a dictionary containing the levels
 you wish to change. As this extends the default tags, you only need to provide
 tags for the levels you wish to override::
 
@@ -149,6 +151,8 @@ tags for the levels you wish to override::
 Using messages in views and templates
 =====================================
 
+.. function:: add_message(request, level, message, extra_tags='', fail_silently=False)
+
 Adding a message
 ----------------
 
@@ -166,6 +170,8 @@ used tags (which are usually represented as HTML classes for the message)::
     messages.warning(request, 'Your account expires in three days.')
     messages.error(request, 'Document deleted.')
 
+.. _message-displaying:
+
 Displaying messages
 -------------------
 
@@ -214,7 +220,7 @@ Level Constant  Value
 ==============  =====
 
 If you need to identify the custom levels in your HTML or CSS, you need to
-provide a mapping via the `MESSAGE_TAGS`_ setting.
+provide a mapping via the :setting:`MESSAGE_TAGS` setting.
 
 .. note::
    If you are creating a reusable application, it is recommended to use
@@ -280,6 +286,53 @@ example::
    use one of the ``add_message`` family of methods. It does not hide failures
    that may occur for other reasons.
 
+Adding messages in Class Based Views
+------------------------------------
+
+.. versionadded:: 1.6
+
+.. class:: views.SuccessMessageMixin
+
+    Adds a success message attribute to
+    :class:`~django.views.generic.edit.FormView` based classes
+
+    .. method:: get_success_message(cleaned_data)
+
+        ``cleaned_data`` is the cleaned data from the form which is used for
+        string formatting
+
+**Example views.py**::
+
+    from django.contrib.messages.views import SuccessMessageMixin
+    from django.views.generic.edit import CreateView
+    from myapp.models import Author
+
+    class AuthorCreate(SuccessMessageMixin, CreateView):
+        model = Author
+        success_url = '/success/'
+        success_message = "%(name)s was created successfully"
+
+The cleaned data from the ``form`` is available for string interpolation using
+the ``%(field_name)s`` syntax. For ModelForms, if you need access to fields
+from the saved ``object`` override the
+:meth:`~django.contrib.messages.views.SuccessMessageMixin.get_success_message`
+method.
+
+**Example views.py for ModelForms**::
+
+    from django.contrib.messages.views import SuccessMessageMixin
+    from django.views.generic.edit import CreateView
+    from myapp.models import ComplicatedModel
+
+    class ComplicatedCreate(SuccessMessageMixin, CreateView):
+        model = ComplicatedModel
+        success_url = '/success/'
+        success_message = "%(calculated_field)s was created successfully"
+
+        def get_success_message(self, cleaned_data):
+            return self.success_message % dict(cleaned_data,
+                                               calculated_field=self.object.calculated_field)
+
 Expiration of messages
 ======================
 
@@ -314,80 +367,10 @@ window/tab will have its own browsing context.
 Settings
 ========
 
-A few :doc:`Django settings </ref/settings>` give you control over message
+A few :ref:`settings<settings-messages>` give you control over message
 behavior:
 
-MESSAGE_LEVEL
--------------
-
-Default: ``messages.INFO``
-
-This sets the minimum message that will be saved in the message storage. See
-`Message levels`_ above for more details.
-
-.. admonition:: Important
-
-   If you override ``MESSAGE_LEVEL`` in your settings file and rely on any of
-   the built-in constants, you must import the constants module directly to
-   avoid the potential for circular imports, e.g.::
-
-       from django.contrib.messages import constants as message_constants
-       MESSAGE_LEVEL = message_constants.DEBUG
-
-   If desired, you may specify the numeric values for the constants directly
-   according to the values in the above :ref:`constants table
-   <message-level-constants>`.
-
-MESSAGE_STORAGE
----------------
-
-Default: ``'django.contrib.messages.storage.fallback.FallbackStorage'``
-
-Controls where Django stores message data. Valid values are:
-
-* ``'django.contrib.messages.storage.fallback.FallbackStorage'``
-* ``'django.contrib.messages.storage.session.SessionStorage'``
-* ``'django.contrib.messages.storage.cookie.CookieStorage'``
-
-See `Storage backends`_ for more details.
-
-MESSAGE_TAGS
-------------
-
-Default::
-
-        {messages.DEBUG: 'debug',
-        messages.INFO: 'info',
-        messages.SUCCESS: 'success',
-        messages.WARNING: 'warning',
-        messages.ERROR: 'error',}
-
-This sets the mapping of message level to message tag, which is typically
-rendered as a CSS class in HTML. If you specify a value, it will extend
-the default. This means you only have to specify those values which you need
-to override. See `Displaying messages`_ above for more details.
-
-.. admonition:: Important
-
-   If you override ``MESSAGE_TAGS`` in your settings file and rely on any of
-   the built-in constants, you must import the ``constants`` module directly to
-   avoid the potential for circular imports, e.g.::
-
-       from django.contrib.messages import constants as message_constants
-       MESSAGE_TAGS = {message_constants.INFO: ''}
-
-   If desired, you may specify the numeric values for the constants directly
-   according to the values in the above :ref:`constants table
-   <message-level-constants>`.
-
-SESSION_COOKIE_DOMAIN
----------------------
-
-Default: ``None``
-
-The storage backends that use cookies -- ``CookieStorage`` and
-``FallbackStorage`` -- use the value of :setting:`SESSION_COOKIE_DOMAIN` in
-setting their cookies. See the :doc:`settings documentation </ref/settings>`
-for more information on how this works and why you might need to set it.
-
-.. _Django settings: ../settings/
+* :setting:`MESSAGE_LEVEL`
+* :setting:`MESSAGE_STORAGE`
+* :setting:`MESSAGE_TAGS`
+* :ref:`SESSION_COOKIE_DOMAIN<messages-session_cookie_domain>`
diff --git a/docs/ref/contrib/redirects.txt b/docs/ref/contrib/redirects.txt
index e34ba405f4..0c0cb2a3c2 100644
--- a/docs/ref/contrib/redirects.txt
+++ b/docs/ref/contrib/redirects.txt
@@ -13,11 +13,12 @@ Installation
 
 To install the redirects app, follow these steps:
 
-1. Add ``'django.contrib.redirects'`` to your :setting:`INSTALLED_APPS`
-   setting.
-2. Add ``'django.contrib.redirects.middleware.RedirectFallbackMiddleware'``
+1. Ensure that the ``django.contrib.sites`` framework
+   :ref:`is installed <enabling-the-sites-framework>`.
+2. Add ``'django.contrib.redirects'`` to your :setting:`INSTALLED_APPS` setting.
+3. Add ``'django.contrib.redirects.middleware.RedirectFallbackMiddleware'``
    to your :setting:`MIDDLEWARE_CLASSES` setting.
-3. Run the command :djadmin:`manage.py syncdb <syncdb>`.
+4. Run the command :djadmin:`manage.py syncdb <syncdb>`.
 
 How it works
 ============
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index ef6c64dc61..d37ee83378 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -49,6 +49,8 @@ loader can find the default templates.)
 Initialization
 ==============
 
+.. function:: views.sitemap(request, sitemaps, section=None, template_name='sitemap.xml', mimetype='application/xml')
+
 To activate sitemap generation on your Django site, add this line to your
 :doc:`URLconf </topics/http/urls>`::
 
@@ -213,8 +215,6 @@ Sitemap class reference
 
     .. attribute:: Sitemap.protocol
 
-        .. versionadded:: 1.4
-
         **Optional.**
 
         This attribute defines the protocol (``'http'`` or ``'https'``) of the
@@ -242,9 +242,9 @@ The sitemap framework provides a couple convenience classes for common cases:
 
     The :class:`django.contrib.sitemaps.GenericSitemap` class allows you to
     create a sitemap by passing it a dictionary which has to contain at least
-    a :data:`queryset` entry. This queryset will be used to generate the items
-    of the sitemap. It may also have a :data:`date_field` entry that
-    specifies a date field for objects retrieved from the :data:`queryset`.
+    a ``queryset`` entry. This queryset will be used to generate the items
+    of the sitemap. It may also have a ``date_field`` entry that
+    specifies a date field for objects retrieved from the ``queryset``.
     This will be used for the :attr:`~Sitemap.lastmod` attribute in the
     generated sitemap. You may also pass :attr:`~Sitemap.priority` and
     :attr:`~Sitemap.changefreq` keyword arguments to the
@@ -256,7 +256,7 @@ Example
 
 Here's an example of a :doc:`URLconf </topics/http/urls>` using both::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns
     from django.contrib.sitemaps import FlatPageSitemap, GenericSitemap
     from blog.models import Entry
 
@@ -283,14 +283,16 @@ Here's an example of a :doc:`URLconf </topics/http/urls>` using both::
 Creating a sitemap index
 ========================
 
+.. function:: views.index(request, sitemaps, template_name='sitemap_index.xml', mimetype='application/xml', sitemap_url_name='django.contrib.sitemaps.views.sitemap')
+
 The sitemap framework also has the ability to create a sitemap index that
 references individual sitemap files, one per each section defined in your
-:data:`sitemaps` dictionary. The only differences in usage are:
+``sitemaps`` dictionary. The only differences in usage are:
 
 * You use two views in your URLconf: :func:`django.contrib.sitemaps.views.index`
   and :func:`django.contrib.sitemaps.views.sitemap`.
 * The :func:`django.contrib.sitemaps.views.sitemap` view should take a
-  :data:`section` keyword argument.
+  ``section`` keyword argument.
 
 Here's what the relevant URLconf lines would look like for the example above::
 
@@ -301,15 +303,13 @@ Here's what the relevant URLconf lines would look like for the example above::
 
 This will automatically generate a :file:`sitemap.xml` file that references
 both :file:`sitemap-flatpages.xml` and :file:`sitemap-blog.xml`. The
-:class:`~django.contrib.sitemaps.Sitemap` classes and the :data:`sitemaps`
+:class:`~django.contrib.sitemaps.Sitemap` classes and the ``sitemaps``
 dict don't change at all.
 
 You should create an index file if one of your sitemaps has more than 50,000
 URLs. In this case, Django will automatically paginate the sitemap, and the
 index will reflect that.
 
-.. versionadded:: 1.4
-
 If you're not using the vanilla sitemap view -- for example, if it's wrapped
 with a caching decorator -- you must name your sitemap view and pass
 ``sitemap_url_name`` to the index view::
@@ -346,29 +346,28 @@ parameter to the ``sitemap`` and ``index`` views via the URLconf::
     )
 
 
-.. versionchanged:: 1.4
-    In addition, these views also return
-    :class:`~django.template.response.TemplateResponse`
-    instances which allow you to easily customize the response data before
-    rendering. For more details, see the
-    :doc:`TemplateResponse documentation </ref/template-response>`.
+These views return :class:`~django.template.response.TemplateResponse`
+instances which allow you to easily customize the response data before
+rendering. For more details, see the :doc:`TemplateResponse documentation
+</ref/template-response>`.
 
 Context variables
 ------------------
 
-When customizing the templates for the :func:`~django.contrib.sitemaps.views.index`
-and :func:`~django.contrib.sitemaps.views.sitemaps` views, you can rely on the
+When customizing the templates for the
+:func:`~django.contrib.sitemaps.views.index` and
+:func:`~django.contrib.sitemaps.views.sitemap` views, you can rely on the
 following context variables.
 
 Index
 -----
 
-The variable :data:`sitemaps` is a list of absolute URLs to each of the sitemaps.
+The variable ``sitemaps`` is a list of absolute URLs to each of the sitemaps.
 
 Sitemap
 -------
 
-The variable :data:`urlset` is a list of URLs that should appear in the
+The variable ``urlset`` is a list of URLs that should appear in the
 sitemap. Each URL exposes attributes as defined in the
 :class:`~django.contrib.sitemaps.Sitemap` class:
 
@@ -378,8 +377,6 @@ sitemap. Each URL exposes attributes as defined in the
 - ``location``
 - ``priority``
 
-.. versionadded:: 1.4
-
 The ``item`` attribute has been added for each URL to allow more flexible
 customization of the templates, such as `Google news sitemaps`_. Assuming
 Sitemap's :attr:`~Sitemap.items()` would return a list of items with
@@ -419,14 +416,14 @@ that: :func:`django.contrib.sitemaps.ping_google()`.
 
 .. function:: ping_google
 
-    :func:`ping_google` takes an optional argument, :data:`sitemap_url`,
+    :func:`ping_google` takes an optional argument, ``sitemap_url``,
     which should be the absolute path to your site's sitemap (e.g.,
     :file:`'/sitemap.xml'`). If this argument isn't provided,
     :func:`ping_google` will attempt to figure out your
     sitemap by performing a reverse looking in your URLconf.
 
     :func:`ping_google` raises the exception
-    :exc:`django.contrib.sitemaps.SitemapNotFound` if it cannot determine your
+    ``django.contrib.sitemaps.SitemapNotFound`` if it cannot determine your
     sitemap URL.
 
 .. admonition:: Register with Google first!
@@ -457,8 +454,8 @@ cron script, or some other scheduled task. The function makes an HTTP request
 to Google's servers, so you may not want to introduce that network overhead
 each time you call ``save()``.
 
-Pinging Google via `manage.py`
-------------------------------
+Pinging Google via ``manage.py``
+--------------------------------
 
 .. django-admin:: ping_google
 
diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index 7e5448b3d3..139a9b377f 100644
--- a/docs/ref/contrib/sites.txt
+++ b/docs/ref/contrib/sites.txt
@@ -246,14 +246,31 @@ To do this, you can use the sites framework. A simple example::
     >>> 'http://%s%s' % (Site.objects.get_current().domain, obj.get_absolute_url())
     'http://example.com/mymodel/objects/3/'
 
+.. _enabling-the-sites-framework:
 
-Default site and ``syncdb``
-===========================
+Enabling the sites framework
+============================
+
+.. versionchanged:: 1.6
+    In previous versions, the sites framework was enabled by default.
+
+To enable the sites framework, follow these steps:
+
+1. Add ``'django.contrib.sites'`` to your :setting:`INSTALLED_APPS`
+   setting.
+
+2. Define a :setting:`SITE_ID` setting::
+
+    SITE_ID = 1
+
+3. Run :djadmin:`syncdb`.
 
 ``django.contrib.sites`` registers a
 :data:`~django.db.models.signals.post_syncdb` signal handler which creates a
-default site named ``example.com`` with the domain ``example.com``. For
-example, this site will be created after Django creates the test database.
+default site named ``example.com`` with the domain ``example.com``. This site
+will also be created after Django creates the test database. To set the
+correct name and domain for your project, you can use an :doc:`initial data
+fixture </howto/initial-data>`.
 
 Caching the current ``Site`` object
 ===================================
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index 3a74797145..806d135deb 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -12,115 +12,22 @@ can easily be served in production.
 .. seealso::
 
     For an introduction to the static files app and some usage examples, see
-    :doc:`/howto/static-files`.
+    :doc:`/howto/static-files/index`. For guidelines on deploying static files,
+    see :doc:`/howto/static-files/deployment`.
 
 .. _staticfiles-settings:
 
 Settings
 ========
 
-.. highlight:: python
+See :ref:`staticfiles settings <settings-staticfiles>` for details on the
+following settings:
 
-.. note::
-
-    The following settings control the behavior of the staticfiles app.
-
-.. setting:: STATICFILES_DIRS
-
-STATICFILES_DIRS
-----------------
-
-Default: ``[]``
-
-This setting defines the additional locations the staticfiles app will traverse
-if the :class:`FileSystemFinder` finder is enabled, e.g. if you use the
-:djadmin:`collectstatic` or :djadmin:`findstatic` management command or use the
-static file serving view.
-
-This should be set to a list or tuple of strings that contain full paths to
-your additional files directory(ies) e.g.::
-
-    STATICFILES_DIRS = (
-        "/home/special.polls.com/polls/static",
-        "/home/polls.com/polls/static",
-        "/opt/webfiles/common",
-    )
-
-Prefixes (optional)
-"""""""""""""""""""
-
-In case you want to refer to files in one of the locations with an additional
-namespace, you can **optionally** provide a prefix as ``(prefix, path)``
-tuples, e.g.::
-
-    STATICFILES_DIRS = (
-        # ...
-        ("downloads", "/opt/webfiles/stats"),
-    )
-
-Example:
-
-Assuming you have :setting:`STATIC_URL` set ``'/static/'``, the
-:djadmin:`collectstatic` management command would collect the "stats" files
-in a ``'downloads'`` subdirectory of :setting:`STATIC_ROOT`.
-
-This would allow you to refer to the local file
-``'/opt/webfiles/stats/polls_20101022.tar.gz'`` with
-``'/static/downloads/polls_20101022.tar.gz'`` in your templates, e.g.:
-
-.. code-block:: html+django
-
-    <a href="{{ STATIC_URL }}downloads/polls_20101022.tar.gz">
-
-.. setting:: STATICFILES_STORAGE
-
-STATICFILES_STORAGE
--------------------
-
-Default: ``'django.contrib.staticfiles.storage.StaticFilesStorage'``
-
-The file storage engine to use when collecting static files with the
-:djadmin:`collectstatic` management command.
-
-.. versionadded:: 1.4
-
-A ready-to-use instance of the storage backend defined in this setting
-can be found at ``django.contrib.staticfiles.storage.staticfiles_storage``.
-
-For an example, see :ref:`staticfiles-from-cdn`.
-
-.. setting:: STATICFILES_FINDERS
-
-STATICFILES_FINDERS
--------------------
-
-Default::
-
-    ("django.contrib.staticfiles.finders.FileSystemFinder",
-     "django.contrib.staticfiles.finders.AppDirectoriesFinder")
-
-The list of finder backends that know how to find static files in
-various locations.
-
-The default will find files stored in the :setting:`STATICFILES_DIRS` setting
-(using :class:`django.contrib.staticfiles.finders.FileSystemFinder`) and in a
-``static`` subdirectory of each app (using
-:class:`django.contrib.staticfiles.finders.AppDirectoriesFinder`)
-
-One finder is disabled by default:
-:class:`django.contrib.staticfiles.finders.DefaultStorageFinder`. If added to
-your :setting:`STATICFILES_FINDERS` setting, it will look for static files in
-the default file storage as defined by the :setting:`DEFAULT_FILE_STORAGE`
-setting.
-
-.. note::
-
-    When using the :class:`AppDirectoriesFinder` finder, make sure your apps
-    can be found by staticfiles. Simply add the app to the
-    :setting:`INSTALLED_APPS` setting of your site.
-
-Static file finders are currently considered a private interface, and this
-interface is thus undocumented.
+* :setting:`STATIC_ROOT`
+* :setting:`STATIC_URL`
+* :setting:`STATICFILES_DIRS`
+* :setting:`STATICFILES_STORAGE`
+* :setting:`STATICFILES_FINDERS`
 
 Management Commands
 ===================
@@ -146,8 +53,6 @@ Files are searched by using the :setting:`enabled finders
 :setting:`STATICFILES_DIRS` and in the ``'static'`` directory of apps
 specified by the :setting:`INSTALLED_APPS` setting.
 
-.. versionadded:: 1.4
-
 The :djadmin:`collectstatic` management command calls the
 :meth:`~django.contrib.staticfiles.storage.StaticFilesStorage.post_process`
 method of the :setting:`STATICFILES_STORAGE` after each run and passes
@@ -176,8 +81,6 @@ Some commonly used options are:
 .. django-admin-option:: -c
 .. django-admin-option:: --clear
 
-    .. versionadded:: 1.4
-
     Clear the existing files before trying to copy or link the original file.
 
 .. django-admin-option:: -l
@@ -187,8 +90,6 @@ Some commonly used options are:
 
 .. django-admin-option:: --no-post-process
 
-    .. versionadded:: 1.4
-
     Don't call the
     :meth:`~django.contrib.staticfiles.storage.StaticFilesStorage.post_process`
     method of the configured :setting:`STATICFILES_STORAGE` storage backend.
@@ -212,19 +113,29 @@ Searches for one or more relative paths with the enabled finders.
 For example::
 
    $ python manage.py findstatic css/base.css admin/js/core.js
-   /home/special.polls.com/core/static/css/base.css
-   /home/polls.com/core/static/css/base.css
-   /home/polls.com/src/django/contrib/admin/media/js/core.js
+   Found 'css/base.css' here:
+     /home/special.polls.com/core/static/css/base.css
+     /home/polls.com/core/static/css/base.css
+   Found 'admin/js/core.js' here:
+     /home/polls.com/src/django/contrib/admin/media/js/core.js
 
 By default, all matching locations are found. To only return the first match
 for each relative path, use the ``--first`` option::
 
    $ python manage.py findstatic css/base.css --first
-   /home/special.polls.com/core/static/css/base.css
+   Found 'css/base.css' here:
+     /home/special.polls.com/core/static/css/base.css
 
 This is a debugging aid; it'll show you exactly which static file will be
 collected for a given path.
 
+By setting the :djadminopt:`--verbosity` flag to 0, you can suppress the extra
+output and just get the path names::
+
+   $ python manage.py findstatic css/base.css --verbosity 0
+   /home/special.polls.com/core/static/css/base.css
+   /home/polls.com/core/static/css/base.css
+
 .. _staticfiles-runserver:
 
 runserver
@@ -276,8 +187,6 @@ StaticFilesStorage
 
     .. method:: post_process(paths, **options)
 
-    .. versionadded:: 1.4
-
     This method is called by the :djadmin:`collectstatic` management command
     after each run and gets passed the local storages and paths of found
     files as a dictionary, as well as the command line options.
@@ -291,8 +200,6 @@ CachedStaticFilesStorage
 
 .. class:: storage.CachedStaticFilesStorage
 
-    .. versionadded:: 1.4
-
     A subclass of the :class:`~django.contrib.staticfiles.storage.StaticFilesStorage`
     storage backend which caches the files it saves by appending the MD5 hash
     of the file's content to the filename. For example, the file
@@ -370,8 +277,6 @@ static
 
 .. templatetag:: staticfiles-static
 
-.. versionadded:: 1.4
-
 Uses the configured :setting:`STATICFILES_STORAGE` storage to create the
 full URL for the given relative path, e.g.:
 
@@ -422,9 +327,18 @@ files:
 Static file development view
 ----------------------------
 
+.. currentmodule:: django.contrib.staticfiles
+
+The static files tools are mostly designed to help with getting static files
+successfully deployed into production. This usually means a separate,
+dedicated static file server, which is a lot of overhead to mess with when
+developing locally. Thus, the ``staticfiles`` app ships with a
+**quick and dirty helper view** that you can use to serve files locally in
+development.
+
 .. highlight:: python
 
-.. function:: django.contrib.staticfiles.views.serve(request, path)
+.. function:: views.serve(request, path)
 
 This view function serves static files in development.
 
@@ -436,6 +350,16 @@ This view function serves static files in development.
     **insecure**. This is only intended for local development, and should
     **never be used in production**.
 
+.. note::
+
+    To guess the served files' content types, this view relies on the
+    :py:mod:`mimetypes` module from the Python standard library, which itself
+    relies on the underlying platform's map files. If you find that this view
+    doesn't return proper content types for certain files, it is most likely
+    that the platform's map files need to be updated. This can be achieved, for
+    example, by installing or updating the ``mailcap`` package on a Red Hat
+    distribution, or ``mime-support`` on a Debian distribution.
+
 This view is automatically enabled by :djadmin:`runserver` (with a
 :setting:`DEBUG` setting set to ``True``). To use the view with a different
 local development server, add the following snippet to the end of your
@@ -451,9 +375,10 @@ primary URL configuration::
 Note, the beginning of the pattern (``r'^static/'``) should be your
 :setting:`STATIC_URL` setting.
 
-Since this is a bit finicky, there's also a helper function that'll do this for you:
+Since this is a bit finicky, there's also a helper function that'll do this for
+you:
 
-.. function:: django.contrib.staticfiles.urls.staticfiles_urlpatterns()
+.. function:: urls.staticfiles_urlpatterns()
 
 This will return the proper URL pattern for serving static files to your
 already defined pattern list. Use it like this::
@@ -464,8 +389,18 @@ already defined pattern list. Use it like this::
 
    urlpatterns += staticfiles_urlpatterns()
 
+This will inspect your :setting:`STATIC_URL` setting and wire up the view
+to serve static files accordingly. Don't forget to set the
+:setting:`STATICFILES_DIRS` setting appropriately to let
+``django.contrib.staticfiles`` know where to look for files in addition to
+files in app directories.
+
 .. warning::
 
     This helper function will only work if :setting:`DEBUG` is ``True``
     and your :setting:`STATIC_URL` setting is neither empty nor a full
     URL such as ``http://static.example.com/``.
+
+    That's because this view is **grossly inefficient** and probably
+    **insecure**. This is only intended for local development, and should
+    **never be used in production**.
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 2418dba8ef..02159c415b 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -77,7 +77,7 @@ latest five news items::
 To connect a URL to this feed, put an instance of the Feed object in
 your :doc:`URLconf </topics/http/urls>`. For example::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns
     from myproject.feeds import LatestEntriesFeed
 
     urlpatterns = patterns('',
@@ -137,6 +137,51 @@ into those elements.
 
   See `a complex example`_ below that uses a description template.
 
+  There is also a way to pass additional information to title and description
+  templates, if you need to supply more than the two variables mentioned
+  before. You can provide your implementation of ``get_context_data`` method
+  in your Feed subclass. For example::
+
+    from mysite.models import Article
+    from django.contrib.syndication.views import Feed
+
+    class ArticlesFeed(Feed):
+        title = "My articles"
+        description_template = "feeds/articles.html"
+
+        def items(self):
+            return Article.objects.order_by('-pub_date')[:5]
+
+        def get_context_data(self, **kwargs):
+            context = super(ArticlesFeed, self).get_context_data(**kwargs)
+            context['foo'] = 'bar'
+            return context
+
+  And the template:
+
+  .. code-block:: html+django
+
+    Something about {{ foo }}: {{ obj.description }}
+
+  This method will be called once per each item in the list returned by
+  ``items()`` with the following keyword arguments:
+
+  * ``item``: the current item. For backward compatibility reasons, the name
+    of this context variable is ``{{ obj }}``.
+
+  * ``obj``: the object returned by ``get_object()``. By default this is not
+    exposed to the templates to avoid confusion with ``{{ obj }}`` (see above),
+    but you can use it in your implementation of ``get_context_data()``.
+
+  * ``site``: current site as described above.
+
+  * ``request``: current request.
+
+  The behavior of ``get_context_data()`` mimics that of
+  :ref:`generic views <adding-extra-context>` - you're supposed to call
+  ``super()`` to retrieve context data from parent class, add your data
+  and return the modified dictionary.
+
 * To specify the contents of ``<link>``, you have two options. For each item
   in ``items()``, Django first tries calling the
   ``item_link()`` method on the
@@ -321,7 +366,7 @@ Here's a full example::
 
 And the accompanying URLconf::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns
     from myproject.feeds import RssSiteNewsFeed, AtomSiteNewsFeed
 
     urlpatterns = patterns('',
@@ -334,7 +379,7 @@ And the accompanying URLconf::
 Feed class reference
 --------------------
 
-.. class:: django.contrib.syndication.views.Feed
+.. class:: views.Feed
 
 This example illustrates all possible attributes and methods for a
 :class:`~django.contrib.syndication.views.Feed` class::
@@ -599,6 +644,15 @@ This example illustrates all possible attributes and methods for a
 
         item_description = 'A description of the item.' # Hard-coded description.
 
+        def get_context_data(self, **kwargs):
+            """
+            Returns a dictionary to use as extra context if either
+            description_template or item_template are used.
+
+            Default implementation preserves the old behavior
+            of using {'obj': item, 'site': current_site} as the context.
+            """
+
         # ITEM LINK -- One of these three is required. The framework looks for
         # them in this order.
 
@@ -624,6 +678,18 @@ This example illustrates all possible attributes and methods for a
             Takes an item, as return by items(), and returns the item's ID.
             """
 
+        # ITEM_GUID_IS_PERMALINK -- The following method is optional. If
+        # provided, it sets the 'isPermaLink' attribute of an item's
+        # GUID element. This method is used only when 'item_guid' is
+        # specified.
+
+        def item_guid_is_permalink(self, obj):
+            """
+            Takes an item, as returned by items(), and returns a boolean.
+            """
+
+        item_guid_is_permalink = False  # Hard coded value
+
         # ITEM AUTHOR NAME -- One of the following three is optional. The
         # framework looks for them in this order.
 
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 352c0f4584..395abd90dd 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -11,27 +11,73 @@ This file describes some of the features that might be relevant to Django
 usage. Of course, it is not intended as a replacement for server-specific
 documentation or reference manuals.
 
+General notes
+=============
+
+.. _persistent-database-connections:
+
+Persistent connections
+----------------------
+
+.. versionadded:: 1.6
+
+Persistent connections avoid the overhead of re-establishing a connection to
+the database in each request. By default, connections are kept open for up 10
+minutes — if not specified, :setting:`CONN_MAX_AGE` defaults to 600 seconds.
+
+Django 1.5 and earlier didn't have persistent connections. To restore the
+legacy behavior of closing the connection at the end of every request, set
+:setting:`CONN_MAX_AGE` to ``0``.
+
+For unlimited persistent connections, set :setting:`CONN_MAX_AGE` to ``None``.
+
+Connection management
+~~~~~~~~~~~~~~~~~~~~~
+
+Django opens a connection to the database when it first makes a database
+query. It keeps this connection open and reuses it in subsequent requests.
+Django closes the connection once it exceeds the maximum age defined by
+:setting:`CONN_MAX_AGE` or when it isn't usable any longer.
+
+In detail, Django automatically opens a connection to the database whenever it
+needs one and doesn't have one already — either because this is the first
+connection, or because the previous connection was closed.
+
+At the beginning of each request, Django closes the connection if it has
+reached its maximum age. If your database terminates idle connections after
+some time, you should set :setting:`CONN_MAX_AGE` to a lower value, so that
+Django doesn't attempt to use a connection that has been terminated by the
+database server. (This problem may only affect very low traffic sites.)
+
+At the end of each request, Django closes the connection if it has reached its
+maximum age or if it is in an unrecoverable error state. If any database
+errors have occurred while processing the requests, Django checks whether the
+connection still works, and closes it if it doesn't. Thus, database errors
+affect at most one request; if the connection becomes unusable, the next
+request gets a fresh connection.
+
+Caveats
+~~~~~~~
+
+Since each thread maintains its own connection, your database must support at
+least as many simultaneous connections as you have worker threads.
+
+Sometimes a database won't be accessed by the majority of your views, for
+example because it's the database of an external system, or thanks to caching.
+In such cases, you should set :setting:`CONN_MAX_AGE` to a lower value, or
+even ``0``, because it doesn't make sense to maintain a connection that's
+unlikely to be reused. This will help keep the number of simultaneous
+connections to this database small.
+
+The development server creates a new thread for each request it handles,
+negating the effect of persistent connections.
+
 .. _postgresql-notes:
 
 PostgreSQL notes
 ================
 
-.. versionchanged:: 1.4
-
-Django supports PostgreSQL 8.2 and higher.
-
-PostgreSQL 8.2 to 8.2.4
------------------------
-
-The implementation of the population statistics aggregates ``STDDEV_POP`` and
-``VAR_POP`` that shipped with PostgreSQL 8.2 to 8.2.4 are `known to be
-faulty`_. Users of these releases of PostgreSQL are advised to upgrade to
-`Release 8.2.5`_ or later. Django will raise a ``NotImplementedError`` if you
-attempt to use the ``StdDev(sample=False)`` or ``Variance(sample=False)``
-aggregate with a database backend that falls within the affected release range.
-
-.. _known to be faulty: http://archives.postgresql.org/pgsql-bugs/2007-07/msg00046.php
-.. _Release 8.2.5: http://www.postgresql.org/docs/devel/static/release-8-2-5.html
+Django supports PostgreSQL 8.4 and higher.
 
 PostgreSQL connection settings
 -------------------------------
@@ -44,7 +90,8 @@ Optimizing PostgreSQL's configuration
 Django needs the following parameters for its database connections:
 
 - ``client_encoding``: ``'UTF8'``,
-- ``default_transaction_isolation``: ``'read committed'``,
+- ``default_transaction_isolation``: ``'read committed'`` by default,
+  or the value set in the connection options (see below),
 - ``timezone``: ``'UTC'`` when :setting:`USE_TZ` is ``True``, value of
   :setting:`TIME_ZONE` otherwise.
 
@@ -58,58 +105,57 @@ will do some additional queries to set these parameters.
 
 .. _ALTER ROLE: http://www.postgresql.org/docs/current/interactive/sql-alterrole.html
 
-Transaction handling
----------------------
-
-:doc:`By default </topics/db/transactions>`, Django runs with an open
-transaction which it commits automatically when any built-in, data-altering
-model function is called. The PostgreSQL backends normally operate the same as
-any other Django backend in this respect.
-
 .. _postgresql-autocommit-mode:
 
 Autocommit mode
-~~~~~~~~~~~~~~~
+---------------
 
-If your application is particularly read-heavy and doesn't make many
-database writes, the overhead of a constantly open transaction can
-sometimes be noticeable. For those situations, you can configure Django
-to use *"autocommit"* behavior for the connection, meaning that each database
-operation will normally be in its own transaction, rather than having
-the transaction extend over multiple operations. In this case, you can
-still manually start a transaction if you're doing something that
-requires consistency across multiple database operations. The
-autocommit behavior is enabled by setting the ``autocommit`` key in
-the :setting:`OPTIONS` part of your database configuration in
-:setting:`DATABASES`::
+.. versionchanged:: 1.6
 
-    'OPTIONS': {
-        'autocommit': True,
+In previous versions of Django, database-level autocommit could be enabled by
+setting the ``autocommit`` key in the :setting:`OPTIONS` part of your database
+configuration in :setting:`DATABASES`::
+
+    DATABASES = {
+        # ...
+        'OPTIONS': {
+            'autocommit': True,
+        },
     }
 
-In this configuration, Django still ensures that :ref:`delete()
-<topics-db-queries-delete>` and :ref:`update() <topics-db-queries-update>`
-queries run inside a single transaction, so that either all the affected
-objects are changed or none of them are.
+Since Django 1.6, autocommit is turned on by default. This configuration is
+ignored and can be safely removed.
 
-.. admonition:: This is database-level autocommit
+Isolation level
+---------------
 
-    This functionality is not the same as the :ref:`autocommit
-    <topics-db-transactions-autocommit>` decorator. That decorator is
-    a Django-level implementation that commits automatically after
-    data changing operations. The feature enabled using the
-    :setting:`OPTIONS` option provides autocommit behavior at the
-    database adapter level. It commits after *every* operation.
+.. versionadded:: 1.6
 
-If you are using this feature and performing an operation akin to delete or
-updating that requires multiple operations, you are strongly recommended to
-wrap you operations in manual transaction handling to ensure data consistency.
-You should also audit your existing code for any instances of this behavior
-before enabling this feature. It's faster, but it provides less automatic
-protection for multi-call operations.
+Like PostgreSQL itself, Django defaults to the ``READ COMMITTED`` `isolation
+level <postgresql-isolation-levels>`_. If you need a higher isolation level
+such as ``REPEATABLE READ`` or ``SERIALIZABLE``, set it in the
+:setting:`OPTIONS` part of your database configuration in
+:setting:`DATABASES`::
+
+    import psycopg2.extensions
+
+    DATABASES = {
+        # ...
+        'OPTIONS': {
+            'isolation_level': psycopg2.extensions.ISOLATION_LEVEL_SERIALIZABLE,
+        },
+    }
+
+.. note::
+
+    Under higher isolation levels, your application should be prepared to
+    handle exceptions raised on serialization failures. This option is
+    designed for advanced uses.
+
+.. _postgresql-isolation-levels: http://www.postgresql.org/docs/current/static/transaction-iso.html
 
 Indexes for ``varchar`` and ``text`` columns
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+--------------------------------------------
 
 When specifying ``db_index=True`` on your model fields, Django typically
 outputs a single ``CREATE INDEX`` statement.  However, if the database type
@@ -120,7 +166,7 @@ for the column.  The extra index is necessary to correctly perform
 lookups that use the ``LIKE`` operator in their SQL, as is done with the
 ``contains`` and ``startswith`` lookup types.
 
-.. _PostgreSQL operator class: http://www.postgresql.org/docs/8.4/static/indexes-opclass.html
+.. _PostgreSQL operator class: http://www.postgresql.org/docs/current/static/indexes-opclass.html
 
 .. _mysql-notes:
 
@@ -173,18 +219,6 @@ running ``syncdb``::
         1005, "Can't create table '\\db_name\\.#sql-4a8_ab' (errno: 150)"
     )
 
-.. versionchanged:: 1.4
-
-In previous versions of Django, fixtures with forward references (i.e.
-relations to rows that have not yet been inserted into the database) would fail
-to load when using the InnoDB storage engine. This was due to the fact that InnoDB
-deviates from the SQL standard by checking foreign key constraints immediately
-instead of deferring the check until the transaction is committed. This
-problem has been resolved in Django 1.4. Fixture data is now loaded with foreign key
-checks turned off; foreign key checks are then re-enabled when the data has
-finished loading, at which point the entire table is checked for invalid foreign
-key references and an `IntegrityError` is raised if any are found.
-
 .. _storage engines: http://dev.mysql.com/doc/refman/5.5/en/storage-engines.html
 .. _MyISAM: http://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html
 .. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb.html
@@ -207,6 +241,14 @@ required for full MySQL support in Django.
     1.2.1p2 or newer, then delete the ``sets.py`` file in the MySQLdb
     directory that was left by an earlier version.
 
+.. note::
+    There are known issues with the way MySQLdb converts date strings into
+    datetime objects. Specifically, date strings with value 0000-00-00 are valid for
+    MySQL but will be converted into None by MySQLdb.
+
+    This means you should be careful while using loaddata/dumpdata with rows
+    that may have 0000-00-00 values, as they will be converted to None.
+
 .. _MySQLdb: http://sourceforge.net/projects/mysql-python
 
 Creating your database
@@ -273,9 +315,9 @@ recommended solution.
 
 Should you decide to use ``utf8_bin`` collation for some of your tables with
 MySQLdb 1.2.1p2 or 1.2.2, you should still use ``utf8_collation_ci_swedish``
-(the default) collation for the :class:`django.contrib.sessions.models.Session`
+(the default) collation for the ``django.contrib.sessions.models.Session``
 table (usually called ``django_session``) and the
-:class:`django.contrib.admin.models.LogEntry` table (usually called
+``django.contrib.admin.models.LogEntry`` table (usually called
 ``django_admin_log``). Those are the two standard tables that use
 :class:`~django.db.models.TextField` internally.
 
@@ -377,8 +419,7 @@ Savepoints
 
 Both the Django ORM and MySQL (when using the InnoDB :ref:`storage engine
 <mysql-storage-engines>`) support database :ref:`savepoints
-<topics-db-transactions-savepoints>`, but this feature wasn't available in
-Django until version 1.4 when such supports was added.
+<topics-db-transactions-savepoints>`.
 
 If you use the MyISAM storage engine please be aware of the fact that you will
 receive database-generated errors if you try to use the :ref:`savepoint-related
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 306db8439e..1d3f1b8d1d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -25,9 +25,10 @@ copy ``django-admin.py`` to a location on your existing path or edit the
 Environment...``) to point to its installed location.
 
 Generally, when working on a single Django project, it's easier to use
-``manage.py``. Use ``django-admin.py`` with ``DJANGO_SETTINGS_MODULE``, or the
-``--settings`` command line option, if you need to switch between multiple
-Django settings files.
+``manage.py`` than ``django-admin.py``. If you need to switch between multiple
+Django settings files, use ``django-admin.py`` with
+:envvar:`DJANGO_SETTINGS_MODULE` or the :djadminopt:`--settings` command line
+option.
 
 The command-line examples throughout this document use ``django-admin.py`` to
 be consistent, but any example can use ``manage.py`` just as well.
@@ -107,12 +108,21 @@ compilemessages
 Compiles .po files created with ``makemessages`` to .mo files for use with
 the builtin gettext support. See :doc:`/topics/i18n/index`.
 
-Use the :djadminopt:`--locale` option to specify the locale to process.
-If not provided, all locales are processed.
+Use the :djadminopt:`--locale` option (or its shorter version ``-l``) to
+specify the locale(s) to process. If not provided, all locales are processed.
 
 Example usage::
 
     django-admin.py compilemessages --locale=pt_BR
+    django-admin.py compilemessages --locale=pt_BR --locale=fr
+    django-admin.py compilemessages -l pt_BR
+    django-admin.py compilemessages -l pt_BR -l fr
+    django-admin.py compilemessages --locale=pt_BR,fr
+    django-admin.py compilemessages -l pt_BR,fr
+
+.. versionchanged:: 1.6
+
+Added the ability to specify multiple locales.
 
 createcachetable
 ----------------
@@ -159,8 +169,11 @@ example, the default settings don't define :setting:`ROOT_URLCONF`, so
 :setting:`ROOT_URLCONF` is followed by ``"###"`` in the output of
 ``diffsettings``.
 
-Note that Django's default settings live in ``django/conf/global_settings.py``,
-if you're ever curious to see the full list of defaults.
+The :djadminopt:`--all` option may be provided to display all settings, even
+if they have Django's default value. Such settings are prefixed by ``"###"``.
+
+.. versionadded:: 1.6
+    The :djadminopt:`--all` option was added.
 
 dumpdata <appname appname appname.Model ...>
 --------------------------------------------
@@ -279,9 +292,24 @@ needed.
 ``inspectdb`` works with PostgreSQL, MySQL and SQLite. Foreign-key detection
 only works in PostgreSQL and with certain types of MySQL tables.
 
+If your plan is that your Django application(s) modify data (i.e. edit, remove
+records and create new ones) in the existing database tables corresponding to
+any of the introspected models then one of the manual review and edit steps
+you need to perform on the resulting ``models.py`` file is to change the
+Python declaration of each one of these models to specify it is a
+:attr:`managed <django.db.models.Options.managed>` one.
+
+This servers as an explicit opt-in to give your nascent Django project write
+access to your precious data on a model by model basis.
+
 The :djadminopt:`--database` option may be used to specify the
 database to introspect.
 
+.. versionchanged:: 1.6
+
+The behavior by which introspected models are created as unmanaged ones is new
+in Django 1.6.
+
 loaddata <fixture fixture ...>
 ------------------------------
 
@@ -292,6 +320,8 @@ Searches for and loads the contents of the named fixture into the database.
 The :djadminopt:`--database` option can be used to specify the database
 onto which the data will be loaded.
 
+.. django-admin-option:: --ignorenonexistent
+
 .. versionadded:: 1.5
 
 The :djadminopt:`--ignorenonexistent` option can be used to ignore fields that
@@ -420,11 +450,24 @@ Separate multiple extensions with commas or use -e or --extension multiple times
 
     django-admin.py makemessages --locale=de --extension=html,txt --extension xml
 
-Use the :djadminopt:`--locale` option to specify the locale to process.
+Use the :djadminopt:`--locale` option (or its shorter version ``-l``) to
+specify the locale(s) to process.
 
 Example usage::
 
     django-admin.py makemessages --locale=pt_BR
+    django-admin.py makemessages --locale=pt_BR --locale=fr
+    django-admin.py makemessages -l pt_BR
+    django-admin.py makemessages -l pt_BR -l fr
+
+You can also use commas to separate multiple locales::
+
+    django-admin.py makemessages --locale=de,fr,pt_BR
+    django-admin.py makemessages -l de,fr,pt_BR
+
+.. versionchanged:: 1.6
+
+Added the ability to specify multiple locales.
 
 .. django-admin-option:: --domain
 
@@ -466,12 +509,18 @@ several lines in language files.
 
 .. django-admin-option:: --no-location
 
-.. versionadded:: 1.4
-
 Use the ``--no-location`` option to not write '``#: filename:line``'
 comment lines in language files. Note that using this option makes it harder
 for technically skilled translators to understand each message's context.
 
+.. django-admin-option:: --keep-pot
+
+.. versionadded:: 1.6
+
+Use the ``--keep-pot`` option to prevent django from deleting the temporary
+.pot file it generates before creating the .po file. This is useful for
+debugging errors which may prevent the final language files from being created.
+
 runfcgi [options]
 -----------------
 
@@ -482,9 +531,8 @@ supports the FastCGI protocol. See the :doc:`FastCGI deployment documentation
 </howto/deployment/fastcgi>` for details. Requires the Python FastCGI module from
 `flup`_.
 
-.. versionadded:: 1.4
-    Internally, this wraps the WSGI application object specified by the
-    :setting:`WSGI_APPLICATION` setting.
+Internally, this wraps the WSGI application object specified by the
+:setting:`WSGI_APPLICATION` setting.
 
 .. _flup: http://www.saddi.com/software/flup/
 
@@ -610,9 +658,8 @@ If you run this script as a user with normal privileges (recommended), you
 might not have access to start a port on a low port number. Low port numbers
 are reserved for the superuser (root).
 
-.. versionadded:: 1.4
-    This server uses the WSGI application object specified by the
-    :setting:`WSGI_APPLICATION` setting.
+This server uses the WSGI application object specified by the
+:setting:`WSGI_APPLICATION` setting.
 
 DO NOT USE THIS SERVER IN A PRODUCTION SETTING. It has not gone through
 security audits or performance tests. (And that's how it's gonna stay. We're in
@@ -658,11 +705,8 @@ Example usage::
 
 .. django-admin-option:: --nothreading
 
-.. versionadded:: 1.4
-
-Since version 1.4, the development server is multithreaded by default.
-Use the ``--nothreading`` option to disable the use of threading in the
-development server.
+The development server is multithreaded by default. Use the ``--nothreading``
+option to disable the use of threading in the development server.
 
 .. django-admin-option:: --ipv6, -6
 
@@ -718,7 +762,8 @@ Serving static files with the development server
 
 By default, the development server doesn't serve any static files for your site
 (such as CSS files, images, things under :setting:`MEDIA_URL` and so forth). If
-you want to configure Django to serve static media, read :doc:`/howto/static-files`.
+you want to configure Django to serve static media, read
+:doc:`/howto/static-files/index`.
 
 shell
 -----
@@ -754,6 +799,18 @@ bpython::
 .. _IPython: http://ipython.scipy.org/
 .. _bpython: http://bpython-interpreter.org/
 
+When the "plain" Python interactive interpreter starts (be it because
+``--plain`` was specified or because no other interactive interface is
+available) it reads the script pointed to by the :envvar:`PYTHONSTARTUP`
+environment variable and the ``~/.pythonrc.py`` script. If you don't wish this
+behavior you can use the ``--no-startup`` option. e.g.::
+
+    django-admin.py shell --plain --no-startup
+
+.. versionadded:: 1.6
+
+The ``--no-startup`` option was added in Django 1.6.
+
 sql <appname appname ...>
 -------------------------
 
@@ -811,6 +868,18 @@ Note that the order in which the SQL files are processed is undefined.
 The :djadminopt:`--database` option can be used to specify the database for
 which to print the SQL.
 
+sqldropindexes <appname appname ...>
+------------------------------------
+
+.. django-admin:: sqldropindexes
+
+.. versionadded:: 1.6
+
+Prints the DROP INDEX SQL statements for the given app name(s).
+
+The :djadminopt:`--database` option can be used to specify the database for
+which to print the SQL.
+
 sqlflush
 --------
 
@@ -856,8 +925,6 @@ startapp <appname> [destination]
 Creates a Django app directory structure for the given app name in the current
 directory or the given destination.
 
-.. versionchanged:: 1.4
-
 By default the directory created contains a ``models.py`` file and other app
 template files. (See the `source`_ for more details.) If only the app
 name is given, the app directory will be created in the current working
@@ -871,7 +938,8 @@ For example::
 
     django-admin.py startapp myapp /Users/jezdez/Code/myapp
 
-.. versionadded:: 1.4
+.. _custom-app-and-project-templates:
+
 .. django-admin-option:: --template
 
 With the ``--template`` option, you can use a custom app template by providing
@@ -893,8 +961,6 @@ zip files, you can use a URL like::
 
     django-admin.py startapp --template=https://github.com/githubuser/django-app-template/archive/master.zip myapp
 
-.. versionadded:: 1.4
-
 When Django copies the app template files, it also renders certain files
 through the template engine: the files whose extensions match the
 ``--extension`` option (``py`` by default) and the files whose names are passed
@@ -905,6 +971,7 @@ with the ``--name`` option. The :class:`template context
   options)
 - ``app_name`` -- the app name as passed to the command
 - ``app_directory`` -- the full path of the newly created app
+- ``docs_version`` -- the version of the documentation: ``'dev'`` or ``'1.x'``
 
 .. _render_warning:
 
@@ -929,8 +996,6 @@ startproject <projectname> [destination]
 Creates a Django project directory structure for the given project name in
 the current directory or the given destination.
 
-.. versionchanged:: 1.4
-
 By default, the new directory contains ``manage.py`` and a project package
 (containing a ``settings.py`` and other files). See the `template source`_ for
 details.
@@ -947,8 +1012,6 @@ For example::
 
     django-admin.py startproject myproject /Users/jezdez/Code/myproject_repo
 
-.. versionadded:: 1.4
-
 As with the :djadmin:`startapp` command, the ``--template`` option lets you
 specify a directory, file path or URL of a custom project template. See the
 :djadmin:`startapp` documentation for details of supported project template
@@ -974,10 +1037,12 @@ through the template engine: the files whose extensions match the
 with the ``--name`` option. The :class:`template context
 <django.template.Context>` used is:
 
-- Any option passed to the startproject command
+- Any option passed to the startapp command (among the command's supported
+  options)
 - ``project_name`` -- the project name as passed to the command
 - ``project_directory`` -- the full path of the newly created project
 - ``secret_key`` -- a random key for the :setting:`SECRET_KEY` setting
+- ``docs_version`` -- the version of the documentation: ``'dev'`` or ``'1.x'``
 
 Please also see the :ref:`rendering warning <render_warning>` as mentioned
 for :djadmin:`startapp`.
@@ -1036,7 +1101,7 @@ test <app or test identifier>
 
 .. django-admin:: test
 
-Runs tests for all installed models. See :doc:`/topics/testing` for more
+Runs tests for all installed models. See :doc:`/topics/testing/index` for more
 information.
 
 .. django-admin-option:: --failfast
@@ -1044,14 +1109,12 @@ information.
 The ``--failfast`` option can be used to stop running tests and report the
 failure immediately after a test fails.
 
-.. versionadded:: 1.4
 .. django-admin-option:: --testrunner
 
 The ``--testrunner`` option can be used to control the test runner class that
 is used to execute tests. If this value is provided, it overrides the value
 provided by the :setting:`TEST_RUNNER` setting.
 
-.. versionadded:: 1.4
 .. django-admin-option:: --liveserver
 
 The ``--liveserver`` option can be used to override the default address where
@@ -1072,7 +1135,7 @@ For example, this command::
 
 ...would perform the following steps:
 
-1. Create a test database, as described in :doc:`/topics/testing`.
+1. Create a test database, as described in :ref:`the-test-database`.
 2. Populate the test database with fixture data from the given fixtures.
    (For more on fixtures, see the documentation for ``loaddata`` above.)
 3. Runs the Django development server (as in ``runserver``), pointed at
@@ -1080,7 +1143,7 @@ For example, this command::
 
 This is useful in a number of ways:
 
-* When you're writing :doc:`unit tests </topics/testing>` of how your views
+* When you're writing :doc:`unit tests </topics/testing/overview>` of how your views
   act with certain fixture data, you can use ``testserver`` to interact with
   the views in a Web browser, manually.
 
@@ -1145,15 +1208,13 @@ changepassword
 .. django-admin:: changepassword
 
 This command is only available if Django's :doc:`authentication system
-</topics/auth>` (``django.contrib.auth``) is installed.
+</topics/auth/index>` (``django.contrib.auth``) is installed.
 
 Allows changing a user's password. It prompts you to enter twice the password of
 the user given as parameter. If they both match, the new password will be
 changed immediately. If you do not supply a user, the command will attempt to
 change the password whose username matches the current user.
 
-.. versionadded:: 1.4
-
 Use the ``--database`` option to specify the database to query for the user. If
 it's not supplied, Django will use the ``default`` database.
 
@@ -1167,7 +1228,7 @@ createsuperuser
 .. django-admin:: createsuperuser
 
 This command is only available if Django's :doc:`authentication system
-</topics/auth>` (``django.contrib.auth``) is installed.
+</topics/auth/index>` (``django.contrib.auth``) is installed.
 
 Creates a superuser account (a user who has all permissions). This is
 useful if you need to create an initial superuser account but did not
@@ -1187,8 +1248,6 @@ using the ``--username`` and ``--email`` arguments on the command
 line. If either of those is not supplied, ``createsuperuser`` will prompt for
 it when running interactively.
 
-.. versionadded:: 1.4
-
 Use the ``--database`` option to specify the database into which the superuser
 object will be saved.
 
@@ -1233,7 +1292,7 @@ collectstatic
 ~~~~~~~~~~~~~
 
 This command is only available if the :doc:`static files application
-</howto/static-files>` (``django.contrib.staticfiles``) is installed.
+</howto/static-files/index>` (``django.contrib.staticfiles``) is installed.
 
 Please refer to its :djadmin:`description <collectstatic>` in the
 :doc:`staticfiles </ref/contrib/staticfiles>` documentation.
@@ -1242,7 +1301,7 @@ findstatic
 ~~~~~~~~~~
 
 This command is only available if the :doc:`static files application
-</howto/static-files>` (``django.contrib.staticfiles``) is installed.
+</howto/static-files/index>` (``django.contrib.staticfiles``) is installed.
 
 Please refer to its :djadmin:`description <findstatic>` in the :doc:`staticfiles
 </ref/contrib/staticfiles>` documentation.
@@ -1289,8 +1348,13 @@ Example usage::
     django-admin.py syncdb --traceback
 
 By default, ``django-admin.py`` will show a simple error message whenever an
-error occurs. If you specify ``--traceback``, ``django-admin.py``  will
-output a full stack trace whenever an exception is raised.
+:class:`~django.core.management.CommandError` occurs, but a full stack trace
+for any other exception. If you specify ``--traceback``, ``django-admin.py``
+will also output a full stack trace when a ``CommandError`` is raised.
+
+.. versionchanged:: 1.6
+    Previously, Django didn't show a full stack trace by default for exceptions
+    other than ``CommandError``.
 
 .. django-admin-option:: --verbosity
 
@@ -1324,7 +1388,7 @@ For example, to dump data from the database with the alias ``master``::
 .. django-admin-option:: --exclude
 
 Exclude a specific application from the applications whose contents is
-output. For example, to specifically exclude the `auth` application from
+output. For example, to specifically exclude the ``auth`` application from
 the output of dumpdata, you would call::
 
     django-admin.py dumpdata --exclude=auth
diff --git a/docs/ref/exceptions.txt b/docs/ref/exceptions.txt
index e91a5dd85e..93bb9ed251 100644
--- a/docs/ref/exceptions.txt
+++ b/docs/ref/exceptions.txt
@@ -119,18 +119,43 @@ NoReverseMatch
 Database Exceptions
 ===================
 
-Django wraps the standard database exceptions :exc:`DatabaseError` and
-:exc:`IntegrityError` so that your Django code has a guaranteed common
-implementation of these classes. These database exceptions are
-provided in :mod:`django.db`.
+Django wraps the standard database exceptions so that your Django code has a
+guaranteed common implementation of these classes. These database exceptions
+are provided in :mod:`django.db`.
 
+.. exception:: Error
+.. exception:: InterfaceError
 .. exception:: DatabaseError
+.. exception:: DataError
+.. exception:: OperationalError
 .. exception:: IntegrityError
+.. exception:: InternalError
+.. exception:: ProgrammingError
+.. exception:: NotSupportedError
 
 The Django wrappers for database exceptions behave exactly the same as
 the underlying database exceptions. See :pep:`249`, the Python Database API
 Specification v2.0, for further information.
 
+.. versionchanged:: 1.6
+    Previous version of Django only wrapped ``DatabaseError`` and
+    ``IntegrityError``.
+
+.. exception:: models.ProtectedError
+
+Raised to prevent deletion of referenced objects when using
+:attr:`django.db.models.PROTECT`. Subclass of :exc:`IntegrityError`.
+
+.. currentmodule:: django.http
+
+Http Exceptions
+===============
+
+.. exception:: UnreadablePostError
+
+    The :exc:`UnreadablePostError` is raised when a user cancels an upload.
+    It is available from :mod:`django.http`.
+
 .. currentmodule:: django.db.transaction
 
 Transaction Exceptions
diff --git a/docs/ref/files/file.txt b/docs/ref/files/file.txt
index ada614df45..7562f9b6bf 100644
--- a/docs/ref/files/file.txt
+++ b/docs/ref/files/file.txt
@@ -14,7 +14,7 @@ The ``File`` Class
     The :class:`File` is a thin wrapper around Python's built-in file object
     with some Django-specific additions. Internally, Django uses this class
     any time it needs to represent a file.
-    
+
     :class:`File` objects have the following attributes and methods:
 
     .. attribute:: name
@@ -148,7 +148,7 @@ below) will also have a couple of extra methods:
 
     Note that the ``content`` argument must be an instance of either
     :class:`File` or of a subclass of :class:`File`, such as
-    :class:`ContentFile`.
+    :class:`~django.core.files.base.ContentFile`.
 
 .. method:: File.delete([save=True])
 
diff --git a/docs/ref/files/storage.txt b/docs/ref/files/storage.txt
index f9bcf9b61e..b9742514ea 100644
--- a/docs/ref/files/storage.txt
+++ b/docs/ref/files/storage.txt
@@ -38,7 +38,7 @@ The FileSystemStorage Class
 
     .. note::
 
-        The :class:`FileSystemStorage.delete` method will not raise
+        The ``FileSystemStorage.delete()`` method will not raise
         raise an exception if the given file name does not exist.
 
 The Storage Class
@@ -66,7 +66,7 @@ The Storage Class
     .. method:: delete(name)
 
         Deletes the file referenced by ``name``. If deletion is not supported
-        on the targest storage system this will raise ``NotImplementedError``
+        on the target storage system this will raise ``NotImplementedError``
         instead
 
     .. method:: exists(name)
diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
index dffef314b7..34ed2e493e 100644
--- a/docs/ref/forms/api.txt
+++ b/docs/ref/forms/api.txt
@@ -2,9 +2,7 @@
 The Forms API
 =============
 
-.. module:: django.forms.forms
-
-.. currentmodule:: django.forms
+.. module:: django.forms
 
 .. admonition:: About this document
 
@@ -150,11 +148,11 @@ it's not necessary to include every field in your form. For example::
 These values are only displayed for unbound forms, and they're not used as
 fallback values if a particular value isn't provided.
 
-Note that if a :class:`~django.forms.fields.Field` defines
-:attr:`~Form.initial` *and* you include ``initial`` when instantiating the
-``Form``, then the latter ``initial`` will have precedence. In this example,
-``initial`` is provided both at the field level and at the form instance level,
-and the latter gets precedence::
+Note that if a :class:`~django.forms.Field` defines :attr:`~Form.initial` *and*
+you include ``initial`` when instantiating the ``Form``, then the latter
+``initial`` will have precedence. In this example, ``initial`` is provided both
+at the field level and at the form instance level, and the latter gets
+precedence::
 
     >>> class CommentForm(forms.Form):
     ...     name = forms.CharField(initial='class')
@@ -163,7 +161,7 @@ and the latter gets precedence::
     >>> f = CommentForm(initial={'name': 'instance'}, auto_id=False)
     >>> print(f)
     <tr><th>Name:</th><td><input type="text" name="name" value="instance" /></td></tr>
-    <tr><th>Url:</th><td><input type="text" name="url" /></td></tr>
+    <tr><th>Url:</th><td><input type="url" name="url" /></td></tr>
     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
 
 Accessing "clean" data
@@ -272,7 +270,7 @@ simply ``print`` it::
     >>> print(f)
     <tr><th><label for="id_subject">Subject:</label></th><td><input id="id_subject" type="text" name="subject" maxlength="100" /></td></tr>
     <tr><th><label for="id_message">Message:</label></th><td><input type="text" name="message" id="id_message" /></td></tr>
-    <tr><th><label for="id_sender">Sender:</label></th><td><input type="text" name="sender" id="id_sender" /></td></tr>
+    <tr><th><label for="id_sender">Sender:</label></th><td><input type="email" name="sender" id="id_sender" /></td></tr>
     <tr><th><label for="id_cc_myself">Cc myself:</label></th><td><input type="checkbox" name="cc_myself" id="id_cc_myself" /></td></tr>
 
 If the form is bound to data, the HTML output will include that data
@@ -289,7 +287,7 @@ include ``checked="checked"`` if appropriate::
     >>> print(f)
     <tr><th><label for="id_subject">Subject:</label></th><td><input id="id_subject" type="text" name="subject" maxlength="100" value="hello" /></td></tr>
     <tr><th><label for="id_message">Message:</label></th><td><input type="text" name="message" id="id_message" value="Hi there" /></td></tr>
-    <tr><th><label for="id_sender">Sender:</label></th><td><input type="text" name="sender" id="id_sender" value="foo@example.com" /></td></tr>
+    <tr><th><label for="id_sender">Sender:</label></th><td><input type="email" name="sender" id="id_sender" value="foo@example.com" /></td></tr>
     <tr><th><label for="id_cc_myself">Cc myself:</label></th><td><input type="checkbox" name="cc_myself" id="id_cc_myself" checked="checked" /></td></tr>
 
 This default output is a two-column HTML table, with a ``<tr>`` for each field.
@@ -299,8 +297,9 @@ Notice the following:
   ``</table>`` tags, nor does it include the ``<form>`` and ``</form>``
   tags or an ``<input type="submit">`` tag. It's your job to do that.
 
-* Each field type has a default HTML representation. ``CharField`` and
-  ``EmailField`` are represented by an ``<input type="text">``.
+* Each field type has a default HTML representation. ``CharField`` is
+  represented by an ``<input type="text">`` and ``EmailField`` by an
+  ``<input type="email">``.
   ``BooleanField`` is represented by an ``<input type="checkbox">``. Note
   these are merely sensible defaults; you can specify which HTML to use for
   a given field by using widgets, which we'll explain shortly.
@@ -337,7 +336,7 @@ a form object, and each rendering method returns a Unicode object.
         >>> print(f.as_p())
         <p><label for="id_subject">Subject:</label> <input id="id_subject" type="text" name="subject" maxlength="100" /></p>
         <p><label for="id_message">Message:</label> <input type="text" name="message" id="id_message" /></p>
-        <p><label for="id_sender">Sender:</label> <input type="text" name="sender" id="id_sender" /></p>
+        <p><label for="id_sender">Sender:</label> <input type="email" name="sender" id="id_sender" /></p>
         <p><label for="id_cc_myself">Cc myself:</label> <input type="checkbox" name="cc_myself" id="id_cc_myself" /></p>
 
 ``as_ul()``
@@ -352,11 +351,11 @@ a form object, and each rendering method returns a Unicode object.
 
         >>> f = ContactForm()
         >>> f.as_ul()
-        u'<li><label for="id_subject">Subject:</label> <input id="id_subject" type="text" name="subject" maxlength="100" /></li>\n<li><label for="id_message">Message:</label> <input type="text" name="message" id="id_message" /></li>\n<li><label for="id_sender">Sender:</label> <input type="text" name="sender" id="id_sender" /></li>\n<li><label for="id_cc_myself">Cc myself:</label> <input type="checkbox" name="cc_myself" id="id_cc_myself" /></li>'
+        u'<li><label for="id_subject">Subject:</label> <input id="id_subject" type="text" name="subject" maxlength="100" /></li>\n<li><label for="id_message">Message:</label> <input type="text" name="message" id="id_message" /></li>\n<li><label for="id_sender">Sender:</label> <input type="email" name="sender" id="id_sender" /></li>\n<li><label for="id_cc_myself">Cc myself:</label> <input type="checkbox" name="cc_myself" id="id_cc_myself" /></li>'
         >>> print(f.as_ul())
         <li><label for="id_subject">Subject:</label> <input id="id_subject" type="text" name="subject" maxlength="100" /></li>
         <li><label for="id_message">Message:</label> <input type="text" name="message" id="id_message" /></li>
-        <li><label for="id_sender">Sender:</label> <input type="text" name="sender" id="id_sender" /></li>
+        <li><label for="id_sender">Sender:</label> <input type="email" name="sender" id="id_sender" /></li>
         <li><label for="id_cc_myself">Cc myself:</label> <input type="checkbox" name="cc_myself" id="id_cc_myself" /></li>
 
 ``as_table()``
@@ -370,16 +369,19 @@ a form object, and each rendering method returns a Unicode object.
 
         >>> f = ContactForm()
         >>> f.as_table()
-        u'<tr><th><label for="id_subject">Subject:</label></th><td><input id="id_subject" type="text" name="subject" maxlength="100" /></td></tr>\n<tr><th><label for="id_message">Message:</label></th><td><input type="text" name="message" id="id_message" /></td></tr>\n<tr><th><label for="id_sender">Sender:</label></th><td><input type="text" name="sender" id="id_sender" /></td></tr>\n<tr><th><label for="id_cc_myself">Cc myself:</label></th><td><input type="checkbox" name="cc_myself" id="id_cc_myself" /></td></tr>'
+        u'<tr><th><label for="id_subject">Subject:</label></th><td><input id="id_subject" type="text" name="subject" maxlength="100" /></td></tr>\n<tr><th><label for="id_message">Message:</label></th><td><input type="text" name="message" id="id_message" /></td></tr>\n<tr><th><label for="id_sender">Sender:</label></th><td><input type="email" name="sender" id="id_sender" /></td></tr>\n<tr><th><label for="id_cc_myself">Cc myself:</label></th><td><input type="checkbox" name="cc_myself" id="id_cc_myself" /></td></tr>'
         >>> print(f.as_table())
         <tr><th><label for="id_subject">Subject:</label></th><td><input id="id_subject" type="text" name="subject" maxlength="100" /></td></tr>
         <tr><th><label for="id_message">Message:</label></th><td><input type="text" name="message" id="id_message" /></td></tr>
-        <tr><th><label for="id_sender">Sender:</label></th><td><input type="text" name="sender" id="id_sender" /></td></tr>
+        <tr><th><label for="id_sender">Sender:</label></th><td><input type="email" name="sender" id="id_sender" /></td></tr>
         <tr><th><label for="id_cc_myself">Cc myself:</label></th><td><input type="checkbox" name="cc_myself" id="id_cc_myself" /></td></tr>
 
 Styling required or erroneous form rows
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. attribute:: Form.error_css_class
+.. attribute:: Form.required_css_class
+
 It's pretty common to style form rows and fields that are required or have
 errors. For example, you might want to present required form rows in bold and
 highlight errors in red.
@@ -430,17 +432,17 @@ tags nor ``id`` attributes::
     >>> print(f.as_table())
     <tr><th>Subject:</th><td><input type="text" name="subject" maxlength="100" /></td></tr>
     <tr><th>Message:</th><td><input type="text" name="message" /></td></tr>
-    <tr><th>Sender:</th><td><input type="text" name="sender" /></td></tr>
+    <tr><th>Sender:</th><td><input type="email" name="sender" /></td></tr>
     <tr><th>Cc myself:</th><td><input type="checkbox" name="cc_myself" /></td></tr>
     >>> print(f.as_ul())
     <li>Subject: <input type="text" name="subject" maxlength="100" /></li>
     <li>Message: <input type="text" name="message" /></li>
-    <li>Sender: <input type="text" name="sender" /></li>
+    <li>Sender: <input type="email" name="sender" /></li>
     <li>Cc myself: <input type="checkbox" name="cc_myself" /></li>
     >>> print(f.as_p())
     <p>Subject: <input type="text" name="subject" maxlength="100" /></p>
     <p>Message: <input type="text" name="message" /></p>
-    <p>Sender: <input type="text" name="sender" /></p>
+    <p>Sender: <input type="email" name="sender" /></p>
     <p>Cc myself: <input type="checkbox" name="cc_myself" /></p>
 
 If ``auto_id`` is set to ``True``, then the form output *will* include
@@ -451,17 +453,17 @@ field::
     >>> print(f.as_table())
     <tr><th><label for="subject">Subject:</label></th><td><input id="subject" type="text" name="subject" maxlength="100" /></td></tr>
     <tr><th><label for="message">Message:</label></th><td><input type="text" name="message" id="message" /></td></tr>
-    <tr><th><label for="sender">Sender:</label></th><td><input type="text" name="sender" id="sender" /></td></tr>
+    <tr><th><label for="sender">Sender:</label></th><td><input type="email" name="sender" id="sender" /></td></tr>
     <tr><th><label for="cc_myself">Cc myself:</label></th><td><input type="checkbox" name="cc_myself" id="cc_myself" /></td></tr>
     >>> print(f.as_ul())
     <li><label for="subject">Subject:</label> <input id="subject" type="text" name="subject" maxlength="100" /></li>
     <li><label for="message">Message:</label> <input type="text" name="message" id="message" /></li>
-    <li><label for="sender">Sender:</label> <input type="text" name="sender" id="sender" /></li>
+    <li><label for="sender">Sender:</label> <input type="email" name="sender" id="sender" /></li>
     <li><label for="cc_myself">Cc myself:</label> <input type="checkbox" name="cc_myself" id="cc_myself" /></li>
     >>> print(f.as_p())
     <p><label for="subject">Subject:</label> <input id="subject" type="text" name="subject" maxlength="100" /></p>
     <p><label for="message">Message:</label> <input type="text" name="message" id="message" /></p>
-    <p><label for="sender">Sender:</label> <input type="text" name="sender" id="sender" /></p>
+    <p><label for="sender">Sender:</label> <input type="email" name="sender" id="sender" /></p>
     <p><label for="cc_myself">Cc myself:</label> <input type="checkbox" name="cc_myself" id="cc_myself" /></p>
 
 If ``auto_id`` is set to a string containing the format character ``'%s'``,
@@ -474,17 +476,17 @@ attributes based on the format string. For example, for a format string
     >>> print(f.as_table())
     <tr><th><label for="id_for_subject">Subject:</label></th><td><input id="id_for_subject" type="text" name="subject" maxlength="100" /></td></tr>
     <tr><th><label for="id_for_message">Message:</label></th><td><input type="text" name="message" id="id_for_message" /></td></tr>
-    <tr><th><label for="id_for_sender">Sender:</label></th><td><input type="text" name="sender" id="id_for_sender" /></td></tr>
+    <tr><th><label for="id_for_sender">Sender:</label></th><td><input type="email" name="sender" id="id_for_sender" /></td></tr>
     <tr><th><label for="id_for_cc_myself">Cc myself:</label></th><td><input type="checkbox" name="cc_myself" id="id_for_cc_myself" /></td></tr>
     >>> print(f.as_ul())
     <li><label for="id_for_subject">Subject:</label> <input id="id_for_subject" type="text" name="subject" maxlength="100" /></li>
     <li><label for="id_for_message">Message:</label> <input type="text" name="message" id="id_for_message" /></li>
-    <li><label for="id_for_sender">Sender:</label> <input type="text" name="sender" id="id_for_sender" /></li>
+    <li><label for="id_for_sender">Sender:</label> <input type="email" name="sender" id="id_for_sender" /></li>
     <li><label for="id_for_cc_myself">Cc myself:</label> <input type="checkbox" name="cc_myself" id="id_for_cc_myself" /></li>
     >>> print(f.as_p())
     <p><label for="id_for_subject">Subject:</label> <input id="id_for_subject" type="text" name="subject" maxlength="100" /></p>
     <p><label for="id_for_message">Message:</label> <input type="text" name="message" id="id_for_message" /></p>
-    <p><label for="id_for_sender">Sender:</label> <input type="text" name="sender" id="id_for_sender" /></p>
+    <p><label for="id_for_sender">Sender:</label> <input type="email" name="sender" id="id_for_sender" /></p>
     <p><label for="id_for_cc_myself">Cc myself:</label> <input type="checkbox" name="cc_myself" id="id_for_cc_myself" /></p>
 
 If ``auto_id`` is set to any other true value -- such as a string that doesn't
@@ -500,13 +502,13 @@ entirely, using the ``label_suffix`` parameter::
     >>> print(f.as_ul())
     <li><label for="id_for_subject">Subject</label> <input id="id_for_subject" type="text" name="subject" maxlength="100" /></li>
     <li><label for="id_for_message">Message</label> <input type="text" name="message" id="id_for_message" /></li>
-    <li><label for="id_for_sender">Sender</label> <input type="text" name="sender" id="id_for_sender" /></li>
+    <li><label for="id_for_sender">Sender</label> <input type="email" name="sender" id="id_for_sender" /></li>
     <li><label for="id_for_cc_myself">Cc myself</label> <input type="checkbox" name="cc_myself" id="id_for_cc_myself" /></li>
     >>> f = ContactForm(auto_id='id_for_%s', label_suffix=' ->')
     >>> print(f.as_ul())
     <li><label for="id_for_subject">Subject -></label> <input id="id_for_subject" type="text" name="subject" maxlength="100" /></li>
     <li><label for="id_for_message">Message -></label> <input type="text" name="message" id="id_for_message" /></li>
-    <li><label for="id_for_sender">Sender -></label> <input type="text" name="sender" id="id_for_sender" /></li>
+    <li><label for="id_for_sender">Sender -></label> <input type="email" name="sender" id="id_for_sender" /></li>
     <li><label for="id_for_cc_myself">Cc myself -></label> <input type="checkbox" name="cc_myself" id="id_for_cc_myself" /></li>
 
 Note that the label suffix is added only if the last character of the
@@ -538,19 +540,19 @@ method you're using::
     >>> print(f.as_table())
     <tr><th>Subject:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="subject" maxlength="100" /></td></tr>
     <tr><th>Message:</th><td><input type="text" name="message" value="Hi there" /></td></tr>
-    <tr><th>Sender:</th><td><ul class="errorlist"><li>Enter a valid email address.</li></ul><input type="text" name="sender" value="invalid email address" /></td></tr>
+    <tr><th>Sender:</th><td><ul class="errorlist"><li>Enter a valid email address.</li></ul><input type="email" name="sender" value="invalid email address" /></td></tr>
     <tr><th>Cc myself:</th><td><input checked="checked" type="checkbox" name="cc_myself" /></td></tr>
     >>> print(f.as_ul())
     <li><ul class="errorlist"><li>This field is required.</li></ul>Subject: <input type="text" name="subject" maxlength="100" /></li>
     <li>Message: <input type="text" name="message" value="Hi there" /></li>
-    <li><ul class="errorlist"><li>Enter a valid email address.</li></ul>Sender: <input type="text" name="sender" value="invalid email address" /></li>
+    <li><ul class="errorlist"><li>Enter a valid email address.</li></ul>Sender: <input type="email" name="sender" value="invalid email address" /></li>
     <li>Cc myself: <input checked="checked" type="checkbox" name="cc_myself" /></li>
     >>> print(f.as_p())
     <p><ul class="errorlist"><li>This field is required.</li></ul></p>
     <p>Subject: <input type="text" name="subject" maxlength="100" /></p>
     <p>Message: <input type="text" name="message" value="Hi there" /></p>
     <p><ul class="errorlist"><li>Enter a valid email address.</li></ul></p>
-    <p>Sender: <input type="text" name="sender" value="invalid email address" /></p>
+    <p>Sender: <input type="email" name="sender" value="invalid email address" /></p>
     <p>Cc myself: <input checked="checked" type="checkbox" name="cc_myself" /></p>
 
 Customizing the error list format
@@ -573,7 +575,7 @@ pass that in at construction time::
     <p>Subject: <input type="text" name="subject" maxlength="100" /></p>
     <p>Message: <input type="text" name="message" value="Hi there" /></p>
     <div class="errorlist"><div class="error">Enter a valid email address.</div></div>
-    <p>Sender: <input type="text" name="sender" value="invalid email address" /></p>
+    <p>Sender: <input type="email" name="sender" value="invalid email address" /></p>
     <p>Cc myself: <input checked="checked" type="checkbox" name="cc_myself" /></p>
 
 More granular output
@@ -587,24 +589,24 @@ lazy developers -- they're not the only way a form object can be displayed.
    Used to display HTML or access attributes for a single field of a
    :class:`Form` instance.
 
-   The :meth:`__unicode__` and :meth:`__str__` methods of this object displays
+   The ``__unicode__()`` and ``__str__()`` methods of this object displays
    the HTML for this field.
 
 To retrieve a single ``BoundField``, use dictionary lookup syntax on your form
 using the field's name as the key::
 
-	>>> form = ContactForm()
-	>>> print(form['subject'])
-	<input id="id_subject" type="text" name="subject" maxlength="100" />
+    >>> form = ContactForm()
+    >>> print(form['subject'])
+    <input id="id_subject" type="text" name="subject" maxlength="100" />
 
 To retrieve all ``BoundField`` objects, iterate the form::
 
-	>>> form = ContactForm()
-	>>> for boundfield in form: print(boundfield)
-	<input id="id_subject" type="text" name="subject" maxlength="100" />
-	<input type="text" name="message" id="id_message" />
-	<input type="text" name="sender" id="id_sender" />
-	<input type="checkbox" name="cc_myself" id="id_cc_myself" />
+    >>> form = ContactForm()
+    >>> for boundfield in form: print(boundfield)
+    <input id="id_subject" type="text" name="subject" maxlength="100" />
+    <input type="text" name="message" id="id_message" />
+    <input type="email" name="sender" id="id_sender" />
+    <input type="checkbox" name="cc_myself" id="id_cc_myself" />
 
 The field-specific output honors the form object's ``auto_id`` setting::
 
@@ -635,7 +637,20 @@ For a field's list of errors, access the field's ``errors`` attribute.
         >>> print(f['subject'].errors)
 
         >>> str(f['subject'].errors)
-	    ''
+        ''
+
+.. method:: BoundField.label_tag(contents=None, attrs=None)
+
+To separately render the label tag of a form field, you can call its
+``label_tag`` method::
+
+    >>> f = ContactForm(data)
+    >>> print(f['message'].label_tag())
+    <label for="id_message">Message</label>
+
+Optionally, you can provide the ``contents`` parameter which will replace the
+auto-generated label tag. An optional ``attrs`` dictionary may contain
+additional attributes for the ``<label>`` tag.
 
 .. method:: BoundField.css_classes()
 
@@ -644,17 +659,17 @@ indicate required form fields or fields that contain errors. If you're
 manually rendering a form, you can access these CSS classes using the
 ``css_classes`` method::
 
-	>>> f = ContactForm(data)
-	>>> f['message'].css_classes()
-	'required'
+    >>> f = ContactForm(data)
+    >>> f['message'].css_classes()
+    'required'
 
 If you want to provide some additional classes in addition to the
 error and required classes that may be required, you can provide
 those classes as an argument::
 
-	>>> f = ContactForm(data)
-	>>> f['message'].css_classes('foo bar')
-	'foo bar required'
+    >>> f = ContactForm(data)
+    >>> f['message'].css_classes('foo bar')
+    'foo bar required'
 
 .. method:: BoundField.value()
 
@@ -715,6 +730,8 @@ form data *and* file data::
 Testing for multipart forms
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. method:: Form.is_multipart
+
 If you're writing reusable views or templates, you may not know ahead of time
 whether your form is a multipart form or not. The ``is_multipart()`` method
 tells you whether the form requires multipart encoding for submission::
@@ -753,7 +770,7 @@ fields are ordered first::
     >>> print(f.as_ul())
     <li>Subject: <input type="text" name="subject" maxlength="100" /></li>
     <li>Message: <input type="text" name="message" /></li>
-    <li>Sender: <input type="text" name="sender" /></li>
+    <li>Sender: <input type="email" name="sender" /></li>
     <li>Cc myself: <input type="checkbox" name="cc_myself" /></li>
     <li>Priority: <input type="text" name="priority" /></li>
 
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 75d05c6829..c8b8044d26 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -112,7 +112,7 @@ We've specified ``auto_id=False`` to simplify the output::
     >>> f = CommentForm(auto_id=False)
     >>> print(f)
     <tr><th>Your name:</th><td><input type="text" name="name" /></td></tr>
-    <tr><th>Your Web site:</th><td><input type="text" name="url" /></td></tr>
+    <tr><th>Your Web site:</th><td><input type="url" name="url" /></td></tr>
     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
 
 ``initial``
@@ -135,7 +135,7 @@ field is initialized to a particular value. For example::
     >>> f = CommentForm(auto_id=False)
     >>> print(f)
     <tr><th>Name:</th><td><input type="text" name="name" value="Your name" /></td></tr>
-    <tr><th>Url:</th><td><input type="text" name="url" value="http://" /></td></tr>
+    <tr><th>Url:</th><td><input type="url" name="url" value="http://" /></td></tr>
     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
 
 You may be thinking, why not just pass a dictionary of the initial values as
@@ -150,7 +150,7 @@ and the HTML output will include any validation errors::
     >>> f = CommentForm(default_data, auto_id=False)
     >>> print(f)
     <tr><th>Name:</th><td><input type="text" name="name" value="Your name" /></td></tr>
-    <tr><th>Url:</th><td><ul class="errorlist"><li>Enter a valid URL.</li></ul><input type="text" name="url" value="http://" /></td></tr>
+    <tr><th>Url:</th><td><ul class="errorlist"><li>Enter a valid URL.</li></ul><input type="url" name="url" value="http://" /></td></tr>
     <tr><th>Comment:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="comment" /></td></tr>
 
 This is why ``initial`` values are only displayed for unbound forms. For bound
@@ -212,17 +212,17 @@ fields. We've specified ``auto_id=False`` to simplify the output::
     >>> print(f.as_table())
     <tr><th>Subject:</th><td><input type="text" name="subject" maxlength="100" /><br /><span class="helptext">100 characters max.</span></td></tr>
     <tr><th>Message:</th><td><input type="text" name="message" /></td></tr>
-    <tr><th>Sender:</th><td><input type="text" name="sender" /><br />A valid email address, please.</td></tr>
+    <tr><th>Sender:</th><td><input type="email" name="sender" /><br />A valid email address, please.</td></tr>
     <tr><th>Cc myself:</th><td><input type="checkbox" name="cc_myself" /></td></tr>
     >>> print(f.as_ul()))
     <li>Subject: <input type="text" name="subject" maxlength="100" /> <span class="helptext">100 characters max.</span></li>
     <li>Message: <input type="text" name="message" /></li>
-    <li>Sender: <input type="text" name="sender" /> A valid email address, please.</li>
+    <li>Sender: <input type="email" name="sender" /> A valid email address, please.</li>
     <li>Cc myself: <input type="checkbox" name="cc_myself" /></li>
     >>> print(f.as_p())
     <p>Subject: <input type="text" name="subject" maxlength="100" /> <span class="helptext">100 characters max.</span></p>
     <p>Message: <input type="text" name="message" /></p>
-    <p>Sender: <input type="text" name="sender" /> A valid email address, please.</p>
+    <p>Sender: <input type="email" name="sender" /> A valid email address, please.</p>
     <p>Cc myself: <input type="checkbox" name="cc_myself" /></p>
 
 ``error_messages``
@@ -289,7 +289,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: BooleanField(**kwargs)
 
-    * Default widget: ``CheckboxInput``
+    * Default widget: :class:`CheckboxInput`
     * Empty value: ``False``
     * Normalizes to: A Python ``True`` or ``False`` value.
     * Validates that the value is ``True`` (e.g. the check box is checked) if
@@ -309,7 +309,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: CharField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`TextInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object.
     * Validates ``max_length`` or ``min_length``, if they are provided.
@@ -329,7 +329,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: ChoiceField(**kwargs)
 
-    * Default widget: ``Select``
+    * Default widget: :class:`Select`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object.
     * Validates that the given value exists in the list of choices.
@@ -355,7 +355,7 @@ For each field, we describe the default widget used if you don't specify
     Just like a :class:`ChoiceField`, except :class:`TypedChoiceField` takes two
     extra arguments, ``coerce`` and ``empty_value``.
 
-    * Default widget: ``Select``
+    * Default widget: :class:`Select`
     * Empty value: Whatever you've given as ``empty_value``
     * Normalizes to: A value of the type provided by the ``coerce`` argument.
     * Validates that the given value exists in the list of choices and can be
@@ -382,7 +382,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: DateField(**kwargs)
 
-    * Default widget: ``DateInput``
+    * Default widget: :class:`DateInput`
     * Empty value: ``None``
     * Normalizes to: A Python ``datetime.date`` object.
     * Validates that the given value is either a ``datetime.date``,
@@ -398,21 +398,21 @@ For each field, we describe the default widget used if you don't specify
 
     If no ``input_formats`` argument is provided, the default input formats are::
 
-        '%Y-%m-%d',       # '2006-10-25'
+        ['%Y-%m-%d',       # '2006-10-25'
         '%m/%d/%Y',       # '10/25/2006'
-        '%m/%d/%y',       # '10/25/06'
+        '%m/%d/%y']       # '10/25/06'
 
     Additionally, if you specify :setting:`USE_L10N=False<USE_L10N>` in your settings, the
     following will also be included in the default input formats::
 
-        '%b %d %Y',       # 'Oct 25 2006'
+        ['%b %d %Y',      # 'Oct 25 2006'
         '%b %d, %Y',      # 'Oct 25, 2006'
         '%d %b %Y',       # '25 Oct 2006'
         '%d %b, %Y',      # '25 Oct, 2006'
         '%B %d %Y',       # 'October 25 2006'
         '%B %d, %Y',      # 'October 25, 2006'
         '%d %B %Y',       # '25 October 2006'
-        '%d %B, %Y',      # '25 October, 2006'
+        '%d %B, %Y']      # '25 October, 2006'
 
     See also :ref:`format localization <format-localization>`.
 
@@ -421,7 +421,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: DateTimeField(**kwargs)
 
-    * Default widget: ``DateTimeInput``
+    * Default widget: :class:`DateTimeInput`
     * Empty value: ``None``
     * Normalizes to: A Python ``datetime.datetime`` object.
     * Validates that the given value is either a ``datetime.datetime``,
@@ -437,7 +437,7 @@ For each field, we describe the default widget used if you don't specify
 
     If no ``input_formats`` argument is provided, the default input formats are::
 
-        '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+        ['%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
         '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
         '%Y-%m-%d',              # '2006-10-25'
         '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
@@ -445,7 +445,7 @@ For each field, we describe the default widget used if you don't specify
         '%m/%d/%Y',              # '10/25/2006'
         '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
         '%m/%d/%y %H:%M',        # '10/25/06 14:30'
-        '%m/%d/%y',              # '10/25/06'
+        '%m/%d/%y']              # '10/25/06'
 
     See also :ref:`format localization <format-localization>`.
 
@@ -454,7 +454,8 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: DecimalField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`NumberInput` when :attr:`Field.localize` is
+      ``False``, else :class:`TextInput`.
     * Empty value: ``None``
     * Normalizes to: A Python ``decimal``.
     * Validates that the given value is a decimal. Leading and trailing
@@ -489,7 +490,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: EmailField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`EmailInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object.
     * Validates that the given value is a valid email address, using a
@@ -505,7 +506,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: FileField(**kwargs)
 
-    * Default widget: ``ClearableFileInput``
+    * Default widget: :class:`ClearableFileInput`
     * Empty value: ``None``
     * Normalizes to: An ``UploadedFile`` object that wraps the file content
       and file name into a single object.
@@ -533,7 +534,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: FilePathField(**kwargs)
 
-    * Default widget: ``Select``
+    * Default widget: :class:`Select`
     * Empty value: ``None``
     * Normalizes to: A unicode object
     * Validates that the selected choice exists in the list of choices.
@@ -580,7 +581,8 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: FloatField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`NumberInput` when :attr:`Field.localize` is
+      ``False``, else :class:`TextInput`.
     * Empty value: ``None``
     * Normalizes to: A Python float.
     * Validates that the given value is an float. Leading and trailing
@@ -596,7 +598,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: ImageField(**kwargs)
 
-    * Default widget: ``ClearableFileInput``
+    * Default widget: :class:`ClearableFileInput`
     * Empty value: ``None``
     * Normalizes to: An ``UploadedFile`` object that wraps the file content
       and file name into a single object.
@@ -621,7 +623,8 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: IntegerField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`NumberInput` when :attr:`Field.localize` is
+      ``False``, else :class:`TextInput`.
     * Empty value: ``None``
     * Normalizes to: A Python integer or long integer.
     * Validates that the given value is an integer. Leading and trailing
@@ -644,7 +647,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: IPAddressField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`TextInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object.
     * Validates that the given value is a valid IPv4 address, using a regular
@@ -654,13 +657,11 @@ For each field, we describe the default widget used if you don't specify
 ``GenericIPAddressField``
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 1.4
-
 .. class:: GenericIPAddressField(**kwargs)
 
     A field containing either an IPv4 or an IPv6 address.
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`TextInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object. IPv6 addresses are
       normalized as described below.
@@ -693,7 +694,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: MultipleChoiceField(**kwargs)
 
-    * Default widget: ``SelectMultiple``
+    * Default widget: :class:`SelectMultiple`
     * Empty value: ``[]`` (an empty list)
     * Normalizes to: A list of Unicode objects.
     * Validates that every value in the given list of values exists in the list
@@ -713,7 +714,7 @@ For each field, we describe the default widget used if you don't specify
     Just like a :class:`MultipleChoiceField`, except :class:`TypedMultipleChoiceField`
     takes two extra arguments, ``coerce`` and ``empty_value``.
 
-    * Default widget: ``SelectMultiple``
+    * Default widget: :class:`SelectMultiple`
     * Empty value: Whatever you've given as ``empty_value``
     * Normalizes to: A list of values of the type provided by the ``coerce``
       argument.
@@ -731,7 +732,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: NullBooleanField(**kwargs)
 
-    * Default widget: ``NullBooleanSelect``
+    * Default widget: :class:`NullBooleanSelect`
     * Empty value: ``None``
     * Normalizes to: A Python ``True``, ``False`` or ``None`` value.
     * Validates nothing (i.e., it never raises a ``ValidationError``).
@@ -741,7 +742,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: RegexField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`TextInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object.
     * Validates that the given value matches against a certain regular
@@ -768,7 +769,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: SlugField(**kwargs)
 
-   * Default widget: ``TextInput``
+   * Default widget: :class:`TextInput`
    * Empty value: ``''`` (an empty string)
    * Normalizes to: A Unicode object.
    * Validates that the given value contains only letters, numbers,
@@ -783,7 +784,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: TimeField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`TextInput`
     * Empty value: ``None``
     * Normalizes to: A Python ``datetime.time`` object.
     * Validates that the given value is either a ``datetime.time`` or string
@@ -807,7 +808,7 @@ For each field, we describe the default widget used if you don't specify
 
 .. class:: URLField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`URLInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object.
     * Validates that the given value is a valid URL.
@@ -829,7 +830,7 @@ Slightly complex built-in ``Field`` classes
 
 .. class:: ComboField(**kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`TextInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: A Unicode object.
     * Validates that the given value against each of the fields specified
@@ -856,7 +857,7 @@ Slightly complex built-in ``Field`` classes
 
 .. class:: MultiValueField(fields=(), **kwargs)
 
-    * Default widget: ``TextInput``
+    * Default widget: :class:`TextInput`
     * Empty value: ``''`` (an empty string)
     * Normalizes to: the type returned by the ``compress`` method of the subclass.
     * Validates that the given value against each of the fields specified
@@ -885,7 +886,7 @@ Slightly complex built-in ``Field`` classes
     .. attribute:: MultiValueField.widget
 
         Must be a subclass of :class:`django.forms.MultiWidget`.
-        Default value is :class:`~django.forms.widgets.TextInput`, which
+        Default value is :class:`~django.forms.TextInput`, which
         probably is not very useful in this case.
 
     .. method:: compress(data_list)
@@ -902,7 +903,7 @@ Slightly complex built-in ``Field`` classes
 
 .. class:: SplitDateTimeField(**kwargs)
 
-    * Default widget: ``SplitDateTimeWidget``
+    * Default widget: :class:`SplitDateTimeWidget`
     * Empty value: ``None``
     * Normalizes to: A Python ``datetime.datetime`` object.
     * Validates that the given value is a ``datetime.datetime`` or string
@@ -945,7 +946,7 @@ objects (in the case of ``ModelMultipleChoiceField``) into the
 
 .. class:: ModelChoiceField(**kwargs)
 
-    * Default widget: ``Select``
+    * Default widget: :class:`Select`
     * Empty value: ``None``
     * Normalizes to: A model instance.
     * Validates that the given id exists in the queryset.
@@ -1000,7 +1001,7 @@ objects (in the case of ``ModelMultipleChoiceField``) into the
 
 .. class:: ModelMultipleChoiceField(**kwargs)
 
-    * Default widget: ``SelectMultiple``
+    * Default widget: :class:`SelectMultiple`
     * Empty value: An empty ``QuerySet`` (self.queryset.none())
     * Normalizes to: A ``QuerySet`` of model instances.
     * Validates that every id in the given list of values exists in the
diff --git a/docs/ref/forms/formsets.txt b/docs/ref/forms/formsets.txt
new file mode 100644
index 0000000000..0ab2590fce
--- /dev/null
+++ b/docs/ref/forms/formsets.txt
@@ -0,0 +1,16 @@
+====================
+Formset Functions
+====================
+
+.. module:: django.forms.formsets
+   :synopsis: Django's functions for building formsets.
+
+.. function:: formset_factory(form, formset=BaseFormSet, extra=1, can_order=False, can_delete=False, max_num=None, validate_max=False)
+
+    Returns a ``FormSet`` class for the given ``form`` class.
+
+    See :ref:`formsets` for example usage.
+
+    .. versionchanged:: 1.6
+    
+    The ``validate_max`` parameter was added.
diff --git a/docs/ref/forms/index.txt b/docs/ref/forms/index.txt
index 866afed6dc..e6edc88ca1 100644
--- a/docs/ref/forms/index.txt
+++ b/docs/ref/forms/index.txt
@@ -9,5 +9,7 @@ Detailed form API reference. For introductory material, see :doc:`/topics/forms/
 
    api
    fields
+   models
+   formsets
    widgets
    validation
diff --git a/docs/ref/forms/models.txt b/docs/ref/forms/models.txt
new file mode 100644
index 0000000000..dd0a422fd0
--- /dev/null
+++ b/docs/ref/forms/models.txt
@@ -0,0 +1,60 @@
+====================
+Model Form Functions
+====================
+
+.. module:: django.forms.models
+   :synopsis: Django's functions for building model forms and formsets.
+
+.. function:: modelform_factory(model, form=ModelForm, fields=None, exclude=None, formfield_callback=None,  widgets=None)
+
+    Returns a :class:`~django.forms.ModelForm` class for the given ``model``.
+    You can optionally pass a ``form`` argument to use as a starting point for
+    constructing the ``ModelForm``.
+
+    ``fields`` is an optional list of field names. If provided, only the named
+    fields will be included in the returned fields.
+
+    ``exclude`` is an optional list of field names. If provided, the named
+    fields will be excluded from the returned fields, even if they are listed
+    in the ``fields`` argument.
+
+    ``widgets`` is a dictionary of model field names mapped to a widget.
+
+    ``formfield_callback`` is a callable that takes a model field and returns
+    a form field.
+
+    See :ref:`modelforms-factory` for example usage.
+
+.. function:: modelformset_factory(model, form=ModelForm, formfield_callback=None, formset=BaseModelFormSet, extra=1, can_delete=False, can_order=False, max_num=None, fields=None, exclude=None, widgets=None, validate_max=False)
+
+    Returns a ``FormSet`` class for the given ``model`` class.
+
+    Arguments ``model``, ``form``, ``fields``, ``exclude``,
+    ``formfield_callback`` and ``widgets`` are all passed through to
+    :func:`~django.forms.models.modelform_factory`.
+
+    Arguments ``formset``, ``extra``, ``max_num``, ``can_order``,
+    ``can_delete`` and ``validate_max`` are passed through to
+    :func:`~django.forms.formsets.formset_factory`. See :ref:`formsets` for
+    details.
+
+    See :ref:`model-formsets` for example usage.
+
+    .. versionchanged:: 1.6
+
+    The ``widgets`` and the ``validate_max`` parameters were added.
+
+.. function:: inlineformset_factory(parent_model, model, form=ModelForm, formset=BaseInlineFormSet, fk_name=None, fields=None, exclude=None, extra=3, can_order=False, can_delete=True, max_num=None, formfield_callback=None, widgets=None, validate_max=False)
+
+    Returns an ``InlineFormSet`` using :func:`modelformset_factory` with
+    defaults of ``formset=BaseInlineFormSet``, ``can_delete=True``, and
+    ``extra=3``.
+
+    If your model has more than one :class:`~django.db.models.ForeignKey` to
+    the ``parent_model``, you must specify a ``fk_name``.
+
+    See :ref:`inline-formsets` for example usage.
+
+    .. versionchanged:: 1.6
+
+    The ``widgets`` and the ``validate_max`` parameters were added.
diff --git a/docs/ref/forms/validation.txt b/docs/ref/forms/validation.txt
index e89bce748f..978c985b55 100644
--- a/docs/ref/forms/validation.txt
+++ b/docs/ref/forms/validation.txt
@@ -181,24 +181,20 @@ the field's ``validators`` argument, or defined on the Field class itself with
 the ``default_validators`` attribute.
 
 Simple validators can be used to validate values inside the field, let's have
-a look at Django's ``EmailField``::
+a look at Django's ``SlugField``::
 
-    class EmailField(CharField):
-        default_error_messages = {
-            'invalid': _('Enter a valid email address.'),
-        }
-        default_validators = [validators.validate_email]
+    class SlugField(CharField):
+        default_validators = [validators.validate_slug]
 
-As you can see, ``EmailField`` is just a ``CharField`` with customized error
-message and a validator that validates email addresses. This can also be done
-on field definition so::
+As you can see, ``SlugField`` is just a ``CharField`` with a customized
+validator that validates that submitted text obeys to some character rules.
+This can also be done on field definition so::
 
-    email = forms.EmailField()
+    slug = forms.SlugField()
 
 is equivalent to::
 
-    email = forms.CharField(validators=[validators.validate_email],
-            error_messages={'invalid': _('Enter a valid email address.')})
+    slug = forms.CharField(validators=[validators.validate_slug])
 
 
 Form field default cleaning
diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index a0ef0731ad..514e8b3dc0 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -49,8 +49,8 @@ Setting arguments for widgets
 
 Many widgets have optional extra arguments; they can be set when defining the
 widget on the field. In the following example, the
-:attr:`~SelectDateWidget.years` attribute is set for a
-:class:`~django.forms.extras.widgets.SelectDateWidget`::
+:attr:`~django.forms.extras.widgets.SelectDateWidget.years` attribute is set
+for a :class:`~django.forms.extras.widgets.SelectDateWidget`::
 
     from django.forms.fields import DateField, ChoiceField, MultipleChoiceField
     from django.forms.widgets import RadioSelect, CheckboxSelectMultiple
@@ -139,7 +139,7 @@ provided for each widget will be rendered exactly the same::
     >>> f = CommentForm(auto_id=False)
     >>> f.as_table()
     <tr><th>Name:</th><td><input type="text" name="name" /></td></tr>
-    <tr><th>Url:</th><td><input type="text" name="url"/></td></tr>
+    <tr><th>Url:</th><td><input type="url" name="url"/></td></tr>
     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
 
 On a real Web page, you probably don't want every widget to look the same. You
@@ -160,7 +160,7 @@ Django will then include the extra attributes in the rendered output:
     >>> f = CommentForm(auto_id=False)
     >>> f.as_table()
     <tr><th>Name:</th><td><input type="text" name="name" class="special"/></td></tr>
-    <tr><th>Url:</th><td><input type="text" name="url"/></td></tr>
+    <tr><th>Url:</th><td><input type="url" name="url"/></td></tr>
     <tr><th>Comment:</th><td><input type="text" name="comment" size="40"/></td></tr>
 
 .. _styling-widget-classes:
@@ -222,7 +222,7 @@ foundation for custom widgets.
 .. class:: MultiWidget(widgets, attrs=None)
 
     A widget that is composed of multiple widgets.
-    :class:`~django.forms.widgets.MultiWidget` works hand in hand with the
+    :class:`~django.forms.MultiWidget` works hand in hand with the
     :class:`~django.forms.MultiValueField`.
 
     :class:`MultiWidget` has one required argument:
@@ -246,8 +246,8 @@ foundation for custom widgets.
         the combined value of the form field into the values for each widget.
 
         An example of this is how :class:`SplitDateTimeWidget` turns a
-        :class:`datetime` value into a list with date and time split into two
-        separate values::
+        :class:`~datetime.datetime` value into a list with date and time split
+        into two separate values::
 
             class SplitDateTimeWidget(MultiWidget):
 
@@ -279,15 +279,10 @@ foundation for custom widgets.
         * A single value (e.g., a string) that is the "compressed" representation
           of a ``list`` of values.
 
-        If `value` is a list, output of :meth:`~MultiWidget.render` will be a
-        concatenation of rendered child widgets. If `value` is not a list, it
-        will be first processed by the method :meth:`~MultiWidget.decompress()`
-        to create the list and then processed as above.
-
-        In the second case -- i.e., if the value is *not* a list --
-        ``render()`` will first decompress the value into a ``list`` before
-        rendering it. It does so by calling the ``decompress()`` method, which
-        :class:`MultiWidget`'s subclasses must implement (see above).
+        If ``value`` is a list, the output of :meth:`~MultiWidget.render` will
+        be a concatenation of rendered child widgets. If ``value`` is not a
+        list, it will first be processed by the method
+        :meth:`~MultiWidget.decompress()` to create the list and then rendered.
 
         When ``render()`` executes its HTML rendering, each value in the list
         is rendered with the corresponding widget -- the first value is
@@ -392,7 +387,38 @@ These widgets make use of the HTML elements ``input`` and ``textarea``.
 
 .. class:: TextInput
 
-    Text input: ``<input type='text' ...>``
+    Text input: ``<input type="text" ...>``
+
+``NumberInput``
+~~~~~~~~~~~~~~~
+
+.. class:: NumberInput
+
+    .. versionadded:: 1.6
+
+    Text input: ``<input type="number" ...>``
+
+    Beware that not all browsers support entering localized numbers in
+    ``number`` input types. Django itself avoids using them for fields having
+    their :attr:`~django.forms.Field.localize` property to ``True``.
+
+``EmailInput``
+~~~~~~~~~~~~~~
+
+.. class:: EmailInput
+
+    .. versionadded:: 1.6
+
+    Text input: ``<input type="email" ...>``
+
+``URLInput``
+~~~~~~~~~~~~
+
+.. class:: URLInput
+
+    .. versionadded:: 1.6
+
+    Text input: ``<input type="url" ...>``
 
 ``PasswordInput``
 ~~~~~~~~~~~~~~~~~
@@ -508,9 +534,9 @@ Selector and checkbox widgets
 
     .. attribute:: Select.choices
 
-        This attribute is optional when the field does not have a
-        :attr:`~Field.choices` attribute. If it does, it will override anything
-        you set here when the attribute is updated on the :class:`Field`.
+        This attribute is optional when the form field does not have a
+        ``choices`` attribute. If it does, it will override anything you set
+        here when the attribute is updated on the :class:`Field`.
 
 ``NullBooleanSelect``
 ~~~~~~~~~~~~~~~~~~~~~
@@ -542,8 +568,6 @@ Selector and checkbox widgets
           ...
         </ul>
 
-    .. versionadded:: 1.4
-
     For more granular control over the generated markup, you can loop over the
     radio buttons in the template. Assuming a form ``myform`` with a field
     ``beatles`` that uses a ``RadioSelect`` as its widget:
@@ -609,6 +633,11 @@ Selector and checkbox widgets
     If you decide not to loop over the radio buttons -- e.g., if your template simply includes
     ``{{ myform.beatles }}`` -- they'll be output in a ``<ul>`` with ``<li>`` tags, as above.
 
+.. versionchanged:: 1.6
+
+The outer ``<ul>`` container will now receive the ``id`` attribute defined on
+the widget.
+
 ``CheckboxSelectMultiple``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -624,6 +653,14 @@ Selector and checkbox widgets
           ...
         </ul>
 
+.. versionchanged:: 1.6
+
+The outer ``<ul>`` container will now receive the ``id`` attribute defined on
+the widget.
+
+Like :class:`RadioSelect`, you can now loop over the individual checkboxes making
+up the lists. See the documentation of :class:`RadioSelect` for more details.
+
 .. _file-upload-widgets:
 
 File upload widgets
@@ -662,9 +699,9 @@ Composite widgets
 
     .. attribute:: MultipleHiddenInput.choices
 
-        This attribute is optional when the field does not have a
-        :attr:`~Field.choices` attribute. If it does, it will override anything
-        you set here when the attribute is updated on the :class:`Field`.
+        This attribute is optional when the form field does not have a
+        ``choices`` attribute. If it does, it will override anything you set
+        here when the attribute is updated on the :class:`Field`.
 
 ``SplitDateTimeWidget``
 ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ref/index.txt b/docs/ref/index.txt
index e1959d44a6..1d71b62f41 100644
--- a/docs/ref/index.txt
+++ b/docs/ref/index.txt
@@ -5,7 +5,6 @@ API Reference
 .. toctree::
    :maxdepth: 1
 
-   authbackends
    class-based-views/index
    clickjacking
    contrib/index
@@ -26,3 +25,4 @@ API Reference
    urls
    utils
    validators
+   views
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index b542aee6e2..20bb2fb751 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -61,14 +61,16 @@ Adds a few conveniences for perfectionists:
   indexer would treat them as separate URLs -- so it's best practice to
   normalize URLs.
 
-* Sends broken link notification emails to :setting:`MANAGERS` if
-  :setting:`SEND_BROKEN_LINK_EMAILS` is set to ``True``.
-
 * Handles ETags based on the :setting:`USE_ETAGS` setting. If
   :setting:`USE_ETAGS` is set to ``True``, Django will calculate an ETag
   for each request by MD5-hashing the page content, and it'll take care of
   sending ``Not Modified`` responses, if appropriate.
 
+.. class:: BrokenLinkEmailsMiddleware
+
+* Sends broken link notification emails to :setting:`MANAGERS` (see
+  :doc:`/howto/error-reporting`).
+
 View metadata middleware
 ------------------------
 
@@ -111,7 +113,7 @@ It will NOT compress content if any of the following are true:
   not to be performed on certain content types.
 
 You can apply GZip compression to individual views using the
-:func:`~django.views.decorators.http.gzip_page()` decorator.
+:func:`~django.views.decorators.gzip.gzip_page()` decorator.
 
 Conditional GET middleware
 --------------------------
@@ -124,7 +126,7 @@ Conditional GET middleware
 Handles conditional GET operations. If the response has a ``ETag`` or
 ``Last-Modified`` header, and the request has ``If-None-Match`` or
 ``If-Modified-Since``, the response is replaced by an
-:class:`~django.http.HttpNotModified`.
+:class:`~django.http.HttpResponseNotModified`.
 
 Also sets the ``Date`` and ``Content-Length`` response-headers.
 
@@ -179,8 +181,8 @@ Authentication middleware
 .. class:: AuthenticationMiddleware
 
 Adds the ``user`` attribute, representing the currently-logged-in user, to
-every incoming ``HttpRequest`` object. See :doc:`Authentication in Web requests
-</topics/auth>`.
+every incoming ``HttpRequest`` object. See :ref:`Authentication in Web requests
+<auth-web-requests>`.
 
 CSRF protection middleware
 --------------------------
@@ -203,6 +205,10 @@ Transaction middleware
 
 .. class:: TransactionMiddleware
 
+.. versionchanged:: 1.6
+    ``TransactionMiddleware`` is deprecated. The documentation of transactions
+    contains :ref:`upgrade instructions <transactions-upgrading-from-1.5>`.
+
 Binds commit and rollback of the default database to the request/response
 phase. If a view function runs successfully, a commit is done. If it fails with
 an exception, a rollback is done.
@@ -222,7 +228,4 @@ X-Frame-Options middleware
 
 .. class:: XFrameOptionsMiddleware
 
-.. versionadded:: 1.4
-   ``XFrameOptionsMiddleware`` was added.
-
 Simple :doc:`clickjacking protection via the X-Frame-Options header </ref/clickjacking/>`.
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index cd1185585c..7ef251c907 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -12,8 +12,8 @@ This document contains all the gory details about all the `field options`_ and
 
 .. seealso::
 
-    If the built-in fields don't do the trick, you can try
-    :mod:`django.contrib.localflavor`, which contains assorted pieces of code
+    If the built-in fields don't do the trick, you can try :doc:`localflavor
+    </topics/localflavor>`, which contains assorted pieces of code
     that are useful for particular countries or cultures. Also, you can easily
     :doc:`write your own custom model fields </howto/custom-model-fields>`.
 
@@ -113,7 +113,7 @@ define a suitably-named constant for each value::
                                           default=FRESHMAN)
 
         def is_upperclass(self):
-	    return self.year_in_school in (self.JUNIOR, self.SENIOR)
+            return self.year_in_school in (self.JUNIOR, self.SENIOR)
 
 Though you can define a choices list outside of a model class and then
 refer to it, defining the choices and names for each choice inside the
@@ -248,8 +248,8 @@ Alternatively you can use plain text and
 
 If ``True``, this field is the primary key for the model.
 
-If you don't specify ``primary_key=True`` for any fields in your model, Django
-will automatically add an :class:`IntegerField` to hold the primary key, so you
+If you don't specify ``primary_key=True`` for any field in your model, Django
+will automatically add an :class:`AutoField` to hold the primary key, so you
 don't need to set ``primary_key=True`` on any of your fields unless you want to
 override the default primary-key behavior. For more, see
 :ref:`automatic-primary-key-fields`.
@@ -272,6 +272,9 @@ field, a :exc:`django.db.IntegrityError` will be raised by the model's
 This option is valid on all field types except :class:`ManyToManyField` and
 :class:`FileField`.
 
+Note that when ``unique`` is ``True``, you don't need to specify
+:attr:`~Field.db_index`, because ``unique`` implies the creation of an index.
+
 ``unique_for_date``
 -------------------
 
@@ -344,6 +347,22 @@ A 64 bit integer, much like an :class:`IntegerField` except that it is
 guaranteed to fit numbers from -9223372036854775808 to 9223372036854775807. The
 default form widget for this field is a :class:`~django.forms.TextInput`.
 
+``BinaryField``
+-------------------
+
+.. class:: BinaryField([**options])
+
+.. versionadded:: 1.6
+
+A field to store raw binary data. It only supports ``bytes`` assignment. Be
+aware that this field has limited functionality. For example, it is not possible
+to filter a queryset on a ``BinaryField`` value.
+
+.. admonition:: Abusing ``BinaryField``
+
+    Although you might think about storing files in the database, consider that
+    it is bad design in 99% of the cases. This field is *not* a replacement for
+    proper :doc`static files </howto/static-files>` handling.
 
 ``BooleanField``
 ----------------
@@ -358,6 +377,10 @@ The default form widget for this field is a
 If you need to accept :attr:`~Field.null` values then use
 :class:`NullBooleanField` instead.
 
+.. versionchanged:: 1.6
+    The default value of ``BooleanField`` was changed from ``False`` to
+    ``None`` when :attr:`Field.default` isn't defined.
+
 ``CharField``
 -------------
 
@@ -453,7 +476,7 @@ A fixed-precision decimal number, represented in Python by a
 .. attribute:: DecimalField.max_digits
 
     The maximum number of digits allowed in the number. Note that this number
-    must be greater than or equal to ``decimal_places``, if it exists.
+    must be greater than or equal to ``decimal_places``.
 
 .. attribute:: DecimalField.decimal_places
 
@@ -509,8 +532,8 @@ Has one **required** argument:
 .. attribute:: FileField.upload_to
 
     A local filesystem path that will be appended to your :setting:`MEDIA_ROOT`
-    setting to determine the value of the :attr:`~django.core.files.File.url`
-    attribute.
+    setting to determine the value of the
+    :attr:`~django.db.models.fields.files.FieldFile.url` attribute.
 
     This path may contain :func:`~time.strftime` formatting, which will be
     replaced by the date/time of the file upload (so that uploaded files don't
@@ -547,8 +570,7 @@ Also has one optional argument:
     Optional. A storage object, which handles the storage and retrieval of your
     files. See :doc:`/topics/files` for details on how to provide this object.
 
-The default form widget for this field is a
-:class:`~django.forms.widgets.FileInput`.
+The default form widget for this field is a :class:`~django.forms.FileInput`.
 
 Using a :class:`FileField` or an :class:`ImageField` (see below) in a model
 takes a few steps:
@@ -565,9 +587,9 @@ takes a few steps:
 
 3. All that will be stored in your database is a path to the file
    (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the
-   convenience :attr:`~django.core.files.File.url` function provided by
-   Django. For example, if your :class:`ImageField` is called ``mug_shot``,
-   you can get the absolute path to your image in a template with
+   convenience :attr:`~django.db.models.fields.files.FieldFile.url` attribute
+   provided by Django. For example, if your :class:`ImageField` is called
+   ``mug_shot``, you can get the absolute path to your image in a template with
    ``{{ object.mug_shot.url }}``.
 
 For example, say your :setting:`MEDIA_ROOT` is set to ``'/home/media'``, and
@@ -590,7 +612,7 @@ topic guide.
     saved.
 
 The uploaded file's relative URL can be obtained using the
-:attr:`~django.db.models.fields.FileField.url` attribute. Internally,
+:attr:`~django.db.models.fields.files.FieldFile.url` attribute. Internally,
 this calls the :meth:`~django.core.files.storage.Storage.url` method of the
 underlying :class:`~django.core.files.storage.Storage` class.
 
@@ -615,9 +637,20 @@ can change the maximum length using the :attr:`~CharField.max_length` argument.
 FileField and FieldFile
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-When you access a :class:`FileField` on a model, you are given an instance
-of :class:`FieldFile` as a proxy for accessing the underlying file. This
-class has several methods that can be used to interact with file data:
+.. currentmodule:: django.db.models.fields.files
+
+.. class:: FieldFile
+
+When you access a :class:`~django.db.models.FileField` on a model, you are
+given an instance of :class:`FieldFile` as a proxy for accessing the underlying
+file. This class has several attributes and methods that can be used to
+interact with file data:
+
+.. attribute:: FieldFile.url
+
+A read-only property to access the file's relative URL by calling the
+:meth:`~django.core.files.storage.Storage.url` method of the underlying
+:class:`~django.core.files.storage.Storage` class.
 
 .. method:: FieldFile.open(mode='rb')
 
@@ -633,9 +666,9 @@ associated with this instance.
 
 This method takes a filename and file contents and passes them to the storage
 class for the field, then associates the stored file with the model field.
-If you want to manually associate file data with :class:`FileField`
-instances on your model, the ``save()`` method is used to persist that file
-data.
+If you want to manually associate file data with
+:class:`~django.db.models.FileField` instances on your model, the ``save()``
+method is used to persist that file data.
 
 Takes two required arguments: ``name`` which is the name of the file, and
 ``content`` which is an object containing the file's contents.  The
@@ -673,6 +706,8 @@ to cleanup orphaned files, you'll need to handle it yourself (for instance,
 with a custom management command that can be run manually or scheduled to run
 periodically via e.g. cron).
 
+.. currentmodule:: django.db.models
+
 ``FilePathField``
 -----------------
 
@@ -760,8 +795,7 @@ Inherits all attributes and methods from :class:`FileField`, but also
 validates that the uploaded object is a valid image.
 
 In addition to the special attributes that are available for :class:`FileField`,
-an :class:`ImageField` also has :attr:`~django.core.files.File.height` and
-:attr:`~django.core.files.File.width` attributes.
+an :class:`ImageField` also has ``height`` and ``width`` attributes.
 
 To facilitate querying on those attributes, :class:`ImageField` has two extra
 optional arguments:
@@ -805,8 +839,6 @@ for this field is a :class:`~django.forms.TextInput`.
 
 .. class:: GenericIPAddressField([protocol=both, unpack_ipv4=False, **options])
 
-.. versionadded:: 1.4
-
 An IPv4 or IPv6 address, in string format (e.g. ``192.0.2.30`` or
 ``2a02:42fe::4``). The default form widget for this field is a
 :class:`~django.forms.TextInput`.
@@ -844,8 +876,8 @@ widget for this field is a :class:`~django.forms.NullBooleanSelect`.
 
 .. class:: PositiveIntegerField([**options])
 
-Like an :class:`IntegerField`, but must be either positive or zero (`0`).
-The value `0` is accepted for backward compatibility reasons.
+Like an :class:`IntegerField`, but must be either positive or zero (``0``).
+The value ``0`` is accepted for backward compatibility reasons.
 
 ``PositiveSmallIntegerField``
 -----------------------------
@@ -919,7 +951,7 @@ A :class:`CharField` for a URL.
 The default form widget for this field is a :class:`~django.forms.TextInput`.
 
 Like all :class:`CharField` subclasses, :class:`URLField` takes the optional
-:attr:`~CharField.max_length`argument. If you don't specify
+:attr:`~CharField.max_length` argument. If you don't specify
 :attr:`~CharField.max_length`, a default of 200 is used.
 
 .. versionadded:: 1.5
@@ -1039,6 +1071,21 @@ define the details of how the relation works.
     The field on the related object that the relation is to. By default, Django
     uses the primary key of the related object.
 
+.. attribute:: ForeignKey.db_constraint
+
+    .. versionadded:: 1.6
+
+    Controls whether or not a constraint should be created in the database for
+    this foreign key. The default is ``True``, and that's almost certainly what
+    you want; setting this to ``False`` can be very bad for data integrity.
+    That said, here are some scenarios where you might want to do this:
+
+    * You have legacy data that is not valid.
+    * You're sharding your database.
+
+    If this is set to ``False``, accessing a related object that doesn't exist
+    will raise its ``DoesNotExist`` exception.
+
 .. attribute:: ForeignKey.on_delete
 
     When an object referenced by a :class:`ForeignKey` is deleted, Django by
@@ -1050,26 +1097,36 @@ define the details of how the relation works.
 
         user = models.ForeignKey(User, blank=True, null=True, on_delete=models.SET_NULL)
 
-    The possible values for :attr:`on_delete` are found in
-    :mod:`django.db.models`:
+The possible values for :attr:`~ForeignKey.on_delete` are found in
+:mod:`django.db.models`:
 
-    * :attr:`~django.db.models.CASCADE`: Cascade deletes; the default.
+* .. attribute:: CASCADE
 
-    * :attr:`~django.db.models.PROTECT`: Prevent deletion of the referenced
-      object by raising :exc:`django.db.models.ProtectedError`, a subclass of
-      :exc:`django.db.IntegrityError`.
+    Cascade deletes; the default.
 
-    * :attr:`~django.db.models.SET_NULL`: Set the :class:`ForeignKey` null;
-      this is only possible if :attr:`null` is ``True``.
+* .. attribute:: PROTECT
 
-    * :attr:`~django.db.models.SET_DEFAULT`: Set the :class:`ForeignKey` to its
-      default value; a default for the :class:`ForeignKey` must be set.
+    Prevent deletion of the referenced object by raising
+    :exc:`~django.db.models.ProtectedError`, a subclass of
+    :exc:`django.db.IntegrityError`.
 
-    * :func:`~django.db.models.SET()`: Set the :class:`ForeignKey` to the value
-      passed to :func:`~django.db.models.SET()`, or if a callable is passed in,
-      the result of calling it. In most cases, passing a callable will be
-      necessary to avoid executing queries at the time your models.py is
-      imported::
+* .. attribute:: SET_NULL
+
+    Set the :class:`ForeignKey` null; this is only possible if
+    :attr:`~Field.null` is ``True``.
+
+* .. attribute:: SET_DEFAULT
+
+    Set the :class:`ForeignKey` to its default value; a default for the
+    :class:`ForeignKey` must be set.
+
+* .. function:: SET()
+
+    Set the :class:`ForeignKey` to the value passed to
+    :func:`~django.db.models.SET()`, or if a callable is passed in,
+    the result of calling it. In most cases, passing a callable will be
+    necessary to avoid executing queries at the time your models.py is
+    imported::
 
         def get_sentinel_user():
             return User.objects.get_or_create(username='deleted')[0]
@@ -1077,11 +1134,12 @@ define the details of how the relation works.
         class MyModel(models.Model):
             user = models.ForeignKey(User, on_delete=models.SET(get_sentinel_user))
 
-    * :attr:`~django.db.models.DO_NOTHING`: Take no action. If your database
-      backend enforces referential integrity, this will cause an
-      :exc:`~django.db.IntegrityError` unless you manually add a SQL ``ON
-      DELETE`` constraint to the database field (perhaps using
-      :ref:`initial sql<initial-sql>`).
+* .. attribute:: DO_NOTHING
+
+    Take no action. If your database backend enforces referential
+    integrity, this will cause an :exc:`~django.db.IntegrityError` unless
+    you manually add a SQL ``ON DELETE`` constraint to the database field
+    (perhaps using :ref:`initial sql<initial-sql>`).
 
 .. _ref-manytomany:
 
@@ -1175,6 +1233,22 @@ that control how the relationship functions.
     the table for the model defining the relationship and the name of the field
     itself.
 
+.. attribute:: ManyToManyField.db_constraint
+
+    .. versionadded:: 1.6
+
+    Controls whether or not constraints should be created in the database for
+    the foreign keys in the intermediary table. The default is ``True``, and
+    that's almost certainly what you want; setting this to ``False`` can be
+    very bad for data integrity. That said, here are some scenarios where you
+    might want to do this:
+
+    * You have legacy data that is not valid.
+    * You're sharding your database.
+
+    It is an error to pass both ``db_constraint`` and ``through``.
+
+
 .. _ref-onetoone:
 
 ``OneToOneField``
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 6315985ba9..9f583c42ac 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -292,12 +292,13 @@ follows this algorithm:
 
 * If the object's primary key attribute is set to a value that evaluates to
   ``True`` (i.e., a value other than ``None`` or the empty string), Django
-  executes a ``SELECT`` query to determine whether a record with the given
-  primary key already exists.
-* If the record with the given primary key does already exist, Django
-  executes an ``UPDATE`` query.
-* If the object's primary key attribute is *not* set, or if it's set but a
-  record doesn't exist, Django executes an ``INSERT``.
+  executes an ``UPDATE``.
+* If the object's primary key attribute is *not* set or if the ``UPDATE``
+  didn't update anything, Django executes an ``INSERT``.
+
+.. versionchanged:: 1.6
+  Previously Django used ``SELECT`` - if not found ``INSERT`` else ``UPDATE``
+  algorithm. The old algorithm resulted in one more query in ``UPDATE`` case.
 
 The one gotcha here is that you should be careful not to specify a primary-key
 value explicitly when saving new objects, if you cannot guarantee the
@@ -601,7 +602,7 @@ pattern, it's possible to give a name to a pattern, and then reference the name
 rather than the view function. A named URL pattern is defined by replacing the
 pattern tuple by a call to the ``url`` function)::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import url
 
     url(r'^people/(\d+)/$', 'blog_views.generic_detail', name='people_view'),
 
@@ -659,7 +660,7 @@ For every :class:`~django.db.models.DateField` and
 <django.db.models.Field.null>`, the object will have ``get_next_by_FOO()`` and
 ``get_previous_by_FOO()`` methods, where ``FOO`` is the name of the field. This
 returns the next and previous object with respect to the date field, raising
-a :exc:`~django.db.DoesNotExist` exception when appropriate.
+a :exc:`~django.core.exceptions.DoesNotExist` exception when appropriate.
 
 Both methods accept optional keyword arguments, which should be in the format
 described in :ref:`Field lookups <field-lookups>`.
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index a577135271..5f9316bd2a 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -85,14 +85,15 @@ Django quotes column and table names behind the scenes.
 
     The name of an orderable field in the model, typically a :class:`DateField`,
     :class:`DateTimeField`, or :class:`IntegerField`. This specifies the default
-    field to use in your model :class:`Manager`'s :class:`~QuerySet.latest`
-    method.
+    field to use in your model :class:`Manager`'s
+    :meth:`~django.db.models.query.QuerySet.latest` and
+    :meth:`~django.db.models.query.QuerySet.earliest` methods.
 
     Example::
 
         get_latest_by = "order_date"
 
-    See the docs for :meth:`~django.db.models.query.QuerySet.latest` for more.
+    See the :meth:`~django.db.models.query.QuerySet.latest` docs for more.
 
 ``managed``
 -----------
@@ -100,7 +101,7 @@ Django quotes column and table names behind the scenes.
 .. attribute:: Options.managed
 
     Defaults to ``True``, meaning Django will create the appropriate database
-    tables in :djadmin:`syncdb` and remove them as part of a :djadmin:`reset`
+    tables in :djadmin:`syncdb` and remove them as part of a :djadmin:`flush`
     management command. That is, Django *manages* the database tables'
     lifecycles.
 
@@ -209,10 +210,6 @@ Django quotes column and table names behind the scenes.
 
         ordering = ['-pub_date', 'author']
 
-    .. versionchanged:: 1.4
-       The Django admin honors all elements in the list/tuple; before 1.4, only
-       the first one was respected.
-
 ``permissions``
 ---------------
 
@@ -262,6 +259,7 @@ Django quotes column and table names behind the scenes.
     an explicit :attr:`through <ManyToManyField.through>` model.
 
 ``index_together``
+------------------
 
 .. attribute:: Options.index_together
 
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 40fa2d2b2f..9c1337d59f 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -378,16 +378,12 @@ query spans multiple tables, it's possible to get duplicate results when a
     :meth:`values()` together, be careful when ordering by fields not in the
     :meth:`values()` call.
 
-.. versionadded:: 1.4
-
-As of Django 1.4, you can pass positional arguments (``*fields``) in order to
-specify the names of fields to which the ``DISTINCT`` should apply. This
-translates to a ``SELECT DISTINCT ON`` SQL query.
-
-Here's the difference. For a normal ``distinct()`` call, the database compares
-*each* field in each row when determining which rows are distinct. For a
-``distinct()`` call with specified field names, the database will only compare
-the specified field names.
+You can pass positional arguments (``*fields``) in order to specify the names
+of fields to which the ``DISTINCT`` should apply. This translates to a
+``SELECT DISTINCT ON`` SQL query. Here's the difference. For a normal
+``distinct()`` call, the database compares *each* field in each row when
+determining which rows are distinct. For a ``distinct()`` call with specified
+field names, the database will only compare the specified field names.
 
 .. note::
     This ability to specify field names is only available in PostgreSQL.
@@ -554,14 +550,19 @@ dates
 .. method:: dates(field, kind, order='ASC')
 
 Returns a ``DateQuerySet`` — a ``QuerySet`` that evaluates to a list of
-``datetime.datetime`` objects representing all available dates of a particular
-kind within the contents of the ``QuerySet``.
+:class:`datetime.date` objects representing all available dates of a
+particular kind within the contents of the ``QuerySet``.
 
-``field`` should be the name of a ``DateField`` or ``DateTimeField`` of your
-model.
+.. versionchanged:: 1.6
+    ``dates`` used to return a list of :class:`datetime.datetime` objects.
+
+``field`` should be the name of a ``DateField`` of your model.
+
+.. versionchanged:: 1.6
+    ``dates`` used to accept operating on a ``DateTimeField``.
 
 ``kind`` should be either ``"year"``, ``"month"`` or ``"day"``. Each
-``datetime.datetime`` object in the result list is "truncated" to the given
+``datetime.date`` object in the result list is "truncated" to the given
 ``type``.
 
 * ``"year"`` returns a list of all distinct year values for the field.
@@ -576,36 +577,77 @@ model.
 Examples::
 
     >>> Entry.objects.dates('pub_date', 'year')
-    [datetime.datetime(2005, 1, 1)]
+    [datetime.date(2005, 1, 1)]
     >>> Entry.objects.dates('pub_date', 'month')
-    [datetime.datetime(2005, 2, 1), datetime.datetime(2005, 3, 1)]
+    [datetime.date(2005, 2, 1), datetime.date(2005, 3, 1)]
     >>> Entry.objects.dates('pub_date', 'day')
-    [datetime.datetime(2005, 2, 20), datetime.datetime(2005, 3, 20)]
+    [datetime.date(2005, 2, 20), datetime.date(2005, 3, 20)]
     >>> Entry.objects.dates('pub_date', 'day', order='DESC')
-    [datetime.datetime(2005, 3, 20), datetime.datetime(2005, 2, 20)]
+    [datetime.date(2005, 3, 20), datetime.date(2005, 2, 20)]
     >>> Entry.objects.filter(headline__contains='Lennon').dates('pub_date', 'day')
-    [datetime.datetime(2005, 3, 20)]
+    [datetime.date(2005, 3, 20)]
 
-.. warning::
+datetimes
+~~~~~~~~~
 
-    When :doc:`time zone support </topics/i18n/timezones>` is enabled, Django
-    uses UTC in the database connection, which means the aggregation is
-    performed in UTC. This is a known limitation of the current implementation.
+.. versionadded:: 1.6
+
+.. method:: datetimes(field, kind, order='ASC', tzinfo=None)
+
+Returns a ``DateTimeQuerySet`` — a ``QuerySet`` that evaluates to a list of
+:class:`datetime.datetime` objects representing all available dates of a
+particular kind within the contents of the ``QuerySet``.
+
+``field`` should be the name of a ``DateTimeField`` of your model.
+
+``kind`` should be either ``"year"``, ``"month"``, ``"day"``, ``"hour"``,
+``"minute"`` or ``"second"``. Each ``datetime.datetime`` object in the result
+list is "truncated" to the given ``type``.
+
+``order``, which defaults to ``'ASC'``, should be either ``'ASC'`` or
+``'DESC'``. This specifies how to order the results.
+
+``tzinfo`` defines the time zone to which datetimes are converted prior to
+truncation. Indeed, a given datetime has different representations depending
+on the time zone in use. This parameter must be a :class:`datetime.tzinfo`
+object. If it's ``None``, Django uses the :ref:`current time zone
+<default-current-time-zone>`. It has no effect when :setting:`USE_TZ` is
+``False``.
+
+.. _database-time-zone-definitions:
+
+.. note::
+
+    This function performs time zone conversions directly in the database.
+    As a consequence, your database must be able to interpret the value of
+    ``tzinfo.tzname(None)``. This translates into the following requirements:
+
+    - SQLite: install pytz_ — conversions are actually performed in Python.
+    - PostgreSQL: no requirements (see `Time Zones`_).
+    - Oracle: no requirements (see `Choosing a Time Zone File`_).
+    - MySQL: load the time zone tables with `mysql_tzinfo_to_sql`_.
+
+    .. _pytz: http://pytz.sourceforge.net/
+    .. _Time Zones: http://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES
+    .. _Choosing a Time Zone File: http://docs.oracle.com/cd/B19306_01/server.102/b14225/ch4datetime.htm#i1006667
+    .. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.5/en/mysql-tzinfo-to-sql.html
 
 none
 ~~~~
 
 .. method:: none()
 
-Returns an ``EmptyQuerySet`` — a ``QuerySet`` subclass that always evaluates to
-an empty list. This can be used in cases where you know that you should return
-an empty result set and your caller is expecting a ``QuerySet`` object (instead
-of returning an empty list, for example.)
+Calling none() will create a queryset that never returns any objects and no
+query will be executed when accessing the results. A qs.none() queryset
+is an instance of ``EmptyQuerySet``.
 
 Examples::
 
     >>> Entry.objects.none()
     []
+    >>> from django.db.models.query import EmptyQuerySet
+    >>> isinstance(Entry.objects.none(), EmptyQuerySet)
+    True
 
 all
 ~~~
@@ -740,8 +782,6 @@ prefetch_related
 
 .. method:: prefetch_related(*lookups)
 
-.. versionadded:: 1.4
-
 Returns a ``QuerySet`` that will automatically retrieve, in a single batch,
 related objects for each of the specified lookups.
 
@@ -1112,9 +1152,9 @@ one, doing so will result in an error.
 
 .. note::
 
-    When calling :meth:`~Model.save()` for instances with deferred fields,
-    only the loaded fields will be saved. See :meth:`~Model.save()` for more
-    details.
+    When calling :meth:`~django.db.models.Model.save()` for instances with
+    deferred fields, only the loaded fields will be saved. See
+    :meth:`~django.db.models.Model.save()` for more details.
 
 
 only
@@ -1164,9 +1204,9 @@ using :meth:`select_related` is an error as well.
 
 .. note::
 
-    When calling :meth:`~Model.save()` for instances with deferred fields,
-    only the loaded fields will be saved. See :meth:`~Model.save()` for more
-    details.
+    When calling :meth:`~django.db.models.Model.save()` for instances with
+    deferred fields, only the loaded fields will be saved. See
+    :meth:`~django.db.models.Model.save()` for more details.
 
 using
 ~~~~~
@@ -1191,8 +1231,6 @@ select_for_update
 
 .. method:: select_for_update(nowait=False)
 
-.. versionadded:: 1.4
-
 Returns a queryset that will lock rows until the end of the transaction,
 generating a ``SELECT ... FOR UPDATE`` SQL statement on supported databases.
 
@@ -1211,11 +1249,6 @@ make the call non-blocking. If a conflicting lock is already acquired by
 another transaction, :exc:`~django.db.DatabaseError` will be raised when the
 queryset is evaluated.
 
-Note that using ``select_for_update()`` will cause the current transaction to be
-considered dirty, if under transaction management. This is to ensure that
-Django issues a ``COMMIT`` or ``ROLLBACK``, releasing any locks held by the
-``SELECT FOR UPDATE``.
-
 Currently, the ``postgresql_psycopg2``, ``oracle``, and ``mysql`` database
 backends support ``select_for_update()``. However, MySQL has no support for the
 ``nowait`` argument. Obviously, users of external third-party backends should
@@ -1248,7 +1281,7 @@ the format described in `Field lookups`_.
 
 ``get()`` raises :exc:`~django.core.exceptions.MultipleObjectsReturned` if more
 than one object was found. The
-:exc:`~django.core.excpetions.MultipleObjectsReturned` exception is an
+:exc:`~django.core.exceptions.MultipleObjectsReturned` exception is an
 attribute of the model class.
 
 ``get()`` raises a :exc:`~django.core.exceptions.DoesNotExist` exception if an
@@ -1368,8 +1401,6 @@ bulk_create
 
 .. method:: bulk_create(objs, batch_size=None)
 
-.. versionadded:: 1.4
-
 This method inserts the provided list of objects into the database in an
 efficient manner (generally only 1 query, no matter how many objects there
 are)::
@@ -1485,14 +1516,25 @@ This example returns the latest ``Entry`` in the table, according to the
 
 If your model's :ref:`Meta <meta-options>` specifies
 :attr:`~django.db.models.Options.get_latest_by`, you can leave off the
-``field_name`` argument to ``latest()``. Django will use the field specified
-in :attr:`~django.db.models.Options.get_latest_by` by default.
+``field_name`` argument to ``earliest()`` or ``latest()``. Django will use the
+field specified in :attr:`~django.db.models.Options.get_latest_by` by default.
 
-Like :meth:`get()`, ``latest()`` raises
-:exc:`~django.core.exceptions.DoesNotExist` if there is no object with the given
-parameters.
+Like :meth:`get()`, ``earliest()`` and ``latest()`` raise
+:exc:`~django.core.exceptions.DoesNotExist` if there is no object with the
+given parameters.
 
-Note ``latest()`` exists purely for convenience and readability.
+Note that ``earliest()`` and ``latest()`` exist purely for convenience and
+readability.
+
+earliest
+~~~~~~~~
+
+.. method:: earliest(field_name=None)
+
+.. versionadded:: 1.6
+
+Works otherwise like :meth:`~django.db.models.query.QuerySet.latest` except
+the direction is changed.
 
 aggregate
 ~~~~~~~~~
@@ -1544,32 +1586,32 @@ The most efficient method of finding whether a model with a unique field
 (e.g. ``primary_key``) is a member of a :class:`.QuerySet` is::
 
     entry = Entry.objects.get(pk=123)
-    if some_query_set.filter(pk=entry.pk).exists():
+    if some_queryset.filter(pk=entry.pk).exists():
         print("Entry contained in queryset")
 
 Which will be faster than the following which requires evaluating and iterating
 through the entire queryset::
 
-    if entry in some_query_set:
+    if entry in some_queryset:
        print("Entry contained in QuerySet")
 
 And to find whether a queryset contains any items::
 
-    if some_query_set.exists():
-        print("There is at least one object in some_query_set")
+    if some_queryset.exists():
+        print("There is at least one object in some_queryset")
 
 Which will be faster than::
 
-    if some_query_set:
-        print("There is at least one object in some_query_set")
+    if some_queryset:
+        print("There is at least one object in some_queryset")
 
 ... but not by a large degree (hence needing a large queryset for efficiency
 gains).
 
-Additionally, if a ``some_query_set`` has not yet been evaluated, but you know
-that it will be at some point, then using ``some_query_set.exists()`` will do
+Additionally, if a ``some_queryset`` has not yet been evaluated, but you know
+that it will be at some point, then using ``some_queryset.exists()`` will do
 more overall work (one query for the existence check plus an extra one to later
-retrieve the results) than simply using ``bool(some_query_set)``, which
+retrieve the results) than simply using ``bool(some_queryset)``, which
 retrieves the results and then checks if any were returned.
 
 update
@@ -1637,7 +1679,7 @@ Finally, realize that ``update()`` does an update at the SQL level and, thus,
 does not call any ``save()`` methods on your models, nor does it emit the
 :attr:`~django.db.models.signals.pre_save` or
 :attr:`~django.db.models.signals.post_save` signals (which are a consequence of
-calling :meth:`Model.save() <~django.db.models.Model.save()>`). If you want to
+calling :meth:`Model.save() <django.db.models.Model.save>`). If you want to
 update a bunch of records for a model that has a custom
 :meth:`~django.db.models.Model.save()` method, loop over them and call
 :meth:`~django.db.models.Model.save()`, like this::
@@ -2017,7 +2059,7 @@ numbers and even characters.
 year
 ~~~~
 
-For date/datetime fields, exact year match. Takes a four-digit year.
+For date and datetime fields, an exact year match. Takes an integer year.
 
 Example::
 
@@ -2029,6 +2071,9 @@ SQL equivalent::
 
 (The exact SQL syntax varies for each database engine.)
 
+When :setting:`USE_TZ` is ``True``, datetime fields are converted to the
+current time zone before filtering.
+
 .. fieldlookup:: month
 
 month
@@ -2047,12 +2092,15 @@ SQL equivalent::
 
 (The exact SQL syntax varies for each database engine.)
 
+When :setting:`USE_TZ` is ``True``, datetime fields are converted to the
+current time zone before filtering.
+
 .. fieldlookup:: day
 
 day
 ~~~
 
-For date and datetime fields, an exact day match.
+For date and datetime fields, an exact day match. Takes an integer day.
 
 Example::
 
@@ -2067,6 +2115,9 @@ SQL equivalent::
 Note this will match any record with a pub_date on the third day of the month,
 such as January 3, July 3, etc.
 
+When :setting:`USE_TZ` is ``True``, datetime fields are converted to the
+current time zone before filtering.
+
 .. fieldlookup:: week_day
 
 week_day
@@ -2088,12 +2139,74 @@ Note this will match any record with a ``pub_date`` that falls on a Monday (day
 2 of the week), regardless of the month or year in which it occurs. Week days
 are indexed with day 1 being Sunday and day 7 being Saturday.
 
-.. warning::
+When :setting:`USE_TZ` is ``True``, datetime fields are converted to the
+current time zone before filtering.
 
-    When :doc:`time zone support </topics/i18n/timezones>` is enabled, Django
-    uses UTC in the database connection, which means the ``year``, ``month``,
-    ``day`` and ``week_day`` lookups are performed in UTC. This is a known
-    limitation of the current implementation.
+.. fieldlookup:: hour
+
+hour
+~~~~
+
+.. versionadded:: 1.6
+
+For datetime fields, an exact hour match. Takes an integer between 0 and 23.
+
+Example::
+
+    Event.objects.filter(timestamp__hour=23)
+
+SQL equivalent::
+
+    SELECT ... WHERE EXTRACT('hour' FROM timestamp) = '23';
+
+(The exact SQL syntax varies for each database engine.)
+
+When :setting:`USE_TZ` is ``True``, values are converted to the current time
+zone before filtering.
+
+.. fieldlookup:: minute
+
+minute
+~~~~~~
+
+.. versionadded:: 1.6
+
+For datetime fields, an exact minute match. Takes an integer between 0 and 59.
+
+Example::
+
+    Event.objects.filter(timestamp__minute=29)
+
+SQL equivalent::
+
+    SELECT ... WHERE EXTRACT('minute' FROM timestamp) = '29';
+
+(The exact SQL syntax varies for each database engine.)
+
+When :setting:`USE_TZ` is ``True``, values are converted to the current time
+zone before filtering.
+
+.. fieldlookup:: second
+
+second
+~~~~~~
+
+.. versionadded:: 1.6
+
+For datetime fields, an exact second match. Takes an integer between 0 and 59.
+
+Example::
+
+    Event.objects.filter(timestamp__second=31)
+
+SQL equivalent::
+
+    SELECT ... WHERE EXTRACT('second' FROM timestamp) = '31';
+
+(The exact SQL syntax varies for each database engine.)
+
+When :setting:`USE_TZ` is ``True``, values are converted to the current time
+zone before filtering.
 
 .. fieldlookup:: isnull
 
@@ -2196,6 +2309,14 @@ Django provides the following aggregation functions in the
 aggregate functions, see
 :doc:`the topic guide on aggregation </topics/db/aggregation>`.
 
+.. warning::
+
+    SQLite can't handle aggregation on date/time fields out of the box.
+    This is because there are no native date/time fields in SQLite and Django
+    currently emulates these features using a text field. Attempts to use
+    aggregation on date/time fields in SQLite will raise
+    ``NotImplementedError``.
+
 Avg
 ~~~
 
diff --git a/docs/ref/models/relations.txt b/docs/ref/models/relations.txt
index 37986ec08d..c923961a19 100644
--- a/docs/ref/models/relations.txt
+++ b/docs/ref/models/relations.txt
@@ -82,14 +82,13 @@ Related objects reference
             >>> e = Entry.objects.get(id=234)
             >>> b.entry_set.remove(e) # Disassociates Entry e from Blog b.
 
-        In order to prevent database inconsistency, this method only exists on
-        :class:`~django.db.models.ForeignKey` objects where ``null=True``. If
-        the related field can't be set to ``None`` (``NULL``), then an object
-        can't be removed from a relation without being added to another. In the
-        above example, removing ``e`` from ``b.entry_set()`` is equivalent to
-        doing ``e.blog = None``, and because the ``blog``
-        :class:`~django.db.models.ForeignKey` doesn't have ``null=True``, this
-        is invalid.
+        For :class:`~django.db.models.ForeignKey` objects, this method only
+        exists if ``null=True``. If the related field can't be set to ``None``
+        (``NULL``), then an object can't be removed from a relation without
+        being added to another. In the above example, removing ``e`` from
+        ``b.entry_set()`` is equivalent to doing ``e.blog = None``, and because
+        the ``blog`` :class:`~django.db.models.ForeignKey` doesn't have
+        ``null=True``, this is invalid.
 
     .. method:: clear()
 
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index c3ba99168d..0f62741c5d 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -34,11 +34,6 @@ All attributes should be considered read-only, unless stated otherwise below.
 
 .. attribute:: HttpRequest.body
 
-    .. versionchanged:: 1.4
-
-    Before Django 1.4, ``HttpRequest.body`` was named
-    ``HttpRequest.raw_post_data``.
-
     The raw HTTP request body as a byte string. This is useful for processing
     data in different ways than conventional HTML forms: binary images,
     XML payload etc. For processing conventional form data, use ``HttpRequest.POST``.
@@ -55,12 +50,12 @@ All attributes should be considered read-only, unless stated otherwise below.
 
 .. attribute:: HttpRequest.path_info
 
-    Under some Web server configurations, the portion of the URL after the host
-    name is split up into a script prefix portion and a path info portion.
-    The ``path_info`` attribute always contains the path info portion of the
-    path, no matter what Web server is being used. Using this instead of
-    attr:`~HttpRequest.path` can make your code much easier to move between test
-    and deployment servers.
+    Under some Web server configurations, the portion of the URL after the
+    host name is split up into a script prefix portion and a path info
+    portion. The ``path_info`` attribute always contains the path info portion
+    of the path, no matter what Web server is being used. Using this instead
+    of :attr:`~HttpRequest.path` can make your code easier to move between
+    test and deployment servers.
 
     For example, if the ``WSGIScriptAlias`` for your application is set to
     ``"/minfo"``, then ``path`` might be ``"/minfo/music/bands/the_beatles/"``
@@ -181,7 +176,7 @@ All attributes should be considered read-only, unless stated otherwise below.
 
     ``user`` is only available if your Django installation has the
     ``AuthenticationMiddleware`` activated. For more, see
-    :doc:`/topics/auth`.
+    :doc:`/topics/auth/index`.
 
 .. attribute:: HttpRequest.session
 
@@ -267,10 +262,8 @@ Methods
 
 .. method:: HttpRequest.get_signed_cookie(key, default=RAISE_ERROR, salt='', max_age=None)
 
-   .. versionadded:: 1.4
-
    Returns a cookie value for a signed cookie, or raises a
-   :class:`~django.core.signing.BadSignature` exception if the signature is
+   ``django.core.signing.BadSignature`` exception if the signature is
    no longer valid. If you provide the ``default`` argument the exception
    will be suppressed and that default value will be returned instead.
 
@@ -478,9 +471,6 @@ In addition, ``QueryDict`` has the following methods:
     It's guaranteed to return a list of some sort unless the default value
     was no list.
 
-    .. versionchanged:: 1.4
-        The ``default`` parameter was added.
-
 .. method:: QueryDict.setlist(key, list_)
 
     Sets the given key to ``list_`` (unlike ``__setitem__()``).
@@ -505,8 +495,6 @@ In addition, ``QueryDict`` has the following methods:
 
 .. method:: QueryDict.dict()
 
-    .. versionadded:: 1.4
-
     Returns ``dict`` representation of ``QueryDict``. For every (key, list)
     pair in ``QueryDict``, ``dict`` will have (key, item), where item is one
     element of the list, using same logic as :meth:`QueryDict.__getitem__()`::
@@ -708,9 +696,7 @@ Methods
 
     .. _HTTPOnly: https://www.owasp.org/index.php/HTTPOnly
 
-.. method:: HttpResponse.set_signed_cookie(key, value='', salt='', max_age=None, expires=None, path='/', domain=None, secure=None, httponly=True)
-
-    .. versionadded:: 1.4
+.. method:: HttpResponse.set_signed_cookie(key, value, salt='', max_age=None, expires=None, path='/', domain=None, secure=None, httponly=True)
 
     Like :meth:`~HttpResponse.set_cookie()`, but
     :doc:`cryptographic signing </topics/signing>` the cookie before setting
@@ -760,6 +746,13 @@ types of HTTP responses. Like ``HttpResponse``, these subclasses live in
     domain (e.g. ``'/search/'``). See :class:`HttpResponse` for other optional
     constructor arguments. Note that this returns an HTTP status code 302.
 
+    .. attribute:: HttpResponseRedirect.url
+
+        .. versionadded:: 1.6
+
+        This read-only attribute represents the URL the response will redirect
+        to (equivalent to the ``Location`` response header).
+
 .. class:: HttpResponsePermanentRedirect
 
     Like :class:`HttpResponseRedirect`, but it returns a permanent redirect
@@ -804,6 +797,8 @@ types of HTTP responses. Like ``HttpResponse``, these subclasses live in
     :class:`~django.template.response.SimpleTemplateResponse`, and the
     ``render`` method must itself return a valid response object.
 
+.. _httpresponse-streaming:
+
 StreamingHttpResponse objects
 =============================
 
@@ -819,8 +814,8 @@ generating large CSV files.
 .. admonition:: Performance considerations
 
     Django is designed for short-lived requests. Streaming responses will tie
-    a worker process and keep a database connection idle in transaction for
-    the entire duration of the response. This may result in poor performance.
+    a worker process for the entire duration of the response. This may result
+    in poor performance.
 
     Generally speaking, you should perform expensive tasks outside of the
     request-response cycle, rather than resorting to a streamed response.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index daa4ee9a46..1fc9d2ff92 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -13,11 +13,12 @@ Settings
     and :setting:`TEMPLATE_CONTEXT_PROCESSORS`. Make sure you keep the
     components required by the features of Django you wish to use.
 
-Available settings
-==================
+Core settings
+=============
 
-Here's a full list of all available settings, in alphabetical order, and their
-default values.
+Here's a list of settings available in Django core and their default values.
+Settings provided by contrib apps are listed below, followed by a topical index
+of the core settings.
 
 .. setting:: ABSOLUTE_URL_OVERRIDES
 
@@ -38,19 +39,6 @@ a model object and return its URL. This is a way of overriding
 Note that the model name used in this setting should be all lower-case, regardless
 of the case of the actual model class name.
 
-.. setting:: ADMIN_FOR
-
-ADMIN_FOR
----------
-
-Default: ``()`` (Empty tuple)
-
-Used for admin-site settings modules, this should be a tuple of settings
-modules (in the format ``'foo.bar.baz'``) for which this site is an admin.
-
-The admin site uses this in its automatically-introspected documentation of
-models, views and template tags.
-
 .. setting:: ADMINS
 
 ADMINS
@@ -68,6 +56,42 @@ of (Full name, email address). Example::
 Note that Django will email *all* of these people whenever an error happens.
 See :doc:`/howto/error-reporting` for more information.
 
+.. setting:: ALLOWED_HOSTS
+
+ALLOWED_HOSTS
+-------------
+
+Default: ``[]`` (Empty list)
+
+A list of strings representing the host/domain names that this Django site can
+serve. This is a security measure to prevent an attacker from poisoning caches
+and password reset emails with links to malicious hosts by submitting requests
+with a fake HTTP ``Host`` header, which is possible even under many
+seemingly-safe webserver configurations.
+
+Values in this list can be fully qualified names (e.g. ``'www.example.com'``),
+in which case they will be matched against the request's ``Host`` header
+exactly (case-insensitive, not including port). A value beginning with a period
+can be used as a subdomain wildcard: ``'.example.com'`` will match
+``example.com``, ``www.example.com``, and any other subdomain of
+``example.com``. A value of ``'*'`` will match anything; in this case you are
+responsible to provide your own validation of the ``Host`` header (perhaps in a
+middleware; if so this middleware must be listed first in
+:setting:`MIDDLEWARE_CLASSES`).
+
+If the ``Host`` header (or ``X-Forwarded-Host`` if
+:setting:`USE_X_FORWARDED_HOST` is enabled) does not match any value in this
+list, the :meth:`django.http.HttpRequest.get_host()` method will raise
+:exc:`~django.core.exceptions.SuspiciousOperation`.
+
+When :setting:`DEBUG` is ``True`` or when running tests, host validation is
+disabled; any host will be accepted. Thus it's usually only necessary to set it
+in production.
+
+This validation only applies via :meth:`~django.http.HttpRequest.get_host()`;
+if your code accesses the ``Host`` header directly from ``request.META`` you
+are bypassing this security protection.
+
 .. setting:: ALLOWED_INCLUDE_ROOTS
 
 ALLOWED_INCLUDE_ROOTS
@@ -99,26 +123,6 @@ The :setting:`APPEND_SLASH` setting is only used if
 :class:`~django.middleware.common.CommonMiddleware` is installed
 (see :doc:`/topics/http/middleware`). See also :setting:`PREPEND_WWW`.
 
-.. setting:: AUTHENTICATION_BACKENDS
-
-AUTHENTICATION_BACKENDS
------------------------
-
-Default: ``('django.contrib.auth.backends.ModelBackend',)``
-
-A tuple of authentication backend classes (as strings) to use when attempting to
-authenticate a user. See the :doc:`authentication backends documentation
-</ref/authbackends>` for details.
-
-.. setting:: AUTH_USER_MODEL
-
-AUTH_USER_MODEL
----------------
-
-Default: 'auth.User'
-
-The model to use to represent a User. See :ref:`auth-custom-user`.
-
 .. setting:: CACHES
 
 CACHES
@@ -159,7 +163,7 @@ The cache backend to use. The built-in cache backends are:
 * ``'django.core.cache.backends.memcached.PyLibMCCache'``
 
 You can use a cache backend that doesn't ship with Django by setting
-:setting:`BACKEND <CACHE-BACKEND>` to a fully-qualified path of a cache
+:setting:`BACKEND <CACHES-BACKEND>` to a fully-qualified path of a cache
 backend class (i.e. ``mypackage.backends.whatever.WhateverCache``).
 Writing a whole new cache backend from scratch is left as an exercise
 to the reader; see the other backends for examples.
@@ -179,7 +183,8 @@ implementation is equivalent to the function::
 You may use any key function you want, as long as it has the same
 argument signature.
 
-See the :ref:`cache documentation <cache_key_transformation>` for more information.
+See the :ref:`cache documentation <cache_key_transformation>` for more
+information.
 
 .. setting:: CACHES-KEY_PREFIX
 
@@ -293,6 +298,8 @@ The default number of seconds to cache a page when the caching middleware or
 
 See :doc:`/topics/cache`.
 
+.. _settings-csrf:
+
 .. setting:: CSRF_COOKIE_DOMAIN
 
 CSRF_COOKIE_DOMAIN
@@ -304,12 +311,25 @@ The domain to be used when setting the CSRF cookie.  This can be useful for
 easily allowing cross-subdomain requests to be excluded from the normal cross
 site request forgery protection.  It should be set to a string such as
 ``".example.com"`` to allow a POST request from a form on one subdomain to be
-accepted by accepted by a view served from another subdomain.
+accepted by a view served from another subdomain.
 
 Please note that the presence of this setting does not imply that Django's CSRF
 protection is safe from cross-subdomain attacks by default - please see the
 :ref:`CSRF limitations <csrf-limitations>` section.
 
+.. setting:: CSRF_COOKIE_HTTPONLY
+
+CSRF_COOKIE_HTTPONLY
+--------------------
+
+.. versionadded:: 1.6
+
+Default: ``False``
+
+Whether to use HttpOnly flag on the CSRF cookie. If this is set to ``True``,
+client-side JavaScript will not to be able to access the CSRF cookie. See
+:setting:`SESSION_COOKIE_HTTPONLY` for details on HttpOnly.
+
 .. setting:: CSRF_COOKIE_NAME
 
 CSRF_COOKIE_NAME
@@ -325,8 +345,6 @@ want.  See :doc:`/ref/contrib/csrf`.
 CSRF_COOKIE_PATH
 ----------------
 
-.. versionadded:: 1.4
-
 Default: ``'/'``
 
 The path set on the CSRF cookie. This should either match the URL path of your
@@ -341,8 +359,6 @@ its own CSRF cookie.
 CSRF_COOKIE_SECURE
 ------------------
 
-.. versionadded:: 1.4
-
 Default: ``False``
 
 Whether to use a secure cookie for the CSRF cookie. If this is set to ``True``,
@@ -365,7 +381,6 @@ where ``reason`` is a short message (intended for developers or logging, not for
 end users) indicating the reason the request was rejected.  See
 :doc:`/ref/contrib/csrf`.
 
-
 .. setting:: DATABASES
 
 DATABASES
@@ -393,6 +408,30 @@ SQLite. This can be configured using the following::
 For other database backends, or more complex SQLite configurations, other options
 will be required. The following inner options are available.
 
+.. setting:: DATABASE-ATOMIC_REQUESTS
+
+ATOMIC_REQUESTS
+~~~~~~~~~~~~~~~
+
+.. versionadded:: 1.6
+
+Default: ``False``
+
+Set this to ``True`` to wrap each HTTP request in a transaction on this
+database. See :ref:`tying-transactions-to-http-requests`.
+
+.. setting:: DATABASE-AUTOCOMMIT
+
+AUTOCOMMIT
+~~~~~~~~~~
+
+.. versionadded:: 1.6
+
+Default: ``True``
+
+Set this to ``False`` if you want to :ref:`disable Django's transaction
+management <deactivate-transaction-management>` and implement your own.
+
 .. setting:: DATABASE-ENGINE
 
 ENGINE
@@ -449,6 +488,19 @@ The name of the database to use. For SQLite, it's the full path to the database
 file. When specifying the path, always use forward slashes, even on Windows
 (e.g. ``C:/homes/user/mysite/sqlite3.db``).
 
+.. setting:: CONN_MAX_AGE
+
+CONN_MAX_AGE
+~~~~~~~~~~~~
+
+.. versionadded:: 1.6
+
+Default: ``600``
+
+The lifetime of a database connection, in seconds. Use ``0`` to close database
+connections at the end of each request — Django's historical behavior — and
+``None`` for unlimited persistent connections.
+
 .. setting:: OPTIONS
 
 OPTIONS
@@ -505,7 +557,7 @@ backend-specific.
 Supported for the PostgreSQL_ (``postgresql_psycopg2``) and MySQL_ (``mysql``)
 backends.
 
-.. _PostgreSQL: http://www.postgresql.org/docs/8.2/static/multibyte.html
+.. _PostgreSQL: http://www.postgresql.org/docs/current/static/multibyte.html
 .. _MySQL: http://dev.mysql.com/doc/refman/5.0/en/charset-database.html
 
 .. setting:: TEST_COLLATION
@@ -562,7 +614,7 @@ If the default value (``None``) is used with the SQLite database engine, the
 tests will use a memory resident database. For all other database engines the
 test database will use the name ``'test_' + DATABASE_NAME``.
 
-See :doc:`/topics/testing`.
+See :ref:`the-test-database`.
 
 .. setting:: TEST_CREATE
 
@@ -670,9 +722,13 @@ DATE_INPUT_FORMATS
 
 Default::
 
-    ('%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', '%b %d %Y',
-    '%b %d, %Y', '%d %b %Y', '%d %b, %Y', '%B %d %Y',
-    '%B %d, %Y', '%d %B %Y', '%d %B, %Y')
+    (
+        '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
+        '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006'
+        '%d %b %Y', '%d %b, %Y',            # '25 Oct 2006', '25 Oct, 2006'
+        '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 2006'
+        '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006'
+    )
 
 A tuple of formats that will be accepted when inputting data on a date field.
 Formats will be tried in order, using the first valid one. Note that these
@@ -707,9 +763,20 @@ DATETIME_INPUT_FORMATS
 
 Default::
 
-    ('%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M', '%Y-%m-%d',
-    '%m/%d/%Y %H:%M:%S', '%m/%d/%Y %H:%M', '%m/%d/%Y',
-    '%m/%d/%y %H:%M:%S', '%m/%d/%y %H:%M', '%m/%d/%y')
+    (
+        '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
+        '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
+        '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
+        '%Y-%m-%d',              # '2006-10-25'
+        '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
+        '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
+        '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
+        '%m/%d/%Y',              # '10/25/2006'
+        '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
+        '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
+        '%m/%d/%y %H:%M',        # '10/25/06 14:30'
+        '%m/%d/%y',              # '10/25/06'
+    )
 
 A tuple of formats that will be accepted when inputting data on a datetime
 field. Formats will be tried in order, using the first valid one. Note that
@@ -748,18 +815,13 @@ sensitive (or offensive), such as :setting:`SECRET_KEY` or
 :setting:`PROFANITIES_LIST`. Specifically, it will exclude any setting whose
 name includes any of the following:
 
-    * API
-    * KEY
-    * PASS
-    * PROFANITIES_LIST
-    * SECRET
-    * SIGNATURE
-    * TOKEN
-
-.. versionchanged:: 1.4
-
-    We changed ``'PASSWORD'`` ``'PASS'``. ``'API'``, ``'TOKEN'`` and ``'KEY'``
-    were added.
+* ``'API'``
+* ``'KEY'``
+* ``'PASS'``
+* ``'PROFANITIES_LIST'``
+* ``'SECRET'``
+* ``'SIGNATURE'``
+* ``'TOKEN'``
 
 Note that these are *partial* matches. ``'PASS'`` will also match PASSWORD,
 just as ``'TOKEN'`` will also match TOKENIZED and so on.
@@ -774,6 +836,8 @@ when you're debugging, but it'll rapidly consume memory on a production server.
 
 .. _django/views/debug.py: https://github.com/django/django/blob/master/django/views/debug.py
 
+.. setting:: DEBUG_PROPAGATE_EXCEPTIONS
+
 DEBUG_PROPAGATE_EXCEPTIONS
 --------------------------
 
@@ -830,7 +894,7 @@ DEFAULT_EXCEPTION_REPORTER_FILTER
 Default: :class:`django.views.debug.SafeExceptionReporterFilter`
 
 Default exception reporter filter class to be used if none has been assigned to
-the :class:`HttpRequest` instance yet.
+the :class:`~django.http.HttpRequest` instance yet.
 See :ref:`Filtering error reports<filtering-error-reports>`.
 
 .. setting:: DEFAULT_FILE_STORAGE
@@ -1070,6 +1134,8 @@ Note that these paths should use Unix-style forward slashes, even on Windows.
 
 See :ref:`initial-data-via-fixtures` and :ref:`topics-testing-fixtures`.
 
+.. setting:: FORCE_SCRIPT_NAME
+
 FORCE_SCRIPT_NAME
 ------------------
 
@@ -1115,8 +1181,6 @@ Available formats are :setting:`DATE_FORMAT`, :setting:`TIME_FORMAT`,
 IGNORABLE_404_URLS
 ------------------
 
-.. versionadded:: 1.4
-
 Default: ``()``
 
 List of compiled regular expression objects describing URLs that should be
@@ -1127,8 +1191,9 @@ query string, if any). Use this if your site does not provide a commonly
 requested file such as ``favicon.ico`` or ``robots.txt``, or if it gets
 hammered by script kiddies.
 
-This is only used if :setting:`SEND_BROKEN_LINK_EMAILS` is set to ``True`` and
-``CommonMiddleware`` is installed (see :doc:`/topics/http/middleware`).
+This is only used if
+:class:`~django.middleware.common.BrokenLinkEmailsMiddleware` is enabled (see
+:doc:`/topics/http/middleware`).
 
 .. setting:: INSTALLED_APPS
 
@@ -1170,9 +1235,12 @@ LANGUAGE_CODE
 
 Default: ``'en-us'``
 
-A string representing the language code for this installation. This should be in
-standard :term:`language format<language code>`. For example, U.S. English is
-``"en-us"``. See :doc:`/topics/i18n/index`.
+A string representing the language code for this installation. This should be
+in standard :term:`language format<language code>`. For example, U.S. English
+is ``"en-us"``. See also the `list of language identifiers`_ and
+:doc:`/topics/i18n/index`.
+
+.. _list of language identifiers: http://www.i18nguy.com/unicode/language-identifiers.html
 
 .. setting:: LANGUAGE_COOKIE_NAME
 
@@ -1197,9 +1265,9 @@ see the current list of translated languages by looking in
 
 .. _online source: https://github.com/django/django/blob/master/django/conf/global_settings.py
 
-The list is a tuple of two-tuples in the format ``(language code, language
-name)``, the ``language code`` part should be a
-:term:`language name<language code>` -- for example, ``('ja', 'Japanese')``.
+The list is a tuple of two-tuples in the format 
+(:term:`language code<language code>`, ``language name``) -- for example, 
+``('ja', 'Japanese')``. 
 This specifies which languages are available for language selection. See
 :doc:`/topics/i18n/index`.
 
@@ -1279,54 +1347,6 @@ configuration process will be skipped.
 
 .. _dictConfig: http://docs.python.org/library/logging.config.html#configuration-dictionary-schema
 
-.. setting:: LOGIN_REDIRECT_URL
-
-LOGIN_REDIRECT_URL
-------------------
-
-Default: ``'/accounts/profile/'``
-
-The URL where requests are redirected after login when the
-``contrib.auth.login`` view gets no ``next`` parameter.
-
-This is used by the :func:`~django.contrib.auth.decorators.login_required`
-decorator, for example.
-
-.. versionchanged:: 1.5
-
-This setting now also accepts view function names and
-:ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
-configuration duplication since you no longer have to define the URL in two
-places (``settings`` and URLconf).
-For backward compatibility reasons the default remains unchanged.
-
-.. setting:: LOGIN_URL
-
-LOGIN_URL
----------
-
-Default: ``'/accounts/login/'``
-
-The URL where requests are redirected for login, especially when using the
-:func:`~django.contrib.auth.decorators.login_required` decorator.
-
-.. versionchanged:: 1.5
-
-This setting now also accepts view function names and
-:ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
-configuration duplication since you no longer have to define the URL in two
-places (``settings`` and URLconf).
-For backward compatibility reasons the default remains unchanged.
-
-.. setting:: LOGOUT_URL
-
-LOGOUT_URL
-----------
-
-Default: ``'/accounts/logout/'``
-
-LOGIN_URL counterpart.
-
 .. setting:: MANAGERS
 
 MANAGERS
@@ -1335,7 +1355,8 @@ MANAGERS
 Default: ``()`` (Empty tuple)
 
 A tuple in the same format as :setting:`ADMINS` that specifies who should get
-broken-link notifications when :setting:`SEND_BROKEN_LINK_EMAILS` is ``True``.
+broken link notifications when
+:class:`~django.middleware.common.BrokenLinkEmailsMiddleware` is enabled.
 
 .. setting:: MEDIA_ROOT
 
@@ -1364,37 +1385,6 @@ to a non-empty value.
 
 Example: ``"http://media.example.com/"``
 
-MESSAGE_LEVEL
--------------
-
-Default: `messages.INFO`
-
-Sets the minimum message level that will be recorded by the messages
-framework. See the :doc:`messages documentation </ref/contrib/messages>` for
-more details.
-
-MESSAGE_STORAGE
----------------
-
-Default: ``'django.contrib.messages.storage.fallback.FallbackStorage'``
-
-Controls where Django stores message data.  See the
-:doc:`messages documentation </ref/contrib/messages>` for more details.
-
-MESSAGE_TAGS
-------------
-
-Default::
-
-    {messages.DEBUG: 'debug',
-    messages.INFO: 'info',
-    messages.SUCCESS: 'success',
-    messages.WARNING: 'warning',
-    messages.ERROR: 'error',}
-
-Sets the mapping of message levels to message tags. See the
-:doc:`messages documentation </ref/contrib/messages>` for more details.
-
 .. setting:: MIDDLEWARE_CLASSES
 
 MIDDLEWARE_CLASSES
@@ -1450,16 +1440,6 @@ format has higher precedence and will be applied instead.
 See also :setting:`DECIMAL_SEPARATOR`, :setting:`THOUSAND_SEPARATOR` and
 :setting:`USE_THOUSAND_SEPARATOR`.
 
-.. setting:: PASSWORD_RESET_TIMEOUT_DAYS
-
-PASSWORD_RESET_TIMEOUT_DAYS
----------------------------
-
-Default: ``3``
-
-The number of days a password reset link is valid for. Used by the
-:mod:`django.contrib.auth` password reset mechanism.
-
 .. setting:: PREPEND_WWW
 
 PREPEND_WWW
@@ -1471,30 +1451,6 @@ Whether to prepend the "www." subdomain to URLs that don't have it. This is only
 used if :class:`~django.middleware.common.CommonMiddleware` is installed
 (see :doc:`/topics/http/middleware`). See also :setting:`APPEND_SLASH`.
 
-.. setting:: PROFANITIES_LIST
-
-PROFANITIES_LIST
-----------------
-
-Default: ``()`` (Empty tuple)
-
-A tuple of profanities, as strings, that will be forbidden in comments when
-:setting:`COMMENTS_ALLOW_PROFANITIES` is ``False``.
-
-.. setting:: RESTRUCTUREDTEXT_FILTER_SETTINGS
-
-RESTRUCTUREDTEXT_FILTER_SETTINGS
---------------------------------
-
-Default: ``{}``
-
-A dictionary containing settings for the ``restructuredtext`` markup filter from
-the :doc:`django.contrib.markup application </ref/contrib/markup>`. They override
-the default writer settings. See the Docutils restructuredtext `writer settings
-docs`_ for details.
-
-.. _writer settings docs: http://docutils.sourceforge.net/docs/user/config.html#html4css1-writer
-
 .. setting:: ROOT_URLCONF
 
 ROOT_URLCONF
@@ -1537,8 +1493,6 @@ randomly-generated ``SECRET_KEY`` to each new project.
 SECURE_PROXY_SSL_HEADER
 -----------------------
 
-.. versionadded:: 1.4
-
 Default: ``None``
 
 A tuple representing a HTTP header/value combination that signifies a request
@@ -1600,6 +1554,11 @@ available in ``request.META``.)
 SEND_BROKEN_LINK_EMAILS
 -----------------------
 
+.. deprecated:: 1.6
+    Since :class:`~django.middleware.common.BrokenLinkEmailsMiddleware`
+    was split from :class:`~django.middleware.common.CommonMiddleware`,
+    this setting no longer serves a purpose.
+
 Default: ``False``
 
 Whether to send an email to the :setting:`MANAGERS` each time somebody visits
@@ -1631,144 +1590,6 @@ Default: ``'root@localhost'``
 The email address that error messages come from, such as those sent to
 :setting:`ADMINS` and :setting:`MANAGERS`.
 
-.. setting:: SESSION_COOKIE_AGE
-
-SESSION_COOKIE_AGE
-------------------
-
-Default: ``1209600`` (2 weeks, in seconds)
-
-The age of session cookies, in seconds. See :doc:`/topics/http/sessions`.
-
-.. setting:: SESSION_COOKIE_DOMAIN
-
-SESSION_COOKIE_DOMAIN
----------------------
-
-Default: ``None``
-
-The domain to use for session cookies. Set this to a string such as
-``".example.com"`` for cross-domain cookies, or use ``None`` for a standard
-domain cookie. See the :doc:`/topics/http/sessions`.
-
-.. setting:: SESSION_COOKIE_HTTPONLY
-
-SESSION_COOKIE_HTTPONLY
------------------------
-
-Default: ``True``
-
-Whether to use HTTPOnly flag on the session cookie. If this is set to
-``True``, client-side JavaScript will not to be able to access the
-session cookie.
-
-HTTPOnly_ is a flag included in a Set-Cookie HTTP response header. It
-is not part of the :rfc:`2109` standard for cookies, and it isn't honored
-consistently by all browsers. However, when it is honored, it can be a
-useful way to mitigate the risk of client side script accessing the
-protected cookie data.
-
-.. _HTTPOnly: https://www.owasp.org/index.php/HTTPOnly
-
-.. versionchanged:: 1.4
-    The default value of the setting was changed from ``False`` to ``True``.
-
-.. setting:: SESSION_COOKIE_NAME
-
-SESSION_COOKIE_NAME
--------------------
-
-Default: ``'sessionid'``
-
-The name of the cookie to use for sessions. This can be whatever you want (but
-should be different from :setting:`LANGUAGE_COOKIE_NAME`).
-See the :doc:`/topics/http/sessions`.
-
-.. setting:: SESSION_COOKIE_PATH
-
-SESSION_COOKIE_PATH
--------------------
-
-Default: ``'/'``
-
-The path set on the session cookie. This should either match the URL path of your
-Django installation or be parent of that path.
-
-This is useful if you have multiple Django instances running under the same
-hostname. They can use different cookie paths, and each instance will only see
-its own session cookie.
-
-.. setting:: SESSION_CACHE_ALIAS
-
-SESSION_CACHE_ALIAS
--------------------
-
-Default: ``default``
-
-If you're using :ref:`cache-based session storage <cached-sessions-backend>`,
-this selects the cache to use.
-
-.. setting:: SESSION_COOKIE_SECURE
-
-SESSION_COOKIE_SECURE
----------------------
-
-Default: ``False``
-
-Whether to use a secure cookie for the session cookie. If this is set to
-``True``, the cookie will be marked as "secure," which means browsers may
-ensure that the cookie is only sent under an HTTPS connection.
-See the :doc:`/topics/http/sessions`.
-
-.. setting:: SESSION_ENGINE
-
-SESSION_ENGINE
---------------
-
-Default: ``django.contrib.sessions.backends.db``
-
-Controls where Django stores session data. Valid values are:
-
-* ``'django.contrib.sessions.backends.db'``
-* ``'django.contrib.sessions.backends.file'``
-* ``'django.contrib.sessions.backends.cache'``
-* ``'django.contrib.sessions.backends.cached_db'``
-* ``'django.contrib.sessions.backends.signed_cookies'``
-
-See :doc:`/topics/http/sessions`.
-
-.. setting:: SESSION_EXPIRE_AT_BROWSER_CLOSE
-
-SESSION_EXPIRE_AT_BROWSER_CLOSE
--------------------------------
-
-Default: ``False``
-
-Whether to expire the session when the user closes his or her browser.
-See the :doc:`/topics/http/sessions`.
-
-.. setting:: SESSION_FILE_PATH
-
-SESSION_FILE_PATH
------------------
-
-Default: ``None``
-
-If you're using file-based session storage, this sets the directory in
-which Django will store session data. See :doc:`/topics/http/sessions`. When
-the default value (``None``) is used, Django will use the standard temporary
-directory for the system.
-
-.. setting:: SESSION_SAVE_EVERY_REQUEST
-
-SESSION_SAVE_EVERY_REQUEST
---------------------------
-
-Default: ``False``
-
-Whether to save the session data on every request. See
-:doc:`/topics/http/sessions`.
-
 .. setting:: SHORT_DATE_FORMAT
 
 SHORT_DATE_FORMAT
@@ -1802,79 +1623,12 @@ See also :setting:`DATE_FORMAT` and :setting:`SHORT_DATE_FORMAT`.
 SIGNING_BACKEND
 ---------------
 
-.. versionadded:: 1.4
-
 Default: 'django.core.signing.TimestampSigner'
 
 The backend used for signing cookies and other data.
 
 See also the :doc:`/topics/signing` documentation.
 
-.. setting:: SITE_ID
-
-SITE_ID
--------
-
-Default: Not defined
-
-The ID, as an integer, of the current site in the ``django_site`` database
-table. This is used so that application data can hook into specific site(s)
-and a single database can manage content for multiple sites.
-
-See :doc:`/ref/contrib/sites`.
-
-.. _site framework docs: ../sites/
-
-.. setting:: STATIC_ROOT
-
-STATIC_ROOT
------------
-
-Default: ``''`` (Empty string)
-
-The absolute path to the directory where :djadmin:`collectstatic` will collect
-static files for deployment.
-
-Example: ``"/var/www/example.com/static/"``
-
-If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled
-(default) the :djadmin:`collectstatic` management command will collect static
-files into this directory. See the howto on :doc:`managing static
-files</howto/static-files>` for more details about usage.
-
-.. warning::
-
-    This should be an (initially empty) destination directory for collecting
-    your static files from their permanent locations into one directory for
-    ease of deployment; it is **not** a place to store your static files
-    permanently. You should do that in directories that will be found by
-    :doc:`staticfiles</ref/contrib/staticfiles>`'s
-    :setting:`finders<STATICFILES_FINDERS>`, which by default, are
-    ``'static/'`` app sub-directories and any directories you include in
-    :setting:`STATICFILES_DIRS`).
-
-See :doc:`staticfiles reference</ref/contrib/staticfiles>` and
-:setting:`STATIC_URL`.
-
-.. setting:: STATIC_URL
-
-STATIC_URL
-----------
-
-Default: ``None``
-
-URL to use when referring to static files located in :setting:`STATIC_ROOT`.
-
-Example: ``"/static/"`` or ``"http://static.example.com/"``
-
-If not ``None``, this will be used as the base path for
-:ref:`media definitions<form-media-paths>` and the
-:doc:`staticfiles app</ref/contrib/staticfiles>`.
-
-It must end in a slash if set to a non-empty value.
-
-See :setting:`STATIC_ROOT`.
-
 .. setting:: TEMPLATE_CONTEXT_PROCESSORS
 
 TEMPLATE_CONTEXT_PROCESSORS
@@ -1894,10 +1648,6 @@ A tuple of callables that are used to populate the context in ``RequestContext``
 These callables take a request object as their argument and return a dictionary
 of items to be merged into the context.
 
-.. versionadded:: 1.4
-    The ``django.core.context_processors.tz`` context processor
-    was added in this release.
-
 .. setting:: TEMPLATE_DEBUG
 
 TEMPLATE_DEBUG
@@ -1963,9 +1713,7 @@ TEST_RUNNER
 Default: ``'django.test.simple.DjangoTestSuiteRunner'``
 
 The name of the class to use for starting the test suite. See
-:doc:`/topics/testing`.
-
-.. _Testing Django Applications: ../testing/
+:ref:`other-testing-frameworks`.
 
 .. setting:: THOUSAND_SEPARATOR
 
@@ -2003,7 +1751,13 @@ See also :setting:`DATE_FORMAT` and :setting:`DATETIME_FORMAT`.
 TIME_INPUT_FORMATS
 ------------------
 
-Default: ``('%H:%M:%S', '%H:%M')``
+Default::
+
+    (
+        '%H:%M:%S',     # '14:30:59'
+        '%H:%M:%S.%f',  # '14:30:59.000200'
+        '%H:%M',        # '14:30'
+    )
 
 A tuple of formats that will be accepted when inputting data on a time field.
 Formats will be tried in order, using the first valid one. Note that these
@@ -2015,6 +1769,10 @@ precedence and will be applied instead.
 
 See also :setting:`DATE_INPUT_FORMATS` and :setting:`DATETIME_INPUT_FORMATS`.
 
+.. versionchanged:: 1.6
+
+Input format with microseconds has been added.
+
 .. _datetime: http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 
 .. setting:: TIME_ZONE
@@ -2024,15 +1782,14 @@ TIME_ZONE
 
 Default: ``'America/Chicago'``
 
-.. versionchanged:: 1.4
-   The meaning of this setting now depends on the value of :setting:`USE_TZ`.
+A string representing the time zone for this installation, or ``None``. See
+the `list of time zones`_.
 
-A string representing the time zone for this installation, or
-``None``. `See available choices`_. (Note that list of available
-choices lists more than one on the same line; you'll want to use just
-one of the choices for a given time zone. For instance, one line says
-``'Europe/London GB GB-Eire'``, but you should use the first bit of
-that -- ``'Europe/London'`` -- as your :setting:`TIME_ZONE` setting.)
+.. note::
+    Since Django was first released with the :setting:`TIME_ZONE` set to
+    ``'America/Chicago'``, the global setting (used if nothing is defined in
+    your project's ``settings.py``) remains ``'America/Chicago'`` for backwards
+    compatibility. New project templates default to ``'UTC'``.
 
 Note that this isn't necessarily the time zone of the server. For example, one
 server may serve multiple Django-powered sites, each with a separate time zone
@@ -2065,7 +1822,7 @@ to ensure your processes are running in the correct environment.
     If you're running Django on Windows, :setting:`TIME_ZONE` must be set to
     match the system time zone.
 
-.. _See available choices: http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
+.. _list of time zones: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
 .. _pytz: http://pytz.sourceforge.net/
 
@@ -2074,6 +1831,12 @@ to ensure your processes are running in the correct environment.
 TRANSACTIONS_MANAGED
 --------------------
 
+.. deprecated:: 1.6
+
+    This setting was deprecated because its name is very misleading. Use the
+    :setting:`AUTOCOMMIT <DATABASE-AUTOCOMMIT>` key in :setting:`DATABASES`
+    entries instead.
+
 Default: ``False``
 
 Set this to ``True`` if you want to :ref:`disable Django's transaction
@@ -2143,8 +1906,6 @@ See also :setting:`DECIMAL_SEPARATOR`, :setting:`NUMBER_GROUPING` and
 USE_TZ
 ------
 
-.. versionadded:: 1.4
-
 Default: ``False``
 
 A boolean that specifies if datetimes will be timezone-aware by default or not.
@@ -2175,8 +1936,6 @@ which sets this header is in use.
 WSGI_APPLICATION
 ----------------
 
-.. versionadded:: 1.4
-
 Default: ``None``
 
 The full Python path of the WSGI application object that Django's built-in
@@ -2185,7 +1944,7 @@ startproject <startproject>` management command will create a simple
 ``wsgi.py`` file with an ``application`` callable in it, and point this setting
 to that ``application``.
 
-If not set, the return value of :func:`django.core.wsgi.get_wsgi_application`
+If not set, the return value of ``django.core.wsgi.get_wsgi_application()``
 will be used. In this case, the behavior of :djadmin:`runserver` will be
 identical to previous Django versions.
 
@@ -2220,8 +1979,41 @@ The default value for the X-Frame-Options header used by
 :class:`~django.middleware.clickjacking.XFrameOptionsMiddleware`. See the
 :doc:`clickjacking protection </ref/clickjacking/>` documentation.
 
-Deprecated settings
-===================
+
+Admindocs
+=========
+
+Settings for :mod:`django.contrib.admindocs`.
+
+.. setting:: ADMIN_FOR
+
+ADMIN_FOR
+---------
+
+Default: ``()`` (Empty tuple)
+
+Used for admin-site settings modules, this should be a tuple of settings
+modules (in the format ``'foo.bar.baz'``) for which this site is an admin.
+
+The admin site uses this in its automatically-introspected documentation of
+models, views and template tags.
+
+
+Auth
+====
+
+Settings for :mod:`django.contrib.auth`.
+
+.. setting:: AUTHENTICATION_BACKENDS
+
+AUTHENTICATION_BACKENDS
+-----------------------
+
+Default: ``('django.contrib.auth.backends.ModelBackend',)``
+
+A tuple of authentication backend classes (as strings) to use when attempting to
+authenticate a user. See the :ref:`authentication backends documentation
+<authentication-backends>` for details.
 
 .. setting:: AUTH_PROFILE_MODULE
 
@@ -2237,29 +2029,697 @@ AUTH_PROFILE_MODULE
 Default: Not defined
 
 The site-specific user profile model used by this site. See
-:ref:`auth-profiles`.
+:ref:`User profiles <auth-profiles>`.
 
-.. setting:: IGNORABLE_404_ENDS
+.. setting:: AUTH_USER_MODEL
 
-IGNORABLE_404_ENDS
+AUTH_USER_MODEL
+---------------
+
+Default: 'auth.User'
+
+The model to use to represent a User. See :ref:`auth-custom-user`.
+
+.. setting:: LOGIN_REDIRECT_URL
+
+LOGIN_REDIRECT_URL
 ------------------
 
-.. deprecated:: 1.4
-   This setting has been superseded by :setting:`IGNORABLE_404_URLS`.
+Default: ``'/accounts/profile/'``
 
-.. setting:: IGNORABLE_404_STARTS
+The URL where requests are redirected after login when the
+``contrib.auth.login`` view gets no ``next`` parameter.
 
-IGNORABLE_404_STARTS
---------------------
+This is used by the :func:`~django.contrib.auth.decorators.login_required`
+decorator, for example.
 
-.. deprecated:: 1.4
-   This setting has been superseded by :setting:`IGNORABLE_404_URLS`.
+.. versionchanged:: 1.5
 
-.. setting:: URL_VALIDATOR_USER_AGENT
+This setting now also accepts view function names and
+:ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
+configuration duplication since you no longer have to define the URL in two
+places (``settings`` and URLconf).
+For backward compatibility reasons the default remains unchanged.
 
-URL_VALIDATOR_USER_AGENT
-------------------------
+.. setting:: LOGIN_URL
 
-.. deprecated:: 1.5
-    This value was used as the ``User-Agent`` header when checking if a URL
-    exists, a feature that was removed due to security and performance issues.
+LOGIN_URL
+---------
+
+Default: ``'/accounts/login/'``
+
+The URL where requests are redirected for login, especially when using the
+:func:`~django.contrib.auth.decorators.login_required` decorator.
+
+.. versionchanged:: 1.5
+
+This setting now also accepts view function names and
+:ref:`named URL patterns <naming-url-patterns>` which can be used to reduce
+configuration duplication since you no longer have to define the URL in two
+places (``settings`` and URLconf).
+For backward compatibility reasons the default remains unchanged.
+
+.. setting:: LOGOUT_URL
+
+LOGOUT_URL
+----------
+
+Default: ``'/accounts/logout/'``
+
+LOGIN_URL counterpart.
+
+.. setting:: PASSWORD_RESET_TIMEOUT_DAYS
+
+PASSWORD_RESET_TIMEOUT_DAYS
+---------------------------
+
+Default: ``3``
+
+The number of days a password reset link is valid for. Used by the
+:mod:`django.contrib.auth` password reset mechanism.
+
+.. setting:: PASSWORD_HASHERS
+
+PASSWORD_HASHERS
+----------------
+
+See :ref:`auth_password_storage`.
+
+Default::
+
+    ('django.contrib.auth.hashers.PBKDF2PasswordHasher',
+     'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+     'django.contrib.auth.hashers.BCryptPasswordHasher',
+     'django.contrib.auth.hashers.SHA1PasswordHasher',
+     'django.contrib.auth.hashers.MD5PasswordHasher',
+     'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
+     'django.contrib.auth.hashers.CryptPasswordHasher',)
+
+
+.. _settings-comments:
+
+Comments
+========
+
+Settings for :mod:`django.contrib.comments`.
+
+.. setting:: COMMENTS_HIDE_REMOVED
+
+COMMENTS_HIDE_REMOVED
+---------------------
+
+If ``True`` (default), removed comments will be excluded from comment
+lists/counts (as taken from template tags). Otherwise, the template author is
+responsible for some sort of a "this comment has been removed by the site staff"
+message.
+
+.. setting:: COMMENT_MAX_LENGTH
+
+COMMENT_MAX_LENGTH
+------------------
+
+The maximum length of the comment field, in characters. Comments longer than
+this will be rejected. Defaults to 3000.
+
+.. setting:: COMMENTS_APP
+
+COMMENTS_APP
+------------
+
+An app which provides :doc:`customization of the comments framework
+</ref/contrib/comments/custom>`.  Use the same dotted-string notation
+as in :setting:`INSTALLED_APPS`.  Your custom :setting:`COMMENTS_APP`
+must also be listed in :setting:`INSTALLED_APPS`.
+
+.. setting:: PROFANITIES_LIST
+
+PROFANITIES_LIST
+----------------
+
+Default: ``()`` (Empty tuple)
+
+A tuple of profanities, as strings, that will be forbidden in comments when
+``COMMENTS_ALLOW_PROFANITIES`` is ``False``.
+
+
+.. _settings-messages:
+
+Messages
+========
+
+Settings for :mod:`django.contrib.messages`.
+
+.. setting:: MESSAGE_LEVEL
+
+MESSAGE_LEVEL
+-------------
+
+Default: ``messages.INFO``
+
+Sets the minimum message level that will be recorded by the messages
+framework. See :ref:`message levels <message-level>` for more details.
+
+.. admonition:: Important
+
+   If you override ``MESSAGE_LEVEL`` in your settings file and rely on any of
+   the built-in constants, you must import the constants module directly to
+   avoid the potential for circular imports, e.g.::
+
+       from django.contrib.messages import constants as message_constants
+       MESSAGE_LEVEL = message_constants.DEBUG
+
+   If desired, you may specify the numeric values for the constants directly
+   according to the values in the above :ref:`constants table
+   <message-level-constants>`.
+
+.. setting:: MESSAGE_STORAGE
+
+MESSAGE_STORAGE
+---------------
+
+Default: ``'django.contrib.messages.storage.fallback.FallbackStorage'``
+
+Controls where Django stores message data. Valid values are:
+
+* ``'django.contrib.messages.storage.fallback.FallbackStorage'``
+* ``'django.contrib.messages.storage.session.SessionStorage'``
+* ``'django.contrib.messages.storage.cookie.CookieStorage'``
+
+See :ref:`message storage backends <message-storage-backends>` for more details.
+
+.. setting:: MESSAGE_TAGS
+
+MESSAGE_TAGS
+------------
+
+Default::
+
+    {messages.DEBUG: 'debug',
+    messages.INFO: 'info',
+    messages.SUCCESS: 'success',
+    messages.WARNING: 'warning',
+    messages.ERROR: 'error',}
+
+This sets the mapping of message level to message tag, which is typically
+rendered as a CSS class in HTML. If you specify a value, it will extend
+the default. This means you only have to specify those values which you need
+to override. See :ref:`message-displaying` above for more details.
+
+.. admonition:: Important
+
+   If you override ``MESSAGE_TAGS`` in your settings file and rely on any of
+   the built-in constants, you must import the ``constants`` module directly to
+   avoid the potential for circular imports, e.g.::
+
+       from django.contrib.messages import constants as message_constants
+       MESSAGE_TAGS = {message_constants.INFO: ''}
+
+   If desired, you may specify the numeric values for the constants directly
+   according to the values in the above :ref:`constants table
+   <message-level-constants>`.
+
+.. _messages-session_cookie_domain:
+
+SESSION_COOKIE_DOMAIN
+---------------------
+
+Default: ``None``
+
+The storage backends that use cookies -- ``CookieStorage`` and
+``FallbackStorage`` -- use the value of :setting:`SESSION_COOKIE_DOMAIN` in
+setting their cookies.
+
+
+.. _settings-sessions:
+
+Sessions
+========
+
+Settings for :mod:`django.contrib.sessions`.
+
+.. setting:: SESSION_CACHE_ALIAS
+
+SESSION_CACHE_ALIAS
+-------------------
+
+Default: ``default``
+
+If you're using :ref:`cache-based session storage <cached-sessions-backend>`,
+this selects the cache to use.
+
+.. setting:: SESSION_COOKIE_AGE
+
+SESSION_COOKIE_AGE
+------------------
+
+Default: ``1209600`` (2 weeks, in seconds)
+
+The age of session cookies, in seconds.
+
+.. setting:: SESSION_COOKIE_DOMAIN
+
+SESSION_COOKIE_DOMAIN
+---------------------
+
+Default: ``None``
+
+The domain to use for session cookies. Set this to a string such as
+``".example.com"`` (note the leading dot!) for cross-domain cookies, or use
+``None`` for a standard domain cookie.
+
+Be cautious when updating this setting on a production site. If you update
+this setting to enable cross-domain cookies on a site that previously used
+standard domain cookies, existing user cookies will be set to the old
+domain. This may result in them being unable to log in as long as these cookies
+persist.
+
+.. setting:: SESSION_COOKIE_HTTPONLY
+
+SESSION_COOKIE_HTTPONLY
+-----------------------
+
+Default: ``True``
+
+Whether to use HTTPOnly flag on the session cookie. If this is set to
+``True``, client-side JavaScript will not to be able to access the
+session cookie.
+
+HTTPOnly_ is a flag included in a Set-Cookie HTTP response header. It
+is not part of the :rfc:`2109` standard for cookies, and it isn't honored
+consistently by all browsers. However, when it is honored, it can be a
+useful way to mitigate the risk of client side script accessing the
+protected cookie data.
+
+.. _HTTPOnly: https://www.owasp.org/index.php/HTTPOnly
+
+.. setting:: SESSION_COOKIE_NAME
+
+SESSION_COOKIE_NAME
+-------------------
+
+Default: ``'sessionid'``
+
+The name of the cookie to use for sessions. This can be whatever you want (but
+should be different from :setting:`LANGUAGE_COOKIE_NAME`).
+
+.. setting:: SESSION_COOKIE_PATH
+
+SESSION_COOKIE_PATH
+-------------------
+
+Default: ``'/'``
+
+The path set on the session cookie. This should either match the URL path of your
+Django installation or be parent of that path.
+
+This is useful if you have multiple Django instances running under the same
+hostname. They can use different cookie paths, and each instance will only see
+its own session cookie.
+
+.. setting:: SESSION_COOKIE_SECURE
+
+SESSION_COOKIE_SECURE
+---------------------
+
+Default: ``False``
+
+Whether to use a secure cookie for the session cookie. If this is set to
+``True``, the cookie will be marked as "secure," which means browsers may
+ensure that the cookie is only sent under an HTTPS connection.
+
+.. setting:: SESSION_ENGINE
+
+SESSION_ENGINE
+--------------
+
+Default: ``django.contrib.sessions.backends.db``
+
+Controls where Django stores session data. Valid values are:
+
+* ``'django.contrib.sessions.backends.db'``
+* ``'django.contrib.sessions.backends.file'``
+* ``'django.contrib.sessions.backends.cache'``
+* ``'django.contrib.sessions.backends.cached_db'``
+* ``'django.contrib.sessions.backends.signed_cookies'``
+
+See :ref:`configuring-sessions` for more details.
+
+.. setting:: SESSION_EXPIRE_AT_BROWSER_CLOSE
+
+SESSION_EXPIRE_AT_BROWSER_CLOSE
+-------------------------------
+
+Default: ``False``
+
+Whether to expire the session when the user closes his or her browser. See
+:ref:`browser-length-vs-persistent-sessions`.
+
+.. setting:: SESSION_FILE_PATH
+
+SESSION_FILE_PATH
+-----------------
+
+Default: ``None``
+
+If you're using file-based session storage, this sets the directory in
+which Django will store session data. When the default value (``None``) is
+used, Django will use the standard temporary directory for the system.
+
+
+.. setting:: SESSION_SAVE_EVERY_REQUEST
+
+SESSION_SAVE_EVERY_REQUEST
+--------------------------
+
+Default: ``False``
+
+Whether to save the session data on every request. If this is ``False``
+(default), then the session data will only be saved if it has been modified --
+that is, if any of its dictionary values have been assigned or deleted.
+
+
+Sites
+=====
+
+Settings for :mod:`django.contrib.sites`.
+
+.. setting:: SITE_ID
+
+SITE_ID
+-------
+
+Default: Not defined
+
+The ID, as an integer, of the current site in the ``django_site`` database
+table. This is used so that application data can hook into specific sites
+and a single database can manage content for multiple sites.
+
+
+.. _settings-staticfiles:
+
+Static files
+============
+
+Settings for :mod:`django.contrib.staticfiles`.
+
+.. setting:: STATIC_ROOT
+
+STATIC_ROOT
+-----------
+
+Default: ``''`` (Empty string)
+
+The absolute path to the directory where :djadmin:`collectstatic` will collect
+static files for deployment.
+
+Example: ``"/var/www/example.com/static/"``
+
+If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled
+(default) the :djadmin:`collectstatic` management command will collect static
+files into this directory. See the howto on :doc:`managing static
+files</howto/static-files/index>` for more details about usage.
+
+.. warning::
+
+    This should be an (initially empty) destination directory for collecting
+    your static files from their permanent locations into one directory for
+    ease of deployment; it is **not** a place to store your static files
+    permanently. You should do that in directories that will be found by
+    :doc:`staticfiles</ref/contrib/staticfiles>`'s
+    :setting:`finders<STATICFILES_FINDERS>`, which by default, are
+    ``'static/'`` app sub-directories and any directories you include in
+    :setting:`STATICFILES_DIRS`).
+
+.. setting:: STATIC_URL
+
+STATIC_URL
+----------
+
+Default: ``None``
+
+URL to use when referring to static files located in :setting:`STATIC_ROOT`.
+
+Example: ``"/static/"`` or ``"http://static.example.com/"``
+
+If not ``None``, this will be used as the base path for
+:ref:`media definitions<form-media-paths>` and the
+:doc:`staticfiles app</ref/contrib/staticfiles>`.
+
+It must end in a slash if set to a non-empty value.
+
+.. setting:: STATICFILES_DIRS
+
+STATICFILES_DIRS
+----------------
+
+Default: ``[]``
+
+This setting defines the additional locations the staticfiles app will traverse
+if the ``FileSystemFinder`` finder is enabled, e.g. if you use the
+:djadmin:`collectstatic` or :djadmin:`findstatic` management command or use the
+static file serving view.
+
+This should be set to a list or tuple of strings that contain full paths to
+your additional files directory(ies) e.g.::
+
+    STATICFILES_DIRS = (
+        "/home/special.polls.com/polls/static",
+        "/home/polls.com/polls/static",
+        "/opt/webfiles/common",
+    )
+
+Prefixes (optional)
+~~~~~~~~~~~~~~~~~~~
+
+In case you want to refer to files in one of the locations with an additional
+namespace, you can **optionally** provide a prefix as ``(prefix, path)``
+tuples, e.g.::
+
+    STATICFILES_DIRS = (
+        # ...
+        ("downloads", "/opt/webfiles/stats"),
+    )
+
+Example:
+
+Assuming you have :setting:`STATIC_URL` set ``'/static/'``, the
+:djadmin:`collectstatic` management command would collect the "stats" files
+in a ``'downloads'`` subdirectory of :setting:`STATIC_ROOT`.
+
+This would allow you to refer to the local file
+``'/opt/webfiles/stats/polls_20101022.tar.gz'`` with
+``'/static/downloads/polls_20101022.tar.gz'`` in your templates, e.g.:
+
+.. code-block:: html+django
+
+    <a href="{{ STATIC_URL }}downloads/polls_20101022.tar.gz">
+
+.. setting:: STATICFILES_STORAGE
+
+STATICFILES_STORAGE
+-------------------
+
+Default: ``'django.contrib.staticfiles.storage.StaticFilesStorage'``
+
+The file storage engine to use when collecting static files with the
+:djadmin:`collectstatic` management command.
+
+A ready-to-use instance of the storage backend defined in this setting
+can be found at ``django.contrib.staticfiles.storage.staticfiles_storage``.
+
+For an example, see :ref:`staticfiles-from-cdn`.
+
+.. setting:: STATICFILES_FINDERS
+
+STATICFILES_FINDERS
+-------------------
+
+Default::
+
+    ("django.contrib.staticfiles.finders.FileSystemFinder",
+     "django.contrib.staticfiles.finders.AppDirectoriesFinder")
+
+The list of finder backends that know how to find static files in
+various locations.
+
+The default will find files stored in the :setting:`STATICFILES_DIRS` setting
+(using ``django.contrib.staticfiles.finders.FileSystemFinder``) and in a
+``static`` subdirectory of each app (using
+``django.contrib.staticfiles.finders.AppDirectoriesFinder``)
+
+One finder is disabled by default:
+``django.contrib.staticfiles.finders.DefaultStorageFinder``. If added to
+your :setting:`STATICFILES_FINDERS` setting, it will look for static files in
+the default file storage as defined by the :setting:`DEFAULT_FILE_STORAGE`
+setting.
+
+.. note::
+
+    When using the ``AppDirectoriesFinder`` finder, make sure your apps
+    can be found by staticfiles. Simply add the app to the
+    :setting:`INSTALLED_APPS` setting of your site.
+
+Static file finders are currently considered a private interface, and this
+interface is thus undocumented.
+
+Core Settings Topical Index
+===========================
+
+Cache
+-----
+* :setting:`CACHES`
+* :setting:`CACHE_MIDDLEWARE_ALIAS`
+* :setting:`CACHE_MIDDLEWARE_ANONYMOUS_ONLY`
+* :setting:`CACHE_MIDDLEWARE_KEY_PREFIX`
+* :setting:`CACHE_MIDDLEWARE_SECONDS`
+
+Database
+--------
+* :setting:`DATABASES`
+* :setting:`DATABASE_ROUTERS`
+* :setting:`DEFAULT_INDEX_TABLESPACE`
+* :setting:`DEFAULT_TABLESPACE`
+* :setting:`TRANSACTIONS_MANAGED`
+
+Debugging
+---------
+* :setting:`DEBUG`
+* :setting:`DEBUG_PROPAGATE_EXCEPTIONS`
+
+Email
+-----
+* :setting:`ADMINS`
+* :setting:`DEFAULT_CHARSET`
+* :setting:`DEFAULT_FROM_EMAIL`
+* :setting:`EMAIL_BACKEND`
+* :setting:`EMAIL_FILE_PATH`
+* :setting:`EMAIL_HOST`
+* :setting:`EMAIL_HOST_PASSWORD`
+* :setting:`EMAIL_HOST_USER`
+* :setting:`EMAIL_PORT`
+* :setting:`EMAIL_SUBJECT_PREFIX`
+* :setting:`EMAIL_USE_TLS`
+* :setting:`MANAGERS`
+* :setting:`SEND_BROKEN_LINK_EMAILS`
+* :setting:`SERVER_EMAIL`
+
+Error reporting
+---------------
+* :setting:`DEFAULT_EXCEPTION_REPORTER_FILTER`
+* :setting:`IGNORABLE_404_URLS`
+* :setting:`MANAGERS`
+* :setting:`SEND_BROKEN_LINK_EMAILS`
+
+File uploads
+------------
+* :setting:`DEFAULT_FILE_STORAGE`
+* :setting:`FILE_CHARSET`
+* :setting:`FILE_UPLOAD_HANDLERS`
+* :setting:`FILE_UPLOAD_MAX_MEMORY_SIZE`
+* :setting:`FILE_UPLOAD_PERMISSIONS`
+* :setting:`FILE_UPLOAD_TEMP_DIR`
+* :setting:`MEDIA_ROOT`
+* :setting:`MEDIA_URL`
+
+Globalization (i18n/l10n)
+-------------------------
+* :setting:`DATE_FORMAT`
+* :setting:`DATE_INPUT_FORMATS`
+* :setting:`DATETIME_FORMAT`
+* :setting:`DATETIME_INPUT_FORMATS`
+* :setting:`DECIMAL_SEPARATOR`
+* :setting:`FIRST_DAY_OF_WEEK`
+* :setting:`FORMAT_MODULE_PATH`
+* :setting:`LANGUAGE_CODE`
+* :setting:`LANGUAGE_COOKIE_NAME`
+* :setting:`LANGUAGES`
+* :setting:`LOCALE_PATHS`
+* :setting:`MONTH_DAY_FORMAT`
+* :setting:`NUMBER_GROUPING`
+* :setting:`SHORT_DATE_FORMAT`
+* :setting:`SHORT_DATETIME_FORMAT`
+* :setting:`THOUSAND_SEPARATOR`
+* :setting:`TIME_FORMAT`
+* :setting:`TIME_INPUT_FORMATS`
+* :setting:`TIME_ZONE`
+* :setting:`USE_I18N`
+* :setting:`USE_L10N`
+* :setting:`USE_THOUSAND_SEPARATOR`
+* :setting:`USE_TZ`
+* :setting:`YEAR_MONTH_FORMAT`
+
+HTTP
+----
+* :setting:`DEFAULT_CHARSET`
+* :setting:`DEFAULT_CONTENT_TYPE`
+* :setting:`DISALLOWED_USER_AGENTS`
+* :setting:`FORCE_SCRIPT_NAME`
+* :setting:`INTERNAL_IPS`
+* :setting:`MIDDLEWARE_CLASSES`
+* :setting:`SECURE_PROXY_SSL_HEADER`
+* :setting:`SIGNING_BACKEND`
+* :setting:`USE_ETAGS`
+* :setting:`USE_X_FORWARDED_HOST`
+* :setting:`WSGI_APPLICATION`
+
+Logging
+-------
+* :setting:`LOGGING`
+* :setting:`LOGGING_CONFIG`
+
+Models
+------
+* :setting:`ABSOLUTE_URL_OVERRIDES`
+* :setting:`FIXTURE_DIRS`
+* :setting:`INSTALLED_APPS`
+
+Security
+--------
+* Cross Site Request Forgery protection
+
+  * :setting:`CSRF_COOKIE_DOMAIN`
+  * :setting:`CSRF_COOKIE_NAME`
+  * :setting:`CSRF_COOKIE_PATH`
+  * :setting:`CSRF_COOKIE_SECURE`
+  * :setting:`CSRF_FAILURE_VIEW`
+
+* :setting:`SECRET_KEY`
+* :setting:`X_FRAME_OPTIONS`
+
+Serialization
+-------------
+* :setting:`DEFAULT_CHARSET`
+* :setting:`SERIALIZATION_MODULES`
+
+Templates
+---------
+* :setting:`ALLOWED_INCLUDE_ROOTS`
+* :setting:`TEMPLATE_CONTEXT_PROCESSORS`
+* :setting:`TEMPLATE_DEBUG`
+* :setting:`TEMPLATE_DIRS`
+* :setting:`TEMPLATE_LOADERS`
+* :setting:`TEMPLATE_STRING_IF_INVALID`
+
+Testing
+-------
+* Database
+
+  * :setting:`TEST_CHARSET`
+  * :setting:`TEST_COLLATION`
+  * :setting:`TEST_DEPENDENCIES`
+  * :setting:`TEST_MIRROR`
+  * :setting:`TEST_NAME`
+  * :setting:`TEST_CREATE`
+  * :setting:`TEST_USER`
+  * :setting:`TEST_USER_CREATE`
+  * :setting:`TEST_PASSWD`
+  * :setting:`TEST_TBLSPACE`
+  * :setting:`TEST_TBLSPACE_TMP`
+
+* :setting:`TEST_RUNNER`
+
+URLs
+----
+* :setting:`APPEND_SLASH`
+* :setting:`PREPEND_WWW`
+* :setting:`ROOT_URLCONF`
diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt
index 0db540370d..ca472bd60e 100644
--- a/docs/ref/signals.txt
+++ b/docs/ref/signals.txt
@@ -12,7 +12,7 @@ A list of all the signals that Django sends.
     The :doc:`comment framework </ref/contrib/comments/index>` sends a :doc:`set
     of comment-related signals </ref/contrib/comments/signals>`.
 
-    The :doc:`authentication framework </topics/auth>` sends :ref:`signals when
+    The :doc:`authentication framework </topics/auth/index>` sends :ref:`signals when
     a user is logged in / out <topics-auth-signals>`.
 
 Model signals
@@ -27,9 +27,8 @@ module system.
 .. warning::
 
     Many of these signals are sent by various model methods like
-    :meth:`~django.db.models.Model.__init__` or
-    :meth:`~django.db.models.Model.save` that you can overwrite in your own
-    code.
+    ``__init__()`` or :meth:`~django.db.models.Model.save` that you can
+    override in your own code.
 
     If you override these methods on your model, you must call the parent class'
     methods for this signals to be sent.
@@ -47,7 +46,7 @@ pre_init
 .. ^^^^^^^ this :module: hack keeps Sphinx from prepending the module.
 
 Whenever you instantiate a Django model, this signal is sent at the beginning
-of the model's :meth:`~django.db.models.Model.__init__` method.
+of the model's ``__init__()`` method.
 
 Arguments sent with this signal:
 
@@ -55,12 +54,10 @@ Arguments sent with this signal:
     The model class that just had an instance created.
 
 ``args``
-    A list of positional arguments passed to
-    :meth:`~django.db.models.Model.__init__`:
+    A list of positional arguments passed to ``__init__()``:
 
 ``kwargs``
-    A dictionary of keyword arguments passed to
-    :meth:`~django.db.models.Model.__init__`:.
+    A dictionary of keyword arguments passed to ``__init__()``:
 
 For example, the :doc:`tutorial </intro/tutorial01>` has this line::
 
@@ -74,7 +71,7 @@ Argument    Value
 ``sender``  ``Poll`` (the class itself)
 
 ``args``    ``[]`` (an empty list because there were no positional
-            arguments passed to ``__init__``.)
+            arguments passed to ``__init__()``.)
 
 ``kwargs``  ``{'question': "What's up?", 'pub_date': datetime.now()}``
 ==========  ===============================================================
@@ -85,7 +82,7 @@ post_init
 .. data:: django.db.models.signals.post_init
    :module:
 
-Like pre_init, but this one is sent when the :meth:`~django.db.models.Model.__init__`: method finishes.
+Like pre_init, but this one is sent when the ``__init__()`` method finishes.
 
 Arguments sent with this signal:
 
@@ -212,24 +209,24 @@ m2m_changed
 .. data:: django.db.models.signals.m2m_changed
    :module:
 
-Sent when a :class:`ManyToManyField` is changed on a model instance.
-Strictly speaking, this is not a model signal since it is sent by the
-:class:`ManyToManyField`, but since it complements the
+Sent when a :class:`~django.db.models.ManyToManyField` is changed on a model
+instance. Strictly speaking, this is not a model signal since it is sent by the
+:class:`~django.db.models.ManyToManyField`, but since it complements the
 :data:`pre_save`/:data:`post_save` and :data:`pre_delete`/:data:`post_delete`
 when it comes to tracking changes to models, it is included here.
 
 Arguments sent with this signal:
 
 ``sender``
-    The intermediate model class describing the :class:`ManyToManyField`.
-    This class is automatically created when a many-to-many field is
-    defined; you can access it using the ``through`` attribute on the
-    many-to-many field.
+    The intermediate model class describing the
+    :class:`~django.db.models.ManyToManyField`. This class is automatically
+    created when a many-to-many field is defined; you can access it using the
+    ``through`` attribute on the many-to-many field.
 
 ``instance``
     The instance whose many-to-many relation is updated. This can be an
-    instance of the ``sender``, or of the class the :class:`ManyToManyField`
-    is related to.
+    instance of the ``sender``, or of the class the
+    :class:`~django.db.models.ManyToManyField` is related to.
 
 ``action``
     A string indicating the type of update that is done on the relation.
@@ -303,8 +300,9 @@ Argument        Value
 
 ``action``      ``"pre_add"`` (followed by a separate signal with ``"post_add"``)
 
-``reverse``     ``False`` (``Pizza`` contains the :class:`ManyToManyField`,
-                so this call modifies the forward relation)
+``reverse``     ``False`` (``Pizza`` contains the
+                :class:`~django.db.models.ManyToManyField`, so this call
+                modifies the forward relation)
 
 ``model``       ``Topping`` (the class of the objects added to the
                 ``Pizza``)
@@ -329,8 +327,9 @@ Argument        Value
 
 ``action``      ``"pre_remove"`` (followed by a separate signal with ``"post_remove"``)
 
-``reverse``     ``True`` (``Pizza`` contains the :class:`ManyToManyField`,
-                so this call modifies the reverse relation)
+``reverse``     ``True`` (``Pizza`` contains the
+                :class:`~django.db.models.ManyToManyField`, so this call
+                modifies the reverse relation)
 
 ``model``       ``Pizza`` (the class of the objects removed from the
                 ``Topping``)
@@ -407,6 +406,10 @@ Arguments sent with this signal:
     For example, the :mod:`django.contrib.auth` app only prompts to create a
     superuser when ``interactive`` is ``True``.
 
+``db``
+    The database alias used for synchronization. Defaults to the ``default``
+    database.
+
 For example, ``yourapp/management/__init__.py`` could be written like::
 
     from django.db.models.signals import post_syncdb
@@ -437,9 +440,8 @@ Sent when Django begins processing an HTTP request.
 Arguments sent with this signal:
 
 ``sender``
-    The handler class -- e.g.
-    :class:`django.core.handlers.wsgi.WsgiHandler` -- that handled
-    the request.
+    The handler class -- e.g. ``django.core.handlers.wsgi.WsgiHandler`` -- that
+    handled the request.
 
 request_finished
 ----------------
@@ -449,6 +451,18 @@ request_finished
 
 Sent when Django finishes processing an HTTP request.
 
+.. note::
+
+    When a view returns a :ref:`streaming response <httpresponse-streaming>`,
+    this signal is sent only after the entire response is consumed by the
+    client (strictly speaking, by the WSGI gateway).
+
+.. versionchanged:: 1.5
+
+    Before Django 1.5, this signal was fired before sending the content to the
+    client. In order to accomodate streaming responses, it is now fired after
+    sending the content.
+
 Arguments sent with this signal:
 
 ``sender``
@@ -476,18 +490,16 @@ Test signals
 .. module:: django.test.signals
    :synopsis: Signals sent during testing.
 
-Signals only sent when :doc:`running tests </topics/testing>`.
+Signals only sent when :ref:`running tests <running-tests>`.
 
 setting_changed
 ---------------
 
-.. versionadded:: 1.4
-
 .. data:: django.test.signals.setting_changed
    :module:
 
 This signal is sent when the value of a setting is changed through the
-:meth:`django.test.TestCase.setting` context manager or the
+``django.test.TestCase.settings()`` context manager or the
 :func:`django.test.utils.override_settings` decorator/context manager.
 
 It's actually sent twice: when the new value is applied ("setup") and when the
@@ -549,8 +561,8 @@ Arguments sent with this signal:
 
 ``sender``
     The database wrapper class -- i.e.
-    :class:`django.db.backends.postgresql_psycopg2.DatabaseWrapper` or
-    :class:`django.db.backends.mysql.DatabaseWrapper`, etc.
+    ``django.db.backends.postgresql_psycopg2.DatabaseWrapper`` or
+    ``django.db.backends.mysql.DatabaseWrapper``, etc.
 
 ``connection``
     The database connection that was opened. This can be used in a
diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt
index d9b7130362..5c13ec7d96 100644
--- a/docs/ref/template-response.txt
+++ b/docs/ref/template-response.txt
@@ -56,11 +56,11 @@ Attributes
 Methods
 -------
 
-.. method:: SimpleTemplateResponse.__init__(template, context=None, mimetype=None, status=None, content_type=None)
+.. method:: SimpleTemplateResponse.__init__(template, context=None, content_type=None, status=None)
 
     Instantiates a
     :class:`~django.template.response.SimpleTemplateResponse` object
-    with the given template, context, MIME type and HTTP status.
+    with the given template, context, content type, and HTTP status.
 
     ``template``
         The full name of a template, or a sequence of template names.
@@ -75,12 +75,15 @@ Methods
         The HTTP Status code for the response.
 
     ``content_type``
-        An alias for ``mimetype``. Historically, this parameter was only called
-        ``mimetype``, but since this is actually the value included in the HTTP
-        ``Content-Type`` header, it can also include the character set encoding,
-        which makes it more than just a MIME type specification. If ``mimetype``
-        is specified (not ``None``), that value is used. Otherwise,
-        ``content_type`` is used. If neither is given,
+
+        .. versionchanged:: 1.5
+
+        Historically, this parameter was only called ``mimetype`` (now
+        deprecated), but since this is actually the value included in the HTTP
+        ``Content-Type`` header, it can also include the character set
+        encoding, which makes it more than just a MIME type specification. If
+        ``mimetype`` is specified (not ``None``), that value is used.
+        Otherwise, ``content_type`` is used. If neither is given,
         :setting:`DEFAULT_CONTENT_TYPE` is used.
 
 
@@ -117,19 +120,18 @@ Methods
     rendered :class:`~django.template.response.SimpleTemplateResponse`
     instance.
 
-    If the callback returns a value that is not `None`, this will be
+    If the callback returns a value that is not ``None``, this will be
     used as the response instead of the original response object (and
     will be passed to the next post rendering callback etc.)
 
-.. method:: SimpleTemplateResponse.render():
+.. method:: SimpleTemplateResponse.render()
 
-    Sets :attr:`response.content` to the result obtained by
+    Sets ``response.content`` to the result obtained by
     :attr:`SimpleTemplateResponse.rendered_content`, runs all post-rendering
     callbacks, and returns the resulting response object.
 
-    :meth:`~SimpleTemplateResponse.render()` will only have an effect
-    the first time it is called. On subsequent calls, it will return
-    the result obtained from the first call.
+    ``render()`` will only have an effect the first time it is called. On
+    subsequent calls, it will return the result obtained from the first call.
 
 
 TemplateResponse objects
@@ -145,7 +147,7 @@ TemplateResponse objects
 Methods
 -------
 
-.. method:: TemplateResponse.__init__(request, template, context=None, mimetype=None, status=None, content_type=None, current_app=None)
+.. method:: TemplateResponse.__init__(request, template, context=None, content_type=None, status=None, current_app=None)
 
     Instantiates an ``TemplateResponse`` object with the given
     template, context, MIME type and HTTP status.
@@ -166,12 +168,15 @@ Methods
         The HTTP Status code for the response.
 
     ``content_type``
-        An alias for ``mimetype``. Historically, this parameter was only called
-        ``mimetype``, but since this is actually the value included in the HTTP
-        ``Content-Type`` header, it can also include the character set encoding,
-        which makes it more than just a MIME type specification. If ``mimetype``
-        is specified (not ``None``), that value is used. Otherwise,
-        ``content_type`` is used. If neither is given,
+
+        .. versionchanged:: 1.5
+
+        Historically, this parameter was only called ``mimetype`` (now
+        deprecated), but since this is actually the value included in the HTTP
+        ``Content-Type`` header, it can also include the character set
+        encoding, which makes it more than just a MIME type specification. If
+        ``mimetype`` is specified (not ``None``), that value is used.
+        Otherwise, ``content_type`` is used. If neither is given,
         :setting:`DEFAULT_CONTENT_TYPE` is used.
 
     ``current_app``
@@ -188,24 +193,23 @@ returned to the client, it must be rendered. The rendering process takes the
 intermediate representation of template and context, and turns it into the
 final byte stream that can be served to the client.
 
-There are three circumstances under which a TemplateResponse will be
+There are three circumstances under which a ``TemplateResponse`` will be
 rendered:
 
-* When the TemplateResponse instance is explicitly rendered, using
+* When the ``TemplateResponse`` instance is explicitly rendered, using
   the :meth:`SimpleTemplateResponse.render()` method.
 
 * When the content of the response is explicitly set by assigning
-  :attr:`response.content`.
+  ``response.content``.
 
 * After passing through template response middleware, but before
   passing through response middleware.
 
-A TemplateResponse can only be rendered once. The first call to
-:meth:`SimpleTemplateResponse.render` sets the content of the
-response; subsequent rendering calls do not change the response
-content.
+A ``TemplateResponse`` can only be rendered once. The first call to
+:meth:`SimpleTemplateResponse.render` sets the content of the response;
+subsequent rendering calls do not change the response content.
 
-However, when :attr:`response.content` is explicitly assigned, the
+However, when ``response.content`` is explicitly assigned, the
 change is always applied. If you want to force the content to be
 re-rendered, you can re-evaluate the rendered content, and assign
 the content of the response manually::
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index db57d2de96..0162f78eed 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -221,13 +221,12 @@ straight lookups. Here are some things to keep in mind:
         self.database_record.delete()
     sensitive_function.alters_data = True
 
-* .. versionadded:: 1.4
-     Occasionally you may want to turn off this feature for other reasons,
-     and tell the template system to leave a variable un-called no matter
-     what.  To do so, set a ``do_not_call_in_templates`` attribute on the
-     callable with the value ``True``.  The template system then will act as
-     if your variable is not callable (allowing you to access attributes of
-     the callable, for example).
+* Occasionally you may want to turn off this feature for other reasons,
+  and tell the template system to leave a variable un-called no matter
+  what.  To do so, set a ``do_not_call_in_templates`` attribute on the
+  callable with the value ``True``.  The template system then will act as
+  if your variable is not callable (allowing you to access attributes of
+  the callable, for example).
 
 .. _invalid-template-variables:
 
@@ -558,15 +557,17 @@ Note that these paths should use Unix-style forward slashes, even on Windows.
 The Python API
 ~~~~~~~~~~~~~~
 
-Django has two ways to load templates from files:
+.. module:: django.template.loader
 
-.. function:: django.template.loader.get_template(template_name)
+``django.template.loader`` has two functions to load templates from files:
+
+.. function:: get_template(template_name)
 
     ``get_template`` returns the compiled template (a ``Template`` object) for
     the template with the given name. If the template doesn't exist, it raises
     ``django.template.TemplateDoesNotExist``.
 
-.. function:: django.template.loader.select_template(template_name_list)
+.. function:: select_template(template_name_list)
 
     ``select_template`` is just like ``get_template``, except it takes a list
     of template names. Of the list, it returns the first template that exists.
@@ -631,11 +632,19 @@ by editing your :setting:`TEMPLATE_LOADERS` setting. :setting:`TEMPLATE_LOADERS`
 should be a tuple of strings, where each string represents a template loader
 class. Here are the template loaders that come with Django:
 
+.. currentmodule:: django.template.loaders
+
 ``django.template.loaders.filesystem.Loader``
+
+.. class:: filesystem.Loader
+
     Loads templates from the filesystem, according to :setting:`TEMPLATE_DIRS`.
     This loader is enabled by default.
 
 ``django.template.loaders.app_directories.Loader``
+
+.. class:: app_directories.Loader
+
     Loads templates from Django apps on the filesystem. For each app in
     :setting:`INSTALLED_APPS`, the loader looks for a ``templates``
     subdirectory. If the directory exists, Django looks for templates in there.
@@ -670,12 +679,18 @@ class. Here are the template loaders that come with Django:
     This loader is enabled by default.
 
 ``django.template.loaders.eggs.Loader``
+
+.. class:: eggs.Loader
+
     Just like ``app_directories`` above, but it loads templates from Python
     eggs rather than from the filesystem.
 
     This loader is disabled by default.
 
 ``django.template.loaders.cached.Loader``
+
+.. class:: cached.Loader
+
     By default, the templating system will read and compile your templates every
     time they need to be rendered. While the Django templating system is quite
     fast, the overhead from reading and compiling templates can add up.
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 57ef0cfb27..123e114c4a 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -147,9 +147,8 @@ You can use any number of values in a ``{% cycle %}`` tag, separated by spaces.
 Values enclosed in single (``'``) or double quotes (``"``) are treated as
 string literals, while values without quotes are treated as template variables.
 
-Note that the variables included in the cycle will not be escaped.
-This is because template tags do not escape their content. Any HTML or
-Javascript code contained in the printed variable will be rendered
+Note that currently the variables included in the cycle will not be escaped.
+Any HTML or Javascript code contained in the printed variable will be rendered
 as-is, which could potentially lead to security issues.
 
 For backwards compatibility, the ``{% cycle %}`` tag supports the much inferior
@@ -172,7 +171,7 @@ just declare the cycle, but not output the first value, you can add a
 
     {% for obj in some_list %}
         {% cycle 'row1' 'row2' as rowcolors silent %}
-        <tr class="{{ rowcolors }}">{% include "subtemplate.html " %}</tr>
+        <tr class="{{ rowcolors }}">{% include "subtemplate.html" %}</tr>
     {% endfor %}
 
 This will output a list of ``<tr>`` elements with ``class``
@@ -190,6 +189,22 @@ call to ``{% cycle %}`` doesn't specify silent::
     {% cycle 'row1' 'row2' as rowcolors silent %}
     {% cycle rowcolors %}
 
+.. versionchanged:: 1.6
+
+To improve safety, future versions of ``cycle`` will automatically escape
+their output. You're encouraged to activate this behavior by loading
+``cycle`` from the ``future`` template library::
+
+    {% load cycle from future %}
+
+When using the ``future`` version, you can disable auto-escaping with::
+
+    {% for o in some_list %}
+        <tr class="{% autoescape off %}{% cycle rowvalue1 rowvalue2 %}{% endautoescape %}">
+            ...
+        </tr>
+    {% endfor %}
+
 .. templatetag:: debug
 
 debug
@@ -257,28 +272,44 @@ This is equivalent to::
 
     {% if var1 %}
         {{ var1|safe }}
-    {% else %}{% if var2 %}
+    {% elif var2 %}
         {{ var2|safe }}
-    {% else %}{% if var3 %}
+    {% elif var3 %}
         {{ var3|safe }}
-    {% endif %}{% endif %}{% endif %}
+    {% endif %}
 
 You can also use a literal string as a fallback value in case all
 passed variables are False::
 
     {% firstof var1 var2 var3 "fallback value" %}
 
-Note that the variables included in the firstof tag will not be
-escaped. This is because template tags do not escape their content.
-Any HTML or Javascript code contained in the printed variable will be
-rendered as-is, which could potentially lead to security issues. If you
-need to escape the variables in the firstof tag, you must do so
-explicitly::
+Note that currently the variables included in the firstof tag will not be
+escaped. Any HTML or Javascript code contained in the printed variable will be
+rendered as-is, which could potentially lead to security issues. If you need
+to escape the variables in the firstof tag, you must do so explicitly::
 
     {% filter force_escape %}
         {% firstof var1 var2 var3 "fallback value" %}
     {% endfilter %}
 
+.. versionchanged:: 1.6
+
+To improve safety, future versions of ``firstof`` will automatically escape
+their output. You're encouraged to activate this behavior by loading
+``firstof`` from the ``future`` template library::
+
+    {% load firstof from future %}
+
+When using the ``future`` version, you can disable auto-escaping with::
+
+    {% autoescape off %}
+        {% firstof var1 var2 var3 "<strong>fallback value</strong>" %}
+    {% endautoescape %}
+
+Or if only some variables should be escaped, you can use::
+
+    {% firstof var1 var2|safe var3 "<strong>fallback value</strong>"|safe %}
+
 .. templatetag:: for
 
 for
@@ -377,14 +408,10 @@ block are output::
 In the above, if ``athlete_list`` is not empty, the number of athletes will be
 displayed by the ``{{ athlete_list|length }}`` variable.
 
-As you can see, the ``if`` tag may take one or several `` {% elif %}``
+As you can see, the ``if`` tag may take one or several ``{% elif %}``
 clauses, as well as an ``{% else %}`` clause that will be displayed if all
 previous conditions fail. These clauses are optional.
 
-.. versionadded:: 1.4
-
-The ``if`` tag now supports ``{% elif %}`` clauses.
-
 Boolean operators
 ^^^^^^^^^^^^^^^^^
 
@@ -743,8 +770,6 @@ escaped, because it's not a format character::
 
 This would display as "It is the 4th of September".
 
-.. versionchanged:: 1.4
-
 .. note::
 
     The format passed can also be one of the predefined ones
@@ -864,7 +889,7 @@ an attribute "description," you could use::
     {% regroup cities by country.description as country_list %}
 
 Or, if ``country`` is a field with ``choices``, it will have a
-:meth:`^django.db.models.Model.get_FOO_display` method available as an
+:meth:`~django.db.models.Model.get_FOO_display` method available as an
 attribute, allowing  you to group on the display string rather than the
 ``choices`` key::
 
@@ -1079,11 +1104,11 @@ value to a maximum value, and then applies that ratio to a constant.
 For example::
 
     <img src="bar.png" alt="Bar"
-         height="10" width="{% widthratio this_value max_value 100 %}" />
+         height="10" width="{% widthratio this_value max_value max_width %}" />
 
-Above, if ``this_value`` is 175 and ``max_value`` is 200, the image in the
-above example will be 88 pixels wide (because 175/200 = .875; .875 * 100 = 87.5
-which is rounded up to 88).
+If ``this_value`` is 175, ``max_value`` is 200, and ``max_width`` is 100, the
+image in the above example will be 88 pixels wide
+(because 175/200 = .875; .875 * 100 = 87.5 which is rounded up to 88).
 
 .. templatetag:: with
 
@@ -1289,10 +1314,6 @@ Z                 Time zone offset in seconds. The          ``-43200`` to ``4320
                   UTC is always positive.
 ================  ========================================  =====================
 
-.. versionadded:: 1.4
-
-The ``e`` and ``o`` format specification characters were added in Django 1.4.
-
 For example::
 
     {{ value|date:"D d M Y" }}
@@ -1915,7 +1936,7 @@ slice
 Returns a slice of the list.
 
 Uses the same syntax as Python's list slicing. See
-http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice
+http://www.diveintopython3.net/native-datatypes.html#slicinglists
 for an introduction.
 
 Example::
@@ -2069,8 +2090,6 @@ If ``value`` is ``"my first post"``, the output will be ``"My First Post"``.
 truncatechars
 ^^^^^^^^^^^^^
 
-.. versionadded:: 1.4
-
 Truncates a string if it is longer than the specified number of characters.
 Truncated strings will end with a translatable ellipsis sequence ("...").
 
@@ -2200,11 +2219,6 @@ It also supports domain-only links ending in one of the original top level
 domains (``.com``, ``.edu``, ``.gov``, ``.int``, ``.mil``, ``.net``, and
 ``.org``). For example, ``djangoproject.com`` gets converted.
 
-.. versionchanged:: 1.4
-
-Until Django 1.4, only the ``.com``, ``.net`` and ``.org`` suffixes were
-supported for domain-only links.
-
 Links can have trailing punctuation (periods, commas, close-parens) and leading
 punctuation (opening parens), and ``urlize`` will still do the right thing.
 
@@ -2334,8 +2348,6 @@ See :ref:`topic-l10n-templates`.
 tz
 ^^
 
-.. versionadded:: 1.4
-
 This library provides control over time zone conversions in templates.
 Like ``l10n``, you only need to load the library using ``{% load tz %}``,
 but you'll usually also set :setting:`USE_TZ` to ``True`` so that conversion
@@ -2356,16 +2368,6 @@ django.contrib.humanize
 A set of Django template filters useful for adding a "human touch" to data. See
 :doc:`/ref/contrib/humanize`.
 
-django.contrib.markup
-^^^^^^^^^^^^^^^^^^^^^
-
-A collection of template filters that implement these common markup languages:
-
-* Textile
-* Markdown
-* reST (reStructuredText)
-
-See the :doc:`markup documentation </ref/contrib/markup>`.
 
 django.contrib.webdesign
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -2416,8 +2418,10 @@ slightly different call::
     The :mod:`staticfiles<django.contrib.staticfiles>` contrib app also ships
     with a :ttag:`static template tag<staticfiles-static>` which uses
     ``staticfiles'`` :setting:`STATICFILES_STORAGE` to build the URL of the
-    given path. Use that instead if you have an advanced use case such as
-    :ref:`using a cloud service to serve static files<staticfiles-from-cdn>`::
+    given path (rather than simply using :func:`urlparse.urljoin` with the
+    :setting:`STATIC_URL` setting and the given path). Use that instead if you
+    have an advanced use case such as :ref:`using a cloud service to serve
+    static files<staticfiles-from-cdn>`::
 
         {% load static from staticfiles %}
         <img src="{% static "images/hi.jpg" %}" alt="Hi!" />
diff --git a/docs/ref/unicode.txt b/docs/ref/unicode.txt
index 784ff33398..bd5bdc96a9 100644
--- a/docs/ref/unicode.txt
+++ b/docs/ref/unicode.txt
@@ -20,14 +20,14 @@ able to store certain characters in the database, and information will be lost.
 * MySQL users, refer to the `MySQL manual`_ (section 9.1.3.2 for MySQL 5.1)
   for details on how to set or alter the database character set encoding.
 
-* PostgreSQL users, refer to the `PostgreSQL manual`_ (section 21.2.2 in
-  PostgreSQL 8) for details on creating databases with the correct encoding.
+* PostgreSQL users, refer to the `PostgreSQL manual`_ (section 22.3.2 in
+  PostgreSQL 9) for details on creating databases with the correct encoding.
 
 * SQLite users, there is nothing you need to do. SQLite always uses UTF-8
   for internal encoding.
 
 .. _MySQL manual: http://dev.mysql.com/doc/refman/5.1/en/charset-database.html
-.. _PostgreSQL manual: http://www.postgresql.org/docs/8.2/static/multibyte.html#AEN24104
+.. _PostgreSQL manual: http://www.postgresql.org/docs/current/static/multibyte.html
 
 All of Django's database backends automatically convert Unicode strings into
 the appropriate encoding for talking to the database. They also automatically
@@ -68,7 +68,7 @@ Python 2 with unicode literals or Python 3::
 
 See also :doc:`Python 3 compatibility </topics/python3>`.
 
-.. admonition:: Warning
+.. warning::
 
     A bytestring does not carry any information with it about its encoding.
     For that reason, we have to make an assumption, and Django assumes that all
diff --git a/docs/ref/urlresolvers.txt b/docs/ref/urlresolvers.txt
index 528f172061..87c0605a11 100644
--- a/docs/ref/urlresolvers.txt
+++ b/docs/ref/urlresolvers.txt
@@ -71,8 +71,6 @@ You can use ``kwargs`` instead of ``args``. For example::
 reverse_lazy()
 --------------
 
-.. versionadded:: 1.4
-
 A lazily evaluated version of `reverse()`_.
 
 .. function:: reverse_lazy(viewname, [urlconf=None, args=None, kwargs=None, current_app=None])
diff --git a/docs/ref/urls.txt b/docs/ref/urls.txt
index b9a0199984..e68edc8254 100644
--- a/docs/ref/urls.txt
+++ b/docs/ref/urls.txt
@@ -4,14 +4,6 @@
 
 .. module:: django.conf.urls
 
-.. versionchanged:: 1.4
-    Starting with Django 1.4 functions ``patterns``, ``url``, ``include`` plus
-    the ``handler*`` symbols described below live in the ``django.conf.urls``
-    module.
-
-    Until Django 1.3 they were located in ``django.conf.urls.defaults``. You
-    still can import them from there but it will be removed in Django 1.6.
-
 patterns()
 ----------
 
@@ -31,12 +23,12 @@ The ``optional_dictionary`` and ``optional_name`` parameters are described in
 :ref:`Passing extra options to view functions <views-extra-options>`.
 
 .. note::
-    Because `patterns()` is a function call, it accepts a maximum of 255
+    Because ``patterns()`` is a function call, it accepts a maximum of 255
     arguments (URL patterns, in this case). This is a limit for all Python
     function calls. This is rarely a problem in practice, because you'll
-    typically structure your URL patterns modularly by using `include()`
+    typically structure your URL patterns modularly by using ``include()``
     sections. However, on the off-chance you do hit the 255-argument limit,
-    realize that `patterns()` returns a Python list, so you can split up the
+    realize that ``patterns()`` returns a Python list, so you can split up the
     construction of the list.
 
     ::
@@ -52,6 +44,20 @@ The ``optional_dictionary`` and ``optional_name`` parameters are described in
     patterns you can construct. The only limit is that you can only create 254
     at a time (the 255th argument is the initial prefix argument).
 
+static()
+--------
+
+.. function:: static.static(prefix, view='django.views.static.serve', **kwargs)
+
+Helper function to return a URL pattern for serving files in debug mode::
+
+    from django.conf import settings
+    from django.conf.urls.static import static
+
+    urlpatterns = patterns('',
+        # ... the rest of your URLconf goes here ...
+    ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+
 url()
 -----
 
@@ -94,7 +100,6 @@ include()
     application and instance namespaces.
 
     :arg module: URLconf module (or module name)
-    :type module: Module or string
     :arg namespace: Instance namespace for the URL entries being included
     :type namespace: string
     :arg app_name: Application namespace for the URL entries being included
@@ -122,9 +127,6 @@ value should suffice.
 See the documentation about :ref:`the 403 (HTTP Forbidden) view
 <http_forbidden_view>` for more information.
 
-.. versionadded:: 1.4
-    ``handler403`` is new in Django 1.4.
-
 handler404
 ----------
 
@@ -153,4 +155,3 @@ value should suffice.
 
 See the documentation about :ref:`the 500 (HTTP Internal Server Error) view
 <http_internal_server_error_view>` for more information.
-
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 2f12c3a96c..a7d5b6690e 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -138,15 +138,13 @@ results. Instead do::
 ``django.utils.dateparse``
 ==========================
 
-.. versionadded:: 1.4
-
 .. module:: django.utils.dateparse
    :synopsis: Functions to parse datetime objects.
 
 The functions defined in this module share the following properties:
 
-- They raise :exc:`ValueError` if their input is well formatted but isn't a
-  valid date or time.
+- They raise :exc:`~exceptions.ValueError` if their input is well formatted but
+  isn't a valid date or time.
 - They return ``None`` if it isn't well formatted at all.
 - They accept up to picosecond resolution in input, but they truncate it to
   microseconds, since that's what Python supports.
@@ -192,8 +190,7 @@ The functions defined in this module share the following properties:
     Like ``decorator_from_middleware``, but returns a function
     that accepts the arguments to be passed to the middleware_class.
     For example, the :func:`~django.views.decorators.cache.cache_page`
-    decorator is created from the
-    :class:`~django.middleware.cache.CacheMiddleware` like this::
+    decorator is created from the ``CacheMiddleware`` like this::
 
          cache_page = decorator_from_middleware_with_args(CacheMiddleware)
 
@@ -284,15 +281,15 @@ The functions defined in this module share the following properties:
 .. function:: smart_str(s, encoding='utf-8', strings_only=False, errors='strict')
 
     Alias of :func:`smart_bytes` on Python 2 and :func:`smart_text` on Python
-    3. This function returns a :class:`str` or a lazy string.
+    3. This function returns a ``str`` or a lazy string.
 
-    For instance, this is  suitable for writing to :attr:`sys.stdout` on
+    For instance, this is  suitable for writing to :data:`sys.stdout` on
     Python 2 and 3.
 
 .. function:: force_str(s, encoding='utf-8', strings_only=False, errors='strict')
 
     Alias of :func:`force_bytes` on Python 2 and :func:`force_text` on Python
-    3. This function always returns a :class:`str`.
+    3. This function always returns a ``str``.
 
 .. function:: iri_to_uri(iri)
 
@@ -532,7 +529,7 @@ escaping HTML.
 
     .. code-block:: python
 
-        format_html(u"%{0} <b>{1}</b> {2}",
+        format_html(u"{0} <b>{1}</b> {2}",
                     mark_safe(some_html), some_text, some_other_text)
 
     This has the advantage that you don't need to apply :func:`escape` to each
@@ -544,6 +541,19 @@ escaping HTML.
     through :func:`conditional_escape` which (ultimately) calls
     :func:`~django.utils.encoding.force_text` on the values.
 
+.. function:: format_html_join(sep, format_string, args_generator)
+
+    A wrapper of :func:`format_html`, for the common case of a group of
+    arguments that need to be formatted using the same format string, and then
+    joined using ``sep``. ``sep`` is also passed through
+    :func:`conditional_escape`.
+
+    ``args_generator`` should be an iterator that returns the sequence of
+    ``args`` that will be passed to :func:`format_html`. For example::
+
+        format_html_join('\n', "<li>{0} {1}</li>", ((u.first_name, u.last_name)
+                                                    for u in users))
+
 .. function:: strip_tags(value)
 
     Removes anything that looks like an html tag from the string, that is
@@ -558,11 +568,11 @@ escaping HTML.
 
 .. function:: remove_tags(value, tags)
 
-    Removes a list of [X]HTML tag names from the output.
+    Removes a space-separated list of [X]HTML tag names from the output.
 
     For example::
 
-        remove_tags(value, ["b", "span"])
+        remove_tags(value, "b span")
 
     If ``value`` is ``"<b>Joel</b> <button>is</button> a <span>slug</span>"`` the
     return value will be ``"Joel <button>is</button> a slug"``.
@@ -626,12 +636,34 @@ escaping HTML.
 .. function:: base36_to_int(s)
 
     Converts a base 36 string to an integer. On Python 2 the output is
-    guaranteed to be an :class:`int` and not a :class:`long`.
+    guaranteed to be an ``int`` and not a ``long``.
 
 .. function:: int_to_base36(i)
 
     Converts a positive integer to a base 36 string. On Python 2 ``i`` must be
-    smaller than :attr:`sys.maxint`.
+    smaller than :data:`sys.maxint`.
+
+``django.utils.module_loading``
+===============================
+
+.. module:: django.utils.module_loading
+   :synopsis: Functions for working with Python modules.
+
+Functions for working with Python modules.
+
+.. function:: import_by_path(dotted_path, error_prefix='')
+
+    Imports a dotted module path and returns the attribute/class designated by
+    the last name in the path. Raises
+    :exc:`~django.core.exceptions.ImproperlyConfigured` if something goes
+    wrong. For example::
+
+        from django.utils.module_loading import import_by_path
+        import_by_path = import_by_path('django.utils.module_loading.import_by_path')
+
+    is equivalent to::
+
+        from django.utils.module_loading import import_by_path
 
 ``django.utils.safestring``
 ===========================
@@ -649,12 +681,12 @@ appropriate entities.
 
     .. versionadded:: 1.5
 
-    A :class:`bytes` subclass that has been specifically marked as "safe"
+    A ``bytes`` subclass that has been specifically marked as "safe"
     (requires no further escaping) for HTML output purposes.
 
 .. class:: SafeString
 
-    A :class:`str` subclass that has been specifically marked as "safe"
+    A ``str`` subclass that has been specifically marked as "safe"
     (requires no further escaping) for HTML output purposes. This is
     :class:`SafeBytes` on Python 2 and :class:`SafeText` on Python 3.
 
@@ -662,7 +694,7 @@ appropriate entities.
 
     .. versionadded:: 1.5
 
-    A :class:`str` (in Python 3) or :class:`unicode` (in Python 2) subclass
+    A ``str`` (in Python 3) or ``unicode`` (in Python 2) subclass
     that has been specifically marked as "safe" for HTML output purposes.
 
 .. class:: SafeUnicode
@@ -788,8 +820,6 @@ For a complete discussion on the usage of the following see the
 
 .. function:: override(language, deactivate=False)
 
-    .. versionadded:: 1.4
-
     A Python context manager that uses
     :func:`django.utils.translation.activate` to fetch the translation object
     for a given language, installing it as the translation object for the
@@ -812,8 +842,6 @@ For a complete discussion on the usage of the following see the
 
 .. function:: get_language_from_request(request, check_path=False)
 
-    .. versionchanged:: 1.4
-
     Analyzes the request to find what language the user wants the system to show.
     Only languages listed in settings.LANGUAGES are taken into account. If the user
     requests a sublanguage where we have a main language, we send out the main
@@ -838,8 +866,6 @@ For a complete discussion on the usage of the following see the
 ``django.utils.timezone``
 =========================
 
-.. versionadded:: 1.4
-
 .. module:: django.utils.timezone
     :synopsis: Timezone support.
 
diff --git a/docs/ref/validators.txt b/docs/ref/validators.txt
index b68d6f2772..92e257ca85 100644
--- a/docs/ref/validators.txt
+++ b/docs/ref/validators.txt
@@ -96,7 +96,7 @@ to, or in lieu of custom ``field.clean()`` methods.
 ------------------
 .. data:: validate_email
 
-    A :class:`RegexValidator` instance that ensures a value looks like an
+    An ``EmailValidator`` instance that ensures a value looks like an
     email address.
 
 ``validate_slug``
@@ -115,15 +115,13 @@ to, or in lieu of custom ``field.clean()`` methods.
 
 ``validate_ipv6_address``
 -------------------------
-.. versionadded:: 1.4
 
 .. data:: validate_ipv6_address
 
-    Uses :mod:`django.utils.ipv6` to check the validity of an IPv6 address.
+    Uses ``django.utils.ipv6`` to check the validity of an IPv6 address.
 
 ``validate_ipv46_address``
 --------------------------
-.. versionadded:: 1.4
 
 .. data:: validate_ipv46_address
 
diff --git a/docs/ref/views.txt b/docs/ref/views.txt
new file mode 100644
index 0000000000..3753f83f07
--- /dev/null
+++ b/docs/ref/views.txt
@@ -0,0 +1,48 @@
+==============
+Built-in Views
+==============
+
+.. module:: django.views
+   :synopsis: Django's built-in views.
+
+Several of Django's built-in views are documented in
+:doc:`/topics/http/views` as well as elsewhere in the documentation.
+
+Serving files in development
+----------------------------
+
+.. function:: static.serve(request, path, document_root, show_indexes=False)
+
+There may be files other than your project's static assets that, for
+convenience, you'd like to have Django serve for you in local development.
+The :func:`~django.views.static.serve` view can be used to serve any directory
+you give it. (This view is **not** hardened for production use and should be
+used only as a development aid; you should serve these files in production
+using a real front-end webserver).
+
+The most likely example is user-uploaded content in :setting:`MEDIA_ROOT`.
+``django.contrib.staticfiles`` is intended for static assets and has no
+built-in handling for user-uploaded files, but you can have Django serve your
+:setting:`MEDIA_ROOT` by appending something like this to your URLconf::
+
+    from django.conf import settings
+
+    # ... the rest of your URLconf goes here ...
+
+    if settings.DEBUG:
+        urlpatterns += patterns('',
+            url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+                'document_root': settings.MEDIA_ROOT,
+            }),
+       )
+
+Note, the snippet assumes your :setting:`MEDIA_URL` has a value of
+``'/media/'``. This will call the :func:`~django.views.static.serve` view,
+passing in the path from the URLconf and the (required) ``document_root``
+parameter.
+
+Since it can become a bit cumbersome to define this URL pattern, Django
+ships with a small URL helper function :func:`~django.conf.urls.static.static`
+that takes as parameters the prefix such as :setting:`MEDIA_URL` and a dotted
+path to a view, such as ``'django.views.static.serve'``. Any other function
+parameter will be transparently passed to the view.
diff --git a/docs/releases/0.96.txt b/docs/releases/0.96.txt
index a608629957..bbec1c3eaf 100644
--- a/docs/releases/0.96.txt
+++ b/docs/releases/0.96.txt
@@ -34,8 +34,7 @@ exceptions if you attempt to use an older version.
 If you're currently unable to upgrade your copy of ``MySQLdb`` to meet
 this requirement, a separate, backwards-compatible backend, called
 "mysql_old", has been added to Django. To use this backend, change
-the :setting:`DATABASE_ENGINE` setting in your Django settings file from
-this::
+the ``DATABASE_ENGINE`` setting in your Django settings file from this::
 
     DATABASE_ENGINE = "mysql"
 
@@ -49,7 +48,7 @@ provided only to ease this transition, and is considered deprecated;
 aside from any necessary security fixes, it will not be actively
 maintained, and it will be removed in a future release of Django.
 
-Also, note that some features, like the new :setting:`DATABASE_OPTIONS`
+Also, note that some features, like the new ``DATABASE_OPTIONS``
 setting (see the :doc:`databases documentation </ref/databases>` for details),
 are only available on the "mysql" backend, and will not be made available for
 "mysql_old".
@@ -220,7 +219,7 @@ supported :doc:`serialization formats </topics/serialization>`, that will be
 loaded into your database at the start of your tests. This makes testing with
 real data much easier.
 
-See :doc:`the testing documentation </topics/testing>` for the full details.
+See :doc:`the testing documentation </topics/testing/index>` for the full details.
 
 Improvements to the admin interface
 -----------------------------------
diff --git a/docs/releases/1.0-porting-guide.txt b/docs/releases/1.0-porting-guide.txt
index 29e40b2ebe..644350525c 100644
--- a/docs/releases/1.0-porting-guide.txt
+++ b/docs/releases/1.0-porting-guide.txt
@@ -277,8 +277,9 @@ Handle uploaded files using the new API
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Replace use of uploaded files -- that is, entries in ``request.FILES`` -- as
-simple dictionaries with the new :class:`~django.core.files.UploadedFile`. The
-old dictionary syntax no longer works.
+simple dictionaries with the new
+:class:`~django.core.files.uploadedfile.UploadedFile`. The old dictionary
+syntax no longer works.
 
 Thus, in a view like::
 
@@ -410,7 +411,7 @@ U.S. local flavor
 ~~~~~~~~~~~~~~~~~
 
 ``django.contrib.localflavor.usa`` has been renamed to
-:mod:`django.contrib.localflavor.us`. This change was made to match the naming
+``django.contrib.localflavor.us``. This change was made to match the naming
 scheme of other local flavors. To migrate your code, all you need to do is
 change the imports.
 
@@ -439,9 +440,10 @@ Settings
 Better exceptions
 ~~~~~~~~~~~~~~~~~
 
-The old :exc:`EnvironmentError` has split into an :exc:`ImportError` when
-Django fails to find the settings module and a :exc:`RuntimeError` when you try
-to reconfigure settings after having already used them
+The old :exc:`~exceptions.EnvironmentError` has split into an
+:exc:`~exceptions.ImportError` when Django fails to find the settings module
+and a :exc:`~exceptions.RuntimeError` when you try to reconfigure settings
+after having already used them.
 
 :setting:`LOGIN_URL` has moved
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -476,8 +478,8 @@ Smaller model changes
 Different exception from ``get()``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Managers now return a :exc:`MultipleObjectsReturned` exception
-instead of :exc:`AssertionError`:
+Managers now return a :exc:`~django.core.exceptions.MultipleObjectsReturned`
+exception instead of :exc:`~exceptions.AssertionError`:
 
 Old (0.96)::
 
@@ -548,7 +550,7 @@ need to reload your data. Do this after you have made the change to using
   **Back up your database first!**
 
   For SQLite, this means making a copy of the single file that stores the
-  database (the name of that file is the :setting:`DATABASE_NAME` in your
+  database (the name of that file is the ``DATABASE_NAME`` in your
   settings.py file).
 
 To upgrade each application to use a ``DecimalField``, you can do the
@@ -641,8 +643,8 @@ The generic relation classes -- ``GenericForeignKey`` and ``GenericRelation``
 Testing
 -------
 
-:meth:`django.test.Client.login` has changed
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:meth:`django.test.client.Client.login` has changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Old (0.96)::
 
@@ -720,7 +722,7 @@ To update your code:
 1. Use :class:`django.utils.datastructures.SortedDict` wherever you were
    using ``django.newforms.forms.SortedDictFromList``.
 
-2. Because :meth:`django.utils.datastructures.SortedDict.copy` doesn't
+2. Because ``django.utils.datastructures.SortedDict.copy`` doesn't
    return a deepcopy as ``SortedDictFromList.copy()`` did, you will need
    to update your code if you were relying on a deepcopy. Do this by using
    ``copy.deepcopy`` directly.
@@ -769,4 +771,3 @@ Old (0.96)                               New (1.0)
 ``backend.uses_case_insensitive_names``  ``connection.features.uses_case_insensitive_names``
 ``backend.uses_custom_queryset``         ``connection.features.uses_custom_queryset``
 =======================================  ===================================================
-
diff --git a/docs/releases/1.1-alpha-1.txt b/docs/releases/1.1-alpha-1.txt
index 10b0d5d71e..b20b4103b8 100644
--- a/docs/releases/1.1-alpha-1.txt
+++ b/docs/releases/1.1-alpha-1.txt
@@ -32,11 +32,13 @@ Aggregate support
 It's now possible to run SQL aggregate queries (i.e. ``COUNT()``, ``MAX()``,
 ``MIN()``, etc.) from within Django's ORM. You can choose to either return the
 results of the aggregate directly, or else annotate the objects in a
-:class:`QuerySet` with the results of the aggregate query.
+:class:`~django.db.models.query.QuerySet` with the results of the aggregate
+query.
 
-This feature is available as new :meth:`QuerySet.aggregate()`` and
-:meth:`QuerySet.annotate()`` methods, and is covered in detail in :doc:`the ORM
-aggregation documentation </topics/db/aggregation>`
+This feature is available as new
+:meth:`~django.db.models.query.QuerySet.aggregate` and
+:meth:`~django.db.models.query.QuerySet.annotate` methods, and is covered in
+detail in :doc:`the ORM aggregation documentation </topics/db/aggregation>`.
 
 Query expressions
 ~~~~~~~~~~~~~~~~~
@@ -51,7 +53,7 @@ Performance improvements
 
 .. currentmodule:: django.test
 
-Tests written using Django's :doc:`testing framework </topics/testing>` now run
+Tests written using Django's :doc:`testing framework </topics/testing/index>` now run
 dramatically faster (as much as 10 times faster in many cases).
 
 This was accomplished through the introduction of transaction-based tests: when
diff --git a/docs/releases/1.1-beta-1.txt b/docs/releases/1.1-beta-1.txt
index 9bac3a53f1..88d8ce5f35 100644
--- a/docs/releases/1.1-beta-1.txt
+++ b/docs/releases/1.1-beta-1.txt
@@ -36,7 +36,7 @@ A number of features have been added to Django's model layer:
 You can now control whether or not Django creates database tables for a model
 using the :attr:`~Options.managed` model option. This defaults to ``True``,
 meaning that Django will create the appropriate database tables in
-:djadmin:`syncdb` and remove them as part of :djadmin:`reset` command. That
+:djadmin:`syncdb` and remove them as part of ``reset`` command. That
 is, Django *manages* the database table's lifecycle.
 
 If you set this to ``False``, however, no database table creating or deletion
@@ -102,7 +102,7 @@ Testing improvements
 .. currentmodule:: django.test.client
 
 A couple of small but very useful improvements have been made to the
-:doc:`testing framework </topics/testing>`:
+:doc:`testing framework </topics/testing/index>`:
 
 * The test :class:`Client` now can automatically follow redirects with the
   ``follow`` argument to :meth:`Client.get` and :meth:`Client.post`. This
diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt
index 852644dee4..ca8e1fff2a 100644
--- a/docs/releases/1.1.txt
+++ b/docs/releases/1.1.txt
@@ -37,7 +37,7 @@ If you are using a 32-bit platform, you're off the hook; you'll observe no
 differences as a result of this change.
 
 However, **users on 64-bit platforms may experience some problems** using the
-:djadmin:`reset` management command. Prior to this change, 64-bit platforms
+``reset`` management command. Prior to this change, 64-bit platforms
 would generate a 64-bit, 16 character digest in the constraint name; for
 example::
 
@@ -48,14 +48,14 @@ Following this change, all platforms, regardless of word size, will generate a
 
     ALTER TABLE myapp_sometable ADD CONSTRAINT object_id_refs_id_32091d1e FOREIGN KEY ...
 
-As a result of this change, you will not be able to use the :djadmin:`reset`
+As a result of this change, you will not be able to use the ``reset``
 management command on any table made by a 64-bit machine. This is because the
 the new generated name will not match the historically generated name; as a
 result, the SQL constructed by the reset command will be invalid.
 
 If you need to reset an application that was created with 64-bit constraints,
 you will need to manually drop the old constraint prior to invoking
-:djadmin:`reset`.
+``reset``.
 
 Test cases are now run in a transaction
 ---------------------------------------
@@ -120,9 +120,8 @@ has been saved.
 Changes to how model formsets are saved
 ---------------------------------------
 
-.. currentmodule:: django.forms.models
-
-In Django 1.1, :class:`BaseModelFormSet` now calls :meth:`ModelForm.save()`.
+In Django 1.1, :class:`~django.forms.models.BaseModelFormSet` now calls
+``ModelForm.save()``.
 
 This is backwards-incompatible if you were modifying ``self.initial`` in a model
 formset's ``__init__``, or if you relied on the internal ``_total_form_count``
@@ -132,7 +131,7 @@ public methods.
 Fixed the ``join`` filter's escaping behavior
 ---------------------------------------------
 
-The :ttag:`join` filter no longer escapes the literal value that is
+The :tfilter:`join` filter no longer escapes the literal value that is
 passed in for the connector.
 
 This is backwards incompatible for the special situation of the literal string
@@ -146,7 +145,7 @@ Permanent redirects and the ``redirect_to()`` generic view
 ----------------------------------------------------------
 
 Django 1.1 adds a ``permanent`` argument to the
-:func:`django.views.generic.simple.redirect_to()` view. This is technically
+``django.views.generic.simple.redirect_to()`` view. This is technically
 backwards-incompatible if you were using the ``redirect_to`` view with a
 format-string key called 'permanent', which is highly unlikely.
 
@@ -198,19 +197,21 @@ Aggregate support
 It's now possible to run SQL aggregate queries (i.e. ``COUNT()``, ``MAX()``,
 ``MIN()``, etc.) from within Django's ORM. You can choose to either return the
 results of the aggregate directly, or else annotate the objects in a
-:class:`QuerySet` with the results of the aggregate query.
+:class:`~django.db.models.query.QuerySet` with the results of the aggregate
+query.
 
-This feature is available as new :meth:`QuerySet.aggregate()`` and
-:meth:`QuerySet.annotate()`` methods, and is covered in detail in :doc:`the ORM
-aggregation documentation </topics/db/aggregation>`.
+This feature is available as new
+:meth:`~django.db.models.query.QuerySet.aggregate` and
+:meth:`~django.db.models.query.QuerySet.annotate` methods, and is covered in
+detail in :doc:`the ORM aggregation documentation </topics/db/aggregation>`.
 
 Query expressions
 ~~~~~~~~~~~~~~~~~
 
 Queries can now refer to a another field on the query and can traverse
 relationships to refer to fields on related models. This is implemented in the
-new :class:`F` object; for full details, including examples, consult the
-:ref:`documentation for F expressions <query-expressions>`.
+new :class:`~django.db.models.F` object; for full details, including examples,
+consult the :ref:`documentation for F expressions <query-expressions>`.
 
 Model improvements
 ------------------
@@ -223,7 +224,7 @@ A number of features have been added to Django's model layer:
 You can now control whether or not Django manages the life-cycle of the database
 tables for a model using the :attr:`~Options.managed` model option. This
 defaults to ``True``, meaning that Django will create the appropriate database
-tables in :djadmin:`syncdb` and remove them as part of the :djadmin:`reset`
+tables in :djadmin:`syncdb` and remove them as part of the ``reset``
 command. That is, Django *manages* the database table's lifecycle.
 
 If you set this to ``False``, however, no database table creating or deletion
@@ -264,14 +265,14 @@ Testing improvements
 --------------------
 
 A few notable improvements have been made to the :doc:`testing framework
-</topics/testing>`.
+</topics/testing/index>`.
 
 Test performance improvements
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. currentmodule:: django.test
 
-Tests written using Django's :doc:`testing framework </topics/testing>` now run
+Tests written using Django's :doc:`testing framework </topics/testing/index>` now run
 dramatically faster (as much as 10 times faster in many cases).
 
 This was accomplished through the introduction of transaction-based tests: when
diff --git a/docs/releases/1.2-alpha-1.txt b/docs/releases/1.2-alpha-1.txt
index 5a8f8fc5f5..8c905f6ef0 100644
--- a/docs/releases/1.2-alpha-1.txt
+++ b/docs/releases/1.2-alpha-1.txt
@@ -285,16 +285,16 @@ This affects the following settings:
 =========================================  ==========================
  Old setting                                New Setting
 =========================================  ==========================
-:setting:`DATABASE_ENGINE`                 :setting:`ENGINE`
-:setting:`DATABASE_HOST`                   :setting:`HOST`
-:setting:`DATABASE_NAME`                   :setting:`NAME`
-:setting:`DATABASE_OPTIONS`                :setting:`OPTIONS`
-:setting:`DATABASE_PASSWORD`               :setting:`PASSWORD`
-:setting:`DATABASE_PORT`                   :setting:`PORT`
-:setting:`DATABASE_USER`                   :setting:`USER`
-:setting:`TEST_DATABASE_CHARSET`           :setting:`TEST_CHARSET`
-:setting:`TEST_DATABASE_COLLATION`         :setting:`TEST_COLLATION`
-:setting:`TEST_DATABASE_NAME`              :setting:`TEST_NAME`
+`DATABASE_ENGINE`                          :setting:`ENGINE <DATABASE-ENGINE>`
+`DATABASE_HOST`                            :setting:`HOST`
+`DATABASE_NAME`                            :setting:`NAME`
+`DATABASE_OPTIONS`                         :setting:`OPTIONS`
+`DATABASE_PASSWORD`                        :setting:`PASSWORD`
+`DATABASE_PORT`                            :setting:`PORT`
+`DATABASE_USER`                            :setting:`USER`
+`TEST_DATABASE_CHARSET`                    :setting:`TEST_CHARSET`
+`TEST_DATABASE_COLLATION`                  :setting:`TEST_COLLATION`
+`TEST_DATABASE_NAME`                       :setting:`TEST_NAME`
 =========================================  ==========================
 
 These changes are also required if you have manually created a database
@@ -428,7 +428,7 @@ Support for multiple databases
 
 Django 1.2 adds the ability to use :doc:`more than one database
 </topics/db/multi-db>` in your Django project. Queries can be
-issued at a specific database with the `using()` method on
+issued at a specific database with the ``using()`` method on
 querysets; individual objects can be saved to a specific database
 by providing a ``using`` argument when you save the instance.
 
diff --git a/docs/releases/1.2-beta-1.txt b/docs/releases/1.2-beta-1.txt
index 99cd274957..abb0f3bbb9 100644
--- a/docs/releases/1.2-beta-1.txt
+++ b/docs/releases/1.2-beta-1.txt
@@ -47,7 +47,7 @@ should be updated to use the new :ref:`class-based runners
 Syndication feeds
 -----------------
 
-The :class:`django.contrib.syndication.feeds.Feed` class is being
+The ``django.contrib.syndication.feeds.Feed`` class is being
 replaced by the :class:`django.contrib.syndication.views.Feed` class.
 The old ``feeds.Feed`` class is deprecated. The new class has an
 almost identical API, but allows instances to be used as views.
@@ -91,7 +91,7 @@ added in Django 1.2 alpha but not documented with the alpha release.
 
 The default authentication backends shipped with Django do not
 currently make use of this, but third-party authentication backends
-are free to do so. See the :doc:`authentication docs </topics/auth>`
+are free to do so. See the :doc:`authentication docs </topics/auth/index>`
 for more information.
 
 
@@ -104,7 +104,7 @@ class will check the backend for permissions, just as the normal
 ``User`` does. This is intended to help centralize permission
 handling; apps can always delegate the question of whether something
 is allowed or not to the authorization/authentication system. See the
-:doc:`authentication docs </topics/auth>` for more details.
+:doc:`authentication docs </topics/auth/index>` for more details.
 
 
 ``select_related()`` improvements
diff --git a/docs/releases/1.2.4.txt b/docs/releases/1.2.4.txt
index cd4ab76f55..b74ea9aef2 100644
--- a/docs/releases/1.2.4.txt
+++ b/docs/releases/1.2.4.txt
@@ -76,7 +76,7 @@ GeoDjango
 =========
 
 The function-based :setting:`TEST_RUNNER` previously used to execute
-the GeoDjango test suite, :func:`django.contrib.gis.tests.run_gis_tests`,
+the GeoDjango test suite, ``django.contrib.gis.tests.run_gis_tests``,
 was finally deprecated in favor of a class-based test runner,
 :class:`django.contrib.gis.tests.GeoDjangoTestSuiteRunner`, added in this
 release.
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index 334f9eb94b..ad39062ed1 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -123,9 +123,9 @@ Support for multiple databases
 
 Django 1.2 adds the ability to use :doc:`more than one database
 </topics/db/multi-db>` in your Django project. Queries can be issued at a
-specific database with the `using()` method on ``QuerySet`` objects. Individual
-objects can be saved to a specific database by providing a ``using`` argument
-when you call ``save()``.
+specific database with the ``using()`` method on ``QuerySet`` objects.
+Individual objects can be saved to a specific database by providing a ``using``
+argument when you call ``save()``.
 
 Model validation
 ----------------
@@ -165,7 +165,7 @@ A foundation for specifying permissions at the per-object level has been added.
 Although there is no implementation of this in core, a custom authentication
 backend can provide this implementation and it will be used by
 :class:`django.contrib.auth.models.User`. See the :doc:`authentication docs
-</topics/auth>` for more information.
+</topics/auth/index>` for more information.
 
 Permissions for anonymous users
 -------------------------------
@@ -175,7 +175,7 @@ If you provide a custom auth backend with ``supports_anonymous_user`` set to
 User already did.  This is useful for centralizing permission handling - apps
 can always delegate the question of whether something is allowed or not to
 the authorization/authentication backend. See the :doc:`authentication
-docs </topics/auth>` for more details.
+docs </topics/auth/index>` for more details.
 
 Relaxed requirements for usernames
 ----------------------------------
@@ -345,10 +345,10 @@ in 1.2 is support for multiple spatial databases.  As a result,
 the following :ref:`spatial database backends <spatial-backends>`
 are now included:
 
-* :mod:`django.contrib.gis.db.backends.postgis`
-* :mod:`django.contrib.gis.db.backends.mysql`
-* :mod:`django.contrib.gis.db.backends.oracle`
-* :mod:`django.contrib.gis.db.backends.spatialite`
+* ``django.contrib.gis.db.backends.postgis``
+* ``django.contrib.gis.db.backends.mysql``
+* ``django.contrib.gis.db.backends.oracle``
+* ``django.contrib.gis.db.backends.spatialite``
 
 GeoDjango now supports the rich capabilities added
 in the `PostGIS 1.5 release <http://postgis.refractions.net/documentation/manual-1.5/>`_.
@@ -765,7 +765,7 @@ over the next few release cycles.
 Code taking advantage of any of the features below will raise a
 ``PendingDeprecationWarning`` in Django 1.2. This warning will be
 silent by default, but may be turned on using Python's :mod:`warnings`
-module, or by running Python with a ``-Wd`` or `-Wall` flag.
+module, or by running Python with a ``-Wd`` or ``-Wall`` flag.
 
 In Django 1.3, these warnings will become a ``DeprecationWarning``,
 which is *not* silent. In Django 1.4 support for these features will
@@ -819,16 +819,16 @@ This affects the following settings:
 =========================================  ==========================
  Old setting                                New Setting
 =========================================  ==========================
-:setting:`DATABASE_ENGINE`                 :setting:`ENGINE`
-:setting:`DATABASE_HOST`                   :setting:`HOST`
-:setting:`DATABASE_NAME`                   :setting:`NAME`
-:setting:`DATABASE_OPTIONS`                :setting:`OPTIONS`
-:setting:`DATABASE_PASSWORD`               :setting:`PASSWORD`
-:setting:`DATABASE_PORT`                   :setting:`PORT`
-:setting:`DATABASE_USER`                   :setting:`USER`
-:setting:`TEST_DATABASE_CHARSET`           :setting:`TEST_CHARSET`
-:setting:`TEST_DATABASE_COLLATION`         :setting:`TEST_COLLATION`
-:setting:`TEST_DATABASE_NAME`              :setting:`TEST_NAME`
+`DATABASE_ENGINE`                          :setting:`ENGINE <DATABASE-ENGINE>`
+`DATABASE_HOST`                            :setting:`HOST`
+`DATABASE_NAME`                            :setting:`NAME`
+`DATABASE_OPTIONS`                         :setting:`OPTIONS`
+`DATABASE_PASSWORD`                        :setting:`PASSWORD`
+`DATABASE_PORT`                            :setting:`PORT`
+`DATABASE_USER`                            :setting:`USER`
+`TEST_DATABASE_CHARSET`                    :setting:`TEST_CHARSET`
+`TEST_DATABASE_COLLATION`                  :setting:`TEST_COLLATION`
+`TEST_DATABASE_NAME`                       :setting:`TEST_NAME`
 =========================================  ==========================
 
 These changes are also required if you have manually created a database
@@ -850,7 +850,7 @@ has been deprecated.
 If you are currently using the ``postgresql`` backend, you should
 migrate to using the ``postgresql_psycopg2`` backend. To update your
 code, install the ``psycopg2`` library and change the
-:setting:`DATABASE_ENGINE` setting to use
+:setting:`ENGINE <DATABASE-ENGINE>` setting to use
 ``django.db.backends.postgresql_psycopg2``.
 
 CSRF response-rewriting middleware
@@ -986,7 +986,7 @@ should be updated to use the new :ref:`class-based runners
 ``Feed`` in ``django.contrib.syndication.feeds``
 ------------------------------------------------
 
-The :class:`django.contrib.syndication.feeds.Feed` class has been
+The ``django.contrib.syndication.feeds.Feed`` class has been
 replaced by the :class:`django.contrib.syndication.views.Feed` class.
 The old ``feeds.Feed`` class is deprecated, and will be removed in
 Django 1.4.
diff --git a/docs/releases/1.3-alpha-1.txt b/docs/releases/1.3-alpha-1.txt
index 2f5124e52b..c71736dc60 100644
--- a/docs/releases/1.3-alpha-1.txt
+++ b/docs/releases/1.3-alpha-1.txt
@@ -61,19 +61,18 @@ Django 1.3 ships with a new contrib app ``'django.contrib.staticfiles'``
 to help developers handle the static media files (images, CSS, Javascript,
 etc.) that are needed to render a complete web page.
 
-In previous versions of Django, it was common to place static assets in
-:setting:`MEDIA_ROOT` along with user-uploaded files, and serve them both at
-:setting:`MEDIA_URL`. Part of the purpose of introducing the ``staticfiles``
-app is to make it easier to keep static files separate from user-uploaded
-files. For this reason, you will probably want to make your
-:setting:`MEDIA_ROOT` and :setting:`MEDIA_URL` different from your
-:setting:`STATICFILES_ROOT` and :setting:`STATICFILES_URL`. You will need to
-arrange for serving of files in :setting:`MEDIA_ROOT` yourself;
-``staticfiles`` does not deal with user-uploaded media at all.
+In previous versions of Django, it was common to place static assets
+in :setting:`MEDIA_ROOT` along with user-uploaded files, and serve
+them both at :setting:`MEDIA_URL`. Part of the purpose of introducing
+the ``staticfiles`` app is to make it easier to keep static files
+separate from user-uploaded files. Static assets should now go in
+``static/`` subdirectories of your apps or in other static assets
+directories listed in :setting:`STATICFILES_DIRS`, and will be served
+at :setting:`STATIC_URL`.
 
 See the :doc:`reference documentation of the app </ref/contrib/staticfiles>`
 for more details or learn how to :doc:`manage static files
-</howto/static-files>`.
+</howto/static-files/index>`.
 
 ``unittest2`` support
 ~~~~~~~~~~~~~~~~~~~~~
@@ -106,16 +105,14 @@ you just won't get any of the nice new unittest2 features.
 Transaction context managers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Users of Python 2.5 and above may now use :ref:`transaction management functions
-<transaction-management-functions>` as `context managers`_. For example::
+Users of Python 2.5 and above may now use transaction management functions as
+`context managers`_. For example::
 
     with transaction.autocommit():
         # ...
 
 .. _context managers: http://docs.python.org/glossary.html#term-context-manager
 
-For more information, see :ref:`transaction-management-functions`.
-
 Configurable delete-cascade
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -151,13 +148,13 @@ process has been on adding lots of smaller, long standing feature
 requests. These include:
 
 * Improved tools for accessing and manipulating the current Site via
-  :func:`django.contrib.sites.models.get_current_site`.
+  ``django.contrib.sites.models.get_current_site()``.
 
 * A :class:`~django.test.client.RequestFactory` for mocking
   requests in tests.
 
 * A new test assertion --
-  :meth:`~django.test.client.Client.assertNumQueries` -- making it
+  :meth:`~django.test.TestCase.assertNumQueries` -- making it
   easier to test the database activity associated with a view.
 
 
@@ -280,7 +277,7 @@ over the next few release cycles.
 Code taking advantage of any of the features below will raise a
 ``PendingDeprecationWarning`` in Django 1.3. This warning will be
 silent by default, but may be turned on using Python's :mod:`warnings`
-module, or by running Python with a ``-Wd`` or `-Wall` flag.
+module, or by running Python with a ``-Wd`` or ``-Wall`` flag.
 
 In Django 1.4, these warnings will become a ``DeprecationWarning``,
 which is *not* silent. In Django 1.5 support for these features will
@@ -312,37 +309,35 @@ As a result of the introduction of class-based generic views, the
 function-based generic views provided by Django have been deprecated.
 The following modules and the views they contain have been deprecated:
 
-* :mod:`django.views.generic.create_update`
-* :mod:`django.views.generic.date_based`
-* :mod:`django.views.generic.list_detail`
-* :mod:`django.views.generic.simple`
+* ``django.views.generic.create_update``
+* ``django.views.generic.date_based``
+* ``django.views.generic.list_detail``
+* ``django.views.generic.simple``
 
 Test client response ``template`` attribute
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Django's :ref:`test client <test-client>` returns
 :class:`~django.test.client.Response` objects annotated with extra testing
-information. In Django versions prior to 1.3, this included a
-:attr:`~django.test.client.Response.template` attribute containing information
-about templates rendered in generating the response: either None, a single
-:class:`~django.template.Template` object, or a list of
-:class:`~django.template.Template` objects. This inconsistency in return values
-(sometimes a list, sometimes not) made the attribute difficult to work with.
+information. In Django versions prior to 1.3, this included a ``template``
+attribute containing information about templates rendered in generating the
+response: either None, a single :class:`~django.template.Template` object, or a
+list of :class:`~django.template.Template` objects. This inconsistency in
+return values (sometimes a list, sometimes not) made the attribute difficult
+to work with.
 
-In Django 1.3 the :attr:`~django.test.client.Response.template` attribute is
-deprecated in favor of a new :attr:`~django.test.client.Response.templates`
-attribute, which is always a list, even if it has only a single element or no
-elements.
+In Django 1.3 the ``template`` attribute is deprecated in favor of a new
+:attr:`~django.test.client.Response.templates` attribute, which is always a
+list, even if it has only a single element or no elements.
 
 ``DjangoTestRunner``
 ~~~~~~~~~~~~~~~~~~~~
 
 As a result of the introduction of support for unittest2, the features
-of :class:`django.test.simple.DjangoTestRunner` (including fail-fast
+of ``django.test.simple.DjangoTestRunner`` (including fail-fast
 and Ctrl-C test termination) have been made redundant. In view of this
-redundancy, :class:`~django.test.simple.DjangoTestRunner` has been
-turned into an empty placeholder class, and will be removed entirely
-in Django 1.5.
+redundancy, ``DjangoTestRunner`` has been turned into an empty placeholder
+class, and will be removed entirely in Django 1.5.
 
 The Django 1.3 roadmap
 ======================
diff --git a/docs/releases/1.3-beta-1.txt b/docs/releases/1.3-beta-1.txt
index 02c038f459..aa7800bb94 100644
--- a/docs/releases/1.3-beta-1.txt
+++ b/docs/releases/1.3-beta-1.txt
@@ -37,7 +37,7 @@ Based on feedback from the community this release adds two new options to the
 
 See the :doc:`staticfiles reference documentation </ref/contrib/staticfiles>`
 for more details, or learn :doc:`how to manage static files
-</howto/static-files>`.
+</howto/static-files/index>`.
 
 Translation comments
 ~~~~~~~~~~~~~~~~~~~~
@@ -61,7 +61,7 @@ Permissions for inactive users
 If you provide a custom auth backend with ``supports_inactive_user`` set to
 ``True``, an inactive user model will check the backend for permissions.
 This is useful for further centralizing the permission handling. See the
-:doc:`authentication docs </topics/auth>` for more details.
+:doc:`authentication docs </topics/auth/index>` for more details.
 
 Backwards-incompatible changes in 1.3 alpha 2
 =============================================
@@ -140,12 +140,11 @@ attribute.
 Changes to ``USStateField``
 ===========================
 
-The :mod:`django.contrib.localflavor` application contains collections
+The ``django.contrib.localflavor`` application contains collections
 of code relevant to specific countries or cultures. One such is
-:class:`~django.contrib.localflavor.us.models.USStateField`, which
-provides a field for storing the two-letter postal abbreviation of a
-U.S. state. This field has consistently caused problems, however,
-because it is often used to store the state portion of a U.S postal
+``USStateField``, which provides a field for storing the two-letter postal
+abbreviation of a U.S. state. This field has consistently caused problems,
+however, because it is often used to store the state portion of a U.S postal
 address, but not all "states" recognized by the U.S Postal Service are
 actually states of the U.S. or even U.S. territory. Several
 compromises over the list of choices resulted in some users feeling
@@ -155,29 +154,29 @@ too few.
 In Django 1.3 we're taking a new approach to this problem, implemented
 as a pair of changes:
 
-* The choice list for `USStateField` has changed. Previously, it
+* The choice list for ``USStateField`` has changed. Previously, it
   consisted of the 50 U.S. states, the District of Columbia and
   U.S. overseas territories. As of Django 1.3 it includes all previous
   choices, plus the U.S. Armed Forces postal codes.
 
 * A new model field,
-  :class:`django.contrib.localflavor.us.models.USPostalCodeField`, has
+  ``django.contrib.localflavor.us.models.USPostalCodeField``, has
   been added which draws its choices from a list of all postal
   abbreviations recognized by the U.S Postal Service. This includes
-  all abbreviations recognized by `USStateField`, plus three
+  all abbreviations recognized by ``USStateField``, plus three
   independent nations -- the Federated States of Micronesia, the
   Republic of the Marshall Islands and the Republic of Palau -- which
   are serviced under treaty by the U.S. postal system. A new form
-  widget, :class:`django.contrib.localflavor.us.forms.USPSSelect`, is
+  widget, ``django.contrib.localflavor.us.forms.USPSSelect``, is
   also available and provides the same set of choices.
 
 Additionally, several finer-grained choice tuples are provided which
 allow mixing and matching of subsets of the U.S. states and
 territories, and other locations serviced by the U.S. postal
-system. Consult the :mod:`django.contrib.localflavor` documentation
+system. Consult the ``django.contrib.localflavor`` documentation
 for more details.
 
-The change to `USStateField` is technically backwards-incompatible for
+The change to ``USStateField`` is technically backwards-incompatible for
 users who expect this field to exclude Armed Forces locations. If you
 need to support U.S. mailing addresses without Armed Forces locations,
 see the list of choice tuples available in the localflavor
diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt
index c507f1bed6..9a41f903f8 100644
--- a/docs/releases/1.3.txt
+++ b/docs/releases/1.3.txt
@@ -115,7 +115,7 @@ at :setting:`STATIC_URL`.
 
 See the :doc:`reference documentation of the app </ref/contrib/staticfiles>`
 for more details or learn how to :doc:`manage static files
-</howto/static-files>`.
+</howto/static-files/index>`.
 
 unittest2 support
 ~~~~~~~~~~~~~~~~~
@@ -148,16 +148,14 @@ you just won't get any of the nice new unittest2 features.
 Transaction context managers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Users of Python 2.5 and above may now use :ref:`transaction management functions
-<transaction-management-functions>` as `context managers`_. For example::
+Users of Python 2.5 and above may now use transaction management functions as
+`context managers`_. For example::
 
     with transaction.autocommit():
         # ...
 
 .. _context managers: http://docs.python.org/glossary.html#term-context-manager
 
-For more information, see :ref:`transaction-management-functions`.
-
 Configurable delete-cascade
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -254,7 +252,7 @@ Permissions for inactive users
 If you provide a custom auth backend with ``supports_inactive_user``
 set to ``True``, an inactive ``User`` instance will check the backend
 for permissions.  This is useful for further centralizing the
-permission handling. See the :doc:`authentication docs </topics/auth>`
+permission handling. See the :doc:`authentication docs </topics/auth/index>`
 for more details.
 
 GeoDjango
@@ -367,9 +365,8 @@ In earlier Django versions, when a model instance containing a
 file from the backend storage. This opened the door to several data-loss
 scenarios, including rolled-back transactions and fields on different models
 referencing the same file. In Django 1.3, when a model is deleted the
-:class:`~django.db.models.FileField`'s
-:func:`~django.db.models.FileField.delete` method won't be called.  If you
-need cleanup of orphaned files, you'll need to handle it yourself (for
+:class:`~django.db.models.FileField`'s ``delete()`` method won't be called. If
+you need cleanup of orphaned files, you'll need to handle it yourself (for
 instance, with a custom management command that can be run manually or
 scheduled to run periodically via e.g. cron).
 
@@ -665,7 +662,7 @@ over the next few release cycles.
 Code taking advantage of any of the features below will raise a
 ``PendingDeprecationWarning`` in Django 1.3. This warning will be
 silent by default, but may be turned on using Python's :mod:`warnings`
-module, or by running Python with a ``-Wd`` or `-Wall` flag.
+module, or by running Python with a ``-Wd`` or ``-Wall`` flag.
 
 In Django 1.4, these warnings will become a ``DeprecationWarning``,
 which is *not* silent. In Django 1.5 support for these features will
@@ -700,40 +697,35 @@ As a result of the introduction of class-based generic views, the
 function-based generic views provided by Django have been deprecated.
 The following modules and the views they contain have been deprecated:
 
-* :mod:`django.views.generic.create_update`
-
-* :mod:`django.views.generic.date_based`
-
-* :mod:`django.views.generic.list_detail`
-
-* :mod:`django.views.generic.simple`
+* ``django.views.generic.create_update``
+* ``django.views.generic.date_based``
+* ``django.views.generic.list_detail``
+* ``django.views.generic.simple``
 
 Test client response ``template`` attribute
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Django's :ref:`test client <test-client>` returns
 :class:`~django.test.client.Response` objects annotated with extra testing
-information. In Django versions prior to 1.3, this included a
-:attr:`~django.test.client.Response.template` attribute containing information
-about templates rendered in generating the response: either None, a single
-:class:`~django.template.Template` object, or a list of
-:class:`~django.template.Template` objects. This inconsistency in return values
-(sometimes a list, sometimes not) made the attribute difficult to work with.
+information. In Django versions prior to 1.3, this included a ``template``
+attribute containing information about templates rendered in generating the
+response: either None, a single :class:`~django.template.Template` object, or a
+list of :class:`~django.template.Template` objects. This inconsistency in
+return values (sometimes a list, sometimes not) made the attribute difficult
+to work with.
 
-In Django 1.3 the :attr:`~django.test.client.Response.template` attribute is
-deprecated in favor of a new :attr:`~django.test.client.Response.templates`
-attribute, which is always a list, even if it has only a single element or no
-elements.
+In Django 1.3 the ``template`` attribute is deprecated in favor of a new
+:attr:`~django.test.client.Response.templates` attribute, which is always a
+list, even if it has only a single element or no elements.
 
 ``DjangoTestRunner``
 ~~~~~~~~~~~~~~~~~~~~
 
 As a result of the introduction of support for unittest2, the features
-of :class:`django.test.simple.DjangoTestRunner` (including fail-fast
+of ``django.test.simple.DjangoTestRunner`` (including fail-fast
 and Ctrl-C test termination) have been made redundant. In view of this
-redundancy, :class:`~django.test.simple.DjangoTestRunner` has been
-turned into an empty placeholder class, and will be removed entirely
-in Django 1.5.
+redundancy, ``DjangoTestRunner`` has been turned into an empty placeholder
+class, and will be removed entirely in Django 1.5.
 
 Changes to :ttag:`url` and :ttag:`ssi`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -805,9 +797,8 @@ GeoDjango
 ~~~~~~~~~
 
 * The function-based :setting:`TEST_RUNNER` previously used to execute
-  the GeoDjango test suite,
-  :func:`django.contrib.gis.tests.run_gis_tests`, was deprecated for
-  the class-based runner,
+  the GeoDjango test suite, ``django.contrib.gis.tests.run_gis_tests``, was
+  deprecated for the class-based runner,
   :class:`django.contrib.gis.tests.GeoDjangoTestSuiteRunner`.
 
 * Previously, calling
@@ -886,11 +877,10 @@ identical to their old versions; only the module location has changed.
 Removal of ``XMLField``
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-When Django was first released, Django included an
-:class:`~django.db.models.XMLField` that performed automatic XML validation
-for any field input. However, this validation function hasn't been
-performed since the introduction of ``newforms``, prior to the 1.0 release.
-As a result, ``XMLField`` as currently implemented is functionally
+When Django was first released, Django included an ``XMLField`` that performed
+automatic XML validation for any field input. However, this validation function
+hasn't been performed since the introduction of ``newforms``, prior to the 1.0
+release. As a result, ``XMLField`` as currently implemented is functionally
 indistinguishable from a simple :class:`~django.db.models.TextField`.
 
 For this reason, Django 1.3 has fast-tracked the deprecation of
diff --git a/docs/releases/1.4-alpha-1.txt b/docs/releases/1.4-alpha-1.txt
index b5ec782f09..cb218ac698 100644
--- a/docs/releases/1.4-alpha-1.txt
+++ b/docs/releases/1.4-alpha-1.txt
@@ -357,8 +357,8 @@ Extended IPv6 support
 
 The previously added support for IPv6 addresses when using the runserver
 management command in Django 1.3 has now been further extended by adding
-a :class:`~django.db.models.fields.GenericIPAddressField` model field,
-a :class:`~django.forms.fields.GenericIPAddressField` form field and
+a :class:`~django.db.models.GenericIPAddressField` model field,
+a :class:`~django.forms.GenericIPAddressField` form field and
 the validators :data:`~django.core.validators.validate_ipv46_address` and
 :data:`~django.core.validators.validate_ipv6_address`
 
@@ -503,8 +503,8 @@ Django 1.4 also includes several smaller improvements worth noting:
 * In the documentation, a helpful :doc:`security overview </topics/security>`
   page.
 
-* The :func:`django.contrib.auth.models.check_password` function has been moved
-  to the :mod:`django.contrib.auth.utils` module. Importing it from the old
+* The ``django.contrib.auth.models.check_password`` function has been moved
+  to the ``django.contrib.auth.utils`` module. Importing it from the old
   location will still work, but you should update your imports.
 
 * The :djadmin:`collectstatic` management command gained a ``--clear`` option
@@ -578,7 +578,7 @@ If you've previously used a URL path for ``ADMIN_MEDIA_PREFIX`` (e.g.
 ``/media/``) simply make sure :setting:`STATIC_URL` and :setting:`STATIC_ROOT`
 are configured and your web server serves the files correctly. The development
 server continues to serve the admin files just like before. Don't hesitate to
-consult the :doc:`static files howto </howto/static-files>` for further
+consult the :doc:`static files howto </howto/static-files/index>` for further
 details.
 
 In case your ``ADMIN_MEDIA_PREFIX`` is set to an specific domain (e.g.
@@ -813,11 +813,12 @@ For more details, see the documentation about
 
 Until Django 1.3, it was possible to exclude some URLs from Django's
 :doc:`404 error reporting</howto/error-reporting>` by adding prefixes to
-:setting:`IGNORABLE_404_STARTS` and suffixes to :setting:`IGNORABLE_404_ENDS`.
+``IGNORABLE_404_STARTS`` and suffixes to ``IGNORABLE_404_ENDS``.
 
 In Django 1.4, these two settings are superseded by
-:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular expressions.
-Django won't send an email for 404 errors on URLs that match any of them.
+:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular
+expressions. Django won't send an email for 404 errors on URLs that match any
+of them.
 
 Furthermore, the previous settings had some rather arbitrary default values::
 
@@ -827,12 +828,12 @@ Furthermore, the previous settings had some rather arbitrary default values::
 
 It's not Django's role to decide if your website has a legacy ``/cgi-bin/``
 section or a ``favicon.ico``. As a consequence, the default values of
-:setting:`IGNORABLE_404_URLS`, :setting:`IGNORABLE_404_STARTS` and
-:setting:`IGNORABLE_404_ENDS` are all now empty.
+:setting:`IGNORABLE_404_URLS`, ``IGNORABLE_404_STARTS``, and
+``IGNORABLE_404_ENDS`` are all now empty.
 
-If you have customized :setting:`IGNORABLE_404_STARTS` or
-:setting:`IGNORABLE_404_ENDS`, or if you want to keep the old default value,
-you should add the following lines in your settings file::
+If you have customized ``IGNORABLE_404_STARTS`` or ``IGNORABLE_404_ENDS``, or
+if you want to keep the old default value, you should add the following lines
+in your settings file::
 
     import re
     IGNORABLE_404_URLS = (
@@ -877,7 +878,7 @@ removed.
 The ``open`` method of the base Storage class took an obscure parameter
 ``mixin`` which allowed you to dynamically change the base classes of the
 returned file object. This has been removed. In the rare case you relied on the
-`mixin` parameter, you can easily achieve the same by overriding the `open`
+``mixin`` parameter, you can easily achieve the same by overriding the ``open``
 method, e.g.::
 
     from django.core.files import File
diff --git a/docs/releases/1.4-beta-1.txt b/docs/releases/1.4-beta-1.txt
index 88f32ea15f..84b1bf6987 100644
--- a/docs/releases/1.4-beta-1.txt
+++ b/docs/releases/1.4-beta-1.txt
@@ -395,8 +395,8 @@ Extended IPv6 support
 
 The previously added support for IPv6 addresses when using the runserver
 management command in Django 1.3 has now been further extended by adding
-a :class:`~django.db.models.fields.GenericIPAddressField` model field,
-a :class:`~django.forms.fields.GenericIPAddressField` form field and
+a :class:`~django.db.models.GenericIPAddressField` model field,
+a :class:`~django.forms.GenericIPAddressField` form field and
 the validators :data:`~django.core.validators.validate_ipv46_address` and
 :data:`~django.core.validators.validate_ipv6_address`
 
@@ -563,8 +563,8 @@ Django 1.4 also includes several smaller improvements worth noting:
 * In the documentation, a helpful :doc:`security overview </topics/security>`
   page.
 
-* The :func:`django.contrib.auth.models.check_password` function has been moved
-  to the :mod:`django.contrib.auth.utils` module. Importing it from the old
+* The ``django.contrib.auth.models.check_password`` function has been moved
+  to the ``django.contrib.auth.utils`` module. Importing it from the old
   location will still work, but you should update your imports.
 
 * The :djadmin:`collectstatic` management command gained a ``--clear`` option
@@ -646,7 +646,7 @@ If you've previously used a URL path for ``ADMIN_MEDIA_PREFIX`` (e.g.
 ``/media/``) simply make sure :setting:`STATIC_URL` and :setting:`STATIC_ROOT`
 are configured and your web server serves the files correctly. The development
 server continues to serve the admin files just like before. Don't hesitate to
-consult the :doc:`static files howto </howto/static-files>` for further
+consult the :doc:`static files howto </howto/static-files/index>` for further
 details.
 
 In case your ``ADMIN_MEDIA_PREFIX`` is set to an specific domain (e.g.
@@ -881,11 +881,12 @@ For more details, see the documentation about
 
 Until Django 1.3, it was possible to exclude some URLs from Django's
 :doc:`404 error reporting</howto/error-reporting>` by adding prefixes to
-:setting:`IGNORABLE_404_STARTS` and suffixes to :setting:`IGNORABLE_404_ENDS`.
+``IGNORABLE_404_STARTS`` and suffixes to ``IGNORABLE_404_ENDS``.
 
 In Django 1.4, these two settings are superseded by
-:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular expressions.
-Django won't send an email for 404 errors on URLs that match any of them.
+:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular
+expressions. Django won't send an email for 404 errors on URLs that match any
+of them.
 
 Furthermore, the previous settings had some rather arbitrary default values::
 
@@ -895,12 +896,12 @@ Furthermore, the previous settings had some rather arbitrary default values::
 
 It's not Django's role to decide if your website has a legacy ``/cgi-bin/``
 section or a ``favicon.ico``. As a consequence, the default values of
-:setting:`IGNORABLE_404_URLS`, :setting:`IGNORABLE_404_STARTS` and
-:setting:`IGNORABLE_404_ENDS` are all now empty.
+:setting:`IGNORABLE_404_URLS`, ``IGNORABLE_404_STARTS``, and
+``IGNORABLE_404_ENDS`` are all now empty.
 
-If you have customized :setting:`IGNORABLE_404_STARTS` or
-:setting:`IGNORABLE_404_ENDS`, or if you want to keep the old default value,
-you should add the following lines in your settings file::
+If you have customized ``IGNORABLE_404_STARTS`` or ``IGNORABLE_404_ENDS``, or
+if you want to keep the old default value, you should add the following lines
+in your settings file::
 
     import re
     IGNORABLE_404_URLS = (
@@ -945,7 +946,7 @@ removed.
 The ``open`` method of the base Storage class took an obscure parameter
 ``mixin`` which allowed you to dynamically change the base classes of the
 returned file object. This has been removed. In the rare case you relied on the
-`mixin` parameter, you can easily achieve the same by overriding the `open`
+``mixin`` parameter, you can easily achieve the same by overriding the ``open``
 method, e.g.::
 
     from django.core.files import File
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
index 01532cc04c..83a5f54fc7 100644
--- a/docs/releases/1.4.txt
+++ b/docs/releases/1.4.txt
@@ -37,8 +37,8 @@ Other notable new features in Django 1.4 include:
   the ability to `bulk insert <#model-objects-bulk-create-in-the-orm>`_
   large datasets for improved performance, and
   `QuerySet.prefetch_related`_, a method to batch-load related objects
-  in areas where :meth:`~django.db.models.QuerySet.select_related` doesn't
-  work.
+  in areas where :meth:`~django.db.models.query.QuerySet.select_related`
+  doesn't work.
 
 * Some nice security additions, including `improved password hashing`_
   (featuring PBKDF2_ and bcrypt_ support), new `tools for cryptographic
@@ -526,8 +526,8 @@ Extended IPv6 support
 ~~~~~~~~~~~~~~~~~~~~~
 
 Django 1.4 can now better handle IPv6 addresses with the new
-:class:`~django.db.models.fields.GenericIPAddressField` model field,
-:class:`~django.forms.fields.GenericIPAddressField` form field and
+:class:`~django.db.models.GenericIPAddressField` model field,
+:class:`~django.forms.GenericIPAddressField` form field and
 the validators :data:`~django.core.validators.validate_ipv46_address` and
 :data:`~django.core.validators.validate_ipv6_address`.
 
@@ -585,7 +585,7 @@ Django 1.4 also includes several smaller improvements worth noting:
 * In the documentation, a helpful :doc:`security overview </topics/security>`
   page.
 
-* The :func:`django.contrib.auth.models.check_password` function has been moved
+* The ``django.contrib.auth.models.check_password`` function has been moved
   to the :mod:`django.contrib.auth.hashers` module. Importing it from the old
   location will still work, but you should update your imports.
 
@@ -708,7 +708,7 @@ If you've previously used a URL path for ``ADMIN_MEDIA_PREFIX`` (e.g.
 ``/media/``) simply make sure :setting:`STATIC_URL` and :setting:`STATIC_ROOT`
 are configured and your Web server serves those files correctly. The
 development server continues to serve the admin files just like before. Read
-the :doc:`static files howto </howto/static-files>` for more details.
+the :doc:`static files howto </howto/static-files/index>` for more details.
 
 If your ``ADMIN_MEDIA_PREFIX`` is set to an specific domain (e.g.
 ``http://media.example.com/admin/``), make sure to also set your
@@ -888,10 +888,10 @@ object, Django raises an exception.
 ``MySQLdb``-specific exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The MySQL backend historically has raised :class:`MySQLdb.OperationalError`
+The MySQL backend historically has raised ``MySQLdb.OperationalError``
 when a query triggered an exception. We've fixed this bug, and we now raise
-:class:`django.db.utils.DatabaseError` instead. If you were testing for
-:class:`MySQLdb.OperationalError`, you'll need to update your ``except``
+:exc:`django.db.DatabaseError` instead. If you were testing for
+``MySQLdb.OperationalError``, you'll need to update your ``except``
 clauses.
 
 Database connection's thread-locality
@@ -966,11 +966,12 @@ For more details, see the documentation about
 
 Until Django 1.3, it was possible to exclude some URLs from Django's
 :doc:`404 error reporting</howto/error-reporting>` by adding prefixes to
-:setting:`IGNORABLE_404_STARTS` and suffixes to :setting:`IGNORABLE_404_ENDS`.
+``IGNORABLE_404_STARTS`` and suffixes to ``IGNORABLE_404_ENDS``.
 
 In Django 1.4, these two settings are superseded by
-:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular expressions.
-Django won't send an email for 404 errors on URLs that match any of them.
+:setting:`IGNORABLE_404_URLS`, which is a list of compiled regular
+expressions. Django won't send an email for 404 errors on URLs that match any
+of them.
 
 Furthermore, the previous settings had some rather arbitrary default values::
 
@@ -980,12 +981,12 @@ Furthermore, the previous settings had some rather arbitrary default values::
 
 It's not Django's role to decide if your website has a legacy ``/cgi-bin/``
 section or a ``favicon.ico``. As a consequence, the default values of
-:setting:`IGNORABLE_404_URLS`, :setting:`IGNORABLE_404_STARTS` and
-:setting:`IGNORABLE_404_ENDS` are all now empty.
+:setting:`IGNORABLE_404_URLS`, ``IGNORABLE_404_STARTS``, and
+``IGNORABLE_404_ENDS`` are all now empty.
 
-If you have customized :setting:`IGNORABLE_404_STARTS` or
-:setting:`IGNORABLE_404_ENDS`, or if you want to keep the old default value,
-you should add the following lines in your settings file::
+If you have customized ``IGNORABLE_404_STARTS`` or ``IGNORABLE_404_ENDS``, or
+if you want to keep the old default value, you should add the following lines
+in your settings file::
 
     import re
     IGNORABLE_404_URLS = (
@@ -1039,7 +1040,7 @@ removed.
 The ``open`` method of the base Storage class used to take an obscure parameter
 ``mixin`` that allowed you to dynamically change the base classes of the
 returned file object. This has been removed. In the rare case you relied on the
-`mixin` parameter, you can easily achieve the same by overriding the `open`
+``mixin`` parameter, you can easily achieve the same by overriding the ``open``
 method, like this::
 
     from django.core.files import File
@@ -1092,8 +1093,8 @@ wild, because they would confuse browsers too.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 It's now possible to check whether a template was used within a block of
-code with :meth:`~django.test.test.TestCase.assertTemplateUsed` and
-:meth:`~django.test.test.TestCase.assertTemplateNotUsed`. And they
+code with :meth:`~django.test.TestCase.assertTemplateUsed` and
+:meth:`~django.test.TestCase.assertTemplateNotUsed`. And they
 can be used as a context manager::
 
     with self.assertTemplateUsed('index.html'):
diff --git a/docs/releases/1.5-alpha-1.txt b/docs/releases/1.5-alpha-1.txt
index 8fbeafc68b..2588b85306 100644
--- a/docs/releases/1.5-alpha-1.txt
+++ b/docs/releases/1.5-alpha-1.txt
@@ -1,6 +1,6 @@
-============================================
-Django 1.5 release notes - UNDER DEVELOPMENT
-============================================
+==============================
+Django 1.5 alpha release notes
+==============================
 
 October 25, 2012.
 
@@ -227,7 +227,9 @@ GeoDjango
   :meth:`~django.contrib.gis.geos.GEOSGeometry.project()` methods
   (so-called linear referencing).
 
-* The wkb and hex properties of `GEOSGeometry` objects preserve the Z dimension.
+* The ``wkb`` and ``hex`` properties of
+  :class:`~django.contrib.gis.geos.GEOSGeometry` objects preserve the Z
+  dimension.
 
 * Support for PostGIS 2.0 has been added and support for GDAL < 1.5 has been
   dropped.
@@ -283,8 +285,8 @@ Django 1.5 also includes several smaller improvements worth noting:
 * An instance of :class:`~django.core.urlresolvers.ResolverMatch` is stored on
   the request as ``resolver_match``.
 
-* By default, all logging messages reaching the `django` logger when
-  :setting:`DEBUG` is `True` are sent to the console (unless you redefine the
+* By default, all logging messages reaching the ``django`` logger when
+  :setting:`DEBUG` is ``True`` are sent to the console (unless you redefine the
   logger in your :setting:`LOGGING` setting).
 
 * When using :class:`~django.template.RequestContext`, it is now possible to
@@ -301,8 +303,9 @@ Django 1.5 also includes several smaller improvements worth noting:
   whenever a user fails to login successfully. See
   :data:`~django.contrib.auth.signals.user_login_failed`
 
-* The loaddata management command now supports an `ignorenonexistent` option to
-  ignore data for fields that no longer exist.
+* The loaddata management command now supports an
+  :djadminopt:`--ignorenonexistent` option to ignore data for fields that no
+  longer exist.
 
 * :meth:`~django.test.SimpleTestCase.assertXMLEqual` and
   :meth:`~django.test.SimpleTestCase.assertXMLNotEqual` new assertions allow
@@ -391,12 +394,12 @@ System version of :mod:`simplejson` no longer used
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 As explained below, Django 1.5 deprecates
-:mod:`django.utils.simplejson` in favor of Python 2.6's built-in :mod:`json`
+``django.utils.simplejson`` in favor of Python 2.6's built-in :mod:`json`
 module. In theory, this change is harmless. Unfortunately, because of
 incompatibilities between versions of :mod:`simplejson`, it may trigger errors
 in some circumstances.
 
-JSON-related features in Django 1.4 always used :mod:`django.utils.simplejson`.
+JSON-related features in Django 1.4 always used ``django.utils.simplejson``.
 This module was actually:
 
 - A system version of :mod:`simplejson`, if one was available (ie. ``import
@@ -423,7 +426,7 @@ More information on these incompatibilities is available in `ticket #18023`_.
 
 The net result is that, if you have installed :mod:`simplejson` and your code
 uses Django's serialization internals directly -- for instance
-:class:`django.core.serializers.json.DjangoJSONEncoder`, the switch from
+``django.core.serializers.json.DjangoJSONEncoder``, the switch from
 :mod:`simplejson` to :mod:`json` could break your code. (In general, changes to
 internals aren't documented; we're making an exception here.)
 
@@ -449,8 +452,8 @@ When using :doc:`object pagination </topics/pagination>`,
 the ``previous_page_number()`` and ``next_page_number()`` methods of the
 :class:`~django.core.paginator.Page` object did not check if the returned
 number was inside the existing page range.
-It does check it now and raises an :exc:`InvalidPage` exception when the number
-is either too low or too high.
+It does check it now and raises an :exc:`~django.core.paginator.InvalidPage`
+exception when the number is either too low or too high.
 
 Behavior of autocommit database option on PostgreSQL changed
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -546,8 +549,9 @@ Miscellaneous
 * :class:`django.forms.ModelMultipleChoiceField` now returns an empty
   ``QuerySet`` as the empty value instead of an empty list.
 
-* :func:`~django.utils.http.int_to_base36` properly raises a :exc:`TypeError`
-  instead of :exc:`ValueError` for non-integer inputs.
+* :func:`~django.utils.http.int_to_base36` properly raises a
+  :exc:`~exceptions.TypeError` instead of :exc:`~exceptions.ValueError` for
+  non-integer inputs.
 
 * The ``slugify`` template filter is now available as a standard python
   function at :func:`django.utils.text.slugify`. Similarly, ``remove_tags`` is
@@ -555,7 +559,7 @@ Miscellaneous
 
 * Uploaded files are no longer created as executable by default. If you need
   them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your
-  needs. The new default value is `0666` (octal) and the current umask value
+  needs. The new default value is ``0666`` (octal) and the current umask value
   is first masked out.
 
 * The :ref:`F() expressions <query-expressions>` supported bitwise operators by
@@ -584,8 +588,8 @@ the :setting:`AUTH_PROFILE_MODULE` setting, and the
 :meth:`~django.contrib.auth.models.User.get_profile()` method for accessing
 the user profile model, should not be used any longer.
 
-Streaming behavior of :class:`HttpResponse`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Streaming behavior of :class:`~django.http.HttpResponse`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Django 1.5 deprecates the ability to stream a response by passing an iterator
 to :class:`~django.http.HttpResponse`. If you rely on this behavior, switch to
@@ -600,7 +604,7 @@ In Django 1.7 and above, the iterator will be consumed immediately by
 Since Django 1.5 drops support for Python 2.5, we can now rely on the
 :mod:`json` module being available in Python's standard library, so we've
 removed our own copy of :mod:`simplejson`. You should now import :mod:`json`
-instead :mod:`django.utils.simplejson`.
+instead of ``django.utils.simplejson``.
 
 Unfortunately, this change might have unwanted side-effects, because of
 incompatibilities between versions of :mod:`simplejson` -- see the backwards-
@@ -618,10 +622,9 @@ Define a ``__str__`` method and apply the
 ``django.utils.itercompat.product``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The :func:`~django.utils.itercompat.product` function has been deprecated. Use
+The ``django.utils.itercompat.product`` function has been deprecated. Use
 the built-in :func:`itertools.product` instead.
 
-
 ``django.utils.markup``
 ~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/releases/1.5-beta-1.txt b/docs/releases/1.5-beta-1.txt
index f3bfc2a8fa..57b13ea6ce 100644
--- a/docs/releases/1.5-beta-1.txt
+++ b/docs/releases/1.5-beta-1.txt
@@ -225,7 +225,9 @@ GeoDjango
   :meth:`~django.contrib.gis.geos.GEOSGeometry.project()` methods
   (so-called linear referencing).
 
-* The wkb and hex properties of `GEOSGeometry` objects preserve the Z dimension.
+* The ``wkb`` and ``hex`` properties of
+  :class:`~django.contrib.gis.geos.GEOSGeometry` objects preserve the Z
+  dimension.
 
 * Support for PostGIS 2.0 has been added and support for GDAL < 1.5 has been
   dropped.
@@ -281,8 +283,8 @@ Django 1.5 also includes several smaller improvements worth noting:
 * An instance of :class:`~django.core.urlresolvers.ResolverMatch` is stored on
   the request as ``resolver_match``.
 
-* By default, all logging messages reaching the `django` logger when
-  :setting:`DEBUG` is `True` are sent to the console (unless you redefine the
+* By default, all logging messages reaching the ``django`` logger when
+  :setting:`DEBUG` is ``True`` are sent to the console (unless you redefine the
   logger in your :setting:`LOGGING` setting).
 
 * When using :class:`~django.template.RequestContext`, it is now possible to
@@ -299,8 +301,9 @@ Django 1.5 also includes several smaller improvements worth noting:
   whenever a user fails to login successfully. See
   :data:`~django.contrib.auth.signals.user_login_failed`
 
-* The loaddata management command now supports an `ignorenonexistent` option to
-  ignore data for fields that no longer exist.
+* The loaddata management command now supports an
+  :djadminopt:`--ignorenonexistent` option to ignore data for fields that no
+  longer exist.
 
 * :meth:`~django.test.SimpleTestCase.assertXMLEqual` and
   :meth:`~django.test.SimpleTestCase.assertXMLNotEqual` new assertions allow
@@ -416,12 +419,12 @@ System version of :mod:`simplejson` no longer used
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :ref:`As explained below <simplejson-deprecation-beta-1>`, Django 1.5 deprecates
-:mod:`django.utils.simplejson` in favor of Python 2.6's built-in :mod:`json`
+``django.utils.simplejson`` in favor of Python 2.6's built-in :mod:`json`
 module. In theory, this change is harmless. Unfortunately, because of
 incompatibilities between versions of :mod:`simplejson`, it may trigger errors
 in some circumstances.
 
-JSON-related features in Django 1.4 always used :mod:`django.utils.simplejson`.
+JSON-related features in Django 1.4 always used ``django.utils.simplejson``.
 This module was actually:
 
 - A system version of :mod:`simplejson`, if one was available (ie. ``import
@@ -448,7 +451,7 @@ More information on these incompatibilities is available in `ticket #18023`_.
 
 The net result is that, if you have installed :mod:`simplejson` and your code
 uses Django's serialization internals directly -- for instance
-:class:`django.core.serializers.json.DjangoJSONEncoder`, the switch from
+``django.core.serializers.json.DjangoJSONEncoder``, the switch from
 :mod:`simplejson` to :mod:`json` could break your code. (In general, changes to
 internals aren't documented; we're making an exception here.)
 
@@ -474,8 +477,8 @@ When using :doc:`object pagination </topics/pagination>`,
 the ``previous_page_number()`` and ``next_page_number()`` methods of the
 :class:`~django.core.paginator.Page` object did not check if the returned
 number was inside the existing page range.
-It does check it now and raises an :exc:`InvalidPage` exception when the number
-is either too low or too high.
+It does check it now and raises an :exc:`~django.core.paginator.InvalidPage`
+exception when the number is either too low or too high.
 
 Behavior of autocommit database option on PostgreSQL changed
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -585,8 +588,9 @@ Miscellaneous
 * :class:`django.forms.ModelMultipleChoiceField` now returns an empty
   ``QuerySet`` as the empty value instead of an empty list.
 
-* :func:`~django.utils.http.int_to_base36` properly raises a :exc:`TypeError`
-  instead of :exc:`ValueError` for non-integer inputs.
+* :func:`~django.utils.http.int_to_base36` properly raises a
+  :exc:`~exceptions.TypeError` instead of :exc:`~exceptions.ValueError` for
+  non-integer inputs.
 
 * The ``slugify`` template filter is now available as a standard python
   function at :func:`django.utils.text.slugify`. Similarly, ``remove_tags`` is
@@ -594,7 +598,7 @@ Miscellaneous
 
 * Uploaded files are no longer created as executable by default. If you need
   them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your
-  needs. The new default value is `0666` (octal) and the current umask value
+  needs. The new default value is ``0666`` (octal) and the current umask value
   is first masked out.
 
 * The :ref:`F() expressions <query-expressions>` supported bitwise operators by
@@ -636,8 +640,8 @@ the :setting:`AUTH_PROFILE_MODULE` setting, and the
 :meth:`~django.contrib.auth.models.User.get_profile()` method for accessing
 the user profile model, should not be used any longer.
 
-Streaming behavior of :class:`HttpResponse`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Streaming behavior of :class:`~django.http.HttpResponse`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Django 1.5 deprecates the ability to stream a response by passing an iterator
 to :class:`~django.http.HttpResponse`. If you rely on this behavior, switch to
@@ -653,7 +657,7 @@ In Django 1.7 and above, the iterator will be consumed immediately by
 Since Django 1.5 drops support for Python 2.5, we can now rely on the
 :mod:`json` module being available in Python's standard library, so we've
 removed our own copy of :mod:`simplejson`. You should now import :mod:`json`
-instead :mod:`django.utils.simplejson`.
+instead of ``django.utils.simplejson``.
 
 Unfortunately, this change might have unwanted side-effects, because of
 incompatibilities between versions of :mod:`simplejson` -- see the
@@ -671,7 +675,7 @@ Define a ``__str__`` method and apply the
 ``django.utils.itercompat.product``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The :func:`~django.utils.itercompat.product` function has been deprecated. Use
+The ``django.utils.itercompat.product`` function has been deprecated. Use
 the built-in :func:`itertools.product` instead.
 
 ``django.utils.markup``
diff --git a/docs/releases/1.5.1.txt b/docs/releases/1.5.1.txt
new file mode 100644
index 0000000000..99998616d2
--- /dev/null
+++ b/docs/releases/1.5.1.txt
@@ -0,0 +1,28 @@
+==========================
+Django 1.5.1 release notes
+==========================
+
+*March 28, 2013*
+
+This is Django 1.5.1, a bugfix release for Django 1.5. It's completely backwards
+compatible with Django 1.5, but includes a handful of fixes.
+
+The biggest fix is for a memory leak introduced in Django 1.5. Under certain
+circumstances, repeated iteration over querysets could leak memory - sometimes
+quite a bit of it. If you'd like more information, the details are in
+`our ticket tracker`__ (and in `a related issue`__ in Python itself).
+
+__ https://code.djangoproject.com/ticket/19895
+__ http://bugs.python.org/issue17468
+
+If you've noticed memory problems under Django 1.5, upgrading to 1.5.1 should
+fix those issues.
+
+Django 1.5.1 also includes a couple smaller fixes:
+
+* Module-level warnings emitted during tests are no longer silently hidden
+  (`#18985`__).
+* Prevented filtering on password hashes in the user admin (`#20078`__).
+
+__ https://code.djangoproject.com/ticket/18985
+__ https://code.djangoproject.com/ticket/20078
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index 6ac5120617..c54373ee41 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -1,6 +1,6 @@
-============================================
-Django 1.5 release notes - UNDER DEVELOPMENT
-============================================
+========================
+Django 1.5 release notes
+========================
 
 Welcome to Django 1.5!
 
@@ -67,7 +67,7 @@ can simply remove that line under Django 1.5
 Python compatibility
 ====================
 
-Django 1.5 requires Python 2.6.5 or above, though we **highly recommended**
+Django 1.5 requires Python 2.6.5 or above, though we **highly recommend**
 Python 2.7.3 or above. Support for Python 2.5 and below has been dropped.
 
 This change should affect only a small number of Django users, as most
@@ -94,11 +94,19 @@ applications that support both platforms.
 However, we're labeling this support "experimental" for now: although it's
 received extensive testing via our automated test suite, it's received very
 little real-world testing. We've done our best to eliminate bugs, but we can't
-be sure we covered all possible uses of Django. Further, Django's more than a
-web framework; it's an ecosystem of pluggable components. At this point, very
-few third-party applications have been ported to Python 3, so it's unlikely
-that a real-world application will have all its dependencies satisfied under
-Python 3.
+be sure we covered all possible uses of Django.
+
+Some features of Django aren't available because they depend on third-party
+software that hasn't been ported to Python 3 yet, including:
+
+- the MySQL database backend (depends on MySQLdb)
+- :class:`~django.db.models.ImageField` (depends on PIL)
+- :class:`~django.test.LiveServerTestCase` (depends on Selenium WebDriver)
+
+Further, Django's more than a web framework; it's an ecosystem of pluggable
+components. At this point, very few third-party applications have been ported
+to Python 3, so it's unlikely that a real-world application will have all its
+dependencies satisfied under Python 3.
 
 Thus, we're recommending that Django 1.5 not be used in production under Python
 3. Instead, use this opportunity to begin :doc:`porting applications to Python 3
@@ -136,9 +144,9 @@ keyword argument ``update_fields``. By using this argument it is possible to
 save only a select list of model's fields. This can be useful for performance
 reasons or when trying to avoid overwriting concurrent changes.
 
-Deferred instances (those loaded by .only() or .defer()) will automatically
-save just the loaded fields. If any field is set manually after load, that
-field will also get updated on save.
+Deferred instances (those loaded by ``.only()`` or ``.defer()``) will
+automatically save just the loaded fields. If any field is set manually after
+load, that field will also get updated on save.
 
 See the :meth:`Model.save() <django.db.models.Model.save()>` documentation for
 more details.
@@ -214,7 +222,9 @@ GeoDjango
   :meth:`~django.contrib.gis.geos.GEOSGeometry.project()` methods
   (so-called linear referencing).
 
-* The wkb and hex properties of `GEOSGeometry` objects preserve the Z dimension.
+* The ``wkb`` and ``hex`` properties of
+  :class:`~django.contrib.gis.geos.GEOSGeometry` objects preserve the Z
+  dimension.
 
 * Support for PostGIS 2.0 has been added and support for GDAL < 1.5 has been
   dropped.
@@ -245,6 +255,11 @@ Django 1.5 also includes several smaller improvements worth noting:
   from :ref:`call_command <call-command>`. Any exception raised by the command
   (mostly :ref:`CommandError <ref-command-exceptions>`) is propagated.
 
+  Moreover, when you output errors or messages in your custom commands, you
+  should now use ``self.stdout.write('message')`` and
+  ``self.stderr.write('error')`` (see the note on
+  :ref:`management commands output <management-commands-output>`).
+
 * The dumpdata management command outputs one row at a time, preventing
   out-of-memory errors when dumping large datasets.
 
@@ -279,8 +294,8 @@ Django 1.5 also includes several smaller improvements worth noting:
 * An instance of :class:`~django.core.urlresolvers.ResolverMatch` is stored on
   the request as ``resolver_match``.
 
-* By default, all logging messages reaching the `django` logger when
-  :setting:`DEBUG` is `True` are sent to the console (unless you redefine the
+* By default, all logging messages reaching the ``django`` logger when
+  :setting:`DEBUG` is ``True`` are sent to the console (unless you redefine the
   logger in your :setting:`LOGGING` setting).
 
 * When using :class:`~django.template.RequestContext`, it is now possible to
@@ -297,8 +312,9 @@ Django 1.5 also includes several smaller improvements worth noting:
   whenever a user fails to login successfully. See
   :data:`~django.contrib.auth.signals.user_login_failed`
 
-* The loaddata management command now supports an `ignorenonexistent` option to
-  ignore data for fields that no longer exist.
+* The loaddata management command now supports an
+  :djadminopt:`--ignorenonexistent` option to ignore data for fields that no
+  longer exist.
 
 * :meth:`~django.test.SimpleTestCase.assertXMLEqual` and
   :meth:`~django.test.SimpleTestCase.assertXMLNotEqual` new assertions allow
@@ -341,6 +357,16 @@ Backwards incompatible changes in 1.5
     deprecation timeline for a given feature, its removal may appear as a
     backwards incompatible change.
 
+``ALLOWED_HOSTS`` required in production
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The new :setting:`ALLOWED_HOSTS` setting validates the request's ``Host``
+header and protects against host-poisoning attacks. This setting is now
+required whenever :setting:`DEBUG` is ``False``, or else
+:meth:`django.http.HttpRequest.get_host()` will raise
+:exc:`~django.core.exceptions.SuspiciousOperation`. For more details see the
+:setting:`full documentation<ALLOWED_HOSTS>` for the new setting.
+
 Managers on abstract models
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -403,6 +429,19 @@ attribute. Developers wishing to access the raw POST data for these cases,
 should use the :attr:`request.body <django.http.HttpRequest.body>` attribute
 instead.
 
+:data:`~django.core.signals.request_finished` signal
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django used to send the :data:`~django.core.signals.request_finished` signal
+as soon as the view function returned a response. This interacted badly with
+:ref:`streaming responses <httpresponse-streaming>` that delay content
+generation.
+
+This signal is now sent after the content is fully consumed by the WSGI
+gateway. This might be backwards incompatible if you rely on the signal being
+fired before sending the response content to the client. If you do, you should
+consider using a middleware instead.
+
 OPTIONS, PUT and DELETE requests in the test client
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -429,12 +468,12 @@ System version of :mod:`simplejson` no longer used
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :ref:`As explained below <simplejson-deprecation>`, Django 1.5 deprecates
-:mod:`django.utils.simplejson` in favor of Python 2.6's built-in :mod:`json`
+``django.utils.simplejson`` in favor of Python 2.6's built-in :mod:`json`
 module. In theory, this change is harmless. Unfortunately, because of
 incompatibilities between versions of :mod:`simplejson`, it may trigger errors
 in some circumstances.
 
-JSON-related features in Django 1.4 always used :mod:`django.utils.simplejson`.
+JSON-related features in Django 1.4 always used ``django.utils.simplejson``.
 This module was actually:
 
 - A system version of :mod:`simplejson`, if one was available (ie. ``import
@@ -461,7 +500,7 @@ More information on these incompatibilities is available in `ticket #18023`_.
 
 The net result is that, if you have installed :mod:`simplejson` and your code
 uses Django's serialization internals directly -- for instance
-:class:`django.core.serializers.json.DjangoJSONEncoder`, the switch from
+``django.core.serializers.json.DjangoJSONEncoder``, the switch from
 :mod:`simplejson` to :mod:`json` could break your code. (In general, changes to
 internals aren't documented; we're making an exception here.)
 
@@ -487,8 +526,8 @@ When using :doc:`object pagination </topics/pagination>`,
 the ``previous_page_number()`` and ``next_page_number()`` methods of the
 :class:`~django.core.paginator.Page` object did not check if the returned
 number was inside the existing page range.
-It does check it now and raises an :exc:`InvalidPage` exception when the number
-is either too low or too high.
+It does check it now and raises an :exc:`~django.core.paginator.InvalidPage`
+exception when the number is either too low or too high.
 
 Behavior of autocommit database option on PostgreSQL changed
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -592,14 +631,34 @@ your routers allow synchronizing content types and permissions to only one of
 them. See the docs on the :ref:`behavior of contrib apps with multiple
 databases <contrib_app_multiple_databases>` for more information.
 
+XML deserializer will not parse documents with a DTD
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to prevent exposure to denial-of-service attacks related to external
+entity references and entity expansion, the XML model deserializer now refuses
+to parse XML documents containing a DTD (DOCTYPE definition). Since the XML
+serializer does not output a DTD, this will not impact typical usage, only
+cases where custom-created XML documents are passed to Django's model
+deserializer.
+
+Formsets default ``max_num``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A (default) value of ``None`` for the ``max_num`` argument to a formset factory
+no longer defaults to allowing any number of forms in the formset. Instead, in
+order to prevent memory-exhaustion attacks, it now defaults to a limit of 1000
+forms. This limit can be raised by explicitly setting a higher value for
+``max_num``.
+
 Miscellaneous
 ~~~~~~~~~~~~~
 
 * :class:`django.forms.ModelMultipleChoiceField` now returns an empty
   ``QuerySet`` as the empty value instead of an empty list.
 
-* :func:`~django.utils.http.int_to_base36` properly raises a :exc:`TypeError`
-  instead of :exc:`ValueError` for non-integer inputs.
+* :func:`~django.utils.http.int_to_base36` properly raises a
+  :exc:`~exceptions.TypeError` instead of :exc:`~exceptions.ValueError` for
+  non-integer inputs.
 
 * The ``slugify`` template filter is now available as a standard python
   function at :func:`django.utils.text.slugify`. Similarly, ``remove_tags`` is
@@ -607,7 +666,7 @@ Miscellaneous
 
 * Uploaded files are no longer created as executable by default. If you need
   them to be executable change :setting:`FILE_UPLOAD_PERMISSIONS` to your
-  needs. The new default value is `0666` (octal) and the current umask value
+  needs. The new default value is ``0666`` (octal) and the current umask value
   is first masked out.
 
 * The :ref:`F() expressions <query-expressions>` supported bitwise operators by
@@ -631,10 +690,39 @@ Miscellaneous
   Attempting to load it with ``{% load adminmedia %}`` will fail. If your
   templates still contain that line you must remove it.
 
+* Because of an implementation oversight, it was possible to use
+  :doc:`django.contrib.redirects </ref/contrib/redirects>` without enabling
+  :doc:`django.contrib.sites </ref/contrib/sites>`. This isn't allowed any
+  longer. If you're using ``django.contrib.redirects``, make sure
+  :setting:`INSTALLED_APPS` contains ``django.contrib.sites``.
+
+* :meth:`BoundField.label_tag <django.forms.BoundField.label_tag>` now
+  escapes its ``contents`` argument. To avoid the HTML escaping, use
+  :func:`django.utils.safestring.mark_safe` on the argument before passing it.
+
 Features deprecated in 1.5
 ==========================
 
-.. _simplejson-deprecation:
+``django.contrib.localflavor``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The localflavor contrib app has been split into separate packages.
+``django.contrib.localflavor`` itself will be removed in Django 1.6, after an
+:ref:`accelerated deprecation <localflavor-deprecation-policy>`. The docs
+provide :ref:`migration instructions <localflavor-how-to-migrate>`.
+
+The new packages are available :ref:`on Github <localflavor-packages>`. The
+core team cannot efficiently maintain these packages in the long term — it
+spans just a dozen countries at this time; similar to translations, maintenance
+will be handed over to interested members of the community.
+
+``django.contrib.markup``
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The markup contrib module has been deprecated and will follow an accelerated
+deprecation schedule. Direct use of python markup libraries or 3rd party tag
+libraries is preferred to Django maintaining this functionality in the
+framework.
 
 :setting:`AUTH_PROFILE_MODULE`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -649,8 +737,8 @@ the :setting:`AUTH_PROFILE_MODULE` setting, and the
 :meth:`~django.contrib.auth.models.User.get_profile()` method for accessing
 the user profile model, should not be used any longer.
 
-Streaming behavior of :class:`HttpResponse`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Streaming behavior of :class:`~django.http.HttpResponse`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Django 1.5 deprecates the ability to stream a response by passing an iterator
 to :class:`~django.http.HttpResponse`. If you rely on this behavior, switch to
@@ -660,13 +748,15 @@ to :class:`~django.http.HttpResponse`. If you rely on this behavior, switch to
 In Django 1.7 and above, the iterator will be consumed immediately by
 :class:`~django.http.HttpResponse`.
 
+.. _simplejson-deprecation:
+
 ``django.utils.simplejson``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Since Django 1.5 drops support for Python 2.5, we can now rely on the
 :mod:`json` module being available in Python's standard library, so we've
 removed our own copy of :mod:`simplejson`. You should now import :mod:`json`
-instead :mod:`django.utils.simplejson`.
+instead of ``django.utils.simplejson``.
 
 Unfortunately, this change might have unwanted side-effects, because of
 incompatibilities between versions of :mod:`simplejson` -- see the
@@ -684,17 +774,9 @@ Define a ``__str__`` method and apply the
 ``django.utils.itercompat.product``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The :func:`~django.utils.itercompat.product` function has been deprecated. Use
+The ``django.utils.itercompat.product`` function has been deprecated. Use
 the built-in :func:`itertools.product` instead.
 
-``django.utils.markup``
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The markup contrib module has been deprecated and will follow an accelerated
-deprecation schedule. Direct use of python markup libraries or 3rd party tag
-libraries is preferred to Django maintaining this functionality in the
-framework.
-
 ``cleanup`` management command
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 1f57913397..2f06756a1b 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -2,6 +2,24 @@
 Django 1.6 release notes - UNDER DEVELOPMENT
 ============================================
 
+.. note::
+
+    Dedicated to Malcolm Tredinnick
+
+    On March 17, 2013, the Django project and the free software community lost
+    a very dear friend and developer.
+
+    Malcolm was a long-time contributor to Django, a model community member, a
+    brilliant mind, and a friend. His contributions to Django — and to many other
+    open source projects — are nearly impossible to enumerate. Many on the core
+    Django team had their first patches reviewed by him; his mentorship enriched
+    us. His consideration, patience, and dedication will always be an inspiration
+    to us.
+
+    This release of Django is for Malcolm.
+
+    -- The Django Developers
+
 Welcome to Django 1.6!
 
 These release notes cover the `new features`_, as well as some `backwards
@@ -17,17 +35,173 @@ deprecation process for some features`_.
 What's new in Django 1.6
 ========================
 
+Simplified default project and app templates
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The default templates used by :djadmin:`startproject` and :djadmin:`startapp`
+have been simplified and modernized. The :doc:`admin
+</ref/contrib/admin/index>` is now enabled by default in new projects; the
+:doc:`sites </ref/contrib/sites>` framework no longer is. :ref:`Language
+detection <how-django-discovers-language-preference>` and :ref:`clickjacking
+prevention <clickjacking-prevention>` are turned on.
+
+If the default templates don't suit your tastes, you can use :ref:`custom
+project and app templates <custom-app-and-project-templates>`.
+
+Improved transaction management
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django's transaction management was overhauled. Database-level autocommit is
+now turned on by default. This makes transaction handling more explicit and
+should improve performance. The existing APIs were deprecated, and new APIs
+were introduced, as described in the :doc:`transaction management docs
+</topics/db/transactions>`.
+
+Please review carefully the list of :ref:`known backwards-incompatibilities
+<transactions-upgrading-from-1.5>` to determine if you need to make changes in
+your code.
+
+Persistent database connections
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django now supports reusing the same database connection for several requests.
+This avoids the overhead of re-establishing a connection at the beginning of
+each request.
+
+By default, database connections will kept open for 10 minutes. This behavior
+is controlled by the :setting:`CONN_MAX_AGE` setting. To restore the previous
+behavior of closing the connection at the end of each request, set
+:setting:`CONN_MAX_AGE` to ``0``. See :ref:`persistent-database-connections`
+for details.
+
+Time zone aware aggregation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The support for :doc:`time zones </topics/i18n/timezones>` introduced in
+Django 1.4 didn't work well with :meth:`QuerySet.dates()
+<django.db.models.query.QuerySet.dates>`: aggregation was always performed in
+UTC. This limitation was lifted in Django 1.6. Use :meth:`QuerySet.datetimes()
+<django.db.models.query.QuerySet.datetimes>` to perform time zone aware
+aggregation on a :class:`~django.db.models.DateTimeField`.
+
+Support for savepoints in SQLite
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django 1.6 adds support for savepoints in SQLite, with some :ref:`limitations
+<savepoints-in-sqlite>`.
+
+``BinaryField`` model field
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A new :class:`django.db.models.BinaryField` model field allows to store raw
+binary data in the database.
+
 Minor features
 ~~~~~~~~~~~~~~
 
 * Authentication backends can raise ``PermissionDenied`` to immediately fail
   the authentication chain.
 
+* The HttpOnly flag can be set on the CSRF cookie with
+  :setting:`CSRF_COOKIE_HTTPONLY`.
+
 * The ``assertQuerysetEqual()`` now checks for undefined order and raises
   ``ValueError`` if undefined order is spotted. The order is seen as
   undefined if the given ``QuerySet`` isn't ordered and there are more than
   one ordered values to compare against.
 
+* Added :meth:`~django.db.models.query.QuerySet.earliest` for symmetry with
+  :meth:`~django.db.models.query.QuerySet.latest`.
+
+* In addition to :lookup:`year`, :lookup:`month` and :lookup:`day`, the ORM
+  now supports :lookup:`hour`, :lookup:`minute` and :lookup:`second` lookups.
+
+* Django now wraps all PEP-249 exceptions.
+
+* The default widgets for :class:`~django.forms.EmailField`,
+  :class:`~django.forms.URLField`, :class:`~django.forms.IntegerField`,
+  :class:`~django.forms.FloatField` and :class:`~django.forms.DecimalField` use
+  the new type attributes available in HTML5 (type='email', type='url',
+  type='number'). Note that due to erratic support of the ``number`` input type
+  with localized numbers in current browsers, Django only uses it when numeric
+  fields are not localized.
+
+* The ``number`` argument for :ref:`lazy plural translations
+  <lazy-plural-translations>` can be provided at translation time rather than
+  at definition time.
+
+* For custom management commands: Verification of the presence of valid
+  settings in commands that ask for it by using the
+  :attr:`~django.core.management.BaseCommand.can_import_settings` internal
+  option is now performed independently from handling of the locale that
+  should be active during the execution of the command. The latter can now be
+  influenced by the new
+  :attr:`~django.core.management.BaseCommand.leave_locale_alone` internal
+  option. See :ref:`management-commands-and-locales` for more details.
+
+* The :attr:`~django.views.generic.edit.DeletionMixin.success_url` of
+  :class:`~django.views.generic.edit.DeletionMixin` is now interpolated with
+  its ``object``\'s ``__dict__``.
+
+* :class:`~django.http.HttpResponseRedirect` and
+  :class:`~django.http.HttpResponsePermanentRedirect` now provide an ``url``
+  attribute (equivalent to the URL the response will redirect to).
+
+* The ``MemcachedCache`` cache backend now uses the latest :mod:`pickle`
+  protocol available.
+
+* Added :class:`~django.contrib.messages.views.SuccessMessageMixin` which
+  provides a ``success_message`` attribute for
+  :class:`~django.views.generic.edit.FormView` based classes.
+
+* Added the :attr:`django.db.models.ForeignKey.db_constraint` and
+  :attr:`django.db.models.ManyToManyField.db_constraint` options.
+
+* The jQuery library embedded in the admin has been upgraded to version 1.9.1.
+
+* Syndication feeds (:mod:`django.contrib.syndication`) can now pass extra
+  context through to feed templates using a new `Feed.get_context_data()`
+  callback.
+
+* The admin list columns have a ``column-<field_name>`` class in the HTML
+  so the columns header can be styled with CSS, e.g. to set a column width.
+
+* The isolation level can be customized under PostgreSQL.
+
+* The :ttag:`blocktrans` template tag now respects
+  :setting:`TEMPLATE_STRING_IF_INVALID` for variables not present in the
+  context, just like other template constructs.
+
+* SimpleLazyObjects will now present more helpful representations in shell
+  debugging situations.
+
+* Generic :class:`~django.contrib.gis.db.models.GeometryField` is now editable
+  with the OpenLayers widget in the admin.
+
+* The :meth:`Model.save() <django.db.models.Model.save()>` will do
+  ``UPDATE`` - if not updated - ``INSERT`` instead of ``SELECT`` - if not
+  found ``INSERT`` else ``UPDATE`` in case the model's primary key is set.
+
+* The documentation contains a :doc:`deployment checklist
+  </howto/deployment/checklist>`.
+
+* The :djadmin:`diffsettings` comand gained a ``--all`` option.
+
+* ``django.forms.fields.Field.__init__`` now calls ``super()``, allowing
+  field mixins to implement ``__init__()`` methods that will reliably be
+  called.
+
+* The ``validate_max`` parameter was added to ``BaseFormSet`` and
+  :func:`~django.forms.formsets.formset_factory`, and ``ModelForm`` and inline
+  versions of the same.  The behavior of validation for formsets with
+  ``max_num`` was clarified.  The previously undocumented behavior that
+  hardened formsets against memory exhaustion attacks was documented,
+  and the undocumented limit of the higher of 1000 or ``max_num`` forms
+  was changed so it is always 1000 more than ``max_num``.
+
+* Added ``BCryptSHA256PasswordHasher`` to resolve the password truncation issue
+  with bcrypt.
+
 Backwards incompatible changes in 1.6
 =====================================
 
@@ -39,5 +213,335 @@ Backwards incompatible changes in 1.6
     deprecation timeline for a given feature, its removal may appear as a
     backwards incompatible change.
 
+New transaction management model
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Behavior changes
+^^^^^^^^^^^^^^^^
+
+Database-level autocommit is enabled by default in Django 1.6. While this
+doesn't change the general spirit of Django's transaction management, there
+are a few known backwards-incompatibities, described in the :ref:`transaction
+management docs <transactions-upgrading-from-1.5>`. You should review your
+code to determine if you're affected.
+
+Savepoints and ``assertNumQueries``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The changes in transaction management may result in additional statements to
+create, release or rollback savepoints. This is more likely to happen with
+SQLite, since it didn't support savepoints until this release.
+
+If tests using :meth:`~django.test.TestCase.assertNumQueries` fail because of
+a higher number of queries than expected, check that the extra queries are
+related to savepoints, and adjust the expected number of queries accordingly.
+
+Autocommit option for PostgreSQL
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In previous versions, database-level autocommit was only an option for
+PostgreSQL, and it was disabled by default. This option is now :ref:`ignored
+<postgresql-autocommit-mode>` and can be removed.
+
+Addition of ``QuerySet.datetimes()``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When the :doc:`time zone support </topics/i18n/timezones>` added in Django 1.4
+was active, :meth:`QuerySet.dates() <django.db.models.query.QuerySet.dates>`
+lookups returned unexpected results, because the aggregation was performed in
+UTC. To fix this, Django 1.6 introduces a new API, :meth:`QuerySet.datetimes()
+<django.db.models.query.QuerySet.datetimes>`. This requires a few changes in
+your code.
+
+``QuerySet.dates()`` returns ``date`` objects
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+:meth:`QuerySet.dates() <django.db.models.query.QuerySet.dates>` now returns a
+list of :class:`~datetime.date`. It used to return a list of
+:class:`~datetime.datetime`.
+
+:meth:`QuerySet.datetimes() <django.db.models.query.QuerySet.datetimes>`
+returns a list of :class:`~datetime.datetime`.
+
+``QuerySet.dates()`` no longer usable on ``DateTimeField``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+:meth:`QuerySet.dates() <django.db.models.query.QuerySet.dates>` raises an
+error if it's used on :class:`~django.db.models.DateTimeField` when time
+zone support is active. Use :meth:`QuerySet.datetimes()
+<django.db.models.query.QuerySet.datetimes>` instead.
+
+``date_hierarchy`` requires time zone definitions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The :attr:`~django.contrib.admin.ModelAdmin.date_hierarchy` feature of the
+admin now relies on :meth:`QuerySet.datetimes()
+<django.db.models.query.QuerySet.datetimes>` when it's used on a
+:class:`~django.db.models.DateTimeField`.
+
+This requires time zone definitions in the database when :setting:`USE_TZ` is
+``True``. :ref:`Learn more <database-time-zone-definitions>`.
+
+``date_list`` in generic views requires time zone definitions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For the same reason, accessing ``date_list`` in the context of a date-based
+generic view requires time zone definitions in the database when the view is
+based on a :class:`~django.db.models.DateTimeField` and :setting:`USE_TZ` is
+``True``. :ref:`Learn more <database-time-zone-definitions>`.
+
+New lookups may clash with model fields
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django 1.6 introduces ``hour``, ``minute``, and ``second`` lookups on
+:class:`~django.db.models.DateTimeField`. If you had model fields called
+``hour``, ``minute``, or ``second``, the new lookups will clash with you field
+names. Append an explicit :lookup:`exact` lookup if this is an issue.
+
+Persistent database connections
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Connection setup not repeated for each request
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When Django establishes a connection to the database, it sets up appropriate
+parameters, depending on the backend being used. Since `persistent database
+connections <persistent-database-connections>`_ are enabled by default in
+Django 1.6, this setup isn't repeated at every request any more. If you
+modifiy parameters such as the connection's isolation level or time zone, you
+should either restore Django's defaults at the end of each request, force an
+appropriate value at the beginning of each request, or disable persistent
+connections.
+
+``BooleanField`` no longer defaults to ``False``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When a :class:`~django.db.models.BooleanField` doesn't have an explicit
+:attr:`~django.db.models.Field.default`, the implicit default value is
+``None``. In previous version of Django, it was ``False``, but that didn't
+represent accurately the lack of a value.
+
+Code that relies on the default value being ``False`` may raise an exception
+when saving new model instances to the database, because ``None`` isn't an
+acceptable value for a :class:`~django.db.models.BooleanField`. You should
+either specify ``default=False`` in the field definition, or ensure the field
+is set to ``True`` or ``False`` before saving the object.
+
+Translations and comments in templates
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Extraction of translations after comments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Extraction of translatable literals from templates with the
+:djadmin:`makemessages` command now correctly detects i18n constructs when
+they are located after a ``{#`` / ``#}``-type comment on the same line. E.g.:
+
+.. code-block:: html+django
+
+    {# A comment #}{% trans "This literal was incorrectly ignored. Not anymore" %}
+
+Location of translator comments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Validation of the placement of :ref:`translator-comments-in-templates`
+specified using ``{#`` / ``#}`` is now stricter. All translator comments not
+located at the end of their respective lines in a template are ignored and a
+warning is generated by :djadmin:`makemessages` when it finds them. E.g.:
+
+.. code-block:: html+django
+
+    {# Translators: This is ignored #}{% trans "Translate me" %}
+    {{ title }}{# Translators: Extracted and associated with 'Welcome' below #}
+    <h1>{% trans "Welcome" %}</h1>
+
+Quoting in :func:`~django.core.urlresolvers.reverse`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When reversing URLs, Django didn't apply :func:`~django.utils.http.urlquote`
+to arguments before interpolating them in URL patterns. This bug is fixed in
+Django 1.6. If you worked around this bug by applying URL quoting before
+passing arguments to :func:`~django.core.urlresolvers.reverse`, this may
+result in double-quoting. If this happens, simply remove the URL quoting from
+your code.
+
+Storage of IP addresses in the comments app
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The :doc:`comments </ref/contrib/comments/index>` app now uses a
+``GenericIPAddressField`` for storing commenters' IP addresses, to support
+comments submitted from IPv6 addresses. Until now, it stored them in an
+``IPAddressField``, which is only meant to support IPv4. When saving a comment
+made from an IPv6 address, the address would be silently truncated on MySQL
+databases, and raise an exception on Oracle. You will need to change the
+column type in your database to benefit from this change.
+
+For MySQL, execute this query on your project's database:
+
+.. code-block:: sql
+
+    ALTER TABLE django_comments MODIFY ip_address VARCHAR(39);
+
+For Oracle, execute this query:
+
+.. code-block:: sql
+
+    ALTER TABLE DJANGO_COMMENTS MODIFY (ip_address VARCHAR2(39));
+
+If you do not apply this change, the behaviour is unchanged: on MySQL, IPv6
+addresses are silently truncated; on Oracle, an exception is generated. No
+database change is needed for SQLite or PostgreSQL databases.
+
+Percent literals in ``cursor.execute`` queries
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you are running raw SQL queries through the
+:ref:`cursor.execute <executing-custom-sql>` method, the rule about doubling
+percent literals (``%``) inside the query has been unified. Past behavior
+depended on the database backend. Now, across all backends, you only need to
+double literal percent characters if you are also providing replacement
+parameters. For example::
+
+    # No parameters, no percent doubling
+    cursor.execute("SELECT foo FROM bar WHERE baz = '30%'")
+
+    # Parameters passed, non-placeholders have to be doubled
+    cursor.execute("SELECT foo FROM bar WHERE baz = '30%%' and id = %s", [self.id])
+
+``SQLite`` users need to check and update such queries.
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+* The ``django.db.models.query.EmptyQuerySet`` can't be instantiated any more -
+  it is only usable as a marker class for checking if
+  :meth:`~django.db.models.query.QuerySet.none` has been called:
+  ``isinstance(qs.none(), EmptyQuerySet)``
+
+* If your CSS/Javascript code used to access HTML input widgets by type, you
+  should review it as ``type='text'`` widgets might be now output as
+  ``type='email'``, ``type='url'`` or ``type='number'`` depending on their
+  corresponding field type.
+
 Features deprecated in 1.6
 ==========================
+
+Transaction management APIs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Transaction management was completely overhauled in Django 1.6, and the
+current APIs are deprecated:
+
+- ``django.middleware.transaction.TransactionMiddleware``
+- ``django.db.transaction.autocommit``
+- ``django.db.transaction.commit_on_success``
+- ``django.db.transaction.commit_manually``
+- the ``TRANSACTIONS_MANAGED`` setting
+
+The reasons for this change and the upgrade path are described in the
+:ref:`transactions documentation <transactions-upgrading-from-1.5>`.
+
+``django.contrib.comments``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django's comment framework has been deprecated and is no longer supported. It
+will be available in Django 1.6 and 1.7, and removed in Django 1.8. Most users
+will be better served with a custom solution, or a hosted product like Disqus__.
+
+The code formerly known as ``django.contrib.comments`` is `still available
+in an external repository`__.
+
+__ https://disqus.com/
+__ https://github.com/django/django-contrib-comments
+
+Support for PostgreSQL versions older than 8.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The end of upstream support periods was reached in December 2011 for
+PostgreSQL 8.2 and in February 2013 for 8.3. As a consequence, Django 1.6 sets
+8.4 as the minimum PostgreSQL version it officially supports.
+
+You're strongly encouraged to use the most recent version of PostgreSQL
+available, because of performance improvements and to take advantage of the
+native streaming replication available in PostgreSQL 9.x.
+
+Changes to :ttag:`cycle` and :ttag:`firstof`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The template system generally escapes all variables to avoid XSS attacks.
+However, due to an accident of history, the :ttag:`cycle` and :ttag:`firstof`
+tags render their arguments as-is.
+
+Django 1.6 starts a process to correct this inconsistency. The ``future``
+template library provides alternate implementations of :ttag:`cycle` and
+:ttag:`firstof` that autoescape their inputs. If you're using these tags,
+you're encourage to include the following line at the top of your templates to
+enable the new behavior::
+
+    {% load cycle from future %}
+
+or::
+
+    {% load firstof from future %}
+
+The tags implementing the old behavior have been deprecated, and in Django
+1.8, the old behavior will be replaced with the new behavior. To ensure
+compatibility with future versions of Django, existing templates should be
+modified to use the ``future`` versions.
+
+If necessary, you can temporarily disable auto-escaping with
+:func:`~django.utils.safestring.mark_safe` or :ttag:`{% autoescape off %}
+<autoescape>`.
+
+``SEND_BROKEN_LINK_EMAILS`` setting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:class:`~django.middleware.common.CommonMiddleware` used to provide basic
+reporting of broken links by email when ``SEND_BROKEN_LINK_EMAILS`` is set to
+``True``.
+
+Because of intractable ordering problems between
+:class:`~django.middleware.common.CommonMiddleware` and
+:class:`~django.middleware.locale.LocaleMiddleware`, this feature was split
+out into a new middleware:
+:class:`~django.middleware.common.BrokenLinkEmailsMiddleware`.
+
+If you're relying on this feature, you should add
+``'django.middleware.common.BrokenLinkEmailsMiddleware'`` to your
+:setting:`MIDDLEWARE_CLASSES` setting and remove ``SEND_BROKEN_LINK_EMAILS``
+from your settings.
+
+``_has_changed`` method on widgets
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you defined your own form widgets and defined the ``_has_changed`` method
+on a widget, you should now define this method on the form field itself.
+
+``module_name`` model meta attribute
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Model._meta.module_name`` was renamed to ``model_name``. Despite being a
+private API, it will go through a regular deprecation path.
+
+``get_query_set`` and similar methods renamed to ``get_queryset``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Methods that return a ``QuerySet`` such as ``Manager.get_query_set`` or
+``ModelAdmin.queryset`` have been renamed to ``get_queryset``.
+
+``shortcut`` view and URLconf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``shortcut`` view was moved from ``django.views.defaults`` to
+``django.contrib.contenttypes.views`` shortly after the 1.0 release, but the
+old location was never deprecated. This oversight was corrected in Django 1.6
+and you should now use the new location.
+
+The URLconf ``django.conf.urls.shortcut`` was also deprecated. If you're
+including it in an URLconf, simply replace::
+
+    (r'^prefix/', include('django.conf.urls.shortcut')),
+
+with::
+
+    (r'^prefix/(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'django.contrib.contenttypes.views.shortcut'),
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index b0cd87a168..c5afd8c719 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -28,6 +28,7 @@ Final releases
 .. toctree::
    :maxdepth: 1
 
+   1.5.1
    1.5
 
 1.4 release
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
deleted file mode 100644
index 3e2b6bbdbf..0000000000
--- a/docs/topics/auth.txt
+++ /dev/null
@@ -1,2696 +0,0 @@
-=============================
-User authentication in Django
-=============================
-
-.. module:: django.contrib.auth
-   :synopsis: Django's authentication framework.
-
-Django comes with a user authentication system. It handles user accounts,
-groups, permissions and cookie-based user sessions. This document explains how
-things work.
-
-Overview
-========
-
-The auth system consists of:
-
-* Users
-* Permissions: Binary (yes/no) flags designating whether a user may perform
-  a certain task.
-* Groups: A generic way of applying labels and permissions to more than one
-  user.
-
-Installation
-============
-
-Authentication support is bundled as a Django application in
-``django.contrib.auth``. To install it, do the following:
-
-1. Put ``'django.contrib.auth'`` and ``'django.contrib.contenttypes'`` in
-   your :setting:`INSTALLED_APPS` setting.
-   (The :class:`~django.contrib.auth.models.Permission` model in
-   :mod:`django.contrib.auth` depends on :mod:`django.contrib.contenttypes`.)
-2. Run the command ``manage.py syncdb``.
-
-Note that the default :file:`settings.py` file created by
-:djadmin:`django-admin.py startproject <startproject>` includes
-``'django.contrib.auth'`` and ``'django.contrib.contenttypes'`` in
-:setting:`INSTALLED_APPS` for convenience.  If your :setting:`INSTALLED_APPS`
-already contains these apps, feel free to run :djadmin:`manage.py syncdb
-<syncdb>` again; you can run that command as many times as you'd like, and each
-time it'll only install what's needed.
-
-The :djadmin:`syncdb` command creates the necessary database tables, creates
-permission objects for all installed apps that need 'em, and prompts you to
-create a superuser account the first time you run it.
-
-Once you've taken those steps, that's it.
-
-Users
-=====
-
-.. class:: models.User
-
-API reference
--------------
-
-Fields
-~~~~~~
-
-.. class:: models.User
-
-    :class:`~django.contrib.auth.models.User` objects have the following
-    fields:
-
-    .. attribute:: models.User.username
-
-        Required. 30 characters or fewer. Usernames may contain alphanumeric,
-        ``_``, ``@``, ``+``, ``.`` and ``-`` characters.
-
-    .. attribute:: models.User.first_name
-
-        Optional. 30 characters or fewer.
-
-    .. attribute:: models.User.last_name
-
-        Optional. 30 characters or fewer.
-
-    .. attribute:: models.User.email
-
-        Optional. Email address.
-
-    .. attribute:: models.User.password
-
-        Required. A hash of, and metadata about, the password. (Django doesn't
-        store the raw password.) Raw passwords can be arbitrarily long and can
-        contain any character. See the "Passwords" section below.
-
-    .. attribute:: models.User.is_staff
-
-        Boolean. Designates whether this user can access the admin site.
-
-    .. attribute:: models.User.is_active
-
-        Boolean. Designates whether this user account should be considered
-        active. We recommend that you set this flag to ``False`` instead of
-        deleting accounts; that way, if your applications have any foreign keys
-        to users, the foreign keys won't break.
-
-        This doesn't necessarily control whether or not the user can log in.
-        Authentication backends aren't required to check for the ``is_active``
-        flag, and the default backends do not. If you want to reject a login
-        based on ``is_active`` being ``False``, it's up to you to check that in
-        your own login view or a custom authentication backend. However, the
-        :class:`~django.contrib.auth.forms.AuthenticationForm` used by the
-        :func:`~django.contrib.auth.views.login` view (which is the default)
-        *does* perform this check, as do the permission-checking methods such
-        as :meth:`~models.User.has_perm` and the authentication in the Django
-        admin. All of those functions/methods will return ``False`` for
-        inactive users.
-
-    .. attribute:: models.User.is_superuser
-
-        Boolean. Designates that this user has all permissions without
-        explicitly assigning them.
-
-    .. attribute:: models.User.last_login
-
-        A datetime of the user's last login. Is set to the current date/time by
-        default.
-
-    .. attribute:: models.User.date_joined
-
-        A datetime designating when the account was created. Is set to the
-        current date/time by default when the account is created.
-
-Methods
-~~~~~~~
-
-.. class:: models.User
-
-    :class:`~django.contrib.auth.models.User` objects have two many-to-many
-    fields: ``groups`` and ``user_permissions``.
-    :class:`~django.contrib.auth.models.User` objects can access their related
-    objects in the same way as any other :doc:`Django model
-    </topics/db/models>`:
-
-    .. code-block:: python
-
-        myuser.groups = [group_list]
-        myuser.groups.add(group, group, ...)
-        myuser.groups.remove(group, group, ...)
-        myuser.groups.clear()
-        myuser.user_permissions = [permission_list]
-        myuser.user_permissions.add(permission, permission, ...)
-        myuser.user_permissions.remove(permission, permission, ...)
-        myuser.user_permissions.clear()
-
-    In addition to those automatic API methods,
-    :class:`~django.contrib.auth.models.User` objects have the following custom
-    methods:
-
-    .. method:: models.User.get_username()
-
-        Returns the username for the user. Since the User model can be swapped
-        out, you should use  this method instead of referencing the username
-        attribute directly.
-
-    .. method:: models.User.is_anonymous()
-
-        Always returns ``False``. This is a way of differentiating
-        :class:`~django.contrib.auth.models.User` and
-        :class:`~django.contrib.auth.models.AnonymousUser` objects.
-        Generally, you should prefer using
-        :meth:`~django.contrib.auth.models.User.is_authenticated()` to this
-        method.
-
-    .. method:: models.User.is_authenticated()
-
-        Always returns ``True``. This is a way to tell if the user has been
-        authenticated. This does not imply any permissions, and doesn't check
-        if the user is active - it only indicates that the user has provided a
-        valid username and password.
-
-    .. method:: models.User.get_full_name()
-
-        Returns the :attr:`~django.contrib.auth.models.User.first_name` plus
-        the :attr:`~django.contrib.auth.models.User.last_name`, with a space in
-        between.
-
-    .. method:: models.User.set_password(raw_password)
-
-        Sets the user's password to the given raw string, taking care of the
-        password hashing. Doesn't save the
-        :class:`~django.contrib.auth.models.User` object.
-
-    .. method:: models.User.check_password(raw_password)
-
-        Returns ``True`` if the given raw string is the correct password for
-        the user. (This takes care of the password hashing in making the
-        comparison.)
-
-    .. method:: models.User.set_unusable_password()
-
-        Marks the user as having no password set.  This isn't the same as
-        having a blank string for a password.
-        :meth:`~django.contrib.auth.models.User.check_password()` for this user
-        will never return ``True``. Doesn't save the
-        :class:`~django.contrib.auth.models.User` object.
-
-        You may need this if authentication for your application takes place
-        against an existing external source such as an LDAP directory.
-
-    .. method:: models.User.has_usable_password()
-
-        Returns ``False`` if
-        :meth:`~django.contrib.auth.models.User.set_unusable_password()` has
-        been called for this user.
-
-    .. method:: models.User.get_group_permissions(obj=None)
-
-        Returns a set of permission strings that the user has, through his/her
-        groups.
-
-        If ``obj`` is passed in, only returns the group permissions for
-        this specific object.
-
-    .. method:: models.User.get_all_permissions(obj=None)
-
-        Returns a set of permission strings that the user has, both through
-        group and user permissions.
-
-        If ``obj`` is passed in, only returns the permissions for this
-        specific object.
-
-    .. method:: models.User.has_perm(perm, obj=None)
-
-        Returns ``True`` if the user has the specified permission, where perm is
-        in the format ``"<app label>.<permission codename>"``. (see
-        `permissions`_ section below). If the user is inactive, this method will
-        always return ``False``.
-
-        If ``obj`` is passed in, this method won't check for a permission for
-        the model, but for this specific object.
-
-    .. method:: models.User.has_perms(perm_list, obj=None)
-
-        Returns ``True`` if the user has each of the specified permissions,
-        where each perm is in the format
-        ``"<app label>.<permission codename>"``. If the user is inactive,
-        this method will always return ``False``.
-
-        If ``obj`` is passed in, this method won't check for permissions for
-        the model, but for the specific object.
-
-    .. method:: models.User.has_module_perms(package_name)
-
-        Returns ``True`` if the user has any permissions in the given package
-        (the Django app label). If the user is inactive, this method will
-        always return ``False``.
-
-    .. method:: models.User.email_user(subject, message, from_email=None)
-
-        Sends an email to the user. If
-        :attr:`~django.contrib.auth.models.User.from_email` is ``None``, Django
-        uses the :setting:`DEFAULT_FROM_EMAIL`.
-
-    .. method:: models.User.get_profile()
-
-        .. deprecated:: 1.5
-            With the introduction of :ref:`custom User models <auth-custom-user>`,
-            the use of :setting:`AUTH_PROFILE_MODULE` to define a single profile
-            model is no longer supported. See the
-            :doc:`Django 1.5 release notes</releases/1.5>` for more information.
-
-        Returns a site-specific profile for this user. Raises
-        :exc:`django.contrib.auth.models.SiteProfileNotAvailable` if the
-        current site doesn't allow profiles, or
-        :exc:`django.core.exceptions.ObjectDoesNotExist` if the user does not
-        have a profile. For information on how to define a site-specific user
-        profile, see the section on `storing additional user information`_ below.
-
-.. _storing additional user information: #storing-additional-information-about-users
-
-Manager functions
-~~~~~~~~~~~~~~~~~
-
-.. class:: models.UserManager
-
-    The :class:`~django.contrib.auth.models.User` model has a custom manager
-    that has the following helper functions:
-
-    .. method:: models.UserManager.create_user(username, email=None, password=None)
-
-        .. versionchanged:: 1.4
-           The ``email`` parameter was made optional. The username
-           parameter is now checked for emptiness and raises a
-           :exc:`ValueError` in case of a negative result.
-
-        Creates, saves and returns a :class:`~django.contrib.auth.models.User`.
-
-        The :attr:`~django.contrib.auth.models.User.username` and
-        :attr:`~django.contrib.auth.models.User.password` are set as given. The
-        domain portion of :attr:`~django.contrib.auth.models.User.email` is
-        automatically converted to lowercase, and the returned
-        :class:`~django.contrib.auth.models.User` object will have
-        :attr:`~models.User.is_active` set to ``True``.
-
-        If no password is provided,
-        :meth:`~django.contrib.auth.models.User.set_unusable_password()` will
-        be called.
-
-        See `Creating users`_ for example usage.
-
-    .. method:: models.UserManager.make_random_password(length=10, allowed_chars='abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789')
-
-        Returns a random password with the given length and given string of
-        allowed characters. (Note that the default value of ``allowed_chars``
-        doesn't contain letters that can cause user confusion, including:
-
-        * ``i``, ``l``, ``I``, and ``1`` (lowercase letter i, lowercase
-          letter L, uppercase letter i, and the number one)
-        * ``o``, ``O``, and ``0`` (uppercase letter o, lowercase letter o,
-          and zero)
-
-Basic usage
------------
-
-.. _topics-auth-creating-users:
-
-Creating users
-~~~~~~~~~~~~~~
-
-The most basic way to create users is to use the
-:meth:`~django.contrib.auth.models.UserManager.create_user` helper function
-that comes with Django::
-
-    >>> from django.contrib.auth.models import User
-    >>> user = User.objects.create_user('john', 'lennon@thebeatles.com', 'johnpassword')
-
-    # At this point, user is a User object that has already been saved
-    # to the database. You can continue to change its attributes
-    # if you want to change other fields.
-    >>> user.is_staff = True
-    >>> user.save()
-
-You can also create users using the Django admin site. Assuming you've enabled
-the admin site and hooked it to the URL ``/admin/``, the "Add user" page is at
-``/admin/auth/user/add/``. You should also see a link to "Users" in the "Auth"
-section of the main admin index page. The "Add user" admin page is different
-than standard admin pages in that it requires you to choose a username and
-password before allowing you to edit the rest of the user's fields.
-
-Also note: if you want your own user account to be able to create users using
-the Django admin site, you'll need to give yourself permission to add users
-*and* change users (i.e., the "Add user" and "Change user" permissions). If
-your account has permission to add users but not to change them, you won't be
-able to add users. Why? Because if you have permission to add users, you have
-the power to create superusers, which can then, in turn, change other users. So
-Django requires add *and* change permissions as a slight security measure.
-
-Changing passwords
-~~~~~~~~~~~~~~~~~~
-
-:djadmin:`manage.py changepassword *username* <changepassword>` offers a method
-of changing a User's password from the command line. It prompts you to
-change the password of a given user which you must enter twice. If
-they both match, the new password will be changed immediately. If you
-do not supply a user, the command will attempt to change the password
-whose username matches the current user.
-
-You can also change a password programmatically, using
-:meth:`~django.contrib.auth.models.User.set_password()`:
-
-.. code-block:: python
-
-    >>> from django.contrib.auth.models import User
-    >>> u = User.objects.get(username__exact='john')
-    >>> u.set_password('new password')
-    >>> u.save()
-
-Don't set the :attr:`~django.contrib.auth.models.User.password` attribute
-directly unless you know what you're doing. This is explained in the next
-section.
-
-.. _auth_password_storage:
-
-How Django stores passwords
----------------------------
-
-.. versionadded:: 1.4
-   Django 1.4 introduces a new flexible password storage system and uses
-   PBKDF2 by default. Previous versions of Django used SHA1, and other
-   algorithms couldn't be chosen.
-
-The :attr:`~django.contrib.auth.models.User.password` attribute of a
-:class:`~django.contrib.auth.models.User` object is a string in this format::
-
-    algorithm$hash
-
-That's a storage algorithm, and hash, separated by the dollar-sign
-character. The algorithm is one of a number of one way hashing or password
-storage algorithms Django can use; see below. The hash is the result of the one-
-way function.
-
-By default, Django uses the PBKDF2_ algorithm with a SHA256 hash, a
-password stretching mechanism recommended by NIST_. This should be
-sufficient for most users: it's quite secure, requiring massive
-amounts of computing time to break.
-
-However, depending on your requirements, you may choose a different
-algorithm, or even use a custom algorithm to match your specific
-security situation. Again, most users shouldn't need to do this -- if
-you're not sure, you probably don't.  If you do, please read on:
-
-Django chooses the an algorithm by consulting the :setting:`PASSWORD_HASHERS`
-setting. This is a list of hashing algorithm classes that this Django
-installation supports. The first entry in this list (that is,
-``settings.PASSWORD_HASHERS[0]``) will be used to store passwords, and all the
-other entries are valid hashers that can be used to check existing passwords.
-This means that if you want to use a different algorithm, you'll need to modify
-:setting:`PASSWORD_HASHERS` to list your preferred algorithm first in the list.
-
-The default for :setting:`PASSWORD_HASHERS` is::
-
-    PASSWORD_HASHERS = (
-        'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-        'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
-        'django.contrib.auth.hashers.BCryptPasswordHasher',
-        'django.contrib.auth.hashers.SHA1PasswordHasher',
-        'django.contrib.auth.hashers.MD5PasswordHasher',
-        'django.contrib.auth.hashers.CryptPasswordHasher',
-    )
-
-This means that Django will use PBKDF2_ to store all passwords, but will support
-checking passwords stored with PBKDF2SHA1, bcrypt_, SHA1_, etc. The next few
-sections describe a couple of common ways advanced users may want to modify this
-setting.
-
-.. _bcrypt_usage:
-
-Using bcrypt with Django
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Bcrypt_ is a popular password storage algorithm that's specifically designed
-for long-term password storage. It's not the default used by Django since it
-requires the use of third-party libraries, but since many people may want to
-use it Django supports bcrypt with minimal effort.
-
-To use Bcrypt as your default storage algorithm, do the following:
-
-1. Install the `py-bcrypt`_ library (probably by running ``sudo pip install
-   py-bcrypt``, or downloading the library and installing it with ``python
-   setup.py install``).
-
-2. Modify :setting:`PASSWORD_HASHERS` to list ``BCryptPasswordHasher``
-   first. That is, in your settings file, you'd put::
-
-        PASSWORD_HASHERS = (
-            'django.contrib.auth.hashers.BCryptPasswordHasher',
-            'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-            'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
-            'django.contrib.auth.hashers.SHA1PasswordHasher',
-            'django.contrib.auth.hashers.MD5PasswordHasher',
-            'django.contrib.auth.hashers.CryptPasswordHasher',
-        )
-
-   (You need to keep the other entries in this list, or else Django won't
-   be able to upgrade passwords; see below).
-
-That's it -- now your Django install will use Bcrypt as the default storage
-algorithm.
-
-.. admonition:: Other bcrypt implementations
-
-   There are several other implementations that allow bcrypt to be
-   used with Django. Django's bcrypt support is NOT directly
-   compatible with these. To upgrade, you will need to modify the
-   hashes in your database to be in the form `bcrypt$(raw bcrypt
-   output)`. For example:
-   `bcrypt$$2a$12$NT0I31Sa7ihGEWpka9ASYrEFkhuTNeBQ2xfZskIiiJeyFXhRgS.Sy`.
-
-Increasing the work factor
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The PBKDF2 and bcrypt algorithms use a number of iterations or rounds of
-hashing. This deliberately slows down attackers, making attacks against hashed
-passwords harder. However, as computing power increases, the number of
-iterations needs to be increased. We've chosen a reasonable default (and will
-increase it with each release of Django), but you may wish to tune it up or
-down, depending on your security needs and available processing power. To do so,
-you'll subclass the appropriate algorithm and override the ``iterations``
-parameters. For example, to increase the number of iterations used by the
-default PBKDF2 algorithm:
-
-1. Create a subclass of ``django.contrib.auth.hashers.PBKDF2PasswordHasher``::
-
-        from django.contrib.auth.hashers import PBKDF2PasswordHasher
-
-        class MyPBKDF2PasswordHasher(PBKDF2PasswordHasher):
-            """
-            A subclass of PBKDF2PasswordHasher that uses 100 times more iterations.
-            """
-            iterations = PBKDF2PasswordHasher.iterations * 100
-
-   Save this somewhere in your project. For example, you might put this in
-   a file like ``myproject/hashers.py``.
-
-2. Add your new hasher as the first entry in :setting:`PASSWORD_HASHERS`::
-
-        PASSWORD_HASHERS = (
-            'myproject.hashers.MyPBKDF2PasswordHasher',
-            'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-            'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
-            'django.contrib.auth.hashers.BCryptPasswordHasher',
-            'django.contrib.auth.hashers.SHA1PasswordHasher',
-            'django.contrib.auth.hashers.MD5PasswordHasher',
-            'django.contrib.auth.hashers.CryptPasswordHasher',
-        )
-
-
-That's it -- now your Django install will use more iterations when it
-stores passwords using PBKDF2.
-
-Password upgrading
-~~~~~~~~~~~~~~~~~~
-
-When users log in, if their passwords are stored with anything other than
-the preferred algorithm, Django will automatically upgrade the algorithm
-to the preferred one. This means that old installs of Django will get
-automatically more secure as users log in, and it also means that you
-can switch to new (and better) storage algorithms as they get invented.
-
-However, Django can only upgrade passwords that use algorithms mentioned in
-:setting:`PASSWORD_HASHERS`, so as you upgrade to new systems you should make
-sure never to *remove* entries from this list. If you do, users using un-
-mentioned algorithms won't be able to upgrade.
-
-.. _sha1: http://en.wikipedia.org/wiki/SHA1
-.. _pbkdf2: http://en.wikipedia.org/wiki/PBKDF2
-.. _nist: http://csrc.nist.gov/publications/nistpubs/800-132/nist-sp800-132.pdf
-.. _bcrypt: http://en.wikipedia.org/wiki/Bcrypt
-.. _py-bcrypt: http://pypi.python.org/pypi/py-bcrypt/
-
-Anonymous users
----------------
-
-.. class:: models.AnonymousUser
-
-    :class:`django.contrib.auth.models.AnonymousUser` is a class that
-    implements the :class:`django.contrib.auth.models.User` interface, with
-    these differences:
-
-    * :attr:`~django.contrib.auth.models.User.id` is always ``None``.
-    * :attr:`~django.contrib.auth.models.User.is_staff` and
-      :attr:`~django.contrib.auth.models.User.is_superuser` are always
-      ``False``.
-    * :attr:`~django.contrib.auth.models.User.is_active` is always ``False``.
-    * :attr:`~django.contrib.auth.models.User.groups` and
-      :attr:`~django.contrib.auth.models.User.user_permissions` are always
-      empty.
-    * :meth:`~django.contrib.auth.models.User.is_anonymous()` returns ``True``
-      instead of ``False``.
-    * :meth:`~django.contrib.auth.models.User.is_authenticated()` returns
-      ``False`` instead of ``True``.
-    * :meth:`~django.contrib.auth.models.User.set_password()`,
-      :meth:`~django.contrib.auth.models.User.check_password()`,
-      :meth:`~django.contrib.auth.models.User.save()`,
-      :meth:`~django.contrib.auth.models.User.delete()`,
-      :meth:`~django.contrib.auth.models.User.set_groups()` and
-      :meth:`~django.contrib.auth.models.User.set_permissions()` raise
-      :exc:`NotImplementedError`.
-
-In practice, you probably won't need to use
-:class:`~django.contrib.auth.models.AnonymousUser` objects on your own, but
-they're used by Web requests, as explained in the next section.
-
-.. _topics-auth-creating-superusers:
-
-Creating superusers
--------------------
-
-:djadmin:`manage.py syncdb <syncdb>` prompts you to create a superuser the
-first time you run it after adding ``'django.contrib.auth'`` to your
-:setting:`INSTALLED_APPS`. If you need to create a superuser at a later date,
-you can use a command line utility::
-
-    manage.py createsuperuser --username=joe --email=joe@example.com
-
-You will be prompted for a password. After you enter one, the user will be
-created immediately. If you leave off the :djadminopt:`--username` or the
-:djadminopt:`--email` options, it will prompt you for those values.
-
-If you're using an older release of Django, the old way of creating a superuser
-on the command line still works::
-
-    python /path/to/django/contrib/auth/create_superuser.py
-
-...where :file:`/path/to` is the path to the Django codebase on your
-filesystem. The ``manage.py`` command is preferred because it figures out the
-correct path and environment for you.
-
-.. _auth-profiles:
-
-Storing additional information about users
-------------------------------------------
-
-.. deprecated:: 1.5
-    With the introduction of :ref:`custom User models <auth-custom-user>`,
-    the use of :setting:`AUTH_PROFILE_MODULE` to define a single profile
-    model is no longer supported. See the
-    :doc:`Django 1.5 release notes</releases/1.5>` for more information.
-
-If you'd like to store additional information related to your users, Django
-provides a method to specify a site-specific related model -- termed a "user
-profile" -- for this purpose.
-
-To make use of this feature, define a model with fields for the
-additional information you'd like to store, or additional methods
-you'd like to have available, and also add a
-:class:`~django.db.models.Field.OneToOneField` named ``user`` from your model
-to the :class:`~django.contrib.auth.models.User` model. This will ensure only
-one instance of your model can be created for each
-:class:`~django.contrib.auth.models.User`. For example::
-
-    from django.contrib.auth.models import User
-
-    class UserProfile(models.Model):
-        # This field is required.
-        user = models.OneToOneField(User)
-
-        # Other fields here
-        accepted_eula = models.BooleanField()
-        favorite_animal = models.CharField(max_length=20, default="Dragons.")
-
-
-To indicate that this model is the user profile model for a given site, fill in
-the setting :setting:`AUTH_PROFILE_MODULE` with a string consisting of the
-following items, separated by a dot:
-
-1. The name of the application (case sensitive) in which the user
-   profile model is defined (in other words, the
-   name which was passed to :djadmin:`manage.py startapp <startapp>` to create
-   the application).
-
-2. The name of the model (not case sensitive) class.
-
-For example, if the profile model was a class named ``UserProfile`` and was
-defined inside an application named ``accounts``, the appropriate setting would
-be::
-
-    AUTH_PROFILE_MODULE = 'accounts.UserProfile'
-
-When a user profile model has been defined and specified in this manner, each
-:class:`~django.contrib.auth.models.User` object will have a method --
-:class:`~django.contrib.auth.models.User.get_profile()` -- which returns the
-instance of the user profile model associated with that
-:class:`~django.contrib.auth.models.User`.
-
-The method :class:`~django.contrib.auth.models.User.get_profile()`
-does not create a profile if one does not exist. You need to register a handler
-for the User model's :attr:`django.db.models.signals.post_save` signal and, in
-the handler, if ``created`` is ``True``, create the associated user profile::
-
-    # in models.py
-
-    from django.contrib.auth.models import User
-    from django.db.models.signals import post_save
-
-    # definition of UserProfile from above
-    # ...
-
-    def create_user_profile(sender, instance, created, **kwargs):
-        if created:
-            UserProfile.objects.create(user=instance)
-
-    post_save.connect(create_user_profile, sender=User)
-
-.. seealso:: :doc:`/topics/signals` for more information on Django's signal
-    dispatcher.
-
-Adding UserProfile fields to the admin
---------------------------------------
-
-To add the UserProfile fields to the user page in the admin, define an
-:class:`~django.contrib.admin.InlineModelAdmin` (for this example, we'll use a
-:class:`~django.contrib.admin.StackedInline`) in your app's ``admin.py`` and
-add it to a ``UserAdmin`` class which is registered with the
-:class:`~django.contrib.auth.models.User` class::
-
-    from django.contrib import admin
-    from django.contrib.auth.admin import UserAdmin
-    from django.contrib.auth.models import User
-
-    from my_user_profile_app.models import UserProfile
-
-    # Define an inline admin descriptor for UserProfile model
-    # which acts a bit like a singleton
-    class UserProfileInline(admin.StackedInline):
-        model = UserProfile
-        can_delete = False
-        verbose_name_plural = 'profile'
-
-    # Define a new User admin
-    class UserAdmin(UserAdmin):
-        inlines = (UserProfileInline, )
-
-    # Re-register UserAdmin
-    admin.site.unregister(User)
-    admin.site.register(User, UserAdmin)
-
-Authentication in Web requests
-==============================
-
-Until now, this document has dealt with the low-level APIs for manipulating
-authentication-related objects. On a higher level, Django can hook this
-authentication framework into its system of
-:class:`request objects <django.http.HttpRequest>`.
-
-First, install the
-:class:`~django.contrib.sessions.middleware.SessionMiddleware` and
-:class:`~django.contrib.auth.middleware.AuthenticationMiddleware`
-middlewares by adding them to your :setting:`MIDDLEWARE_CLASSES` setting. See
-the :doc:`session documentation </topics/http/sessions>` for more information.
-
-Once you have those middlewares installed, you'll be able to access
-:attr:`request.user <django.http.HttpRequest.user>` in views.
-:attr:`request.user <django.http.HttpRequest.user>` will give you a
-:class:`~django.contrib.auth.models.User` object representing the currently
-logged-in user. If a user isn't currently logged in,
-:attr:`request.user <django.http.HttpRequest.user>` will be set to an instance
-of :class:`~django.contrib.auth.models.AnonymousUser` (see the previous
-section). You can tell them apart with
-:meth:`~django.contrib.auth.models.User.is_authenticated()`, like so::
-
-    if request.user.is_authenticated():
-        # Do something for authenticated users.
-    else:
-        # Do something for anonymous users.
-
-.. _how-to-log-a-user-in:
-
-How to log a user in
---------------------
-
-Django provides two functions in :mod:`django.contrib.auth`:
-:func:`~django.contrib.auth.authenticate()` and
-:func:`~django.contrib.auth.login()`.
-
-.. function:: authenticate()
-
-    To authenticate a given username and password, use
-    :func:`~django.contrib.auth.authenticate()`. It takes two keyword
-    arguments, ``username`` and ``password``, and it returns a
-    :class:`~django.contrib.auth.models.User` object if the password is valid
-    for the given username. If the password is invalid,
-    :func:`~django.contrib.auth.authenticate()` returns ``None``. Example::
-
-        from django.contrib.auth import authenticate
-        user = authenticate(username='john', password='secret')
-        if user is not None:
-            if user.is_active:
-                print("You provided a correct username and password!")
-            else:
-                print("Your account has been disabled!")
-        else:
-            print("Your username and password were incorrect.")
-
-.. function:: login()
-
-    To log a user in, in a view, use :func:`~django.contrib.auth.login()`. It
-    takes an :class:`~django.http.HttpRequest` object and a
-    :class:`~django.contrib.auth.models.User` object.
-    :func:`~django.contrib.auth.login()` saves the user's ID in the session,
-    using Django's session framework, so, as mentioned above, you'll need to
-    make sure to have the session middleware installed.
-
-    Note that data set during the anonymous session is retained when the user
-    logs in.
-
-    This example shows how you might use both
-    :func:`~django.contrib.auth.authenticate()` and
-    :func:`~django.contrib.auth.login()`::
-
-        from django.contrib.auth import authenticate, login
-
-        def my_view(request):
-            username = request.POST['username']
-            password = request.POST['password']
-            user = authenticate(username=username, password=password)
-            if user is not None:
-                if user.is_active:
-                    login(request, user)
-                    # Redirect to a success page.
-                else:
-                    # Return a 'disabled account' error message
-            else:
-                # Return an 'invalid login' error message.
-
-.. admonition:: Calling ``authenticate()`` first
-
-    When you're manually logging a user in, you *must* call
-    :func:`~django.contrib.auth.authenticate()` before you call
-    :func:`~django.contrib.auth.login()`.
-    :func:`~django.contrib.auth.authenticate()`
-    sets an attribute on the :class:`~django.contrib.auth.models.User` noting
-    which authentication backend successfully authenticated that user (see the
-    `backends documentation`_ for details), and this information is needed
-    later during the login process.
-
-.. _backends documentation: #other-authentication-sources
-
-Manually managing a user's password
------------------------------------
-
-.. currentmodule:: django.contrib.auth.hashers
-
-.. versionadded:: 1.4
-    The :mod:`django.contrib.auth.hashers` module provides a set of functions
-    to create and validate hashed password. You can use them independently
-    from the ``User`` model.
-
-.. function:: check_password(password, encoded)
-
-    .. versionadded:: 1.4
-
-    If you'd like to manually authenticate a user by comparing a plain-text
-    password to the hashed password in the database, use the convenience
-    function :func:`django.contrib.auth.hashers.check_password`. It takes two
-    arguments: the plain-text password to check, and the full value of a
-    user's ``password`` field in the database to check against, and returns
-    ``True`` if they match, ``False`` otherwise.
-
-.. function:: make_password(password[, salt, hashers])
-
-    .. versionadded:: 1.4
-
-    Creates a hashed password in the format used by this application. It takes
-    one mandatory argument: the password in plain-text. Optionally, you can
-    provide a salt and a hashing algorithm to use, if you don't want to use the
-    defaults (first entry of ``PASSWORD_HASHERS`` setting).
-    Currently supported algorithms are: ``'pbkdf2_sha256'``, ``'pbkdf2_sha1'``,
-    ``'bcrypt'`` (see :ref:`bcrypt_usage`), ``'sha1'``, ``'md5'``,
-    ``'unsalted_md5'`` (only for backward compatibility) and ``'crypt'``
-    if you have the ``crypt`` library installed. If the password argument is
-    ``None``, an unusable password is returned (a one that will be never
-    accepted by :func:`django.contrib.auth.hashers.check_password`).
-
-.. function:: is_password_usable(encoded_password)
-
-   .. versionadded:: 1.4
-
-   Checks if the given string is a hashed password that has a chance
-   of being verified against :func:`django.contrib.auth.hashers.check_password`.
-
-
-How to log a user out
----------------------
-
-.. currentmodule:: django.contrib.auth
-
-.. function:: logout()
-
-    To log out a user who has been logged in via
-    :func:`django.contrib.auth.login()`, use
-    :func:`django.contrib.auth.logout()` within your view. It takes an
-    :class:`~django.http.HttpRequest` object and has no return value.
-    Example::
-
-        from django.contrib.auth import logout
-
-        def logout_view(request):
-            logout(request)
-            # Redirect to a success page.
-
-    Note that :func:`~django.contrib.auth.logout()` doesn't throw any errors if
-    the user wasn't logged in.
-
-    When you call :func:`~django.contrib.auth.logout()`, the session data for
-    the current request is completely cleaned out. All existing data is
-    removed. This is to prevent another person from using the same Web browser
-    to log in and have access to the previous user's session data. If you want
-    to put anything into the session that will be available to the user
-    immediately after logging out, do that *after* calling
-    :func:`django.contrib.auth.logout()`.
-
-.. _topics-auth-signals:
-
-Login and logout signals
-------------------------
-
-The auth framework uses two :doc:`signals </topics/signals>` that can be used
-for notification when a user logs in or out.
-
-.. data:: django.contrib.auth.signals.user_logged_in
-   :module:
-
-Sent when a user logs in successfully.
-
-Arguments sent with this signal:
-
-``sender``
-    The class of the user that just logged in.
-
-``request``
-    The current :class:`~django.http.HttpRequest` instance.
-
-``user``
-    The user instance that just logged in.
-
-.. data:: django.contrib.auth.signals.user_logged_out
-   :module:
-
-Sent when the logout method is called.
-
-``sender``
-    As above: the class of the user that just logged out or ``None``
-    if the user was not authenticated.
-
-``request``
-    The current :class:`~django.http.HttpRequest` instance.
-
-``user``
-    The user instance that just logged out or ``None`` if the
-    user was not authenticated.
-
-.. data:: django.contrib.auth.signals.user_login_failed
-   :module:
-.. versionadded:: 1.5
-
-Sent when the user failed to login successfully
-
-``sender``
-    The name of the module used for authentication.
-
-``credentials``
-    A dictonary of keyword arguments containing the user credentials that were
-    passed to :func:`~django.contrib.auth.authenticate()` or your own custom
-    authentication backend. Credentials matching a set of 'sensitive' patterns,
-    (including password) will not be sent in the clear as part of the signal.
-
-Limiting access to logged-in users
-----------------------------------
-
-The raw way
-~~~~~~~~~~~
-
-The simple, raw way to limit access to pages is to check
-:meth:`request.user.is_authenticated()
-<django.contrib.auth.models.User.is_authenticated()>` and either redirect to a
-login page::
-
-    from django.http import HttpResponseRedirect
-
-    def my_view(request):
-        if not request.user.is_authenticated():
-            return HttpResponseRedirect('/login/?next=%s' % request.path)
-        # ...
-
-...or display an error message::
-
-    def my_view(request):
-        if not request.user.is_authenticated():
-            return render_to_response('myapp/login_error.html')
-        # ...
-
-The login_required decorator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. function:: decorators.login_required([redirect_field_name=REDIRECT_FIELD_NAME, login_url=None])
-
-    As a shortcut, you can use the convenient
-    :func:`~django.contrib.auth.decorators.login_required` decorator::
-
-        from django.contrib.auth.decorators import login_required
-
-        @login_required
-        def my_view(request):
-            ...
-
-    :func:`~django.contrib.auth.decorators.login_required` does the following:
-
-    * If the user isn't logged in, redirect to
-      :setting:`settings.LOGIN_URL <LOGIN_URL>`, passing the current absolute
-      path in the query string. Example: ``/accounts/login/?next=/polls/3/``.
-
-    * If the user is logged in, execute the view normally. The view code is
-      free to assume the user is logged in.
-
-    By default, the path that the user should be redirected to upon
-    successful authentication is stored in a query string parameter called
-    ``"next"``. If you would prefer to use a different name for this parameter,
-    :func:`~django.contrib.auth.decorators.login_required` takes an
-    optional ``redirect_field_name`` parameter::
-
-        from django.contrib.auth.decorators import login_required
-
-        @login_required(redirect_field_name='my_redirect_field')
-        def my_view(request):
-            ...
-
-    Note that if you provide a value to ``redirect_field_name``, you will most
-    likely need to customize your login template as well, since the template
-    context variable which stores the redirect path will use the value of
-    ``redirect_field_name`` as its key rather than ``"next"`` (the default).
-
-    :func:`~django.contrib.auth.decorators.login_required` also takes an
-    optional ``login_url`` parameter. Example::
-
-        from django.contrib.auth.decorators import login_required
-
-        @login_required(login_url='/accounts/login/')
-        def my_view(request):
-            ...
-
-    Note that if you don't specify the ``login_url`` parameter, you'll need to map
-    the appropriate Django view to :setting:`settings.LOGIN_URL <LOGIN_URL>`. For
-    example, using the defaults, add the following line to your URLconf::
-
-        (r'^accounts/login/$', 'django.contrib.auth.views.login'),
-
-    .. versionchanged:: 1.5
-
-    As of version 1.5 :setting:`settings.LOGIN_URL <LOGIN_URL>` now also accepts
-    view function names and :ref:`named URL patterns <naming-url-patterns>`.
-    This allows you to freely remap your login view within your URLconf
-    without having to update the setting.
-
-.. function:: views.login(request, [template_name, redirect_field_name, authentication_form])
-
-    **URL name:** ``login``
-
-    See :doc:`the URL documentation </topics/http/urls>` for details on using
-    named URL patterns.
-
-    Here's what ``django.contrib.auth.views.login`` does:
-
-    * If called via ``GET``, it displays a login form that POSTs to the
-      same URL. More on this in a bit.
-
-    * If called via ``POST``, it tries to log the user in. If login is
-      successful, the view redirects to the URL specified in ``next``. If
-      ``next`` isn't provided, it redirects to
-      :setting:`settings.LOGIN_REDIRECT_URL <LOGIN_REDIRECT_URL>` (which
-      defaults to ``/accounts/profile/``). If login isn't successful, it
-      redisplays the login form.
-
-    It's your responsibility to provide the login form in a template called
-    ``registration/login.html`` by default. This template gets passed four
-    template context variables:
-
-    * ``form``: A :class:`~django.forms.Form` object representing the login
-      form. See the :doc:`forms documentation </topics/forms/index>` for
-      more on ``Form`` objects.
-
-    * ``next``: The URL to redirect to after successful login. This may
-      contain a query string, too.
-
-    * ``site``: The current :class:`~django.contrib.sites.models.Site`,
-      according to the :setting:`SITE_ID` setting. If you don't have the
-      site framework installed, this will be set to an instance of
-      :class:`~django.contrib.sites.models.RequestSite`, which derives the
-      site name and domain from the current
-      :class:`~django.http.HttpRequest`.
-
-    * ``site_name``: An alias for ``site.name``. If you don't have the site
-      framework installed, this will be set to the value of
-      :attr:`request.META['SERVER_NAME'] <django.http.HttpRequest.META>`.
-      For more on sites, see :doc:`/ref/contrib/sites`.
-
-    If you'd prefer not to call the template :file:`registration/login.html`,
-    you can pass the ``template_name`` parameter via the extra arguments to
-    the view in your URLconf. For example, this URLconf line would use
-    :file:`myapp/login.html` instead::
-
-        (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'myapp/login.html'}),
-
-    You can also specify the name of the ``GET`` field which contains the URL
-    to redirect to after login by passing ``redirect_field_name`` to the view.
-    By default, the field is called ``next``.
-
-    Here's a sample :file:`registration/login.html` template you can use as a
-    starting point. It assumes you have a :file:`base.html` template that
-    defines a ``content`` block:
-
-    .. code-block:: html+django
-
-        {% extends "base.html" %}
-
-        {% block content %}
-
-        {% if form.errors %}
-        <p>Your username and password didn't match. Please try again.</p>
-        {% endif %}
-
-        <form method="post" action="{% url 'django.contrib.auth.views.login' %}">
-        {% csrf_token %}
-        <table>
-        <tr>
-            <td>{{ form.username.label_tag }}</td>
-            <td>{{ form.username }}</td>
-        </tr>
-        <tr>
-            <td>{{ form.password.label_tag }}</td>
-            <td>{{ form.password }}</td>
-        </tr>
-        </table>
-
-        <input type="submit" value="login" />
-        <input type="hidden" name="next" value="{{ next }}" />
-        </form>
-
-        {% endblock %}
-
-    If you are using alternate authentication (see
-    :ref:`authentication-backends`) you can pass a custom authentication form
-    to the login view via the ``authentication_form`` parameter. This form must
-    accept a ``request`` keyword argument in its ``__init__`` method, and
-    provide a ``get_user`` method which returns the authenticated user object
-    (this method is only ever called after successful form validation).
-
-    .. _forms documentation: ../forms/
-    .. _site framework docs: ../sites/
-
-    .. versionadded:: 1.4
-
-    The :func:`~views.login` view and the :ref:`other-built-in-views` now all
-    return a :class:`~django.template.response.TemplateResponse` instance,
-    which allows you to easily customize the response data before rendering.
-    For more details, see the
-    :doc:`TemplateResponse documentation </ref/template-response>`.
-
-.. _other-built-in-views:
-
-Other built-in views
---------------------
-
-.. module:: django.contrib.auth.views
-
-In addition to the :func:`~views.login` view, the authentication system
-includes a few other useful built-in views located in
-:mod:`django.contrib.auth.views`:
-
-.. function:: logout(request, [next_page, template_name, redirect_field_name])
-
-    Logs a user out.
-
-    **URL name:** ``logout``
-
-    See :doc:`the URL documentation </topics/http/urls>` for details on using
-    named URL patterns.
-
-    **Optional arguments:**
-
-    * ``next_page``: The URL to redirect to after logout.
-
-    * ``template_name``: The full name of a template to display after
-      logging the user out. Defaults to
-      :file:`registration/logged_out.html` if no argument is supplied.
-
-    * ``redirect_field_name``: The name of a ``GET`` field containing the
-      URL to redirect to after log out. Overrides ``next_page`` if the given
-      ``GET`` parameter is passed.
-
-    **Template context:**
-
-    * ``title``: The string "Logged out", localized.
-
-    * ``site``: The current :class:`~django.contrib.sites.models.Site`,
-      according to the :setting:`SITE_ID` setting. If you don't have the
-      site framework installed, this will be set to an instance of
-      :class:`~django.contrib.sites.models.RequestSite`, which derives the
-      site name and domain from the current
-      :class:`~django.http.HttpRequest`.
-
-    * ``site_name``: An alias for ``site.name``. If you don't have the site
-      framework installed, this will be set to the value of
-      :attr:`request.META['SERVER_NAME'] <django.http.HttpRequest.META>`.
-      For more on sites, see :doc:`/ref/contrib/sites`.
-
-.. function:: logout_then_login(request[, login_url])
-
-    Logs a user out, then redirects to the login page.
-
-    **URL name:** No default URL provided
-
-    **Optional arguments:**
-
-    * ``login_url``: The URL of the login page to redirect to.
-      Defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>` if not supplied.
-
-.. function:: password_change(request[, template_name, post_change_redirect, password_change_form])
-
-    Allows a user to change their password.
-
-    **URL name:** ``password_change``
-
-    **Optional arguments:**
-
-    * ``template_name``: The full name of a template to use for
-      displaying the password change form. Defaults to
-      :file:`registration/password_change_form.html` if not supplied.
-
-    * ``post_change_redirect``: The URL to redirect to after a successful
-      password change.
-
-    * ``password_change_form``: A custom "change password" form which must
-      accept a ``user`` keyword argument. The form is responsible for
-      actually changing the user's password. Defaults to
-      :class:`~django.contrib.auth.forms.PasswordChangeForm`.
-
-    **Template context:**
-
-    * ``form``: The password change form (see ``password_change_form`` above).
-
-.. function:: password_change_done(request[, template_name])
-
-    The page shown after a user has changed their password.
-
-    **URL name:** ``password_change_done``
-
-    **Optional arguments:**
-
-    * ``template_name``: The full name of a template to use.
-      Defaults to :file:`registration/password_change_done.html` if not
-      supplied.
-
-.. function:: password_reset(request[, is_admin_site, template_name, email_template_name, password_reset_form, token_generator, post_reset_redirect, from_email])
-
-    Allows a user to reset their password by generating a one-time use link
-    that can be used to reset the password, and sending that link to the
-    user's registered email address.
-
-    .. versionchanged:: 1.4
-        Users flagged with an unusable password (see
-        :meth:`~django.contrib.auth.models.User.set_unusable_password()`
-        will not be able to request a password reset to prevent misuse
-        when using an external authentication source like LDAP.
-
-    **URL name:** ``password_reset``
-
-    **Optional arguments:**
-
-    * ``template_name``: The full name of a template to use for
-      displaying the password reset form. Defaults to
-      :file:`registration/password_reset_form.html` if not supplied.
-
-    * ``email_template_name``: The full name of a template to use for
-      generating the email with the reset password link. Defaults to
-      :file:`registration/password_reset_email.html` if not supplied.
-
-    * ``subject_template_name``: The full name of a template to use for
-      the subject of the email with the reset password link. Defaults
-      to :file:`registration/password_reset_subject.txt` if not supplied.
-
-      .. versionadded:: 1.4
-
-    * ``password_reset_form``: Form that will be used to get the email of
-      the user to reset the password for. Defaults to
-      :class:`~django.contrib.auth.forms.PasswordResetForm`.
-
-    * ``token_generator``: Instance of the class to check the one time link.
-      This will default to ``default_token_generator``, it's an instance of
-      ``django.contrib.auth.tokens.PasswordResetTokenGenerator``.
-
-    * ``post_reset_redirect``: The URL to redirect to after a successful
-      password reset request.
-
-    * ``from_email``: A valid email address. By default Django uses
-      the :setting:`DEFAULT_FROM_EMAIL`.
-
-    **Template context:**
-
-    * ``form``: The form (see ``password_reset_form`` above) for resetting
-      the user's password.
-
-    **Email template context:**
-
-    * ``email``: An alias for ``user.email``
-
-    * ``user``: The current :class:`~django.contrib.auth.models.User`,
-      according to the ``email`` form field. Only active users are able to
-      reset their passwords (``User.is_active is True``).
-
-    * ``site_name``: An alias for ``site.name``. If you don't have the site
-      framework installed, this will be set to the value of
-      :attr:`request.META['SERVER_NAME'] <django.http.HttpRequest.META>`.
-      For more on sites, see :doc:`/ref/contrib/sites`.
-
-    * ``domain``: An alias for ``site.domain``. If you don't have the site
-      framework installed, this will be set to the value of
-      ``request.get_host()``.
-
-    * ``protocol``: http or https
-
-    * ``uid``: The user's id encoded in base 36.
-
-    * ``token``: Token to check that the reset link is valid.
-
-    Sample ``registration/password_reset_email.html`` (email body template):
-
-    .. code-block:: html+django
-
-        Someone asked for password reset for email {{ email }}. Follow the link below:
-        {{ protocol}}://{{ domain }}{% url 'password_reset_confirm' uidb36=uid token=token %}
-
-    The same template context is used for subject template. Subject must be
-    single line plain text string.
-
-
-.. function:: password_reset_done(request[, template_name])
-
-    The page shown after a user has been emailed a link to reset their
-    password. This view is called by default if the :func:`password_reset` view
-    doesn't have an explicit ``post_reset_redirect`` URL set.
-
-    **URL name:** ``password_reset_done``
-
-    **Optional arguments:**
-
-    * ``template_name``: The full name of a template to use.
-      Defaults to :file:`registration/password_reset_done.html` if not
-      supplied.
-
-.. function:: password_reset_confirm(request[, uidb36, token, template_name, token_generator, set_password_form, post_reset_redirect])
-
-    Presents a form for entering a new password.
-
-    **URL name:** ``password_reset_confirm``
-
-    **Optional arguments:**
-
-    * ``uidb36``: The user's id encoded in base 36. Defaults to ``None``.
-
-    * ``token``: Token to check that the password is valid. Defaults to
-      ``None``.
-
-    * ``template_name``: The full name of a template to display the confirm
-      password view. Default value is :file:`registration/password_reset_confirm.html`.
-
-    * ``token_generator``: Instance of the class to check the password. This
-      will default to ``default_token_generator``, it's an instance of
-      ``django.contrib.auth.tokens.PasswordResetTokenGenerator``.
-
-    * ``set_password_form``: Form that will be used to set the password.
-      Defaults to :class:`~django.contrib.auth.forms.SetPasswordForm`
-
-    * ``post_reset_redirect``: URL to redirect after the password reset
-      done. Defaults to ``None``.
-
-    **Template context:**
-
-    * ``form``: The form (see ``set_password_form`` above) for setting the
-      new user's password.
-
-    * ``validlink``: Boolean, True if the link (combination of uidb36 and
-      token) is valid or unused yet.
-
-.. function:: password_reset_complete(request[,template_name])
-
-   Presents a view which informs the user that the password has been
-   successfully changed.
-
-   **URL name:** ``password_reset_complete``
-
-   **Optional arguments:**
-
-   * ``template_name``: The full name of a template to display the view.
-     Defaults to :file:`registration/password_reset_complete.html`.
-
-Helper functions
-----------------
-
-.. currentmodule:: django.contrib.auth.views
-
-.. function:: redirect_to_login(next[, login_url, redirect_field_name])
-
-    Redirects to the login page, and then back to another URL after a
-    successful login.
-
-    **Required arguments:**
-
-    * ``next``: The URL to redirect to after a successful login.
-
-    **Optional arguments:**
-
-    * ``login_url``: The URL of the login page to redirect to.
-      Defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>` if not supplied.
-
-    * ``redirect_field_name``: The name of a ``GET`` field containing the
-      URL to redirect to after log out. Overrides ``next`` if the given
-      ``GET`` parameter is passed.
-
-
-.. _built-in-auth-forms:
-
-Built-in forms
---------------
-
-.. module:: django.contrib.auth.forms
-
-If you don't want to use the built-in views, but want the convenience of not
-having to write forms for this functionality, the authentication system
-provides several built-in forms located in :mod:`django.contrib.auth.forms`:
-
-.. class:: AdminPasswordChangeForm
-
-    A form used in the admin interface to change a user's password.
-
-.. class:: AuthenticationForm
-
-    A form for logging a user in.
-
-.. class:: PasswordChangeForm
-
-    A form for allowing a user to change their password.
-
-.. class:: PasswordResetForm
-
-    A form for generating and emailing a one-time use link to reset a
-    user's password.
-
-.. class:: SetPasswordForm
-
-    A form that lets a user change his/her password without entering the old
-    password.
-
-.. class:: UserChangeForm
-
-    A form used in the admin interface to change a user's information and
-    permissions.
-
-.. class:: UserCreationForm
-
-    A form for creating a new user.
-
-Limiting access to logged-in users that pass a test
----------------------------------------------------
-
-.. currentmodule:: django.contrib.auth.decorators
-
-To limit access based on certain permissions or some other test, you'd do
-essentially the same thing as described in the previous section.
-
-The simple way is to run your test on :attr:`request.user
-<django.http.HttpRequest.user>` in the view directly. For example, this view
-checks to make sure the user is logged in and has the permission
-``polls.can_vote``::
-
-    def my_view(request):
-        if not request.user.has_perm('polls.can_vote'):
-            return HttpResponse("You can't vote in this poll.")
-        # ...
-
-.. function:: user_passes_test(func, [login_url=None])
-
-    As a shortcut, you can use the convenient ``user_passes_test`` decorator::
-
-        from django.contrib.auth.decorators import user_passes_test
-
-        @user_passes_test(lambda u: u.has_perm('polls.can_vote'))
-        def my_view(request):
-            ...
-
-    We're using this particular test as a relatively simple example. However,
-    if you just want to test whether a permission is available to a user, you
-    can use the :func:`~django.contrib.auth.decorators.permission_required()`
-    decorator, described later in this document.
-
-    :func:`~django.contrib.auth.decorators.user_passes_test` takes a required
-    argument: a callable that takes a
-    :class:`~django.contrib.auth.models.User` object and returns ``True`` if
-    the user is allowed to view the page. Note that
-    :func:`~django.contrib.auth.decorators.user_passes_test` does not
-    automatically check that the :class:`~django.contrib.auth.models.User` is
-    not anonymous.
-
-    :func:`~django.contrib.auth.decorators.user_passes_test()` takes an
-    optional ``login_url`` argument, which lets you specify the URL for your
-    login page (:setting:`settings.LOGIN_URL <LOGIN_URL>` by default).
-
-    For example::
-
-        from django.contrib.auth.decorators import user_passes_test
-
-        @user_passes_test(lambda u: u.has_perm('polls.can_vote'), login_url='/login/')
-        def my_view(request):
-            ...
-
-The permission_required decorator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. function:: permission_required([login_url=None, raise_exception=False])
-
-    It's a relatively common task to check whether a user has a particular
-    permission. For that reason, Django provides a shortcut for that case: the
-    :func:`~django.contrib.auth.decorators.permission_required()` decorator.
-    Using this decorator, the earlier example can be written as::
-
-        from django.contrib.auth.decorators import permission_required
-
-        @permission_required('polls.can_vote')
-        def my_view(request):
-            ...
-
-    As for the :meth:`User.has_perm` method, permission names take the form
-    ``"<app label>.<permission codename>"`` (i.e. ``polls.can_vote`` for a
-    permission on a model in the ``polls`` application).
-
-    Note that :func:`~django.contrib.auth.decorators.permission_required()`
-    also takes an optional ``login_url`` parameter. Example::
-
-        from django.contrib.auth.decorators import permission_required
-
-        @permission_required('polls.can_vote', login_url='/loginpage/')
-        def my_view(request):
-            ...
-
-    As in the :func:`~decorators.login_required` decorator, ``login_url``
-    defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>`.
-
-    .. versionchanged:: 1.4
-
-    Added ``raise_exception`` parameter. If given, the decorator will raise
-    :exc:`~django.core.exceptions.PermissionDenied`, prompting
-    :ref:`the 403 (HTTP Forbidden) view<http_forbidden_view>` instead of
-    redirecting to the login page.
-
-.. currentmodule:: django.contrib.auth
-
-Applying permissions to generic views
--------------------------------------
-
-To apply a permission to a :doc:`class-based generic view
-</ref/class-based-views/index>`, decorate the :meth:`View.dispatch
-<django.views.generic.base.View.dispatch>` method on the class. See
-:ref:`decorating-class-based-views` for details.
-
-.. _permissions:
-
-Permissions
-===========
-
-Django comes with a simple permissions system. It provides a way to assign
-permissions to specific users and groups of users.
-
-It's used by the Django admin site, but you're welcome to use it in your own
-code.
-
-The Django admin site uses permissions as follows:
-
-* Access to view the "add" form and add an object is limited to users with
-  the "add" permission for that type of object.
-* Access to view the change list, view the "change" form and change an
-  object is limited to users with the "change" permission for that type of
-  object.
-* Access to delete an object is limited to users with the "delete"
-  permission for that type of object.
-
-Permissions can be set not only per type of object, but also per specific
-object instance. By using the
-:meth:`~django.contrib.admin.ModelAdmin.has_add_permission`,
-:meth:`~django.contrib.admin.ModelAdmin.has_change_permission` and
-:meth:`~django.contrib.admin.ModelAdmin.has_delete_permission` methods provided
-by the :class:`~django.contrib.admin.ModelAdmin` class, it is possible to
-customize permissions for different object instances of the same type.
-
-Default permissions
--------------------
-
-When ``django.contrib.auth`` is listed in your :setting:`INSTALLED_APPS`
-setting, it will ensure that three default permissions -- add, change and
-delete -- are created for each Django model defined in one of your installed
-applications.
-
-These permissions will be created when you run :djadmin:`manage.py syncdb
-<syncdb>`; the first time you run ``syncdb`` after adding
-``django.contrib.auth`` to :setting:`INSTALLED_APPS`, the default permissions
-will be created for all previously-installed models, as well as for any new
-models being installed at that time. Afterward, it will create default
-permissions for new models each time you run :djadmin:`manage.py syncdb
-<syncdb>`.
-
-Assuming you have an application with an
-:attr:`~django.db.models.Options.app_label` ``foo`` and a model named ``Bar``,
-to test for basic permissions you should use:
-
-* add: ``user.has_perm('foo.add_bar')``
-* change: ``user.has_perm('foo.change_bar')``
-* delete: ``user.has_perm('foo.delete_bar')``
-
-.. _custom-permissions:
-
-Custom permissions
-------------------
-
-To create custom permissions for a given model object, use the ``permissions``
-:ref:`model Meta attribute <meta-options>`.
-
-This example Task model creates three custom permissions, i.e., actions users
-can or cannot do with Task instances, specific to your application::
-
-    class Task(models.Model):
-        ...
-        class Meta:
-            permissions = (
-                ("view_task", "Can see available tasks"),
-                ("change_task_status", "Can change the status of tasks"),
-                ("close_task", "Can remove a task by setting its status as closed"),
-            )
-
-The only thing this does is create those extra permissions when you run
-:djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
-value of these permissions when an user is trying to access the functionality
-provided by the application (viewing tasks, changing the status of tasks,
-closing tasks.) Continuing the above example, the following checks if a user may
-view tasks::
-
-    user.has_perm('app.view_task')
-
-API reference
--------------
-
-.. currentmodule:: django.contrib.auth.models
-
-.. class:: models.Permission
-
-Fields
-~~~~~~
-
-:class:`~django.contrib.auth.models.Permission` objects have the following
-fields:
-
-.. attribute:: Permission.name
-
-    Required. 50 characters or fewer. Example: ``'Can vote'``.
-
-.. attribute:: Permission.content_type
-
-    Required. A reference to the ``django_content_type`` database table, which
-    contains a record for each installed Django model.
-
-.. attribute:: Permission.codename
-
-    Required. 100 characters or fewer. Example: ``'can_vote'``.
-
-Methods
-~~~~~~~
-
-:class:`~django.contrib.auth.models.Permission` objects have the standard
-data-access methods like any other :doc:`Django model </ref/models/instances>`.
-
-.. currentmodule:: django.contrib.auth
-
-Programmatically creating permissions
--------------------------------------
-
-While custom permissions can be defined within a model's ``Meta`` class, you
-can also create permissions directly. For example, you can create the
-``can_publish`` permission for a ``BlogPost`` model in ``myapp``::
-
-    from django.contrib.auth.models import Group, Permission
-    from django.contrib.contenttypes.models import ContentType
-
-    content_type = ContentType.objects.get(app_label='myapp', model='BlogPost')
-    permission = Permission.objects.create(codename='can_publish',
-                                           name='Can Publish Posts',
-                                           content_type=content_type)
-
-The permission can then be assigned to a
-:class:`~django.contrib.auth.models.User` via its ``user_permissions``
-attribute or to a :class:`~django.contrib.auth.models.Group` via its
-``permissions`` attribute.
-
-Authentication data in templates
-================================
-
-The currently logged-in user and his/her permissions are made available in the
-:doc:`template context </ref/templates/api>` when you use
-:class:`~django.template.context.RequestContext`.
-
-.. admonition:: Technicality
-
-   Technically, these variables are only made available in the template context
-   if you use :class:`~django.template.context.RequestContext` *and* your
-   :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting contains
-   ``"django.contrib.auth.context_processors.auth"``, which is default. For
-   more, see the :ref:`RequestContext docs <subclassing-context-requestcontext>`.
-
-Users
------
-
-When rendering a template :class:`~django.template.context.RequestContext`, the
-currently logged-in user, either a  :class:`~django.contrib.auth.models.User`
-instance or an :class:`~django.contrib.auth.models.AnonymousUser` instance, is
-stored in the template variable ``{{ user }}``:
-
-.. code-block:: html+django
-
-    {% if user.is_authenticated %}
-        <p>Welcome, {{ user.username }}. Thanks for logging in.</p>
-    {% else %}
-        <p>Welcome, new user. Please log in.</p>
-    {% endif %}
-
-This template context variable is not available if a ``RequestContext`` is not
-being used.
-
-Permissions
------------
-
-The currently logged-in user's permissions are stored in the template variable
-``{{ perms }}``. This is an instance of
-:class:`django.contrib.auth.context_processors.PermWrapper`, which is a
-template-friendly proxy of permissions.
-
-In the ``{{ perms }}`` object, single-attribute lookup is a proxy to
-:meth:`User.has_module_perms <django.contrib.auth.models.User.has_module_perms>`.
-This example would display ``True`` if the logged-in user had any permissions
-in the ``foo`` app::
-
-    {{ perms.foo }}
-
-Two-level-attribute lookup is a proxy to
-:meth:`User.has_perm <django.contrib.auth.models.User.has_perm>`. This example
-would display ``True`` if the logged-in user had the permission
-``foo.can_vote``::
-
-    {{ perms.foo.can_vote }}
-
-Thus, you can check permissions in template ``{% if %}`` statements:
-
-.. code-block:: html+django
-
-    {% if perms.foo %}
-        <p>You have permission to do something in the foo app.</p>
-        {% if perms.foo.can_vote %}
-            <p>You can vote!</p>
-        {% endif %}
-        {% if perms.foo.can_drive %}
-            <p>You can drive!</p>
-        {% endif %}
-    {% else %}
-        <p>You don't have permission to do anything in the foo app.</p>
-    {% endif %}
-
-.. versionadded:: 1.5
-    Permission lookup by "if in".
-
-It is possible to also look permissions up by ``{% if in %}`` statements.
-For example:
-
-.. code-block:: html+django
-
-    {% if 'foo' in perms %}
-        {% if 'foo.can_vote' in perms %}
-            <p>In lookup works, too.</p>
-        {% endif %}
-    {% endif %}
-
-Groups
-======
-
-Groups are a generic way of categorizing users so you can apply permissions, or
-some other label, to those users. A user can belong to any number of groups.
-
-A user in a group automatically has the permissions granted to that group. For
-example, if the group ``Site editors`` has the permission
-``can_edit_home_page``, any user in that group will have that permission.
-
-Beyond permissions, groups are a convenient way to categorize users to give
-them some label, or extended functionality. For example, you could create a
-group ``'Special users'``, and you could write code that could, say, give them
-access to a members-only portion of your site, or send them members-only email
-messages.
-
-API reference
--------------
-
-.. class:: models.Group
-
-Fields
-~~~~~~
-
-:class:`~django.contrib.auth.models.Group` objects have the following fields:
-
-.. attribute:: Group.name
-
-    Required. 80 characters or fewer. Any characters are permitted. Example:
-    ``'Awesome Users'``.
-
-.. attribute:: Group.permissions
-
-    Many-to-many field to :class:`~django.contrib.auth.models.Permissions`::
-
-        group.permissions = [permission_list]
-        group.permissions.add(permission, permission, ...)
-        group.permissions.remove(permission, permission, ...)
-        group.permissions.clear()
-
-.. _auth-custom-user:
-
-Customizing the User model
-==========================
-
-.. versionadded:: 1.5
-
-Some kinds of projects may have authentication requirements for which Django's
-built-in :class:`~django.contrib.auth.models.User` model is not always
-appropriate. For instance, on some sites it makes more sense to use an email
-address as your identification token instead of a username.
-
-Django allows you to override the default User model by providing a value for
-the :setting:`AUTH_USER_MODEL` setting that references a custom model::
-
-     AUTH_USER_MODEL = 'myapp.MyUser'
-
-This dotted pair describes the name of the Django app, and the name of the Django
-model that you wish to use as your User model.
-
-.. admonition:: Warning
-
-   Changing :setting:`AUTH_USER_MODEL` has a big effect on your database
-   structure. It changes the tables that are available, and it will affect the
-   construction of foreign keys and many-to-many relationships. If you intend
-   to set :setting:`AUTH_USER_MODEL`, you should set it before running
-   ``manage.py syncdb`` for the first time.
-
-   If you have an existing project and you want to migrate to using a custom
-   User model, you may need to look into using a migration tool like South_
-   to ease the transition.
-
-.. _South: http://south.aeracode.org
-
-Referencing the User model
---------------------------
-
-If you reference :class:`~django.contrib.auth.models.User` directly (for
-example, by referring to it in a foreign key), your code will not work in
-projects where the :setting:`AUTH_USER_MODEL` setting has been changed to a
-different User model.
-
-Instead of referring to :class:`~django.contrib.auth.models.User` directly,
-you should reference the user model using
-:func:`django.contrib.auth.get_user_model()`. This method will return the
-currently active User model -- the custom User model if one is specified, or
-:class:`~django.contrib.auth.User` otherwise.
-
-When you define a foreign key or many-to-many relations to the User model,
-you should specify the custom model using the :setting:`AUTH_USER_MODEL`
-setting. For example::
-
-    from django.conf import settings
-    from django.db import models
-
-    class Article(models.Model)
-        author = models.ForeignKey(settings.AUTH_USER_MODEL)
-
-Specifying a custom User model
-------------------------------
-
-.. admonition:: Model design considerations
-
-    Think carefully before handling information not directly related to
-    authentication in your custom User Model.
-
-    It may be better to store app-specific user information in a model
-    that has a relation with the User model. That allows each app to specify
-    its own user data requirements without risking conflicts with other
-    apps. On the other hand, queries to retrieve this related information
-    will involve a database join, which may have an effect on performance.
-
-Django expects your custom User model to meet some minimum requirements.
-
-1. Your model must have a single unique field that can be used for
-   identification purposes. This can be a username, an email address,
-   or any other unique attribute.
-
-2. Your model must provide a way to address the user in a "short" and
-   "long" form. The most common interpretation of this would be to use
-   the user's given name as the "short" identifier, and the user's full
-   name as the "long" identifier. However, there are no constraints on
-   what these two methods return - if you want, they can return exactly
-   the same value.
-
-The easiest way to construct a compliant custom User model is to inherit from
-:class:`~django.contrib.auth.models.AbstractBaseUser`.
-:class:`~django.contrib.auth.models.AbstractBaseUser` provides the core
-implementation of a `User` model, including hashed passwords and tokenized
-password resets. You must then provide some key implementation details:
-
-.. class:: models.CustomUser
-
-    .. attribute:: User.USERNAME_FIELD
-
-        A string describing the name of the field on the User model that is
-        used as the unique identifier. This will usually be a username of
-        some kind, but it can also be an email address, or any other unique
-        identifier. In the following example, the field `identifier` is used
-        as the identifying field::
-
-            class MyUser(AbstractBaseUser):
-                identifier = models.CharField(max_length=40, unique=True, db_index=True)
-                ...
-                USERNAME_FIELD = 'identifier'
-
-    .. attribute:: User.REQUIRED_FIELDS
-
-        A list of the field names that *must* be provided when creating
-        a user. For example, here is the partial definition for a User model
-        that defines two required fields - a date of birth and height::
-
-            class MyUser(AbstractBaseUser):
-                ...
-                date_of_birth = models.DateField()
-                height = models.FloatField()
-                ...
-                REQUIRED_FIELDS = ['date_of_birth', 'height']
-
-        .. note::
-
-            ``REQUIRED_FIELDS`` must contain all required fields on your User
-            model, but should *not* contain the ``USERNAME_FIELD``.
-
-    .. attribute:: User.is_active
-
-        A boolean attribute that indicates whether the user is considered
-        "active".  This attribute is provided as an attribute on
-        ``AbstractBaseUser`` defaulting to ``True``. How you choose to
-        implement it will depend on the details of your chosen auth backends.
-        See the documentation of the :attr:`attribute on the builtin user model
-        <django.contrib.auth.models.User.is_active>` for details.
-
-    .. method:: User.get_full_name():
-
-        A longer formal identifier for the user. A common interpretation
-        would be the full name name of the user, but it can be any string that
-        identifies the user.
-
-    .. method:: User.get_short_name():
-
-        A short, informal identifier for the user. A common interpretation
-        would be the first name of the user, but it can be any string that
-        identifies the user in an informal way. It may also return the same
-        value as :meth:`django.contrib.auth.User.get_full_name()`.
-
-The following methods are available on any subclass of
-:class:`~django.contrib.auth.models.AbstractBaseUser`:
-
-.. class:: models.AbstractBaseUser
-
-    .. method:: models.AbstractBaseUser.get_username()
-
-        Returns the value of the field nominated by ``USERNAME_FIELD``.
-
-    .. method:: models.AbstractBaseUser.is_anonymous()
-
-        Always returns ``False``. This is a way of differentiating
-        from  :class:`~django.contrib.auth.models.AnonymousUser` objects.
-        Generally, you should prefer using
-        :meth:`~django.contrib.auth.models.AbstractBaseUser.is_authenticated()` to this
-        method.
-
-    .. method:: models.AbstractBaseUser.is_authenticated()
-
-        Always returns ``True``. This is a way to tell if the user has been
-        authenticated. This does not imply any permissions, and doesn't check
-        if the user is active - it only indicates that the user has provided a
-        valid username and password.
-
-    .. method:: models.AbstractBaseUser.set_password(raw_password)
-
-        Sets the user's password to the given raw string, taking care of the
-        password hashing. Doesn't save the
-        :class:`~django.contrib.auth.models.AbstractBaseUser` object.
-
-    .. method:: models.AbstractBaseUser.check_password(raw_password)
-
-        Returns ``True`` if the given raw string is the correct password for
-        the user. (This takes care of the password hashing in making the
-        comparison.)
-
-    .. method:: models.AbstractBaseUser.set_unusable_password()
-
-        Marks the user as having no password set.  This isn't the same as
-        having a blank string for a password.
-        :meth:`~django.contrib.auth.models.AbstractBaseUser.check_password()` for this user
-        will never return ``True``. Doesn't save the
-        :class:`~django.contrib.auth.models.AbstractBaseUser` object.
-
-        You may need this if authentication for your application takes place
-        against an existing external source such as an LDAP directory.
-
-    .. method:: models.AbstractBaseUser.has_usable_password()
-
-        Returns ``False`` if
-        :meth:`~django.contrib.auth.models.AbstractBaseUser.set_unusable_password()` has
-        been called for this user.
-
-
-You should also define a custom manager for your User model. If your User
-model defines `username` and `email` fields the same as Django's default User,
-you can just install Django's
-:class:`~django.contrib.auth.models.UserManager`; however, if your User model
-defines different fields, you will need to define a custom manager that
-extends :class:`~django.contrib.auth.models.BaseUserManager` providing two
-additional methods:
-
-.. class:: models.CustomUserManager
-
-    .. method:: models.CustomUserManager.create_user(*username_field*, password=None, **other_fields)
-
-        The prototype of `create_user()` should accept the username field,
-        plus all required fields as arguments. For example, if your user model
-        uses `email` as the username field, and has `date_of_birth` as a required
-        fields, then create_user should be defined as::
-
-            def create_user(self, email, date_of_birth, password=None):
-                # create user here
-
-    .. method:: models.CustomUserManager.create_superuser(*username_field*, password, **other_fields)
-
-        The prototype of `create_superuser()` should accept the username field,
-        plus all required fields as arguments. For example, if your user model
-        uses `email` as the username field, and has `date_of_birth` as a required
-        fields, then create_superuser should be defined as::
-
-            def create_superuser(self, email, date_of_birth, password):
-                # create superuser here
-
-        Unlike `create_user()`, `create_superuser()` *must* require the caller
-        to provider a password.
-
-:class:`~django.contrib.auth.models.BaseUserManager` provides the following
-utility methods:
-
-.. class:: models.BaseUserManager
-
-    .. method:: models.BaseUserManager.normalize_email(email)
-
-        A classmethod that normalizes email addresses by lowercasing
-        the domain portion of the email address.
-
-    .. method:: models.BaseUserManager.get_by_natural_key(username)
-
-        Retrieves a user instance using the contents of the field
-        nominated by ``USERNAME_FIELD``.
-
-    .. method:: models.BaseUserManager.make_random_password(length=10, allowed_chars='abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789')
-
-        Returns a random password with the given length and given string of
-        allowed characters. (Note that the default value of ``allowed_chars``
-        doesn't contain letters that can cause user confusion, including:
-
-        * ``i``, ``l``, ``I``, and ``1`` (lowercase letter i, lowercase
-          letter L, uppercase letter i, and the number one)
-        * ``o``, ``O``, and ``0`` (uppercase letter o, lowercase letter o,
-          and zero)
-
-Extending Django's default User
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you're entirely happy with Django's :class:`~django.contrib.auth.models.User`
-model and you just want to add some additional profile information, you can
-simply subclass :class:`~django.contrib.auth.models.AbstractUser` and add your
-custom profile fields.
-
-Custom users and the built-in auth forms
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-As you may expect, built-in Django's :ref:`forms <built-in-auth-forms>`
-and :ref:`views <other-built-in-views>` make certain assumptions about
-the user model that they are working with.
-
-If your user model doesn't follow the same assumptions, it may be necessary to define
-a replacement form, and pass that form in as part of the configuration of the
-auth views.
-
-* :class:`~django.contrib.auth.forms.UserCreationForm`
-
-  Depends on the :class:`~django.contrib.auth.models.User` model.
-  Must be re-written for any custom user model.
-
-* :class:`~django.contrib.auth.forms.UserChangeForm`
-
-  Depends on the :class:`~django.contrib.auth.models.User` model.
-  Must be re-written for any custom user model.
-
-* :class:`~django.contrib.auth.forms.AuthenticationForm`
-
-  Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`,
-  and will adapt to use the field defined in `USERNAME_FIELD`.
-
-* :class:`~django.contrib.auth.forms.PasswordResetForm`
-
-  Assumes that the user model has an integer primary key, has a field named
-  `email` that can be used to identify the user, and a boolean field
-  named `is_active` to prevent password resets for inactive users.
-
-* :class:`~django.contrib.auth.forms.SetPasswordForm`
-
-  Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`
-
-* :class:`~django.contrib.auth.forms.PasswordChangeForm`
-
-  Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`
-
-* :class:`~django.contrib.auth.forms.AdminPasswordChangeForm`
-
-  Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`
-
-
-Custom users and django.contrib.admin
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you want your custom User model to also work with Admin, your User model must
-define some additional attributes and methods. These methods allow the admin to
-control access of the User to admin content:
-
-.. attribute:: User.is_staff
-
-    Returns True if the user is allowed to have access to the admin site.
-
-.. attribute:: User.is_active
-
-    Returns True if the user account is currently active.
-
-.. method:: User.has_perm(perm, obj=None):
-
-    Returns True if the user has the named permission. If `obj` is
-    provided, the permission needs to be checked against a specific object
-    instance.
-
-.. method:: User.has_module_perms(app_label):
-
-    Returns True if the user has permission to access models in
-    the given app.
-
-You will also need to register your custom User model with the admin. If
-your custom User model extends :class:`~django.contrib.auth.models.AbstractUser`,
-you can use Django's existing :class:`~django.contrib.auth.admin.UserAdmin`
-class. However, if your User model extends
-:class:`~django.contrib.auth.models.AbstractBaseUser`, you'll need to define
-a custom ModelAdmin class. It may be possible to subclass the default
-:class:`~django.contrib.auth.admin.UserAdmin`; however, you'll need to
-override any of the definitions that refer to fields on
-:class:`~django.contrib.auth.models.AbstractUser` that aren't on your
-custom User class.
-
-Custom users and permissions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To make it easy to include Django's permission framework into your own User
-class, Django provides :class:`~django.contrib.auth.model.PermissionsMixin`.
-This is an abstract model you can include in the class heirarchy for your User
-model, giving you all the methods and database fields necessary to support
-Django's permission model.
-
-:class:`~django.contrib.auth.model.PermissionsMixin` provides the following
-methods and attributes:
-
-.. class:: models.PermissionsMixin
-
-    .. attribute:: models.PermissionsMixin.is_superuser
-
-        Boolean. Designates that this user has all permissions without
-        explicitly assigning them.
-
-    .. method:: models.PermissionsMixin.get_group_permissions(obj=None)
-
-        Returns a set of permission strings that the user has, through his/her
-        groups.
-
-        If ``obj`` is passed in, only returns the group permissions for
-        this specific object.
-
-    .. method:: models.PermissionsMixin.get_all_permissions(obj=None)
-
-        Returns a set of permission strings that the user has, both through
-        group and user permissions.
-
-        If ``obj`` is passed in, only returns the permissions for this
-        specific object.
-
-    .. method:: models.PermissionsMixin.has_perm(perm, obj=None)
-
-        Returns ``True`` if the user has the specified permission, where perm is
-        in the format ``"<app label>.<permission codename>"`` (see
-        `permissions`_). If the user is inactive, this method will
-        always return ``False``.
-
-        If ``obj`` is passed in, this method won't check for a permission for
-        the model, but for this specific object.
-
-    .. method:: models.PermissionsMixin.has_perms(perm_list, obj=None)
-
-        Returns ``True`` if the user has each of the specified permissions,
-        where each perm is in the format
-        ``"<app label>.<permission codename>"``. If the user is inactive,
-        this method will always return ``False``.
-
-        If ``obj`` is passed in, this method won't check for permissions for
-        the model, but for the specific object.
-
-    .. method:: models.PermissionsMixin.has_module_perms(package_name)
-
-        Returns ``True`` if the user has any permissions in the given package
-        (the Django app label). If the user is inactive, this method will
-        always return ``False``.
-
-.. admonition:: ModelBackend
-
-    If you don't include the
-    :class:`~django.contrib.auth.model.PermissionsMixin`, you must ensure you
-    don't invoke the permissions methods on ``ModelBackend``. ``ModelBackend``
-    assumes that certain fields are available on your user model. If your User
-    model doesn't provide  those fields, you will receive database errors when
-    you check permissions.
-
-Custom users and Proxy models
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-One limitation of custom User models is that installing a custom User model
-will break any proxy model extending :class:`~django.contrib.auth.models.User`.
-Proxy models must be based on a concrete base class; by defining a custom User
-model, you remove the ability of Django to reliably identify the base class.
-
-If your project uses proxy models, you must either modify the proxy to extend
-the User model that is currently in use in your project, or merge your proxy's
-behavior into your User subclass.
-
-Custom users and signals
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Another limitation of custom User models is that you can't use
-:func:`django.contrib.auth.get_user_model()` as the sender or target of a signal
-handler. Instead, you must register the handler with the actual User model.
-
-Custom users and testing/fixtures
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you are writing an application that interacts with the User model, you must
-take some precautions to ensure that your test suite will run regardless of
-the User model that is being used by a project. Any test that instantiates an
-instance of User will fail if the User model has been swapped out. This
-includes any attempt to create an instance of User with a fixture.
-
-To ensure that your test suite will pass in any project configuration,
-``django.contrib.auth.tests.utils`` defines a ``@skipIfCustomUser`` decorator.
-This decorator will cause a test case to be skipped if any User model other
-than the default Django user is in use. This decorator can be applied to a
-single test, or to an entire test class.
-
-Depending on your application, tests may also be needed to be added to ensure
-that the application works with *any* user model, not just the default User
-model. To assist with this, Django provides two substitute user models that
-can be used in test suites:
-
-* :class:`django.contrib.auth.tests.custom_user.CustomUser`, a custom user
-  model that uses an ``email`` field as the username, and has a basic
-  admin-compliant permissions setup
-
-* :class:`django.contrib.auth.tests.custom_user.ExtensionUser`, a custom
-  user model that extends :class:`~django.contrib.auth.models.AbstractUser`,
-  adding a ``date_of_birth`` field.
-
-You can then use the ``@override_settings`` decorator to make that test run
-with the custom User model. For example, here is a skeleton for a test that
-would test three possible User models -- the default, plus the two User
-models provided by ``auth`` app::
-
-    from django.contrib.auth.tests.utils import skipIfCustomUser
-    from django.test import TestCase
-    from django.test.utils import override_settings
-
-
-    class ApplicationTestCase(TestCase):
-        @skipIfCustomUser
-        def test_normal_user(self):
-            "Run tests for the normal user model"
-            self.assertSomething()
-
-        @override_settings(AUTH_USER_MODEL='auth.CustomUser')
-        def test_custom_user(self):
-            "Run tests for a custom user model with email-based authentication"
-            self.assertSomething()
-
-        @override_settings(AUTH_USER_MODEL='auth.ExtensionUser')
-        def test_extension_user(self):
-            "Run tests for a simple extension of the built-in User."
-            self.assertSomething()
-
-
-A full example
---------------
-
-Here is an example of an admin-compliant custom user app. This user model uses
-an email address as the username, and has a required date of birth; it
-provides no permission checking, beyond a simple `admin` flag on the user
-account. This model would be compatible with all the built-in auth forms and
-views, except for the User creation forms.
-
-This code would all live in a ``models.py`` file for a custom
-authentication app::
-
-    from django.db import models
-    from django.contrib.auth.models import (
-        BaseUserManager, AbstractBaseUser
-    )
-
-
-    class MyUserManager(BaseUserManager):
-        def create_user(self, email, date_of_birth, password=None):
-            """
-            Creates and saves a User with the given email, date of
-            birth and password.
-            """
-            if not email:
-                raise ValueError('Users must have an email address')
-
-            user = self.model(
-                email=MyUserManager.normalize_email(email),
-                date_of_birth=date_of_birth,
-            )
-
-            user.set_password(password)
-            user.save(using=self._db)
-            return user
-
-        def create_superuser(self, email, date_of_birth, password):
-            """
-            Creates and saves a superuser with the given email, date of
-            birth and password.
-            """
-            user = self.create_user(email,
-                password=password,
-                date_of_birth=date_of_birth
-            )
-            user.is_admin = True
-            user.save(using=self._db)
-            return user
-
-
-    class MyUser(AbstractBaseUser):
-        email = models.EmailField(
-            verbose_name='email address',
-            max_length=255,
-            unique=True,
-            db_index=True,
-        )
-        date_of_birth = models.DateField()
-        is_active = models.BooleanField(default=True)
-        is_admin = models.BooleanField(default=False)
-
-        objects = MyUserManager()
-
-        USERNAME_FIELD = 'email'
-        REQUIRED_FIELDS = ['date_of_birth']
-
-        def get_full_name(self):
-            # The user is identified by their email address
-            return self.email
-
-        def get_short_name(self):
-            # The user is identified by their email address
-            return self.email
-
-        def __unicode__(self):
-            return self.email
-
-        def has_perm(self, perm, obj=None):
-            "Does the user have a specific permission?"
-            # Simplest possible answer: Yes, always
-            return True
-
-        def has_module_perms(self, app_label):
-            "Does the user have permissions to view the app `app_label`?"
-            # Simplest possible answer: Yes, always
-            return True
-
-        @property
-        def is_staff(self):
-            "Is the user a member of staff?"
-            # Simplest possible answer: All admins are staff
-            return self.is_admin
-
-Then, to register this custom User model with Django's admin, the following
-code would be required in the app's ``admin.py`` file::
-
-    from django import forms
-    from django.contrib import admin
-    from django.contrib.auth.models import Group
-    from django.contrib.auth.admin import UserAdmin
-    from django.contrib.auth.forms import ReadOnlyPasswordHashField
-
-    from customauth.models import MyUser
-
-
-    class UserCreationForm(forms.ModelForm):
-        """A form for creating new users. Includes all the required
-        fields, plus a repeated password."""
-        password1 = forms.CharField(label='Password', widget=forms.PasswordInput)
-        password2 = forms.CharField(label='Password confirmation', widget=forms.PasswordInput)
-
-        class Meta:
-            model = MyUser
-            fields = ('email', 'date_of_birth')
-
-        def clean_password2(self):
-            # Check that the two password entries match
-            password1 = self.cleaned_data.get("password1")
-            password2 = self.cleaned_data.get("password2")
-            if password1 and password2 and password1 != password2:
-                raise forms.ValidationError("Passwords don't match")
-            return password2
-
-        def save(self, commit=True):
-            # Save the provided password in hashed format
-            user = super(UserCreationForm, self).save(commit=False)
-            user.set_password(self.cleaned_data["password1"])
-            if commit:
-                user.save()
-            return user
-
-
-    class UserChangeForm(forms.ModelForm):
-        """A form for updating users. Includes all the fields on
-        the user, but replaces the password field with admin's
-        password hash display field.
-        """
-        password = ReadOnlyPasswordHashField()
-
-        class Meta:
-            model = MyUser
-
-        def clean_password(self):
-            # Regardless of what the user provides, return the initial value.
-            # This is done here, rather than on the field, because the
-            # field does not have access to the initial value
-            return self.initial["password"]
-
-
-    class MyUserAdmin(UserAdmin):
-        # The forms to add and change user instances
-        form = UserChangeForm
-        add_form = UserCreationForm
-
-        # The fields to be used in displaying the User model.
-        # These override the definitions on the base UserAdmin
-        # that reference specific fields on auth.User.
-        list_display = ('email', 'date_of_birth', 'is_admin')
-        list_filter = ('is_admin',)
-        fieldsets = (
-            (None, {'fields': ('email', 'password')}),
-            ('Personal info', {'fields': ('date_of_birth',)}),
-            ('Permissions', {'fields': ('is_admin',)}),
-            ('Important dates', {'fields': ('last_login',)}),
-        )
-        add_fieldsets = (
-            (None, {
-                'classes': ('wide',),
-                'fields': ('email', 'date_of_birth', 'password1', 'password2')}
-            ),
-        )
-        search_fields = ('email',)
-        ordering = ('email',)
-        filter_horizontal = ()
-
-    # Now register the new UserAdmin...
-    admin.site.register(MyUser, MyUserAdmin)
-    # ... and, since we're not using Django's builtin permissions,
-    # unregister the Group model from admin.
-    admin.site.unregister(Group)
-
-.. _authentication-backends:
-
-Other authentication sources
-============================
-
-The authentication that comes with Django is good enough for most common cases,
-but you may have the need to hook into another authentication source -- that
-is, another source of usernames and passwords or authentication methods.
-
-For example, your company may already have an LDAP setup that stores a username
-and password for every employee. It'd be a hassle for both the network
-administrator and the users themselves if users had separate accounts in LDAP
-and the Django-based applications.
-
-So, to handle situations like this, the Django authentication system lets you
-plug in other authentication sources. You can override Django's default
-database-based scheme, or you can use the default system in tandem with other
-systems.
-
-See the :doc:`authentication backend reference </ref/authbackends>`
-for information on the authentication backends included with Django.
-
-Specifying authentication backends
-----------------------------------
-
-Behind the scenes, Django maintains a list of "authentication backends" that it
-checks for authentication. When somebody calls
-:func:`django.contrib.auth.authenticate()` -- as described in :ref:`How to log
-a user in <how-to-log-a-user-in>` above -- Django tries authenticating across
-all of its authentication backends. If the first authentication method fails,
-Django tries the second one, and so on, until all backends have been attempted.
-
-The list of authentication backends to use is specified in the
-:setting:`AUTHENTICATION_BACKENDS` setting. This should be a tuple of Python
-path names that point to Python classes that know how to authenticate. These
-classes can be anywhere on your Python path.
-
-By default, :setting:`AUTHENTICATION_BACKENDS` is set to::
-
-    ('django.contrib.auth.backends.ModelBackend',)
-
-That's the basic authentication backend that checks the Django users database
-and queries the builtin permissions. It does not provide protection against
-brute force attacks via any rate limiting mechanism. You may either implement
-your own rate limiting mechanism in a custom auth backend, or use the
-mechanisms provided by most Web servers.
-
-The order of :setting:`AUTHENTICATION_BACKENDS` matters, so if the same
-username and password is valid in multiple backends, Django will stop
-processing at the first positive match.
-
-.. note::
-
-    Once a user has authenticated, Django stores which backend was used to
-    authenticate the user in the user's session, and re-uses the same backend
-    for the duration of that session whenever access to the currently
-    authenticated user is needed. This effectively means that authentication
-    sources are cached on a per-session basis, so if you change
-    :setting:`AUTHENTICATION_BACKENDS`, you'll need to clear out session data if
-    you need to force users to re-authenticate using different methods. A simple
-    way to do that is simply to execute ``Session.objects.all().delete()``.
-
-.. versionadded:: 1.6
-
-If a backend raises a :class:`~django.core.exceptions.PermissionDenied`
-exception, authentication will immediately fail. Django won't check the
-backends that follow.
-
-Writing an authentication backend
----------------------------------
-
-An authentication backend is a class that implements two required methods:
-``get_user(user_id)`` and ``authenticate(**credentials)``, as well as a set of
-optional permission related :ref:`authorization methods <authorization_methods>`.
-
-The ``get_user`` method takes a ``user_id`` -- which could be a username,
-database ID or whatever -- and returns a ``User`` object.
-
-The ``authenticate`` method takes credentials as keyword arguments. Most of
-the time, it'll just look like this::
-
-    class MyBackend(object):
-        def authenticate(self, username=None, password=None):
-            # Check the username/password and return a User.
-
-But it could also authenticate a token, like so::
-
-    class MyBackend(object):
-        def authenticate(self, token=None):
-            # Check the token and return a User.
-
-Either way, ``authenticate`` should check the credentials it gets, and it
-should return a ``User`` object that matches those credentials, if the
-credentials are valid. If they're not valid, it should return ``None``.
-
-The Django admin system is tightly coupled to the Django ``User`` object
-described at the beginning of this document. For now, the best way to deal with
-this is to create a Django ``User`` object for each user that exists for your
-backend (e.g., in your LDAP directory, your external SQL database, etc.) You
-can either write a script to do this in advance, or your ``authenticate``
-method can do it the first time a user logs in.
-
-Here's an example backend that authenticates against a username and password
-variable defined in your ``settings.py`` file and creates a Django ``User``
-object the first time a user authenticates::
-
-    from django.conf import settings
-    from django.contrib.auth.models import User, check_password
-
-    class SettingsBackend(object):
-        """
-        Authenticate against the settings ADMIN_LOGIN and ADMIN_PASSWORD.
-
-        Use the login name, and a hash of the password. For example:
-
-        ADMIN_LOGIN = 'admin'
-        ADMIN_PASSWORD = 'sha1$4e987$afbcf42e21bd417fb71db8c66b321e9fc33051de'
-        """
-
-        def authenticate(self, username=None, password=None):
-            login_valid = (settings.ADMIN_LOGIN == username)
-            pwd_valid = check_password(password, settings.ADMIN_PASSWORD)
-            if login_valid and pwd_valid:
-                try:
-                    user = User.objects.get(username=username)
-                except User.DoesNotExist:
-                    # Create a new user. Note that we can set password
-                    # to anything, because it won't be checked; the password
-                    # from settings.py will.
-                    user = User(username=username, password='get from settings.py')
-                    user.is_staff = True
-                    user.is_superuser = True
-                    user.save()
-                return user
-            return None
-
-        def get_user(self, user_id):
-            try:
-                return User.objects.get(pk=user_id)
-            except User.DoesNotExist:
-                return None
-
-.. _authorization_methods:
-
-Handling authorization in custom backends
------------------------------------------
-
-Custom auth backends can provide their own permissions.
-
-The user model will delegate permission lookup functions
-(:meth:`~django.contrib.auth.models.User.get_group_permissions()`,
-:meth:`~django.contrib.auth.models.User.get_all_permissions()`,
-:meth:`~django.contrib.auth.models.User.has_perm()`, and
-:meth:`~django.contrib.auth.models.User.has_module_perms()`) to any
-authentication backend that implements these functions.
-
-The permissions given to the user will be the superset of all permissions
-returned by all backends. That is, Django grants a permission to a user that
-any one backend grants.
-
-The simple backend above could implement permissions for the magic admin
-fairly simply::
-
-    class SettingsBackend(object):
-
-        # ...
-
-        def has_perm(self, user_obj, perm, obj=None):
-            if user_obj.username == settings.ADMIN_LOGIN:
-                return True
-            else:
-                return False
-
-This gives full permissions to the user granted access in the above example.
-Notice that in addition to the same arguments given to the associated
-:class:`django.contrib.auth.models.User` functions, the backend auth functions
-all take the user object, which may be an anonymous user, as an argument.
-
-A full authorization implementation can be found in the ``ModelBackend`` class
-in `django/contrib/auth/backends.py`_, which is the default backend and queries
-the ``auth_permission`` table most of the time. If you wish to provide
-custom behavior for only part of the backend API, you can take advantage of
-Python inheritence and subclass ``ModelBackend`` instead of implementing the
-complete API in a custom backend.
-
-.. _django/contrib/auth/backends.py: https://github.com/django/django/blob/master/django/contrib/auth/backends.py
-
-.. _anonymous_auth:
-
-Authorization for anonymous users
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-An anonymous user is one that is not authenticated i.e. they have provided no
-valid authentication details. However, that does not necessarily mean they are
-not authorized to do anything. At the most basic level, most Web sites
-authorize anonymous users to browse most of the site, and many allow anonymous
-posting of comments etc.
-
-Django's permission framework does not have a place to store permissions for
-anonymous users. However, the user object passed to an authentication backend
-may be an :class:`django.contrib.auth.models.AnonymousUser` object, allowing
-the backend to specify custom authorization behavior for anonymous users. This
-is especially useful for the authors of re-usable apps, who can delegate all
-questions of authorization to the auth backend, rather than needing settings,
-for example, to control anonymous access.
-
-.. _inactive_auth:
-
-Authorization for inactive users
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-An inactive user is a one that is authenticated but has its attribute
-``is_active`` set to ``False``. However this does not mean they are not
-authorized to do anything. For example they are allowed to activate their
-account.
-
-The support for anonymous users in the permission system allows for a scenario
-where anonymous users have permissions to do something while inactive
-authenticated users do not.
-
-Do not forget to test for the ``is_active`` attribute of the user in your own
-backend permission methods.
-
-
-Handling object permissions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Django's permission framework has a foundation for object permissions, though
-there is no implementation for it in the core. That means that checking for
-object permissions will always return ``False`` or an empty list (depending on
-the check performed). An authentication backend will receive the keyword
-parameters ``obj`` and ``user_obj`` for each object related authorization
-method and can return the object level permission as appropriate.
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
new file mode 100644
index 0000000000..143a729f37
--- /dev/null
+++ b/docs/topics/auth/customizing.txt
@@ -0,0 +1,1092 @@
+====================================
+Customizing authentication in Django
+====================================
+
+The authentication that comes with Django is good enough for most common cases,
+but you may have needs not met by the out-of-the-box defaults. To customize
+authentication to your projects needs involves understanding what points of the
+provided system are extendible or replaceable. This document provides details
+about how the auth system can be customized.
+
+:ref:`Authentication backends <authentication-backends>` provide an extensible
+system for when a username and password stored with the User model need
+to be authenticated against a different service than Django's default.
+
+You can give your models :ref:`custom permissions <custom-permissions>` that can be
+checked through Django's authorization system.
+
+You can :ref:`extend <extending-user>` the default User model, or :ref:`substitute
+<auth-custom-user>` a completely customized model.
+
+.. _authentication-backends:
+
+Other authentication sources
+============================
+
+There may be times you have the need to hook into another authentication source
+-- that is, another source of usernames and passwords or authentication
+methods.
+
+For example, your company may already have an LDAP setup that stores a username
+and password for every employee. It'd be a hassle for both the network
+administrator and the users themselves if users had separate accounts in LDAP
+and the Django-based applications.
+
+So, to handle situations like this, the Django authentication system lets you
+plug in other authentication sources. You can override Django's default
+database-based scheme, or you can use the default system in tandem with other
+systems.
+
+See the `authentication backend reference
+<authentication-backends-reference>` for information on the authentication
+backends included with Django.
+
+Specifying authentication backends
+----------------------------------
+
+Behind the scenes, Django maintains a list of "authentication backends" that it
+checks for authentication. When somebody calls
+:func:`django.contrib.auth.authenticate()` -- as described in :ref:`How to log
+a user in <how-to-log-a-user-in>` above -- Django tries authenticating across
+all of its authentication backends. If the first authentication method fails,
+Django tries the second one, and so on, until all backends have been attempted.
+
+The list of authentication backends to use is specified in the
+:setting:`AUTHENTICATION_BACKENDS` setting. This should be a tuple of Python
+path names that point to Python classes that know how to authenticate. These
+classes can be anywhere on your Python path.
+
+By default, :setting:`AUTHENTICATION_BACKENDS` is set to::
+
+    ('django.contrib.auth.backends.ModelBackend',)
+
+That's the basic authentication backend that checks the Django users database
+and queries the built-in permissions. It does not provide protection against
+brute force attacks via any rate limiting mechanism. You may either implement
+your own rate limiting mechanism in a custom auth backend, or use the
+mechanisms provided by most Web servers.
+
+The order of :setting:`AUTHENTICATION_BACKENDS` matters, so if the same
+username and password is valid in multiple backends, Django will stop
+processing at the first positive match.
+
+.. note::
+
+    Once a user has authenticated, Django stores which backend was used to
+    authenticate the user in the user's session, and re-uses the same backend
+    for the duration of that session whenever access to the currently
+    authenticated user is needed. This effectively means that authentication
+    sources are cached on a per-session basis, so if you change
+    :setting:`AUTHENTICATION_BACKENDS`, you'll need to clear out session data if
+    you need to force users to re-authenticate using different methods. A simple
+    way to do that is simply to execute ``Session.objects.all().delete()``.
+
+.. versionadded:: 1.6
+
+If a backend raises a :class:`~django.core.exceptions.PermissionDenied`
+exception, authentication will immediately fail. Django won't check the
+backends that follow.
+
+Writing an authentication backend
+---------------------------------
+
+An authentication backend is a class that implements two required methods:
+``get_user(user_id)`` and ``authenticate(**credentials)``, as well as a set of
+optional permission related :ref:`authorization methods <authorization_methods>`.
+
+The ``get_user`` method takes a ``user_id`` -- which could be a username,
+database ID or whatever -- and returns a ``User`` object.
+
+The ``authenticate`` method takes credentials as keyword arguments. Most of
+the time, it'll just look like this::
+
+    class MyBackend(object):
+        def authenticate(self, username=None, password=None):
+            # Check the username/password and return a User.
+            ...
+
+But it could also authenticate a token, like so::
+
+    class MyBackend(object):
+        def authenticate(self, token=None):
+            # Check the token and return a User.
+            ...
+
+Either way, ``authenticate`` should check the credentials it gets, and it
+should return a ``User`` object that matches those credentials, if the
+credentials are valid. If they're not valid, it should return ``None``.
+
+The Django admin system is tightly coupled to the Django ``User`` object
+described at the beginning of this document. For now, the best way to deal with
+this is to create a Django ``User`` object for each user that exists for your
+backend (e.g., in your LDAP directory, your external SQL database, etc.) You
+can either write a script to do this in advance, or your ``authenticate``
+method can do it the first time a user logs in.
+
+Here's an example backend that authenticates against a username and password
+variable defined in your ``settings.py`` file and creates a Django ``User``
+object the first time a user authenticates::
+
+    from django.conf import settings
+    from django.contrib.auth.models import User, check_password
+
+    class SettingsBackend(object):
+        """
+        Authenticate against the settings ADMIN_LOGIN and ADMIN_PASSWORD.
+
+        Use the login name, and a hash of the password. For example:
+
+        ADMIN_LOGIN = 'admin'
+        ADMIN_PASSWORD = 'sha1$4e987$afbcf42e21bd417fb71db8c66b321e9fc33051de'
+        """
+
+        def authenticate(self, username=None, password=None):
+            login_valid = (settings.ADMIN_LOGIN == username)
+            pwd_valid = check_password(password, settings.ADMIN_PASSWORD)
+            if login_valid and pwd_valid:
+                try:
+                    user = User.objects.get(username=username)
+                except User.DoesNotExist:
+                    # Create a new user. Note that we can set password
+                    # to anything, because it won't be checked; the password
+                    # from settings.py will.
+                    user = User(username=username, password='get from settings.py')
+                    user.is_staff = True
+                    user.is_superuser = True
+                    user.save()
+                return user
+            return None
+
+        def get_user(self, user_id):
+            try:
+                return User.objects.get(pk=user_id)
+            except User.DoesNotExist:
+                return None
+
+.. _authorization_methods:
+
+Handling authorization in custom backends
+-----------------------------------------
+
+Custom auth backends can provide their own permissions.
+
+The user model will delegate permission lookup functions
+(:meth:`~django.contrib.auth.models.User.get_group_permissions()`,
+:meth:`~django.contrib.auth.models.User.get_all_permissions()`,
+:meth:`~django.contrib.auth.models.User.has_perm()`, and
+:meth:`~django.contrib.auth.models.User.has_module_perms()`) to any
+authentication backend that implements these functions.
+
+The permissions given to the user will be the superset of all permissions
+returned by all backends. That is, Django grants a permission to a user that
+any one backend grants.
+
+The simple backend above could implement permissions for the magic admin
+fairly simply::
+
+    class SettingsBackend(object):
+        ...
+        def has_perm(self, user_obj, perm, obj=None):
+            if user_obj.username == settings.ADMIN_LOGIN:
+                return True
+            else:
+                return False
+
+This gives full permissions to the user granted access in the above example.
+Notice that in addition to the same arguments given to the associated
+:class:`django.contrib.auth.models.User` functions, the backend auth functions
+all take the user object, which may be an anonymous user, as an argument.
+
+A full authorization implementation can be found in the ``ModelBackend`` class
+in `django/contrib/auth/backends.py`_, which is the default backend and queries
+the ``auth_permission`` table most of the time. If you wish to provide
+custom behavior for only part of the backend API, you can take advantage of
+Python inheritance and subclass ``ModelBackend`` instead of implementing the
+complete API in a custom backend.
+
+.. _django/contrib/auth/backends.py: https://github.com/django/django/blob/master/django/contrib/auth/backends.py
+
+.. _anonymous_auth:
+
+Authorization for anonymous users
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+An anonymous user is one that is not authenticated i.e. they have provided no
+valid authentication details. However, that does not necessarily mean they are
+not authorized to do anything. At the most basic level, most Web sites
+authorize anonymous users to browse most of the site, and many allow anonymous
+posting of comments etc.
+
+Django's permission framework does not have a place to store permissions for
+anonymous users. However, the user object passed to an authentication backend
+may be an :class:`django.contrib.auth.models.AnonymousUser` object, allowing
+the backend to specify custom authorization behavior for anonymous users. This
+is especially useful for the authors of re-usable apps, who can delegate all
+questions of authorization to the auth backend, rather than needing settings,
+for example, to control anonymous access.
+
+.. _inactive_auth:
+
+Authorization for inactive users
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+An inactive user is a one that is authenticated but has its attribute
+``is_active`` set to ``False``. However this does not mean they are not
+authorized to do anything. For example they are allowed to activate their
+account.
+
+The support for anonymous users in the permission system allows for a scenario
+where anonymous users have permissions to do something while inactive
+authenticated users do not.
+
+Do not forget to test for the ``is_active`` attribute of the user in your own
+backend permission methods.
+
+
+Handling object permissions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django's permission framework has a foundation for object permissions, though
+there is no implementation for it in the core. That means that checking for
+object permissions will always return ``False`` or an empty list (depending on
+the check performed). An authentication backend will receive the keyword
+parameters ``obj`` and ``user_obj`` for each object related authorization
+method and can return the object level permission as appropriate.
+
+.. _custom-permissions:
+
+Custom permissions
+==================
+
+To create custom permissions for a given model object, use the ``permissions``
+:ref:`model Meta attribute <meta-options>`.
+
+This example Task model creates three custom permissions, i.e., actions users
+can or cannot do with Task instances, specific to your application::
+
+    class Task(models.Model):
+        ...
+        class Meta:
+            permissions = (
+                ("view_task", "Can see available tasks"),
+                ("change_task_status", "Can change the status of tasks"),
+                ("close_task", "Can remove a task by setting its status as closed"),
+            )
+
+The only thing this does is create those extra permissions when you run
+:djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
+value of these permissions when an user is trying to access the functionality
+provided by the application (viewing tasks, changing the status of tasks,
+closing tasks.) Continuing the above example, the following checks if a user may
+view tasks::
+
+    user.has_perm('app.view_task')
+
+.. _extending-user:
+
+Extending the existing User model
+=================================
+
+There are two ways to extend the default
+:class:`~django.contrib.auth.models.User` model without substituting your own
+model. If the changes you need are purely behavioral, and don't require any
+change to what is stored in the database, you can create a :ref:`proxy model
+<proxy-models>` based on :class:`~django.contrib.auth.models.User`. This
+allows for any of the features offered by proxy models including default
+ordering, custom managers, or custom model methods.
+
+If you wish to store information related to ``User``, you can use a :ref:`one-to-one
+relationship <ref-onetoone>` to a model containing the fields for
+additional information. This one-to-one model is often called a profile model,
+as it might store non-auth related information about a site user. For example
+you might create an Employee model::
+
+    from django.contrib.auth.models import User
+
+    class Employee(models.Model):
+        user = models.OneToOneField(User)
+        department = models.CharField(max_length=100)
+
+Assuming an existing Employee Fred Smith who has both a User and Employee
+model, you can access the related information using Django's standard related
+model conventions::
+
+    >>> u = User.objects.get(username='fsmith')
+    >>> freds_department = u.employee.department
+
+To add a profile model's fields to the user page in the admin, define an
+:class:`~django.contrib.admin.InlineModelAdmin` (for this example, we'll use a
+:class:`~django.contrib.admin.StackedInline`) in your app's ``admin.py`` and
+add it to a ``UserAdmin`` class which is registered with the
+:class:`~django.contrib.auth.models.User` class::
+
+    from django.contrib import admin
+    from django.contrib.auth.admin import UserAdmin
+    from django.contrib.auth.models import User
+
+    from my_user_profile_app.models import Employee
+
+    # Define an inline admin descriptor for Employee model
+    # which acts a bit like a singleton
+    class EmployeeInline(admin.StackedInline):
+        model = Employee
+        can_delete = False
+        verbose_name_plural = 'employee'
+
+    # Define a new User admin
+    class UserAdmin(UserAdmin):
+        inlines = (EmployeeInline, )
+
+    # Re-register UserAdmin
+    admin.site.unregister(User)
+    admin.site.register(User, UserAdmin)
+
+These profile models are not special in any way - they are just Django models that
+happen to have a one-to-one link with a User model. As such, they do not get
+auto created when a user is created, but
+a :attr:`django.db.models.signals.post_save` could be used to create or update
+related models as appropriate.
+
+Note that using related models results in additional queries or joins to
+retrieve the related data, and depending on your needs substituting the User
+model and adding the related fields may be your better option.  However
+existing links to the default User model within your project's apps may justify
+the extra database load.
+
+.. _auth-profiles:
+
+.. deprecated:: 1.5
+    With the introduction of :ref:`custom User models <auth-custom-user>`,
+    the use of :setting:`AUTH_PROFILE_MODULE` to define a single profile
+    model is no longer supported. See the
+    :doc:`Django 1.5 release notes</releases/1.5>` for more information.
+
+Prior to 1.5, a single profile model could be specified site-wide with the
+setting :setting:`AUTH_PROFILE_MODULE` with a string consisting of the
+following items, separated by a dot:
+
+1. The name of the application (case sensitive) in which the user
+   profile model is defined (in other words, the
+   name which was passed to :djadmin:`manage.py startapp <startapp>` to create
+   the application).
+
+2. The name of the model (not case sensitive) class.
+
+For example, if the profile model was a class named ``UserProfile`` and was
+defined inside an application named ``accounts``, the appropriate setting would
+be::
+
+    AUTH_PROFILE_MODULE = 'accounts.UserProfile'
+
+When a user profile model has been defined and specified in this manner, each
+:class:`~django.contrib.auth.models.User` object will have a method --
+:class:`~django.contrib.auth.models.User.get_profile()` -- which returns the
+instance of the user profile model associated with that
+:class:`~django.contrib.auth.models.User`.
+
+The method :class:`~django.contrib.auth.models.User.get_profile()`
+does not create a profile if one does not exist.
+
+.. _auth-custom-user:
+
+Substituting a custom User model
+================================
+
+.. versionadded:: 1.5
+
+Some kinds of projects may have authentication requirements for which Django's
+built-in :class:`~django.contrib.auth.models.User` model is not always
+appropriate. For instance, on some sites it makes more sense to use an email
+address as your identification token instead of a username.
+
+Django allows you to override the default User model by providing a value for
+the :setting:`AUTH_USER_MODEL` setting that references a custom model::
+
+     AUTH_USER_MODEL = 'myapp.MyUser'
+
+This dotted pair describes the name of the Django app (which must be in your
+:setting:`INSTALLED_APPS`), and the name of the Django model that you wish to
+use as your User model.
+
+.. warning::
+
+   Changing :setting:`AUTH_USER_MODEL` has a big effect on your database
+   structure. It changes the tables that are available, and it will affect the
+   construction of foreign keys and many-to-many relationships. If you intend
+   to set :setting:`AUTH_USER_MODEL`, you should set it before running
+   ``manage.py syncdb`` for the first time.
+
+   If you have an existing project and you want to migrate to using a custom
+   User model, you may need to look into using a migration tool like South_
+   to ease the transition.
+
+.. _South: http://south.aeracode.org
+
+Referencing the User model
+--------------------------
+
+.. currentmodule:: django.contrib.auth
+
+If you reference :class:`~django.contrib.auth.models.User` directly (for
+example, by referring to it in a foreign key), your code will not work in
+projects where the :setting:`AUTH_USER_MODEL` setting has been changed to a
+different User model.
+
+.. function:: get_user_model()
+
+    Instead of referring to :class:`~django.contrib.auth.models.User` directly,
+    you should reference the user model using
+    ``django.contrib.auth.get_user_model()``. This method will return the
+    currently active User model -- the custom User model if one is specified, or
+    :class:`~django.contrib.auth.models.User` otherwise.
+
+    When you define a foreign key or many-to-many relations to the User model,
+    you should specify the custom model using the :setting:`AUTH_USER_MODEL`
+    setting. For example::
+
+        from django.conf import settings
+        from django.db import models
+
+        class Article(models.Model):
+            author = models.ForeignKey(settings.AUTH_USER_MODEL)
+
+Specifying a custom User model
+------------------------------
+
+.. admonition:: Model design considerations
+
+    Think carefully before handling information not directly related to
+    authentication in your custom User Model.
+
+    It may be better to store app-specific user information in a model
+    that has a relation with the User model. That allows each app to specify
+    its own user data requirements without risking conflicts with other
+    apps. On the other hand, queries to retrieve this related information
+    will involve a database join, which may have an effect on performance.
+
+Django expects your custom User model to meet some minimum requirements.
+
+1. Your model must have an integer primary key.
+
+2. Your model must have a single unique field that can be used for
+   identification purposes. This can be a username, an email address,
+   or any other unique attribute.
+
+3. Your model must provide a way to address the user in a "short" and
+   "long" form. The most common interpretation of this would be to use
+   the user's given name as the "short" identifier, and the user's full
+   name as the "long" identifier. However, there are no constraints on
+   what these two methods return - if you want, they can return exactly
+   the same value.
+
+The easiest way to construct a compliant custom User model is to inherit from
+:class:`~django.contrib.auth.models.AbstractBaseUser`.
+:class:`~django.contrib.auth.models.AbstractBaseUser` provides the core
+implementation of a ``User`` model, including hashed passwords and tokenized
+password resets. You must then provide some key implementation details:
+
+.. currentmodule:: django.contrib.auth
+
+.. class:: models.CustomUser
+
+    .. attribute:: USERNAME_FIELD
+
+        A string describing the name of the field on the User model that is
+        used as the unique identifier. This will usually be a username of
+        some kind, but it can also be an email address, or any other unique
+        identifier. The field *must* be unique (i.e., have ``unique=True``
+        set in its definition).
+
+        In the following example, the field ``identifier`` is used
+        as the identifying field::
+
+            class MyUser(AbstractBaseUser):
+                identifier = models.CharField(max_length=40, unique=True, db_index=True)
+                ...
+                USERNAME_FIELD = 'identifier'
+
+    .. attribute:: REQUIRED_FIELDS
+
+        A list of the field names that *must* be provided when creating a user
+        via the :djadmin:`createsuperuser` management command. The user will be
+        prompted to supply a value for each of these fields. It should include
+        any field for which :attr:`~django.db.models.Field.blank` is ``False``
+        or undefined, but may include additional fields you want prompted for
+        when a user is created interactively. However, it will not work for
+        :class:`~django.db.models.ForeignKey` fields.
+
+        For example, here is the partial definition for a ``User`` model that
+        defines two required fields - a date of birth and height::
+
+            class MyUser(AbstractBaseUser):
+                ...
+                date_of_birth = models.DateField()
+                height = models.FloatField()
+                ...
+                REQUIRED_FIELDS = ['date_of_birth', 'height']
+
+        .. note::
+
+            ``REQUIRED_FIELDS`` must contain all required fields on your User
+            model, but should *not* contain the ``USERNAME_FIELD``.
+
+    .. attribute:: is_active
+
+        A boolean attribute that indicates whether the user is considered
+        "active".  This attribute is provided as an attribute on
+        ``AbstractBaseUser`` defaulting to ``True``. How you choose to
+        implement it will depend on the details of your chosen auth backends.
+        See the documentation of the :attr:`attribute on the builtin user model
+        <django.contrib.auth.models.User.is_active>` for details.
+
+    .. method:: get_full_name()
+
+        A longer formal identifier for the user. A common interpretation
+        would be the full name name of the user, but it can be any string that
+        identifies the user.
+
+    .. method:: get_short_name()
+
+        A short, informal identifier for the user. A common interpretation
+        would be the first name of the user, but it can be any string that
+        identifies the user in an informal way. It may also return the same
+        value as :meth:`django.contrib.auth.models.User.get_full_name()`.
+
+The following methods are available on any subclass of
+:class:`~django.contrib.auth.models.AbstractBaseUser`:
+
+.. class:: models.AbstractBaseUser
+
+    .. method:: get_username()
+
+        Returns the value of the field nominated by ``USERNAME_FIELD``.
+
+    .. method:: models.AbstractBaseUser.is_anonymous()
+
+        Always returns ``False``. This is a way of differentiating
+        from  :class:`~django.contrib.auth.models.AnonymousUser` objects.
+        Generally, you should prefer using
+        :meth:`~django.contrib.auth.models.AbstractBaseUser.is_authenticated()` to this
+        method.
+
+    .. method:: models.AbstractBaseUser.is_authenticated()
+
+        Always returns ``True``. This is a way to tell if the user has been
+        authenticated. This does not imply any permissions, and doesn't check
+        if the user is active - it only indicates that the user has provided a
+        valid username and password.
+
+    .. method:: models.AbstractBaseUser.set_password(raw_password)
+
+        Sets the user's password to the given raw string, taking care of the
+        password hashing. Doesn't save the
+        :class:`~django.contrib.auth.models.AbstractBaseUser` object.
+
+    .. method:: models.AbstractBaseUser.check_password(raw_password)
+
+        Returns ``True`` if the given raw string is the correct password for
+        the user. (This takes care of the password hashing in making the
+        comparison.)
+
+    .. method:: models.AbstractBaseUser.set_unusable_password()
+
+        Marks the user as having no password set.  This isn't the same as
+        having a blank string for a password.
+        :meth:`~django.contrib.auth.models.AbstractBaseUser.check_password()` for this user
+        will never return ``True``. Doesn't save the
+        :class:`~django.contrib.auth.models.AbstractBaseUser` object.
+
+        You may need this if authentication for your application takes place
+        against an existing external source such as an LDAP directory.
+
+    .. method:: models.AbstractBaseUser.has_usable_password()
+
+        Returns ``False`` if
+        :meth:`~django.contrib.auth.models.AbstractBaseUser.set_unusable_password()` has
+        been called for this user.
+
+You should also define a custom manager for your ``User`` model. If your
+``User`` model defines ``username`` and ``email`` fields the same as Django's
+default ``User``, you can just install Django's
+:class:`~django.contrib.auth.models.UserManager`; however, if your ``User``
+model defines different fields, you will need to define a custom manager that
+extends :class:`~django.contrib.auth.models.BaseUserManager` providing two
+additional methods:
+
+.. class:: models.CustomUserManager
+
+    .. method:: models.CustomUserManager.create_user(*username_field*, password=None, \**other_fields)
+
+        The prototype of ``create_user()`` should accept the username field,
+        plus all required fields as arguments. For example, if your user model
+        uses ``email`` as the username field, and has ``date_of_birth`` as a
+        required fields, then ``create_user`` should be defined as::
+
+            def create_user(self, email, date_of_birth, password=None):
+                # create user here
+                ...
+
+    .. method:: models.CustomUserManager.create_superuser(*username_field*, password, \**other_fields)
+
+        The prototype of ``create_superuser()`` should accept the username
+        field, plus all required fields as arguments. For example, if your user
+        model uses ``email`` as the username field, and has ``date_of_birth``
+        as a required fields, then ``create_superuser`` should be defined as::
+
+            def create_superuser(self, email, date_of_birth, password):
+                # create superuser here
+                ...
+
+        Unlike ``create_user()``, ``create_superuser()`` *must* require the
+        caller to provider a password.
+
+:class:`~django.contrib.auth.models.BaseUserManager` provides the following
+utility methods:
+
+.. class:: models.BaseUserManager
+
+    .. method:: models.BaseUserManager.normalize_email(email)
+
+        A classmethod that normalizes email addresses by lowercasing
+        the domain portion of the email address.
+
+    .. method:: models.BaseUserManager.get_by_natural_key(username)
+
+        Retrieves a user instance using the contents of the field
+        nominated by ``USERNAME_FIELD``.
+
+    .. method:: models.BaseUserManager.make_random_password(length=10, allowed_chars='abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789')
+
+        Returns a random password with the given length and given string of
+        allowed characters. (Note that the default value of ``allowed_chars``
+        doesn't contain letters that can cause user confusion, including:
+
+        * ``i``, ``l``, ``I``, and ``1`` (lowercase letter i, lowercase
+          letter L, uppercase letter i, and the number one)
+        * ``o``, ``O``, and ``0`` (uppercase letter o, lowercase letter o,
+          and zero)
+
+Extending Django's default User
+-------------------------------
+
+If you're entirely happy with Django's :class:`~django.contrib.auth.models.User`
+model and you just want to add some additional profile information, you can
+simply subclass ``django.contrib.auth.models.AbstractUser`` and add your
+custom profile fields. This class provides the full implementation of the
+default :class:`~django.contrib.auth.models.User` as an :ref:`abstract model
+<abstract-base-classes>`.
+
+.. _custom-users-and-the-built-in-auth-forms:
+
+Custom users and the built-in auth forms
+----------------------------------------
+
+As you may expect, built-in Django's :ref:`forms <built-in-auth-forms>` and
+:ref:`views <built-in-auth-views>` make certain assumptions about the user
+model that they are working with.
+
+If your user model doesn't follow the same assumptions, it may be necessary to define
+a replacement form, and pass that form in as part of the configuration of the
+auth views.
+
+* :class:`~django.contrib.auth.forms.UserCreationForm`
+
+  Depends on the :class:`~django.contrib.auth.models.User` model.
+  Must be re-written for any custom user model.
+
+* :class:`~django.contrib.auth.forms.UserChangeForm`
+
+  Depends on the :class:`~django.contrib.auth.models.User` model.
+  Must be re-written for any custom user model.
+
+* :class:`~django.contrib.auth.forms.AuthenticationForm`
+
+  Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`,
+  and will adapt to use the field defined in `USERNAME_FIELD`.
+
+* :class:`~django.contrib.auth.forms.PasswordResetForm`
+
+  Assumes that the user model has an integer primary key, has a field named
+  ``email`` that can be used to identify the user, and a boolean field
+  named `is_active` to prevent password resets for inactive users.
+
+* :class:`~django.contrib.auth.forms.SetPasswordForm`
+
+  Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`
+
+* :class:`~django.contrib.auth.forms.PasswordChangeForm`
+
+  Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`
+
+* :class:`~django.contrib.auth.forms.AdminPasswordChangeForm`
+
+  Works with any subclass of :class:`~django.contrib.auth.models.AbstractBaseUser`
+
+
+Custom users and :mod:`django.contrib.admin`
+--------------------------------------------
+
+If you want your custom User model to also work with Admin, your User model must
+define some additional attributes and methods. These methods allow the admin to
+control access of the User to admin content:
+
+.. class:: models.CustomUser
+
+.. attribute:: is_staff
+
+    Returns ``True`` if the user is allowed to have access to the admin site.
+
+.. attribute:: is_active
+
+    Returns ``True`` if the user account is currently active.
+
+.. method:: has_perm(perm, obj=None):
+
+    Returns ``True`` if the user has the named permission. If ``obj`` is
+    provided, the permission needs to be checked against a specific object
+    instance.
+
+.. method:: has_module_perms(app_label):
+
+    Returns ``True`` if the user has permission to access models in
+    the given app.
+
+You will also need to register your custom User model with the admin. If
+your custom User model extends ``django.contrib.auth.models.AbstractUser``,
+you can use Django's existing ``django.contrib.auth.admin.UserAdmin``
+class. However, if your User model extends
+:class:`~django.contrib.auth.models.AbstractBaseUser`, you'll need to define
+a custom ModelAdmin class. It may be possible to subclass the default
+``django.contrib.auth.admin.UserAdmin``; however, you'll need to
+override any of the definitions that refer to fields on
+``django.contrib.auth.models.AbstractUser`` that aren't on your
+custom User class.
+
+Custom users and permissions
+----------------------------
+
+To make it easy to include Django's permission framework into your own User
+class, Django provides :class:`~django.contrib.auth.models.PermissionsMixin`.
+This is an abstract model you can include in the class hierarchy for your User
+model, giving you all the methods and database fields necessary to support
+Django's permission model.
+
+:class:`~django.contrib.auth.models.PermissionsMixin` provides the following
+methods and attributes:
+
+.. class:: models.PermissionsMixin
+
+    .. attribute:: models.PermissionsMixin.is_superuser
+
+        Boolean. Designates that this user has all permissions without
+        explicitly assigning them.
+
+    .. method:: models.PermissionsMixin.get_group_permissions(obj=None)
+
+        Returns a set of permission strings that the user has, through his/her
+        groups.
+
+        If ``obj`` is passed in, only returns the group permissions for
+        this specific object.
+
+    .. method:: models.PermissionsMixin.get_all_permissions(obj=None)
+
+        Returns a set of permission strings that the user has, both through
+        group and user permissions.
+
+        If ``obj`` is passed in, only returns the permissions for this
+        specific object.
+
+    .. method:: models.PermissionsMixin.has_perm(perm, obj=None)
+
+        Returns ``True`` if the user has the specified permission, where perm is
+        in the format ``"<app label>.<permission codename>"`` (see
+        :ref:`permissions <topic-authorization>`). If the user is inactive, this method will
+        always return ``False``.
+
+        If ``obj`` is passed in, this method won't check for a permission for
+        the model, but for this specific object.
+
+    .. method:: models.PermissionsMixin.has_perms(perm_list, obj=None)
+
+        Returns ``True`` if the user has each of the specified permissions,
+        where each perm is in the format
+        ``"<app label>.<permission codename>"``. If the user is inactive,
+        this method will always return ``False``.
+
+        If ``obj`` is passed in, this method won't check for permissions for
+        the model, but for the specific object.
+
+    .. method:: models.PermissionsMixin.has_module_perms(package_name)
+
+        Returns ``True`` if the user has any permissions in the given package
+        (the Django app label). If the user is inactive, this method will
+        always return ``False``.
+
+.. admonition:: ModelBackend
+
+    If you don't include the
+    :class:`~django.contrib.auth.models.PermissionsMixin`, you must ensure you
+    don't invoke the permissions methods on ``ModelBackend``. ``ModelBackend``
+    assumes that certain fields are available on your user model. If your User
+    model doesn't provide  those fields, you will receive database errors when
+    you check permissions.
+
+Custom users and Proxy models
+-----------------------------
+
+One limitation of custom User models is that installing a custom User model
+will break any proxy model extending :class:`~django.contrib.auth.models.User`.
+Proxy models must be based on a concrete base class; by defining a custom User
+model, you remove the ability of Django to reliably identify the base class.
+
+If your project uses proxy models, you must either modify the proxy to extend
+the User model that is currently in use in your project, or merge your proxy's
+behavior into your User subclass.
+
+Custom users and signals
+------------------------
+
+Another limitation of custom User models is that you can't use
+:func:`django.contrib.auth.get_user_model()` as the sender or target of a signal
+handler. Instead, you must register the handler with the resulting User model.
+See :doc:`/topics/signals` for more information on registering an sending
+signals.
+
+Custom users and testing/fixtures
+---------------------------------
+
+If you are writing an application that interacts with the User model, you must
+take some precautions to ensure that your test suite will run regardless of
+the User model that is being used by a project. Any test that instantiates an
+instance of User will fail if the User model has been swapped out. This
+includes any attempt to create an instance of User with a fixture.
+
+To ensure that your test suite will pass in any project configuration,
+``django.contrib.auth.tests.utils`` defines a ``@skipIfCustomUser`` decorator.
+This decorator will cause a test case to be skipped if any User model other
+than the default Django user is in use. This decorator can be applied to a
+single test, or to an entire test class.
+
+Depending on your application, tests may also be needed to be added to ensure
+that the application works with *any* user model, not just the default User
+model. To assist with this, Django provides two substitute user models that
+can be used in test suites:
+
+* ``django.contrib.auth.tests.custom_user.CustomUser``, a custom user
+  model that uses an ``email`` field as the username, and has a basic
+  admin-compliant permissions setup
+
+* ``django.contrib.auth.tests.custom_user.ExtensionUser``, a custom
+  user model that extends ``django.contrib.auth.models.AbstractUser``,
+  adding a ``date_of_birth`` field.
+
+You can then use the ``@override_settings`` decorator to make that test run
+with the custom User model. For example, here is a skeleton for a test that
+would test three possible User models -- the default, plus the two User
+models provided by ``auth`` app::
+
+    from django.contrib.auth.tests.utils import skipIfCustomUser
+    from django.test import TestCase
+    from django.test.utils import override_settings
+
+
+    class ApplicationTestCase(TestCase):
+        @skipIfCustomUser
+        def test_normal_user(self):
+            "Run tests for the normal user model"
+            self.assertSomething()
+
+        @override_settings(AUTH_USER_MODEL='auth.CustomUser')
+        def test_custom_user(self):
+            "Run tests for a custom user model with email-based authentication"
+            self.assertSomething()
+
+        @override_settings(AUTH_USER_MODEL='auth.ExtensionUser')
+        def test_extension_user(self):
+            "Run tests for a simple extension of the built-in User."
+            self.assertSomething()
+
+
+A full example
+--------------
+
+Here is an example of an admin-compliant custom user app. This user model uses
+an email address as the username, and has a required date of birth; it
+provides no permission checking, beyond a simple ``admin`` flag on the user
+account. This model would be compatible with all the built-in auth forms and
+views, except for the User creation forms. This example illustrates how most of
+the components work together, but is not intended to be copied directly into
+projects for production use.
+
+This code would all live in a ``models.py`` file for a custom
+authentication app::
+
+    from django.db import models
+    from django.contrib.auth.models import (
+        BaseUserManager, AbstractBaseUser
+    )
+
+
+    class MyUserManager(BaseUserManager):
+        def create_user(self, email, date_of_birth, password=None):
+            """
+            Creates and saves a User with the given email, date of
+            birth and password.
+            """
+            if not email:
+                raise ValueError('Users must have an email address')
+
+            user = self.model(
+                email=MyUserManager.normalize_email(email),
+                date_of_birth=date_of_birth,
+            )
+
+            user.set_password(password)
+            user.save(using=self._db)
+            return user
+
+        def create_superuser(self, email, date_of_birth, password):
+            """
+            Creates and saves a superuser with the given email, date of
+            birth and password.
+            """
+            user = self.create_user(email,
+                password=password,
+                date_of_birth=date_of_birth
+            )
+            user.is_admin = True
+            user.save(using=self._db)
+            return user
+
+
+    class MyUser(AbstractBaseUser):
+        email = models.EmailField(
+            verbose_name='email address',
+            max_length=255,
+            unique=True,
+            db_index=True,
+        )
+        date_of_birth = models.DateField()
+        is_active = models.BooleanField(default=True)
+        is_admin = models.BooleanField(default=False)
+
+        objects = MyUserManager()
+
+        USERNAME_FIELD = 'email'
+        REQUIRED_FIELDS = ['date_of_birth']
+
+        def get_full_name(self):
+            # The user is identified by their email address
+            return self.email
+
+        def get_short_name(self):
+            # The user is identified by their email address
+            return self.email
+
+        def __unicode__(self):
+            return self.email
+
+        def has_perm(self, perm, obj=None):
+            "Does the user have a specific permission?"
+            # Simplest possible answer: Yes, always
+            return True
+
+        def has_module_perms(self, app_label):
+            "Does the user have permissions to view the app `app_label`?"
+            # Simplest possible answer: Yes, always
+            return True
+
+        @property
+        def is_staff(self):
+            "Is the user a member of staff?"
+            # Simplest possible answer: All admins are staff
+            return self.is_admin
+
+Then, to register this custom User model with Django's admin, the following
+code would be required in the app's ``admin.py`` file::
+
+    from django import forms
+    from django.contrib import admin
+    from django.contrib.auth.models import Group
+    from django.contrib.auth.admin import UserAdmin
+    from django.contrib.auth.forms import ReadOnlyPasswordHashField
+
+    from customauth.models import MyUser
+
+
+    class UserCreationForm(forms.ModelForm):
+        """A form for creating new users. Includes all the required
+        fields, plus a repeated password."""
+        password1 = forms.CharField(label='Password', widget=forms.PasswordInput)
+        password2 = forms.CharField(label='Password confirmation', widget=forms.PasswordInput)
+
+        class Meta:
+            model = MyUser
+            fields = ('email', 'date_of_birth')
+
+        def clean_password2(self):
+            # Check that the two password entries match
+            password1 = self.cleaned_data.get("password1")
+            password2 = self.cleaned_data.get("password2")
+            if password1 and password2 and password1 != password2:
+                raise forms.ValidationError("Passwords don't match")
+            return password2
+
+        def save(self, commit=True):
+            # Save the provided password in hashed format
+            user = super(UserCreationForm, self).save(commit=False)
+            user.set_password(self.cleaned_data["password1"])
+            if commit:
+                user.save()
+            return user
+
+
+    class UserChangeForm(forms.ModelForm):
+        """A form for updating users. Includes all the fields on
+        the user, but replaces the password field with admin's
+        password hash display field.
+        """
+        password = ReadOnlyPasswordHashField()
+
+        class Meta:
+            model = MyUser
+
+        def clean_password(self):
+            # Regardless of what the user provides, return the initial value.
+            # This is done here, rather than on the field, because the
+            # field does not have access to the initial value
+            return self.initial["password"]
+
+
+    class MyUserAdmin(UserAdmin):
+        # The forms to add and change user instances
+        form = UserChangeForm
+        add_form = UserCreationForm
+
+        # The fields to be used in displaying the User model.
+        # These override the definitions on the base UserAdmin
+        # that reference specific fields on auth.User.
+        list_display = ('email', 'date_of_birth', 'is_admin')
+        list_filter = ('is_admin',)
+        fieldsets = (
+            (None, {'fields': ('email', 'password')}),
+            ('Personal info', {'fields': ('date_of_birth',)}),
+            ('Permissions', {'fields': ('is_admin',)}),
+            ('Important dates', {'fields': ('last_login',)}),
+        )
+        add_fieldsets = (
+            (None, {
+                'classes': ('wide',),
+                'fields': ('email', 'date_of_birth', 'password1', 'password2')}
+            ),
+        )
+        search_fields = ('email',)
+        ordering = ('email',)
+        filter_horizontal = ()
+
+    # Now register the new UserAdmin...
+    admin.site.register(MyUser, MyUserAdmin)
+    # ... and, since we're not using Django's builtin permissions,
+    # unregister the Group model from admin.
+    admin.site.unregister(Group)
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
new file mode 100644
index 0000000000..a38ee84841
--- /dev/null
+++ b/docs/topics/auth/default.txt
@@ -0,0 +1,1092 @@
+======================================
+Using the Django authentication system
+======================================
+
+.. currentmodule:: django.contrib.auth
+
+This document explains the usage of Django's authentication system in its
+default configuration. This configuration has evolved to serve the most common
+project needs, handling a reasonably wide range of tasks, and has a careful
+implementation of passwords and permissions, and can handle many projects as
+is.  For projects where authentication needs differ from the default, Django
+supports extensive :doc:`extension and customization
+</topics/auth/customizing>` of authentication.
+
+Django authentication provides both authentication and authorization, together
+and is generally referred to as the authentication system, as these features
+somewhat coupled.
+
+.. _user-objects:
+
+User objects
+============
+
+:class:`~django.contrib.auth.models.User` objects are the core of the
+authentication system. They typically represent the people interacting with
+your site and are used to enable things like restricting access, registering
+user profiles, associating content with creators etc. Only one class of user
+exists in Django's authentication framework, i.e., 'superusers' or admin
+'staff' users are just user objects with special attributes set, not different
+classes of user objects.
+
+The primary attributes of the default user are:
+
+* username
+* password
+* email
+* first name
+* last name
+
+See the :class:`full API documentation <django.contrib.auth.models.User>` for
+full reference, the documentation that follows is more task oriented.
+
+.. _topics-auth-creating-users:
+
+Creating users
+--------------
+
+The most direct way to create users is to use the included
+:meth:`~django.contrib.auth.models.UserManager.create_user` helper function::
+
+    >>> from django.contrib.auth.models import User
+    >>> user = User.objects.create_user('john', 'lennon@thebeatles.com', 'johnpassword')
+
+    # At this point, user is a User object that has already been saved
+    # to the database. You can continue to change its attributes
+    # if you want to change other fields.
+    >>> user.last_name = 'Lennon'
+    >>> user.save()
+
+If you have the Django admin installed, you can also :ref:`create users
+interactively <auth-admin>`.
+
+.. _topics-auth-creating-superusers:
+
+Creating superusers
+-------------------
+
+:djadmin:`manage.py syncdb <syncdb>` prompts you to create a superuser the
+first time you run it with ``'django.contrib.auth'`` in your
+:setting:`INSTALLED_APPS`. If you need to create a superuser at a later date,
+you can use a command line utility::
+
+    manage.py createsuperuser --username=joe --email=joe@example.com
+
+You will be prompted for a password. After you enter one, the user will be
+created immediately. If you leave off the :djadminopt:`--username` or the
+:djadminopt:`--email` options, it will prompt you for those values.
+
+Changing passwords
+------------------
+
+Django does not store raw (clear text) passwords on the user model, but only
+a hash (see :doc:`documentation of how passwords are managed
+</topics/auth/passwords>` for full details). Because of this, do not attempt to
+manipulate the password attribute of the user directly. This is why a helper
+function is used when creating a user.
+
+To change a user's password, you have several options:
+
+:djadmin:`manage.py changepassword *username* <changepassword>` offers a method
+of changing a User's password from the command line. It prompts you to
+change the password of a given user which you must enter twice. If
+they both match, the new password will be changed immediately. If you
+do not supply a user, the command will attempt to change the password
+whose username matches the current system user.
+
+You can also change a password programmatically, using
+:meth:`~django.contrib.auth.models.User.set_password()`:
+
+.. code-block:: python
+
+    >>> from django.contrib.auth.models import User
+    >>> u = User.objects.get(username__exact='john')
+    >>> u.set_password('new password')
+    >>> u.save()
+
+If you have the Django admin installed, you can also change user's passwords
+on the :ref:`authentication system's admin pages <auth-admin>`.
+
+Django also provides :ref:`views <built-in-auth-views>` and :ref:`forms
+<built-in-auth-forms>` that may be used to allow users to change their own
+passwords.
+
+Authenticating Users
+--------------------
+
+.. function:: authenticate(\**credentials)
+
+    To authenticate a given username and password, use
+    :func:`~django.contrib.auth.authenticate()`. It takes credentials in the
+    form of keyword arguments, for the default configuration this is
+    ``username`` and ``password``, and it returns
+    a :class:`~django.contrib.auth.models.User` object if the password is valid
+    for the given username. If the password is invalid,
+    :func:`~django.contrib.auth.authenticate()` returns ``None``. Example::
+
+        from django.contrib.auth import authenticate
+        user = authenticate(username='john', password='secret')
+        if user is not None:
+            # the password verified for the user
+            if user.is_active:
+                print("User is valid, active and authenticated")
+            else:
+                print("The password is valid, but the account has been disabled!")
+        else:
+            # the authentication system was unable to verify the username and password
+            print("The username and password were incorrect.")
+
+.. _topic-authorization:
+
+Permissions and Authorization
+=============================
+
+Django comes with a simple permissions system. It provides a way to assign
+permissions to specific users and groups of users.
+
+It's used by the Django admin site, but you're welcome to use it in your own
+code.
+
+The Django admin site uses permissions as follows:
+
+* Access to view the "add" form and add an object is limited to users with
+  the "add" permission for that type of object.
+* Access to view the change list, view the "change" form and change an
+  object is limited to users with the "change" permission for that type of
+  object.
+* Access to delete an object is limited to users with the "delete"
+  permission for that type of object.
+
+Permissions can be set not only per type of object, but also per specific
+object instance. By using the
+:meth:`~django.contrib.admin.ModelAdmin.has_add_permission`,
+:meth:`~django.contrib.admin.ModelAdmin.has_change_permission` and
+:meth:`~django.contrib.admin.ModelAdmin.has_delete_permission` methods provided
+by the :class:`~django.contrib.admin.ModelAdmin` class, it is possible to
+customize permissions for different object instances of the same type.
+
+:class:`~django.contrib.auth.models.User` objects have two many-to-many
+fields: ``groups`` and ``user_permissions``.
+:class:`~django.contrib.auth.models.User` objects can access their related
+objects in the same way as any other :doc:`Django model
+</topics/db/models>`:
+
+.. code-block:: python
+
+    myuser.groups = [group_list]
+    myuser.groups.add(group, group, ...)
+    myuser.groups.remove(group, group, ...)
+    myuser.groups.clear()
+    myuser.user_permissions = [permission_list]
+    myuser.user_permissions.add(permission, permission, ...)
+    myuser.user_permissions.remove(permission, permission, ...)
+    myuser.user_permissions.clear()
+
+Default permissions
+-------------------
+
+When ``django.contrib.auth`` is listed in your :setting:`INSTALLED_APPS`
+setting, it will ensure that three default permissions -- add, change and
+delete -- are created for each Django model defined in one of your installed
+applications.
+
+These permissions will be created when you run :djadmin:`manage.py syncdb
+<syncdb>`; the first time you run ``syncdb`` after adding
+``django.contrib.auth`` to :setting:`INSTALLED_APPS`, the default permissions
+will be created for all previously-installed models, as well as for any new
+models being installed at that time. Afterward, it will create default
+permissions for new models each time you run :djadmin:`manage.py syncdb
+<syncdb>`.
+
+Assuming you have an application with an
+:attr:`~django.db.models.Options.app_label` ``foo`` and a model named ``Bar``,
+to test for basic permissions you should use:
+
+* add: ``user.has_perm('foo.add_bar')``
+* change: ``user.has_perm('foo.change_bar')``
+* delete: ``user.has_perm('foo.delete_bar')``
+
+The :class:`~django.contrib.auth.models.Permission` model is rarely accessed
+directly.
+
+Groups
+------
+
+:class:`django.contrib.auth.models.Group` models are a generic way of
+categorizing users so you can apply permissions, or some other label, to those
+users. A user can belong to any number of groups.
+
+A user in a group automatically has the permissions granted to that group. For
+example, if the group ``Site editors`` has the permission
+``can_edit_home_page``, any user in that group will have that permission.
+
+Beyond permissions, groups are a convenient way to categorize users to give
+them some label, or extended functionality. For example, you could create a
+group ``'Special users'``, and you could write code that could, say, give them
+access to a members-only portion of your site, or send them members-only email
+messages.
+
+Programmatically creating permissions
+-------------------------------------
+
+While :ref:`custom permissions <custom-permissions>` can be defined within
+a model's ``Meta`` class, you can also create permissions directly. For
+example, you can create the ``can_publish`` permission for a ``BlogPost`` model
+in ``myapp``::
+
+    from django.contrib.auth.models import Group, Permission
+    from django.contrib.contenttypes.models import ContentType
+
+    content_type = ContentType.objects.get(app_label='myapp', model='BlogPost')
+    permission = Permission.objects.create(codename='can_publish',
+                                           name='Can Publish Posts',
+                                           content_type=content_type)
+
+The permission can then be assigned to a
+:class:`~django.contrib.auth.models.User` via its ``user_permissions``
+attribute or to a :class:`~django.contrib.auth.models.Group` via its
+``permissions`` attribute.
+
+.. _auth-web-requests:
+
+Authentication in Web requests
+==============================
+
+Django uses :doc:`sessions </topics/http/sessions>` and middleware to hook the
+authentication system into :class:`request objects <django.http.HttpRequest>`.
+
+These provide a :attr:`request.user <django.http.HttpRequest.user>`  attribute
+on every request which represents the current user. If the current user has not
+logged in, this attribute will be set to an instance
+of :class:`~django.contrib.auth.models.AnonymousUser`, otherwise it will be an
+instance of :class:`~django.contrib.auth.models.User`.
+
+You can tell them apart with
+:meth:`~django.contrib.auth.models.User.is_authenticated()`, like so::
+
+    if request.user.is_authenticated():
+        # Do something for authenticated users.
+    else:
+        # Do something for anonymous users.
+
+.. _how-to-log-a-user-in:
+
+How to log a user in
+--------------------
+
+If you have an authenticated user you want to attach to the current session
+- this is done with a :func:`~django.contrib.auth.login` function.
+
+.. function:: login()
+
+    To log a user in, from a view, use :func:`~django.contrib.auth.login()`. It
+    takes an :class:`~django.http.HttpRequest` object and a
+    :class:`~django.contrib.auth.models.User` object.
+    :func:`~django.contrib.auth.login()` saves the user's ID in the session,
+    using Django's session framework.
+
+    Note that any data set during the anonymous session is retained in the
+    session after a user logs in.
+
+    This example shows how you might use both
+    :func:`~django.contrib.auth.authenticate()` and
+    :func:`~django.contrib.auth.login()`::
+
+        from django.contrib.auth import authenticate, login
+
+        def my_view(request):
+            username = request.POST['username']
+            password = request.POST['password']
+            user = authenticate(username=username, password=password)
+            if user is not None:
+                if user.is_active:
+                    login(request, user)
+                    # Redirect to a success page.
+                else:
+                    # Return a 'disabled account' error message
+            else:
+                # Return an 'invalid login' error message.
+
+.. admonition:: Calling ``authenticate()`` first
+
+    When you're manually logging a user in, you *must* call
+    :func:`~django.contrib.auth.authenticate()` before you call
+    :func:`~django.contrib.auth.login()`.
+    :func:`~django.contrib.auth.authenticate()`
+    sets an attribute on the :class:`~django.contrib.auth.models.User` noting
+    which authentication backend successfully authenticated that user (see the
+    :ref:`backends documentation <authentication-backends>` for details), and
+    this information is needed later during the login process. An error will be
+    raise if you try to login a user object retrieved from the database
+    directly.
+
+How to log a user out
+---------------------
+
+.. function:: logout()
+
+    To log out a user who has been logged in via
+    :func:`django.contrib.auth.login()`, use
+    :func:`django.contrib.auth.logout()` within your view. It takes an
+    :class:`~django.http.HttpRequest` object and has no return value.
+    Example::
+
+        from django.contrib.auth import logout
+
+        def logout_view(request):
+            logout(request)
+            # Redirect to a success page.
+
+    Note that :func:`~django.contrib.auth.logout()` doesn't throw any errors if
+    the user wasn't logged in.
+
+    When you call :func:`~django.contrib.auth.logout()`, the session data for
+    the current request is completely cleaned out. All existing data is
+    removed. This is to prevent another person from using the same Web browser
+    to log in and have access to the previous user's session data. If you want
+    to put anything into the session that will be available to the user
+    immediately after logging out, do that *after* calling
+    :func:`django.contrib.auth.logout()`.
+
+Limiting access to logged-in users
+----------------------------------
+
+The raw way
+~~~~~~~~~~~
+
+The simple, raw way to limit access to pages is to check
+:meth:`request.user.is_authenticated()
+<django.contrib.auth.models.User.is_authenticated()>` and either redirect to a
+login page::
+
+    from django.shortcuts import redirect
+
+    def my_view(request):
+        if not request.user.is_authenticated():
+            return redirect('/login/?next=%s' % request.path)
+        # ...
+
+...or display an error message::
+
+    from django.shortcuts import render
+
+    def my_view(request):
+        if not request.user.is_authenticated():
+            return render(request, 'myapp/login_error.html')
+        # ...
+
+.. currentmodule:: django.contrib.auth.decorators
+
+The login_required decorator
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. function:: login_required([redirect_field_name=REDIRECT_FIELD_NAME, login_url=None])
+
+    As a shortcut, you can use the convenient
+    :func:`~django.contrib.auth.decorators.login_required` decorator::
+
+        from django.contrib.auth.decorators import login_required
+
+        @login_required
+        def my_view(request):
+            ...
+
+    :func:`~django.contrib.auth.decorators.login_required` does the following:
+
+    * If the user isn't logged in, redirect to
+      :setting:`settings.LOGIN_URL <LOGIN_URL>`, passing the current absolute
+      path in the query string. Example: ``/accounts/login/?next=/polls/3/``.
+
+    * If the user is logged in, execute the view normally. The view code is
+      free to assume the user is logged in.
+
+    By default, the path that the user should be redirected to upon
+    successful authentication is stored in a query string parameter called
+    ``"next"``. If you would prefer to use a different name for this parameter,
+    :func:`~django.contrib.auth.decorators.login_required` takes an
+    optional ``redirect_field_name`` parameter::
+
+        from django.contrib.auth.decorators import login_required
+
+        @login_required(redirect_field_name='my_redirect_field')
+        def my_view(request):
+            ...
+
+    Note that if you provide a value to ``redirect_field_name``, you will most
+    likely need to customize your login template as well, since the template
+    context variable which stores the redirect path will use the value of
+    ``redirect_field_name`` as its key rather than ``"next"`` (the default).
+
+    :func:`~django.contrib.auth.decorators.login_required` also takes an
+    optional ``login_url`` parameter. Example::
+
+        from django.contrib.auth.decorators import login_required
+
+        @login_required(login_url='/accounts/login/')
+        def my_view(request):
+            ...
+
+    Note that if you don't specify the ``login_url`` parameter, you'll need to
+    ensure that the :setting:`settings.LOGIN_URL <LOGIN_URL>` and your login
+    view are properly associated. For example, using the defaults, add the
+    following line to your URLconf::
+
+        (r'^accounts/login/$', 'django.contrib.auth.views.login'),
+
+    .. versionchanged:: 1.5
+
+    The :setting:`settings.LOGIN_URL <LOGIN_URL>` also accepts
+    view function names and :ref:`named URL patterns <naming-url-patterns>`.
+    This allows you to freely remap your login view within your URLconf
+    without having to update the setting.
+
+.. note::
+
+    The login_required decorator does NOT check the is_active flag on a user.
+
+Limiting access to logged-in users that pass a test
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To limit access based on certain permissions or some other test, you'd do
+essentially the same thing as described in the previous section.
+
+The simple way is to run your test on :attr:`request.user
+<django.http.HttpRequest.user>` in the view directly. For example, this view
+checks to make sure the user has an email in the desired domain::
+
+    def my_view(request):
+        if not '@example.com' in request.user.email:
+            return HttpResponse("You can't vote in this poll.")
+        # ...
+
+.. function:: user_passes_test(func, [login_url=None])
+
+    As a shortcut, you can use the convenient ``user_passes_test`` decorator::
+
+        from django.contrib.auth.decorators import user_passes_test
+
+        def email_check(user):
+            return '@example.com' in user.email
+
+        @user_passes_test(email_check)
+        def my_view(request):
+            ...
+
+    :func:`~django.contrib.auth.decorators.user_passes_test` takes a required
+    argument: a callable that takes a
+    :class:`~django.contrib.auth.models.User` object and returns ``True`` if
+    the user is allowed to view the page. Note that
+    :func:`~django.contrib.auth.decorators.user_passes_test` does not
+    automatically check that the :class:`~django.contrib.auth.models.User` is
+    not anonymous.
+
+    :func:`~django.contrib.auth.decorators.user_passes_test()` takes an
+    optional ``login_url`` argument, which lets you specify the URL for your
+    login page (:setting:`settings.LOGIN_URL <LOGIN_URL>` by default).
+
+    For example::
+
+        @user_passes_test(email_check, login_url='/login/')
+        def my_view(request):
+            ...
+
+The permission_required decorator
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. function:: permission_required([login_url=None, raise_exception=False])
+
+    It's a relatively common task to check whether a user has a particular
+    permission. For that reason, Django provides a shortcut for that case: the
+    :func:`~django.contrib.auth.decorators.permission_required()` decorator.::
+
+        from django.contrib.auth.decorators import permission_required
+
+        @permission_required('polls.can_vote')
+        def my_view(request):
+            ...
+
+    As for the :meth:`~django.contrib.auth.models.User.has_perm` method,
+    permission names take the form ``"<app label>.<permission codename>"``
+    (i.e. ``polls.can_vote`` for a permission on a model in the ``polls``
+    application).
+
+    Note that :func:`~django.contrib.auth.decorators.permission_required()`
+    also takes an optional ``login_url`` parameter. Example::
+
+        from django.contrib.auth.decorators import permission_required
+
+        @permission_required('polls.can_vote', login_url='/loginpage/')
+        def my_view(request):
+            ...
+
+    As in the :func:`~django.contrib.auth.decorators.login_required` decorator,
+    ``login_url`` defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>`.
+
+    If the ``raise_exception`` parameter is given, the decorator will raise
+    :exc:`~django.core.exceptions.PermissionDenied`, prompting :ref:`the 403
+    (HTTP Forbidden) view<http_forbidden_view>` instead of redirecting to the
+    login page.
+
+Applying permissions to generic views
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To apply a permission to a :doc:`class-based generic view
+</ref/class-based-views/index>`, decorate the :meth:`View.dispatch
+<django.views.generic.base.View.dispatch>` method on the class. See
+:ref:`decorating-class-based-views` for details.
+
+
+.. _built-in-auth-views:
+
+Authentication Views
+--------------------
+
+.. module:: django.contrib.auth.views
+
+Django provides several views that you can use for handling login, logout, and
+password management. These make use of the :ref:`stock auth forms
+<built-in-auth-forms>` but you can pass in your own forms as well.
+
+Django provides no default template for the authentication views - however the
+template context is documented for each view below.
+
+The built-in views all return
+a :class:`~django.template.response.TemplateResponse` instance, which allows
+you to easily customize the response data before rendering.  For more details,
+see the :doc:`TemplateResponse documentation </ref/template-response>`.
+
+Most built-in authentication views provide a URL name for easier reference. See
+:doc:`the URL documentation </topics/http/urls>` for details on using named URL
+patterns.
+
+
+.. function:: login(request, [template_name, redirect_field_name, authentication_form])
+
+    **URL name:** ``login``
+
+    See :doc:`the URL documentation </topics/http/urls>` for details on using
+    named URL patterns.
+
+    Here's what ``django.contrib.auth.views.login`` does:
+
+    * If called via ``GET``, it displays a login form that POSTs to the
+      same URL. More on this in a bit.
+
+    * If called via ``POST`` with user submitted credentials, it tries to log
+      the user in. If login is successful, the view redirects to the URL
+      specified in ``next``. If ``next`` isn't provided, it redirects to
+      :setting:`settings.LOGIN_REDIRECT_URL <LOGIN_REDIRECT_URL>` (which
+      defaults to ``/accounts/profile/``). If login isn't successful, it
+      redisplays the login form.
+
+    It's your responsibility to provide the html for the login template
+    , called ``registration/login.html`` by default. This template gets passed
+    four template context variables:
+
+    * ``form``: A :class:`~django.forms.Form` object representing the
+      :class:`~django.contrib.auth.forms.AuthenticationForm`.
+
+    * ``next``: The URL to redirect to after successful login. This may
+      contain a query string, too.
+
+    * ``site``: The current :class:`~django.contrib.sites.models.Site`,
+      according to the :setting:`SITE_ID` setting. If you don't have the
+      site framework installed, this will be set to an instance of
+      :class:`~django.contrib.sites.models.RequestSite`, which derives the
+      site name and domain from the current
+      :class:`~django.http.HttpRequest`.
+
+    * ``site_name``: An alias for ``site.name``. If you don't have the site
+      framework installed, this will be set to the value of
+      :attr:`request.META['SERVER_NAME'] <django.http.HttpRequest.META>`.
+      For more on sites, see :doc:`/ref/contrib/sites`.
+
+    If you'd prefer not to call the template :file:`registration/login.html`,
+    you can pass the ``template_name`` parameter via the extra arguments to
+    the view in your URLconf. For example, this URLconf line would use
+    :file:`myapp/login.html` instead::
+
+        (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'myapp/login.html'}),
+
+    You can also specify the name of the ``GET`` field which contains the URL
+    to redirect to after login by passing ``redirect_field_name`` to the view.
+    By default, the field is called ``next``.
+
+    Here's a sample :file:`registration/login.html` template you can use as a
+    starting point. It assumes you have a :file:`base.html` template that
+    defines a ``content`` block:
+
+    .. code-block:: html+django
+
+        {% extends "base.html" %}
+
+        {% block content %}
+
+        {% if form.errors %}
+        <p>Your username and password didn't match. Please try again.</p>
+        {% endif %}
+
+        <form method="post" action="{% url 'django.contrib.auth.views.login' %}">
+        {% csrf_token %}
+        <table>
+        <tr>
+            <td>{{ form.username.label_tag }}</td>
+            <td>{{ form.username }}</td>
+        </tr>
+        <tr>
+            <td>{{ form.password.label_tag }}</td>
+            <td>{{ form.password }}</td>
+        </tr>
+        </table>
+
+        <input type="submit" value="login" />
+        <input type="hidden" name="next" value="{{ next }}" />
+        </form>
+
+        {% endblock %}
+
+    If you have customized authentication (see
+    :doc:`Customizing Authentication </topics/auth/customizing>`) you can pass a custom authentication form
+    to the login view via the ``authentication_form`` parameter. This form must
+    accept a ``request`` keyword argument in its ``__init__`` method, and
+    provide a ``get_user`` method which returns the authenticated user object
+    (this method is only ever called after successful form validation).
+
+    .. _forms documentation: ../forms/
+    .. _site framework docs: ../sites/
+
+
+.. function:: logout(request, [next_page, template_name, redirect_field_name])
+
+    Logs a user out.
+
+    **URL name:** ``logout``
+
+    **Optional arguments:**
+
+    * ``next_page``: The URL to redirect to after logout.
+
+    * ``template_name``: The full name of a template to display after
+      logging the user out. Defaults to
+      :file:`registration/logged_out.html` if no argument is supplied.
+
+    * ``redirect_field_name``: The name of a ``GET`` field containing the
+      URL to redirect to after log out. Overrides ``next_page`` if the given
+      ``GET`` parameter is passed.
+
+    **Template context:**
+
+    * ``title``: The string "Logged out", localized.
+
+    * ``site``: The current :class:`~django.contrib.sites.models.Site`,
+      according to the :setting:`SITE_ID` setting. If you don't have the
+      site framework installed, this will be set to an instance of
+      :class:`~django.contrib.sites.models.RequestSite`, which derives the
+      site name and domain from the current
+      :class:`~django.http.HttpRequest`.
+
+    * ``site_name``: An alias for ``site.name``. If you don't have the site
+      framework installed, this will be set to the value of
+      :attr:`request.META['SERVER_NAME'] <django.http.HttpRequest.META>`.
+      For more on sites, see :doc:`/ref/contrib/sites`.
+
+.. function:: logout_then_login(request[, login_url])
+
+    Logs a user out, then redirects to the login page.
+
+    **URL name:** No default URL provided
+
+    **Optional arguments:**
+
+    * ``login_url``: The URL of the login page to redirect to.
+      Defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>` if not supplied.
+
+.. function:: password_change(request[, template_name, post_change_redirect, password_change_form])
+
+    Allows a user to change their password.
+
+    **URL name:** ``password_change``
+
+    **Optional arguments:**
+
+    * ``template_name``: The full name of a template to use for
+      displaying the password change form. Defaults to
+      :file:`registration/password_change_form.html` if not supplied.
+
+    * ``post_change_redirect``: The URL to redirect to after a successful
+      password change.
+
+    * ``password_change_form``: A custom "change password" form which must
+      accept a ``user`` keyword argument. The form is responsible for
+      actually changing the user's password. Defaults to
+      :class:`~django.contrib.auth.forms.PasswordChangeForm`.
+
+    **Template context:**
+
+    * ``form``: The password change form (see ``password_change_form`` above).
+
+.. function:: password_change_done(request[, template_name])
+
+    The page shown after a user has changed their password.
+
+    **URL name:** ``password_change_done``
+
+    **Optional arguments:**
+
+    * ``template_name``: The full name of a template to use.
+      Defaults to :file:`registration/password_change_done.html` if not
+      supplied.
+
+.. function:: password_reset(request[, is_admin_site, template_name, email_template_name, password_reset_form, token_generator, post_reset_redirect, from_email])
+
+    Allows a user to reset their password by generating a one-time use link
+    that can be used to reset the password, and sending that link to the
+    user's registered email address.
+
+    If the email address provided does not exist in the system, this view
+    won't send an email, but the user won't receive any error message either.
+    This prevents information leaking to potential attackers. If you want to
+    provide an error message in this case, you can subclass
+    :class:`~django.contrib.auth.forms.PasswordResetForm` and use the
+    ``password_reset_form`` argument.
+
+
+    Users flagged with an unusable password (see
+    :meth:`~django.contrib.auth.models.User.set_unusable_password()` aren't
+    allowed to request a password reset to prevent misuse when using an
+    external authentication source like LDAP. Note that they won't receive any
+    error message since this would expose their account's existence but no
+    mail will be sent either.
+
+    .. versionchanged:: 1.6
+        Previously, error messages indicated whether a given email was
+        registered.
+
+    **URL name:** ``password_reset``
+
+    **Optional arguments:**
+
+    * ``template_name``: The full name of a template to use for
+      displaying the password reset form. Defaults to
+      :file:`registration/password_reset_form.html` if not supplied.
+
+    * ``email_template_name``: The full name of a template to use for
+      generating the email with the reset password link. Defaults to
+      :file:`registration/password_reset_email.html` if not supplied.
+
+    * ``subject_template_name``: The full name of a template to use for
+      the subject of the email with the reset password link. Defaults
+      to :file:`registration/password_reset_subject.txt` if not supplied.
+
+    * ``password_reset_form``: Form that will be used to get the email of
+      the user to reset the password for. Defaults to
+      :class:`~django.contrib.auth.forms.PasswordResetForm`.
+
+    * ``token_generator``: Instance of the class to check the one time link.
+      This will default to ``default_token_generator``, it's an instance of
+      ``django.contrib.auth.tokens.PasswordResetTokenGenerator``.
+
+    * ``post_reset_redirect``: The URL to redirect to after a successful
+      password reset request.
+
+    * ``from_email``: A valid email address. By default Django uses
+      the :setting:`DEFAULT_FROM_EMAIL`.
+
+    **Template context:**
+
+    * ``form``: The form (see ``password_reset_form`` above) for resetting
+      the user's password.
+
+    **Email template context:**
+
+    * ``email``: An alias for ``user.email``
+
+    * ``user``: The current :class:`~django.contrib.auth.models.User`,
+      according to the ``email`` form field. Only active users are able to
+      reset their passwords (``User.is_active is True``).
+
+    * ``site_name``: An alias for ``site.name``. If you don't have the site
+      framework installed, this will be set to the value of
+      :attr:`request.META['SERVER_NAME'] <django.http.HttpRequest.META>`.
+      For more on sites, see :doc:`/ref/contrib/sites`.
+
+    * ``domain``: An alias for ``site.domain``. If you don't have the site
+      framework installed, this will be set to the value of
+      ``request.get_host()``.
+
+    * ``protocol``: http or https
+
+    * ``uid``: The user's id encoded in base 36.
+
+    * ``token``: Token to check that the reset link is valid.
+
+    Sample ``registration/password_reset_email.html`` (email body template):
+
+    .. code-block:: html+django
+
+        Someone asked for password reset for email {{ email }}. Follow the link below:
+        {{ protocol}}://{{ domain }}{% url 'password_reset_confirm' uidb36=uid token=token %}
+
+    The same template context is used for subject template. Subject must be
+    single line plain text string.
+
+
+.. function:: password_reset_done(request[, template_name])
+
+    The page shown after a user has been emailed a link to reset their
+    password. This view is called by default if the :func:`password_reset` view
+    doesn't have an explicit ``post_reset_redirect`` URL set.
+
+    **URL name:** ``password_reset_done``
+
+    **Optional arguments:**
+
+    * ``template_name``: The full name of a template to use.
+      Defaults to :file:`registration/password_reset_done.html` if not
+      supplied.
+
+.. function:: password_reset_confirm(request[, uidb36, token, template_name, token_generator, set_password_form, post_reset_redirect])
+
+    Presents a form for entering a new password.
+
+    **URL name:** ``password_reset_confirm``
+
+    **Optional arguments:**
+
+    * ``uidb36``: The user's id encoded in base 36. Defaults to ``None``.
+
+    * ``token``: Token to check that the password is valid. Defaults to
+      ``None``.
+
+    * ``template_name``: The full name of a template to display the confirm
+      password view. Default value is :file:`registration/password_reset_confirm.html`.
+
+    * ``token_generator``: Instance of the class to check the password. This
+      will default to ``default_token_generator``, it's an instance of
+      ``django.contrib.auth.tokens.PasswordResetTokenGenerator``.
+
+    * ``set_password_form``: Form that will be used to set the password.
+      Defaults to :class:`~django.contrib.auth.forms.SetPasswordForm`
+
+    * ``post_reset_redirect``: URL to redirect after the password reset
+      done. Defaults to ``None``.
+
+    **Template context:**
+
+    * ``form``: The form (see ``set_password_form`` above) for setting the
+      new user's password.
+
+    * ``validlink``: Boolean, True if the link (combination of uidb36 and
+      token) is valid or unused yet.
+
+.. function:: password_reset_complete(request[,template_name])
+
+   Presents a view which informs the user that the password has been
+   successfully changed.
+
+   **URL name:** ``password_reset_complete``
+
+   **Optional arguments:**
+
+   * ``template_name``: The full name of a template to display the view.
+     Defaults to :file:`registration/password_reset_complete.html`.
+
+Helper functions
+----------------
+
+.. currentmodule:: django.contrib.auth.views
+
+.. function:: redirect_to_login(next[, login_url, redirect_field_name])
+
+    Redirects to the login page, and then back to another URL after a
+    successful login.
+
+    **Required arguments:**
+
+    * ``next``: The URL to redirect to after a successful login.
+
+    **Optional arguments:**
+
+    * ``login_url``: The URL of the login page to redirect to.
+      Defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>` if not supplied.
+
+    * ``redirect_field_name``: The name of a ``GET`` field containing the
+      URL to redirect to after log out. Overrides ``next`` if the given
+      ``GET`` parameter is passed.
+
+
+.. _built-in-auth-forms:
+
+Built-in forms
+--------------
+
+.. module:: django.contrib.auth.forms
+
+If you don't want to use the built-in views, but want the convenience of not
+having to write forms for this functionality, the authentication system
+provides several built-in forms located in :mod:`django.contrib.auth.forms`:
+
+.. note::
+    The built-in authentication forms make certain assumptions about the user
+    model that they are working with. If you're using a :ref:`custom User model
+    <auth-custom-user>`, it may be necessary to define your own forms for the
+    authentication system. For more information, refer to the documentation
+    about :ref:`using the built-in authentication forms with custom user models
+    <custom-users-and-the-built-in-auth-forms>`.
+
+.. class:: AdminPasswordChangeForm
+
+    A form used in the admin interface to change a user's password.
+
+.. class:: AuthenticationForm
+
+    A form for logging a user in.
+
+.. class:: PasswordChangeForm
+
+    A form for allowing a user to change their password.
+
+.. class:: PasswordResetForm
+
+    A form for generating and emailing a one-time use link to reset a
+    user's password.
+
+.. class:: SetPasswordForm
+
+    A form that lets a user change his/her password without entering the old
+    password.
+
+.. class:: UserChangeForm
+
+    A form used in the admin interface to change a user's information and
+    permissions.
+
+.. class:: UserCreationForm
+
+    A form for creating a new user.
+
+.. currentmodule:: django.contrib.auth
+
+
+Authentication data in templates
+--------------------------------
+
+The currently logged-in user and his/her permissions are made available in the
+:doc:`template context </ref/templates/api>` when you use
+:class:`~django.template.RequestContext`.
+
+.. admonition:: Technicality
+
+   Technically, these variables are only made available in the template context
+   if you use :class:`~django.template.RequestContext` *and* your
+   :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting contains
+   ``"django.contrib.auth.context_processors.auth"``, which is default. For
+   more, see the :ref:`RequestContext docs <subclassing-context-requestcontext>`.
+
+Users
+~~~~~
+
+When rendering a template :class:`~django.template.RequestContext`, the
+currently logged-in user, either a  :class:`~django.contrib.auth.models.User`
+instance or an :class:`~django.contrib.auth.models.AnonymousUser` instance, is
+stored in the template variable ``{{ user }}``:
+
+.. code-block:: html+django
+
+    {% if user.is_authenticated %}
+        <p>Welcome, {{ user.username }}. Thanks for logging in.</p>
+    {% else %}
+        <p>Welcome, new user. Please log in.</p>
+    {% endif %}
+
+This template context variable is not available if a ``RequestContext`` is not
+being used.
+
+Permissions
+~~~~~~~~~~~
+
+The currently logged-in user's permissions are stored in the template variable
+``{{ perms }}``. This is an instance of
+``django.contrib.auth.context_processors.PermWrapper``, which is a
+template-friendly proxy of permissions.
+
+In the ``{{ perms }}`` object, single-attribute lookup is a proxy to
+:meth:`User.has_module_perms <django.contrib.auth.models.User.has_module_perms>`.
+This example would display ``True`` if the logged-in user had any permissions
+in the ``foo`` app::
+
+    {{ perms.foo }}
+
+Two-level-attribute lookup is a proxy to
+:meth:`User.has_perm <django.contrib.auth.models.User.has_perm>`. This example
+would display ``True`` if the logged-in user had the permission
+``foo.can_vote``::
+
+    {{ perms.foo.can_vote }}
+
+Thus, you can check permissions in template ``{% if %}`` statements:
+
+.. code-block:: html+django
+
+    {% if perms.foo %}
+        <p>You have permission to do something in the foo app.</p>
+        {% if perms.foo.can_vote %}
+            <p>You can vote!</p>
+        {% endif %}
+        {% if perms.foo.can_drive %}
+            <p>You can drive!</p>
+        {% endif %}
+    {% else %}
+        <p>You don't have permission to do anything in the foo app.</p>
+    {% endif %}
+
+.. versionadded:: 1.5
+    Permission lookup by "if in".
+
+It is possible to also look permissions up by ``{% if in %}`` statements.
+For example:
+
+.. code-block:: html+django
+
+    {% if 'foo' in perms %}
+        {% if 'foo.can_vote' in perms %}
+            <p>In lookup works, too.</p>
+        {% endif %}
+    {% endif %}
+
+.. _auth-admin:
+
+Managing users in the admin
+===========================
+
+When you have both ``django.contrib.admin`` and ``django.contrib.auth``
+installed, the admin provides a convenient way to view and manage users,
+groups, and permissions. Users can be created and deleted like any Django
+model. Groups can be created, and permissions can be assigned to users or
+groups. A log of user edits to models made within the admin is also stored and
+displayed.
+
+Creating Users
+--------------
+
+You should see a link to "Users" in the "Auth"
+section of the main admin index page. The "Add user" admin page is different
+than standard admin pages in that it requires you to choose a username and
+password before allowing you to edit the rest of the user's fields.
+
+Also note: if you want a user account to be able to create users using the
+Django admin site, you'll need to give them permission to add users *and*
+change users (i.e., the "Add user" and "Change user" permissions). If an
+account has permission to add users but not to change them, that account won't
+be able to add users. Why? Because if you have permission to add users, you
+have the power to create superusers, which can then, in turn, change other
+users. So Django requires add *and* change permissions as a slight security
+measure.
+
+Changing Passwords
+------------------
+
+User passwords are not displayed in the admin (nor stored in the database), but
+the :doc:`password storage details </topics/auth/passwords>` are displayed.
+Included in the display of this information is a link to
+a password change form that allows admins to change user passwords.
diff --git a/docs/topics/auth/index.txt b/docs/topics/auth/index.txt
new file mode 100644
index 0000000000..8447d449ce
--- /dev/null
+++ b/docs/topics/auth/index.txt
@@ -0,0 +1,89 @@
+=============================
+User authentication in Django
+=============================
+
+.. toctree::
+   :hidden:
+
+   default
+   passwords
+   customizing
+
+.. module:: django.contrib.auth
+   :synopsis: Django's authentication framework.
+
+Django comes with an user authentication system. It handles user accounts,
+groups, permissions and cookie-based user sessions. This section of the
+documentation explains how the default implementation works out of the box, as
+well as how to :doc:`extend and customize </topics/auth/customizing>` it to
+suit your project's needs.
+
+Overview
+========
+
+The Django authentication system handles both authentication and authorization.
+Briefly, authentication verifies a user is who they claim to be, and
+authorization determines what an authenticated user is allowed to do. Here the
+term authentication is used to refer to both tasks.
+
+The auth system consists of:
+
+* Users
+* Permissions: Binary (yes/no) flags designating whether a user may perform
+  a certain task.
+* Groups: A generic way of applying labels and permissions to more than one
+  user.
+* A configurable password hashing system
+* Forms and view tools for logging in users, or restricting content
+* A pluggable backend system
+
+The authentication system in Django aims to be very generic and doesn't provide
+some features commonly found in web authentication systems. Solutions for some
+of these common problems have been implemented in third-party packages:
+
+* Password strength checking
+* Throttling of login attempts
+* Authentication against third-parties (OAuth, for example)
+
+Installation
+============
+
+Authentication support is bundled as a Django contrib module in
+``django.contrib.auth``. By default, the required configuration is already
+included in the :file:`settings.py` generated by :djadmin:`django-admin.py
+startproject <startproject>`, these consist of two items listed in your
+:setting:`INSTALLED_APPS` setting:
+
+1. ``'django.contrib.auth'`` contains the core of the authentication framework,
+   and its default models.
+2. ``'django.contrib.contenttypes'`` is the Django :doc:`content type system
+   </ref/contrib/contenttypes>`, which allows permissions to be associated with
+   models you create.
+
+and two items in your :setting:`MIDDLEWARE_CLASSES` setting:
+
+1. :class:`~django.contrib.sessions.middleware.SessionMiddleware` manages
+   :doc:`sessions </topics/http/sessions>` across requests.
+2. :class:`~django.contrib.auth.middleware.AuthenticationMiddleware` associates
+   users with requests using sessions.
+
+With these settings in place, running the command ``manage.py syncdb`` creates
+the necessary database tables for auth related models, creates permissions for
+any models defined in your installed apps, and prompts you to create
+a superuser account the first time you run it.
+
+Usage
+=====
+
+:doc:`Using Django's default implementation <default>`
+
+* :ref:`Working with User objects <user-objects>`
+* :ref:`Permissions and authorization <topic-authorization>`
+* :ref:`Authentication in web requests <auth-web-requests>`
+* :ref:`Managing users in the admin <auth-admin>`
+
+:doc:`API reference for the default implementation </ref/contrib/auth>`
+
+:doc:`Customizing Users and authentication <customizing>`
+
+:doc:`Password management in Django <passwords>`
diff --git a/docs/topics/auth/passwords.txt b/docs/topics/auth/passwords.txt
new file mode 100644
index 0000000000..2193e6a3c7
--- /dev/null
+++ b/docs/topics/auth/passwords.txt
@@ -0,0 +1,225 @@
+=============================
+Password management in Django
+=============================
+
+Password management is something that should generally not be reinvented
+unnecessarily, and Django endeavors to provide a secure and flexible set of
+tools for managing user passwords. This document describes how Django stores
+passwords, how the storage hashing can be configured, and some utilities to
+work with hashed passwords.
+
+.. _auth_password_storage:
+
+How Django stores passwords
+===========================
+
+Django provides a flexible password storage system and uses PBKDF2 by default.
+
+The :attr:`~django.contrib.auth.models.User.password` attribute of a
+:class:`~django.contrib.auth.models.User` object is a string in this format::
+
+    <algorithm>$<iterations>$<salt>$<hash>
+
+Those are the components used for storing a User's password, separated by the
+dollar-sign character and consist of: the hashing algorithm, the number of
+algorithm iterations (work factor), the random salt, and the resulting password
+hash.  The algorithm is one of a number of one-way hashing or password storage
+algorithms Django can use; see below. Iterations describe the number of times
+the algorithm is run over the hash. Salt is the random seed used and the hash
+is the result of the one-way function.
+
+By default, Django uses the PBKDF2_ algorithm with a SHA256 hash, a
+password stretching mechanism recommended by NIST_. This should be
+sufficient for most users: it's quite secure, requiring massive
+amounts of computing time to break.
+
+However, depending on your requirements, you may choose a different
+algorithm, or even use a custom algorithm to match your specific
+security situation. Again, most users shouldn't need to do this -- if
+you're not sure, you probably don't.  If you do, please read on:
+
+Django chooses the algorithm to use by consulting the
+:setting:`PASSWORD_HASHERS` setting. This is a list of hashing algorithm
+classes that this Django installation supports. The first entry in this list
+(that is, ``settings.PASSWORD_HASHERS[0]``) will be used to store passwords,
+and all the other entries are valid hashers that can be used to check existing
+passwords.  This means that if you want to use a different algorithm, you'll
+need to modify :setting:`PASSWORD_HASHERS` to list your preferred algorithm
+first in the list.
+
+The default for :setting:`PASSWORD_HASHERS` is::
+
+    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.CryptPasswordHasher',
+    )
+
+This means that Django will use PBKDF2_ to store all passwords, but will support
+checking passwords stored with PBKDF2SHA1, bcrypt_, SHA1_, etc. The next few
+sections describe a couple of common ways advanced users may want to modify this
+setting.
+
+.. _bcrypt_usage:
+
+Using bcrypt with Django
+------------------------
+
+Bcrypt_ is a popular password storage algorithm that's specifically designed
+for long-term password storage. It's not the default used by Django since it
+requires the use of third-party libraries, but since many people may want to
+use it Django supports bcrypt with minimal effort.
+
+To use Bcrypt as your default storage algorithm, do the following:
+
+1. Install the `py-bcrypt`_ library (probably by running ``sudo pip install
+   py-bcrypt``, or downloading the library and installing it with ``python
+   setup.py install``).
+
+2. Modify :setting:`PASSWORD_HASHERS` to list ``BCryptSHA256PasswordHasher``
+   first. That is, in your settings file, you'd put::
+
+        PASSWORD_HASHERS = (
+            'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
+            'django.contrib.auth.hashers.BCryptPasswordHasher',
+            'django.contrib.auth.hashers.PBKDF2PasswordHasher',
+            'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+            'django.contrib.auth.hashers.SHA1PasswordHasher',
+            'django.contrib.auth.hashers.MD5PasswordHasher',
+            'django.contrib.auth.hashers.CryptPasswordHasher',
+        )
+
+   (You need to keep the other entries in this list, or else Django won't
+   be able to upgrade passwords; see below).
+
+That's it -- now your Django install will use Bcrypt as the default storage
+algorithm.
+
+.. admonition:: Password truncation with BCryptPasswordHasher
+
+    The designers of bcrypt truncate all passwords at 72 characters which means
+    that ``bcrypt(password_with_100_chars) == bcrypt(password_with_100_chars[:72])``.
+    The original ``BCryptPasswordHasher`` does not have any special handling and
+    thus is also subject to this hidden password length limit.
+    ``BCryptSHA256PasswordHasher`` fixes this by first first hashing the
+    password using sha256. This prevents the password truncation and so should
+    be preferred over the ``BCryptPasswordHasher``. The practical ramification
+    of this truncation is pretty marginal as the average user does not have a
+    password greater than 72 characters in length and even being truncated at 72
+    the compute powered required to brute force bcrypt in any useful amount of
+    time is still astronomical. Nonetheless, we recommend you use
+    ``BCryptSHA256PasswordHasher`` anyway on the principle of "better safe than
+    sorry".
+
+.. admonition:: Other bcrypt implementations
+
+   There are several other implementations that allow bcrypt to be
+   used with Django. Django's bcrypt support is NOT directly
+   compatible with these. To upgrade, you will need to modify the
+   hashes in your database to be in the form ``bcrypt$(raw bcrypt
+   output)``. For example:
+   ``bcrypt$$2a$12$NT0I31Sa7ihGEWpka9ASYrEFkhuTNeBQ2xfZskIiiJeyFXhRgS.Sy``.
+
+Increasing the work factor
+--------------------------
+
+The PBKDF2 and bcrypt algorithms use a number of iterations or rounds of
+hashing. This deliberately slows down attackers, making attacks against hashed
+passwords harder. However, as computing power increases, the number of
+iterations needs to be increased. We've chosen a reasonable default (and will
+increase it with each release of Django), but you may wish to tune it up or
+down, depending on your security needs and available processing power. To do so,
+you'll subclass the appropriate algorithm and override the ``iterations``
+parameters. For example, to increase the number of iterations used by the
+default PBKDF2 algorithm:
+
+1. Create a subclass of ``django.contrib.auth.hashers.PBKDF2PasswordHasher``::
+
+        from django.contrib.auth.hashers import PBKDF2PasswordHasher
+
+        class MyPBKDF2PasswordHasher(PBKDF2PasswordHasher):
+            """
+            A subclass of PBKDF2PasswordHasher that uses 100 times more iterations.
+            """
+            iterations = PBKDF2PasswordHasher.iterations * 100
+
+   Save this somewhere in your project. For example, you might put this in
+   a file like ``myproject/hashers.py``.
+
+2. Add your new hasher as the first entry in :setting:`PASSWORD_HASHERS`::
+
+        PASSWORD_HASHERS = (
+            'myproject.hashers.MyPBKDF2PasswordHasher',
+            '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.CryptPasswordHasher',
+        )
+
+
+That's it -- now your Django install will use more iterations when it
+stores passwords using PBKDF2.
+
+Password upgrading
+------------------
+
+When users log in, if their passwords are stored with anything other than
+the preferred algorithm, Django will automatically upgrade the algorithm
+to the preferred one. This means that old installs of Django will get
+automatically more secure as users log in, and it also means that you
+can switch to new (and better) storage algorithms as they get invented.
+
+However, Django can only upgrade passwords that use algorithms mentioned in
+:setting:`PASSWORD_HASHERS`, so as you upgrade to new systems you should make
+sure never to *remove* entries from this list. If you do, users using un-
+mentioned algorithms won't be able to upgrade.
+
+.. _sha1: http://en.wikipedia.org/wiki/SHA1
+.. _pbkdf2: http://en.wikipedia.org/wiki/PBKDF2
+.. _nist: http://csrc.nist.gov/publications/nistpubs/800-132/nist-sp800-132.pdf
+.. _bcrypt: http://en.wikipedia.org/wiki/Bcrypt
+.. _py-bcrypt: http://pypi.python.org/pypi/py-bcrypt/
+
+
+Manually managing a user's password
+===================================
+
+.. module:: django.contrib.auth.hashers
+
+The :mod:`django.contrib.auth.hashers` module provides a set of functions
+to create and validate hashed password. You can use them independently
+from the ``User`` model.
+
+.. function:: check_password(password, encoded)
+
+    If you'd like to manually authenticate a user by comparing a plain-text
+    password to the hashed password in the database, use the convenience
+    function :func:`check_password`. It takes two arguments: the plain-text
+    password to check, and the full value of a user's ``password`` field in the
+    database to check against, and returns ``True`` if they match, ``False``
+    otherwise.
+
+.. function:: make_password(password[, salt, hashers])
+
+    Creates a hashed password in the format used by this application. It takes
+    one mandatory argument: the password in plain-text. Optionally, you can
+    provide a salt and a hashing algorithm to use, if you don't want to use the
+    defaults (first entry of ``PASSWORD_HASHERS`` setting).
+    Currently supported algorithms are: ``'pbkdf2_sha256'``, ``'pbkdf2_sha1'``,
+    ``'bcrypt_sha256'`` (see :ref:`bcrypt_usage`), ``'bcrypt'``, ``'sha1'``,
+    ``'md5'``, ``'unsalted_md5'`` (only for backward compatibility) and ``'crypt'``
+    if you have the ``crypt`` library installed. If the password argument is
+    ``None``, an unusable password is returned (a one that will be never
+    accepted by :func:`check_password`).
+
+.. function:: is_password_usable(encoded_password)
+
+   Checks if the given string is a hashed password that has a chance
+   of being verified against :func:`check_password`.
diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
index a15cf58370..6b6d57511a 100644
--- a/docs/topics/cache.txt
+++ b/docs/topics/cache.txt
@@ -137,7 +137,7 @@ on the IP addresses 172.19.26.240 (port 11211), 172.19.26.242 (port 11212), and
             'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
             'LOCATION': [
                 '172.19.26.240:11211',
-                '172.19.26.242:11211',
+                '172.19.26.242:11212',
                 '172.19.26.244:11213',
             ]
         }
@@ -482,8 +482,6 @@ include the name of the active :term:`language<language code>` -- see also
 :ref:`how-django-discovers-language-preference`). This allows you to easily
 cache multilingual sites without having to create the cache key yourself.
 
-.. versionchanged:: 1.4
-
 Cache keys also include the active :term:`language <language code>` when
 :setting:`USE_L10N` is set to ``True`` and the :ref:`current time zone
 <default-current-time-zone>` when :setting:`USE_TZ` is set to ``True``.
@@ -641,6 +639,23 @@ equivalent:
 This feature is useful in avoiding repetition in templates. You can set the
 timeout in a variable, in one place, and just reuse that value.
 
+.. function:: django.core.cache.utils.make_template_fragment_key(fragment_name, vary_on=None)
+
+If you want to obtain the cache key used for a cached fragment, you can use
+``make_template_fragment_key``. ``fragment_name`` is the same as second argument
+to the ``cache`` template tag; ``vary_on`` is a list of all additional arguments
+passed to the tag. This function can be useful for invalidating or overwriting
+a cached item, for example:
+
+.. code-block:: python
+
+    >>> from django.core.cache import cache
+    >>> from django.core.cache.utils import make_template_fragment_key
+    # cache key for {% cache 500 sidebar username %}
+    >>> key = make_template_fragment_key('sidebar', [username])
+    >>> cache.delete(key) # invalidates cached template fragment
+
+
 The low-level cache API
 =======================
 
@@ -666,6 +681,8 @@ pickling.)
 Accessing the cache
 -------------------
 
+.. function:: django.core.cache.get_cache(backend, **kwargs)
+
 The cache module, ``django.core.cache``, has a ``cache`` object that's
 automatically created from the ``'default'`` entry in the :setting:`CACHES`
 setting::
@@ -678,7 +695,7 @@ If you have multiple caches defined in :setting:`CACHES`, then you can use
     >>> from django.core.cache import get_cache
     >>> cache = get_cache('alternate')
 
-If the named key does not exist, :exc:`InvalidCacheBackendError` will be raised.
+If the named key does not exist, ``InvalidCacheBackendError`` will be raised.
 
 
 Basic usage
@@ -846,7 +863,7 @@ key version to set or get. For example::
     'hello world!'
 
 The version of a specific key can be incremented and decremented using
-the :func:`incr_version()` and :func:`decr_version()` methods. This
+the ``incr_version()`` and ``decr_version()`` methods. This
 enables specific keys to be bumped to a new version, leaving other
 keys unaffected. Continuing our previous example::
 
@@ -881,7 +898,7 @@ parts), you can provide a custom key function.
 
 The :setting:`KEY_FUNCTION <CACHES-KEY_FUNCTION>` cache setting
 specifies a dotted-path to a function matching the prototype of
-:func:`make_key()` above. If provided, this custom key function will
+``make_key()`` above. If provided, this custom key function will
 be used instead of the default key combining function.
 
 Cache key warnings
diff --git a/docs/topics/class-based-views/generic-display.txt b/docs/topics/class-based-views/generic-display.txt
index 10279c0f63..64b998770f 100644
--- a/docs/topics/class-based-views/generic-display.txt
+++ b/docs/topics/class-based-views/generic-display.txt
@@ -110,7 +110,7 @@ Now we need to define a view::
 Finally hook that view into your urls::
 
     # urls.py
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, url
     from books.views import PublisherList
 
     urlpatterns = patterns('',
@@ -172,7 +172,7 @@ context using the lower cased version of the model class' name. This is
 provided in addition to the default ``object_list`` entry, but contains exactly
 the same data, i.e. ``publisher_list``.
 
-If the this still isn't a good match, you can manually set the name of the
+If this still isn't a good match, you can manually set the name of the
 context variable. The ``context_object_name`` attribute on a generic view
 specifies the context variable to use::
 
@@ -188,6 +188,8 @@ Providing a useful ``context_object_name`` is always a good idea. Your
 coworkers who design templates will thank you.
 
 
+.. _adding-extra-context:
+
 Adding extra context
 --------------------
 
@@ -228,7 +230,7 @@ more::
     get_context_data on the super class. When no two classes try to define the
     same key, this will give the expected results. However if any class
     attempts to override a key after parent classes have set it (after the call
-    to super), any children of that class will also need to explictly set it
+    to super), any children of that class will also need to explicitly set it
     after super if they want to be sure to override all parents. If you're
     having trouble, review the method resolution order of your view.
 
@@ -257,9 +259,9 @@ Specifying ``model = Publisher`` is really just shorthand for saying
 ``queryset = Publisher.objects.all()``. However, by using ``queryset``
 to define a filtered list of objects you can be more specific about the
 objects that will be visible in the view (see :doc:`/topics/db/queries`
-for more information about :class:`QuerySet` objects, and see the
-:doc:`class-based views reference </ref/class-based-views/index>` for the
-complete details).
+for more information about :class:`~django.db.models.query.QuerySet` objects,
+and see the :doc:`class-based views reference </ref/class-based-views/index>`
+for the complete details).
 
 To pick a simple example, we might want to order a list of books by
 publication date, with the most recent first::
@@ -312,9 +314,9 @@ what if we wanted to write a view that displayed all the books by some arbitrary
 publisher?
 
 Handily, the ``ListView`` has a
-:meth:`~django.views.generic.detail.ListView.get_queryset` method we can
-override. Previously, it has just been returning the value of the ``queryset``
-attribute, but now we can add more logic.
+:meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset` method we
+can override. Previously, it has just been returning the value of the
+``queryset`` attribute, but now we can add more logic.
 
 The key part to making this work is that when class-based views are called,
 various useful things are stored on ``self``; as well as the request
diff --git a/docs/topics/class-based-views/generic-editing.txt b/docs/topics/class-based-views/generic-editing.txt
index 7d12184705..8cd34f8ad9 100644
--- a/docs/topics/class-based-views/generic-editing.txt
+++ b/docs/topics/class-based-views/generic-editing.txt
@@ -7,10 +7,10 @@ Form processing generally has 3 paths:
 * POST with invalid data (typically redisplay form with errors)
 * POST with valid data (process the data and typically redirect)
 
-Implementing this yourself often results in a lot of repeated
-boilerplate code (see :ref:`Using a form in a
-view<using-a-form-in-a-view>`). To help avoid this, Django provides a
-collection of generic class-based views for form processing.
+Implementing this yourself often results in a lot of repeated boilerplate code
+(see :ref:`Using a form in a view<using-a-form-in-a-view>`). To help avoid
+this, Django provides a collection of generic class-based views for form
+processing.
 
 Basic Forms
 -----------
@@ -28,7 +28,7 @@ Given a simple contact form::
             # send email using the self.cleaned_data dictionary
             pass
 
-The view can be constructed using a FormView::
+The view can be constructed using a ``FormView``::
 
     # views.py
     from myapp.forms import ContactForm
@@ -50,42 +50,46 @@ Notes:
 * FormView inherits
   :class:`~django.views.generic.base.TemplateResponseMixin` so
   :attr:`~django.views.generic.base.TemplateResponseMixin.template_name`
-  can be used here
+  can be used here.
 * The default implementation for
-  :meth:`~django.views.generic.edit.FormView.form_valid` simply
-  redirects to the :attr:`success_url`
+  :meth:`~django.views.generic.edit.FormMixin.form_valid` simply
+  redirects to the :attr:`~django.views.generic.edit.FormMixin.success_url`.
 
 Model Forms
 -----------
 
 Generic views really shine when working with models.  These generic
-views will automatically create a :class:`ModelForm`, so long as they
-can work out which model class to use:
+views will automatically create a :class:`~django.forms.ModelForm`, so long as
+they can work out which model class to use:
 
-* If the :attr:`model` attribute is given, that model class will be used
-* If :meth:`get_object()` returns an object, the class of that object
-  will be used
-* If a :attr:`queryset` is given, the model for that queryset will be used
+* If the :attr:`~django.views.generic.edit.ModelFormMixin.model` attribute is
+  given, that model class will be used.
+* If :meth:`~django.views.generic.detail.SingleObjectMixin.get_object()`
+  returns an object, the class of that object will be used.
+* If a :attr:`~django.views.generic.detail.SingleObjectMixin.queryset` is
+  given, the model for that queryset will be used.
 
-Model form views provide a :meth:`form_valid()` implementation that
-saves the model automatically.  You can override this if you have any
+Model form views provide a
+:meth:`~django.views.generic.edit.ModelFormMixin.form_valid()` implementation
+that saves the model automatically.  You can override this if you have any
 special requirements; see below for examples.
 
-You don't even need to provide a attr:`success_url` for
+You don't even need to provide a ``success_url`` for
 :class:`~django.views.generic.edit.CreateView` or
 :class:`~django.views.generic.edit.UpdateView` - they will use
-:meth:`get_absolute_url()` on the model object if available.
+:meth:`~django.db.models.Model.get_absolute_url()` on the model object if available.
 
-If you want to use a custom :class:`ModelForm` (for instance to add
-extra validation) simply set
+If you want to use a custom :class:`~django.forms.ModelForm` (for instance to
+add extra validation) simply set
 :attr:`~django.views.generic.edit.FormMixin.form_class` on your view.
 
 .. note::
     When specifying a custom form class, you must still specify the model,
-    even though the :attr:`form_class` may be a :class:`ModelForm`.
+    even though the :attr:`~django.views.generic.edit.FormMixin.form_class` may
+    be a :class:`~django.forms.ModelForm`.
 
-First we need to add :meth:`get_absolute_url()` to our :class:`Author`
-class:
+First we need to add :meth:`~django.db.models.Model.get_absolute_url()` to our
+``Author`` class:
 
 .. code-block:: python
 
@@ -137,8 +141,10 @@ Finally, we hook these new views into the URLconf::
 
 .. note::
 
-    These views inherit :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`
-    which uses :attr:`~django.views.generic.detail.SingleObjectTemplateResponseMixin.template_name_prefix`
+    These views inherit
+    :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`
+    which uses
+    :attr:`~django.views.generic.detail.SingleObjectTemplateResponseMixin.template_name_suffix`
     to construct the
     :attr:`~django.views.generic.base.TemplateResponseMixin.template_name`
     based on the model.
@@ -149,15 +155,17 @@ Finally, we hook these new views into the URLconf::
     * :class:`DeleteView` uses ``myapp/author_confirm_delete.html``
 
     If you wish to have separate templates for :class:`CreateView` and
-    :class:1UpdateView`, you can set either :attr:`template_name` or
-    :attr:`template_name_suffix` on your view class.
+    :class:`UpdateView`, you can set either
+    :attr:`~django.views.generic.base.TemplateResponseMixin.template_name` or
+    :attr:`~django.views.generic.detail.SingleObjectTemplateResponseMixin.template_name_suffix`
+    on your view class.
 
 Models and request.user
 -----------------------
 
 To track the user that created an object using a :class:`CreateView`,
-you can use a custom :class:`ModelForm` to do this. First, add the
-foreign key relation to the model::
+you can use a custom :class:`~django.forms.ModelForm` to do this. First, add
+the foreign key relation to the model::
 
     # models.py
     from django.contrib.auth import User
@@ -169,7 +177,7 @@ foreign key relation to the model::
 
         # ...
 
-Create a custom :class:`ModelForm` in order to exclude the
+Create a custom :class:`~django.forms.ModelForm` in order to exclude the
 ``created_by`` field and prevent the user from editing it:
 
 .. code-block:: python
@@ -183,8 +191,10 @@ Create a custom :class:`ModelForm` in order to exclude the
             model = Author
             exclude = ('created_by',)
 
-In the view, use the custom :attr:`form_class` and override
-:meth:`form_valid()` to add the user::
+In the view, use the custom
+:attr:`~django.views.generic.edit.FormMixin.form_class` and override
+:meth:`~django.views.generic.edit.ModelFormMixin.form_valid()` to add the
+user::
 
     # views.py
     from django.views.generic.edit import CreateView
@@ -202,7 +212,8 @@ In the view, use the custom :attr:`form_class` and override
 Note that you'll need to :ref:`decorate this
 view<decorating-class-based-views>` using
 :func:`~django.contrib.auth.decorators.login_required`, or
-alternatively handle unauthorised users in the :meth:`form_valid()`.
+alternatively handle unauthorized users in the
+:meth:`~django.views.generic.edit.ModelFormMixin.form_valid()`.
 
 AJAX example
 ------------
@@ -214,7 +225,6 @@ works for AJAX requests as well as 'normal' form POSTs::
 
     from django.http import HttpResponse
     from django.views.generic.edit import CreateView
-    from django.views.generic.detail import SingleObjectTemplateResponseMixin
 
     class AjaxableResponseMixin(object):
         """
diff --git a/docs/topics/class-based-views/index.txt b/docs/topics/class-based-views/index.txt
index 54d4b0f252..b2fa93e05f 100644
--- a/docs/topics/class-based-views/index.txt
+++ b/docs/topics/class-based-views/index.txt
@@ -14,6 +14,7 @@ reusable views which suits your use case. For full details, see the
 .. toctree::
    :maxdepth: 1
 
+   intro
    generic-display
    generic-editing
    mixins
@@ -37,7 +38,7 @@ URLconf. If you're only changing a few simple attributes on a class-based view,
 you can simply pass them into the
 :meth:`~django.views.generic.base.View.as_view` method call itself::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns
     from django.views.generic import TemplateView
 
     urlpatterns = patterns('',
@@ -73,7 +74,7 @@ point the URL to the :meth:`~django.views.generic.base.View.as_view` class
 method instead, which provides a function-like entry to class-based views::
 
     # urls.py
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns
     from some_app.views import AboutView
 
     urlpatterns = patterns('',
@@ -127,68 +128,3 @@ the client issues a ``HEAD`` request, the response has an empty body and
 the ``Last-Modified`` header indicates when the most recent book was published.
 Based on this information, the client may or may not download the full object
 list.
-
-Decorating class-based views
-============================
-
-.. highlightlang:: python
-
-Since class-based views aren't functions, decorating them works differently
-depending on if you're using ``as_view`` or creating a subclass.
-
-Decorating in URLconf
----------------------
-
-The simplest way of decorating class-based views is to decorate the
-result of the :meth:`~django.views.generic.base.View.as_view` method.
-The easiest place to do this is in the URLconf where you deploy your view::
-
-    from django.contrib.auth.decorators import login_required, permission_required
-    from django.views.generic import TemplateView
-
-    from .views import VoteView
-
-    urlpatterns = patterns('',
-        (r'^about/', login_required(TemplateView.as_view(template_name="secret.html"))),
-        (r'^vote/', permission_required('polls.can_vote')(VoteView.as_view())),
-    )
-
-This approach applies the decorator on a per-instance basis. If you
-want every instance of a view to be decorated, you need to take a
-different approach.
-
-.. _decorating-class-based-views:
-
-Decorating the class
---------------------
-
-To decorate every instance of a class-based view, you need to decorate
-the class definition itself. To do this you apply the decorator to the
-:meth:`~django.views.generic.base.View.dispatch` method of the class.
-
-A method on a class isn't quite the same as a standalone function, so
-you can't just apply a function decorator to the method -- you need to
-transform it into a method decorator first. The ``method_decorator``
-decorator transforms a function decorator into a method decorator so
-that it can be used on an instance method. For example::
-
-    from django.contrib.auth.decorators import login_required
-    from django.utils.decorators import method_decorator
-    from django.views.generic import TemplateView
-
-    class ProtectedView(TemplateView):
-        template_name = 'secret.html'
-
-        @method_decorator(login_required)
-        def dispatch(self, *args, **kwargs):
-            return super(ProtectedView, self).dispatch(*args, **kwargs)
-
-In this example, every instance of ``ProtectedView`` will have
-login protection.
-
-.. note::
-
-    ``method_decorator`` passes ``*args`` and ``**kwargs``
-    as parameters to the decorated method on the class. If your method
-    does not accept a compatible set of parameters it will raise a
-    ``TypeError`` exception.
diff --git a/docs/topics/class-based-views/intro.txt b/docs/topics/class-based-views/intro.txt
new file mode 100644
index 0000000000..dbbbea25f0
--- /dev/null
+++ b/docs/topics/class-based-views/intro.txt
@@ -0,0 +1,289 @@
+=================================
+Introduction to Class-based views
+=================================
+
+Class-based views provide an alternative way to implement views as Python
+objects instead of functions. They do not replace function-based views, but
+have certain differences and advantages when compared to function-based views:
+
+* Organization of code related to specific HTTP methods (``GET``, ``POST``,
+  etc) can be addressed by separate methods instead of conditional branching.
+
+* Object oriented techniques such as mixins (multiple inheritance) can be
+  used to factor code into reusable components.
+
+The relationship and history of generic views, class-based views, and class-based generic views
+===============================================================================================
+
+In the beginning there was only the view function contract, Django passed your
+function an :class:`~django.http.HttpRequest` and expected back an
+:class:`~django.http.HttpResponse`. This was the extent of what Django provided.
+
+Early on it was recognized that there were common idioms and patterns found in
+view development. Function-based generic views were introduced to abstract
+these patterns and ease view development for the common cases.
+
+The problem with function-based generic views is that while they covered the
+simple cases well, there was no way to extend or customize them beyond some
+simple configuration options, limiting their usefulness in many real-world
+applications.
+
+Class-based generic views were created with the same objective as
+function-based generic views, to make view development easier. However, the way
+the solution is implemented, through the use of mixins, provides a toolkit that
+results in class-based generic views being more extensible and flexible than
+their function-based counterparts.
+
+If you have tried function based generic views in the past and found them
+lacking, you should not think of class-based generic views as simply a
+class-based equivalent, but rather as a fresh approach to solving the original
+problems that generic views were meant to solve.
+
+The toolkit of base classes and mixins that Django uses to build class-based
+generic views are built for maximum flexibility, and as such have many hooks in
+the form of default method implementations and attributes that you are unlikely
+to be concerned with in the simplest use cases. For example, instead of
+limiting you to a class based attribute for ``form_class``, the implementation
+uses a ``get_form`` method, which calls a ``get_form_class`` method, which in
+its default implementation just returns the ``form_class`` attribute of the
+class. This gives you several options for specifying what form to use, from a
+simple attribute, to a fully dynamic, callable hook. These options seem to add
+hollow complexity for simple situations, but without them, more advanced
+designs would be limited.
+
+Using class-based views
+=======================
+
+At its core, a class-based view allows you to respond to different HTTP request
+methods with different class instance methods, instead of with conditionally
+branching code inside a single view function.
+
+So where the code to handle HTTP ``GET`` in a view function would look
+something like::
+
+    from django.http import HttpResponse
+
+    def my_view(request):
+        if request.method == 'GET':
+            # <view logic>
+            return HttpResponse('result')
+
+In a class-based view, this would become::
+
+    from django.http import HttpResponse
+    from django.views.generic.base import View
+
+    class MyView(View):
+        def get(self, request):
+            # <view logic>
+            return HttpResponse('result')
+
+Because Django's URL resolver expects to send the request and associated
+arguments to a callable function, not a class, class-based views have an
+:meth:`~django.views.generic.base.View.as_view` class method which serves as
+the callable entry point to your class. The ``as_view`` entry point creates an
+instance of your class and calls its
+:meth:`~django.views.generic.base.View.dispatch` method. ``dispatch`` looks at
+the request to determine whether it is a ``GET``, ``POST``, etc, and relays the
+request to a matching method if one is defined, or raises
+:class:`~django.http.HttpResponseNotAllowed` if not::
+
+    # urls.py
+    from django.conf.urls import patterns
+    from myapp.views import MyView
+
+    urlpatterns = patterns('',
+        (r'^about/', MyView.as_view()),
+    )
+
+
+It is worth noting that what your method returns is identical to what you
+return from a function-based view, namely some form of
+:class:`~django.http.HttpResponse`. This means that
+:doc:`http shortcuts </topics/http/shortcuts>` or
+:class:`~django.template.response.TemplateResponse` objects are valid to use
+inside a class-based view.
+
+While a minimal class-based view does not require any class attributes to
+perform its job, class attributes are useful in many class-based designs,
+and there are two ways to configure or set class attributes.
+
+The first is the standard Python way of subclassing and overriding attributes
+and methods in the subclass. So that if your parent class had an attribute
+``greeting`` like this::
+
+    from django.http import HttpResponse
+    from django.views.generic.base import View
+
+    class GreetingView(View):
+        greeting = "Good Day"
+
+        def get(self, request):
+            return HttpResponse(self.greeting)
+
+You can override that in a subclass::
+
+    class MorningGreetingView(GreetingView):
+        greeting = "Morning to ya"
+
+Another option is to configure class attributes as keyword arguments to the
+:meth:`~django.views.generic.base.View.as_view` call in the URLconf::
+
+    urlpatterns = patterns('',
+        (r'^about/', GreetingView.as_view(greeting="G'day")),
+    )
+
+.. note::
+
+    While your class is instantiated for each request dispatched to it, class
+    attributes set through the
+    :meth:`~django.views.generic.base.View.as_view` entry point are
+    configured only once at the time your URLs are imported.
+
+Using mixins
+============
+
+Mixins are a form of multiple inheritance where behaviors and attributes of
+multiple parent classes can be combined.
+
+For example, in the generic class-based views there is a mixin called
+:class:`~django.views.generic.base.TemplateResponseMixin` whose primary purpose
+is to define the method
+:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`.
+When combined with the behavior of the :class:`~django.views.generic.base.View`
+base class, the result is a :class:`~django.views.generic.base.TemplateView`
+class that will dispatch requests to the appropriate matching methods (a
+behavior defined in the ``View`` base class), and that has a
+:meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
+method that uses a
+:attr:`~django.views.generic.base.TemplateResponseMixin.template_name`
+attribute to return a :class:`~django.template.response.TemplateResponse`
+object (a behavior defined in the ``TemplateResponseMixin``).
+
+Mixins are an excellent way of reusing code across multiple classes, but they
+come with some cost. The more your code is scattered among mixins, the harder
+it will be to read a child class and know what exactly it is doing, and the
+harder it will be to know which methods from which mixins to override if you
+are subclassing something that has a deep inheritance tree.
+
+Note also that you can only inherit from one generic view - that is, only one
+parent class may inherit from :class:`~django.views.generic.base.View` and
+the rest (if any) should be mixins. Trying to inherit from more than one class
+that inherits from ``View`` - for example, trying to use a form at the top of a
+list and combining :class:`~django.views.generic.edit.ProcessFormView` and
+:class:`~django.views.generic.list.ListView` - won't work as expected.
+
+Handling forms with class-based views
+=====================================
+
+A basic function-based view that handles forms may look something like this::
+
+    from django.http import HttpResponseRedirect
+    from django.shortcuts import render
+
+    from .forms import MyForm
+
+    def myview(request):
+        if request.method == "POST":
+            form = MyForm(request.POST)
+            if form.is_valid():
+                # <process form cleaned data>
+                return HttpResponseRedirect('/success/')
+        else:
+            form = MyForm(initial={'key': 'value'})
+
+        return render(request, 'form_template.html', {'form': form})
+
+A similar class-based view might look like::
+
+    from django.http import HttpResponseRedirect
+    from django.shortcuts import render
+
+    from .forms import MyForm
+
+    class MyFormView(View):
+        form_class = MyForm
+        initial = {'key': 'value'}
+        template_name = 'form_template.html'
+
+        def get(self, request, *args, **kwargs):
+            form = self.form_class(initial=self.initial)
+            return render(request,  self.template_name, {'form': form})
+
+        def post(self, request, *args, **kwargs):
+            form = self.form_class(request.POST)
+            if form.is_valid():
+                # <process form cleaned data>
+                return HttpResponseRedirect('/success/')
+
+            return render(request, self.template_name, {'form': form})
+
+This is a very simple case, but you can see that you would then have the option
+of customizing this view by overriding any of the class attributes, e.g.
+``form_class``, via URLconf configuration, or subclassing and overriding one or
+more of the methods (or both!).
+
+Decorating class-based views
+============================
+
+The extension of class-based views isn't limited to using mixins. You
+can use also use decorators. Since class-based views aren't functions,
+decorating them works differently depending on if you're using ``as_view`` or
+creating a subclass.
+
+Decorating in URLconf
+---------------------
+
+The simplest way of decorating class-based views is to decorate the
+result of the :meth:`~django.views.generic.base.View.as_view` method.
+The easiest place to do this is in the URLconf where you deploy your view::
+
+    from django.contrib.auth.decorators import login_required, permission_required
+    from django.views.generic import TemplateView
+
+    from .views import VoteView
+
+    urlpatterns = patterns('',
+        (r'^about/', login_required(TemplateView.as_view(template_name="secret.html"))),
+        (r'^vote/', permission_required('polls.can_vote')(VoteView.as_view())),
+    )
+
+This approach applies the decorator on a per-instance basis. If you
+want every instance of a view to be decorated, you need to take a
+different approach.
+
+.. _decorating-class-based-views:
+
+Decorating the class
+--------------------
+
+To decorate every instance of a class-based view, you need to decorate
+the class definition itself. To do this you apply the decorator to the
+:meth:`~django.views.generic.base.View.dispatch` method of the class.
+
+A method on a class isn't quite the same as a standalone function, so
+you can't just apply a function decorator to the method -- you need to
+transform it into a method decorator first. The ``method_decorator``
+decorator transforms a function decorator into a method decorator so
+that it can be used on an instance method. For example::
+
+    from django.contrib.auth.decorators import login_required
+    from django.utils.decorators import method_decorator
+    from django.views.generic import TemplateView
+
+    class ProtectedView(TemplateView):
+        template_name = 'secret.html'
+
+        @method_decorator(login_required)
+        def dispatch(self, *args, **kwargs):
+            return super(ProtectedView, self).dispatch(*args, **kwargs)
+
+In this example, every instance of ``ProtectedView`` will have
+login protection.
+
+.. note::
+
+    ``method_decorator`` passes ``*args`` and ``**kwargs``
+    as parameters to the decorated method on the class. If your method
+    does not accept a compatible set of parameters it will raise a
+    ``TypeError`` exception.
diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt
index f349c23626..9550d2fb86 100644
--- a/docs/topics/class-based-views/mixins.txt
+++ b/docs/topics/class-based-views/mixins.txt
@@ -13,7 +13,7 @@ but some of it you may want to use separately. For instance, you may
 want to write a view that renders a template to make the HTTP
 response, but you can't use
 :class:`~django.views.generic.base.TemplateView`; perhaps you need to
-render a template only on `POST`, with `GET` doing something else
+render a template only on ``POST``, with ``GET`` doing something else
 entirely. While you could use
 :class:`~django.template.response.TemplateResponse` directly, this
 will likely result in duplicate code.
@@ -35,10 +35,10 @@ interface to working with templates in class-based views.
     Every built in view which returns a
     :class:`~django.template.response.TemplateResponse` will call the
     :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
-    method that :class:`TemplateResponseMixin` provides. Most of the time this
+    method that ``TemplateResponseMixin`` provides. Most of the time this
     will be called for you (for instance, it is called by the ``get()`` method
     implemented by both :class:`~django.views.generic.base.TemplateView` and
-    :class:`~django.views.generic.base.DetailView`); similarly, it's unlikely
+    :class:`~django.views.generic.detail.DetailView`); similarly, it's unlikely
     that you'll need to override it, although if you want your response to
     return something not rendered via a Django template then you'll want to do
     it. For an example of this, see the :ref:`JSONResponseMixin example
@@ -59,10 +59,10 @@ interface to working with templates in class-based views.
 
 :class:`~django.views.generic.base.ContextMixin`
     Every built in view which needs context data, such as for rendering a
-    template (including :class:`TemplateResponseMixin` above), should call
+    template (including ``TemplateResponseMixin`` above), should call
     :meth:`~django.views.generic.base.ContextMixin.get_context_data` passing
     any data they want to ensure is in there as keyword arguments.
-    ``get_context_data`` returns a dictionary; in :class:`ContextMixin` it
+    ``get_context_data`` returns a dictionary; in ``ContextMixin`` it
     simply returns its keyword arguments, but it is common to override this to
     add more members to the dictionary.
 
@@ -93,8 +93,8 @@ DetailView: working with a single Django object
 
 To show the detail of an object, we basically need to do two things:
 we need to look up the object and then we need to make a
-:class:`TemplateResponse` with a suitable template, and that object as
-context.
+:class:`~django.template.response.TemplateResponse` with a suitable template,
+and that object as context.
 
 To get the object, :class:`~django.views.generic.detail.DetailView`
 relies on :class:`~django.views.generic.detail.SingleObjectMixin`,
@@ -106,20 +106,21 @@ URLConf, and looks the object up either from the
 :attr:`~django.views.generic.detail.SingleObjectMixin.model` attribute
 on the view, or the
 :attr:`~django.views.generic.detail.SingleObjectMixin.queryset`
-attribute if that's provided). :class:`SingleObjectMixin` also overrides
+attribute if that's provided). ``SingleObjectMixin`` also overrides
 :meth:`~django.views.generic.base.ContextMixin.get_context_data`,
 which is used across all Django's built in class-based views to supply
 context data for template renders.
 
-To then make a :class:`TemplateResponse`, :class:`DetailView` uses
+To then make a :class:`~django.template.response.TemplateResponse`,
+:class:`DetailView` uses
 :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`,
-which extends
-:class:`~django.views.generic.base.TemplateResponseMixin`, overriding
-:meth:`get_template_names()` as discussed above. It actually provides
-a fairly sophisticated set of options, but the main one that most
-people are going to use is
-``<app_label>/<object_name>_detail.html``. The ``_detail`` part can be
-changed by setting
+which extends :class:`~django.views.generic.base.TemplateResponseMixin`,
+overriding
+:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names()`
+as discussed above. It actually provides a fairly sophisticated set of options,
+but the main one that most people are going to use is
+``<app_label>/<object_name>_detail.html``. The ``_detail`` part can be changed
+by setting
 :attr:`~django.views.generic.detail.SingleObjectTemplateResponseMixin.template_name_suffix`
 on a subclass to something else. (For instance, the :doc:`generic edit
 views<generic-editing>` use ``_form`` for create and update views, and
@@ -129,9 +130,10 @@ ListView: working with many Django objects
 ------------------------------------------
 
 Lists of objects follow roughly the same pattern: we need a (possibly
-paginated) list of objects, typically a :class:`QuerySet`, and then we need
-to make a :class:`TemplateResponse` with a suitable template using
-that list of objects.
+paginated) list of objects, typically a
+:class:`~django.db.models.query.QuerySet`, and then we need to make a
+:class:`~django.template.response.TemplateResponse` with a suitable template
+using that list of objects.
 
 To get the objects, :class:`~django.views.generic.list.ListView` uses
 :class:`~django.views.generic.list.MultipleObjectMixin`, which
@@ -139,9 +141,9 @@ provides both
 :meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset`
 and
 :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`. Unlike
-with :class:`SingleObjectMixin`, there's no need to key off parts of
-the URL to figure out the queryset to work with, so the default just
-uses the
+with :class:`~django.views.generic.detail.SingleObjectMixin`, there's no need
+to key off parts of the URL to figure out the queryset to work with, so the
+default just uses the
 :attr:`~django.views.generic.list.MultipleObjectMixin.queryset` or
 :attr:`~django.views.generic.list.MultipleObjectMixin.model` attribute
 on the view class. A common reason to override
@@ -149,19 +151,19 @@ on the view class. A common reason to override
 here would be to dynamically vary the objects, such as depending on
 the current user or to exclude posts in the future for a blog.
 
-:class:`MultipleObjectMixin` also overrides
+:class:`~django.views.generic.list.MultipleObjectMixin` also overrides
 :meth:`~django.views.generic.base.ContextMixin.get_context_data` to
 include appropriate context variables for pagination (providing
 dummies if pagination is disabled). It relies on ``object_list`` being
 passed in as a keyword argument, which :class:`ListView` arranges for
 it.
 
-To make a :class:`TemplateResponse`, :class:`ListView` then uses
+To make a :class:`~django.template.response.TemplateResponse`,
+:class:`ListView` then uses
 :class:`~django.views.generic.list.MultipleObjectTemplateResponseMixin`;
-as with :class:`SingleObjectTemplateResponseMixin` above, this
-overrides :meth:`get_template_names()` to provide :meth:`a range of
-options
-<~django.views.generic.list.MultipleObjectTempalteResponseMixin>`,
+as with :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`
+above, this overrides ``get_template_names()`` to provide :meth:`a range of
+options <django.views.generic.list.MultipleObjectTemplateResponseMixin>`,
 with the most commonly-used being
 ``<app_label>/<object_name>_list.html``, with the ``_list`` part again
 being taken from the
@@ -198,13 +200,13 @@ the box.
 
     If in doubt, it's often better to back off and base your work on
     :class:`View` or :class:`TemplateView`, perhaps with
-    :class:`SimpleObjectMixin` and
-    :class:`MultipleObjectMixin`. Although you will probably end up
-    writing more code, it is more likely to be clearly understandable
-    to someone else coming to it later, and with fewer interactions to
-    worry about you will save yourself some thinking. (Of course, you
-    can always dip into Django's implementation of the generic class
-    based views for inspiration on how to tackle problems.)
+    :class:`~django.views.generic.detail.SingleObjectMixin` and
+    :class:`~django.views.generic.list.MultipleObjectMixin`. Although you
+    will probably end up writing more code, it is more likely to be clearly
+    understandable to someone else coming to it later, and with fewer
+    interactions to worry about you will save yourself some thinking. (Of
+    course, you can always dip into Django's implementation of the generic
+    class based views for inspiration on how to tackle problems.)
 
 .. _method resolution order: http://www.python.org/download/releases/2.3/mro/
 
@@ -248,9 +250,9 @@ We'll demonstrate this with the publisher modelling we used in the
 In practice you'd probably want to record the interest in a key-value
 store rather than in a relational database, so we've left that bit
 out. The only bit of the view that needs to worry about using
-:class:`SingleObjectMixin` is where we want to look up the author
-we're interested in, which it just does with a simple call to
-``self.get_object()``. Everything else is taken care of for us by the
+:class:`~django.views.generic.detail.SingleObjectMixin` is where we want to
+look up the author we're interested in, which it just does with a simple call
+to ``self.get_object()``. Everything else is taken care of for us by the
 mixin.
 
 We can hook this into our URLs easily enough::
@@ -265,8 +267,9 @@ We can hook this into our URLs easily enough::
 
 Note the ``pk`` named group, which
 :meth:`~django.views.generic.detail.SingleObjectMixin.get_object` uses
-to look up the :class:`Author` instance. You could also use a slug, or
-any of the other features of :class:`SingleObjectMixin`.
+to look up the ``Author`` instance. You could also use a slug, or
+any of the other features of
+:class:`~django.views.generic.detail.SingleObjectMixin`.
 
 Using SingleObjectMixin with ListView
 -------------------------------------
@@ -278,28 +281,29 @@ example, you might want to paginate through all the books by a
 particular publisher.
 
 One way to do this is to combine :class:`ListView` with
-:class:`SingleObjectMixin`, so that the queryset for the paginated
-list of books can hang off the publisher found as the single
+:class:`~django.views.generic.detail.SingleObjectMixin`, so that the queryset
+for the paginated list of books can hang off the publisher found as the single
 object. In order to do this, we need to have two different querysets:
 
 **Publisher queryset for use in get_object**
-    We'll set that up directly when we call :meth:`get_object()`.
+    We'll set that up directly when we call ``get_object()``.
 
 **Book queryset for use by ListView**
-    We'll figure that out ourselves in :meth:`get_queryset()` so we
-    can take into account the Publisher we're looking at.
+    We'll figure that out ourselves in ``get_queryset()`` so we
+    can take into account the ``Publisher`` we're looking at.
 
 .. note::
 
-    We have to think carefully about :meth:`get_context_data()`.
-    Since both :class:`SingleObjectMixin` and :class:`ListView` will
+    We have to think carefully about ``get_context_data()``.
+    Since both :class:`~django.views.generic.detail.SingleObjectMixin` and
+    :class:`ListView` will
     put things in the context data under the value of
-    :attr:`context_object_name` if it's set, we'll instead explictly
+    ``context_object_name`` if it's set, we'll instead explictly
     ensure the Publisher is in the context data. :class:`ListView`
     will add in the suitable ``page_obj`` and ``paginator`` for us
     providing we remember to call ``super()``.
 
-Now we can write a new :class:`PublisherDetail`::
+Now we can write a new ``PublisherDetail``::
 
     from django.views.generic import ListView
     from django.views.generic.detail import SingleObjectMixin
@@ -317,13 +321,14 @@ Now we can write a new :class:`PublisherDetail`::
             self.object = self.get_object(Publisher.objects.all())
             return self.object.book_set.all()
 
-Notice how we set ``self.object`` within :meth:`get_queryset` so we
-can use it again later in :meth:`get_context_data`. If you don't set
-:attr:`template_name`, the template will default to the normal
+Notice how we set ``self.object`` within ``get_queryset()`` so we
+can use it again later in ``get_context_data()``. If you don't set
+``template_name``, the template will default to the normal
 :class:`ListView` choice, which in this case would be
 ``"books/book_list.html"`` because it's a list of books;
-:class:`ListView` knows nothing about :class:`SingleObjectMixin`, so
-it doesn't have any clue this view is anything to do with a Publisher.
+:class:`ListView` knows nothing about
+:class:`~django.views.generic.detail.SingleObjectMixin`, so it doesn't have
+any clue this view is anything to do with a Publisher.
 
 .. highlightlang:: html+django
 
@@ -366,7 +371,7 @@ Generally you can use
 :class:`~django.views.generic.base.TemplateResponseMixin` and
 :class:`~django.views.generic.detail.SingleObjectMixin` when you need
 their functionality. As shown above, with a bit of care you can even
-combine :class:`SingleObjectMixin` with
+combine ``SingleObjectMixin`` with
 :class:`~django.views.generic.list.ListView`. However things get
 increasingly complex as you try to do so, and a good rule of thumb is:
 
@@ -377,53 +382,53 @@ increasingly complex as you try to do so, and a good rule of thumb is:
     list<generic-display>`, :doc:`editing<generic-editing>` and
     date. For example it's fine to combine
     :class:`TemplateView` (built in view) with
-    :class:`MultipleObjectMixin` (generic list), but you're likely to
-    have problems combining :class:`SingleObjectMixin` (generic
-    detail) with :class:`MultipleObjectMixin` (generic list).
+    :class:`~django.views.generic.list.MultipleObjectMixin` (generic list), but
+    you're likely to have problems combining ``SingleObjectMixin`` (generic
+    detail) with ``MultipleObjectMixin`` (generic list).
 
 To show what happens when you try to get more sophisticated, we show
 an example that sacrifices readability and maintainability when there
 is a simpler solution. First, let's look at a naive attempt to combine
 :class:`~django.views.generic.detail.DetailView` with
 :class:`~django.views.generic.edit.FormMixin` to enable use to
-``POST`` a Django :class:`Form` to the same URL as we're displaying an
-object using :class:`DetailView`.
+``POST`` a Django :class:`~django.forms.Form` to the same URL as we're
+displaying an object using :class:`DetailView`.
 
 Using FormMixin with DetailView
 -------------------------------
 
 Think back to our earlier example of using :class:`View` and
-:class:`SingleObjectMixin` together. We were recording a user's
-interest in a particular author; say now that we want to let them
-leave a message saying why they like them. Again, let's assume we're
+:class:`~django.views.generic.detail.SingleObjectMixin` together. We were
+recording a user's interest in a particular author; say now that we want to
+let them leave a message saying why they like them. Again, let's assume we're
 not going to store this in a relational database but instead in
 something more esoteric that we won't worry about here.
 
-At this point it's natural to reach for a :class:`Form` to encapsulate
-the information sent from the user's browser to Django. Say also that
-we're heavily invested in `REST`_, so we want to use the same URL for
+At this point it's natural to reach for a :class:`~django.forms.Form` to
+encapsulate the information sent from the user's browser to Django. Say also
+that we're heavily invested in `REST`_, so we want to use the same URL for
 displaying the author as for capturing the message from the
-user. Let's rewrite our :class:`AuthorDetailView` to do that.
+user. Let's rewrite our ``AuthorDetailView`` to do that.
 
 .. _REST: http://en.wikipedia.org/wiki/Representational_state_transfer
 
 We'll keep the ``GET`` handling from :class:`DetailView`, although
-we'll have to add a :class:`Form` into the context data so we can
+we'll have to add a :class:`~django.forms.Form` into the context data so we can
 render it in the template. We'll also want to pull in form processing
 from :class:`~django.views.generic.edit.FormMixin`, and write a bit of
 code so that on ``POST`` the form gets called appropriately.
 
 .. note::
 
-    We use :class:`FormMixin` and implement :meth:`post()` ourselves
-    rather than try to mix :class:`DetailView` with :class:`FormView`
-    (which provides a suitable :meth:`post()` already) because both of
-    the views implement :meth:`get()`, and things would get much more
+    We use :class:`~django.views.generic.edit.FormMixin` and implement
+    ``post()`` ourselves rather than try to mix :class:`DetailView` with
+    :class:`FormView` (which provides a suitable ``post()`` already) because
+    both of the views implement ``get()``, and things would get much more
     confusing.
 
 .. highlightlang:: python
 
-Our new :class:`AuthorDetail` looks like this::
+Our new ``AuthorDetail`` looks like this::
 
     # CAUTION: you almost certainly do not want to do this.
     # It is provided as part of a discussion of problems you can
@@ -473,24 +478,24 @@ Our new :class:`AuthorDetail` looks like this::
             # record the interest using the message in form.cleaned_data
             return super(AuthorDetail, self).form_valid(form)
 
-:meth:`get_success_url()` is just providing somewhere to redirect to,
+``get_success_url()`` is just providing somewhere to redirect to,
 which gets used in the default implementation of
-:meth:`form_valid()`. We have to provide our own :meth:`post()` as
-noted earlier, and override :meth:`get_context_data()` to make the
-:class:`Form` available in the context data.
+``form_valid()``. We have to provide our own ``post()`` as
+noted earlier, and override ``get_context_data()`` to make the
+:class:`~django.forms.Form` available in the context data.
 
 A better solution
 -----------------
 
 It should be obvious that the number of subtle interactions between
-:class:`FormMixin` and :class:`DetailView` is already testing our
-ability to manage things. It's unlikely you'd want to write this kind
-of class yourself.
+:class:`~django.views.generic.edit.FormMixin` and :class:`DetailView` is
+already testing our ability to manage things. It's unlikely you'd want to
+write this kind of class yourself.
 
-In this case, it would be fairly easy to just write the :meth:`post()`
+In this case, it would be fairly easy to just write the ``post()``
 method yourself, keeping :class:`DetailView` as the only generic
-functionality, although writing :class:`Form` handling code involves a
-lot of duplication.
+functionality, although writing :class:`~django.forms.Form` handling code
+involves a lot of duplication.
 
 Alternatively, it would still be easier than the above approach to
 have a separate view for processing the form, which could use
@@ -503,15 +508,15 @@ An alternative better solution
 What we're really trying to do here is to use two different class
 based views from the same URL. So why not do just that? We have a very
 clear division here: ``GET`` requests should get the
-:class:`DetailView` (with the :class:`Form` added to the context
+:class:`DetailView` (with the :class:`~django.forms.Form` added to the context
 data), and ``POST`` requests should get the :class:`FormView`. Let's
 set up those views first.
 
-The :class:`AuthorDisplay` view is almost the same as :ref:`when we
+The ``AuthorDisplay`` view is almost the same as :ref:`when we
 first introduced AuthorDetail<generic-views-extra-work>`; we have to
-write our own :meth:`get_context_data()` to make the
-:class:`AuthorInterestForm` available to the template. We'll skip the
-:meth:`get_object()` override from before for clarity.
+write our own ``get_context_data()`` to make the
+``AuthorInterestForm`` available to the template. We'll skip the
+``get_object()`` override from before for clarity.
 
 .. code-block:: python
 
@@ -533,11 +538,11 @@ write our own :meth:`get_context_data()` to make the
             context.update(kwargs)
             return super(AuthorDisplay, self).get_context_data(**context)
 
-Then the :class:`AuthorInterest` is a simple :class:`FormView`, but we
-have to bring in :class:`SingleObjectMixin` so we can find the author
-we're talking about, and we have to remember to set
-:attr:`template_name` to ensure that form errors will render the same
-template as :class:`AuthorDisplay` is using on ``GET``.
+Then the ``AuthorInterest`` is a simple :class:`FormView`, but we
+have to bring in :class:`~django.views.generic.detail.SingleObjectMixin` so we
+can find the author we're talking about, and we have to remember to set
+``template_name`` to ensure that form errors will render the same
+template as ``AuthorDisplay`` is using on ``GET``.
 
 .. code-block:: python
 
@@ -568,15 +573,15 @@ template as :class:`AuthorDisplay` is using on ``GET``.
             # record the interest using the message in form.cleaned_data
             return super(AuthorInterest, self).form_valid(form)
 
-Finally we bring this together in a new :class:`AuthorDetail` view. We
-already know that calling :meth:`as_view()` on a class-based view
-gives us something that behaves exactly like a function based view, so
-we can do that at the point we choose between the two subviews.
+Finally we bring this together in a new ``AuthorDetail`` view. We
+already know that calling :meth:`~django.views.generic.base.View.as_view()` on
+a class-based view gives us something that behaves exactly like a function
+based view, so we can do that at the point we choose between the two subviews.
 
-You can of course pass through keyword arguments to :meth:`as_view()`
-in the same way you would in your URLconf, such as if you wanted the
-:class:`AuthorInterest` behaviour to also appear at another URL but
-using a different template.
+You can of course pass through keyword arguments to
+:meth:`~django.views.generic.base.View.as_view()` in the same way you
+would in your URLconf, such as if you wanted the ``AuthorInterest`` behavior
+to also appear at another URL but using a different template.
 
 .. code-block:: python
 
@@ -647,8 +652,8 @@ Now we mix this into the base TemplateView::
 
 Equally we could use our mixin with one of the generic views. We can make our
 own version of :class:`~django.views.generic.detail.DetailView` by mixing
-:class:`JSONResponseMixin` with the
-:class:`~django.views.generic.detail.BaseDetailView` -- (the
+``JSONResponseMixin`` with the
+``django.views.generic.detail.BaseDetailView`` -- (the
 :class:`~django.views.generic.detail.DetailView` before template
 rendering behavior has been mixed in)::
 
@@ -663,11 +668,12 @@ If you want to be really adventurous, you could even mix a
 :class:`~django.views.generic.detail.DetailView` subclass that is able
 to return *both* HTML and JSON content, depending on some property of
 the HTTP request, such as a query argument or a HTTP header. Just mix
-in both the :class:`JSONResponseMixin` and a
+in both the ``JSONResponseMixin`` and a
 :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`,
-and override the implementation of :func:`render_to_response()` to defer
-to the appropriate subclass depending on the type of response that the user
-requested::
+and override the implementation of
+:func:`~django.views.generic.base.TemplateResponseMixin.render_to_response()`
+to defer to the appropriate subclass depending on the type of response that the
+user requested::
 
     class HybridDetailView(JSONResponseMixin, SingleObjectTemplateResponseMixin, BaseDetailView):
         def render_to_response(self, context):
@@ -679,5 +685,5 @@ requested::
 
 Because of the way that Python resolves method overloading, the local
 ``render_to_response()`` implementation will override the versions provided by
-:class:`JSONResponseMixin` and
+``JSONResponseMixin`` and
 :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`.
diff --git a/docs/topics/conditional-view-processing.txt b/docs/topics/conditional-view-processing.txt
index 1979e89c31..caa7376189 100644
--- a/docs/topics/conditional-view-processing.txt
+++ b/docs/topics/conditional-view-processing.txt
@@ -27,7 +27,7 @@ instead of a full response, telling the client that nothing has changed.
 When you need more fine-grained control you may use per-view conditional
 processing functions.
 
-.. conditional-decorators:
+.. _conditional-decorators:
 
 The ``condition`` decorator
 ===========================
diff --git a/docs/topics/db/aggregation.txt b/docs/topics/db/aggregation.txt
index 3a4d287864..125cd0bdee 100644
--- a/docs/topics/db/aggregation.txt
+++ b/docs/topics/db/aggregation.txt
@@ -21,14 +21,12 @@ used to track the inventory for a series of online bookstores:
     class Author(models.Model):
        name = models.CharField(max_length=100)
        age = models.IntegerField()
-       friends = models.ManyToManyField('self', blank=True)
 
     class Publisher(models.Model):
        name = models.CharField(max_length=300)
        num_awards = models.IntegerField()
 
     class Book(models.Model):
-       isbn = models.CharField(max_length=9)
        name = models.CharField(max_length=300)
        pages = models.IntegerField()
        price = models.DecimalField(max_digits=10, decimal_places=2)
@@ -40,11 +38,14 @@ used to track the inventory for a series of online bookstores:
     class Store(models.Model):
        name = models.CharField(max_length=300)
        books = models.ManyToManyField(Book)
+       registered_users = models.PositiveIntegerField()
 
 Cheat sheet
 ===========
 
-In a hurry? Here's how to do common aggregate queries, assuming the models above::
+In a hurry? Here's how to do common aggregate queries, assuming the models above:
+
+.. code-block:: python
 
     # Total number of books.
     >>> Book.objects.count()
@@ -64,6 +65,9 @@ In a hurry? Here's how to do common aggregate queries, assuming the models above
     >>> Book.objects.all().aggregate(Max('price'))
     {'price__max': Decimal('81.20')}
 
+    # All the following queries involve traversing the Book<->Publisher
+    # many-to-many relationship backward
+
     # Each publisher, each with a count of books as a "num_books" attribute.
     >>> from django.db.models import Count
     >>> pubs = Publisher.objects.annotate(num_books=Count('book'))
@@ -73,7 +77,6 @@ In a hurry? Here's how to do common aggregate queries, assuming the models above
     73
 
     # The top 5 publishers, in order by number of books.
-    >>> from django.db.models import Count
     >>> pubs = Publisher.objects.annotate(num_books=Count('book')).order_by('-num_books')[:5]
     >>> pubs[0].num_books
     1323
@@ -139,8 +142,10 @@ will be annotated with the specified values.
 
 The syntax for these annotations is identical to that used for the
 ``aggregate()`` clause. Each argument to ``annotate()`` describes an
-aggregate that is to be calculated. For example, to annotate Books with
-the number of authors::
+aggregate that is to be calculated. For example, to annotate books with
+the number of authors:
+
+.. code-block:: python
 
     # Build an annotated queryset
     >>> q = Book.objects.annotate(Count('authors'))
@@ -169,7 +174,7 @@ specify the annotation::
 Unlike ``aggregate()``, ``annotate()`` is *not* a terminal clause. The output
 of the ``annotate()`` clause is a ``QuerySet``; this ``QuerySet`` can be
 modified using any other ``QuerySet`` operation, including ``filter()``,
-``order_by``, or even additional calls to ``annotate()``.
+``order_by()``, or even additional calls to ``annotate()``.
 
 Joins and aggregates
 ====================
@@ -189,8 +194,8 @@ you could use the annotation::
 
     >>> Store.objects.annotate(min_price=Min('books__price'), max_price=Max('books__price'))
 
-This tells Django to retrieve the Store model, join (through the
-many-to-many relationship) with the Book model, and aggregate on the
+This tells Django to retrieve the ``Store`` model, join (through the
+many-to-many relationship) with the ``Book`` model, and aggregate on the
 price field of the book model to produce a minimum and maximum value.
 
 The same rules apply to the ``aggregate()`` clause. If you wanted to
@@ -205,6 +210,50 @@ issue the query::
 
     >>> Store.objects.aggregate(youngest_age=Min('books__authors__age'))
 
+Following relationships backwards
+---------------------------------
+
+In a way similar to :ref:`lookups-that-span-relationships`, aggregations and
+annotations on fields of models or models that are related to the one you are
+querying can include traversing "reverse" relationships. The lowercase name
+of related models and double-underscores are used here too.
+
+For example, we can ask for all publishers, annotated with their respective
+total book stock counters (note how we use ``'book'`` to specify the
+``Publisher`` -> ``Book`` reverse foreign key hop)::
+
+    >>> from django.db.models import Count, Min, Sum, Max, Avg
+    >>> Publisher.objects.annotate(Count('book'))
+
+(Every ``Publisher`` in the resulting ``QuerySet`` will have an extra attribute
+called ``book__count``.)
+
+We can also ask for the oldest book of any of those managed by every publisher::
+
+    >>> Publisher.objects.aggregate(oldest_pubdate=Min('book__pubdate'))
+
+(The resulting dictionary will have a key called ``'oldest_pubdate'``. If no
+such alias were specified, it would be the rather long ``'book__pubdate__min'``.)
+
+This doesn't apply just to foreign keys. It also works with many-to-many
+relations. For example, we can ask for every author, annotated with the total
+number of pages considering all the books he/she has (co-)authored (note how we
+use ``'book'`` to specify the ``Author`` -> ``Book`` reverse many-to-many hop)::
+
+    >>> Author.objects.annotate(total_pages=Sum('book__pages'))
+
+(Every ``Author`` in the resulting ``QuerySet`` will have an extra attribute
+called ``total_pages``. If no such alias were specified, it would be the rather
+long ``book__pages__sum``.)
+
+Or ask for the average rating of all the books written by author(s) we have on
+file::
+
+    >>> Author.objects.aggregate(average_rating=Avg('book__rating'))
+
+(The resulting dictionary will have a key called ``'average__rating'``. If no
+such alias were specified, it would be the rather long ``'book__rating__avg'``.)
+
 Aggregations and other QuerySet clauses
 =======================================
 
@@ -263,7 +312,7 @@ and the query::
 
     >>> Publisher.objects.filter(book__rating__gt=3.0).annotate(num_books=Count('book'))
 
-Both queries will return a list of Publishers that have at least one good
+Both queries will return a list of publishers that have at least one good
 book (i.e., a book with a rating exceeding 3.0). However, the annotation in
 the first query will provide the total number of all books published by the
 publisher; the second query will only include good books in the annotated
diff --git a/docs/topics/db/examples/many_to_many.txt b/docs/topics/db/examples/many_to_many.txt
index 5a24027894..2076427768 100644
--- a/docs/topics/db/examples/many_to_many.txt
+++ b/docs/topics/db/examples/many_to_many.txt
@@ -35,7 +35,7 @@ objects, and a ``Publication`` has multiple ``Article`` objects:
 What follows are examples of operations that can be performed using the Python
 API facilities.
 
-Create a couple of Publications::
+Create a couple of ``Publications``::
 
     >>> p1 = Publication(title='The Python Journal')
     >>> p1.save()
@@ -44,11 +44,11 @@ Create a couple of Publications::
     >>> p3 = Publication(title='Science Weekly')
     >>> p3.save()
 
-Create an Article::
+Create an ``Article``::
 
     >>> a1 = Article(headline='Django lets you build Web apps easily')
 
-You can't associate it with a Publication until it's been saved::
+You can't associate it with a ``Publication`` until it's been saved::
 
     >>> a1.publications.add(p1)
     Traceback (most recent call last):
@@ -60,11 +60,11 @@ Save it!
 
     >>> a1.save()
 
-Associate the Article with a Publication::
+Associate the ``Article`` with a ``Publication``::
 
     >>> a1.publications.add(p1)
 
-Create another Article, and set it to appear in both Publications::
+Create another ``Article``, and set it to appear in both ``Publications``::
 
     >>> a2 = Article(headline='NASA uses Python')
     >>> a2.save()
@@ -75,25 +75,26 @@ Adding a second time is OK::
 
     >>> a2.publications.add(p3)
 
-Adding an object of the wrong type raises TypeError::
+Adding an object of the wrong type raises :exc:`~exceptions.TypeError`::
 
     >>> a2.publications.add(a1)
     Traceback (most recent call last):
     ...
     TypeError: 'Publication' instance expected
 
-Add a Publication directly via publications.add by using keyword arguments::
+Create and add a ``Publication`` to an ``Article`` in one step using
+:meth:`~django.db.models.fields.related.RelatedManager.create`::
 
     >>> new_publication = a2.publications.create(title='Highlights for Children')
 
-Article objects have access to their related Publication objects::
+``Article`` objects have access to their related ``Publication`` objects::
 
     >>> a1.publications.all()
     [<Publication: The Python Journal>]
     >>> a2.publications.all()
     [<Publication: Highlights for Children>, <Publication: Science News>, <Publication: Science Weekly>, <Publication: The Python Journal>]
 
-Publication objects have access to their related Article objects::
+``Publication`` objects have access to their related ``Article`` objects::
 
     >>> p2.article_set.all()
     [<Article: NASA uses Python>]
@@ -102,7 +103,8 @@ Publication objects have access to their related Article objects::
     >>> Publication.objects.get(id=4).article_set.all()
     [<Article: NASA uses Python>]
 
-Many-to-many relationships can be queried using :ref:`lookups across relationships <lookups-that-span-relationships>`::
+Many-to-many relationships can be queried using :ref:`lookups across
+relationships <lookups-that-span-relationships>`::
 
     >>> Article.objects.filter(publications__id__exact=1)
     [<Article: Django lets you build Web apps easily>, <Article: NASA uses Python>]
@@ -119,7 +121,8 @@ Many-to-many relationships can be queried using :ref:`lookups across relationshi
     >>> Article.objects.filter(publications__title__startswith="Science").distinct()
     [<Article: NASA uses Python>]
 
-The count() function respects distinct() as well::
+The :meth:`~django.db.models.query.QuerySet.count` function respects
+:meth:`~django.db.models.query.QuerySet.distinct` as well::
 
     >>> Article.objects.filter(publications__title__startswith="Science").count()
     2
@@ -133,7 +136,7 @@ The count() function respects distinct() as well::
     [<Article: Django lets you build Web apps easily>, <Article: NASA uses Python>]
 
 Reverse m2m queries are supported (i.e., starting at the table that doesn't have
-a ManyToManyField)::
+a :class:`~django.db.models.ManyToManyField`)::
 
     >>> Publication.objects.filter(id__exact=1)
     [<Publication: The Python Journal>]
@@ -163,7 +166,7 @@ involved is a little complex)::
     >>> Article.objects.exclude(publications=p2)
     [<Article: Django lets you build Web apps easily>]
 
-If we delete a Publication, its Articles won't be able to access it::
+If we delete a ``Publication``, its ``Articles`` won't be able to access it::
 
     >>> p1.delete()
     >>> Publication.objects.all()
@@ -172,7 +175,7 @@ If we delete a Publication, its Articles won't be able to access it::
     >>> a1.publications.all()
     []
 
-If we delete an Article, its Publications won't be able to access it::
+If we delete an ``Article``, its ``Publications`` won't be able to access it::
 
     >>> a2.delete()
     >>> Article.objects.all()
@@ -199,7 +202,7 @@ Adding via the other end using keywords::
     >>> a5.publications.all()
     [<Publication: Science News>]
 
-Removing publication from an article::
+Removing ``Publication`` from an ``Article``::
 
     >>> a4.publications.remove(p2)
     >>> p2.article_set.all()
@@ -242,7 +245,7 @@ And you can clear from the other end::
     >>> p2.article_set.all()
     [<Article: Oxygen-free diet works wonders>]
 
-Recreate the article and Publication we have deleted::
+Recreate the ``Article`` and ``Publication`` we have deleted::
 
     >>> p1 = Publication(title='The Python Journal')
     >>> p1.save()
@@ -250,7 +253,8 @@ Recreate the article and Publication we have deleted::
     >>> a2.save()
     >>> a2.publications.add(p1, p2, p3)
 
-Bulk delete some Publications - references to deleted publications should go::
+Bulk delete some ``Publications`` - references to deleted publications should
+go::
 
     >>> Publication.objects.filter(title__startswith='Science').delete()
     >>> Publication.objects.all()
@@ -267,15 +271,18 @@ Bulk delete some articles - references to deleted objects should go::
     [<Article: Django lets you build Web apps easily>]
     >>> q.delete()
 
-After the delete, the QuerySet cache needs to be cleared, and the referenced
-objects should be gone::
+After the :meth:`~django.db.models.query.QuerySet.delete`, the
+:class:`~django.db.models.query.QuerySet` cache needs to be cleared, and the
+referenced objects should be gone::
 
     >>> print(q)
     []
     >>> p1.article_set.all()
     [<Article: NASA uses Python>]
 
-An alternate to calling clear() is to assign the empty set::
+An alternate to calling
+:meth:`~django.db.models.fields.related.RelatedManager.clear` is to assign the
+empty set::
 
     >>> p1.article_set = []
     >>> p1.article_set.all()
diff --git a/docs/topics/db/examples/one_to_one.txt b/docs/topics/db/examples/one_to_one.txt
index 4c8e0ecfcc..09634c84c7 100644
--- a/docs/topics/db/examples/one_to_one.txt
+++ b/docs/topics/db/examples/one_to_one.txt
@@ -10,7 +10,7 @@ In this example, a ``Place`` optionally can be a ``Restaurant``:
 
 .. code-block:: python
 
-    from django.db import models, transaction, IntegrityError
+    from django.db import models
 
     class Place(models.Model):
         name = models.CharField(max_length=50)
diff --git a/docs/topics/db/managers.txt b/docs/topics/db/managers.txt
index a14616a17c..56bdd16e84 100644
--- a/docs/topics/db/managers.txt
+++ b/docs/topics/db/managers.txt
@@ -70,8 +70,8 @@ returns a list of all ``OpinionPoll`` objects, each with an extra
                 SELECT p.id, p.question, p.poll_date, COUNT(*)
                 FROM polls_opinionpoll p, polls_response r
                 WHERE p.id = r.poll_id
-                GROUP BY 1, 2, 3
-                ORDER BY 3 DESC""")
+                GROUP BY p.id, p.question, p.poll_date
+                ORDER BY p.poll_date DESC""")
             result_list = []
             for row in cursor.fetchall():
                 p = self.model(id=row[0], question=row[1], poll_date=row[2])
@@ -85,7 +85,7 @@ returns a list of all ``OpinionPoll`` objects, each with an extra
         objects = PollManager()
 
     class Response(models.Model):
-        poll = models.ForeignKey(Poll)
+        poll = models.ForeignKey(OpinionPoll)
         person_name = models.CharField(max_length=50)
         response = models.TextField()
 
@@ -108,7 +108,7 @@ example, using this model::
 ...the statement ``Book.objects.all()`` will return all books in the database.
 
 You can override a ``Manager``\'s base ``QuerySet`` by overriding the
-``Manager.get_query_set()`` method. ``get_query_set()`` should return a
+``Manager.get_queryset()`` method. ``get_queryset()`` should return a
 ``QuerySet`` with the properties you require.
 
 For example, the following model has *two* ``Manager``\s -- one that returns
@@ -116,8 +116,8 @@ all objects, and one that returns only the books by Roald Dahl::
 
     # First, define the Manager subclass.
     class DahlBookManager(models.Manager):
-        def get_query_set(self):
-            return super(DahlBookManager, self).get_query_set().filter(author='Roald Dahl')
+        def get_queryset(self):
+            return super(DahlBookManager, self).get_queryset().filter(author='Roald Dahl')
 
     # Then hook it into the Book model explicitly.
     class Book(models.Model):
@@ -131,7 +131,7 @@ With this sample model, ``Book.objects.all()`` will return all books in the
 database, but ``Book.dahl_objects.all()`` will only return the ones written by
 Roald Dahl.
 
-Of course, because ``get_query_set()`` returns a ``QuerySet`` object, you can
+Of course, because ``get_queryset()`` returns a ``QuerySet`` object, you can
 use ``filter()``, ``exclude()`` and all the other ``QuerySet`` methods on it.
 So these statements are all legal::
 
@@ -147,12 +147,12 @@ models.
 For example::
 
     class MaleManager(models.Manager):
-        def get_query_set(self):
-            return super(MaleManager, self).get_query_set().filter(sex='M')
+        def get_queryset(self):
+            return super(MaleManager, self).get_queryset().filter(sex='M')
 
     class FemaleManager(models.Manager):
-        def get_query_set(self):
-            return super(FemaleManager, self).get_query_set().filter(sex='F')
+        def get_queryset(self):
+            return super(FemaleManager, self).get_queryset().filter(sex='F')
 
     class Person(models.Model):
         first_name = models.CharField(max_length=50)
@@ -172,9 +172,12 @@ the "default" ``Manager``, and several parts of Django
 (including :djadmin:`dumpdata`) will use that ``Manager``
 exclusively for that model. As a result, it's a good idea to be careful in
 your choice of default manager in order to avoid a situation where overriding
-``get_query_set()`` results in an inability to retrieve objects you'd like to
+``get_queryset()`` results in an inability to retrieve objects you'd like to
 work with.
 
+.. versionchanged:: 1.6
+    The ``get_queryset`` method was previously named ``get_query_set``.
+
 .. _managers-for-related-objects:
 
 Using managers for related object access
@@ -188,7 +191,7 @@ by the default manager.
 
 If the normal plain manager class (:class:`django.db.models.Manager`) is not
 appropriate for your circumstances, you can force Django to use the same class
-as the default manager for your model by setting the `use_for_related_fields`
+as the default manager for your model by setting the ``use_for_related_fields``
 attribute on the manager class. This is documented fully below_.
 
 .. _below: manager-types_
@@ -366,7 +369,7 @@ it will use :class:`django.db.models.Manager`.
 Writing correct Managers for use in automatic Manager instances
 ---------------------------------------------------------------
 
-As already suggested by the `django.contrib.gis` example, above, the
+As already suggested by the :mod:`django.contrib.gis` example, above, the
 ``use_for_related_fields`` feature is primarily for managers that need to
 return a custom ``QuerySet`` subclass. In providing this functionality in your
 manager, there are a couple of things to remember.
@@ -379,9 +382,9 @@ to from some other model. In those situations, Django has to be able to see
 all the objects for the model it is fetching, so that *anything* which is
 referred to can be retrieved.
 
-If you override the ``get_query_set()`` method and filter out any rows, Django
+If you override the ``get_queryset()`` method and filter out any rows, Django
 will return incorrect results. Don't do that. A manager that filters results
-in ``get_query_set()`` is not appropriate for use as an automatic manager.
+in ``get_queryset()`` is not appropriate for use as an automatic manager.
 
 Set ``use_for_related_fields`` when you define the class
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -410,4 +413,3 @@ used in a model, since the attribute's value is processed when the model class
 is created and not subsequently reread. Set the attribute on the manager class
 when it is first defined, as in the initial example of this section and
 everything will work smoothly.
-
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
index 2f1676ac1a..dd7714052d 100644
--- a/docs/topics/db/models.txt
+++ b/docs/topics/db/models.txt
@@ -66,13 +66,13 @@ those models. Do this by editing your settings file and changing the
 your ``models.py``.
 
 For example, if the models for your application live in the module
-``mysite.myapp.models`` (the package structure that is created for an
+``myapp.models`` (the package structure that is created for an
 application by the :djadmin:`manage.py startapp <startapp>` script),
 :setting:`INSTALLED_APPS` should read, in part::
 
     INSTALLED_APPS = (
         #...
-        'mysite.myapp',
+        'myapp',
         #...
     )
 
@@ -660,15 +660,13 @@ model.
 
 For example, this model has a few custom methods::
 
-    from django.contrib.localflavor.us.models import USStateField
-
     class Person(models.Model):
         first_name = models.CharField(max_length=50)
         last_name = models.CharField(max_length=50)
         birth_date = models.DateField()
         address = models.CharField(max_length=100)
         city = models.CharField(max_length=50)
-        state = USStateField() # Yes, this is America-centric...
+        state = models.CharField(max_length=2)      # yes, this is America-centric
 
         def baby_boomer_status(self):
             "Returns the person's baby-boomer status."
@@ -1063,52 +1061,46 @@ Proxy models are declared like normal models. You tell Django that it's a
 proxy model by setting the :attr:`~django.db.models.Options.proxy` attribute of
 the ``Meta`` class to ``True``.
 
-For example, suppose you want to add a method to the standard
-:class:`~django.contrib.auth.models.User` model that will be used in your
-templates. You can do it like this::
+For example, suppose you want to add a method to the ``Person`` model described
+above. You can do it like this::
 
-    from django.contrib.auth.models import User
-
-    class MyUser(User):
+    class MyPerson(Person):
         class Meta:
             proxy = True
 
         def do_something(self):
             ...
 
-The ``MyUser`` class operates on the same database table as its parent
-:class:`~django.contrib.auth.models.User` class. In particular, any new
-instances of :class:`~django.contrib.auth.models.User` will also be accessible
-through ``MyUser``, and vice-versa::
+The ``MyPerson`` class operates on the same database table as its parent
+``Person`` class. In particular, any new instances of ``Person`` will also be
+accessible through ``MyPerson``, and vice-versa::
 
-    >>> u = User.objects.create(username="foobar")
-    >>> MyUser.objects.get(username="foobar")
-    <MyUser: foobar>
+    >>> p = Person.objects.create(first_name="foobar")
+    >>> MyPerson.objects.get(first_name="foobar")
+    <MyPerson: foobar>
 
-You could also use a proxy model to define a different default ordering on a
-model. The standard :class:`~django.contrib.auth.models.User` model has no
-ordering defined on it (intentionally; sorting is expensive and we don't want
-to do it all the time when we fetch users). You might want to regularly order
-by the ``username`` attribute when you use the proxy. This is easy::
+You could also use a proxy model to define a different default ordering on
+a model. You might not always want to order the ``Person`` model, but regularly
+order by the ``last_name`` attribute when you use the proxy. This is easy::
 
-    class OrderedUser(User):
+    class OrderedPerson(Person):
         class Meta:
-            ordering = ["username"]
+            ordering = ["last_name"]
             proxy = True
 
-Now normal :class:`~django.contrib.auth.models.User` queries will be unordered
-and ``OrderedUser`` queries will be ordered by ``username``.
+Now normal ``Person`` queries will be unordered
+and ``OrderedPerson`` queries will be ordered by ``last_name``.
 
 QuerySets still return the model that was requested
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-There is no way to have Django return, say, a ``MyUser`` object whenever you
-query for :class:`~django.contrib.auth.models.User` objects. A queryset for
-``User`` objects will return those types of objects. The whole point of proxy
-objects is that code relying on the original ``User`` will use those and your
-own code can use the extensions you included (that no other code is relying on
-anyway). It is not a way to replace the ``User`` (or any other) model
-everywhere with something of your own creation.
+There is no way to have Django return, say, a ``MyPerson`` object whenever you
+query for ``Person`` objects. A queryset for ``Person`` objects will return
+those types of objects. The whole point of proxy objects is that code relying
+on the original ``Person`` will use those and your own code can use the
+extensions you included (that no other code is relying on anyway). It is not
+a way to replace the ``Person`` (or any other) model everywhere with something
+of your own creation.
 
 Base class restrictions
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -1131,12 +1123,12 @@ it will become the default, although any managers defined on the parent
 classes will still be available.
 
 Continuing our example from above, you could change the default manager used
-when you query the ``User`` model like this::
+when you query the ``Person`` model like this::
 
     class NewManager(models.Manager):
         ...
 
-    class MyUser(User):
+    class MyPerson(Person):
         objects = NewManager()
 
         class Meta:
@@ -1154,7 +1146,7 @@ containing the new managers and inherit that after the primary base class::
         class Meta:
             abstract = True
 
-    class MyUser(User, ExtraManagers):
+    class MyPerson(Person, ExtraManagers):
         class Meta:
             proxy = True
 
diff --git a/docs/topics/db/multi-db.txt b/docs/topics/db/multi-db.txt
index 8a02305376..182099cc3a 100644
--- a/docs/topics/db/multi-db.txt
+++ b/docs/topics/db/multi-db.txt
@@ -20,9 +20,7 @@ documentation.
 
 Databases can have any alias you choose. However, the alias
 ``default`` has special significance. Django uses the database with
-the alias of ``default`` when no other database has been selected. If
-you don't have a ``default`` database, you need to be careful to
-always specify the database that you want to use.
+the alias of ``default`` when no other database has been selected.
 
 The following is an example ``settings.py`` snippet defining two
 databases -- a default PostgreSQL database and a MySQL database called
@@ -45,6 +43,29 @@ databases -- a default PostgreSQL database and a MySQL database called
         }
     }
 
+If the concept of a ``default`` database doesn't make sense in the context
+of your project, you need to be careful to always specify the database
+that you want to use. Django requires that a ``default`` database entry
+be defined, but the parameters dictionary can be left blank if it will not be
+used. The following is an example ``settings.py`` snippet defining two
+non-default databases, with the ``default`` entry intentionally left empty::
+
+    DATABASES = {
+        'default': {},
+        'users': {
+            'NAME': 'user_data',
+            'ENGINE': 'django.db.backends.mysql',
+            'USER': 'mysql_user',
+            'PASSWORD': 'superS3cret'
+        },
+        'customers': {
+            'NAME': 'customer_data',
+            'ENGINE': 'django.db.backends.mysql',
+            'USER': 'mysql_cust',
+            'PASSWORD': 'veryPriv@ate'
+        }
+    }
+
 If you attempt to access a database that you haven't defined in your
 :setting:`DATABASES` setting, Django will raise a
 ``django.db.utils.ConnectionDoesNotExist`` exception.
@@ -303,7 +324,7 @@ from::
             in the master/slave pool.
             """
             db_list = ('master', 'slave1', 'slave2')
-            if obj1.state.db in db_list and obj2.state.db in db_list:
+            if obj1._state.db in db_list and obj2._state.db in db_list:
                 return True
             return None
 
@@ -485,19 +506,19 @@ solution is to use ``db_manager()``, like this::
 
 ``db_manager()`` returns a copy of the manager bound to the database you specify.
 
-Using ``get_query_set()`` with multiple databases
+Using ``get_queryset()`` with multiple databases
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If you're overriding ``get_query_set()`` on your manager, be sure to
+If you're overriding ``get_queryset()`` on your manager, be sure to
 either call the method on the parent (using ``super()``) or do the
 appropriate handling of the ``_db`` attribute on the manager (a string
 containing the name of the database to use).
 
 For example, if you want to return a custom ``QuerySet`` class from
-the ``get_query_set`` method, you could do this::
+the ``get_queryset`` method, you could do this::
 
     class MyManager(models.Manager):
-        def get_query_set(self):
+        def get_queryset(self):
             qs = CustomQuerySet(self.model)
             if self._db is not None:
                 qs = qs.using(self._db)
@@ -527,9 +548,9 @@ multiple-database support::
             # Tell Django to delete objects from the 'other' database
             obj.delete(using=self.using)
 
-        def queryset(self, request):
+        def get_queryset(self, request):
             # Tell Django to look for objects on the 'other' database.
-            return super(MultiDBModelAdmin, self).queryset(request).using(self.using)
+            return super(MultiDBModelAdmin, self).get_queryset(request).using(self.using)
 
         def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
             # Tell Django to populate ForeignKey widgets using a query
@@ -552,9 +573,9 @@ Inlines can be handled in a similar fashion. They require three customized metho
     class MultiDBTabularInline(admin.TabularInline):
         using = 'other'
 
-        def queryset(self, request):
+        def get_queryset(self, request):
             # Tell Django to look for inline objects on the 'other' database.
-            return super(MultiDBTabularInline, self).queryset(request).using(self.using)
+            return super(MultiDBTabularInline, self).get_queryset(request).using(self.using)
 
         def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
             # Tell Django to populate ForeignKey widgets using a query
diff --git a/docs/topics/db/optimization.txt b/docs/topics/db/optimization.txt
index b5cca52e23..c1459ae247 100644
--- a/docs/topics/db/optimization.txt
+++ b/docs/topics/db/optimization.txt
@@ -157,7 +157,7 @@ Doing the following is potentially quite slow:
 
   >>> entry = Entry.objects.get(headline__startswith="News")
 
-First of all, `headline` is not indexed, which will make the underlying
+First of all, ``headline`` is not indexed, which will make the underlying
 database fetch slower.
 
 Second, the lookup doesn't guarantee that only one object will be returned.
diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt
index 90c06ac66a..f19302974d 100644
--- a/docs/topics/db/queries.txt
+++ b/docs/topics/db/queries.txt
@@ -163,10 +163,9 @@ default. Access it directly via the model class, like so::
     "record-level" operations.
 
 The :class:`~django.db.models.Manager` is the main source of ``QuerySets`` for
-a model. It acts as a "root" :class:`~django.db.models.query.QuerySet` that
-describes all objects in the model's database table. For example,
-``Blog.objects`` is the initial :class:`~django.db.models.query.QuerySet` that
-contains all ``Blog`` objects in the database.
+a model. For example, ``Blog.objects.all()`` returns a
+:class:`~django.db.models.query.QuerySet` that contains all ``Blog`` objects in
+the database.
 
 Retrieving all objects
 ----------------------
@@ -180,20 +179,13 @@ this, use the :meth:`~django.db.models.query.QuerySet.all` method on a
 The :meth:`~django.db.models.query.QuerySet.all` method returns a
 :class:`~django.db.models.query.QuerySet` of all the objects in the database.
 
-(If ``Entry.objects`` is a :class:`~django.db.models.query.QuerySet`, why can't
-we just do ``Entry.objects``?  That's because ``Entry.objects``, the root
-:class:`~django.db.models.query.QuerySet`, is a special case that cannot be
-evaluated. The :meth:`~django.db.models.query.QuerySet.all` method returns a
-:class:`~django.db.models.query.QuerySet` that *can* be evaluated.)
-
-
 Retrieving specific objects with filters
 ----------------------------------------
 
-The root :class:`~django.db.models.query.QuerySet` provided by the
-:class:`~django.db.models.Manager` describes all objects in the database
-table. Usually, though, you'll need to select only a subset of the complete set
-of objects.
+The :class:`~django.db.models.query.QuerySet` returned by
+:meth:`~django.db.models.query.QuerySet.all` describes all objects in the
+database table. Usually, though, you'll need to select only a subset of the
+complete set of objects.
 
 To create such a subset, you refine the initial
 :class:`~django.db.models.query.QuerySet`, adding filter conditions. The two
@@ -216,10 +208,9 @@ so::
 
     Entry.objects.filter(pub_date__year=2006)
 
-We don't have to add an :meth:`~django.db.models.query.QuerySet.all` --
-``Entry.objects.all().filter(...)``. That would still work, but you only need
-:meth:`~django.db.models.query.QuerySet.all` when you want all objects from the
-root :class:`~django.db.models.query.QuerySet`.
+With the default manager class, it is the same as::
+
+    Entry.objects.all().filter(pub_date__year=2006)
 
 .. _chaining-filters:
 
@@ -306,8 +297,8 @@ the query - in this case, it will be a
 :class:`~django.db.models.query.QuerySet` containing a single element.
 
 If you know there is only one object that matches your query, you can use the
-:meth:`~django.db.models.query.QuerySet.get` method on a `Manager` which
-returns the object directly::
+:meth:`~django.db.models.query.QuerySet.get` method on a
+:class:`~django.db.models.Manager` which returns the object directly::
 
     >>> one_entry = Entry.objects.get(pk=1)
 
@@ -327,8 +318,8 @@ a primary key of 1, Django will raise ``Entry.DoesNotExist``.
 
 Similarly, Django will complain if more than one item matches the
 :meth:`~django.db.models.query.QuerySet.get` query. In this case, it will raise
-``MultipleObjectsReturned``, which again is an attribute of the model class
-itself.
+:exc:`~django.core.exceptions.MultipleObjectsReturned`, which again is an
+attribute of the model class itself.
 
 
 Other QuerySet methods
@@ -412,14 +403,13 @@ translates (roughly) into the following SQL::
 
    .. _`Keyword Arguments`: http://docs.python.org/tutorial/controlflow.html#keyword-arguments
 
-.. versionchanged:: 1.4
-    The field specified in a lookup has to be the name of a model field.
-    There's one exception though, in case of a
-    :class:`~django.db.models.ForeignKey` you can specify the field
-    name suffixed with ``_id``. In this case, the value parameter is expected
-    to contain the raw value of the foreign model's primary key. For example:
+The field specified in a lookup has to be the name of a model field. There's
+one exception though, in case of a :class:`~django.db.models.ForeignKey` you
+can specify the field name suffixed with ``_id``. In this case, the value
+parameter is expected to contain the raw value of the foreign model's primary
+key. For example:
 
-        >>> Entry.objects.filter(blog_id__exact=4)
+    >>> Entry.objects.filter(blog_id__exact=4)
 
 If you pass an invalid keyword argument, a lookup function will raise
 ``TypeError``.
@@ -601,6 +591,8 @@ relation may end up filtering on different linked objects.
 Filters can reference fields on the model
 -----------------------------------------
 
+.. class:: F
+
 In the examples given so far, we have constructed filters that compare
 the value of a model field with a constant. But what if you want to compare
 the value of a model field with another field on the same model?
@@ -755,6 +747,8 @@ To avoid this problem, simply save the
 Complex lookups with Q objects
 ==============================
 
+.. class:: Q
+
 Keyword argument queries -- in :meth:`~django.db.models.query.QuerySet.filter`,
 etc. -- are "AND"ed together. If you need to execute more complex queries (for
 example, queries with ``OR`` statements), you can use ``Q`` objects.
@@ -830,7 +824,7 @@ precede the definition of any keyword arguments. For example::
     The `OR lookups examples`_ in the Django unit tests show some possible uses
     of ``Q``.
 
-    .. _OR lookups examples: https://github.com/django/django/blob/master/tests/modeltests/or_lookups/tests.py
+    .. _OR lookups examples: https://github.com/django/django/blob/master/tests/or_lookups/tests.py
 
 Comparing objects
 =================
diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
index 310dcb5ae6..34cfa382d3 100644
--- a/docs/topics/db/sql.txt
+++ b/docs/topics/db/sql.txt
@@ -24,9 +24,8 @@ return model instances:
 .. method:: Manager.raw(raw_query, params=None, translations=None)
 
 This method method takes a raw SQL query, executes it, and returns a
-:class:`~django.db.models.query.RawQuerySet` instance. This
-:class:`~django.db.models.query.RawQuerySet` instance can be iterated
-over just like an normal QuerySet to provide object instances.
+``django.db.models.query.RawQuerySet`` instance. This ``RawQuerySet`` instance
+can be iterated over just like an normal QuerySet to provide object instances.
 
 This is best illustrated with an example. Suppose you've got the following model::
 
@@ -156,7 +155,7 @@ of people with their ages calculated by the database::
     Jane is 42.
     ...
 
-__ http://www.postgresql.org/docs/8.4/static/functions-datetime.html
+__ http://www.postgresql.org/docs/current/static/functions-datetime.html
 
 Passing parameters into ``raw()``
 ---------------------------------
@@ -202,31 +201,38 @@ perform queries that don't map cleanly to models, or directly execute
 In these cases, you can always access the database directly, routing around
 the model layer entirely.
 
-The object ``django.db.connection`` represents the
-default database connection, and ``django.db.transaction`` represents the
-default database transaction. To use the database connection, call
-``connection.cursor()`` to get a cursor object. Then, call
-``cursor.execute(sql, [params])`` to execute the SQL and ``cursor.fetchone()``
-or ``cursor.fetchall()`` to return the resulting rows. After performing a data
-changing operation, you should then call
-``transaction.commit_unless_managed()`` to ensure your changes are committed
-to the database. If your query is purely a data retrieval operation, no commit
-is required. For example::
+The object ``django.db.connection`` represents the default database
+connection. To use the database connection, call ``connection.cursor()`` to
+get a cursor object. Then, call ``cursor.execute(sql, [params])`` to execute
+the SQL and ``cursor.fetchone()`` or ``cursor.fetchall()`` to return the
+resulting rows.
+
+For example::
+
+    from django.db import connection
 
     def my_custom_sql():
-        from django.db import connection, transaction
         cursor = connection.cursor()
 
-        # Data modifying operation - commit required
         cursor.execute("UPDATE bar SET foo = 1 WHERE baz = %s", [self.baz])
-        transaction.commit_unless_managed()
 
-        # Data retrieval operation - no commit required
         cursor.execute("SELECT foo FROM bar WHERE baz = %s", [self.baz])
         row = cursor.fetchone()
 
         return row
 
+.. versionchanged:: 1.6
+    In Django 1.5 and earlier, after performing a data changing operation, you
+    had to call ``transaction.commit_unless_managed()`` to ensure your changes
+    were committed to the database. Since Django now defaults to database-level
+    autocommit, this isn't necessary any longer.
+
+Note that if you want to include literal percent signs in the query, you have to
+double them in the case you are passing parameters::
+
+     cursor.execute("SELECT foo FROM bar WHERE baz = '30%'")
+     cursor.execute("SELECT foo FROM bar WHERE baz = '30%%' and id = %s", [self.id])
+
 If you are using :doc:`more than one database </topics/db/multi-db>`, you can
 use ``django.db.connections`` to obtain the connection (and cursor) for a
 specific database. ``django.db.connections`` is a dictionary-like
@@ -236,7 +242,6 @@ alias::
     from django.db import connections
     cursor = connections['my_db_alias'].cursor()
     # Your code here...
-    transaction.commit_unless_managed(using='my_db_alias')
 
 By default, the Python DB API will return results without their field
 names, which means you end up with a ``list`` of values, rather than a
@@ -261,27 +266,18 @@ Here is an example of the difference between the two::
     >>> dictfetchall(cursor)
     [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}]
 
-
-.. _transactions-and-raw-sql:
-
-Transactions and raw SQL
-------------------------
-
-When you make a raw SQL call, Django will automatically mark the
-current transaction as dirty. You must then ensure that the
-transaction containing those calls is closed correctly. See :ref:`the
-notes on the requirements of Django's transaction handling
-<topics-db-transactions-requirements>` for more details.
-
 Connections and cursors
 -----------------------
 
 ``connection`` and ``cursor`` mostly implement the standard Python DB-API
-described in :pep:`249` (except when it comes to :doc:`transaction handling
-</topics/db/transactions>`). If you're not familiar with the Python DB-API, note
-that the SQL statement in ``cursor.execute()`` uses placeholders, ``"%s"``,
-rather than adding parameters directly within the SQL. If you use this
-technique, the underlying database library will automatically add quotes and
-escaping to your parameter(s) as necessary. (Also note that Django expects the
-``"%s"`` placeholder, *not* the ``"?"`` placeholder, which is used by the SQLite
-Python bindings. This is for the sake of consistency and sanity.)
+described in :pep:`249` — except when it comes to :doc:`transaction handling
+</topics/db/transactions>`.
+
+If you're not familiar with the Python DB-API, note that the SQL statement in
+``cursor.execute()`` uses placeholders, ``"%s"``, rather than adding
+parameters directly within the SQL. If you use this technique, the underlying
+database library will automatically escape your parameters as necessary.
+
+Also note that Django expects the ``"%s"`` placeholder, *not* the ``"?"``
+placeholder, which is used by the SQLite Python bindings. This is for the sake
+of consistency and sanity.
diff --git a/docs/topics/db/tablespaces.txt b/docs/topics/db/tablespaces.txt
index 7fcd5588e7..8bf1d07bca 100644
--- a/docs/topics/db/tablespaces.txt
+++ b/docs/topics/db/tablespaces.txt
@@ -68,6 +68,3 @@ PostgreSQL and Oracle support tablespaces. SQLite and MySQL don't.
 
 When you use a backend that lacks support for tablespaces, Django ignores all
 tablespace-related options.
-
-.. versionchanged:: 1.4
-    Since Django 1.4, the PostgreSQL backend supports tablespaces.
diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt
index 65944abb8b..d48365dc9e 100644
--- a/docs/topics/db/transactions.txt
+++ b/docs/topics/db/transactions.txt
@@ -1,289 +1,366 @@
-==============================
-Managing database transactions
-==============================
+=====================
+Database transactions
+=====================
 
 .. module:: django.db.transaction
 
-Django gives you a few ways to control how database transactions are managed,
-if you're using a database that supports transactions.
+Django gives you a few ways to control how database transactions are managed.
+
+Managing database transactions
+==============================
 
 Django's default transaction behavior
-=====================================
+-------------------------------------
 
-Django's default behavior is to run with an open transaction which it
-commits automatically when any built-in, data-altering model function is
-called. For example, if you call ``model.save()`` or ``model.delete()``, the
-change will be committed immediately.
+Django's default behavior is to run in autocommit mode. Each query is
+immediately committed to the database. :ref:`See below for details
+<autocommit-details>`.
 
-This is much like the auto-commit setting for most databases. As soon as you
-perform an action that needs to write to the database, Django produces the
-``INSERT``/``UPDATE``/``DELETE`` statements and then does the ``COMMIT``.
-There's no implicit ``ROLLBACK``.
+Django uses transactions or savepoints automatically to guarantee the
+integrity of ORM operations that require multiple queries, especially
+:ref:`delete() <topics-db-queries-delete>` and :ref:`update()
+<topics-db-queries-update>` queries.
+
+.. versionchanged:: 1.6
+    Previous version of Django featured :ref:`a more complicated default
+    behavior <transactions-upgrading-from-1.5>`.
+
+.. _tying-transactions-to-http-requests:
 
 Tying transactions to HTTP requests
-===================================
+-----------------------------------
 
-The recommended way to handle transactions in Web requests is to tie them to
-the request and response phases via Django's ``TransactionMiddleware``.
+A common way to handle transactions on the web is to wrap each request in a
+transaction. Set :setting:`ATOMIC_REQUESTS <DATABASE-ATOMIC_REQUESTS>` to
+``True`` in the configuration of each database for which you want to enable
+this behavior.
 
-It works like this: When a request starts, Django starts a transaction. If the
-response is produced without problems, Django commits any pending transactions.
-If the view function produces an exception, Django rolls back any pending
-transactions.
+It works like this. Before calling a view function, Django starts a
+transaction. If the response is produced without problems, Django commits the
+transaction. If the view produces an exception, Django rolls back the
+transaction.
 
-To activate this feature, just add the ``TransactionMiddleware`` middleware to
-your :setting:`MIDDLEWARE_CLASSES` setting::
+You may perfom partial commits and rollbacks in your view code, typically with
+the :func:`atomic` context manager. However, at the end of the view, either
+all the changes will be committed, or none of them.
 
-    MIDDLEWARE_CLASSES = (
-        'django.middleware.cache.UpdateCacheMiddleware',
-        'django.contrib.sessions.middleware.SessionMiddleware',
-        'django.middleware.common.CommonMiddleware',
-        'django.middleware.transaction.TransactionMiddleware',
-        'django.middleware.cache.FetchFromCacheMiddleware',
-    )
+To disable this behavior for a specific view, you must set the
+``transactions_per_request`` attribute of the view function itself to
+``False``, like this::
 
-The order is quite important. The transaction middleware applies not only to
-view functions, but also for all middleware modules that come after it. So if
-you use the session middleware after the transaction middleware, session
-creation will be part of the transaction.
+    def my_view(request):
+        do_stuff()
+    my_view.transactions_per_request = False
 
-The various cache middlewares are an exception:
-:class:`~django.middleware.cache.CacheMiddleware`,
-:class:`~django.middleware.cache.UpdateCacheMiddleware`, and
-:class:`~django.middleware.cache.FetchFromCacheMiddleware` are never affected.
-Even when using database caching, Django's cache backend uses its own
-database cursor (which is mapped to its own database connection internally).
+.. warning::
 
-.. note::
+    While the simplicity of this transaction model is appealing, it also makes it
+    inefficient when traffic increases. Opening a transaction for every view has
+    some overhead. The impact on performance depends on the query patterns of your
+    application and on how well your database handles locking.
 
-    The ``TransactionMiddleware`` only affects the database aliased
-    as "default" within your :setting:`DATABASES` setting.  If you are using
-    multiple databases and want transaction control over databases other than
-    "default", you will need to write your own transaction middleware.
+.. admonition:: Per-request transactions and streaming responses
 
-.. _transaction-management-functions:
+    When a view returns a :class:`~django.http.StreamingHttpResponse`, reading
+    the contents of the response will often execute code to generate the
+    content. Since the view has already returned, such code runs outside of
+    the transaction.
 
-Controlling transaction management in views
-===========================================
+    Generally speaking, it isn't advisable to write to the database while
+    generating a streaming response, since there's no sensible way to handle
+    errors after starting to send the response.
 
-For most people, implicit request-based transactions work wonderfully. However,
-if you need more fine-grained control over how transactions are managed, you can
-use a set of functions in ``django.db.transaction`` to control transactions on a
-per-function or per-code-block basis.
+In practice, this feature simply wraps every view function in the :func:`atomic`
+decorator described below.
 
-These functions, described in detail below, can be used in two different ways:
+Note that only the execution of your view in enclosed in the transactions.
+Middleware run outside of the transaction, and so does the rendering of
+template responses.
 
-* As a decorator_ on a particular function. For example::
+.. versionchanged:: 1.6
+    Django used to provide this feature via ``TransactionMiddleware``, which is
+    now deprecated.
 
-    from django.db import transaction
+Controlling transactions explicitly
+-----------------------------------
 
-    @transaction.commit_on_success
-    def viewfunc(request):
-        # ...
-        # this code executes inside a transaction
-        # ...
+.. versionadded:: 1.6
 
-* As a `context manager`_ around a particular block of code::
+Django provides a single API to control database transactions.
 
-    from django.db import transaction
+.. function:: atomic(using=None, savepoint=True)
 
-    def viewfunc(request):
-        # ...
-        # this code executes using default transaction management
-        # ...
+    This function creates an atomic block for writes to the database.
+    (Atomicity is the defining property of database transactions.)
 
-        with transaction.commit_on_success():
-            # ...
-            # this code executes inside a transaction
-            # ...
+    When the block completes successfully, the changes are committed to the
+    database. When it raises an exception, the changes are rolled back.
 
-Both techniques work with all supported version of Python.
+    ``atomic`` can be nested. In this case, when an inner block completes
+    successfully, its effects can still be rolled back if an exception is
+    raised in the outer block at a later point.
 
-.. _decorator: http://docs.python.org/glossary.html#term-decorator
-.. _context manager: http://docs.python.org/glossary.html#term-context-manager
+    ``atomic`` takes a ``using`` argument which should be the name of a
+    database. If this argument isn't provided, Django uses the ``"default"``
+    database.
 
-For maximum compatibility, all of the examples below show transactions using the
-decorator syntax, but all of the follow functions may be used as context
-managers, too.
-
-.. note::
-
-    Although the examples below use view functions as examples, these
-    decorators and context managers can be used anywhere in your code
-    that you need to deal with transactions.
-
-.. _topics-db-transactions-autocommit:
-
-.. function:: autocommit
-
-    Use the ``autocommit`` decorator to switch a view function to Django's
-    default commit behavior, regardless of the global transaction setting.
-
-    Example::
+    ``atomic`` is usable both as a `decorator`_::
 
         from django.db import transaction
 
-        @transaction.autocommit
+        @transaction.atomic
         def viewfunc(request):
-            ....
+            # This code executes inside a transaction.
+            do_stuff()
 
-        @transaction.autocommit(using="my_other_database")
-        def viewfunc2(request):
-            ....
-
-    Within ``viewfunc()``, transactions will be committed as soon as you call
-    ``model.save()``, ``model.delete()``, or any other function that writes to
-    the database.  ``viewfunc2()`` will have this same behavior, but for the
-    ``"my_other_database"`` connection.
-
-.. function:: commit_on_success
-
-    Use the ``commit_on_success`` decorator to use a single transaction for all
-    the work done in a function::
+    and as a `context manager`_::
 
         from django.db import transaction
 
-        @transaction.commit_on_success
         def viewfunc(request):
-            ....
+            # This code executes in autocommit mode (Django's default).
+            do_stuff()
 
-        @transaction.commit_on_success(using="my_other_database")
-        def viewfunc2(request):
-            ....
+            with transaction.atomic():
+                # This code executes inside a transaction.
+                do_more_stuff()
 
-    If the function returns successfully, then Django will commit all work done
-    within the function at that point. If the function raises an exception,
-    though, Django will roll back the transaction.
+    .. _decorator: http://docs.python.org/glossary.html#term-decorator
+    .. _context manager: http://docs.python.org/glossary.html#term-context-manager
 
-.. function:: commit_manually
+    Wrapping ``atomic`` in a try/except block allows for natural handling of
+    integrity errors::
 
-    Use the ``commit_manually`` decorator if you need full control over
-    transactions. It tells Django you'll be managing the transaction on your
-    own.
+        from django.db import IntegrityError, transaction
 
-    Whether you are writing or simply reading from the database, you must
-    ``commit()`` or ``rollback()`` explicitly or Django will raise a
-    :exc:`TransactionManagementError` exception. This is required when reading
-    from the database because ``SELECT`` statements may call functions which
-    modify tables, and thus it is impossible to know if any data has been
-    modified.
-
-    Manual transaction management looks like this::
-
-        from django.db import transaction
-
-        @transaction.commit_manually
+        @transaction.atomic
         def viewfunc(request):
-            ...
-            # You can commit/rollback however and whenever you want
-            transaction.commit()
-            ...
+            do_stuff()
 
-            # But you've got to remember to do it yourself!
             try:
-                ...
-            except:
-                transaction.rollback()
-            else:
-                transaction.commit()
+                with transaction.atomic():
+                    do_stuff_that_could_fail()
+            except IntegrityError:
+                handle_exception()
 
-        @transaction.commit_manually(using="my_other_database")
-        def viewfunc2(request):
-            ....
+            do_more_stuff()
 
-.. _topics-db-transactions-requirements:
+    In this example, even if ``do_stuff_that_could_fail()`` causes a database
+    error by breaking an integrity constraint, you can execute queries in
+    ``do_more_stuff()``, and the changes from ``do_stuff()`` are still there.
 
-Requirements for transaction handling
-=====================================
+    In order to guarantee atomicity, ``atomic`` disables some APIs. Attempting
+    to commit, roll back, or change the autocommit state of the database
+    connection within an ``atomic`` block will raise an exception.
 
-Django requires that every transaction that is opened is closed before
-the completion of a request. If you are using :func:`autocommit` (the
-default commit mode) or :func:`commit_on_success`, this will be done
-for you automatically. However, if you are manually managing
-transactions (using the :func:`commit_manually` decorator), you must
-ensure that the transaction is either committed or rolled back before
-a request is completed.
+    Under the hood, Django's transaction management code:
 
-This applies to all database operations, not just write operations. Even
-if your transaction only reads from the database, the transaction must
-be committed or rolled back before you complete a request.
+    - opens a transaction when entering the outermost ``atomic`` block;
+    - creates a savepoint when entering an inner ``atomic`` block;
+    - releases or rolls back to the savepoint when exiting an inner block;
+    - commits or rolls back the transaction when exiting the outermost block.
+
+    You can disable the creation of savepoints for inner blocks by setting the
+    ``savepoint`` argument to ``False``. If an exception occurs, Django will
+    perform the rollback when exiting the first parent block with a savepoint
+    if there is one, and the outermost block otherwise. Atomicity is still
+    guaranteed by the outer transaction. This option should only be used if
+    the overhead of savepoints is noticeable. It has the drawback of breaking
+    the error handling described above.
+
+    You may use ``atomic`` when autocommit is turned off. It will only use
+    savepoints, even for the outermost block, and it will raise an exception
+    if the outermost block is declared with ``savepoint=False``.
+
+.. admonition:: Performance considerations
+
+    Open transactions have a performance cost for your database server. To
+    minimize this overhead, keep your transactions as short as possible. This
+    is especially important of you're using :func:`atomic` in long-running
+    processes, outside of Django's request / response cycle.
+
+Autocommit
+==========
+
+.. _autocommit-details:
+
+Why Django uses autocommit
+--------------------------
+
+In the SQL standards, each SQL query starts a transaction, unless one is
+already in progress. Such transactions must then be committed or rolled back.
+
+This isn't always convenient for application developers. To alleviate this
+problem, most databases provide an autocommit mode. When autocommit is turned
+on, each SQL query is wrapped in its own transaction. In other words, the
+transaction is not only automatically started, but also automatically
+committed.
+
+:pep:`249`, the Python Database API Specification v2.0, requires autocommit to
+be initially turned off. Django overrides this default and turns autocommit
+on.
+
+To avoid this, you can :ref:`deactivate the transaction management
+<deactivate-transaction-management>`, but it isn't recommended.
+
+.. versionchanged:: 1.6
+    Before Django 1.6, autocommit was turned off, and it was emulated by
+    forcing a commit after write operations in the ORM.
 
 .. _deactivate-transaction-management:
 
-How to globally deactivate transaction management
-=================================================
+Deactivating transaction management
+-----------------------------------
 
-Control freaks can totally disable all transaction management by setting
-:setting:`TRANSACTIONS_MANAGED` to ``True`` in the Django settings file.
+You can totally disable Django's transaction management for a given database
+by setting :setting:`AUTOCOMMIT <DATABASE-AUTOCOMMIT>` to ``False`` in its
+configuration. If you do this, Django won't enable autocommit, and won't
+perform any commits. You'll get the regular behavior of the underlying
+database library.
 
-If you do this, Django won't provide any automatic transaction management
-whatsoever. Middleware will no longer implicitly commit transactions, and
-you'll need to roll management yourself. This even requires you to commit
-changes done by middleware somewhere else.
+This requires you to commit explicitly every transaction, even those started
+by Django or by third-party libraries. Thus, this is best used in situations
+where you want to run your own transaction-controlling middleware or do
+something really strange.
 
-Thus, this is best used in situations where you want to run your own
-transaction-controlling middleware or do something really strange. In almost
-all situations, you'll be better off using the default behavior, or the
-transaction middleware, and only modify selected functions as needed.
+.. versionchanged:: 1.6
+    This used to be controlled by the ``TRANSACTIONS_MANAGED`` setting.
+
+Low-level APIs
+==============
+
+.. warning::
+
+    Always prefer :func:`atomic` if possible at all. It accounts for the
+    idiosyncrasies of each database and prevents invalid operations.
+
+    The low level APIs are only useful if you're implementing your own
+    transaction management.
+
+.. _managing-autocommit:
+
+Autocommit
+----------
+
+.. versionadded:: 1.6
+
+Django provides a straightforward API in the :mod:`django.db.transaction`
+module to manage the autocommit state of each database connection.
+
+.. function:: get_autocommit(using=None)
+
+.. function:: set_autocommit(autocommit, using=None)
+
+These functions take a ``using`` argument which should be the name of a
+database. If it isn't provided, Django uses the ``"default"`` database.
+
+Autocommit is initially turned on. If you turn it off, it's your
+responsibility to restore it.
+
+Once you turn autocommit off, you get the default behavior of your database
+adapter, and Django won't help you. Although that behavior is specified in
+:pep:`249`, implementations of adapters aren't always consistent with one
+another. Review the documentation of the adapter you're using carefully.
+
+You must ensure that no transaction is active, usually by issuing a
+:func:`commit` or a :func:`rollback`, before turning autocommit back on.
+
+Django will refuse to turn autocommit off when an :func:`atomic` block is
+active, because that would break atomicity.
+
+Transactions
+------------
+
+A transaction is an atomic set of database queries. Even if your program
+crashes, the database guarantees that either all the changes will be applied,
+or none of them.
+
+Django doesn't provide an API to start a transaction. The expected way to
+start a transaction is to disable autocommit with :func:`set_autocommit`.
+
+Once you're in a transaction, you can choose either to apply the changes
+you've performed until this point with :func:`commit`, or to cancel them with
+:func:`rollback`. These functions are defined in :mod:`django.db.transaction`.
+
+.. function:: commit(using=None)
+
+.. function:: rollback(using=None)
+
+These functions take a ``using`` argument which should be the name of a
+database. If it isn't provided, Django uses the ``"default"`` database.
+
+Django will refuse to commit or to rollback when an :func:`atomic` block is
+active, because that would break atomicity.
 
 .. _topics-db-transactions-savepoints:
 
 Savepoints
-==========
+----------
 
-A savepoint is a marker within a transaction that enables you to roll back part
-of a transaction, rather than the full transaction. Savepoints are available
-with the PostgreSQL 8, Oracle and MySQL (when using the InnoDB storage engine)
-backends. Other backends provide the savepoint functions, but they're empty
-operations -- they don't actually do anything.
+A savepoint is a marker within a transaction that enables you to roll back
+part of a transaction, rather than the full transaction. Savepoints are
+available with the SQLite (≥ 3.6.8), PostgreSQL, Oracle and MySQL (when using
+the InnoDB storage engine) backends. Other backends provide the savepoint
+functions, but they're empty operations -- they don't actually do anything.
 
-.. versionchanged:: 1.4
-   Savepoint support for the MySQL backend was added in Django 1.4.
+Savepoints aren't especially useful if you are using autocommit, the default
+behavior of Django. However, once you open a transaction with :func:`atomic`,
+you build up a series of database operations awaiting a commit or rollback. If
+you issue a rollback, the entire transaction is rolled back. Savepoints
+provide the ability to perform a fine-grained rollback, rather than the full
+rollback that would be performed by ``transaction.rollback()``.
 
-Savepoints aren't especially useful if you are using the default
-``autocommit`` behavior of Django. However, if you are using
-``commit_on_success`` or ``commit_manually``, each open transaction will build
-up a series of database operations, awaiting a commit or rollback. If you
-issue a rollback, the entire transaction is rolled back. Savepoints provide
-the ability to perform a fine-grained rollback, rather than the full rollback
-that would be performed by ``transaction.rollback()``.
+.. versionchanged:: 1.6
+
+When the :func:`atomic` decorator is nested, it creates a savepoint to allow
+partial commit or rollback. You're strongly encouraged to use :func:`atomic`
+rather than the functions described below, but they're still part of the
+public API, and there's no plan to deprecate them.
 
 Each of these functions takes a ``using`` argument which should be the name of
 a database for which the behavior applies.  If no ``using`` argument is
 provided then the ``"default"`` database is used.
 
-Savepoints are controlled by three methods on the transaction object:
+Savepoints are controlled by three functions in :mod:`django.db.transaction`:
 
-.. method:: transaction.savepoint(using=None)
+.. function:: savepoint(using=None)
 
-    Creates a new savepoint. This marks a point in the transaction that
-    is known to be in a "good" state.
+    Creates a new savepoint. This marks a point in the transaction that is
+    known to be in a "good" state. Returns the savepoint ID (``sid``).
 
-    Returns the savepoint ID (sid).
+.. function:: savepoint_commit(sid, using=None)
 
-.. method:: transaction.savepoint_commit(sid, using=None)
+    Releases savepoint ``sid``. The changes performed since the savepoint was
+    created become part of the transaction.
 
-    Updates the savepoint to include any operations that have been performed
-    since the savepoint was created, or since the last commit.
+.. function:: savepoint_rollback(sid, using=None)
 
-.. method:: transaction.savepoint_rollback(sid, using=None)
+    Rolls back the transaction to savepoint ``sid``.
 
-    Rolls the transaction back to the last point at which the savepoint was
-    committed.
+These functions do nothing if savepoints aren't supported or if the database
+is in autocommit mode.
+
+In addition, there's a utility function:
+
+.. function:: clean_savepoints(using=None)
+
+    Resets the counter used to generate unique savepoint IDs.
 
 The following example demonstrates the use of savepoints::
 
     from django.db import transaction
 
-    @transaction.commit_manually
+    # open a transaction
+    @transaction.atomic
     def viewfunc(request):
 
       a.save()
-      # open transaction now contains a.save()
+      # transaction now contains a.save()
+
       sid = transaction.savepoint()
 
       b.save()
-      # open transaction now contains a.save() and b.save()
+      # transaction now contains a.save() and b.save()
 
       if want_to_keep_b:
           transaction.savepoint_commit(sid)
@@ -292,10 +369,28 @@ The following example demonstrates the use of savepoints::
           transaction.savepoint_rollback(sid)
           # open transaction now contains only a.save()
 
-      transaction.commit()
+Database-specific notes
+=======================
+
+.. _savepoints-in-sqlite:
+
+Savepoints in SQLite
+--------------------
+
+While SQLite ≥ 3.6.8 supports savepoints, a flaw in the design of the
+:mod:`sqlite3` module makes them hardly usable.
+
+When autocommit is enabled, savepoints don't make sense. When it's disabled,
+:mod:`sqlite3` commits implicitly before savepoint statements. (In fact, it
+commits before any statement other than ``SELECT``, ``INSERT``, ``UPDATE``,
+``DELETE`` and ``REPLACE``.) This bug has two consequences:
+
+- The low level APIs for savepoints are only usable inside a transaction ie.
+  inside an :func:`atomic` block.
+- It's impossible to use :func:`atomic` when autocommit is turned off.
 
 Transactions in MySQL
-=====================
+---------------------
 
 If you're using MySQL, your tables may or may not support transactions; it
 depends on your MySQL version and the table types you're using. (By
@@ -303,28 +398,34 @@ depends on your MySQL version and the table types you're using. (By
 peculiarities are outside the scope of this article, but the MySQL site has
 `information on MySQL transactions`_.
 
-If your MySQL setup does *not* support transactions, then Django will function
-in auto-commit mode: Statements will be executed and committed as soon as
-they're called. If your MySQL setup *does* support transactions, Django will
-handle transactions as explained in this document.
+If your MySQL setup does *not* support transactions, then Django will always
+function in autocommit mode: statements will be executed and committed as soon
+as they're called. If your MySQL setup *does* support transactions, Django
+will handle transactions as explained in this document.
 
 .. _information on MySQL transactions: http://dev.mysql.com/doc/refman/5.0/en/sql-syntax-transactions.html
 
 Handling exceptions within PostgreSQL transactions
-==================================================
+--------------------------------------------------
 
-When a call to a PostgreSQL cursor raises an exception (typically
-``IntegrityError``), all subsequent SQL in the same transaction will fail with
-the error "current transaction is aborted, queries ignored until end of
-transaction block". Whilst simple use of ``save()`` is unlikely to raise an
-exception in PostgreSQL, there are more advanced usage patterns which
-might, such as saving objects with unique fields, saving using the
+.. note::
+
+    This section is relevant only if you're implementing your own transaction
+    management. This problem cannot occur in Django's default mode and
+    :func:`atomic` handles it automatically.
+
+Inside a transaction, when a call to a PostgreSQL cursor raises an exception
+(typically ``IntegrityError``), all subsequent SQL in the same transaction
+will fail with the error "current transaction is aborted, queries ignored
+until end of transaction block". Whilst simple use of ``save()`` is unlikely
+to raise an exception in PostgreSQL, there are more advanced usage patterns
+which might, such as saving objects with unique fields, saving using the
 force_insert/force_update flag, or invoking custom SQL.
 
 There are several ways to recover from this sort of error.
 
 Transaction rollback
---------------------
+~~~~~~~~~~~~~~~~~~~~
 
 The first option is to roll back the entire transaction. For example::
 
@@ -341,13 +442,13 @@ made by ``a.save()`` would be lost, even though that operation raised no error
 itself.
 
 Savepoint rollback
-------------------
+~~~~~~~~~~~~~~~~~~
 
-If you are using PostgreSQL 8 or later, you can use :ref:`savepoints
-<topics-db-transactions-savepoints>` to control the extent of a rollback.
-Before performing a database operation that could fail, you can set or update
-the savepoint; that way, if the operation fails, you can roll back the single
-offending operation, rather than the entire transaction. For example::
+You can use :ref:`savepoints <topics-db-transactions-savepoints>` to control
+the extent of a rollback. Before performing a database operation that could
+fail, you can set or update the savepoint; that way, if the operation fails,
+you can roll back the single offending operation, rather than the entire
+transaction. For example::
 
     a.save() # Succeeds, and never undone by savepoint rollback
     try:
@@ -361,25 +462,224 @@ offending operation, rather than the entire transaction. For example::
 In this example, ``a.save()`` will not be undone in the case where
 ``b.save()`` raises an exception.
 
-Database-level autocommit
--------------------------
+.. _transactions-upgrading-from-1.5:
 
-With PostgreSQL 8.2 or later, there is an advanced option to run PostgreSQL
-with :doc:`database-level autocommit </ref/databases>`. If you use this option,
-there is no constantly open transaction, so it is always possible to continue
-after catching an exception. For example::
+Changes from Django 1.5 and earlier
+===================================
 
-    a.save() # succeeds
+The features described below were deprecated in Django 1.6 and will be removed
+in Django 1.8. They're documented in order to ease the migration to the new
+transaction management APIs.
+
+Legacy APIs
+-----------
+
+The following functions, defined in ``django.db.transaction``, provided a way
+to control transactions on a per-function or per-code-block basis. They could
+be used as decorators or as context managers, and they accepted a ``using``
+argument, exactly like :func:`atomic`.
+
+.. function:: autocommit
+
+    Enable Django's default autocommit behavior.
+
+    Transactions will be committed as soon as you call ``model.save()``,
+    ``model.delete()``, or any other function that writes to the database.
+
+.. function:: commit_on_success
+
+    Use a single transaction for all the work done in a function.
+
+    If the function returns successfully, then Django will commit all work done
+    within the function at that point. If the function raises an exception,
+    though, Django will roll back the transaction.
+
+.. function:: commit_manually
+
+    Tells Django you'll be managing the transaction on your own.
+
+    Whether you are writing or simply reading from the database, you must
+    ``commit()`` or ``rollback()`` explicitly or Django will raise a
+    :exc:`TransactionManagementError` exception. This is required when reading
+    from the database because ``SELECT`` statements may call functions which
+    modify tables, and thus it is impossible to know if any data has been
+    modified.
+
+.. _transaction-states:
+
+Transaction states
+------------------
+
+The three functions described above relied on a concept called "transaction
+states". This mechanisme was deprecated in Django 1.6, but it's still
+available until Django 1.8..
+
+At any time, each database connection is in one of these two states:
+
+- **auto mode**: autocommit is enabled;
+- **managed mode**: autocommit is disabled.
+
+Django starts in auto mode. ``TransactionMiddleware``,
+:func:`commit_on_success` and :func:`commit_manually` activate managed mode;
+:func:`autocommit` activates auto mode.
+
+Internally, Django keeps a stack of states. Activations and deactivations must
+be balanced.
+
+For example, :func:`commit_on_success` switches to managed mode when entering
+the block of code it controls; when exiting the block, it commits or
+rollbacks, and switches back to auto mode.
+
+So :func:`commit_on_success` really has two effects: it changes the
+transaction state and it defines an transaction block. Nesting will give the
+expected results in terms of transaction state, but not in terms of
+transaction semantics. Most often, the inner block will commit, breaking the
+atomicity of the outer block.
+
+:func:`autocommit` and :func:`commit_manually` have similar limitations.
+
+API changes
+-----------
+
+Transaction middleware
+~~~~~~~~~~~~~~~~~~~~~~
+
+In Django 1.6, ``TransactionMiddleware`` is deprecated and replaced
+:setting:`ATOMIC_REQUESTS <DATABASE-ATOMIC_REQUESTS>`. While the general
+behavior is the same, there are a few differences.
+
+With the transaction middleware, it was still possible to switch to autocommit
+or to commit explicitly in a view. Since :func:`atomic` guarantees atomicity,
+this isn't allowed any longer.
+
+To avoid wrapping a particular view in a transaction, instead of::
+
+    @transaction.autocommit
+    def my_view(request):
+        do_stuff()
+
+you must now use this pattern::
+
+    def my_view(request):
+        do_stuff()
+    my_view.transactions_per_request = False
+
+The transaction middleware applied not only to view functions, but also to
+middleware modules that came after it. For instance, if you used the session
+middleware after the transaction middleware, session creation was part of the
+transaction. :setting:`ATOMIC_REQUESTS <DATABASE-ATOMIC_REQUESTS>` only
+applies to the view itself.
+
+Managing transactions
+~~~~~~~~~~~~~~~~~~~~~
+
+Starting with Django 1.6, :func:`atomic` is the only supported API for
+defining a transaction. Unlike the deprecated APIs, it's nestable and always
+guarantees atomicity.
+
+In most cases, it will be a drop-in replacement for :func:`commit_on_success`.
+
+During the deprecation period, it's possible to use :func:`atomic` within
+:func:`autocommit`, :func:`commit_on_success` or :func:`commit_manually`.
+However, the reverse is forbidden, because nesting the old decorators /
+context managers breaks atomicity.
+
+Managing autocommit
+~~~~~~~~~~~~~~~~~~~
+
+Django 1.6 introduces an explicit :ref:`API for mananging autocommit
+<managing-autocommit>`.
+
+To disable autocommit temporarily, instead of::
+
+    with transaction.commit_manually():
+        # do stuff
+
+you should now use::
+
+    transaction.set_autocommit(False)
     try:
-        b.save() # Could throw exception
-    except IntegrityError:
-        pass
-    c.save() # succeeds
+        # do stuff
+    finally:
+        transaction.set_autocommit(True)
 
-.. note::
+To enable autocommit temporarily, instead of::
 
-    This is not the same as the :ref:`autocommit decorator
-    <topics-db-transactions-autocommit>`. When using database level autocommit
-    there is no database transaction at all. The ``autocommit`` decorator
-    still uses transactions, automatically committing each transaction when
-    a database modifying operation occurs.
+    with transaction.autocommit():
+        # do stuff
+
+you should now use::
+
+    transaction.set_autocommit(True)
+    try:
+        # do stuff
+    finally:
+        transaction.set_autocommit(False)
+
+Disabling transaction management
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Instead of setting ``TRANSACTIONS_MANAGED = True``, set the ``AUTOCOMMIT`` key
+to ``False`` in the configuration of each database, as explained in
+:ref:`deactivate-transaction-management`.
+
+Backwards incompatibilities
+---------------------------
+
+Since version 1.6, Django uses database-level autocommit in auto mode.
+Previously, it implemented application-level autocommit by triggering a commit
+after each ORM write.
+
+As a consequence, each database query (for instance, an ORM read) started a
+transaction that lasted until the next ORM write. Such "automatic
+transactions" no longer exist in Django 1.6.
+
+There are four known scenarios where this is backwards-incompatible.
+
+Note that managed mode isn't affected at all. This section assumes auto mode.
+See the :ref:`description of modes <transaction-states>` above.
+
+Sequences of custom SQL queries
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you're executing several :ref:`custom SQL queries <executing-custom-sql>`
+in a row, each one now runs in its own transaction, instead of sharing the
+same "automatic transaction". If you need to enforce atomicity, you must wrap
+the sequence of queries in :func:`commit_on_success`.
+
+To check for this problem, look for calls to ``cursor.execute()``. They're
+usually followed by a call to ``transaction.commit_unless_managed()``, which
+isn't useful any more and should be removed.
+
+Select for update
+~~~~~~~~~~~~~~~~~
+
+If you were relying on "automatic transactions" to provide locking between
+:meth:`~django.db.models.query.QuerySet.select_for_update` and a subsequent
+write operation — an extremely fragile design, but nonetheless possible — you
+must wrap the relevant code in :func:`atomic`.
+
+Using a high isolation level
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you were using the "repeatable read" isolation level or higher, and if you
+relied on "automatic transactions" to guarantee consistency between successive
+reads, the new behavior might be backwards-incompatible. To enforce
+consistency, you must wrap such sequences in :func:`atomic`.
+
+MySQL defaults to "repeatable read" and SQLite to "serializable"; they may be
+affected by this problem.
+
+At the "read committed" isolation level or lower, "automatic transactions"
+have no effect on the semantics of any sequence of ORM operations.
+
+PostgreSQL and Oracle default to "read committed" and aren't affected, unless
+you changed the isolation level.
+
+Using unsupported database features
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+With triggers, views, or functions, it's possible to make ORM reads result in
+database modifications. Django 1.5 and earlier doesn't deal with this case and
+it's theoretically possible to observe a different behavior after upgrading to
+Django 1.6 or later. In doubt, use :func:`atomic` to enforce integrity.
diff --git a/docs/topics/files.txt b/docs/topics/files.txt
index 66e104759a..c05f98ef7e 100644
--- a/docs/topics/files.txt
+++ b/docs/topics/files.txt
@@ -2,7 +2,10 @@
 Managing files
 ==============
 
-This document describes Django's file access APIs.
+This document describes Django's file access APIs for files such as those
+uploaded by a user. The lower level APIs are general enough that you could use
+them for other purposes. If you want to handle "static files" (JS, CSS, etc),
+see :doc:`/howto/static-files/index`.
 
 By default, Django stores files locally, using the :setting:`MEDIA_ROOT` and
 :setting:`MEDIA_URL` settings. The examples below assume that you're using these
@@ -93,7 +96,7 @@ The following approach may be used to close files automatically::
 Closing files is especially important when accessing file fields in a loop
 over a large number of objects:: If files are not manually closed after
 accessing them, the risk of running out of file descriptors may arise. This
-may lead to the following error:
+may lead to the following error::
 
     IOError: [Errno 24] Too many open files
 
diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt
index 7c1771b758..269ac5b4b6 100644
--- a/docs/topics/forms/formsets.txt
+++ b/docs/topics/forms/formsets.txt
@@ -3,7 +3,9 @@
 Formsets
 ========
 
-A formset is a layer of abstraction to working with multiple forms on the same
+.. class:: django.forms.formset.BaseFormSet
+
+A formset is a layer of abstraction to work with multiple forms on the same
 page. It can be best compared to a data grid. Let's say you have the following
 form::
 
@@ -30,14 +32,14 @@ would with a regular form::
 
 As you can see it only displayed one empty form. The number of empty forms
 that is displayed is controlled by the ``extra`` parameter. By default,
-``formset_factory`` defines one extra form; the following example will
-display two blank forms::
+:func:`~django.forms.formsets.formset_factory` defines one extra form; the
+following example will display two blank forms::
 
     >>> ArticleFormSet = formset_factory(ArticleForm, extra=2)
 
 Iterating over the ``formset`` will render the forms in the order they were
 created. You can change this order by providing an alternate implementation for
-the :meth:`__iter__()` method.
+the ``__iter__()`` method.
 
 Formsets can also be indexed into, which returns the corresponding form. If you
 override ``__iter__``, you will need to also override ``__getitem__`` to have
@@ -82,11 +84,12 @@ list of dictionaries as the initial data.
 Limiting the maximum number of forms
 ------------------------------------
 
-The ``max_num`` parameter to ``formset_factory`` gives you the ability to
-limit the maximum number of empty forms the formset will display::
+The ``max_num`` parameter to :func:`~django.forms.formsets.formset_factory`
+gives you the ability to limit the maximum number of empty forms the formset
+will display::
 
     >>> ArticleFormSet = formset_factory(ArticleForm, extra=2, max_num=1)
-    >>> formset = ArticleFormset()
+    >>> formset = ArticleFormSet()
     >>> for form in formset:
     ...     print(form.as_table())
     <tr><th><label for="id_form-0-title">Title:</label></th><td><input type="text" name="form-0-title" id="id_form-0-title" /></td></tr>
@@ -96,8 +99,22 @@ If the value of ``max_num`` is greater than the number of existing
 objects, up to ``extra`` additional blank forms will be added to the formset,
 so long as the total number of forms does not exceed ``max_num``.
 
-A ``max_num`` value of ``None`` (the default) puts no limit on the number of
-forms displayed.
+A ``max_num`` value of ``None`` (the default) puts a high limit on the number
+of forms displayed (1000). In practice this is equivalent to no limit.
+
+If the number of forms in the initial data exceeds ``max_num``, all initial
+data forms will be displayed regardless.  (No extra forms will be displayed.)
+
+By default, ``max_num`` only affects how many forms are displayed and does not
+affect validation.  If ``validate_max=True`` is passed to the
+:func:`~django.forms.formsets.formset_factory`, then ``max_num`` will affect
+validation.  See :ref:`validate_max`.
+
+.. versionchanged:: 1.6
+   The ``validate_max`` parameter was added to
+   :func:`~django.forms.formsets.formset_factory`.  Also, the behavior of
+   ``FormSet`` was brought in line with that of ``ModelFormSet`` so that it
+   displays initial data regardless of ``max_num``.
 
 Formset validation
 ------------------
@@ -139,8 +156,6 @@ As we can see, ``formset.errors`` is a list whose entries correspond to the
 forms in the formset. Validation was performed for each of the two forms, and
 the expected error message appears for the second item.
 
-.. versionadded:: 1.4
-
 We can also check if form data differs from the initial data (i.e. the form was
 sent without any data)::
 
@@ -178,7 +193,10 @@ this management data, an exception will be raised::
 
 It is used to keep track of how many form instances are being displayed. If
 you are adding new forms via JavaScript, you should increment the count fields
-in this form as well.
+in this form as well. On the other hand, if you are using JavaScript to allow
+deletion of existing objects, then you need to ensure the ones being removed
+are properly marked for deletion by including ``form-#-DELETE`` in the ``POST``
+data. It is expected that all forms are present in the ``POST`` data regardless.
 
 The management form is available as an attribute of the formset
 itself. When rendering a formset in a template, you can include all
@@ -248,14 +266,59 @@ The formset ``clean`` method is called after all the ``Form.clean`` methods
 have been called. The errors will be found using the ``non_form_errors()``
 method on the formset.
 
+.. _validate_max:
+
+Validating the number of forms in a formset
+-------------------------------------------
+
+If ``validate_max=True`` is passed to
+:func:`~django.forms.formsets.formset_factory`, validation will also check
+that the number of forms in the data set is less than or equal to ``max_num``.
+
+    >>> ArticleFormSet = formset_factory(ArticleForm, max_num=1, validate_max=True)
+    >>> data = {
+    ...     'form-TOTAL_FORMS': u'2',
+    ...     'form-INITIAL_FORMS': u'0',
+    ...     'form-MAX_NUM_FORMS': u'',
+    ...     'form-0-title': u'Test',
+    ...     'form-0-pub_date': u'1904-06-16',
+    ...     'form-1-title': u'Test 2',
+    ...     'form-1-pub_date': u'1912-06-23',
+    ... }
+    >>> formset = ArticleFormSet(data)
+    >>> formset.is_valid()
+    False
+    >>> formset.errors
+    [{}, {}]
+    >>> formset.non_form_errors()
+    [u'Please submit 1 or fewer forms.']
+
+``validate_max=True`` validates against ``max_num`` strictly even if
+``max_num`` was exceeded because the amount of initial data supplied was
+excessive.
+
+Applications which need more customizable validation of the number of forms
+should use custom formset validation.
+
+.. note::
+
+    Regardless of ``validate_max``, if the number of forms in a data set
+    exceeds ``max_num`` by more than 1000, then the form will fail to validate
+    as if ``validate_max`` were set, and additionally only the first 1000
+    forms above ``max_num`` will be validated.  The remainder will be
+    truncated entirely.  This is to protect against memory exhaustion attacks
+    using forged POST requests.
+
+.. versionchanged:: 1.6
+   The ``validate_max`` parameter was added to
+   :func:`~django.forms.formsets.formset_factory`.
+
 Dealing with ordering and deletion of forms
 -------------------------------------------
 
-Common use cases with a formset is dealing with ordering and deletion of the
-form instances. This has been dealt with for you. The ``formset_factory``
-provides two optional parameters ``can_order`` and ``can_delete`` that will do
-the extra work of adding the extra fields and providing simpler ways of
-getting to that data.
+The :func:`~django.forms.formsets.formset_factory` provides two optional
+parameters ``can_order`` and ``can_delete`` to help with ordering of forms in
+formsets and deletion of forms from a formset.
 
 ``can_order``
 ~~~~~~~~~~~~~
@@ -273,13 +336,13 @@ Lets you create a formset with the ability to order::
     ...     print(form.as_table())
     <tr><th><label for="id_form-0-title">Title:</label></th><td><input type="text" name="form-0-title" value="Article #1" id="id_form-0-title" /></td></tr>
     <tr><th><label for="id_form-0-pub_date">Pub date:</label></th><td><input type="text" name="form-0-pub_date" value="2008-05-10" id="id_form-0-pub_date" /></td></tr>
-    <tr><th><label for="id_form-0-ORDER">Order:</label></th><td><input type="text" name="form-0-ORDER" value="1" id="id_form-0-ORDER" /></td></tr>
+    <tr><th><label for="id_form-0-ORDER">Order:</label></th><td><input type="number" name="form-0-ORDER" value="1" id="id_form-0-ORDER" /></td></tr>
     <tr><th><label for="id_form-1-title">Title:</label></th><td><input type="text" name="form-1-title" value="Article #2" id="id_form-1-title" /></td></tr>
     <tr><th><label for="id_form-1-pub_date">Pub date:</label></th><td><input type="text" name="form-1-pub_date" value="2008-05-11" id="id_form-1-pub_date" /></td></tr>
-    <tr><th><label for="id_form-1-ORDER">Order:</label></th><td><input type="text" name="form-1-ORDER" value="2" id="id_form-1-ORDER" /></td></tr>
+    <tr><th><label for="id_form-1-ORDER">Order:</label></th><td><input type="number" name="form-1-ORDER" value="2" id="id_form-1-ORDER" /></td></tr>
     <tr><th><label for="id_form-2-title">Title:</label></th><td><input type="text" name="form-2-title" id="id_form-2-title" /></td></tr>
     <tr><th><label for="id_form-2-pub_date">Pub date:</label></th><td><input type="text" name="form-2-pub_date" id="id_form-2-pub_date" /></td></tr>
-    <tr><th><label for="id_form-2-ORDER">Order:</label></th><td><input type="text" name="form-2-ORDER" id="id_form-2-ORDER" /></td></tr>
+    <tr><th><label for="id_form-2-ORDER">Order:</label></th><td><input type="number" name="form-2-ORDER" id="id_form-2-ORDER" /></td></tr>
 
 This adds an additional field to each form. This new field is named ``ORDER``
 and is an ``forms.IntegerField``. For the forms that came from the initial
diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt
index 4693de6c7e..ac58acc9e3 100644
--- a/docs/topics/forms/index.txt
+++ b/docs/topics/forms/index.txt
@@ -197,6 +197,14 @@ context variable ``form``. Here's a simple example template::
 The form only outputs its own fields; it is up to you to provide the surrounding
 ``<form>`` tags and the submit button.
 
+If your form includes uploaded files, be sure to include
+``enctype="multipart/form-data"`` in the ``form`` element. If you wish to write
+a generic template that will work whether or not the form has files, you can
+use the :meth:`~django.forms.Form.is_multipart` attribute on the form::
+
+    <form action="/contact/" method="post"
+        {% if form.is_multipart %}enctype="multipart/form-data"{% endif %}>
+
 .. admonition:: Forms and Cross Site Request Forgery protection
 
    Django ships with an easy-to-use :doc:`protection against Cross Site Request
@@ -215,7 +223,7 @@ wrapped in a paragraph. Here's the output for our example template::
    <p><label for="id_message">Message:</label>
        <input type="text" name="message" id="id_message" /></p>
    <p><label for="id_sender">Sender:</label>
-       <input type="text" name="sender" id="id_sender" /></p>
+       <input type="email" name="sender" id="id_sender" /></p>
    <p><label for="id_cc_myself">Cc myself:</label>
        <input type="checkbox" name="cc_myself" id="id_cc_myself" /></p>
    <input type="submit" value="Submit" />
@@ -300,9 +308,9 @@ loop::
         <p><input type="submit" value="Send message" /></p>
     </form>
 
-Within this loop, ``{{ field }}`` is an instance of :class:`BoundField`.
-``BoundField`` also has the following attributes, which can be useful in your
-templates:
+Within this loop, ``{{ field }}`` is an instance of
+:class:`~django.forms.BoundField`. ``BoundField`` also has the following
+attributes, which can be useful in your templates:
 
 ``{{ field.label }}``
     The label of the field, e.g. ``Email address``.
@@ -328,7 +336,7 @@ templates:
     case, each object in the loop is a simple string containing the error
     message.
 
-``field.is_hidden``
+``{{ field.is_hidden }}``
     This attribute is ``True`` if the form field is a hidden field and
     ``False`` otherwise. It's not particularly useful as a template
     variable, but could be useful in conditional tests such as::
@@ -337,6 +345,12 @@ templates:
            {# Do something special #}
         {% endif %}
 
+``{{ field.field }}``
+    The :class:`~django.forms.Field` instance from the form class that
+    this :class:`~django.forms.BoundField` wraps. You can use it to access
+    :class:`~django.forms.Field` attributes , e.g.
+    ``{{ char_field.field.max_length }}``.
+
 Looping over hidden and visible fields
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt
index 233346db0d..eaf2bbbaf2 100644
--- a/docs/topics/forms/modelforms.txt
+++ b/docs/topics/forms/modelforms.txt
@@ -222,11 +222,6 @@ supplied, ``save()`` will update that instance. If it's not supplied,
     # Save a new Article object from the form's data.
     >>> new_article = f.save()
 
-    # Create a form to edit an existing Article.
-    >>> a = Article.objects.get(pk=1)
-    >>> f = ArticleForm(instance=a)
-    >>> f.save()
-
     # Create a form to edit an existing Article, but use
     # POST data to populate the form.
     >>> a = Article.objects.get(pk=1)
@@ -544,11 +539,40 @@ for more on how field cleaning and validation work. Also, your model's
 :ref:`Validating objects <validating-objects>` for more information on the
 model's ``clean()`` hook.
 
+.. _modelforms-factory:
+
+ModelForm factory function
+--------------------------
+
+You can create forms from a given model using the standalone function
+:func:`~django.forms.models.modelform_factory`, instead of using a class
+definition. This may be more convenient if you do not have many customizations
+to make::
+
+    >>> from django.forms.models import modelform_factory
+    >>> BookForm = modelform_factory(Book)
+
+This can also be used to make simple modifications to existing forms, for
+example by specifying which fields should be displayed::
+
+    >>> Form = modelform_factory(Book, form=BookForm, fields=("author",))
+
+... or which fields should be excluded::
+
+    >>> Form = modelform_factory(Book, form=BookForm, exclude=("title",))
+
+You can also specify the widgets to be used for a given field::
+
+    >>> from django.forms import Textarea
+    >>> Form = modelform_factory(Book, form=BookForm, widgets={"title": Textarea()})
+
 .. _model-formsets:
 
 Model formsets
 ==============
 
+.. class:: models.BaseModelFormSet
+
 Like :doc:`regular formsets </topics/forms/formsets>`, Django provides a couple
 of enhanced formset classes that make it easy to work with Django models. Let's
 reuse the ``Author`` model from above::
@@ -572,9 +596,11 @@ with the ``Author`` model. It works just like a regular formset::
     <tr><th><label for="id_form-0-birth_date">Birth date:</label></th><td><input type="text" name="form-0-birth_date" id="id_form-0-birth_date" /><input type="hidden" name="form-0-id" id="id_form-0-id" /></td></tr>
 
 .. note::
-    ``modelformset_factory`` uses ``formset_factory`` to generate formsets.
-    This means that a model formset is just an extension of a basic formset
-    that knows how to interact with a particular model.
+
+    :func:`~django.forms.models.modelformset_factory` uses
+    :func:`~django.forms.formsets.formset_factory` to generate formsets. This
+    means that a model formset is just an extension of a basic formset that
+    knows how to interact with a particular model.
 
 Changing the queryset
 ---------------------
@@ -620,16 +646,28 @@ exclude::
 
     >>> AuthorFormSet = modelformset_factory(Author, exclude=('birth_date',))
 
+Specifying widgets to use in the form with ``widgets``
+------------------------------------------------------
+
+.. versionadded:: 1.6
+
+Using the ``widgets`` parameter, you can specify a dictionary of values to
+customize the ``ModelForm``'s widget class for a particular field. This
+works the same way as the ``widgets`` dictionary on the inner ``Meta``
+class of a ``ModelForm`` works::
+
+    >>> AuthorFormSet = modelformset_factory(
+    ...     Author, widgets={'name': Textarea(attrs={'cols': 80, 'rows': 20})
+
 Providing initial values
 ------------------------
 
-.. versionadded:: 1.4
-
 As with regular formsets, it's possible to :ref:`specify initial data
 <formsets-initial-data>` for forms in the formset by specifying an ``initial``
 parameter when instantiating the model formset class returned by
-``modelformset_factory``. However, with model formsets, the initial values only
-apply to extra forms, those that aren't bound to an existing object instance.
+:func:`~django.forms.models.modelformset_factory`. However, with model
+formsets, the initial values only apply to extra forms, those that aren't bound
+to an existing object instance.
 
 .. _saving-objects-in-the-formset:
 
@@ -675,7 +713,8 @@ Limiting the number of editable objects
 ---------------------------------------
 
 As with regular formsets, you can use the ``max_num`` and ``extra`` parameters
-to ``modelformset_factory`` to limit the number of extra forms displayed.
+to :func:`~django.forms.models.modelformset_factory` to limit the number of
+extra forms displayed.
 
 ``max_num`` does not prevent existing objects from being displayed::
 
@@ -700,8 +739,8 @@ so long as the total number of forms does not exceed ``max_num``::
     <tr><th><label for="id_form-2-name">Name:</label></th><td><input id="id_form-2-name" type="text" name="form-2-name" value="Walt Whitman" maxlength="100" /><input type="hidden" name="form-2-id" value="2" id="id_form-2-id" /></td></tr>
     <tr><th><label for="id_form-3-name">Name:</label></th><td><input id="id_form-3-name" type="text" name="form-3-name" maxlength="100" /><input type="hidden" name="form-3-id" id="id_form-3-id" /></td></tr>
 
-A ``max_num`` value of ``None`` (the default) puts no limit on the number of
-forms displayed.
+A ``max_num`` value of ``None`` (the default) puts a high limit on the number
+of forms displayed (1000). In practice this is equivalent to no limit.
 
 Using a model formset in a view
 -------------------------------
@@ -827,6 +866,8 @@ primary key that isn't called ``id``, make sure it gets rendered.)
 
 .. highlight:: python
 
+.. _inline-formsets:
+
 Inline formsets
 ===============
 
@@ -850,7 +891,9 @@ a particular author, you could do this::
     >>> formset = BookFormSet(instance=author)
 
 .. note::
-    ``inlineformset_factory`` uses ``modelformset_factory`` and marks
+
+    :func:`~django.forms.models.inlineformset_factory` uses
+    :func:`~django.forms.models.modelformset_factory` and marks
     ``can_delete=True``.
 
 .. seealso::
@@ -869,7 +912,8 @@ the following model::
         to_friend = models.ForeignKey(Friend)
         length_in_months = models.IntegerField()
 
-To resolve this, you can use ``fk_name`` to ``inlineformset_factory``::
+To resolve this, you can use ``fk_name`` to
+:func:`~django.forms.models.inlineformset_factory`::
 
     >>> FriendshipFormSet = inlineformset_factory(Friend, Friendship, fk_name="from_friend")
 
@@ -895,3 +939,13 @@ of a model. Here's how you can do that::
         })
 
 Notice how we pass ``instance`` in both the ``POST`` and ``GET`` cases.
+
+Specifying widgets to use in the inline form
+--------------------------------------------
+
+.. versionadded:: 1.6
+
+``inlineformset_factory`` uses ``modelformset_factory`` and passes most
+of its arguments to ``modelformset_factory``. This means you can use
+the ``widgets`` parameter in much the same way as passing it to
+``modelformset_factory``. See `Specifying widgets to use in the form with widgets`_ above.
diff --git a/docs/topics/http/decorators.txt b/docs/topics/http/decorators.txt
index 83d14a0777..25616a44c0 100644
--- a/docs/topics/http/decorators.txt
+++ b/docs/topics/http/decorators.txt
@@ -39,8 +39,6 @@ a :class:`django.http.HttpResponseNotAllowed` if the conditions are not met.
 
 .. function:: require_safe()
 
-    .. versionadded:: 1.4
-
     Decorator to require that a view only accept the GET and HEAD methods.
     These methods are commonly considered "safe" because they should not have
     the significance of taking an action other than retrieving the requested
diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt
index b3a830c25e..80bd5f3c44 100644
--- a/docs/topics/http/file-uploads.txt
+++ b/docs/topics/http/file-uploads.txt
@@ -201,7 +201,7 @@ corresponding :class:`~django.db.models.FileField` when calling
                 return HttpResponseRedirect('/success/url/')
         else:
             form = ModelFormWithFileField()
-        return render('upload.html', {'form': form})
+        return render(request, 'upload.html', {'form': form})
 
 If you are constructing an object manually, you can simply assign the file
 object from :attr:`request.FILES <django.http.HttpRequest.FILES>` to the file
@@ -221,14 +221,14 @@ field in the model::
                 return HttpResponseRedirect('/success/url/')
         else:
             form = UploadFileForm()
-        return render('upload.html', {'form': form})
+        return render(request, 'upload.html', {'form': form})
 
 
 ``UploadedFile`` objects
 ========================
 
-In addition to those inherited from :class:`File`, all ``UploadedFile`` objects
-define the following methods/attributes:
+In addition to those inherited from :class:`~django.core.files.File`, all
+``UploadedFile`` objects define the following methods/attributes:
 
 .. attribute:: UploadedFile.content_type
 
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index baf8aa5cb5..f5c688e254 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -28,6 +28,8 @@ If you don't want to use sessions, you might as well remove the
 ``'django.contrib.sessions'`` from your :setting:`INSTALLED_APPS`.
 It'll save you a small bit of overhead.
 
+.. _configuring-sessions:
+
 Configuring the session engine
 ==============================
 
@@ -110,8 +112,6 @@ server has permissions to read and write to this location.
 Using cookie-based sessions
 ---------------------------
 
-.. versionadded:: 1.4
-
 To use cookies-based sessions, set the :setting:`SESSION_ENGINE` setting to
 ``"django.contrib.sessions.backends.signed_cookies"``. The session data will be
 stored using Django's tools for :doc:`cryptographic signing </topics/signing>`
@@ -264,7 +264,7 @@ You can edit it multiple times.
       - ``modification``: last modification of the session, as a
         :class:`~datetime.datetime` object. Defaults to the current time.
       - ``expiry``: expiry information for the session, as a
-        :class:`~datetime.datetime` object, an :class:`int` (in seconds), or
+        :class:`~datetime.datetime` object, an :func:`int` (in seconds), or
         ``None``. Defaults to the value stored in the session by
         :meth:`set_expiry`, if there is one, or ``None``.
 
@@ -453,6 +453,8 @@ session cookie is sent.
 .. versionchanged:: 1.5
   The session is not saved if the response's status code is 500.
 
+.. _browser-length-vs-persistent-sessions:
+
 Browser-length sessions vs. persistent sessions
 ===============================================
 
@@ -474,6 +476,16 @@ This setting is a global default and can be overwritten at a per-session level
 by explicitly calling the :meth:`~backends.base.SessionBase.set_expiry` method
 of ``request.session`` as described above in `using sessions in views`_.
 
+.. note::
+
+    Some browsers (Chrome, for example) provide settings that allow users to
+    continue browsing sessions after closing and re-opening the browser. In
+    some cases, this can interfere with the
+    :setting:`SESSION_EXPIRE_AT_BROWSER_CLOSE` setting and prevent sessions
+    from expiring on browser close. Please be aware of this while testing
+    Django applications which have the
+    :setting:`SESSION_EXPIRE_AT_BROWSER_CLOSE` setting enabled.
+
 Clearing the session store
 ==========================
 
@@ -501,114 +513,20 @@ session data is stored by the users' browsers.
 Settings
 ========
 
-A few :doc:`Django settings </ref/settings>` give you control over session
+A few :ref:`Django settings <settings-sessions>` give you control over session
 behavior:
 
-SESSION_ENGINE
---------------
-
-Default: ``django.contrib.sessions.backends.db``
-
-Controls where Django stores session data. Valid values are:
-
-* ``'django.contrib.sessions.backends.db'``
-* ``'django.contrib.sessions.backends.file'``
-* ``'django.contrib.sessions.backends.cache'``
-* ``'django.contrib.sessions.backends.cached_db'``
-* ``'django.contrib.sessions.backends.signed_cookies'``
-
-See `configuring the session engine`_ for more details.
-
-SESSION_FILE_PATH
------------------
-
-Default: ``/tmp/``
-
-If you're using file-based session storage, this sets the directory in
-which Django will store session data.
-
-SESSION_COOKIE_AGE
-------------------
-
-Default: ``1209600`` (2 weeks, in seconds)
-
-The age of session cookies, in seconds.
-
-SESSION_COOKIE_DOMAIN
----------------------
-
-Default: ``None``
-
-The domain to use for session cookies. Set this to a string such as
-``".example.com"`` (note the leading dot!) for cross-domain cookies, or use
-``None`` for a standard domain cookie.
-
-SESSION_COOKIE_HTTPONLY
------------------------
-
-Default: ``True``
-
-Whether to use HTTPOnly flag on the session cookie. If this is set to
-``True``, client-side JavaScript will not to be able to access the
-session cookie.
-
-HTTPOnly_ is a flag included in a Set-Cookie HTTP response header. It
-is not part of the :rfc:`2109` standard for cookies, and it isn't honored
-consistently by all browsers. However, when it is honored, it can be a
-useful way to mitigate the risk of client side script accessing the
-protected cookie data.
-
-.. versionchanged:: 1.4
-    The default value of the setting was changed from ``False`` to ``True``.
-
-.. _HTTPOnly: https://www.owasp.org/index.php/HTTPOnly
-
-SESSION_COOKIE_NAME
--------------------
-
-Default: ``'sessionid'``
-
-The name of the cookie to use for sessions. This can be whatever you want.
-
-SESSION_COOKIE_PATH
--------------------
-
-Default: ``'/'``
-
-The path set on the session cookie. This should either match the URL path of
-your Django installation or be parent of that path.
-
-This is useful if you have multiple Django instances running under the same
-hostname. They can use different cookie paths, and each instance will only see
-its own session cookie.
-
-SESSION_COOKIE_SECURE
----------------------
-
-Default: ``False``
-
-Whether to use a secure cookie for the session cookie. If this is set to
-``True``, the cookie will be marked as "secure," which means browsers may
-ensure that the cookie is only sent under an HTTPS connection.
-
-SESSION_EXPIRE_AT_BROWSER_CLOSE
--------------------------------
-
-Default: ``False``
-
-Whether to expire the session when the user closes his or her browser. See
-"Browser-length sessions vs. persistent sessions" above.
-
-SESSION_SAVE_EVERY_REQUEST
---------------------------
-
-Default: ``False``
-
-Whether to save the session data on every request. If this is ``False``
-(default), then the session data will only be saved if it has been modified --
-that is, if any of its dictionary values have been assigned or deleted.
-
-.. _Django settings: ../settings/
+* :setting:`SESSION_CACHE_ALIAS`
+* :setting:`SESSION_COOKIE_AGE`
+* :setting:`SESSION_COOKIE_DOMAIN`
+* :setting:`SESSION_COOKIE_HTTPONLY`
+* :setting:`SESSION_COOKIE_NAME`
+* :setting:`SESSION_COOKIE_PATH`
+* :setting:`SESSION_COOKIE_SECURE`
+* :setting:`SESSION_ENGINE`
+* :setting:`SESSION_EXPIRE_AT_BROWSER_CLOSE`
+* :setting:`SESSION_FILE_PATH`
+* :setting:`SESSION_SAVE_EVERY_REQUEST`
 
 Technical details
 =================
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index b1b4700b73..961f0b9d96 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -50,6 +50,9 @@ Optional arguments
     The MIME type to use for the resulting document. Defaults to the value of
     the :setting:`DEFAULT_CONTENT_TYPE` setting.
 
+    .. versionchanged:: 1.5
+        This parameter used to be called ``mimetype``.
+
 ``status``
     The status code for the response. Defaults to ``200``.
 
@@ -87,7 +90,7 @@ This example is equivalent to::
 ``render_to_response``
 ======================
 
-.. function:: render_to_response(template_name[, dictionary][, context_instance][, mimetype])
+.. function:: render_to_response(template_name[, dictionary][, context_instance][, content_type])
 
    Renders a given template with a given context dictionary and returns an
    :class:`~django.http.HttpResponse` object with that rendered text.
@@ -121,10 +124,14 @@ Optional arguments
                                   my_data_dictionary,
                                   context_instance=RequestContext(request))
 
-``mimetype``
+``content_type``
     The MIME type to use for the resulting document. Defaults to the value of
     the :setting:`DEFAULT_CONTENT_TYPE` setting.
 
+    .. versionchanged:: 1.5
+        This parameter used to be called ``mimetype``.
+
+
 Example
 -------
 
@@ -148,7 +155,7 @@ This example is equivalent to::
         t = loader.get_template('myapp/template.html')
         c = Context({'foo': 'bar'})
         return HttpResponse(t.render(c),
-            mimetype="application/xhtml+xml")
+            content_type="application/xhtml+xml")
 
 ``redirect``
 ============
@@ -162,8 +169,9 @@ This example is equivalent to::
 
    * A model: the model's `get_absolute_url()` function will be called.
 
-   * A view name, possibly with arguments: `urlresolvers.reverse()` will
-     be used to reverse-resolve the name.
+   * A view name, possibly with arguments: :func:`urlresolvers.reverse
+     <django.core.urlresolvers.reverse>` will be used to reverse-resolve the
+     name.
 
    * A URL, which will be used as-is for the redirect location.
 
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index 00c07da6ea..9a96199dba 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -26,10 +26,9 @@ This mapping can be as short or as long as needed. It can reference other
 mappings. And, because it's pure Python code, it can be constructed
 dynamically.
 
-.. versionadded:: 1.4
-    Django also provides a way to translate URLs according to the active
-    language. See the :ref:`internationalization documentation
-    <url-internationalization>` for more information.
+Django also provides a way to translate URLs according to the active
+language. See the :ref:`internationalization documentation
+<url-internationalization>` for more information.
 
 .. _how-django-processes-a-request:
 
@@ -67,13 +66,13 @@ Example
 
 Here's a sample URLconf::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, url
 
     urlpatterns = patterns('',
-        (r'^articles/2003/$', 'news.views.special_case_2003'),
-        (r'^articles/(\d{4})/$', 'news.views.year_archive'),
-        (r'^articles/(\d{4})/(\d{2})/$', 'news.views.month_archive'),
-        (r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'news.views.article_detail'),
+        url(r'^articles/2003/$', 'news.views.special_case_2003'),
+        url(r'^articles/(\d{4})/$', 'news.views.year_archive'),
+        url(r'^articles/(\d{4})/(\d{2})/$', 'news.views.month_archive'),
+        url(r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'news.views.article_detail'),
     )
 
 Notes:
@@ -125,10 +124,10 @@ is ``(?P<name>pattern)``, where ``name`` is the name of the group and
 Here's the above example URLconf, rewritten to use named groups::
 
     urlpatterns = patterns('',
-        (r'^articles/2003/$', 'news.views.special_case_2003'),
-        (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
-        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
-        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
+        url(r'^articles/2003/$', 'news.views.special_case_2003'),
+        url(r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
+        url(r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
+        url(r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
     )
 
 This accomplishes exactly the same thing as the previous example, with one
@@ -184,7 +183,7 @@ Each captured argument is sent to the view as a plain Python string, regardless
 of what sort of match the regular expression makes. For example, in this
 URLconf line::
 
-    (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
+    url(r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
 
 ...the ``year`` argument to ``news.views.year_archive()`` will be a string, not
 an integer, even though the ``\d{4}`` will only match integer strings.
@@ -194,13 +193,14 @@ Here's an example URLconf and view::
 
     # URLconf
     urlpatterns = patterns('',
-        (r'^blog/$', 'blog.views.page'),
-        (r'^blog/page(?P<num>\d+)/$', 'blog.views.page'),
+        url(r'^blog/$', 'blog.views.page'),
+        url(r'^blog/page(?P<num>\d+)/$', 'blog.views.page'),
     )
 
     # View (in blog/views.py)
     def page(request, num="1"):
         # Output the appropriate page of blog entries, according to num.
+        ...
 
 In the above example, both URL patterns point to the same view --
 ``blog.views.page`` -- but the first pattern doesn't capture anything from the
@@ -246,9 +246,6 @@ The variables are:
 * ``handler500`` -- See :data:`django.conf.urls.handler500`.
 * ``handler403`` -- See :data:`django.conf.urls.handler403`.
 
-.. versionadded:: 1.4
-    ``handler403`` is new in Django 1.4.
-
 .. _urlpatterns-view-prefix:
 
 The view prefix
@@ -259,12 +256,12 @@ code duplication.
 
 Here's the example URLconf from the :doc:`Django overview </intro/overview>`::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, url
 
     urlpatterns = patterns('',
-        (r'^articles/(\d{4})/$', 'news.views.year_archive'),
-        (r'^articles/(\d{4})/(\d{2})/$', 'news.views.month_archive'),
-        (r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'news.views.article_detail'),
+        url(r'^articles/(\d{4})/$', 'news.views.year_archive'),
+        url(r'^articles/(\d{4})/(\d{2})/$', 'news.views.month_archive'),
+        url(r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'news.views.article_detail'),
     )
 
 In this example, each view has a common prefix -- ``'news.views'``.
@@ -274,12 +271,12 @@ each view function.
 
 With this in mind, the above example can be written more concisely as::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, url
 
     urlpatterns = patterns('news.views',
-        (r'^articles/(\d{4})/$', 'year_archive'),
-        (r'^articles/(\d{4})/(\d{2})/$', 'month_archive'),
-        (r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'article_detail'),
+        url(r'^articles/(\d{4})/$', 'year_archive'),
+        url(r'^articles/(\d{4})/(\d{2})/$', 'month_archive'),
+        url(r'^articles/(\d{4})/(\d{2})/(\d+)/$', 'article_detail'),
     )
 
 Note that you don't put a trailing dot (``"."``) in the prefix. Django puts
@@ -295,25 +292,25 @@ Just add multiple ``patterns()`` objects together, like this:
 
 Old::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, url
 
     urlpatterns = patterns('',
-        (r'^$', 'myapp.views.app_index'),
-        (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'myapp.views.month_display'),
-        (r'^tag/(?P<tag>\w+)/$', 'weblog.views.tag'),
+        url(r'^$', 'myapp.views.app_index'),
+        url(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'myapp.views.month_display'),
+        url(r'^tag/(?P<tag>\w+)/$', 'weblog.views.tag'),
     )
 
 New::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import patterns, url
 
     urlpatterns = patterns('myapp.views',
-        (r'^$', 'app_index'),
-        (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$','month_display'),
+        url(r'^$', 'app_index'),
+        url(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$','month_display'),
     )
 
     urlpatterns += patterns('weblog.views',
-        (r'^tag/(?P<tag>\w+)/$', 'tag'),
+        url(r'^tag/(?P<tag>\w+)/$', 'tag'),
     )
 
 .. _including-other-urlconfs:
@@ -327,14 +324,13 @@ essentially "roots" a set of URLs below other ones.
 For example, here's an excerpt of the URLconf for the `Django Web site`_
 itself. It includes a number of other URLconfs::
 
-    from django.conf.urls import patterns, include
+    from django.conf.urls import include, patterns, url
 
     urlpatterns = patterns('',
         # ... snip ...
-        (r'^comments/', include('django.contrib.comments.urls')),
-        (r'^community/', include('django_website.aggregator.urls')),
-        (r'^contact/', include('django_website.contact.urls')),
-        (r'^r/', include('django.conf.urls.shortcut')),
+        url(r'^comments/', include('django.contrib.comments.urls')),
+        url(r'^community/', include('django_website.aggregator.urls')),
+        url(r'^contact/', include('django_website.contact.urls')),
         # ... snip ...
     )
 
@@ -349,7 +345,7 @@ URLconf Python module defining them as the ``include()`` argument but by using
 directly the pattern list as returned by :func:`~django.conf.urls.patterns`
 instead. For example, consider this URLconf::
 
-    from django.conf.urls import patterns, url, include
+    from django.conf.urls import include, patterns, url
 
     extra_patterns = patterns('',
         url(r'^reports/(?P<id>\d+)/$', 'credit.views.report'),
@@ -358,8 +354,8 @@ instead. For example, consider this URLconf::
 
     urlpatterns = patterns('',
         url(r'^$', 'apps.main.views.homepage'),
-        (r'^help/', include('apps.help.urls')),
-        (r'^credit/', include(extra_patterns)),
+        url(r'^help/', include('apps.help.urls')),
+        url(r'^credit/', include(extra_patterns)),
     )
 
 In this example, the ``/credit/reports/`` URL will be handled by the
@@ -375,13 +371,13 @@ the following example is valid::
 
     # In settings/urls/main.py
     urlpatterns = patterns('',
-        (r'^(?P<username>\w+)/blog/', include('foo.urls.blog')),
+        url(r'^(?P<username>\w+)/blog/', include('foo.urls.blog')),
     )
 
     # In foo/urls/blog.py
     urlpatterns = patterns('foo.views',
-        (r'^$', 'blog.index'),
-        (r'^archive/$', 'blog.archive'),
+        url(r'^$', 'blog.index'),
+        url(r'^archive/$', 'blog.archive'),
     )
 
 In the above example, the captured ``"username"`` variable is passed to the
@@ -395,13 +391,14 @@ Passing extra options to view functions
 URLconfs have a hook that lets you pass extra arguments to your view functions,
 as a Python dictionary.
 
-Any URLconf tuple can have an optional third element, which should be a
-dictionary of extra keyword arguments to pass to the view function.
+The :func:`django.conf.urls.url` function can take an optional third argument
+which should be a dictionary of extra keyword arguments to pass to the view
+function.
 
 For example::
 
     urlpatterns = patterns('blog.views',
-        (r'^blog/(?P<year>\d{4})/$', 'year_archive', {'foo': 'bar'}),
+        url(r'^blog/(?P<year>\d{4})/$', 'year_archive', {'foo': 'bar'}),
     )
 
 In this example, for a request to ``/blog/2005/``, Django will call
@@ -431,26 +428,26 @@ Set one::
 
     # main.py
     urlpatterns = patterns('',
-        (r'^blog/', include('inner'), {'blogid': 3}),
+        url(r'^blog/', include('inner'), {'blogid': 3}),
     )
 
     # inner.py
     urlpatterns = patterns('',
-        (r'^archive/$', 'mysite.views.archive'),
-        (r'^about/$', 'mysite.views.about'),
+        url(r'^archive/$', 'mysite.views.archive'),
+        url(r'^about/$', 'mysite.views.about'),
     )
 
 Set two::
 
     # main.py
     urlpatterns = patterns('',
-        (r'^blog/', include('inner')),
+        url(r'^blog/', include('inner')),
     )
 
     # inner.py
     urlpatterns = patterns('',
-        (r'^archive/$', 'mysite.views.archive', {'blogid': 3}),
-        (r'^about/$', 'mysite.views.about', {'blogid': 3}),
+        url(r'^archive/$', 'mysite.views.archive', {'blogid': 3}),
+        url(r'^about/$', 'mysite.views.about', {'blogid': 3}),
     )
 
 Note that extra options will *always* be passed to *every* line in the included
@@ -468,9 +465,9 @@ supported -- you can pass any callable object as the view.
 For example, given this URLconf in "string" notation::
 
     urlpatterns = patterns('',
-        (r'^archive/$', 'mysite.views.archive'),
-        (r'^about/$', 'mysite.views.about'),
-        (r'^contact/$', 'mysite.views.contact'),
+        url(r'^archive/$', 'mysite.views.archive'),
+        url(r'^about/$', 'mysite.views.about'),
+        url(r'^contact/$', 'mysite.views.contact'),
     )
 
 You can accomplish the same thing by passing objects rather than strings. Just
@@ -479,9 +476,9 @@ be sure to import the objects::
     from mysite.views import archive, about, contact
 
     urlpatterns = patterns('',
-        (r'^archive/$', archive),
-        (r'^about/$', about),
-        (r'^contact/$', contact),
+        url(r'^archive/$', archive),
+        url(r'^about/$', about),
+        url(r'^contact/$', contact),
     )
 
 The following example is functionally identical. It's just a bit more compact
@@ -491,9 +488,9 @@ each view individually::
     from mysite import views
 
     urlpatterns = patterns('',
-        (r'^archive/$', views.archive),
-        (r'^about/$', views.about),
-        (r'^contact/$', views.contact),
+        url(r'^archive/$', views.archive),
+        url(r'^about/$', views.about),
+        url(r'^contact/$', views.contact),
     )
 
 The style you use is up to you.
@@ -507,7 +504,7 @@ imported::
     from mysite.views import ClassBasedView
 
     urlpatterns = patterns('',
-        (r'^myview/$', ClassBasedView.as_view()),
+        url(r'^myview/$', ClassBasedView.as_view()),
     )
 
 Reverse resolution of URLs
@@ -616,8 +613,8 @@ your URLconf. For example, these two URL patterns both point to the ``archive``
 view::
 
     urlpatterns = patterns('',
-        (r'^archive/(\d{4})/$', archive),
-        (r'^archive-summary/(\d{4})/$', archive, {'summary': True}),
+        url(r'^archive/(\d{4})/$', archive),
+        url(r'^archive-summary/(\d{4})/$', archive, {'summary': True}),
     )
 
 This is completely valid, but it leads to problems when you try to do reverse
@@ -635,7 +632,7 @@ Here's the above example, rewritten to use named URL patterns::
 
     urlpatterns = patterns('',
         url(r'^archive/(\d{4})/$', archive, name="full-archive"),
-        url(r'^archive-summary/(\d{4})/$', archive, {'summary': True}, "arch-summary"),
+        url(r'^archive-summary/(\d{4})/$', archive, {'summary': True}, name="arch-summary"),
     )
 
 With these names in place (``full-archive`` and ``arch-summary``), you can
@@ -647,7 +644,8 @@ target each pattern individually by using its name:
     {% url 'full-archive' 2007 %}
 
 Even though both URL patterns refer to the ``archive`` view here, using the
-``name`` parameter to ``url()`` allows you to tell them apart in templates.
+``name`` parameter to :func:`django.conf.urls.url` allows you to tell them
+apart in templates.
 
 The string used for the URL name can contain any characters you like. You are
 not restricted to valid Python names.
@@ -790,7 +788,7 @@ Firstly, you can provide the :term:`application <application namespace>` and
 :func:`django.conf.urls.include()` when you construct your URL patterns. For
 example,::
 
-    (r'^help/', include('apps.help.urls', namespace='foo', app_name='bar')),
+    url(r'^help/', include('apps.help.urls', namespace='foo', app_name='bar')),
 
 This will include the URLs defined in ``apps.help.urls`` into the
 :term:`application namespace` ``'bar'``, with the :term:`instance namespace`
@@ -810,7 +808,7 @@ For example::
         url(r'^advanced/$', 'apps.help.views.views.advanced'),
     )
 
-    (r'^help/', include(help_patterns, 'bar', 'foo')),
+    url(r'^help/', include(help_patterns, 'bar', 'foo')),
 
 This will include the nominated URL patterns into the given application and
 instance namespace.
diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
index caa2882f37..f73ec4f5be 100644
--- a/docs/topics/http/views.txt
+++ b/docs/topics/http/views.txt
@@ -132,6 +132,8 @@ Customizing error views
 The 404 (page not found) view
 -----------------------------
 
+.. function:: django.views.defaults.page_not_found(request, template_name='404.html')
+
 When you raise an ``Http404`` exception, Django loads a special view devoted
 to handling 404 errors. By default, it's the view
 ``django.views.defaults.page_not_found``, which either produces a very simple
@@ -199,8 +201,6 @@ One thing to note about 500 views:
 The 403 (HTTP Forbidden) view
 -----------------------------
 
-.. versionadded:: 1.4
-
 In the same vein as the 404 and 500 views, Django has a view to handle 403
 Forbidden errors. If a view results in a 403 exception then Django will, by
 default, call the view ``django.views.defaults.permission_denied``.
diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt
index f3bb13ab03..22a0edb073 100644
--- a/docs/topics/i18n/timezones.txt
+++ b/docs/topics/i18n/timezones.txt
@@ -4,8 +4,6 @@
 Time zones
 ==========
 
-.. versionadded:: 1.4
-
 .. _time-zones-overview:
 
 Overview
@@ -312,7 +310,7 @@ time zone is unset, the default time zone applies.
 get_current_timezone
 ~~~~~~~~~~~~~~~~~~~~
 
-When the :func:`django.core.context_processors.tz` context processor is
+When the ``django.core.context_processors.tz`` context processor is
 enabled -- by default, it is -- each :class:`~django.template.RequestContext`
 contains a ``TIME_ZONE`` variable that provides the name of the current time
 zone.
@@ -456,8 +454,9 @@ zone support.
 
 Fixtures generated with ``USE_TZ = False``, or before Django 1.4, use the
 "naive" format. If your project contains such fixtures, after you enable time
-zone support, you'll see :exc:`RuntimeWarning`\ s when you load them. To get
-rid of the warnings, you must convert your fixtures to the "aware" format.
+zone support, you'll see :exc:`~exceptions.RuntimeWarning`\ s when you load
+them. To get rid of the warnings, you must convert your fixtures to the "aware"
+format.
 
 You can regenerate fixtures with :djadmin:`loaddata` then :djadmin:`dumpdata`.
 Or, if they're small enough, you can simply edit them to add the UTC offset
@@ -660,7 +659,7 @@ Usage
        datetime.datetime(2012, 2, 21, 10, 28, 45, tzinfo=<DstTzInfo 'Europe/Helsinki' EET+2:00:00 STD>)
 
    Note that ``localize`` is a pytz extension to the :class:`~datetime.tzinfo`
-   API. Also, you may want to catch :exc:`~pytz.InvalidTimeError`. The
+   API. Also, you may want to catch ``pytz.InvalidTimeError``. The
    documentation of pytz contains `more examples`_. You should review it
    before attempting to manipulate aware datetimes.
 
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 65c6fe2445..811425d229 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -29,7 +29,9 @@ use internationalization, you should take the two seconds to set
 :setting:`USE_I18N = False <USE_I18N>` in your settings file. Then Django will
 make some optimizations so as not to load the internationalization machinery.
 You'll probably also want to remove ``'django.core.context_processors.i18n'``
-from your :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting.
+from your :setting:`TEMPLATE_CONTEXT_PROCESSORS` setting and
+``'django.middleware.locale.LocaleMiddleware'`` from your
+:setting:`MIDDLEWARE_CLASSES` setting.
 
 .. note::
 
@@ -142,14 +144,22 @@ preceding the string, e.g.::
         # Translators: This message appears on the home page only
         output = ugettext("Welcome to my site.")
 
-This also works in templates with the :ttag:`comment` tag:
+The comment will then appear in the resulting ``.po`` file associated with the
+translatable contruct located below it and should also be displayed by most
+translation tools.
 
-.. code-block:: html+django
+.. note:: Just for completeness, this is the corresponding fragment of the
+    resulting ``.po`` file:
 
-    {% comment %}Translators: This is a text of the base template {% endcomment %}
+    .. code-block:: po
 
-The comment will then appear in the resulting ``.po`` file and should also be
-displayed by most translation tools.
+        #. Translators: This message appears on the home page only
+        # path/to/python/file.py:123
+        msgid "Welcome to my site."
+        msgstr ""
+
+This also works in templates. See :ref:`translator-comments-in-templates` for
+more details.
 
 Marking strings as no-op
 ------------------------
@@ -287,8 +297,6 @@ will appear in the ``.po`` file as:
     msgid "May"
     msgstr ""
 
-.. versionadded:: 1.4
-
 Contextual markers are also supported by the :ttag:`trans` and
 :ttag:`blocktrans` template tags.
 
@@ -345,7 +353,7 @@ It is recommended to always provide explicit
 :attr:`~django.db.models.Options.verbose_name` and
 :attr:`~django.db.models.Options.verbose_name_plural` options rather than
 relying on the fallback English-centric and somewhat naïve determination of
-verbose names Django performs bu looking at the model's class name::
+verbose names Django performs by looking at the model's class name::
 
     from django.utils.translation import ugettext_lazy as _
 
@@ -408,6 +416,41 @@ convert them to strings, because they should be converted as late as possible
 (so that the correct locale is in effect). This necessitates the use of the
 helper function described next.
 
+.. _lazy-plural-translations:
+
+Lazy translations and plural
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 1.6
+
+When using lazy translation for a plural string (``[u]n[p]gettext_lazy``), you
+generally don't know the ``number`` argument at the time of the string
+definition. Therefore, you are authorized to pass a key name instead of an
+integer as the ``number`` argument. Then ``number`` will be looked up in the
+dictionary under that key during string interpolation. Here's example::
+
+    class MyForm(forms.Form):
+        error_message = ungettext_lazy("You only provided %(num)d argument",
+            "You only provided %(num)d arguments", 'num')
+
+        def clean(self):
+            # ...
+            if error:
+                raise forms.ValidationError(self.error_message % {'num': number})
+
+If the string contains exactly one unnamed placeholder, you can interpolate
+directly with the ``number`` argument::
+
+    class MyForm(forms.Form):
+        error_message = ungettext_lazy("You provided %d argument",
+            "You provided %d arguments")
+
+        def clean(self):
+            # ...
+            if error:
+                raise forms.ValidationError(self.error_message % number)
+
+
 Joining strings: string_concat()
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -507,7 +550,6 @@ It's not possible to mix a template variable inside a string within ``{% trans
 %}``. If your translations require strings with variables (placeholders), use
 ``{% blocktrans %}`` instead.
 
-.. versionadded:: 1.4
 
 If you'd like to retrieve a translated string without displaying it, you can
 use the following syntax::
@@ -533,8 +575,6 @@ or should be used as arguments for other template tags or filters::
     {% endfor %}
     </p>
 
-.. versionadded:: 1.4
-
 ``{% trans %}`` also supports :ref:`contextual markers<contextual-markers>`
 using the ``context`` keyword:
 
@@ -574,8 +614,6 @@ You can use multiple expressions inside a single ``blocktrans`` tag::
 .. note:: The previous more verbose format is still supported:
    ``{% blocktrans with book|title as book_t and author|title as author_t %}``
 
-.. versionchanged:: 1.4
-
 If resolving one of the block arguments fails, blocktrans will fall back to
 the default language by deactivating the currently active language
 temporarily with the :func:`~django.utils.translation.deactivate_all`
@@ -620,8 +658,6 @@ be retrieved (and stored) beforehand::
     This is a URL: {{ the_url }}
     {% endblocktrans %}
 
-.. versionadded:: 1.4
-
 ``{% blocktrans %}`` also supports :ref:`contextual
 markers<contextual-markers>` using the ``context`` keyword:
 
@@ -629,6 +665,63 @@ markers<contextual-markers>` using the ``context`` keyword:
 
     {% blocktrans with name=user.username context "greeting" %}Hi {{ name }}{% endblocktrans %}
 
+.. _translator-comments-in-templates:
+
+Comments for translators in templates
+-------------------------------------
+
+Just like with :ref:`Python code <translator-comments>`, these notes for
+translators can be specified using comments, either with the :ttag:`comment`
+tag:
+
+.. code-block:: html+django
+
+    {% comment %}Translators: View verb{% endcomment %}
+    {% trans "View" %}
+
+    {% comment %}Translators: Short intro blurb{% endcomment %}
+    <p>{% blocktrans %}A multiline translatable
+    literal.{% endblocktrans %}</p>
+
+or with the ``{#`` ... ``#}`` :ref:`one-line comment constructs <template-comments>`:
+
+.. code-block:: html+django
+
+    {# Translators: Label of a button that triggers search{% endcomment #}
+    <button type="submit">{% trans "Go" %}</button>
+
+    {# Translators: This is a text of the base template #}
+    {% blocktrans %}Ambiguous translatable block of text{% endblocktrans %}
+
+.. note:: Just for completeness, these are the corresponding fragments of the
+    resulting ``.po`` file:
+
+    .. code-block:: po
+
+        #. Translators: View verb
+        # path/to/template/file.html:10
+        msgid "View"
+        msgstr ""
+
+        #. Translators: Short intro blurb
+        # path/to/template/file.html:13
+        msgid ""
+        "A multiline translatable"
+        "literal."
+        msgstr ""
+
+        # ...
+
+        #. Translators: Label of a button that triggers search
+        # path/to/template/file.html:100
+        msgid "Go"
+        msgstr ""
+
+        #. Translators:
+        # path/to/template/file.html:103
+        msgid "Ambiguous translatable block of text"
+        msgstr ""
+
 .. _template-translation-vars:
 
 Other tags
@@ -853,6 +946,52 @@ This isn't as fast as string interpolation in Python, so keep it to those
 cases where you really need it (for example, in conjunction with ``ngettext``
 to produce proper pluralizations).
 
+Note on performance
+-------------------
+
+The :func:`~django.views.i18n.javascript_catalog` view generates the catalog
+from ``.mo`` files on every request. Since its output is constant — at least
+for a given version of a site — it's a good candidate for caching.
+
+Server-side caching will reduce CPU load. It's easily implemented with the
+:func:`~django.views.decorators.cache.cache_page` decorator. To trigger cache
+invalidation when your translations change, provide a version-dependant key
+prefix, as shown in the example below, or map the view at a version-dependant
+URL.
+
+.. code-block:: python
+
+    from django.views.decorators.cache import cache_page
+    from django.views.i18n import javascript_catalog
+
+    # The value returned by get_version() must change when translations change.
+    @cache_page(86400, key_prefix='js18n-%s' % get_version())
+    def cached_javascript_catalog(request, domain='djangojs', packages=None):
+        return javascript_catalog(request, domain, packages)
+
+Client-side caching will save bandwidth and make your site load faster. If
+you're using ETags (:setting:`USE_ETAGS = True <USE_ETAGS>`), you're already
+covered. Otherwise, you can apply :ref:`conditional decorators
+<conditional-decorators>`. In the following example, the cache is invalidated
+whenever your restart your application server.
+
+.. code-block:: python
+
+    from django.utils import timezone
+    from django.views.decorators.http import last_modified
+    from django.views.i18n import javascript_catalog
+
+    last_modified_date = timezone.now()
+    @last_modified(lambda req, **kw: last_modified_date)
+    def cached_javascript_catalog(request, domain='djangojs', packages=None):
+        return javascript_catalog(request, domain, packages)
+
+You can even pre-generate the javascript catalog as part of your deployment
+procedure and serve it as a static file. This radical technique is implemented
+in django-statici18n_.
+
+.. _django-statici18n: http://django-statici18n.readthedocs.org/en/latest/
+
 .. _url-internationalization:
 
 Internationalization: in URL patterns
@@ -928,7 +1067,7 @@ function. Example::
 
     :func:`~django.conf.urls.i18n.i18n_patterns` is only allowed in your root
     URLconf. Using it within an included URLconf will throw an
-    :exc:`ImproperlyConfigured` exception.
+    :exc:`~django.core.exceptions.ImproperlyConfigured` exception.
 
 .. warning::
 
@@ -1248,6 +1387,8 @@ The ``set_language`` redirect view
 
 .. highlightlang:: python
 
+.. currentmodule:: django.views.i18n
+
 .. function:: set_language(request)
 
 As a convenience, Django comes with a view, :func:`django.views.i18n.set_language`,
@@ -1383,9 +1524,14 @@ If you want to let each individual user specify which language he or she
 prefers, use ``LocaleMiddleware``. ``LocaleMiddleware`` enables language
 selection based on data from the request. It customizes content for each user.
 
-To use ``LocaleMiddleware``, add ``'django.middleware.locale.LocaleMiddleware'``
-to your :setting:`MIDDLEWARE_CLASSES` setting. Because middleware order
-matters, you should follow these guidelines:
+``LocaleMiddleware`` is enabled in the default settings file: the
+:setting:`MIDDLEWARE_CLASSES` setting contains
+``'django.middleware.locale.LocaleMiddleware'``.
+
+.. versionchanged:: 1.6
+    In previous versions, ``LocaleMiddleware``  wasn't enabled by default.
+
+Because middleware order matters, you should follow these guidelines:
 
 * Make sure it's one of the first middlewares installed.
 * It should come after ``SessionMiddleware``, because ``LocaleMiddleware``
@@ -1408,8 +1554,6 @@ For example, your :setting:`MIDDLEWARE_CLASSES` might look like this::
 ``LocaleMiddleware`` tries to determine the user's language preference by
 following this algorithm:
 
-.. versionchanged:: 1.4
-
 * First, it looks for the language prefix in the requested URL.  This is
   only performed when you are using the ``i18n_patterns`` function in your
   root URLconf. See :ref:`url-internationalization` for more information
diff --git a/docs/topics/index.txt b/docs/topics/index.txt
index 72f5090b15..f8f60b2953 100644
--- a/docs/topics/index.txt
+++ b/docs/topics/index.txt
@@ -13,13 +13,14 @@ Introductions to all the key parts of Django you'll need to know:
    templates
    class-based-views/index
    files
-   testing
-   auth
+   testing/index
+   auth/index
    cache
    conditional-view-processing
    signing
    email
    i18n/index
+   localflavor
    logging
    pagination
    python3
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index b71033f319..1c99dc5d5a 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -135,7 +135,7 @@ table once ``syncdb`` has created it. After creating a database user with these
 permissions, you'll specify the details in your project's settings file,
 see :setting:`DATABASES` for details.
 
-If you're using Django's :doc:`testing framework</topics/testing>` to test
+If you're using Django's :doc:`testing framework</topics/testing/index>` to test
 database queries, Django will need permission to create a test database.
 
 .. _PostgreSQL: http://www.postgresql.org/
@@ -148,7 +148,7 @@ database queries, Django will need permission to create a test database.
 .. _Oracle: http://www.oracle.com/
 .. _Sybase SQL Anywhere: http://code.google.com/p/sqlany-django/
 .. _IBM DB2: http://code.google.com/p/ibm-db/
-.. _Microsoft SQL Server 2005: http://code.google.com/p/django-mssql/
+.. _Microsoft SQL Server 2005: https://bitbucket.org/Manfre/django-mssql/
 .. _Firebird: http://code.google.com/p/django-firebird/
 .. _ODBC: http://code.google.com/p/django-pyodbc/
 .. _removing-old-versions-of-django:
diff --git a/docs/ref/contrib/localflavor.txt b/docs/topics/localflavor.txt
similarity index 76%
rename from docs/ref/contrib/localflavor.txt
rename to docs/topics/localflavor.txt
index 9bb27e6e74..8ae435463d 100644
--- a/docs/ref/contrib/localflavor.txt
+++ b/docs/topics/localflavor.txt
@@ -2,15 +2,10 @@
 The "local flavor" add-ons
 ==========================
 
-.. module:: django.contrib.localflavor
-    :synopsis: A collection of various Django snippets that are useful only for
-               a particular country or culture.
-
 Historically, Django has shipped with ``django.contrib.localflavor`` --
 assorted pieces of code that are useful for particular countries or cultures.
-Starting with Django 1.5, we've started the process of moving the code to
-outside packages (i.e., packages distributed separately from Django), for
-easier maintenance and to trim the size of Django's codebase.
+This code is now distributed separately from Django, for easier maintenance
+and to trim the size of Django's codebase.
 
 The localflavor packages are named ``django-localflavor-*``, where the asterisk
 is an `ISO 3166 country code`_. For example: ``django-localflavor-us`` is the
@@ -37,38 +32,7 @@ file.
 
 .. _ISO 3166 country code: http://www.iso.org/iso/country_codes.htm
 
-How to migrate
-==============
-
-If you've used the old ``django.contrib.localflavor`` package, follow these two
-easy steps to update your code:
-
-1. Install the appropriate third-party ``django-localflavor-*`` package(s).
-   Go to https://github.com/django/ and find the package for your country.
-
-2. Change your app's import statements to reference the new packages.
-
-   For example, change this::
-
-       from django.contrib.localflavor.fr.forms import FRPhoneNumberField
-
-   ...to this::
-
-       from django_localflavor_fr.forms import FRPhoneNumberField
-
-The code in the new packages is the same (it was copied directly from Django),
-so you don't have to worry about backwards compatibility in terms of
-functionality. Only the imports have changed.
-
-Deprecation policy
-==================
-
-In Django 1.5, importing from ``django.contrib.localflavor`` will result in a
-``DeprecationWarning``. This means your code will still work, but you should
-change it as soon as possible.
-
-In Django 1.6, importing from ``django.contrib.localflavor`` will no longer
-work.
+.. _localflavor-packages:
 
 Supported countries
 ===================
@@ -90,6 +54,7 @@ The following countries have django-localflavor- packages.
 * Finland: https://github.com/django/django-localflavor-fi
 * France: https://github.com/django/django-localflavor-fr
 * Germany: https://github.com/django/django-localflavor-de
+* Greece: https://github.com/spapas/django-localflavor-gr
 * Hong Kong: https://github.com/django/django-localflavor-hk
 * Iceland: https://github.com/django/django-localflavor-is
 * India: https://github.com/django/django-localflavor-in
@@ -121,28 +86,47 @@ The following countries have django-localflavor- packages.
 * United States of America: https://github.com/django/django-localflavor-us
 * Uruguay: https://github.com/django/django-localflavor-uy
 
-django.contrib.localflavor.generic
-==================================
+Internationalization of localflavors
+====================================
 
-The ``django.contrib.localflavor.generic`` package, which hasn't been removed from
-Django yet, contains useful code that is not specific to one particular country
-or culture. Currently, it defines date, datetime and split datetime input
-fields based on those from :doc:`forms </topics/forms/index>`, but with non-US
-default formats. Here's an example of how to use them::
+To activate translations for a ``localflavor`` application, you must include
+the application's name (e.g. ``django_localflavor_jp``) in the
+:setting:`INSTALLED_APPS` setting, so the internationalization system can find
+the catalog, as explained in :ref:`how-django-discovers-translations`.
 
-    from django import forms
-    from django.contrib.localflavor import generic
+.. _localflavor-how-to-migrate:
 
-    class MyForm(forms.Form):
-        my_date_field = generic.forms.DateField()
+How to migrate
+==============
 
-Internationalization of localflavor
-===================================
+If you've used the old ``django.contrib.localflavor`` package, follow these two
+easy steps to update your code:
 
-Localflavor has its own catalog of translations, in the directory
-``django/contrib/localflavor/locale``, and it's not loaded automatically like
-Django's general catalog in ``django/conf/locale``. If you want localflavor's
-texts to be translated, like form fields error messages, you must include
-:mod:`django.contrib.localflavor` in the :setting:`INSTALLED_APPS` setting, so
-the internationalization system can find the catalog, as explained in
-:ref:`how-django-discovers-translations`.
+1. Install the appropriate third-party ``django-localflavor-*`` package(s).
+   Go to https://github.com/django/ and find the package for your country.
+
+2. Change your app's import statements to reference the new packages.
+
+   For example, change this::
+
+       from django.contrib.localflavor.fr.forms import FRPhoneNumberField
+
+   ...to this::
+
+       from django_localflavor_fr.forms import FRPhoneNumberField
+
+The code in the new packages is the same (it was copied directly from Django),
+so you don't have to worry about backwards compatibility in terms of
+functionality. Only the imports have changed.
+
+.. _localflavor-deprecation-policy:
+
+Deprecation policy
+==================
+
+In Django 1.5, importing from ``django.contrib.localflavor`` will result in a
+``DeprecationWarning``. This means your code will still work, but you should
+change it as soon as possible.
+
+In Django 1.6, importing from ``django.contrib.localflavor`` will no longer
+work.
diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index 652ad397ff..cb22a57e84 100644
--- a/docs/topics/logging.txt
+++ b/docs/topics/logging.txt
@@ -141,7 +141,7 @@ error log record will be written.
 Naming loggers
 --------------
 
-The call to :meth:`logging.getLogger()` obtains (creating, if
+The call to :func:`logging.getLogger()` obtains (creating, if
 necessary) an instance of a logger. The logger instance is identified
 by a name. This name is used to identify the logger for configuration
 purposes.
@@ -242,7 +242,7 @@ An example
 The full documentation for `dictConfig format`_ is the best source of
 information about logging configuration dictionaries. However, to give
 you a taste of what is possible, here is an example of a fairly
-complex logging setup, configured using :meth:`logging.dictConfig`::
+complex logging setup, configured using :func:`logging.config.dictConfig`::
 
     LOGGING = {
         'version': 1,
@@ -308,7 +308,7 @@ This logging configuration does the following things:
   * ``simple``, that just outputs the log level name (e.g.,
     ``DEBUG``) and the log message.
 
-    The `format` string is a normal Python formatting string
+    The ``format`` string is a normal Python formatting string
     describing the details that are to be output on each logging
     line. The full list of detail that can be output can be
     found in the `formatter documentation`_.
@@ -317,12 +317,12 @@ This logging configuration does the following things:
     message, plus the time, process, thread and module that
     generate the log message.
 
-* Defines one filter -- :class:`project.logging.SpecialFilter`,
+* Defines one filter -- ``project.logging.SpecialFilter``,
   using the alias ``special``. If this filter required additional
   arguments at time of construction, they can be provided as
   additional keys in the filter configuration dictionary. In this
   case, the argument ``foo`` will be given a value of ``bar`` when
-  instantiating the :class:`SpecialFilter`.
+  instantiating the ``SpecialFilter``.
 
 * Defines three handlers:
 
@@ -330,7 +330,7 @@ This logging configuration does the following things:
     higher) message to ``/dev/null``.
 
   * ``console``, a StreamHandler, which will print any ``DEBUG``
-    (or higher) message to stderr. This handler uses the `simple` output
+    (or higher) message to stderr. This handler uses the ``simple`` output
     format.
 
   * ``mail_admins``, an AdminEmailHandler, which will email any
@@ -365,7 +365,7 @@ logger, you can specify your own configuration scheme.
 
 The :setting:`LOGGING_CONFIG` setting defines the callable that will
 be used to configure Django's loggers. By default, it points at
-Python's :meth:`logging.dictConfig()` method. However, if you want to
+Python's :func:`logging.config.dictConfig()` function. However, if you want to
 use a different configuration process, you can use any other callable
 that takes a single argument. The contents of :setting:`LOGGING` will
 be provided as the value of that argument when logging is configured.
@@ -504,14 +504,12 @@ logging module.
 
 .. class:: CallbackFilter(callback)
 
-   .. versionadded:: 1.4
-
    This filter accepts a callback function (which should accept a single
    argument, the record to be logged), and calls it for each record that passes
    through the filter. Handling of that record will not proceed if the callback
    returns False.
 
-   For instance, to filter out :class:`~django.http.UnreadablePostError`
+   For instance, to filter out :exc:`~django.http.UnreadablePostError`
    (raised when a user cancels an upload) from the admin emails, you would
    create a filter function::
 
@@ -542,13 +540,11 @@ logging module.
 
 .. class:: RequireDebugFalse()
 
-   .. versionadded:: 1.4
-
    This filter will only pass on records when settings.DEBUG is False.
 
    This filter is used as follows in the default :setting:`LOGGING`
    configuration to ensure that the :class:`AdminEmailHandler` only sends error
-   emails to admins when :setting:`DEBUG` is `False`::
+   emails to admins when :setting:`DEBUG` is ``False``::
 
        'filters': {
             'require_debug_false': {
@@ -568,7 +564,7 @@ logging module.
    .. versionadded:: 1.5
 
    This filter is similar to :class:`RequireDebugFalse`, except that records are
-   passed only when :setting:`DEBUG` is `True`.
+   passed only when :setting:`DEBUG` is ``True``.
 
 .. _default-logging-configuration:
 
@@ -580,8 +576,8 @@ with ``ERROR`` or ``CRITICAL`` level are sent to :class:`AdminEmailHandler`, as
 long as the :setting:`DEBUG` setting is set to ``False``.
 
 All messages reaching the ``django`` catch-all logger when :setting:`DEBUG` is
-`True` are sent ot the console. They are simply discarded (sent to
-``NullHandler``) when :setting:`DEBUG` is `False`.
+``True`` are sent to the console. They are simply discarded (sent to
+``NullHandler``) when :setting:`DEBUG` is ``False``.
 
 .. versionchanged:: 1.5
 
diff --git a/docs/topics/pagination.txt b/docs/topics/pagination.txt
index 6c3ab77b11..17747c22ff 100644
--- a/docs/topics/pagination.txt
+++ b/docs/topics/pagination.txt
@@ -126,12 +126,6 @@ pages along with any interesting information from the objects themselves::
         </span>
     </div>
 
-.. versionchanged:: 1.4
-    Previously, you would need to use
-    ``{% for contact in contacts.object_list %}``, since the ``Page``
-    object was not iterable.
-
-
 ``Paginator`` objects
 =====================
 
@@ -205,8 +199,8 @@ Attributes
 
 .. exception:: InvalidPage
 
-	A base class for exceptions raised when a paginator is passed an invalid
-	page number.
+    A base class for exceptions raised when a paginator is passed an invalid
+    page number.
 
 The :meth:`Paginator.page` method raises an exception if the requested page is
 invalid (i.e., not an integer) or contains no objects. Generally, it's enough
@@ -234,7 +228,6 @@ using :meth:`Paginator.page`.
 
 .. class:: Page(object_list, number, paginator)
 
-.. versionadded:: 1.4
     A page acts like a sequence of :attr:`Page.object_list` when using
     ``len()`` or iterating it directly.
 
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index e6dc165399..33f5fcd4c0 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -78,8 +78,8 @@ wherever possible and avoid the ``b`` prefixes.
 String handling
 ---------------
 
-Python 2's :class:`unicode` type was renamed :class:`str` in Python 3,
-:class:`str` was renamed :class:`bytes`, and :class:`basestring` disappeared.
+Python 2's :func:`unicode` type was renamed :func:`str` in Python 3,
+:func:`str` was renamed ``bytes()``, and :func:`basestring` disappeared.
 six_ provides :ref:`tools <string-handling-with-six>` to deal with these
 changes.
 
@@ -131,35 +131,36 @@ and ``SafeText`` respectively.
 
 For forwards compatibility, the new names work as of Django 1.4.2.
 
-:meth:`__str__` and :meth:`__unicode__` methods
------------------------------------------------
+:meth:`~object.__str__` and :meth:`~object.__unicode__` methods
+---------------------------------------------------------------
 
-In Python 2, the object model specifies :meth:`__str__` and
-:meth:`__unicode__` methods. If these methods exist, they must return
-:class:`str` (bytes) and :class:`unicode` (text) respectively.
+In Python 2, the object model specifies :meth:`~object.__str__` and
+:meth:`~object.__unicode__` methods. If these methods exist, they must return
+``str`` (bytes) and ``unicode`` (text) respectively.
 
-The ``print`` statement and the :func:`str` built-in call :meth:`__str__` to
-determine the human-readable representation of an object. The :func:`unicode`
-built-in calls :meth:`__unicode__` if it exists, and otherwise falls back to
-:meth:`__str__` and decodes the result with the system encoding. Conversely,
-the :class:`~django.db.models.Model` base class automatically derives
-:meth:`__str__` from :meth:`__unicode__` by encoding to UTF-8.
+The ``print`` statement and the :func:`str` built-in call
+:meth:`~object.__str__` to determine the human-readable representation of an
+object. The :func:`unicode` built-in calls :meth:`~object.__unicode__` if it
+exists, and otherwise falls back to :meth:`~object.__str__` and decodes the
+result with the system encoding. Conversely, the
+:class:`~django.db.models.Model` base class automatically derives
+:meth:`~object.__str__` from :meth:`~object.__unicode__` by encoding to UTF-8.
 
-In Python 3, there's simply :meth:`__str__`, which must return :class:`str`
+In Python 3, there's simply :meth:`~object.__str__`, which must return ``str``
 (text).
 
-(It is also possible to define :meth:`__bytes__`, but Django application have
+(It is also possible to define ``__bytes__()``, but Django application have
 little use for that method, because they hardly ever deal with
-:class:`bytes`.)
+``bytes``.)
 
-Django provides a simple way to define :meth:`__str__` and :meth:`__unicode__`
-methods that work on Python 2 and 3: you must define a :meth:`__str__` method
-returning text and to apply the
+Django provides a simple way to define :meth:`~object.__str__` and
+:meth:`~object.__unicode__` methods that work on Python 2 and 3: you must
+define a :meth:`~object.__str__` method returning text and to apply the
 :func:`~django.utils.encoding.python_2_unicode_compatible` decorator.
 
 On Python 3, the decorator is a no-op. On Python 2, it defines appropriate
-:meth:`__unicode__` and :meth:`__str__` methods (replacing the original
-:meth:`__str__` method in the process). Here's an example::
+:meth:`~object.__unicode__` and :meth:`~object.__str__` methods (replacing the
+original :meth:`~object.__str__` method in the process). Here's an example::
 
     from __future__ import unicode_literals
     from django.utils.encoding import python_2_unicode_compatible
@@ -173,8 +174,8 @@ This technique is the best match for Django's porting philosophy.
 
 For forwards compatibility, this decorator is available as of Django 1.4.2.
 
-Finally, note that :meth:`__repr__` must return a :class:`str` on all versions
-of Python.
+Finally, note that :meth:`~object.__repr__` must return a ``str`` on all
+versions of Python.
 
 :class:`dict` and :class:`dict`-like classes
 --------------------------------------------
@@ -186,20 +187,20 @@ behave likewise in Python 3.
 
 six_ provides compatibility functions to work around this change:
 :func:`~six.iterkeys`, :func:`~six.iteritems`, and :func:`~six.itervalues`.
-Django's bundled version adds :func:`~django.utils.six.iterlists` for
-:class:`~django.utils.datastructures.MultiValueDict` and its subclasses.
+It also contains an undocumented ``iterlists`` function that works well for
+``django.utils.datastructures.MultiValueDict`` and its subclasses.
 
 :class:`~django.http.HttpRequest` and :class:`~django.http.HttpResponse` objects
 --------------------------------------------------------------------------------
 
 According to :pep:`3333`:
 
-- headers are always :class:`str` objects,
-- input and output streams are always :class:`bytes` objects.
+- headers are always ``str`` objects,
+- input and output streams are always ``bytes`` objects.
 
 Specifically, :attr:`HttpResponse.content <django.http.HttpResponse.content>`
-contains :class:`bytes`, which may become an issue if you compare it with a
-:class:`str` in your tests. The preferred solution is to rely on
+contains ``bytes``, which may become an issue if you compare it with a
+``str`` in your tests. The preferred solution is to rely on
 :meth:`~django.test.TestCase.assertContains` and
 :meth:`~django.test.TestCase.assertNotContains`. These methods accept a
 response and a unicode string as arguments.
@@ -236,11 +237,10 @@ under Python 3, use the :func:`str` builtin::
 
     str('my string')
 
-In Python 3, there aren't any automatic conversions between :class:`str` and
-:class:`bytes`, and the :mod:`codecs` module became more strict.
-:meth:`str.decode` always returns :class:`bytes`, and :meth:`bytes.decode`
-always returns :class:`str`. As a consequence, the following pattern is
-sometimes necessary::
+In Python 3, there aren't any automatic conversions between ``str`` and
+``bytes``, and the :mod:`codecs` module became more strict. :meth:`str.encode`
+always returns ``bytes``, and ``bytes.decode`` always returns ``str``. As a
+consequence, the following pattern is sometimes necessary::
 
     value = value.encode('ascii', 'ignore').decode('ascii')
 
@@ -343,7 +343,7 @@ meaning of ``str`` changed. To test these types, use the following idioms::
     isinstance(myvalue, bytes)                  # replacement for str
 
 Python ≥ 2.6 provides ``bytes`` as an alias for ``str``, so you don't need
-:attr:`six.binary_type`.
+:data:`six.binary_type`.
 
 ``long``
 ~~~~~~~~
@@ -356,7 +356,7 @@ The ``long`` type no longer exists in Python 3. ``1L`` is a syntax error. Use
 ``xrange``
 ~~~~~~~~~~
 
-Import :func:`six.moves.xrange` wherever you use ``xrange``.
+Import ``six.moves.xrange`` wherever you use ``xrange``.
 
 Moved modules
 ~~~~~~~~~~~~~
@@ -391,21 +391,19 @@ function.
 Customizations of six
 ---------------------
 
-The version of six bundled with Django includes one extra function:
-
-.. function:: iterlists(MultiValueDict)
-
-    Returns an iterator over the lists of values of a
-    :class:`~django.utils.datastructures.MultiValueDict`. This replaces
-    :meth:`~django.utils.datastructures.MultiValueDict.iterlists()` on Python
-    2 and :meth:`~django.utils.datastructures.MultiValueDict.lists()` on
-    Python 3.
+The version of six bundled with Django includes a few extras.
 
 .. function:: assertRaisesRegex(testcase, *args, **kwargs)
 
     This replaces ``testcase.assertRaisesRegexp`` on Python 2, and
     ``testcase.assertRaisesRegex`` on Python 3. ``assertRaisesRegexp`` still
-    exists in current Python3 versions, but issues a warning.
+    exists in current Python 3 versions, but issues a warning.
+
+.. function:: assertRegex(testcase, *args, **kwargs)
+
+    This replaces ``testcase.assertRegexpMatches`` on Python 2, and
+    ``testcase.assertRegex`` on Python 3. ``assertRegexpMatches`` still
+    exists in current Python 3 versions, but issues a warning.
 
 
 In addition to six' defaults moves, Django's version provides ``thread`` as
diff --git a/docs/topics/security.txt b/docs/topics/security.txt
index 169f9ac773..566202eefa 100644
--- a/docs/topics/security.txt
+++ b/docs/topics/security.txt
@@ -38,7 +38,7 @@ in unauthorized JavaScript execution, depending on how the browser renders
 imperfect HTML.
 
 It is also important to be particularly careful when using ``is_safe`` with
-custom template tags, the :ttag:`safe` template tag, :mod:`mark_safe
+custom template tags, the :tfilter:`safe` template tag, :mod:`mark_safe
 <django.utils.safestring>`, and when autoescape is turned off.
 
 In addition, if you are using the template system to output something other
@@ -48,13 +48,6 @@ escaping.
 You should also be very careful when storing HTML in the database, especially
 when that HTML is retrieved and displayed.
 
-Markup library
---------------
-
-If you use :mod:`django.contrib.markup`, you need to ensure that the filters are
-only used on trusted input, or that you have correctly configured them to ensure
-they do not allow raw HTML output. See the documentation of that module for more
-information.
 
 Cross site request forgery (CSRF) protection
 ============================================
@@ -76,8 +69,8 @@ POST to your Web site and have another logged in user unwittingly submit that
 form. The malicious user would have to know the nonce, which is user specific
 (using a cookie).
 
-When deployed with :ref:`HTTPS <security-recommendation-ssl>`, 
-``CsrfViewMiddleware`` will check that the HTTP referer header is set to a 
+When deployed with :ref:`HTTPS <security-recommendation-ssl>`,
+``CsrfViewMiddleware`` will check that the HTTP referer header is set to a
 URL on the same origin (including subdomain and port). Because HTTPS
 provides additional security, it is imperative to ensure connections use HTTPS
 where it is available by forwarding insecure connection requests and using
@@ -167,47 +160,40 @@ server, there are some additional steps you may need:
 
 .. _host-headers-virtual-hosting:
 
-Host headers and virtual hosting
-================================
+Host header validation
+======================
 
-Django uses the ``Host`` header provided by the client to construct URLs
-in certain cases. While these values are sanitized to prevent Cross
-Site Scripting attacks, they can be used for Cross-Site Request
-Forgery and cache poisoning attacks in some circumstances. We
-recommend you ensure your Web server is configured such that:
+Django uses the ``Host`` header provided by the client to construct URLs in
+certain cases. While these values are sanitized to prevent Cross Site Scripting
+attacks, a fake ``Host`` value can be used for Cross-Site Request Forgery,
+cache poisoning attacks, and poisoning links in emails.
 
-* It always validates incoming HTTP ``Host`` headers against the expected
-  host name.
-* Disallows requests with no ``Host`` header.
-* Is *not* configured with a catch-all virtual host that forwards requests
-  to a Django application.
+Because even seemingly-secure webserver configurations are susceptible to fake
+``Host`` headers, Django validates ``Host`` headers against the
+:setting:`ALLOWED_HOSTS` setting in the
+:meth:`django.http.HttpRequest.get_host()` method.
+
+This validation only applies via :meth:`~django.http.HttpRequest.get_host()`;
+if your code accesses the ``Host`` header directly from ``request.META`` you
+are bypassing this security protection.
+
+For more details see the full :setting:`ALLOWED_HOSTS` documentation.
+
+.. warning::
+
+   Previous versions of this document recommended configuring your webserver to
+   ensure it validates incoming HTTP ``Host`` headers. While this is still
+   recommended, in many common webservers a configuration that seems to
+   validate the ``Host`` header may not in fact do so. For instance, even if
+   Apache is configured such that your Django site is served from a non-default
+   virtual host with the ``ServerName`` set, it is still possible for an HTTP
+   request to match this virtual host and supply a fake ``Host`` header. Thus,
+   Django now requires that you set :setting:`ALLOWED_HOSTS` explicitly rather
+   than relying on webserver configuration.
 
 Additionally, as of 1.3.1, Django requires you to explicitly enable support for
-the ``X-Forwarded-Host`` header if your configuration requires it.
-
-Configuration for Apache
-------------------------
-
-The easiest way to get the described behavior in Apache is as follows. Create
-a `virtual host`_ using the ServerName_ and ServerAlias_ directives to restrict
-the domains Apache reacts to. Please keep in mind that while the directives do
-support ports the match is only performed against the hostname. This means that
-the ``Host`` header could still contain a port pointing to another webserver on
-the same machine. The next step is to make sure that your newly created virtual
-host is not also the default virtual host. Apache uses the first virtual host
-found in the configuration file as default virtual host.  As such you have to
-ensure that you have another virtual host which will act as catch-all virtual
-host. Just add one if you do not have one already, there is nothing special
-about it aside from ensuring it is the first virtual host in the configuration
-file. Debian/Ubuntu users usually don't have to take any action, since Apache
-ships with a default virtual host in ``sites-available`` which is linked into
-``sites-enabled`` as ``000-default`` and included from ``apache2.conf``. Just
-make sure not to name your site ``000-abc``, since files are included in
-alphabetical order.
-
-.. _virtual host: http://httpd.apache.org/docs/2.2/vhosts/
-.. _ServerName: http://httpd.apache.org/docs/2.2/mod/core.html#servername
-.. _ServerAlias: http://httpd.apache.org/docs/2.2/mod/core.html#serveralias
+the ``X-Forwarded-Host`` header (via the :setting:`USE_X_FORWARDED_HOST`
+setting) if your configuration requires it.
 
 
 .. _additional-security-topics:
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index 28f600e223..ce39f6cd28 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -26,6 +26,8 @@ to (see `Serialization formats`_) and a
 argument can be any iterator that yields Django model instances, but it'll
 almost always be a QuerySet).
 
+.. function:: django.core.serializers.get_serializer(format)
+
 You can also use a serializer object directly::
 
     XMLSerializer = serializers.get_serializer("xml")
@@ -43,7 +45,7 @@ This is useful if you want to serialize data directly to a file-like object
 
     Calling :func:`~django.core.serializers.get_serializer` with an unknown
     :ref:`format <serialization-formats>` will raise a
-    :class:`~django.core.serializers.SerializerDoesNotExist` exception.
+    ``django.core.serializers.SerializerDoesNotExist`` exception.
 
 Subset of fields
 ~~~~~~~~~~~~~~~~
@@ -88,11 +90,11 @@ If you only serialize the Restaurant model::
 
     data = serializers.serialize('xml', Restaurant.objects.all())
 
-the fields on the serialized output will only contain the `serves_hot_dogs`
-attribute. The `name` attribute of the base class will be ignored.
+the fields on the serialized output will only contain the ``serves_hot_dogs``
+attribute. The ``name`` attribute of the base class will be ignored.
 
-In order to fully serialize your Restaurant instances, you will need to
-serialize the Place models as well::
+In order to fully serialize your ``Restaurant`` instances, you will need to
+serialize the ``Place`` models as well::
 
     all_objects = list(Restaurant.objects.all()) + list(Place.objects.all())
     data = serializers.serialize('xml', all_objects)
@@ -115,6 +117,16 @@ object and any associated relationship data.
 
 Calling ``DeserializedObject.save()`` saves the object to the database.
 
+.. note::
+
+    If the ``pk`` attribute in the serialized data doesn't exist or is
+    null, a new instance will be saved to the database.
+
+.. versionchanged:: 1.6
+
+In previous versions of Django, the ``pk`` attribute had to be present
+on the serialized data or a ``DeserializationError`` would be raised.
+
 This ensures that deserializing is a non-destructive operation even if the
 data in your serialized representation doesn't match what's currently in the
 database. Usually, working with these ``DeserializedObject`` instances looks
@@ -160,11 +172,82 @@ Identifier  Information
 .. _json: http://json.org/
 .. _PyYAML: http://www.pyyaml.org/
 
-Notes for specific serialization formats
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+XML
+~~~
 
-json
-^^^^
+The basic XML serialization format is quite simple::
+
+    <?xml version="1.0" encoding="utf-8"?>
+    <django-objects version="1.0">
+        <object pk="123" model="sessions.session">
+            <field type="DateTimeField" name="expire_date">2013-01-16T08:16:59.844560+00:00</field>
+            <!-- ... -->
+        </object>
+    </django-objects>
+
+The whole collection of objects that is either serialized or de-serialized is
+represented by a ``<django-objects>``-tag which contains multiple
+``<object>``-elements. Each such object has two attributes: "pk" and "model",
+the latter being represented by the name of the app ("sessions") and the
+lowercase name of the model ("session") separated by a dot.
+
+Each field of the object is serialized as a ``<field>``-element sporting the
+fields "type" and "name". The text content of the element represents the value
+that should be stored.
+
+Foreign keys and other relational fields are treated a little bit differently::
+
+    <object pk="27" model="auth.permission">
+        <!-- ... -->
+        <field to="contenttypes.contenttype" name="content_type" rel="ManyToOneRel">9</field>
+        <!-- ... -->
+    </object>
+
+In this example we specify that the auth.Permission object with the PK 24 has
+a foreign key to the contenttypes.ContentType instance with the PK 9.
+
+ManyToMany-relations are exported for the model that binds them. For instance,
+the auth.User model has such a relation to the auth.Permission model::
+
+    <object pk="1" model="auth.user">
+        <!-- ... -->
+        <field to="auth.permission" name="user_permissions" rel="ManyToManyRel">
+            <object pk="46"></object>
+            <object pk="47"></object>
+        </field>
+    </object>
+
+This example links the given user with the permission models with PKs 46 and 47.
+
+JSON
+~~~~
+
+When staying with the same example data as before it would be serialized as
+JSON in the following way::
+
+    [
+        {
+            "pk": "4b678b301dfd8a4e0dad910de3ae245b",
+            "model": "sessions.session",
+            "fields": {
+                "expire_date": "2013-01-16T08:16:59.844Z",
+                ...
+            }
+        }
+    ]
+
+The formatting here is a bit simpler than with XML. The whole collection
+is just represented as an array and the objects are represented by JSON objects
+with three properties: "pk", "model" and "fields". "fields" is again an object
+containing each field's name and value as property and property-value
+respectively.
+
+Foreign keys just have the PK of the linked object as property value.
+ManyToMany-relations are serialized for the model that defines them and are
+represented as a list of PKs.
+
+Date and datetime related types are treated in a special way by the JSON
+serializer to make the format compatible with `ECMA-262`_.
 
 Be aware that not all Django output can be passed unmodified to :mod:`json`.
 In particular, :ref:`lazy translation objects <lazy-translations>` need a
@@ -173,14 +256,29 @@ In particular, :ref:`lazy translation objects <lazy-translations>` need a
     import json
     from django.utils.functional import Promise
     from django.utils.encoding import force_text
+    from django.core.serializers.json import DjangoJSONEncoder
 
-    class LazyEncoder(json.JSONEncoder):
+    class LazyEncoder(DjangoJSONEncoder):
         def default(self, obj):
             if isinstance(obj, Promise):
                 return force_text(obj)
             return super(LazyEncoder, self).default(obj)
 
 .. _special encoder: http://docs.python.org/library/json.html#encoders-and-decoders
+.. _ecma-262: http://www.ecma-international.org/ecma-262/5.1/#sec-15.9.1.15
+
+YAML
+~~~~
+
+YAML serialization looks quite similar to JSON. The object list is serialized
+as a sequence mappings with the keys "pk", "model" and "fields". Each field is
+again a mapping with the key being name of the field and the value the value::
+
+    -   fields: {expire_date: !!timestamp '2013-01-16 08:16:59.844560+00:00'}
+        model: sessions.session
+        pk: 4b678b301dfd8a4e0dad910de3ae245b
+
+Referential fields are again just represented by the PK or sequence of PKs.
 
 .. _topics-serialization-natural-keys:
 
@@ -193,7 +291,7 @@ This strategy works well for most objects, but it can cause difficulty in some
 circumstances.
 
 Consider the case of a list of objects that have a foreign key referencing
-:class:`~django.contrib.conttenttypes.models.ContentType`. If you're going to
+:class:`~django.contrib.contenttypes.models.ContentType`. If you're going to
 serialize an object that refers to a content type, then you need to have a way
 to refer to that content type to begin with. Since ``ContentType`` objects are
 automatically created by Django during the database synchronization process,
@@ -341,7 +439,7 @@ When ``use_natural_keys=True`` is specified, Django will use the
 type that defines the method.
 
 If you are using :djadmin:`dumpdata` to generate serialized data, you
-use the `--natural` command line flag to generate natural keys.
+use the :djadminopt:`--natural` command line flag to generate natural keys.
 
 .. note::
 
@@ -360,7 +458,7 @@ Dependencies during serialization
 
 Since natural keys rely on database lookups to resolve references, it
 is important that the data exists before it is referenced. You can't make
-a `forward reference` with natural keys -- the data you're referencing
+a "forward reference" with natural keys -- the data you're referencing
 must exist before you include a natural key reference to that data.
 
 To accommodate this limitation, calls to :djadmin:`dumpdata` that use
diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt
index 88fa7b6864..fa26297988 100644
--- a/docs/topics/settings.txt
+++ b/docs/topics/settings.txt
@@ -32,6 +32,8 @@ Because a settings file is a Python module, the following apply:
 Designating the settings
 ========================
 
+.. envvar:: DJANGO_SETTINGS_MODULE
+
 When you use Django, you have to tell it which settings you're using. Do this
 by using an environment variable, ``DJANGO_SETTINGS_MODULE``.
 
@@ -260,4 +262,3 @@ It boils down to this: Use exactly one of either ``configure()`` or
 ``DJANGO_SETTINGS_MODULE``. Not both, and not neither.
 
 .. _@login_required: ../authentication/#the-login-required-decorator
-
diff --git a/docs/topics/signals.txt b/docs/topics/signals.txt
index 1078d0372c..d611da4a37 100644
--- a/docs/topics/signals.txt
+++ b/docs/topics/signals.txt
@@ -30,7 +30,7 @@ notifications:
 
 * :data:`django.db.models.signals.m2m_changed`
 
-  Sent when a :class:`ManyToManyField` on a model is changed.
+  Sent when a :class:`~django.db.models.ManyToManyField` on a model is changed.
 
 * :data:`django.core.signals.request_started` &
   :data:`django.core.signals.request_finished`
@@ -213,7 +213,8 @@ Defining signals
 
 All signals are :class:`django.dispatch.Signal` instances. The
 ``providing_args`` is a list of the names of arguments the signal will provide
-to listeners.
+to listeners. This is purely documentational, however, as there is nothing that
+checks that the signal actually provides these arguments to its listeners.
 
 For example:
 
diff --git a/docs/topics/signing.txt b/docs/topics/signing.txt
index 07de97e2f3..68afd6962a 100644
--- a/docs/topics/signing.txt
+++ b/docs/topics/signing.txt
@@ -5,8 +5,6 @@ Cryptographic signing
 .. module:: django.core.signing
    :synopsis: Django's signing framework.
 
-.. versionadded:: 1.4
-
 The golden rule of Web application security is to never trust data from
 untrusted sources. Sometimes it can be useful to pass data through an
 untrusted medium. Cryptographically signed values can be passed through an
@@ -60,6 +58,7 @@ You can retrieve the original value using the ``unsign`` method::
 If the signature or value have been altered in any way, a
 ``django.core.signing.BadSignature`` exception will be raised::
 
+    >>> from django.core import signing
     >>> value += 'm'
     >>> try:
     ...    original = signer.unsign(value)
diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
index fb2119515b..58a3ee9870 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -250,6 +250,8 @@ You can also create your own custom template tags; see
     tags and filters available for a given site. See
     :doc:`/ref/contrib/admin/admindocs`.
 
+.. _template-comments:
+
 Comments
 ========
 
diff --git a/docs/topics/_images/django_unittest_classes_hierarchy.graffle b/docs/topics/testing/_images/django_unittest_classes_hierarchy.graffle
similarity index 100%
rename from docs/topics/_images/django_unittest_classes_hierarchy.graffle
rename to docs/topics/testing/_images/django_unittest_classes_hierarchy.graffle
diff --git a/docs/topics/_images/django_unittest_classes_hierarchy.pdf b/docs/topics/testing/_images/django_unittest_classes_hierarchy.pdf
similarity index 100%
rename from docs/topics/_images/django_unittest_classes_hierarchy.pdf
rename to docs/topics/testing/_images/django_unittest_classes_hierarchy.pdf
diff --git a/docs/topics/_images/django_unittest_classes_hierarchy.svg b/docs/topics/testing/_images/django_unittest_classes_hierarchy.svg
similarity index 100%
rename from docs/topics/_images/django_unittest_classes_hierarchy.svg
rename to docs/topics/testing/_images/django_unittest_classes_hierarchy.svg
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
new file mode 100644
index 0000000000..26dc8ee1ae
--- /dev/null
+++ b/docs/topics/testing/advanced.txt
@@ -0,0 +1,425 @@
+=======================
+Advanced testing topics
+=======================
+
+The request factory
+===================
+
+.. module:: django.test.client
+
+.. class:: RequestFactory
+
+The :class:`~django.test.client.RequestFactory` shares the same API as
+the test client. However, instead of behaving like a browser, the
+RequestFactory provides a way to generate a request instance that can
+be used as the first argument to any view. This means you can test a
+view function the same way as you would test any other function -- as
+a black box, with exactly known inputs, testing for specific outputs.
+
+The API for the :class:`~django.test.client.RequestFactory` is a slightly
+restricted subset of the test client API:
+
+* It only has access to the HTTP methods :meth:`~Client.get()`,
+  :meth:`~Client.post()`, :meth:`~Client.put()`,
+  :meth:`~Client.delete()`, :meth:`~Client.head()` and
+  :meth:`~Client.options()`.
+
+* These methods accept all the same arguments *except* for
+  ``follows``. Since this is just a factory for producing
+  requests, it's up to you to handle the response.
+
+* It does not support middleware. Session and authentication
+  attributes must be supplied by the test itself if required
+  for the view to function properly.
+
+Example
+-------
+
+The following is a simple unit test using the request factory::
+
+    from django.utils import unittest
+    from django.test.client import RequestFactory
+
+    class SimpleTest(unittest.TestCase):
+        def setUp(self):
+            # Every test needs access to the request factory.
+            self.factory = RequestFactory()
+
+        def test_details(self):
+            # Create an instance of a GET request.
+            request = self.factory.get('/customer/details')
+
+            # Test my_view() as if it were deployed at /customer/details
+            response = my_view(request)
+            self.assertEqual(response.status_code, 200)
+
+.. _topics-testing-advanced-multidb:
+
+Tests and multiple databases
+============================
+
+.. _topics-testing-masterslave:
+
+Testing master/slave configurations
+-----------------------------------
+
+If you're testing a multiple database configuration with master/slave
+replication, this strategy of creating test databases poses a problem.
+When the test databases are created, there won't be any replication,
+and as a result, data created on the master won't be seen on the
+slave.
+
+To compensate for this, Django allows you to define that a database is
+a *test mirror*. Consider the following (simplified) example database
+configuration::
+
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.mysql',
+            'NAME': 'myproject',
+            'HOST': 'dbmaster',
+             # ... plus some other settings
+        },
+        'slave': {
+            'ENGINE': 'django.db.backends.mysql',
+            'NAME': 'myproject',
+            'HOST': 'dbslave',
+            'TEST_MIRROR': 'default'
+            # ... plus some other settings
+        }
+    }
+
+In this setup, we have two database servers: ``dbmaster``, described
+by the database alias ``default``, and ``dbslave`` described by the
+alias ``slave``. As you might expect, ``dbslave`` has been configured
+by the database administrator as a read slave of ``dbmaster``, so in
+normal activity, any write to ``default`` will appear on ``slave``.
+
+If Django created two independent test databases, this would break any
+tests that expected replication to occur. However, the ``slave``
+database has been configured as a test mirror (using the
+:setting:`TEST_MIRROR` setting), indicating that under testing,
+``slave`` should be treated as a mirror of ``default``.
+
+When the test environment is configured, a test version of ``slave``
+will *not* be created. Instead the connection to ``slave``
+will be redirected to point at ``default``. As a result, writes to
+``default`` will appear on ``slave`` -- but because they are actually
+the same database, not because there is data replication between the
+two databases.
+
+.. _topics-testing-creation-dependencies:
+
+Controlling creation order for test databases
+---------------------------------------------
+
+By default, Django will always create the ``default`` database first.
+However, no guarantees are made on the creation order of any other
+databases in your test setup.
+
+If your database configuration requires a specific creation order, you
+can specify the dependencies that exist using the
+:setting:`TEST_DEPENDENCIES` setting. Consider the following
+(simplified) example database configuration::
+
+    DATABASES = {
+        'default': {
+             # ... db settings
+             'TEST_DEPENDENCIES': ['diamonds']
+        },
+        'diamonds': {
+            # ... db settings
+        },
+        'clubs': {
+            # ... db settings
+            'TEST_DEPENDENCIES': ['diamonds']
+        },
+        'spades': {
+            # ... db settings
+            'TEST_DEPENDENCIES': ['diamonds','hearts']
+        },
+        'hearts': {
+            # ... db settings
+            'TEST_DEPENDENCIES': ['diamonds','clubs']
+        }
+    }
+
+Under this configuration, the ``diamonds`` database will be created first,
+as it is the only database alias without dependencies. The ``default`` and
+``clubs`` alias will be created next (although the order of creation of this
+pair is not guaranteed); then ``hearts``; and finally ``spades``.
+
+If there are any circular dependencies in the
+:setting:`TEST_DEPENDENCIES` definition, an ``ImproperlyConfigured``
+exception will be raised.
+
+Running tests outside the test runner
+=====================================
+
+If you want to run tests outside of ``./manage.py test`` -- for example,
+from a shell prompt -- you will need to set up the test
+environment first. Django provides a convenience method to do this::
+
+    >>> from django.test.utils import setup_test_environment
+    >>> setup_test_environment()
+
+This convenience method sets up the test database, and puts other
+Django features into modes that allow for repeatable testing.
+
+The call to :meth:`~django.test.utils.setup_test_environment` is made
+automatically as part of the setup of ``./manage.py test``. You only
+need to manually invoke this method if you're not using running your
+tests via Django's test runner.
+
+.. _other-testing-frameworks:
+
+Using different testing frameworks
+==================================
+
+Clearly, :mod:`doctest` and :mod:`unittest` are not the only Python testing
+frameworks. While Django doesn't provide explicit support for alternative
+frameworks, it does provide a way to invoke tests constructed for an
+alternative framework as if they were normal Django tests.
+
+When you run ``./manage.py test``, Django looks at the :setting:`TEST_RUNNER`
+setting to determine what to do. By default, :setting:`TEST_RUNNER` points to
+``'django.test.simple.DjangoTestSuiteRunner'``. This class defines the default Django
+testing behavior. This behavior involves:
+
+#. Performing global pre-test setup.
+
+#. Looking for unit tests and doctests in the ``models.py`` and
+   ``tests.py`` files in each installed application.
+
+#. Creating the test databases.
+
+#. Running ``syncdb`` to install models and initial data into the test
+   databases.
+
+#. Running the unit tests and doctests that are found.
+
+#. Destroying the test databases.
+
+#. Performing global post-test teardown.
+
+If you define your own test runner class and point :setting:`TEST_RUNNER` at
+that class, Django will execute your test runner whenever you run
+``./manage.py test``. In this way, it is possible to use any test framework
+that can be executed from Python code, or to modify the Django test execution
+process to satisfy whatever testing requirements you may have.
+
+.. _topics-testing-test_runner:
+
+Defining a test runner
+----------------------
+
+.. currentmodule:: django.test.simple
+
+A test runner is a class defining a ``run_tests()`` method. Django ships
+with a ``DjangoTestSuiteRunner`` class that defines the default Django
+testing behavior. This class defines the ``run_tests()`` entry point,
+plus a selection of other methods that are used to by ``run_tests()`` to
+set up, execute and tear down the test suite.
+
+.. class:: DjangoTestSuiteRunner(verbosity=1, interactive=True, failfast=True, **kwargs)
+
+    ``verbosity`` determines the amount of notification and debug information
+    that will be printed to the console; ``0`` is no output, ``1`` is normal
+    output, and ``2`` is verbose output.
+
+    If ``interactive`` is ``True``, the test suite has permission to ask the
+    user for instructions when the test suite is executed. An example of this
+    behavior would be asking for permission to delete an existing test
+    database. If ``interactive`` is ``False``, the test suite must be able to
+    run without any manual intervention.
+
+    If ``failfast`` is ``True``, the test suite will stop running after the
+    first test failure is detected.
+
+    Django will, from time to time, extend the capabilities of
+    the test runner by adding new arguments. The ``**kwargs`` declaration
+    allows for this expansion. If you subclass ``DjangoTestSuiteRunner`` or
+    write your own test runner, ensure accept and handle the ``**kwargs``
+    parameter.
+
+    Your test runner may also define additional command-line options.
+    If you add an ``option_list`` attribute to a subclassed test runner,
+    those options will be added to the list of command-line options that
+    the :djadmin:`test` command can use.
+
+Attributes
+~~~~~~~~~~
+
+.. attribute:: DjangoTestSuiteRunner.option_list
+
+    This is the tuple of ``optparse`` options which will be fed into the
+    management command's ``OptionParser`` for parsing arguments. See the
+    documentation for Python's ``optparse`` module for more details.
+
+Methods
+~~~~~~~
+
+.. method:: DjangoTestSuiteRunner.run_tests(test_labels, extra_tests=None, **kwargs)
+
+    Run the test suite.
+
+    ``test_labels`` is a list of strings describing the tests to be run. A test
+    label can take one of three forms:
+
+    * ``app.TestCase.test_method`` -- Run a single test method in a test
+      case.
+    * ``app.TestCase`` -- Run all the test methods in a test case.
+    * ``app`` -- Search for and run all tests in the named application.
+
+    If ``test_labels`` has a value of ``None``, the test runner should run
+    search for tests in all the applications in :setting:`INSTALLED_APPS`.
+
+    ``extra_tests`` is a list of extra ``TestCase`` instances to add to the
+    suite that is executed by the test runner. These extra tests are run
+    in addition to those discovered in the modules listed in ``test_labels``.
+
+    This method should return the number of tests that failed.
+
+.. method:: DjangoTestSuiteRunner.setup_test_environment(**kwargs)
+
+    Sets up the test environment ready for testing.
+
+.. method:: DjangoTestSuiteRunner.build_suite(test_labels, extra_tests=None, **kwargs)
+
+    Constructs a test suite that matches the test labels provided.
+
+    ``test_labels`` is a list of strings describing the tests to be run. A test
+    label can take one of three forms:
+
+    * ``app.TestCase.test_method`` -- Run a single test method in a test
+      case.
+    * ``app.TestCase`` -- Run all the test methods in a test case.
+    * ``app`` -- Search for and run all tests in the named application.
+
+    If ``test_labels`` has a value of ``None``, the test runner should run
+    search for tests in all the applications in :setting:`INSTALLED_APPS`.
+
+    ``extra_tests`` is a list of extra ``TestCase`` instances to add to the
+    suite that is executed by the test runner. These extra tests are run
+    in addition to those discovered in the modules listed in ``test_labels``.
+
+    Returns a ``TestSuite`` instance ready to be run.
+
+.. method:: DjangoTestSuiteRunner.setup_databases(**kwargs)
+
+    Creates the test databases.
+
+    Returns a data structure that provides enough detail to undo the changes
+    that have been made. This data will be provided to the ``teardown_databases()``
+    function at the conclusion of testing.
+
+.. method:: DjangoTestSuiteRunner.run_suite(suite, **kwargs)
+
+    Runs the test suite.
+
+    Returns the result produced by the running the test suite.
+
+.. method:: DjangoTestSuiteRunner.teardown_databases(old_config, **kwargs)
+
+    Destroys the test databases, restoring pre-test conditions.
+
+    ``old_config`` is a data structure defining the changes in the
+    database configuration that need to be reversed. It is the return
+    value of the ``setup_databases()`` method.
+
+.. method:: DjangoTestSuiteRunner.teardown_test_environment(**kwargs)
+
+    Restores the pre-test environment.
+
+.. method:: DjangoTestSuiteRunner.suite_result(suite, result, **kwargs)
+
+    Computes and returns a return code based on a test suite, and the result
+    from that test suite.
+
+
+Testing utilities
+-----------------
+
+.. module:: django.test.utils
+   :synopsis: Helpers to write custom test runners.
+
+To assist in the creation of your own test runner, Django provides a number of
+utility methods in the ``django.test.utils`` module.
+
+.. function:: setup_test_environment()
+
+    Performs any global pre-test setup, such as the installing the
+    instrumentation of the template rendering system and setting up
+    the dummy email outbox.
+
+.. function:: teardown_test_environment()
+
+    Performs any global post-test teardown, such as removing the black
+    magic hooks into the template system and restoring normal email
+    services.
+
+.. currentmodule:: django.db.connection.creation
+
+The creation module of the database backend (``connection.creation``)
+also provides some utilities that can be useful during testing.
+
+.. function:: create_test_db([verbosity=1, autoclobber=False])
+
+    Creates a new test database and runs ``syncdb`` against it.
+
+    ``verbosity`` has the same behavior as in ``run_tests()``.
+
+    ``autoclobber`` describes the behavior that will occur if a
+    database with the same name as the test database is discovered:
+
+    * If ``autoclobber`` is ``False``, the user will be asked to
+      approve destroying the existing database. ``sys.exit`` is
+      called if the user does not approve.
+
+    * If autoclobber is ``True``, the database will be destroyed
+      without consulting the user.
+
+    Returns the name of the test database that it created.
+
+    ``create_test_db()`` has the side effect of modifying the value of
+    :setting:`NAME` in :setting:`DATABASES` to match the name of the test
+    database.
+
+.. function:: destroy_test_db(old_database_name, [verbosity=1])
+
+    Destroys the database whose name is the value of :setting:`NAME` in
+    :setting:`DATABASES`, and sets :setting:`NAME` to the value of
+    ``old_database_name``.
+
+    The ``verbosity`` argument has the same behavior as for
+    :class:`~django.test.simple.DjangoTestSuiteRunner`.
+
+.. _topics-testing-code-coverage:
+
+Integration with coverage.py
+============================
+
+Code coverage describes how much source code has been tested. It shows which
+parts of your code are being exercised by tests and which are not. It's an
+important part of testing applications, so it's strongly recommended to check
+the coverage of your tests.
+
+Django can be easily integrated with `coverage.py`_, a tool for measuring code
+coverage of Python programs. First, `install coverage.py`_. Next, run the
+following from your project folder containing ``manage.py``::
+
+   coverage run --source='.' manage.py test myapp
+
+This runs your tests and collects coverage data of the executed files in your
+project. You can see a report of this data by typing following command::
+
+   coverage report
+
+Note that some Django code was executed while running tests, but it is not
+listed here because of the ``source`` flag passed to the previous command.
+
+For more options like annotated HTML listings detailing missed lines, see the
+`coverage.py`_ docs.
+
+.. _coverage.py: http://nedbatchelder.com/code/coverage/
+.. _install coverage.py: http://pypi.python.org/pypi/coverage
diff --git a/docs/topics/testing/doctests.txt b/docs/topics/testing/doctests.txt
new file mode 100644
index 0000000000..5036e946a9
--- /dev/null
+++ b/docs/topics/testing/doctests.txt
@@ -0,0 +1,81 @@
+===================
+Django and doctests
+===================
+
+Doctests use Python's standard :mod:`doctest` module, which searches your
+docstrings for statements that resemble a session of the Python interactive
+interpreter. A full explanation of how :mod:`doctest` works is out of the scope
+of this document; read Python's official documentation for the details.
+
+.. admonition:: What's a **docstring**?
+
+    A good explanation of docstrings (and some guidelines for using them
+    effectively) can be found in :pep:`257`:
+
+        A docstring is a string literal that occurs as the first statement in
+        a module, function, class, or method definition.  Such a docstring
+        becomes the ``__doc__`` special attribute of that object.
+
+    For example, this function has a docstring that describes what it does::
+
+        def add_two(num):
+            "Return the result of adding two to the provided number."
+            return num + 2
+
+    Because tests often make great documentation, putting tests directly in
+    your docstrings is an effective way to document *and* test your code.
+
+As with unit tests, for a given Django application, the test runner looks for
+doctests in two places:
+
+* The ``models.py`` file. You can define module-level doctests and/or a
+  doctest for individual models. It's common practice to put
+  application-level doctests in the module docstring and model-level
+  doctests in the model docstrings.
+
+* A file called ``tests.py`` in the application directory -- i.e., the
+  directory that holds ``models.py``. This file is a hook for any and all
+  doctests you want to write that aren't necessarily related to models.
+
+This example doctest is equivalent to the example given in the unittest section
+above::
+
+    # models.py
+
+    from django.db import models
+
+    class Animal(models.Model):
+        """
+        An animal that knows how to make noise
+
+        # Create some animals
+        >>> lion = Animal.objects.create(name="lion", sound="roar")
+        >>> cat = Animal.objects.create(name="cat", sound="meow")
+
+        # Make 'em speak
+        >>> lion.speak()
+        'The lion says "roar"'
+        >>> cat.speak()
+        'The cat says "meow"'
+        """
+        name = models.CharField(max_length=20)
+        sound = models.CharField(max_length=20)
+
+        def speak(self):
+            return 'The %s says "%s"' % (self.name, self.sound)
+
+When you :ref:`run your tests <running-tests>`, the test runner will find this
+docstring, notice that portions of it look like an interactive Python session,
+and execute those lines while checking that the results match.
+
+In the case of model tests, note that the test runner takes care of creating
+its own test database. That is, any test that accesses a database -- by
+creating and saving model instances, for example -- will not affect your
+production database. However, the database is not refreshed between doctests,
+so if your doctest requires a certain state you should consider flushing the
+database or loading a fixture. (See the section on :ref:`fixtures
+<topics-testing-fixtures>` for more on this.) Note that to use this feature,
+the database user Django is connecting as must have ``CREATE DATABASE``
+rights.
+
+For more details about :mod:`doctest`, see the Python documentation.
diff --git a/docs/topics/testing/index.txt b/docs/topics/testing/index.txt
new file mode 100644
index 0000000000..94e88bdf04
--- /dev/null
+++ b/docs/topics/testing/index.txt
@@ -0,0 +1,111 @@
+=================
+Testing in Django
+=================
+
+.. toctree::
+   :hidden:
+
+   overview
+   doctests
+   advanced
+
+Automated testing is an extremely useful bug-killing tool for the modern
+Web developer. You can use a collection of tests -- a **test suite** -- to
+solve, or avoid, a number of problems:
+
+* When you're writing new code, you can use tests to validate your code
+  works as expected.
+
+* When you're refactoring or modifying old code, you can use tests to
+  ensure your changes haven't affected your application's behavior
+  unexpectedly.
+
+Testing a Web application is a complex task, because a Web application is made
+of several layers of logic -- from HTTP-level request handling, to form
+validation and processing, to template rendering. With Django's test-execution
+framework and assorted utilities, you can simulate requests, insert test data,
+inspect your application's output and generally verify your code is doing what
+it should be doing.
+
+The best part is, it's really easy.
+
+Unit tests v. doctests
+======================
+
+There are two primary ways to write tests with Django, corresponding to the
+two test frameworks that ship in the Python standard library. The two
+frameworks are:
+
+* **Unit tests** -- tests that are expressed as methods on a Python class
+  that subclasses :class:`unittest.TestCase` or Django's customized
+  :class:`~django.test.TestCase`. For example::
+
+      import unittest
+
+      class MyFuncTestCase(unittest.TestCase):
+          def testBasic(self):
+              a = ['larry', 'curly', 'moe']
+              self.assertEqual(my_func(a, 0), 'larry')
+              self.assertEqual(my_func(a, 1), 'curly')
+
+* **Doctests** -- tests that are embedded in your functions' docstrings and
+  are written in a way that emulates a session of the Python interactive
+  interpreter. For example::
+
+      def my_func(a_list, idx):
+          """
+          >>> a = ['larry', 'curly', 'moe']
+          >>> my_func(a, 0)
+          'larry'
+          >>> my_func(a, 1)
+          'curly'
+          """
+          return a_list[idx]
+
+Which should I use?
+-------------------
+
+Because Django supports both of the standard Python test frameworks, it's up to
+you and your tastes to decide which one to use. You can even decide to use
+*both*.
+
+For developers new to testing, however, this choice can seem confusing. Here,
+then, are a few key differences to help you decide which approach is right for
+you:
+
+* If you've been using Python for a while, :mod:`doctest` will probably feel
+  more "pythonic". It's designed to make writing tests as easy as possible,
+  so it requires no overhead of writing classes or methods. You simply put
+  tests in docstrings. This has the added advantage of serving as
+  documentation (and correct documentation, at that!). However, while
+  doctests are good for some simple example code, they are not very good if
+  you want to produce either high quality, comprehensive tests or high
+  quality documentation. Test failures are often difficult to debug
+  as it can be unclear exactly why the test failed. Thus, doctests should
+  generally be avoided and used primarily for documentation examples only.
+
+* The :mod:`unittest` framework will probably feel very familiar to
+  developers coming from Java. :mod:`unittest` is inspired by Java's JUnit,
+  so you'll feel at home with this method if you've used JUnit or any test
+  framework inspired by JUnit.
+
+* If you need to write a bunch of tests that share similar code, then
+  you'll appreciate the :mod:`unittest` framework's organization around
+  classes and methods. This makes it easy to abstract common tasks into
+  common methods. The framework also supports explicit setup and/or cleanup
+  routines, which give you a high level of control over the environment
+  in which your test cases are run.
+
+* If you're writing tests for Django itself, you should use :mod:`unittest`.
+
+Where to go from here
+=====================
+
+As unit tests are preferred in Django, we treat them in detail in the
+:doc:`overview` document.
+
+:doc:`doctests` describes Django-specific features when using doctests.
+
+You can also use any *other* Python test framework, Django provides an API and
+tools for that kind of integration. They are described in the
+:ref:`other-testing-frameworks` section of :doc:`advanced`.
diff --git a/docs/topics/testing.txt b/docs/topics/testing/overview.txt
similarity index 73%
rename from docs/topics/testing.txt
rename to docs/topics/testing/overview.txt
index 8c11e32a55..259c39618b 100644
--- a/docs/topics/testing.txt
+++ b/docs/topics/testing/overview.txt
@@ -5,69 +5,17 @@ Testing Django applications
 .. module:: django.test
    :synopsis: Testing tools for Django applications.
 
-Automated testing is an extremely useful bug-killing tool for the modern
-Web developer. You can use a collection of tests -- a **test suite** -- to
-solve, or avoid, a number of problems:
+.. seealso::
 
-* When you're writing new code, you can use tests to validate your code
-  works as expected.
+    The :doc:`testing tutorial </intro/tutorial05>` and the
+    :doc:`advanced testing topics </topics/testing/advanced>`.
 
-* When you're refactoring or modifying old code, you can use tests to
-  ensure your changes haven't affected your application's behavior
-  unexpectedly.
-
-Testing a Web application is a complex task, because a Web application is made
-of several layers of logic -- from HTTP-level request handling, to form
-validation and processing, to template rendering. With Django's test-execution
-framework and assorted utilities, you can simulate requests, insert test data,
-inspect your application's output and generally verify your code is doing what
-it should be doing.
-
-The best part is, it's really easy.
-
-This document is split into two primary sections. First, we explain how to
-write tests with Django. Then, we explain how to run them.
+This document is split into two primary sections. First, we explain how to write
+tests with Django. Then, we explain how to run them.
 
 Writing tests
 =============
 
-There are two primary ways to write tests with Django, corresponding to the
-two test frameworks that ship in the Python standard library. The two
-frameworks are:
-
-* **Unit tests** -- tests that are expressed as methods on a Python class
-  that subclasses :class:`unittest.TestCase` or Django's customized
-  :class:`TestCase`. For example::
-
-      import unittest
-
-      class MyFuncTestCase(unittest.TestCase):
-          def testBasic(self):
-              a = ['larry', 'curly', 'moe']
-              self.assertEqual(my_func(a, 0), 'larry')
-              self.assertEqual(my_func(a, 1), 'curly')
-
-* **Doctests** -- tests that are embedded in your functions' docstrings and
-  are written in a way that emulates a session of the Python interactive
-  interpreter. For example::
-
-      def my_func(a_list, idx):
-          """
-          >>> a = ['larry', 'curly', 'moe']
-          >>> my_func(a, 0)
-          'larry'
-          >>> my_func(a, 1)
-          'curly'
-          """
-          return a_list[idx]
-
-We'll discuss choosing the appropriate test framework later, however, most
-experienced developers prefer unit tests. You can also use any *other* Python
-test framework, as we'll explain in a bit.
-
-Writing unit tests
-------------------
-
 Django's unit tests use a Python standard library module: :mod:`unittest`. This
 module defines tests in class-based approach.
 
@@ -80,7 +28,7 @@ module defines tests in class-based approach.
     backported for Python 2.5 compatibility.
 
     To access this library, Django provides the
-    :mod:`django.utils.unittest` module alias. If you are using Python
+    ``django.utils.unittest`` module alias. If you are using Python
     2.7, or you have installed unittest2 locally, Django will map the
     alias to the installed version of the unittest library. Otherwise,
     Django will use its own bundled version of unittest2.
@@ -115,8 +63,8 @@ Here is an example :class:`unittest.TestCase` subclass::
 
     class AnimalTestCase(unittest.TestCase):
         def setUp(self):
-            self.lion = Animal.objects.create(name="lion", sound="roar")
-            self.cat = Animal.objects.create(name="cat", sound="meow")
+            self.lion = Animal(name="lion", sound="roar")
+            self.cat = Animal(name="cat", sound="meow")
 
         def test_animals_can_speak(self):
             """Animals that can speak are correctly identified"""
@@ -139,121 +87,17 @@ For more details about :mod:`unittest`, see the Python documentation.
 
 .. _suggested organization: http://docs.python.org/library/unittest.html#organizing-tests
 
-Writing doctests
-----------------
+.. warning::
 
-Doctests use Python's standard :mod:`doctest` module, which searches your
-docstrings for statements that resemble a session of the Python interactive
-interpreter. A full explanation of how :mod:`doctest` works is out of the scope
-of this document; read Python's official documentation for the details.
+    If your tests rely on database access such as creating or querying models,
+    be sure to create your test classes as subclasses of
+    :class:`django.test.TestCase` rather than :class:`unittest.TestCase`.
 
-.. admonition:: What's a **docstring**?
-
-    A good explanation of docstrings (and some guidelines for using them
-    effectively) can be found in :pep:`257`:
-
-        A docstring is a string literal that occurs as the first statement in
-        a module, function, class, or method definition.  Such a docstring
-        becomes the ``__doc__`` special attribute of that object.
-
-    For example, this function has a docstring that describes what it does::
-
-        def add_two(num):
-            "Return the result of adding two to the provided number."
-            return num + 2
-
-    Because tests often make great documentation, putting tests directly in
-    your docstrings is an effective way to document *and* test your code.
-
-As with unit tests, for a given Django application, the test runner looks for
-doctests in two places:
-
-* The ``models.py`` file. You can define module-level doctests and/or a
-  doctest for individual models. It's common practice to put
-  application-level doctests in the module docstring and model-level
-  doctests in the model docstrings.
-
-* A file called ``tests.py`` in the application directory -- i.e., the
-  directory that holds ``models.py``. This file is a hook for any and all
-  doctests you want to write that aren't necessarily related to models.
-
-This example doctest is equivalent to the example given in the unittest section
-above::
-
-    # models.py
-
-    from django.db import models
-
-    class Animal(models.Model):
-        """
-        An animal that knows how to make noise
-
-        # Create some animals
-        >>> lion = Animal.objects.create(name="lion", sound="roar")
-        >>> cat = Animal.objects.create(name="cat", sound="meow")
-
-        # Make 'em speak
-        >>> lion.speak()
-        'The lion says "roar"'
-        >>> cat.speak()
-        'The cat says "meow"'
-        """
-        name = models.CharField(max_length=20)
-        sound = models.CharField(max_length=20)
-
-        def speak(self):
-            return 'The %s says "%s"' % (self.name, self.sound)
-
-When you :ref:`run your tests <running-tests>`, the test runner will find this
-docstring, notice that portions of it look like an interactive Python session,
-and execute those lines while checking that the results match.
-
-In the case of model tests, note that the test runner takes care of creating
-its own test database. That is, any test that accesses a database -- by
-creating and saving model instances, for example -- will not affect your
-production database. However, the database is not refreshed between doctests,
-so if your doctest requires a certain state you should consider flushing the
-database or loading a fixture. (See the section on fixtures, below, for more
-on this.) Note that to use this feature, the database user Django is connecting
-as must have ``CREATE DATABASE`` rights.
-
-For more details about :mod:`doctest`, see the Python documentation.
-
-Which should I use?
--------------------
-
-Because Django supports both of the standard Python test frameworks, it's up to
-you and your tastes to decide which one to use. You can even decide to use
-*both*.
-
-For developers new to testing, however, this choice can seem confusing. Here,
-then, are a few key differences to help you decide which approach is right for
-you:
-
-* If you've been using Python for a while, :mod:`doctest` will probably feel
-  more "pythonic". It's designed to make writing tests as easy as possible,
-  so it requires no overhead of writing classes or methods. You simply put
-  tests in docstrings. This has the added advantage of serving as
-  documentation (and correct documentation, at that!). However, while
-  doctests are good for some simple example code, they are not very good if
-  you want to produce either high quality, comprehensive tests or high
-  quality documentation. Test failures are often difficult to debug
-  as it can be unclear exactly why the test failed. Thus, doctests should
-  generally be avoided and used primarily for documentation examples only.
-
-* The :mod:`unittest` framework will probably feel very familiar to
-  developers coming from Java. :mod:`unittest` is inspired by Java's JUnit,
-  so you'll feel at home with this method if you've used JUnit or any test
-  framework inspired by JUnit.
-
-* If you need to write a bunch of tests that share similar code, then
-  you'll appreciate the :mod:`unittest` framework's organization around
-  classes and methods. This makes it easy to abstract common tasks into
-  common methods. The framework also supports explicit setup and/or cleanup
-  routines, which give you a high level of control over the environment
-  in which your test cases are run.
-
-* If you're writing tests for Django itself, you should use :mod:`unittest`.
+    In the example above, we instantiate some models but do not save them to
+    the database. Using :class:`unittest.TestCase` avoids the cost of running
+    each test in a transaction and flushing the database, but for most
+    applications the scope of tests you will be able to write this way will
+    be fairly limited, so it's easiest to use :class:`django.test.TestCase`.
 
 .. _running-tests:
 
@@ -329,23 +173,7 @@ be reported, and any test databases created by the run will not be destroyed.
     flag areas in your code that aren't strictly wrong but could benefit
     from a better implementation.
 
-Running tests outside the test runner
--------------------------------------
-
-If you want to run tests outside of ``./manage.py test`` -- for example,
-from a shell prompt -- you will need to set up the test
-environment first. Django provides a convenience method to do this::
-
-    >>> from django.test.utils import setup_test_environment
-    >>> setup_test_environment()
-
-This convenience method sets up the test database, and puts other
-Django features into modes that allow for repeatable testing.
-
-The call to :meth:`~django.test.utils.setup_test_environment` is made
-automatically as part of the setup of `./manage.py test`. You only
-need to manually invoke this method if you're not using running your
-tests via Django's test runner.
+.. _the-test-database:
 
 The test database
 -----------------
@@ -367,9 +195,9 @@ entirely!). If you want to use a different database name, specify
 
 Aside from using a separate database, the test runner will otherwise
 use all of the same database settings you have in your settings file:
-:setting:`ENGINE`, :setting:`USER`, :setting:`HOST`, etc. The test
-database is created by the user specified by :setting:`USER`, so you'll need
-to make sure that the given user account has sufficient privileges to
+:setting:`ENGINE <DATABASE-ENGINE>`, :setting:`USER`, :setting:`HOST`, etc. The
+test database is created by the user specified by :setting:`USER`, so you'll
+need to make sure that the given user account has sufficient privileges to
 create a new database on the system.
 
 For fine-grained control over the character encoding of your test
@@ -388,100 +216,9 @@ advanced settings.
     your tests. *It is a bad idea to have such import-time database queries in
     your code* anyway - rewrite your code so that it doesn't do this.
 
-.. _topics-testing-masterslave:
+.. seealso::
 
-Testing master/slave configurations
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you're testing a multiple database configuration with master/slave
-replication, this strategy of creating test databases poses a problem.
-When the test databases are created, there won't be any replication,
-and as a result, data created on the master won't be seen on the
-slave.
-
-To compensate for this, Django allows you to define that a database is
-a *test mirror*. Consider the following (simplified) example database
-configuration::
-
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.mysql',
-            'NAME': 'myproject',
-            'HOST': 'dbmaster',
-             # ... plus some other settings
-        },
-        'slave': {
-            'ENGINE': 'django.db.backends.mysql',
-            'NAME': 'myproject',
-            'HOST': 'dbslave',
-            'TEST_MIRROR': 'default'
-            # ... plus some other settings
-        }
-    }
-
-In this setup, we have two database servers: ``dbmaster``, described
-by the database alias ``default``, and ``dbslave`` described by the
-alias ``slave``. As you might expect, ``dbslave`` has been configured
-by the database administrator as a read slave of ``dbmaster``, so in
-normal activity, any write to ``default`` will appear on ``slave``.
-
-If Django created two independent test databases, this would break any
-tests that expected replication to occur. However, the ``slave``
-database has been configured as a test mirror (using the
-:setting:`TEST_MIRROR` setting), indicating that under testing,
-``slave`` should be treated as a mirror of ``default``.
-
-When the test environment is configured, a test version of ``slave``
-will *not* be created. Instead the connection to ``slave``
-will be redirected to point at ``default``. As a result, writes to
-``default`` will appear on ``slave`` -- but because they are actually
-the same database, not because there is data replication between the
-two databases.
-
-.. _topics-testing-creation-dependencies:
-
-Controlling creation order for test databases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, Django will always create the ``default`` database first.
-However, no guarantees are made on the creation order of any other
-databases in your test setup.
-
-If your database configuration requires a specific creation order, you
-can specify the dependencies that exist using the
-:setting:`TEST_DEPENDENCIES` setting. Consider the following
-(simplified) example database configuration::
-
-    DATABASES = {
-        'default': {
-             # ... db settings
-             'TEST_DEPENDENCIES': ['diamonds']
-        },
-        'diamonds': {
-            # ... db settings
-        },
-        'clubs': {
-            # ... db settings
-            'TEST_DEPENDENCIES': ['diamonds']
-        },
-        'spades': {
-            # ... db settings
-            'TEST_DEPENDENCIES': ['diamonds','hearts']
-        },
-        'hearts': {
-            # ... db settings
-            'TEST_DEPENDENCIES': ['diamonds','clubs']
-        }
-    }
-
-Under this configuration, the ``diamonds`` database will be created first,
-as it is the only database alias without dependencies. The ``default`` and
-``clubs`` alias will be created next (although the order of creation of this
-pair is not guaranteed); then ``hearts``; and finally ``spades``.
-
-If there are any circular dependencies in the
-:setting:`TEST_DEPENDENCIES` definition, an ``ImproperlyConfigured``
-exception will be raised.
+    The :ref:`advanced multi-db testing topics <topics-testing-advanced-multidb>`.
 
 Order in which tests are executed
 ---------------------------------
@@ -598,36 +335,6 @@ to a faster hashing algorithm::
 Don't forget to also include in :setting:`PASSWORD_HASHERS` any hashing
 algorithm used in fixtures, if any.
 
-.. _topics-testing-code-coverage:
-
-Integration with coverage.py
-----------------------------
-
-Code coverage describes how much source code has been tested. It shows which
-parts of your code are being exercised by tests and which are not. It's an
-important part of testing applications, so it's strongly recommended to check
-the coverage of your tests.
-
-Django can be easily integrated with `coverage.py`_, a tool for measuring code
-coverage of Python programs. First, `install coverage.py`_. Next, run the
-following from your project folder containing ``manage.py``::
-
-   coverage run --source='.' manage.py test myapp
-
-This runs your tests and collects coverage data of the executed files in your
-project. You can see a report of this data by typing following command::
-
-   coverage report
-
-Note that some Django code was executed while running tests, but it is not
-listed here because of the ``source`` flag passed to the previous command.
-
-For more options like annotated HTML listings detailing missed lines, see the
-`coverage.py`_ docs.
-
-.. _coverage.py: http://nedbatchelder.com/code/coverage/
-.. _install coverage.py: http://pypi.python.org/pypi/coverage
-
 Testing tools
 =============
 
@@ -926,6 +633,14 @@ Use the ``django.test.client.Client`` class to make requests.
         The ``follow`` and ``extra`` arguments act the same as for
         :meth:`Client.get`.
 
+    .. method:: Client.patch(path, data='', content_type='application/octet-stream', follow=False, **extra)
+
+        Makes a PATCH request on the provided ``path`` and returns a
+        ``Response`` object. Useful for testing RESTful interfaces.
+
+        The ``follow`` and ``extra`` arguments act the same as for
+        :meth:`Client.get`.
+
     .. method:: Client.delete(path, data='', content_type='application/octet-stream', follow=False, **extra)
 
         Makes an DELETE request on the provided ``path`` and returns a
@@ -944,7 +659,7 @@ Use the ``django.test.client.Client`` class to make requests.
 
     .. method:: Client.login(**credentials)
 
-        If your site uses Django's :doc:`authentication system</topics/auth>`
+        If your site uses Django's :doc:`authentication system</topics/auth/index>`
         and you deal with logging in users, you can use the test client's
         ``login()`` method to simulate the effect of a user logging into the
         site.
@@ -988,7 +703,7 @@ Use the ``django.test.client.Client`` class to make requests.
 
     .. method:: Client.logout()
 
-        If your site uses Django's :doc:`authentication system</topics/auth>`,
+        If your site uses Django's :doc:`authentication system</topics/auth/index>`,
         the ``logout()`` method can be used to simulate the effect of a user
         logging out of your site.
 
@@ -1124,60 +839,14 @@ The following is a simple unit test using the test client::
             # Check that the rendered context contains 5 customers.
             self.assertEqual(len(response.context['customers']), 5)
 
-The request factory
--------------------
+.. seealso::
 
-.. class:: RequestFactory
+    :class:`django.test.client.RequestFactory`
 
-The :class:`~django.test.client.RequestFactory` shares the same API as
-the test client. However, instead of behaving like a browser, the
-RequestFactory provides a way to generate a request instance that can
-be used as the first argument to any view. This means you can test a
-view function the same way as you would test any other function -- as
-a black box, with exactly known inputs, testing for specific outputs.
-
-The API for the :class:`~django.test.client.RequestFactory` is a slightly
-restricted subset of the test client API:
-
-* It only has access to the HTTP methods :meth:`~Client.get()`,
-  :meth:`~Client.post()`, :meth:`~Client.put()`,
-  :meth:`~Client.delete()`, :meth:`~Client.head()` and
-  :meth:`~Client.options()`.
-
-* These methods accept all the same arguments *except* for
-  ``follows``. Since this is just a factory for producing
-  requests, it's up to you to handle the response.
-
-* It does not support middleware. Session and authentication
-  attributes must be supplied by the test itself if required
-  for the view to function properly.
-
-Example
-~~~~~~~
-
-The following is a simple unit test using the request factory::
-
-    from django.utils import unittest
-    from django.test.client import RequestFactory
-
-    class SimpleTest(unittest.TestCase):
-        def setUp(self):
-            # Every test needs access to the request factory.
-            self.factory = RequestFactory()
-
-        def test_details(self):
-            # Create an instance of a GET request.
-            request = self.factory.get('/customer/details')
-
-            # Test my_view() as if it were deployed at /customer/details
-            response = my_view(request)
-            self.assertEqual(response.status_code, 200)
-
-Test cases
-----------
+.. _django-testcase-subclasses:
 
 Provided test case classes
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+--------------------------
 
 .. currentmodule:: django.test
 
@@ -1191,40 +860,42 @@ Normal Python unit test classes extend a base class of
    :width: 508
    :height: 391
 
+   Hierarchy of Django unit testing classes
+
 Regardless of the version of Python you're using, if you've installed
-:mod:`unittest2`, :mod:`django.utils.unittest` will point to that library.
+``unittest2``, ``django.utils.unittest`` will point to that library.
 
-TestCase
-^^^^^^^^
+SimpleTestCase
+~~~~~~~~~~~~~~
 
-.. class:: TestCase()
+.. class:: SimpleTestCase()
 
-This class provides some additional capabilities that can be useful for testing
-Web sites.
+A very thin subclass of :class:`unittest.TestCase`, it extends it with some
+basic functionality like:
 
-Converting a normal :class:`unittest.TestCase` to a Django :class:`TestCase` is
-easy: Just change the base class of your test from `'unittest.TestCase'` to
-`'django.test.TestCase'`. All of the standard Python unit test functionality
-will continue to be available, but it will be augmented with some useful
-additions, including:
+* Saving and restoring the Python warning machinery state.
+* Checking that a callable :meth:`raises a certain exception <SimpleTestCase.assertRaisesMessage>`.
+* :meth:`Testing form field rendering <SimpleTestCase.assertFieldOutput>`.
+* Testing server :ref:`HTML responses for the presence/lack of a given fragment <assertions>`.
+* The ability to run tests with :ref:`modified settings <overriding-settings>`
 
-* Automatic loading of fixtures.
+If you need any of the other more complex and heavyweight Django-specific
+features like:
 
-* Wraps each test in a transaction.
+* Using the :attr:`~TestCase.client` :class:`~django.test.client.Client`.
+* Testing or using the ORM.
+* Database :attr:`~TestCase.fixtures`.
+* Custom test-time :attr:`URL maps <TestCase.urls>`.
+* Test :ref:`skipping based on database backend features <skipping-tests>`.
+* The remaining specialized :ref:`assert* <assertions>` methods.
 
-* Creates a TestClient instance.
+then you should use :class:`~django.test.TransactionTestCase` or
+:class:`~django.test.TestCase` instead.
 
-* Django-specific assertions for testing for things like redirection and form
-  errors.
-
-.. versionchanged:: 1.5
-    The order in which tests are run has changed. See `Order in which tests are
-    executed`_.
-
-``TestCase`` inherits from :class:`~django.test.TransactionTestCase`.
+``SimpleTestCase`` inherits from ``django.utils.unittest.TestCase``.
 
 TransactionTestCase
-^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~
 
 .. class:: TransactionTestCase()
 
@@ -1295,36 +966,183 @@ to test the effects of commit and rollback:
     Using ``reset_sequences = True`` will slow down the test, since the primary
     key reset is an relatively expensive database operation.
 
-SimpleTestCase
-^^^^^^^^^^^^^^
+TestCase
+~~~~~~~~
 
-.. class:: SimpleTestCase()
+.. class:: TestCase()
 
-.. versionadded:: 1.4
+This class provides some additional capabilities that can be useful for testing
+Web sites.
 
-A very thin subclass of :class:`unittest.TestCase`, it extends it with some
-basic functionality like:
+Converting a normal :class:`unittest.TestCase` to a Django :class:`TestCase` is
+easy: Just change the base class of your test from ``'unittest.TestCase'`` to
+``'django.test.TestCase'``. All of the standard Python unit test functionality
+will continue to be available, but it will be augmented with some useful
+additions, including:
 
-* Saving and restoring the Python warning machinery state.
-* Checking that a callable :meth:`raises a certain exception <SimpleTestCase.assertRaisesMessage>`.
-* :meth:`Testing form field rendering <SimpleTestCase.assertFieldOutput>`.
-* Testing server :ref:`HTML responses for the presence/lack of a given fragment <assertions>`.
-* The ability to run tests with :ref:`modified settings <overriding-settings>`
+* Automatic loading of fixtures.
 
-If you need any of the other more complex and heavyweight Django-specific
-features like:
+* Wraps each test in a transaction.
 
-* Using the :attr:`~TestCase.client` :class:`~django.test.client.Client`.
-* Testing or using the ORM.
-* Database :attr:`~TestCase.fixtures`.
-* Custom test-time :attr:`URL maps <TestCase.urls>`.
-* Test :ref:`skipping based on database backend features <skipping-tests>`.
-* The remaining specialized :ref:`assert* <assertions>` methods.
+* Creates a TestClient instance.
 
-then you should use :class:`~django.test.TransactionTestCase` or
-:class:`~django.test.TestCase` instead.
+* Django-specific assertions for testing for things like redirection and form
+  errors.
 
-``SimpleTestCase`` inherits from :class:`django.utils.unittest.TestCase`.
+.. versionchanged:: 1.5
+    The order in which tests are run has changed. See `Order in which tests are
+    executed`_.
+
+``TestCase`` inherits from :class:`~django.test.TransactionTestCase`.
+
+.. _live-test-server:
+
+LiveServerTestCase
+~~~~~~~~~~~~~~~~~~
+
+.. class:: LiveServerTestCase()
+
+``LiveServerTestCase`` does basically the same as
+:class:`~django.test.TransactionTestCase` with one extra feature: it launches a
+live Django server in the background on setup, and shuts it down on teardown.
+This allows the use of automated test clients other than the
+:ref:`Django dummy client <test-client>` such as, for example, the Selenium_
+client, to execute a series of functional tests inside a browser and simulate a
+real user's actions.
+
+By default the live server's address is ``'localhost:8081'`` and the full URL
+can be accessed during the tests with ``self.live_server_url``. If you'd like
+to change the default address (in the case, for example, where the 8081 port is
+already taken) then you may pass a different one to the :djadmin:`test` command
+via the :djadminopt:`--liveserver` option, for example:
+
+.. code-block:: bash
+
+    ./manage.py test --liveserver=localhost:8082
+
+Another way of changing the default server address is by setting the
+`DJANGO_LIVE_TEST_SERVER_ADDRESS` environment variable somewhere in your
+code (for example, in a :ref:`custom test runner<topics-testing-test_runner>`):
+
+.. code-block:: python
+
+    import os
+    os.environ['DJANGO_LIVE_TEST_SERVER_ADDRESS'] = 'localhost:8082'
+
+In the case where the tests are run by multiple processes in parallel (for
+example, in the context of several simultaneous `continuous integration`_
+builds), the processes will compete for the same address, and therefore your
+tests might randomly fail with an "Address already in use" error. To avoid this
+problem, you can pass a comma-separated list of ports or ranges of ports (at
+least as many as the number of potential parallel processes). For example:
+
+.. code-block:: bash
+
+    ./manage.py test --liveserver=localhost:8082,8090-8100,9000-9200,7041
+
+Then, during test execution, each new live test server will try every specified
+port until it finds one that is free and takes it.
+
+.. _continuous integration: http://en.wikipedia.org/wiki/Continuous_integration
+
+To demonstrate how to use ``LiveServerTestCase``, let's write a simple Selenium
+test. First of all, you need to install the `selenium package`_ into your
+Python path:
+
+.. code-block:: bash
+
+   pip install selenium
+
+Then, add a ``LiveServerTestCase``-based test to your app's tests module
+(for example: ``myapp/tests.py``). The code for this test may look as follows:
+
+.. code-block:: python
+
+    from django.test import LiveServerTestCase
+    from selenium.webdriver.firefox.webdriver import WebDriver
+
+    class MySeleniumTests(LiveServerTestCase):
+        fixtures = ['user-data.json']
+
+        @classmethod
+        def setUpClass(cls):
+            cls.selenium = WebDriver()
+            super(MySeleniumTests, cls).setUpClass()
+
+        @classmethod
+        def tearDownClass(cls):
+            cls.selenium.quit()
+            super(MySeleniumTests, cls).tearDownClass()
+
+        def test_login(self):
+            self.selenium.get('%s%s' % (self.live_server_url, '/login/'))
+            username_input = self.selenium.find_element_by_name("username")
+            username_input.send_keys('myuser')
+            password_input = self.selenium.find_element_by_name("password")
+            password_input.send_keys('secret')
+            self.selenium.find_element_by_xpath('//input[@value="Log in"]').click()
+
+Finally, you may run the test as follows:
+
+.. code-block:: bash
+
+    ./manage.py test myapp.MySeleniumTests.test_login
+
+This example will automatically open Firefox then go to the login page, enter
+the credentials and press the "Log in" button. Selenium offers other drivers in
+case you do not have Firefox installed or wish to use another browser. The
+example above is just a tiny fraction of what the Selenium client can do; check
+out the `full reference`_ for more details.
+
+.. _Selenium: http://seleniumhq.org/
+.. _selenium package: http://pypi.python.org/pypi/selenium
+.. _full reference: http://selenium-python.readthedocs.org/en/latest/api.html
+.. _Firefox: http://www.mozilla.com/firefox/
+
+.. note::
+
+    ``LiveServerTestCase`` makes use of the :doc:`staticfiles contrib app
+    </howto/static-files/index>` so you'll need to have your project configured
+    accordingly (in particular by setting :setting:`STATIC_URL`).
+
+.. note::
+
+    When using an in-memory SQLite database to run the tests, the same database
+    connection will be shared by two threads in parallel: the thread in which
+    the live server is run and the thread in which the test case is run. It's
+    important to prevent simultaneous database queries via this shared
+    connection by the two threads, as that may sometimes randomly cause the
+    tests to fail. So you need to ensure that the two threads don't access the
+    database at the same time. In particular, this means that in some cases
+    (for example, just after clicking a link or submitting a form), you might
+    need to check that a response is received by Selenium and that the next
+    page is loaded before proceeding with further test execution.
+    Do this, for example, by making Selenium wait until the ``<body>`` HTML tag
+    is found in the response (requires Selenium > 2.13):
+
+    .. code-block:: python
+
+        def test_login(self):
+            from selenium.webdriver.support.wait import WebDriverWait
+            timeout = 2
+            ...
+            self.selenium.find_element_by_xpath('//input[@value="Log in"]').click()
+            # Wait until the response is received
+            WebDriverWait(self.selenium, timeout).until(
+                lambda driver: driver.find_element_by_tag_name('body'))
+
+    The tricky thing here is that there's really no such thing as a "page load,"
+    especially in modern Web apps that generate HTML dynamically after the
+    server generates the initial document. So, simply checking for the presence
+    of ``<body>`` in the response might not necessarily be appropriate for all
+    use cases. Please refer to the `Selenium FAQ`_ and
+    `Selenium documentation`_ for more information.
+
+    .. _Selenium FAQ: http://code.google.com/p/selenium/wiki/FrequentlyAskedQuestions#Q:_WebDriver_fails_to_find_elements_/_Does_not_block_on_page_loa
+    .. _Selenium documentation: http://seleniumhq.org/docs/04_webdriver_advanced.html#explicit-waits
+
+Test cases features
+-------------------
 
 Default test client
 ~~~~~~~~~~~~~~~~~~~
@@ -1385,6 +1203,7 @@ attribute::
 
         def test_my_stuff(self):
             # Here self.client is an instance of MyTestClient...
+            call_some_test_code()
 
 .. _topics-testing-fixtures:
 
@@ -1533,8 +1352,6 @@ Overriding settings
 
 .. method:: TestCase.settings
 
-.. versionadded:: 1.4
-
 For testing purposes it's often useful to change a setting temporarily and
 revert to the original value after running the testing code. For this use case
 Django provides a standard Python context manager (see :pep:`343`)
@@ -1563,7 +1380,7 @@ in the ``with`` block and reset its value to the previous state afterwards.
 .. function:: override_settings
 
 In case you want to override a setting for just one test method or even the
-whole :class:`TestCase` class, Django provides the
+whole :class:`~django.test.TestCase` class, Django provides the
 :func:`~django.test.utils.override_settings` decorator (see :pep:`318`). It's
 used like this::
 
@@ -1598,6 +1415,14 @@ The decorator can also be applied to test case classes::
     the original ``LoginTestCase`` is still equally affected by the
     decorator.
 
+You can also simulate the absence of a setting by deleting it after settings
+have been overriden, like this::
+
+    @override_settings()
+    def test_something(self):
+        del settings.LOGIN_URL
+        ...
+
 When overriding settings, make sure to handle the cases in which your app's
 code uses a cache or similar feature that retains state even if the
 setting is changed. Django provides the
@@ -1623,7 +1448,7 @@ Emptying the test outbox
 If you use Django's custom ``TestCase`` class, the test runner will clear the
 contents of the test email outbox at the start of each test case.
 
-For more detail on email services during tests, see `Email services`_.
+For more detail on email services during tests, see `Email services`_ below.
 
 .. _assertions:
 
@@ -1646,8 +1471,6 @@ your test suite.
 
 .. method:: SimpleTestCase.assertRaisesMessage(expected_exception, expected_message, callable_obj=None, *args, **kwargs)
 
-    .. versionadded:: 1.4
-
     Asserts that execution of callable ``callable_obj`` raised the
     ``expected_exception`` exception and that such exception has an
     ``expected_message`` representation. Any other outcome is reported as a
@@ -1656,8 +1479,6 @@ your test suite.
 
 .. method:: SimpleTestCase.assertFieldOutput(self, fieldclass, valid, invalid, field_args=None, field_kwargs=None, empty_value=u'')
 
-    .. versionadded:: 1.4
-
     Asserts that a form field behaves correctly with various inputs.
 
     :param fieldclass: the class of the field to be tested.
@@ -1667,7 +1488,7 @@ your test suite.
         error messages.
     :param field_args: the args passed to instantiate the field.
     :param field_kwargs: the kwargs passed to instantiate the field.
-    :param empty_value: the expected clean output for inputs in ``EMPTY_VALUES``.
+    :param empty_value: the expected clean output for inputs in ``empty_values``.
 
     For example, the following code tests that an ``EmailField`` accepts
     "a@a.com" as a valid email address, but rejects "aaa" with a reasonable
@@ -1682,8 +1503,6 @@ your test suite.
     that ``text`` appears in the content of the response. If ``count`` is
     provided, ``text`` must occur exactly ``count`` times in the response.
 
-    .. versionadded:: 1.4
-
     Set ``html`` to ``True`` to handle ``text`` as HTML. The comparison with
     the response content will be based on HTML semantics instead of
     character-by-character equality. Whitespace is ignored in most cases,
@@ -1695,8 +1514,6 @@ your test suite.
     Asserts that a ``Response`` instance produced the given ``status_code`` and
     that ``text`` does not appears in the content of the response.
 
-    .. versionadded:: 1.4
-
     Set ``html`` to ``True`` to handle ``text`` as HTML. The comparison with
     the response content will be based on HTML semantics instead of
     character-by-character equality. Whitespace is ignored in most cases,
@@ -1725,8 +1542,6 @@ your test suite.
 
     The name is a string such as ``'admin/index.html'``.
 
-    .. versionadded:: 1.4
-
     You can use this as a context manager, like this::
 
         with self.assertTemplateUsed('index.html'):
@@ -1739,8 +1554,6 @@ your test suite.
     Asserts that the template with the given name was *not* used in rendering
     the response.
 
-    .. versionadded:: 1.4
-
     You can use this as a context manager in the same way as
     :meth:`~TestCase.assertTemplateUsed`.
 
@@ -1767,12 +1580,6 @@ your test suite.
     provide an implicit ordering, you can set the ``ordered`` parameter to
     ``False``, which turns the comparison into a Python set comparison.
 
-    .. versionchanged:: 1.4
-	The ``ordered`` parameter is new in version 1.4. In earlier versions,
-	you would need to ensure the queryset is ordered consistently, possibly
-	via an explicit ``order_by()`` call on the queryset prior to
-	comparison.
-
     .. versionchanged:: 1.6
         The method now checks for undefined order and raises ``ValueError``
         if undefined order is spotted. The ordering is seen as undefined if
@@ -1799,8 +1606,6 @@ your test suite.
 
 .. method:: SimpleTestCase.assertHTMLEqual(html1, html2, msg=None)
 
-    .. versionadded:: 1.4
-
     Asserts that the strings ``html1`` and ``html2`` are equal. The comparison
     is based on HTML semantics. The comparison takes following things into
     account:
@@ -1830,8 +1635,6 @@ your test suite.
 
 .. method:: SimpleTestCase.assertHTMLNotEqual(html1, html2, msg=None)
 
-    .. versionadded:: 1.4
-
     Asserts that the strings ``html1`` and ``html2`` are *not* equal. The
     comparison is based on HTML semantics. See
     :meth:`~SimpleTestCase.assertHTMLEqual` for details.
@@ -1939,7 +1742,7 @@ test if the database doesn't support a specific named feature.
 
 The decorators use a string identifier to describe database features.
 This string corresponds to attributes of the database connection
-features class. See :class:`~django.db.backends.BaseDatabaseFeatures`
+features class. See ``django.db.backends.BaseDatabaseFeatures``
 class for a full list of database features that can be used as a basis
 for skipping tests.
 
@@ -1969,376 +1772,3 @@ under MySQL with MyISAM tables)::
         @skipUnlessDBFeature('supports_transactions')
         def test_transaction_behavior(self):
             # ... conditional test code
-
-Live test server
-----------------
-
-.. versionadded:: 1.4
-
-.. currentmodule:: django.test
-
-.. class:: LiveServerTestCase()
-
-``LiveServerTestCase`` does basically the same as
-:class:`~django.test.TransactionTestCase` with one extra feature: it launches a
-live Django server in the background on setup, and shuts it down on teardown.
-This allows the use of automated test clients other than the
-:ref:`Django dummy client <test-client>` such as, for example, the Selenium_
-client, to execute a series of functional tests inside a browser and simulate a
-real user's actions.
-
-By default the live server's address is `'localhost:8081'` and the full URL
-can be accessed during the tests with ``self.live_server_url``. If you'd like
-to change the default address (in the case, for example, where the 8081 port is
-already taken) then you may pass a different one to the :djadmin:`test` command
-via the :djadminopt:`--liveserver` option, for example:
-
-.. code-block:: bash
-
-    ./manage.py test --liveserver=localhost:8082
-
-Another way of changing the default server address is by setting the
-`DJANGO_LIVE_TEST_SERVER_ADDRESS` environment variable somewhere in your
-code (for example, in a :ref:`custom test runner<topics-testing-test_runner>`):
-
-.. code-block:: python
-
-    import os
-    os.environ['DJANGO_LIVE_TEST_SERVER_ADDRESS'] = 'localhost:8082'
-
-In the case where the tests are run by multiple processes in parallel (for
-example, in the context of several simultaneous `continuous integration`_
-builds), the processes will compete for the same address, and therefore your
-tests might randomly fail with an "Address already in use" error. To avoid this
-problem, you can pass a comma-separated list of ports or ranges of ports (at
-least as many as the number of potential parallel processes). For example:
-
-.. code-block:: bash
-
-    ./manage.py test --liveserver=localhost:8082,8090-8100,9000-9200,7041
-
-Then, during test execution, each new live test server will try every specified
-port until it finds one that is free and takes it.
-
-.. _continuous integration: http://en.wikipedia.org/wiki/Continuous_integration
-
-To demonstrate how to use ``LiveServerTestCase``, let's write a simple Selenium
-test. First of all, you need to install the `selenium package`_ into your
-Python path:
-
-.. code-block:: bash
-
-   pip install selenium
-
-Then, add a ``LiveServerTestCase``-based test to your app's tests module
-(for example: ``myapp/tests.py``). The code for this test may look as follows:
-
-.. code-block:: python
-
-    from django.test import LiveServerTestCase
-    from selenium.webdriver.firefox.webdriver import WebDriver
-
-    class MySeleniumTests(LiveServerTestCase):
-        fixtures = ['user-data.json']
-
-        @classmethod
-        def setUpClass(cls):
-            cls.selenium = WebDriver()
-            super(MySeleniumTests, cls).setUpClass()
-
-        @classmethod
-        def tearDownClass(cls):
-            cls.selenium.quit()
-            super(MySeleniumTests, cls).tearDownClass()
-
-        def test_login(self):
-            self.selenium.get('%s%s' % (self.live_server_url, '/login/'))
-            username_input = self.selenium.find_element_by_name("username")
-            username_input.send_keys('myuser')
-            password_input = self.selenium.find_element_by_name("password")
-            password_input.send_keys('secret')
-            self.selenium.find_element_by_xpath('//input[@value="Log in"]').click()
-
-Finally, you may run the test as follows:
-
-.. code-block:: bash
-
-    ./manage.py test myapp.MySeleniumTests.test_login
-
-This example will automatically open Firefox then go to the login page, enter
-the credentials and press the "Log in" button. Selenium offers other drivers in
-case you do not have Firefox installed or wish to use another browser. The
-example above is just a tiny fraction of what the Selenium client can do; check
-out the `full reference`_ for more details.
-
-.. _Selenium: http://seleniumhq.org/
-.. _selenium package: http://pypi.python.org/pypi/selenium
-.. _full reference: http://selenium-python.readthedocs.org/en/latest/api.html
-.. _Firefox: http://www.mozilla.com/firefox/
-
-.. note::
-
-    ``LiveServerTestCase`` makes use of the :doc:`staticfiles contrib app
-    </howto/static-files>` so you'll need to have your project configured
-    accordingly (in particular by setting :setting:`STATIC_URL`).
-
-.. note::
-
-    When using an in-memory SQLite database to run the tests, the same database
-    connection will be shared by two threads in parallel: the thread in which
-    the live server is run and the thread in which the test case is run. It's
-    important to prevent simultaneous database queries via this shared
-    connection by the two threads, as that may sometimes randomly cause the
-    tests to fail. So you need to ensure that the two threads don't access the
-    database at the same time. In particular, this means that in some cases
-    (for example, just after clicking a link or submitting a form), you might
-    need to check that a response is received by Selenium and that the next
-    page is loaded before proceeding with further test execution.
-    Do this, for example, by making Selenium wait until the `<body>` HTML tag
-    is found in the response (requires Selenium > 2.13):
-
-    .. code-block:: python
-
-        def test_login(self):
-            from selenium.webdriver.support.wait import WebDriverWait
-            timeout = 2
-            ...
-            self.selenium.find_element_by_xpath('//input[@value="Log in"]').click()
-            # Wait until the response is received
-            WebDriverWait(self.selenium, timeout).until(
-                lambda driver: driver.find_element_by_tag_name('body'))
-
-    The tricky thing here is that there's really no such thing as a "page load,"
-    especially in modern Web apps that generate HTML dynamically after the
-    server generates the initial document. So, simply checking for the presence
-    of `<body>` in the response might not necessarily be appropriate for all
-    use cases. Please refer to the `Selenium FAQ`_ and
-    `Selenium documentation`_ for more information.
-
-    .. _Selenium FAQ: http://code.google.com/p/selenium/wiki/FrequentlyAskedQuestions#Q:_WebDriver_fails_to_find_elements_/_Does_not_block_on_page_loa
-    .. _Selenium documentation: http://seleniumhq.org/docs/04_webdriver_advanced.html#explicit-waits
-
-Using different testing frameworks
-==================================
-
-Clearly, :mod:`doctest` and :mod:`unittest` are not the only Python testing
-frameworks. While Django doesn't provide explicit support for alternative
-frameworks, it does provide a way to invoke tests constructed for an
-alternative framework as if they were normal Django tests.
-
-When you run ``./manage.py test``, Django looks at the :setting:`TEST_RUNNER`
-setting to determine what to do. By default, :setting:`TEST_RUNNER` points to
-``'django.test.simple.DjangoTestSuiteRunner'``. This class defines the default Django
-testing behavior. This behavior involves:
-
-#. Performing global pre-test setup.
-
-#. Looking for unit tests and doctests in the ``models.py`` and
-   ``tests.py`` files in each installed application.
-
-#. Creating the test databases.
-
-#. Running ``syncdb`` to install models and initial data into the test
-   databases.
-
-#. Running the unit tests and doctests that are found.
-
-#. Destroying the test databases.
-
-#. Performing global post-test teardown.
-
-If you define your own test runner class and point :setting:`TEST_RUNNER` at
-that class, Django will execute your test runner whenever you run
-``./manage.py test``. In this way, it is possible to use any test framework
-that can be executed from Python code, or to modify the Django test execution
-process to satisfy whatever testing requirements you may have.
-
-.. _topics-testing-test_runner:
-
-Defining a test runner
-----------------------
-
-.. currentmodule:: django.test.simple
-
-A test runner is a class defining a ``run_tests()`` method. Django ships
-with a ``DjangoTestSuiteRunner`` class that defines the default Django
-testing behavior. This class defines the ``run_tests()`` entry point,
-plus a selection of other methods that are used to by ``run_tests()`` to
-set up, execute and tear down the test suite.
-
-.. class:: DjangoTestSuiteRunner(verbosity=1, interactive=True, failfast=True, **kwargs)
-
-    ``verbosity`` determines the amount of notification and debug information
-    that will be printed to the console; ``0`` is no output, ``1`` is normal
-    output, and ``2`` is verbose output.
-
-    If ``interactive`` is ``True``, the test suite has permission to ask the
-    user for instructions when the test suite is executed. An example of this
-    behavior would be asking for permission to delete an existing test
-    database. If ``interactive`` is ``False``, the test suite must be able to
-    run without any manual intervention.
-
-    If ``failfast`` is ``True``, the test suite will stop running after the
-    first test failure is detected.
-
-    Django will, from time to time, extend the capabilities of
-    the test runner by adding new arguments. The ``**kwargs`` declaration
-    allows for this expansion. If you subclass ``DjangoTestSuiteRunner`` or
-    write your own test runner, ensure accept and handle the ``**kwargs``
-    parameter.
-
-    .. versionadded:: 1.4
-
-    Your test runner may also define additional command-line options.
-    If you add an ``option_list`` attribute to a subclassed test runner,
-    those options will be added to the list of command-line options that
-    the :djadmin:`test` command can use.
-
-Attributes
-~~~~~~~~~~
-
-.. attribute:: DjangoTestSuiteRunner.option_list
-
-    .. versionadded:: 1.4
-
-    This is the tuple of ``optparse`` options which will be fed into the
-    management command's ``OptionParser`` for parsing arguments. See the
-    documentation for Python's ``optparse`` module for more details.
-
-Methods
-~~~~~~~
-
-.. method:: DjangoTestSuiteRunner.run_tests(test_labels, extra_tests=None, **kwargs)
-
-    Run the test suite.
-
-    ``test_labels`` is a list of strings describing the tests to be run. A test
-    label can take one of three forms:
-
-    * ``app.TestCase.test_method`` -- Run a single test method in a test
-      case.
-    * ``app.TestCase`` -- Run all the test methods in a test case.
-    * ``app`` -- Search for and run all tests in the named application.
-
-    If ``test_labels`` has a value of ``None``, the test runner should run
-    search for tests in all the applications in :setting:`INSTALLED_APPS`.
-
-    ``extra_tests`` is a list of extra ``TestCase`` instances to add to the
-    suite that is executed by the test runner. These extra tests are run
-    in addition to those discovered in the modules listed in ``test_labels``.
-
-    This method should return the number of tests that failed.
-
-.. method:: DjangoTestSuiteRunner.setup_test_environment(**kwargs)
-
-    Sets up the test environment ready for testing.
-
-.. method:: DjangoTestSuiteRunner.build_suite(test_labels, extra_tests=None, **kwargs)
-
-    Constructs a test suite that matches the test labels provided.
-
-    ``test_labels`` is a list of strings describing the tests to be run. A test
-    label can take one of three forms:
-
-    * ``app.TestCase.test_method`` -- Run a single test method in a test
-      case.
-    * ``app.TestCase`` -- Run all the test methods in a test case.
-    * ``app`` -- Search for and run all tests in the named application.
-
-    If ``test_labels`` has a value of ``None``, the test runner should run
-    search for tests in all the applications in :setting:`INSTALLED_APPS`.
-
-    ``extra_tests`` is a list of extra ``TestCase`` instances to add to the
-    suite that is executed by the test runner. These extra tests are run
-    in addition to those discovered in the modules listed in ``test_labels``.
-
-    Returns a ``TestSuite`` instance ready to be run.
-
-.. method:: DjangoTestSuiteRunner.setup_databases(**kwargs)
-
-    Creates the test databases.
-
-    Returns a data structure that provides enough detail to undo the changes
-    that have been made. This data will be provided to the ``teardown_databases()``
-    function at the conclusion of testing.
-
-.. method:: DjangoTestSuiteRunner.run_suite(suite, **kwargs)
-
-    Runs the test suite.
-
-    Returns the result produced by the running the test suite.
-
-.. method:: DjangoTestSuiteRunner.teardown_databases(old_config, **kwargs)
-
-    Destroys the test databases, restoring pre-test conditions.
-
-    ``old_config`` is a data structure defining the changes in the
-    database configuration that need to be reversed. It is the return
-    value of the ``setup_databases()`` method.
-
-.. method:: DjangoTestSuiteRunner.teardown_test_environment(**kwargs)
-
-    Restores the pre-test environment.
-
-.. method:: DjangoTestSuiteRunner.suite_result(suite, result, **kwargs)
-
-    Computes and returns a return code based on a test suite, and the result
-    from that test suite.
-
-
-Testing utilities
------------------
-
-.. module:: django.test.utils
-   :synopsis: Helpers to write custom test runners.
-
-To assist in the creation of your own test runner, Django provides a number of
-utility methods in the ``django.test.utils`` module.
-
-.. function:: setup_test_environment()
-
-    Performs any global pre-test setup, such as the installing the
-    instrumentation of the template rendering system and setting up
-    the dummy email outbox.
-
-.. function:: teardown_test_environment()
-
-    Performs any global post-test teardown, such as removing the black
-    magic hooks into the template system and restoring normal email
-    services.
-
-.. currentmodule:: django.db.connection.creation
-
-The creation module of the database backend (``connection.creation``)
-also provides some utilities that can be useful during testing.
-
-.. function:: create_test_db([verbosity=1, autoclobber=False])
-
-    Creates a new test database and runs ``syncdb`` against it.
-
-    ``verbosity`` has the same behavior as in ``run_tests()``.
-
-    ``autoclobber`` describes the behavior that will occur if a
-    database with the same name as the test database is discovered:
-
-    * If ``autoclobber`` is ``False``, the user will be asked to
-      approve destroying the existing database. ``sys.exit`` is
-      called if the user does not approve.
-
-    * If autoclobber is ``True``, the database will be destroyed
-      without consulting the user.
-
-    Returns the name of the test database that it created.
-
-    ``create_test_db()`` has the side effect of modifying the value of
-    :setting:`NAME` in :setting:`DATABASES` to match the name of the test
-    database.
-
-.. function:: destroy_test_db(old_database_name, [verbosity=1])
-
-    Destroys the database whose name is the value of :setting:`NAME` in
-    :setting:`DATABASES`, and sets :setting:`NAME` to the value of
-    ``old_database_name``.
-
-    The ``verbosity`` argument has the same behavior as for
-    :class:`~django.test.simple.DjangoTestSuiteRunner`.
diff --git a/extras/django_bash_completion b/extras/django_bash_completion
index 1c3887eba0..8f85211705 100755
--- a/extras/django_bash_completion
+++ b/extras/django_bash_completion
@@ -42,10 +42,10 @@ complete -F _django_completion -o default django-admin.py manage.py django-admin
 _python_django_completion()
 {
     if [[ ${COMP_CWORD} -ge 2 ]]; then
-        PYTHON_EXE=$( basename -- ${COMP_WORDS[0]} )
+        PYTHON_EXE=${COMP_WORDS[0]##*/}
         echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
         if [[ $? == 0 ]]; then
-            PYTHON_SCRIPT=$( basename -- ${COMP_WORDS[1]} )
+            PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
             echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
             if [[ $? == 0 ]]; then
                 COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
@@ -61,7 +61,7 @@ unset pythons
 if command -v whereis &>/dev/null; then
     python_interpreters=$(whereis python | cut -d " " -f 2-)
     for python in $python_interpreters; do
-        pythons="${pythons} $(basename -- $python)"
+        pythons="${pythons} ${python##*/}"
     done
     pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
 else
diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py
new file mode 100644
index 0000000000..b90b26e1f8
--- /dev/null
+++ b/scripts/manage_translations.py
@@ -0,0 +1,164 @@
+#!/usr/bin/env python
+#
+# This python file contains utility scripts to manage Django translations.
+# It has to be run inside the django git root directory.
+#
+# The following commands are available:
+#
+# * update_catalogs: check for new strings in core and contrib catalogs, and
+#                    output how much strings are new/changed.
+#
+# * lang_stats: output statistics for each catalog/language combination
+#
+# * fetch: fetch translations from transifex.com
+#
+# Each command support the --languages and --resources options to limit their
+# operation to the specified language or resource. For example, to get stats
+# for Spanish in contrib.admin, run:
+#
+#  $ python scripts/manage_translations.py lang_stats --language=es --resources=admin
+
+import os
+from optparse import OptionParser
+from subprocess import call, Popen, PIPE
+
+from django.core.management import call_command
+
+
+HAVE_JS = ['admin']
+
+def _get_locale_dirs(include_core=True):
+    """
+    Return a tuple (contrib name, absolute path) for all locale directories,
+    optionally including the django core catalog.
+    """
+    contrib_dir = os.path.join(os.getcwd(), 'django', 'contrib')
+    dirs = []
+    for contrib_name in os.listdir(contrib_dir):
+        path = os.path.join(contrib_dir, contrib_name, 'locale')
+        if os.path.isdir(path):
+            dirs.append((contrib_name, path))
+            if contrib_name in HAVE_JS:
+                dirs.append(("%s-js" % contrib_name, path))
+    if include_core:
+        dirs.insert(0, ('core', os.path.join(os.getcwd(), 'django', 'conf', 'locale')))
+    return dirs
+
+def _tx_resource_for_name(name):
+    """ Return the Transifex resource name """
+    if name == 'core':
+        return "django.core"
+    else:
+        return "django.contrib-%s" % name
+
+def _check_diff(cat_name, base_path):
+    """
+    Output the approximate number of changed/added strings in the en catalog.
+    """
+    po_path = '%(path)s/en/LC_MESSAGES/django%(ext)s.po' % {
+        'path': base_path, 'ext': 'js' if cat_name.endswith('-js') else ''}
+    p = Popen("git diff -U0 %s | egrep -v '^@@|^[-+]#|^..POT-Creation' | wc -l" % po_path,
+              stdout=PIPE, stderr=PIPE, shell=True)
+    output, errors = p.communicate()
+    num_changes = int(output.strip()) - 4
+    print("%d changed/added messages in '%s' catalog." % (num_changes, cat_name))
+
+
+def update_catalogs(resources=None, languages=None):
+    """
+    Update the en/LC_MESSAGES/django.po (main and contrib) files with
+    new/updated translatable strings.
+    """
+    contrib_dirs = _get_locale_dirs(include_core=False)
+
+    os.chdir(os.path.join(os.getcwd(), 'django'))
+    print("Updating main en catalog")
+    call_command('makemessages', locale='en')
+    _check_diff('core', os.path.join(os.getcwd(), 'conf', 'locale'))
+
+    # Contrib catalogs
+    for name, dir_ in contrib_dirs:
+        if resources and not name in resources:
+            continue
+        os.chdir(os.path.join(dir_, '..'))
+        print("Updating en catalog in %s" % dir_)
+        if name.endswith('-js'):
+            call_command('makemessages', locale='en', domain='djangojs')
+        else:
+            call_command('makemessages', locale='en')
+        _check_diff(name, dir_)
+
+
+def lang_stats(resources=None, languages=None):
+    """
+    Output language statistics of committed translation files for each
+    Django catalog.
+    If resources is provided, it should be a list of translation resource to
+    limit the output (e.g. ['core', 'gis']).
+    """
+    locale_dirs = _get_locale_dirs()
+
+    for name, dir_ in locale_dirs:
+        if resources and not name in resources:
+            continue
+        print("\nShowing translations stats for '%s':" % name) 
+        langs = sorted([d for d in os.listdir(dir_) if not d.startswith('_')])
+        for lang in langs:
+            if languages and not lang in languages:
+                continue
+            # TODO: merge first with the latest en catalog
+            p = Popen("msgfmt -vc -o /dev/null %(path)s/%(lang)s/LC_MESSAGES/django%(ext)s.po" % {
+                'path': dir_, 'lang': lang, 'ext': 'js' if name.endswith('-js') else ''},
+                stdout=PIPE, stderr=PIPE, shell=True)
+            output, errors = p.communicate()
+            if p.returncode == 0:
+                # msgfmt output stats on stderr
+                print("%s: %s" % (lang, errors.strip()))
+
+
+def fetch(resources=None, languages=None):
+    """
+    Fetch translations from Transifex, wrap long lines, generate mo files.
+    """
+    locale_dirs = _get_locale_dirs()
+
+    for name, dir_ in locale_dirs:
+        if resources and not name in resources:
+            continue
+
+        # Transifex pull
+        if languages is None:
+            call('tx pull -r %(res)s -a -f' % {'res': _tx_resource_for_name(name)}, shell=True)
+            languages = sorted([d for d in os.listdir(dir_) if not d.startswith('_')])
+        else:
+            for lang in languages:
+                call('tx pull -r %(res)s -f -l %(lang)s' % {
+                    'res': _tx_resource_for_name(name), 'lang': lang}, shell=True)
+
+        # msgcat to wrap lines and msgfmt for compilation of .mo file
+        for lang in languages:
+            po_path = '%(path)s/%(lang)s/LC_MESSAGES/django%(ext)s.po' % {
+                'path': dir_, 'lang': lang, 'ext': 'js' if name.endswith('-js') else ''}
+            call('msgcat -o %s %s' % (po_path, po_path), shell=True)
+            mo_path = '%s.mo' % po_path[:-3]
+            call('msgfmt -o %s %s' % (mo_path, po_path), shell=True)
+
+
+if __name__ == "__main__":
+    RUNABLE_SCRIPTS = ('update_catalogs', 'lang_stats', 'fetch')
+
+    parser = OptionParser(usage="usage: %prog [options] cmd")
+    parser.add_option("-r", "--resources", action='append',
+        help="limit operation to the specified resources")
+    parser.add_option("-l", "--languages", action='append',
+        help="limit operation to the specified languages")
+    options, args = parser.parse_args()
+
+    if not args:
+        parser.print_usage()
+        exit(1)
+
+    if args[0] in RUNABLE_SCRIPTS:
+        eval(args[0])(options.resources, options.languages)
+    else:
+        print("Available commands are: %s" % ", ".join(RUNABLE_SCRIPTS))
diff --git a/setup.py b/setup.py
index 333d57ac70..006cba4137 100644
--- a/setup.py
+++ b/setup.py
@@ -10,9 +10,12 @@ import sys
 # still present in site-packages. See #18115.
 overlay_warning = False
 if "install" in sys.argv:
-    # We have to try also with an explicit prefix of /usr/local in order to
-    # catch Debian's custom user site-packages directory.
-    for lib_path in get_python_lib(), get_python_lib(prefix="/usr/local"):
+    lib_paths = [get_python_lib()]
+    if lib_paths[0].startswith("/usr/lib/"):
+        # We have to try also with an explicit prefix of /usr/local in order to
+        # catch Debian's custom user site-packages directory.
+        lib_paths.append(get_python_lib(prefix="/usr/local"))
+    for lib_path in lib_paths:
         existing_path = os.path.abspath(os.path.join(lib_path, "django"))
         if os.path.exists(existing_path):
             # We note the need for the warning here, but present it after the
@@ -68,9 +71,7 @@ django_dir = 'django'
 
 for dirpath, dirnames, filenames in os.walk(django_dir):
     # Ignore PEP 3147 cache dirs and those whose names start with '.'
-    for i, dirname in enumerate(dirnames):
-        if dirname.startswith('.') or dirname == '__pycache__':
-            del dirnames[i]
+    dirnames[:] = [d for d in dirnames if not d.startswith('.') and d != '__pycache__']
     if '__init__.py' in filenames:
         packages.append('.'.join(fullsplit(dirpath)))
     elif filenames:
@@ -92,7 +93,7 @@ setup(
     author = 'Django Software Foundation',
     author_email = 'foundation@djangoproject.com',
     description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
-    download_url = 'https://www.djangoproject.com/m/releases/1.4/Django-1.4.tar.gz',
+    license = "BSD",
     packages = packages,
     cmdclass = cmdclasses,
     data_files = data_files,
@@ -107,6 +108,8 @@ setup(
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Internet :: WWW/HTTP :: WSGI',
diff --git a/tests/.coveragerc b/tests/.coveragerc
index b979e94c58..cd7fee3c89 100644
--- a/tests/.coveragerc
+++ b/tests/.coveragerc
@@ -1,5 +1,5 @@
 [run]
-omit = runtests,test_sqlite,regressiontests*,modeltests*,*/django/contrib/*/tests*,*/django/utils/unittest*,*/django/utils/simplejson*,*/django/utils/importlib.py,*/django/test/_doctest.py,*/django/core/servers/fastcgi.py,*/django/utils/autoreload.py,*/django/utils/dictconfig.py
+omit = */django/contrib/*/tests*,*/django/utils/unittest*,*/django/utils/simplejson*,*/django/utils/importlib.py,*/django/test/_doctest.py,*/django/core/servers/fastcgi.py,*/django/utils/autoreload.py,*/django/utils/dictconfig.py
 
 [html]
 directory = coverage_html
diff --git a/django/contrib/localflavor/ar/__init__.py b/tests/admin_changelist/__init__.py
similarity index 100%
rename from django/contrib/localflavor/ar/__init__.py
rename to tests/admin_changelist/__init__.py
diff --git a/tests/regressiontests/admin_changelist/admin.py b/tests/admin_changelist/admin.py
similarity index 91%
rename from tests/regressiontests/admin_changelist/admin.py
rename to tests/admin_changelist/admin.py
index 5751d04bce..8387ba77a1 100644
--- a/tests/regressiontests/admin_changelist/admin.py
+++ b/tests/admin_changelist/admin.py
@@ -34,8 +34,8 @@ class ChildAdmin(admin.ModelAdmin):
     list_per_page = 10
     list_filter = ['parent', 'age']
 
-    def queryset(self, request):
-        return super(ChildAdmin, self).queryset(request).select_related("parent__name")
+    def get_queryset(self, request):
+        return super(ChildAdmin, self).get_queryset(request).select_related("parent__name")
 
 
 class CustomPaginationAdmin(ChildAdmin):
@@ -46,8 +46,8 @@ class FilteredChildAdmin(admin.ModelAdmin):
     list_display = ['name', 'parent']
     list_per_page = 10
 
-    def queryset(self, request):
-        return super(FilteredChildAdmin, self).queryset(request).filter(
+    def get_queryset(self, request):
+        return super(FilteredChildAdmin, self).get_queryset(request).filter(
             name__contains='filtered')
 
 
diff --git a/tests/regressiontests/admin_changelist/models.py b/tests/admin_changelist/models.py
similarity index 92%
rename from tests/regressiontests/admin_changelist/models.py
rename to tests/admin_changelist/models.py
index 4ba2f9c503..242e4b7b6c 100644
--- a/tests/regressiontests/admin_changelist/models.py
+++ b/tests/admin_changelist/models.py
@@ -74,8 +74,8 @@ class UnorderedObject(models.Model):
 
 
 class OrderedObjectManager(models.Manager):
-    def get_query_set(self):
-        return super(OrderedObjectManager, self).get_query_set().order_by('number')
+    def get_queryset(self):
+        return super(OrderedObjectManager, self).get_queryset().order_by('number')
 
 class OrderedObject(models.Model):
     """
@@ -87,3 +87,6 @@ class OrderedObject(models.Model):
     number = models.IntegerField(default=0, db_column='number_val')
 
     objects = OrderedObjectManager()
+
+class CustomIdUser(models.Model):
+    uuid = models.AutoField(primary_key=True)
diff --git a/tests/regressiontests/admin_changelist/tests.py b/tests/admin_changelist/tests.py
similarity index 94%
rename from tests/regressiontests/admin_changelist/tests.py
rename to tests/admin_changelist/tests.py
index e8d4cbff16..fd433967d3 100644
--- a/tests/regressiontests/admin_changelist/tests.py
+++ b/tests/admin_changelist/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 
@@ -20,11 +20,11 @@ from .admin import (ChildAdmin, QuartetAdmin, BandAdmin, ChordsBandAdmin,
     SwallowAdmin, DynamicListFilterChildAdmin)
 from .models import (Event, Child, Parent, Genre, Band, Musician, Group,
     Quartet, Membership, ChordsMusician, ChordsBand, Invitation, Swallow,
-    UnorderedObject, OrderedObject)
+    UnorderedObject, OrderedObject, CustomIdUser)
 
 
 class ChangeListTests(TestCase):
-    urls = "regressiontests.admin_changelist.urls"
+    urls = "admin_changelist.urls"
 
     def setUp(self):
         self.factory = RequestFactory()
@@ -39,15 +39,15 @@ class ChangeListTests(TestCase):
 
     def test_select_related_preserved(self):
         """
-        Regression test for #10348: ChangeList.get_query_set() shouldn't
-        overwrite a custom select_related provided by ModelAdmin.queryset().
+        Regression test for #10348: ChangeList.get_queryset() shouldn't
+        overwrite a custom select_related provided by ModelAdmin.get_queryset().
         """
         m = ChildAdmin(Child, admin.site)
         request = self.factory.get('/child/')
         cl = ChangeList(request, Child, m.list_display, m.list_display_links,
                 m.list_filter, m.date_hierarchy, m.search_fields,
                 m.list_select_related, m.list_per_page, m.list_max_show_all, m.list_editable, m)
-        self.assertEqual(cl.query_set.query.select_related, {'parent': {'name': {}}})
+        self.assertEqual(cl.queryset.query.select_related, {'parent': {'name': {}}})
 
     def test_result_list_empty_changelist_value(self):
         """
@@ -122,12 +122,11 @@ class ChangeListTests(TestCase):
         table_output = template.render(context)
         # make sure that hidden fields are in the correct place
         hiddenfields_div = '<div class="hiddenfields"><input type="hidden" name="form-0-id" value="%d" id="id_form-0-id" /></div>' % new_child.id
-        self.assertFalse(table_output.find(hiddenfields_div) == -1,
-            'Failed to find hidden fields in: %s' % table_output)
+        self.assertInHTML(hiddenfields_div, table_output, msg_prefix='Failed to find hidden fields')
+
         # make sure that list editable fields are rendered in divs correctly
         editable_name_field = '<input name="form-0-name" value="name" class="vTextField" maxlength="30" type="text" id="id_form-0-name" />'
-        self.assertFalse('<td>%s</td>' % editable_name_field == -1,
-            'Failed to find "name" list_editable field in: %s' % table_output)
+        self.assertInHTML('<td>%s</td>' % editable_name_field, table_output, msg_prefix='Failed to find "name" list_editable field')
 
     def test_result_list_editable(self):
         """
@@ -278,7 +277,7 @@ class ChangeListTests(TestCase):
                         m.list_max_show_all, m.list_editable, m)
 
         # Make sure distinct() was called
-        self.assertEqual(cl.query_set.count(), 1)
+        self.assertEqual(cl.queryset.count(), 1)
 
     def test_distinct_for_non_unique_related_object_in_search_fields(self):
         """
@@ -298,7 +297,7 @@ class ChangeListTests(TestCase):
                         m.list_max_show_all, m.list_editable, m)
 
         # Make sure distinct() was called
-        self.assertEqual(cl.query_set.count(), 1)
+        self.assertEqual(cl.queryset.count(), 1)
 
     def test_pagination(self):
         """
@@ -318,7 +317,7 @@ class ChangeListTests(TestCase):
                 m.list_filter, m.date_hierarchy, m.search_fields,
                 m.list_select_related, m.list_per_page, m.list_max_show_all,
                 m.list_editable, m)
-        self.assertEqual(cl.query_set.count(), 60)
+        self.assertEqual(cl.queryset.count(), 60)
         self.assertEqual(cl.paginator.count, 60)
         self.assertEqual(list(cl.paginator.page_range), [1, 2, 3, 4, 5, 6])
 
@@ -328,7 +327,7 @@ class ChangeListTests(TestCase):
                 m.list_filter, m.date_hierarchy, m.search_fields,
                 m.list_select_related, m.list_per_page, m.list_max_show_all,
                 m.list_editable, m)
-        self.assertEqual(cl.query_set.count(), 30)
+        self.assertEqual(cl.queryset.count(), 30)
         self.assertEqual(cl.paginator.count, 30)
         self.assertEqual(list(cl.paginator.page_range), [1, 2, 3])
 
@@ -564,3 +563,22 @@ class ChangeListTests(TestCase):
         request = self._mocked_authenticated_request('/child/', user_parents)
         response = m.changelist_view(request)
         self.assertEqual(response.context_data['cl'].list_filter, ('parent', 'name', 'age'))
+
+class AdminLogNodeTestCase(TestCase):
+
+    def test_get_admin_log_templatetag_custom_user(self):
+        """
+        Regression test for ticket #20088: admin log depends on User model
+        having id field as primary key.
+
+        The old implementation raised an AttributeError when trying to use
+        the id field.
+        """
+        context = Context({'user': CustomIdUser()})
+        template_string = '{% load log %}{% get_admin_log 10 as admin_log for_user user %}'
+
+        template = Template(template_string)
+
+        # Rendering should be u'' since this templatetag just logs,
+        # it doesn't render any string.
+        self.assertEqual(template.render(context), '')
diff --git a/tests/regressiontests/admin_changelist/urls.py b/tests/admin_changelist/urls.py
similarity index 100%
rename from tests/regressiontests/admin_changelist/urls.py
rename to tests/admin_changelist/urls.py
diff --git a/tests/modeltests/distinct_on_fields/__init__.py b/tests/admin_custom_urls/__init__.py
similarity index 100%
rename from tests/modeltests/distinct_on_fields/__init__.py
rename to tests/admin_custom_urls/__init__.py
diff --git a/tests/regressiontests/admin_custom_urls/fixtures/actions.json b/tests/admin_custom_urls/fixtures/actions.json
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/fixtures/actions.json
rename to tests/admin_custom_urls/fixtures/actions.json
diff --git a/tests/regressiontests/admin_custom_urls/fixtures/users.json b/tests/admin_custom_urls/fixtures/users.json
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/fixtures/users.json
rename to tests/admin_custom_urls/fixtures/users.json
diff --git a/tests/regressiontests/admin_custom_urls/models.py b/tests/admin_custom_urls/models.py
similarity index 55%
rename from tests/regressiontests/admin_custom_urls/models.py
rename to tests/admin_custom_urls/models.py
index b9b3285463..55fc064835 100644
--- a/tests/regressiontests/admin_custom_urls/models.py
+++ b/tests/admin_custom_urls/models.py
@@ -1,7 +1,9 @@
 from functools import update_wrapper
 
 from django.contrib import admin
+from django.core.urlresolvers import reverse
 from django.db import models
+from django.http import HttpResponseRedirect
 from django.utils.encoding import python_2_unicode_compatible
 
 
@@ -40,7 +42,7 @@ class ActionAdmin(admin.ModelAdmin):
                 return self.admin_site.admin_view(view)(*args, **kwargs)
             return update_wrapper(wrapper, view)
 
-        info = self.model._meta.app_label, self.model._meta.module_name
+        info = self.model._meta.app_label, self.model._meta.model_name
 
         view_name = '%s_%s_add' % info
 
@@ -49,41 +51,30 @@ class ActionAdmin(admin.ModelAdmin):
         ) + self.remove_url(view_name)
 
 
-admin.site.register(Action, ActionAdmin)
-
-
 class Person(models.Model):
-    nick = models.CharField(max_length=20)
-
-
-class PersonAdmin(admin.ModelAdmin):
-    """A custom ModelAdmin that customizes the deprecated post_url_continue
-    argument to response_add()"""
-    def response_add(self, request, obj, post_url_continue='../%s/continue/',
-                     continue_url=None, add_url=None, hasperm_url=None,
-                     noperm_url=None):
-        return super(PersonAdmin, self).response_add(request, obj,
-                                                     post_url_continue,
-                                                     continue_url, add_url,
-                                                     hasperm_url, noperm_url)
-
-
-admin.site.register(Person, PersonAdmin)
-
-
-class City(models.Model):
     name = models.CharField(max_length=20)
 
+class PersonAdmin(admin.ModelAdmin):
 
-class CityAdmin(admin.ModelAdmin):
-    """A custom ModelAdmin that redirects to the changelist when the user
-    presses the 'Save and add another' button when adding a model instance."""
-    def response_add(self, request, obj,
-                     add_another_url='admin:admin_custom_urls_city_changelist',
-                     **kwargs):
-        return super(CityAdmin, self).response_add(request, obj,
-                                                   add_another_url=add_another_url,
-                                                   **kwargs)
+    def response_post_save_add(self, request, obj):
+        return HttpResponseRedirect(
+            reverse('admin:admin_custom_urls_person_history', args=[obj.pk]))
+
+    def response_post_save_change(self, request, obj):
+        return HttpResponseRedirect(
+            reverse('admin:admin_custom_urls_person_delete', args=[obj.pk]))
 
 
-admin.site.register(City, CityAdmin)
+class Car(models.Model):
+    name = models.CharField(max_length=20)
+
+class CarAdmin(admin.ModelAdmin):
+
+    def response_add(self, request, obj, post_url_continue=None):
+        return super(CarAdmin, self).response_add(
+            request, obj, post_url_continue=reverse('admin:admin_custom_urls_car_history', args=[obj.pk]))
+
+
+admin.site.register(Action, ActionAdmin)
+admin.site.register(Person, PersonAdmin)
+admin.site.register(Car, CarAdmin)
diff --git a/tests/regressiontests/admin_custom_urls/tests.py b/tests/admin_custom_urls/tests.py
similarity index 62%
rename from tests/regressiontests/admin_custom_urls/tests.py
rename to tests/admin_custom_urls/tests.py
index 87c72e2e71..31c93410f4 100644
--- a/tests/regressiontests/admin_custom_urls/tests.py
+++ b/tests/admin_custom_urls/tests.py
@@ -1,5 +1,4 @@
 from __future__ import absolute_import, unicode_literals
-
 import warnings
 
 from django.contrib.admin.util import quote
@@ -8,7 +7,7 @@ from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.utils import override_settings
 
-from .models import Action, Person, City
+from .models import Action, Person, Car
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
@@ -86,8 +85,8 @@ class AdminCustomUrlsTest(TestCase):
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
-class CustomUrlsWorkflowTests(TestCase):
-    fixtures = ['users.json']
+class CustomRedirects(TestCase):
+    fixtures = ['users.json', 'actions.json']
 
     def setUp(self):
         self.client.login(username='super', password='secret')
@@ -95,33 +94,48 @@ class CustomUrlsWorkflowTests(TestCase):
     def tearDown(self):
         self.client.logout()
 
-    def test_old_argument_deprecation(self):
-        """Test reporting of post_url_continue deprecation."""
-        post_data = {
-            'nick': 'johndoe',
-        }
-        cnt = Person.objects.count()
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            response = self.client.post(reverse('admin:admin_custom_urls_person_add'), post_data)
-            self.assertEqual(response.status_code, 302)
-            self.assertEqual(Person.objects.count(), cnt + 1)
-            # We should get a DeprecationWarning
-            self.assertEqual(len(w), 1)
-            self.assertTrue(isinstance(w[0].message, DeprecationWarning))
+    def test_post_save_add_redirect(self):
+        """
+        Ensures that ModelAdmin.response_post_save_add() controls the
+        redirection after the 'Save' button has been pressed when adding a
+        new object.
+        Refs 8001, 18310, 19505.
+        """
+        post_data = { 'name': 'John Doe', }
+        self.assertEqual(Person.objects.count(), 0)
+        response = self.client.post(
+            reverse('admin:admin_custom_urls_person_add'), post_data)
+        persons = Person.objects.all()
+        self.assertEqual(len(persons), 1)
+        self.assertRedirects(
+            response, reverse('admin:admin_custom_urls_person_history', args=[persons[0].pk]))
 
-    def test_custom_add_another_redirect(self):
-        """Test customizability of post-object-creation redirect URL."""
-        post_data = {
-            'name': 'Rome',
-            '_addanother': '1',
-        }
-        cnt = City.objects.count()
-        with warnings.catch_warnings(record=True) as w:
-            # POST to the view whose post-object-creation redir URL argument we
-            # are customizing (object creation)
-            response = self.client.post(reverse('admin:admin_custom_urls_city_add'), post_data)
-            self.assertEqual(City.objects.count(), cnt + 1)
-            # Check that it redirected to the URL we set
-            self.assertRedirects(response, reverse('admin:admin_custom_urls_city_changelist'))
-            self.assertEqual(len(w), 0) # We should get no DeprecationWarning
+    def test_post_save_change_redirect(self):
+        """
+        Ensures that ModelAdmin.response_post_save_change() controls the
+        redirection after the 'Save' button has been pressed when editing an
+        existing object.
+        Refs 8001, 18310, 19505.
+        """
+        Person.objects.create(name='John Doe')
+        self.assertEqual(Person.objects.count(), 1)
+        person = Person.objects.all()[0]
+        post_data = { 'name': 'Jack Doe', }
+        response = self.client.post(
+            reverse('admin:admin_custom_urls_person_change', args=[person.pk]), post_data)
+        self.assertRedirects(
+            response, reverse('admin:admin_custom_urls_person_delete', args=[person.pk]))
+
+    def test_post_url_continue(self):
+        """
+        Ensures that the ModelAdmin.response_add()'s parameter `post_url_continue`
+        controls the redirection after an object has been created.
+        """
+        post_data = { 'name': 'SuperFast', '_continue': '1' }
+        self.assertEqual(Car.objects.count(), 0)
+        response = self.client.post(
+            reverse('admin:admin_custom_urls_car_add'), post_data)
+        cars = Car.objects.all()
+        self.assertEqual(len(cars), 1)
+        self.assertRedirects(
+            response, reverse('admin:admin_custom_urls_car_history', args=[cars[0].pk]))
diff --git a/tests/regressiontests/admin_custom_urls/urls.py b/tests/admin_custom_urls/urls.py
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/urls.py
rename to tests/admin_custom_urls/urls.py
diff --git a/django/contrib/localflavor/at/__init__.py b/tests/admin_filters/__init__.py
similarity index 100%
rename from django/contrib/localflavor/at/__init__.py
rename to tests/admin_filters/__init__.py
diff --git a/tests/regressiontests/admin_filters/models.py b/tests/admin_filters/models.py
similarity index 100%
rename from tests/regressiontests/admin_filters/models.py
rename to tests/admin_filters/models.py
diff --git a/tests/regressiontests/admin_filters/tests.py b/tests/admin_filters/tests.py
similarity index 94%
rename from tests/regressiontests/admin_filters/tests.py
rename to tests/admin_filters/tests.py
index 4a3e6135c3..f05e8e2011 100644
--- a/tests/regressiontests/admin_filters/tests.py
+++ b/tests/admin_filters/tests.py
@@ -61,7 +61,7 @@ class DecadeListFilterWithFailingQueryset(DecadeListFilterWithTitleAndParameter)
 class DecadeListFilterWithQuerysetBasedLookups(DecadeListFilterWithTitleAndParameter):
 
     def lookups(self, request, model_admin):
-        qs = model_admin.queryset(request)
+        qs = model_admin.get_queryset(request)
         if qs.filter(year__gte=1980, year__lte=1989).exists():
             yield ('the 80s', "the 1980's")
         if qs.filter(year__gte=1990, year__lte=1999).exists():
@@ -83,11 +83,11 @@ class DepartmentListFilterLookupWithNonStringValue(SimpleListFilter):
     parameter_name = 'department'
 
     def lookups(self, request, model_admin):
-        return set([
+        return sorted(set([
             (employee.department.id,  # Intentionally not a string (Refs #19318)
              employee.department.code)
-            for employee in model_admin.queryset(request).all()
-        ])
+            for employee in model_admin.get_queryset(request).all()
+        ]))
 
     def queryset(self, request, queryset):
         if self.value():
@@ -183,7 +183,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.django_book, self.djangonaut_book])
 
         # Make sure the correct choice is selected
@@ -200,7 +200,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         if (self.today.year, self.today.month) == (self.one_week_ago.year, self.one_week_ago.month):
             # In case one week ago is in the same month.
             self.assertEqual(list(queryset), [self.gipsy_book, self.django_book, self.djangonaut_book])
@@ -221,7 +221,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         if self.today.year == self.one_week_ago.year:
             # In case one week ago is in the same year.
             self.assertEqual(list(queryset), [self.gipsy_book, self.django_book, self.djangonaut_book])
@@ -242,7 +242,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.gipsy_book, self.django_book, self.djangonaut_book])
 
         # Make sure the correct choice is selected
@@ -266,7 +266,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.django_book])
 
         # Make sure the last choice is None and is selected
@@ -293,7 +293,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.gipsy_book])
 
         # Make sure the last choice is None and is selected
@@ -321,7 +321,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.django_book, self.bio_book, self.djangonaut_book])
 
         # Make sure the last choice is None and is selected
@@ -349,7 +349,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, User, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.lisa])
 
         # Make sure the last choice is None and is selected
@@ -374,7 +374,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, User, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.alfred])
 
         # Make sure the last choice is None and is selected
@@ -410,7 +410,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.bio_book])
 
         # Make sure the correct choice is selected
@@ -424,7 +424,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.gipsy_book, self.djangonaut_book])
 
         # Make sure the correct choice is selected
@@ -438,7 +438,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.django_book])
 
         # Make sure the correct choice is selected
@@ -457,7 +457,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), list(Book.objects.all().order_by('-id')))
 
         # Make sure the correct choice is selected
@@ -474,7 +474,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [])
 
         # Make sure the correct choice is selected
@@ -491,7 +491,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.bio_book])
 
         # Make sure the correct choice is selected
@@ -508,7 +508,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.gipsy_book, self.djangonaut_book])
 
         # Make sure the correct choice is selected
@@ -525,7 +525,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.djangonaut_book])
 
         # Make sure the correct choices are selected
@@ -534,13 +534,13 @@ class ListFiltersTests(TestCase):
         choices = list(filterspec.choices(changelist))
         self.assertEqual(choices[3]['display'], 'the 2000\'s')
         self.assertEqual(choices[3]['selected'], True)
-        self.assertEqual(choices[3]['query_string'], '?publication-decade=the+00s&author__id__exact=%s' % self.alfred.pk)
+        self.assertEqual(choices[3]['query_string'], '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk)
 
         filterspec = changelist.get_filters(request)[0][0]
         self.assertEqual(force_text(filterspec.title), 'Verbose Author')
         choice = select_by(filterspec.choices(changelist), "display", "alfred")
         self.assertEqual(choice['selected'], True)
-        self.assertEqual(choice['query_string'], '?publication-decade=the+00s&author__id__exact=%s' % self.alfred.pk)
+        self.assertEqual(choice['query_string'], '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk)
 
     def test_listfilter_without_title(self):
         """
@@ -615,7 +615,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.bio_book])
 
         filterspec = changelist.get_filters(request)[0][-1]
@@ -637,7 +637,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.bio_book])
 
         # Make sure the correct choice is selected
@@ -654,7 +654,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Book, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.bio_book])
 
         # Make sure the correct choice is selected
@@ -676,16 +676,16 @@ class ListFiltersTests(TestCase):
         request = self.request_factory.get('/', {'department': self.john.pk})
         changelist = self.get_changelist(request, Employee, modeladmin)
 
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
 
         self.assertEqual(list(queryset), [self.john])
 
         filterspec = changelist.get_filters(request)[0][-1]
         self.assertEqual(force_text(filterspec.title), 'department')
         choices = list(filterspec.choices(changelist))
-        self.assertEqual(choices[2]['display'], 'DEV')
-        self.assertEqual(choices[2]['selected'], True)
-        self.assertEqual(choices[2]['query_string'], '?department=%s' % self.john.pk)
+        self.assertEqual(choices[1]['display'], 'DEV')
+        self.assertEqual(choices[1]['selected'], True)
+        self.assertEqual(choices[1]['query_string'], '?department=%s' % self.john.pk)
 
     def test_fk_with_to_field(self):
         """
@@ -698,7 +698,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Employee, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.jack, self.john])
 
         filterspec = changelist.get_filters(request)[0][-1]
@@ -723,7 +723,7 @@ class ListFiltersTests(TestCase):
         changelist = self.get_changelist(request, Employee, modeladmin)
 
         # Make sure the correct queryset is returned
-        queryset = changelist.get_query_set(request)
+        queryset = changelist.get_queryset(request)
         self.assertEqual(list(queryset), [self.john])
 
         filterspec = changelist.get_filters(request)[0][-1]
diff --git a/django/contrib/localflavor/au/__init__.py b/tests/admin_inlines/__init__.py
similarity index 100%
rename from django/contrib/localflavor/au/__init__.py
rename to tests/admin_inlines/__init__.py
diff --git a/tests/regressiontests/admin_inlines/admin.py b/tests/admin_inlines/admin.py
similarity index 91%
rename from tests/regressiontests/admin_inlines/admin.py
rename to tests/admin_inlines/admin.py
index cf51fa49b4..44671d0ac4 100644
--- a/tests/regressiontests/admin_inlines/admin.py
+++ b/tests/admin_inlines/admin.py
@@ -28,6 +28,11 @@ class HolderAdmin(admin.ModelAdmin):
         js = ('my_awesome_admin_scripts.js',)
 
 
+class ReadOnlyInlineInline(admin.TabularInline):
+    model = ReadOnlyInline
+    readonly_fields = ['name']
+
+
 class InnerInline2(admin.StackedInline):
     model = Inner2
 
@@ -124,6 +129,9 @@ class ChildModel1Inline(admin.TabularInline):
 class ChildModel2Inline(admin.StackedInline):
     model = ChildModel2
 
+# admin for #19524
+class SightingInline(admin.TabularInline):
+    model = Sighting
 
 site.register(TitleCollection, inlines=[TitleInline])
 # Test bug #12561 and #12778
@@ -139,6 +147,7 @@ site.register(Novel, NovelAdmin)
 site.register(Fashionista, inlines=[InlineWeakness])
 site.register(Holder4, Holder4Admin)
 site.register(Author, AuthorAdmin)
-site.register(CapoFamiglia, inlines=[ConsigliereInline, SottoCapoInline])
+site.register(CapoFamiglia, inlines=[ConsigliereInline, SottoCapoInline, ReadOnlyInlineInline])
 site.register(ProfileCollection, inlines=[ProfileInline])
-site.register(ParentModelWithCustomPk, inlines=[ChildModel1Inline, ChildModel2Inline])
\ No newline at end of file
+site.register(ParentModelWithCustomPk, inlines=[ChildModel1Inline, ChildModel2Inline])
+site.register(ExtraTerrestrial, inlines=[SightingInline])
diff --git a/tests/regressiontests/admin_inlines/fixtures/admin-views-users.xml b/tests/admin_inlines/fixtures/admin-views-users.xml
similarity index 100%
rename from tests/regressiontests/admin_inlines/fixtures/admin-views-users.xml
rename to tests/admin_inlines/fixtures/admin-views-users.xml
diff --git a/tests/regressiontests/admin_inlines/models.py b/tests/admin_inlines/models.py
similarity index 86%
rename from tests/regressiontests/admin_inlines/models.py
rename to tests/admin_inlines/models.py
index b004d5f85a..82c1c3f078 100644
--- a/tests/regressiontests/admin_inlines/models.py
+++ b/tests/admin_inlines/models.py
@@ -90,7 +90,6 @@ class Inner4Tabular(models.Model):
     dummy = models.IntegerField(help_text="Awesome tabular help text is awesome.")
     holder = models.ForeignKey(Holder4)
 
-
 # Models for #12749
 
 class Person(models.Model):
@@ -129,16 +128,24 @@ class Novel(models.Model):
     name = models.CharField(max_length=40)
 
 class Chapter(models.Model):
+    name = models.CharField(max_length=40)
     novel = models.ForeignKey(Novel)
 
+class FootNote(models.Model):
+    """
+    Model added for ticket 19838
+    """
+    chapter = models.ForeignKey(Chapter, on_delete=models.PROTECT)
+    note = models.CharField(max_length=40)
 
 # Models for #16838
+
 class CapoFamiglia(models.Model):
     name = models.CharField(max_length=100)
 
 
 class Consigliere(models.Model):
-    name = models.CharField(max_length=100)
+    name = models.CharField(max_length=100, help_text='Help text for Consigliere')
     capo_famiglia = models.ForeignKey(CapoFamiglia, related_name='+')
 
 
@@ -146,6 +153,12 @@ class SottoCapo(models.Model):
     name = models.CharField(max_length=100)
     capo_famiglia = models.ForeignKey(CapoFamiglia, related_name='+')
 
+
+class ReadOnlyInline(models.Model):
+    name = models.CharField(max_length=100, help_text='Help text for ReadOnlyInline')
+    capo_famiglia = models.ForeignKey(CapoFamiglia)
+
+
 # Models for #18433
 
 class ParentModelWithCustomPk(models.Model):
@@ -170,6 +183,17 @@ class ChildModel2(models.Model):
     def get_absolute_url(self):
         return '/child_model2/'
 
+# Models for #19524
+
+class LifeForm(models.Model):
+    pass
+
+class ExtraTerrestrial(LifeForm):
+    name = models.CharField(max_length=100)
+
+class Sighting(models.Model):
+    et = models.ForeignKey(ExtraTerrestrial)
+    place = models.CharField(max_length=100)
 
 # Other models
 
diff --git a/tests/regressiontests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
similarity index 83%
rename from tests/regressiontests/admin_inlines/tests.py
rename to tests/admin_inlines/tests.py
index 5bb6077bff..714a2f1c61 100644
--- a/tests/regressiontests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -12,12 +12,12 @@ from .admin import InnerInline, TitleInline, site
 from .models import (Holder, Inner, Holder2, Inner2, Holder3, Inner3, Person,
     OutfitItem, Fashionista, Teacher, Parent, Child, Author, Book, Profile,
     ProfileCollection, ParentModelWithCustomPk, ChildModel1, ChildModel2,
-    Title)
+    Sighting, Title, Novel, Chapter, FootNote)
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class TestInline(TestCase):
-    urls = "regressiontests.admin_inlines.urls"
+    urls = "admin_inlines.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -122,6 +122,10 @@ class TestInline(TestCase):
         response = self.client.get('/admin/admin_inlines/holder4/add/')
         self.assertContains(response, '<p class="help">Awesome stacked help text is awesome.</p>', 4)
         self.assertContains(response, '<img src="/static/admin/img/icon-unknown.gif" class="help help-tooltip" width="10" height="10" alt="(Awesome tabular help text is awesome.)" title="Awesome tabular help text is awesome." />', 1)
+        # ReadOnly fields
+        response = self.client.get('/admin/admin_inlines/capofamiglia/add/')
+        self.assertContains(response, '<img src="/static/admin/img/icon-unknown.gif" class="help help-tooltip" width="10" height="10" alt="(Help text for ReadOnlyInline)" title="Help text for ReadOnlyInline" />', 1)
+
 
     def test_non_related_name_inline(self):
         """
@@ -131,19 +135,17 @@ class TestInline(TestCase):
         response = self.client.get('/admin/admin_inlines/capofamiglia/add/')
 
         self.assertContains(response,
-                '<input type="hidden" name="-1-0-id" id="id_-1-0-id" />')
+                '<input type="hidden" name="-1-0-id" id="id_-1-0-id" />', html=True)
         self.assertContains(response,
-                '<input type="hidden" name="-1-0-capo_famiglia" '
-                'id="id_-1-0-capo_famiglia" />')
+                '<input type="hidden" name="-1-0-capo_famiglia" id="id_-1-0-capo_famiglia" />', html=True)
         self.assertContains(response,
                 '<input id="id_-1-0-name" type="text" class="vTextField" '
                 'name="-1-0-name" maxlength="100" />', html=True)
 
         self.assertContains(response,
-                '<input type="hidden" name="-2-0-id" id="id_-2-0-id" />')
+                '<input type="hidden" name="-2-0-id" id="id_-2-0-id" />', html=True)
         self.assertContains(response,
-                '<input type="hidden" name="-2-0-capo_famiglia" '
-                'id="id_-2-0-capo_famiglia" />')
+                '<input type="hidden" name="-2-0-capo_famiglia" id="id_-2-0-capo_famiglia" />', html=True)
         self.assertContains(response,
                 '<input id="id_-2-0-name" type="text" class="vTextField" '
                 'name="-2-0-name" maxlength="100" />', html=True)
@@ -174,10 +176,27 @@ class TestInline(TestCase):
         self.assertContains(response, child1_shortcut)
         self.assertContains(response, child2_shortcut)
 
+    def test_create_inlines_on_inherited_model(self):
+        """
+        Ensure that an object can be created with inlines when it inherits
+        another class. Bug #19524.
+        """
+        data = {
+            'name': 'Martian',
+            'sighting_set-TOTAL_FORMS': 1,
+            'sighting_set-INITIAL_FORMS': 0,
+            'sighting_set-MAX_NUM_FORMS': 0,
+            'sighting_set-0-place': 'Zone 51',
+            '_save': 'Save',
+        }
+        response = self.client.post('/admin/admin_inlines/extraterrestrial/add/', data)
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(Sighting.objects.filter(et__name='Martian').count(), 1)
+
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class TestInlineMedia(TestCase):
-    urls = "regressiontests.admin_inlines.urls"
+    urls = "admin_inlines.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -214,7 +233,7 @@ class TestInlineMedia(TestCase):
         self.assertContains(response, 'my_awesome_inline_scripts.js')
 
 class TestInlineAdminForm(TestCase):
-    urls = "regressiontests.admin_inlines.urls"
+    urls = "admin_inlines.urls"
 
     def test_immutable_content_type(self):
         """Regression for #9362
@@ -231,13 +250,51 @@ class TestInlineAdminForm(TestCase):
         parent_ct = ContentType.objects.get_for_model(Parent)
         self.assertEqual(iaf.original.content_type, parent_ct)
 
+
+@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
+class TestInlineProtectedOnDelete(TestCase):
+    urls = "admin_inlines.urls"
+    fixtures = ['admin-views-users.xml']
+
+    def setUp(self):
+        result = self.client.login(username='super', password='secret')
+        self.assertEqual(result, True)
+
+    def tearDown(self):
+        self.client.logout()
+
+    def test_deleting_inline_with_protected_delete_does_not_validate(self):
+        lotr = Novel.objects.create(name='Lord of the rings')
+        chapter = Chapter.objects.create(novel=lotr, name='Many Meetings')
+        foot_note = FootNote.objects.create(chapter=chapter, note='yadda yadda')
+
+        change_url = '/admin/admin_inlines/novel/%i/' % lotr.id
+        response = self.client.get(change_url)
+        data = {
+            'name': lotr.name,
+            'chapter_set-TOTAL_FORMS': 1,
+            'chapter_set-INITIAL_FORMS': 1,
+            'chapter_set-MAX_NUM_FORMS': 1000,
+            '_save': 'Save',
+            'chapter_set-0-id': chapter.id,
+            'chapter_set-0-name': chapter.name,
+            'chapter_set-0-novel': lotr.id,
+            'chapter_set-0-DELETE': 'on'
+        }
+        response = self.client.post(change_url, data)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Deleting chapter %s would require deleting "
+                            "the following protected related objects: foot note %s"
+                            % (chapter, foot_note))
+
+
 class TestInlinePermissions(TestCase):
     """
     Make sure the admin respects permissions for objects that are edited
     inline. Refs #8060.
 
     """
-    urls = "regressiontests.admin_inlines.urls"
+    urls = "admin_inlines.urls"
 
     def setUp(self):
         self.user = User(username='admin')
@@ -326,7 +383,8 @@ class TestInlinePermissions(TestCase):
         # Add permission on inner2s, so we get the inline
         self.assertContains(response, '<h2>Inner2s</h2>')
         self.assertContains(response, 'Add another Inner2')
-        self.assertContains(response, 'value="3" id="id_inner2_set-TOTAL_FORMS"')
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
+                            'value="3" name="inner2_set-TOTAL_FORMS" />', html=True)
 
     def test_inline_change_m2m_add_perm(self):
         permission = Permission.objects.get(codename='add_book', content_type=self.book_ct)
@@ -345,8 +403,10 @@ class TestInlinePermissions(TestCase):
         # We have change perm on books, so we can add/change/delete inlines
         self.assertContains(response, '<h2>Author-book relationships</h2>')
         self.assertContains(response, 'Add another Author-Book Relationship')
-        self.assertContains(response, 'value="4" id="id_Author_books-TOTAL_FORMS"')
-        self.assertContains(response, '<input type="hidden" name="Author_books-0-id" value="%i"' % self.author_book_auto_m2m_intermediate_id)
+        self.assertContains(response, '<input type="hidden" id="id_Author_books-TOTAL_FORMS" '
+                            'value="4" name="Author_books-TOTAL_FORMS" />', html=True)
+        self.assertContains(response, '<input type="hidden" id="id_Author_books-0-id" '
+                            'value="%i" name="Author_books-0-id" />' % self.author_book_auto_m2m_intermediate_id, html=True)
         self.assertContains(response, 'id="id_Author_books-0-DELETE"')
 
     def test_inline_change_fk_add_perm(self):
@@ -357,8 +417,10 @@ class TestInlinePermissions(TestCase):
         self.assertContains(response, '<h2>Inner2s</h2>')
         self.assertContains(response, 'Add another Inner2')
         # 3 extra forms only, not the existing instance form
-        self.assertContains(response, 'value="3" id="id_inner2_set-TOTAL_FORMS"')
-        self.assertNotContains(response, '<input type="hidden" name="inner2_set-0-id" value="%i"' % self.inner2_id)
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
+                                'value="3" name="inner2_set-TOTAL_FORMS" />', html=True)
+        self.assertNotContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
+                            'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
 
     def test_inline_change_fk_change_perm(self):
         permission = Permission.objects.get(codename='change_inner2', content_type=self.inner_ct)
@@ -367,10 +429,13 @@ class TestInlinePermissions(TestCase):
         # Change permission on inner2s, so we can change existing but not add new
         self.assertContains(response, '<h2>Inner2s</h2>')
         # Just the one form for existing instances
-        self.assertContains(response, 'value="1" id="id_inner2_set-TOTAL_FORMS"')
-        self.assertContains(response, '<input type="hidden" name="inner2_set-0-id" value="%i"' % self.inner2_id)
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
+                                'value="1" name="inner2_set-TOTAL_FORMS" />', html=True)
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
+                            'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
         # max-num 0 means we can't add new ones
-        self.assertContains(response, 'value="0" id="id_inner2_set-MAX_NUM_FORMS"')
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-MAX_NUM_FORMS" '
+                                'value="0" name="inner2_set-MAX_NUM_FORMS" />', html=True)
 
     def test_inline_change_fk_add_change_perm(self):
         permission = Permission.objects.get(codename='add_inner2', content_type=self.inner_ct)
@@ -381,9 +446,10 @@ class TestInlinePermissions(TestCase):
         # Add/change perm, so we can add new and change existing
         self.assertContains(response, '<h2>Inner2s</h2>')
         # One form for existing instance and three extra for new
-        self.assertContains(response, 'value="4" id="id_inner2_set-TOTAL_FORMS"')
-        self.assertContains(response, '<input type="hidden" name="inner2_set-0-id" value="%i"' % self.inner2_id)
-
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
+                                'value="4" name="inner2_set-TOTAL_FORMS" />', html=True)
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
+                            'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
 
     def test_inline_change_fk_change_del_perm(self):
         permission = Permission.objects.get(codename='change_inner2', content_type=self.inner_ct)
@@ -394,8 +460,10 @@ class TestInlinePermissions(TestCase):
         # Change/delete perm on inner2s, so we can change/delete existing
         self.assertContains(response, '<h2>Inner2s</h2>')
         # One form for existing instance only, no new
-        self.assertContains(response, 'value="1" id="id_inner2_set-TOTAL_FORMS"')
-        self.assertContains(response, '<input type="hidden" name="inner2_set-0-id" value="%i"' % self.inner2_id)
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
+                                'value="1" name="inner2_set-TOTAL_FORMS" />', html=True)
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
+                            'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
         self.assertContains(response, 'id="id_inner2_set-0-DELETE"')
 
 
@@ -410,8 +478,10 @@ class TestInlinePermissions(TestCase):
         # All perms on inner2s, so we can add/change/delete
         self.assertContains(response, '<h2>Inner2s</h2>')
         # One form for existing instance only, three for new
-        self.assertContains(response, 'value="4" id="id_inner2_set-TOTAL_FORMS"')
-        self.assertContains(response, '<input type="hidden" name="inner2_set-0-id" value="%i"' % self.inner2_id)
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
+                                'value="4" name="inner2_set-TOTAL_FORMS" />', html=True)
+        self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
+                            'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
         self.assertContains(response, 'id="id_inner2_set-0-DELETE"')
 
 
@@ -419,7 +489,7 @@ class TestInlinePermissions(TestCase):
 class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
     webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
     fixtures = ['admin-views-users.xml']
-    urls = "regressiontests.admin_inlines.urls"
+    urls = "admin_inlines.urls"
 
     def test_add_stackeds(self):
         """
@@ -518,15 +588,7 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
         self.selenium.find_element_by_name('profile_set-2-last_name').send_keys('2 last name 2')
 
         self.selenium.find_element_by_xpath('//input[@value="Save"]').click()
-
-        try:
-            # Wait for the next page to be loaded.
-            self.wait_loaded_tag('body')
-        except TimeoutException:
-            # IE7 occasionnally returns an error "Internet Explorer cannot
-            # display the webpage" and doesn't load the next page. We just
-            # ignore it.
-            pass
+        self.wait_page_loaded()
 
         # Check that the objects have been created in the database
         self.assertEqual(ProfileCollection.objects.all().count(), 1)
diff --git a/tests/regressiontests/admin_inlines/urls.py b/tests/admin_inlines/urls.py
similarity index 100%
rename from tests/regressiontests/admin_inlines/urls.py
rename to tests/admin_inlines/urls.py
diff --git a/django/contrib/localflavor/be/__init__.py b/tests/admin_ordering/__init__.py
similarity index 100%
rename from django/contrib/localflavor/be/__init__.py
rename to tests/admin_ordering/__init__.py
diff --git a/tests/regressiontests/admin_ordering/models.py b/tests/admin_ordering/models.py
similarity index 91%
rename from tests/regressiontests/admin_ordering/models.py
rename to tests/admin_ordering/models.py
index 195b3c3694..3da52b1b00 100644
--- a/tests/regressiontests/admin_ordering/models.py
+++ b/tests/admin_ordering/models.py
@@ -15,6 +15,7 @@ class Song(models.Model):
     band = models.ForeignKey(Band)
     name = models.CharField(max_length=100)
     duration = models.IntegerField()
+    other_interpreters = models.ManyToManyField(Band, related_name='covers')
 
     class Meta:
         ordering = ('name',)
diff --git a/tests/regressiontests/admin_ordering/tests.py b/tests/admin_ordering/tests.py
similarity index 54%
rename from tests/regressiontests/admin_ordering/tests.py
rename to tests/admin_ordering/tests.py
index faae834f93..6655ad37ad 100644
--- a/tests/regressiontests/admin_ordering/tests.py
+++ b/tests/admin_ordering/tests.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.test import TestCase, RequestFactory
+from django.contrib import admin
 from django.contrib.admin.options import ModelAdmin
 from django.contrib.auth.models import User
 
@@ -21,8 +22,8 @@ request.user = MockSuperUser()
 
 class TestAdminOrdering(TestCase):
     """
-    Let's make sure that ModelAdmin.queryset uses the ordering we define in
-    ModelAdmin rather that ordering defined in the model's inner Meta
+    Let's make sure that ModelAdmin.get_queryset uses the ordering we define
+    in ModelAdmin rather that ordering defined in the model's inner Meta
     class.
     """
 
@@ -41,7 +42,7 @@ class TestAdminOrdering(TestCase):
         class.
         """
         ma = ModelAdmin(Band, None)
-        names = [b.name for b in ma.queryset(request)]
+        names = [b.name for b in ma.get_queryset(request)]
         self.assertEqual(['Aerosmith', 'Radiohead', 'Van Halen'], names)
 
     def test_specified_ordering(self):
@@ -52,7 +53,7 @@ class TestAdminOrdering(TestCase):
         class BandAdmin(ModelAdmin):
             ordering = ('rank',) # default ordering is ('name',)
         ma = BandAdmin(Band, None)
-        names = [b.name for b in ma.queryset(request)]
+        names = [b.name for b in ma.get_queryset(request)]
         self.assertEqual(['Radiohead', 'Van Halen', 'Aerosmith'], names)
 
     def test_dynamic_ordering(self):
@@ -64,17 +65,17 @@ class TestAdminOrdering(TestCase):
         request = self.request_factory.get('/')
         request.user = super_user
         ma = DynOrderingBandAdmin(Band, None)
-        names = [b.name for b in ma.queryset(request)]
+        names = [b.name for b in ma.get_queryset(request)]
         self.assertEqual(['Radiohead', 'Van Halen', 'Aerosmith'], names)
         request.user = other_user
-        names = [b.name for b in ma.queryset(request)]
+        names = [b.name for b in ma.get_queryset(request)]
         self.assertEqual(['Aerosmith', 'Radiohead', 'Van Halen'], names)
 
 
 class TestInlineModelAdminOrdering(TestCase):
     """
-    Let's make sure that InlineModelAdmin.queryset uses the ordering we define
-    in InlineModelAdmin.
+    Let's make sure that InlineModelAdmin.get_queryset uses the ordering we
+    define in InlineModelAdmin.
     """
 
     def setUp(self):
@@ -94,7 +95,7 @@ class TestInlineModelAdminOrdering(TestCase):
         class.
         """
         inline = SongInlineDefaultOrdering(self.b, None)
-        names = [s.name for s in inline.queryset(request)]
+        names = [s.name for s in inline.get_queryset(request)]
         self.assertEqual(['Dude (Looks Like a Lady)', 'Jaded', 'Pink'], names)
 
     def test_specified_ordering(self):
@@ -102,5 +103,52 @@ class TestInlineModelAdminOrdering(TestCase):
         Let's check with ordering set to something different than the default.
         """
         inline = SongInlineNewOrdering(self.b, None)
-        names = [s.name for s in inline.queryset(request)]
+        names = [s.name for s in inline.get_queryset(request)]
         self.assertEqual(['Jaded', 'Pink', 'Dude (Looks Like a Lady)'], names)
+
+
+class TestRelatedFieldsAdminOrdering(TestCase):
+    def setUp(self):
+        self.b1 = Band(name='Pink Floyd', bio='', rank=1)
+        self.b1.save()
+        self.b2 = Band(name='Foo Fighters', bio='', rank=5)
+        self.b2.save()
+
+        # we need to register a custom ModelAdmin (instead of just using
+        # ModelAdmin) because the field creator tries to find the ModelAdmin
+        # for the related model
+        class SongAdmin(admin.ModelAdmin):
+            pass
+        admin.site.register(Song, SongAdmin)
+
+    def check_ordering_of_field_choices(self, correct_ordering):
+        fk_field = admin.site._registry[Song].formfield_for_foreignkey(Song.band.field)
+        m2m_field = admin.site._registry[Song].formfield_for_manytomany(Song.other_interpreters.field)
+
+        self.assertEqual(list(fk_field.queryset), correct_ordering)
+        self.assertEqual(list(m2m_field.queryset), correct_ordering)
+
+    def test_no_admin_fallback_to_model_ordering(self):
+        # should be ordered by name (as defined by the model)
+        self.check_ordering_of_field_choices([self.b2, self.b1])
+
+    def test_admin_with_no_ordering_fallback_to_model_ordering(self):
+        class NoOrderingBandAdmin(admin.ModelAdmin):
+            pass
+        admin.site.register(Band, NoOrderingBandAdmin)
+
+        # should be ordered by name (as defined by the model)
+        self.check_ordering_of_field_choices([self.b2, self.b1])
+
+    def test_admin_ordering_beats_model_ordering(self):
+        class StaticOrderingBandAdmin(admin.ModelAdmin):
+            ordering = ('rank', )
+        admin.site.register(Band, StaticOrderingBandAdmin)
+
+        # should be ordered by rank (defined by the ModelAdmin)
+        self.check_ordering_of_field_choices([self.b1, self.b2])
+
+    def tearDown(self):
+        admin.site.unregister(Song)
+        if Band in admin.site._registry:
+            admin.site.unregister(Band)
diff --git a/django/contrib/localflavor/br/__init__.py b/tests/admin_registration/__init__.py
similarity index 100%
rename from django/contrib/localflavor/br/__init__.py
rename to tests/admin_registration/__init__.py
diff --git a/tests/regressiontests/admin_registration/models.py b/tests/admin_registration/models.py
similarity index 100%
rename from tests/regressiontests/admin_registration/models.py
rename to tests/admin_registration/models.py
diff --git a/tests/regressiontests/admin_registration/tests.py b/tests/admin_registration/tests.py
similarity index 100%
rename from tests/regressiontests/admin_registration/tests.py
rename to tests/admin_registration/tests.py
diff --git a/django/contrib/localflavor/ca/__init__.py b/tests/admin_scripts/__init__.py
similarity index 100%
rename from django/contrib/localflavor/ca/__init__.py
rename to tests/admin_scripts/__init__.py
diff --git a/django/contrib/localflavor/ch/__init__.py b/tests/admin_scripts/app_with_import/__init__.py
similarity index 100%
rename from django/contrib/localflavor/ch/__init__.py
rename to tests/admin_scripts/app_with_import/__init__.py
diff --git a/tests/regressiontests/admin_scripts/app_with_import/models.py b/tests/admin_scripts/app_with_import/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/app_with_import/models.py
rename to tests/admin_scripts/app_with_import/models.py
diff --git a/django/contrib/localflavor/cl/__init__.py b/tests/admin_scripts/broken_app/__init__.py
similarity index 100%
rename from django/contrib/localflavor/cl/__init__.py
rename to tests/admin_scripts/broken_app/__init__.py
diff --git a/tests/regressiontests/admin_scripts/broken_app/models.py b/tests/admin_scripts/broken_app/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/broken_app/models.py
rename to tests/admin_scripts/broken_app/models.py
diff --git a/django/contrib/localflavor/cn/__init__.py b/tests/admin_scripts/complex_app/__init__.py
similarity index 100%
rename from django/contrib/localflavor/cn/__init__.py
rename to tests/admin_scripts/complex_app/__init__.py
diff --git a/django/contrib/localflavor/co/__init__.py b/tests/admin_scripts/complex_app/admin/__init__.py
similarity index 100%
rename from django/contrib/localflavor/co/__init__.py
rename to tests/admin_scripts/complex_app/admin/__init__.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py b/tests/admin_scripts/complex_app/admin/foo.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/admin/foo.py
rename to tests/admin_scripts/complex_app/admin/foo.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/__init__.py b/tests/admin_scripts/complex_app/models/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/models/__init__.py
rename to tests/admin_scripts/complex_app/models/__init__.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/bar.py b/tests/admin_scripts/complex_app/models/bar.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/models/bar.py
rename to tests/admin_scripts/complex_app/models/bar.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/foo.py b/tests/admin_scripts/complex_app/models/foo.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/models/foo.py
rename to tests/admin_scripts/complex_app/models/foo.py
diff --git a/django/contrib/localflavor/cz/__init__.py b/tests/admin_scripts/custom_templates/app_template/__init__.py
similarity index 100%
rename from django/contrib/localflavor/cz/__init__.py
rename to tests/admin_scripts/custom_templates/app_template/__init__.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/app_template/api.py b/tests/admin_scripts/custom_templates/app_template/api.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/app_template/api.py
rename to tests/admin_scripts/custom_templates/app_template/api.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/app_template/models.py b/tests/admin_scripts/custom_templates/app_template/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/app_template/models.py
rename to tests/admin_scripts/custom_templates/app_template/models.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template.tgz b/tests/admin_scripts/custom_templates/project_template.tgz
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template.tgz
rename to tests/admin_scripts/custom_templates/project_template.tgz
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/Procfile b/tests/admin_scripts/custom_templates/project_template/additional_dir/Procfile
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/Procfile
rename to tests/admin_scripts/custom_templates/project_template/additional_dir/Procfile
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py b/tests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py
rename to tests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/extra.py b/tests/admin_scripts/custom_templates/project_template/additional_dir/extra.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/extra.py
rename to tests/admin_scripts/custom_templates/project_template/additional_dir/extra.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt b/tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt
rename to tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/manage.py b/tests/admin_scripts/custom_templates/project_template/manage.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/manage.py
rename to tests/admin_scripts/custom_templates/project_template/manage.py
diff --git a/django/contrib/localflavor/de/__init__.py b/tests/admin_scripts/custom_templates/project_template/project_name/__init__.py
similarity index 100%
rename from django/contrib/localflavor/de/__init__.py
rename to tests/admin_scripts/custom_templates/project_template/project_name/__init__.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/project_name/settings.py b/tests/admin_scripts/custom_templates/project_template/project_name/settings.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/project_name/settings.py
rename to tests/admin_scripts/custom_templates/project_template/project_name/settings.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-18091-non-ascii-template.txt b/tests/admin_scripts/custom_templates/project_template/ticket-18091-non-ascii-template.txt
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-18091-non-ascii-template.txt
rename to tests/admin_scripts/custom_templates/project_template/ticket-18091-non-ascii-template.txt
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico b/tests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico
rename to tests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico
diff --git a/django/contrib/localflavor/ec/__init__.py b/tests/admin_scripts/management/__init__.py
similarity index 100%
rename from django/contrib/localflavor/ec/__init__.py
rename to tests/admin_scripts/management/__init__.py
diff --git a/django/contrib/localflavor/es/__init__.py b/tests/admin_scripts/management/commands/__init__.py
similarity index 100%
rename from django/contrib/localflavor/es/__init__.py
rename to tests/admin_scripts/management/commands/__init__.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/app_command.py b/tests/admin_scripts/management/commands/app_command.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/app_command.py
rename to tests/admin_scripts/management/commands/app_command.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/base_command.py b/tests/admin_scripts/management/commands/base_command.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/base_command.py
rename to tests/admin_scripts/management/commands/base_command.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/custom_startproject.py b/tests/admin_scripts/management/commands/custom_startproject.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/custom_startproject.py
rename to tests/admin_scripts/management/commands/custom_startproject.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/label_command.py b/tests/admin_scripts/management/commands/label_command.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/label_command.py
rename to tests/admin_scripts/management/commands/label_command.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/noargs_command.py b/tests/admin_scripts/management/commands/noargs_command.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/noargs_command.py
rename to tests/admin_scripts/management/commands/noargs_command.py
diff --git a/tests/regressiontests/admin_scripts/models.py b/tests/admin_scripts/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/models.py
rename to tests/admin_scripts/models.py
diff --git a/django/contrib/localflavor/fi/__init__.py b/tests/admin_scripts/simple_app/__init__.py
similarity index 100%
rename from django/contrib/localflavor/fi/__init__.py
rename to tests/admin_scripts/simple_app/__init__.py
diff --git a/tests/regressiontests/admin_scripts/simple_app/models.py b/tests/admin_scripts/simple_app/models.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/simple_app/models.py
rename to tests/admin_scripts/simple_app/models.py
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
similarity index 90%
rename from tests/regressiontests/admin_scripts/tests.py
rename to tests/admin_scripts/tests.py
index d0ca9d26df..baec16820e 100644
--- a/tests/regressiontests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -16,18 +16,26 @@ import codecs
 
 from django import conf, bin, get_version
 from django.conf import settings
+from django.core.management import BaseCommand, CommandError
 from django.db import connection
 from django.test.simple import DjangoTestSuiteRunner
 from django.utils import unittest
 from django.utils.encoding import force_str, force_text
 from django.utils._os import upath
+from django.utils.six import StringIO
 from django.test import LiveServerTestCase
 
-test_dir = os.path.dirname(os.path.dirname(upath(__file__)))
+
+test_dir = os.path.realpath(os.path.join(os.environ['DJANGO_TEST_TEMP_DIR'], 'test_project'))
+if not os.path.exists(test_dir):
+    os.mkdir(test_dir)
+    open(os.path.join(test_dir, '__init__.py'), 'w').close()
+
+custom_templates_dir = os.path.join(os.path.dirname(__file__), 'custom_templates')
+
 
 class AdminScriptTestCase(unittest.TestCase):
     def write_settings(self, filename, apps=None, is_dir=False, sdict=None):
-        test_dir = os.path.dirname(os.path.dirname(upath(__file__)))
         if is_dir:
             settings_dir = os.path.join(test_dir, filename)
             os.mkdir(settings_dir)
@@ -36,7 +44,7 @@ class AdminScriptTestCase(unittest.TestCase):
             settings_file_path = os.path.join(test_dir, filename)
 
         with open(settings_file_path, 'w') as settings_file:
-            settings_file.write('# Settings file automatically generated by regressiontests.admin_scripts test case\n')
+            settings_file.write('# Settings file automatically generated by admin_scripts test case\n')
             exports = [
                 'DATABASES',
                 'ROOT_URLCONF',
@@ -50,7 +58,7 @@ class AdminScriptTestCase(unittest.TestCase):
                     settings_file.write("%s = %s\n" % (s, o))
 
             if apps is None:
-                apps = ['django.contrib.auth', 'django.contrib.contenttypes', 'regressiontests.admin_scripts']
+                apps = ['django.contrib.auth', 'django.contrib.contenttypes', 'admin_scripts']
 
             settings_file.write("INSTALLED_APPS = %s\n" % apps)
 
@@ -89,16 +97,21 @@ class AdminScriptTestCase(unittest.TestCase):
         first_package_re = re.compile(r'(^[^\.]+)\.')
         for backend in settings.DATABASES.values():
             result = first_package_re.findall(backend['ENGINE'])
-            if result and result != 'django':
+            if result and result != ['django']:
                 backend_pkg = __import__(result[0])
                 backend_dir = os.path.dirname(backend_pkg.__file__)
                 paths.append(os.path.dirname(backend_dir))
         return paths
 
     def run_test(self, script, args, settings_file=None, apps=None):
-        test_dir = os.path.dirname(os.path.dirname(__file__))
-        project_dir = os.path.dirname(test_dir)
-        base_dir = os.path.dirname(project_dir)
+        project_dir = test_dir
+        base_dir = os.path.dirname(test_dir)
+        # The base dir for Django's tests is one level up.
+        tests_dir = os.path.dirname(os.path.dirname(__file__))
+        # The base dir for Django is one level above the test dir. We don't use
+        # `import django` to figure that out, so we don't pick up a Django
+        # from site-packages or similar.
+        django_dir = os.path.dirname(tests_dir)
         ext_backend_base_dirs = self._ext_backend_paths()
 
         # Remember the old environment
@@ -116,7 +129,7 @@ class AdminScriptTestCase(unittest.TestCase):
             os.environ['DJANGO_SETTINGS_MODULE'] = settings_file
         elif 'DJANGO_SETTINGS_MODULE' in os.environ:
             del os.environ['DJANGO_SETTINGS_MODULE']
-        python_path = [project_dir, base_dir]
+        python_path = [base_dir, django_dir, tests_dir]
         python_path.extend(ext_backend_base_dirs)
         os.environ[python_path_var_name] = os.pathsep.join(python_path)
 
@@ -125,7 +138,6 @@ class AdminScriptTestCase(unittest.TestCase):
         out, err = subprocess.Popen([sys.executable, script] + args,
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                 universal_newlines=True).communicate()
-
         # Restore the old environment
         if old_django_settings_module:
             os.environ['DJANGO_SETTINGS_MODULE'] = old_django_settings_module
@@ -156,7 +168,7 @@ class AdminScriptTestCase(unittest.TestCase):
         with open(test_manage_py, 'r') as fp:
             manage_py_contents = fp.read()
         manage_py_contents = manage_py_contents.replace(
-            "{{ project_name }}", "regressiontests")
+            "{{ project_name }}", "test_project")
         with open(test_manage_py, 'w') as fp:
             fp.write(manage_py_contents)
         self.addCleanup(safe_remove, test_manage_py)
@@ -228,7 +240,7 @@ class DjangoAdminDefaultSettings(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "default: django-admin builtin commands succeed if settings are provided as argument"
-        args = ['sqlall', '--settings=regressiontests.settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.settings', 'admin_scripts']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
@@ -236,7 +248,7 @@ class DjangoAdminDefaultSettings(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "default: django-admin builtin commands succeed if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
 
@@ -263,7 +275,7 @@ class DjangoAdminDefaultSettings(AdminScriptTestCase):
 
     def test_custom_command_with_settings(self):
         "default: django-admin can execute user commands if settings are provided as argument"
-        args = ['noargs_command', '--settings=regressiontests.settings']
+        args = ['noargs_command', '--settings=test_project.settings']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
@@ -271,7 +283,7 @@ class DjangoAdminDefaultSettings(AdminScriptTestCase):
     def test_custom_command_with_environment(self):
         "default: django-admin can execute user commands if settings are provided in environment"
         args = ['noargs_command']
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
 
@@ -280,7 +292,7 @@ class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase):
     contains the test application specified using a full path.
     """
     def setUp(self):
-        self.write_settings('settings.py', ['django.contrib.auth', 'django.contrib.contenttypes', 'regressiontests.admin_scripts'])
+        self.write_settings('settings.py', ['django.contrib.auth', 'django.contrib.contenttypes', 'admin_scripts'])
 
     def tearDown(self):
         self.remove_settings('settings.py')
@@ -294,7 +306,7 @@ class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "fulldefault: django-admin builtin commands succeed if a settings file is provided"
-        args = ['sqlall', '--settings=regressiontests.settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.settings', 'admin_scripts']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
@@ -302,7 +314,7 @@ class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "fulldefault: django-admin builtin commands succeed if the environment contains settings"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
 
@@ -329,7 +341,7 @@ class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase):
 
     def test_custom_command_with_settings(self):
         "fulldefault: django-admin can execute user commands if settings are provided as argument"
-        args = ['noargs_command', '--settings=regressiontests.settings']
+        args = ['noargs_command', '--settings=test_project.settings']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
@@ -337,7 +349,7 @@ class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase):
     def test_custom_command_with_environment(self):
         "fulldefault: django-admin can execute user commands if settings are provided in environment"
         args = ['noargs_command']
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
 
@@ -360,7 +372,7 @@ class DjangoAdminMinimalSettings(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "minimal: django-admin builtin commands fail if settings are provided as argument"
-        args = ['sqlall', '--settings=regressiontests.settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.settings', 'admin_scripts']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(out)
         self.assertOutput(err, 'App with label admin_scripts could not be found')
@@ -368,7 +380,7 @@ class DjangoAdminMinimalSettings(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "minimal: django-admin builtin commands fail if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.assertNoOutput(out)
         self.assertOutput(err, 'App with label admin_scripts could not be found')
 
@@ -395,7 +407,7 @@ class DjangoAdminMinimalSettings(AdminScriptTestCase):
 
     def test_custom_command_with_settings(self):
         "minimal: django-admin can't execute user commands, even if settings are provided as argument"
-        args = ['noargs_command', '--settings=regressiontests.settings']
+        args = ['noargs_command', '--settings=test_project.settings']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(out)
         self.assertOutput(err, "Unknown command: 'noargs_command'")
@@ -403,7 +415,7 @@ class DjangoAdminMinimalSettings(AdminScriptTestCase):
     def test_custom_command_with_environment(self):
         "minimal: django-admin can't execute user commands, even if settings are provided in environment"
         args = ['noargs_command']
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.assertNoOutput(out)
         self.assertOutput(err, "Unknown command: 'noargs_command'")
 
@@ -426,7 +438,7 @@ class DjangoAdminAlternateSettings(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "alternate: django-admin builtin commands succeed if settings are provided as argument"
-        args = ['sqlall', '--settings=regressiontests.alternate_settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.alternate_settings', 'admin_scripts']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
@@ -434,7 +446,7 @@ class DjangoAdminAlternateSettings(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "alternate: django-admin builtin commands succeed if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_django_admin(args, 'regressiontests.alternate_settings')
+        out, err = self.run_django_admin(args, 'test_project.alternate_settings')
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
 
@@ -461,7 +473,7 @@ class DjangoAdminAlternateSettings(AdminScriptTestCase):
 
     def test_custom_command_with_settings(self):
         "alternate: django-admin can execute user commands if settings are provided as argument"
-        args = ['noargs_command', '--settings=regressiontests.alternate_settings']
+        args = ['noargs_command', '--settings=test_project.alternate_settings']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
@@ -469,7 +481,7 @@ class DjangoAdminAlternateSettings(AdminScriptTestCase):
     def test_custom_command_with_environment(self):
         "alternate: django-admin can execute user commands if settings are provided in environment"
         args = ['noargs_command']
-        out, err = self.run_django_admin(args, 'regressiontests.alternate_settings')
+        out, err = self.run_django_admin(args, 'test_project.alternate_settings')
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
 
@@ -497,7 +509,7 @@ class DjangoAdminMultipleSettings(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "alternate: django-admin builtin commands succeed if settings are provided as argument"
-        args = ['sqlall', '--settings=regressiontests.alternate_settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.alternate_settings', 'admin_scripts']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
@@ -505,7 +517,7 @@ class DjangoAdminMultipleSettings(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "alternate: django-admin builtin commands succeed if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_django_admin(args, 'regressiontests.alternate_settings')
+        out, err = self.run_django_admin(args, 'test_project.alternate_settings')
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
 
@@ -531,7 +543,7 @@ class DjangoAdminMultipleSettings(AdminScriptTestCase):
 
     def test_custom_command_with_settings(self):
         "alternate: django-admin can execute user commands if settings are provided as argument"
-        args = ['noargs_command', '--settings=regressiontests.alternate_settings']
+        args = ['noargs_command', '--settings=test_project.alternate_settings']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
@@ -539,7 +551,7 @@ class DjangoAdminMultipleSettings(AdminScriptTestCase):
     def test_custom_command_with_environment(self):
         "alternate: django-admin can execute user commands if settings are provided in environment"
         args = ['noargs_command']
-        out, err = self.run_django_admin(args, 'regressiontests.alternate_settings')
+        out, err = self.run_django_admin(args, 'test_project.alternate_settings')
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
 
@@ -560,17 +572,17 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase):
         "directory: startapp creates the correct directory"
         args = ['startapp', 'settings_test']
         app_path = os.path.join(test_dir, 'settings_test')
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.addCleanup(shutil.rmtree, app_path)
         self.assertNoOutput(err)
         self.assertTrue(os.path.exists(app_path))
 
     def test_setup_environ_custom_template(self):
         "directory: startapp creates the correct directory with a custom template"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'app_template')
+        template_path = os.path.join(custom_templates_dir, 'app_template')
         args = ['startapp', '--template', template_path, 'custom_settings_test']
         app_path = os.path.join(test_dir, 'custom_settings_test')
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.addCleanup(shutil.rmtree, app_path)
         self.assertNoOutput(err)
         self.assertTrue(os.path.exists(app_path))
@@ -605,7 +617,7 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "directory: django-admin builtin commands succeed if settings are provided as argument"
-        args = ['sqlall', '--settings=regressiontests.settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.settings', 'admin_scripts']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
@@ -613,7 +625,7 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "directory: django-admin builtin commands succeed if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_django_admin(args, 'regressiontests.settings')
+        out, err = self.run_django_admin(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
 
@@ -632,7 +644,7 @@ class ManageNoSettings(AdminScriptTestCase):
         args = ['sqlall', 'admin_scripts']
         out, err = self.run_manage(args)
         self.assertNoOutput(out)
-        self.assertOutput(err, "Could not import settings 'regressiontests.settings'")
+        self.assertOutput(err, "Could not import settings 'test_project.settings'")
 
     def test_builtin_with_bad_settings(self):
         "no settings: manage.py builtin commands fail if settings file (from argument) doesn't exist"
@@ -668,7 +680,7 @@ class ManageDefaultSettings(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "default: manage.py builtin commands succeed if settings are provided as argument"
-        args = ['sqlall', '--settings=regressiontests.settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.settings', 'admin_scripts']
         out, err = self.run_manage(args)
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
@@ -676,7 +688,7 @@ class ManageDefaultSettings(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "default: manage.py builtin commands succeed if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_manage(args, 'regressiontests.settings')
+        out, err = self.run_manage(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
 
@@ -703,7 +715,7 @@ class ManageDefaultSettings(AdminScriptTestCase):
 
     def test_custom_command_with_settings(self):
         "default: manage.py can execute user commands when settings are provided as argument"
-        args = ['noargs_command', '--settings=regressiontests.settings']
+        args = ['noargs_command', '--settings=test_project.settings']
         out, err = self.run_manage(args)
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
@@ -711,7 +723,7 @@ class ManageDefaultSettings(AdminScriptTestCase):
     def test_custom_command_with_environment(self):
         "default: manage.py can execute user commands when settings are provided in environment"
         args = ['noargs_command']
-        out, err = self.run_manage(args, 'regressiontests.settings')
+        out, err = self.run_manage(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
 
@@ -721,7 +733,7 @@ class ManageFullPathDefaultSettings(AdminScriptTestCase):
     contains the test application specified using a full path.
     """
     def setUp(self):
-        self.write_settings('settings.py', ['django.contrib.auth', 'django.contrib.contenttypes', 'regressiontests.admin_scripts'])
+        self.write_settings('settings.py', ['django.contrib.auth', 'django.contrib.contenttypes', 'admin_scripts'])
 
     def tearDown(self):
         self.remove_settings('settings.py')
@@ -735,7 +747,7 @@ class ManageFullPathDefaultSettings(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "fulldefault: manage.py builtin commands succeed if settings are provided as argument"
-        args = ['sqlall', '--settings=regressiontests.settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.settings', 'admin_scripts']
         out, err = self.run_manage(args)
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
@@ -743,7 +755,7 @@ class ManageFullPathDefaultSettings(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "fulldefault: manage.py builtin commands succeed if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_manage(args, 'regressiontests.settings')
+        out, err = self.run_manage(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, 'CREATE TABLE')
 
@@ -770,7 +782,7 @@ class ManageFullPathDefaultSettings(AdminScriptTestCase):
 
     def test_custom_command_with_settings(self):
         "fulldefault: manage.py can execute user commands when settings are provided as argument"
-        args = ['noargs_command', '--settings=regressiontests.settings']
+        args = ['noargs_command', '--settings=test_project.settings']
         out, err = self.run_manage(args)
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
@@ -778,7 +790,7 @@ class ManageFullPathDefaultSettings(AdminScriptTestCase):
     def test_custom_command_with_environment(self):
         "fulldefault: manage.py can execute user commands when settings are provided in environment"
         args = ['noargs_command']
-        out, err = self.run_manage(args, 'regressiontests.settings')
+        out, err = self.run_manage(args, 'test_project.settings')
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:NoArgsCommand")
 
@@ -801,7 +813,7 @@ class ManageMinimalSettings(AdminScriptTestCase):
 
     def test_builtin_with_settings(self):
         "minimal: manage.py builtin commands fail if settings are provided as argument"
-        args = ['sqlall', '--settings=regressiontests.settings', 'admin_scripts']
+        args = ['sqlall', '--settings=test_project.settings', 'admin_scripts']
         out, err = self.run_manage(args)
         self.assertNoOutput(out)
         self.assertOutput(err, 'App with label admin_scripts could not be found')
@@ -809,7 +821,7 @@ class ManageMinimalSettings(AdminScriptTestCase):
     def test_builtin_with_environment(self):
         "minimal: manage.py builtin commands fail if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
-        out, err = self.run_manage(args, 'regressiontests.settings')
+        out, err = self.run_manage(args, 'test_project.settings')
         self.assertNoOutput(out)
         self.assertOutput(err, 'App with label admin_scripts could not be found')
 
@@ -836,7 +848,7 @@ class ManageMinimalSettings(AdminScriptTestCase):
 
     def test_custom_command_with_settings(self):
         "minimal: manage.py can't execute user commands, even if settings are provided as argument"
-        args = ['noargs_command', '--settings=regressiontests.settings']
+        args = ['noargs_command', '--settings=test_project.settings']
         out, err = self.run_manage(args)
         self.assertNoOutput(out)
         self.assertOutput(err, "Unknown command: 'noargs_command'")
@@ -844,7 +856,7 @@ class ManageMinimalSettings(AdminScriptTestCase):
     def test_custom_command_with_environment(self):
         "minimal: manage.py can't execute user commands, even if settings are provided in environment"
         args = ['noargs_command']
-        out, err = self.run_manage(args, 'regressiontests.settings')
+        out, err = self.run_manage(args, 'test_project.settings')
         self.assertNoOutput(out)
         self.assertOutput(err, "Unknown command: 'noargs_command'")
 
@@ -863,7 +875,7 @@ class ManageAlternateSettings(AdminScriptTestCase):
         args = ['sqlall', 'admin_scripts']
         out, err = self.run_manage(args)
         self.assertNoOutput(out)
-        self.assertOutput(err, "Could not import settings 'regressiontests.settings'")
+        self.assertOutput(err, "Could not import settings 'test_project.settings'")
 
     def test_builtin_with_settings(self):
         "alternate: manage.py builtin commands work with settings provided as argument"
@@ -902,7 +914,7 @@ class ManageAlternateSettings(AdminScriptTestCase):
         args = ['noargs_command']
         out, err = self.run_manage(args)
         self.assertNoOutput(out)
-        self.assertOutput(err, "Could not import settings 'regressiontests.settings'")
+        self.assertOutput(err, "Could not import settings 'test_project.settings'")
 
     def test_custom_command_with_settings(self):
         "alternate: manage.py can execute user commands if settings are provided as argument"
@@ -1005,7 +1017,7 @@ class ManageSettingsWithImportError(AdminScriptTestCase):
         else:
             settings_file_path = os.path.join(test_dir, filename)
         with open(settings_file_path, 'w') as settings_file:
-            settings_file.write('# Settings file automatically generated by regressiontests.admin_scripts test case\n')
+            settings_file.write('# Settings file automatically generated by admin_scripts test case\n')
             settings_file.write('# The next line will cause an import error:\nimport foo42bar\n')
 
     def test_builtin_command(self):
@@ -1102,13 +1114,13 @@ class ManageTestCommand(AdminScriptTestCase):
         address_predefined = 'DJANGO_LIVE_TEST_SERVER_ADDRESS' in os.environ
         old_address = os.environ.get('DJANGO_LIVE_TEST_SERVER_ADDRESS')
 
-        self.cmd.handle(verbosity=0, testrunner='regressiontests.admin_scripts.tests.CustomTestRunner')
+        self.cmd.handle(verbosity=0, testrunner='admin_scripts.tests.CustomTestRunner')
 
         # Original state hasn't changed
         self.assertEqual('DJANGO_LIVE_TEST_SERVER_ADDRESS' in os.environ, address_predefined)
         self.assertEqual(os.environ.get('DJANGO_LIVE_TEST_SERVER_ADDRESS'), old_address)
 
-        self.cmd.handle(verbosity=0, testrunner='regressiontests.admin_scripts.tests.CustomTestRunner',
+        self.cmd.handle(verbosity=0, testrunner='admin_scripts.tests.CustomTestRunner',
                         liveserver='blah')
 
         # Variable was correctly set
@@ -1279,6 +1291,43 @@ class CommandTypes(AdminScriptTestCase):
         self.assertNoOutput(err)
         self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',), options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'), ('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity', '1')]")
 
+    def test_base_run_from_argv(self):
+        """
+        Test run_from_argv properly terminates even with custom execute() (#19665)
+        Also test proper traceback display.
+        """
+        command = BaseCommand()
+        def raise_command_error(*args, **kwargs):
+            raise CommandError("Custom error")
+
+        old_stderr = sys.stderr
+        sys.stderr = err = StringIO()
+        try:
+            command.execute = lambda args: args  # This will trigger TypeError
+            with self.assertRaises(SystemExit):
+                command.run_from_argv(['', ''])
+            err_message = err.getvalue()
+            # Exceptions other than CommandError automatically output the traceback
+            self.assertIn("Traceback", err_message)
+            self.assertIn("TypeError", err_message)
+
+            command.execute = raise_command_error
+            err.truncate(0)
+            with self.assertRaises(SystemExit):
+                command.run_from_argv(['', ''])
+            err_message = err.getvalue()
+            self.assertNotIn("Traceback", err_message)
+            self.assertIn("CommandError", err_message)
+
+            err.truncate(0)
+            with self.assertRaises(SystemExit):
+                command.run_from_argv(['', '', '--traceback'])
+            err_message = err.getvalue()
+            self.assertIn("Traceback (most recent call last)", err_message)
+            self.assertIn("CommandError", err_message)
+        finally:
+            sys.stderr = old_stderr
+
     def test_noargs(self):
         "NoArg Commands can be executed"
         args = ['noargs_command']
@@ -1430,13 +1479,15 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
     def test_invalid_project_name(self):
         "Make sure the startproject management command validates a project name"
-        args = ['startproject', '7testproject']
-        testproject_dir = os.path.join(test_dir, '7testproject')
-        self.addCleanup(shutil.rmtree, testproject_dir, True)
+        for bad_name in ('7testproject', '../testproject'):
+            args = ['startproject', bad_name]
+            testproject_dir = os.path.join(test_dir, bad_name)
+            self.addCleanup(shutil.rmtree, testproject_dir, True)
 
-        out, err = self.run_django_admin(args)
-        self.assertOutput(err, "Error: '7testproject' is not a valid project name. Please make sure the name begins with a letter or underscore.")
-        self.assertFalse(os.path.exists(testproject_dir))
+            out, err = self.run_django_admin(args)
+            self.assertOutput(err, "Error: '%s' is not a valid project name. "
+                "Please make sure the name begins with a letter or underscore." % bad_name)
+            self.assertFalse(os.path.exists(testproject_dir))
 
     def test_simple_project_different_directory(self):
         "Make sure the startproject management command creates a project in a specific directory"
@@ -1456,7 +1507,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
     def test_custom_project_template(self):
         "Make sure the startproject management command is able to use a different project template"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(custom_templates_dir, 'project_template')
         args = ['startproject', '--template', template_path, 'customtestproject']
         testproject_dir = os.path.join(test_dir, 'customtestproject')
         self.addCleanup(shutil.rmtree, testproject_dir, True)
@@ -1468,7 +1519,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
     def test_template_dir_with_trailing_slash(self):
         "Ticket 17475: Template dir passed has a trailing path separator"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template' + os.sep)
+        template_path = os.path.join(custom_templates_dir, 'project_template' + os.sep)
         args = ['startproject', '--template', template_path, 'customtestproject']
         testproject_dir = os.path.join(test_dir, 'customtestproject')
         self.addCleanup(shutil.rmtree, testproject_dir, True)
@@ -1480,7 +1531,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
     def test_custom_project_template_from_tarball_by_path(self):
         "Make sure the startproject management command is able to use a different project template from a tarball"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template.tgz')
+        template_path = os.path.join(custom_templates_dir, 'project_template.tgz')
         args = ['startproject', '--template', template_path, 'tarballtestproject']
         testproject_dir = os.path.join(test_dir, 'tarballtestproject')
         self.addCleanup(shutil.rmtree, testproject_dir, True)
@@ -1492,7 +1543,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
     def test_custom_project_template_from_tarball_to_alternative_location(self):
         "Startproject can use a project template from a tarball and create it in a specified location"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template.tgz')
+        template_path = os.path.join(custom_templates_dir, 'project_template.tgz')
         args = ['startproject', '--template', template_path, 'tarballtestproject', 'altlocation']
         testproject_dir = os.path.join(test_dir, 'altlocation')
         os.mkdir(testproject_dir)
@@ -1531,7 +1582,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
     def test_file_without_extension(self):
         "Make sure the startproject management command is able to render custom files"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(custom_templates_dir, 'project_template')
         args = ['startproject', '--template', template_path, 'customtestproject', '-e', 'txt', '-n', 'Procfile']
         testproject_dir = os.path.join(test_dir, 'customtestproject')
         self.addCleanup(shutil.rmtree, testproject_dir, True)
@@ -1549,7 +1600,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
     def test_custom_project_template_context_variables(self):
         "Make sure template context variables are rendered with proper values"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(custom_templates_dir, 'project_template')
         args = ['startproject', '--template', template_path, 'another_project', 'project_dir']
         testproject_dir = os.path.join(test_dir, 'project_dir')
         os.mkdir(testproject_dir)
@@ -1567,7 +1618,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
         # We're using a custom command so we need the alternate settings
         self.write_settings('alternate_settings.py')
         self.addCleanup(self.remove_settings, 'alternate_settings.py')
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(custom_templates_dir, 'project_template')
         args = ['custom_startproject', '--template', template_path, 'another_project', 'project_dir', '--extra', '<&>', '--settings=alternate_settings']
         testproject_dir = os.path.join(test_dir, 'project_dir')
         os.mkdir(testproject_dir)
@@ -1584,7 +1635,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
         Make sure an exception is raised when the provided
         destination directory doesn't exist
         """
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(custom_templates_dir, 'project_template')
         args = ['startproject', '--template', template_path, 'yet_another_project', 'project_dir2']
         testproject_dir = os.path.join(test_dir, 'project_dir2')
         out, err = self.run_django_admin(args)
@@ -1594,7 +1645,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
     def test_custom_project_template_with_non_ascii_templates(self):
         "Ticket 18091: Make sure the startproject management command is able to render templates with non-ASCII content"
-        template_path = os.path.join(test_dir, 'admin_scripts', 'custom_templates', 'project_template')
+        template_path = os.path.join(custom_templates_dir, 'project_template')
         args = ['startproject', '--template', template_path, '--extension=txt', 'customtestproject']
         testproject_dir = os.path.join(test_dir, 'customtestproject')
         self.addCleanup(shutil.rmtree, testproject_dir, True)
@@ -1610,11 +1661,21 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
 class DiffSettings(AdminScriptTestCase):
     """Tests for diffsettings management command."""
+
     def test_basic(self):
-        "Runs without error and emits settings diff."
+        """Runs without error and emits settings diff."""
         self.write_settings('settings_to_diff.py', sdict={'FOO': '"bar"'})
         self.addCleanup(self.remove_settings, 'settings_to_diff.py')
         args = ['diffsettings', '--settings=settings_to_diff']
         out, err = self.run_manage(args)
         self.assertNoOutput(err)
         self.assertOutput(out, "FOO = 'bar'  ###")
+
+    def test_all(self):
+        """The all option also shows settings with the default value."""
+        self.write_settings('settings_to_diff.py', sdict={'STATIC_URL': 'None'})
+        self.addCleanup(self.remove_settings, 'settings_to_diff.py')
+        args = ['diffsettings', '--settings=settings_to_diff', '--all']
+        out, err = self.run_manage(args)
+        self.assertNoOutput(err)
+        self.assertOutput(out, "### STATIC_URL = None")
diff --git a/tests/regressiontests/admin_scripts/urls.py b/tests/admin_scripts/urls.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/urls.py
rename to tests/admin_scripts/urls.py
diff --git a/django/contrib/localflavor/fr/__init__.py b/tests/admin_util/__init__.py
similarity index 100%
rename from django/contrib/localflavor/fr/__init__.py
rename to tests/admin_util/__init__.py
diff --git a/tests/regressiontests/admin_util/models.py b/tests/admin_util/models.py
similarity index 100%
rename from tests/regressiontests/admin_util/models.py
rename to tests/admin_util/models.py
diff --git a/tests/regressiontests/admin_util/tests.py b/tests/admin_util/tests.py
similarity index 93%
rename from tests/regressiontests/admin_util/tests.py
rename to tests/admin_util/tests.py
index e9e122a9f0..7898f200b5 100644
--- a/tests/regressiontests/admin_util/tests.py
+++ b/tests/admin_util/tests.py
@@ -5,8 +5,8 @@ from datetime import datetime
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin import helpers
-from django.contrib.admin.util import (display_for_field, label_for_field,
-    lookup_field, NestedObjects)
+from django.contrib.admin.util import (display_for_field, flatten_fieldsets,
+    label_for_field, lookup_field, NestedObjects)
 from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
 from django.contrib.sites.models import Site
 from django.db import models, DEFAULT_DB_ALIAS
@@ -300,3 +300,21 @@ class UtilTests(unittest.TestCase):
                          '<label for="id_text" class="required inline">&amp;text:</label>')
         self.assertEqual(helpers.AdminField(form, 'cb', is_first=False).label_tag(),
                          '<label for="id_cb" class="vCheckboxLabel required inline">&amp;cb</label>')
+
+    def test_flatten_fieldsets(self):
+        """
+        Regression test for #18051
+        """
+        fieldsets = (
+            (None, {
+                'fields': ('url', 'title', ('content', 'sites'))
+            }),
+        )
+        self.assertEqual(flatten_fieldsets(fieldsets), ['url', 'title', 'content', 'sites'])
+
+        fieldsets = (
+            (None, {
+                'fields': ('url', 'title', ['content', 'sites'])
+            }),
+        )
+        self.assertEqual(flatten_fieldsets(fieldsets), ['url', 'title', 'content', 'sites'])
diff --git a/django/contrib/localflavor/gb/__init__.py b/tests/admin_validation/__init__.py
similarity index 100%
rename from django/contrib/localflavor/gb/__init__.py
rename to tests/admin_validation/__init__.py
diff --git a/tests/regressiontests/admin_validation/models.py b/tests/admin_validation/models.py
similarity index 100%
rename from tests/regressiontests/admin_validation/models.py
rename to tests/admin_validation/models.py
diff --git a/tests/regressiontests/admin_validation/tests.py b/tests/admin_validation/tests.py
similarity index 93%
rename from tests/regressiontests/admin_validation/tests.py
rename to tests/admin_validation/tests.py
index be2500a803..5b2c45f6f2 100644
--- a/tests/regressiontests/admin_validation/tests.py
+++ b/tests/admin_validation/tests.py
@@ -20,6 +20,18 @@ class InvalidFields(admin.ModelAdmin):
     form = SongForm
     fields = ['spam']
 
+class ValidFormFieldsets(admin.ModelAdmin):
+    def get_form(self, request, obj=None, **kwargs):
+        class ExtraFieldForm(SongForm):
+            name = forms.CharField(max_length=50)
+        return ExtraFieldForm
+
+    fieldsets = (
+        (None, {
+            'fields': ('name',),
+        }),
+    )
+
 class ValidationTestCase(TestCase):
 
     def test_readonly_and_editable(self):
@@ -42,6 +54,14 @@ class ValidationTestCase(TestCase):
             validate,
             InvalidFields, Song)
 
+    def test_custom_get_form_with_fieldsets(self):
+        """
+        Ensure that the fieldsets validation is skipped when the ModelAdmin.get_form() method
+        is overridden.
+        Refs #19445.
+        """
+        validate(ValidFormFieldsets, Song)
+
     def test_exclude_values(self):
         """
         Tests for basic validation of 'exclude' option values (#12689)
@@ -122,7 +142,7 @@ class ValidationTestCase(TestCase):
             model = TwoAlbumFKAndAnE
 
         self.assertRaisesMessage(Exception,
-            "<class 'regressiontests.admin_validation.models.TwoAlbumFKAndAnE'> has more than 1 ForeignKey to <class 'regressiontests.admin_validation.models.Album'>",
+            "<class 'admin_validation.models.TwoAlbumFKAndAnE'> has more than 1 ForeignKey to <class 'admin_validation.models.Album'>",
             validate_inline,
             TwoAlbumFKAndAnEInline, None, Album)
 
diff --git a/django/contrib/localflavor/generic/__init__.py b/tests/admin_views/__init__.py
similarity index 100%
rename from django/contrib/localflavor/generic/__init__.py
rename to tests/admin_views/__init__.py
diff --git a/tests/regressiontests/admin_views/admin.py b/tests/admin_views/admin.py
similarity index 90%
rename from tests/regressiontests/admin_views/admin.py
rename to tests/admin_views/admin.py
index 1e4e9b5c75..cc7585cd2d 100644
--- a/tests/regressiontests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -27,7 +27,8 @@ from .models import (Article, Chapter, Account, Media, Child, Parent, Picture,
     Album, Question, Answer, ComplexSortedPerson, PrePopulatedPostLargeSlug,
     AdminOrderedField, AdminOrderedModelMethod, AdminOrderedAdminMethod,
     AdminOrderedCallable, Report, Color2, UnorderedObject, MainPrepopulated,
-    RelatedPrepopulated, UndeletableObject, UserMessenger, Simple, Choice)
+    RelatedPrepopulated, UndeletableObject, UserMessenger, Simple, Choice,
+    ShortMessage, Telegram)
 
 
 def callable_year(dt_value):
@@ -70,6 +71,16 @@ class ChapterXtra1Admin(admin.ModelAdmin):
 class ArticleAdmin(admin.ModelAdmin):
     list_display = ('content', 'date', callable_year, 'model_year', 'modeladmin_year')
     list_filter = ('date', 'section')
+    fieldsets=(
+        ('Some fields', {
+            'classes': ('collapse',),
+            'fields': ('title', 'content')
+        }),
+        ('Some other fields', {
+            'classes': ('wide',),
+            'fields': ('date', 'section')
+        })
+    )
 
     def changelist_view(self, request):
         "Test that extra_context works"
@@ -166,10 +177,10 @@ class PersonAdmin(admin.ModelAdmin):
         return super(PersonAdmin, self).get_changelist_formset(request,
             formset=BasePersonModelFormSet, **kwargs)
 
-    def queryset(self, request):
+    def get_queryset(self, request):
         # Order by a field that isn't in list display, to be able to test
         # whether ordering is preserved.
-        return super(PersonAdmin, self).queryset(request).order_by('age')
+        return super(PersonAdmin, self).get_queryset(request).order_by('age')
 
 
 class FooAccount(Account):
@@ -272,8 +283,8 @@ class ParentAdmin(admin.ModelAdmin):
 
 
 class EmptyModelAdmin(admin.ModelAdmin):
-    def queryset(self, request):
-        return super(EmptyModelAdmin, self).queryset(request).filter(pk__gt=1)
+    def get_queryset(self, request):
+        return super(EmptyModelAdmin, self).get_queryset(request).filter(pk__gt=1)
 
 
 class OldSubscriberAdmin(admin.ModelAdmin):
@@ -416,8 +427,8 @@ class PostAdmin(admin.ModelAdmin):
 
 
 class CustomChangeList(ChangeList):
-    def get_query_set(self, request):
-        return self.root_query_set.filter(pk=9999) # Does not exist
+    def get_queryset(self, request):
+        return self.root_queryset.filter(pk=9999) # Does not exist
 
 
 class GadgetAdmin(admin.ModelAdmin):
@@ -439,25 +450,54 @@ class FoodDeliveryAdmin(admin.ModelAdmin):
     list_editable = ('driver', 'restaurant')
 
 
-class PaperAdmin(admin.ModelAdmin):
-    """
-    A ModelAdmin with a custom queryset() method that uses only(), to test
-    verbose_name display in messages shown after adding Paper instances.
-    """
-
-    def queryset(self, request):
-        return super(PaperAdmin, self).queryset(request).only('title')
-
-
 class CoverLetterAdmin(admin.ModelAdmin):
     """
-    A ModelAdmin with a custom queryset() method that uses only(), to test
-    verbose_name display in messages shown after adding CoverLetter instances.
+    A ModelAdmin with a custom get_queryset() method that uses defer(), to test
+    verbose_name display in messages shown after adding/editing CoverLetter
+    instances.
     Note that the CoverLetter model defines a __unicode__ method.
+    For testing fix for ticket #14529.
     """
 
-    def queryset(self, request):
-        return super(CoverLetterAdmin, self).queryset(request).defer('date_written')
+    def get_queryset(self, request):
+        return super(CoverLetterAdmin, self).get_queryset(request).defer('date_written')
+
+
+class PaperAdmin(admin.ModelAdmin):
+    """
+    A ModelAdmin with a custom get_queryset() method that uses only(), to test
+    verbose_name display in messages shown after adding/editing Paper
+    instances.
+    For testing fix for ticket #14529.
+    """
+
+    def get_queryset(self, request):
+        return super(PaperAdmin, self).get_queryset(request).only('title')
+
+
+class ShortMessageAdmin(admin.ModelAdmin):
+    """
+    A ModelAdmin with a custom get_queryset() method that uses defer(), to test
+    verbose_name display in messages shown after adding/editing ShortMessage
+    instances.
+    For testing fix for ticket #14529.
+    """
+
+    def get_queryset(self, request):
+        return super(ShortMessageAdmin, self).get_queryset(request).defer('timestamp')
+
+
+class TelegramAdmin(admin.ModelAdmin):
+    """
+    A ModelAdmin with a custom get_queryset() method that uses only(), to test
+    verbose_name display in messages shown after adding/editing Telegram
+    instances.
+    Note that the Telegram model defines a __unicode__ method.
+    For testing fix for ticket #14529.
+    """
+
+    def get_queryset(self, request):
+        return super(TelegramAdmin, self).get_queryset(request).only('title')
 
 
 class StoryForm(forms.ModelForm):
@@ -665,6 +705,8 @@ site.register(FoodDelivery, FoodDeliveryAdmin)
 site.register(RowLevelChangePermissionModel, RowLevelChangePermissionModelAdmin)
 site.register(Paper, PaperAdmin)
 site.register(CoverLetter, CoverLetterAdmin)
+site.register(ShortMessage, ShortMessageAdmin)
+site.register(Telegram, TelegramAdmin)
 site.register(Story, StoryAdmin)
 site.register(OtherStory, OtherStoryAdmin)
 site.register(Report, ReportAdmin)
diff --git a/tests/regressiontests/admin_views/customadmin.py b/tests/admin_views/customadmin.py
similarity index 95%
rename from tests/regressiontests/admin_views/customadmin.py
rename to tests/admin_views/customadmin.py
index d69d690af0..c204b81edd 100644
--- a/tests/regressiontests/admin_views/customadmin.py
+++ b/tests/admin_views/customadmin.py
@@ -35,8 +35,8 @@ class Admin2(admin.AdminSite):
 
 class UserLimitedAdmin(UserAdmin):
     # used for testing password change on a user not in queryset
-    def queryset(self, request):
-        qs = super(UserLimitedAdmin, self).queryset(request)
+    def get_queryset(self, request):
+        qs = super(UserLimitedAdmin, self).get_queryset(request)
         return qs.filter(is_superuser=False)
 
 
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-actions.xml b/tests/admin_views/fixtures/admin-views-actions.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-actions.xml
rename to tests/admin_views/fixtures/admin-views-actions.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-books.xml b/tests/admin_views/fixtures/admin-views-books.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-books.xml
rename to tests/admin_views/fixtures/admin-views-books.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-colors.xml b/tests/admin_views/fixtures/admin-views-colors.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-colors.xml
rename to tests/admin_views/fixtures/admin-views-colors.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-fabrics.xml b/tests/admin_views/fixtures/admin-views-fabrics.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-fabrics.xml
rename to tests/admin_views/fixtures/admin-views-fabrics.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-person.xml b/tests/admin_views/fixtures/admin-views-person.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-person.xml
rename to tests/admin_views/fixtures/admin-views-person.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-unicode.xml b/tests/admin_views/fixtures/admin-views-unicode.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-unicode.xml
rename to tests/admin_views/fixtures/admin-views-unicode.xml
diff --git a/tests/regressiontests/admin_views/fixtures/admin-views-users.xml b/tests/admin_views/fixtures/admin-views-users.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/admin-views-users.xml
rename to tests/admin_views/fixtures/admin-views-users.xml
diff --git a/tests/regressiontests/admin_views/fixtures/deleted-objects.xml b/tests/admin_views/fixtures/deleted-objects.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/deleted-objects.xml
rename to tests/admin_views/fixtures/deleted-objects.xml
diff --git a/tests/regressiontests/admin_views/fixtures/multiple-child-classes.json b/tests/admin_views/fixtures/multiple-child-classes.json
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/multiple-child-classes.json
rename to tests/admin_views/fixtures/multiple-child-classes.json
diff --git a/tests/regressiontests/admin_views/fixtures/string-primary-key.xml b/tests/admin_views/fixtures/string-primary-key.xml
similarity index 100%
rename from tests/regressiontests/admin_views/fixtures/string-primary-key.xml
rename to tests/admin_views/fixtures/string-primary-key.xml
diff --git a/tests/regressiontests/admin_views/forms.py b/tests/admin_views/forms.py
similarity index 100%
rename from tests/regressiontests/admin_views/forms.py
rename to tests/admin_views/forms.py
diff --git a/tests/regressiontests/admin_views/models.py b/tests/admin_views/models.py
similarity index 97%
rename from tests/regressiontests/admin_views/models.py
rename to tests/admin_views/models.py
index c641cfc0e6..1916949f63 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/admin_views/models.py
@@ -184,7 +184,7 @@ class Person(models.Model):
     name = models.CharField(max_length=100)
     gender = models.IntegerField(choices=GENDER_CHOICES)
     age = models.IntegerField(default=21)
-    alive = models.BooleanField()
+    alive = models.BooleanField(default=True)
 
     def __str__(self):
         return self.name
@@ -196,7 +196,7 @@ class Persona(models.Model):
     A simple persona associated with accounts, to test inlining of related
     accounts which inherit from a common accounts class.
     """
-    name = models.CharField(blank=False,  max_length=80)
+    name = models.CharField(blank=False, max_length=80)
     def __str__(self):
         return self.name
 
@@ -207,7 +207,7 @@ class Account(models.Model):
     A simple, generic account encapsulating the information shared by all
     types of accounts.
     """
-    username = models.CharField(blank=False,  max_length=80)
+    username = models.CharField(blank=False, max_length=80)
     persona = models.ForeignKey(Persona, related_name="accounts")
     servicename = 'generic service'
 
@@ -548,11 +548,6 @@ class FoodDelivery(models.Model):
         unique_together = (("driver", "restaurant"),)
 
 
-class Paper(models.Model):
-    title = models.CharField(max_length=30)
-    author = models.CharField(max_length=30, blank=True, null=True)
-
-
 @python_2_unicode_compatible
 class CoverLetter(models.Model):
     author = models.CharField(max_length=30)
@@ -562,6 +557,25 @@ class CoverLetter(models.Model):
         return self.author
 
 
+class Paper(models.Model):
+    title = models.CharField(max_length=30)
+    author = models.CharField(max_length=30, blank=True, null=True)
+
+
+class ShortMessage(models.Model):
+    content = models.CharField(max_length=140)
+    timestamp = models.DateTimeField(null=True, blank=True)
+
+
+@python_2_unicode_compatible
+class Telegram(models.Model):
+    title = models.CharField(max_length=30)
+    date_sent = models.DateField(null=True, blank=True)
+
+    def __str__(self):
+        return self.title
+
+
 class Story(models.Model):
     title = models.CharField(max_length=100)
     content = models.TextField()
diff --git a/tests/regressiontests/admin_views/templates/custom_filter_template.html b/tests/admin_views/templates/custom_filter_template.html
similarity index 100%
rename from tests/regressiontests/admin_views/templates/custom_filter_template.html
rename to tests/admin_views/templates/custom_filter_template.html
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/admin_views/tests.py
similarity index 91%
rename from tests/regressiontests/admin_views/tests.py
rename to tests/admin_views/tests.py
index 669695ea9b..e0000ff6b5 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -6,7 +6,7 @@ import re
 import datetime
 try:
     from urllib.parse import urljoin
-except ImportError:     # Python 2
+except ImportError:  # Python 2
     from urlparse import urljoin
 
 from django.conf import settings, global_settings
@@ -25,6 +25,7 @@ from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.models import Group, User, Permission, UNUSABLE_PASSWORD
 from django.contrib.contenttypes.models import ContentType
+from django.core.urlresolvers import reverse
 from django.forms.util import ErrorList
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -32,7 +33,7 @@ from django.utils import formats, translation, unittest
 from django.utils.cache import get_max_age
 from django.utils.encoding import iri_to_uri, force_bytes
 from django.utils.html import escape
-from django.utils.http import urlencode
+from django.utils.http import urlencode, urlquote
 from django.utils._os import upath
 from django.utils import six
 from django.test.utils import override_settings
@@ -47,7 +48,7 @@ from .models import (Article, BarAccount, CustomArticle, EmptyModel, FooAccount,
     OtherStory, ComplexSortedPerson, Parent, Child, AdminOrderedField,
     AdminOrderedModelMethod, AdminOrderedAdminMethod, AdminOrderedCallable,
     Report, MainPrepopulated, RelatedPrepopulated, UnorderedObject,
-    Simple, UndeletableObject, Choice)
+    Simple, UndeletableObject, Choice, ShortMessage, Telegram)
 
 
 ERROR_MESSAGE = "Please enter the correct username and password \
@@ -64,7 +65,7 @@ class AdminViewBasicTest(TestCase):
     # this test case and changing urlbit.
     urlbit = 'admin'
 
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
 
     def setUp(self):
         self.old_USE_I18N = settings.USE_I18N
@@ -124,13 +125,22 @@ class AdminViewBasicTest(TestCase):
 
     def testBasicEditGetStringPK(self):
         """
-        A smoke test to ensure GET on the change_view works (returns an HTTP
-        404 error, see #11191) when passing a string as the PK argument for a
-        model with an integer PK field.
+        Ensure GET on the change_view works (returns an HTTP 404 error, see
+        #11191) when passing a string as the PK argument for a model with an
+        integer PK field.
         """
         response = self.client.get('/test_admin/%s/admin_views/section/abc/' % self.urlbit)
         self.assertEqual(response.status_code, 404)
 
+    def testBasicInheritanceGetStringPK(self):
+        """
+        Ensure GET on the change_view works on inherited models (returns an
+        HTTP 404 error, see #19951) when passing a string as the PK argument
+        for a model with an integer PK field.
+        """
+        response = self.client.get('/test_admin/%s/admin_views/supervillain/abc/' % self.urlbit)
+        self.assertEqual(response.status_code, 404)
+
     def testBasicAddPost(self):
         """
         A smoke test to ensure POST on add_view works.
@@ -282,7 +292,7 @@ class AdminViewBasicTest(TestCase):
         """
         If no ordering is defined in `ModelAdmin.ordering` or in the query
         string, then the underlying order of the queryset should not be
-        changed, even if it is defined in `Modeladmin.queryset()`.
+        changed, even if it is defined in `Modeladmin.get_queryset()`.
         Refs #11868, #7309.
         """
         p1 = Person.objects.create(name="Amy", gender=1, alive=True, age=80)
@@ -431,7 +441,7 @@ class AdminViewBasicTest(TestCase):
                         self.urlbit, query_string))
                 self.assertEqual(filtered_response.status_code, 200)
                 # ensure changelist contains only valid objects
-                for obj in filtered_response.context['cl'].query_set.all():
+                for obj in filtered_response.context['cl'].queryset.all():
                     self.assertTrue(params['test'](obj, value))
 
     def testIncorrectLookupParameters(self):
@@ -610,7 +620,7 @@ class AdminViewBasicTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminViewFormUrlTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ["admin-views-users.xml"]
     urlbit = "admin3"
 
@@ -637,14 +647,14 @@ class AdminViewFormUrlTest(TestCase):
             os.path.join(os.path.dirname(upath(__file__)), 'templates'),)
         with self.settings(TEMPLATE_DIRS=template_dirs):
             response = self.client.get("/test_admin/admin/admin_views/color2/")
-            self.assertTrue('custom_filter_template.html' in [t.name for t in response.templates])
+            self.assertTemplateUsed(response, 'custom_filter_template.html')
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminJavaScriptTest(TestCase):
     fixtures = ['admin-views-users.xml']
 
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
 
     def setUp(self):
         self.client.login(username='super', password='secret')
@@ -709,7 +719,7 @@ class AdminJavaScriptTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class SaveAsTests(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml', 'admin-views-person.xml']
 
     def setUp(self):
@@ -739,7 +749,7 @@ class SaveAsTests(TestCase):
 
 
 class CustomModelAdminTest(AdminViewBasicTest):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     urlbit = "admin2"
 
     def testCustomAdminSiteLoginForm(self):
@@ -816,7 +826,7 @@ def get_perm(Model, perm):
 class AdminViewPermissionsTest(TestCase):
     """Tests for Admin Views Permissions."""
 
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -972,6 +982,32 @@ class AdminViewPermissionsTest(TestCase):
         login = self.client.post('/test_admin/admin/', dict(self.super_login, **new_next), QUERY_STRING=query_string)
         self.assertRedirects(login, redirect_url)
 
+    def testDoubleLoginIsNotAllowed(self):
+        """Regression test for #19327"""
+        response = self.client.get('/test_admin/admin/')
+        self.assertEqual(response.status_code, 200)
+
+        # Establish a valid admin session
+        login = self.client.post('/test_admin/admin/', self.super_login)
+        self.assertRedirects(login, '/test_admin/admin/')
+        self.assertFalse(login.context)
+
+        # Logging in with non-admin user fails
+        login = self.client.post('/test_admin/admin/', self.joepublic_login)
+        self.assertEqual(login.status_code, 200)
+        self.assertContains(login, ERROR_MESSAGE)
+
+        # Establish a valid admin session
+        login = self.client.post('/test_admin/admin/', self.super_login)
+        self.assertRedirects(login, '/test_admin/admin/')
+        self.assertFalse(login.context)
+
+        # Logging in with admin user while already logged in
+        login = self.client.post('/test_admin/admin/', self.super_login)
+        self.assertRedirects(login, '/test_admin/admin/')
+        self.assertFalse(login.context)
+        self.client.get('/test_admin/admin/logout/')
+
     def testAddView(self):
         """Test add view restricts access and actually adds items."""
 
@@ -1103,6 +1139,46 @@ class AdminViewPermissionsTest(TestCase):
             self.assertContains(response, 'login-form')
             self.client.get('/test_admin/admin/logout/')
 
+    def testHistoryView(self):
+        """History view should restrict access."""
+
+        # add user shoud not be able to view the list of article or change any of them
+        self.client.get('/test_admin/admin/')
+        self.client.post('/test_admin/admin/', self.adduser_login)
+        response = self.client.get('/test_admin/admin/admin_views/article/1/history/')
+        self.assertEqual(response.status_code, 403)
+        self.client.get('/test_admin/admin/logout/')
+
+        # change user can view all items and edit them
+        self.client.get('/test_admin/admin/')
+        self.client.post('/test_admin/admin/', self.changeuser_login)
+        response = self.client.get('/test_admin/admin/admin_views/article/1/history/')
+        self.assertEqual(response.status_code, 200)
+
+        # Test redirection when using row-level change permissions. Refs #11513.
+        RowLevelChangePermissionModel.objects.create(id=1, name="odd id")
+        RowLevelChangePermissionModel.objects.create(id=2, name="even id")
+        for login_dict in [self.super_login, self.changeuser_login, self.adduser_login, self.deleteuser_login]:
+            self.client.post('/test_admin/admin/', login_dict)
+            response = self.client.get('/test_admin/admin/admin_views/rowlevelchangepermissionmodel/1/history/')
+            self.assertEqual(response.status_code, 403)
+
+            response = self.client.get('/test_admin/admin/admin_views/rowlevelchangepermissionmodel/2/history/')
+            self.assertEqual(response.status_code, 200)
+
+            self.client.get('/test_admin/admin/logout/')
+
+        for login_dict in [self.joepublic_login, self.no_username_login]:
+            self.client.post('/test_admin/admin/', login_dict)
+            response = self.client.get('/test_admin/admin/admin_views/rowlevelchangepermissionmodel/1/history/')
+            self.assertEqual(response.status_code, 200)
+            self.assertContains(response, 'login-form')
+            response = self.client.get('/test_admin/admin/admin_views/rowlevelchangepermissionmodel/2/history/')
+            self.assertEqual(response.status_code, 200)
+            self.assertContains(response, 'login-form')
+
+            self.client.get('/test_admin/admin/logout/')
+
     def testConditionallyShowAddSectionLink(self):
         """
         The foreign key widget should only show the "add related" button if the
@@ -1217,7 +1293,7 @@ class AdminViewPermissionsTest(TestCase):
 class AdminViewsNoUrlTest(TestCase):
     """Regression test for #17333"""
 
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -1247,7 +1323,7 @@ class AdminViewsNoUrlTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminViewDeletedObjectsTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml', 'deleted-objects.xml']
 
     def setUp(self):
@@ -1263,7 +1339,7 @@ class AdminViewDeletedObjectsTest(TestCase):
         """
         pattern = re.compile(br"""<li>Plot: <a href=".+/admin_views/plot/1/">World Domination</a>\s*<ul>\s*<li>Plot details: <a href=".+/admin_views/plotdetails/1/">almost finished</a>""")
         response = self.client.get('/test_admin/admin/admin_views/villain/%s/delete/' % quote(1))
-        self.assertRegexpMatches(response.content, pattern)
+        six.assertRegex(self, response.content, pattern)
 
     def test_cyclic(self):
         """
@@ -1365,7 +1441,7 @@ class AdminViewDeletedObjectsTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminViewStringPrimaryKeyTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml', 'string-primary-key.xml']
 
     def __init__(self, *args):
@@ -1401,21 +1477,23 @@ class AdminViewStringPrimaryKeyTest(TestCase):
         "Link to the changeform of the object in changelist should use reverse() and be quoted -- #18072"
         prefix = '/test_admin/admin/admin_views/modelwithstringprimarykey/'
         response = self.client.get(prefix)
-        # this URL now comes through reverse(), thus iri_to_uri encoding
-        pk_final_url = escape(iri_to_uri(quote(self.pk)))
+        # this URL now comes through reverse(), thus url quoting and iri_to_uri encoding
+        pk_final_url = escape(iri_to_uri(urlquote(quote(self.pk))))
         should_contain = """<th><a href="%s%s/">%s</a></th>""" % (prefix, pk_final_url, escape(self.pk))
         self.assertContains(response, should_contain)
 
     def test_recentactions_link(self):
         "The link from the recent actions list referring to the changeform of the object should be quoted"
         response = self.client.get('/test_admin/admin/')
-        should_contain = """<a href="admin_views/modelwithstringprimarykey/%s/">%s</a>""" % (escape(quote(self.pk)), escape(self.pk))
+        link = reverse('admin:admin_views_modelwithstringprimarykey_change', args=(quote(self.pk),))
+        should_contain = """<a href="%s">%s</a>""" % (link, escape(self.pk))
         self.assertContains(response, should_contain)
 
     def test_recentactions_without_content_type(self):
         "If a LogEntry is missing content_type it will not display it in span tag under the hyperlink."
         response = self.client.get('/test_admin/admin/')
-        should_contain = """<a href="admin_views/modelwithstringprimarykey/%s/">%s</a>""" % (escape(quote(self.pk)), escape(self.pk))
+        link = reverse('admin:admin_views_modelwithstringprimarykey_change', args=(quote(self.pk),))
+        should_contain = """<a href="%s">%s</a>""" % (link, escape(self.pk))
         self.assertContains(response, should_contain)
         should_contain = "Model with string primary key"  # capitalized in Recent Actions
         self.assertContains(response, should_contain)
@@ -1435,8 +1513,8 @@ class AdminViewStringPrimaryKeyTest(TestCase):
     def test_deleteconfirmation_link(self):
         "The link from the delete confirmation page referring back to the changeform of the object should be quoted"
         response = self.client.get('/test_admin/admin/admin_views/modelwithstringprimarykey/%s/delete/' % quote(self.pk))
-        # this URL now comes through reverse(), thus iri_to_uri encoding
-        should_contain = """/%s/">%s</a>""" % (escape(iri_to_uri(quote(self.pk))), escape(self.pk))
+        # this URL now comes through reverse(), thus url quoting and iri_to_uri encoding
+        should_contain = """/%s/">%s</a>""" % (escape(iri_to_uri(urlquote(quote(self.pk)))), escape(self.pk))
         self.assertContains(response, should_contain)
 
     def test_url_conflicts_with_add(self):
@@ -1486,7 +1564,7 @@ class AdminViewStringPrimaryKeyTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class SecureViewTests(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -1641,12 +1719,12 @@ class SecureViewTests(TestCase):
         response = self.client.get(shortcut_url, follow=False)
         # Can't use self.assertRedirects() because User.get_absolute_url() is silly.
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response['Location'], 'http://example.com/users/super/')
+        self.assertEqual(response.url, 'http://example.com/users/super/')
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminViewUnicodeTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-unicode.xml']
 
     def setUp(self):
@@ -1701,7 +1779,7 @@ class AdminViewUnicodeTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminViewListEditable(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml', 'admin-views-person.xml']
 
     def setUp(self):
@@ -2078,7 +2156,7 @@ class AdminViewListEditable(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminSearchTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users', 'multiple-child-classes',
                 'admin-views-person']
 
@@ -2126,7 +2204,7 @@ class AdminSearchTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminInheritedInlinesTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -2214,7 +2292,7 @@ class AdminInheritedInlinesTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminActionsTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml', 'admin-views-actions.xml']
 
     def setUp(self):
@@ -2433,7 +2511,7 @@ class AdminActionsTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class TestCustomChangeList(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
     urlbit = 'admin'
 
@@ -2454,7 +2532,7 @@ class TestCustomChangeList(TestCase):
         self.assertEqual(response.status_code, 302)  # redirect somewhere
         # Hit the page once to get messages out of the queue message list
         response = self.client.get('/test_admin/%s/admin_views/gadget/' % self.urlbit)
-        # Ensure that that data is still not visible on the page
+        # Ensure that data is still not visible on the page
         response = self.client.get('/test_admin/%s/admin_views/gadget/' % self.urlbit)
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, 'First Gadget')
@@ -2462,7 +2540,7 @@ class TestCustomChangeList(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class TestInlineNotEditable(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -2482,7 +2560,7 @@ class TestInlineNotEditable(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminCustomQuerysetTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -2497,6 +2575,34 @@ class AdminCustomQuerysetTest(TestCase):
             else:
                 self.assertNotContains(response, 'Primary key = %s' % i)
 
+    def test_changelist_view_count_queries(self):
+        # create 2 Person objects
+        Person.objects.create(name='person1', gender=1)
+        Person.objects.create(name='person2', gender=2)
+
+        # 4 queries are expected: 1 for the session, 1 for the user,
+        # 1 for the count and 1 for the objects on the page
+        with self.assertNumQueries(4):
+            resp = self.client.get('/test_admin/admin/admin_views/person/')
+            self.assertEqual(resp.context['selection_note'], '0 of 2 selected')
+            self.assertEqual(resp.context['selection_note_all'], 'All 2 selected')
+        with self.assertNumQueries(4):
+            extra = {'q': 'not_in_name'}
+            resp = self.client.get('/test_admin/admin/admin_views/person/', extra)
+            self.assertEqual(resp.context['selection_note'], '0 of 0 selected')
+            self.assertEqual(resp.context['selection_note_all'], 'All 0 selected')
+        with self.assertNumQueries(4):
+            extra = {'q': 'person'}
+            resp = self.client.get('/test_admin/admin/admin_views/person/', extra)
+            self.assertEqual(resp.context['selection_note'], '0 of 2 selected')
+            self.assertEqual(resp.context['selection_note_all'], 'All 2 selected')
+        # here one more count(*) query will run, because filters were applied
+        with self.assertNumQueries(5):
+            extra = {'gender__exact': '1'}
+            resp = self.client.get('/test_admin/admin/admin_views/person/', extra)
+            self.assertEqual(resp.context['selection_note'], '0 of 1 selected')
+            self.assertEqual(resp.context['selection_note_all'], '1 selected')
+
     def test_change_view(self):
         for i in self.pks:
             response = self.client.get('/test_admin/admin/admin_views/emptymodel/%s/' % i)
@@ -2505,27 +2611,93 @@ class AdminCustomQuerysetTest(TestCase):
             else:
                 self.assertEqual(response.status_code, 404)
 
-    def test_add_model_modeladmin_only_qs(self):
-        # only() is used in ModelAdmin.queryset()
-        p = Paper.objects.create(title="My Paper Title")
-        self.assertEqual(Paper.objects.count(), 1)
-        response = self.client.get('/test_admin/admin/admin_views/paper/%s/' % p.pk)
+    def test_add_model_modeladmin_defer_qs(self):
+        # Test for #14529. defer() is used in ModelAdmin.get_queryset()
+
+        # model has __unicode__ method
+        self.assertEqual(CoverLetter.objects.count(), 0)
+        # Emulate model instance creation via the admin
+        post_data = {
+            "author": "Candidate, Best",
+            "_save": "Save",
+        }
+        response = self.client.post('/test_admin/admin/admin_views/coverletter/add/',
+                                    post_data, follow=True)
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(CoverLetter.objects.count(), 1)
+        # Message should contain non-ugly model verbose name
+        self.assertContains(
+            response,
+            '<li class="success">The cover letter &quot;Candidate, Best&quot; was added successfully.</li>',
+            html=True
+        )
+
+        # model has no __unicode__ method
+        self.assertEqual(ShortMessage.objects.count(), 0)
+        # Emulate model instance creation via the admin
+        post_data = {
+            "content": "What's this SMS thing?",
+            "_save": "Save",
+        }
+        response = self.client.post('/test_admin/admin/admin_views/shortmessage/add/',
+                post_data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(ShortMessage.objects.count(), 1)
+        # Message should contain non-ugly model verbose name
+        self.assertContains(
+            response,
+            '<li class="success">The short message &quot;ShortMessage object&quot; was added successfully.</li>',
+            html=True
+        )
+
+    def test_add_model_modeladmin_only_qs(self):
+        # Test for #14529. only() is used in ModelAdmin.get_queryset()
+
+        # model has __unicode__ method
+        self.assertEqual(Telegram.objects.count(), 0)
+        # Emulate model instance creation via the admin
+        post_data = {
+            "title": "Urgent telegram",
+            "_save": "Save",
+        }
+        response = self.client.post('/test_admin/admin/admin_views/telegram/add/',
+                post_data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(Telegram.objects.count(), 1)
+        # Message should contain non-ugly model verbose name
+        self.assertContains(
+            response,
+            '<li class="success">The telegram &quot;Urgent telegram&quot; was added successfully.</li>',
+            html=True
+        )
+
+        # model has no __unicode__ method
+        self.assertEqual(Paper.objects.count(), 0)
+        # Emulate model instance creation via the admin
         post_data = {
             "title": "My Modified Paper Title",
             "_save": "Save",
         }
-        response = self.client.post('/test_admin/admin/admin_views/paper/%s/' % p.pk,
+        response = self.client.post('/test_admin/admin/admin_views/paper/add/',
                 post_data, follow=True)
         self.assertEqual(response.status_code, 200)
-        # Message should contain non-ugly model name. Instance representation is set by six.text_type() (ugly)
-        self.assertContains(response, '<li class="info">The paper &quot;Paper_Deferred_author object&quot; was changed successfully.</li>', html=True)
+        self.assertEqual(Paper.objects.count(), 1)
+        # Message should contain non-ugly model verbose name
+        self.assertContains(
+            response,
+            '<li class="success">The paper &quot;Paper object&quot; was added successfully.</li>',
+            html=True
+        )
 
-        # defer() is used in ModelAdmin.queryset()
+    def test_edit_model_modeladmin_defer_qs(self):
+        # Test for #14529. defer() is used in ModelAdmin.get_queryset()
+
+        # model has __unicode__ method
         cl = CoverLetter.objects.create(author="John Doe")
         self.assertEqual(CoverLetter.objects.count(), 1)
         response = self.client.get('/test_admin/admin/admin_views/coverletter/%s/' % cl.pk)
         self.assertEqual(response.status_code, 200)
+        # Emulate model instance edit via the admin
         post_data = {
             "author": "John Doe II",
             "_save": "Save",
@@ -2533,13 +2705,88 @@ class AdminCustomQuerysetTest(TestCase):
         response = self.client.post('/test_admin/admin/admin_views/coverletter/%s/' % cl.pk,
                 post_data, follow=True)
         self.assertEqual(response.status_code, 200)
-        # Message should contain non-ugly model name. Instance representation is set by model's __unicode__()
-        self.assertContains(response, '<li class="info">The cover letter &quot;John Doe II&quot; was changed successfully.</li>', html=True)
+        self.assertEqual(CoverLetter.objects.count(), 1)
+        # Message should contain non-ugly model verbose name. Instance
+        # representation is set by model's __unicode__()
+        self.assertContains(
+            response,
+            '<li class="success">The cover letter &quot;John Doe II&quot; was changed successfully.</li>',
+            html=True
+        )
+
+        # model has no __unicode__ method
+        sm = ShortMessage.objects.create(content="This is expensive")
+        self.assertEqual(ShortMessage.objects.count(), 1)
+        response = self.client.get('/test_admin/admin/admin_views/shortmessage/%s/' % sm.pk)
+        self.assertEqual(response.status_code, 200)
+        # Emulate model instance edit via the admin
+        post_data = {
+            "content": "Too expensive",
+            "_save": "Save",
+        }
+        response = self.client.post('/test_admin/admin/admin_views/shortmessage/%s/' % sm.pk,
+                post_data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(ShortMessage.objects.count(), 1)
+        # Message should contain non-ugly model verbose name. The ugly(!)
+        # instance representation is set by six.text_type()
+        self.assertContains(
+            response,
+            '<li class="success">The short message &quot;ShortMessage_Deferred_timestamp object&quot; was changed successfully.</li>',
+            html=True
+        )
+
+    def test_edit_model_modeladmin_only_qs(self):
+        # Test for #14529. only() is used in ModelAdmin.get_queryset()
+
+        # model has __unicode__ method
+        t = Telegram.objects.create(title="Frist Telegram")
+        self.assertEqual(Telegram.objects.count(), 1)
+        response = self.client.get('/test_admin/admin/admin_views/telegram/%s/' % t.pk)
+        self.assertEqual(response.status_code, 200)
+        # Emulate model instance edit via the admin
+        post_data = {
+            "title": "Telegram without typo",
+            "_save": "Save",
+        }
+        response = self.client.post('/test_admin/admin/admin_views/telegram/%s/' % t.pk,
+                post_data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(Telegram.objects.count(), 1)
+        # Message should contain non-ugly model verbose name. The instance
+        # representation is set by model's __unicode__()
+        self.assertContains(
+            response,
+            '<li class="success">The telegram &quot;Telegram without typo&quot; was changed successfully.</li>',
+            html=True
+        )
+
+        # model has no __unicode__ method
+        p = Paper.objects.create(title="My Paper Title")
+        self.assertEqual(Paper.objects.count(), 1)
+        response = self.client.get('/test_admin/admin/admin_views/paper/%s/' % p.pk)
+        self.assertEqual(response.status_code, 200)
+        # Emulate model instance edit via the admin
+        post_data = {
+            "title": "My Modified Paper Title",
+            "_save": "Save",
+        }
+        response = self.client.post('/test_admin/admin/admin_views/paper/%s/' % p.pk,
+                post_data, follow=True)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(Paper.objects.count(), 1)
+        # Message should contain non-ugly model verbose name. The ugly(!)
+        # instance representation is set by six.text_type()
+        self.assertContains(
+            response,
+            '<li class="success">The paper &quot;Paper_Deferred_author object&quot; was changed successfully.</li>',
+            html=True
+        )
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminInlineFileUploadTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml', 'admin-views-actions.xml']
     urlbit = 'admin'
 
@@ -2586,7 +2833,7 @@ class AdminInlineFileUploadTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminInlineTests(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -2905,7 +3152,7 @@ class AdminInlineTests(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class NeverCacheTests(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml', 'admin-views-colors.xml', 'admin-views-fabrics.xml']
 
     def setUp(self):
@@ -2979,7 +3226,7 @@ class NeverCacheTests(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class PrePopulatedTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3014,12 +3261,12 @@ class PrePopulatedTest(TestCase):
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
-class SeleniumPrePopulatedFirefoxTests(AdminSeleniumWebDriverTestCase):
+class SeleniumAdminViewsFirefoxTests(AdminSeleniumWebDriverTestCase):
     webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
-    def test_basic(self):
+    def test_prepopulated_fields(self):
         """
         Ensure that the JavaScript-automated prepopulated fields work with the
         main form and with stacked and tabular inlines.
@@ -3081,16 +3328,7 @@ class SeleniumPrePopulatedFirefoxTests(AdminSeleniumWebDriverTestCase):
 
         # Save and check that everything is properly stored in the database
         self.selenium.find_element_by_xpath('//input[@value="Save"]').click()
-
-        try:
-            # Wait for the next page to be loaded.
-            self.wait_loaded_tag('body')
-        except TimeoutException:
-            # IE7 occasionnally returns an error "Internet Explorer cannot
-            # display the webpage" and doesn't load the next page. We just
-            # ignore it.
-            pass
-
+        self.wait_page_loaded()
         self.assertEqual(MainPrepopulated.objects.all().count(), 1)
         MainPrepopulated.objects.get(
             name=' this is the mAin nÀMë and it\'s awεšome',
@@ -3129,18 +3367,34 @@ class SeleniumPrePopulatedFirefoxTests(AdminSeleniumWebDriverTestCase):
             slug2='option-one-tabular-inline-ignored-characters',
         )
 
+    def test_collapsible_fieldset(self):
+        """
+        Test that the 'collapse' class in fieldsets definition allows to
+        show/hide the appropriate field section.
+        """
+        self.admin_login(username='super', password='secret', login_url='/test_admin/admin/')
+        self.selenium.get('%s%s' % (self.live_server_url,
+            '/test_admin/admin/admin_views/article/add/'))
+        self.assertFalse(self.selenium.find_element_by_id('id_title').is_displayed())
+        self.selenium.find_elements_by_link_text('Show')[0].click()
+        self.assertTrue(self.selenium.find_element_by_id('id_title').is_displayed())
+        self.assertEqual(
+            self.selenium.find_element_by_id('fieldsetcollapser0').text,
+            "Hide"
+        )
 
-class SeleniumPrePopulatedChromeTests(SeleniumPrePopulatedFirefoxTests):
+
+class SeleniumAdminViewsChromeTests(SeleniumAdminViewsFirefoxTests):
     webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
 
 
-class SeleniumPrePopulatedIETests(SeleniumPrePopulatedFirefoxTests):
+class SeleniumAdminViewsIETests(SeleniumAdminViewsFirefoxTests):
     webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class ReadonlyTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3228,7 +3482,7 @@ class ReadonlyTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class RawIdFieldsTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3266,7 +3520,7 @@ class UserAdminTest(TestCase):
     """
     Tests user CRUD functionality.
     """
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3351,7 +3605,7 @@ class UserAdminTest(TestCase):
 
         # Don't depend on a warm cache, see #17377.
         ContentType.objects.clear_cache()
-        with self.assertNumQueries(8):
+        with self.assertNumQueries(10):
             response = self.client.get('/test_admin/admin/auth/user/%s/' % u.pk)
             self.assertEqual(response.status_code, 200)
 
@@ -3367,7 +3621,7 @@ class GroupAdminTest(TestCase):
     """
     Tests group CRUD functionality.
     """
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3389,14 +3643,14 @@ class GroupAdminTest(TestCase):
     def test_group_permission_performance(self):
         g = Group.objects.create(name="test_group")
 
-        with self.assertNumQueries(6):  # instead of 259!
+        with self.assertNumQueries(8):  # instead of 259!
             response = self.client.get('/test_admin/admin/auth/group/%s/' % g.pk)
             self.assertEqual(response.status_code, 200)
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class CSSTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3452,7 +3706,7 @@ except ImportError:
 @unittest.skipUnless(docutils, "no docutils installed.")
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminDocsTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3495,7 +3749,7 @@ class AdminDocsTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class ValidXHTMLTests(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
     urlbit = 'admin'
 
@@ -3519,7 +3773,7 @@ class ValidXHTMLTests(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class DateHierarchyTests(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3545,14 +3799,14 @@ class DateHierarchyTests(TestCase):
 
     def assert_contains_month_link(self, response, date):
         self.assertContains(
-            response, '?release_date__year=%d&amp;release_date__month=%d"' % (
-                date.year, date.month))
+            response, '?release_date__month=%d&amp;release_date__year=%d"' % (
+                date.month, date.year))
 
     def assert_contains_day_link(self, response, date):
         self.assertContains(
-            response, '?release_date__year=%d&amp;'
-            'release_date__month=%d&amp;release_date__day=%d"' % (
-                date.year, date.month, date.day))
+            response, '?release_date__day=%d&amp;'
+            'release_date__month=%d&amp;release_date__year=%d"' % (
+                date.day, date.month, date.year))
 
     def test_empty(self):
         """
@@ -3651,7 +3905,7 @@ class AdminCustomSaveRelatedTests(TestCase):
     Ensure that one can easily customize the way related objects are saved.
     Refs #16115.
     """
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3716,7 +3970,7 @@ class AdminCustomSaveRelatedTests(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminViewLogoutTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
@@ -3728,7 +3982,7 @@ class AdminViewLogoutTest(TestCase):
     def test_client_logout_url_can_be_used_to_login(self):
         response = self.client.get('/test_admin/admin/logout/')
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.template_name, 'registration/logged_out.html')
+        self.assertTemplateUsed(response, 'registration/logged_out.html')
         self.assertEqual(response.request['PATH_INFO'], '/test_admin/admin/logout/')
 
         # we are now logged out
@@ -3738,14 +3992,14 @@ class AdminViewLogoutTest(TestCase):
         # follow the redirect and test results.
         response = self.client.get('/test_admin/admin/logout/', follow=True)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.template_name, 'admin/login.html')
+        self.assertTemplateUsed(response, 'admin/login.html')
         self.assertEqual(response.request['PATH_INFO'], '/test_admin/admin/')
         self.assertContains(response, '<input type="hidden" name="next" value="/test_admin/admin/" />')
 
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminUserMessageTest(TestCase):
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
     fixtures = ['admin-views-users.xml']
 
     def setUp(self):
diff --git a/tests/regressiontests/admin_views/urls.py b/tests/admin_views/urls.py
similarity index 100%
rename from tests/regressiontests/admin_views/urls.py
rename to tests/admin_views/urls.py
diff --git a/tests/regressiontests/admin_views/views.py b/tests/admin_views/views.py
similarity index 100%
rename from tests/regressiontests/admin_views/views.py
rename to tests/admin_views/views.py
diff --git a/django/contrib/localflavor/hk/__init__.py b/tests/admin_widgets/__init__.py
similarity index 100%
rename from django/contrib/localflavor/hk/__init__.py
rename to tests/admin_widgets/__init__.py
diff --git a/tests/regressiontests/admin_widgets/fixtures/admin-widgets-users.xml b/tests/admin_widgets/fixtures/admin-widgets-users.xml
similarity index 100%
rename from tests/regressiontests/admin_widgets/fixtures/admin-widgets-users.xml
rename to tests/admin_widgets/fixtures/admin-widgets-users.xml
diff --git a/tests/regressiontests/admin_widgets/models.py b/tests/admin_widgets/models.py
similarity index 97%
rename from tests/regressiontests/admin_widgets/models.py
rename to tests/admin_widgets/models.py
index 2977b86f3e..ae19d58cc4 100644
--- a/tests/regressiontests/admin_widgets/models.py
+++ b/tests/admin_widgets/models.py
@@ -37,8 +37,8 @@ class Album(models.Model):
         return self.name
 
 class HiddenInventoryManager(models.Manager):
-    def get_query_set(self):
-        return super(HiddenInventoryManager, self).get_query_set().filter(hidden=False)
+    def get_queryset(self):
+        return super(HiddenInventoryManager, self).get_queryset().filter(hidden=False)
 
 @python_2_unicode_compatible
 class Inventory(models.Model):
diff --git a/tests/regressiontests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
similarity index 98%
rename from tests/regressiontests/admin_widgets/tests.py
rename to tests/admin_widgets/tests.py
index 76aa9f448f..4e09922893 100644
--- a/tests/regressiontests/admin_widgets/tests.py
+++ b/tests/admin_widgets/tests.py
@@ -425,13 +425,6 @@ class ManyToManyRawIdWidgetTest(DjangoTestCase):
             '<input type="text" name="test" value="%(m1pk)s" class="vManyToManyRawIdAdminField" /><a href="/widget_admin/admin_widgets/member/" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_STATIC_PREFIX)simg/selector-search.gif" width="16" height="16" alt="Lookup" /></a>' % dict(admin_static_prefix(), m1pk=m1.pk)
         )
 
-        self.assertEqual(w._has_changed(None, None), False)
-        self.assertEqual(w._has_changed([], None), False)
-        self.assertEqual(w._has_changed(None, ['1']), True)
-        self.assertEqual(w._has_changed([1, 2], ['1', '2']), False)
-        self.assertEqual(w._has_changed([1, 2], ['1']), True)
-        self.assertEqual(w._has_changed([1, 2], ['1', '3']), True)
-
     def test_m2m_related_model_not_in_admin(self):
         # M2M relationship with model not registered with admin site. Raw ID
         # widget should have no magnifying glass link. See #16542
@@ -467,7 +460,7 @@ class RelatedFieldWidgetWrapperTests(DjangoTestCase):
 class DateTimePickerSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
     webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
     fixtures = ['admin-widgets-users.xml']
-    urls = "regressiontests.admin_widgets.urls"
+    urls = "admin_widgets.urls"
 
     def test_show_hide_date_time_picker_widgets(self):
         """
@@ -523,7 +516,7 @@ class DateTimePickerSeleniumIETests(DateTimePickerSeleniumFirefoxTests):
 class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
     webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'
     fixtures = ['admin-widgets-users.xml']
-    urls = "regressiontests.admin_widgets.urls"
+    urls = "admin_widgets.urls"
 
     def setUp(self):
         self.lisa = models.Student.objects.create(name='Lisa')
@@ -651,12 +644,14 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas
         self.selenium.get(
             '%s%s' % (self.live_server_url, '/admin_widgets/school/%s/' % self.school.id))
 
+        self.wait_page_loaded()
         self.execute_basic_operations('vertical', 'students')
         self.execute_basic_operations('horizontal', 'alumni')
 
         # Save and check that everything is properly stored in the database ---
         self.selenium.find_element_by_xpath('//input[@value="Save"]').click()
-        self.school = models.School.objects.get(id=self.school.id) # Reload from database
+        self.wait_page_loaded()
+        self.school = models.School.objects.get(id=self.school.id)  # Reload from database
         self.assertEqual(list(self.school.students.all()),
                          [self.arthur, self.cliff, self.jason, self.john])
         self.assertEqual(list(self.school.alumni.all()),
@@ -735,6 +730,7 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas
 
         # Save and check that everything is properly stored in the database ---
         self.selenium.find_element_by_xpath('//input[@value="Save"]').click()
+        self.wait_page_loaded()
         self.school = models.School.objects.get(id=self.school.id) # Reload from database
         self.assertEqual(list(self.school.students.all()),
                          [self.jason, self.peter])
diff --git a/tests/regressiontests/admin_widgets/urls.py b/tests/admin_widgets/urls.py
similarity index 100%
rename from tests/regressiontests/admin_widgets/urls.py
rename to tests/admin_widgets/urls.py
diff --git a/tests/regressiontests/admin_widgets/widgetadmin.py b/tests/admin_widgets/widgetadmin.py
similarity index 100%
rename from tests/regressiontests/admin_widgets/widgetadmin.py
rename to tests/admin_widgets/widgetadmin.py
diff --git a/django/contrib/localflavor/hr/__init__.py b/tests/aggregation/__init__.py
similarity index 100%
rename from django/contrib/localflavor/hr/__init__.py
rename to tests/aggregation/__init__.py
diff --git a/tests/modeltests/aggregation/fixtures/aggregation.json b/tests/aggregation/fixtures/aggregation.json
similarity index 100%
rename from tests/modeltests/aggregation/fixtures/aggregation.json
rename to tests/aggregation/fixtures/aggregation.json
diff --git a/tests/modeltests/aggregation/models.py b/tests/aggregation/models.py
similarity index 100%
rename from tests/modeltests/aggregation/models.py
rename to tests/aggregation/models.py
diff --git a/tests/modeltests/aggregation/tests.py b/tests/aggregation/tests.py
similarity index 98%
rename from tests/modeltests/aggregation/tests.py
rename to tests/aggregation/tests.py
index c23b32fc85..c635e6ebb6 100644
--- a/tests/modeltests/aggregation/tests.py
+++ b/tests/aggregation/tests.py
@@ -579,9 +579,9 @@ class BaseAggregateTestCase(TestCase):
         dates = Book.objects.annotate(num_authors=Count("authors")).dates('pubdate', 'year')
         self.assertQuerysetEqual(
             dates, [
-                "datetime.datetime(1991, 1, 1, 0, 0)",
-                "datetime.datetime(1995, 1, 1, 0, 0)",
-                "datetime.datetime(2007, 1, 1, 0, 0)",
-                "datetime.datetime(2008, 1, 1, 0, 0)"
+                "datetime.date(1991, 1, 1)",
+                "datetime.date(1995, 1, 1)",
+                "datetime.date(2007, 1, 1)",
+                "datetime.date(2008, 1, 1)"
             ]
         )
diff --git a/django/contrib/localflavor/id/__init__.py b/tests/aggregation_regress/__init__.py
similarity index 100%
rename from django/contrib/localflavor/id/__init__.py
rename to tests/aggregation_regress/__init__.py
diff --git a/tests/regressiontests/aggregation_regress/fixtures/aggregation_regress.json b/tests/aggregation_regress/fixtures/aggregation_regress.json
similarity index 100%
rename from tests/regressiontests/aggregation_regress/fixtures/aggregation_regress.json
rename to tests/aggregation_regress/fixtures/aggregation_regress.json
diff --git a/tests/regressiontests/aggregation_regress/models.py b/tests/aggregation_regress/models.py
similarity index 73%
rename from tests/regressiontests/aggregation_regress/models.py
rename to tests/aggregation_regress/models.py
index dd4ff50aec..047c871c39 100644
--- a/tests/regressiontests/aggregation_regress/models.py
+++ b/tests/aggregation_regress/models.py
@@ -1,4 +1,6 @@
 # coding: utf-8
+from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 
@@ -22,6 +24,13 @@ class Publisher(models.Model):
         return self.name
 
 
+class ItemTag(models.Model):
+    tag = models.CharField(max_length=100)
+    content_type = models.ForeignKey(ContentType)
+    object_id = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+
+
 @python_2_unicode_compatible
 class Book(models.Model):
     isbn = models.CharField(max_length=9)
@@ -33,6 +42,7 @@ class Book(models.Model):
     contact = models.ForeignKey(Author, related_name='book_contact_set')
     publisher = models.ForeignKey(Publisher)
     pubdate = models.DateField()
+    tags = generic.GenericRelation(ItemTag)
 
     class Meta:
         ordering = ('name',)
@@ -63,6 +73,14 @@ class Clues(models.Model):
     Clue = models.CharField(max_length=150)
 
 
+class WithManualPK(models.Model):
+    # The generic relations regression test needs two different model
+    # classes with the same PK value, and there are some (external)
+    # DB backends that don't work nicely when assigning integer to AutoField
+    # column (MSSQL at least).
+    id = models.IntegerField(primary_key=True)
+
+
 @python_2_unicode_compatible
 class HardbackBook(Book):
     weight = models.FloatField()
diff --git a/tests/regressiontests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py
similarity index 87%
rename from tests/regressiontests/aggregation_regress/tests.py
rename to tests/aggregation_regress/tests.py
index 596ebbfaec..6c5a43664a 100644
--- a/tests/regressiontests/aggregation_regress/tests.py
+++ b/tests/aggregation_regress/tests.py
@@ -6,11 +6,14 @@ from decimal import Decimal
 from operator import attrgetter
 
 from django.core.exceptions import FieldError
+from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count, Max, Avg, Sum, StdDev, Variance, F, Q
 from django.test import TestCase, Approximate, skipUnlessDBFeature
 from django.utils import six
+from django.utils.unittest import expectedFailure
 
-from .models import Author, Book, Publisher, Clues, Entries, HardbackBook
+from .models import (Author, Book, Publisher, Clues, Entries, HardbackBook,
+        ItemTag, WithManualPK)
 
 
 class AggregationTests(TestCase):
@@ -470,7 +473,7 @@ class AggregationTests(TestCase):
         # Regression for #15709 - Ensure each group_by field only exists once
         # per query
         qs = Book.objects.values('publisher').annotate(max_pages=Max('pages')).order_by()
-        grouping, gb_params = qs.query.get_compiler(qs.db).get_grouping([])
+        grouping, gb_params = qs.query.get_compiler(qs.db).get_grouping([], [])
         self.assertEqual(len(grouping), 1)
 
     def test_duplicate_alias(self):
@@ -546,8 +549,8 @@ class AggregationTests(TestCase):
         qs = Book.objects.annotate(num_authors=Count('authors')).filter(num_authors=2).dates('pubdate', 'day')
         self.assertQuerysetEqual(
             qs, [
-                datetime.datetime(1995, 1, 15, 0, 0),
-                datetime.datetime(2007, 12, 6, 0, 0)
+                datetime.date(1995, 1, 15),
+                datetime.date(2007, 12, 6),
             ],
             lambda b: b
         )
@@ -845,14 +848,14 @@ class AggregationTests(TestCase):
 
         # The name of the explicitly provided annotation name in this case
         # poses no problem
-        qs = Author.objects.annotate(book_cnt=Count('book')).filter(book_cnt=2)
+        qs = Author.objects.annotate(book_cnt=Count('book')).filter(book_cnt=2).order_by('name')
         self.assertQuerysetEqual(
             qs,
             ['Peter Norvig'],
             lambda b: b.name
         )
         # Neither in this case
-        qs = Author.objects.annotate(book_count=Count('book')).filter(book_count=2)
+        qs = Author.objects.annotate(book_count=Count('book')).filter(book_count=2).order_by('name')
         self.assertQuerysetEqual(
             qs,
             ['Peter Norvig'],
@@ -860,7 +863,7 @@ class AggregationTests(TestCase):
         )
         # This case used to fail because the ORM couldn't resolve the
         # automatically generated annotation name `book__count`
-        qs = Author.objects.annotate(Count('book')).filter(book__count=2)
+        qs = Author.objects.annotate(Count('book')).filter(book__count=2).order_by('name')
         self.assertQuerysetEqual(
             qs,
             ['Peter Norvig'],
@@ -898,7 +901,7 @@ class AggregationTests(TestCase):
 
         # There should only be one GROUP BY clause, for the `id` column.
         # `name` and `age` should not be grouped on.
-        grouping, gb_params = results.query.get_compiler(using='default').get_grouping([])
+        grouping, gb_params = results.query.get_compiler(using='default').get_grouping([], [])
         self.assertEqual(len(grouping), 1)
         assert 'id' in grouping[0]
         assert 'name' not in grouping[0]
@@ -927,7 +930,7 @@ class AggregationTests(TestCase):
     def test_aggregate_duplicate_columns_only(self):
         # Works with only() too.
         results = Author.objects.only('id', 'name').annotate(num_contacts=Count('book_contact_set'))
-        grouping, gb_params = results.query.get_compiler(using='default').get_grouping([])
+        grouping, gb_params = results.query.get_compiler(using='default').get_grouping([], [])
         self.assertEqual(len(grouping), 1)
         assert 'id' in grouping[0]
         assert 'name' not in grouping[0]
@@ -957,7 +960,7 @@ class AggregationTests(TestCase):
         # And select_related()
         results = Book.objects.select_related('contact').annotate(
             num_authors=Count('authors'))
-        grouping, gb_params = results.query.get_compiler(using='default').get_grouping([])
+        grouping, gb_params = results.query.get_compiler(using='default').get_grouping([], [])
         self.assertEqual(len(grouping), 1)
         assert 'id' in grouping[0]
         assert 'name' not in grouping[0]
@@ -982,3 +985,119 @@ class AggregationTests(TestCase):
     def test_reverse_join_trimming(self):
         qs = Author.objects.annotate(Count('book_contact_set__contact'))
         self.assertIn(' JOIN ', str(qs.query))
+
+    def test_aggregation_with_generic_reverse_relation(self):
+        """
+        Regression test for #10870:  Aggregates with joins ignore extra
+        filters provided by setup_joins
+
+        tests aggregations with generic reverse relations
+        """
+        b = Book.objects.get(name='Practical Django Projects')
+        ItemTag.objects.create(object_id=b.id, tag='intermediate',
+                content_type=ContentType.objects.get_for_model(b))
+        ItemTag.objects.create(object_id=b.id, tag='django',
+                content_type=ContentType.objects.get_for_model(b))
+        # Assign a tag to model with same PK as the book above. If the JOIN
+        # used in aggregation doesn't have content type as part of the
+        # condition the annotation will also count the 'hi mom' tag for b.
+        wmpk = WithManualPK.objects.create(id=b.pk)
+        ItemTag.objects.create(object_id=wmpk.id, tag='hi mom',
+                content_type=ContentType.objects.get_for_model(wmpk))
+        b = Book.objects.get(name__startswith='Paradigms of Artificial Intelligence')
+        ItemTag.objects.create(object_id=b.id, tag='intermediate',
+                content_type=ContentType.objects.get_for_model(b))
+
+        self.assertEqual(Book.objects.aggregate(Count('tags')), {'tags__count': 3})
+        results = Book.objects.annotate(Count('tags')).order_by('-tags__count', 'name')
+        self.assertEqual(
+            [(b.name, b.tags__count) for b in results],
+            [
+                ('Practical Django Projects', 2),
+                ('Paradigms of Artificial Intelligence Programming: Case Studies in Common Lisp', 1),
+                ('Artificial Intelligence: A Modern Approach', 0),
+                ('Python Web Development with Django', 0),
+                ('Sams Teach Yourself Django in 24 Hours', 0),
+                ('The Definitive Guide to Django: Web Development Done Right', 0)
+            ]
+        )
+
+    def test_negated_aggregation(self):
+        expected_results = Author.objects.exclude(
+            pk__in=Author.objects.annotate(book_cnt=Count('book')).filter(book_cnt=2)
+        ).order_by('name')
+        expected_results = [a.name for a in expected_results]
+        qs = Author.objects.annotate(book_cnt=Count('book')).exclude(
+            Q(book_cnt=2), Q(book_cnt=2)).order_by('name')
+        self.assertQuerysetEqual(
+            qs,
+            expected_results,
+            lambda b: b.name
+        )
+        expected_results = Author.objects.exclude(
+            pk__in=Author.objects.annotate(book_cnt=Count('book')).filter(book_cnt=2)
+        ).order_by('name')
+        expected_results = [a.name for a in expected_results]
+        qs = Author.objects.annotate(book_cnt=Count('book')).exclude(Q(book_cnt=2)|Q(book_cnt=2)).order_by('name')
+        self.assertQuerysetEqual(
+            qs,
+            expected_results,
+            lambda b: b.name
+        )
+
+    def test_name_filters(self):
+        qs = Author.objects.annotate(Count('book')).filter(
+            Q(book__count__exact=2)|Q(name='Adrian Holovaty')
+        ).order_by('name')
+        self.assertQuerysetEqual(
+            qs,
+            ['Adrian Holovaty', 'Peter Norvig'],
+            lambda b: b.name
+        )
+
+    def test_name_expressions(self):
+        # Test that aggregates are spotted corretly from F objects.
+        # Note that Adrian's age is 34 in the fixtures, and he has one book
+        # so both conditions match one author.
+        qs = Author.objects.annotate(Count('book')).filter(
+            Q(name='Peter Norvig')|Q(age=F('book__count') + 33)
+        ).order_by('name')
+        self.assertQuerysetEqual(
+            qs,
+            ['Adrian Holovaty', 'Peter Norvig'],
+            lambda b: b.name
+        )
+
+    def test_ticket_11293(self):
+        q1 = Q(price__gt=50)
+        q2 = Q(authors__count__gt=1)
+        query = Book.objects.annotate(Count('authors')).filter(
+            q1 | q2).order_by('pk')
+        self.assertQuerysetEqual(
+            query, [1, 4, 5, 6],
+            lambda b: b.pk)
+
+    def test_ticket_11293_q_immutable(self):
+        """
+        Check that splitting a q object to parts for where/having doesn't alter
+        the original q-object.
+        """
+        q1 = Q(isbn='')
+        q2 = Q(authors__count__gt=1)
+        query = Book.objects.annotate(Count('authors'))
+        query.filter(q1 | q2)
+        self.assertEqual(len(q2.children), 1)
+
+    def test_fobj_group_by(self):
+        """
+        Check that an F() object referring to related column works correctly
+        in group by.
+        """
+        qs = Book.objects.annotate(
+            acount=Count('authors')
+        ).filter(
+            acount=F('publisher__num_awards')
+        )
+        self.assertQuerysetEqual(
+            qs, ['Sams Teach Yourself Django in 24 Hours'],
+            lambda b: b.name)
diff --git a/django/contrib/localflavor/ie/__init__.py b/tests/app_loading/__init__.py
similarity index 100%
rename from django/contrib/localflavor/ie/__init__.py
rename to tests/app_loading/__init__.py
diff --git a/tests/regressiontests/app_loading/eggs/brokenapp.egg b/tests/app_loading/eggs/brokenapp.egg
similarity index 100%
rename from tests/regressiontests/app_loading/eggs/brokenapp.egg
rename to tests/app_loading/eggs/brokenapp.egg
diff --git a/tests/regressiontests/app_loading/eggs/modelapp.egg b/tests/app_loading/eggs/modelapp.egg
similarity index 100%
rename from tests/regressiontests/app_loading/eggs/modelapp.egg
rename to tests/app_loading/eggs/modelapp.egg
diff --git a/tests/regressiontests/app_loading/eggs/nomodelapp.egg b/tests/app_loading/eggs/nomodelapp.egg
similarity index 100%
rename from tests/regressiontests/app_loading/eggs/nomodelapp.egg
rename to tests/app_loading/eggs/nomodelapp.egg
diff --git a/tests/regressiontests/app_loading/eggs/omelet.egg b/tests/app_loading/eggs/omelet.egg
similarity index 100%
rename from tests/regressiontests/app_loading/eggs/omelet.egg
rename to tests/app_loading/eggs/omelet.egg
diff --git a/django/contrib/markup/models.py b/tests/app_loading/models.py
similarity index 100%
rename from django/contrib/markup/models.py
rename to tests/app_loading/models.py
diff --git a/django/contrib/localflavor/il/__init__.py b/tests/app_loading/not_installed/__init__.py
similarity index 100%
rename from django/contrib/localflavor/il/__init__.py
rename to tests/app_loading/not_installed/__init__.py
diff --git a/tests/regressiontests/app_loading/not_installed/models.py b/tests/app_loading/not_installed/models.py
similarity index 100%
rename from tests/regressiontests/app_loading/not_installed/models.py
rename to tests/app_loading/not_installed/models.py
diff --git a/tests/regressiontests/app_loading/tests.py b/tests/app_loading/tests.py
similarity index 100%
rename from tests/regressiontests/app_loading/tests.py
rename to tests/app_loading/tests.py
diff --git a/django/contrib/localflavor/in_/__init__.py b/tests/backends/__init__.py
similarity index 100%
rename from django/contrib/localflavor/in_/__init__.py
rename to tests/backends/__init__.py
diff --git a/tests/regressiontests/backends/models.py b/tests/backends/models.py
similarity index 77%
rename from tests/regressiontests/backends/models.py
rename to tests/backends/models.py
index 344cf4c798..4f03ddeacc 100644
--- a/tests/regressiontests/backends/models.py
+++ b/tests/backends/models.py
@@ -39,7 +39,7 @@ if connection.features.supports_long_model_names:
             verbose_name = 'model_with_long_table_name'
         primary_key_is_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.AutoField(primary_key=True)
         charfield_is_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.CharField(max_length=100)
-        m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.ManyToManyField(Person,blank=True)
+        m2m_also_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.ManyToManyField(Person, blank=True)
 
 
 class Tag(models.Model):
@@ -62,6 +62,7 @@ class Post(models.Model):
 class Reporter(models.Model):
     first_name = models.CharField(max_length=30)
     last_name = models.CharField(max_length=30)
+    raw_data = models.BinaryField()
 
     def __str__(self):
         return "%s %s" % (self.first_name, self.last_name)
@@ -75,3 +76,30 @@ class Article(models.Model):
 
     def __str__(self):
         return self.headline
+
+
+@python_2_unicode_compatible
+class Item(models.Model):
+    name = models.CharField(max_length=30)
+    date = models.DateField()
+    time = models.TimeField()
+    last_modified = models.DateTimeField()
+
+    def __str__(self):
+        return self.name
+
+
+@python_2_unicode_compatible
+class Object(models.Model):
+    related_objects = models.ManyToManyField("self", db_constraint=False, symmetrical=False)
+
+    def __str__(self):
+        return str(self.id)
+
+
+@python_2_unicode_compatible
+class ObjectReference(models.Model):
+    obj = models.ForeignKey(Object, db_constraint=False)
+
+    def __str__(self):
+        return str(self.obj_id)
diff --git a/tests/regressiontests/backends/tests.py b/tests/backends/tests.py
similarity index 79%
rename from tests/regressiontests/backends/tests.py
rename to tests/backends/tests.py
index 934c37d147..a426926cef 100644
--- a/tests/regressiontests/backends/tests.py
+++ b/tests/backends/tests.py
@@ -3,22 +3,23 @@
 from __future__ import absolute_import, unicode_literals
 
 import datetime
+from decimal import Decimal
 import threading
 
 from django.conf import settings
 from django.core.management.color import no_style
-from django.core.exceptions import ImproperlyConfigured
 from django.db import (backend, connection, connections, DEFAULT_DB_ALIAS,
-    IntegrityError, transaction)
+    DatabaseError, IntegrityError, transaction)
 from django.db.backends.signals import connection_created
 from django.db.backends.postgresql_psycopg2 import version as pg_version
-from django.db.utils import ConnectionHandler, DatabaseError, load_backend
+from django.db.backends.util import format_number
+from django.db.models import Sum, Avg, Variance, StdDev
+from django.db.utils import ConnectionHandler
 from django.test import (TestCase, skipUnlessDBFeature, skipIfDBFeature,
     TransactionTestCase)
-from django.test.utils import override_settings
-from django.utils import six
+from django.test.utils import override_settings, str_prefix
+from django.utils import six, unittest
 from django.utils.six.moves import xrange
-from django.utils import unittest
 
 from . import models
 
@@ -42,7 +43,7 @@ class OracleChecks(unittest.TestCase):
         # Check that '%' chars are escaped for query execution.
         name = '"SOME%NAME"'
         quoted_name = connection.ops.quote_name(name)
-        self.assertEquals(quoted_name % (), name)
+        self.assertEqual(quoted_name % (), name)
 
     @unittest.skipUnless(connection.vendor == 'oracle',
                          "No need to check Oracle cursor semantics")
@@ -52,7 +53,7 @@ class OracleChecks(unittest.TestCase):
         convert_unicode = backend.convert_unicode
         cursor = connection.cursor()
         cursor.callproc(convert_unicode('DBMS_SESSION.SET_IDENTIFIER'),
-                        [convert_unicode('_django_testing!'),])
+                        [convert_unicode('_django_testing!')])
 
     @unittest.skipUnless(connection.vendor == 'oracle',
                          "No need to check Oracle cursor semantics")
@@ -72,7 +73,7 @@ class OracleChecks(unittest.TestCase):
         c = connection.cursor()
         c.execute('CREATE TABLE ltext ("TEXT" NCLOB)')
         long_str = ''.join([six.text_type(x) for x in xrange(4000)])
-        c.execute('INSERT INTO ltext VALUES (%s)',[long_str])
+        c.execute('INSERT INTO ltext VALUES (%s)', [long_str])
         c.execute('SELECT text FROM ltext')
         row = c.fetchone()
         self.assertEqual(long_str, row[0].read())
@@ -99,6 +100,7 @@ class OracleChecks(unittest.TestCase):
         c.execute(query)
         self.assertEqual(c.fetchone()[0], 1)
 
+
 class MySQLTests(TestCase):
     @unittest.skipUnless(connection.vendor == 'mysql',
                         "Test valid only for MySQL")
@@ -117,17 +119,11 @@ class MySQLTests(TestCase):
         found_reset = False
         for sql in statements:
             found_reset = found_reset or 'ALTER TABLE' in sql
-        if connection.mysql_version < (5,0,13):
+        if connection.mysql_version < (5, 0, 13):
             self.assertTrue(found_reset)
         else:
             self.assertFalse(found_reset)
 
-    @unittest.skipUnless(connection.vendor == 'mysql',
-                        "Test valid only for MySQL")
-    def test_server_version_connections(self):
-        connection.close()
-        connection.mysql_version
-        self.assertTrue(connection.connection is None)
 
 class DateQuotingTest(TestCase):
 
@@ -143,11 +139,11 @@ class DateQuotingTest(TestCase):
         updated = datetime.datetime(2010, 2, 20)
         models.SchoolClass.objects.create(year=2009, last_updated=updated)
         years = models.SchoolClass.objects.dates('last_updated', 'year')
-        self.assertEqual(list(years), [datetime.datetime(2010, 1, 1, 0, 0)])
+        self.assertEqual(list(years), [datetime.date(2010, 1, 1)])
 
-    def test_django_extract(self):
+    def test_django_date_extract(self):
         """
-        Test the custom ``django_extract method``, in particular against fields
+        Test the custom ``django_date_extract method``, in particular against fields
         which clash with strings passed to it (e.g. 'day') - see #12818__.
 
         __: http://code.djangoproject.com/ticket/12818
@@ -159,24 +155,35 @@ class DateQuotingTest(TestCase):
         self.assertEqual(len(classes), 1)
 
 
+@override_settings(DEBUG=True)
 class LastExecutedQueryTest(TestCase):
-    @override_settings(DEBUG=True)
+
     def test_debug_sql(self):
-        list(models.Tag.objects.filter(name="test"))
+        list(models.Reporter.objects.filter(first_name="test"))
         sql = connection.queries[-1]['sql'].lower()
-        self.assertTrue(sql.startswith("select"))
-        self.assertIn(models.Tag._meta.db_table, sql)
+        self.assertIn("select", sql)
+        self.assertIn(models.Reporter._meta.db_table, sql)
 
     def test_query_encoding(self):
         """
         Test that last_executed_query() returns an Unicode string
         """
-        tags = models.Tag.objects.extra(select={'föö':1})
-        sql, params = tags.query.sql_with_params()
-        cursor = tags.query.get_compiler('default').execute_sql(None)
+        persons = models.Reporter.objects.filter(raw_data=b'\x00\x46  \xFE').extra(select={'föö': 1})
+        sql, params = persons.query.sql_with_params()
+        cursor = persons.query.get_compiler('default').execute_sql(None)
         last_sql = cursor.db.ops.last_executed_query(cursor, sql, params)
         self.assertTrue(isinstance(last_sql, six.text_type))
 
+    @unittest.skipUnless(connection.vendor == 'sqlite',
+                         "This test is specific to SQLite.")
+    def test_no_interpolation_on_sqlite(self):
+        # Regression for #17158
+        # This shouldn't raise an exception
+        query = "SELECT strftime('%Y', 'now');"
+        connection.cursor().execute(query)
+        self.assertEqual(connection.queries[-1]['sql'],
+            str_prefix("QUERY = %(_)s\"SELECT strftime('%%Y', 'now');\" - PARAMS = ()"))
+
 
 class ParameterHandlingTest(TestCase):
     def test_bad_parameter_count(self):
@@ -187,8 +194,9 @@ class ParameterHandlingTest(TestCase):
             connection.ops.quote_name('root'),
             connection.ops.quote_name('square')
         ))
-        self.assertRaises(Exception, cursor.executemany, query, [(1,2,3),])
-        self.assertRaises(Exception, cursor.executemany, query, [(1,),])
+        self.assertRaises(Exception, cursor.executemany, query, [(1, 2, 3)])
+        self.assertRaises(Exception, cursor.executemany, query, [(1,)])
+
 
 # Unfortunately, the following tests would be a good test to run on all
 # backends, but it breaks MySQL hard. Until #13711 is fixed, it can't be run
@@ -236,6 +244,7 @@ class LongNameTest(TestCase):
         for statement in connection.ops.sql_flush(no_style(), tables, sequences):
             cursor.execute(statement)
 
+
 class SequenceResetTest(TestCase):
     def test_generic_relation(self):
         "Sequence names are correct when resetting generic relations (Ref #13941)"
@@ -253,6 +262,7 @@ class SequenceResetTest(TestCase):
         obj = models.Post.objects.create(name='New post', text='goodbye world')
         self.assertTrue(obj.pk > 10)
 
+
 class PostgresVersionTest(TestCase):
     def assert_parses(self, version_string, version):
         self.assertEqual(pg_version._parse_version(version_string), version)
@@ -287,14 +297,15 @@ class PostgresVersionTest(TestCase):
         conn = OlderConnectionMock()
         self.assertEqual(pg_version.get_version(conn), 80300)
 
+
 class PostgresNewConnectionTest(TestCase):
     """
     #17062: PostgreSQL shouldn't roll back SET TIME ZONE, even if the first
     transaction is rolled back.
     """
     @unittest.skipUnless(
-        connection.vendor == 'postgresql' and connection.isolation_level > 0,
-        "This test applies only to PostgreSQL without autocommit")
+        connection.vendor == 'postgresql',
+        "This test applies only to PostgreSQL")
     def test_connect_and_rollback(self):
         new_connections = ConnectionHandler(settings.DATABASES)
         new_connection = new_connections[DEFAULT_DB_ALIAS]
@@ -327,40 +338,75 @@ class PostgresNewConnectionTest(TestCase):
                 pass
 
 
-# Unfortunately with sqlite3 the in-memory test database cannot be
-# closed, and so it cannot be re-opened during testing, and so we
-# sadly disable this test for now.
-class ConnectionCreatedSignalTest(TestCase):
+# This test needs to run outside of a transaction, otherwise closing the
+# connection would implicitly rollback and cause problems during teardown.
+class ConnectionCreatedSignalTest(TransactionTestCase):
+
+    # Unfortunately with sqlite3 the in-memory test database cannot be closed,
+    # and so it cannot be re-opened during testing.
     @skipUnlessDBFeature('test_db_allows_multiple_connections')
     def test_signal(self):
         data = {}
+
         def receiver(sender, connection, **kwargs):
             data["connection"] = connection
 
         connection_created.connect(receiver)
         connection.close()
-        cursor = connection.cursor()
+        connection.cursor()
         self.assertTrue(data["connection"].connection is connection.connection)
 
         connection_created.disconnect(receiver)
         data.clear()
-        cursor = connection.cursor()
+        connection.cursor()
         self.assertTrue(data == {})
 
 
 class EscapingChecks(TestCase):
+    """
+    All tests in this test case are also run with settings.DEBUG=True in
+    EscapingChecksDebug test case, to also test CursorDebugWrapper.
+    """
+    def test_paramless_no_escaping(self):
+        cursor = connection.cursor()
+        cursor.execute("SELECT '%s'")
+        self.assertEqual(cursor.fetchall()[0][0], '%s')
+
+    def test_parameter_escaping(self):
+        cursor = connection.cursor()
+        cursor.execute("SELECT '%%', %s", ('%d',))
+        self.assertEqual(cursor.fetchall()[0], ('%', '%d'))
 
     @unittest.skipUnless(connection.vendor == 'sqlite',
                          "This is a sqlite-specific issue")
-    def test_parameter_escaping(self):
+    def test_sqlite_parameter_escaping(self):
         #13648: '%s' escaping support for sqlite3
         cursor = connection.cursor()
-        response = cursor.execute(
-            "select strftime('%%s', date('now'))").fetchall()[0][0]
-        self.assertNotEqual(response, None)
+        cursor.execute("select strftime('%s', date('now'))")
+        response = cursor.fetchall()[0][0]
         # response should be an non-zero integer
         self.assertTrue(int(response))
 
+@override_settings(DEBUG=True)
+class EscapingChecksDebug(EscapingChecks):
+    pass
+
+
+class SqlliteAggregationTests(TestCase):
+    """
+    #19360: Raise NotImplementedError when aggregating on date/time fields.
+    """
+    @unittest.skipUnless(connection.vendor == 'sqlite',
+                         "No need to check SQLite aggregation semantics")
+    def test_aggregation(self):
+        for aggregate in (Sum, Avg, Variance, StdDev):
+            self.assertRaises(NotImplementedError,
+                models.Item.objects.all().aggregate, aggregate('time'))
+            self.assertRaises(NotImplementedError,
+                models.Item.objects.all().aggregate, aggregate('date'))
+            self.assertRaises(NotImplementedError,
+                models.Item.objects.all().aggregate, aggregate('last_modified'))
+
 
 class BackendTestCase(TestCase):
 
@@ -400,7 +446,6 @@ class BackendTestCase(TestCase):
             self.create_squares_with_executemany(args)
         self.assertEqual(models.Square.objects.count(), 9)
 
-
     def test_unicode_fetches(self):
         #6254: fetchone, fetchmany, fetchall return strings as unicode objects
         qn = connection.ops.quote_name
@@ -424,8 +469,8 @@ class BackendTestCase(TestCase):
         old_password = connection.settings_dict['PASSWORD']
         connection.settings_dict['PASSWORD'] = "françois"
         try:
-            cursor = connection.cursor()
-        except backend.Database.DatabaseError:
+            connection.cursor()
+        except DatabaseError:
             # As password is probably wrong, a database exception is expected
             pass
         except Exception as e:
@@ -451,6 +496,7 @@ class BackendTestCase(TestCase):
         with self.assertRaises(DatabaseError):
             cursor.execute(query)
 
+
 # We don't make these tests conditional because that means we would need to
 # check and differentiate between:
 # * MySQL+InnoDB, MySQL+MYISAM (something we currently can't do).
@@ -458,7 +504,6 @@ class BackendTestCase(TestCase):
 #   on or not, something that would be controlled by runtime support and user
 #   preference.
 # verify if its type is django.database.db.IntegrityError.
-
 class FkConstraintsTests(TransactionTestCase):
 
     def setUp(self):
@@ -497,7 +542,8 @@ class FkConstraintsTests(TransactionTestCase):
         """
         When constraint checks are disabled, should be able to write bad data without IntegrityErrors.
         """
-        with transaction.commit_manually():
+        transaction.set_autocommit(False)
+        try:
             # Create an Article.
             models.Article.objects.create(headline="Test article", pub_date=datetime.datetime(2010, 9, 4), reporter=self.r)
             # Retrive it from the DB
@@ -511,12 +557,15 @@ class FkConstraintsTests(TransactionTestCase):
                 self.fail("IntegrityError should not have occurred.")
             finally:
                 transaction.rollback()
+        finally:
+            transaction.set_autocommit(True)
 
     def test_disable_constraint_checks_context_manager(self):
         """
         When constraint checks are disabled (using context manager), should be able to write bad data without IntegrityErrors.
         """
-        with transaction.commit_manually():
+        transaction.set_autocommit(False)
+        try:
             # Create an Article.
             models.Article.objects.create(headline="Test article", pub_date=datetime.datetime(2010, 9, 4), reporter=self.r)
             # Retrive it from the DB
@@ -529,12 +578,15 @@ class FkConstraintsTests(TransactionTestCase):
                 self.fail("IntegrityError should not have occurred.")
             finally:
                 transaction.rollback()
+        finally:
+            transaction.set_autocommit(True)
 
     def test_check_constraints(self):
         """
         Constraint checks should raise an IntegrityError when bad data is in the DB.
         """
-        with transaction.commit_manually():
+        try:
+            transaction.set_autocommit(False)
             # Create an Article.
             models.Article.objects.create(headline="Test article", pub_date=datetime.datetime(2010, 9, 4), reporter=self.r)
             # Retrive it from the DB
@@ -547,6 +599,8 @@ class FkConstraintsTests(TransactionTestCase):
                         connection.check_constraints()
             finally:
                 transaction.rollback()
+        finally:
+            transaction.set_autocommit(True)
 
 
 class ThreadTests(TestCase):
@@ -557,9 +611,12 @@ class ThreadTests(TestCase):
         different for each thread.
         Refs #17258.
         """
-        connections_set = set()
+        # Map connections by id because connections with identical aliases
+        # have the same hash.
+        connections_dict = {}
         connection.cursor()
-        connections_set.add(connection)
+        connections_dict[id(connection)] = connection
+
         def runner():
             # Passing django.db.connection between threads doesn't work while
             # connections[DEFAULT_DB_ALIAS] does.
@@ -569,19 +626,19 @@ class ThreadTests(TestCase):
             # main thread.
             connection.allow_thread_sharing = True
             connection.cursor()
-            connections_set.add(connection)
+            connections_dict[id(connection)] = connection
         for x in range(2):
             t = threading.Thread(target=runner)
             t.start()
             t.join()
         # Check that each created connection got different inner connection.
         self.assertEqual(
-            len(set([conn.connection for conn in connections_set])),
+            len(set(conn.connection for conn in connections_dict.values())),
             3)
         # Finish by closing the connections opened by the other threads (the
         # connection opened in the main thread will automatically be closed on
         # teardown).
-        for conn in connections_set:
+        for conn in connections_dict.values():
             if conn is not connection:
                 conn.close()
 
@@ -590,25 +647,28 @@ class ThreadTests(TestCase):
         Ensure that the connections are different for each thread.
         Refs #17258.
         """
-        connections_set = set()
+        # Map connections by id because connections with identical aliases
+        # have the same hash.
+        connections_dict = {}
         for conn in connections.all():
-            connections_set.add(conn)
+            connections_dict[id(conn)] = conn
+
         def runner():
             from django.db import connections
             for conn in connections.all():
                 # Allow thread sharing so the connection can be closed by the
                 # main thread.
                 conn.allow_thread_sharing = True
-                connections_set.add(conn)
+                connections_dict[id(conn)] = conn
         for x in range(2):
             t = threading.Thread(target=runner)
             t.start()
             t.join()
-        self.assertEqual(len(connections_set), 6)
+        self.assertEqual(len(connections_dict), 6)
         # Finish by closing the connections opened by the other threads (the
         # connection opened in the main thread will automatically be closed on
         # teardown).
-        for conn in connections_set:
+        for conn in connections_dict.values():
             if conn is not connection:
                 conn.close()
 
@@ -659,6 +719,7 @@ class ThreadTests(TestCase):
         """
         # First, without explicitly enabling the connection for sharing.
         exceptions = set()
+
         def runner1():
             def runner2(other_thread_connection):
                 try:
@@ -676,6 +737,7 @@ class ThreadTests(TestCase):
 
         # Then, with explicitly enabling the connection for sharing.
         exceptions = set()
+
         def runner1():
             def runner2(other_thread_connection):
                 try:
@@ -704,3 +766,72 @@ class MySQLPKZeroTests(TestCase):
     def test_zero_as_autoval(self):
         with self.assertRaises(ValueError):
             models.Square.objects.create(id=0, root=0, square=1)
+
+
+class DBConstraintTestCase(TransactionTestCase):
+    def test_can_reference_existant(self):
+        obj = models.Object.objects.create()
+        ref = models.ObjectReference.objects.create(obj=obj)
+        self.assertEqual(ref.obj, obj)
+
+        ref = models.ObjectReference.objects.get(obj=obj)
+        self.assertEqual(ref.obj, obj)
+
+    def test_can_reference_non_existant(self):
+        self.assertFalse(models.Object.objects.filter(id=12345).exists())
+        ref = models.ObjectReference.objects.create(obj_id=12345)
+        ref_new = models.ObjectReference.objects.get(obj_id=12345)
+        self.assertEqual(ref, ref_new)
+
+        with self.assertRaises(models.Object.DoesNotExist):
+            ref.obj
+
+    def test_many_to_many(self):
+        obj = models.Object.objects.create()
+        obj.related_objects.create()
+        self.assertEqual(models.Object.objects.count(), 2)
+        self.assertEqual(obj.related_objects.count(), 1)
+
+        intermediary_model = models.Object._meta.get_field_by_name("related_objects")[0].rel.through
+        intermediary_model.objects.create(from_object_id=obj.id, to_object_id=12345)
+        self.assertEqual(obj.related_objects.count(), 1)
+        self.assertEqual(intermediary_model.objects.count(), 2)
+
+
+class BackendUtilTests(TestCase):
+
+    def test_format_number(self):
+        """
+        Test the format_number converter utility
+        """
+        def equal(value, max_d, places, result):
+            self.assertEqual(format_number(Decimal(value), max_d, places), result)
+
+        equal('0', 12, 3,
+              '0.000')
+        equal('0', 12, 8,
+              '0.00000000')
+        equal('1', 12, 9,
+              '1.000000000')
+        equal('0.00000000', 12, 8,
+              '0.00000000')
+        equal('0.000000004', 12, 8,
+              '0.00000000')
+        equal('0.000000008', 12, 8,
+              '0.00000001')
+        equal('0.000000000000000000999', 10, 8,
+              '0.00000000')
+        equal('0.1234567890', 12, 10,
+              '0.1234567890')
+        equal('0.1234567890', 12, 9,
+              '0.123456789')
+        equal('0.1234567890', 12, 8,
+              '0.12345679')
+        equal('0.1234567890', 12, 5,
+              '0.12346')
+        equal('0.1234567890', 12, 3,
+              '0.123')
+        equal('0.1234567890', 12, 1,
+              '0.1')
+        equal('0.1234567890', 12, 0,
+              '0')
diff --git a/django/contrib/localflavor/is_/__init__.py b/tests/base/__init__.py
similarity index 100%
rename from django/contrib/localflavor/is_/__init__.py
rename to tests/base/__init__.py
diff --git a/tests/base/models.py b/tests/base/models.py
new file mode 100644
index 0000000000..bddb406820
--- /dev/null
+++ b/tests/base/models.py
@@ -0,0 +1,23 @@
+from __future__ import unicode_literals
+
+from django.db import models
+from django.utils import six
+
+
+# The models definitions below used to crash. Generating models dynamically
+# at runtime is a bad idea because it pollutes the app cache. This doesn't
+# integrate well with the test suite but at least it prevents regressions.
+
+
+class CustomBaseModel(models.base.ModelBase):
+    pass
+
+
+class MyModel(six.with_metaclass(CustomBaseModel, models.Model)):
+        """Model subclass with a custom base using six.with_metaclass."""
+
+
+if not six.PY3:
+    class MyModel(models.Model):
+        """Model subclass with a custom base using __metaclass__."""
+        __metaclass__ = CustomBaseModel
diff --git a/tests/modeltests/files/__init__.py b/tests/bash_completion/__init__.py
similarity index 100%
rename from tests/modeltests/files/__init__.py
rename to tests/bash_completion/__init__.py
diff --git a/tests/modeltests/invalid_models/__init__.py b/tests/bash_completion/management/__init__.py
similarity index 100%
rename from tests/modeltests/invalid_models/__init__.py
rename to tests/bash_completion/management/__init__.py
diff --git a/tests/modeltests/m2m_signals/__init__.py b/tests/bash_completion/management/commands/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_signals/__init__.py
rename to tests/bash_completion/management/commands/__init__.py
diff --git a/tests/regressiontests/bash_completion/management/commands/test_command.py b/tests/bash_completion/management/commands/test_command.py
similarity index 100%
rename from tests/regressiontests/bash_completion/management/commands/test_command.py
rename to tests/bash_completion/management/commands/test_command.py
diff --git a/tests/regressiontests/bash_completion/models.py b/tests/bash_completion/models.py
similarity index 100%
rename from tests/regressiontests/bash_completion/models.py
rename to tests/bash_completion/models.py
diff --git a/tests/regressiontests/bash_completion/tests.py b/tests/bash_completion/tests.py
similarity index 97%
rename from tests/regressiontests/bash_completion/tests.py
rename to tests/bash_completion/tests.py
index ed8cedf1ab..4fdb793feb 100644
--- a/tests/regressiontests/bash_completion/tests.py
+++ b/tests/bash_completion/tests.py
@@ -66,7 +66,7 @@ class BashCompletionTests(unittest.TestCase):
         "Subcommands can be autocompleted"
         self._user_input('django-admin.py sql')
         output = self._run_autocomplete()
-        self.assertEqual(output, ['sql sqlall sqlclear sqlcustom sqlflush sqlindexes sqlinitialdata sqlsequencereset'])
+        self.assertEqual(output, ['sql sqlall sqlclear sqlcustom sqldropindexes sqlflush sqlindexes sqlinitialdata sqlsequencereset'])
 
     def test_help(self):
         "No errors, just an empty list if there are no autocomplete options"
diff --git a/django/contrib/localflavor/it/__init__.py b/tests/basic/__init__.py
similarity index 100%
rename from django/contrib/localflavor/it/__init__.py
rename to tests/basic/__init__.py
diff --git a/tests/modeltests/basic/models.py b/tests/basic/models.py
similarity index 100%
rename from tests/modeltests/basic/models.py
rename to tests/basic/models.py
diff --git a/tests/modeltests/basic/tests.py b/tests/basic/tests.py
similarity index 86%
rename from tests/modeltests/basic/tests.py
rename to tests/basic/tests.py
index 1c83b980a7..ccbb9bd423 100644
--- a/tests/modeltests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -1,10 +1,13 @@
 from __future__ import absolute_import, unicode_literals
 
 from datetime import datetime
+import threading
 
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
+from django.db import connections, DEFAULT_DB_ALIAS
 from django.db.models.fields import Field, FieldDoesNotExist
-from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
+from django.db.models.query import QuerySet, EmptyQuerySet, ValuesListQuerySet
+from django.test import TestCase, TransactionTestCase, skipIfDBFeature, skipUnlessDBFeature
 from django.utils import six
 from django.utils.translation import ugettext_lazy
 
@@ -140,21 +143,21 @@ class ModelTest(TestCase):
 
         # Django raises an Article.MultipleObjectsReturned exception if the
         # lookup matches more than one object
-        self.assertRaisesRegexp(
+        six.assertRaisesRegex(self,
             MultipleObjectsReturned,
             "get\(\) returned more than one Article -- it returned 2!",
             Article.objects.get,
             headline__startswith='Area',
         )
 
-        self.assertRaisesRegexp(
+        six.assertRaisesRegex(self,
             MultipleObjectsReturned,
             "get\(\) returned more than one Article -- it returned 2!",
             Article.objects.get,
             pub_date__year=2005,
         )
 
-        self.assertRaisesRegexp(
+        six.assertRaisesRegex(self,
             MultipleObjectsReturned,
             "get\(\) returned more than one Article -- it returned 2!",
             Article.objects.get,
@@ -265,34 +268,34 @@ class ModelTest(TestCase):
         # ... but there will often be more efficient ways if that is all you need:
         self.assertTrue(Article.objects.filter(id=a8.id).exists())
 
-        # dates() returns a list of available dates of the given scope for
+        # datetimes() returns a list of available dates of the given scope for
         # the given field.
         self.assertQuerysetEqual(
-            Article.objects.dates('pub_date', 'year'),
+            Article.objects.datetimes('pub_date', 'year'),
             ["datetime.datetime(2005, 1, 1, 0, 0)"])
         self.assertQuerysetEqual(
-            Article.objects.dates('pub_date', 'month'),
+            Article.objects.datetimes('pub_date', 'month'),
             ["datetime.datetime(2005, 7, 1, 0, 0)"])
         self.assertQuerysetEqual(
-            Article.objects.dates('pub_date', 'day'),
+            Article.objects.datetimes('pub_date', 'day'),
             ["datetime.datetime(2005, 7, 28, 0, 0)",
              "datetime.datetime(2005, 7, 29, 0, 0)",
              "datetime.datetime(2005, 7, 30, 0, 0)",
              "datetime.datetime(2005, 7, 31, 0, 0)"])
         self.assertQuerysetEqual(
-            Article.objects.dates('pub_date', 'day', order='ASC'),
+            Article.objects.datetimes('pub_date', 'day', order='ASC'),
             ["datetime.datetime(2005, 7, 28, 0, 0)",
              "datetime.datetime(2005, 7, 29, 0, 0)",
              "datetime.datetime(2005, 7, 30, 0, 0)",
              "datetime.datetime(2005, 7, 31, 0, 0)"])
         self.assertQuerysetEqual(
-            Article.objects.dates('pub_date', 'day', order='DESC'),
+            Article.objects.datetimes('pub_date', 'day', order='DESC'),
             ["datetime.datetime(2005, 7, 31, 0, 0)",
              "datetime.datetime(2005, 7, 30, 0, 0)",
              "datetime.datetime(2005, 7, 29, 0, 0)",
              "datetime.datetime(2005, 7, 28, 0, 0)"])
 
-        # dates() requires valid arguments.
+        # datetimes() requires valid arguments.
         self.assertRaises(
             TypeError,
             Article.objects.dates,
@@ -323,10 +326,10 @@ class ModelTest(TestCase):
             order="bad order",
         )
 
-        # Use iterator() with dates() to return a generator that lazily
+        # Use iterator() with datetimes() to return a generator that lazily
         # requests each result one at a time, to save memory.
         dates = []
-        for article in Article.objects.dates('pub_date', 'day', order='DESC').iterator():
+        for article in Article.objects.datetimes('pub_date', 'day', order='DESC').iterator():
             dates.append(article)
         self.assertEqual(dates, [
             datetime(2005, 7, 31, 0, 0),
@@ -639,3 +642,74 @@ class ModelTest(TestCase):
         Article.objects.bulk_create([Article(headline=lazy, pub_date=datetime.now())])
         article = Article.objects.get()
         self.assertEqual(article.headline, notlazy)
+
+    def test_emptyqs(self):
+        # Can't be instantiated
+        with self.assertRaises(TypeError):
+            EmptyQuerySet()
+        self.assertTrue(isinstance(Article.objects.none(), EmptyQuerySet))
+
+    def test_emptyqs_values(self):
+        # test for #15959
+        Article.objects.create(headline='foo', pub_date=datetime.now())
+        with self.assertNumQueries(0):
+            qs = Article.objects.none().values_list('pk')
+            self.assertTrue(isinstance(qs, EmptyQuerySet))
+            self.assertTrue(isinstance(qs, ValuesListQuerySet))
+            self.assertEqual(len(qs), 0)
+
+    def test_emptyqs_customqs(self):
+        # A hacky test for custom QuerySet subclass - refs #17271
+        Article.objects.create(headline='foo', pub_date=datetime.now())
+        class CustomQuerySet(QuerySet):
+            def do_something(self):
+                return 'did something'
+
+        qs = Article.objects.all()
+        qs.__class__ = CustomQuerySet
+        qs = qs.none()
+        with self.assertNumQueries(0):
+            self.assertEqual(len(qs), 0)
+            self.assertTrue(isinstance(qs, EmptyQuerySet))
+            self.assertEqual(qs.do_something(), 'did something')
+
+    def test_emptyqs_values_order(self):
+        # Tests for ticket #17712
+        Article.objects.create(headline='foo', pub_date=datetime.now())
+        with self.assertNumQueries(0):
+            self.assertEqual(len(Article.objects.none().values_list('id').order_by('id')), 0)
+        with self.assertNumQueries(0):
+            self.assertEqual(len(Article.objects.none().filter(
+                id__in=Article.objects.values_list('id', flat=True))), 0)
+
+    @skipUnlessDBFeature('can_distinct_on_fields')
+    def test_emptyqs_distinct(self):
+        # Tests for #19426
+        Article.objects.create(headline='foo', pub_date=datetime.now())
+        with self.assertNumQueries(0):
+            self.assertEqual(len(Article.objects.none().distinct('headline', 'pub_date')), 0)
+
+class ConcurrentSaveTests(TransactionTestCase):
+    @skipUnlessDBFeature('test_db_allows_multiple_connections')
+    def test_concurrent_delete_with_save(self):
+        """
+        Test fetching, deleting and finally saving an object - we should get
+        an insert in this case.
+        """
+        a = Article.objects.create(headline='foo', pub_date=datetime.now())
+        exceptions = []
+        def deleter():
+            try:
+                # Do not delete a directly - doing so alters its state.
+                Article.objects.filter(pk=a.pk).delete()
+                connections[DEFAULT_DB_ALIAS].commit_unless_managed()
+            except Exception as e:
+                exceptions.append(e)
+            finally:
+                connections[DEFAULT_DB_ALIAS].close()
+        self.assertEqual(len(exceptions), 0)
+        t = threading.Thread(target=deleter)
+        t.start()
+        t.join()
+        a.save()
+        self.assertEqual(Article.objects.get(pk=a.pk).headline, 'foo')
diff --git a/django/contrib/localflavor/jp/__init__.py b/tests/bug639/__init__.py
similarity index 100%
rename from django/contrib/localflavor/jp/__init__.py
rename to tests/bug639/__init__.py
diff --git a/tests/regressiontests/bug639/models.py b/tests/bug639/models.py
similarity index 100%
rename from tests/regressiontests/bug639/models.py
rename to tests/bug639/models.py
diff --git a/tests/regressiontests/bug639/test.jpg b/tests/bug639/test.jpg
similarity index 100%
rename from tests/regressiontests/bug639/test.jpg
rename to tests/bug639/test.jpg
diff --git a/tests/regressiontests/bug639/tests.py b/tests/bug639/tests.py
similarity index 100%
rename from tests/regressiontests/bug639/tests.py
rename to tests/bug639/tests.py
diff --git a/django/contrib/localflavor/kw/__init__.py b/tests/bug8245/__init__.py
similarity index 100%
rename from django/contrib/localflavor/kw/__init__.py
rename to tests/bug8245/__init__.py
diff --git a/tests/regressiontests/bug8245/admin.py b/tests/bug8245/admin.py
similarity index 100%
rename from tests/regressiontests/bug8245/admin.py
rename to tests/bug8245/admin.py
diff --git a/tests/regressiontests/bug8245/models.py b/tests/bug8245/models.py
similarity index 100%
rename from tests/regressiontests/bug8245/models.py
rename to tests/bug8245/models.py
diff --git a/tests/regressiontests/bug8245/tests.py b/tests/bug8245/tests.py
similarity index 100%
rename from tests/regressiontests/bug8245/tests.py
rename to tests/bug8245/tests.py
diff --git a/django/contrib/localflavor/mk/__init__.py b/tests/builtin_server/__init__.py
similarity index 100%
rename from django/contrib/localflavor/mk/__init__.py
rename to tests/builtin_server/__init__.py
diff --git a/tests/modeltests/invalid_models/models.py b/tests/builtin_server/models.py
similarity index 100%
rename from tests/modeltests/invalid_models/models.py
rename to tests/builtin_server/models.py
diff --git a/tests/builtin_server/tests.py b/tests/builtin_server/tests.py
new file mode 100644
index 0000000000..662466a110
--- /dev/null
+++ b/tests/builtin_server/tests.py
@@ -0,0 +1,102 @@
+from __future__ import unicode_literals
+
+from io import BytesIO
+
+from django.core.servers.basehttp import ServerHandler, MAX_SOCKET_CHUNK_SIZE
+from django.utils.unittest import TestCase
+
+
+class DummyHandler(object):
+    def log_request(self, *args, **kwargs):
+        pass
+
+
+class FileWrapperHandler(ServerHandler):
+    def __init__(self, *args, **kwargs):
+        super(FileWrapperHandler, self).__init__(*args, **kwargs)
+        self.request_handler = DummyHandler()
+        self._used_sendfile = False
+
+    def sendfile(self):
+        self._used_sendfile = True
+        return True
+
+
+def wsgi_app(environ, start_response):
+    start_response(str('200 OK'), [(str('Content-Type'), str('text/plain'))])
+    return [b'Hello World!']
+
+
+def wsgi_app_file_wrapper(environ, start_response):
+    start_response(str('200 OK'), [(str('Content-Type'), str('text/plain'))])
+    return environ['wsgi.file_wrapper'](BytesIO(b'foo'))
+
+
+class WSGIFileWrapperTests(TestCase):
+    """
+    Test that the wsgi.file_wrapper works for the builting server.
+
+    Tests for #9659: wsgi.file_wrapper in the builtin server.
+    We need to mock a couple of handlers and keep track of what
+    gets called when using a couple kinds of WSGI apps.
+    """
+
+    def test_file_wrapper_uses_sendfile(self):
+        env = {'SERVER_PROTOCOL': 'HTTP/1.0'}
+        handler = FileWrapperHandler(None, BytesIO(), BytesIO(), env)
+        handler.run(wsgi_app_file_wrapper)
+        self.assertTrue(handler._used_sendfile)
+        self.assertEqual(handler.stdout.getvalue(), b'')
+        self.assertEqual(handler.stderr.getvalue(), b'')
+
+    def test_file_wrapper_no_sendfile(self):
+        env = {'SERVER_PROTOCOL': 'HTTP/1.0'}
+        handler = FileWrapperHandler(None, BytesIO(), BytesIO(), env)
+        handler.run(wsgi_app)
+        self.assertFalse(handler._used_sendfile)
+        self.assertEqual(handler.stdout.getvalue().splitlines()[-1], b'Hello World!')
+        self.assertEqual(handler.stderr.getvalue(), b'')
+
+
+class WriteChunkCounterHandler(ServerHandler):
+    """
+    Server handler that counts the number of chunks written after headers were
+    sent. Used to make sure large response body chunking works properly.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(WriteChunkCounterHandler, self).__init__(*args, **kwargs)
+        self.request_handler = DummyHandler()
+        self.headers_written = False
+        self.write_chunk_counter = 0
+
+    def send_headers(self):
+        super(WriteChunkCounterHandler, self).send_headers()
+        self.headers_written = True
+
+    def _write(self, data):
+        if self.headers_written:
+            self.write_chunk_counter += 1
+        self.stdout.write(data)
+
+
+def send_big_data_app(environ, start_response):
+    start_response(str('200 OK'), [(str('Content-Type'), str('text/plain'))])
+    # Return a blob of data that is 1.5 times the maximum chunk size.
+    return [b'x' * (MAX_SOCKET_CHUNK_SIZE + MAX_SOCKET_CHUNK_SIZE // 2)]
+
+
+class ServerHandlerChunksProperly(TestCase):
+    """
+    Test that the ServerHandler chunks data properly.
+
+    Tests for #18972: The logic that performs the math to break data into
+    32MB (MAX_SOCKET_CHUNK_SIZE) chunks was flawed, BUT it didn't actually
+    cause any problems.
+    """
+
+    def test_chunked_data(self):
+        env = {'SERVER_PROTOCOL': 'HTTP/1.0'}
+        handler = WriteChunkCounterHandler(None, BytesIO(), BytesIO(), env)
+        handler.run(send_big_data_app)
+        self.assertEqual(handler.write_chunk_counter, 2)
diff --git a/django/contrib/localflavor/mx/__init__.py b/tests/bulk_create/__init__.py
similarity index 100%
rename from django/contrib/localflavor/mx/__init__.py
rename to tests/bulk_create/__init__.py
diff --git a/tests/regressiontests/bulk_create/models.py b/tests/bulk_create/models.py
similarity index 100%
rename from tests/regressiontests/bulk_create/models.py
rename to tests/bulk_create/models.py
diff --git a/tests/regressiontests/bulk_create/tests.py b/tests/bulk_create/tests.py
similarity index 100%
rename from tests/regressiontests/bulk_create/tests.py
rename to tests/bulk_create/tests.py
diff --git a/django/contrib/localflavor/nl/__init__.py b/tests/cache/__init__.py
similarity index 100%
rename from django/contrib/localflavor/nl/__init__.py
rename to tests/cache/__init__.py
diff --git a/tests/regressiontests/cache/closeable_cache.py b/tests/cache/closeable_cache.py
similarity index 100%
rename from tests/regressiontests/cache/closeable_cache.py
rename to tests/cache/closeable_cache.py
diff --git a/tests/regressiontests/cache/liberal_backend.py b/tests/cache/liberal_backend.py
similarity index 100%
rename from tests/regressiontests/cache/liberal_backend.py
rename to tests/cache/liberal_backend.py
diff --git a/tests/regressiontests/cache/models.py b/tests/cache/models.py
similarity index 100%
rename from tests/regressiontests/cache/models.py
rename to tests/cache/models.py
diff --git a/tests/regressiontests/cache/tests.py b/tests/cache/tests.py
similarity index 92%
rename from tests/regressiontests/cache/tests.py
rename to tests/cache/tests.py
index fc92ecf870..00c51638b7 100644
--- a/tests/regressiontests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -12,13 +12,15 @@ import string
 import tempfile
 import time
 import warnings
+import pickle
 
 from django.conf import settings
 from django.core import management
 from django.core.cache import get_cache
 from django.core.cache.backends.base import (CacheKeyWarning,
     InvalidCacheBackendError)
-from django.db import router
+from django.db import router, transaction
+from django.core.cache.utils import make_template_fragment_key
 from django.http import (HttpResponse, HttpRequest, StreamingHttpResponse,
     QueryDict)
 from django.middleware.cache import (FetchFromCacheMiddleware,
@@ -807,7 +809,7 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase):
         self.prefix_cache = get_cache(self.backend_name, LOCATION=self._table_name, KEY_PREFIX='cacheprefix')
         self.v2_cache = get_cache(self.backend_name, LOCATION=self._table_name, VERSION=2)
         self.custom_key_cache = get_cache(self.backend_name, LOCATION=self._table_name, KEY_FUNCTION=custom_key_func)
-        self.custom_key_cache2 = get_cache(self.backend_name, LOCATION=self._table_name, KEY_FUNCTION='regressiontests.cache.tests.custom_key_func')
+        self.custom_key_cache2 = get_cache(self.backend_name, LOCATION=self._table_name, KEY_FUNCTION='cache.tests.custom_key_func')
 
     def tearDown(self):
         from django.db import connection
@@ -836,6 +838,13 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase):
                 interactive=False
             )
 
+    def test_clear_commits_transaction(self):
+        # Ensure the database transaction is committed (#19896)
+        self.cache.set("key1", "spam")
+        self.cache.clear()
+        transaction.rollback()
+        self.assertEqual(self.cache.get("key1"), None)
+
 
 @override_settings(USE_TZ=True)
 class DBCacheWithTimeZoneTests(DBCacheTests):
@@ -888,7 +897,7 @@ class LocMemCacheTests(unittest.TestCase, BaseCacheTests):
         self.prefix_cache = get_cache(self.backend_name, KEY_PREFIX='cacheprefix')
         self.v2_cache = get_cache(self.backend_name, VERSION=2)
         self.custom_key_cache = get_cache(self.backend_name, OPTIONS={'MAX_ENTRIES': 30}, KEY_FUNCTION=custom_key_func)
-        self.custom_key_cache2 = get_cache(self.backend_name, OPTIONS={'MAX_ENTRIES': 30}, KEY_FUNCTION='regressiontests.cache.tests.custom_key_func')
+        self.custom_key_cache2 = get_cache(self.backend_name, OPTIONS={'MAX_ENTRIES': 30}, KEY_FUNCTION='cache.tests.custom_key_func')
 
         # LocMem requires a hack to make the other caches
         # share a data store with the 'normal' cache.
@@ -957,7 +966,7 @@ class MemcachedCacheTests(unittest.TestCase, BaseCacheTests):
         self.prefix_cache = get_cache(cache_key, KEY_PREFIX=random_prefix)
         self.v2_cache = get_cache(cache_key, VERSION=2)
         self.custom_key_cache = get_cache(cache_key, KEY_FUNCTION=custom_key_func)
-        self.custom_key_cache2 = get_cache(cache_key, KEY_FUNCTION='regressiontests.cache.tests.custom_key_func')
+        self.custom_key_cache2 = get_cache(cache_key, KEY_FUNCTION='cache.tests.custom_key_func')
 
     def tearDown(self):
         self.cache.clear()
@@ -977,6 +986,18 @@ class MemcachedCacheTests(unittest.TestCase, BaseCacheTests):
         # memcached limits key length to 250
         self.assertRaises(Exception, self.cache.set, 'a' * 251, 'value')
 
+    # Explicitly display a skipped test if no configured cache uses MemcachedCache
+    @unittest.skipUnless(
+        any(cache['BACKEND'] == 'django.core.cache.backends.memcached.MemcachedCache'
+            for cache in settings.CACHES.values()),
+        "cache with python-memcached library not available")
+    def test_memcached_uses_highest_pickle_version(self):
+        # Regression test for #19810
+        for cache_key, cache in settings.CACHES.items():
+            if cache['BACKEND'] == 'django.core.cache.backends.memcached.MemcachedCache':
+                self.assertEqual(get_cache(cache_key)._cache.pickleProtocol,
+                                 pickle.HIGHEST_PROTOCOL)
+
 
 class FileBasedCacheTests(unittest.TestCase, BaseCacheTests):
     """
@@ -990,7 +1011,7 @@ class FileBasedCacheTests(unittest.TestCase, BaseCacheTests):
         self.prefix_cache = get_cache(self.backend_name, LOCATION=self.dirname, KEY_PREFIX='cacheprefix')
         self.v2_cache = get_cache(self.backend_name, LOCATION=self.dirname, VERSION=2)
         self.custom_key_cache = get_cache(self.backend_name, LOCATION=self.dirname, KEY_FUNCTION=custom_key_func)
-        self.custom_key_cache2 = get_cache(self.backend_name, LOCATION=self.dirname, KEY_FUNCTION='regressiontests.cache.tests.custom_key_func')
+        self.custom_key_cache2 = get_cache(self.backend_name, LOCATION=self.dirname, KEY_FUNCTION='cache.tests.custom_key_func')
 
     def tearDown(self):
         self.cache.clear()
@@ -1034,7 +1055,7 @@ class CustomCacheKeyValidationTests(unittest.TestCase):
 
     """
     def test_custom_key_validation(self):
-        cache = get_cache('regressiontests.cache.liberal_backend://')
+        cache = get_cache('cache.liberal_backend://')
 
         # this key is both longer than 250 characters, and has spaces
         key = 'some key with spaces' * 15
@@ -1061,7 +1082,7 @@ class GetCacheTests(unittest.TestCase):
 
     def test_close(self):
         from django.core import signals
-        cache = get_cache('regressiontests.cache.closeable_cache.CacheClass')
+        cache = get_cache('cache.closeable_cache.CacheClass')
         self.assertFalse(cache.closed)
         signals.request_finished.send(self.__class__)
         self.assertTrue(cache.closed)
@@ -1303,6 +1324,73 @@ class CacheI18nTest(TestCase):
         key2 = get_cache_key(request)
         self.assertEqual(key, key2)
 
+    def check_accept_language_vary(self, accept_language, vary, reference_key):
+        request = self._get_request()
+        request.META['HTTP_ACCEPT_LANGUAGE'] = accept_language
+        request.META['HTTP_ACCEPT_ENCODING'] = 'gzip;q=1.0, identity; q=0.5, *;q=0'
+        response = HttpResponse()
+        response['Vary'] = vary
+        key = learn_cache_key(request, response)
+        key2 = get_cache_key(request)
+        self.assertEqual(key, reference_key)
+        self.assertEqual(key2, reference_key)
+
+    @override_settings(USE_I18N=True, USE_L10N=False, USE_TZ=False)
+    def test_cache_key_i18n_translation_accept_language(self):
+        lang = translation.get_language()
+        self.assertEqual(lang, 'en')
+        request = self._get_request()
+        request.META['HTTP_ACCEPT_ENCODING'] = 'gzip;q=1.0, identity; q=0.5, *;q=0'
+        response = HttpResponse()
+        response['Vary'] = 'accept-encoding'
+        key = learn_cache_key(request, response)
+        self.assertIn(lang, key, "Cache keys should include the language name when translation is active")
+        self.check_accept_language_vary(
+            'en-us',
+            'cookie, accept-language, accept-encoding',
+            key
+        )
+        self.check_accept_language_vary(
+            'en-US',
+            'cookie, accept-encoding, accept-language',
+            key
+        )
+        self.check_accept_language_vary(
+            'en-US,en;q=0.8',
+            'accept-encoding, accept-language, cookie',
+            key
+        )
+        self.check_accept_language_vary(
+            'en-US,en;q=0.8,ko;q=0.6',
+            'accept-language, cookie, accept-encoding',
+            key
+        )
+        self.check_accept_language_vary(
+            'ko-kr,ko;q=0.8,en-us;q=0.5,en;q=0.3 ',
+            'accept-encoding, cookie, accept-language',
+            key
+        )
+        self.check_accept_language_vary(
+            'ko-KR,ko;q=0.8,en-US;q=0.6,en;q=0.4',
+            'accept-language, accept-encoding, cookie',
+            key
+        )
+        self.check_accept_language_vary(
+            'ko;q=1.0,en;q=0.5',
+            'cookie, accept-language, accept-encoding',
+            key
+        )
+        self.check_accept_language_vary(
+            'ko, en',
+            'cookie, accept-encoding, accept-language',
+            key
+        )
+        self.check_accept_language_vary(
+            'ko-KR, en-US',
+            'accept-encoding, accept-language, cookie',
+            key
+        )
+
     @override_settings(USE_I18N=False, USE_L10N=True, USE_TZ=False)
     def test_cache_key_i18n_formatting(self):
         request = self._get_request()
@@ -1428,24 +1516,21 @@ class CacheI18nTest(TestCase):
             CACHE_MIDDLEWARE_SECONDS=60,
             USE_ETAGS=True,
     )
-    def test_middleware_with_streaming_response(self):
-        # cache with non empty request.GET
-        request = self._get_request_cache(query_string='foo=baz&other=true')
-
-        # first access, cache must return None
+    def test_middleware_doesnt_cache_streaming_response(self):
+        request = self._get_request()
         get_cache_data = FetchFromCacheMiddleware().process_request(request)
-        self.assertEqual(get_cache_data, None)
+        self.assertIsNone(get_cache_data)
 
-        # pass streaming response through UpdateCacheMiddleware.
-        content = 'Check for cache with QUERY_STRING and streaming content'
+        # This test passes on Python < 3.3 even without the corresponding code
+        # in UpdateCacheMiddleware, because pickling a StreamingHttpResponse
+        # fails (http://bugs.python.org/issue14288). LocMemCache silently
+        # swallows the exception and doesn't store the response in cache.
+        content = ['Check for cache with streaming content.']
         response = StreamingHttpResponse(content)
         UpdateCacheMiddleware().process_response(request, response)
 
-        # second access, cache must still return None, because we can't cache
-        # streaming response.
         get_cache_data = FetchFromCacheMiddleware().process_request(request)
-        self.assertEqual(get_cache_data, None)
-
+        self.assertIsNone(get_cache_data)
 
 @override_settings(
         CACHES={
@@ -1481,19 +1566,12 @@ def hello_world_view(request, value):
 )
 class CacheMiddlewareTest(TestCase):
 
-    # The following tests will need to be modified in Django 1.6 to not use
-    # deprecated ways of using the cache_page decorator that will be removed in
-    # such version
     def setUp(self):
         self.factory = RequestFactory()
         self.default_cache = get_cache('default')
         self.other_cache = get_cache('other')
-        self.save_warnings_state()
-        warnings.filterwarnings('ignore', category=DeprecationWarning,
-            module='django.views.decorators.cache')
 
     def tearDown(self):
-        self.restore_warnings_state()
         self.default_cache.clear()
         self.other_cache.clear()
 
@@ -1606,21 +1684,20 @@ class CacheMiddlewareTest(TestCase):
         request.user = MockAuthenticatedUser()
         request.session = MockAccessedSession()
 
-        response = cache_page(hello_world_view)(request, '1')
+        response = cache_page(60)(hello_world_view)(request, '1')
 
         self.assertFalse("Cache-Control" in response)
 
     def test_view_decorator(self):
         # decorate the same view with different cache decorators
-        default_view = cache_page(hello_world_view)
-        default_with_prefix_view = cache_page(key_prefix='prefix1')(hello_world_view)
+        default_view = cache_page(3)(hello_world_view)
+        default_with_prefix_view = cache_page(3, key_prefix='prefix1')(hello_world_view)
 
-        explicit_default_view = cache_page(cache='default')(hello_world_view)
-        explicit_default_with_prefix_view = cache_page(cache='default', key_prefix='prefix1')(hello_world_view)
+        explicit_default_view = cache_page(3, cache='default')(hello_world_view)
+        explicit_default_with_prefix_view = cache_page(3, cache='default', key_prefix='prefix1')(hello_world_view)
 
-        other_view = cache_page(cache='other')(hello_world_view)
-        other_with_prefix_view = cache_page(cache='other', key_prefix='prefix2')(hello_world_view)
-        other_with_timeout_view = cache_page(3, cache='other', key_prefix='prefix3')(hello_world_view)
+        other_view = cache_page(1, cache='other')(hello_world_view)
+        other_with_prefix_view = cache_page(1, cache='other', key_prefix='prefix2')(hello_world_view)
 
         request = self.factory.get('/view/')
 
@@ -1660,10 +1737,6 @@ class CacheMiddlewareTest(TestCase):
         response = other_with_prefix_view(request, '9')
         self.assertEqual(response.content, b'Hello World 9')
 
-        # Request from the alternate cache with a new prefix and a custom timeout
-        response = other_with_timeout_view(request, '10')
-        self.assertEqual(response.content, b'Hello World 10')
-
         # But if we wait a couple of seconds...
         time.sleep(2)
 
@@ -1692,18 +1765,6 @@ class CacheMiddlewareTest(TestCase):
         response = other_with_prefix_view(request, '16')
         self.assertEqual(response.content, b'Hello World 16')
 
-        # ... but a view with a custom timeout will still hit
-        response = other_with_timeout_view(request, '17')
-        self.assertEqual(response.content, b'Hello World 10')
-
-        # And if we wait a few more seconds
-        time.sleep(2)
-
-        # the custom timeout cache will miss
-        response = other_with_timeout_view(request, '18')
-        self.assertEqual(response.content, b'Hello World 18')
-
-
 @override_settings(
         CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
         CACHE_MIDDLEWARE_SECONDS=1,
@@ -1804,7 +1865,7 @@ class TestWithTemplateResponse(TestCase):
 
 class TestEtagWithAdmin(TestCase):
     # See https://code.djangoproject.com/ticket/16003
-    urls = "regressiontests.admin_views.urls"
+    urls = "admin_views.urls"
 
     def test_admin(self):
         with self.settings(USE_ETAGS=False):
@@ -1816,3 +1877,25 @@ class TestEtagWithAdmin(TestCase):
             response = self.client.get('/test_admin/admin/')
             self.assertEqual(response.status_code, 200)
             self.assertTrue(response.has_header('ETag'))
+
+
+class TestMakeTemplateFragmentKey(TestCase):
+    def test_without_vary_on(self):
+        key = make_template_fragment_key('a.fragment')
+        self.assertEqual(key, 'template.cache.a.fragment.d41d8cd98f00b204e9800998ecf8427e')
+
+    def test_with_one_vary_on(self):
+        key = make_template_fragment_key('foo', ['abc'])
+        self.assertEqual(key,
+            'template.cache.foo.900150983cd24fb0d6963f7d28e17f72')
+
+    def test_with_many_vary_on(self):
+        key = make_template_fragment_key('bar', ['abc', 'def'])
+        self.assertEqual(key,
+            'template.cache.bar.4b35f12ab03cec09beec4c21b2d2fa88')
+
+    def test_proper_escaping(self):
+        key = make_template_fragment_key('spam', ['abc:def%'])
+        self.assertEqual(key,
+            'template.cache.spam.f27688177baec990cdf3fbd9d9c3f469')
+
diff --git a/django/contrib/localflavor/no/__init__.py b/tests/choices/__init__.py
similarity index 100%
rename from django/contrib/localflavor/no/__init__.py
rename to tests/choices/__init__.py
diff --git a/tests/modeltests/choices/models.py b/tests/choices/models.py
similarity index 100%
rename from tests/modeltests/choices/models.py
rename to tests/choices/models.py
diff --git a/tests/modeltests/choices/tests.py b/tests/choices/tests.py
similarity index 100%
rename from tests/modeltests/choices/tests.py
rename to tests/choices/tests.py
diff --git a/django/contrib/localflavor/pe/__init__.py b/tests/commands_sql/__init__.py
similarity index 100%
rename from django/contrib/localflavor/pe/__init__.py
rename to tests/commands_sql/__init__.py
diff --git a/tests/commands_sql/models.py b/tests/commands_sql/models.py
new file mode 100644
index 0000000000..089aa96f30
--- /dev/null
+++ b/tests/commands_sql/models.py
@@ -0,0 +1,7 @@
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
+
+
+@python_2_unicode_compatible
+class Book(models.Model):
+    title = models.CharField(max_length=100, db_index=True)
diff --git a/tests/commands_sql/tests.py b/tests/commands_sql/tests.py
new file mode 100644
index 0000000000..831e9a27c4
--- /dev/null
+++ b/tests/commands_sql/tests.py
@@ -0,0 +1,52 @@
+from __future__ import unicode_literals
+
+from django.core.management.color import no_style
+from django.core.management.sql import (sql_create, sql_delete, sql_indexes,
+    sql_destroy_indexes, sql_all)
+from django.db import connections, DEFAULT_DB_ALIAS, models
+from django.test import TestCase
+from django.utils import six
+
+# See also initial_sql_regress for 'custom_sql_for_model' tests
+
+
+class SQLCommandsTestCase(TestCase):
+    """Tests for several functions in django/core/management/sql.py"""
+    def test_sql_create(self):
+        app = models.get_app('commands_sql')
+        output = sql_create(app, no_style(), connections[DEFAULT_DB_ALIAS])
+        # Lower so that Oracle's upper case tbl names wont break
+        sql = output[0].lower()
+        six.assertRegex(self, sql, r'^create table .commands_sql_book.*')
+
+    def test_sql_delete(self):
+        app = models.get_app('commands_sql')
+        output = sql_delete(app, no_style(), connections[DEFAULT_DB_ALIAS])
+        # Oracle produces DROP SEQUENCE and DROP TABLE for this command.
+        if connections[DEFAULT_DB_ALIAS].vendor == 'oracle':
+            sql = output[1].lower()
+        else:
+            sql = output[0].lower()
+        six.assertRegex(self, sql, r'^drop table .commands_sql_book.*')
+
+    def test_sql_indexes(self):
+        app = models.get_app('commands_sql')
+        output = sql_indexes(app, no_style(), connections[DEFAULT_DB_ALIAS])
+        # PostgreSQL creates two indexes
+        self.assertIn(len(output), [1, 2])
+        self.assertTrue(output[0].startswith("CREATE INDEX"))
+
+    def test_sql_destroy_indexes(self):
+        app = models.get_app('commands_sql')
+        output = sql_destroy_indexes(app, no_style(), connections[DEFAULT_DB_ALIAS])
+        # PostgreSQL creates two indexes
+        self.assertIn(len(output), [1, 2])
+        self.assertTrue(output[0].startswith("DROP INDEX"))
+
+    def test_sql_all(self):
+        app = models.get_app('commands_sql')
+        output = sql_all(app, no_style(), connections[DEFAULT_DB_ALIAS])
+        # PostgreSQL creates two indexes
+        self.assertIn(len(output), [2, 3])
+        self.assertTrue(output[0].startswith('CREATE TABLE'))
+        self.assertTrue(output[1].startswith('CREATE INDEX'))
diff --git a/django/contrib/localflavor/pl/__init__.py b/tests/comment_tests/__init__.py
similarity index 100%
rename from django/contrib/localflavor/pl/__init__.py
rename to tests/comment_tests/__init__.py
diff --git a/tests/comment_tests/custom_comments/__init__.py b/tests/comment_tests/custom_comments/__init__.py
new file mode 100644
index 0000000000..14c614f610
--- /dev/null
+++ b/tests/comment_tests/custom_comments/__init__.py
@@ -0,0 +1,32 @@
+from django.core import urlresolvers
+from comment_tests.custom_comments.models import CustomComment
+from comment_tests.custom_comments.forms import CustomCommentForm
+
+def get_model():
+    return CustomComment
+
+def get_form():
+    return CustomCommentForm
+
+def get_form_target():
+    return urlresolvers.reverse(
+        "comment_tests.custom_comments.views.custom_submit_comment"
+    )
+
+def get_flag_url(c):
+    return urlresolvers.reverse(
+        "comment_tests.custom_comments.views.custom_flag_comment",
+        args=(c.id,)
+    )
+
+def get_delete_url(c):
+    return urlresolvers.reverse(
+        "comment_tests.custom_comments.views.custom_delete_comment",
+        args=(c.id,)
+    )
+
+def get_approve_url(c):
+    return urlresolvers.reverse(
+        "comment_tests.custom_comments.views.custom_approve_comment",
+        args=(c.id,)
+    )
diff --git a/tests/regressiontests/comment_tests/custom_comments/forms.py b/tests/comment_tests/custom_comments/forms.py
similarity index 100%
rename from tests/regressiontests/comment_tests/custom_comments/forms.py
rename to tests/comment_tests/custom_comments/forms.py
diff --git a/tests/regressiontests/comment_tests/custom_comments/models.py b/tests/comment_tests/custom_comments/models.py
similarity index 100%
rename from tests/regressiontests/comment_tests/custom_comments/models.py
rename to tests/comment_tests/custom_comments/models.py
diff --git a/tests/regressiontests/comment_tests/custom_comments/views.py b/tests/comment_tests/custom_comments/views.py
similarity index 100%
rename from tests/regressiontests/comment_tests/custom_comments/views.py
rename to tests/comment_tests/custom_comments/views.py
diff --git a/tests/regressiontests/comment_tests/fixtures/comment_tests.json b/tests/comment_tests/fixtures/comment_tests.json
similarity index 100%
rename from tests/regressiontests/comment_tests/fixtures/comment_tests.json
rename to tests/comment_tests/fixtures/comment_tests.json
diff --git a/tests/regressiontests/comment_tests/fixtures/comment_utils.xml b/tests/comment_tests/fixtures/comment_utils.xml
similarity index 100%
rename from tests/regressiontests/comment_tests/fixtures/comment_utils.xml
rename to tests/comment_tests/fixtures/comment_utils.xml
diff --git a/tests/regressiontests/comment_tests/models.py b/tests/comment_tests/models.py
similarity index 100%
rename from tests/regressiontests/comment_tests/models.py
rename to tests/comment_tests/models.py
diff --git a/tests/regressiontests/comment_tests/tests/__init__.py b/tests/comment_tests/tests/__init__.py
similarity index 82%
rename from tests/regressiontests/comment_tests/tests/__init__.py
rename to tests/comment_tests/tests/__init__.py
index f80b29e17b..ae4585e187 100644
--- a/tests/regressiontests/comment_tests/tests/__init__.py
+++ b/tests/comment_tests/tests/__init__.py
@@ -17,7 +17,7 @@ CT = ContentType.objects.get_for_model
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',))
 class CommentTestCase(TestCase):
     fixtures = ["comment_tests"]
-    urls = 'regressiontests.comment_tests.urls_default'
+    urls = 'comment_tests.urls_default'
 
     def createSomeComments(self):
         # Two anonymous comments on two different objects
@@ -85,11 +85,11 @@ class CommentTestCase(TestCase):
         d.update(f.initial)
         return d
 
-from regressiontests.comment_tests.tests.app_api_tests import *
-from regressiontests.comment_tests.tests.feed_tests import *
-from regressiontests.comment_tests.tests.model_tests import *
-from regressiontests.comment_tests.tests.comment_form_tests import *
-from regressiontests.comment_tests.tests.templatetag_tests import *
-from regressiontests.comment_tests.tests.comment_view_tests import *
-from regressiontests.comment_tests.tests.moderation_view_tests import *
-from regressiontests.comment_tests.tests.comment_utils_moderators_tests import *
+from comment_tests.tests.test_app_api import *
+from comment_tests.tests.test_feeds import *
+from comment_tests.tests.test_models import *
+from comment_tests.tests.test_comment_form import *
+from comment_tests.tests.test_templatetags import *
+from comment_tests.tests.test_comment_view import *
+from comment_tests.tests.test_comment_utils_moderators import *
+from comment_tests.tests.test_moderation_views import *
diff --git a/tests/regressiontests/comment_tests/tests/app_api_tests.py b/tests/comment_tests/tests/test_app_api.py
similarity index 84%
rename from tests/regressiontests/comment_tests/tests/app_api_tests.py
rename to tests/comment_tests/tests/test_app_api.py
index a756068790..ed23ba39cc 100644
--- a/tests/regressiontests/comment_tests/tests/app_api_tests.py
+++ b/tests/comment_tests/tests/test_app_api.py
@@ -45,23 +45,23 @@ class CommentAppAPITests(CommentTestCase):
 
 
 @override_settings(
-    COMMENTS_APP='regressiontests.comment_tests.custom_comments',
+    COMMENTS_APP='comment_tests.custom_comments',
     INSTALLED_APPS=list(settings.INSTALLED_APPS) + [
-        'regressiontests.comment_tests.custom_comments'],
+        'comment_tests.custom_comments'],
 )
 class CustomCommentTest(CommentTestCase):
-    urls = 'regressiontests.comment_tests.urls'
+    urls = 'comment_tests.urls'
 
     def testGetCommentApp(self):
-        from regressiontests.comment_tests import custom_comments
+        from comment_tests import custom_comments
         self.assertEqual(comments.get_comment_app(), custom_comments)
 
     def testGetModel(self):
-        from regressiontests.comment_tests.custom_comments.models import CustomComment
+        from comment_tests.custom_comments.models import CustomComment
         self.assertEqual(comments.get_model(), CustomComment)
 
     def testGetForm(self):
-        from regressiontests.comment_tests.custom_comments.forms import CustomCommentForm
+        from comment_tests.custom_comments.forms import CustomCommentForm
         self.assertEqual(comments.get_form(), CustomCommentForm)
 
     def testGetFormTarget(self):
diff --git a/tests/regressiontests/comment_tests/tests/comment_form_tests.py b/tests/comment_tests/tests/test_comment_form.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/comment_form_tests.py
rename to tests/comment_tests/tests/test_comment_form.py
diff --git a/tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py b/tests/comment_tests/tests/test_comment_utils_moderators.py
similarity index 90%
rename from tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py
rename to tests/comment_tests/tests/test_comment_utils_moderators.py
index eab87ef53b..6c7a882e25 100644
--- a/tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py
+++ b/tests/comment_tests/tests/test_comment_utils_moderators.py
@@ -4,6 +4,7 @@ from django.contrib.comments.models import Comment
 from django.contrib.comments.moderation import (moderator, CommentModerator,
     AlreadyModerated)
 from django.core import mail
+from django.test.utils import override_settings
 
 from . import CommentTestCase
 from ..models import Entry
@@ -67,9 +68,10 @@ class CommentUtilsModeratorTests(CommentTestCase):
         self.assertRaises(AlreadyModerated, moderator.register, Entry, EntryModerator1)
 
     def testEmailNotification(self):
-        moderator.register(Entry, EntryModerator1)
-        self.createSomeComments()
-        self.assertEqual(len(mail.outbox), 2)
+        with override_settings(MANAGERS=("test@example.com",)):
+            moderator.register(Entry, EntryModerator1)
+            self.createSomeComments()
+            self.assertEqual(len(mail.outbox), 2)
 
     def testCommentsEnabled(self):
         moderator.register(Entry, EntryModerator2)
@@ -94,4 +96,4 @@ class CommentUtilsModeratorTests(CommentTestCase):
     def testAutoCloseFieldImmediate(self):
         moderator.register(Entry, EntryModerator6)
         c1, c2 = self.createSomeComments()
-        self.assertEqual(Comment.objects.all().count(), 0)
\ No newline at end of file
+        self.assertEqual(Comment.objects.all().count(), 0)
diff --git a/tests/regressiontests/comment_tests/tests/comment_view_tests.py b/tests/comment_tests/tests/test_comment_view.py
similarity index 88%
rename from tests/regressiontests/comment_tests/tests/comment_view_tests.py
rename to tests/comment_tests/tests/test_comment_view.py
index 5c1954026d..0d994d3af8 100644
--- a/tests/regressiontests/comment_tests/tests/comment_view_tests.py
+++ b/tests/comment_tests/tests/test_comment_view.py
@@ -101,13 +101,43 @@ class CommentViewTests(CommentTestCase):
         settings.DEBUG = olddebug
 
     def testCreateValidComment(self):
+        address = "1.2.3.4"
         a = Article.objects.get(pk=1)
         data = self.getValidData(a)
-        self.response = self.client.post("/post/", data, REMOTE_ADDR="1.2.3.4")
+        self.response = self.client.post("/post/", data, REMOTE_ADDR=address)
         self.assertEqual(self.response.status_code, 302)
         self.assertEqual(Comment.objects.count(), 1)
         c = Comment.objects.all()[0]
-        self.assertEqual(c.ip_address, "1.2.3.4")
+        self.assertEqual(c.ip_address, address)
+        self.assertEqual(c.comment, "This is my comment")
+
+    def testCreateValidCommentIPv6(self):
+        """
+        Test creating a valid comment with a long IPv6 address.
+        Note that this test should fail when Comment.ip_address is an IPAddress instead of a GenericIPAddress,
+        but does not do so on SQLite or PostgreSQL, because they use the TEXT and INET types, which already
+        allow storing an IPv6 address internally.
+        """
+        address = "2a02::223:6cff:fe8a:2e8a"
+        a = Article.objects.get(pk=1)
+        data = self.getValidData(a)
+        self.response = self.client.post("/post/", data, REMOTE_ADDR=address)
+        self.assertEqual(self.response.status_code, 302)
+        self.assertEqual(Comment.objects.count(), 1)
+        c = Comment.objects.all()[0]
+        self.assertEqual(c.ip_address, address)
+        self.assertEqual(c.comment, "This is my comment")
+
+    def testCreateValidCommentIPv6Unpack(self):
+        address = "::ffff:18.52.18.52"
+        a = Article.objects.get(pk=1)
+        data = self.getValidData(a)
+        self.response = self.client.post("/post/", data, REMOTE_ADDR=address)
+        self.assertEqual(self.response.status_code, 302)
+        self.assertEqual(Comment.objects.count(), 1)
+        c = Comment.objects.all()[0]
+        # We trim the '::ffff:' bit off because it is an IPv4 addr
+        self.assertEqual(c.ip_address, address[7:])
         self.assertEqual(c.comment, "This is my comment")
 
     def testPostAsAuthenticatedUser(self):
diff --git a/tests/regressiontests/comment_tests/tests/feed_tests.py b/tests/comment_tests/tests/test_feeds.py
similarity index 97%
rename from tests/regressiontests/comment_tests/tests/feed_tests.py
rename to tests/comment_tests/tests/test_feeds.py
index c93d7abf7d..941ffb6bf2 100644
--- a/tests/regressiontests/comment_tests/tests/feed_tests.py
+++ b/tests/comment_tests/tests/test_feeds.py
@@ -12,7 +12,7 @@ from ..models import Article
 
 
 class CommentFeedTests(CommentTestCase):
-    urls = 'regressiontests.comment_tests.urls'
+    urls = 'comment_tests.urls'
     feed_url = '/rss/comments/'
 
     def setUp(self):
diff --git a/tests/regressiontests/comment_tests/tests/model_tests.py b/tests/comment_tests/tests/test_models.py
similarity index 100%
rename from tests/regressiontests/comment_tests/tests/model_tests.py
rename to tests/comment_tests/tests/test_models.py
diff --git a/tests/regressiontests/comment_tests/tests/moderation_view_tests.py b/tests/comment_tests/tests/test_moderation_views.py
similarity index 86%
rename from tests/regressiontests/comment_tests/tests/moderation_view_tests.py
rename to tests/comment_tests/tests/test_moderation_views.py
index 0f83d5e210..02af35cfe4 100644
--- a/tests/regressiontests/comment_tests/tests/moderation_view_tests.py
+++ b/tests/comment_tests/tests/test_moderation_views.py
@@ -1,9 +1,10 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth.models import User, Permission
 from django.contrib.comments import signals
 from django.contrib.comments.models import Comment, CommentFlag
 from django.contrib.contenttypes.models import ContentType
+from django.utils import translation
 
 from . import CommentTestCase
 
@@ -92,6 +93,8 @@ class FlagViewTests(CommentTestCase):
         self.testFlagPost()
         self.assertEqual(received_signals, [signals.comment_was_flagged])
 
+        signals.comment_was_flagged.disconnect(receive)
+
 def makeModerator(username):
     u = User.objects.get(username=username)
     ct = ContentType.objects.get_for_model(Comment)
@@ -163,6 +166,8 @@ class DeleteViewTests(CommentTestCase):
         self.testDeletePost()
         self.assertEqual(received_signals, [signals.comment_was_flagged])
 
+        signals.comment_was_flagged.disconnect(receive)
+
     def testDeletedView(self):
         comments = self.createSomeComments()
         pk = comments[0].pk
@@ -238,6 +243,8 @@ class ApproveViewTests(CommentTestCase):
         self.testApprovePost()
         self.assertEqual(received_signals, [signals.comment_was_flagged])
 
+        signals.comment_was_flagged.disconnect(receive)
+
     def testApprovedView(self):
         comments = self.createSomeComments()
         pk = comments[0].pk
@@ -245,7 +252,7 @@ class ApproveViewTests(CommentTestCase):
         self.assertTemplateUsed(response, "comments/approved.html")
 
 class AdminActionsTests(CommentTestCase):
-    urls = "regressiontests.comment_tests.urls_admin"
+    urls = "comment_tests.urls_admin"
 
     def setUp(self):
         super(AdminActionsTests, self).setUp()
@@ -281,3 +288,28 @@ class AdminActionsTests(CommentTestCase):
         response = self.client.get('/admin2/comments/comment/')
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, '<option value="delete_selected">')
+
+    def performActionAndCheckMessage(self, action, action_params, expected_message):
+        response = self.client.post('/admin/comments/comment/',
+                                    data={'_selected_action': action_params,
+                                          'action': action,
+                                          'index': 0},
+                                    follow=True)
+        self.assertContains(response, expected_message)
+
+    def testActionsMessageTranslations(self):
+        c1, c2, c3, c4 = self.createSomeComments()
+        one_comment = c1.pk
+        many_comments = [c2.pk, c3.pk, c4.pk]
+        makeModerator("normaluser")
+        self.client.login(username="normaluser", password="normaluser")
+        with translation.override('en'):
+            #Test approving
+            self.performActionAndCheckMessage('approve_comments', one_comment, '1 comment was successfully approved')
+            self.performActionAndCheckMessage('approve_comments', many_comments, '3 comments were successfully approved')
+            #Test flagging
+            self.performActionAndCheckMessage('flag_comments', one_comment, '1 comment was successfully flagged')
+            self.performActionAndCheckMessage('flag_comments', many_comments, '3 comments were successfully flagged')
+            #Test removing
+            self.performActionAndCheckMessage('remove_comments', one_comment, '1 comment was successfully removed')
+            self.performActionAndCheckMessage('remove_comments', many_comments, '3 comments were successfully removed')
diff --git a/tests/regressiontests/comment_tests/tests/templatetag_tests.py b/tests/comment_tests/tests/test_templatetags.py
similarity index 80%
rename from tests/regressiontests/comment_tests/tests/templatetag_tests.py
rename to tests/comment_tests/tests/test_templatetags.py
index 62b3fb35db..185f6de297 100644
--- a/tests/regressiontests/comment_tests/tests/templatetag_tests.py
+++ b/tests/comment_tests/tests/test_templatetags.py
@@ -3,11 +3,19 @@ from __future__ import absolute_import
 from django.contrib.comments.forms import CommentForm
 from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
-from django.template import Template, Context
+from django.template import Template, Context, Library, libraries
 
 from ..models import Article, Author
 from . import CommentTestCase
 
+register = Library()
+
+@register.filter
+def noop(variable, param=None):
+    return variable
+
+libraries['comment_testtags'] = register
+
 
 class CommentTemplateTagTests(CommentTestCase):
 
@@ -32,6 +40,9 @@ class CommentTemplateTagTests(CommentTestCase):
     def testGetCommentFormFromObject(self):
         self.testGetCommentForm("{% get_comment_form for a as form %}")
 
+    def testWhitespaceInGetCommentFormTag(self):
+        self.testGetCommentForm("{% load comment_testtags %}{% get_comment_form for a|noop:'x y' as form %}")
+
     def testRenderCommentForm(self, tag=None):
         t = "{% load comments %}" + (tag or "{% render_comment_form for comment_tests.article a.id %}")
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
@@ -44,6 +55,9 @@ class CommentTemplateTagTests(CommentTestCase):
     def testRenderCommentFormFromObject(self):
         self.testRenderCommentForm("{% render_comment_form for a %}")
 
+    def testWhitespaceInRenderCommentFormTag(self):
+        self.testRenderCommentForm("{% load comment_testtags %}{% render_comment_form for a|noop:'x y' %}")
+
     def testRenderCommentFormFromObjectWithQueryCount(self):
         with self.assertNumQueries(1):
             self.testRenderCommentFormFromObject()
@@ -65,6 +79,10 @@ class CommentTemplateTagTests(CommentTestCase):
         self.createSomeComments()
         self.verifyGetCommentCount("{% get_comment_count for a as cc %}")
 
+    def testWhitespaceInGetCommentCountTag(self):
+        self.createSomeComments()
+        self.verifyGetCommentCount("{% load comment_testtags %}{% get_comment_count for a|noop:'x y' as cc %}")
+
     def verifyGetCommentList(self, tag=None):
         c1, c2, c3, c4 = Comment.objects.all()[:4]
         t = "{% load comments %}" +  (tag or "{% get_comment_list for comment_tests.author a.id as cl %}")
@@ -84,6 +102,10 @@ class CommentTemplateTagTests(CommentTestCase):
         self.createSomeComments()
         self.verifyGetCommentList("{% get_comment_list for a as cl %}")
 
+    def testWhitespaceInGetCommentListTag(self):
+        self.createSomeComments()
+        self.verifyGetCommentList("{% load comment_testtags %}{% get_comment_list for a|noop:'x y' as cl %}")
+
     def testGetCommentPermalink(self):
         c1, c2, c3, c4 = self.createSomeComments()
         t = "{% load comments %}{% get_comment_list for comment_tests.author author.id as cl %}"
@@ -102,6 +124,15 @@ class CommentTemplateTagTests(CommentTestCase):
         ctx, out = self.render(t, author=author)
         self.assertEqual(out, "/cr/%s/%s/#c%s-by-Joe Somebody" % (ct.id, author.id, c2.id))
 
+    def testWhitespaceInGetCommentPermalinkTag(self):
+        c1, c2, c3, c4 = self.createSomeComments()
+        t = "{% load comments comment_testtags %}{% get_comment_list for comment_tests.author author.id as cl %}"
+        t += "{% get_comment_permalink cl.0|noop:'x y' %}"
+        ct = ContentType.objects.get_for_model(Author)
+        author = Author.objects.get(pk=1)
+        ctx, out = self.render(t, author=author)
+        self.assertEqual(out, "/cr/%s/%s/#c%s" % (ct.id, author.id, c2.id))
+
     def testRenderCommentList(self, tag=None):
         t = "{% load comments %}" + (tag or "{% render_comment_list for comment_tests.article a.id %}")
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
@@ -114,6 +145,9 @@ class CommentTemplateTagTests(CommentTestCase):
     def testRenderCommentListFromObject(self):
         self.testRenderCommentList("{% render_comment_list for a %}")
 
+    def testWhitespaceInRenderCommentListTag(self):
+        self.testRenderCommentList("{% load comment_testtags %}{% render_comment_list for a|noop:'x y' %}")
+
     def testNumberQueries(self):
         """
         Ensure that the template tags use cached content types to reduce the
diff --git a/tests/regressiontests/comment_tests/urls.py b/tests/comment_tests/urls.py
similarity index 100%
rename from tests/regressiontests/comment_tests/urls.py
rename to tests/comment_tests/urls.py
diff --git a/tests/regressiontests/comment_tests/urls_admin.py b/tests/comment_tests/urls_admin.py
similarity index 100%
rename from tests/regressiontests/comment_tests/urls_admin.py
rename to tests/comment_tests/urls_admin.py
diff --git a/tests/regressiontests/comment_tests/urls_default.py b/tests/comment_tests/urls_default.py
similarity index 100%
rename from tests/regressiontests/comment_tests/urls_default.py
rename to tests/comment_tests/urls_default.py
diff --git a/tests/regressiontests/conditional_processing/__init__.py b/tests/conditional_processing/__init__.py
similarity index 100%
rename from tests/regressiontests/conditional_processing/__init__.py
rename to tests/conditional_processing/__init__.py
diff --git a/tests/modeltests/validators/models.py b/tests/conditional_processing/models.py
similarity index 100%
rename from tests/modeltests/validators/models.py
rename to tests/conditional_processing/models.py
diff --git a/tests/regressiontests/conditional_processing/models.py b/tests/conditional_processing/tests.py
similarity index 99%
rename from tests/regressiontests/conditional_processing/models.py
rename to tests/conditional_processing/tests.py
index b47fdf6fb5..77f1ff54ed 100644
--- a/tests/regressiontests/conditional_processing/models.py
+++ b/tests/conditional_processing/tests.py
@@ -16,7 +16,7 @@ ETAG = 'b4246ffc4f62314ca13147c9d4f76974'
 EXPIRED_ETAG = '7fae4cd4b0f81e7d2914700043aa8ed6'
 
 class ConditionalGet(TestCase):
-    urls = 'regressiontests.conditional_processing.urls'
+    urls = 'conditional_processing.urls'
 
     def assertFullResponse(self, response, check_last_modified=True, check_etag=True):
         self.assertEqual(response.status_code, 200)
diff --git a/tests/regressiontests/conditional_processing/urls.py b/tests/conditional_processing/urls.py
similarity index 100%
rename from tests/regressiontests/conditional_processing/urls.py
rename to tests/conditional_processing/urls.py
diff --git a/tests/regressiontests/conditional_processing/views.py b/tests/conditional_processing/views.py
similarity index 94%
rename from tests/regressiontests/conditional_processing/views.py
rename to tests/conditional_processing/views.py
index 2188c9b462..14a5a83a45 100644
--- a/tests/regressiontests/conditional_processing/views.py
+++ b/tests/conditional_processing/views.py
@@ -4,7 +4,7 @@ from __future__ import absolute_import
 from django.views.decorators.http import condition, etag, last_modified
 from django.http import HttpResponse
 
-from .models import FULL_RESPONSE, LAST_MODIFIED, ETAG
+from .tests import FULL_RESPONSE, LAST_MODIFIED, ETAG
 
 
 def index(request):
diff --git a/django/contrib/localflavor/pt/__init__.py b/tests/contenttypes_tests/__init__.py
similarity index 100%
rename from django/contrib/localflavor/pt/__init__.py
rename to tests/contenttypes_tests/__init__.py
diff --git a/tests/contenttypes_tests/fixtures/testdata.json b/tests/contenttypes_tests/fixtures/testdata.json
new file mode 100644
index 0000000000..52510bfe90
--- /dev/null
+++ b/tests/contenttypes_tests/fixtures/testdata.json
@@ -0,0 +1,47 @@
+[
+    {
+        "pk": 1,
+        "model": "contenttypes_tests.author",
+        "fields": {
+            "name": "Boris"
+        }
+    },
+    {
+        "pk": 1,
+        "model": "contenttypes_tests.article",
+        "fields": {
+            "author": 1,
+            "title": "Old Article",
+            "slug": "old_article",
+            "date_created": "2001-01-01 21:22:23"
+        }
+    },
+    {
+        "pk": 2,
+        "model": "contenttypes_tests.article",
+        "fields": {
+            "author": 1,
+            "title": "Current Article",
+            "slug": "current_article",
+            "date_created": "2007-09-17 21:22:23"
+        }
+    },
+    {
+        "pk": 3,
+        "model": "contenttypes_tests.article",
+        "fields": {
+            "author": 1,
+            "title": "Future Article",
+            "slug": "future_article",
+            "date_created": "3000-01-01 21:22:23"
+        }
+    },
+    {
+        "pk": 1,
+        "model": "sites.site",
+        "fields": {
+            "domain": "testserver",
+            "name": "testserver"
+        }
+    }
+]
diff --git a/tests/contenttypes_tests/models.py b/tests/contenttypes_tests/models.py
new file mode 100644
index 0000000000..3c6685687a
--- /dev/null
+++ b/tests/contenttypes_tests/models.py
@@ -0,0 +1,24 @@
+from __future__ import absolute_import, unicode_literals
+
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
+
+@python_2_unicode_compatible
+class Author(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return '/views/authors/%s/' % self.id
+
+@python_2_unicode_compatible
+class Article(models.Model):
+    title = models.CharField(max_length=100)
+    slug = models.SlugField()
+    author = models.ForeignKey(Author)
+    date_created = models.DateTimeField()
+
+    def __str__(self):
+        return self.title
diff --git a/tests/contenttypes_tests/tests.py b/tests/contenttypes_tests/tests.py
new file mode 100644
index 0000000000..b39e118ec6
--- /dev/null
+++ b/tests/contenttypes_tests/tests.py
@@ -0,0 +1,47 @@
+from __future__ import absolute_import, unicode_literals
+
+from django.contrib.contenttypes.models import ContentType
+from django.test import TestCase
+
+from .models import Author, Article
+
+class ContentTypesViewsTests(TestCase):
+    fixtures = ['testdata.json']
+    urls = 'contenttypes_tests.urls'
+
+    def test_shortcut_with_absolute_url(self):
+        "Can view a shortcut for an Author object that has a get_absolute_url method"
+        for obj in Author.objects.all():
+            short_url = '/shortcut/%s/%s/' % (ContentType.objects.get_for_model(Author).id, obj.pk)
+            response = self.client.get(short_url)
+            self.assertRedirects(response, 'http://testserver%s' % obj.get_absolute_url(),
+                                 status_code=302, target_status_code=404)
+
+    def test_shortcut_no_absolute_url(self):
+        "Shortcuts for an object that has no get_absolute_url method raises 404"
+        for obj in Article.objects.all():
+            short_url = '/shortcut/%s/%s/' % (ContentType.objects.get_for_model(Article).id, obj.pk)
+            response = self.client.get(short_url)
+            self.assertEqual(response.status_code, 404)
+
+    def test_wrong_type_pk(self):
+        short_url = '/shortcut/%s/%s/' % (ContentType.objects.get_for_model(Author).id, 'nobody/expects')
+        response = self.client.get(short_url)
+        self.assertEqual(response.status_code, 404)
+
+    def test_shortcut_bad_pk(self):
+        short_url = '/shortcut/%s/%s/' % (ContentType.objects.get_for_model(Author).id, '42424242')
+        response = self.client.get(short_url)
+        self.assertEqual(response.status_code, 404)
+
+    def test_nonint_content_type(self):
+        an_author = Author.objects.all()[0]
+        short_url = '/shortcut/%s/%s/' % ('spam', an_author.pk)
+        response = self.client.get(short_url)
+        self.assertEqual(response.status_code, 404)
+
+    def test_bad_content_type(self):
+        an_author = Author.objects.all()[0]
+        short_url = '/shortcut/%s/%s/' % (42424242, an_author.pk)
+        response = self.client.get(short_url)
+        self.assertEqual(response.status_code, 404)
diff --git a/tests/contenttypes_tests/urls.py b/tests/contenttypes_tests/urls.py
new file mode 100644
index 0000000000..2cfc90b024
--- /dev/null
+++ b/tests/contenttypes_tests/urls.py
@@ -0,0 +1,7 @@
+from __future__ import absolute_import, unicode_literals
+
+from django.conf.urls import patterns
+
+urlpatterns = patterns('',
+    (r'^shortcut/(\d+)/(.*)/$', 'django.contrib.contenttypes.views.shortcut'),
+)
diff --git a/django/contrib/localflavor/py/__init__.py b/tests/context_processors/__init__.py
similarity index 100%
rename from django/contrib/localflavor/py/__init__.py
rename to tests/context_processors/__init__.py
diff --git a/tests/regressiontests/context_processors/models.py b/tests/context_processors/models.py
similarity index 100%
rename from tests/regressiontests/context_processors/models.py
rename to tests/context_processors/models.py
diff --git a/tests/regressiontests/context_processors/templates/context_processors/request_attrs.html b/tests/context_processors/templates/context_processors/request_attrs.html
similarity index 100%
rename from tests/regressiontests/context_processors/templates/context_processors/request_attrs.html
rename to tests/context_processors/templates/context_processors/request_attrs.html
diff --git a/tests/regressiontests/context_processors/tests.py b/tests/context_processors/tests.py
similarity index 96%
rename from tests/regressiontests/context_processors/tests.py
rename to tests/context_processors/tests.py
index 1f2209efb0..c57c592de6 100644
--- a/tests/regressiontests/context_processors/tests.py
+++ b/tests/context_processors/tests.py
@@ -9,7 +9,7 @@ class RequestContextProcessorTests(TestCase):
     Tests for the ``django.core.context_processors.request`` processor.
     """
 
-    urls = 'regressiontests.context_processors.urls'
+    urls = 'context_processors.urls'
 
     def test_request_attributes(self):
         """
diff --git a/tests/regressiontests/context_processors/urls.py b/tests/context_processors/urls.py
similarity index 100%
rename from tests/regressiontests/context_processors/urls.py
rename to tests/context_processors/urls.py
diff --git a/tests/regressiontests/context_processors/views.py b/tests/context_processors/views.py
similarity index 100%
rename from tests/regressiontests/context_processors/views.py
rename to tests/context_processors/views.py
diff --git a/django/contrib/localflavor/ro/__init__.py b/tests/createsuperuser/__init__.py
similarity index 100%
rename from django/contrib/localflavor/ro/__init__.py
rename to tests/createsuperuser/__init__.py
diff --git a/tests/regressiontests/app_loading/models.py b/tests/createsuperuser/models.py
similarity index 100%
rename from tests/regressiontests/app_loading/models.py
rename to tests/createsuperuser/models.py
diff --git a/tests/regressiontests/createsuperuser/tests.py b/tests/createsuperuser/tests.py
similarity index 100%
rename from tests/regressiontests/createsuperuser/tests.py
rename to tests/createsuperuser/tests.py
diff --git a/django/contrib/localflavor/ru/__init__.py b/tests/csrf_tests/__init__.py
similarity index 100%
rename from django/contrib/localflavor/ru/__init__.py
rename to tests/csrf_tests/__init__.py
diff --git a/tests/regressiontests/csrf_tests/models.py b/tests/csrf_tests/models.py
similarity index 100%
rename from tests/regressiontests/csrf_tests/models.py
rename to tests/csrf_tests/models.py
diff --git a/tests/regressiontests/csrf_tests/tests.py b/tests/csrf_tests/tests.py
similarity index 97%
rename from tests/regressiontests/csrf_tests/tests.py
rename to tests/csrf_tests/tests.py
index c5b66a31d1..5300b2172a 100644
--- a/tests/regressiontests/csrf_tests/tests.py
+++ b/tests/csrf_tests/tests.py
@@ -7,6 +7,7 @@ from django.http import HttpRequest, HttpResponse
 from django.middleware.csrf import CsrfViewMiddleware, CSRF_KEY_LENGTH
 from django.template import RequestContext, Template
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.views.decorators.csrf import csrf_exempt, requires_csrf_token, ensure_csrf_cookie
 
 
@@ -101,7 +102,8 @@ class CsrfViewMiddlewareTest(TestCase):
         with self.settings(CSRF_COOKIE_NAME='myname',
                            CSRF_COOKIE_DOMAIN='.example.com',
                            CSRF_COOKIE_PATH='/test/',
-                           CSRF_COOKIE_SECURE=True):
+                           CSRF_COOKIE_SECURE=True,
+                           CSRF_COOKIE_HTTPONLY=True):
             # token_view calls get_token() indirectly
             CsrfViewMiddleware().process_view(req, token_view, (), {})
             resp = token_view(req)
@@ -110,6 +112,7 @@ class CsrfViewMiddlewareTest(TestCase):
         self.assertNotEqual(csrf_cookie, False)
         self.assertEqual(csrf_cookie['domain'], '.example.com')
         self.assertEqual(csrf_cookie['secure'], True)
+        self.assertEqual(csrf_cookie['httponly'], True)
         self.assertEqual(csrf_cookie['path'], '/test/')
         self.assertTrue('Cookie' in resp2.get('Vary',''))
 
@@ -267,6 +270,7 @@ class CsrfViewMiddlewareTest(TestCase):
         csrf_cookie = resp2.cookies[settings.CSRF_COOKIE_NAME]
         self._check_token_present(resp, csrf_id=csrf_cookie.value)
 
+    @override_settings(ALLOWED_HOSTS=['www.example.com'])
     def test_https_bad_referer(self):
         """
         Test that a POST HTTPS request with a bad referer is rejected
@@ -279,6 +283,7 @@ class CsrfViewMiddlewareTest(TestCase):
         self.assertNotEqual(None, req2)
         self.assertEqual(403, req2.status_code)
 
+    @override_settings(ALLOWED_HOSTS=['www.example.com'])
     def test_https_good_referer(self):
         """
         Test that a POST HTTPS request with a good referer is accepted
@@ -290,6 +295,7 @@ class CsrfViewMiddlewareTest(TestCase):
         req2 = CsrfViewMiddleware().process_view(req, post_form_view, (), {})
         self.assertEqual(None, req2)
 
+    @override_settings(ALLOWED_HOSTS=['www.example.com'])
     def test_https_good_referer_2(self):
         """
         Test that a POST HTTPS request with a good referer is accepted
diff --git a/django/contrib/localflavor/se/__init__.py b/tests/custom_columns/__init__.py
similarity index 100%
rename from django/contrib/localflavor/se/__init__.py
rename to tests/custom_columns/__init__.py
diff --git a/tests/modeltests/custom_columns/models.py b/tests/custom_columns/models.py
similarity index 100%
rename from tests/modeltests/custom_columns/models.py
rename to tests/custom_columns/models.py
diff --git a/tests/modeltests/custom_columns/tests.py b/tests/custom_columns/tests.py
similarity index 62%
rename from tests/modeltests/custom_columns/tests.py
rename to tests/custom_columns/tests.py
index a2e5323a75..51028b0c46 100644
--- a/tests/modeltests/custom_columns/tests.py
+++ b/tests/custom_columns/tests.py
@@ -8,66 +8,71 @@ from .models import Author, Article
 
 
 class CustomColumnsTests(TestCase):
-    def test_db_column(self):
+    def setUp(self):
         a1 = Author.objects.create(first_name="John", last_name="Smith")
         a2 = Author.objects.create(first_name="Peter", last_name="Jones")
 
         art = Article.objects.create(headline="Django lets you build Web apps easily")
         art.authors = [a1, a2]
 
-        # Although the table and column names on Author have been set to custom
-        # values, nothing about using the Author model has changed...
+        self.a1 = a1
+        self.art = art
 
-        # Query the available authors
+    def test_query_all_available_authors(self):
         self.assertQuerysetEqual(
             Author.objects.all(), [
                 "Peter Jones", "John Smith",
             ],
             six.text_type
         )
+
+    def test_get_first_name(self):
+        self.assertEqual(
+            Author.objects.get(first_name__exact="John"),
+            self.a1,
+        )
+
+    def test_filter_first_name(self):
         self.assertQuerysetEqual(
             Author.objects.filter(first_name__exact="John"), [
                 "John Smith",
             ],
             six.text_type
-        )
-        self.assertEqual(
-            Author.objects.get(first_name__exact="John"),
-            a1,
+
         )
 
+    def test_field_error(self):
         self.assertRaises(FieldError,
             lambda: Author.objects.filter(firstname__exact="John")
         )
 
-        a = Author.objects.get(last_name__exact="Smith")
-        a.first_name = "John"
-        a.last_name = "Smith"
+    def test_attribute_error(self):
+        with self.assertRaises(AttributeError):
+            self.a1.firstname
 
-        self.assertRaises(AttributeError, lambda: a.firstname)
-        self.assertRaises(AttributeError, lambda: a.last)
+        with self.assertRaises(AttributeError):
+            self.a1.last
 
-        # Although the Article table uses a custom m2m table,
-        # nothing about using the m2m relationship has changed...
-
-        # Get all the authors for an article
+    def test_get_all_authors_for_an_article(self):
         self.assertQuerysetEqual(
-            art.authors.all(), [
+            self.art.authors.all(), [
                 "Peter Jones",
                 "John Smith",
             ],
             six.text_type
         )
-        # Get the articles for an author
+
+    def test_get_all_articles_for_an_author(self):
         self.assertQuerysetEqual(
-            a.article_set.all(), [
+            self.a1.article_set.all(), [
                 "Django lets you build Web apps easily",
             ],
             lambda a: a.headline
         )
-        # Query the authors across the m2m relation
+
+    def test_get_author_m2m_relation(self):
         self.assertQuerysetEqual(
-            art.authors.filter(last_name='Jones'), [
+            self.art.authors.filter(last_name='Jones'), [
                 "Peter Jones"
             ],
             six.text_type
diff --git a/django/contrib/localflavor/si/__init__.py b/tests/custom_columns_regress/__init__.py
similarity index 100%
rename from django/contrib/localflavor/si/__init__.py
rename to tests/custom_columns_regress/__init__.py
diff --git a/tests/regressiontests/custom_columns_regress/models.py b/tests/custom_columns_regress/models.py
similarity index 100%
rename from tests/regressiontests/custom_columns_regress/models.py
rename to tests/custom_columns_regress/models.py
diff --git a/tests/regressiontests/custom_columns_regress/tests.py b/tests/custom_columns_regress/tests.py
similarity index 100%
rename from tests/regressiontests/custom_columns_regress/tests.py
rename to tests/custom_columns_regress/tests.py
diff --git a/django/contrib/localflavor/sk/__init__.py b/tests/custom_managers/__init__.py
similarity index 100%
rename from django/contrib/localflavor/sk/__init__.py
rename to tests/custom_managers/__init__.py
diff --git a/tests/modeltests/custom_managers/models.py b/tests/custom_managers/models.py
similarity index 85%
rename from tests/modeltests/custom_managers/models.py
rename to tests/custom_managers/models.py
index de7c1772ed..2f5e62fc7a 100644
--- a/tests/modeltests/custom_managers/models.py
+++ b/tests/custom_managers/models.py
@@ -30,11 +30,11 @@ class Person(models.Model):
     def __str__(self):
         return "%s %s" % (self.first_name, self.last_name)
 
-# An example of a custom manager that sets get_query_set().
+# An example of a custom manager that sets get_queryset().
 
 class PublishedBookManager(models.Manager):
-    def get_query_set(self):
-        return super(PublishedBookManager, self).get_query_set().filter(is_published=True)
+    def get_queryset(self):
+        return super(PublishedBookManager, self).get_queryset().filter(is_published=True)
 
 @python_2_unicode_compatible
 class Book(models.Model):
@@ -50,8 +50,8 @@ class Book(models.Model):
 # An example of providing multiple custom managers.
 
 class FastCarManager(models.Manager):
-    def get_query_set(self):
-        return super(FastCarManager, self).get_query_set().filter(top_speed__gt=150)
+    def get_queryset(self):
+        return super(FastCarManager, self).get_queryset().filter(top_speed__gt=150)
 
 @python_2_unicode_compatible
 class Car(models.Model):
diff --git a/tests/modeltests/custom_managers/tests.py b/tests/custom_managers/tests.py
similarity index 100%
rename from tests/modeltests/custom_managers/tests.py
rename to tests/custom_managers/tests.py
diff --git a/django/contrib/localflavor/tr/__init__.py b/tests/custom_managers_regress/__init__.py
similarity index 100%
rename from django/contrib/localflavor/tr/__init__.py
rename to tests/custom_managers_regress/__init__.py
diff --git a/tests/regressiontests/custom_managers_regress/models.py b/tests/custom_managers_regress/models.py
similarity index 90%
rename from tests/regressiontests/custom_managers_regress/models.py
rename to tests/custom_managers_regress/models.py
index 71073f0fe7..95cf6e8ca1 100644
--- a/tests/regressiontests/custom_managers_regress/models.py
+++ b/tests/custom_managers_regress/models.py
@@ -10,8 +10,8 @@ class RestrictedManager(models.Manager):
     """
     A manager that filters out non-public instances.
     """
-    def get_query_set(self):
-        return super(RestrictedManager, self).get_query_set().filter(is_public=True)
+    def get_queryset(self):
+        return super(RestrictedManager, self).get_queryset().filter(is_public=True)
 
 @python_2_unicode_compatible
 class RelatedModel(models.Model):
diff --git a/tests/regressiontests/custom_managers_regress/tests.py b/tests/custom_managers_regress/tests.py
similarity index 100%
rename from tests/regressiontests/custom_managers_regress/tests.py
rename to tests/custom_managers_regress/tests.py
diff --git a/django/contrib/localflavor/uk/__init__.py b/tests/custom_methods/__init__.py
similarity index 100%
rename from django/contrib/localflavor/uk/__init__.py
rename to tests/custom_methods/__init__.py
diff --git a/tests/modeltests/custom_methods/models.py b/tests/custom_methods/models.py
similarity index 100%
rename from tests/modeltests/custom_methods/models.py
rename to tests/custom_methods/models.py
diff --git a/tests/modeltests/custom_methods/tests.py b/tests/custom_methods/tests.py
similarity index 100%
rename from tests/modeltests/custom_methods/tests.py
rename to tests/custom_methods/tests.py
diff --git a/django/contrib/localflavor/us/__init__.py b/tests/custom_pk/__init__.py
similarity index 100%
rename from django/contrib/localflavor/us/__init__.py
rename to tests/custom_pk/__init__.py
diff --git a/tests/modeltests/custom_pk/fields.py b/tests/custom_pk/fields.py
similarity index 100%
rename from tests/modeltests/custom_pk/fields.py
rename to tests/custom_pk/fields.py
diff --git a/tests/modeltests/custom_pk/models.py b/tests/custom_pk/models.py
similarity index 100%
rename from tests/modeltests/custom_pk/models.py
rename to tests/custom_pk/models.py
diff --git a/tests/modeltests/custom_pk/tests.py b/tests/custom_pk/tests.py
similarity index 100%
rename from tests/modeltests/custom_pk/tests.py
rename to tests/custom_pk/tests.py
diff --git a/django/contrib/localflavor/uy/__init__.py b/tests/datatypes/__init__.py
similarity index 100%
rename from django/contrib/localflavor/uy/__init__.py
rename to tests/datatypes/__init__.py
diff --git a/tests/regressiontests/datatypes/models.py b/tests/datatypes/models.py
similarity index 100%
rename from tests/regressiontests/datatypes/models.py
rename to tests/datatypes/models.py
diff --git a/tests/regressiontests/datatypes/tests.py b/tests/datatypes/tests.py
similarity index 100%
rename from tests/regressiontests/datatypes/tests.py
rename to tests/datatypes/tests.py
diff --git a/django/contrib/localflavor/za/__init__.py b/tests/dates/__init__.py
similarity index 100%
rename from django/contrib/localflavor/za/__init__.py
rename to tests/dates/__init__.py
diff --git a/tests/regressiontests/dates/models.py b/tests/dates/models.py
similarity index 94%
rename from tests/regressiontests/dates/models.py
rename to tests/dates/models.py
index e4bffb7199..23350755e7 100644
--- a/tests/regressiontests/dates/models.py
+++ b/tests/dates/models.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 
diff --git a/tests/regressiontests/dates/tests.py b/tests/dates/tests.py
similarity index 66%
rename from tests/regressiontests/dates/tests.py
rename to tests/dates/tests.py
index de28cac436..6c02d597de 100644
--- a/tests/regressiontests/dates/tests.py
+++ b/tests/dates/tests.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from datetime import datetime
+import datetime
 
 from django.test import TestCase
 
@@ -11,32 +11,32 @@ class DatesTests(TestCase):
     def test_related_model_traverse(self):
         a1 = Article.objects.create(
             title="First one",
-            pub_date=datetime(2005, 7, 28),
+            pub_date=datetime.date(2005, 7, 28),
         )
         a2 = Article.objects.create(
             title="Another one",
-            pub_date=datetime(2010, 7, 28),
+            pub_date=datetime.date(2010, 7, 28),
         )
         a3 = Article.objects.create(
             title="Third one, in the first day",
-            pub_date=datetime(2005, 7, 28),
+            pub_date=datetime.date(2005, 7, 28),
         )
 
         a1.comments.create(
             text="Im the HULK!",
-            pub_date=datetime(2005, 7, 28),
+            pub_date=datetime.date(2005, 7, 28),
         )
         a1.comments.create(
             text="HULK SMASH!",
-            pub_date=datetime(2005, 7, 29),
+            pub_date=datetime.date(2005, 7, 29),
         )
         a2.comments.create(
             text="LMAO",
-            pub_date=datetime(2010, 7, 28),
+            pub_date=datetime.date(2010, 7, 28),
         )
         a3.comments.create(
             text="+1",
-            pub_date=datetime(2005, 8, 29),
+            pub_date=datetime.date(2005, 8, 29),
         )
 
         c = Category.objects.create(name="serious-news")
@@ -44,31 +44,31 @@ class DatesTests(TestCase):
 
         self.assertQuerysetEqual(
             Comment.objects.dates("article__pub_date", "year"), [
-                datetime(2005, 1, 1),
-                datetime(2010, 1, 1),
+                datetime.date(2005, 1, 1),
+                datetime.date(2010, 1, 1),
             ],
             lambda d: d,
         )
         self.assertQuerysetEqual(
             Comment.objects.dates("article__pub_date", "month"), [
-                datetime(2005, 7, 1),
-                datetime(2010, 7, 1),
+                datetime.date(2005, 7, 1),
+                datetime.date(2010, 7, 1),
             ],
             lambda d: d
         )
         self.assertQuerysetEqual(
             Comment.objects.dates("article__pub_date", "day"), [
-                datetime(2005, 7, 28),
-                datetime(2010, 7, 28),
+                datetime.date(2005, 7, 28),
+                datetime.date(2010, 7, 28),
             ],
             lambda d: d
         )
         self.assertQuerysetEqual(
             Article.objects.dates("comments__pub_date", "day"), [
-                datetime(2005, 7, 28),
-                datetime(2005, 7, 29),
-                datetime(2005, 8, 29),
-                datetime(2010, 7, 28),
+                datetime.date(2005, 7, 28),
+                datetime.date(2005, 7, 29),
+                datetime.date(2005, 8, 29),
+                datetime.date(2010, 7, 28),
             ],
             lambda d: d
         )
@@ -77,7 +77,7 @@ class DatesTests(TestCase):
         )
         self.assertQuerysetEqual(
             Category.objects.dates("articles__pub_date", "day"), [
-                datetime(2005, 7, 28),
+                datetime.date(2005, 7, 28),
             ],
             lambda d: d,
         )
diff --git a/django/contrib/markup/__init__.py b/tests/datetimes/__init__.py
similarity index 100%
rename from django/contrib/markup/__init__.py
rename to tests/datetimes/__init__.py
diff --git a/tests/datetimes/models.py b/tests/datetimes/models.py
new file mode 100644
index 0000000000..f21376aa1c
--- /dev/null
+++ b/tests/datetimes/models.py
@@ -0,0 +1,28 @@
+from __future__ import unicode_literals
+
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
+
+
+@python_2_unicode_compatible
+class Article(models.Model):
+    title = models.CharField(max_length=100)
+    pub_date = models.DateTimeField()
+
+    categories = models.ManyToManyField("Category", related_name="articles")
+
+    def __str__(self):
+        return self.title
+
+@python_2_unicode_compatible
+class Comment(models.Model):
+    article = models.ForeignKey(Article, related_name="comments")
+    text = models.TextField()
+    pub_date = models.DateTimeField()
+    approval_date = models.DateTimeField(null=True)
+
+    def __str__(self):
+        return 'Comment to %s (%s)' % (self.article.title, self.pub_date)
+
+class Category(models.Model):
+    name = models.CharField(max_length=255)
diff --git a/tests/datetimes/tests.py b/tests/datetimes/tests.py
new file mode 100644
index 0000000000..58cb060f6b
--- /dev/null
+++ b/tests/datetimes/tests.py
@@ -0,0 +1,83 @@
+from __future__ import absolute_import
+
+import datetime
+
+from django.test import TestCase
+
+from .models import Article, Comment, Category
+
+
+class DateTimesTests(TestCase):
+    def test_related_model_traverse(self):
+        a1 = Article.objects.create(
+            title="First one",
+            pub_date=datetime.datetime(2005, 7, 28, 9, 0, 0),
+        )
+        a2 = Article.objects.create(
+            title="Another one",
+            pub_date=datetime.datetime(2010, 7, 28, 10, 0, 0),
+        )
+        a3 = Article.objects.create(
+            title="Third one, in the first day",
+            pub_date=datetime.datetime(2005, 7, 28, 17, 0, 0),
+        )
+
+        a1.comments.create(
+            text="Im the HULK!",
+            pub_date=datetime.datetime(2005, 7, 28, 9, 30, 0),
+        )
+        a1.comments.create(
+            text="HULK SMASH!",
+            pub_date=datetime.datetime(2005, 7, 29, 1, 30, 0),
+        )
+        a2.comments.create(
+            text="LMAO",
+            pub_date=datetime.datetime(2010, 7, 28, 10, 10, 10),
+        )
+        a3.comments.create(
+            text="+1",
+            pub_date=datetime.datetime(2005, 8, 29, 10, 10, 10),
+        )
+
+        c = Category.objects.create(name="serious-news")
+        c.articles.add(a1, a3)
+
+        self.assertQuerysetEqual(
+            Comment.objects.datetimes("article__pub_date", "year"), [
+                datetime.datetime(2005, 1, 1),
+                datetime.datetime(2010, 1, 1),
+            ],
+            lambda d: d,
+        )
+        self.assertQuerysetEqual(
+            Comment.objects.datetimes("article__pub_date", "month"), [
+                datetime.datetime(2005, 7, 1),
+                datetime.datetime(2010, 7, 1),
+            ],
+            lambda d: d
+        )
+        self.assertQuerysetEqual(
+            Comment.objects.datetimes("article__pub_date", "day"), [
+                datetime.datetime(2005, 7, 28),
+                datetime.datetime(2010, 7, 28),
+            ],
+            lambda d: d
+        )
+        self.assertQuerysetEqual(
+            Article.objects.datetimes("comments__pub_date", "day"), [
+                datetime.datetime(2005, 7, 28),
+                datetime.datetime(2005, 7, 29),
+                datetime.datetime(2005, 8, 29),
+                datetime.datetime(2010, 7, 28),
+            ],
+            lambda d: d
+        )
+        self.assertQuerysetEqual(
+            Article.objects.datetimes("comments__approval_date", "day"), []
+        )
+        self.assertQuerysetEqual(
+            Category.objects.datetimes("articles__pub_date", "day"), [
+                datetime.datetime(2005, 7, 28),
+            ],
+            lambda d: d,
+        )
diff --git a/django/contrib/markup/templatetags/__init__.py b/tests/db_typecasts/__init__.py
similarity index 100%
rename from django/contrib/markup/templatetags/__init__.py
rename to tests/db_typecasts/__init__.py
diff --git a/tests/regressiontests/builtin_server/models.py b/tests/db_typecasts/models.py
similarity index 100%
rename from tests/regressiontests/builtin_server/models.py
rename to tests/db_typecasts/models.py
diff --git a/tests/regressiontests/db_typecasts/tests.py b/tests/db_typecasts/tests.py
similarity index 100%
rename from tests/regressiontests/db_typecasts/tests.py
rename to tests/db_typecasts/tests.py
diff --git a/tests/modeltests/__init__.py b/tests/decorators/__init__.py
similarity index 100%
rename from tests/modeltests/__init__.py
rename to tests/decorators/__init__.py
diff --git a/tests/regressiontests/decorators/models.py b/tests/decorators/models.py
similarity index 100%
rename from tests/regressiontests/decorators/models.py
rename to tests/decorators/models.py
diff --git a/tests/regressiontests/decorators/tests.py b/tests/decorators/tests.py
similarity index 91%
rename from tests/regressiontests/decorators/tests.py
rename to tests/decorators/tests.py
index 7dc36aa479..8a3f340e9f 100644
--- a/tests/regressiontests/decorators/tests.py
+++ b/tests/decorators/tests.py
@@ -1,4 +1,3 @@
-import warnings
 from functools import wraps
 
 from django.contrib.admin.views.decorators import staff_member_required
@@ -116,22 +115,6 @@ class DecoratorsTest(TestCase):
         my_view_cached2 = cache_page(123, key_prefix="test")(my_view)
         self.assertEqual(my_view_cached2(HttpRequest()), "response")
 
-    def test_cache_page_old_style(self):
-        """
-        Test that we can call cache_page the old way
-        """
-        def my_view(request):
-            return "response"
-        with warnings.catch_warnings(record=True):
-            my_view_cached = cache_page(my_view, 123)
-            self.assertEqual(my_view_cached(HttpRequest()), "response")
-            my_view_cached2 = cache_page(my_view, 123, key_prefix="test")
-            self.assertEqual(my_view_cached2(HttpRequest()), "response")
-            my_view_cached3 = cache_page(my_view)
-            self.assertEqual(my_view_cached3(HttpRequest()), "response")
-            my_view_cached4 = cache_page()(my_view)
-            self.assertEqual(my_view_cached4(HttpRequest()), "response")
-
     def test_require_safe_accepts_only_safe_methods(self):
         """
         Test for the require_safe decorator.
diff --git a/tests/modeltests/aggregation/__init__.py b/tests/defaultfilters/__init__.py
similarity index 100%
rename from tests/modeltests/aggregation/__init__.py
rename to tests/defaultfilters/__init__.py
diff --git a/tests/regressiontests/createsuperuser/models.py b/tests/defaultfilters/models.py
similarity index 100%
rename from tests/regressiontests/createsuperuser/models.py
rename to tests/defaultfilters/models.py
diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/defaultfilters/tests.py
similarity index 98%
rename from tests/regressiontests/defaultfilters/tests.py
rename to tests/defaultfilters/tests.py
index 8596f8c801..21734faf95 100644
--- a/tests/regressiontests/defaultfilters/tests.py
+++ b/tests/defaultfilters/tests.py
@@ -314,6 +314,11 @@ class DefaultFiltersTests(TestCase):
         self.assertEqual(urlize('see test[at[example.com'),
             'see <a href="http://test[at[example.com" rel="nofollow">test[at[example.com</a>' )
 
+        # Check urlize works with IPv4/IPv6 addresses
+        self.assertEqual(urlize('http://192.168.0.15/api/9'),
+            '<a href="http://192.168.0.15/api/9" rel="nofollow">http://192.168.0.15/api/9</a>')
+        self.assertEqual(urlize('http://[2001:db8:cafe::2]/api/9'),
+            '<a href="http://[2001:db8:cafe::2]/api/9" rel="nofollow">http://[2001:db8:cafe::2]/api/9</a>')
 
     def test_wordcount(self):
         self.assertEqual(wordcount(''), 0)
diff --git a/tests/modeltests/basic/__init__.py b/tests/defer/__init__.py
similarity index 100%
rename from tests/modeltests/basic/__init__.py
rename to tests/defer/__init__.py
diff --git a/tests/modeltests/defer/models.py b/tests/defer/models.py
similarity index 100%
rename from tests/modeltests/defer/models.py
rename to tests/defer/models.py
diff --git a/tests/modeltests/defer/tests.py b/tests/defer/tests.py
similarity index 100%
rename from tests/modeltests/defer/tests.py
rename to tests/defer/tests.py
diff --git a/tests/modeltests/choices/__init__.py b/tests/defer_regress/__init__.py
similarity index 100%
rename from tests/modeltests/choices/__init__.py
rename to tests/defer_regress/__init__.py
diff --git a/tests/regressiontests/defer_regress/models.py b/tests/defer_regress/models.py
similarity index 100%
rename from tests/regressiontests/defer_regress/models.py
rename to tests/defer_regress/models.py
diff --git a/tests/regressiontests/defer_regress/tests.py b/tests/defer_regress/tests.py
similarity index 100%
rename from tests/regressiontests/defer_regress/tests.py
rename to tests/defer_regress/tests.py
diff --git a/tests/modeltests/custom_columns/__init__.py b/tests/delete/__init__.py
similarity index 100%
rename from tests/modeltests/custom_columns/__init__.py
rename to tests/delete/__init__.py
diff --git a/tests/modeltests/delete/models.py b/tests/delete/models.py
similarity index 100%
rename from tests/modeltests/delete/models.py
rename to tests/delete/models.py
diff --git a/tests/modeltests/delete/tests.py b/tests/delete/tests.py
similarity index 94%
rename from tests/modeltests/delete/tests.py
rename to tests/delete/tests.py
index 20b815c33d..66173078a0 100644
--- a/tests/modeltests/delete/tests.py
+++ b/tests/delete/tests.py
@@ -227,7 +227,28 @@ class DeletionTests(TestCase):
         )
 
         models.signals.post_delete.disconnect(log_post_delete)
-        models.signals.post_delete.disconnect(log_pre_delete)
+        models.signals.pre_delete.disconnect(log_pre_delete)
+
+    def test_relational_post_delete_signals_happen_before_parent_object(self):
+        deletions = []
+
+        def log_post_delete(instance, **kwargs):
+            self.assertTrue(R.objects.filter(pk=instance.r_id))
+            self.assertIs(type(instance), S)
+            deletions.append(instance.id)
+
+        r = R.objects.create(pk=1)
+        S.objects.create(pk=1, r=r)
+
+        models.signals.post_delete.connect(log_post_delete, sender=S)
+
+        try:
+            r.delete()
+        finally:
+            models.signals.post_delete.disconnect(log_post_delete)
+
+        self.assertEqual(len(deletions), 1)
+        self.assertEqual(deletions[0], 1)
 
     @skipUnlessDBFeature("can_defer_constraint_checks")
     def test_can_defer_constraint_checks(self):
diff --git a/tests/modeltests/model_package/__init__.py b/tests/delete_regress/__init__.py
similarity index 100%
rename from tests/modeltests/model_package/__init__.py
rename to tests/delete_regress/__init__.py
diff --git a/tests/regressiontests/delete_regress/models.py b/tests/delete_regress/models.py
similarity index 91%
rename from tests/regressiontests/delete_regress/models.py
rename to tests/delete_regress/models.py
index dbe383fb41..3632a7dbc1 100644
--- a/tests/regressiontests/delete_regress/models.py
+++ b/tests/delete_regress/models.py
@@ -99,3 +99,13 @@ class OrgUnit(models.Model):
 class Login(models.Model):
     description = models.CharField(max_length=32)
     orgunit = models.ForeignKey(OrgUnit)
+
+class House(models.Model):
+    address = models.CharField(max_length=32)
+
+class OrderedPerson(models.Model):
+    name = models.CharField(max_length=32)
+    lives_in = models.ForeignKey(House)
+
+    class Meta:
+        ordering = ['name']
diff --git a/tests/regressiontests/delete_regress/tests.py b/tests/delete_regress/tests.py
similarity index 94%
rename from tests/regressiontests/delete_regress/tests.py
rename to tests/delete_regress/tests.py
index c3e4a6a0b7..e88c95e229 100644
--- a/tests/regressiontests/delete_regress/tests.py
+++ b/tests/delete_regress/tests.py
@@ -10,7 +10,7 @@ from django.test import TestCase, TransactionTestCase, skipUnlessDBFeature
 from .models import (Book, Award, AwardNote, Person, Child, Toy, PlayedWith,
     PlayedWithNote, Email, Researcher, Food, Eaten, Policy, Version, Location,
     Item, Image, File, Photo, FooFile, FooImage, FooPhoto, FooFileProxy, Login,
-    OrgUnit)
+    OrgUnit, OrderedPerson, House)
 
 
 # Can't run this test under SQLite, because you can't
@@ -22,12 +22,12 @@ class DeleteLockingTest(TransactionTestCase):
         self.conn2 = new_connections[DEFAULT_DB_ALIAS]
         # Put both DB connections into managed transaction mode
         transaction.enter_transaction_management()
-        transaction.managed(True)
-        self.conn2._enter_transaction_management(True)
+        self.conn2.enter_transaction_management()
 
     def tearDown(self):
         # Close down the second connection.
         transaction.leave_transaction_management()
+        self.conn2.abort()
         self.conn2.close()
 
     @skipUnlessDBFeature('test_db_allows_multiple_connections')
@@ -333,7 +333,7 @@ class Ticket19102Tests(TestCase):
             ).select_related('orgunit').delete()
         self.assertFalse(Login.objects.filter(pk=self.l1.pk).exists())
         self.assertTrue(Login.objects.filter(pk=self.l2.pk).exists())
-    
+
     @skipUnlessDBFeature("update_can_self_select")
     def test_ticket_19102_defer(self):
         with self.assertNumQueries(1):
@@ -347,3 +347,14 @@ class Ticket19102Tests(TestCase):
         self.assertFalse(Login.objects.filter(pk=self.l1.pk).exists())
         self.assertTrue(Login.objects.filter(pk=self.l2.pk).exists())
 
+
+class OrderedDeleteTests(TestCase):
+    def test_meta_ordered_delete(self):
+        # When a subquery is performed by deletion code, the subquery must be
+        # cleared of all ordering. There was a but that caused _meta ordering
+        # to be used. Refs #19720.
+        h = House.objects.create(address='Foo')
+        OrderedPerson.objects.create(name='Jack', lives_in=h)
+        OrderedPerson.objects.create(name='Bob', lives_in=h)
+        OrderedPerson.objects.filter(lives_in__address='Foo').delete()
+        self.assertEqual(OrderedPerson.objects.count(), 0)
diff --git a/tests/modeltests/custom_managers/__init__.py b/tests/deprecation/__init__.py
similarity index 100%
rename from tests/modeltests/custom_managers/__init__.py
rename to tests/deprecation/__init__.py
diff --git a/tests/regressiontests/db_typecasts/models.py b/tests/deprecation/models.py
similarity index 100%
rename from tests/regressiontests/db_typecasts/models.py
rename to tests/deprecation/models.py
diff --git a/tests/deprecation/tests.py b/tests/deprecation/tests.py
new file mode 100644
index 0000000000..df752b3149
--- /dev/null
+++ b/tests/deprecation/tests.py
@@ -0,0 +1,158 @@
+from __future__ import unicode_literals
+import warnings
+
+from django.test.testcases import SimpleTestCase
+from django.utils import six
+from django.utils.deprecation import RenameMethodsBase
+
+
+class RenameManagerMethods(RenameMethodsBase):
+    renamed_methods = (
+        ('old', 'new', PendingDeprecationWarning),
+    )
+
+
+class RenameMethodsTests(SimpleTestCase):
+    """
+    Tests the `RenameMethodsBase` type introduced to rename `get_query_set`
+    to `get_queryset` across the code base following #15363.
+    """
+
+    def test_class_definition_warnings(self):
+        """
+        Ensure a warning is raised upon class definition to suggest renaming
+        the faulty method.
+        """
+        with warnings.catch_warnings(record=True) as recorded:
+            warnings.simplefilter('always')
+            class Manager(six.with_metaclass(RenameManagerMethods)):
+                def old(self):
+                    pass
+            self.assertEqual(len(recorded), 1)
+            msg = str(recorded[0].message)
+            self.assertEqual(msg,
+                '`Manager.old` method should be renamed `new`.')
+
+    def test_get_new_defined(self):
+        """
+        Ensure `old` complains and not `new` when only `new` is defined.
+        """
+        with warnings.catch_warnings(record=True) as recorded:
+            warnings.simplefilter('ignore')
+            class Manager(six.with_metaclass(RenameManagerMethods)):
+                def new(self):
+                    pass
+            warnings.simplefilter('always')
+            manager = Manager()
+            manager.new()
+            self.assertEqual(len(recorded), 0)
+            manager.old()
+            self.assertEqual(len(recorded), 1)
+            msg = str(recorded.pop().message)
+            self.assertEqual(msg,
+                '`Manager.old` is deprecated, use `new` instead.')
+
+    def test_get_old_defined(self):
+        """
+        Ensure `old` complains when only `old` is defined.
+        """
+        with warnings.catch_warnings(record=True) as recorded:
+            warnings.simplefilter('ignore')
+            class Manager(six.with_metaclass(RenameManagerMethods)):
+                def old(self):
+                    pass
+            warnings.simplefilter('always')
+            manager = Manager()
+            manager.new()
+            self.assertEqual(len(recorded), 0)
+            manager.old()
+            self.assertEqual(len(recorded), 1)
+            msg = str(recorded.pop().message)
+            self.assertEqual(msg,
+                '`Manager.old` is deprecated, use `new` instead.')
+
+    def test_deprecated_subclass_renamed(self):
+        """
+        Ensure the correct warnings are raised when a class that didn't rename
+        `old` subclass one that did.
+        """
+        with warnings.catch_warnings(record=True) as recorded:
+            warnings.simplefilter('ignore')
+            class Renamed(six.with_metaclass(RenameManagerMethods)):
+                def new(self):
+                    pass
+            class Deprecated(Renamed):
+                def old(self):
+                    super(Deprecated, self).old()
+            warnings.simplefilter('always')
+            deprecated = Deprecated()
+            deprecated.new()
+            self.assertEqual(len(recorded), 1)
+            msg = str(recorded.pop().message)
+            self.assertEqual(msg,
+                '`Renamed.old` is deprecated, use `new` instead.')
+            recorded[:] = []
+            deprecated.old()
+            self.assertEqual(len(recorded), 2)
+            msgs = [str(warning.message) for warning in recorded]
+            self.assertEqual(msgs, [
+                '`Deprecated.old` is deprecated, use `new` instead.',
+                '`Renamed.old` is deprecated, use `new` instead.',
+            ])
+
+    def test_renamed_subclass_deprecated(self):
+        """
+        Ensure the correct warnings are raised when a class that renamed
+        `old` subclass one that didn't.
+        """
+        with warnings.catch_warnings(record=True) as recorded:
+            warnings.simplefilter('ignore')
+            class Deprecated(six.with_metaclass(RenameManagerMethods)):
+                def old(self):
+                    pass
+            class Renamed(Deprecated):
+                def new(self):
+                    super(Renamed, self).new()
+            warnings.simplefilter('always')
+            renamed = Renamed()
+            renamed.new()
+            self.assertEqual(len(recorded), 0)
+            renamed.old()
+            self.assertEqual(len(recorded), 1)
+            msg = str(recorded.pop().message)
+            self.assertEqual(msg,
+                '`Renamed.old` is deprecated, use `new` instead.')
+
+    def test_deprecated_subclass_renamed_and_mixins(self):
+        """
+        Ensure the correct warnings are raised when a subclass inherit from a
+        class that renamed `old` and mixins that may or may not have renamed
+        `new`.
+        """
+        with warnings.catch_warnings(record=True) as recorded:
+            warnings.simplefilter('ignore')
+            class Renamed(six.with_metaclass(RenameManagerMethods)):
+                def new(self):
+                    pass
+            class RenamedMixin(object):
+                def new(self):
+                    super(RenamedMixin, self).new()
+            class DeprecatedMixin(object):
+                def old(self):
+                    super(DeprecatedMixin, self).old()
+            class Deprecated(DeprecatedMixin, RenamedMixin, Renamed):
+                pass
+            warnings.simplefilter('always')
+            deprecated = Deprecated()
+            deprecated.new()
+            self.assertEqual(len(recorded), 1)
+            msg = str(recorded.pop().message)
+            self.assertEqual(msg,
+                '`RenamedMixin.old` is deprecated, use `new` instead.')
+            deprecated.old()
+            self.assertEqual(len(recorded), 2)
+            msgs = [str(warning.message) for warning in recorded]
+            self.assertEqual(msgs, [
+                '`DeprecatedMixin.old` is deprecated, use `new` instead.',
+                '`RenamedMixin.old` is deprecated, use `new` instead.',
+            ])
diff --git a/tests/regressiontests/dispatch/__init__.py b/tests/dispatch/__init__.py
similarity index 100%
rename from tests/regressiontests/dispatch/__init__.py
rename to tests/dispatch/__init__.py
diff --git a/tests/regressiontests/defaultfilters/models.py b/tests/dispatch/models.py
similarity index 100%
rename from tests/regressiontests/defaultfilters/models.py
rename to tests/dispatch/models.py
diff --git a/tests/regressiontests/dispatch/tests/__init__.py b/tests/dispatch/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/dispatch/tests/__init__.py
rename to tests/dispatch/tests/__init__.py
diff --git a/tests/regressiontests/dispatch/tests/test_dispatcher.py b/tests/dispatch/tests/test_dispatcher.py
similarity index 100%
rename from tests/regressiontests/dispatch/tests/test_dispatcher.py
rename to tests/dispatch/tests/test_dispatcher.py
diff --git a/tests/regressiontests/dispatch/tests/test_saferef.py b/tests/dispatch/tests/test_saferef.py
similarity index 100%
rename from tests/regressiontests/dispatch/tests/test_saferef.py
rename to tests/dispatch/tests/test_saferef.py
diff --git a/tests/modeltests/select_for_update/__init__.py b/tests/distinct_on_fields/__init__.py
similarity index 100%
rename from tests/modeltests/select_for_update/__init__.py
rename to tests/distinct_on_fields/__init__.py
diff --git a/tests/modeltests/distinct_on_fields/models.py b/tests/distinct_on_fields/models.py
similarity index 100%
rename from tests/modeltests/distinct_on_fields/models.py
rename to tests/distinct_on_fields/models.py
diff --git a/tests/modeltests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py
similarity index 100%
rename from tests/modeltests/distinct_on_fields/tests.py
rename to tests/distinct_on_fields/tests.py
diff --git a/tests/modeltests/custom_methods/__init__.py b/tests/empty/__init__.py
similarity index 100%
rename from tests/modeltests/custom_methods/__init__.py
rename to tests/empty/__init__.py
diff --git a/tests/modeltests/empty/models.py b/tests/empty/models.py
similarity index 100%
rename from tests/modeltests/empty/models.py
rename to tests/empty/models.py
diff --git a/tests/modeltests/custom_pk/__init__.py b/tests/empty/no_models/__init__.py
similarity index 100%
rename from tests/modeltests/custom_pk/__init__.py
rename to tests/empty/no_models/__init__.py
diff --git a/tests/empty/no_models/tests.py b/tests/empty/no_models/tests.py
new file mode 100644
index 0000000000..8b8db1af39
--- /dev/null
+++ b/tests/empty/no_models/tests.py
@@ -0,0 +1,6 @@
+from django.test import TestCase
+
+
+class NoModelTests(TestCase):
+    """ A placeholder test case. See empty.tests for more info. """
+    pass
diff --git a/tests/modeltests/empty/tests.py b/tests/empty/tests.py
similarity index 94%
rename from tests/modeltests/empty/tests.py
rename to tests/empty/tests.py
index 4c0c4409d8..6dd9f7c75d 100644
--- a/tests/modeltests/empty/tests.py
+++ b/tests/empty/tests.py
@@ -31,7 +31,7 @@ class NoModelTests(TestCase):
 
     It seemed like an appropriate home for it.
     """
-    @override_settings(INSTALLED_APPS=("modeltests.empty.no_models",))
+    @override_settings(INSTALLED_APPS=("empty.no_models",))
     def test_no_models(self):
         with six.assertRaisesRegex(self, ImproperlyConfigured,
                     'App with label no_models is missing a models.py module.'):
diff --git a/tests/modeltests/defer/__init__.py b/tests/expressions/__init__.py
similarity index 100%
rename from tests/modeltests/defer/__init__.py
rename to tests/expressions/__init__.py
diff --git a/tests/modeltests/expressions/models.py b/tests/expressions/models.py
similarity index 100%
rename from tests/modeltests/expressions/models.py
rename to tests/expressions/models.py
diff --git a/tests/modeltests/expressions/tests.py b/tests/expressions/tests.py
similarity index 100%
rename from tests/modeltests/expressions/tests.py
rename to tests/expressions/tests.py
diff --git a/tests/modeltests/delete/__init__.py b/tests/expressions_regress/__init__.py
similarity index 100%
rename from tests/modeltests/delete/__init__.py
rename to tests/expressions_regress/__init__.py
diff --git a/tests/regressiontests/expressions_regress/models.py b/tests/expressions_regress/models.py
similarity index 100%
rename from tests/regressiontests/expressions_regress/models.py
rename to tests/expressions_regress/models.py
diff --git a/tests/regressiontests/expressions_regress/tests.py b/tests/expressions_regress/tests.py
similarity index 100%
rename from tests/regressiontests/expressions_regress/tests.py
rename to tests/expressions_regress/tests.py
diff --git a/tests/modeltests/empty/__init__.py b/tests/extra_regress/__init__.py
similarity index 100%
rename from tests/modeltests/empty/__init__.py
rename to tests/extra_regress/__init__.py
diff --git a/tests/regressiontests/extra_regress/models.py b/tests/extra_regress/models.py
similarity index 100%
rename from tests/regressiontests/extra_regress/models.py
rename to tests/extra_regress/models.py
diff --git a/tests/regressiontests/extra_regress/tests.py b/tests/extra_regress/tests.py
similarity index 99%
rename from tests/regressiontests/extra_regress/tests.py
rename to tests/extra_regress/tests.py
index 1bc6789edd..194b250c99 100644
--- a/tests/regressiontests/extra_regress/tests.py
+++ b/tests/extra_regress/tests.py
@@ -166,8 +166,9 @@ class ExtraRegressTests(TestCase):
         )
 
         self.assertQuerysetEqual(
-            RevisionableModel.objects.extra(select={"the_answer": 'id'}).dates('when', 'month'),
-            ['datetime.datetime(2008, 9, 1, 0, 0)']
+            RevisionableModel.objects.extra(select={"the_answer": 'id'}).datetimes('when', 'month'),
+            [datetime.datetime(2008, 9, 1, 0, 0)],
+            transform=lambda d: d,
         )
 
     def test_values_with_extra(self):
diff --git a/tests/modeltests/empty/no_models/__init__.py b/tests/field_defaults/__init__.py
similarity index 100%
rename from tests/modeltests/empty/no_models/__init__.py
rename to tests/field_defaults/__init__.py
diff --git a/tests/modeltests/field_defaults/models.py b/tests/field_defaults/models.py
similarity index 100%
rename from tests/modeltests/field_defaults/models.py
rename to tests/field_defaults/models.py
diff --git a/tests/modeltests/field_defaults/tests.py b/tests/field_defaults/tests.py
similarity index 100%
rename from tests/modeltests/field_defaults/tests.py
rename to tests/field_defaults/tests.py
diff --git a/tests/modeltests/expressions/__init__.py b/tests/field_subclassing/__init__.py
similarity index 100%
rename from tests/modeltests/expressions/__init__.py
rename to tests/field_subclassing/__init__.py
diff --git a/tests/modeltests/field_subclassing/fields.py b/tests/field_subclassing/fields.py
similarity index 100%
rename from tests/modeltests/field_subclassing/fields.py
rename to tests/field_subclassing/fields.py
diff --git a/tests/modeltests/field_subclassing/models.py b/tests/field_subclassing/models.py
similarity index 100%
rename from tests/modeltests/field_subclassing/models.py
rename to tests/field_subclassing/models.py
diff --git a/tests/modeltests/field_subclassing/tests.py b/tests/field_subclassing/tests.py
similarity index 94%
rename from tests/modeltests/field_subclassing/tests.py
rename to tests/field_subclassing/tests.py
index 0ec317dea5..9331ff2f3f 100644
--- a/tests/modeltests/field_subclassing/tests.py
+++ b/tests/field_subclassing/tests.py
@@ -61,7 +61,11 @@ class CustomField(TestCase):
 
         # Serialization works, too.
         stream = serializers.serialize("json", MyModel.objects.all())
-        self.assertEqual(stream, '[{"pk": %d, "model": "field_subclassing.mymodel", "fields": {"data": "12", "name": "m"}}]' % m1.pk)
+        self.assertJSONEqual(stream, [{
+            "pk": m1.pk,
+            "model": "field_subclassing.mymodel",
+            "fields": {"data": "12", "name": "m"}
+        }])
 
         obj = list(serializers.deserialize("json", stream))[0]
         self.assertEqual(obj.object, m)
diff --git a/tests/regressiontests/bash_completion/__init__.py b/tests/file_storage/__init__.py
similarity index 100%
rename from tests/regressiontests/bash_completion/__init__.py
rename to tests/file_storage/__init__.py
diff --git a/tests/file_storage/magic.png b/tests/file_storage/magic.png
new file mode 100644
index 0000000000..a06449f9e9
Binary files /dev/null and b/tests/file_storage/magic.png differ
diff --git a/tests/regressiontests/dispatch/models.py b/tests/file_storage/models.py
similarity index 100%
rename from tests/regressiontests/dispatch/models.py
rename to tests/file_storage/models.py
diff --git a/tests/modeltests/model_forms/test.png b/tests/file_storage/test.png
similarity index 100%
rename from tests/modeltests/model_forms/test.png
rename to tests/file_storage/test.png
diff --git a/tests/regressiontests/file_storage/test1.png b/tests/file_storage/test1.png
similarity index 100%
rename from tests/regressiontests/file_storage/test1.png
rename to tests/file_storage/test1.png
diff --git a/tests/regressiontests/file_storage/tests.py b/tests/file_storage/tests.py
similarity index 94%
rename from tests/regressiontests/file_storage/tests.py
rename to tests/file_storage/tests.py
index b6d3e1ff0b..5e6adee894 100644
--- a/tests/regressiontests/file_storage/tests.py
+++ b/tests/file_storage/tests.py
@@ -7,6 +7,7 @@ import shutil
 import sys
 import tempfile
 import time
+import zlib
 from datetime import datetime, timedelta
 from io import BytesIO
 
@@ -26,7 +27,7 @@ from django.utils import six
 from django.utils import unittest
 from django.utils._os import upath
 from django.test.utils import override_settings
-from ..servers.tests import LiveServerBase
+from servers.tests import LiveServerBase
 
 # Try to import PIL in either of the two ways it can end up installed.
 # Checking for the existence of Image is enough for CPython, but
@@ -54,11 +55,9 @@ class GetStorageClassTests(SimpleTestCase):
         """
         get_storage_class raises an error if the requested import don't exist.
         """
-        self.assertRaisesMessage(
-            ImproperlyConfigured,
-            "NonExistingStorage isn't a storage module.",
-            get_storage_class,
-            'NonExistingStorage')
+        with six.assertRaisesRegex(self, ImproperlyConfigured,
+                "Error importing module storage: \"No module named '?storage'?\""):
+            get_storage_class('storage.NonExistingStorage')
 
     def test_get_nonexisting_storage_class(self):
         """
@@ -66,8 +65,8 @@ class GetStorageClassTests(SimpleTestCase):
         """
         self.assertRaisesMessage(
             ImproperlyConfigured,
-            'Storage module "django.core.files.storage" does not define a '\
-                '"NonExistingStorage" class.',
+            'Module "django.core.files.storage" does not define a '
+            '"NonExistingStorage" attribute/class',
             get_storage_class,
             'django.core.files.storage.NonExistingStorage')
 
@@ -76,13 +75,11 @@ class GetStorageClassTests(SimpleTestCase):
         get_storage_class raises an error if the requested module don't exist.
         """
         # Error message may or may not be the fully qualified path.
-        six.assertRaisesRegex(self,
-            ImproperlyConfigured,
-            ('Error importing storage module django.core.files.non_existing_'
-                'storage: "No module named .*non_existing_storage'),
-            get_storage_class,
-            'django.core.files.non_existing_storage.NonExistingStorage'
-        )
+        with six.assertRaisesRegex(self, ImproperlyConfigured,
+                "Error importing module django.core.files.non_existing_storage: "
+                "\"No module named '?(django.core.files.)?non_existing_storage'?\""):
+            get_storage_class(
+                'django.core.files.non_existing_storage.NonExistingStorage')
 
 class FileStorageTests(unittest.TestCase):
     storage_class = FileSystemStorage
@@ -559,6 +556,20 @@ class InconsistentGetImageDimensionsBug(unittest.TestCase):
         self.assertEqual(image_pil.size, size_1)
         self.assertEqual(size_1, size_2)
 
+    @unittest.skipUnless(Image, "PIL not installed")
+    def test_bug_19457(self):
+        """
+        Regression test for #19457
+        get_image_dimensions fails on some pngs, while Image.size is working good on them
+        """
+        img_path = os.path.join(os.path.dirname(upath(__file__)), "magic.png")
+        try:
+            size = get_image_dimensions(img_path)
+        except zlib.error:
+            self.fail("Exception raised from get_image_dimensions().")
+        self.assertEqual(size, Image.open(img_path).size)
+
+
 class ContentFileTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -628,7 +639,7 @@ class FileLikeObjectTestCase(LiveServerBase):
         f = File(file_like_object)
         stored_filename = self.storage.save("remote_file.html", f)
 
-        stored_file = self.storage.open(stored_filename)
         remote_file = self.urlopen('/example_view/')
 
-        self.assertEqual(stored_file.read(), remote_file.read())
+        with self.storage.open(stored_filename) as stored_file:
+            self.assertEqual(stored_file.read(), remote_file.read())
diff --git a/tests/modeltests/field_defaults/__init__.py b/tests/file_uploads/__init__.py
similarity index 100%
rename from tests/modeltests/field_defaults/__init__.py
rename to tests/file_uploads/__init__.py
diff --git a/tests/regressiontests/file_uploads/models.py b/tests/file_uploads/models.py
similarity index 100%
rename from tests/regressiontests/file_uploads/models.py
rename to tests/file_uploads/models.py
diff --git a/tests/regressiontests/file_uploads/tests.py b/tests/file_uploads/tests.py
similarity index 100%
rename from tests/regressiontests/file_uploads/tests.py
rename to tests/file_uploads/tests.py
diff --git a/tests/regressiontests/file_uploads/uploadhandler.py b/tests/file_uploads/uploadhandler.py
similarity index 100%
rename from tests/regressiontests/file_uploads/uploadhandler.py
rename to tests/file_uploads/uploadhandler.py
diff --git a/tests/regressiontests/file_uploads/urls.py b/tests/file_uploads/urls.py
similarity index 100%
rename from tests/regressiontests/file_uploads/urls.py
rename to tests/file_uploads/urls.py
diff --git a/tests/regressiontests/file_uploads/views.py b/tests/file_uploads/views.py
similarity index 100%
rename from tests/regressiontests/file_uploads/views.py
rename to tests/file_uploads/views.py
diff --git a/tests/regressiontests/bash_completion/management/__init__.py b/tests/files/__init__.py
similarity index 100%
rename from tests/regressiontests/bash_completion/management/__init__.py
rename to tests/files/__init__.py
diff --git a/tests/modeltests/files/models.py b/tests/files/models.py
similarity index 97%
rename from tests/modeltests/files/models.py
rename to tests/files/models.py
index cefc7c7244..4134472748 100644
--- a/tests/modeltests/files/models.py
+++ b/tests/files/models.py
@@ -26,5 +26,5 @@ class Storage(models.Model):
 
     normal = models.FileField(storage=temp_storage, upload_to='tests')
     custom = models.FileField(storage=temp_storage, upload_to=custom_upload_to)
-    random = models.FileField(storage=temp_storage, upload_to=random_upload_to, max_length=16)
+    random = models.FileField(storage=temp_storage, upload_to=random_upload_to)
     default = models.FileField(storage=temp_storage, upload_to='tests', default='tests/default.txt')
diff --git a/tests/modeltests/files/tests.py b/tests/files/tests.py
similarity index 82%
rename from tests/modeltests/files/tests.py
rename to tests/files/tests.py
index 71ca103205..cd2d15acdb 100644
--- a/tests/modeltests/files/tests.py
+++ b/tests/files/tests.py
@@ -5,12 +5,12 @@ import shutil
 import tempfile
 
 from django.core.cache import cache
-from django.core.exceptions import ValidationError
 from django.core.files import File
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
 from django.utils import unittest
+from django.utils.six import StringIO
 
 from .models import Storage, temp_storage, temp_storage_location
 
@@ -103,23 +103,31 @@ class FileStorageTests(TestCase):
         obj4.random.save("random_file", ContentFile("random content"))
         self.assertTrue(obj4.random.name.endswith("/random_file"))
 
-    def test_max_length(self):
-        """
-        Test that FileField validates the length of the generated file name
-        that will be stored in the database. Regression for #9893.
-        """
-        # upload_to = 'unused', so file names are saved as '456/xxxxx'.
-        # max_length = 16, so names longer than 12 characters are rejected.
-        s1 = Storage(random=SimpleUploadedFile(12 * 'x', b"content"))
-        s1.full_clean()
-        with self.assertRaises(ValidationError):
-            Storage(random=SimpleUploadedFile(13 * 'x', b"content")).full_clean()
+    def test_file_object(self):
+        # Create sample file
+        temp_storage.save('tests/example.txt', ContentFile('some content'))
+
+        # Load it as python file object
+        with open(temp_storage.path('tests/example.txt')) as file_obj:
+            # Save it using storage and read its content
+            temp_storage.save('tests/file_obj', file_obj)
+        self.assertTrue(temp_storage.exists('tests/file_obj'))
+        with temp_storage.open('tests/file_obj') as f:
+            self.assertEqual(f.read(), b'some content')
+
+
+    def test_stringio(self):
+        # Test passing StringIO instance as content argument to save
+        output = StringIO()
+        output.write('content')
+        output.seek(0)
+
+        # Save it and read written file
+        temp_storage.save('tests/stringio', output)
+        self.assertTrue(temp_storage.exists('tests/stringio'))
+        with temp_storage.open('tests/stringio') as f:
+            self.assertEqual(f.read(), b'content')
 
-        # Ticket #18515: validation for an already saved file should not check
-        # against a regenerated file name (and potentially raise a ValidationError
-        # if max_length is exceeded
-        s1.save()
-        s1.full_clean()
 
 
 class FileTests(unittest.TestCase):
diff --git a/tests/modeltests/fixtures/__init__.py b/tests/fixtures/__init__.py
similarity index 100%
rename from tests/modeltests/fixtures/__init__.py
rename to tests/fixtures/__init__.py
diff --git a/tests/modeltests/fixtures/fixtures/db_fixture_1.default.json b/tests/fixtures/fixtures/db_fixture_1.default.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/db_fixture_1.default.json
rename to tests/fixtures/fixtures/db_fixture_1.default.json
diff --git a/tests/modeltests/fixtures/fixtures/db_fixture_2.default.json.gz b/tests/fixtures/fixtures/db_fixture_2.default.json.gz
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/db_fixture_2.default.json.gz
rename to tests/fixtures/fixtures/db_fixture_2.default.json.gz
diff --git a/tests/modeltests/fixtures/fixtures/db_fixture_3.nosuchdb.json b/tests/fixtures/fixtures/db_fixture_3.nosuchdb.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/db_fixture_3.nosuchdb.json
rename to tests/fixtures/fixtures/db_fixture_3.nosuchdb.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture1.json b/tests/fixtures/fixtures/fixture1.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture1.json
rename to tests/fixtures/fixtures/fixture1.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture2.json b/tests/fixtures/fixtures/fixture2.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture2.json
rename to tests/fixtures/fixtures/fixture2.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture2.xml b/tests/fixtures/fixtures/fixture2.xml
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture2.xml
rename to tests/fixtures/fixtures/fixture2.xml
diff --git a/tests/modeltests/fixtures/fixtures/fixture3.xml b/tests/fixtures/fixtures/fixture3.xml
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture3.xml
rename to tests/fixtures/fixtures/fixture3.xml
diff --git a/tests/modeltests/fixtures/fixtures/fixture4.json.zip b/tests/fixtures/fixtures/fixture4.json.zip
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture4.json.zip
rename to tests/fixtures/fixtures/fixture4.json.zip
diff --git a/tests/modeltests/fixtures/fixtures/fixture5.json.gz b/tests/fixtures/fixtures/fixture5.json.gz
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture5.json.gz
rename to tests/fixtures/fixtures/fixture5.json.gz
diff --git a/tests/modeltests/fixtures/fixtures/fixture5.json.zip b/tests/fixtures/fixtures/fixture5.json.zip
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture5.json.zip
rename to tests/fixtures/fixtures/fixture5.json.zip
diff --git a/tests/modeltests/fixtures/fixtures/fixture6.json b/tests/fixtures/fixtures/fixture6.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture6.json
rename to tests/fixtures/fixtures/fixture6.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture7.xml b/tests/fixtures/fixtures/fixture7.xml
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture7.xml
rename to tests/fixtures/fixtures/fixture7.xml
diff --git a/tests/modeltests/fixtures/fixtures/fixture8.json b/tests/fixtures/fixtures/fixture8.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture8.json
rename to tests/fixtures/fixtures/fixture8.json
diff --git a/tests/modeltests/fixtures/fixtures/fixture9.xml b/tests/fixtures/fixtures/fixture9.xml
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/fixture9.xml
rename to tests/fixtures/fixtures/fixture9.xml
diff --git a/tests/modeltests/fixtures/fixtures/initial_data.json b/tests/fixtures/fixtures/initial_data.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/initial_data.json
rename to tests/fixtures/fixtures/initial_data.json
diff --git a/tests/modeltests/fixtures/fixtures/invalid.json b/tests/fixtures/fixtures/invalid.json
similarity index 100%
rename from tests/modeltests/fixtures/fixtures/invalid.json
rename to tests/fixtures/fixtures/invalid.json
diff --git a/tests/modeltests/fixtures/models.py b/tests/fixtures/models.py
similarity index 96%
rename from tests/modeltests/fixtures/models.py
rename to tests/fixtures/models.py
index 8bd3501926..976716fdc9 100644
--- a/tests/modeltests/fixtures/models.py
+++ b/tests/fixtures/models.py
@@ -78,8 +78,8 @@ class Person(models.Model):
         return (self.name,)
 
 class SpyManager(PersonManager):
-    def get_query_set(self):
-        return super(SpyManager, self).get_query_set().filter(cover_blown=False)
+    def get_queryset(self):
+        return super(SpyManager, self).get_queryset().filter(cover_blown=False)
 
 class Spy(Person):
     objects = SpyManager()
diff --git a/tests/modeltests/fixtures/tests.py b/tests/fixtures/tests.py
similarity index 98%
rename from tests/modeltests/fixtures/tests.py
rename to tests/fixtures/tests.py
index 415ed6dcf2..103612198e 100644
--- a/tests/modeltests/fixtures/tests.py
+++ b/tests/fixtures/tests.py
@@ -22,7 +22,7 @@ class TestCaseFixtureLoadingTests(TestCase):
         ])
 
 
-class FixtureLoadingTests(TestCase):
+class DumpDataAssertMixin(object):
 
     def _dumpdata_assert(self, args, output, format='json', natural_keys=False,
                          use_base_manager=False, exclude_list=[]):
@@ -34,7 +34,15 @@ class FixtureLoadingTests(TestCase):
                                                       'use_base_manager': use_base_manager,
                                                       'exclude': exclude_list})
         command_output = new_io.getvalue().strip()
-        self.assertEqual(command_output, output)
+        if format == "json":
+            self.assertJSONEqual(command_output, output)
+        elif format == "xml":
+            self.assertXMLEqual(command_output, output)
+        else:
+            self.assertEqual(command_output, output)
+
+
+class FixtureLoadingTests(DumpDataAssertMixin, TestCase):
 
     def test_initial_data(self):
         # syncdb introduces 1 initial data object from initial_data.json.
@@ -290,12 +298,7 @@ class FixtureLoadingTests(TestCase):
 <django-objects version="1.0"><object pk="1" model="fixtures.category"><field type="CharField" name="title">News Stories</field><field type="TextField" name="description">Latest news stories</field></object><object pk="2" model="fixtures.article"><field type="CharField" name="headline">Poker has no place on ESPN</field><field type="DateTimeField" name="pub_date">2006-06-16T12:00:00</field></object><object pk="3" model="fixtures.article"><field type="CharField" name="headline">Time to reform copyright</field><field type="DateTimeField" name="pub_date">2006-06-16T13:00:00</field></object><object pk="1" model="fixtures.tag"><field type="CharField" name="name">copyright</field><field to="contenttypes.contenttype" name="tagged_type" rel="ManyToOneRel"><natural>fixtures</natural><natural>article</natural></field><field type="PositiveIntegerField" name="tagged_id">3</field></object><object pk="2" model="fixtures.tag"><field type="CharField" name="name">law</field><field to="contenttypes.contenttype" name="tagged_type" rel="ManyToOneRel"><natural>fixtures</natural><natural>article</natural></field><field type="PositiveIntegerField" name="tagged_id">3</field></object><object pk="1" model="fixtures.person"><field type="CharField" name="name">Django Reinhardt</field></object><object pk="2" model="fixtures.person"><field type="CharField" name="name">Stephane Grappelli</field></object><object pk="3" model="fixtures.person"><field type="CharField" name="name">Prince</field></object><object pk="10" model="fixtures.book"><field type="CharField" name="name">Achieving self-awareness of Python programs</field><field to="fixtures.person" name="authors" rel="ManyToManyRel"></field></object></django-objects>""", format='xml', natural_keys=True)
 
 
-class FixtureTransactionTests(TransactionTestCase):
-    def _dumpdata_assert(self, args, output, format='json'):
-        new_io = six.StringIO()
-        management.call_command('dumpdata', *args, **{'format': format, 'stdout': new_io})
-        command_output = new_io.getvalue().strip()
-        self.assertEqual(command_output, output)
+class FixtureTransactionTests(DumpDataAssertMixin, TransactionTestCase):
 
     @skipUnlessDBFeature('supports_forward_references')
     def test_format_discovery(self):
diff --git a/tests/modeltests/fixtures_model_package/__init__.py b/tests/fixtures_model_package/__init__.py
similarity index 100%
rename from tests/modeltests/fixtures_model_package/__init__.py
rename to tests/fixtures_model_package/__init__.py
diff --git a/tests/modeltests/fixtures_model_package/fixtures/fixture1.json b/tests/fixtures_model_package/fixtures/fixture1.json
similarity index 100%
rename from tests/modeltests/fixtures_model_package/fixtures/fixture1.json
rename to tests/fixtures_model_package/fixtures/fixture1.json
diff --git a/tests/modeltests/fixtures_model_package/fixtures/fixture2.json b/tests/fixtures_model_package/fixtures/fixture2.json
similarity index 100%
rename from tests/modeltests/fixtures_model_package/fixtures/fixture2.json
rename to tests/fixtures_model_package/fixtures/fixture2.json
diff --git a/tests/modeltests/fixtures_model_package/fixtures/fixture2.xml b/tests/fixtures_model_package/fixtures/fixture2.xml
similarity index 100%
rename from tests/modeltests/fixtures_model_package/fixtures/fixture2.xml
rename to tests/fixtures_model_package/fixtures/fixture2.xml
diff --git a/tests/modeltests/fixtures_model_package/fixtures/initial_data.json b/tests/fixtures_model_package/fixtures/initial_data.json
similarity index 100%
rename from tests/modeltests/fixtures_model_package/fixtures/initial_data.json
rename to tests/fixtures_model_package/fixtures/initial_data.json
diff --git a/tests/modeltests/fixtures_model_package/models/__init__.py b/tests/fixtures_model_package/models/__init__.py
similarity index 100%
rename from tests/modeltests/fixtures_model_package/models/__init__.py
rename to tests/fixtures_model_package/models/__init__.py
diff --git a/tests/modeltests/fixtures_model_package/tests.py b/tests/fixtures_model_package/tests.py
similarity index 93%
rename from tests/modeltests/fixtures_model_package/tests.py
rename to tests/fixtures_model_package/tests.py
index d147fe68a7..c250f647ce 100644
--- a/tests/modeltests/fixtures_model_package/tests.py
+++ b/tests/fixtures_model_package/tests.py
@@ -25,7 +25,8 @@ class SampleTestCase(TestCase):
 
 class TestNoInitialDataLoading(TransactionTestCase):
     def test_syncdb(self):
-        with transaction.commit_manually():
+        transaction.set_autocommit(False)
+        try:
             Book.objects.all().delete()
 
             management.call_command(
@@ -35,6 +36,9 @@ class TestNoInitialDataLoading(TransactionTestCase):
             )
             self.assertQuerysetEqual(Book.objects.all(), [])
             transaction.rollback()
+        finally:
+            transaction.set_autocommit(True)
+
 
     def test_flush(self):
         # Test presence of fixture (flush called by TransactionTestCase)
@@ -45,7 +49,8 @@ class TestNoInitialDataLoading(TransactionTestCase):
             lambda a: a.name
         )
 
-        with transaction.commit_manually():
+        transaction.set_autocommit(False)
+        try:
             management.call_command(
                 'flush',
                 verbosity=0,
@@ -55,6 +60,8 @@ class TestNoInitialDataLoading(TransactionTestCase):
             )
             self.assertQuerysetEqual(Book.objects.all(), [])
             transaction.rollback()
+        finally:
+            transaction.set_autocommit(True)
 
 
 class FixtureTestCase(TestCase):
diff --git a/tests/modeltests/field_subclassing/__init__.py b/tests/fixtures_regress/__init__.py
similarity index 100%
rename from tests/modeltests/field_subclassing/__init__.py
rename to tests/fixtures_regress/__init__.py
diff --git a/tests/regressiontests/fixtures_regress/fixtures/absolute.json b/tests/fixtures_regress/fixtures/absolute.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/absolute.json
rename to tests/fixtures_regress/fixtures/absolute.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/animal.xml b/tests/fixtures_regress/fixtures/animal.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/animal.xml
rename to tests/fixtures_regress/fixtures/animal.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/bad_fixture1.unkn b/tests/fixtures_regress/fixtures/bad_fixture1.unkn
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/bad_fixture1.unkn
rename to tests/fixtures_regress/fixtures/bad_fixture1.unkn
diff --git a/tests/regressiontests/fixtures_regress/fixtures/bad_fixture2.xml b/tests/fixtures_regress/fixtures/bad_fixture2.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/bad_fixture2.xml
rename to tests/fixtures_regress/fixtures/bad_fixture2.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/big-fixture.json b/tests/fixtures_regress/fixtures/big-fixture.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/big-fixture.json
rename to tests/fixtures_regress/fixtures/big-fixture.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/empty.json b/tests/fixtures_regress/fixtures/empty.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/empty.json
rename to tests/fixtures_regress/fixtures/empty.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/forward_ref.json b/tests/fixtures_regress/fixtures/forward_ref.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/forward_ref.json
rename to tests/fixtures_regress/fixtures/forward_ref.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/forward_ref_bad_data.json b/tests/fixtures_regress/fixtures/forward_ref_bad_data.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/forward_ref_bad_data.json
rename to tests/fixtures_regress/fixtures/forward_ref_bad_data.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/forward_ref_lookup.json b/tests/fixtures_regress/fixtures/forward_ref_lookup.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/forward_ref_lookup.json
rename to tests/fixtures_regress/fixtures/forward_ref_lookup.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/model-inheritance.json b/tests/fixtures_regress/fixtures/model-inheritance.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/model-inheritance.json
rename to tests/fixtures_regress/fixtures/model-inheritance.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/nk-inheritance.json b/tests/fixtures_regress/fixtures/nk-inheritance.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/nk-inheritance.json
rename to tests/fixtures_regress/fixtures/nk-inheritance.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/nk-inheritance2.xml b/tests/fixtures_regress/fixtures/nk-inheritance2.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/nk-inheritance2.xml
rename to tests/fixtures_regress/fixtures/nk-inheritance2.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/non_natural_1.json b/tests/fixtures_regress/fixtures/non_natural_1.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/non_natural_1.json
rename to tests/fixtures_regress/fixtures/non_natural_1.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/non_natural_2.xml b/tests/fixtures_regress/fixtures/non_natural_2.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/non_natural_2.xml
rename to tests/fixtures_regress/fixtures/non_natural_2.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/pretty.xml b/tests/fixtures_regress/fixtures/pretty.xml
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/pretty.xml
rename to tests/fixtures_regress/fixtures/pretty.xml
diff --git a/tests/regressiontests/fixtures_regress/fixtures/sequence.json b/tests/fixtures_regress/fixtures/sequence.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/sequence.json
rename to tests/fixtures_regress/fixtures/sequence.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures/sequence_extra.json b/tests/fixtures_regress/fixtures/sequence_extra.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/sequence_extra.json
rename to tests/fixtures_regress/fixtures/sequence_extra.json
diff --git a/tests/fixtures_regress/fixtures/sequence_extra_xml.xml b/tests/fixtures_regress/fixtures/sequence_extra_xml.xml
new file mode 100644
index 0000000000..dd2ee7c28f
--- /dev/null
+++ b/tests/fixtures_regress/fixtures/sequence_extra_xml.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+    <object pk="1" model="fixtures_regress.animal">
+        <field type="CharField" name="name">Wolf</field>
+        <field type="CharField" name="extra_name">Super Wolf</field>
+        <field type="CharField" name="latin_name">Canis lupus</field>
+        <field type="IntegerField" name="count">3</field>
+        <field type="FloatField" name="weight">1.2</field>
+    </object>
+</django-objects>
diff --git a/tests/regressiontests/fixtures_regress/fixtures/thingy.json b/tests/fixtures_regress/fixtures/thingy.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures/thingy.json
rename to tests/fixtures_regress/fixtures/thingy.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures_1/forward_ref_1.json b/tests/fixtures_regress/fixtures_1/forward_ref_1.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures_1/forward_ref_1.json
rename to tests/fixtures_regress/fixtures_1/forward_ref_1.json
diff --git a/tests/regressiontests/fixtures_regress/fixtures_2/forward_ref_2.json b/tests/fixtures_regress/fixtures_2/forward_ref_2.json
similarity index 100%
rename from tests/regressiontests/fixtures_regress/fixtures_2/forward_ref_2.json
rename to tests/fixtures_regress/fixtures_2/forward_ref_2.json
diff --git a/tests/regressiontests/fixtures_regress/models.py b/tests/fixtures_regress/models.py
similarity index 100%
rename from tests/regressiontests/fixtures_regress/models.py
rename to tests/fixtures_regress/models.py
diff --git a/tests/regressiontests/fixtures_regress/tests.py b/tests/fixtures_regress/tests.py
similarity index 94%
rename from tests/regressiontests/fixtures_regress/tests.py
rename to tests/fixtures_regress/tests.py
index 988c5acd0c..02e923e386 100644
--- a/tests/regressiontests/fixtures_regress/tests.py
+++ b/tests/fixtures_regress/tests.py
@@ -18,6 +18,7 @@ from django.utils.encoding import force_text
 from django.utils._os import upath
 from django.utils import six
 from django.utils.six import PY3, StringIO
+import json
 
 from .models import (Animal, Stuff, Absolute, Parent, Child, Article, Widget,
     Store, Person, Book, NKChild, RefToNKChild, Circle1, Circle2, Circle3,
@@ -86,6 +87,20 @@ class TestFixtures(TestCase):
         )
         self.assertEqual(Animal.specimens.all()[0].name, 'Lion')
 
+    def test_loaddata_not_found_fields_ignore_xml(self):
+        """
+        Test for ticket #19998 -- Ignore entries in the XML serialised data
+        for fields that have been removed from the model definition.
+        """
+        management.call_command(
+            'loaddata',
+            'sequence_extra_xml',
+            ignore=True,
+            verbosity=0,
+            commit=False
+        )
+        self.assertEqual(Animal.specimens.all()[0].name, 'Wolf')
+
     @skipIfDBFeature('interprets_empty_strings_as_nulls')
     def test_pretty_print_xml(self):
         """
@@ -334,15 +349,17 @@ class TestFixtures(TestCase):
         # between different Python versions.
         data = re.sub('0{6,}\d', '', data)
 
-        lion_json = '{"pk": 1, "model": "fixtures_regress.animal", "fields": {"count": 3, "weight": 1.2, "name": "Lion", "latin_name": "Panthera leo"}}'
-        emu_json = '{"pk": 10, "model": "fixtures_regress.animal", "fields": {"count": 42, "weight": 1.2, "name": "Emu", "latin_name": "Dromaius novaehollandiae"}}'
-        platypus_json = '{"pk": %d, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.2, "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}'
-        platypus_json = platypus_json % animal.pk
+        animals_data = sorted([
+            {"pk": 1, "model": "fixtures_regress.animal", "fields": {"count": 3, "weight": 1.2, "name": "Lion", "latin_name": "Panthera leo"}},
+            {"pk": 10, "model": "fixtures_regress.animal", "fields": {"count": 42, "weight": 1.2, "name": "Emu", "latin_name": "Dromaius novaehollandiae"}},
+            {"pk": animal.pk, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.2, "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}},
+        ], key=lambda x: x["pk"])
+
+        data = sorted(json.loads(data), key=lambda x: x["pk"])
+
+        self.maxDiff = 1024
+        self.assertEqual(data, animals_data)
 
-        self.assertEqual(len(data), len('[%s]' % ', '.join([lion_json, emu_json, platypus_json])))
-        self.assertTrue(lion_json in data)
-        self.assertTrue(emu_json in data)
-        self.assertTrue(platypus_json in data)
 
     def test_proxy_model_included(self):
         """
@@ -358,7 +375,7 @@ class TestFixtures(TestCase):
             format='json',
             stdout=stdout
         )
-        self.assertEqual(
+        self.assertJSONEqual(
             stdout.getvalue(),
             """[{"pk": %d, "model": "fixtures_regress.widget", "fields": {"name": "grommet"}}]"""
             % widget.pk
@@ -519,7 +536,7 @@ class NaturalKeyFixtureTests(TestCase):
             use_natural_keys=True,
             stdout=stdout,
         )
-        self.assertEqual(
+        self.assertJSONEqual(
             stdout.getvalue(),
             """[{"pk": 2, "model": "fixtures_regress.store", "fields": {"main": null, "name": "Amazon"}}, {"pk": 3, "model": "fixtures_regress.store", "fields": {"main": null, "name": "Borders"}}, {"pk": 4, "model": "fixtures_regress.person", "fields": {"name": "Neal Stephenson"}}, {"pk": 1, "model": "fixtures_regress.book", "fields": {"stores": [["Amazon"], ["Borders"]], "name": "Cryptonomicon", "author": ["Neal Stephenson"]}}]"""
         )
@@ -681,5 +698,8 @@ class TestTicket11101(TransactionTestCase):
     @skipUnlessDBFeature('supports_transactions')
     def test_ticket_11101(self):
         """Test that fixtures can be rolled back (ticket #11101)."""
-        ticket_11101 = transaction.commit_manually(self.ticket_11101)
-        ticket_11101()
+        transaction.set_autocommit(False)
+        try:
+            self.ticket_11101()
+        finally:
+            transaction.set_autocommit(True)
diff --git a/tests/modeltests/force_insert_update/__init__.py b/tests/force_insert_update/__init__.py
similarity index 100%
rename from tests/modeltests/force_insert_update/__init__.py
rename to tests/force_insert_update/__init__.py
diff --git a/tests/modeltests/force_insert_update/models.py b/tests/force_insert_update/models.py
similarity index 100%
rename from tests/modeltests/force_insert_update/models.py
rename to tests/force_insert_update/models.py
diff --git a/tests/modeltests/force_insert_update/tests.py b/tests/force_insert_update/tests.py
similarity index 100%
rename from tests/modeltests/force_insert_update/tests.py
rename to tests/force_insert_update/tests.py
diff --git a/tests/modeltests/generic_relations/__init__.py b/tests/foreign_object/__init__.py
similarity index 100%
rename from tests/modeltests/generic_relations/__init__.py
rename to tests/foreign_object/__init__.py
diff --git a/tests/foreign_object/models.py b/tests/foreign_object/models.py
new file mode 100644
index 0000000000..2d02b5624c
--- /dev/null
+++ b/tests/foreign_object/models.py
@@ -0,0 +1,152 @@
+import datetime
+
+from django.db import models
+from django.db.models.fields.related import ReverseSingleRelatedObjectDescriptor
+from django.utils.encoding import python_2_unicode_compatible
+from django.utils.translation import get_language
+
+class Country(models.Model):
+    # Table Column Fields
+    name = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return self.name
+
+
+class Person(models.Model):
+    # Table Column Fields
+    name = models.CharField(max_length=128)
+    person_country_id = models.IntegerField()
+
+    # Relation Fields
+    person_country = models.ForeignObject(
+        Country, from_fields=['person_country_id'], to_fields=['id'])
+    friends = models.ManyToManyField('self', through='Friendship', symmetrical=False)
+
+    class Meta:
+        ordering = ('name',)
+
+    def __unicode__(self):
+        return self.name
+
+class Group(models.Model):
+    # Table Column Fields
+    name = models.CharField(max_length=128)
+    group_country = models.ForeignKey(Country)
+    members = models.ManyToManyField(Person, related_name='groups', through='Membership')
+
+    class Meta:
+        ordering = ('name',)
+
+    def __unicode__(self):
+        return self.name
+
+
+class Membership(models.Model):
+    # Table Column Fields
+    membership_country = models.ForeignKey(Country)
+    date_joined = models.DateTimeField(default=datetime.datetime.now)
+    invite_reason = models.CharField(max_length=64, null=True)
+    person_id = models.IntegerField()
+    group_id = models.IntegerField()
+
+    # Relation Fields
+    person = models.ForeignObject(Person,
+        from_fields=['membership_country', 'person_id'],
+        to_fields=['person_country_id', 'id'])
+    group = models.ForeignObject(Group,
+        from_fields=['membership_country', 'group_id'],
+        to_fields=['group_country', 'id'])
+
+    class Meta:
+        ordering = ('date_joined', 'invite_reason')
+
+    def __unicode__(self):
+        return "%s is a member of %s" % (self.person.name, self.group.name)
+
+
+class Friendship(models.Model):
+    # Table Column Fields
+    from_friend_country = models.ForeignKey(Country, related_name="from_friend_country")
+    from_friend_id = models.IntegerField()
+    to_friend_country_id = models.IntegerField()
+    to_friend_id = models.IntegerField()
+
+    # Relation Fields
+    from_friend = models.ForeignObject(Person,
+        from_fields=['from_friend_country', 'from_friend_id'],
+        to_fields=['person_country_id', 'id'],
+        related_name='from_friend')
+
+    to_friend_country = models.ForeignObject(Country,
+        from_fields=['to_friend_country_id'],
+        to_fields=['id'],
+        related_name='to_friend_country')
+
+    to_friend = models.ForeignObject(Person,
+        from_fields=['to_friend_country_id', 'to_friend_id'],
+        to_fields=['person_country_id', 'id'],
+        related_name='to_friend')
+
+class ArticleTranslationDescriptor(ReverseSingleRelatedObjectDescriptor):
+    """
+    The set of articletranslation should not set any local fields.
+    """
+    def __set__(self, instance, value):
+        if instance is None:
+            raise AttributeError("%s must be accessed via instance" % self.field.name)
+        setattr(instance, self.cache_name, value)
+        if value is not None and not self.field.rel.multiple:
+            setattr(value, self.field.related.get_cache_name(), instance)
+
+class ColConstraint(object):
+    # Antyhing with as_sql() method works in get_extra_restriction().
+    def __init__(self, alias, col, value):
+        self.alias, self.col, self.value = alias, col, value
+
+    def as_sql(self, qn, connection):
+        return '%s.%s = %%s' % (qn(self.alias), qn(self.col)), [self.value]
+
+class ActiveTranslationField(models.ForeignObject):
+    """
+    This field will allow querying and fetching the currently active translation
+    for Article from ArticleTranslation.
+    """
+    requires_unique_target = False
+
+    def get_extra_restriction(self, where_class, alias, related_alias):
+        return ColConstraint(alias, 'lang', get_language())
+
+    def get_extra_descriptor_filter(self):
+        return {'lang': get_language()}
+
+    def contribute_to_class(self, cls, name):
+        super(ActiveTranslationField, self).contribute_to_class(cls, name)
+        setattr(cls, self.name, ArticleTranslationDescriptor(self))
+
+@python_2_unicode_compatible
+class Article(models.Model):
+    active_translation = ActiveTranslationField(
+        'ArticleTranslation',
+        from_fields=['id'],
+        to_fields=['article'],
+        related_name='+',
+        null=True)
+    pub_date = models.DateField()
+
+    def __str__(self):
+        try:
+            return self.active_translation.title
+        except ArticleTranslation.DoesNotExist:
+            return '[No translation found]'
+
+class ArticleTranslation(models.Model):
+    article = models.ForeignKey(Article)
+    lang = models.CharField(max_length='2')
+    title = models.CharField(max_length=100)
+    body = models.TextField()
+    abstract = models.CharField(max_length=400, null=True)
+
+    class Meta:
+        unique_together = ('article', 'lang')
+        ordering = ('active_translation__title',)
diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py
new file mode 100644
index 0000000000..2ca13cb786
--- /dev/null
+++ b/tests/foreign_object/tests.py
@@ -0,0 +1,338 @@
+import datetime
+from operator import attrgetter
+
+from .models import Country, Person, Group, Membership, Friendship, Article, ArticleTranslation
+from django.test import TestCase
+from django.utils.translation import activate
+from django import forms
+
+class MultiColumnFKTests(TestCase):
+    def setUp(self):
+        # Creating countries
+        self.usa = Country.objects.create(name="United States of America")
+        self.soviet_union = Country.objects.create(name="Soviet Union")
+        Person()
+        # Creating People
+        self.bob = Person()
+        self.bob.name = 'Bob'
+        self.bob.person_country = self.usa
+        self.bob.save()
+        self.jim = Person.objects.create(name='Jim', person_country=self.usa)
+        self.george = Person.objects.create(name='George', person_country=self.usa)
+
+        self.jane = Person.objects.create(name='Jane', person_country=self.soviet_union)
+        self.mark = Person.objects.create(name='Mark', person_country=self.soviet_union)
+        self.sam = Person.objects.create(name='Sam', person_country=self.soviet_union)
+
+        # Creating Groups
+        self.kgb = Group.objects.create(name='KGB', group_country=self.soviet_union)
+        self.cia = Group.objects.create(name='CIA', group_country=self.usa)
+        self.republican = Group.objects.create(name='Republican', group_country=self.usa)
+        self.democrat = Group.objects.create(name='Democrat', group_country=self.usa)
+
+    def test_get_succeeds_on_multicolumn_match(self):
+        # Membership objects have access to their related Person if both
+        # country_ids match between them
+        membership = Membership.objects.create(
+            membership_country_id=self.usa.id, person_id=self.bob.id, group_id=self.cia.id)
+
+        person = membership.person
+        self.assertEqual((person.id, person.name), (self.bob.id, "Bob"))
+
+    def test_get_fails_on_multicolumn_mismatch(self):
+        # Membership objects returns DoesNotExist error when the there is no
+        # Person with the same id and country_id
+        membership = Membership.objects.create(
+            membership_country_id=self.usa.id, person_id=self.jane.id, group_id=self.cia.id)
+
+        self.assertRaises(Person.DoesNotExist, getattr, membership, 'person')
+
+    def test_reverse_query_returns_correct_result(self):
+        # Creating a valid membership because it has the same country has the person
+        Membership.objects.create(
+            membership_country_id=self.usa.id, person_id=self.bob.id, group_id=self.cia.id)
+
+        # Creating an invalid membership because it has a different country has the person
+        Membership.objects.create(
+            membership_country_id=self.soviet_union.id, person_id=self.bob.id,
+            group_id=self.republican.id)
+
+        self.assertQuerysetEqual(
+            self.bob.membership_set.all(), [
+                self.cia.id
+            ],
+            attrgetter("group_id")
+        )
+
+    def test_query_filters_correctly(self):
+
+        # Creating a to valid memberships
+        Membership.objects.create(
+            membership_country_id=self.usa.id, person_id=self.bob.id, group_id=self.cia.id)
+        Membership.objects.create(
+            membership_country_id=self.usa.id, person_id=self.jim.id,
+            group_id=self.cia.id)
+
+        # Creating an invalid membership
+        Membership.objects.create(membership_country_id=self.soviet_union.id,
+                                  person_id=self.george.id, group_id=self.cia.id)
+
+        self.assertQuerysetEqual(
+            Membership.objects.filter(person__name__contains='o'), [
+                self.bob.id
+            ],
+            attrgetter("person_id")
+        )
+
+    def test_reverse_query_filters_correctly(self):
+
+        timemark = datetime.datetime.utcnow()
+        timedelta = datetime.timedelta(days=1)
+
+        # Creating a to valid memberships
+        Membership.objects.create(
+            membership_country_id=self.usa.id, person_id=self.bob.id,
+            group_id=self.cia.id, date_joined=timemark - timedelta)
+        Membership.objects.create(
+            membership_country_id=self.usa.id, person_id=self.jim.id,
+            group_id=self.cia.id, date_joined=timemark + timedelta)
+
+        # Creating an invalid membership
+        Membership.objects.create(
+            membership_country_id=self.soviet_union.id, person_id=self.george.id,
+            group_id=self.cia.id, date_joined=timemark + timedelta)
+
+        self.assertQuerysetEqual(
+            Person.objects.filter(membership__date_joined__gte=timemark), [
+                'Jim'
+            ],
+            attrgetter('name')
+        )
+
+    def test_forward_in_lookup_filters_correctly(self):
+        Membership.objects.create(membership_country_id=self.usa.id, person_id=self.bob.id,
+                                  group_id=self.cia.id)
+        Membership.objects.create(membership_country_id=self.usa.id, person_id=self.jim.id,
+                                  group_id=self.cia.id)
+
+        # Creating an invalid membership
+        Membership.objects.create(
+            membership_country_id=self.soviet_union.id, person_id=self.george.id,
+            group_id=self.cia.id)
+
+        self.assertQuerysetEqual(
+            Membership.objects.filter(person__in=[self.george, self.jim]), [
+                self.jim.id,
+            ],
+            attrgetter('person_id')
+        )
+
+        self.assertQuerysetEqual(
+            Membership.objects.filter(person__in=Person.objects.filter(name='Jim')), [
+                self.jim.id,
+            ],
+            attrgetter('person_id')
+        )
+
+    def test_select_related_foreignkey_forward_works(self):
+        Membership.objects.create(membership_country=self.usa, person=self.bob, group=self.cia)
+        Membership.objects.create(membership_country=self.usa, person=self.jim, group=self.democrat)
+
+        with self.assertNumQueries(1):
+            people = [m.person for m in Membership.objects.select_related('person')]
+
+        normal_people = [m.person for m in Membership.objects.all()]
+        self.assertEqual(people, normal_people)
+
+    def test_prefetch_foreignkey_forward_works(self):
+        Membership.objects.create(membership_country=self.usa, person=self.bob, group=self.cia)
+        Membership.objects.create(membership_country=self.usa, person=self.jim, group=self.democrat)
+
+        with self.assertNumQueries(2):
+            people = [m.person for m in Membership.objects.prefetch_related('person')]
+
+        normal_people = [m.person for m in Membership.objects.all()]
+        self.assertEqual(people, normal_people)
+
+    def test_prefetch_foreignkey_reverse_works(self):
+        Membership.objects.create(membership_country=self.usa, person=self.bob, group=self.cia)
+        Membership.objects.create(membership_country=self.usa, person=self.jim, group=self.democrat)
+        with self.assertNumQueries(2):
+            membership_sets = [list(p.membership_set.all())
+                               for p in Person.objects.prefetch_related('membership_set')]
+
+        normal_membership_sets = [list(p.membership_set.all()) for p in Person.objects.all()]
+        self.assertEqual(membership_sets, normal_membership_sets)
+
+    def test_m2m_through_forward_returns_valid_members(self):
+        # We start out by making sure that the Group 'CIA' has no members.
+        self.assertQuerysetEqual(
+            self.cia.members.all(),
+            []
+        )
+
+        Membership.objects.create(membership_country=self.usa, person=self.bob, group=self.cia)
+        Membership.objects.create(membership_country=self.usa, person=self.jim, group=self.cia)
+
+        # Let's check to make sure that it worked.  Bob and Jim should be members of the CIA.
+
+        self.assertQuerysetEqual(
+            self.cia.members.all(), [
+                'Bob',
+                'Jim'
+            ], attrgetter("name")
+        )
+
+    def test_m2m_through_reverse_returns_valid_members(self):
+        # We start out by making sure that Bob is in no groups.
+        self.assertQuerysetEqual(
+            self.bob.groups.all(),
+            []
+        )
+
+        Membership.objects.create(membership_country=self.usa, person=self.bob, group=self.cia)
+        Membership.objects.create(membership_country=self.usa, person=self.bob,
+                                  group=self.republican)
+
+        # Bob should be in the CIA and a Republican
+        self.assertQuerysetEqual(
+            self.bob.groups.all(), [
+                'CIA',
+                'Republican'
+            ], attrgetter("name")
+        )
+
+    def test_m2m_through_forward_ignores_invalid_members(self):
+        # We start out by making sure that the Group 'CIA' has no members.
+        self.assertQuerysetEqual(
+            self.cia.members.all(),
+            []
+        )
+
+        # Something adds jane to group CIA but Jane is in Soviet Union which isn't CIA's country
+        Membership.objects.create(membership_country=self.usa, person=self.jane, group=self.cia)
+
+        # There should still be no members in CIA
+        self.assertQuerysetEqual(
+            self.cia.members.all(),
+            []
+        )
+
+    def test_m2m_through_reverse_ignores_invalid_members(self):
+        # We start out by making sure that Jane has no groups.
+        self.assertQuerysetEqual(
+            self.jane.groups.all(),
+            []
+        )
+
+        # Something adds jane to group CIA but Jane is in Soviet Union which isn't CIA's country
+        Membership.objects.create(membership_country=self.usa, person=self.jane, group=self.cia)
+
+        # Jane should still not be in any groups
+        self.assertQuerysetEqual(
+            self.jane.groups.all(),
+            []
+        )
+
+    def test_m2m_through_on_self_works(self):
+        self.assertQuerysetEqual(
+            self.jane.friends.all(),
+            []
+        )
+
+        Friendship.objects.create(
+            from_friend_country=self.jane.person_country, from_friend=self.jane,
+            to_friend_country=self.george.person_country, to_friend=self.george)
+
+        self.assertQuerysetEqual(
+            self.jane.friends.all(),
+            ['George'], attrgetter("name")
+        )
+
+    def test_m2m_through_on_self_ignores_mismatch_columns(self):
+        self.assertQuerysetEqual(self.jane.friends.all(), [])
+
+        # Note that we use ids instead of instances. This is because instances on ForeignObject
+        # properties will set all related field off of the given instance
+        Friendship.objects.create(
+            from_friend_id=self.jane.id, to_friend_id=self.george.id,
+            to_friend_country_id=self.jane.person_country_id,
+            from_friend_country_id=self.george.person_country_id)
+
+        self.assertQuerysetEqual(self.jane.friends.all(), [])
+
+    def test_prefetch_related_m2m_foward_works(self):
+        Membership.objects.create(membership_country=self.usa, person=self.bob, group=self.cia)
+        Membership.objects.create(membership_country=self.usa, person=self.jim, group=self.democrat)
+
+        with self.assertNumQueries(2):
+            members_lists = [list(g.members.all())
+                             for g in Group.objects.prefetch_related('members')]
+
+        normal_members_lists = [list(g.members.all()) for g in Group.objects.all()]
+        self.assertEqual(members_lists, normal_members_lists)
+
+    def test_prefetch_related_m2m_reverse_works(self):
+        Membership.objects.create(membership_country=self.usa, person=self.bob, group=self.cia)
+        Membership.objects.create(membership_country=self.usa, person=self.jim, group=self.democrat)
+
+        with self.assertNumQueries(2):
+            groups_lists = [list(p.groups.all()) for p in Person.objects.prefetch_related('groups')]
+
+        normal_groups_lists = [list(p.groups.all()) for p in Person.objects.all()]
+        self.assertEqual(groups_lists, normal_groups_lists)
+
+    def test_translations(self):
+        activate('fi')
+        a1 = Article.objects.create(pub_date=datetime.date.today())
+        at1_fi = ArticleTranslation(article=a1, lang='fi', title='Otsikko', body='Diipadaapa')
+        at1_fi.save()
+        at2_en = ArticleTranslation(article=a1, lang='en', title='Title', body='Lalalalala')
+        at2_en.save()
+        with self.assertNumQueries(1):
+            fetched = Article.objects.select_related('active_translation').get(
+                active_translation__title='Otsikko')
+            self.assertTrue(fetched.active_translation.title == 'Otsikko')
+        a2 = Article.objects.create(pub_date=datetime.date.today())
+        at2_fi = ArticleTranslation(article=a2, lang='fi', title='Atsikko', body='Diipadaapa',
+                                    abstract='dipad')
+        at2_fi.save()
+        a3 = Article.objects.create(pub_date=datetime.date.today())
+        at3_en = ArticleTranslation(article=a3, lang='en', title='A title', body='lalalalala',
+                                    abstract='lala')
+        at3_en.save()
+        # Test model initialization with active_translation field.
+        a3 = Article(id=a3.id, pub_date=a3.pub_date, active_translation=at3_en)
+        a3.save()
+        self.assertEqual(
+            list(Article.objects.filter(active_translation__abstract=None)),
+            [a1, a3])
+        self.assertEqual(
+            list(Article.objects.filter(active_translation__abstract=None,
+                                        active_translation__pk__isnull=False)),
+            [a1])
+        activate('en')
+        self.assertEqual(
+            list(Article.objects.filter(active_translation__abstract=None)),
+            [a1, a2])
+
+class FormsTests(TestCase):
+    # ForeignObjects should not have any form fields, currently the user needs
+    # to manually deal with the foreignobject relation.
+    class ArticleForm(forms.ModelForm):
+        class Meta:
+            model = Article
+
+    def test_foreign_object_form(self):
+        # A very crude test checking that the non-concrete fields do not get form fields.
+        form = FormsTests.ArticleForm()
+        self.assertIn('id_pub_date', form.as_table())
+        self.assertNotIn('active_translation', form.as_table())
+        form = FormsTests.ArticleForm(data={'pub_date': str(datetime.date.today())})
+        self.assertTrue(form.is_valid())
+        a = form.save()
+        self.assertEqual(a.pub_date, datetime.date.today())
+        form = FormsTests.ArticleForm(instance=a, data={'pub_date': '2013-01-01'})
+        a2 = form.save()
+        self.assertEqual(a.pk, a2.pk)
+        self.assertEqual(a2.pub_date, datetime.date(2013, 1, 1))
diff --git a/tests/modeltests/get_latest/__init__.py b/tests/forms_tests/__init__.py
similarity index 100%
rename from tests/modeltests/get_latest/__init__.py
rename to tests/forms_tests/__init__.py
diff --git a/tests/regressiontests/forms/models.py b/tests/forms_tests/models.py
similarity index 100%
rename from tests/regressiontests/forms/models.py
rename to tests/forms_tests/models.py
diff --git a/tests/regressiontests/forms/templates/forms/article_form.html b/tests/forms_tests/templates/forms_tests/article_form.html
similarity index 67%
rename from tests/regressiontests/forms/templates/forms/article_form.html
rename to tests/forms_tests/templates/forms_tests/article_form.html
index cde85051f6..de38466335 100644
--- a/tests/regressiontests/forms/templates/forms/article_form.html
+++ b/tests/forms_tests/templates/forms_tests/article_form.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-  <form method="post" action=".">
+  <form method="post" action=".">{% csrf_token %}
     {{ form.as_p }}<br>
     <input id="submit" type="submit">
   </form>
diff --git a/tests/forms_tests/tests/__init__.py b/tests/forms_tests/tests/__init__.py
new file mode 100644
index 0000000000..aea9418c05
--- /dev/null
+++ b/tests/forms_tests/tests/__init__.py
@@ -0,0 +1,21 @@
+from __future__ import absolute_import
+
+from .test_error_messages import (FormsErrorMessagesTestCase,
+    ModelChoiceFieldErrorMessagesTestCase)
+from .test_extra import FormsExtraTestCase, FormsExtraL10NTestCase
+from .test_fields import FieldsTests
+from .test_forms import FormsTestCase
+from .test_formsets import (FormsFormsetTestCase, FormsetAsFooTests,
+    TestIsBoundBehavior, TestEmptyFormSet)
+from .test_input_formats import (LocalizedTimeTests, CustomTimeInputFormatsTests,
+    SimpleTimeFormatTests, LocalizedDateTests, CustomDateInputFormatsTests,
+    SimpleDateFormatTests, LocalizedDateTimeTests,
+    CustomDateTimeInputFormatsTests, SimpleDateTimeFormatTests)
+from .test_media import FormsMediaTestCase, StaticFormsMediaTestCase
+from .tests import (TestTicket12510, TestTicket14567, ModelFormCallableModelDefault,
+    FormsModelTestCase, RelatedModelFormTests)
+from .test_regressions import FormsRegressionsTestCase
+from .test_util import FormsUtilTestCase
+from .test_validators import TestFieldWithValidators
+from .test_widgets import (FormsWidgetTestCase, FormsI18NWidgetsTestCase,
+    WidgetTests, LiveWidgetTests, ClearableFileInputTests)
diff --git a/tests/regressiontests/forms/tests/filepath_test_files/.dot-file b/tests/forms_tests/tests/filepath_test_files/.dot-file
similarity index 100%
rename from tests/regressiontests/forms/tests/filepath_test_files/.dot-file
rename to tests/forms_tests/tests/filepath_test_files/.dot-file
diff --git a/tests/regressiontests/forms/tests/filepath_test_files/directory/.keep b/tests/forms_tests/tests/filepath_test_files/directory/.keep
similarity index 100%
rename from tests/regressiontests/forms/tests/filepath_test_files/directory/.keep
rename to tests/forms_tests/tests/filepath_test_files/directory/.keep
diff --git a/tests/regressiontests/forms/tests/filepath_test_files/fake-image.jpg b/tests/forms_tests/tests/filepath_test_files/fake-image.jpg
similarity index 100%
rename from tests/regressiontests/forms/tests/filepath_test_files/fake-image.jpg
rename to tests/forms_tests/tests/filepath_test_files/fake-image.jpg
diff --git a/tests/regressiontests/forms/tests/filepath_test_files/real-text-file.txt b/tests/forms_tests/tests/filepath_test_files/real-text-file.txt
similarity index 100%
rename from tests/regressiontests/forms/tests/filepath_test_files/real-text-file.txt
rename to tests/forms_tests/tests/filepath_test_files/real-text-file.txt
diff --git a/tests/regressiontests/forms/tests/error_messages.py b/tests/forms_tests/tests/test_error_messages.py
similarity index 97%
rename from tests/regressiontests/forms/tests/error_messages.py
rename to tests/forms_tests/tests/test_error_messages.py
index b76e122bc0..9d45a46a3d 100644
--- a/tests/regressiontests/forms/tests/error_messages.py
+++ b/tests/forms_tests/tests/test_error_messages.py
@@ -60,9 +60,9 @@ class FormsErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
             'invalid': 'INVALID',
             'min_value': 'MIN VALUE IS %(limit_value)s',
             'max_value': 'MAX VALUE IS %(limit_value)s',
-            'max_digits': 'MAX DIGITS IS %s',
-            'max_decimal_places': 'MAX DP IS %s',
-            'max_whole_digits': 'MAX DIGITS BEFORE DP IS %s',
+            'max_digits': 'MAX DIGITS IS %(max)s',
+            'max_decimal_places': 'MAX DP IS %(max)s',
+            'max_whole_digits': 'MAX DIGITS BEFORE DP IS %(max)s',
         }
         f = DecimalField(min_value=5, max_value=10, error_messages=e)
         self.assertFormErrors(['REQUIRED'], f.clean, '')
@@ -237,7 +237,7 @@ class FormsErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
 class ModelChoiceFieldErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
     def test_modelchoicefield(self):
         # Create choices for the model choice field tests below.
-        from regressiontests.forms.models import ChoiceModel
+        from forms_tests.models import ChoiceModel
         c1 = ChoiceModel.objects.create(pk=1, name='a')
         c2 = ChoiceModel.objects.create(pk=2, name='b')
         c3 = ChoiceModel.objects.create(pk=3, name='c')
@@ -254,7 +254,7 @@ class ModelChoiceFieldErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
         # ModelMultipleChoiceField
         e = {
             'required': 'REQUIRED',
-            'invalid_choice': '%s IS INVALID CHOICE',
+            'invalid_choice': '%(value)s IS INVALID CHOICE',
             'list': 'NOT A LIST OF VALUES',
         }
         f = ModelMultipleChoiceField(queryset=ChoiceModel.objects.all(), error_messages=e)
diff --git a/tests/regressiontests/forms/tests/extra.py b/tests/forms_tests/tests/test_extra.py
similarity index 89%
rename from tests/regressiontests/forms/tests/extra.py
rename to tests/forms_tests/tests/test_extra.py
index 07acb29741..a83cdfc05f 100644
--- a/tests/regressiontests/forms/tests/extra.py
+++ b/tests/forms_tests/tests/test_extra.py
@@ -12,7 +12,7 @@ from django.utils import six
 from django.utils import translation
 from django.utils.encoding import force_text, smart_text, python_2_unicode_compatible
 
-from .error_messages import AssertFormErrorsMixin
+from .test_error_messages import AssertFormErrorsMixin
 
 
 class GetDate(Form):
@@ -428,6 +428,23 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         # If insufficient data is provided, None is substituted
         self.assertFormErrors(['This field is required.'], f.clean, ['some text',['JP']])
 
+        # test with no initial data
+        self.assertTrue(f._has_changed(None, ['some text', ['J','P'], ['2007-04-25','6:24:00']]))
+
+        # test when the data is the same as initial
+        self.assertFalse(f._has_changed('some text,JP,2007-04-25 06:24:00',
+            ['some text', ['J','P'], ['2007-04-25','6:24:00']]))
+
+        # test when the first widget's data has changed
+        self.assertTrue(f._has_changed('some text,JP,2007-04-25 06:24:00',
+            ['other text', ['J','P'], ['2007-04-25','6:24:00']]))
+
+        # test when the last widget's data has changed. this ensures that it is not
+        # short circuiting while testing the widgets.
+        self.assertTrue(f._has_changed('some text,JP,2007-04-25 06:24:00',
+            ['some text', ['J','P'], ['2009-04-25','11:44:00']]))
+
+
         class ComplexFieldForm(Form):
             field1 = ComplexField(widget=w)
 
@@ -457,7 +474,7 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         f = IPAddressField()
         self.assertFormErrors(['This field is required.'], f.clean, '')
         self.assertFormErrors(['This field is required.'], f.clean, None)
-        self.assertEqual(f.clean('127.0.0.1'), '127.0.0.1')
+        self.assertEqual(f.clean(' 127.0.0.1'), '127.0.0.1')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, 'foo')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, '127.0.0.')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, '1.2.3.4.5')
@@ -466,7 +483,7 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         f = IPAddressField(required=False)
         self.assertEqual(f.clean(''), '')
         self.assertEqual(f.clean(None), '')
-        self.assertEqual(f.clean('127.0.0.1'), '127.0.0.1')
+        self.assertEqual(f.clean(' 127.0.0.1'), '127.0.0.1')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, 'foo')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, '127.0.0.')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, '1.2.3.4.5')
@@ -482,24 +499,24 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         f = GenericIPAddressField()
         self.assertFormErrors(['This field is required.'], f.clean, '')
         self.assertFormErrors(['This field is required.'], f.clean, None)
-        self.assertEqual(f.clean('127.0.0.1'), '127.0.0.1')
+        self.assertEqual(f.clean(' 127.0.0.1 '), '127.0.0.1')
         self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, 'foo')
         self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '127.0.0.')
         self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '1.2.3.4.5')
         self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '256.125.1.5')
-        self.assertEqual(f.clean('fe80::223:6cff:fe8a:2e8a'), 'fe80::223:6cff:fe8a:2e8a')
-        self.assertEqual(f.clean('2a02::223:6cff:fe8a:2e8a'), '2a02::223:6cff:fe8a:2e8a')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '12345:2:3:4')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '1::2:3::4')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, 'foo::223:6cff:fe8a:2e8a')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '1::2:3:4:5:6:7:8')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '1:2')
+        self.assertEqual(f.clean(' fe80::223:6cff:fe8a:2e8a '), 'fe80::223:6cff:fe8a:2e8a')
+        self.assertEqual(f.clean(' 2a02::223:6cff:fe8a:2e8a '), '2a02::223:6cff:fe8a:2e8a')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '12345:2:3:4')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1::2:3::4')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, 'foo::223:6cff:fe8a:2e8a')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1::2:3:4:5:6:7:8')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1:2')
 
     def test_generic_ipaddress_as_ipv4_only(self):
         f = GenericIPAddressField(protocol="IPv4")
         self.assertFormErrors(['This field is required.'], f.clean, '')
         self.assertFormErrors(['This field is required.'], f.clean, None)
-        self.assertEqual(f.clean('127.0.0.1'), '127.0.0.1')
+        self.assertEqual(f.clean(' 127.0.0.1 '), '127.0.0.1')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, 'foo')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, '127.0.0.')
         self.assertFormErrors(['Enter a valid IPv4 address.'], f.clean, '1.2.3.4.5')
@@ -516,13 +533,13 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         self.assertFormErrors(['Enter a valid IPv6 address.'], f.clean, '127.0.0.')
         self.assertFormErrors(['Enter a valid IPv6 address.'], f.clean, '1.2.3.4.5')
         self.assertFormErrors(['Enter a valid IPv6 address.'], f.clean, '256.125.1.5')
-        self.assertEqual(f.clean('fe80::223:6cff:fe8a:2e8a'), 'fe80::223:6cff:fe8a:2e8a')
-        self.assertEqual(f.clean('2a02::223:6cff:fe8a:2e8a'), '2a02::223:6cff:fe8a:2e8a')
-        self.assertFormErrors(['Enter a valid IPv6 address.'], f.clean, '12345:2:3:4')
-        self.assertFormErrors(['Enter a valid IPv6 address.'], f.clean, '1::2:3::4')
-        self.assertFormErrors(['Enter a valid IPv6 address.'], f.clean, 'foo::223:6cff:fe8a:2e8a')
-        self.assertFormErrors(['Enter a valid IPv6 address.'], f.clean, '1::2:3:4:5:6:7:8')
-        self.assertFormErrors(['Enter a valid IPv6 address.'], f.clean, '1:2')
+        self.assertEqual(f.clean(' fe80::223:6cff:fe8a:2e8a '), 'fe80::223:6cff:fe8a:2e8a')
+        self.assertEqual(f.clean(' 2a02::223:6cff:fe8a:2e8a '), '2a02::223:6cff:fe8a:2e8a')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '12345:2:3:4')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1::2:3::4')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, 'foo::223:6cff:fe8a:2e8a')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1::2:3:4:5:6:7:8')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1:2')
 
     def test_generic_ipaddress_as_generic_not_required(self):
         f = GenericIPAddressField(required=False)
@@ -533,24 +550,24 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '127.0.0.')
         self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '1.2.3.4.5')
         self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '256.125.1.5')
-        self.assertEqual(f.clean('fe80::223:6cff:fe8a:2e8a'), 'fe80::223:6cff:fe8a:2e8a')
-        self.assertEqual(f.clean('2a02::223:6cff:fe8a:2e8a'), '2a02::223:6cff:fe8a:2e8a')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '12345:2:3:4')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '1::2:3::4')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, 'foo::223:6cff:fe8a:2e8a')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '1::2:3:4:5:6:7:8')
-        self.assertFormErrors(['Enter a valid IPv4 or IPv6 address.'], f.clean, '1:2')
+        self.assertEqual(f.clean(' fe80::223:6cff:fe8a:2e8a '), 'fe80::223:6cff:fe8a:2e8a')
+        self.assertEqual(f.clean(' 2a02::223:6cff:fe8a:2e8a '), '2a02::223:6cff:fe8a:2e8a')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '12345:2:3:4')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1::2:3::4')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, 'foo::223:6cff:fe8a:2e8a')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1::2:3:4:5:6:7:8')
+        self.assertFormErrors(['This is not a valid IPv6 address.'], f.clean, '1:2')
 
     def test_generic_ipaddress_normalization(self):
         # Test the normalising code
         f = GenericIPAddressField()
-        self.assertEqual(f.clean('::ffff:0a0a:0a0a'), '::ffff:10.10.10.10')
-        self.assertEqual(f.clean('::ffff:10.10.10.10'), '::ffff:10.10.10.10')
-        self.assertEqual(f.clean('2001:000:a:0000:0:fe:fe:beef'), '2001:0:a::fe:fe:beef')
-        self.assertEqual(f.clean('2001::a:0000:0:fe:fe:beef'), '2001:0:a::fe:fe:beef')
+        self.assertEqual(f.clean(' ::ffff:0a0a:0a0a  '), '::ffff:10.10.10.10')
+        self.assertEqual(f.clean(' ::ffff:10.10.10.10  '), '::ffff:10.10.10.10')
+        self.assertEqual(f.clean(' 2001:000:a:0000:0:fe:fe:beef  '), '2001:0:a::fe:fe:beef')
+        self.assertEqual(f.clean(' 2001::a:0000:0:fe:fe:beef  '), '2001:0:a::fe:fe:beef')
 
         f = GenericIPAddressField(unpack_ipv4=True)
-        self.assertEqual(f.clean('::ffff:0a0a:0a0a'), '10.10.10.10')
+        self.assertEqual(f.clean(' ::ffff:0a0a:0a0a'), '10.10.10.10')
 
     def test_smart_text(self):
         class Test:
@@ -614,7 +631,7 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
         f = CommentForm(data, auto_id=False, error_class=DivErrorList)
         self.assertHTMLEqual(f.as_p(), """<p>Name: <input type="text" name="name" maxlength="50" /></p>
 <div class="errorlist"><div class="error">Enter a valid email address.</div></div>
-<p>Email: <input type="text" name="email" value="invalid" /></p>
+<p>Email: <input type="email" name="email" value="invalid" /></p>
 <div class="errorlist"><div class="error">This field is required.</div></div>
 <p>Comment: <input type="text" name="comment" /></p>""")
 
@@ -725,8 +742,8 @@ class FormsExtraL10NTestCase(TestCase):
 
     def test_l10n_date_changed(self):
         """
-        Ensure that SelectDateWidget._has_changed() works correctly with a
-        localized date format.
+        Ensure that DateField._has_changed() with SelectDateWidget works
+        correctly with a localized date format.
         Refs #17165.
         """
         # With Field.show_hidden_initial=False -----------------------
diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/forms_tests/tests/test_fields.py
similarity index 87%
rename from tests/regressiontests/forms/tests/fields.py
rename to tests/forms_tests/tests/test_fields.py
index e17d976fcf..7516de29b4 100644
--- a/tests/regressiontests/forms/tests/fields.py
+++ b/tests/forms_tests/tests/test_fields.py
@@ -35,7 +35,9 @@ from decimal import Decimal
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.forms import *
 from django.test import SimpleTestCase
+from django.utils import formats
 from django.utils import six
+from django.utils import translation
 from django.utils._os import upath
 
 
@@ -52,10 +54,29 @@ def fix_os_paths(x):
 
 class FieldsTests(SimpleTestCase):
 
+    def assertWidgetRendersTo(self, field, to):
+        class _Form(Form):
+            f = field
+        self.assertHTMLEqual(str(_Form()['f']), to)
+
     def test_field_sets_widget_is_required(self):
         self.assertTrue(Field(required=True).widget.is_required)
         self.assertFalse(Field(required=False).widget.is_required)
 
+    def test_cooperative_multiple_inheritance(self):
+        class A(object):
+            def __init__(self):
+                self.class_a_var = True
+                super(A, self).__init__()
+
+
+        class ComplexField(Field, A):
+            def __init__(self):
+                super(ComplexField, self).__init__()
+
+        f = ComplexField()
+        self.assertTrue(f.class_a_var)
+
     # CharField ###################################################################
 
     def test_charfield_1(self):
@@ -125,6 +146,7 @@ class FieldsTests(SimpleTestCase):
 
     def test_integerfield_1(self):
         f = IntegerField()
+        self.assertWidgetRendersTo(f, '<input type="number" name="f" id="id_f" />')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, '')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, None)
         self.assertEqual(1, f.clean('1'))
@@ -159,6 +181,7 @@ class FieldsTests(SimpleTestCase):
 
     def test_integerfield_3(self):
         f = IntegerField(max_value=10)
+        self.assertWidgetRendersTo(f, '<input max="10" type="number" name="f" id="id_f" />')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, None)
         self.assertEqual(1, f.clean(1))
         self.assertEqual(10, f.clean(10))
@@ -170,6 +193,7 @@ class FieldsTests(SimpleTestCase):
 
     def test_integerfield_4(self):
         f = IntegerField(min_value=10)
+        self.assertWidgetRendersTo(f, '<input id="id_f" type="number" name="f" min="10" />')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, None)
         self.assertRaisesMessage(ValidationError, "'Ensure this value is greater than or equal to 10.'", f.clean, 1)
         self.assertEqual(10, f.clean(10))
@@ -181,6 +205,7 @@ class FieldsTests(SimpleTestCase):
 
     def test_integerfield_5(self):
         f = IntegerField(min_value=10, max_value=20)
+        self.assertWidgetRendersTo(f, '<input id="id_f" max="20" type="number" name="f" min="10" />')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, None)
         self.assertRaisesMessage(ValidationError, "'Ensure this value is greater than or equal to 10.'", f.clean, 1)
         self.assertEqual(10, f.clean(10))
@@ -192,10 +217,19 @@ class FieldsTests(SimpleTestCase):
         self.assertEqual(f.max_value, 20)
         self.assertEqual(f.min_value, 10)
 
+    def test_integerfield_localized(self):
+        """
+        Make sure localized IntegerField's widget renders to a text input with
+        no number input specific attributes.
+        """
+        f1 = IntegerField(localize=True)
+        self.assertWidgetRendersTo(f1, '<input id="id_f" name="f" type="text" />')
+
     # FloatField ##################################################################
 
     def test_floatfield_1(self):
         f = FloatField()
+        self.assertWidgetRendersTo(f, '<input step="any" type="number" name="f" id="id_f" />')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, '')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, None)
         self.assertEqual(1.0, f.clean('1'))
@@ -222,6 +256,7 @@ class FieldsTests(SimpleTestCase):
 
     def test_floatfield_3(self):
         f = FloatField(max_value=1.5, min_value=0.5)
+        self.assertWidgetRendersTo(f, '<input step="any" name="f" min="0.5" max="1.5" type="number" id="id_f" />')
         self.assertRaisesMessage(ValidationError, "'Ensure this value is less than or equal to 1.5.'", f.clean, '1.6')
         self.assertRaisesMessage(ValidationError, "'Ensure this value is greater than or equal to 0.5.'", f.clean, '0.4')
         self.assertEqual(1.5, f.clean('1.5'))
@@ -229,10 +264,30 @@ class FieldsTests(SimpleTestCase):
         self.assertEqual(f.max_value, 1.5)
         self.assertEqual(f.min_value, 0.5)
 
+    def test_floatfield_localized(self):
+        """
+        Make sure localized FloatField's widget renders to a text input with
+        no number input specific attributes.
+        """
+        f = FloatField(localize=True)
+        self.assertWidgetRendersTo(f, '<input id="id_f" name="f" type="text" />')
+
+    def test_floatfield_changed(self):
+        f = FloatField()
+        n = 4.35
+        self.assertFalse(f._has_changed(n, '4.3500'))
+
+        with translation.override('fr'):
+            with self.settings(USE_L10N=True):
+                f = FloatField(localize=True)
+                localized_n = formats.localize_input(n)  # -> '4,35' in French
+                self.assertFalse(f._has_changed(n, localized_n))
+
     # DecimalField ################################################################
 
     def test_decimalfield_1(self):
         f = DecimalField(max_digits=4, decimal_places=2)
+        self.assertWidgetRendersTo(f, '<input id="id_f" step="0.01" type="number" name="f" maxlength="6" />')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, '')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, None)
         self.assertEqual(f.clean('1'), Decimal("1"))
@@ -278,6 +333,7 @@ class FieldsTests(SimpleTestCase):
 
     def test_decimalfield_3(self):
         f = DecimalField(max_digits=4, decimal_places=2, max_value=Decimal('1.5'), min_value=Decimal('0.5'))
+        self.assertWidgetRendersTo(f, '<input step="0.01" name="f" min="0.5" max="1.5" maxlength="6" type="number" id="id_f" />')
         self.assertRaisesMessage(ValidationError, "'Ensure this value is less than or equal to 1.5.'", f.clean, '1.6')
         self.assertRaisesMessage(ValidationError, "'Ensure this value is greater than or equal to 0.5.'", f.clean, '0.4')
         self.assertEqual(f.clean('1.5'), Decimal("1.5"))
@@ -309,6 +365,26 @@ class FieldsTests(SimpleTestCase):
         self.assertEqual(f.clean('.01'), Decimal(".01"))
         self.assertRaisesMessage(ValidationError, "'Ensure that there are no more than 0 digits before the decimal point.'", f.clean, '1.1')
 
+    def test_decimalfield_localized(self):
+        """
+        Make sure localized DecimalField's widget renders to a text input with
+        no number input specific attributes.
+        """
+        f = DecimalField(localize=True)
+        self.assertWidgetRendersTo(f, '<input id="id_f" name="f" type="text" />')
+
+    def test_decimalfield_changed(self):
+        f = DecimalField(max_digits=2, decimal_places=2)
+        d = Decimal("0.1")
+        self.assertFalse(f._has_changed(d, '0.10'))
+        self.assertTrue(f._has_changed(d, '0.101'))
+
+        with translation.override('fr'):
+            with self.settings(USE_L10N=True):
+                f = DecimalField(max_digits=2, decimal_places=2, localize=True)
+                localized_d = formats.localize_input(d)  # -> '0,1' in French
+                self.assertFalse(f._has_changed(d, localized_d))
+
     # DateField ###################################################################
 
     def test_datefield_1(self):
@@ -362,6 +438,22 @@ class FieldsTests(SimpleTestCase):
         f = DateField()
         self.assertRaisesMessage(ValidationError, "'Enter a valid date.'", f.clean, 'a\x00b')
 
+    def test_datefield_changed(self):
+        format = '%d/%m/%Y'
+        f = DateField(input_formats=[format])
+        d = datetime.date(2007, 9, 17)
+        self.assertFalse(f._has_changed(d, '17/09/2007'))
+
+    def test_datefield_strptime(self):
+        """Test that field.strptime doesn't raise an UnicodeEncodeError (#16123)"""
+        f = DateField()
+        try:
+            f.strptime('31 мая 2011', '%d-%b-%y')
+        except Exception as e:
+            # assertIsInstance or assertRaises cannot be used because UnicodeEncodeError
+            # is a subclass of ValueError
+            self.assertEqual(e.__class__, ValueError)
+
     # TimeField ###################################################################
 
     def test_timefield_1(self):
@@ -388,6 +480,14 @@ class FieldsTests(SimpleTestCase):
         self.assertEqual(datetime.time(14, 25, 59), f.clean(' 14:25:59 '))
         self.assertRaisesMessage(ValidationError, "'Enter a valid time.'", f.clean, '   ')
 
+    def test_timefield_changed(self):
+        t1 = datetime.time(12, 51, 34, 482548)
+        t2 = datetime.time(12, 51)
+        f = TimeField(input_formats=['%H:%M', '%H:%M %p'])
+        self.assertTrue(f._has_changed(t1, '12:51'))
+        self.assertFalse(f._has_changed(t2, '12:51'))
+        self.assertFalse(f._has_changed(t2, '12:51 PM'))
+
     # DateTimeField ###############################################################
 
     def test_datetimefield_1(self):
@@ -446,6 +546,13 @@ class FieldsTests(SimpleTestCase):
     def test_datetimefield_5(self):
         f = DateTimeField(input_formats=['%Y.%m.%d %H:%M:%S.%f'])
         self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45, 200), f.clean('2006.10.25 14:30:45.0002'))
+
+    def test_datetimefield_changed(self):
+        format = '%Y %m %d %I:%M %p'
+        f = DateTimeField(input_formats=[format])
+        d = datetime.datetime(2006, 9, 17, 14, 30, 0)
+        self.assertFalse(f._has_changed(d, '2006 09 17 2:30 PM'))
+
     # RegexField ##################################################################
 
     def test_regexfield_1(self):
@@ -502,10 +609,11 @@ class FieldsTests(SimpleTestCase):
         self.assertRaisesMessage(ValidationError, "'Enter a valid value.'", f.clean, 'abcd')
 
     # EmailField ##################################################################
-    # See also modeltests/validators tests for validate_email specific tests
+    # See also validators tests for validate_email specific tests
 
     def test_emailfield_1(self):
         f = EmailField()
+        self.assertWidgetRendersTo(f, '<input type="email" name="f" id="id_f" />')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, '')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, None)
         self.assertEqual('person@example.com', f.clean('person@example.com'))
@@ -530,6 +638,7 @@ class FieldsTests(SimpleTestCase):
 
     def test_emailfield_min_max_length(self):
         f = EmailField(min_length=10, max_length=15)
+        self.assertWidgetRendersTo(f, '<input id="id_f" type="email" name="f" maxlength="15" />')
         self.assertRaisesMessage(ValidationError, "'Ensure this value has at least 10 characters (it has 9).'", f.clean, 'a@foo.com')
         self.assertEqual('alf@foo.com', f.clean('alf@foo.com'))
         self.assertRaisesMessage(ValidationError, "'Ensure this value has at most 15 characters (it has 20).'", f.clean, 'alf123456788@foo.com')
@@ -566,10 +675,34 @@ class FieldsTests(SimpleTestCase):
         self.assertEqual(SimpleUploadedFile,
                          type(f.clean(SimpleUploadedFile('name', b''))))
 
+    def test_filefield_changed(self):
+        '''
+        Test for the behavior of _has_changed for FileField. The value of data will
+        more than likely come from request.FILES. The value of initial data will
+        likely be a filename stored in the database. Since its value is of no use to
+        a FileField it is ignored.
+        '''
+        f = FileField()
+
+        # No file was uploaded and no initial data.
+        self.assertFalse(f._has_changed('', None))
+
+        # A file was uploaded and no initial data.
+        self.assertTrue(f._has_changed('', {'filename': 'resume.txt', 'content': 'My resume'}))
+
+        # A file was not uploaded, but there is initial data
+        self.assertFalse(f._has_changed('resume.txt', None))
+
+        # A file was uploaded and there is initial data (file identity is not dealt
+        # with here)
+        self.assertTrue(f._has_changed('resume.txt', {'filename': 'resume.txt', 'content': 'My resume'}))
+
+
     # URLField ##################################################################
 
     def test_urlfield_1(self):
         f = URLField()
+        self.assertWidgetRendersTo(f, '<input type="url" name="f" id="id_f" />')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, '')
         self.assertRaisesMessage(ValidationError, "'This field is required.'", f.clean, None)
         self.assertEqual('http://localhost/', f.clean('http://localhost'))
@@ -621,6 +754,7 @@ class FieldsTests(SimpleTestCase):
 
     def test_urlfield_5(self):
         f = URLField(min_length=15, max_length=20)
+        self.assertWidgetRendersTo(f, '<input id="id_f" type="url" name="f" maxlength="20" />')
         self.assertRaisesMessage(ValidationError, "'Ensure this value has at least 15 characters (it has 13).'", f.clean, 'http://f.com')
         self.assertEqual('http://example.com/', f.clean('http://example.com'))
         self.assertRaisesMessage(ValidationError, "'Ensure this value has at most 20 characters (it has 38).'", f.clean, 'http://abcdefghijklmnopqrstuvwxyz.com')
@@ -709,6 +843,18 @@ class FieldsTests(SimpleTestCase):
     def test_boolean_picklable(self):
         self.assertIsInstance(pickle.loads(pickle.dumps(BooleanField())), BooleanField)
 
+    def test_booleanfield_changed(self):
+        f = BooleanField()
+        self.assertFalse(f._has_changed(None, None))
+        self.assertFalse(f._has_changed(None, ''))
+        self.assertFalse(f._has_changed('', None))
+        self.assertFalse(f._has_changed('', ''))
+        self.assertTrue(f._has_changed(False, 'on'))
+        self.assertFalse(f._has_changed(True, 'on'))
+        self.assertTrue(f._has_changed(True, ''))
+        # Initial value may have mutated to a string due to show_hidden_initial (#19537)
+        self.assertTrue(f._has_changed('False', 'on'))
+
     # ChoiceField #################################################################
 
     def test_choicefield_1(self):
@@ -779,6 +925,11 @@ class FieldsTests(SimpleTestCase):
         f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=False, empty_value=None)
         self.assertEqual(None, f.clean(''))
 
+    def test_typedchoicefield_has_changed(self):
+        # has_changed should not trigger required validation
+        f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=True)
+        self.assertFalse(f._has_changed(None, ''))
+
     # NullBooleanField ############################################################
 
     def test_nullbooleanfield_1(self):
@@ -825,6 +976,16 @@ class FieldsTests(SimpleTestCase):
         self.assertEqual(False, f.cleaned_data['nullbool1'])
         self.assertEqual(None, f.cleaned_data['nullbool2'])
 
+    def test_nullbooleanfield_changed(self):
+        f = NullBooleanField()
+        self.assertTrue(f._has_changed(False, None))
+        self.assertTrue(f._has_changed(None, False))
+        self.assertFalse(f._has_changed(None, None))
+        self.assertFalse(f._has_changed(False, False))
+        self.assertTrue(f._has_changed(True, False))
+        self.assertTrue(f._has_changed(True, None))
+        self.assertTrue(f._has_changed(True, False))
+
     # MultipleChoiceField #########################################################
 
     def test_multiplechoicefield_1(self):
@@ -866,6 +1027,16 @@ class FieldsTests(SimpleTestCase):
         self.assertRaisesMessage(ValidationError, "'Select a valid choice. 6 is not one of the available choices.'", f.clean, ['6'])
         self.assertRaisesMessage(ValidationError, "'Select a valid choice. 6 is not one of the available choices.'", f.clean, ['1','6'])
 
+    def test_multiplechoicefield_changed(self):
+        f = MultipleChoiceField(choices=[('1', 'One'), ('2', 'Two'), ('3', 'Three')])
+        self.assertFalse(f._has_changed(None, None))
+        self.assertFalse(f._has_changed([], None))
+        self.assertTrue(f._has_changed(None, ['1']))
+        self.assertFalse(f._has_changed([1, 2], ['1', '2']))
+        self.assertFalse(f._has_changed([2, 1], ['1', '2']))
+        self.assertTrue(f._has_changed([1, 2], ['1']))
+        self.assertTrue(f._has_changed([1, 2], ['1', '3']))
+
     # TypedMultipleChoiceField ############################################################
     # TypedMultipleChoiceField is just like MultipleChoiceField, except that coerced types
     # will be returned:
@@ -908,6 +1079,11 @@ class FieldsTests(SimpleTestCase):
         f = TypedMultipleChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=False, empty_value=None)
         self.assertEqual(None, f.clean([]))
 
+    def test_typedmultiplechoicefield_has_changed(self):
+        # has_changed should not trigger required validation
+        f = TypedMultipleChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=True)
+        self.assertFalse(f._has_changed(None, ''))
+
    # ComboField ##################################################################
 
     def test_combofield_1(self):
@@ -997,7 +1173,7 @@ class FieldsTests(SimpleTestCase):
         f = FilePathField(path=path, allow_folders=True, allow_files=False)
         f.choices.sort()
         expected = [
-            ('/tests/regressiontests/forms/tests/filepath_test_files/directory', 'directory'),
+            ('/tests/forms_tests/tests/filepath_test_files/directory', 'directory'),
         ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
             self.assertEqual(exp[1], got[1])
@@ -1006,10 +1182,10 @@ class FieldsTests(SimpleTestCase):
         f = FilePathField(path=path, allow_folders=True, allow_files=True)
         f.choices.sort()
         expected = [
-            ('/tests/regressiontests/forms/tests/filepath_test_files/.dot-file', '.dot-file'),
-            ('/tests/regressiontests/forms/tests/filepath_test_files/directory', 'directory'),
-            ('/tests/regressiontests/forms/tests/filepath_test_files/fake-image.jpg', 'fake-image.jpg'),
-            ('/tests/regressiontests/forms/tests/filepath_test_files/real-text-file.txt', 'real-text-file.txt'),
+            ('/tests/forms_tests/tests/filepath_test_files/.dot-file', '.dot-file'),
+            ('/tests/forms_tests/tests/filepath_test_files/directory', 'directory'),
+            ('/tests/forms_tests/tests/filepath_test_files/fake-image.jpg', 'fake-image.jpg'),
+            ('/tests/forms_tests/tests/filepath_test_files/real-text-file.txt', 'real-text-file.txt'),
         ]
 
         actual = fix_os_paths(f.choices)
@@ -1048,3 +1224,9 @@ class FieldsTests(SimpleTestCase):
         self.assertRaisesMessage(ValidationError, "'Enter a valid time.'", f.clean, ['2006-01-10', ''])
         self.assertRaisesMessage(ValidationError, "'Enter a valid time.'", f.clean, ['2006-01-10'])
         self.assertRaisesMessage(ValidationError, "'Enter a valid date.'", f.clean, ['', '07:30'])
+
+    def test_splitdatetimefield_changed(self):
+        f = SplitDateTimeField(input_date_formats=['%d/%m/%Y'])
+        self.assertTrue(f._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), ['2008-05-06', '12:40:00']))
+        self.assertFalse(f._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), ['06/05/2008', '12:40']))
+        self.assertTrue(f._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), ['06/05/2008', '12:41']))
diff --git a/tests/regressiontests/forms/tests/forms.py b/tests/forms_tests/tests/test_forms.py
similarity index 95%
rename from tests/regressiontests/forms/tests/forms.py
rename to tests/forms_tests/tests/test_forms.py
index 1c83ed04d4..45e62a492c 100644
--- a/tests/regressiontests/forms/tests/forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -11,6 +11,7 @@ from django.test import TestCase
 from django.test.utils import str_prefix
 from django.utils.datastructures import MultiValueDict, MergeDict
 from django.utils.safestring import mark_safe
+from django.utils import six
 
 
 class Person(Form):
@@ -136,11 +137,7 @@ class FormsTestCase(TestCase):
         self.assertEqual(p.errors['first_name'], ['This field is required.'])
         self.assertEqual(p.errors['birthday'], ['This field is required.'])
         self.assertFalse(p.is_valid())
-        self.assertHTMLEqual(p.errors.as_ul(), '<ul class="errorlist"><li>first_name<ul class="errorlist"><li>This field is required.</li></ul></li><li>birthday<ul class="errorlist"><li>This field is required.</li></ul></li></ul>')
-        self.assertEqual(p.errors.as_text(), """* first_name
-  * This field is required.
-* birthday
-  * This field is required.""")
+        self.assertDictEqual(p.errors, {'birthday': ['This field is required.'], 'first_name': ['This field is required.']})
         self.assertEqual(p.cleaned_data, {'last_name': 'Lennon'})
         self.assertEqual(p['first_name'].errors, ['This field is required.'])
         self.assertHTMLEqual(p['first_name'].errors.as_ul(), '<ul class="errorlist"><li>This field is required.</li></ul>')
@@ -248,11 +245,11 @@ class FormsTestCase(TestCase):
             get_spam = BooleanField()
 
         f = SignupForm(auto_id=False)
-        self.assertHTMLEqual(str(f['email']), '<input type="text" name="email" />')
+        self.assertHTMLEqual(str(f['email']), '<input type="email" name="email" />')
         self.assertHTMLEqual(str(f['get_spam']), '<input type="checkbox" name="get_spam" />')
 
         f = SignupForm({'email': 'test@example.com', 'get_spam': True}, auto_id=False)
-        self.assertHTMLEqual(str(f['email']), '<input type="text" name="email" value="test@example.com" />')
+        self.assertHTMLEqual(str(f['email']), '<input type="email" name="email" value="test@example.com" />')
         self.assertHTMLEqual(str(f['get_spam']), '<input checked="checked" type="checkbox" name="get_spam" />')
 
         # 'True' or 'true' should be rendered without a value attribute
@@ -410,7 +407,7 @@ class FormsTestCase(TestCase):
         # gets a distinct ID, formed by appending an underscore plus the button's
         # zero-based index.
         f = FrameworkForm(auto_id='id_%s')
-        self.assertHTMLEqual(str(f['language']), """<ul>
+        self.assertHTMLEqual(str(f['language']), """<ul id="id_language">
 <li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
 <li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
 </ul>""")
@@ -419,17 +416,17 @@ class FormsTestCase(TestCase):
         # either as_table() or as_ul(), the label for the RadioSelect will point to the
         # ID of the *first* radio button.
         self.assertHTMLEqual(f.as_table(), """<tr><th><label for="id_name">Name:</label></th><td><input type="text" name="name" id="id_name" /></td></tr>
-<tr><th><label for="id_language_0">Language:</label></th><td><ul>
+<tr><th><label for="id_language_0">Language:</label></th><td><ul id="id_language">
 <li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
 <li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
 </ul></td></tr>""")
         self.assertHTMLEqual(f.as_ul(), """<li><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></li>
-<li><label for="id_language_0">Language:</label> <ul>
+<li><label for="id_language_0">Language:</label> <ul id="id_language">
 <li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
 <li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
 </ul></li>""")
         self.assertHTMLEqual(f.as_p(), """<p><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></p>
-<p><label for="id_language_0">Language:</label> <ul>
+<p><label for="id_language_0">Language:</label> <ul id="id_language">
 <li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
 <li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
 </ul></p>""")
@@ -536,7 +533,7 @@ class FormsTestCase(TestCase):
             composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=CheckboxSelectMultiple)
 
         f = SongForm(auto_id='%s_id')
-        self.assertHTMLEqual(str(f['composers']), """<ul>
+        self.assertHTMLEqual(str(f['composers']), """<ul id="composers_id">
 <li><label for="composers_id_0"><input type="checkbox" name="composers" value="J" id="composers_id_0" /> John Lennon</label></li>
 <li><label for="composers_id_1"><input type="checkbox" name="composers" value="P" id="composers_id_1" /> Paul McCartney</label></li>
 </ul>""")
@@ -955,12 +952,12 @@ class FormsTestCase(TestCase):
         class UserRegistration(Form):
             username = CharField(max_length=10, label='Your username')
             password1 = CharField(widget=PasswordInput)
-            password2 = CharField(widget=PasswordInput, label='Password (again)')
+            password2 = CharField(widget=PasswordInput, label='Contraseña (de nuevo)')
 
         p = UserRegistration(auto_id=False)
         self.assertHTMLEqual(p.as_ul(), """<li>Your username: <input type="text" name="username" maxlength="10" /></li>
 <li>Password1: <input type="password" name="password1" /></li>
-<li>Password (again): <input type="password" name="password2" /></li>""")
+<li>Contraseña (de nuevo): <input type="password" name="password2" /></li>""")
 
         # Labels for as_* methods will only end in a colon if they don't end in other
         # punctuation already.
@@ -982,14 +979,6 @@ class FormsTestCase(TestCase):
 <p><label for="id_q4">Answer this question!</label> <input type="text" name="q4" id="id_q4" /></p>
 <p><label for="id_q5">The last question. Period.</label> <input type="text" name="q5" id="id_q5" /></p>""")
 
-        # A label can be a Unicode object or a bytestring with special characters.
-        class UserRegistration(Form):
-            username = CharField(max_length=10, label='ŠĐĆŽćžšđ')
-            password = CharField(widget=PasswordInput, label='\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111')
-
-        p = UserRegistration(auto_id=False)
-        self.assertHTMLEqual(p.as_ul(), '<li>\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111: <input type="text" name="username" maxlength="10" /></li>\n<li>\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111: <input type="password" name="password" /></li>')
-
         # If a label is set to the empty string for a field, that field won't get a label.
         class UserRegistration(Form):
             username = CharField(max_length=10, label='')
@@ -1204,6 +1193,32 @@ class FormsTestCase(TestCase):
 <option value="w">whiz</option>
 </select></li>""")
 
+    def test_changed_data(self):
+        class Person(Form):
+            first_name = CharField(initial='Hans')
+            last_name = CharField(initial='Greatel')
+            birthday = DateField(initial=datetime.date(1974, 8, 16))
+
+        p = Person(data={'first_name': 'Hans', 'last_name': 'Scrmbl',
+                         'birthday': '1974-08-16'})
+        self.assertTrue(p.is_valid())
+        self.assertNotIn('first_name', p.changed_data)
+        self.assertIn('last_name', p.changed_data)
+        self.assertNotIn('birthday', p.changed_data)
+
+        # Test that field raising ValidationError is always in changed_data
+        class PedanticField(forms.Field):
+            def to_python(self, value):
+                raise ValidationError('Whatever')
+
+        class Person2(Person):
+            pedantic = PedanticField(initial='whatever', show_hidden_initial=True)
+
+        p = Person2(data={'first_name': 'Hans', 'last_name': 'Scrmbl',
+                         'birthday': '1974-08-16', 'initial-pedantic': 'whatever'})
+        self.assertFalse(p.is_valid())
+        self.assertIn('pedantic', p.changed_data)
+
     def test_boundfield_values(self):
         # It's possible to get to the value which would be used for rendering
         # the widget for a field by using the BoundField's value method.
@@ -1223,20 +1238,20 @@ class FormsTestCase(TestCase):
         # You can specify descriptive text for a field by using the 'help_text' argument)
         class UserRegistration(Form):
             username = CharField(max_length=10, help_text='e.g., user@example.com')
-            password = CharField(widget=PasswordInput, help_text='Choose wisely.')
+            password = CharField(widget=PasswordInput, help_text='Wählen Sie mit Bedacht.')
 
         p = UserRegistration(auto_id=False)
         self.assertHTMLEqual(p.as_ul(), """<li>Username: <input type="text" name="username" maxlength="10" /> <span class="helptext">e.g., user@example.com</span></li>
-<li>Password: <input type="password" name="password" /> <span class="helptext">Choose wisely.</span></li>""")
+<li>Password: <input type="password" name="password" /> <span class="helptext">Wählen Sie mit Bedacht.</span></li>""")
         self.assertHTMLEqual(p.as_p(), """<p>Username: <input type="text" name="username" maxlength="10" /> <span class="helptext">e.g., user@example.com</span></p>
-<p>Password: <input type="password" name="password" /> <span class="helptext">Choose wisely.</span></p>""")
+<p>Password: <input type="password" name="password" /> <span class="helptext">Wählen Sie mit Bedacht.</span></p>""")
         self.assertHTMLEqual(p.as_table(), """<tr><th>Username:</th><td><input type="text" name="username" maxlength="10" /><br /><span class="helptext">e.g., user@example.com</span></td></tr>
-<tr><th>Password:</th><td><input type="password" name="password" /><br /><span class="helptext">Choose wisely.</span></td></tr>""")
+<tr><th>Password:</th><td><input type="password" name="password" /><br /><span class="helptext">Wählen Sie mit Bedacht.</span></td></tr>""")
 
         # The help text is displayed whether or not data is provided for the form.
         p = UserRegistration({'username': 'foo'}, auto_id=False)
         self.assertHTMLEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="foo" maxlength="10" /> <span class="helptext">e.g., user@example.com</span></li>
-<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /> <span class="helptext">Choose wisely.</span></li>""")
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /> <span class="helptext">Wählen Sie mit Bedacht.</span></li>""")
 
         # help_text is not displayed for hidden fields. It can be used for documentation
         # purposes, though.
@@ -1249,13 +1264,6 @@ class FormsTestCase(TestCase):
         self.assertHTMLEqual(p.as_ul(), """<li>Username: <input type="text" name="username" maxlength="10" /> <span class="helptext">e.g., user@example.com</span></li>
 <li>Password: <input type="password" name="password" /><input type="hidden" name="next" value="/" /></li>""")
 
-        # Help text can include arbitrary Unicode characters.
-        class UserRegistration(Form):
-            username = CharField(max_length=10, help_text='ŠĐĆŽćžšđ')
-
-        p = UserRegistration(auto_id=False)
-        self.assertHTMLEqual(p.as_ul(), '<li>Username: <input type="text" name="username" maxlength="10" /> <span class="helptext">\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111</span></li>')
-
     def test_subclassing_forms(self):
         # You can subclass a Form to add fields. The resulting form subclass will have
         # all of the fields of the parent Form, plus whichever fields you define in the
@@ -1495,7 +1503,7 @@ class FormsTestCase(TestCase):
                 form = UserRegistration(auto_id=False)
 
             if form.is_valid():
-                return 'VALID: %r' % form.cleaned_data
+                return 'VALID: %r' % sorted(six.iteritems(form.cleaned_data))
 
             t = Template('<form action="" method="post">\n<table>\n{{ form }}\n</table>\n<input type="submit" />\n</form>')
             return t.render(Context({'form': form}))
@@ -1520,7 +1528,8 @@ class FormsTestCase(TestCase):
 <input type="submit" />
 </form>""")
         # Case 3: POST with valid data (the success message).)
-        self.assertHTMLEqual(my_function('POST', {'username': 'adrian', 'password1': 'secret', 'password2': 'secret'}), str_prefix("VALID: {'username': %(_)s'adrian', 'password1': %(_)s'secret', 'password2': %(_)s'secret'}"))
+        self.assertEqual(my_function('POST', {'username': 'adrian', 'password1': 'secret', 'password2': 'secret'}),
+                    str_prefix("VALID: [('password1', %(_)s'secret'), ('password2', %(_)s'secret'), ('username', %(_)s'adrian')]"))
 
     def test_templates_with_forms(self):
         class UserRegistration(Form):
@@ -1614,23 +1623,6 @@ class FormsTestCase(TestCase):
 </form>""")
         self.assertEqual(Template('{{ form.password1.help_text }}').render(Context({'form': UserRegistration(auto_id=False)})), '')
 
-        # The label_tag() method takes an optional attrs argument: a dictionary of HTML
-        # attributes to add to the <label> tag.
-        f = UserRegistration(auto_id='id_%s')
-        form_output = []
-
-        for bf in f:
-            form_output.append(bf.label_tag(attrs={'class': 'pretty'}))
-
-        expected_form_output = [
-            '<label for="id_username" class="pretty">Username</label>',
-            '<label for="id_password1" class="pretty">Password1</label>',
-            '<label for="id_password2" class="pretty">Password2</label>',
-        ]
-        self.assertEqual(len(form_output), len(expected_form_output))
-        for i in range(len(form_output)):
-            self.assertHTMLEqual(form_output[i], expected_form_output[i])
-
         # To display the errors that aren't associated with a particular field -- e.g.,
         # the errors caused by Form.clean() -- use {{ form.non_field_errors }} in the
         # template. If used on its own, it is displayed as a <ul> (or an empty string, if
@@ -1741,8 +1733,8 @@ class FormsTestCase(TestCase):
 <option value="2">Yes</option>
 <option value="3">No</option>
 </select></li>
-<li><label for="id_email">Email:</label> <input type="text" name="email" id="id_email" /></li>
-<li class="required error"><ul class="errorlist"><li>This field is required.</li></ul><label for="id_age">Age:</label> <input type="text" name="age" id="id_age" /></li>""")
+<li><label for="id_email">Email:</label> <input type="email" name="email" id="id_email" /></li>
+<li class="required error"><ul class="errorlist"><li>This field is required.</li></ul><label for="id_age">Age:</label> <input type="number" name="age" id="id_age" /></li>""")
 
         self.assertHTMLEqual(p.as_p(), """<ul class="errorlist"><li>This field is required.</li></ul>
 <p class="required error"><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></p>
@@ -1751,9 +1743,9 @@ class FormsTestCase(TestCase):
 <option value="2">Yes</option>
 <option value="3">No</option>
 </select></p>
-<p><label for="id_email">Email:</label> <input type="text" name="email" id="id_email" /></p>
+<p><label for="id_email">Email:</label> <input type="email" name="email" id="id_email" /></p>
 <ul class="errorlist"><li>This field is required.</li></ul>
-<p class="required error"><label for="id_age">Age:</label> <input type="text" name="age" id="id_age" /></p>""")
+<p class="required error"><label for="id_age">Age:</label> <input type="number" name="age" id="id_age" /></p>""")
 
         self.assertHTMLEqual(p.as_table(), """<tr class="required error"><th><label for="id_name">Name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="name" id="id_name" /></td></tr>
 <tr class="required"><th><label for="id_is_cool">Is cool:</label></th><td><select name="is_cool" id="id_is_cool">
@@ -1761,8 +1753,8 @@ class FormsTestCase(TestCase):
 <option value="2">Yes</option>
 <option value="3">No</option>
 </select></td></tr>
-<tr><th><label for="id_email">Email:</label></th><td><input type="text" name="email" id="id_email" /></td></tr>
-<tr class="required error"><th><label for="id_age">Age:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="age" id="id_age" /></td></tr>""")
+<tr><th><label for="id_email">Email:</label></th><td><input type="email" name="email" id="id_email" /></td></tr>
+<tr class="required error"><th><label for="id_age">Age:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="number" name="age" id="id_age" /></td></tr>""")
 
     def test_label_split_datetime_not_displayed(self):
         class EventForm(Form):
@@ -1799,3 +1791,58 @@ class FormsTestCase(TestCase):
         form = NameForm(data={'name' : ['fname', 'lname']})
         self.assertTrue(form.is_valid())
         self.assertEqual(form.cleaned_data, {'name' : 'fname lname'})
+
+    def test_custom_empty_values(self):
+        """
+        Test that form fields can customize what is considered as an empty value
+        for themselves (#19997).
+        """
+        class CustomJSONField(CharField):
+            empty_values = [None, '']
+            def to_python(self, value):
+                # Fake json.loads
+                if value == '{}':
+                    return {}
+                return super(CustomJSONField, self).to_python(value)
+
+        class JSONForm(forms.Form):
+            json = CustomJSONField()
+
+        form = JSONForm(data={'json': '{}'});
+        form.full_clean()
+        self.assertEqual(form.cleaned_data, {'json' : {}})
+
+    def test_boundfield_label_tag(self):
+        class SomeForm(Form):
+            field = CharField()
+        boundfield = SomeForm()['field']
+
+        testcases = [  # (args, kwargs, expected)
+            # without anything: just print the <label>
+            ((), {}, '<label for="id_field">Field</label>'),
+
+            # passing just one argument: overrides the field's label
+            (('custom',), {}, '<label for="id_field">custom</label>'),
+
+            # the overriden label is escaped
+            (('custom&',), {}, '<label for="id_field">custom&amp;</label>'),
+            ((mark_safe('custom&'),), {}, '<label for="id_field">custom&</label>'),
+
+            # Passing attrs to add extra attributes on the <label>
+            ((), {'attrs': {'class': 'pretty'}}, '<label for="id_field" class="pretty">Field</label>')
+        ]
+
+        for args, kwargs, expected in testcases:
+            self.assertHTMLEqual(boundfield.label_tag(*args, **kwargs), expected)
+
+    def test_boundfield_label_tag_no_id(self):
+        """
+        If a widget has no id, label_tag just returns the text with no
+        surrounding <label>.
+        """
+        class SomeForm(Form):
+            field = CharField()
+        boundfield = SomeForm(auto_id='')['field']
+
+        self.assertHTMLEqual(boundfield.label_tag(), 'Field')
+        self.assertHTMLEqual(boundfield.label_tag('Custom&'), 'Custom&amp;')
diff --git a/tests/regressiontests/forms/tests/formsets.py b/tests/forms_tests/tests/test_formsets.py
similarity index 82%
rename from tests/regressiontests/forms/tests/formsets.py
rename to tests/forms_tests/tests/test_formsets.py
index bf893c4c1d..4ac3c5ecf1 100644
--- a/tests/regressiontests/forms/tests/formsets.py
+++ b/tests/forms_tests/tests/test_formsets.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.forms import Form, CharField, IntegerField, ValidationError, DateField
-from django.forms.formsets import formset_factory, BaseFormSet
+from django.forms import (CharField, DateField, FileField, Form, IntegerField,
+    ValidationError, formsets)
+from django.forms.formsets import BaseFormSet, formset_factory
 from django.forms.util import ErrorList
 from django.test import TestCase
 
@@ -50,9 +51,9 @@ class FormsFormsetTestCase(TestCase):
         # for adding data. By default, it displays 1 blank form. It can display more,
         # but we'll look at how to do so later.
         formset = ChoiceFormSet(auto_id=False, prefix='choices')
-        self.assertHTMLEqual(str(formset), """<input type="hidden" name="choices-TOTAL_FORMS" value="1" /><input type="hidden" name="choices-INITIAL_FORMS" value="0" /><input type="hidden" name="choices-MAX_NUM_FORMS" />
+        self.assertHTMLEqual(str(formset), """<input type="hidden" name="choices-TOTAL_FORMS" value="1" /><input type="hidden" name="choices-INITIAL_FORMS" value="0" /><input type="hidden" name="choices-MAX_NUM_FORMS" value="1000" />
 <tr><th>Choice:</th><td><input type="text" name="choices-0-choice" /></td></tr>
-<tr><th>Votes:</th><td><input type="text" name="choices-0-votes" /></td></tr>""")
+<tr><th>Votes:</th><td><input type="number" name="choices-0-votes" /></td></tr>""")
 
         # On thing to note is that there needs to be a special value in the data. This
         # value tells the FormSet how many forms were displayed so it can tell how
@@ -136,9 +137,9 @@ class FormsFormsetTestCase(TestCase):
             form_output.append(form.as_ul())
 
         self.assertHTMLEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
-<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
+<li>Votes: <input type="number" name="choices-0-votes" value="100" /></li>
 <li>Choice: <input type="text" name="choices-1-choice" /></li>
-<li>Votes: <input type="text" name="choices-1-votes" /></li>""")
+<li>Votes: <input type="number" name="choices-1-votes" /></li>""")
 
         # Let's simulate what would happen if we submitted this form.
 
@@ -209,11 +210,11 @@ class FormsFormsetTestCase(TestCase):
             form_output.append(form.as_ul())
 
         self.assertHTMLEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" /></li>
-<li>Votes: <input type="text" name="choices-0-votes" /></li>
+<li>Votes: <input type="number" name="choices-0-votes" /></li>
 <li>Choice: <input type="text" name="choices-1-choice" /></li>
-<li>Votes: <input type="text" name="choices-1-votes" /></li>
+<li>Votes: <input type="number" name="choices-1-votes" /></li>
 <li>Choice: <input type="text" name="choices-2-choice" /></li>
-<li>Votes: <input type="text" name="choices-2-votes" /></li>""")
+<li>Votes: <input type="number" name="choices-2-votes" /></li>""")
 
         # Since we displayed every form as blank, we will also accept them back as blank.
         # This may seem a little strange, but later we will show how to require a minimum
@@ -255,6 +256,27 @@ class FormsFormsetTestCase(TestCase):
         self.assertTrue(formset.is_valid())
         self.assertEqual([form.cleaned_data for form in formset.forms], [{'votes': 100, 'choice': 'Calexico'}, {}, {}])
 
+    def test_formset_validate_max_flag(self):
+        # If validate_max is set and max_num is less than TOTAL_FORMS in the
+        # data, then throw an exception. MAX_NUM_FORMS in the data is
+        # irrelevant here (it's output as a hint for the client but its
+        # value in the returned data is not checked)
+
+        data = {
+            'choices-TOTAL_FORMS': '2', # the number of forms rendered
+            'choices-INITIAL_FORMS': '0', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '2', # max number of forms - should be ignored
+            'choices-0-choice': 'Zero',
+            'choices-0-votes': '0',
+            'choices-1-choice': 'One',
+            'choices-1-votes': '1',
+        }
+
+        ChoiceFormSet = formset_factory(Choice, extra=1, max_num=1, validate_max=True)
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertFalse(formset.is_valid())
+        self.assertEqual(formset.non_form_errors(), ['Please submit 1 or fewer forms.'])
+
     def test_second_form_partially_filled_2(self):
         # And once again, if we try to partially complete a form, validation will fail.
 
@@ -300,19 +322,19 @@ class FormsFormsetTestCase(TestCase):
             form_output.append(form.as_ul())
 
         self.assertHTMLEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
-<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
+<li>Votes: <input type="number" name="choices-0-votes" value="100" /></li>
 <li>Choice: <input type="text" name="choices-1-choice" /></li>
-<li>Votes: <input type="text" name="choices-1-votes" /></li>
+<li>Votes: <input type="number" name="choices-1-votes" /></li>
 <li>Choice: <input type="text" name="choices-2-choice" /></li>
-<li>Votes: <input type="text" name="choices-2-votes" /></li>
+<li>Votes: <input type="number" name="choices-2-votes" /></li>
 <li>Choice: <input type="text" name="choices-3-choice" /></li>
-<li>Votes: <input type="text" name="choices-3-votes" /></li>""")
+<li>Votes: <input type="number" name="choices-3-votes" /></li>""")
 
         # Make sure retrieving an empty form works, and it shows up in the form list
 
         self.assertTrue(formset.empty_form.empty_permitted)
         self.assertHTMLEqual(formset.empty_form.as_ul(), """<li>Choice: <input type="text" name="choices-__prefix__-choice" /></li>
-<li>Votes: <input type="text" name="choices-__prefix__-votes" /></li>""")
+<li>Votes: <input type="number" name="choices-__prefix__-votes" /></li>""")
 
     def test_formset_with_deletion(self):
         # FormSets with deletion ######################################################
@@ -330,13 +352,13 @@ class FormsFormsetTestCase(TestCase):
             form_output.append(form.as_ul())
 
         self.assertHTMLEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
-<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
+<li>Votes: <input type="number" name="choices-0-votes" value="100" /></li>
 <li>Delete: <input type="checkbox" name="choices-0-DELETE" /></li>
 <li>Choice: <input type="text" name="choices-1-choice" value="Fergie" /></li>
-<li>Votes: <input type="text" name="choices-1-votes" value="900" /></li>
+<li>Votes: <input type="number" name="choices-1-votes" value="900" /></li>
 <li>Delete: <input type="checkbox" name="choices-1-DELETE" /></li>
 <li>Choice: <input type="text" name="choices-2-choice" /></li>
-<li>Votes: <input type="text" name="choices-2-votes" /></li>
+<li>Votes: <input type="number" name="choices-2-votes" /></li>
 <li>Delete: <input type="checkbox" name="choices-2-DELETE" /></li>""")
 
         # To delete something, we just need to set that form's special delete field to
@@ -427,14 +449,14 @@ class FormsFormsetTestCase(TestCase):
             form_output.append(form.as_ul())
 
         self.assertHTMLEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
-<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
-<li>Order: <input type="text" name="choices-0-ORDER" value="1" /></li>
+<li>Votes: <input type="number" name="choices-0-votes" value="100" /></li>
+<li>Order: <input type="number" name="choices-0-ORDER" value="1" /></li>
 <li>Choice: <input type="text" name="choices-1-choice" value="Fergie" /></li>
-<li>Votes: <input type="text" name="choices-1-votes" value="900" /></li>
-<li>Order: <input type="text" name="choices-1-ORDER" value="2" /></li>
+<li>Votes: <input type="number" name="choices-1-votes" value="900" /></li>
+<li>Order: <input type="number" name="choices-1-ORDER" value="2" /></li>
 <li>Choice: <input type="text" name="choices-2-choice" /></li>
-<li>Votes: <input type="text" name="choices-2-votes" /></li>
-<li>Order: <input type="text" name="choices-2-ORDER" /></li>""")
+<li>Votes: <input type="number" name="choices-2-votes" /></li>
+<li>Order: <input type="number" name="choices-2-ORDER" /></li>""")
 
         data = {
             'choices-TOTAL_FORMS': '3', # the number of forms rendered
@@ -538,20 +560,20 @@ class FormsFormsetTestCase(TestCase):
             form_output.append(form.as_ul())
 
         self.assertHTMLEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
-<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
-<li>Order: <input type="text" name="choices-0-ORDER" value="1" /></li>
+<li>Votes: <input type="number" name="choices-0-votes" value="100" /></li>
+<li>Order: <input type="number" name="choices-0-ORDER" value="1" /></li>
 <li>Delete: <input type="checkbox" name="choices-0-DELETE" /></li>
 <li>Choice: <input type="text" name="choices-1-choice" value="Fergie" /></li>
-<li>Votes: <input type="text" name="choices-1-votes" value="900" /></li>
-<li>Order: <input type="text" name="choices-1-ORDER" value="2" /></li>
+<li>Votes: <input type="number" name="choices-1-votes" value="900" /></li>
+<li>Order: <input type="number" name="choices-1-ORDER" value="2" /></li>
 <li>Delete: <input type="checkbox" name="choices-1-DELETE" /></li>
 <li>Choice: <input type="text" name="choices-2-choice" value="The Decemberists" /></li>
-<li>Votes: <input type="text" name="choices-2-votes" value="500" /></li>
-<li>Order: <input type="text" name="choices-2-ORDER" value="3" /></li>
+<li>Votes: <input type="number" name="choices-2-votes" value="500" /></li>
+<li>Order: <input type="number" name="choices-2-ORDER" value="3" /></li>
 <li>Delete: <input type="checkbox" name="choices-2-DELETE" /></li>
 <li>Choice: <input type="text" name="choices-3-choice" /></li>
-<li>Votes: <input type="text" name="choices-3-votes" /></li>
-<li>Order: <input type="text" name="choices-3-ORDER" /></li>
+<li>Votes: <input type="number" name="choices-3-votes" /></li>
+<li>Order: <input type="number" name="choices-3-ORDER" /></li>
 <li>Delete: <input type="checkbox" name="choices-3-DELETE" /></li>""")
 
         # Let's delete Fergie, and put The Decemberists ahead of Calexico.
@@ -653,8 +675,8 @@ class FormsFormsetTestCase(TestCase):
         # Limiting the maximum number of forms ########################################
         # Base case for max_num.
 
-        # When not passed, max_num will take its default value of None, i.e. unlimited
-        # number of forms, only controlled by the value of the extra parameter.
+        # When not passed, max_num will take a high default value, leaving the
+        # number of forms only controlled by the value of the extra parameter.
 
         LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=3)
         formset = LimitedFavoriteDrinkFormSet()
@@ -701,8 +723,8 @@ class FormsFormsetTestCase(TestCase):
     def test_max_num_with_initial_data(self):
         # max_num with initial data
 
-        # When not passed, max_num will take its default value of None, i.e. unlimited
-        # number of forms, only controlled by the values of the initial and extra
+        # When not passed, max_num will take a high default value, leaving the
+        # number of forms only controlled by the value of the initial and extra
         # parameters.
 
         initial = [
@@ -719,8 +741,20 @@ class FormsFormsetTestCase(TestCase):
 <tr><th><label for="id_form-1-name">Name:</label></th><td><input type="text" name="form-1-name" id="id_form-1-name" /></td></tr>""")
 
     def test_max_num_zero(self):
-        # If max_num is 0 then no form is rendered at all, even if extra and initial
-        # are specified.
+        # If max_num is 0 then no form is rendered at all, regardless of extra,
+        # unless initial data is present. (This changed in the patch for bug
+        # 20084 -- previously max_num=0 trumped initial data)
+
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=1, max_num=0)
+        formset = LimitedFavoriteDrinkFormSet()
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), "")
+
+        # test that initial trumps max_num
 
         initial = [
             {'name': 'Fernet and Coke'},
@@ -732,12 +766,13 @@ class FormsFormsetTestCase(TestCase):
 
         for form in formset.forms:
             form_output.append(str(form))
-
-        self.assertEqual('\n'.join(form_output), "")
+        self.assertEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input id="id_form-0-name" name="form-0-name" type="text" value="Fernet and Coke" /></td></tr>
+<tr><th><label for="id_form-1-name">Name:</label></th><td><input id="id_form-1-name" name="form-1-name" type="text" value="Bloody Mary" /></td></tr>""")
 
     def test_more_initial_than_max_num(self):
-        # More initial forms than max_num will result in only the first max_num of
-        # them to be displayed with no extra forms.
+        # More initial forms than max_num now results in all initial forms
+        # being displayed (but no extra forms).  This behavior was changed
+        # from max_num taking precedence in the patch for #20084
 
         initial = [
             {'name': 'Gin Tonic'},
@@ -750,9 +785,9 @@ class FormsFormsetTestCase(TestCase):
 
         for form in formset.forms:
             form_output.append(str(form))
-
-        self.assertHTMLEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input type="text" name="form-0-name" value="Gin Tonic" id="id_form-0-name" /></td></tr>
-<tr><th><label for="id_form-1-name">Name:</label></th><td><input type="text" name="form-1-name" value="Bloody Mary" id="id_form-1-name" /></td></tr>""")
+        self.assertHTMLEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input id="id_form-0-name" name="form-0-name" type="text" value="Gin Tonic" /></td></tr>
+<tr><th><label for="id_form-1-name">Name:</label></th><td><input id="id_form-1-name" name="form-1-name" type="text" value="Bloody Mary" /></td></tr>
+<tr><th><label for="id_form-2-name">Name:</label></th><td><input id="id_form-2-name" name="form-2-name" type="text" value="Jack and Coke" /></td></tr>""")
 
         # One form from initial and extra=3 with max_num=2 should result in the one
         # initial form and one extra.
@@ -877,6 +912,66 @@ class FormsFormsetTestCase(TestCase):
         self.assertTrue(formset.is_valid())
         self.assertTrue(all([form.is_valid_called for form in formset.forms]))
 
+    def test_hard_limit_on_instantiated_forms(self):
+        """A formset has a hard limit on the number of forms instantiated."""
+        # reduce the default limit of 1000 temporarily for testing
+        _old_DEFAULT_MAX_NUM = formsets.DEFAULT_MAX_NUM
+        try:
+            formsets.DEFAULT_MAX_NUM = 2
+            ChoiceFormSet = formset_factory(Choice, max_num=1)
+            # someone fiddles with the mgmt form data...
+            formset = ChoiceFormSet(
+                {
+                    'choices-TOTAL_FORMS': '4',
+                    'choices-INITIAL_FORMS': '0',
+                    'choices-MAX_NUM_FORMS': '4',
+                    'choices-0-choice': 'Zero',
+                    'choices-0-votes': '0',
+                    'choices-1-choice': 'One',
+                    'choices-1-votes': '1',
+                    'choices-2-choice': 'Two',
+                    'choices-2-votes': '2',
+                    'choices-3-choice': 'Three',
+                    'choices-3-votes': '3',
+                    },
+                prefix='choices',
+                )
+            # But we still only instantiate 3 forms
+            self.assertEqual(len(formset.forms), 3)
+            # and the formset isn't valid
+            self.assertFalse(formset.is_valid())
+        finally:
+            formsets.DEFAULT_MAX_NUM = _old_DEFAULT_MAX_NUM
+
+    def test_increase_hard_limit(self):
+        """Can increase the built-in forms limit via a higher max_num."""
+        # reduce the default limit of 1000 temporarily for testing
+        _old_DEFAULT_MAX_NUM = formsets.DEFAULT_MAX_NUM
+        try:
+            formsets.DEFAULT_MAX_NUM = 3
+            # for this form, we want a limit of 4
+            ChoiceFormSet = formset_factory(Choice, max_num=4)
+            formset = ChoiceFormSet(
+                {
+                    'choices-TOTAL_FORMS': '4',
+                    'choices-INITIAL_FORMS': '0',
+                    'choices-MAX_NUM_FORMS': '4',
+                    'choices-0-choice': 'Zero',
+                    'choices-0-votes': '0',
+                    'choices-1-choice': 'One',
+                    'choices-1-votes': '1',
+                    'choices-2-choice': 'Two',
+                    'choices-2-votes': '2',
+                    'choices-3-choice': 'Three',
+                    'choices-3-votes': '3',
+                    },
+                prefix='choices',
+                )
+            # Four forms are instantiated and no exception is raised
+            self.assertEqual(len(formset.forms), 4)
+        finally:
+            formsets.DEFAULT_MAX_NUM = _old_DEFAULT_MAX_NUM
+
 
 data = {
     'choices-TOTAL_FORMS': '1', # the number of forms rendered
@@ -897,19 +992,19 @@ class FormsetAsFooTests(TestCase):
         formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
         self.assertHTMLEqual(formset.as_table(),"""<input type="hidden" name="choices-TOTAL_FORMS" value="1" /><input type="hidden" name="choices-INITIAL_FORMS" value="0" /><input type="hidden" name="choices-MAX_NUM_FORMS" value="0" />
 <tr><th>Choice:</th><td><input type="text" name="choices-0-choice" value="Calexico" /></td></tr>
-<tr><th>Votes:</th><td><input type="text" name="choices-0-votes" value="100" /></td></tr>""")
+<tr><th>Votes:</th><td><input type="number" name="choices-0-votes" value="100" /></td></tr>""")
 
     def test_as_p(self):
         formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
         self.assertHTMLEqual(formset.as_p(),"""<input type="hidden" name="choices-TOTAL_FORMS" value="1" /><input type="hidden" name="choices-INITIAL_FORMS" value="0" /><input type="hidden" name="choices-MAX_NUM_FORMS" value="0" />
 <p>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></p>
-<p>Votes: <input type="text" name="choices-0-votes" value="100" /></p>""")
+<p>Votes: <input type="number" name="choices-0-votes" value="100" /></p>""")
 
     def test_as_ul(self):
         formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
         self.assertHTMLEqual(formset.as_ul(),"""<input type="hidden" name="choices-TOTAL_FORMS" value="1" /><input type="hidden" name="choices-INITIAL_FORMS" value="0" /><input type="hidden" name="choices-MAX_NUM_FORMS" value="0" />
 <li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
-<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>""")
+<li>Votes: <input type="number" name="choices-0-votes" value="100" /></li>""")
 
 
 # Regression test for #11418 #################################################
@@ -974,11 +1069,23 @@ class TestIsBoundBehavior(TestCase):
         self.assertHTMLEqual(empty_forms[0].as_p(), empty_forms[1].as_p())
 
 class TestEmptyFormSet(TestCase):
-    "Test that an empty formset still calls clean()"
     def test_empty_formset_is_valid(self):
+        """Test that an empty formset still calls clean()"""
         EmptyFsetWontValidateFormset = formset_factory(FavoriteDrinkForm, extra=0, formset=EmptyFsetWontValidate)
         formset = EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0', 'form-TOTAL_FORMS':'0'},prefix="form")
         formset2 = EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0', 'form-TOTAL_FORMS':'1', 'form-0-name':'bah' },prefix="form")
         self.assertFalse(formset.is_valid())
         self.assertFalse(formset2.is_valid())
 
+    def test_empty_formset_media(self):
+        """Make sure media is available on empty formset, refs #19545"""
+        class MediaForm(Form):
+            class Media:
+                js = ('some-file.js',)
+        self.assertIn('some-file.js', str(formset_factory(MediaForm, extra=0)().media))
+
+    def test_empty_formset_is_multipart(self):
+        """Make sure `is_multipart()` works with empty formset, refs #19545"""
+        class FileForm(Form):
+            file = FileField()
+        self.assertTrue(formset_factory(FileForm, extra=0)().is_multipart())
diff --git a/tests/regressiontests/forms/tests/input_formats.py b/tests/forms_tests/tests/test_input_formats.py
similarity index 99%
rename from tests/regressiontests/forms/tests/input_formats.py
rename to tests/forms_tests/tests/test_input_formats.py
index 7a305dbc2b..eb0e8dcad8 100644
--- a/tests/regressiontests/forms/tests/input_formats.py
+++ b/tests/forms_tests/tests/test_input_formats.py
@@ -9,7 +9,8 @@ from django.test import SimpleTestCase
 @override_settings(TIME_INPUT_FORMATS=["%I:%M:%S %p", "%I:%M %p"], USE_L10N=True)
 class LocalizedTimeTests(SimpleTestCase):
     def setUp(self):
-        # nl/formats.py has customized TIME_INPUT_FORMATS
+        # nl/formats.py has customized TIME_INPUT_FORMATS:
+        # ('%H:%M:%S', '%H.%M:%S', '%H.%M', '%H:%M')
         activate('nl')
 
     def tearDown(self):
@@ -37,6 +38,10 @@ class LocalizedTimeTests(SimpleTestCase):
         text = f.widget._format_value(result)
         self.assertEqual(text, "13:30:00")
 
+        # ISO formats are accepted, even if not specified in formats.py
+        result = f.clean('13:30:05.000155')
+        self.assertEqual(result, time(13,30,5,155))
+
     def test_localized_timeField(self):
         "Localized TimeFields act as unlocalized widgets"
         f = forms.TimeField(localize=True)
diff --git a/tests/regressiontests/forms/tests/media.py b/tests/forms_tests/tests/test_media.py
similarity index 100%
rename from tests/regressiontests/forms/tests/media.py
rename to tests/forms_tests/tests/test_media.py
diff --git a/tests/regressiontests/forms/tests/regressions.py b/tests/forms_tests/tests/test_regressions.py
similarity index 84%
rename from tests/regressiontests/forms/tests/regressions.py
rename to tests/forms_tests/tests/test_regressions.py
index 45f51eef2f..be9dc8c593 100644
--- a/tests/regressiontests/forms/tests/regressions.py
+++ b/tests/forms_tests/tests/test_regressions.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from warnings import catch_warnings
+import warnings
 
 from django.forms import *
 from django.test import TestCase
 from django.utils.translation import ugettext_lazy, override
 
-from regressiontests.forms.models import Cheese
+from forms_tests.models import Cheese
 
 
 class FormsRegressionsTestCase(TestCase):
@@ -54,22 +54,23 @@ class FormsRegressionsTestCase(TestCase):
             somechoice = ChoiceField(choices=GENDERS, widget=RadioSelect(), label='\xc5\xf8\xdf')
 
         f = SomeForm()
-        self.assertHTMLEqual(f.as_p(), '<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul>\n<li><label for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>')
+        self.assertHTMLEqual(f.as_p(), '<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul id="id_somechoice">\n<li><label for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>')
 
         # Testing choice validation with UTF-8 bytestrings as input (these are the
         # Russian abbreviations "мес." and "шт.".
         UNITS = ((b'\xd0\xbc\xd0\xb5\xd1\x81.', b'\xd0\xbc\xd0\xb5\xd1\x81.'),
                  (b'\xd1\x88\xd1\x82.', b'\xd1\x88\xd1\x82.'))
         f = ChoiceField(choices=UNITS)
-        self.assertEqual(f.clean('\u0448\u0442.'), '\u0448\u0442.')
-        with catch_warnings(record=True):
+        with warnings.catch_warnings():
             # Ignore UnicodeWarning
+            warnings.simplefilter("ignore")
+            self.assertEqual(f.clean('\u0448\u0442.'), '\u0448\u0442.')
             self.assertEqual(f.clean(b'\xd1\x88\xd1\x82.'), '\u0448\u0442.')
 
         # Translated error messages used to be buggy.
         with override('ru'):
             f = SomeForm({})
-            self.assertHTMLEqual(f.as_p(), '<ul class="errorlist"><li>\u041e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u043f\u043e\u043b\u0435.</li></ul>\n<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul>\n<li><label for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>')
+            self.assertHTMLEqual(f.as_p(), '<ul class="errorlist"><li>\u041e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u043f\u043e\u043b\u0435.</li></ul>\n<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul id="id_somechoice">\n<li><label for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>')
 
         # Deep copying translated text shouldn't raise an error)
         from django.utils.translation import gettext_lazy
@@ -121,7 +122,7 @@ class FormsRegressionsTestCase(TestCase):
         f = SomeForm({'field': ['<script>']})
         self.assertHTMLEqual(t.render(Context({'form': f})), '<ul class="errorlist"><li>field<ul class="errorlist"><li>Select a valid choice. &lt;script&gt; is not one of the available choices.</li></ul></li></ul>')
 
-        from regressiontests.forms.models import ChoiceModel
+        from forms_tests.models import ChoiceModel
 
         class SomeForm(Form):
             field = ModelMultipleChoiceField(ChoiceModel.objects.all())
diff --git a/tests/regressiontests/forms/tests/util.py b/tests/forms_tests/tests/test_util.py
similarity index 100%
rename from tests/regressiontests/forms/tests/util.py
rename to tests/forms_tests/tests/test_util.py
diff --git a/tests/forms_tests/tests/test_validators.py b/tests/forms_tests/tests/test_validators.py
new file mode 100644
index 0000000000..0598835cff
--- /dev/null
+++ b/tests/forms_tests/tests/test_validators.py
@@ -0,0 +1,39 @@
+from __future__ import unicode_literals
+
+from django import forms
+from django.core import validators
+from django.core.exceptions import ValidationError
+from django.utils.unittest import TestCase
+
+
+class UserForm(forms.Form):
+    full_name = forms.CharField(
+        max_length = 50,
+        validators = [
+            validators.validate_integer,
+            validators.validate_email,
+        ]
+    )
+    string = forms.CharField(
+        max_length = 50,
+        validators = [
+            validators.RegexValidator(
+                regex='^[a-zA-Z]*$',
+                message="Letters only.",
+            )
+        ]
+    )
+
+
+class TestFieldWithValidators(TestCase):
+    def test_all_errors_get_reported(self):
+        form = UserForm({'full_name': 'not int nor mail', 'string': '2 is not correct'})
+        self.assertRaises(ValidationError, form.fields['full_name'].clean, 'not int nor mail')
+
+        try:
+            form.fields['full_name'].clean('not int nor mail')
+        except ValidationError as e:
+            self.assertEqual(2, len(e.messages))
+
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors['string'], ["Letters only."])
diff --git a/tests/regressiontests/forms/tests/widgets.py b/tests/forms_tests/tests/test_widgets.py
similarity index 92%
rename from tests/regressiontests/forms/tests/widgets.py
rename to tests/forms_tests/tests/test_widgets.py
index 31c0e65c7c..4664553aa7 100644
--- a/tests/regressiontests/forms/tests/widgets.py
+++ b/tests/forms_tests/tests/test_widgets.py
@@ -15,7 +15,7 @@ from django.utils import six
 from django.utils.translation import activate, deactivate
 from django.test import TestCase
 from django.test.utils import override_settings
-from django.utils.encoding import python_2_unicode_compatible
+from django.utils.encoding import python_2_unicode_compatible, force_text
 
 from ..models import Article
 
@@ -148,25 +148,6 @@ class FormsWidgetTestCase(TestCase):
 
         self.assertHTMLEqual(w.render('email', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}), '<input type="file" class="fun" name="email" />')
 
-        # Test for the behavior of _has_changed for FileInput. The value of data will
-        # more than likely come from request.FILES. The value of initial data will
-        # likely be a filename stored in the database. Since its value is of no use to
-        # a FileInput it is ignored.
-        w = FileInput()
-
-        # No file was uploaded and no initial data.
-        self.assertFalse(w._has_changed('', None))
-
-        # A file was uploaded and no initial data.
-        self.assertTrue(w._has_changed('', {'filename': 'resume.txt', 'content': 'My resume'}))
-
-        # A file was not uploaded, but there is initial data
-        self.assertFalse(w._has_changed('resume.txt', None))
-
-        # A file was uploaded and there is initial data (file identity is not dealt
-        # with here)
-        self.assertTrue(w._has_changed('resume.txt', {'filename': 'resume.txt', 'content': 'My resume'}))
-
     def test_textarea(self):
         w = Textarea()
         self.assertHTMLEqual(w.render('msg', ''), '<textarea rows="10" cols="40" name="msg"></textarea>')
@@ -233,14 +214,6 @@ class FormsWidgetTestCase(TestCase):
         self.assertIsInstance(value, bool)
         self.assertTrue(value)
 
-        self.assertFalse(w._has_changed(None, None))
-        self.assertFalse(w._has_changed(None, ''))
-        self.assertFalse(w._has_changed('', None))
-        self.assertFalse(w._has_changed('', ''))
-        self.assertTrue(w._has_changed(False, 'on'))
-        self.assertFalse(w._has_changed(True, 'on'))
-        self.assertTrue(w._has_changed(True, ''))
-
     def test_select(self):
         w = Select()
         self.assertHTMLEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select name="beatle">
@@ -413,13 +386,6 @@ class FormsWidgetTestCase(TestCase):
 <option value="2">Yes</option>
 <option value="3" selected="selected">No</option>
 </select>""")
-        self.assertTrue(w._has_changed(False, None))
-        self.assertTrue(w._has_changed(None, False))
-        self.assertFalse(w._has_changed(None, None))
-        self.assertFalse(w._has_changed(False, False))
-        self.assertTrue(w._has_changed(True, False))
-        self.assertTrue(w._has_changed(True, None))
-        self.assertTrue(w._has_changed(True, False))
 
     def test_selectmultiple(self):
         w = SelectMultiple()
@@ -533,14 +499,6 @@ class FormsWidgetTestCase(TestCase):
         # Unicode choices are correctly rendered as HTML
         self.assertHTMLEqual(w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]), '<select multiple="multiple" name="nums">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" selected="selected">\u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</option>\n<option value="\u0107\u017e\u0161\u0111">abc\u0107\u017e\u0161\u0111</option>\n</select>')
 
-        # Test the usage of _has_changed
-        self.assertFalse(w._has_changed(None, None))
-        self.assertFalse(w._has_changed([], None))
-        self.assertTrue(w._has_changed(None, ['1']))
-        self.assertFalse(w._has_changed([1, 2], ['1', '2']))
-        self.assertTrue(w._has_changed([1, 2], ['1']))
-        self.assertTrue(w._has_changed([1, 2], ['1', '3']))
-
         # Choices can be nested one level in order to create HTML optgroups:
         w.choices = (('outer1', 'Outer 1'), ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2'))))
         self.assertHTMLEqual(w.render('nestchoice', None), """<select multiple="multiple" name="nestchoice">
@@ -698,7 +656,7 @@ beatle J R Ringo False""")
 <label><input checked="checked" type="radio" name="beatle" value="G" /> George</label><br />
 <label><input type="radio" name="beatle" value="R" /> Ringo</label>""")
 
-        # A RadioFieldRenderer object also allows index access to individual RadioInput
+        # A RadioFieldRenderer object also allows index access to individual RadioChoiceInput
         w = RadioSelect()
         r = w.get_renderer('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')))
         self.assertHTMLEqual(str(r[1]), '<label><input type="radio" name="beatle" value="P" /> Paul</label>')
@@ -707,11 +665,8 @@ beatle J R Ringo False""")
         self.assertFalse(r[1].is_checked())
         self.assertEqual((r[1].name, r[1].value, r[1].choice_value, r[1].choice_label), ('beatle', 'J', 'P', 'Paul'))
 
-        try:
+        with self.assertRaises(IndexError):
             r[10]
-            self.fail("This offset should not exist.")
-        except IndexError:
-            pass
 
         # Choices are escaped correctly
         w = RadioSelect()
@@ -726,7 +681,7 @@ beatle J R Ringo False""")
 
         # Attributes provided at instantiation are passed to the constituent inputs
         w = RadioSelect(attrs={'id':'foo'})
-        self.assertHTMLEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+        self.assertHTMLEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul id="foo">
 <li><label for="foo_0"><input checked="checked" type="radio" id="foo_0" value="J" name="beatle" /> John</label></li>
 <li><label for="foo_1"><input type="radio" id="foo_1" value="P" name="beatle" /> Paul</label></li>
 <li><label for="foo_2"><input type="radio" id="foo_2" value="G" name="beatle" /> George</label></li>
@@ -735,7 +690,7 @@ beatle J R Ringo False""")
 
         # Attributes provided at render-time are passed to the constituent inputs
         w = RadioSelect()
-        self.assertHTMLEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), attrs={'id':'bar'}), """<ul>
+        self.assertHTMLEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), attrs={'id':'bar'}), """<ul id="bar">
 <li><label for="bar_0"><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label></li>
 <li><label for="bar_1"><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label></li>
 <li><label for="bar_2"><input type="radio" id="bar_2" value="G" name="beatle" /> George</label></li>
@@ -842,25 +797,42 @@ beatle J R Ringo False""")
 <li><label><input type="checkbox" name="escape" value="good" /> you &gt; me</label></li>
 </ul>""")
 
-        # Test the usage of _has_changed
-        self.assertFalse(w._has_changed(None, None))
-        self.assertFalse(w._has_changed([], None))
-        self.assertTrue(w._has_changed(None, ['1']))
-        self.assertFalse(w._has_changed([1, 2], ['1', '2']))
-        self.assertTrue(w._has_changed([1, 2], ['1']))
-        self.assertTrue(w._has_changed([1, 2], ['1', '3']))
-        self.assertFalse(w._has_changed([2, 1], ['1', '2']))
-
         # Unicode choices are correctly rendered as HTML
         self.assertHTMLEqual(w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]), '<ul>\n<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>\n<li><label><input type="checkbox" name="nums" value="2" /> 2</label></li>\n<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>\n<li><label><input checked="checked" type="checkbox" name="nums" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /> \u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</label></li>\n<li><label><input type="checkbox" name="nums" value="\u0107\u017e\u0161\u0111" /> abc\u0107\u017e\u0161\u0111</label></li>\n</ul>')
 
         # Each input gets a separate ID
-        self.assertHTMLEqual(CheckboxSelectMultiple().render('letters', list('ac'), choices=zip(list('abc'), list('ABC')), attrs={'id': 'abc'}), """<ul>
+        self.assertHTMLEqual(CheckboxSelectMultiple().render('letters', list('ac'), choices=zip(list('abc'), list('ABC')), attrs={'id': 'abc'}), """<ul id="abc">
 <li><label for="abc_0"><input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" /> A</label></li>
 <li><label for="abc_1"><input type="checkbox" name="letters" value="b" id="abc_1" /> B</label></li>
 <li><label for="abc_2"><input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" /> C</label></li>
 </ul>""")
 
+        # Each input gets a separate ID when the ID is passed to the constructor
+        self.assertHTMLEqual(CheckboxSelectMultiple(attrs={'id': 'abc'}).render('letters', list('ac'), choices=zip(list('abc'), list('ABC'))), """<ul id="abc">
+<li><label for="abc_0"><input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" /> A</label></li>
+<li><label for="abc_1"><input type="checkbox" name="letters" value="b" id="abc_1" /> B</label></li>
+<li><label for="abc_2"><input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" /> C</label></li>
+</ul>""")
+
+        w = CheckboxSelectMultiple()
+        r = w.get_renderer('abc', 'b', choices=[(c, c.upper()) for c in 'abc'])
+        # You can iterate over the CheckboxFieldRenderer to get individual elements
+        expected = [
+            '<label><input type="checkbox" name="abc" value="a" /> A</label>',
+            '<label><input checked="checked" type="checkbox" name="abc" value="b" /> B</label>',
+            '<label><input type="checkbox" name="abc" value="c" /> C</label>',
+        ]
+        for output, expected in zip(r, expected):
+            self.assertHTMLEqual(force_text(output), expected)
+
+        # You can access individual elements
+        self.assertHTMLEqual(force_text(r[1]),
+            '<label><input checked="checked" type="checkbox" name="abc" value="b" /> B</label>')
+
+        # Out-of-range errors are propagated
+        with self.assertRaises(IndexError):
+            r[42]
+
     def test_multi(self):
         class MyMultiWidget(MultiWidget):
             def decompress(self, value):
@@ -877,21 +849,6 @@ beatle J R Ringo False""")
         w = MyMultiWidget(widgets=(TextInput(attrs={'class': 'big'}), TextInput(attrs={'class': 'small'})), attrs={'id': 'bar'})
         self.assertHTMLEqual(w.render('name', ['john', 'lennon']), '<input id="bar_0" type="text" class="big" value="john" name="name_0" /><br /><input id="bar_1" type="text" class="small" value="lennon" name="name_1" />')
 
-        w = MyMultiWidget(widgets=(TextInput(), TextInput()))
-
-        # test with no initial data
-        self.assertTrue(w._has_changed(None, ['john', 'lennon']))
-
-        # test when the data is the same as initial
-        self.assertFalse(w._has_changed('john__lennon', ['john', 'lennon']))
-
-        # test when the first widget's data has changed
-        self.assertTrue(w._has_changed('john__lennon', ['alfred', 'lennon']))
-
-        # test when the last widget's data has changed. this ensures that it is not
-        # short circuiting while testing the widgets.
-        self.assertTrue(w._has_changed('john__lennon', ['john', 'denver']))
-
     def test_splitdatetime(self):
         w = SplitDateTimeWidget()
         self.assertHTMLEqual(w.render('date', ''), '<input type="text" name="date_0" /><input type="text" name="date_1" />')
@@ -907,10 +864,6 @@ beatle J R Ringo False""")
         w = SplitDateTimeWidget(date_format='%d/%m/%Y', time_format='%H:%M')
         self.assertHTMLEqual(w.render('date', datetime.datetime(2006, 1, 10, 7, 30)), '<input type="text" name="date_0" value="10/01/2006" /><input type="text" name="date_1" value="07:30" />')
 
-        self.assertTrue(w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), ['2008-05-06', '12:40:00']))
-        self.assertFalse(w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), ['06/05/2008', '12:40']))
-        self.assertTrue(w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), ['06/05/2008', '12:41']))
-
     def test_datetimeinput(self):
         w = DateTimeInput()
         self.assertHTMLEqual(w.render('date', None), '<input type="text" name="date" />')
@@ -925,13 +878,6 @@ beatle J R Ringo False""")
         # Use 'format' to change the way a value is displayed.
         w = DateTimeInput(format='%d/%m/%Y %H:%M', attrs={'type': 'datetime'})
         self.assertHTMLEqual(w.render('date', d), '<input type="datetime" name="date" value="17/09/2007 12:51" />')
-        self.assertFalse(w._has_changed(d, '17/09/2007 12:51'))
-
-        # Make sure a custom format works with _has_changed. The hidden input will use
-        data = datetime.datetime(2010, 3, 6, 12, 0, 0)
-        custom_format = '%d.%m.%Y %H:%M'
-        w = DateTimeInput(format=custom_format)
-        self.assertFalse(w._has_changed(formats.localize_input(data), data.strftime(custom_format)))
 
     def test_dateinput(self):
         w = DateInput()
@@ -948,13 +894,6 @@ beatle J R Ringo False""")
         # Use 'format' to change the way a value is displayed.
         w = DateInput(format='%d/%m/%Y', attrs={'type': 'date'})
         self.assertHTMLEqual(w.render('date', d), '<input type="date" name="date" value="17/09/2007" />')
-        self.assertFalse(w._has_changed(d, '17/09/2007'))
-
-        # Make sure a custom format works with _has_changed. The hidden input will use
-        data = datetime.date(2010, 3, 6)
-        custom_format = '%d.%m.%Y'
-        w = DateInput(format=custom_format)
-        self.assertFalse(w._has_changed(formats.localize_input(data), data.strftime(custom_format)))
 
     def test_timeinput(self):
         w = TimeInput()
@@ -973,13 +912,6 @@ beatle J R Ringo False""")
         # Use 'format' to change the way a value is displayed.
         w = TimeInput(format='%H:%M', attrs={'type': 'time'})
         self.assertHTMLEqual(w.render('time', t), '<input type="time" name="time" value="12:51" />')
-        self.assertFalse(w._has_changed(t, '12:51'))
-
-        # Make sure a custom format works with _has_changed. The hidden input will use
-        data = datetime.time(13, 0)
-        custom_format = '%I:%M %p'
-        w = TimeInput(format=custom_format)
-        self.assertFalse(w._has_changed(formats.localize_input(data), data.strftime(custom_format)))
 
     def test_splithiddendatetime(self):
         from django.forms.widgets import SplitHiddenDateTimeWidget
@@ -1007,10 +939,6 @@ class FormsI18NWidgetsTestCase(TestCase):
         deactivate()
         super(FormsI18NWidgetsTestCase, self).tearDown()
 
-    def test_splitdatetime(self):
-        w = SplitDateTimeWidget(date_format='%d/%m/%Y', time_format='%H:%M')
-        self.assertTrue(w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), ['06.05.2008', '12:41']))
-
     def test_datetimeinput(self):
         w = DateTimeInput()
         d = datetime.datetime(2007, 9, 17, 12, 51, 34, 482548)
@@ -1100,7 +1028,7 @@ class WidgetTests(TestCase):
 
 
 class LiveWidgetTests(AdminSeleniumWebDriverTestCase):
-    urls = 'regressiontests.forms.urls'
+    urls = 'forms_tests.urls'
 
     def test_textarea_trailing_newlines(self):
         """
diff --git a/tests/regressiontests/forms/tests/models.py b/tests/forms_tests/tests/tests.py
similarity index 99%
rename from tests/regressiontests/forms/tests/models.py
rename to tests/forms_tests/tests/tests.py
index be75643b28..80e2cadcc3 100644
--- a/tests/regressiontests/forms/tests/models.py
+++ b/tests/forms_tests/tests/tests.py
@@ -46,7 +46,8 @@ class TestTicket14567(TestCase):
     """
     def test_empty_queryset_return(self):
         "If a model's ManyToManyField has blank=True and is saved with no data, a queryset is returned."
-        form = OptionalMultiChoiceModelForm({'multi_choice_optional': '', 'multi_choice': ['1']})
+        option = ChoiceOptionModel.objects.create(name='default')
+        form = OptionalMultiChoiceModelForm({'multi_choice_optional': '', 'multi_choice': [option.pk]})
         self.assertTrue(form.is_valid())
         # Check that the empty value is a QuerySet
         self.assertTrue(isinstance(form.cleaned_data['multi_choice_optional'], models.query.QuerySet))
diff --git a/tests/regressiontests/forms/urls.py b/tests/forms_tests/urls.py
similarity index 64%
rename from tests/regressiontests/forms/urls.py
rename to tests/forms_tests/urls.py
index b482b6c45c..cbd760081a 100644
--- a/tests/regressiontests/forms/urls.py
+++ b/tests/forms_tests/urls.py
@@ -5,5 +5,5 @@ from .views import ArticleFormView
 
 
 urlpatterns = patterns('',
-    url(r'^/model_form/(?P<pk>\d+)/$', ArticleFormView.as_view(), name="article_form"),
+    url(r'^model_form/(?P<pk>\d+)/$', ArticleFormView.as_view(), name="article_form"),
 )
diff --git a/tests/regressiontests/forms/views.py b/tests/forms_tests/views.py
similarity index 100%
rename from tests/regressiontests/forms/views.py
rename to tests/forms_tests/views.py
diff --git a/tests/modeltests/get_object_or_404/__init__.py b/tests/generic_inline_admin/__init__.py
similarity index 100%
rename from tests/modeltests/get_object_or_404/__init__.py
rename to tests/generic_inline_admin/__init__.py
diff --git a/tests/regressiontests/generic_inline_admin/admin.py b/tests/generic_inline_admin/admin.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/admin.py
rename to tests/generic_inline_admin/admin.py
diff --git a/tests/regressiontests/generic_inline_admin/fixtures/users.xml b/tests/generic_inline_admin/fixtures/users.xml
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/fixtures/users.xml
rename to tests/generic_inline_admin/fixtures/users.xml
diff --git a/tests/regressiontests/generic_inline_admin/models.py b/tests/generic_inline_admin/models.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/models.py
rename to tests/generic_inline_admin/models.py
diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py
similarity index 83%
rename from tests/regressiontests/generic_inline_admin/tests.py
rename to tests/generic_inline_admin/tests.py
index fea30b4946..ac2c191183 100644
--- a/tests/regressiontests/generic_inline_admin/tests.py
+++ b/tests/generic_inline_admin/tests.py
@@ -6,6 +6,7 @@ from django.contrib import admin
 from django.contrib.admin.sites import AdminSite
 from django.contrib.contenttypes.generic import (
     generic_inlineformset_factory, GenericTabularInline)
+from django.forms.formsets import DEFAULT_MAX_NUM
 from django.forms.models import ModelForm
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -18,7 +19,7 @@ from .models import (Episode, EpisodeExtra, EpisodeMaxNum, Media,
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class GenericAdminViewTest(TestCase):
-    urls = "regressiontests.generic_inline_admin.urls"
+    urls = "generic_inline_admin.urls"
     fixtures = ['users.xml']
 
     def setUp(self):
@@ -102,22 +103,22 @@ class GenericAdminViewTest(TestCase):
         # Works with no queryset
         formset = EpisodeMediaFormSet(instance=e)
         self.assertEqual(len(formset.forms), 5)
-        self.assertHTMLEqual(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="text" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/podcast.mp3" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>' % self.mp3_media_pk)
-        self.assertHTMLEqual(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="text" name="generic_inline_admin-media-content_type-object_id-1-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>' % self.png_media_pk)
-        self.assertHTMLEqual(formset.forms[2].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-2-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-2-url" type="text" name="generic_inline_admin-media-content_type-object_id-2-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-2-id" id="id_generic_inline_admin-media-content_type-object_id-2-id" /></p>')
+        self.assertHTMLEqual(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="url" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/podcast.mp3" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>' % self.mp3_media_pk)
+        self.assertHTMLEqual(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="url" name="generic_inline_admin-media-content_type-object_id-1-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>' % self.png_media_pk)
+        self.assertHTMLEqual(formset.forms[2].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-2-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-2-url" type="url" name="generic_inline_admin-media-content_type-object_id-2-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-2-id" id="id_generic_inline_admin-media-content_type-object_id-2-id" /></p>')
 
         # A queryset can be used to alter display ordering
         formset = EpisodeMediaFormSet(instance=e, queryset=Media.objects.order_by('url'))
         self.assertEqual(len(formset.forms), 5)
-        self.assertHTMLEqual(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="text" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>' % self.png_media_pk)
-        self.assertHTMLEqual(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="text" name="generic_inline_admin-media-content_type-object_id-1-url" value="http://example.com/podcast.mp3" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>' % self.mp3_media_pk)
-        self.assertHTMLEqual(formset.forms[2].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-2-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-2-url" type="text" name="generic_inline_admin-media-content_type-object_id-2-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-2-id" id="id_generic_inline_admin-media-content_type-object_id-2-id" /></p>')
+        self.assertHTMLEqual(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="url" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>' % self.png_media_pk)
+        self.assertHTMLEqual(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="url" name="generic_inline_admin-media-content_type-object_id-1-url" value="http://example.com/podcast.mp3" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>' % self.mp3_media_pk)
+        self.assertHTMLEqual(formset.forms[2].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-2-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-2-url" type="url" name="generic_inline_admin-media-content_type-object_id-2-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-2-id" id="id_generic_inline_admin-media-content_type-object_id-2-id" /></p>')
 
         # Works with a queryset that omits items
         formset = EpisodeMediaFormSet(instance=e, queryset=Media.objects.filter(url__endswith=".png"))
         self.assertEqual(len(formset.forms), 4)
-        self.assertHTMLEqual(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="text" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>' % self.png_media_pk)
-        self.assertHTMLEqual(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="text" name="generic_inline_admin-media-content_type-object_id-1-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>')
+        self.assertHTMLEqual(formset.forms[0].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-0-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-0-url" type="url" name="generic_inline_admin-media-content_type-object_id-0-url" value="http://example.com/logo.png" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-0-id" value="%s" id="id_generic_inline_admin-media-content_type-object_id-0-id" /></p>' % self.png_media_pk)
+        self.assertHTMLEqual(formset.forms[1].as_p(), '<p><label for="id_generic_inline_admin-media-content_type-object_id-1-url">Url:</label> <input id="id_generic_inline_admin-media-content_type-object_id-1-url" type="url" name="generic_inline_admin-media-content_type-object_id-1-url" maxlength="200" /><input type="hidden" name="generic_inline_admin-media-content_type-object_id-1-id" id="id_generic_inline_admin-media-content_type-object_id-1-id" /></p>')
 
     def testGenericInlineFormsetFactory(self):
         # Regression test for #10522.
@@ -131,7 +132,7 @@ class GenericAdminViewTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class GenericInlineAdminParametersTest(TestCase):
-    urls = "regressiontests.generic_inline_admin.urls"
+    urls = "generic_inline_admin.urls"
     fixtures = ['users.xml']
 
     def setUp(self):
@@ -185,7 +186,7 @@ class GenericInlineAdminParametersTest(TestCase):
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class GenericInlineAdminWithUniqueTogetherTest(TestCase):
-    urls = "regressiontests.generic_inline_admin.urls"
+    urls = "generic_inline_admin.urls"
     fixtures = ['users.xml']
 
     def setUp(self):
@@ -212,7 +213,7 @@ class GenericInlineAdminWithUniqueTogetherTest(TestCase):
         self.assertEqual(response.status_code, 302) # redirect somewhere
 
 class NoInlineDeletionTest(TestCase):
-    urls = "regressiontests.generic_inline_admin.urls"
+    urls = "generic_inline_admin.urls"
 
     def test_no_deletion(self):
         fake_site = object()
@@ -234,7 +235,7 @@ request.user = MockSuperUser()
 
 
 class GenericInlineModelAdminTest(TestCase):
-    urls = "regressiontests.generic_inline_admin.urls"
+    urls = "generic_inline_admin.urls"
 
     def setUp(self):
         self.site = AdminSite()
@@ -244,7 +245,7 @@ class GenericInlineModelAdminTest(TestCase):
 
         # Create a formset with default arguments
         formset = media_inline.get_formset(request)
-        self.assertEqual(formset.max_num, None)
+        self.assertEqual(formset.max_num, DEFAULT_MAX_NUM)
         self.assertEqual(formset.can_order, False)
 
         # Create a formset with custom keyword arguments
diff --git a/tests/regressiontests/generic_inline_admin/urls.py b/tests/generic_inline_admin/urls.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/urls.py
rename to tests/generic_inline_admin/urls.py
diff --git a/tests/modeltests/get_or_create/__init__.py b/tests/generic_relations/__init__.py
similarity index 100%
rename from tests/modeltests/get_or_create/__init__.py
rename to tests/generic_relations/__init__.py
diff --git a/tests/modeltests/generic_relations/models.py b/tests/generic_relations/models.py
similarity index 93%
rename from tests/modeltests/generic_relations/models.py
rename to tests/generic_relations/models.py
index 2f025e660b..34dc8d3a7d 100644
--- a/tests/modeltests/generic_relations/models.py
+++ b/tests/generic_relations/models.py
@@ -88,9 +88,13 @@ class Mineral(models.Model):
         return self.name
 
 class GeckoManager(models.Manager):
-    def get_query_set(self):
-        return super(GeckoManager, self).get_query_set().filter(has_tail=True)
+    def get_queryset(self):
+        return super(GeckoManager, self).get_queryset().filter(has_tail=True)
 
 class Gecko(models.Model):
     has_tail = models.BooleanField()
     objects = GeckoManager()
+
+# To test fix for #11263
+class Rock(Mineral):
+    tags = generic.GenericRelation(TaggedItem)
diff --git a/tests/modeltests/generic_relations/tests.py b/tests/generic_relations/tests.py
similarity index 96%
rename from tests/modeltests/generic_relations/tests.py
rename to tests/generic_relations/tests.py
index 73b0a483a2..27b25185ea 100644
--- a/tests/modeltests/generic_relations/tests.py
+++ b/tests/generic_relations/tests.py
@@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
 from .models import (TaggedItem, ValuableTaggedItem, Comparison, Animal,
-    Vegetable, Mineral, Gecko)
+    Vegetable, Mineral, Gecko, Rock)
 
 
 class GenericRelationsTests(TestCase):
@@ -231,6 +231,16 @@ class GenericRelationsTests(TestCase):
         tag = TaggedItem.objects.create(content_object=tailless, tag="lizard")
         self.assertEqual(tag.content_object, tailless)
 
+    def test_subclasses_with_gen_rel(self):
+        """
+        Test that concrete model subclasses with generic relations work
+        correctly (ticket 11263).
+        """
+        granite = Rock.objects.create(name='granite', hardness=5)
+        TaggedItem.objects.create(content_object=granite, tag="countertop")
+        self.assertEqual(Rock.objects.filter(tags__tag="countertop").count(), 1)
+
+
 class CustomWidget(forms.TextInput):
     pass
 
diff --git a/tests/modeltests/invalid_models/invalid_models/__init__.py b/tests/generic_relations_regress/__init__.py
similarity index 100%
rename from tests/modeltests/invalid_models/invalid_models/__init__.py
rename to tests/generic_relations_regress/__init__.py
diff --git a/tests/regressiontests/generic_relations_regress/models.py b/tests/generic_relations_regress/models.py
similarity index 69%
rename from tests/regressiontests/generic_relations_regress/models.py
rename to tests/generic_relations_regress/models.py
index dacc9b380b..2795471f7f 100644
--- a/tests/regressiontests/generic_relations_regress/models.py
+++ b/tests/generic_relations_regress/models.py
@@ -6,7 +6,7 @@ from django.utils.encoding import python_2_unicode_compatible
 
 __all__ = ('Link', 'Place', 'Restaurant', 'Person', 'Address',
            'CharLink', 'TextLink', 'OddRelation1', 'OddRelation2',
-           'Contact', 'Organization', 'Note')
+           'Contact', 'Organization', 'Note', 'Company')
 
 @python_2_unicode_compatible
 class Link(models.Model):
@@ -84,3 +84,41 @@ class Organization(models.Model):
     name = models.CharField(max_length=255)
     contacts = models.ManyToManyField(Contact, related_name='organizations')
 
+@python_2_unicode_compatible
+class Company(models.Model):
+    name = models.CharField(max_length=100)
+    links = generic.GenericRelation(Link)
+
+    def __str__(self):
+        return "Company: %s" % self.name
+
+# For testing #13085 fix, we also use Note model defined above
+class Developer(models.Model):
+    name = models.CharField(max_length=15)
+
+@python_2_unicode_compatible
+class Team(models.Model):
+    name = models.CharField(max_length=15)
+    members = models.ManyToManyField(Developer)
+
+    def __str__(self):
+        return "%s team" % self.name
+
+    def __len__(self):
+        return self.members.count()
+
+class Guild(models.Model):
+    name = models.CharField(max_length=15)
+    members = models.ManyToManyField(Developer)
+
+    def __nonzero__(self):
+        return self.members.count()
+
+class Tag(models.Model):
+    content_type = models.ForeignKey(ContentType, related_name='g_r_r_tags')
+    object_id = models.CharField(max_length=15)
+    content_object = generic.GenericForeignKey()
+    label = models.CharField(max_length=15)
+
+class Board(models.Model):
+    name = models.CharField(primary_key=True, max_length=15)
diff --git a/tests/regressiontests/generic_relations_regress/tests.py b/tests/generic_relations_regress/tests.py
similarity index 52%
rename from tests/regressiontests/generic_relations_regress/tests.py
rename to tests/generic_relations_regress/tests.py
index 4c0f024433..474113584a 100644
--- a/tests/regressiontests/generic_relations_regress/tests.py
+++ b/tests/generic_relations_regress/tests.py
@@ -1,8 +1,10 @@
 from django.db.models import Q
-from django.test import TestCase
+from django.db.utils import IntegrityError
+from django.test import TestCase, skipIfDBFeature
 
 from .models import (Address, Place, Restaurant, Link, CharLink, TextLink,
-    Person, Contact, Note, Organization, OddRelation1, OddRelation2)
+    Person, Contact, Note, Organization, OddRelation1, OddRelation2, Company,
+    Developer, Team, Guild, Tag, Board)
 
 
 class GenericRelationTests(TestCase):
@@ -72,5 +74,64 @@ class GenericRelationTests(TestCase):
             Q(notes__note__icontains=r'other note'))
         self.assertTrue(org_contact in qs)
 
+    def test_join_reuse(self):
+        qs = Person.objects.filter(
+            addresses__street='foo'
+        ).filter(
+            addresses__street='bar'
+        )
+        self.assertEqual(str(qs.query).count('JOIN'), 2)
 
+    def test_generic_relation_ordering(self):
+        """
+        Test that ordering over a generic relation does not include extraneous
+        duplicate results, nor excludes rows not participating in the relation.
+        """
+        p1 = Place.objects.create(name="South Park")
+        p2 = Place.objects.create(name="The City")
+        c = Company.objects.create(name="Chubby's Intl.")
+        l1 = Link.objects.create(content_object=p1)
+        l2 = Link.objects.create(content_object=c)
 
+        places = list(Place.objects.order_by('links__id'))
+        def count_places(place):
+            return len([p for p in places if p.id == place.id])
+
+        self.assertEqual(len(places), 2)
+        self.assertEqual(count_places(p1), 1)
+        self.assertEqual(count_places(p2), 1)
+
+    def test_target_model_is_unsaved(self):
+        """Test related to #13085"""
+        # Fails with another, ORM-level error
+        dev1 = Developer(name='Joe')
+        note = Note(note='Deserves promotion', content_object=dev1)
+        self.assertRaises(IntegrityError, note.save)
+
+    def test_target_model_len_zero(self):
+        """Test for #13085 -- __len__() returns 0"""
+        team1 = Team.objects.create(name='Backend devs')
+        try:
+            note = Note(note='Deserve a bonus', content_object=team1)
+        except Exception as e:
+            if issubclass(type(e), Exception) and str(e) == 'Impossible arguments to GFK.get_content_type!':
+                self.fail("Saving model with GenericForeignKey to model instance whose __len__ method returns 0 shouldn't fail.")
+            raise e
+        note.save()
+
+    def test_target_model_nonzero_false(self):
+        """Test related to #13085"""
+        # __nonzero__() returns False -- This actually doesn't currently fail.
+        # This test validates that
+        g1 = Guild.objects.create(name='First guild')
+        note = Note(note='Note for guild', content_object=g1)
+        note.save()
+
+    @skipIfDBFeature('interprets_empty_strings_as_nulls')
+    def test_gfk_to_model_with_empty_pk(self):
+        """Test related to #13085"""
+        # Saving model with GenericForeignKey to model instance with an
+        # empty CharField PK
+        b1 = Board.objects.create(name='')
+        tag = Tag(label='VP', content_object=b1)
+        tag.save()
diff --git a/tests/modeltests/known_related_objects/__init__.py b/tests/generic_views/__init__.py
similarity index 100%
rename from tests/modeltests/known_related_objects/__init__.py
rename to tests/generic_views/__init__.py
diff --git a/tests/regressiontests/generic_views/fixtures/generic-views-test-data.json b/tests/generic_views/fixtures/generic-views-test-data.json
similarity index 100%
rename from tests/regressiontests/generic_views/fixtures/generic-views-test-data.json
rename to tests/generic_views/fixtures/generic-views-test-data.json
diff --git a/tests/regressiontests/generic_views/models.py b/tests/generic_views/models.py
similarity index 100%
rename from tests/regressiontests/generic_views/models.py
rename to tests/generic_views/models.py
diff --git a/tests/regressiontests/generic_views/templates/generic_views/about.html b/tests/generic_views/templates/generic_views/about.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/about.html
rename to tests/generic_views/templates/generic_views/about.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/apple_detail.html b/tests/generic_views/templates/generic_views/apple_detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/apple_detail.html
rename to tests/generic_views/templates/generic_views/apple_detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/artist_detail.html b/tests/generic_views/templates/generic_views/artist_detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/artist_detail.html
rename to tests/generic_views/templates/generic_views/artist_detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/artist_form.html b/tests/generic_views/templates/generic_views/artist_form.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/artist_form.html
rename to tests/generic_views/templates/generic_views/artist_form.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_confirm_delete.html b/tests/generic_views/templates/generic_views/author_confirm_delete.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_confirm_delete.html
rename to tests/generic_views/templates/generic_views/author_confirm_delete.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_detail.html b/tests/generic_views/templates/generic_views/author_detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_detail.html
rename to tests/generic_views/templates/generic_views/author_detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_form.html b/tests/generic_views/templates/generic_views/author_form.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_form.html
rename to tests/generic_views/templates/generic_views/author_form.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_list.html b/tests/generic_views/templates/generic_views/author_list.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_list.html
rename to tests/generic_views/templates/generic_views/author_list.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_objects.html b/tests/generic_views/templates/generic_views/author_objects.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_objects.html
rename to tests/generic_views/templates/generic_views/author_objects.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/author_view.html b/tests/generic_views/templates/generic_views/author_view.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/author_view.html
rename to tests/generic_views/templates/generic_views/author_view.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive.html b/tests/generic_views/templates/generic_views/book_archive.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive.html
rename to tests/generic_views/templates/generic_views/book_archive.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive_day.html b/tests/generic_views/templates/generic_views/book_archive_day.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive_day.html
rename to tests/generic_views/templates/generic_views/book_archive_day.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive_month.html b/tests/generic_views/templates/generic_views/book_archive_month.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive_month.html
rename to tests/generic_views/templates/generic_views/book_archive_month.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive_week.html b/tests/generic_views/templates/generic_views/book_archive_week.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive_week.html
rename to tests/generic_views/templates/generic_views/book_archive_week.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_archive_year.html b/tests/generic_views/templates/generic_views/book_archive_year.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_archive_year.html
rename to tests/generic_views/templates/generic_views/book_archive_year.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_detail.html b/tests/generic_views/templates/generic_views/book_detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_detail.html
rename to tests/generic_views/templates/generic_views/book_detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/book_list.html b/tests/generic_views/templates/generic_views/book_list.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/book_list.html
rename to tests/generic_views/templates/generic_views/book_list.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/confirm_delete.html b/tests/generic_views/templates/generic_views/confirm_delete.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/confirm_delete.html
rename to tests/generic_views/templates/generic_views/confirm_delete.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/detail.html b/tests/generic_views/templates/generic_views/detail.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/detail.html
rename to tests/generic_views/templates/generic_views/detail.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/form.html b/tests/generic_views/templates/generic_views/form.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/form.html
rename to tests/generic_views/templates/generic_views/form.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/list.html b/tests/generic_views/templates/generic_views/list.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/list.html
rename to tests/generic_views/templates/generic_views/list.html
diff --git a/tests/regressiontests/generic_views/templates/generic_views/page_template.html b/tests/generic_views/templates/generic_views/page_template.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/generic_views/page_template.html
rename to tests/generic_views/templates/generic_views/page_template.html
diff --git a/tests/generic_views/templates/generic_views/robots.txt b/tests/generic_views/templates/generic_views/robots.txt
new file mode 100644
index 0000000000..72158267ba
--- /dev/null
+++ b/tests/generic_views/templates/generic_views/robots.txt
@@ -0,0 +1 @@
+User-Agent: *
diff --git a/tests/regressiontests/generic_views/templates/registration/login.html b/tests/generic_views/templates/registration/login.html
similarity index 100%
rename from tests/regressiontests/generic_views/templates/registration/login.html
rename to tests/generic_views/templates/registration/login.html
diff --git a/tests/regressiontests/generic_views/base.py b/tests/generic_views/test_base.py
similarity index 94%
rename from tests/regressiontests/generic_views/base.py
rename to tests/generic_views/test_base.py
index c7ad7a0deb..0e84e17132 100644
--- a/tests/regressiontests/generic_views/base.py
+++ b/tests/generic_views/test_base.py
@@ -229,7 +229,7 @@ class ViewTest(unittest.TestCase):
 
 
 class TemplateViewTest(TestCase):
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     rf = RequestFactory()
 
@@ -312,6 +312,11 @@ class TemplateViewTest(TestCase):
 
         self.assertNotEqual(response.content, response2.content)
 
+    def test_content_type(self):
+        response = self.client.get('/template/content_type/')
+        self.assertEqual(response['Content-Type'], 'text/plain')
+
+
 class RedirectViewTest(unittest.TestCase):
     rf = RequestFactory()
 
@@ -324,66 +329,66 @@ class RedirectViewTest(unittest.TestCase):
         "Default is a permanent redirect"
         response = RedirectView.as_view(url='/bar/')(self.rf.get('/foo/'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/')
+        self.assertEqual(response.url, '/bar/')
 
     def test_temporary_redirect(self):
         "Permanent redirects are an option"
         response = RedirectView.as_view(url='/bar/', permanent=False)(self.rf.get('/foo/'))
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response['Location'], '/bar/')
+        self.assertEqual(response.url, '/bar/')
 
     def test_include_args(self):
         "GET arguments can be included in the redirected URL"
         response = RedirectView.as_view(url='/bar/')(self.rf.get('/foo/'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/')
+        self.assertEqual(response.url, '/bar/')
 
         response = RedirectView.as_view(url='/bar/', query_string=True)(self.rf.get('/foo/?pork=spam'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/?pork=spam')
+        self.assertEqual(response.url, '/bar/?pork=spam')
 
     def test_include_urlencoded_args(self):
         "GET arguments can be URL-encoded when included in the redirected URL"
         response = RedirectView.as_view(url='/bar/', query_string=True)(
             self.rf.get('/foo/?unicode=%E2%9C%93'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/?unicode=%E2%9C%93')
+        self.assertEqual(response.url, '/bar/?unicode=%E2%9C%93')
 
     def test_parameter_substitution(self):
         "Redirection URLs can be parameterized"
         response = RedirectView.as_view(url='/bar/%(object_id)d/')(self.rf.get('/foo/42/'), object_id=42)
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/42/')
+        self.assertEqual(response.url, '/bar/42/')
 
     def test_redirect_POST(self):
         "Default is a permanent redirect"
         response = RedirectView.as_view(url='/bar/')(self.rf.post('/foo/'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/')
+        self.assertEqual(response.url, '/bar/')
 
     def test_redirect_HEAD(self):
         "Default is a permanent redirect"
         response = RedirectView.as_view(url='/bar/')(self.rf.head('/foo/'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/')
+        self.assertEqual(response.url, '/bar/')
 
     def test_redirect_OPTIONS(self):
         "Default is a permanent redirect"
         response = RedirectView.as_view(url='/bar/')(self.rf.options('/foo/'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/')
+        self.assertEqual(response.url, '/bar/')
 
     def test_redirect_PUT(self):
         "Default is a permanent redirect"
         response = RedirectView.as_view(url='/bar/')(self.rf.put('/foo/'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/')
+        self.assertEqual(response.url, '/bar/')
 
     def test_redirect_DELETE(self):
         "Default is a permanent redirect"
         response = RedirectView.as_view(url='/bar/')(self.rf.delete('/foo/'))
         self.assertEqual(response.status_code, 301)
-        self.assertEqual(response['Location'], '/bar/')
+        self.assertEqual(response.url, '/bar/')
 
     def test_redirect_when_meta_contains_no_query_string(self):
         "regression for #16705"
diff --git a/tests/regressiontests/generic_views/dates.py b/tests/generic_views/test_dates.py
similarity index 98%
rename from tests/regressiontests/generic_views/dates.py
rename to tests/generic_views/test_dates.py
index 0c565daf9f..263326322e 100644
--- a/tests/regressiontests/generic_views/dates.py
+++ b/tests/generic_views/test_dates.py
@@ -4,7 +4,7 @@ import time
 import datetime
 
 from django.core.exceptions import ImproperlyConfigured
-from django.test import TestCase
+from django.test import TestCase, skipUnlessDBFeature
 from django.test.utils import override_settings
 from django.utils import timezone
 from django.utils.unittest import skipUnless
@@ -33,7 +33,7 @@ def _make_books(n, base_date):
 
 class ArchiveIndexViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
 
     def test_archive_view(self):
@@ -119,6 +119,7 @@ class ArchiveIndexViewTests(TestCase):
         self.assertEqual(res.status_code, 200)
 
     @requires_tz_support
+    @skipUnlessDBFeature('has_zoneinfo_database')
     @override_settings(USE_TZ=True, TIME_ZONE='Africa/Nairobi')
     def test_aware_datetime_archive_view(self):
         BookSigning.objects.create(event_date=datetime.datetime(2008, 4, 2, 12, 0, tzinfo=timezone.utc))
@@ -135,12 +136,12 @@ class ArchiveIndexViewTests(TestCase):
 
 class YearArchiveViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_year_view(self):
         res = self.client.get('/dates/books/2008/')
         self.assertEqual(res.status_code, 200)
-        self.assertEqual(list(res.context['date_list']), [datetime.datetime(2008, 10, 1)])
+        self.assertEqual(list(res.context['date_list']), [datetime.date(2008, 10, 1)])
         self.assertEqual(res.context['year'], datetime.date(2008, 1, 1))
         self.assertTemplateUsed(res, 'generic_views/book_archive_year.html')
 
@@ -151,7 +152,7 @@ class YearArchiveViewTests(TestCase):
     def test_year_view_make_object_list(self):
         res = self.client.get('/dates/books/2006/make_object_list/')
         self.assertEqual(res.status_code, 200)
-        self.assertEqual(list(res.context['date_list']), [datetime.datetime(2006, 5, 1)])
+        self.assertEqual(list(res.context['date_list']), [datetime.date(2006, 5, 1)])
         self.assertEqual(list(res.context['book_list']), list(Book.objects.filter(pubdate__year=2006)))
         self.assertEqual(list(res.context['object_list']), list(Book.objects.filter(pubdate__year=2006)))
         self.assertTemplateUsed(res, 'generic_views/book_archive_year.html')
@@ -181,7 +182,7 @@ class YearArchiveViewTests(TestCase):
 
         res = self.client.get('/dates/books/%s/allow_future/' % year)
         self.assertEqual(res.status_code, 200)
-        self.assertEqual(list(res.context['date_list']), [datetime.datetime(year, 1, 1)])
+        self.assertEqual(list(res.context['date_list']), [datetime.date(year, 1, 1)])
 
     def test_year_view_paginated(self):
         res = self.client.get('/dates/books/2006/paginated/')
@@ -204,6 +205,7 @@ class YearArchiveViewTests(TestCase):
         res = self.client.get('/dates/booksignings/2008/')
         self.assertEqual(res.status_code, 200)
 
+    @skipUnlessDBFeature('has_zoneinfo_database')
     @override_settings(USE_TZ=True, TIME_ZONE='Africa/Nairobi')
     def test_aware_datetime_year_view(self):
         BookSigning.objects.create(event_date=datetime.datetime(2008, 4, 2, 12, 0, tzinfo=timezone.utc))
@@ -219,13 +221,13 @@ class YearArchiveViewTests(TestCase):
 
 class MonthArchiveViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_month_view(self):
         res = self.client.get('/dates/books/2008/oct/')
         self.assertEqual(res.status_code, 200)
         self.assertTemplateUsed(res, 'generic_views/book_archive_month.html')
-        self.assertEqual(list(res.context['date_list']), [datetime.datetime(2008, 10, 1)])
+        self.assertEqual(list(res.context['date_list']), [datetime.date(2008, 10, 1)])
         self.assertEqual(list(res.context['book_list']),
                          list(Book.objects.filter(pubdate=datetime.date(2008, 10, 1))))
         self.assertEqual(res.context['month'], datetime.date(2008, 10, 1))
@@ -268,7 +270,7 @@ class MonthArchiveViewTests(TestCase):
         # allow_future = True, valid future month
         res = self.client.get('/dates/books/%s/allow_future/' % urlbit)
         self.assertEqual(res.status_code, 200)
-        self.assertEqual(res.context['date_list'][0].date(), b.pubdate)
+        self.assertEqual(res.context['date_list'][0], b.pubdate)
         self.assertEqual(list(res.context['book_list']), [b])
         self.assertEqual(res.context['month'], future)
 
@@ -328,6 +330,7 @@ class MonthArchiveViewTests(TestCase):
         res = self.client.get('/dates/booksignings/2008/apr/')
         self.assertEqual(res.status_code, 200)
 
+    @skipUnlessDBFeature('has_zoneinfo_database')
     @override_settings(USE_TZ=True, TIME_ZONE='Africa/Nairobi')
     def test_aware_datetime_month_view(self):
         BookSigning.objects.create(event_date=datetime.datetime(2008, 2, 1, 12, 0, tzinfo=timezone.utc))
@@ -345,7 +348,7 @@ class MonthArchiveViewTests(TestCase):
 
 class WeekArchiveViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_week_view(self):
         res = self.client.get('/dates/books/2008/week/39/')
@@ -442,7 +445,7 @@ class WeekArchiveViewTests(TestCase):
 
 class DayArchiveViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_day_view(self):
         res = self.client.get('/dates/books/2008/oct/01/')
@@ -560,7 +563,7 @@ class DayArchiveViewTests(TestCase):
 
 class DateDetailViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_date_detail_by_pk(self):
         res = self.client.get('/dates/books/2008/oct/01/1/')
diff --git a/tests/regressiontests/generic_views/detail.py b/tests/generic_views/test_detail.py
similarity index 99%
rename from tests/regressiontests/generic_views/detail.py
rename to tests/generic_views/test_detail.py
index c8f1999a2a..faee05688e 100644
--- a/tests/regressiontests/generic_views/detail.py
+++ b/tests/generic_views/test_detail.py
@@ -9,7 +9,7 @@ from .models import Artist, Author, Page
 
 class DetailViewTest(TestCase):
     fixtures = ['generic-views-test-data.json']
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_simple_object(self):
         res = self.client.get('/detail/obj/')
diff --git a/tests/regressiontests/generic_views/edit.py b/tests/generic_views/test_edit.py
similarity index 94%
rename from tests/regressiontests/generic_views/edit.py
rename to tests/generic_views/test_edit.py
index 0f1eb3cca7..c54d632363 100644
--- a/tests/regressiontests/generic_views/edit.py
+++ b/tests/generic_views/test_edit.py
@@ -13,16 +13,16 @@ from .models import Artist, Author
 
 
 class FormMixinTests(TestCase):
-     def test_initial_data(self):
-         """ Test instance independence of initial data dict (see #16138) """
-         initial_1 = FormMixin().get_initial()
-         initial_1['foo'] = 'bar'
-         initial_2 = FormMixin().get_initial()
-         self.assertNotEqual(initial_1, initial_2)
+    def test_initial_data(self):
+        """ Test instance independence of initial data dict (see #16138) """
+        initial_1 = FormMixin().get_initial()
+        initial_1['foo'] = 'bar'
+        initial_2 = FormMixin().get_initial()
+        self.assertNotEqual(initial_1, initial_2)
 
 
 class BasicFormTests(TestCase):
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_post_data(self):
         res = self.client.post('/contact/', {'name': "Me", 'message': "Hello"})
@@ -35,7 +35,7 @@ class ModelFormMixinTests(TestCase):
         self.assertEqual(form_class._meta.model, Author)
 
 class CreateViewTests(TestCase):
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_create(self):
         res = self.client.get('/edit/authors/create/')
@@ -114,7 +114,7 @@ class CreateViewTests(TestCase):
 
 
 class UpdateViewTests(TestCase):
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_update_post(self):
         a = Author.objects.create(
@@ -252,7 +252,7 @@ class UpdateViewTests(TestCase):
 
 
 class DeleteViewTests(TestCase):
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_delete_by_post(self):
         a = Author.objects.create(**{'name': 'Randall Munroe', 'slug': 'randall-munroe'})
@@ -283,6 +283,13 @@ class DeleteViewTests(TestCase):
         self.assertRedirects(res, 'http://testserver/edit/authors/create/')
         self.assertQuerysetEqual(Author.objects.all(), [])
 
+    def test_delete_with_interpolated_redirect(self):
+        a = Author.objects.create(**{'name': 'Randall Munroe', 'slug': 'randall-munroe'})
+        res = self.client.post('/edit/author/%d/delete/interpolate_redirect/' % a.pk)
+        self.assertEqual(res.status_code, 302)
+        self.assertRedirects(res, 'http://testserver/edit/authors/create/?deleted=%d' % a.pk)
+        self.assertQuerysetEqual(Author.objects.all(), [])
+
     def test_delete_with_special_properties(self):
         a = Author.objects.create(**{'name': 'Randall Munroe', 'slug': 'randall-munroe'})
         res = self.client.get('/edit/author/%d/delete/special/' % a.pk)
diff --git a/tests/regressiontests/generic_views/forms.py b/tests/generic_views/test_forms.py
similarity index 100%
rename from tests/regressiontests/generic_views/forms.py
rename to tests/generic_views/test_forms.py
diff --git a/tests/regressiontests/generic_views/list.py b/tests/generic_views/test_list.py
similarity index 99%
rename from tests/regressiontests/generic_views/list.py
rename to tests/generic_views/test_list.py
index be2721d775..cc4d2f5966 100644
--- a/tests/regressiontests/generic_views/list.py
+++ b/tests/generic_views/test_list.py
@@ -11,7 +11,7 @@ from .models import Author, Artist
 
 class ListViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
-    urls = 'regressiontests.generic_views.urls'
+    urls = 'generic_views.urls'
 
     def test_items(self):
         res = self.client.get('/list/dict/')
diff --git a/tests/generic_views/tests.py b/tests/generic_views/tests.py
new file mode 100644
index 0000000000..244aa3c701
--- /dev/null
+++ b/tests/generic_views/tests.py
@@ -0,0 +1,11 @@
+from __future__ import absolute_import
+
+from .test_base import (ViewTest, TemplateViewTest, RedirectViewTest,
+    GetContextDataTest)
+from .test_dates import (ArchiveIndexViewTests, YearArchiveViewTests,
+    MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests,
+    DateDetailViewTests)
+from .test_detail import DetailViewTest
+from .test_edit import (FormMixinTests, BasicFormTests, ModelFormMixinTests,
+    CreateViewTests, UpdateViewTests, DeleteViewTests)
+from .test_list import ListViewTests
diff --git a/tests/regressiontests/generic_views/urls.py b/tests/generic_views/urls.py
similarity index 97%
rename from tests/regressiontests/generic_views/urls.py
rename to tests/generic_views/urls.py
index 34b37fa7c4..695b50279a 100644
--- a/tests/regressiontests/generic_views/urls.py
+++ b/tests/generic_views/urls.py
@@ -20,6 +20,8 @@ urlpatterns = patterns('',
         TemplateView.as_view(template_name='generic_views/about.html')),
     (r'^template/custom/(?P<foo>\w+)/$',
         views.CustomTemplateView.as_view(template_name='generic_views/about.html')),
+    (r'^template/content_type/$',
+        TemplateView.as_view(template_name='generic_views/robots.txt', content_type='text/plain')),
 
     (r'^template/cached/(?P<foo>\w+)/$',
         cache_page(2.0)(TemplateView.as_view(template_name='generic_views/about.html'))),
@@ -95,6 +97,8 @@ urlpatterns = patterns('',
         views.NaiveAuthorDelete.as_view()),
     (r'^edit/author/(?P<pk>\d+)/delete/redirect/$',
         views.NaiveAuthorDelete.as_view(success_url='/edit/authors/create/')),
+    (r'^edit/author/(?P<pk>\d+)/delete/interpolate_redirect/$',
+        views.NaiveAuthorDelete.as_view(success_url='/edit/authors/create/?deleted=%(id)s')),
     (r'^edit/author/(?P<pk>\d+)/delete/$',
         views.AuthorDelete.as_view()),
     (r'^edit/author/(?P<pk>\d+)/delete/special/$',
diff --git a/tests/regressiontests/generic_views/views.py b/tests/generic_views/views.py
similarity index 98%
rename from tests/regressiontests/generic_views/views.py
rename to tests/generic_views/views.py
index 71e78e82c7..69bfcb32dd 100644
--- a/tests/regressiontests/generic_views/views.py
+++ b/tests/generic_views/views.py
@@ -1,12 +1,13 @@
 from __future__ import absolute_import
 
 from django.contrib.auth.decorators import login_required
+from django.contrib.messages.views import SuccessMessageMixin
 from django.core.paginator import Paginator
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.decorators import method_decorator
 from django.views import generic
 
-from .forms import AuthorForm, ContactForm
+from .test_forms import AuthorForm, ContactForm
 from .models import Artist, Author, Book, Page, BookSigning
 
 
diff --git a/tests/modeltests/lookup/__init__.py b/tests/get_earliest_or_latest/__init__.py
similarity index 100%
rename from tests/modeltests/lookup/__init__.py
rename to tests/get_earliest_or_latest/__init__.py
diff --git a/tests/get_earliest_or_latest/models.py b/tests/get_earliest_or_latest/models.py
new file mode 100644
index 0000000000..cd62cf0104
--- /dev/null
+++ b/tests/get_earliest_or_latest/models.py
@@ -0,0 +1,16 @@
+from django.db import models
+
+
+class Article(models.Model):
+    headline = models.CharField(max_length=100)
+    pub_date = models.DateField()
+    expire_date = models.DateField()
+
+    class Meta:
+        get_latest_by = 'pub_date'
+
+
+class Person(models.Model):
+    name = models.CharField(max_length=30)
+    birthday = models.DateField()
+    # Note that this model doesn't have "get_latest_by" set.
diff --git a/tests/get_earliest_or_latest/tests.py b/tests/get_earliest_or_latest/tests.py
new file mode 100644
index 0000000000..6317a0974c
--- /dev/null
+++ b/tests/get_earliest_or_latest/tests.py
@@ -0,0 +1,123 @@
+from __future__ import absolute_import
+
+from datetime import datetime
+
+from django.test import TestCase
+
+from .models import Article, Person
+
+
+class EarliestOrLatestTests(TestCase):
+    """Tests for the earliest() and latest() objects methods"""
+
+    def tearDown(self):
+        """Makes sure Article has a get_latest_by"""
+        if not Article._meta.get_latest_by:
+            Article._meta.get_latest_by = 'pub_date'
+
+    def test_earliest(self):
+        # Because no Articles exist yet, earliest() raises ArticleDoesNotExist.
+        self.assertRaises(Article.DoesNotExist, Article.objects.earliest)
+
+        a1 = Article.objects.create(
+            headline="Article 1", pub_date=datetime(2005, 7, 26),
+            expire_date=datetime(2005, 9, 1)
+        )
+        a2 = Article.objects.create(
+            headline="Article 2", pub_date=datetime(2005, 7, 27),
+            expire_date=datetime(2005, 7, 28)
+        )
+        a3 = Article.objects.create(
+            headline="Article 3", pub_date=datetime(2005, 7, 28),
+            expire_date=datetime(2005, 8, 27)
+        )
+        a4 = Article.objects.create(
+            headline="Article 4", pub_date=datetime(2005, 7, 28),
+            expire_date=datetime(2005, 7, 30)
+        )
+
+        # Get the earliest Article.
+        self.assertEqual(Article.objects.earliest(), a1)
+        # Get the earliest Article that matches certain filters.
+        self.assertEqual(
+            Article.objects.filter(pub_date__gt=datetime(2005, 7, 26)).earliest(),
+            a2
+        )
+
+        # Pass a custom field name to earliest() to change the field that's used
+        # to determine the earliest object.
+        self.assertEqual(Article.objects.earliest('expire_date'), a2)
+        self.assertEqual(Article.objects.filter(
+            pub_date__gt=datetime(2005, 7, 26)).earliest('expire_date'), a2)
+
+        # Ensure that earliest() overrides any other ordering specified on the
+        # query. Refs #11283.
+        self.assertEqual(Article.objects.order_by('id').earliest(), a1)
+
+        # Ensure that error is raised if the user forgot to add a get_latest_by
+        # in the Model.Meta
+        Article.objects.model._meta.get_latest_by = None
+        self.assertRaisesMessage(
+            AssertionError,
+            "earliest() and latest() require either a field_name parameter or "
+            "'get_latest_by' in the model",
+            lambda: Article.objects.earliest(),
+        )
+
+    def test_latest(self):
+        # Because no Articles exist yet, latest() raises ArticleDoesNotExist.
+        self.assertRaises(Article.DoesNotExist, Article.objects.latest)
+
+        a1 = Article.objects.create(
+            headline="Article 1", pub_date=datetime(2005, 7, 26),
+            expire_date=datetime(2005, 9, 1)
+        )
+        a2 = Article.objects.create(
+            headline="Article 2", pub_date=datetime(2005, 7, 27),
+            expire_date=datetime(2005, 7, 28)
+        )
+        a3 = Article.objects.create(
+            headline="Article 3", pub_date=datetime(2005, 7, 27),
+            expire_date=datetime(2005, 8, 27)
+        )
+        a4 = Article.objects.create(
+            headline="Article 4", pub_date=datetime(2005, 7, 28),
+            expire_date=datetime(2005, 7, 30)
+        )
+
+        # Get the latest Article.
+        self.assertEqual(Article.objects.latest(), a4)
+        # Get the latest Article that matches certain filters.
+        self.assertEqual(
+            Article.objects.filter(pub_date__lt=datetime(2005, 7, 27)).latest(),
+            a1
+        )
+
+        # Pass a custom field name to latest() to change the field that's used
+        # to determine the latest object.
+        self.assertEqual(Article.objects.latest('expire_date'), a1)
+        self.assertEqual(
+            Article.objects.filter(pub_date__gt=datetime(2005, 7, 26)).latest('expire_date'),
+            a3,
+        )
+
+        # Ensure that latest() overrides any other ordering specified on the query. Refs #11283.
+        self.assertEqual(Article.objects.order_by('id').latest(), a4)
+
+        # Ensure that error is raised if the user forgot to add a get_latest_by
+        # in the Model.Meta
+        Article.objects.model._meta.get_latest_by = None
+        self.assertRaisesMessage(
+            AssertionError,
+            "earliest() and latest() require either a field_name parameter or "
+            "'get_latest_by' in the model",
+            lambda: Article.objects.latest(),
+        )
+
+    def test_latest_manual(self):
+        # You can still use latest() with a model that doesn't have
+        # "get_latest_by" set -- just pass in the field name manually.
+        p1 = Person.objects.create(name="Ralph", birthday=datetime(1950, 1, 1))
+        p2 = Person.objects.create(name="Stephanie", birthday=datetime(1960, 2, 3))
+        self.assertRaises(AssertionError, Person.objects.latest)
+        self.assertEqual(Person.objects.latest("birthday"), p2)
diff --git a/tests/modeltests/m2m_and_m2o/__init__.py b/tests/get_object_or_404/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_and_m2o/__init__.py
rename to tests/get_object_or_404/__init__.py
diff --git a/tests/modeltests/get_object_or_404/models.py b/tests/get_object_or_404/models.py
similarity index 88%
rename from tests/modeltests/get_object_or_404/models.py
rename to tests/get_object_or_404/models.py
index bda060569e..bb9aa60383 100644
--- a/tests/modeltests/get_object_or_404/models.py
+++ b/tests/get_object_or_404/models.py
@@ -22,8 +22,8 @@ class Author(models.Model):
         return self.name
 
 class ArticleManager(models.Manager):
-    def get_query_set(self):
-        return super(ArticleManager, self).get_query_set().filter(authors__name__icontains='sir')
+    def get_queryset(self):
+        return super(ArticleManager, self).get_queryset().filter(authors__name__icontains='sir')
 
 @python_2_unicode_compatible
 class Article(models.Model):
diff --git a/tests/modeltests/get_object_or_404/tests.py b/tests/get_object_or_404/tests.py
similarity index 98%
rename from tests/modeltests/get_object_or_404/tests.py
rename to tests/get_object_or_404/tests.py
index 3b234c6cd3..38ebeb4f8c 100644
--- a/tests/modeltests/get_object_or_404/tests.py
+++ b/tests/get_object_or_404/tests.py
@@ -53,7 +53,7 @@ class GetObjectOr404Tests(TestCase):
             get_object_or_404, Author.objects.all()
         )
 
-        # Using an EmptyQuerySet raises a Http404 error.
+        # Using an empty QuerySet raises a Http404 error.
         self.assertRaises(Http404,
             get_object_or_404, Article.objects.none(), title__contains="Run"
         )
diff --git a/tests/modeltests/m2m_intermediary/__init__.py b/tests/get_or_create/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_intermediary/__init__.py
rename to tests/get_or_create/__init__.py
diff --git a/tests/modeltests/get_or_create/models.py b/tests/get_or_create/models.py
similarity index 100%
rename from tests/modeltests/get_or_create/models.py
rename to tests/get_or_create/models.py
diff --git a/tests/modeltests/get_or_create/tests.py b/tests/get_or_create/tests.py
similarity index 100%
rename from tests/modeltests/get_or_create/tests.py
rename to tests/get_or_create/tests.py
diff --git a/tests/modeltests/m2m_multiple/__init__.py b/tests/get_or_create_regress/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_multiple/__init__.py
rename to tests/get_or_create_regress/__init__.py
diff --git a/tests/regressiontests/get_or_create_regress/models.py b/tests/get_or_create_regress/models.py
similarity index 100%
rename from tests/regressiontests/get_or_create_regress/models.py
rename to tests/get_or_create_regress/models.py
diff --git a/tests/regressiontests/get_or_create_regress/tests.py b/tests/get_or_create_regress/tests.py
similarity index 100%
rename from tests/regressiontests/get_or_create_regress/tests.py
rename to tests/get_or_create_regress/tests.py
diff --git a/tests/modeltests/m2m_recursive/__init__.py b/tests/handlers/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_recursive/__init__.py
rename to tests/handlers/__init__.py
diff --git a/tests/regressiontests/file_storage/models.py b/tests/handlers/models.py
similarity index 100%
rename from tests/regressiontests/file_storage/models.py
rename to tests/handlers/models.py
diff --git a/tests/handlers/tests.py b/tests/handlers/tests.py
new file mode 100644
index 0000000000..3680eecdd2
--- /dev/null
+++ b/tests/handlers/tests.py
@@ -0,0 +1,91 @@
+from django.core.handlers.wsgi import WSGIHandler
+from django.core.signals import request_started, request_finished
+from django.db import close_old_connections, connection
+from django.test import RequestFactory, TestCase, TransactionTestCase
+from django.test.utils import override_settings
+
+
+class HandlerTests(TestCase):
+
+    def setUp(self):
+        request_started.disconnect(close_old_connections)
+
+    def tearDown(self):
+        request_started.connect(close_old_connections)
+
+    # Mangle settings so the handler will fail
+    @override_settings(MIDDLEWARE_CLASSES=42)
+    def test_lock_safety(self):
+        """
+        Tests for bug #11193 (errors inside middleware shouldn't leave
+        the initLock locked).
+        """
+        # Try running the handler, it will fail in load_middleware
+        handler = WSGIHandler()
+        self.assertEqual(handler.initLock.locked(), False)
+        with self.assertRaises(Exception):
+            handler(None, None)
+        self.assertEqual(handler.initLock.locked(), False)
+
+    def test_bad_path_info(self):
+        """Tests for bug #15672 ('request' referenced before assignment)"""
+        environ = RequestFactory().get('/').environ
+        environ['PATH_INFO'] = '\xed'
+        handler = WSGIHandler()
+        response = handler(environ, lambda *a, **k: None)
+        self.assertEqual(response.status_code, 400)
+
+
+class TransactionsPerRequestTests(TransactionTestCase):
+    urls = 'handlers.urls'
+
+    def test_no_transaction(self):
+        response = self.client.get('/in_transaction/')
+        self.assertContains(response, 'False')
+
+    def test_auto_transaction(self):
+        old_atomic_requests = connection.settings_dict['ATOMIC_REQUESTS']
+        try:
+            connection.settings_dict['ATOMIC_REQUESTS'] = True
+            response = self.client.get('/in_transaction/')
+        finally:
+            connection.settings_dict['ATOMIC_REQUESTS'] = old_atomic_requests
+        self.assertContains(response, 'True')
+
+    def test_no_auto_transaction(self):
+        old_atomic_requests = connection.settings_dict['ATOMIC_REQUESTS']
+        try:
+            connection.settings_dict['ATOMIC_REQUESTS'] = True
+            response = self.client.get('/not_in_transaction/')
+        finally:
+            connection.settings_dict['ATOMIC_REQUESTS'] = old_atomic_requests
+        self.assertContains(response, 'False')
+
+class SignalsTests(TestCase):
+    urls = 'handlers.urls'
+
+    def setUp(self):
+        self.signals = []
+        request_started.connect(self.register_started)
+        request_finished.connect(self.register_finished)
+
+    def tearDown(self):
+        request_started.disconnect(self.register_started)
+        request_finished.disconnect(self.register_finished)
+
+    def register_started(self, **kwargs):
+        self.signals.append('started')
+
+    def register_finished(self, **kwargs):
+        self.signals.append('finished')
+
+    def test_request_signals(self):
+        response = self.client.get('/regular/')
+        self.assertEqual(self.signals, ['started', 'finished'])
+        self.assertEqual(response.content, b"regular content")
+
+    def test_request_signals_streaming_response(self):
+        response = self.client.get('/streaming/')
+        self.assertEqual(self.signals, ['started'])
+        self.assertEqual(b''.join(response.streaming_content), b"streaming content")
+        self.assertEqual(self.signals, ['started', 'finished'])
diff --git a/tests/handlers/urls.py b/tests/handlers/urls.py
new file mode 100644
index 0000000000..29858055ab
--- /dev/null
+++ b/tests/handlers/urls.py
@@ -0,0 +1,12 @@
+from __future__ import unicode_literals
+
+from django.conf.urls import patterns, url
+
+from . import views
+
+urlpatterns = patterns('',
+    url(r'^regular/$', views.regular),
+    url(r'^streaming/$', views.streaming),
+    url(r'^in_transaction/$', views.in_transaction),
+    url(r'^not_in_transaction/$', views.not_in_transaction),
+)
diff --git a/tests/handlers/views.py b/tests/handlers/views.py
new file mode 100644
index 0000000000..22d9ea4c7d
--- /dev/null
+++ b/tests/handlers/views.py
@@ -0,0 +1,17 @@
+from __future__ import unicode_literals
+
+from django.db import connection
+from django.http import HttpResponse, StreamingHttpResponse
+
+def regular(request):
+    return HttpResponse(b"regular content")
+
+def streaming(request):
+    return StreamingHttpResponse([b"streaming", b" ", b"content"])
+
+def in_transaction(request):
+    return HttpResponse(str(connection.in_atomic_block))
+
+def not_in_transaction(request):
+    return HttpResponse(str(connection.in_atomic_block))
+not_in_transaction.transactions_per_request = False
diff --git a/tests/modeltests/m2o_recursive/__init__.py b/tests/http_utils/__init__.py
similarity index 100%
rename from tests/modeltests/m2o_recursive/__init__.py
rename to tests/http_utils/__init__.py
diff --git a/tests/regressiontests/handlers/models.py b/tests/http_utils/models.py
similarity index 100%
rename from tests/regressiontests/handlers/models.py
rename to tests/http_utils/models.py
diff --git a/tests/regressiontests/http_utils/tests.py b/tests/http_utils/tests.py
similarity index 100%
rename from tests/regressiontests/http_utils/tests.py
rename to tests/http_utils/tests.py
diff --git a/tests/modeltests/many_to_many/__init__.py b/tests/httpwrappers/__init__.py
similarity index 100%
rename from tests/modeltests/many_to_many/__init__.py
rename to tests/httpwrappers/__init__.py
diff --git a/tests/regressiontests/httpwrappers/abc.txt b/tests/httpwrappers/abc.txt
similarity index 100%
rename from tests/regressiontests/httpwrappers/abc.txt
rename to tests/httpwrappers/abc.txt
diff --git a/tests/regressiontests/http_utils/models.py b/tests/httpwrappers/models.py
similarity index 100%
rename from tests/regressiontests/http_utils/models.py
rename to tests/httpwrappers/models.py
diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/httpwrappers/tests.py
similarity index 93%
rename from tests/regressiontests/httpwrappers/tests.py
rename to tests/httpwrappers/tests.py
index a601e541c6..194232e92f 100644
--- a/tests/regressiontests/httpwrappers/tests.py
+++ b/tests/httpwrappers/tests.py
@@ -7,6 +7,8 @@ import pickle
 import warnings
 
 from django.core.exceptions import SuspiciousOperation
+from django.core.signals import request_finished
+from django.db import close_old_connections
 from django.http import (QueryDict, HttpResponse, HttpResponseRedirect,
                          HttpResponsePermanentRedirect, HttpResponseNotAllowed,
                          HttpResponseNotModified, StreamingHttpResponse,
@@ -130,15 +132,14 @@ class QueryDictTests(unittest.TestCase):
             self.assertTrue(q.has_key('foo'))
         self.assertTrue('foo' in q)
 
-        self.assertEqual(sorted(list(six.iteritems(q))),
-                         [('foo', 'another'), ('name', 'john')])
-        self.assertEqual(sorted(list(six.iterlists(q))),
-                         [('foo', ['bar', 'baz', 'another']), ('name', ['john'])])
-        self.assertEqual(sorted(list(six.iterkeys(q))),
-                         ['foo', 'name'])
-        self.assertEqual(sorted(list(six.itervalues(q))),
-                         ['another', 'john'])
-        self.assertEqual(len(q), 2)
+        self.assertListEqual(sorted(list(six.iteritems(q))),
+                             [('foo', 'another'), ('name', 'john')])
+        self.assertListEqual(sorted(list(six.iterlists(q))),
+                             [('foo', ['bar', 'baz', 'another']), ('name', ['john'])])
+        self.assertListEqual(sorted(list(six.iterkeys(q))),
+                             ['foo', 'name'])
+        self.assertListEqual(sorted(list(six.itervalues(q))),
+                             ['another', 'john'])
 
         q.update({'foo': 'hello'})
         self.assertEqual(q['foo'], 'hello')
@@ -327,13 +328,13 @@ class HttpResponseTests(unittest.TestCase):
         r = HttpResponse()
         r.content = ['1', '2', 3, '\u079e']
         with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always", PendingDeprecationWarning)
+            warnings.simplefilter("always", DeprecationWarning)
             my_iter = iter(r)
-            self.assertEqual(w[0].category, PendingDeprecationWarning)
+            self.assertEqual(w[0].category, DeprecationWarning)
         with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always", PendingDeprecationWarning)
+            warnings.simplefilter("always", DeprecationWarning)
             result = list(my_iter)
-            self.assertEqual(w[0].category, PendingDeprecationWarning)
+            self.assertEqual(w[0].category, DeprecationWarning)
         #'\xde\x9e' == unichr(1950).encode('utf-8')
         self.assertEqual(result, [b'1', b'2', b'3', b'\xde\x9e'])
         self.assertEqual(r.content, b'123\xde\x9e')
@@ -361,7 +362,7 @@ class HttpResponseTests(unittest.TestCase):
         # XXX change this when the deprecation completes in HttpResponse
         r = HttpResponse(iter(['hello', 'world']))
         with warnings.catch_warnings():
-            warnings.simplefilter("ignore", PendingDeprecationWarning)
+            warnings.simplefilter("ignore", DeprecationWarning)
             self.assertEqual(b''.join(r), b'helloworld')
         self.assertEqual(r.content, b'')                # not the expected result!
 
@@ -411,6 +412,8 @@ class HttpResponseSubclassesTests(TestCase):
             content='The resource has temporarily moved',
             content_type='text/html')
         self.assertContains(response, 'The resource has temporarily moved', status_code=302)
+        # Test that url attribute is right
+        self.assertEqual(response.url, response['Location'])
 
     def test_not_modified(self):
         response = HttpResponseNotModified()
@@ -483,6 +486,15 @@ class StreamingHttpResponseTests(TestCase):
             r.tell()
 
 class FileCloseTests(TestCase):
+
+    def setUp(self):
+        # Disable the request_finished signal during this test
+        # to avoid interfering with the database connection.
+        request_finished.disconnect(close_old_connections)
+
+    def tearDown(self):
+        request_finished.connect(close_old_connections)
+
     def test_response(self):
         filename = os.path.join(os.path.dirname(upath(__file__)), 'abc.txt')
 
@@ -498,7 +510,7 @@ class FileCloseTests(TestCase):
         r = HttpResponse(file1)
         self.assertFalse(file1.closed)
         with warnings.catch_warnings():
-            warnings.simplefilter("ignore", PendingDeprecationWarning)
+            warnings.simplefilter("ignore", DeprecationWarning)
             list(r)
         self.assertFalse(file1.closed)
         r.close()
@@ -589,3 +601,7 @@ class CookieTests(unittest.TestCase):
         c['name']['httponly'] = True
         self.assertTrue(c['name']['httponly'])
 
+    def test_load_dict(self):
+        c = SimpleCookie()
+        c.load({'name': 'val'})
+        self.assertEqual(c['name'].value, 'val')
diff --git a/tests/modeltests/many_to_one/__init__.py b/tests/i18n/__init__.py
similarity index 100%
rename from tests/modeltests/many_to_one/__init__.py
rename to tests/i18n/__init__.py
diff --git a/tests/regressiontests/i18n/commands/__init__.py b/tests/i18n/commands/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/commands/__init__.py
rename to tests/i18n/commands/__init__.py
diff --git a/tests/regressiontests/i18n/commands/code.sample b/tests/i18n/commands/code.sample
similarity index 100%
rename from tests/regressiontests/i18n/commands/code.sample
rename to tests/i18n/commands/code.sample
diff --git a/tests/regressiontests/i18n/commands/compilation.py b/tests/i18n/commands/compilation.py
similarity index 50%
rename from tests/regressiontests/i18n/commands/compilation.py
rename to tests/i18n/commands/compilation.py
index 2944469110..12bb89ed08 100644
--- a/tests/regressiontests/i18n/commands/compilation.py
+++ b/tests/i18n/commands/compilation.py
@@ -1,22 +1,25 @@
 import os
 
 from django.core.management import call_command, CommandError
-from django.test import TestCase
+from django.test import SimpleTestCase
 from django.test.utils import override_settings
-from django.utils import translation, six
+from django.utils import translation
 from django.utils._os import upath
 from django.utils.six import StringIO
 
 test_dir = os.path.abspath(os.path.dirname(upath(__file__)))
 
 
-class MessageCompilationTests(TestCase):
+class MessageCompilationTests(SimpleTestCase):
 
     def setUp(self):
         self._cwd = os.getcwd()
+        self.addCleanup(os.chdir, self._cwd)
+        os.chdir(test_dir)
 
-    def tearDown(self):
-        os.chdir(self._cwd)
+    def rmfile(self, filepath):
+        if os.path.exists(filepath):
+            os.remove(filepath)
 
 
 class PoFileTests(MessageCompilationTests):
@@ -25,9 +28,8 @@ class PoFileTests(MessageCompilationTests):
     MO_FILE = 'locale/%s/LC_MESSAGES/django.mo' % LOCALE
 
     def test_bom_rejection(self):
-        os.chdir(test_dir)
         with self.assertRaises(CommandError) as cm:
-            call_command('compilemessages', locale=self.LOCALE, stderr=StringIO())
+            call_command('compilemessages', locale=self.LOCALE, stdout=StringIO())
         self.assertIn("file has a BOM (Byte Order Mark)", cm.exception.args[0])
         self.assertFalse(os.path.exists(self.MO_FILE))
 
@@ -43,8 +45,7 @@ class PoFileContentsTests(MessageCompilationTests):
         self.addCleanup(os.unlink, os.path.join(test_dir, self.MO_FILE))
 
     def test_percent_symbol_in_po_file(self):
-        os.chdir(test_dir)
-        call_command('compilemessages', locale=self.LOCALE, stderr=StringIO())
+        call_command('compilemessages', locale=self.LOCALE, stdout=StringIO())
         self.assertTrue(os.path.exists(self.MO_FILE))
 
 
@@ -55,11 +56,14 @@ class PercentRenderingTests(MessageCompilationTests):
     LOCALE='it'
     MO_FILE='locale/%s/LC_MESSAGES/django.mo' % LOCALE
 
+    def setUp(self):
+        super(PercentRenderingTests, self).setUp()
+        self.addCleanup(os.unlink, os.path.join(test_dir, self.MO_FILE))
+
     @override_settings(LOCALE_PATHS=(os.path.join(test_dir, 'locale'),))
     def test_percent_symbol_escaping(self):
         from django.template import Template, Context
-        os.chdir(test_dir)
-        call_command('compilemessages', locale=self.LOCALE, stderr=StringIO())
+        call_command('compilemessages', locale=self.LOCALE, stdout=StringIO())
         with translation.override(self.LOCALE):
             t = Template('{% load i18n %}{% trans "Looks like a str fmt spec %% o but shouldn\'t be interpreted as such" %}')
             rendered = t.render(Context({}))
@@ -68,3 +72,42 @@ class PercentRenderingTests(MessageCompilationTests):
             t = Template('{% load i18n %}{% trans "Completed 50%% of all the tasks" %}')
             rendered = t.render(Context({}))
             self.assertEqual(rendered, 'IT translation of Completed 50%% of all the tasks')
+
+
+@override_settings(LOCALE_PATHS=(os.path.join(test_dir, 'locale'),))
+class MultipleLocaleCompilationTests(MessageCompilationTests):
+    MO_FILE_HR = None
+    MO_FILE_FR = None
+
+    def setUp(self):
+        super(MultipleLocaleCompilationTests, self).setUp()
+        localedir = os.path.join(test_dir, 'locale')
+        self.MO_FILE_HR = os.path.join(localedir, 'hr/LC_MESSAGES/django.mo')
+        self.MO_FILE_FR = os.path.join(localedir, 'fr/LC_MESSAGES/django.mo')
+        self.addCleanup(self.rmfile, os.path.join(localedir, self.MO_FILE_HR))
+        self.addCleanup(self.rmfile, os.path.join(localedir, self.MO_FILE_FR))
+
+    def test_one_locale(self):
+        call_command('compilemessages', locale='hr', stdout=StringIO())
+
+        self.assertTrue(os.path.exists(self.MO_FILE_HR))
+
+    def test_multiple_locales(self):
+        call_command('compilemessages', locale=['hr', 'fr'], stdout=StringIO())
+
+        self.assertTrue(os.path.exists(self.MO_FILE_HR))
+        self.assertTrue(os.path.exists(self.MO_FILE_FR))
+
+
+class CompilationErrorHandling(MessageCompilationTests):
+
+    LOCALE='ja'
+    MO_FILE='locale/%s/LC_MESSAGES/django.mo' % LOCALE
+
+    def setUp(self):
+        super(CompilationErrorHandling, self).setUp()
+        self.addCleanup(self.rmfile, os.path.join(test_dir, self.MO_FILE))
+
+    def test_error_reported_by_msgfmt(self):
+        with self.assertRaises(CommandError):
+            call_command('compilemessages', locale=self.LOCALE, stdout=StringIO())
diff --git a/tests/regressiontests/i18n/commands/extraction.py b/tests/i18n/commands/extraction.py
similarity index 65%
rename from tests/regressiontests/i18n/commands/extraction.py
rename to tests/i18n/commands/extraction.py
index aa5efe1967..80e4ee0110 100644
--- a/tests/regressiontests/i18n/commands/extraction.py
+++ b/tests/i18n/commands/extraction.py
@@ -4,17 +4,20 @@ from __future__ import unicode_literals
 import os
 import re
 import shutil
+import warnings
 
 from django.core import management
-from django.test import TestCase
+from django.test import SimpleTestCase
 from django.utils.encoding import force_text
 from django.utils._os import upath
+from django.utils import six
 from django.utils.six import StringIO
+from django.utils.translation import TranslatorCommentWarning
 
 
 LOCALE='de'
 
-class ExtractorTests(TestCase):
+class ExtractorTests(SimpleTestCase):
 
     PO_FILE='locale/%s/LC_MESSAGES/django.po' % LOCALE
 
@@ -107,25 +110,34 @@ class BasicExtractorTests(ExtractorTests):
             self.assertMsgId('I think that 100%% is more that 50%% of %(obj)s.', po_contents)
             self.assertMsgId("Blocktrans extraction shouldn't double escape this: %%, a=%(a)s", po_contents)
 
+    def test_force_en_us_locale(self):
+        """Value of locale-munging option used by the command is the right one"""
+        from django.core.management.commands.makemessages import Command
+        self.assertTrue(Command.leave_locale_alone)
+
     def test_extraction_error(self):
         os.chdir(self.test_dir)
-        shutil.copyfile('./templates/template_with_error.tpl', './templates/template_with_error.html')
-        self.assertRaises(SyntaxError, management.call_command, 'makemessages', locale=LOCALE, verbosity=0)
+        self.assertRaises(SyntaxError, management.call_command, 'makemessages', locale=LOCALE, extensions=['tpl'], verbosity=0)
         with self.assertRaises(SyntaxError) as context_manager:
-            management.call_command('makemessages', locale=LOCALE, verbosity=0)
-        self.assertRegexpMatches(str(context_manager.exception),
-                r'Translation blocks must not include other block tags: blocktrans \(file templates[/\\]template_with_error\.html, line 3\)'
+            management.call_command('makemessages', locale=LOCALE, extensions=['tpl'], verbosity=0)
+        six.assertRegex(self, str(context_manager.exception),
+                r'Translation blocks must not include other block tags: blocktrans \(file templates[/\\]template_with_error\.tpl, line 3\)'
             )
-        os.remove('./templates/template_with_error.html')
         # Check that the temporary file was cleaned up
-        self.assertFalse(os.path.exists('./templates/template_with_error.html.py'))
+        self.assertFalse(os.path.exists('./templates/template_with_error.tpl.py'))
 
     def test_extraction_warning(self):
+        """test xgettext warning about multiple bare interpolation placeholders"""
         os.chdir(self.test_dir)
         shutil.copyfile('./code.sample', './code_sample.py')
         stdout = StringIO()
-        management.call_command('makemessages', locale=LOCALE, stdout=stdout)
-        os.remove('./code_sample.py')
+        try:
+            management.call_command('makemessages', locale=LOCALE, stdout=stdout)
+        finally:
+            try:
+                os.remove('./code_sample.py')
+            except OSError:
+                pass
         self.assertIn("code_sample.py:4", force_text(stdout.getvalue()))
 
     def test_template_message_context_extractor(self):
@@ -141,23 +153,23 @@ class BasicExtractorTests(ExtractorTests):
             po_contents = force_text(fp.read())
             # {% trans %}
             self.assertTrue('msgctxt "Special trans context #1"' in po_contents)
-            self.assertTrue("Translatable literal #7a" in po_contents)
+            self.assertMsgId("Translatable literal #7a", po_contents)
             self.assertTrue('msgctxt "Special trans context #2"' in po_contents)
-            self.assertTrue("Translatable literal #7b" in po_contents)
+            self.assertMsgId("Translatable literal #7b", po_contents)
             self.assertTrue('msgctxt "Special trans context #3"' in po_contents)
-            self.assertTrue("Translatable literal #7c" in po_contents)
+            self.assertMsgId("Translatable literal #7c", po_contents)
 
             # {% blocktrans %}
             self.assertTrue('msgctxt "Special blocktrans context #1"' in po_contents)
-            self.assertTrue("Translatable literal #8a" in po_contents)
+            self.assertMsgId("Translatable literal #8a", po_contents)
             self.assertTrue('msgctxt "Special blocktrans context #2"' in po_contents)
-            self.assertTrue("Translatable literal #8b-singular" in po_contents)
+            self.assertMsgId("Translatable literal #8b-singular", po_contents)
             self.assertTrue("Translatable literal #8b-plural" in po_contents)
             self.assertTrue('msgctxt "Special blocktrans context #3"' in po_contents)
-            self.assertTrue("Translatable literal #8c-singular" in po_contents)
+            self.assertMsgId("Translatable literal #8c-singular", po_contents)
             self.assertTrue("Translatable literal #8c-plural" in po_contents)
             self.assertTrue('msgctxt "Special blocktrans context #4"' in po_contents)
-            self.assertTrue("Translatable literal #8d" in po_contents)
+            self.assertMsgId("Translatable literal #8d %(a)s", po_contents)
 
     def test_context_in_single_quotes(self):
         os.chdir(self.test_dir)
@@ -173,6 +185,63 @@ class BasicExtractorTests(ExtractorTests):
             self.assertTrue('msgctxt "Special blocktrans context wrapped in double quotes"' in po_contents)
             self.assertTrue('msgctxt "Special blocktrans context wrapped in single quotes"' in po_contents)
 
+    def test_template_comments(self):
+        """Template comment tags on the same line of other constructs (#19552)"""
+        os.chdir(self.test_dir)
+        # Test detection/end user reporting of old, incorrect templates
+        # translator comments syntax
+        with warnings.catch_warnings(record=True) as ws:
+            warnings.simplefilter('always')
+            management.call_command('makemessages', locale=LOCALE, extensions=['thtml'], verbosity=0)
+            self.assertEqual(len(ws), 3)
+            for w in ws:
+                self.assertTrue(issubclass(w.category, TranslatorCommentWarning))
+            six.assertRegex(self, str(ws[0].message),
+                r"The translator-targeted comment 'Translators: ignored i18n comment #1' \(file templates/comments.thtml, line 4\) was ignored, because it wasn't the last item on the line\."
+            )
+            six.assertRegex(self, str(ws[1].message),
+                r"The translator-targeted comment 'Translators: ignored i18n comment #3' \(file templates/comments.thtml, line 6\) was ignored, because it wasn't the last item on the line\."
+            )
+            six.assertRegex(self, str(ws[2].message),
+                r"The translator-targeted comment 'Translators: ignored i18n comment #4' \(file templates/comments.thtml, line 8\) was ignored, because it wasn't the last item on the line\."
+            )
+        # Now test .po file contents
+        self.assertTrue(os.path.exists(self.PO_FILE))
+        with open(self.PO_FILE, 'r') as fp:
+            po_contents = force_text(fp.read())
+
+            self.assertMsgId('Translatable literal #9a', po_contents)
+            self.assertFalse('ignored comment #1' in po_contents)
+
+            self.assertFalse('Translators: ignored i18n comment #1' in po_contents)
+            self.assertMsgId("Translatable literal #9b", po_contents)
+
+            self.assertFalse('ignored i18n comment #2' in po_contents)
+            self.assertFalse('ignored comment #2' in po_contents)
+            self.assertMsgId('Translatable literal #9c', po_contents)
+
+            self.assertFalse('ignored comment #3' in po_contents)
+            self.assertFalse('ignored i18n comment #3' in po_contents)
+            self.assertMsgId('Translatable literal #9d', po_contents)
+
+            self.assertFalse('ignored comment #4' in po_contents)
+            self.assertMsgId('Translatable literal #9e', po_contents)
+            self.assertFalse('ignored comment #5' in po_contents)
+
+            self.assertFalse('ignored i18n comment #4' in po_contents)
+            self.assertMsgId('Translatable literal #9f', po_contents)
+            self.assertTrue('#. Translators: valid i18n comment #5' in po_contents)
+
+            self.assertMsgId('Translatable literal #9g', po_contents)
+            self.assertTrue('#. Translators: valid i18n comment #6' in po_contents)
+            self.assertMsgId('Translatable literal #9h', po_contents)
+            self.assertTrue('#. Translators: valid i18n comment #7' in po_contents)
+            self.assertMsgId('Translatable literal #9i', po_contents)
+
+            six.assertRegex(self, po_contents, r'#\..+Translators: valid i18n comment #8')
+            six.assertRegex(self, po_contents, r'#\..+Translators: valid i18n comment #9')
+            self.assertMsgId("Translatable literal #9j", po_contents)
+
 
 class JavascriptExtractorTests(ExtractorTests):
 
@@ -293,3 +362,64 @@ class NoLocationExtractorTests(ExtractorTests):
         with open(self.PO_FILE, 'r') as fp:
             po_contents = force_text(fp.read())
             self.assertTrue('#: templates/test.html:55' in po_contents)
+
+
+class KeepPotFileExtractorTests(ExtractorTests):
+
+    POT_FILE='locale/django.pot'
+
+    def setUp(self):
+        super(KeepPotFileExtractorTests, self).setUp()
+
+    def tearDown(self):
+        super(KeepPotFileExtractorTests, self).tearDown()
+        os.chdir(self.test_dir)
+        try:
+            os.unlink(self.POT_FILE)
+        except OSError:
+            pass
+        os.chdir(self._cwd)
+
+    def test_keep_pot_disabled_by_default(self):
+        os.chdir(self.test_dir)
+        management.call_command('makemessages', locale=LOCALE, verbosity=0)
+        self.assertFalse(os.path.exists(self.POT_FILE))
+
+    def test_keep_pot_explicitly_disabled(self):
+        os.chdir(self.test_dir)
+        management.call_command('makemessages', locale=LOCALE, verbosity=0,
+                                keep_pot=False)
+        self.assertFalse(os.path.exists(self.POT_FILE))
+
+    def test_keep_pot_enabled(self):
+        os.chdir(self.test_dir)
+        management.call_command('makemessages', locale=LOCALE, verbosity=0,
+                                keep_pot=True)
+        self.assertTrue(os.path.exists(self.POT_FILE))
+
+
+class MultipleLocaleExtractionTests(ExtractorTests):
+    PO_FILE_PT = 'locale/pt/LC_MESSAGES/django.po'
+    PO_FILE_DE = 'locale/de/LC_MESSAGES/django.po'
+    LOCALES = ['pt', 'de', 'ch']
+
+    def tearDown(self):
+        os.chdir(self.test_dir)
+        for locale in self.LOCALES:
+            try:
+                self._rmrf('locale/%s' % locale)
+            except OSError:
+                pass
+        os.chdir(self._cwd)
+
+    def test_multiple_locales(self):
+        os.chdir(self.test_dir)
+        management.call_command('makemessages', locale=['pt','de'], verbosity=0)
+        self.assertTrue(os.path.exists(self.PO_FILE_PT))
+        self.assertTrue(os.path.exists(self.PO_FILE_DE))
+
+    def test_comma_separated_locales(self):
+        os.chdir(self.test_dir)
+        management.call_command('makemessages', locale='pt,de,ch', verbosity=0)
+        self.assertTrue(os.path.exists(self.PO_FILE_PT))
+        self.assertTrue(os.path.exists(self.PO_FILE_DE))
diff --git a/tests/regressiontests/i18n/commands/ignore_dir/ignored.html b/tests/i18n/commands/ignore_dir/ignored.html
similarity index 100%
rename from tests/regressiontests/i18n/commands/ignore_dir/ignored.html
rename to tests/i18n/commands/ignore_dir/ignored.html
diff --git a/tests/regressiontests/i18n/commands/javascript.js b/tests/i18n/commands/javascript.js
similarity index 100%
rename from tests/regressiontests/i18n/commands/javascript.js
rename to tests/i18n/commands/javascript.js
diff --git a/tests/regressiontests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po b/tests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po
rename to tests/i18n/commands/locale/es_AR/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/commands/locale/fr/LC_MESSAGES/django.po b/tests/i18n/commands/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/commands/locale/fr/LC_MESSAGES/django.po
rename to tests/i18n/commands/locale/fr/LC_MESSAGES/django.po
diff --git a/tests/i18n/commands/locale/hr/LC_MESSAGES/django.po b/tests/i18n/commands/locale/hr/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..663ca0000f
--- /dev/null
+++ b/tests/i18n/commands/locale/hr/LC_MESSAGES/django.po
@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-12-04 04:59-0600\n"
+"PO-Revision-Date: 2013-01-16 22:53-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\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"
+
+#. Translators: Django template comment for translators
+#: templates/test.html:9
+#, python-format
+msgid "I think that 100%% is more that 50%% of anything."
+msgstr ""
+
+#: templates/test.html:10
+#, python-format
+msgid "I think that 100%% is more that 50%% of %(obj)s."
+msgstr ""
+
+#: templates/test.html:70
+#, python-format
+msgid "Literal with a percent symbol at the end %%"
+msgstr ""
+
+#: templates/test.html:71
+#, python-format
+msgid "Literal with a percent %% symbol in the middle"
+msgstr ""
+
+#: templates/test.html:72
+#, python-format
+msgid "Completed 50%% of all the tasks"
+msgstr ""
+
+#: templates/test.html:73
+#, python-format
+msgctxt "ctx0"
+msgid "Completed 99%% of all the tasks"
+msgstr ""
+
+#: templates/test.html:74
+#, python-format
+msgid "Shouldn't double escape this sequence: %% (two percent signs)"
+msgstr ""
+
+#: templates/test.html:75
+#, python-format
+msgctxt "ctx1"
+msgid "Shouldn't double escape this sequence %% either"
+msgstr ""
+
+#: templates/test.html:76
+#, python-format
+msgid "Looks like a str fmt spec %%s but shouldn't be interpreted as such"
+msgstr "Translation of the above string"
+
+#: templates/test.html:77
+#, python-format
+msgid "Looks like a str fmt spec %% o but shouldn't be interpreted as such"
+msgstr "Translation contains %% for the above string"
diff --git a/tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.po b/tests/i18n/commands/locale/it/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.po
rename to tests/i18n/commands/locale/it/LC_MESSAGES/django.po
diff --git a/tests/i18n/commands/locale/ja/LC_MESSAGES/django.po b/tests/i18n/commands/locale/ja/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..08d6be1e63
--- /dev/null
+++ b/tests/i18n/commands/locale/ja/LC_MESSAGES/django.po
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-12-04 04:59-0600\n"
+"PO-Revision-Date: 2013-02-26 21:29-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#, brainfuck-format
+msgwhat!? "This is an invalid PO file. GNU msgfmt should reject it."
diff --git a/tests/i18n/commands/templates/comments.thtml b/tests/i18n/commands/templates/comments.thtml
new file mode 100644
index 0000000000..90eb5f1792
--- /dev/null
+++ b/tests/i18n/commands/templates/comments.thtml
@@ -0,0 +1,13 @@
+{% load i18n %}
+
+{# ignored comment #1 #}{% trans "Translatable literal #9a" %}
+{# Translators: ignored i18n comment #1 #}{% trans "Translatable literal #9b" %}
+{# Translators: ignored i18n comment #2 #}{# ignored comment #2 #}{% trans "Translatable literal #9c" %}
+{# ignored comment #3 #}{# Translators: ignored i18n comment #3 #}{% trans "Translatable literal #9d" %}
+{# ignored comment #4 #}{% trans "Translatable literal #9e" %}{# ignored comment #5 #}
+{# Translators: ignored i18n comment #4 #}{% trans "Translatable literal #9f" %}{# Translators: valid i18n comment #5 #}
+{% trans "Translatable literal #9g" %}{# Translators: valid i18n comment #6 #}
+{# ignored comment #6 #}{% trans "Translatable literal #9h" %}{# Translators: valid i18n comment #7 #}
+{% trans "Translatable literal #9i" %}
+{# Translators: valid i18n comment #8 #}{# Translators: valid i18n comment #9 #}
+{% trans "Translatable literal #9j" %}
diff --git a/tests/regressiontests/i18n/commands/templates/template_with_error.tpl b/tests/i18n/commands/templates/template_with_error.tpl
similarity index 100%
rename from tests/regressiontests/i18n/commands/templates/template_with_error.tpl
rename to tests/i18n/commands/templates/template_with_error.tpl
diff --git a/tests/regressiontests/i18n/commands/templates/test.html b/tests/i18n/commands/templates/test.html
similarity index 99%
rename from tests/regressiontests/i18n/commands/templates/test.html
rename to tests/i18n/commands/templates/test.html
index e7d7f3ca53..6cb4493ef6 100644
--- a/tests/regressiontests/i18n/commands/templates/test.html
+++ b/tests/i18n/commands/templates/test.html
@@ -81,4 +81,4 @@ continued here.{% endcomment %}
 {% trans "Translatable literal with context wrapped in single quotes" context 'Context wrapped in single quotes' as var %}
 {% trans "Translatable literal with context wrapped in double quotes" context "Context wrapped in double quotes" as var %}
 {% blocktrans context 'Special blocktrans context wrapped in single quotes' %}Translatable literal with context wrapped in single quotes{% endblocktrans %}
-{% blocktrans context "Special blocktrans context wrapped in double quotes" %}Translatable literal with context wrapped in double quotes{% endblocktrans %}
\ No newline at end of file
+{% blocktrans context "Special blocktrans context wrapped in double quotes" %}Translatable literal with context wrapped in double quotes{% endblocktrans %}
diff --git a/tests/i18n/commands/tests.py b/tests/i18n/commands/tests.py
new file mode 100644
index 0000000000..f9e3c20fff
--- /dev/null
+++ b/tests/i18n/commands/tests.py
@@ -0,0 +1,24 @@
+import os
+import re
+from subprocess import Popen, PIPE
+
+from django.core.management.utils import find_command
+
+can_run_extraction_tests = False
+can_run_compilation_tests = False
+
+# checks if it can find xgettext on the PATH and
+# imports the extraction tests if yes
+xgettext_cmd = find_command('xgettext')
+if xgettext_cmd:
+    p = Popen('%s --version' % xgettext_cmd, shell=True, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt', universal_newlines=True)
+    output = p.communicate()[0]
+    match = re.search(r'(?P<major>\d+)\.(?P<minor>\d+)', output)
+    if match:
+        xversion = (int(match.group('major')), int(match.group('minor')))
+        if xversion >= (0, 15):
+            can_run_extraction_tests = True
+    del p
+
+if find_command('msgfmt'):
+    can_run_compilation_tests = True
diff --git a/tests/modeltests/many_to_one_null/__init__.py b/tests/i18n/contenttypes/__init__.py
similarity index 100%
rename from tests/modeltests/many_to_one_null/__init__.py
rename to tests/i18n/contenttypes/__init__.py
diff --git a/tests/regressiontests/i18n/contenttypes/locale/en/LC_MESSAGES/django.mo b/tests/i18n/contenttypes/locale/en/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/locale/en/LC_MESSAGES/django.mo
rename to tests/i18n/contenttypes/locale/en/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/contenttypes/locale/en/LC_MESSAGES/django.po b/tests/i18n/contenttypes/locale/en/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/locale/en/LC_MESSAGES/django.po
rename to tests/i18n/contenttypes/locale/en/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.mo b/tests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.mo
rename to tests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.po b/tests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.po
rename to tests/i18n/contenttypes/locale/fr/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/contenttypes/tests.py b/tests/i18n/contenttypes/tests.py
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/tests.py
rename to tests/i18n/contenttypes/tests.py
diff --git a/tests/regressiontests/i18n/forms.py b/tests/i18n/forms.py
similarity index 100%
rename from tests/regressiontests/i18n/forms.py
rename to tests/i18n/forms.py
diff --git a/tests/regressiontests/i18n/models.py b/tests/i18n/models.py
similarity index 100%
rename from tests/regressiontests/i18n/models.py
rename to tests/i18n/models.py
diff --git a/tests/modeltests/model_forms/__init__.py b/tests/i18n/other/__init__.py
similarity index 100%
rename from tests/modeltests/model_forms/__init__.py
rename to tests/i18n/other/__init__.py
diff --git a/tests/modeltests/model_formsets/__init__.py b/tests/i18n/other/locale/__init__.py
similarity index 100%
rename from tests/modeltests/model_formsets/__init__.py
rename to tests/i18n/other/locale/__init__.py
diff --git a/tests/i18n/other/locale/de/LC_MESSAGES/django.mo b/tests/i18n/other/locale/de/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..ef64b650ec
Binary files /dev/null and b/tests/i18n/other/locale/de/LC_MESSAGES/django.mo differ
diff --git a/tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.po b/tests/i18n/other/locale/de/LC_MESSAGES/django.po
similarity index 70%
rename from tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.po
rename to tests/i18n/other/locale/de/LC_MESSAGES/django.po
index a471d3814b..822fa3796b 100644
--- a/tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.po
+++ b/tests/i18n/other/locale/de/LC_MESSAGES/django.po
@@ -41,6 +41,38 @@ msgid_plural "%d results"
 msgstr[0] "%d Resultat"
 msgstr[1] "%d Resultate"
 
+#: models.py:11
+msgid "%d good result"
+msgid_plural "%d good results"
+msgstr[0] "%d gutes Resultat"
+msgstr[1] "%d guten Resultate"
+
+#: models.py:11
+msgid "good result"
+msgid_plural "good results"
+msgstr[0] "gutes Resultat"
+msgstr[1] "guten Resultate"
+
+#: models.py:11
+msgctxt "Exclamation"
+msgid "%d good result"
+msgid_plural "%d good results"
+msgstr[0] "%d gutes Resultat!"
+msgstr[1] "%d guten Resultate!"
+
+#: models.py:11
+msgid "Hi %(name)s, %(num)d good result"
+msgid_plural "Hi %(name)s, %(num)d good results"
+msgstr[0] "Hallo %(name)s, %(num)d gutes Resultat"
+msgstr[1] "Hallo %(name)s, %(num)d guten Resultate"
+
+#: models.py:11
+msgctxt "Greeting"
+msgid "Hi %(name)s, %(num)d good result"
+msgid_plural "Hi %(name)s, %(num)d good results"
+msgstr[0] "Willkommen %(name)s, %(num)d gutes Resultat"
+msgstr[1] "Willkommen %(name)s, %(num)d guten Resultate"
+
 #: models.py:13
 #, python-format
 msgid "The result was %(percent)s%%"
diff --git a/tests/modeltests/model_inheritance/__init__.py b/tests/i18n/other/locale/de/__init__.py
similarity index 100%
rename from tests/modeltests/model_inheritance/__init__.py
rename to tests/i18n/other/locale/de/__init__.py
diff --git a/tests/regressiontests/i18n/other/locale/de/formats.py b/tests/i18n/other/locale/de/formats.py
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/de/formats.py
rename to tests/i18n/other/locale/de/formats.py
diff --git a/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.mo b/tests/i18n/other/locale/fr/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.mo
rename to tests/i18n/other/locale/fr/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.po b/tests/i18n/other/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/fr/LC_MESSAGES/django.po
rename to tests/i18n/other/locale/fr/LC_MESSAGES/django.po
diff --git a/tests/modeltests/model_inheritance_same_model_name/__init__.py b/tests/i18n/patterns/__init__.py
similarity index 100%
rename from tests/modeltests/model_inheritance_same_model_name/__init__.py
rename to tests/i18n/patterns/__init__.py
diff --git a/tests/regressiontests/i18n/patterns/locale/en/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/en/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/en/LC_MESSAGES/django.mo
rename to tests/i18n/patterns/locale/en/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/patterns/locale/en/LC_MESSAGES/django.po b/tests/i18n/patterns/locale/en/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/en/LC_MESSAGES/django.po
rename to tests/i18n/patterns/locale/en/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo
rename to tests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/patterns/locale/nl/LC_MESSAGES/django.po b/tests/i18n/patterns/locale/nl/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/nl/LC_MESSAGES/django.po
rename to tests/i18n/patterns/locale/nl/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo
rename to tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po b/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po
rename to tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/patterns/templates/404.html b/tests/i18n/patterns/templates/404.html
similarity index 100%
rename from tests/regressiontests/i18n/patterns/templates/404.html
rename to tests/i18n/patterns/templates/404.html
diff --git a/tests/regressiontests/i18n/patterns/templates/dummy.html b/tests/i18n/patterns/templates/dummy.html
similarity index 100%
rename from tests/regressiontests/i18n/patterns/templates/dummy.html
rename to tests/i18n/patterns/templates/dummy.html
diff --git a/tests/regressiontests/i18n/patterns/tests.py b/tests/i18n/patterns/tests.py
similarity index 87%
rename from tests/regressiontests/i18n/patterns/tests.py
rename to tests/i18n/patterns/tests.py
index 358cdf65db..d334e4fe2d 100644
--- a/tests/regressiontests/i18n/patterns/tests.py
+++ b/tests/i18n/patterns/tests.py
@@ -19,7 +19,7 @@ from django.utils import translation
     TEMPLATE_DIRS=(
         os.path.join(os.path.dirname(upath(__file__)), 'templates'),
     ),
-    LANGUAGE_CODE='en',
+    LANGUAGE_CODE='en-us',
     LANGUAGES=(
         ('nl', 'Dutch'),
         ('en', 'English'),
@@ -34,7 +34,7 @@ class URLTestCaseBase(TestCase):
     """
     TestCase base-class for the URL tests.
     """
-    urls = 'regressiontests.i18n.patterns.urls.default'
+    urls = 'i18n.patterns.urls.default'
 
     def setUp(self):
         # Make sure the cache is empty before we are doing our tests.
@@ -61,13 +61,13 @@ class URLPrefixTests(URLTestCaseBase):
         with translation.override('nl'):
             self.assertEqual(reverse('prefixed'), '/nl/prefixed/')
 
-    @override_settings(ROOT_URLCONF='regressiontests.i18n.patterns.urls.wrong')
+    @override_settings(ROOT_URLCONF='i18n.patterns.urls.wrong')
     def test_invalid_prefix_use(self):
         self.assertRaises(ImproperlyConfigured, lambda: reverse('account:register'))
 
 
 class URLDisabledTests(URLTestCaseBase):
-    urls = 'regressiontests.i18n.patterns.urls.disabled'
+    urls = 'i18n.patterns.urls.disabled'
 
     @override_settings(USE_I18N=False)
     def test_prefixed_i18n_disabled(self):
@@ -82,7 +82,7 @@ class PathUnusedTests(URLTestCaseBase):
     Check that if no i18n_patterns is used in root urlconfs, then no
     language activation happens based on url prefix.
     """
-    urls = 'regressiontests.i18n.patterns.urls.path_unused'
+    urls = 'i18n.patterns.urls.path_unused'
 
     def test_no_lang_activate(self):
         response = self.client.get('/nl/foo/')
@@ -115,6 +115,7 @@ class URLTranslationTests(URLTestCaseBase):
 
         with translation.override('nl'):
             self.assertEqual(reverse('users'), '/nl/gebruikers/')
+            self.assertEqual(reverse('prefixed_xml'), '/nl/prefixed.xml')
 
         with translation.override('pt-br'):
             self.assertEqual(reverse('users'), '/pt-br/usuarios/')
@@ -170,6 +171,34 @@ class URLRedirectTests(URLTestCaseBase):
         response = self.client.get(response['location'])
         self.assertEqual(response.status_code, 200)
 
+    def test_pl_pl_redirect(self):
+        # language from outside of the supported LANGUAGES list
+        response = self.client.get('/account/register/', HTTP_ACCEPT_LANGUAGE='pl-pl')
+        self.assertRedirects(response, '/en/account/register/')
+
+        response = self.client.get(response['location'])
+        self.assertEqual(response.status_code, 200)
+
+
+class URLVaryAcceptLanguageTests(URLTestCaseBase):
+    """
+    Tests that 'Accept-Language' is not added to the Vary header when using
+    prefixed URLs. 
+    """
+    def test_no_prefix_response(self):
+        response = self.client.get('/not-prefixed/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.get('Vary'), 'Accept-Language')
+
+    def test_en_redirect(self):
+        response = self.client.get('/account/register/', HTTP_ACCEPT_LANGUAGE='en')
+        self.assertRedirects(response, '/en/account/register/')
+        self.assertFalse(response.get('Vary'))
+
+        response = self.client.get(response['location'])
+        self.assertEqual(response.status_code, 200)
+        self.assertFalse(response.get('Vary'))
+
 
 class URLRedirectWithoutTrailingSlashTests(URLTestCaseBase):
     """
@@ -186,6 +215,9 @@ class URLRedirectWithoutTrailingSlashTests(URLTestCaseBase):
         self.assertIn(('http://testserver/en/account/register/', 301), response.redirect_chain)
         self.assertRedirects(response, '/en/account/register/', 302)
 
+        response = self.client.get('/prefixed.xml', HTTP_ACCEPT_LANGUAGE='en', follow=True)
+        self.assertRedirects(response, '/en/prefixed.xml', 302)
+
 
 class URLRedirectWithoutTrailingSlashSettingTests(URLTestCaseBase):
     """
diff --git a/tests/modeltests/mutually_referential/__init__.py b/tests/i18n/patterns/urls/__init__.py
similarity index 100%
rename from tests/modeltests/mutually_referential/__init__.py
rename to tests/i18n/patterns/urls/__init__.py
diff --git a/tests/regressiontests/i18n/patterns/urls/default.py b/tests/i18n/patterns/urls/default.py
similarity index 81%
rename from tests/regressiontests/i18n/patterns/urls/default.py
rename to tests/i18n/patterns/urls/default.py
index f117502753..0edaea48ad 100644
--- a/tests/regressiontests/i18n/patterns/urls/default.py
+++ b/tests/i18n/patterns/urls/default.py
@@ -14,6 +14,7 @@ urlpatterns = patterns('',
 
 urlpatterns += i18n_patterns('',
     url(r'^prefixed/$', view, name='prefixed'),
+    url(r'^prefixed\.xml$', view, name='prefixed_xml'),
     url(_(r'^users/$'), view, name='users'),
-    url(_(r'^account/'), include('regressiontests.i18n.patterns.urls.namespace', namespace='account')),
+    url(_(r'^account/'), include('i18n.patterns.urls.namespace', namespace='account')),
 )
diff --git a/tests/regressiontests/i18n/patterns/urls/disabled.py b/tests/i18n/patterns/urls/disabled.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/disabled.py
rename to tests/i18n/patterns/urls/disabled.py
diff --git a/tests/regressiontests/i18n/patterns/urls/namespace.py b/tests/i18n/patterns/urls/namespace.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/namespace.py
rename to tests/i18n/patterns/urls/namespace.py
diff --git a/tests/regressiontests/i18n/patterns/urls/path_unused.py b/tests/i18n/patterns/urls/path_unused.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/path_unused.py
rename to tests/i18n/patterns/urls/path_unused.py
diff --git a/tests/regressiontests/i18n/patterns/urls/wrong.py b/tests/i18n/patterns/urls/wrong.py
similarity index 62%
rename from tests/regressiontests/i18n/patterns/urls/wrong.py
rename to tests/i18n/patterns/urls/wrong.py
index 22e9d535cc..deed258909 100644
--- a/tests/regressiontests/i18n/patterns/urls/wrong.py
+++ b/tests/i18n/patterns/urls/wrong.py
@@ -4,5 +4,5 @@ from django.utils.translation import ugettext_lazy as _
 
 
 urlpatterns = i18n_patterns('',
-    url(_(r'^account/'), include('regressiontests.i18n.patterns.urls.wrong_namespace', namespace='account')),
+    url(_(r'^account/'), include('i18n.patterns.urls.wrong_namespace', namespace='account')),
 )
diff --git a/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py b/tests/i18n/patterns/urls/wrong_namespace.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/wrong_namespace.py
rename to tests/i18n/patterns/urls/wrong_namespace.py
diff --git a/tests/modeltests/one_to_one/__init__.py b/tests/i18n/resolution/__init__.py
similarity index 100%
rename from tests/modeltests/one_to_one/__init__.py
rename to tests/i18n/resolution/__init__.py
diff --git a/tests/regressiontests/i18n/resolution/locale/de/LC_MESSAGES/django.mo b/tests/i18n/resolution/locale/de/LC_MESSAGES/django.mo
similarity index 100%
rename from tests/regressiontests/i18n/resolution/locale/de/LC_MESSAGES/django.mo
rename to tests/i18n/resolution/locale/de/LC_MESSAGES/django.mo
diff --git a/tests/regressiontests/i18n/resolution/locale/de/LC_MESSAGES/django.po b/tests/i18n/resolution/locale/de/LC_MESSAGES/django.po
similarity index 100%
rename from tests/regressiontests/i18n/resolution/locale/de/LC_MESSAGES/django.po
rename to tests/i18n/resolution/locale/de/LC_MESSAGES/django.po
diff --git a/tests/regressiontests/i18n/resolution/models.py b/tests/i18n/resolution/models.py
similarity index 100%
rename from tests/regressiontests/i18n/resolution/models.py
rename to tests/i18n/resolution/models.py
diff --git a/tests/regressiontests/i18n/tests.py b/tests/i18n/tests.py
similarity index 79%
rename from tests/regressiontests/i18n/tests.py
rename to tests/i18n/tests.py
index dcc288e600..d26a201efa 100644
--- a/tests/regressiontests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -15,34 +15,42 @@ from django.test.utils import override_settings
 from django.utils import translation
 from django.utils.formats import (get_format, date_format, time_format,
     localize, localize_input, iter_format_modules, get_format_modules,
-    number_format)
+    number_format, reset_format_cache, sanitize_separators)
 from django.utils.importlib import import_module
 from django.utils.numberformat import format as nformat
 from django.utils._os import upath
 from django.utils.safestring import mark_safe, SafeBytes, SafeString, SafeText
 from django.utils import six
 from django.utils.six import PY3
-from django.utils.translation import (ugettext, ugettext_lazy, activate,
-    deactivate, gettext_lazy, pgettext, npgettext, to_locale,
-    get_language_info, get_language, get_language_from_request, trans_real)
-
+from django.utils.translation import (activate, deactivate,
+    get_language,  get_language_from_request, get_language_info,
+    to_locale, trans_real,
+    gettext, gettext_lazy,
+    ugettext, ugettext_lazy,
+    ngettext, ngettext_lazy,
+    ungettext, ungettext_lazy,
+    pgettext, pgettext_lazy,
+    npgettext, npgettext_lazy)
 
 from .commands.tests import can_run_extraction_tests, can_run_compilation_tests
 if can_run_extraction_tests:
     from .commands.extraction import (ExtractorTests, BasicExtractorTests,
         JavascriptExtractorTests, IgnoredExtractorTests, SymlinkExtractorTests,
         CopyPluralFormsExtractorTests, NoWrapExtractorTests,
-        NoLocationExtractorTests)
+        NoLocationExtractorTests, KeepPotFileExtractorTests,
+        MultipleLocaleExtractionTests)
 if can_run_compilation_tests:
     from .commands.compilation import (PoFileTests, PoFileContentsTests,
-        PercentRenderingTests)
+        PercentRenderingTests, MultipleLocaleCompilationTests,
+        CompilationErrorHandling)
 from .contenttypes.tests import ContentTypeTests
 from .forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm
 from .models import Company, TestModel
 from .patterns.tests import (URLRedirectWithoutTrailingSlashTests,
     URLTranslationTests, URLDisabledTests, URLTagTests, URLTestCaseBase,
     URLRedirectWithoutTrailingSlashSettingTests, URLNamespaceTests,
-    URLPrefixTests, URLResponseTests, URLRedirectTests, PathUnusedTests)
+    URLPrefixTests, URLResponseTests, URLRedirectTests, PathUnusedTests,
+    URLVaryAcceptLanguageTests)
 
 
 here = os.path.dirname(os.path.abspath(upath(__file__)))
@@ -94,6 +102,45 @@ class TranslationTests(TestCase):
         s2 = pickle.loads(pickle.dumps(s1))
         self.assertEqual(six.text_type(s2), "test")
 
+    @override_settings(LOCALE_PATHS=extended_locale_paths)
+    def test_ungettext_lazy(self):
+        simple_with_format = ungettext_lazy('%d good result', '%d good results')
+        simple_str_with_format = ngettext_lazy(str('%d good result'), str('%d good results'))
+        simple_context_with_format = npgettext_lazy('Exclamation', '%d good result', '%d good results')
+        simple_without_format = ungettext_lazy('good result', 'good results')
+        with translation.override('de'):
+            self.assertEqual(simple_with_format % 1, '1 gutes Resultat')
+            self.assertEqual(simple_with_format % 4, '4 guten Resultate')
+            self.assertEqual(simple_str_with_format % 1, str('1 gutes Resultat'))
+            self.assertEqual(simple_str_with_format % 4, str('4 guten Resultate'))
+            self.assertEqual(simple_context_with_format % 1, '1 gutes Resultat!')
+            self.assertEqual(simple_context_with_format % 4, '4 guten Resultate!')
+            self.assertEqual(simple_without_format % 1, 'gutes Resultat')
+            self.assertEqual(simple_without_format % 4, 'guten Resultate')
+
+        complex_nonlazy = ungettext_lazy('Hi %(name)s, %(num)d good result', 'Hi %(name)s, %(num)d good results', 4)
+        complex_deferred = ungettext_lazy('Hi %(name)s, %(num)d good result', 'Hi %(name)s, %(num)d good results', 'num')
+        complex_str_nonlazy = ngettext_lazy(str('Hi %(name)s, %(num)d good result'), str('Hi %(name)s, %(num)d good results'), 4)
+        complex_str_deferred = ngettext_lazy(str('Hi %(name)s, %(num)d good result'), str('Hi %(name)s, %(num)d good results'), 'num')
+        complex_context_nonlazy = npgettext_lazy('Greeting', 'Hi %(name)s, %(num)d good result', 'Hi %(name)s, %(num)d good results', 4)
+        complex_context_deferred = npgettext_lazy('Greeting', 'Hi %(name)s, %(num)d good result', 'Hi %(name)s, %(num)d good results', 'num')
+        with translation.override('de'):
+            self.assertEqual(complex_nonlazy % {'num': 4, 'name': 'Jim'}, 'Hallo Jim, 4 guten Resultate')
+            self.assertEqual(complex_deferred % {'name': 'Jim', 'num': 1}, 'Hallo Jim, 1 gutes Resultat')
+            self.assertEqual(complex_deferred % {'name': 'Jim', 'num': 5}, 'Hallo Jim, 5 guten Resultate')
+            with six.assertRaisesRegex(self, KeyError, 'Your dictionary lacks key.*'):
+                complex_deferred % {'name': 'Jim'}
+            self.assertEqual(complex_str_nonlazy % {'num': 4, 'name': 'Jim'}, str('Hallo Jim, 4 guten Resultate'))
+            self.assertEqual(complex_str_deferred % {'name': 'Jim', 'num': 1}, str('Hallo Jim, 1 gutes Resultat'))
+            self.assertEqual(complex_str_deferred % {'name': 'Jim', 'num': 5}, str('Hallo Jim, 5 guten Resultate'))
+            with six.assertRaisesRegex(self, KeyError, 'Your dictionary lacks key.*'):
+                complex_str_deferred % {'name': 'Jim'}
+            self.assertEqual(complex_context_nonlazy % {'num': 4, 'name': 'Jim'}, 'Willkommen Jim, 4 guten Resultate')
+            self.assertEqual(complex_context_deferred % {'name': 'Jim', 'num': 1}, 'Willkommen Jim, 1 gutes Resultat')
+            self.assertEqual(complex_context_deferred % {'name': 'Jim', 'num': 5}, 'Willkommen Jim, 5 guten Resultate')
+            with six.assertRaisesRegex(self, KeyError, 'Your dictionary lacks key.*'):
+                complex_context_deferred % {'name': 'Jim'}
+
     @override_settings(LOCALE_PATHS=extended_locale_paths)
     def test_pgettext(self):
         trans_real._active = local()
@@ -292,14 +339,10 @@ class TranslationTests(TestCase):
             self.assertEqual(rendered, 'My other name is James.')
 
 
+@override_settings(USE_L10N=True)
 class FormattingTests(TestCase):
 
     def setUp(self):
-        self.use_i18n = settings.USE_I18N
-        self.use_l10n = settings.USE_L10N
-        self.use_thousand_separator = settings.USE_THOUSAND_SEPARATOR
-        self.thousand_separator = settings.THOUSAND_SEPARATOR
-        self.number_grouping = settings.NUMBER_GROUPING
         self.n = decimal.Decimal('66666.666')
         self.f = 99999.999
         self.d = datetime.date(2009, 12, 31)
@@ -315,24 +358,16 @@ class FormattingTests(TestCase):
             'l': self.l,
         })
 
-    def tearDown(self):
-        # Restore defaults
-        settings.USE_I18N = self.use_i18n
-        settings.USE_L10N = self.use_l10n
-        settings.USE_THOUSAND_SEPARATOR = self.use_thousand_separator
-        settings.THOUSAND_SEPARATOR = self.thousand_separator
-        settings.NUMBER_GROUPING = self.number_grouping
-
     def test_locale_independent(self):
         """
         Localization of numbers
         """
-        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=False):
+        with self.settings(USE_THOUSAND_SEPARATOR=False):
             self.assertEqual('66666.66', nformat(self.n, decimal_sep='.', decimal_pos=2, grouping=3, thousand_sep=','))
             self.assertEqual('66666A6', nformat(self.n, decimal_sep='A', decimal_pos=1, grouping=1, thousand_sep='B'))
             self.assertEqual('66666', nformat(self.n, decimal_sep='X', decimal_pos=0, grouping=1, thousand_sep='Y'))
 
-        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True):
+        with self.settings(USE_THOUSAND_SEPARATOR=True):
             self.assertEqual('66,666.66', nformat(self.n, decimal_sep='.', decimal_pos=2, grouping=3, thousand_sep=','))
             self.assertEqual('6B6B6B6B6A6', nformat(self.n, decimal_sep='A', decimal_pos=1, grouping=1, thousand_sep='B'))
             self.assertEqual('-66666.6', nformat(-66666.666, decimal_sep='.', decimal_pos=1))
@@ -345,12 +380,12 @@ class FormattingTests(TestCase):
             self.assertEqual('31.12.2009 в 20:50', Template('{{ dt|date:"d.m.Y в H:i" }}').render(self.ctxt))
             self.assertEqual('⌚ 10:15', Template('{{ t|time:"⌚ H:i" }}').render(self.ctxt))
 
+    @override_settings(USE_L10N=False)
     def test_l10n_disabled(self):
         """
         Catalan locale with format i18n disabled translations will be used,
         but not formats
         """
-        settings.USE_L10N = False
         with translation.override('ca', deactivate=True):
             self.assertEqual('N j, Y', get_format('DATE_FORMAT'))
             self.assertEqual(0, get_format('FIRST_DAY_OF_WEEK'))
@@ -428,14 +463,14 @@ class FormattingTests(TestCase):
         fr_formats.THOUSAND_SEPARATOR = ''
         fr_formats.FIRST_DAY_OF_WEEK = 0
 
+        reset_format_cache()
         with translation.override('fr'):
-            with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True,
-                               THOUSAND_SEPARATOR='!'):
+            with self.settings(USE_THOUSAND_SEPARATOR=True, THOUSAND_SEPARATOR='!'):
                 self.assertEqual('', get_format('THOUSAND_SEPARATOR'))
                 # Even a second time (after the format has been cached)...
                 self.assertEqual('', get_format('THOUSAND_SEPARATOR'))
 
-            with self.settings(USE_L10N=True, FIRST_DAY_OF_WEEK=1):
+            with self.settings(FIRST_DAY_OF_WEEK=1):
                 self.assertEqual(0, get_format('FIRST_DAY_OF_WEEK'))
                 # Even a second time (after the format has been cached)...
                 self.assertEqual(0, get_format('FIRST_DAY_OF_WEEK'))
@@ -445,7 +480,6 @@ class FormattingTests(TestCase):
         fr_formats.FIRST_DAY_OF_WEEK = backup_FIRST_DAY_OF_WEEK
 
     def test_l10n_enabled(self):
-        settings.USE_L10N = True
         # Catalan locale
         with translation.override('ca', deactivate=True):
             self.assertEqual('j \d\e F \d\e Y', get_format('DATE_FORMAT'))
@@ -457,67 +491,70 @@ class FormattingTests(TestCase):
             self.assertEqual('31/12/2009 20:50', date_format(self.dt, 'SHORT_DATETIME_FORMAT'))
             self.assertEqual('No localizable', localize('No localizable'))
 
-            settings.USE_THOUSAND_SEPARATOR = True
-            self.assertEqual('66.666,666', localize(self.n))
-            self.assertEqual('99.999,999', localize(self.f))
-            self.assertEqual('10.000', localize(self.l))
-            self.assertEqual('True', localize(True))
+            with self.settings(USE_THOUSAND_SEPARATOR=True):
+                self.assertEqual('66.666,666', localize(self.n))
+                self.assertEqual('99.999,999', localize(self.f))
+                self.assertEqual('10.000', localize(self.l))
+                self.assertEqual('True', localize(True))
 
-            settings.USE_THOUSAND_SEPARATOR = False
-            self.assertEqual('66666,666', localize(self.n))
-            self.assertEqual('99999,999', localize(self.f))
-            self.assertEqual('10000', localize(self.l))
-            self.assertEqual('31 de desembre de 2009', localize(self.d))
-            self.assertEqual('31 de desembre de 2009 a les 20:50', localize(self.dt))
+            with self.settings(USE_THOUSAND_SEPARATOR=False):
+                self.assertEqual('66666,666', localize(self.n))
+                self.assertEqual('99999,999', localize(self.f))
+                self.assertEqual('10000', localize(self.l))
+                self.assertEqual('31 de desembre de 2009', localize(self.d))
+                self.assertEqual('31 de desembre de 2009 a les 20:50', localize(self.dt))
 
-            settings.USE_THOUSAND_SEPARATOR = True
-            self.assertEqual('66.666,666', Template('{{ n }}').render(self.ctxt))
-            self.assertEqual('99.999,999', Template('{{ f }}').render(self.ctxt))
-            self.assertEqual('10.000', Template('{{ l }}').render(self.ctxt))
+            with self.settings(USE_THOUSAND_SEPARATOR=True):
+                self.assertEqual('66.666,666', Template('{{ n }}').render(self.ctxt))
+                self.assertEqual('99.999,999', Template('{{ f }}').render(self.ctxt))
+                self.assertEqual('10.000', Template('{{ l }}').render(self.ctxt))
 
-            form3 = I18nForm({
-                'decimal_field': '66.666,666',
-                'float_field': '99.999,999',
-                'date_field': '31/12/2009',
-                'datetime_field': '31/12/2009 20:50',
-                'time_field': '20:50',
-                'integer_field': '1.234',
-            })
-            self.assertEqual(True, form3.is_valid())
-            self.assertEqual(decimal.Decimal('66666.666'), form3.cleaned_data['decimal_field'])
-            self.assertEqual(99999.999, form3.cleaned_data['float_field'])
-            self.assertEqual(datetime.date(2009, 12, 31), form3.cleaned_data['date_field'])
-            self.assertEqual(datetime.datetime(2009, 12, 31, 20, 50), form3.cleaned_data['datetime_field'])
-            self.assertEqual(datetime.time(20, 50), form3.cleaned_data['time_field'])
-            self.assertEqual(1234, form3.cleaned_data['integer_field'])
+            with self.settings(USE_THOUSAND_SEPARATOR=True):
+                form3 = I18nForm({
+                    'decimal_field': '66.666,666',
+                    'float_field': '99.999,999',
+                    'date_field': '31/12/2009',
+                    'datetime_field': '31/12/2009 20:50',
+                    'time_field': '20:50',
+                    'integer_field': '1.234',
+                })
+                self.assertEqual(True, form3.is_valid())
+                self.assertEqual(decimal.Decimal('66666.666'), form3.cleaned_data['decimal_field'])
+                self.assertEqual(99999.999, form3.cleaned_data['float_field'])
+                self.assertEqual(datetime.date(2009, 12, 31), form3.cleaned_data['date_field'])
+                self.assertEqual(datetime.datetime(2009, 12, 31, 20, 50), form3.cleaned_data['datetime_field'])
+                self.assertEqual(datetime.time(20, 50), form3.cleaned_data['time_field'])
+                self.assertEqual(1234, form3.cleaned_data['integer_field'])
 
-            settings.USE_THOUSAND_SEPARATOR = False
-            self.assertEqual('66666,666', Template('{{ n }}').render(self.ctxt))
-            self.assertEqual('99999,999', Template('{{ f }}').render(self.ctxt))
-            self.assertEqual('31 de desembre de 2009', Template('{{ d }}').render(self.ctxt))
-            self.assertEqual('31 de desembre de 2009 a les 20:50', Template('{{ dt }}').render(self.ctxt))
-            self.assertEqual('66666,67', Template('{{ n|floatformat:2 }}').render(self.ctxt))
-            self.assertEqual('100000,0', Template('{{ f|floatformat }}').render(self.ctxt))
-            self.assertEqual('10:15:48', Template('{{ t|time:"TIME_FORMAT" }}').render(self.ctxt))
-            self.assertEqual('31/12/2009', Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(self.ctxt))
-            self.assertEqual('31/12/2009 20:50', Template('{{ dt|date:"SHORT_DATETIME_FORMAT" }}').render(self.ctxt))
-            self.assertEqual(date_format(datetime.datetime.now(), "DATE_FORMAT"), Template('{% now "DATE_FORMAT" %}').render(self.ctxt))
+            with self.settings(USE_THOUSAND_SEPARATOR=False):
+                self.assertEqual('66666,666', Template('{{ n }}').render(self.ctxt))
+                self.assertEqual('99999,999', Template('{{ f }}').render(self.ctxt))
+                self.assertEqual('31 de desembre de 2009', Template('{{ d }}').render(self.ctxt))
+                self.assertEqual('31 de desembre de 2009 a les 20:50', Template('{{ dt }}').render(self.ctxt))
+                self.assertEqual('66666,67', Template('{{ n|floatformat:2 }}').render(self.ctxt))
+                self.assertEqual('100000,0', Template('{{ f|floatformat }}').render(self.ctxt))
+                self.assertEqual('10:15:48', Template('{{ t|time:"TIME_FORMAT" }}').render(self.ctxt))
+                self.assertEqual('31/12/2009', Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(self.ctxt))
+                self.assertEqual('31/12/2009 20:50', Template('{{ dt|date:"SHORT_DATETIME_FORMAT" }}').render(self.ctxt))
+                self.assertEqual(date_format(datetime.datetime.now(), "DATE_FORMAT"),
+                                 Template('{% now "DATE_FORMAT" %}').render(self.ctxt))
 
-            form4 = I18nForm({
-                'decimal_field': '66666,666',
-                'float_field': '99999,999',
-                'date_field': '31/12/2009',
-                'datetime_field': '31/12/2009 20:50',
-                'time_field': '20:50',
-                'integer_field': '1234',
-            })
-            self.assertEqual(True, form4.is_valid())
-            self.assertEqual(decimal.Decimal('66666.666'), form4.cleaned_data['decimal_field'])
-            self.assertEqual(99999.999, form4.cleaned_data['float_field'])
-            self.assertEqual(datetime.date(2009, 12, 31), form4.cleaned_data['date_field'])
-            self.assertEqual(datetime.datetime(2009, 12, 31, 20, 50), form4.cleaned_data['datetime_field'])
-            self.assertEqual(datetime.time(20, 50), form4.cleaned_data['time_field'])
-            self.assertEqual(1234, form4.cleaned_data['integer_field'])
+            with self.settings(USE_THOUSAND_SEPARATOR=False):
+                form4 = I18nForm({
+                    'decimal_field': '66666,666',
+                    'float_field': '99999,999',
+                    'date_field': '31/12/2009',
+                    'datetime_field': '31/12/2009 20:50',
+                    'time_field': '20:50',
+                    'integer_field': '1234',
+                })
+                self.assertEqual(True, form4.is_valid())
+                self.assertEqual(decimal.Decimal('66666.666'), form4.cleaned_data['decimal_field'])
+                self.assertEqual(99999.999, form4.cleaned_data['float_field'])
+                self.assertEqual(datetime.date(2009, 12, 31), form4.cleaned_data['date_field'])
+                self.assertEqual(datetime.datetime(2009, 12, 31, 20, 50), form4.cleaned_data['datetime_field'])
+                self.assertEqual(datetime.time(20, 50), form4.cleaned_data['time_field'])
+                self.assertEqual(1234, form4.cleaned_data['integer_field'])
 
             form5 = SelectDateForm({
                 'date_field_month': '12',
@@ -548,32 +585,32 @@ class FormattingTests(TestCase):
             self.assertEqual('12/31/2009 8:50 p.m.', date_format(self.dt, 'SHORT_DATETIME_FORMAT'))
             self.assertEqual('No localizable', localize('No localizable'))
 
-            settings.USE_THOUSAND_SEPARATOR = True
-            self.assertEqual('66,666.666', localize(self.n))
-            self.assertEqual('99,999.999', localize(self.f))
-            self.assertEqual('10,000', localize(self.l))
+            with self.settings(USE_THOUSAND_SEPARATOR=True):
+                self.assertEqual('66,666.666', localize(self.n))
+                self.assertEqual('99,999.999', localize(self.f))
+                self.assertEqual('10,000', localize(self.l))
 
-            settings.USE_THOUSAND_SEPARATOR = False
-            self.assertEqual('66666.666', localize(self.n))
-            self.assertEqual('99999.999', localize(self.f))
-            self.assertEqual('10000', localize(self.l))
-            self.assertEqual('Dec. 31, 2009', localize(self.d))
-            self.assertEqual('Dec. 31, 2009, 8:50 p.m.', localize(self.dt))
+            with self.settings(USE_THOUSAND_SEPARATOR=False):
+                self.assertEqual('66666.666', localize(self.n))
+                self.assertEqual('99999.999', localize(self.f))
+                self.assertEqual('10000', localize(self.l))
+                self.assertEqual('Dec. 31, 2009', localize(self.d))
+                self.assertEqual('Dec. 31, 2009, 8:50 p.m.', localize(self.dt))
 
-            settings.USE_THOUSAND_SEPARATOR = True
-            self.assertEqual('66,666.666', Template('{{ n }}').render(self.ctxt))
-            self.assertEqual('99,999.999', Template('{{ f }}').render(self.ctxt))
-            self.assertEqual('10,000', Template('{{ l }}').render(self.ctxt))
+            with self.settings(USE_THOUSAND_SEPARATOR=True):
+                self.assertEqual('66,666.666', Template('{{ n }}').render(self.ctxt))
+                self.assertEqual('99,999.999', Template('{{ f }}').render(self.ctxt))
+                self.assertEqual('10,000', Template('{{ l }}').render(self.ctxt))
 
-            settings.USE_THOUSAND_SEPARATOR = False
-            self.assertEqual('66666.666', Template('{{ n }}').render(self.ctxt))
-            self.assertEqual('99999.999', Template('{{ f }}').render(self.ctxt))
-            self.assertEqual('Dec. 31, 2009', Template('{{ d }}').render(self.ctxt))
-            self.assertEqual('Dec. 31, 2009, 8:50 p.m.', Template('{{ dt }}').render(self.ctxt))
-            self.assertEqual('66666.67', Template('{{ n|floatformat:2 }}').render(self.ctxt))
-            self.assertEqual('100000.0', Template('{{ f|floatformat }}').render(self.ctxt))
-            self.assertEqual('12/31/2009', Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(self.ctxt))
-            self.assertEqual('12/31/2009 8:50 p.m.', Template('{{ dt|date:"SHORT_DATETIME_FORMAT" }}').render(self.ctxt))
+            with self.settings(USE_THOUSAND_SEPARATOR=False):
+                self.assertEqual('66666.666', Template('{{ n }}').render(self.ctxt))
+                self.assertEqual('99999.999', Template('{{ f }}').render(self.ctxt))
+                self.assertEqual('Dec. 31, 2009', Template('{{ d }}').render(self.ctxt))
+                self.assertEqual('Dec. 31, 2009, 8:50 p.m.', Template('{{ dt }}').render(self.ctxt))
+                self.assertEqual('66666.67', Template('{{ n|floatformat:2 }}').render(self.ctxt))
+                self.assertEqual('100000.0', Template('{{ f|floatformat }}').render(self.ctxt))
+                self.assertEqual('12/31/2009', Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(self.ctxt))
+                self.assertEqual('12/31/2009 8:50 p.m.', Template('{{ dt|date:"SHORT_DATETIME_FORMAT" }}').render(self.ctxt))
 
             form5 = I18nForm({
                 'decimal_field': '66666.666',
@@ -607,17 +644,17 @@ class FormattingTests(TestCase):
         """
         Check if sublocales fall back to the main locale
         """
-        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True):
+        with self.settings(USE_THOUSAND_SEPARATOR=True):
             with translation.override('de-at', deactivate=True):
                 self.assertEqual('66.666,666', Template('{{ n }}').render(self.ctxt))
             with translation.override('es-us', deactivate=True):
-                self.assertEqual('31 de diciembre de 2009', date_format(self.d))
+                self.assertEqual('31 de Diciembre de 2009', date_format(self.d))
 
     def test_localized_input(self):
         """
         Tests if form input is correctly localized
         """
-        settings.USE_L10N = True
+        self.maxDiff = 1200
         with translation.override('de-at', deactivate=True):
             form6 = CompanyForm({
                 'name': 'acme',
@@ -634,18 +671,35 @@ class FormattingTests(TestCase):
             self.assertEqual(datetime.datetime(2009, 12, 31, 6, 0, 0), form6.cleaned_data['date_added'])
             with self.settings(USE_THOUSAND_SEPARATOR=True):
                 # Checking for the localized "products_delivered" field
-                self.assertTrue('<input type="text" name="products_delivered" value="12.000" id="id_products_delivered" />' in form6.as_ul())
+                self.assertInHTML('<input type="text" name="products_delivered" value="12.000" id="id_products_delivered" />', form6.as_ul())
+
+    def test_sanitize_separators(self):
+        """
+        Tests django.utils.formats.sanitize_separators.
+        """
+        # Non-strings are untouched
+        self.assertEqual(sanitize_separators(123), 123)
+
+        with translation.override('ru', deactivate=True):
+            # Russian locale has non-breaking space (\xa0) as thousand separator
+            # Check that usual space is accepted too when sanitizing inputs
+            with self.settings(USE_THOUSAND_SEPARATOR=True):
+                self.assertEqual(sanitize_separators('1\xa0234\xa0567'), '1234567')
+                self.assertEqual(sanitize_separators('77\xa0777,777'), '77777.777')
+                self.assertEqual(sanitize_separators('12 345'), '12345')
+                self.assertEqual(sanitize_separators('77 777,777'), '77777.777')
+            with self.settings(USE_THOUSAND_SEPARATOR=True, USE_L10N=False):
+                self.assertEqual(sanitize_separators('12\xa0345'), '12\xa0345')
 
     def test_iter_format_modules(self):
         """
         Tests the iter_format_modules function.
         """
-        settings.USE_L10N = True
         with translation.override('de-at', deactivate=True):
             de_format_mod = import_module('django.conf.locale.de.formats')
             self.assertEqual(list(iter_format_modules('de')), [de_format_mod])
-            with self.settings(FORMAT_MODULE_PATH='regressiontests.i18n.other.locale'):
-                test_de_format_mod = import_module('regressiontests.i18n.other.locale.de.formats')
+            with self.settings(FORMAT_MODULE_PATH='i18n.other.locale'):
+                test_de_format_mod = import_module('i18n.other.locale.de.formats')
                 self.assertEqual(list(iter_format_modules('de')), [test_de_format_mod, de_format_mod])
 
     def test_iter_format_modules_stability(self):
@@ -653,19 +707,16 @@ class FormattingTests(TestCase):
         Tests the iter_format_modules function always yields format modules in
         a stable and correct order in presence of both base ll and ll_CC formats.
         """
-        settings.USE_L10N = True
         en_format_mod = import_module('django.conf.locale.en.formats')
         en_gb_format_mod = import_module('django.conf.locale.en_GB.formats')
         self.assertEqual(list(iter_format_modules('en-gb')), [en_gb_format_mod, en_format_mod])
 
     def test_get_format_modules_lang(self):
-        with self.settings(USE_L10N=True):
-            with translation.override('de', deactivate=True):
-                self.assertEqual('.', get_format('DECIMAL_SEPARATOR', lang='en'))
+        with translation.override('de', deactivate=True):
+            self.assertEqual('.', get_format('DECIMAL_SEPARATOR', lang='en'))
 
     def test_get_format_modules_stability(self):
-        with self.settings(USE_L10N=True,
-                FORMAT_MODULE_PATH='regressiontests.i18n.other.locale'):
+        with self.settings(FORMAT_MODULE_PATH='i18n.other.locale'):
             with translation.override('de', deactivate=True):
                 old = str("%r") % get_format_modules(reverse=True)
                 new = str("%r") % get_format_modules(reverse=True) # second try
@@ -860,7 +911,7 @@ class AppResolutionOrderI18NTests(ResolutionOrderI18NTests):
 
     def setUp(self):
         self.old_installed_apps = settings.INSTALLED_APPS
-        settings.INSTALLED_APPS = ['regressiontests.i18n.resolution'] + list(settings.INSTALLED_APPS)
+        settings.INSTALLED_APPS = ['i18n.resolution'] + list(settings.INSTALLED_APPS)
         super(AppResolutionOrderI18NTests, self).setUp()
 
     def tearDown(self):
@@ -877,7 +928,7 @@ class LocalePathsResolutionOrderI18NTests(ResolutionOrderI18NTests):
         self.assertUgettext('Time', 'LOCALE_PATHS')
 
     def test_locale_paths_override_app_translation(self):
-        extended_apps = list(settings.INSTALLED_APPS) + ['regressiontests.i18n.resolution']
+        extended_apps = list(settings.INSTALLED_APPS) + ['i18n.resolution']
         with self.settings(INSTALLED_APPS=extended_apps):
             self.assertUgettext('Time', 'LOCALE_PATHS')
 
@@ -908,6 +959,19 @@ class TestLanguageInfo(TestCase):
         self.assertEqual(li['name'], 'German')
         self.assertEqual(li['bidi'], False)
 
+    def test_unknown_language_code(self):
+        six.assertRaisesRegex(self, KeyError, r"Unknown language code xx\.", get_language_info, 'xx')
+
+    def test_unknown_only_country_code(self):
+        li = get_language_info('de-xx')
+        self.assertEqual(li['code'], 'de')
+        self.assertEqual(li['name_local'], 'Deutsch')
+        self.assertEqual(li['name'], 'German')
+        self.assertEqual(li['bidi'], False)
+
+    def test_unknown_language_code_and_country_code(self):
+        six.assertRaisesRegex(self, KeyError, r"Unknown language code xx-xx and xx\.", get_language_info, 'xx-xx')
+
 
 class MultipleLocaleActivationTests(TestCase):
     """
@@ -1033,3 +1097,26 @@ class MultipleLocaleActivationTests(TestCase):
             t = Template("{% load i18n %}{% blocktrans %}No{% endblocktrans %}")
         with translation.override('nl'):
             self.assertEqual(t.render(Context({})), 'Nee')
+
+
+@override_settings(
+    USE_I18N=True,
+    LANGUAGES=(
+        ('en', 'English'),
+        ('fr', 'French'),
+    ),
+    MIDDLEWARE_CLASSES=(
+        'django.middleware.locale.LocaleMiddleware',
+        'django.middleware.common.CommonMiddleware',
+    ),
+)
+class LocaleMiddlewareTests(TestCase):
+
+    urls = 'i18n.urls'
+
+    def test_streaming_response(self):
+        # Regression test for #5241
+        response = self.client.get('/fr/streaming/')
+        self.assertContains(response, "Oui/Non")
+        response = self.client.get('/en/streaming/')
+        self.assertContains(response, "Yes/No")
diff --git a/tests/i18n/urls.py b/tests/i18n/urls.py
new file mode 100644
index 0000000000..c118265dab
--- /dev/null
+++ b/tests/i18n/urls.py
@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+
+from django.conf.urls.i18n import i18n_patterns
+from django.http import StreamingHttpResponse
+from django.utils.translation import ugettext_lazy as _
+
+urlpatterns = i18n_patterns('',
+    (r'^streaming/$', lambda r: StreamingHttpResponse([_("Yes"), "/", _("No")])),
+)
diff --git a/tests/modeltests/or_lookups/__init__.py b/tests/indexes/__init__.py
similarity index 100%
rename from tests/modeltests/or_lookups/__init__.py
rename to tests/indexes/__init__.py
diff --git a/tests/indexes/models.py b/tests/indexes/models.py
new file mode 100644
index 0000000000..e38eb005db
--- /dev/null
+++ b/tests/indexes/models.py
@@ -0,0 +1,20 @@
+from django.db import connection
+from django.db import models
+
+
+class Article(models.Model):
+    headline = models.CharField(max_length=100)
+    pub_date = models.DateTimeField()
+
+    class Meta:
+        index_together = [
+            ["headline", "pub_date"],
+        ]
+
+
+# Indexing a TextField on Oracle or MySQL results in index creation error.
+if connection.vendor == 'postgresql':
+    class IndexedArticle(models.Model):
+        headline = models.CharField(max_length=100, db_index=True)
+        body = models.TextField(db_index=True)
+        slug = models.CharField(max_length=40, unique=True)
diff --git a/tests/indexes/tests.py b/tests/indexes/tests.py
new file mode 100644
index 0000000000..672e35d286
--- /dev/null
+++ b/tests/indexes/tests.py
@@ -0,0 +1,27 @@
+from django.core.management.color import no_style
+from django.db import connections, DEFAULT_DB_ALIAS
+from django.test import TestCase
+from django.utils.unittest import skipUnless
+
+from .models import Article
+
+
+class IndexesTests(TestCase):
+    def test_index_together(self):
+        connection = connections[DEFAULT_DB_ALIAS]
+        index_sql = connection.creation.sql_indexes_for_model(Article, no_style())
+        self.assertEqual(len(index_sql), 1)
+
+    @skipUnless(connections[DEFAULT_DB_ALIAS].vendor == 'postgresql',
+        "This is a postgresql-specific issue")
+    def test_postgresql_text_indexes(self):
+        """Test creation of PostgreSQL-specific text indexes (#12234)"""
+        from .models import IndexedArticle
+        connection = connections[DEFAULT_DB_ALIAS]
+        index_sql = connection.creation.sql_indexes_for_model(IndexedArticle, no_style())
+        self.assertEqual(len(index_sql), 5)
+        self.assertIn('("headline" varchar_pattern_ops)', index_sql[1])
+        self.assertIn('("body" text_pattern_ops)', index_sql[3])
+        # unique=True and db_index=True should only create the varchar-specific
+        # index (#19441).
+        self.assertIn('("slug" varchar_pattern_ops)', index_sql[4])
diff --git a/tests/modeltests/order_with_respect_to/__init__.py b/tests/initial_sql_regress/__init__.py
similarity index 100%
rename from tests/modeltests/order_with_respect_to/__init__.py
rename to tests/initial_sql_regress/__init__.py
diff --git a/tests/regressiontests/initial_sql_regress/models.py b/tests/initial_sql_regress/models.py
similarity index 100%
rename from tests/regressiontests/initial_sql_regress/models.py
rename to tests/initial_sql_regress/models.py
diff --git a/tests/regressiontests/initial_sql_regress/sql/simple.sql b/tests/initial_sql_regress/sql/simple.sql
similarity index 86%
rename from tests/regressiontests/initial_sql_regress/sql/simple.sql
rename to tests/initial_sql_regress/sql/simple.sql
index d82f8381af..c3edb11c5a 100644
--- a/tests/regressiontests/initial_sql_regress/sql/simple.sql
+++ b/tests/initial_sql_regress/sql/simple.sql
@@ -7,5 +7,6 @@ INSERT INTO
 INSERT INTO initial_sql_regress_simple (name) VALUES ('George');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Miles O''Brien');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Semicolon;Man');
+INSERT INTO initial_sql_regress_simple (name) VALUES ('"100%" of % are not placeholders');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('This line has a Windows line ending');
 
diff --git a/tests/initial_sql_regress/tests.py b/tests/initial_sql_regress/tests.py
new file mode 100644
index 0000000000..bd23aab15d
--- /dev/null
+++ b/tests/initial_sql_regress/tests.py
@@ -0,0 +1,47 @@
+from django.core.management.color import no_style
+from django.core.management.sql import custom_sql_for_model
+from django.db import connections, DEFAULT_DB_ALIAS
+from django.test import TestCase
+from django.test.utils import override_settings
+
+from .models import Simple
+
+
+class InitialSQLTests(TestCase):
+    """
+    The format of the included SQL file for this test suite is important.
+    It must end with a trailing newline in order to test the fix for #2161.
+    """
+
+    def test_initial_sql(self):
+        """
+        As pointed out by #14661, test data loaded by custom SQL
+        can't be relied upon; as a result, the test framework flushes the
+        data contents before every test. This test validates that this has
+        occurred.
+        """
+        self.assertEqual(Simple.objects.count(), 0)
+
+    def test_custom_sql(self):
+        """
+        Simulate the custom SQL loading by syncdb.
+        """
+        connection = connections[DEFAULT_DB_ALIAS]
+        custom_sql = custom_sql_for_model(Simple, no_style(), connection)
+        self.assertEqual(len(custom_sql), 9)
+        cursor = connection.cursor()
+        for sql in custom_sql:
+            cursor.execute(sql)
+        self.assertEqual(Simple.objects.count(), 9)
+        self.assertEqual(
+            Simple.objects.get(name__contains='placeholders').name,
+            '"100%" of % are not placeholders'
+        )
+
+    @override_settings(DEBUG=True)
+    def test_custom_sql_debug(self):
+        """
+        Same test, ensure that CursorDebugWrapper doesn't alter sql loading
+        (#3485).
+        """
+        self.test_custom_sql()
diff --git a/tests/modeltests/ordering/__init__.py b/tests/inline_formsets/__init__.py
similarity index 100%
rename from tests/modeltests/ordering/__init__.py
rename to tests/inline_formsets/__init__.py
diff --git a/tests/regressiontests/inline_formsets/models.py b/tests/inline_formsets/models.py
similarity index 100%
rename from tests/regressiontests/inline_formsets/models.py
rename to tests/inline_formsets/models.py
diff --git a/tests/regressiontests/inline_formsets/tests.py b/tests/inline_formsets/tests.py
similarity index 94%
rename from tests/regressiontests/inline_formsets/tests.py
rename to tests/inline_formsets/tests.py
index e979fb4337..df682d34ef 100644
--- a/tests/regressiontests/inline_formsets/tests.py
+++ b/tests/inline_formsets/tests.py
@@ -124,7 +124,7 @@ class InlineFormsetFactoryTest(TestCase):
         to use for the inline formset, we should get an exception.
         """
         six.assertRaisesRegex(self, Exception,
-            "<class 'regressiontests.inline_formsets.models.Child'> has more than 1 ForeignKey to <class 'regressiontests.inline_formsets.models.Parent'>",
+            "<class 'inline_formsets.models.Child'> has more than 1 ForeignKey to <class 'inline_formsets.models.Parent'>",
             inlineformset_factory, Parent, Child
         )
 
@@ -134,7 +134,7 @@ class InlineFormsetFactoryTest(TestCase):
         to the parent model, we should get an exception.
         """
         self.assertRaises(Exception,
-            "fk_name 'school' is not a ForeignKey to <class 'regressiontests.inline_formsets.models.Parent'>",
+            "fk_name 'school' is not a ForeignKey to <class 'inline_formsets.models.Parent'>",
             inlineformset_factory, Parent, Child, fk_name='school'
         )
 
@@ -144,7 +144,7 @@ class InlineFormsetFactoryTest(TestCase):
         exception.
         """
         six.assertRaisesRegex(self, Exception,
-            "<class 'regressiontests.inline_formsets.models.Child'> has no field named 'test'",
+            "<class 'inline_formsets.models.Child'> has no field named 'test'",
             inlineformset_factory, Parent, Child, fk_name='test'
         )
 
diff --git a/tests/regressiontests/bash_completion/management/commands/__init__.py b/tests/inspectdb/__init__.py
similarity index 100%
rename from tests/regressiontests/bash_completion/management/commands/__init__.py
rename to tests/inspectdb/__init__.py
diff --git a/tests/inspectdb/models.py b/tests/inspectdb/models.py
new file mode 100644
index 0000000000..2862f7f3dc
--- /dev/null
+++ b/tests/inspectdb/models.py
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models
+
+
+class People(models.Model):
+    name = models.CharField(max_length=255)
+    parent = models.ForeignKey('self')
+
+class Message(models.Model):
+    from_field = models.ForeignKey(People, db_column='from_id')
+
+class PeopleData(models.Model):
+    people_pk = models.ForeignKey(People, primary_key=True)
+    ssn = models.CharField(max_length=11)
+
+class PeopleMoreData(models.Model):
+    people_unique = models.ForeignKey(People, unique=True)
+    license = models.CharField(max_length=255)
+
+class DigitsInColumnName(models.Model):
+    all_digits = models.CharField(max_length=11, db_column='123')
+    leading_digit = models.CharField(max_length=11, db_column='4extra')
+    leading_digits = models.CharField(max_length=11, db_column='45extra')
+
+class SpecialColumnName(models.Model):
+    field = models.IntegerField(db_column='field')
+    # Underscores
+    field_field_0 = models.IntegerField(db_column='Field_')
+    field_field_1 = models.IntegerField(db_column='Field__')
+    field_field_2 = models.IntegerField(db_column='__field')
+    # Other chars
+    prc_x = models.IntegerField(db_column='prc(%) x')
+    non_ascii = models.IntegerField(db_column='tamaño')
+
+class ColumnTypes(models.Model):
+    id = models.AutoField(primary_key=True)
+    big_int_field = models.BigIntegerField()
+    bool_field = models.BooleanField()
+    null_bool_field = models.NullBooleanField()
+    char_field = models.CharField(max_length=10)
+    comma_separated_int_field = models.CommaSeparatedIntegerField(max_length=99)
+    date_field = models.DateField()
+    date_time_field = models.DateTimeField()
+    decimal_field = models.DecimalField(max_digits=6, decimal_places=1)
+    email_field = models.EmailField()
+    file_field = models.FileField(upload_to="unused")
+    file_path_field = models.FilePathField()
+    float_field = models.FloatField()
+    int_field = models.IntegerField()
+    ip_address_field = models.IPAddressField()
+    gen_ip_adress_field = models.GenericIPAddressField(protocol="ipv4")
+    pos_int_field = models.PositiveIntegerField()
+    pos_small_int_field = models.PositiveSmallIntegerField()
+    slug_field = models.SlugField()
+    small_int_field = models.SmallIntegerField()
+    text_field = models.TextField()
+    time_field = models.TimeField()
+    url_field = models.URLField()
diff --git a/tests/inspectdb/tests.py b/tests/inspectdb/tests.py
new file mode 100644
index 0000000000..79cbbfa3f2
--- /dev/null
+++ b/tests/inspectdb/tests.py
@@ -0,0 +1,164 @@
+# -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
+
+import re
+
+from django.core.management import call_command
+from django.db import connection
+from django.test import TestCase, skipUnlessDBFeature
+from django.utils.unittest import expectedFailure
+from django.utils.six import PY3, StringIO
+
+if connection.vendor == 'oracle':
+    expectedFailureOnOracle = expectedFailure
+else:
+    expectedFailureOnOracle = lambda f: f
+
+class InspectDBTestCase(TestCase):
+
+    def test_stealth_table_name_filter_option(self):
+        out = StringIO()
+        # Lets limit the introspection to tables created for models of this
+        # application
+        call_command('inspectdb',
+                     table_name_filter=lambda tn:tn.startswith('inspectdb_'),
+                     stdout=out)
+        error_message = "inspectdb has examined a table that should have been filtered out."
+        # contrib.contenttypes is one of the apps always installed when running
+        # the Django test suite, check that one of its tables hasn't been
+        # inspected
+        self.assertNotIn("class DjangoContentType(models.Model):", out.getvalue(), msg=error_message)
+
+    # Inspecting oracle DB doesn't produce correct results, see #19884
+    @expectedFailureOnOracle
+    def test_field_types(self):
+        """Test introspection of various Django field types"""
+        out = StringIO()
+        call_command('inspectdb',
+                     table_name_filter=lambda tn:tn.startswith('inspectdb_columntypes'),
+                     stdout=out)
+        output = out.getvalue()
+        def assertFieldType(name, definition):
+            out_def = re.search(r'^\s*%s = (models.*)$' % name, output, re.MULTILINE).groups()[0]
+            self.assertEqual(definition, out_def)
+
+        assertFieldType('id', "models.IntegerField(primary_key=True)")
+        assertFieldType('big_int_field', "models.BigIntegerField()")
+        if connection.vendor == 'mysql':
+            # No native boolean type on MySQL
+            assertFieldType('bool_field', "models.IntegerField()")
+            assertFieldType('null_bool_field', "models.IntegerField(blank=True, null=True)")
+        else:
+            assertFieldType('bool_field', "models.BooleanField()")
+            assertFieldType('null_bool_field', "models.NullBooleanField()")
+        assertFieldType('char_field', "models.CharField(max_length=10)")
+        assertFieldType('comma_separated_int_field', "models.CharField(max_length=99)")
+        assertFieldType('date_field', "models.DateField()")
+        assertFieldType('date_time_field', "models.DateTimeField()")
+        if connection.vendor == 'sqlite':
+            # Guessed arguments, see #5014
+            assertFieldType('decimal_field', "models.DecimalField(max_digits=10, decimal_places=5) "
+                "# max_digits and decimal_places have been guessed, as this database handles decimal fields as float")
+        else:
+            assertFieldType('decimal_field', "models.DecimalField(max_digits=6, decimal_places=1)")
+        assertFieldType('email_field', "models.CharField(max_length=75)")
+        assertFieldType('file_field', "models.CharField(max_length=100)")
+        assertFieldType('file_path_field', "models.CharField(max_length=100)")
+        assertFieldType('float_field', "models.FloatField()")
+        assertFieldType('int_field', "models.IntegerField()")
+        if connection.vendor == 'postgresql':
+            # Only PostgreSQL has a specific type
+            assertFieldType('ip_address_field', "models.GenericIPAddressField()")
+            assertFieldType('gen_ip_adress_field', "models.GenericIPAddressField()")
+        else:
+            assertFieldType('ip_address_field', "models.CharField(max_length=15)")
+            assertFieldType('gen_ip_adress_field', "models.CharField(max_length=39)")
+        if connection.vendor == 'sqlite':
+            assertFieldType('pos_int_field', "models.PositiveIntegerField()")
+            assertFieldType('pos_small_int_field', "models.PositiveSmallIntegerField()")
+        else:
+            # 'unsigned' property undetected on other backends
+            assertFieldType('pos_int_field', "models.IntegerField()")
+            if connection.vendor == 'postgresql':
+                assertFieldType('pos_small_int_field', "models.SmallIntegerField()")
+            else:
+                assertFieldType('pos_small_int_field', "models.IntegerField()")
+        assertFieldType('slug_field', "models.CharField(max_length=50)")
+        if connection.vendor in ('sqlite', 'postgresql'):
+            assertFieldType('small_int_field', "models.SmallIntegerField()")
+        else:
+            assertFieldType('small_int_field', "models.IntegerField()")
+        assertFieldType('text_field', "models.TextField()")
+        assertFieldType('time_field', "models.TimeField()")
+        assertFieldType('url_field', "models.CharField(max_length=200)")
+
+    @skipUnlessDBFeature('can_introspect_foreign_keys')
+    def test_attribute_name_not_python_keyword(self):
+        out = StringIO()
+        # Lets limit the introspection to tables created for models of this
+        # application
+        call_command('inspectdb',
+                     table_name_filter=lambda tn:tn.startswith('inspectdb_'),
+                     stdout=out)
+        output = out.getvalue()
+        error_message = "inspectdb generated an attribute name which is a python keyword"
+        # Recursive foreign keys should be set to 'self'
+        self.assertIn("parent = models.ForeignKey('self')", output)
+        self.assertNotIn("from = models.ForeignKey(InspectdbPeople)", output, msg=error_message)
+        # As InspectdbPeople model is defined after InspectdbMessage, it should be quoted
+        self.assertIn("from_field = models.ForeignKey('InspectdbPeople', db_column='from_id')",
+            output)
+        self.assertIn("people_pk = models.ForeignKey(InspectdbPeople, primary_key=True)",
+            output)
+        self.assertIn("people_unique = models.ForeignKey(InspectdbPeople, unique=True)",
+            output)
+
+    def test_digits_column_name_introspection(self):
+        """Introspection of column names consist/start with digits (#16536/#17676)"""
+        out = StringIO()
+        # Lets limit the introspection to tables created for models of this
+        # application
+        call_command('inspectdb',
+                     table_name_filter=lambda tn:tn.startswith('inspectdb_'),
+                     stdout=out)
+        output = out.getvalue()
+        error_message = "inspectdb generated a model field name which is a number"
+        self.assertNotIn("    123 = models.CharField", output, msg=error_message)
+        self.assertIn("number_123 = models.CharField", output)
+
+        error_message = "inspectdb generated a model field name which starts with a digit"
+        self.assertNotIn("    4extra = models.CharField", output, msg=error_message)
+        self.assertIn("number_4extra = models.CharField", output)
+
+        self.assertNotIn("    45extra = models.CharField", output, msg=error_message)
+        self.assertIn("number_45extra = models.CharField", output)
+
+    def test_special_column_name_introspection(self):
+        """
+        Introspection of column names containing special characters,
+        unsuitable for Python identifiers
+        """
+        out = StringIO()
+        call_command('inspectdb', stdout=out)
+        output = out.getvalue()
+        base_name = 'Field' if connection.vendor != 'oracle' else 'field'
+        self.assertIn("field = models.IntegerField()", output)
+        self.assertIn("field_field = models.IntegerField(db_column='%s_')" % base_name, output)
+        self.assertIn("field_field_0 = models.IntegerField(db_column='%s__')" % base_name, output)
+        self.assertIn("field_field_1 = models.IntegerField(db_column='__field')", output)
+        self.assertIn("prc_x = models.IntegerField(db_column='prc(%) x')", output)
+        if PY3:
+            # Python 3 allows non-ascii identifiers
+            self.assertIn("tamaño = models.IntegerField()", output)
+        else:
+            self.assertIn("tama_o = models.IntegerField(db_column='tama\\xf1o')", output)
+
+    def test_managed_models(self):
+        """Test that by default the command generates models with `Meta.managed = False` (#14305)"""
+        out = StringIO()
+        call_command('inspectdb',
+                     table_name_filter=lambda tn:tn.startswith('inspectdb_columntypes'),
+                     stdout=out)
+        output = out.getvalue()
+        self.longMessage = False
+        self.assertIn("        managed = False", output, msg='inspectdb should generate unmanaged models.')
diff --git a/tests/modeltests/prefetch_related/__init__.py b/tests/introspection/__init__.py
similarity index 100%
rename from tests/modeltests/prefetch_related/__init__.py
rename to tests/introspection/__init__.py
diff --git a/tests/regressiontests/introspection/models.py b/tests/introspection/models.py
similarity index 89%
rename from tests/regressiontests/introspection/models.py
rename to tests/introspection/models.py
index 4de82e47e7..00c5ebea3c 100644
--- a/tests/regressiontests/introspection/models.py
+++ b/tests/introspection/models.py
@@ -10,6 +10,7 @@ class Reporter(models.Model):
     last_name = models.CharField(max_length=30)
     email = models.EmailField()
     facebook_user_id = models.BigIntegerField(null=True)
+    raw_data = models.BinaryField(null=True)
 
     class Meta:
         unique_together = ('first_name', 'last_name')
@@ -23,6 +24,7 @@ class Article(models.Model):
     headline = models.CharField(max_length=100)
     pub_date = models.DateField()
     reporter = models.ForeignKey(Reporter)
+    response_to = models.ForeignKey('self', null=True)
 
     def __str__(self):
         return self.headline
diff --git a/tests/regressiontests/introspection/tests.py b/tests/introspection/tests.py
similarity index 82%
rename from tests/regressiontests/introspection/tests.py
rename to tests/introspection/tests.py
index 2df946d874..67e0266a66 100644
--- a/tests/regressiontests/introspection/tests.py
+++ b/tests/introspection/tests.py
@@ -1,10 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
-from functools import update_wrapper
-
 from django.db import connection
 from django.test import TestCase, skipUnlessDBFeature, skipIfDBFeature
-from django.utils import six, unittest
+from django.utils import unittest
 
 from .models import Reporter, Article
 
@@ -14,36 +12,7 @@ else:
     expectedFailureOnOracle = lambda f: f
 
 
-# The introspection module is optional, so methods tested here might raise
-# NotImplementedError. This is perfectly acceptable behavior for the backend
-# in question, but the tests need to handle this without failing. Ideally we'd
-# skip these tests, but until #4788 is done we'll just ignore them.
-#
-# The easiest way to accomplish this is to decorate every test case with a
-# wrapper that ignores the exception.
-#
-# The metaclass is just for fun.
-
-
-def ignore_not_implemented(func):
-    def _inner(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except NotImplementedError:
-            return None
-    update_wrapper(_inner, func)
-    return _inner
-
-
-class IgnoreNotimplementedError(type):
-    def __new__(cls, name, bases, attrs):
-        for k, v in attrs.items():
-            if k.startswith('test'):
-                attrs[k] = ignore_not_implemented(v)
-        return type.__new__(cls, name, bases, attrs)
-
-
-class IntrospectionTests(six.with_metaclass(IgnoreNotimplementedError, TestCase)):
+class IntrospectionTests(TestCase):
     def test_table_names(self):
         tl = connection.introspection.table_names()
         self.assertEqual(tl, sorted(tl))
@@ -91,9 +60,13 @@ class IntrospectionTests(six.with_metaclass(IgnoreNotimplementedError, TestCase)
     def test_get_table_description_types(self):
         cursor = connection.cursor()
         desc = connection.introspection.get_table_description(cursor, Reporter._meta.db_table)
+        # The MySQL exception is due to the cursor.description returning the same constant for
+        # text and blob columns. TODO: use information_schema database to retrieve the proper
+        # field type on MySQL
         self.assertEqual(
             [datatype(r[1], r) for r in desc],
-            ['IntegerField', 'CharField', 'CharField', 'CharField', 'BigIntegerField']
+            ['IntegerField', 'CharField', 'CharField', 'CharField',
+             'BigIntegerField', 'BinaryField' if connection.vendor != 'mysql' else 'TextField']
         )
 
     # The following test fails on Oracle due to #17202 (can't correctly
@@ -116,7 +89,7 @@ class IntrospectionTests(six.with_metaclass(IgnoreNotimplementedError, TestCase)
         desc = connection.introspection.get_table_description(cursor, Reporter._meta.db_table)
         self.assertEqual(
             [r[6] for r in desc],
-            [False, False, False, False, True]
+            [False, False, False, False, True, True]
         )
 
     # Regression test for #9991 - 'real' types in postgres
@@ -137,12 +110,17 @@ class IntrospectionTests(six.with_metaclass(IgnoreNotimplementedError, TestCase)
         # should test that the response is correct.
         if relations:
             # That's {field_index: (field_index_other_table, other_table)}
-            self.assertEqual(relations, {3: (0, Reporter._meta.db_table)})
+            self.assertEqual(relations, {3: (0, Reporter._meta.db_table),
+                                         4: (0, Article._meta.db_table)})
 
+    @skipUnlessDBFeature('can_introspect_foreign_keys')
     def test_get_key_columns(self):
         cursor = connection.cursor()
         key_columns = connection.introspection.get_key_columns(cursor, Article._meta.db_table)
-        self.assertEqual(key_columns, [('reporter_id', Reporter._meta.db_table, 'id')])
+        self.assertEqual(
+            set(key_columns),
+            set([('reporter_id', Reporter._meta.db_table, 'id'),
+                 ('response_to_id', Article._meta.db_table, 'id')]))
 
     def test_get_primary_key_column(self):
         cursor = connection.cursor()
diff --git a/tests/regressiontests/delete_regress/__init__.py b/tests/invalid_models/__init__.py
similarity index 100%
rename from tests/regressiontests/delete_regress/__init__.py
rename to tests/invalid_models/__init__.py
diff --git a/tests/modeltests/properties/__init__.py b/tests/invalid_models/invalid_models/__init__.py
similarity index 100%
rename from tests/modeltests/properties/__init__.py
rename to tests/invalid_models/invalid_models/__init__.py
diff --git a/tests/modeltests/invalid_models/invalid_models/models.py b/tests/invalid_models/invalid_models/models.py
similarity index 100%
rename from tests/modeltests/invalid_models/invalid_models/models.py
rename to tests/invalid_models/invalid_models/models.py
diff --git a/tests/regressiontests/httpwrappers/models.py b/tests/invalid_models/models.py
similarity index 100%
rename from tests/regressiontests/httpwrappers/models.py
rename to tests/invalid_models/models.py
diff --git a/tests/modeltests/invalid_models/tests.py b/tests/invalid_models/tests.py
similarity index 96%
rename from tests/modeltests/invalid_models/tests.py
rename to tests/invalid_models/tests.py
index 5f6224c45d..f878525b3b 100644
--- a/tests/modeltests/invalid_models/tests.py
+++ b/tests/invalid_models/tests.py
@@ -43,7 +43,7 @@ class InvalidModelTestCase(unittest.TestCase):
     )
     def test_invalid_models(self):
         try:
-            module = load_app("modeltests.invalid_models.invalid_models")
+            module = load_app("invalid_models.invalid_models")
         except Exception:
             self.fail('Unable to load invalid model module')
 
diff --git a/tests/modeltests/proxy_model_inheritance/__init__.py b/tests/known_related_objects/__init__.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/__init__.py
rename to tests/known_related_objects/__init__.py
diff --git a/tests/modeltests/known_related_objects/fixtures/tournament.json b/tests/known_related_objects/fixtures/tournament.json
similarity index 75%
rename from tests/modeltests/known_related_objects/fixtures/tournament.json
rename to tests/known_related_objects/fixtures/tournament.json
index 2f2b1c5627..bd4cbc17a7 100644
--- a/tests/modeltests/known_related_objects/fixtures/tournament.json
+++ b/tests/known_related_objects/fixtures/tournament.json
@@ -4,62 +4,73 @@
         "model": "known_related_objects.tournament",
         "fields": {
             "name": "Tourney 1"
-            }
-        },
+        }
+    },
     {
         "pk": 2,
         "model": "known_related_objects.tournament",
         "fields": {
             "name": "Tourney 2"
-            }
-        },
+        }
+    },
+    {
+        "pk": 1,
+        "model": "known_related_objects.organiser",
+        "fields": {
+            "name": "Organiser 1"
+        }
+    },
     {
         "pk": 1,
         "model": "known_related_objects.pool",
         "fields": {
             "tournament": 1,
+            "organiser": 1,
             "name": "T1 Pool 1"
-            }
-        },
+        }
+    },
     {
         "pk": 2,
         "model": "known_related_objects.pool",
         "fields": {
             "tournament": 1,
+            "organiser": 1,
             "name": "T1 Pool 2"
-            }
-        },
+        }
+    },
     {
         "pk": 3,
         "model": "known_related_objects.pool",
         "fields": {
             "tournament": 2,
+            "organiser": 1,
             "name": "T2 Pool 1"
-            }
-        },
+        }
+    },
     {
         "pk": 4,
         "model": "known_related_objects.pool",
         "fields": {
             "tournament": 2,
+            "organiser": 1,
             "name": "T2 Pool 2"
-            }
-        },
+        }
+    },
     {
         "pk": 1,
         "model": "known_related_objects.poolstyle",
         "fields": {
             "name": "T1 Pool 2 Style",
             "pool": 2
-            }
-        },
+        }
+    },
     {
         "pk": 2,
         "model": "known_related_objects.poolstyle",
         "fields": {
             "name": "T2 Pool 1 Style",
             "pool": 3
-            }
         }
+    }
 ]
 
diff --git a/tests/modeltests/known_related_objects/models.py b/tests/known_related_objects/models.py
similarity index 79%
rename from tests/modeltests/known_related_objects/models.py
rename to tests/known_related_objects/models.py
index 4c516dd7e8..e256cc38f2 100644
--- a/tests/modeltests/known_related_objects/models.py
+++ b/tests/known_related_objects/models.py
@@ -9,9 +9,13 @@ from django.db import models
 class Tournament(models.Model):
     name = models.CharField(max_length=30)
 
+class Organiser(models.Model):
+    name = models.CharField(max_length=30)
+
 class Pool(models.Model):
     name = models.CharField(max_length=30)
     tournament = models.ForeignKey(Tournament)
+    organiser = models.ForeignKey(Organiser)
 
 class PoolStyle(models.Model):
     name = models.CharField(max_length=30)
diff --git a/tests/modeltests/known_related_objects/tests.py b/tests/known_related_objects/tests.py
similarity index 61%
rename from tests/modeltests/known_related_objects/tests.py
rename to tests/known_related_objects/tests.py
index 24feab2241..d28d266557 100644
--- a/tests/modeltests/known_related_objects/tests.py
+++ b/tests/known_related_objects/tests.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from django.test import TestCase
 
-from .models import Tournament, Pool, PoolStyle
+from .models import Tournament, Organiser, Pool, PoolStyle
 
 class ExistingRelatedInstancesTests(TestCase):
     fixtures = ['tournament.json']
@@ -21,12 +21,52 @@ class ExistingRelatedInstancesTests(TestCase):
 
     def test_foreign_key_multiple_prefetch(self):
         with self.assertNumQueries(2):
-            tournaments = list(Tournament.objects.prefetch_related('pool_set'))
+            tournaments = list(Tournament.objects.prefetch_related('pool_set').order_by('pk'))
             pool1 = tournaments[0].pool_set.all()[0]
             self.assertIs(tournaments[0], pool1.tournament)
             pool2 = tournaments[1].pool_set.all()[0]
             self.assertIs(tournaments[1], pool2.tournament)
 
+    def test_queryset_or(self):
+        tournament_1 = Tournament.objects.get(pk=1)
+        tournament_2 = Tournament.objects.get(pk=2)
+        with self.assertNumQueries(1):
+            pools = tournament_1.pool_set.all() | tournament_2.pool_set.all()
+            related_objects = set(pool.tournament for pool in pools)
+            self.assertEqual(related_objects, set((tournament_1, tournament_2)))
+
+    def test_queryset_or_different_cached_items(self):
+        tournament = Tournament.objects.get(pk=1)
+        organiser = Organiser.objects.get(pk=1)
+        with self.assertNumQueries(1):
+            pools = tournament.pool_set.all() | organiser.pool_set.all()
+            first = pools.filter(pk=1)[0]
+            self.assertIs(first.tournament, tournament)
+            self.assertIs(first.organiser, organiser)
+
+    def test_queryset_or_only_one_with_precache(self):
+        tournament_1 = Tournament.objects.get(pk=1)
+        tournament_2 = Tournament.objects.get(pk=2)
+        # 2 queries here as pool id 3 has tournament 2, which is not cached
+        with self.assertNumQueries(2):
+            pools = tournament_1.pool_set.all() | Pool.objects.filter(pk=3)
+            related_objects = set(pool.tournament for pool in pools)
+            self.assertEqual(related_objects, set((tournament_1, tournament_2)))
+        # and the other direction
+        with self.assertNumQueries(2):
+            pools = Pool.objects.filter(pk=3) | tournament_1.pool_set.all()
+            related_objects = set(pool.tournament for pool in pools)
+            self.assertEqual(related_objects, set((tournament_1, tournament_2)))
+
+    def test_queryset_and(self):
+        tournament = Tournament.objects.get(pk=1)
+        organiser = Organiser.objects.get(pk=1)
+        with self.assertNumQueries(1):
+            pools = tournament.pool_set.all() & organiser.pool_set.all()
+            first = pools.filter(pk=1)[0]
+            self.assertIs(first.tournament, tournament)
+            self.assertIs(first.organiser, organiser)
+
     def test_one_to_one(self):
         with self.assertNumQueries(2):
             style = PoolStyle.objects.get(pk=1)
@@ -41,7 +81,7 @@ class ExistingRelatedInstancesTests(TestCase):
 
     def test_one_to_one_multi_select_related(self):
         with self.assertNumQueries(1):
-            poolstyles = list(PoolStyle.objects.select_related('pool'))
+            poolstyles = list(PoolStyle.objects.select_related('pool').order_by('pk'))
             self.assertIs(poolstyles[0], poolstyles[0].pool.poolstyle)
             self.assertIs(poolstyles[1], poolstyles[1].pool.poolstyle)
 
@@ -53,7 +93,7 @@ class ExistingRelatedInstancesTests(TestCase):
 
     def test_one_to_one_multi_prefetch_related(self):
         with self.assertNumQueries(2):
-            poolstyles = list(PoolStyle.objects.prefetch_related('pool'))
+            poolstyles = list(PoolStyle.objects.prefetch_related('pool').order_by('pk'))
             self.assertIs(poolstyles[0], poolstyles[0].pool.poolstyle)
             self.assertIs(poolstyles[1], poolstyles[1].pool.poolstyle)
 
@@ -77,12 +117,12 @@ class ExistingRelatedInstancesTests(TestCase):
 
     def test_reverse_one_to_one_multi_select_related(self):
         with self.assertNumQueries(1):
-            pools = list(Pool.objects.select_related('poolstyle'))
+            pools = list(Pool.objects.select_related('poolstyle').order_by('pk'))
             self.assertIs(pools[1], pools[1].poolstyle.pool)
             self.assertIs(pools[2], pools[2].poolstyle.pool)
 
     def test_reverse_one_to_one_multi_prefetch_related(self):
         with self.assertNumQueries(2):
-            pools = list(Pool.objects.prefetch_related('poolstyle'))
+            pools = list(Pool.objects.prefetch_related('poolstyle').order_by('pk'))
             self.assertIs(pools[1], pools[1].poolstyle.pool)
             self.assertIs(pools[2], pools[2].poolstyle.pool)
diff --git a/tests/modeltests/proxy_model_inheritance/app1/__init__.py b/tests/logging_tests/__init__.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/app1/__init__.py
rename to tests/logging_tests/__init__.py
diff --git a/tests/regressiontests/logging_tests/logconfig.py b/tests/logging_tests/logconfig.py
similarity index 100%
rename from tests/regressiontests/logging_tests/logconfig.py
rename to tests/logging_tests/logconfig.py
diff --git a/tests/regressiontests/localflavor/models.py b/tests/logging_tests/models.py
similarity index 100%
rename from tests/regressiontests/localflavor/models.py
rename to tests/logging_tests/models.py
diff --git a/tests/regressiontests/logging_tests/tests.py b/tests/logging_tests/tests.py
similarity index 77%
rename from tests/regressiontests/logging_tests/tests.py
rename to tests/logging_tests/tests.py
index 07804eb398..27ae651042 100644
--- a/tests/regressiontests/logging_tests/tests.py
+++ b/tests/logging_tests/tests.py
@@ -5,16 +5,16 @@ import logging
 import sys
 import warnings
 
-from django.conf import compat_patch_logging_config, LazySettings
+from django.conf import LazySettings
 from django.core import mail
 from django.test import TestCase, RequestFactory
 from django.test.utils import override_settings
 from django.utils.encoding import force_text
-from django.utils.log import CallbackFilter, RequireDebugFalse
+from django.utils.log import CallbackFilter, RequireDebugFalse, RequireDebugTrue
 from django.utils.six import StringIO
 from django.utils.unittest import skipUnless
 
-from ..admin_scripts.tests import AdminScriptTestCase
+from admin_scripts.tests import AdminScriptTestCase
 
 from .logconfig import MyEmailBackend
 
@@ -40,46 +40,10 @@ OLD_LOGGING = {
 }
 
 
-class PatchLoggingConfigTest(TestCase):
-    """
-    Tests for backward-compat shim for #16288. These tests should be removed in
-    Django 1.6 when that shim and DeprecationWarning are removed.
-
-    """
-    def test_filter_added(self):
-        """
-        Test that debug-false filter is added to mail_admins handler if it has
-        no filters.
-
-        """
-        config = copy.deepcopy(OLD_LOGGING)
-
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            compat_patch_logging_config(config)
-            self.assertEqual(len(w), 1)
-
-        self.assertEqual(
-            config["handlers"]["mail_admins"]["filters"],
-            ['require_debug_false'])
-
-    def test_filter_configuration(self):
-        """
-        Test that the auto-added require_debug_false filter is an instance of
-        `RequireDebugFalse` filter class.
-
-        """
-        config = copy.deepcopy(OLD_LOGGING)
-        with warnings.catch_warnings(record=True):
-            compat_patch_logging_config(config)
-
-        flt = config["filters"]["require_debug_false"]
-        self.assertEqual(flt["()"], "django.utils.log.RequireDebugFalse")
-
+class LoggingFiltersTest(TestCase):
     def test_require_debug_false_filter(self):
         """
         Test the RequireDebugFalse filter class.
-
         """
         filter_ = RequireDebugFalse()
 
@@ -89,32 +53,17 @@ class PatchLoggingConfigTest(TestCase):
         with self.settings(DEBUG=False):
             self.assertEqual(filter_.filter("record is not used"), True)
 
-    def test_no_patch_if_filters_key_exists(self):
+    def test_require_debug_true_filter(self):
         """
-        Test that the logging configuration is not modified if the mail_admins
-        handler already has a "filters" key.
-
+        Test the RequireDebugTrue filter class.
         """
-        config = copy.deepcopy(OLD_LOGGING)
-        config["handlers"]["mail_admins"]["filters"] = []
-        new_config = copy.deepcopy(config)
-        compat_patch_logging_config(new_config)
+        filter_ = RequireDebugTrue()
 
-        self.assertEqual(config, new_config)
-
-    def test_no_patch_if_no_mail_admins_handler(self):
-        """
-        Test that the logging configuration is not modified if the mail_admins
-        handler is not present.
-
-        """
-        config = copy.deepcopy(OLD_LOGGING)
-        config["handlers"].pop("mail_admins")
-        new_config = copy.deepcopy(config)
-        compat_patch_logging_config(new_config)
-
-        self.assertEqual(config, new_config)
+        with self.settings(DEBUG=True):
+            self.assertEqual(filter_.filter("record is not used"), True)
 
+        with self.settings(DEBUG=False):
+            self.assertEqual(filter_.filter("record is not used"), False)
 
 class DefaultLoggingTest(TestCase):
     def setUp(self):
@@ -144,24 +93,42 @@ class WarningLoggerTests(TestCase):
     and captured to the logging system
     """
     def setUp(self):
+        # If tests are invoke with "-Wall" (or any -W flag actually) then
+        # warning logging gets disabled (see django/conf/__init__.py). However,
+        # these tests expect warnings to be logged, so manually force warnings
+        # to the logs. Use getattr() here because the logging capture state is
+        # undocumented and (I assume) brittle.
+        self._old_capture_state = bool(getattr(logging, '_warnings_showwarning', False))
+        logging.captureWarnings(True)
+
+        # this convoluted setup is to avoid printing this deprecation to
+        # stderr during test running - as the test runner forces deprecations
+        # to be displayed at the global py.warnings level
         self.logger = logging.getLogger('py.warnings')
-        self.old_stream = self.logger.handlers[0].stream
+        self.outputs = []
+        self.old_streams = []
+        for handler in self.logger.handlers:
+            self.old_streams.append(handler.stream)
+            self.outputs.append(StringIO())
+            handler.stream = self.outputs[-1]
 
     def tearDown(self):
-        self.logger.handlers[0].stream = self.old_stream
+        for i, handler in enumerate(self.logger.handlers):
+            self.logger.handlers[i].stream = self.old_streams[i]
+
+        # Reset warnings state.
+        logging.captureWarnings(self._old_capture_state)
 
     @override_settings(DEBUG=True)
     def test_warnings_capture(self):
-        output = StringIO()
-        self.logger.handlers[0].stream = output
         warnings.warn('Foo Deprecated', DeprecationWarning)
-        self.assertTrue('Foo Deprecated' in force_text(output.getvalue()))
+        output = force_text(self.outputs[0].getvalue())
+        self.assertTrue('Foo Deprecated' in output)
 
     def test_warnings_capture_debug_false(self):
-        output = StringIO()
-        self.logger.handlers[0].stream = output
         warnings.warn('Foo Deprecated', DeprecationWarning)
-        self.assertFalse('Foo Deprecated' in force_text(output.getvalue()))
+        output = force_text(self.outputs[0].getvalue())
+        self.assertFalse('Foo Deprecated' in output)
 
 
 class CallbackFilterTest(TestCase):
@@ -189,7 +156,7 @@ class AdminEmailHandlerTest(TestCase):
     logger = logging.getLogger('django.request')
 
     def get_admin_email_handler(self, logger):
-        # Inspired from regressiontests/views/views.py: send_log()
+        # Inspired from views/views.py: send_log()
         # ensuring the AdminEmailHandler does not get filtered out
         # even with DEBUG=True.
         admin_email_handler = [
@@ -198,6 +165,10 @@ class AdminEmailHandlerTest(TestCase):
             ][0]
         return admin_email_handler
 
+    def test_fail_silently(self):
+        admin_email_handler = self.get_admin_email_handler(self.logger)
+        self.assertTrue(admin_email_handler.connection().fail_silently)
+
     @override_settings(
             ADMINS=(('whatever admin', 'admin@example.com'),),
             EMAIL_SUBJECT_PREFIX='-SuperAwesomeSubject-'
@@ -330,7 +301,7 @@ class AdminEmailHandlerTest(TestCase):
         orig_email_backend = admin_email_handler.email_backend
         mail.mail_admins = my_mail_admins
         admin_email_handler.email_backend = (
-            'regressiontests.logging_tests.logconfig.MyEmailBackend')
+            'logging_tests.logconfig.MyEmailBackend')
 
         try:
             self.logger.error(message)
@@ -381,5 +352,5 @@ class SettingsConfigureLogging(TestCase):
     def test_configure_initializes_logging(self):
         settings = LazySettings()
         settings.configure(
-            LOGGING_CONFIG='regressiontests.logging_tests.tests.dictConfig')
+            LOGGING_CONFIG='logging_tests.tests.dictConfig')
         self.assertTrue(dictConfig.called)
diff --git a/tests/modeltests/proxy_model_inheritance/app2/__init__.py b/tests/lookup/__init__.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/app2/__init__.py
rename to tests/lookup/__init__.py
diff --git a/tests/modeltests/lookup/models.py b/tests/lookup/models.py
similarity index 68%
rename from tests/modeltests/lookup/models.py
rename to tests/lookup/models.py
index f388ddf403..f60c4962fd 100644
--- a/tests/modeltests/lookup/models.py
+++ b/tests/lookup/models.py
@@ -10,29 +10,16 @@ from django.db import models
 from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 
+from shared_models.models import Author, Book
 
-class Author(models.Model):
-    name = models.CharField(max_length=100)
-    class Meta:
-        ordering = ('name', )
-
-@python_2_unicode_compatible
-class Article(models.Model):
-    headline = models.CharField(max_length=100)
-    pub_date = models.DateTimeField()
-    author = models.ForeignKey(Author, blank=True, null=True)
-    class Meta:
-        ordering = ('-pub_date', 'headline')
-
-    def __str__(self):
-        return self.headline
 
 class Tag(models.Model):
-    articles = models.ManyToManyField(Article)
+    articles = models.ManyToManyField(Book)
     name = models.CharField(max_length=100)
     class Meta:
         ordering = ('name', )
 
+
 @python_2_unicode_compatible
 class Season(models.Model):
     year = models.PositiveSmallIntegerField()
@@ -41,6 +28,7 @@ class Season(models.Model):
     def __str__(self):
         return six.text_type(self.year)
 
+
 @python_2_unicode_compatible
 class Game(models.Model):
     season = models.ForeignKey(Season, related_name='games')
@@ -50,6 +38,7 @@ class Game(models.Model):
     def __str__(self):
         return "%s at %s" % (self.away, self.home)
 
+
 @python_2_unicode_compatible
 class Player(models.Model):
     name = models.CharField(max_length=100)
diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py
new file mode 100644
index 0000000000..6a6729ef22
--- /dev/null
+++ b/tests/lookup/tests.py
@@ -0,0 +1,687 @@
+from __future__ import absolute_import, unicode_literals
+
+from datetime import datetime
+from operator import attrgetter
+
+from django.core.exceptions import FieldError
+from django.test import TestCase, skipUnlessDBFeature
+from django.utils import six
+
+from shared_models.models import Author, Book
+
+from .models import Tag, Game, Season, Player
+
+
+class LookupTests(TestCase):
+
+    def setUp(self):
+        # Create a few Authors.
+        self.au1 = Author(name='Author 1')
+        self.au1.save()
+        self.au2 = Author(name='Author 2')
+        self.au2.save()
+        # Create a couple of Books.
+        self.b1 = Book(title='Book 1', pubdate=datetime(2005, 7, 26), author=self.au1)
+        self.b1.save()
+        self.b2 = Book(title='Book 2', pubdate=datetime(2005, 7, 27), author=self.au1)
+        self.b2.save()
+        self.b3 = Book(title='Book 3', pubdate=datetime(2005, 7, 27), author=self.au1)
+        self.b3.save()
+        self.b4 = Book(title='Book 4', pubdate=datetime(2005, 7, 28), author=self.au1)
+        self.b4.save()
+        self.b5 = Book(title='Book 5', pubdate=datetime(2005, 8, 1, 9, 0), author=self.au2)
+        self.b5.save()
+        self.b6 = Book(title='Book 6', pubdate=datetime(2005, 8, 1, 8, 0), author=self.au2)
+        self.b6.save()
+        self.b7 = Book(title='Book 7', pubdate=datetime(2005, 7, 27), author=self.au2)
+        self.b7.save()
+        # Create a few Tags.
+        self.t1 = Tag(name='Tag 1')
+        self.t1.save()
+        self.t1.articles.add(self.b1, self.b2, self.b3)
+        self.t2 = Tag(name='Tag 2')
+        self.t2.save()
+        self.t2.articles.add(self.b3, self.b4, self.b5)
+        self.t3 = Tag(name='Tag 3')
+        self.t3.save()
+        self.t3.articles.add(self.b5, self.b6, self.b7)
+
+    def test_exists(self):
+        # We can use .exists() to check that there are some
+        self.assertTrue(Book.objects.exists())
+        for a in Book.objects.all():
+            a.delete()
+        # There should be none now!
+        self.assertFalse(Book.objects.exists())
+
+    def test_lookup_int_as_str(self):
+        # Integer value can be queried using string
+        self.assertQuerysetEqual(Book.objects.filter(id__iexact=str(self.b1.id)),
+                                 ['<Book: Book 1>'])
+
+    @skipUnlessDBFeature('supports_date_lookup_using_string')
+    def test_lookup_date_as_str(self):
+        # A date lookup can be performed using a string search
+        self.assertQuerysetEqual(Book.objects.filter(pubdate__startswith='2005'),
+            [
+                '<Book: Book 5>',
+                '<Book: Book 6>',
+                '<Book: Book 4>',
+                '<Book: Book 2>',
+                '<Book: Book 3>',
+                '<Book: Book 7>',
+                '<Book: Book 1>',
+            ])
+
+    def test_iterator(self):
+        # Each QuerySet gets iterator(), which is a generator that "lazily"
+        # returns results using database-level iteration.
+        self.assertQuerysetEqual(Book.objects.iterator(),
+            [
+                'Book 5',
+                'Book 6',
+                'Book 4',
+                'Book 2',
+                'Book 3',
+                'Book 7',
+                'Book 1',
+            ],
+            transform=attrgetter('title'))
+        # iterator() can be used on any QuerySet.
+        self.assertQuerysetEqual(
+            Book.objects.filter(title__endswith='4').iterator(),
+            ['Book 4'],
+            transform=attrgetter('title'))
+
+    def test_count(self):
+        # count() returns the number of objects matching search criteria.
+        self.assertEqual(Book.objects.count(), 7)
+        self.assertEqual(Book.objects.filter(pubdate__exact=datetime(2005, 7, 27)).count(), 3)
+        self.assertEqual(Book.objects.filter(title__startswith='Blah blah').count(), 0)
+
+        # count() should respect sliced query sets.
+        articles = Book.objects.all()
+        self.assertEqual(articles.count(), 7)
+        self.assertEqual(articles[:4].count(), 4)
+        self.assertEqual(articles[1:100].count(), 6)
+        self.assertEqual(articles[10:100].count(), 0)
+
+        # Date and date/time lookups can also be done with strings.
+        self.assertEqual(Book.objects.filter(pubdate__exact='2005-07-27').count(), 3)
+
+    def test_in_bulk(self):
+        # in_bulk() takes a list of IDs and returns a dictionary mapping IDs to objects.
+        arts = Book.objects.in_bulk([self.b1.id, self.b2.id])
+        self.assertEqual(arts[self.b1.id], self.b1)
+        self.assertEqual(arts[self.b2.id], self.b2)
+        self.assertEqual(Book.objects.in_bulk([self.b3.id]), {self.b3.id: self.b3})
+        self.assertEqual(Book.objects.in_bulk(set([self.b3.id])), {self.b3.id: self.b3})
+        self.assertEqual(Book.objects.in_bulk(frozenset([self.b3.id])), {self.b3.id: self.b3})
+        self.assertEqual(Book.objects.in_bulk((self.b3.id,)), {self.b3.id: self.b3})
+        self.assertEqual(Book.objects.in_bulk([1000]), {})
+        self.assertEqual(Book.objects.in_bulk([]), {})
+        self.assertEqual(Book.objects.in_bulk(iter([self.b1.id])), {self.b1.id: self.b1})
+        self.assertEqual(Book.objects.in_bulk(iter([])), {})
+        self.assertRaises(TypeError, Book.objects.in_bulk)
+        self.assertRaises(TypeError, Book.objects.in_bulk, name__startswith='Blah')
+
+    def test_values(self):
+        # values() returns a list of dictionaries instead of object instances --
+        # and you can specify which fields you want to retrieve.
+        identity = lambda x:x
+        self.assertQuerysetEqual(Book.objects.values('title'),
+            [
+                {'title': 'Book 5'},
+                {'title': 'Book 6'},
+                {'title': 'Book 4'},
+                {'title': 'Book 2'},
+                {'title': 'Book 3'},
+                {'title': 'Book 7'},
+                {'title': 'Book 1'},
+            ],
+            transform=identity)
+        self.assertQuerysetEqual(
+            Book.objects.filter(pubdate__exact=datetime(2005, 7, 27)).values('id'),
+            [{'id': self.b2.id}, {'id': self.b3.id}, {'id': self.b7.id}],
+            transform=identity)
+        self.assertQuerysetEqual(Book.objects.values('id', 'title'),
+            [
+                {'id': self.b5.id, 'title': 'Book 5'},
+                {'id': self.b6.id, 'title': 'Book 6'},
+                {'id': self.b4.id, 'title': 'Book 4'},
+                {'id': self.b2.id, 'title': 'Book 2'},
+                {'id': self.b3.id, 'title': 'Book 3'},
+                {'id': self.b7.id, 'title': 'Book 7'},
+                {'id': self.b1.id, 'title': 'Book 1'},
+            ],
+            transform=identity)
+        # You can use values() with iterator() for memory savings,
+        # because iterator() uses database-level iteration.
+        self.assertQuerysetEqual(Book.objects.values('id', 'title').iterator(),
+            [
+                {'title': 'Book 5', 'id': self.b5.id},
+                {'title': 'Book 6', 'id': self.b6.id},
+                {'title': 'Book 4', 'id': self.b4.id},
+                {'title': 'Book 2', 'id': self.b2.id},
+                {'title': 'Book 3', 'id': self.b3.id},
+                {'title': 'Book 7', 'id': self.b7.id},
+                {'title': 'Book 1', 'id': self.b1.id},
+            ],
+            transform=identity)
+        # The values() method works with "extra" fields specified in extra(select).
+        self.assertQuerysetEqual(
+            Book.objects.extra(select={'id_plus_one': 'id + 1'}).values('id', 'id_plus_one'),
+            [
+                {'id': self.b5.id, 'id_plus_one': self.b5.id + 1},
+                {'id': self.b6.id, 'id_plus_one': self.b6.id + 1},
+                {'id': self.b4.id, 'id_plus_one': self.b4.id + 1},
+                {'id': self.b2.id, 'id_plus_one': self.b2.id + 1},
+                {'id': self.b3.id, 'id_plus_one': self.b3.id + 1},
+                {'id': self.b7.id, 'id_plus_one': self.b7.id + 1},
+                {'id': self.b1.id, 'id_plus_one': self.b1.id + 1},
+            ],
+            transform=identity)
+        data = {
+            'id_plus_one': 'id+1',
+            'id_plus_two': 'id+2',
+            'id_plus_three': 'id+3',
+            'id_plus_four': 'id+4',
+            'id_plus_five': 'id+5',
+            'id_plus_six': 'id+6',
+            'id_plus_seven': 'id+7',
+            'id_plus_eight': 'id+8',
+        }
+        self.assertQuerysetEqual(
+            Book.objects.filter(id=self.b1.id).extra(select=data).values(*data.keys()),
+            [{
+                'id_plus_one': self.b1.id + 1,
+                'id_plus_two': self.b1.id + 2,
+                'id_plus_three': self.b1.id + 3,
+                'id_plus_four': self.b1.id + 4,
+                'id_plus_five': self.b1.id + 5,
+                'id_plus_six': self.b1.id + 6,
+                'id_plus_seven': self.b1.id + 7,
+                'id_plus_eight': self.b1.id + 8,
+            }], transform=identity)
+        # You can specify fields from forward and reverse relations, just like filter().
+        self.assertQuerysetEqual(
+            Book.objects.values('title', 'author__name'),
+            [
+                {'title': self.b5.title, 'author__name': self.au2.name},
+                {'title': self.b6.title, 'author__name': self.au2.name},
+                {'title': self.b4.title, 'author__name': self.au1.name},
+                {'title': self.b2.title, 'author__name': self.au1.name},
+                {'title': self.b3.title, 'author__name': self.au1.name},
+                {'title': self.b7.title, 'author__name': self.au2.name},
+                {'title': self.b1.title, 'author__name': self.au1.name},
+            ], transform=identity)
+        self.assertQuerysetEqual(
+            Author.objects.values('name', 'book__title').order_by('name', 'book__title'),
+            [
+                {'name': self.au1.name, 'book__title': self.b1.title},
+                {'name': self.au1.name, 'book__title': self.b2.title},
+                {'name': self.au1.name, 'book__title': self.b3.title},
+                {'name': self.au1.name, 'book__title': self.b4.title},
+                {'name': self.au2.name, 'book__title': self.b5.title},
+                {'name': self.au2.name, 'book__title': self.b6.title},
+                {'name': self.au2.name, 'book__title': self.b7.title},
+            ], transform=identity)
+        self.assertQuerysetEqual(
+            Author.objects.values('name', 'book__title', 'book__tag__name').order_by('name', 'book__title', 'book__tag__name'),
+            [
+                {'name': self.au1.name, 'book__title': self.b1.title, 'book__tag__name': self.t1.name},
+                {'name': self.au1.name, 'book__title': self.b2.title, 'book__tag__name': self.t1.name},
+                {'name': self.au1.name, 'book__title': self.b3.title, 'book__tag__name': self.t1.name},
+                {'name': self.au1.name, 'book__title': self.b3.title, 'book__tag__name': self.t2.name},
+                {'name': self.au1.name, 'book__title': self.b4.title, 'book__tag__name': self.t2.name},
+                {'name': self.au2.name, 'book__title': self.b5.title, 'book__tag__name': self.t2.name},
+                {'name': self.au2.name, 'book__title': self.b5.title, 'book__tag__name': self.t3.name},
+                {'name': self.au2.name, 'book__title': self.b6.title, 'book__tag__name': self.t3.name},
+                {'name': self.au2.name, 'book__title': self.b7.title, 'book__tag__name': self.t3.name},
+            ], transform=identity)
+        # However, an exception FieldDoesNotExist will be thrown if you specify
+        # a non-existent field name in values() (a field that is neither in the
+        # model nor in extra(select)).
+        self.assertRaises(FieldError,
+            Book.objects.extra(select={'id_plus_one': 'id + 1'}).values,
+            'id', 'id_plus_two')
+        # If you don't specify field names to values(), all are returned.
+        self.assertQuerysetEqual(Book.objects.filter(id=self.b5.id).values(),
+            [{
+                'id': self.b5.id,
+                'author_id': self.au2.id,
+                'title': 'Book 5',
+                'pages': 0,
+                'pubdate': datetime(2005, 8, 1, 9, 0)
+            }], transform=identity)
+
+    def test_values_list(self):
+        # values_list() is similar to values(), except that the results are
+        # returned as a list of tuples, rather than a list of dictionaries.
+        # Within each tuple, the order of the elements is the same as the order
+        # of fields in the values_list() call.
+        identity = lambda x:x
+        self.assertQuerysetEqual(Book.objects.values_list('title'),
+            [
+                ('Book 5',),
+                ('Book 6',),
+                ('Book 4',),
+                ('Book 2',),
+                ('Book 3',),
+                ('Book 7',),
+                ('Book 1',),
+            ], transform=identity)
+        self.assertQuerysetEqual(Book.objects.values_list('id').order_by('id'),
+            [(self.b1.id,), (self.b2.id,), (self.b3.id,), (self.b4.id,), (self.b5.id,), (self.b6.id,), (self.b7.id,)],
+            transform=identity)
+        self.assertQuerysetEqual(
+            Book.objects.values_list('id', flat=True).order_by('id'),
+            [self.b1.id, self.b2.id, self.b3.id, self.b4.id, self.b5.id, self.b6.id, self.b7.id],
+            transform=identity)
+        self.assertQuerysetEqual(
+            Book.objects.extra(select={'id_plus_one': 'id+1'})
+                           .order_by('id').values_list('id'),
+            [(self.b1.id,), (self.b2.id,), (self.b3.id,), (self.b4.id,), (self.b5.id,), (self.b6.id,), (self.b7.id,)],
+            transform=identity)
+        self.assertQuerysetEqual(
+            Book.objects.extra(select={'id_plus_one': 'id+1'})
+                           .order_by('id').values_list('id_plus_one', 'id'),
+            [
+                (self.b1.id+1, self.b1.id),
+                (self.b2.id+1, self.b2.id),
+                (self.b3.id+1, self.b3.id),
+                (self.b4.id+1, self.b4.id),
+                (self.b5.id+1, self.b5.id),
+                (self.b6.id+1, self.b6.id),
+                (self.b7.id+1, self.b7.id)
+            ],
+            transform=identity)
+        self.assertQuerysetEqual(
+            Book.objects.extra(select={'id_plus_one': 'id+1'})
+                           .order_by('id').values_list('id', 'id_plus_one'),
+            [
+                (self.b1.id, self.b1.id+1),
+                (self.b2.id, self.b2.id+1),
+                (self.b3.id, self.b3.id+1),
+                (self.b4.id, self.b4.id+1),
+                (self.b5.id, self.b5.id+1),
+                (self.b6.id, self.b6.id+1),
+                (self.b7.id, self.b7.id+1)
+            ],
+            transform=identity)
+        self.assertQuerysetEqual(
+            Author.objects.values_list('name', 'book__title', 'book__tag__name').order_by('name', 'book__title', 'book__tag__name'),
+            [
+                (self.au1.name, self.b1.title, self.t1.name),
+                (self.au1.name, self.b2.title, self.t1.name),
+                (self.au1.name, self.b3.title, self.t1.name),
+                (self.au1.name, self.b3.title, self.t2.name),
+                (self.au1.name, self.b4.title, self.t2.name),
+                (self.au2.name, self.b5.title, self.t2.name),
+                (self.au2.name, self.b5.title, self.t3.name),
+                (self.au2.name, self.b6.title, self.t3.name),
+                (self.au2.name, self.b7.title, self.t3.name),
+            ], transform=identity)
+        self.assertRaises(TypeError, Book.objects.values_list, 'id', 'title', flat=True)
+
+    def test_get_next_previous_by(self):
+        # Every DateField and DateTimeField creates get_next_by_FOO() and
+        # get_previous_by_FOO() methods. In the case of identical date values,
+        # these methods will use the ID as a fallback check. This guarantees
+        # that no records are skipped or duplicated.
+        self.assertEqual(repr(self.b1.get_next_by_pubdate()),
+                         '<Book: Book 2>')
+        self.assertEqual(repr(self.b2.get_next_by_pubdate()),
+                         '<Book: Book 3>')
+        self.assertEqual(repr(self.b2.get_next_by_pubdate(title__endswith='6')),
+                         '<Book: Book 6>')
+        self.assertEqual(repr(self.b3.get_next_by_pubdate()),
+                         '<Book: Book 7>')
+        self.assertEqual(repr(self.b4.get_next_by_pubdate()),
+                         '<Book: Book 6>')
+        self.assertRaises(Book.DoesNotExist, self.b5.get_next_by_pubdate)
+        self.assertEqual(repr(self.b6.get_next_by_pubdate()),
+                         '<Book: Book 5>')
+        self.assertEqual(repr(self.b7.get_next_by_pubdate()),
+                         '<Book: Book 4>')
+
+        self.assertEqual(repr(self.b7.get_previous_by_pubdate()),
+                         '<Book: Book 3>')
+        self.assertEqual(repr(self.b6.get_previous_by_pubdate()),
+                         '<Book: Book 4>')
+        self.assertEqual(repr(self.b5.get_previous_by_pubdate()),
+                         '<Book: Book 6>')
+        self.assertEqual(repr(self.b4.get_previous_by_pubdate()),
+                         '<Book: Book 7>')
+        self.assertEqual(repr(self.b3.get_previous_by_pubdate()),
+                         '<Book: Book 2>')
+        self.assertEqual(repr(self.b2.get_previous_by_pubdate()),
+                         '<Book: Book 1>')
+
+    def test_escaping(self):
+        # Underscores, percent signs and backslashes have special meaning in the
+        # underlying SQL code, but Django handles the quoting of them automatically.
+        b8 = Book(title='Book_ with underscore', pubdate=datetime(2005, 11, 20))
+        b8.save()
+        self.assertQuerysetEqual(Book.objects.filter(title__startswith='Book'),
+            [
+                '<Book: Book_ with underscore>',
+                '<Book: Book 5>',
+                '<Book: Book 6>',
+                '<Book: Book 4>',
+                '<Book: Book 2>',
+                '<Book: Book 3>',
+                '<Book: Book 7>',
+                '<Book: Book 1>',
+            ])
+        self.assertQuerysetEqual(Book.objects.filter(title__startswith='Book_'),
+                                 ['<Book: Book_ with underscore>'])
+        b9 = Book(title='Book% with percent sign', pubdate=datetime(2005, 11, 21))
+        b9.save()
+        self.assertQuerysetEqual(Book.objects.filter(title__startswith='Book'),
+            [
+                '<Book: Book% with percent sign>',
+                '<Book: Book_ with underscore>',
+                '<Book: Book 5>',
+                '<Book: Book 6>',
+                '<Book: Book 4>',
+                '<Book: Book 2>',
+                '<Book: Book 3>',
+                '<Book: Book 7>',
+                '<Book: Book 1>',
+            ])
+        self.assertQuerysetEqual(Book.objects.filter(title__startswith='Book%'),
+                                 ['<Book: Book% with percent sign>'])
+        b10 = Book(title='Book with \\ backslash', pubdate=datetime(2005, 11, 22))
+        b10.save()
+        self.assertQuerysetEqual(Book.objects.filter(title__contains='\\'),
+                                 ['<Book: Book with \ backslash>'])
+
+    def test_exclude(self):
+        b8 = Book.objects.create(title='Book_ with underscore', pubdate=datetime(2005, 11, 20))
+        b9 = Book.objects.create(title='Book% with percent sign', pubdate=datetime(2005, 11, 21))
+        b10 = Book.objects.create(title='Book with \\ backslash', pubdate=datetime(2005, 11, 22))
+
+        # exclude() is the opposite of filter() when doing lookups:
+        self.assertQuerysetEqual(
+            Book.objects.filter(title__contains='Book').exclude(title__contains='with'),
+            [
+                '<Book: Book 5>',
+                '<Book: Book 6>',
+                '<Book: Book 4>',
+                '<Book: Book 2>',
+                '<Book: Book 3>',
+                '<Book: Book 7>',
+                '<Book: Book 1>',
+            ])
+        self.assertQuerysetEqual(Book.objects.exclude(title__startswith="Book_"),
+            [
+                '<Book: Book with \\ backslash>',
+                '<Book: Book% with percent sign>',
+                '<Book: Book 5>',
+                '<Book: Book 6>',
+                '<Book: Book 4>',
+                '<Book: Book 2>',
+                '<Book: Book 3>',
+                '<Book: Book 7>',
+                '<Book: Book 1>',
+            ])
+        self.assertQuerysetEqual(Book.objects.exclude(title="Book 7"),
+            [
+                '<Book: Book with \\ backslash>',
+                '<Book: Book% with percent sign>',
+                '<Book: Book_ with underscore>',
+                '<Book: Book 5>',
+                '<Book: Book 6>',
+                '<Book: Book 4>',
+                '<Book: Book 2>',
+                '<Book: Book 3>',
+                '<Book: Book 1>',
+            ])
+
+    def test_none(self):
+       # none() returns a QuerySet that behaves like any other QuerySet object
+        self.assertQuerysetEqual(Book.objects.none(), [])
+        self.assertQuerysetEqual(
+            Book.objects.none().filter(title__startswith='Book'), [])
+        self.assertQuerysetEqual(
+            Book.objects.filter(title__startswith='Book').none(), [])
+        self.assertEqual(Book.objects.none().count(), 0)
+        self.assertEqual(
+            Book.objects.none().update(title="This should not take effect"), 0)
+        self.assertQuerysetEqual(
+            [article for article in Book.objects.none().iterator()],
+            [])
+
+    def test_in(self):
+        # using __in with an empty list should return an empty query set
+        self.assertQuerysetEqual(Book.objects.filter(id__in=[]), [])
+        self.assertQuerysetEqual(Book.objects.exclude(id__in=[]),
+            [
+                '<Book: Book 5>',
+                '<Book: Book 6>',
+                '<Book: Book 4>',
+                '<Book: Book 2>',
+                '<Book: Book 3>',
+                '<Book: Book 7>',
+                '<Book: Book 1>',
+            ])
+
+    def test_error_messages(self):
+        # Programming errors are pointed out with nice error messages
+        with six.assertRaisesRegex(self, FieldError, "Cannot resolve keyword 'pubdate_year' "
+             "into field. Choices are: .+"):
+                Book.objects.filter(pubdate_year='2005').count()
+
+        with self.assertRaises(FieldError, msg="Join on field 'title' not permitted. "
+             "Did you misspell 'starts' for the lookup type?"):
+                Book.objects.filter(title__starts='Book')
+
+    def test_regex(self):
+        # Create some articles with a bit more interesting names for testing field lookups:
+        for a in Book.objects.all():
+            a.delete()
+        now = datetime.now()
+        b1 = Book(pubdate=now, title='f')
+        b1.save()
+        b2 = Book(pubdate=now, title='fo')
+        b2.save()
+        b3 = Book(pubdate=now, title='foo')
+        b3.save()
+        b4 = Book(pubdate=now, title='fooo')
+        b4.save()
+        b5 = Book(pubdate=now, title='hey-Foo')
+        b5.save()
+        b6 = Book(pubdate=now, title='bar')
+        b6.save()
+        b7 = Book(pubdate=now, title='AbBa')
+        b7.save()
+        b8 = Book(pubdate=now, title='baz')
+        b8.save()
+        b9 = Book(pubdate=now, title='baxZ')
+        b9.save()
+        # zero-or-more
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'fo*'),
+            ['<Book: f>', '<Book: fo>', '<Book: foo>', '<Book: fooo>'])
+        self.assertQuerysetEqual(Book.objects.filter(title__iregex=r'fo*'),
+            [
+                '<Book: f>',
+                '<Book: fo>',
+                '<Book: foo>',
+                '<Book: fooo>',
+                '<Book: hey-Foo>',
+            ])
+        # one-or-more
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'fo+'),
+            ['<Book: fo>', '<Book: foo>', '<Book: fooo>'])
+        # wildcard
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'fooo?'),
+            ['<Book: foo>', '<Book: fooo>'])
+        # leading anchor
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'^b'),
+            ['<Book: bar>', '<Book: baxZ>', '<Book: baz>'])
+        self.assertQuerysetEqual(Book.objects.filter(title__iregex=r'^a'),
+            ['<Book: AbBa>'])
+        # trailing anchor
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'z$'),
+            ['<Book: baz>'])
+        self.assertQuerysetEqual(Book.objects.filter(title__iregex=r'z$'),
+            ['<Book: baxZ>', '<Book: baz>'])
+        # character sets
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'ba[rz]'),
+            ['<Book: bar>', '<Book: baz>'])
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'ba.[RxZ]'),
+            ['<Book: baxZ>'])
+        self.assertQuerysetEqual(Book.objects.filter(title__iregex=r'ba[RxZ]'),
+            ['<Book: bar>', '<Book: baxZ>', '<Book: baz>'])
+
+        # and more articles:
+        b10 = Book(pubdate=now, title='foobar')
+        b10.save()
+        b11 = Book(pubdate=now, title='foobaz')
+        b11.save()
+        b12 = Book(pubdate=now, title='ooF')
+        b12.save()
+        b13 = Book(pubdate=now, title='foobarbaz')
+        b13.save()
+        b14 = Book(pubdate=now, title='zoocarfaz')
+        b14.save()
+        b15 = Book(pubdate=now, title='barfoobaz')
+        b15.save()
+        b16 = Book(pubdate=now, title='bazbaRFOO')
+        b16.save()
+
+        # alternation
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'oo(f|b)'),
+            [
+                '<Book: barfoobaz>',
+                '<Book: foobar>',
+                '<Book: foobarbaz>',
+                '<Book: foobaz>',
+            ])
+        self.assertQuerysetEqual(Book.objects.filter(title__iregex=r'oo(f|b)'),
+            [
+                '<Book: barfoobaz>',
+                '<Book: foobar>',
+                '<Book: foobarbaz>',
+                '<Book: foobaz>',
+                '<Book: ooF>',
+            ])
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'^foo(f|b)'),
+            ['<Book: foobar>', '<Book: foobarbaz>', '<Book: foobaz>'])
+
+        # greedy matching
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'b.*az'),
+            [
+                '<Book: barfoobaz>',
+                '<Book: baz>',
+                '<Book: bazbaRFOO>',
+                '<Book: foobarbaz>',
+                '<Book: foobaz>',
+            ])
+        self.assertQuerysetEqual(Book.objects.filter(title__iregex=r'b.*ar'),
+            [
+                '<Book: bar>',
+                '<Book: barfoobaz>',
+                '<Book: bazbaRFOO>',
+                '<Book: foobar>',
+                '<Book: foobarbaz>',
+            ])
+
+    @skipUnlessDBFeature('supports_regex_backreferencing')
+    def test_regex_backreferencing(self):
+        # grouping and backreferences
+        now = datetime.now()
+        b10 = Book(pubdate=now, title='foobar')
+        b10.save()
+        b11 = Book(pubdate=now, title='foobaz')
+        b11.save()
+        b12 = Book(pubdate=now, title='ooF')
+        b12.save()
+        b13 = Book(pubdate=now, title='foobarbaz')
+        b13.save()
+        b14 = Book(pubdate=now, title='zoocarfaz')
+        b14.save()
+        b15 = Book(pubdate=now, title='barfoobaz')
+        b15.save()
+        b16 = Book(pubdate=now, title='bazbaRFOO')
+        b16.save()
+        self.assertQuerysetEqual(Book.objects.filter(title__regex=r'b(.).*b\1'),
+            ['<Book: barfoobaz>', '<Book: bazbaRFOO>', '<Book: foobarbaz>'])
+
+    def test_nonfield_lookups(self):
+        """
+        Ensure that a lookup query containing non-fields raises the proper
+        exception.
+        """
+        with self.assertRaises(FieldError):
+            Book.objects.filter(name__blahblah=99)
+        with self.assertRaises(FieldError):
+            Book.objects.filter(name__blahblah__exact=99)
+        with self.assertRaises(FieldError):
+            Book.objects.filter(blahblah=99)
+
+    def test_lookup_collision(self):
+        """
+        Ensure that genuine field names don't collide with built-in lookup
+        types ('year', 'gt', 'range', 'in' etc.).
+        Refs #11670.
+        """
+
+        # Here we're using 'gt' as a code number for the year, e.g. 111=>2009.
+        season_2009 = Season.objects.create(year=2009, gt=111)
+        season_2009.games.create(home="Houston Astros", away="St. Louis Cardinals")
+        season_2010 = Season.objects.create(year=2010, gt=222)
+        season_2010.games.create(home="Houston Astros", away="Chicago Cubs")
+        season_2010.games.create(home="Houston Astros", away="Milwaukee Brewers")
+        season_2010.games.create(home="Houston Astros", away="St. Louis Cardinals")
+        season_2011 = Season.objects.create(year=2011, gt=333)
+        season_2011.games.create(home="Houston Astros", away="St. Louis Cardinals")
+        season_2011.games.create(home="Houston Astros", away="Milwaukee Brewers")
+        hunter_pence = Player.objects.create(name="Hunter Pence")
+        hunter_pence.games = Game.objects.filter(season__year__in=[2009, 2010])
+        pudge = Player.objects.create(name="Ivan Rodriquez")
+        pudge.games = Game.objects.filter(season__year=2009)
+        pedro_feliz = Player.objects.create(name="Pedro Feliz")
+        pedro_feliz.games = Game.objects.filter(season__year__in=[2011])
+        johnson = Player.objects.create(name="Johnson")
+        johnson.games = Game.objects.filter(season__year__in=[2011])
+
+        # Games in 2010
+        self.assertEqual(Game.objects.filter(season__year=2010).count(), 3)
+        self.assertEqual(Game.objects.filter(season__year__exact=2010).count(), 3)
+        self.assertEqual(Game.objects.filter(season__gt=222).count(), 3)
+        self.assertEqual(Game.objects.filter(season__gt__exact=222).count(), 3)
+
+        # Games in 2011
+        self.assertEqual(Game.objects.filter(season__year=2011).count(), 2)
+        self.assertEqual(Game.objects.filter(season__year__exact=2011).count(), 2)
+        self.assertEqual(Game.objects.filter(season__gt=333).count(), 2)
+        self.assertEqual(Game.objects.filter(season__gt__exact=333).count(), 2)
+        self.assertEqual(Game.objects.filter(season__year__gt=2010).count(), 2)
+        self.assertEqual(Game.objects.filter(season__gt__gt=222).count(), 2)
+
+        # Games played in 2010 and 2011
+        self.assertEqual(Game.objects.filter(season__year__in=[2010, 2011]).count(), 5)
+        self.assertEqual(Game.objects.filter(season__year__gt=2009).count(), 5)
+        self.assertEqual(Game.objects.filter(season__gt__in=[222, 333]).count(), 5)
+        self.assertEqual(Game.objects.filter(season__gt__gt=111).count(), 5)
+
+        # Players who played in 2009
+        self.assertEqual(Player.objects.filter(games__season__year=2009).distinct().count(), 2)
+        self.assertEqual(Player.objects.filter(games__season__year__exact=2009).distinct().count(), 2)
+        self.assertEqual(Player.objects.filter(games__season__gt=111).distinct().count(), 2)
+        self.assertEqual(Player.objects.filter(games__season__gt__exact=111).distinct().count(), 2)
+
+        # Players who played in 2010
+        self.assertEqual(Player.objects.filter(games__season__year=2010).distinct().count(), 1)
+        self.assertEqual(Player.objects.filter(games__season__year__exact=2010).distinct().count(), 1)
+        self.assertEqual(Player.objects.filter(games__season__gt=222).distinct().count(), 1)
+        self.assertEqual(Player.objects.filter(games__season__gt__exact=222).distinct().count(), 1)
+
+        # Players who played in 2011
+        self.assertEqual(Player.objects.filter(games__season__year=2011).distinct().count(), 2)
+        self.assertEqual(Player.objects.filter(games__season__year__exact=2011).distinct().count(), 2)
+        self.assertEqual(Player.objects.filter(games__season__gt=333).distinct().count(), 2)
+        self.assertEqual(Player.objects.filter(games__season__year__gt=2010).distinct().count(), 2)
+        self.assertEqual(Player.objects.filter(games__season__gt__gt=222).distinct().count(), 2)
diff --git a/tests/modeltests/proxy_models/__init__.py b/tests/m2m_and_m2o/__init__.py
similarity index 100%
rename from tests/modeltests/proxy_models/__init__.py
rename to tests/m2m_and_m2o/__init__.py
diff --git a/tests/modeltests/m2m_and_m2o/models.py b/tests/m2m_and_m2o/models.py
similarity index 100%
rename from tests/modeltests/m2m_and_m2o/models.py
rename to tests/m2m_and_m2o/models.py
diff --git a/tests/modeltests/m2m_and_m2o/tests.py b/tests/m2m_and_m2o/tests.py
similarity index 100%
rename from tests/modeltests/m2m_and_m2o/tests.py
rename to tests/m2m_and_m2o/tests.py
diff --git a/tests/modeltests/raw_query/__init__.py b/tests/m2m_intermediary/__init__.py
similarity index 100%
rename from tests/modeltests/raw_query/__init__.py
rename to tests/m2m_intermediary/__init__.py
diff --git a/tests/modeltests/m2m_intermediary/models.py b/tests/m2m_intermediary/models.py
similarity index 100%
rename from tests/modeltests/m2m_intermediary/models.py
rename to tests/m2m_intermediary/models.py
diff --git a/tests/modeltests/m2m_intermediary/tests.py b/tests/m2m_intermediary/tests.py
similarity index 100%
rename from tests/modeltests/m2m_intermediary/tests.py
rename to tests/m2m_intermediary/tests.py
diff --git a/tests/modeltests/reserved_names/__init__.py b/tests/m2m_multiple/__init__.py
similarity index 100%
rename from tests/modeltests/reserved_names/__init__.py
rename to tests/m2m_multiple/__init__.py
diff --git a/tests/modeltests/m2m_multiple/models.py b/tests/m2m_multiple/models.py
similarity index 100%
rename from tests/modeltests/m2m_multiple/models.py
rename to tests/m2m_multiple/models.py
diff --git a/tests/modeltests/m2m_multiple/tests.py b/tests/m2m_multiple/tests.py
similarity index 100%
rename from tests/modeltests/m2m_multiple/tests.py
rename to tests/m2m_multiple/tests.py
diff --git a/tests/modeltests/reverse_lookup/__init__.py b/tests/m2m_recursive/__init__.py
similarity index 100%
rename from tests/modeltests/reverse_lookup/__init__.py
rename to tests/m2m_recursive/__init__.py
diff --git a/tests/modeltests/m2m_recursive/models.py b/tests/m2m_recursive/models.py
similarity index 100%
rename from tests/modeltests/m2m_recursive/models.py
rename to tests/m2m_recursive/models.py
diff --git a/tests/modeltests/m2m_recursive/tests.py b/tests/m2m_recursive/tests.py
similarity index 100%
rename from tests/modeltests/m2m_recursive/tests.py
rename to tests/m2m_recursive/tests.py
diff --git a/tests/modeltests/save_delete_hooks/__init__.py b/tests/m2m_regress/__init__.py
similarity index 100%
rename from tests/modeltests/save_delete_hooks/__init__.py
rename to tests/m2m_regress/__init__.py
diff --git a/tests/regressiontests/m2m_regress/models.py b/tests/m2m_regress/models.py
similarity index 100%
rename from tests/regressiontests/m2m_regress/models.py
rename to tests/m2m_regress/models.py
diff --git a/tests/regressiontests/m2m_regress/tests.py b/tests/m2m_regress/tests.py
similarity index 88%
rename from tests/regressiontests/m2m_regress/tests.py
rename to tests/m2m_regress/tests.py
index 3dc1d2417c..884fc097a1 100644
--- a/tests/regressiontests/m2m_regress/tests.py
+++ b/tests/m2m_regress/tests.py
@@ -5,7 +5,7 @@ from django.test import TestCase
 from django.utils import six
 
 from .models import (SelfRefer, Tag, TagCollection, Entry, SelfReferChild,
-    SelfReferChildSibling, Worksheet, RegressionModelSplit)
+    SelfReferChildSibling, Worksheet, RegressionModelSplit, Line)
 
 
 class M2MRegressionTests(TestCase):
@@ -96,3 +96,16 @@ class M2MRegressionTests(TestCase):
         # causes a TypeError in add_lazy_relation
         m1 = RegressionModelSplit(name='1')
         m1.save()
+
+    def test_m2m_filter(self):
+        worksheet = Worksheet.objects.create(id=1)
+        line_hi = Line.objects.create(name="hi")
+        line_bye = Line.objects.create(name="bye")
+
+        worksheet.lines = [line_hi, line_bye]
+        hi = worksheet.lines.filter(name="hi")
+
+        worksheet.lines = hi
+        self.assertEqual(1, worksheet.lines.count())
+        self.assertEqual(1, hi.count())
+
diff --git a/tests/regressiontests/file_storage/__init__.py b/tests/m2m_signals/__init__.py
similarity index 100%
rename from tests/regressiontests/file_storage/__init__.py
rename to tests/m2m_signals/__init__.py
diff --git a/tests/modeltests/m2m_signals/models.py b/tests/m2m_signals/models.py
similarity index 100%
rename from tests/modeltests/m2m_signals/models.py
rename to tests/m2m_signals/models.py
diff --git a/tests/modeltests/m2m_signals/tests.py b/tests/m2m_signals/tests.py
similarity index 100%
rename from tests/modeltests/m2m_signals/tests.py
rename to tests/m2m_signals/tests.py
diff --git a/tests/modeltests/m2m_through/__init__.py b/tests/m2m_through/__init__.py
similarity index 100%
rename from tests/modeltests/m2m_through/__init__.py
rename to tests/m2m_through/__init__.py
diff --git a/tests/modeltests/m2m_through/models.py b/tests/m2m_through/models.py
similarity index 100%
rename from tests/modeltests/m2m_through/models.py
rename to tests/m2m_through/models.py
diff --git a/tests/modeltests/m2m_through/tests.py b/tests/m2m_through/tests.py
similarity index 100%
rename from tests/modeltests/m2m_through/tests.py
rename to tests/m2m_through/tests.py
diff --git a/tests/modeltests/unmanaged_models/__init__.py b/tests/m2m_through_regress/__init__.py
similarity index 100%
rename from tests/modeltests/unmanaged_models/__init__.py
rename to tests/m2m_through_regress/__init__.py
diff --git a/tests/regressiontests/m2m_through_regress/fixtures/m2m_through.json b/tests/m2m_through_regress/fixtures/m2m_through.json
similarity index 100%
rename from tests/regressiontests/m2m_through_regress/fixtures/m2m_through.json
rename to tests/m2m_through_regress/fixtures/m2m_through.json
diff --git a/tests/regressiontests/m2m_through_regress/models.py b/tests/m2m_through_regress/models.py
similarity index 100%
rename from tests/regressiontests/m2m_through_regress/models.py
rename to tests/m2m_through_regress/models.py
diff --git a/tests/regressiontests/m2m_through_regress/tests.py b/tests/m2m_through_regress/tests.py
similarity index 91%
rename from tests/regressiontests/m2m_through_regress/tests.py
rename to tests/m2m_through_regress/tests.py
index 17a4525442..5ac10462fa 100644
--- a/tests/regressiontests/m2m_through_regress/tests.py
+++ b/tests/m2m_through_regress/tests.py
@@ -73,12 +73,12 @@ class M2MThroughTestCase(TestCase):
 
         out = StringIO()
         management.call_command("dumpdata", "m2m_through_regress", format="json", stdout=out)
-        self.assertEqual(out.getvalue().strip(), """[{"pk": %(m_pk)s, "model": "m2m_through_regress.membership", "fields": {"person": %(p_pk)s, "price": 100, "group": %(g_pk)s}}, {"pk": %(p_pk)s, "model": "m2m_through_regress.person", "fields": {"name": "Bob"}}, {"pk": %(g_pk)s, "model": "m2m_through_regress.group", "fields": {"name": "Roll"}}]""" % pks)
+        self.assertJSONEqual(out.getvalue().strip(), """[{"pk": %(m_pk)s, "model": "m2m_through_regress.membership", "fields": {"person": %(p_pk)s, "price": 100, "group": %(g_pk)s}}, {"pk": %(p_pk)s, "model": "m2m_through_regress.person", "fields": {"name": "Bob"}}, {"pk": %(g_pk)s, "model": "m2m_through_regress.group", "fields": {"name": "Roll"}}]""" % pks)
 
         out = StringIO()
         management.call_command("dumpdata", "m2m_through_regress", format="xml",
             indent=2, stdout=out)
-        self.assertEqual(out.getvalue().strip(), """
+        self.assertXMLEqual(out.getvalue().strip(), """
 <?xml version="1.0" encoding="utf-8"?>
 <django-objects version="1.0">
   <object pk="%(m_pk)s" model="m2m_through_regress.membership">
@@ -232,4 +232,4 @@ class ThroughLoadDataTestCase(TestCase):
         "Check that sequences on an m2m_through are created for the through model, not a phantom auto-generated m2m table. Refs #11107"
         out = StringIO()
         management.call_command("dumpdata", "m2m_through_regress", format="json", stdout=out)
-        self.assertEqual(out.getvalue().strip(), """[{"pk": 1, "model": "m2m_through_regress.usermembership", "fields": {"price": 100, "group": 1, "user": 1}}, {"pk": 1, "model": "m2m_through_regress.person", "fields": {"name": "Guido"}}, {"pk": 1, "model": "m2m_through_regress.group", "fields": {"name": "Python Core Group"}}]""")
+        self.assertJSONEqual(out.getvalue().strip(), """[{"pk": 1, "model": "m2m_through_regress.usermembership", "fields": {"price": 100, "group": 1, "user": 1}}, {"pk": 1, "model": "m2m_through_regress.person", "fields": {"name": "Guido"}}, {"pk": 1, "model": "m2m_through_regress.group", "fields": {"name": "Python Core Group"}}]""")
diff --git a/tests/modeltests/schema/__init__.py b/tests/m2o_recursive/__init__.py
similarity index 100%
rename from tests/modeltests/schema/__init__.py
rename to tests/m2o_recursive/__init__.py
diff --git a/tests/modeltests/m2o_recursive/models.py b/tests/m2o_recursive/models.py
similarity index 100%
rename from tests/modeltests/m2o_recursive/models.py
rename to tests/m2o_recursive/models.py
diff --git a/tests/modeltests/m2o_recursive/tests.py b/tests/m2o_recursive/tests.py
similarity index 100%
rename from tests/modeltests/m2o_recursive/tests.py
rename to tests/m2o_recursive/tests.py
diff --git a/tests/regressiontests/m2m_through_regress/__init__.py b/tests/mail/__init__.py
similarity index 100%
rename from tests/regressiontests/m2m_through_regress/__init__.py
rename to tests/mail/__init__.py
diff --git a/tests/regressiontests/mail/custombackend.py b/tests/mail/custombackend.py
similarity index 100%
rename from tests/regressiontests/mail/custombackend.py
rename to tests/mail/custombackend.py
diff --git a/tests/regressiontests/mail/models.py b/tests/mail/models.py
similarity index 100%
rename from tests/regressiontests/mail/models.py
rename to tests/mail/models.py
diff --git a/tests/regressiontests/mail/tests.py b/tests/mail/tests.py
similarity index 95%
rename from tests/regressiontests/mail/tests.py
rename to tests/mail/tests.py
index b798cb21aa..0a843db9e7 100644
--- a/tests/regressiontests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -90,7 +90,17 @@ class MailTests(TestCase):
         """
         headers = {"date": "Fri, 09 Nov 2001 01:08:47 -0000", "Message-ID": "foo"}
         email = EmailMessage('subject', 'content', 'from@example.com', ['to@example.com'], headers=headers)
-        self.assertEqual(email.message().as_string(), 'Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: 7bit\nSubject: subject\nFrom: from@example.com\nTo: to@example.com\ndate: Fri, 09 Nov 2001 01:08:47 -0000\nMessage-ID: foo\n\ncontent')
+
+        self.assertEqual(sorted(email.message().items()), [
+            ('Content-Transfer-Encoding', '7bit'),
+            ('Content-Type', 'text/plain; charset="utf-8"'),
+            ('From', 'from@example.com'),
+            ('MIME-Version', '1.0'),
+            ('Message-ID', 'foo'),
+            ('Subject', 'subject'),
+            ('To', 'to@example.com'),
+            ('date', 'Fri, 09 Nov 2001 01:08:47 -0000'),
+        ])
 
     def test_from_header(self):
         """
@@ -233,7 +243,7 @@ class MailTests(TestCase):
 
     def test_custom_backend(self):
         """Test custom backend defined in this suite."""
-        conn = mail.get_connection('regressiontests.mail.custombackend.EmailBackend')
+        conn = mail.get_connection('mail.custombackend.EmailBackend')
         self.assertTrue(hasattr(conn, 'test_outbox'))
         email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
         conn.send_messages([email])
@@ -261,13 +271,13 @@ class MailTests(TestCase):
         mail.outbox = []
 
         # Send using non-default connection
-        connection = mail.get_connection('regressiontests.mail.custombackend.EmailBackend')
+        connection = mail.get_connection('mail.custombackend.EmailBackend')
         send_mail('Subject', 'Content', 'from@example.com', ['to@example.com'], connection=connection)
         self.assertEqual(mail.outbox, [])
         self.assertEqual(len(connection.test_outbox), 1)
         self.assertEqual(connection.test_outbox[0].subject, 'Subject')
 
-        connection = mail.get_connection('regressiontests.mail.custombackend.EmailBackend')
+        connection = mail.get_connection('mail.custombackend.EmailBackend')
         send_mass_mail([
                 ('Subject1', 'Content1', 'from1@example.com', ['to1@example.com']),
                 ('Subject2', 'Content2', 'from2@example.com', ['to2@example.com']),
@@ -277,13 +287,13 @@ class MailTests(TestCase):
         self.assertEqual(connection.test_outbox[0].subject, 'Subject1')
         self.assertEqual(connection.test_outbox[1].subject, 'Subject2')
 
-        connection = mail.get_connection('regressiontests.mail.custombackend.EmailBackend')
+        connection = mail.get_connection('mail.custombackend.EmailBackend')
         mail_admins('Admin message', 'Content', connection=connection)
         self.assertEqual(mail.outbox, [])
         self.assertEqual(len(connection.test_outbox), 1)
         self.assertEqual(connection.test_outbox[0].subject, '[Django] Admin message')
 
-        connection = mail.get_connection('regressiontests.mail.custombackend.EmailBackend')
+        connection = mail.get_connection('mail.custombackend.EmailBackend')
         mail_managers('Manager message', 'Content', connection=connection)
         self.assertEqual(mail.outbox, [])
         self.assertEqual(len(connection.test_outbox), 1)
@@ -482,6 +492,16 @@ class BaseEmailBackendTests(object):
         self.assertEqual(message.get('from'), "tester")
         self.assertEqual(message.get('to'), "django")
 
+    def test_close_connection(self):
+        """
+        Test that connection can be closed (even when not explicitely opened)
+        """
+        conn = mail.get_connection(username='', password='')
+        try:
+            conn.close()
+        except Exception as e:
+            self.fail("close() unexpectedly raised an exception: %s" % e)
+
 
 class LocmemBackendTests(BaseEmailBackendTests, TestCase):
     email_backend = 'django.core.mail.backends.locmem.EmailBackend'
@@ -649,9 +669,9 @@ class FakeSMTPServer(smtpd.SMTPServer, threading.Thread):
         asyncore.close_all()
 
     def stop(self):
-        assert self.active
-        self.active = False
-        self.join()
+        if self.active:
+            self.active = False
+            self.join()
 
 
 class SMTPBackendTests(BaseEmailBackendTests, TestCase):
@@ -705,3 +725,16 @@ class SMTPBackendTests(BaseEmailBackendTests, TestCase):
         backend = smtp.EmailBackend(username='', password='')
         self.assertEqual(backend.username, '')
         self.assertEqual(backend.password, '')
+
+    def test_server_stopped(self):
+        """
+        Test that closing the backend while the SMTP server is stopped doesn't
+        raise an exception.
+        """
+        backend = smtp.EmailBackend(username='', password='')
+        backend.open()
+        self.server.stop()
+        try:
+            backend.close()
+        except Exception as e:
+            self.fail("close() unexpectedly raised an exception: %s" % e)
diff --git a/tests/modeltests/select_related/__init__.py b/tests/managers_regress/__init__.py
similarity index 100%
rename from tests/modeltests/select_related/__init__.py
rename to tests/managers_regress/__init__.py
diff --git a/tests/regressiontests/managers_regress/models.py b/tests/managers_regress/models.py
similarity index 88%
rename from tests/regressiontests/managers_regress/models.py
rename to tests/managers_regress/models.py
index d72970d86e..d8dd22ec9a 100644
--- a/tests/regressiontests/managers_regress/models.py
+++ b/tests/managers_regress/models.py
@@ -7,18 +7,18 @@ from django.utils.encoding import python_2_unicode_compatible
 
 
 class OnlyFred(models.Manager):
-    def get_query_set(self):
-        return super(OnlyFred, self).get_query_set().filter(name='fred')
+    def get_queryset(self):
+        return super(OnlyFred, self).get_queryset().filter(name='fred')
 
 
 class OnlyBarney(models.Manager):
-    def get_query_set(self):
-        return super(OnlyBarney, self).get_query_set().filter(name='barney')
+    def get_queryset(self):
+        return super(OnlyBarney, self).get_queryset().filter(name='barney')
 
 
 class Value42(models.Manager):
-    def get_query_set(self):
-        return super(Value42, self).get_query_set().filter(value=42)
+    def get_queryset(self):
+        return super(Value42, self).get_queryset().filter(value=42)
 
 
 class AbstractBase1(models.Model):
diff --git a/tests/regressiontests/managers_regress/tests.py b/tests/managers_regress/tests.py
similarity index 100%
rename from tests/regressiontests/managers_regress/tests.py
rename to tests/managers_regress/tests.py
diff --git a/tests/modeltests/serializers/__init__.py b/tests/many_to_many/__init__.py
similarity index 100%
rename from tests/modeltests/serializers/__init__.py
rename to tests/many_to_many/__init__.py
diff --git a/tests/modeltests/many_to_many/models.py b/tests/many_to_many/models.py
similarity index 76%
rename from tests/modeltests/many_to_many/models.py
rename to tests/many_to_many/models.py
index a196c85092..31793b3974 100644
--- a/tests/modeltests/many_to_many/models.py
+++ b/tests/many_to_many/models.py
@@ -6,6 +6,7 @@ To define a many-to-many relationship, use ``ManyToManyField()``.
 In this example, an ``Article`` can be published in multiple ``Publication``
 objects, and a ``Publication`` has multiple ``Article`` objects.
 """
+from __future__ import unicode_literals
 
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
@@ -24,7 +25,9 @@ class Publication(models.Model):
 @python_2_unicode_compatible
 class Article(models.Model):
     headline = models.CharField(max_length=100)
-    publications = models.ManyToManyField(Publication)
+    # Assign a unicode string as name to make sure the intermediary model is
+    # correctly created. Refs #20207
+    publications = models.ManyToManyField(Publication, name='publications')
 
     def __str__(self):
         return self.headline
diff --git a/tests/modeltests/many_to_many/tests.py b/tests/many_to_many/tests.py
similarity index 100%
rename from tests/modeltests/many_to_many/tests.py
rename to tests/many_to_many/tests.py
diff --git a/tests/modeltests/signals/__init__.py b/tests/many_to_one/__init__.py
similarity index 100%
rename from tests/modeltests/signals/__init__.py
rename to tests/many_to_one/__init__.py
diff --git a/tests/modeltests/many_to_one/models.py b/tests/many_to_one/models.py
similarity index 100%
rename from tests/modeltests/many_to_one/models.py
rename to tests/many_to_one/models.py
diff --git a/tests/modeltests/many_to_one/tests.py b/tests/many_to_one/tests.py
similarity index 92%
rename from tests/modeltests/many_to_one/tests.py
rename to tests/many_to_one/tests.py
index 44ae689dd4..a4f87a3283 100644
--- a/tests/modeltests/many_to_one/tests.py
+++ b/tests/many_to_one/tests.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from copy import deepcopy
-from datetime import datetime
+import datetime
 
 from django.core.exceptions import MultipleObjectsReturned, FieldError
 from django.test import TestCase
@@ -20,7 +20,7 @@ class ManyToOneTests(TestCase):
         self.r2.save()
         # Create an Article.
         self.a = Article(id=None, headline="This is a test",
-                         pub_date=datetime(2005, 7, 27), reporter=self.r)
+                         pub_date=datetime.date(2005, 7, 27), reporter=self.r)
         self.a.save()
 
     def test_get(self):
@@ -36,25 +36,25 @@ class ManyToOneTests(TestCase):
         # You can also instantiate an Article by passing the Reporter's ID
         # instead of a Reporter object.
         a3 = Article(id=None, headline="Third article",
-                     pub_date=datetime(2005, 7, 27), reporter_id=self.r.id)
+                     pub_date=datetime.date(2005, 7, 27), reporter_id=self.r.id)
         a3.save()
         self.assertEqual(a3.reporter.id, self.r.id)
 
         # Similarly, the reporter ID can be a string.
         a4 = Article(id=None, headline="Fourth article",
-                     pub_date=datetime(2005, 7, 27), reporter_id=str(self.r.id))
+                     pub_date=datetime.date(2005, 7, 27), reporter_id=str(self.r.id))
         a4.save()
         self.assertEqual(repr(a4.reporter), "<Reporter: John Smith>")
 
     def test_add(self):
         # Create an Article via the Reporter object.
         new_article = self.r.article_set.create(headline="John's second story",
-                                                pub_date=datetime(2005, 7, 29))
+                                                pub_date=datetime.date(2005, 7, 29))
         self.assertEqual(repr(new_article), "<Article: John's second story>")
         self.assertEqual(new_article.reporter.id, self.r.id)
 
         # Create a new article, and add it to the article set.
-        new_article2 = Article(headline="Paul's story", pub_date=datetime(2006, 1, 17))
+        new_article2 = Article(headline="Paul's story", pub_date=datetime.date(2006, 1, 17))
         self.r.article_set.add(new_article2)
         self.assertEqual(new_article2.reporter.id, self.r.id)
         self.assertQuerysetEqual(self.r.article_set.all(),
@@ -80,9 +80,9 @@ class ManyToOneTests(TestCase):
 
     def test_assign(self):
         new_article = self.r.article_set.create(headline="John's second story",
-                                                pub_date=datetime(2005, 7, 29))
+                                                pub_date=datetime.date(2005, 7, 29))
         new_article2 = self.r2.article_set.create(headline="Paul's story",
-                                                  pub_date=datetime(2006, 1, 17))
+                                                  pub_date=datetime.date(2006, 1, 17))
         # Assign the article to the reporter directly using the descriptor.
         new_article2.reporter = self.r
         new_article2.save()
@@ -118,9 +118,9 @@ class ManyToOneTests(TestCase):
 
     def test_selects(self):
         new_article = self.r.article_set.create(headline="John's second story",
-                                                pub_date=datetime(2005, 7, 29))
+                                                pub_date=datetime.date(2005, 7, 29))
         new_article2 = self.r2.article_set.create(headline="Paul's story",
-                                                  pub_date=datetime(2006, 1, 17))
+                                                  pub_date=datetime.date(2006, 1, 17))
         # Reporter objects have access to their related Article objects.
         self.assertQuerysetEqual(self.r.article_set.all(), [
             "<Article: John's second story>",
@@ -237,9 +237,9 @@ class ManyToOneTests(TestCase):
 
     def test_reverse_selects(self):
         a3 = Article.objects.create(id=None, headline="Third article",
-                                    pub_date=datetime(2005, 7, 27), reporter_id=self.r.id)
+                                    pub_date=datetime.date(2005, 7, 27), reporter_id=self.r.id)
         a4 = Article.objects.create(id=None, headline="Fourth article",
-                                    pub_date=datetime(2005, 7, 27), reporter_id=str(self.r.id))
+                                    pub_date=datetime.date(2005, 7, 27), reporter_id=str(self.r.id))
         # Reporters can be queried
         self.assertQuerysetEqual(Reporter.objects.filter(id__exact=self.r.id),
                                  ["<Reporter: John Smith>"])
@@ -316,33 +316,33 @@ class ManyToOneTests(TestCase):
         # objects (Reporters).
         r1 = Reporter.objects.create(first_name='Mike', last_name='Royko', email='royko@suntimes.com')
         r2 = Reporter.objects.create(first_name='John', last_name='Kass', email='jkass@tribune.com')
-        a1 = Article.objects.create(headline='First', pub_date=datetime(1980, 4, 23), reporter=r1)
-        a2 = Article.objects.create(headline='Second', pub_date=datetime(1980, 4, 23), reporter=r2)
+        Article.objects.create(headline='First', pub_date=datetime.date(1980, 4, 23), reporter=r1)
+        Article.objects.create(headline='Second', pub_date=datetime.date(1980, 4, 23), reporter=r2)
         self.assertEqual(list(Article.objects.select_related().dates('pub_date', 'day')),
             [
-                datetime(1980, 4, 23, 0, 0),
-                datetime(2005, 7, 27, 0, 0),
+                datetime.date(1980, 4, 23),
+                datetime.date(2005, 7, 27),
             ])
         self.assertEqual(list(Article.objects.select_related().dates('pub_date', 'month')),
             [
-                datetime(1980, 4, 1, 0, 0),
-                datetime(2005, 7, 1, 0, 0),
+                datetime.date(1980, 4, 1),
+                datetime.date(2005, 7, 1),
             ])
         self.assertEqual(list(Article.objects.select_related().dates('pub_date', 'year')),
             [
-                datetime(1980, 1, 1, 0, 0),
-                datetime(2005, 1, 1, 0, 0),
+                datetime.date(1980, 1, 1),
+                datetime.date(2005, 1, 1),
             ])
 
     def test_delete(self):
         new_article = self.r.article_set.create(headline="John's second story",
-                                                pub_date=datetime(2005, 7, 29))
+                                                pub_date=datetime.date(2005, 7, 29))
         new_article2 = self.r2.article_set.create(headline="Paul's story",
-                                                  pub_date=datetime(2006, 1, 17))
+                                                  pub_date=datetime.date(2006, 1, 17))
         a3 = Article.objects.create(id=None, headline="Third article",
-                                    pub_date=datetime(2005, 7, 27), reporter_id=self.r.id)
+                                    pub_date=datetime.date(2005, 7, 27), reporter_id=self.r.id)
         a4 = Article.objects.create(id=None, headline="Fourth article",
-                                    pub_date=datetime(2005, 7, 27), reporter_id=str(self.r.id))
+                                    pub_date=datetime.date(2005, 7, 27), reporter_id=str(self.r.id))
         # If you delete a reporter, his articles will be deleted.
         self.assertQuerysetEqual(Article.objects.all(),
             [
@@ -383,7 +383,7 @@ class ManyToOneTests(TestCase):
         # for a ForeignKey.
         a2, created = Article.objects.get_or_create(id=None,
                                                     headline="John's second test",
-                                                    pub_date=datetime(2011, 5, 7),
+                                                    pub_date=datetime.date(2011, 5, 7),
                                                     reporter_id=self.r.id)
         self.assertTrue(created)
         self.assertEqual(a2.reporter.id, self.r.id)
@@ -398,7 +398,7 @@ class ManyToOneTests(TestCase):
 
         # Create an Article by Paul for the same date.
         a3 = Article.objects.create(id=None, headline="Paul's commentary",
-                                    pub_date=datetime(2011, 5, 7),
+                                    pub_date=datetime.date(2011, 5, 7),
                                     reporter_id=self.r2.id)
         self.assertEqual(a3.reporter.id, self.r2.id)
 
@@ -407,7 +407,7 @@ class ManyToOneTests(TestCase):
                           Article.objects.get, reporter_id=self.r.id)
         self.assertEqual(repr(a3),
                          repr(Article.objects.get(reporter_id=self.r2.id,
-                                             pub_date=datetime(2011, 5, 7))))
+                                             pub_date=datetime.date(2011, 5, 7))))
 
     def test_manager_class_caching(self):
         r1 = Reporter.objects.create(first_name='Mike')
@@ -425,7 +425,7 @@ class ManyToOneTests(TestCase):
                                            email='john.smith@example.com')
         lazy = ugettext_lazy('test')
         reporter.article_set.create(headline=lazy,
-                                    pub_date=datetime(2011, 6, 10))
+                                    pub_date=datetime.date(2011, 6, 10))
         notlazy = six.text_type(lazy)
         article = reporter.article_set.get()
         self.assertEqual(article.headline, notlazy)
diff --git a/tests/modeltests/str/__init__.py b/tests/many_to_one_null/__init__.py
similarity index 100%
rename from tests/modeltests/str/__init__.py
rename to tests/many_to_one_null/__init__.py
diff --git a/tests/modeltests/many_to_one_null/models.py b/tests/many_to_one_null/models.py
similarity index 100%
rename from tests/modeltests/many_to_one_null/models.py
rename to tests/many_to_one_null/models.py
diff --git a/tests/modeltests/many_to_one_null/tests.py b/tests/many_to_one_null/tests.py
similarity index 100%
rename from tests/modeltests/many_to_one_null/tests.py
rename to tests/many_to_one_null/tests.py
diff --git a/tests/modeltests/tablespaces/__init__.py b/tests/many_to_one_regress/__init__.py
similarity index 100%
rename from tests/modeltests/tablespaces/__init__.py
rename to tests/many_to_one_regress/__init__.py
diff --git a/tests/regressiontests/many_to_one_regress/models.py b/tests/many_to_one_regress/models.py
similarity index 88%
rename from tests/regressiontests/many_to_one_regress/models.py
rename to tests/many_to_one_regress/models.py
index f3727820f8..0ac0871793 100644
--- a/tests/regressiontests/many_to_one_regress/models.py
+++ b/tests/many_to_one_regress/models.py
@@ -48,3 +48,9 @@ class Relation(models.Model):
 
     def __str__(self):
         return "%s - %s" % (self.left.category.name, self.right.category.name)
+
+class Car(models.Model):
+    make = models.CharField(max_length=100, null=True, unique=True)
+
+class Driver(models.Model):
+    car = models.ForeignKey(Car, to_field='make', null=True, related_name='drivers')
diff --git a/tests/regressiontests/many_to_one_regress/tests.py b/tests/many_to_one_regress/tests.py
similarity index 81%
rename from tests/regressiontests/many_to_one_regress/tests.py
rename to tests/many_to_one_regress/tests.py
index d980d7437c..a9969a7e90 100644
--- a/tests/regressiontests/many_to_one_regress/tests.py
+++ b/tests/many_to_one_regress/tests.py
@@ -4,7 +4,8 @@ from django.db import models
 from django.test import TestCase
 from django.utils import six
 
-from .models import First, Third, Parent, Child, Category, Record, Relation
+from .models import (
+    First, Third, Parent, Child, Category, Record, Relation, Car, Driver)
 
 
 class ManyToOneRegressionTests(TestCase):
@@ -111,3 +112,25 @@ class ManyToOneRegressionTests(TestCase):
         # of a model, and interrogate its related field.
         cat = models.ForeignKey(Category)
         self.assertEqual('id', cat.rel.get_related_field().name)
+
+    def test_relation_unsaved(self):
+        # Test that the <field>_set manager does not join on Null value fields (#17541)
+        Third.objects.create(name='Third 1')
+        Third.objects.create(name='Third 2')
+        th = Third(name="testing")
+        # The object isn't saved an thus the relation field is null - we won't even
+        # execute a query in this case.
+        with self.assertNumQueries(0):
+            self.assertEqual(th.child_set.count(), 0)
+        th.save()
+        # Now the model is saved, so we will need to execute an query.
+        with self.assertNumQueries(1):
+            self.assertEqual(th.child_set.count(), 0)
+
+    def test_related_null_to_field(self):
+        c1 = Car.objects.create()
+        c2 = Car.objects.create()
+        d1 = Driver.objects.create()
+        self.assertIs(d1.car, None)
+        with self.assertNumQueries(0):
+            self.assertEqual(list(c1.drivers.all()), [])
diff --git a/tests/regressiontests/inspectdb/__init__.py b/tests/max_lengths/__init__.py
similarity index 100%
rename from tests/regressiontests/inspectdb/__init__.py
rename to tests/max_lengths/__init__.py
diff --git a/tests/regressiontests/max_lengths/models.py b/tests/max_lengths/models.py
similarity index 100%
rename from tests/regressiontests/max_lengths/models.py
rename to tests/max_lengths/models.py
diff --git a/tests/regressiontests/max_lengths/tests.py b/tests/max_lengths/tests.py
similarity index 100%
rename from tests/regressiontests/max_lengths/tests.py
rename to tests/max_lengths/tests.py
diff --git a/tests/modeltests/test_client/__init__.py b/tests/middleware/__init__.py
similarity index 100%
rename from tests/modeltests/test_client/__init__.py
rename to tests/middleware/__init__.py
diff --git a/tests/regressiontests/middleware/cond_get_urls.py b/tests/middleware/cond_get_urls.py
similarity index 100%
rename from tests/regressiontests/middleware/cond_get_urls.py
rename to tests/middleware/cond_get_urls.py
diff --git a/tests/regressiontests/middleware/extra_urls.py b/tests/middleware/extra_urls.py
similarity index 100%
rename from tests/regressiontests/middleware/extra_urls.py
rename to tests/middleware/extra_urls.py
diff --git a/tests/middleware/models.py b/tests/middleware/models.py
new file mode 100644
index 0000000000..7088bfc2f3
--- /dev/null
+++ b/tests/middleware/models.py
@@ -0,0 +1,13 @@
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
+
+
+@python_2_unicode_compatible
+class Band(models.Model):
+    name = models.CharField(max_length=100)
+
+    class Meta:
+        ordering = ('name',)
+
+    def __str__(self):
+        return self.name
diff --git a/tests/regressiontests/middleware/tests.py b/tests/middleware/tests.py
similarity index 55%
rename from tests/regressiontests/middleware/tests.py
rename to tests/middleware/tests.py
index b8cffd9c92..f2f7f4df66 100644
--- a/tests/regressiontests/middleware/tests.py
+++ b/tests/middleware/tests.py
@@ -1,36 +1,35 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
 
 import gzip
-import re
-import random
 from io import BytesIO
+import random
+import re
+import warnings
 
 from django.conf import settings
 from django.core import mail
-from django.http import HttpRequest
-from django.http import HttpResponse, StreamingHttpResponse
+from django.db import (transaction, connections, DEFAULT_DB_ALIAS,
+                       IntegrityError)
+from django.http import HttpRequest, HttpResponse, StreamingHttpResponse
 from django.middleware.clickjacking import XFrameOptionsMiddleware
-from django.middleware.common import CommonMiddleware
+from django.middleware.common import CommonMiddleware, BrokenLinkEmailsMiddleware
 from django.middleware.http import ConditionalGetMiddleware
 from django.middleware.gzip import GZipMiddleware
-from django.test import TestCase, RequestFactory
+from django.middleware.transaction import TransactionMiddleware
+from django.test import TransactionTestCase, TestCase, RequestFactory
 from django.test.utils import override_settings
 from django.utils import six
+from django.utils.encoding import force_str
 from django.utils.six.moves import xrange
+from django.utils.unittest import expectedFailure
+
+from transactions.tests import IgnorePendingDeprecationWarningsMixin
+
+from .models import Band
 
 
 class CommonMiddlewareTest(TestCase):
-    def setUp(self):
-        self.append_slash = settings.APPEND_SLASH
-        self.prepend_www = settings.PREPEND_WWW
-        self.ignorable_404_urls = settings.IGNORABLE_404_URLS
-        self.send_broken_email_links = settings.SEND_BROKEN_LINK_EMAILS
-
-    def tearDown(self):
-        settings.APPEND_SLASH = self.append_slash
-        settings.PREPEND_WWW = self.prepend_www
-        settings.IGNORABLE_404_URLS = self.ignorable_404_urls
-        settings.SEND_BROKEN_LINK_EMAILS = self.send_broken_email_links
 
     def _get_request(self, path):
         request = HttpRequest()
@@ -41,257 +40,244 @@ class CommonMiddlewareTest(TestCase):
         request.path = request.path_info = "/middleware/%s" % path
         return request
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_have_slash(self):
         """
         Tests that URLs with slashes go unmolested.
         """
-        settings.APPEND_SLASH = True
         request = self._get_request('slash/')
         self.assertEqual(CommonMiddleware().process_request(request), None)
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_slashless_resource(self):
         """
         Tests that matches to explicit slashless URLs go unmolested.
         """
-        settings.APPEND_SLASH = True
         request = self._get_request('noslash')
         self.assertEqual(CommonMiddleware().process_request(request), None)
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_slashless_unknown(self):
         """
         Tests that APPEND_SLASH doesn't redirect to unknown resources.
         """
-        settings.APPEND_SLASH = True
         request = self._get_request('unknown')
         self.assertEqual(CommonMiddleware().process_request(request), None)
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_redirect(self):
         """
         Tests that APPEND_SLASH redirects slashless URLs to a valid pattern.
         """
-        settings.APPEND_SLASH = True
         request = self._get_request('slash')
         r = CommonMiddleware().process_request(request)
         self.assertEqual(r.status_code, 301)
-        self.assertEqual(r['Location'], 'http://testserver/middleware/slash/')
+        self.assertEqual(r.url, 'http://testserver/middleware/slash/')
 
+    @override_settings(APPEND_SLASH=True, DEBUG=True)
     def test_append_slash_no_redirect_on_POST_in_DEBUG(self):
         """
         Tests that while in debug mode, an exception is raised with a warning
         when a failed attempt is made to POST to an URL which would normally be
         redirected to a slashed version.
         """
-        settings.APPEND_SLASH = True
-        settings.DEBUG = True
         request = self._get_request('slash')
         request.method = 'POST'
-        self.assertRaises(
-            RuntimeError,
-            CommonMiddleware().process_request,
-            request)
-        try:
+        with six.assertRaisesRegex(self, RuntimeError, 'end in a slash'):
             CommonMiddleware().process_request(request)
-        except RuntimeError as e:
-            self.assertTrue('end in a slash' in str(e))
-        settings.DEBUG = False
 
+    @override_settings(APPEND_SLASH=False)
     def test_append_slash_disabled(self):
         """
         Tests disabling append slash functionality.
         """
-        settings.APPEND_SLASH = False
         request = self._get_request('slash')
         self.assertEqual(CommonMiddleware().process_request(request), None)
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_quoted(self):
         """
         Tests that URLs which require quoting are redirected to their slash
         version ok.
         """
-        settings.APPEND_SLASH = True
         request = self._get_request('needsquoting#')
         r = CommonMiddleware().process_request(request)
         self.assertEqual(r.status_code, 301)
         self.assertEqual(
-            r['Location'],
+            r.url,
             'http://testserver/middleware/needsquoting%23/')
 
+    @override_settings(APPEND_SLASH=False, PREPEND_WWW=True)
     def test_prepend_www(self):
-        settings.PREPEND_WWW = True
-        settings.APPEND_SLASH = False
         request = self._get_request('path/')
         r = CommonMiddleware().process_request(request)
         self.assertEqual(r.status_code, 301)
         self.assertEqual(
-            r['Location'],
+            r.url,
             'http://www.testserver/middleware/path/')
 
+    @override_settings(APPEND_SLASH=True, PREPEND_WWW=True)
     def test_prepend_www_append_slash_have_slash(self):
-        settings.PREPEND_WWW = True
-        settings.APPEND_SLASH = True
         request = self._get_request('slash/')
         r = CommonMiddleware().process_request(request)
         self.assertEqual(r.status_code, 301)
-        self.assertEqual(r['Location'],
+        self.assertEqual(r.url,
                           'http://www.testserver/middleware/slash/')
 
+    @override_settings(APPEND_SLASH=True, PREPEND_WWW=True)
     def test_prepend_www_append_slash_slashless(self):
-        settings.PREPEND_WWW = True
-        settings.APPEND_SLASH = True
         request = self._get_request('slash')
         r = CommonMiddleware().process_request(request)
         self.assertEqual(r.status_code, 301)
-        self.assertEqual(r['Location'],
+        self.assertEqual(r.url,
                           'http://www.testserver/middleware/slash/')
 
 
     # The following tests examine expected behavior given a custom urlconf that
     # overrides the default one through the request object.
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_have_slash_custom_urlconf(self):
-      """
-      Tests that URLs with slashes go unmolested.
-      """
-      settings.APPEND_SLASH = True
-      request = self._get_request('customurlconf/slash/')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      self.assertEqual(CommonMiddleware().process_request(request), None)
+        """
+        Tests that URLs with slashes go unmolested.
+        """
+        request = self._get_request('customurlconf/slash/')
+        request.urlconf = 'middleware.extra_urls'
+        self.assertEqual(CommonMiddleware().process_request(request), None)
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_slashless_resource_custom_urlconf(self):
-      """
-      Tests that matches to explicit slashless URLs go unmolested.
-      """
-      settings.APPEND_SLASH = True
-      request = self._get_request('customurlconf/noslash')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      self.assertEqual(CommonMiddleware().process_request(request), None)
+        """
+        Tests that matches to explicit slashless URLs go unmolested.
+        """
+        request = self._get_request('customurlconf/noslash')
+        request.urlconf = 'middleware.extra_urls'
+        self.assertEqual(CommonMiddleware().process_request(request), None)
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_slashless_unknown_custom_urlconf(self):
-      """
-      Tests that APPEND_SLASH doesn't redirect to unknown resources.
-      """
-      settings.APPEND_SLASH = True
-      request = self._get_request('customurlconf/unknown')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      self.assertEqual(CommonMiddleware().process_request(request), None)
+        """
+        Tests that APPEND_SLASH doesn't redirect to unknown resources.
+        """
+        request = self._get_request('customurlconf/unknown')
+        request.urlconf = 'middleware.extra_urls'
+        self.assertEqual(CommonMiddleware().process_request(request), None)
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_redirect_custom_urlconf(self):
-      """
-      Tests that APPEND_SLASH redirects slashless URLs to a valid pattern.
-      """
-      settings.APPEND_SLASH = True
-      request = self._get_request('customurlconf/slash')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      r = CommonMiddleware().process_request(request)
-      self.assertFalse(r is None,
-          "CommonMiddlware failed to return APPEND_SLASH redirect using request.urlconf")
-      self.assertEqual(r.status_code, 301)
-      self.assertEqual(r['Location'], 'http://testserver/middleware/customurlconf/slash/')
+        """
+        Tests that APPEND_SLASH redirects slashless URLs to a valid pattern.
+        """
+        request = self._get_request('customurlconf/slash')
+        request.urlconf = 'middleware.extra_urls'
+        r = CommonMiddleware().process_request(request)
+        self.assertFalse(r is None,
+            "CommonMiddlware failed to return APPEND_SLASH redirect using request.urlconf")
+        self.assertEqual(r.status_code, 301)
+        self.assertEqual(r.url, 'http://testserver/middleware/customurlconf/slash/')
 
+    @override_settings(APPEND_SLASH=True, DEBUG=True)
     def test_append_slash_no_redirect_on_POST_in_DEBUG_custom_urlconf(self):
-      """
-      Tests that while in debug mode, an exception is raised with a warning
-      when a failed attempt is made to POST to an URL which would normally be
-      redirected to a slashed version.
-      """
-      settings.APPEND_SLASH = True
-      settings.DEBUG = True
-      request = self._get_request('customurlconf/slash')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      request.method = 'POST'
-      self.assertRaises(
-          RuntimeError,
-          CommonMiddleware().process_request,
-          request)
-      try:
-          CommonMiddleware().process_request(request)
-      except RuntimeError as e:
-          self.assertTrue('end in a slash' in str(e))
-      settings.DEBUG = False
+        """
+        Tests that while in debug mode, an exception is raised with a warning
+        when a failed attempt is made to POST to an URL which would normally be
+        redirected to a slashed version.
+        """
+        request = self._get_request('customurlconf/slash')
+        request.urlconf = 'middleware.extra_urls'
+        request.method = 'POST'
+        with six.assertRaisesRegex(self, RuntimeError, 'end in a slash'):
+            CommonMiddleware().process_request(request)
 
+    @override_settings(APPEND_SLASH=False)
     def test_append_slash_disabled_custom_urlconf(self):
-      """
-      Tests disabling append slash functionality.
-      """
-      settings.APPEND_SLASH = False
-      request = self._get_request('customurlconf/slash')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      self.assertEqual(CommonMiddleware().process_request(request), None)
+        """
+        Tests disabling append slash functionality.
+        """
+        request = self._get_request('customurlconf/slash')
+        request.urlconf = 'middleware.extra_urls'
+        self.assertEqual(CommonMiddleware().process_request(request), None)
 
+    @override_settings(APPEND_SLASH=True)
     def test_append_slash_quoted_custom_urlconf(self):
-      """
-      Tests that URLs which require quoting are redirected to their slash
-      version ok.
-      """
-      settings.APPEND_SLASH = True
-      request = self._get_request('customurlconf/needsquoting#')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      r = CommonMiddleware().process_request(request)
-      self.assertFalse(r is None,
-          "CommonMiddlware failed to return APPEND_SLASH redirect using request.urlconf")
-      self.assertEqual(r.status_code, 301)
-      self.assertEqual(
-          r['Location'],
-          'http://testserver/middleware/customurlconf/needsquoting%23/')
+        """
+        Tests that URLs which require quoting are redirected to their slash
+        version ok.
+        """
+        request = self._get_request('customurlconf/needsquoting#')
+        request.urlconf = 'middleware.extra_urls'
+        r = CommonMiddleware().process_request(request)
+        self.assertFalse(r is None,
+            "CommonMiddlware failed to return APPEND_SLASH redirect using request.urlconf")
+        self.assertEqual(r.status_code, 301)
+        self.assertEqual(
+            r.url,
+            'http://testserver/middleware/customurlconf/needsquoting%23/')
 
+    @override_settings(APPEND_SLASH=False, PREPEND_WWW=True)
     def test_prepend_www_custom_urlconf(self):
-      settings.PREPEND_WWW = True
-      settings.APPEND_SLASH = False
-      request = self._get_request('customurlconf/path/')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      r = CommonMiddleware().process_request(request)
-      self.assertEqual(r.status_code, 301)
-      self.assertEqual(
-          r['Location'],
-          'http://www.testserver/middleware/customurlconf/path/')
+        request = self._get_request('customurlconf/path/')
+        request.urlconf = 'middleware.extra_urls'
+        r = CommonMiddleware().process_request(request)
+        self.assertEqual(r.status_code, 301)
+        self.assertEqual(
+            r.url,
+            'http://www.testserver/middleware/customurlconf/path/')
 
+    @override_settings(APPEND_SLASH=True, PREPEND_WWW=True)
     def test_prepend_www_append_slash_have_slash_custom_urlconf(self):
-      settings.PREPEND_WWW = True
-      settings.APPEND_SLASH = True
-      request = self._get_request('customurlconf/slash/')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      r = CommonMiddleware().process_request(request)
-      self.assertEqual(r.status_code, 301)
-      self.assertEqual(r['Location'],
-                        'http://www.testserver/middleware/customurlconf/slash/')
+        request = self._get_request('customurlconf/slash/')
+        request.urlconf = 'middleware.extra_urls'
+        r = CommonMiddleware().process_request(request)
+        self.assertEqual(r.status_code, 301)
+        self.assertEqual(r.url,
+                          'http://www.testserver/middleware/customurlconf/slash/')
 
+    @override_settings(APPEND_SLASH=True, PREPEND_WWW=True)
     def test_prepend_www_append_slash_slashless_custom_urlconf(self):
-      settings.PREPEND_WWW = True
-      settings.APPEND_SLASH = True
-      request = self._get_request('customurlconf/slash')
-      request.urlconf = 'regressiontests.middleware.extra_urls'
-      r = CommonMiddleware().process_request(request)
-      self.assertEqual(r.status_code, 301)
-      self.assertEqual(r['Location'],
-                        'http://www.testserver/middleware/customurlconf/slash/')
+        request = self._get_request('customurlconf/slash')
+        request.urlconf = 'middleware.extra_urls'
+        r = CommonMiddleware().process_request(request)
+        self.assertEqual(r.status_code, 301)
+        self.assertEqual(r.url,
+                          'http://www.testserver/middleware/customurlconf/slash/')
 
-    # Tests for the 404 error reporting via email
+    # Legacy tests for the 404 error reporting via email (to be removed in 1.8)
 
+    @override_settings(IGNORABLE_404_URLS=(re.compile(r'foo'),),
+                       SEND_BROKEN_LINK_EMAILS=True,
+                       MANAGERS=('PHB@dilbert.com',))
     def test_404_error_reporting(self):
-        settings.IGNORABLE_404_URLS = (re.compile(r'foo'),)
-        settings.SEND_BROKEN_LINK_EMAILS = True
         request = self._get_request('regular_url/that/does/not/exist')
         request.META['HTTP_REFERER'] = '/another/url/'
-        response = self.client.get(request.path)
-        CommonMiddleware().process_response(request, response)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", PendingDeprecationWarning)
+            response = self.client.get(request.path)
+            CommonMiddleware().process_response(request, response)
         self.assertEqual(len(mail.outbox), 1)
         self.assertIn('Broken', mail.outbox[0].subject)
 
+    @override_settings(IGNORABLE_404_URLS=(re.compile(r'foo'),),
+                       SEND_BROKEN_LINK_EMAILS=True,
+                       MANAGERS=('PHB@dilbert.com',))
     def test_404_error_reporting_no_referer(self):
-        settings.IGNORABLE_404_URLS = (re.compile(r'foo'),)
-        settings.SEND_BROKEN_LINK_EMAILS = True
         request = self._get_request('regular_url/that/does/not/exist')
-        response = self.client.get(request.path)
-        CommonMiddleware().process_response(request, response)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", PendingDeprecationWarning)
+            response = self.client.get(request.path)
+            CommonMiddleware().process_response(request, response)
         self.assertEqual(len(mail.outbox), 0)
 
+    @override_settings(IGNORABLE_404_URLS=(re.compile(r'foo'),),
+                       SEND_BROKEN_LINK_EMAILS=True,
+                       MANAGERS=('PHB@dilbert.com',))
     def test_404_error_reporting_ignored_url(self):
-        settings.IGNORABLE_404_URLS = (re.compile(r'foo'),)
-        settings.SEND_BROKEN_LINK_EMAILS = True
         request = self._get_request('foo_url/that/does/not/exist/either')
         request.META['HTTP_REFERER'] = '/another/url/'
-        response = self.client.get(request.path)
-        CommonMiddleware().process_response(request, response)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", PendingDeprecationWarning)
+            response = self.client.get(request.path)
+            CommonMiddleware().process_response(request, response)
         self.assertEqual(len(mail.outbox), 0)
 
     # Other tests
@@ -299,13 +285,44 @@ class CommonMiddlewareTest(TestCase):
     def test_non_ascii_query_string_does_not_crash(self):
         """Regression test for #15152"""
         request = self._get_request('slash')
-        request.META['QUERY_STRING'] = 'drink=café'
+        request.META['QUERY_STRING'] = force_str('drink=café')
         response = CommonMiddleware().process_request(request)
         self.assertEqual(response.status_code, 301)
 
 
+@override_settings(
+    IGNORABLE_404_URLS=(re.compile(r'foo'),),
+    MANAGERS=('PHB@dilbert.com',),
+)
+class BrokenLinkEmailsMiddlewareTest(TestCase):
+
+    def setUp(self):
+        self.req = HttpRequest()
+        self.req.META = {
+            'SERVER_NAME': 'testserver',
+            'SERVER_PORT': 80,
+        }
+        self.req.path = self.req.path_info = 'regular_url/that/does/not/exist'
+        self.resp = self.client.get(self.req.path)
+
+    def test_404_error_reporting(self):
+        self.req.META['HTTP_REFERER'] = '/another/url/'
+        BrokenLinkEmailsMiddleware().process_response(self.req, self.resp)
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertIn('Broken', mail.outbox[0].subject)
+
+    def test_404_error_reporting_no_referer(self):
+        BrokenLinkEmailsMiddleware().process_response(self.req, self.resp)
+        self.assertEqual(len(mail.outbox), 0)
+
+    def test_404_error_reporting_ignored_url(self):
+        self.req.path = self.req.path_info = 'foo_url/that/does/not/exist'
+        BrokenLinkEmailsMiddleware().process_response(self.req, self.resp)
+        self.assertEqual(len(mail.outbox), 0)
+
+
 class ConditionalGetMiddlewareTest(TestCase):
-    urls = 'regressiontests.middleware.cond_get_urls'
+    urls = 'middleware.cond_get_urls'
     def setUp(self):
         self.req = HttpRequest()
         self.req.META = {
@@ -424,70 +441,66 @@ class XFrameOptionsMiddlewareTest(TestCase):
     """
     Tests for the X-Frame-Options clickjacking prevention middleware.
     """
-    def setUp(self):
-        self.x_frame_options = settings.X_FRAME_OPTIONS
-
-    def tearDown(self):
-        settings.X_FRAME_OPTIONS = self.x_frame_options
 
     def test_same_origin(self):
         """
         Tests that the X_FRAME_OPTIONS setting can be set to SAMEORIGIN to
         have the middleware use that value for the HTTP header.
         """
-        settings.X_FRAME_OPTIONS = 'SAMEORIGIN'
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       HttpResponse())
-        self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
+        with override_settings(X_FRAME_OPTIONS='SAMEORIGIN'):
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                           HttpResponse())
+            self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
 
-        settings.X_FRAME_OPTIONS = 'sameorigin'
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+        with override_settings(X_FRAME_OPTIONS='sameorigin'):
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
                                                        HttpResponse())
-        self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
+            self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
 
     def test_deny(self):
         """
         Tests that the X_FRAME_OPTIONS setting can be set to DENY to
         have the middleware use that value for the HTTP header.
         """
-        settings.X_FRAME_OPTIONS = 'DENY'
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       HttpResponse())
-        self.assertEqual(r['X-Frame-Options'], 'DENY')
+        with override_settings(X_FRAME_OPTIONS='DENY'):
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                           HttpResponse())
+            self.assertEqual(r['X-Frame-Options'], 'DENY')
 
-        settings.X_FRAME_OPTIONS = 'deny'
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       HttpResponse())
-        self.assertEqual(r['X-Frame-Options'], 'DENY')
+        with override_settings(X_FRAME_OPTIONS='deny'):
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                           HttpResponse())
+            self.assertEqual(r['X-Frame-Options'], 'DENY')
 
     def test_defaults_sameorigin(self):
         """
         Tests that if the X_FRAME_OPTIONS setting is not set then it defaults
         to SAMEORIGIN.
         """
-        del settings.X_FRAME_OPTIONS
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       HttpResponse())
-        self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
+        with override_settings(X_FRAME_OPTIONS=None):
+            del settings.X_FRAME_OPTIONS    # restored by override_settings
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                           HttpResponse())
+            self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
 
     def test_dont_set_if_set(self):
         """
         Tests that if the X-Frame-Options header is already set then the
         middleware does not attempt to override it.
         """
-        settings.X_FRAME_OPTIONS = 'DENY'
-        response = HttpResponse()
-        response['X-Frame-Options'] = 'SAMEORIGIN'
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       response)
-        self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
+        with override_settings(X_FRAME_OPTIONS='DENY'):
+            response = HttpResponse()
+            response['X-Frame-Options'] = 'SAMEORIGIN'
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                           response)
+            self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
 
-        settings.X_FRAME_OPTIONS = 'SAMEORIGIN'
-        response = HttpResponse()
-        response['X-Frame-Options'] = 'DENY'
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       response)
-        self.assertEqual(r['X-Frame-Options'], 'DENY')
+        with override_settings(X_FRAME_OPTIONS='SAMEORIGIN'):
+            response = HttpResponse()
+            response['X-Frame-Options'] = 'DENY'
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                           response)
+            self.assertEqual(r['X-Frame-Options'], 'DENY')
 
     def test_response_exempt(self):
         """
@@ -495,18 +508,18 @@ class XFrameOptionsMiddlewareTest(TestCase):
         to False then it still sets the header, but if it's set to True then
         it does not.
         """
-        settings.X_FRAME_OPTIONS = 'SAMEORIGIN'
-        response = HttpResponse()
-        response.xframe_options_exempt = False
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       response)
-        self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
+        with override_settings(X_FRAME_OPTIONS='SAMEORIGIN'):
+            response = HttpResponse()
+            response.xframe_options_exempt = False
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                           response)
+            self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
 
-        response = HttpResponse()
-        response.xframe_options_exempt = True
-        r = XFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       response)
-        self.assertEqual(r.get('X-Frame-Options', None), None)
+            response = HttpResponse()
+            response.xframe_options_exempt = True
+            r = XFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                           response)
+            self.assertEqual(r.get('X-Frame-Options', None), None)
 
     def test_is_extendable(self):
         """
@@ -523,23 +536,23 @@ class XFrameOptionsMiddlewareTest(TestCase):
                     return 'SAMEORIGIN'
                 return 'DENY'
 
-        settings.X_FRAME_OPTIONS = 'DENY'
-        response = HttpResponse()
-        response.sameorigin = True
-        r = OtherXFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                            response)
-        self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
+        with override_settings(X_FRAME_OPTIONS='DENY'):
+            response = HttpResponse()
+            response.sameorigin = True
+            r = OtherXFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                                response)
+            self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
 
-        request = HttpRequest()
-        request.sameorigin = True
-        r = OtherXFrameOptionsMiddleware().process_response(request,
-                                                            HttpResponse())
-        self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
+            request = HttpRequest()
+            request.sameorigin = True
+            r = OtherXFrameOptionsMiddleware().process_response(request,
+                                                                HttpResponse())
+            self.assertEqual(r['X-Frame-Options'], 'SAMEORIGIN')
 
-        settings.X_FRAME_OPTIONS = 'SAMEORIGIN'
-        r = OtherXFrameOptionsMiddleware().process_response(HttpRequest(),
-                                                       HttpResponse())
-        self.assertEqual(r['X-Frame-Options'], 'DENY')
+        with override_settings(X_FRAME_OPTIONS='SAMEORIGIN'):
+            r = OtherXFrameOptionsMiddleware().process_response(HttpRequest(),
+                                                                HttpResponse())
+            self.assertEqual(r['X-Frame-Options'], 'DENY')
 
 
 class GZipMiddlewareTest(TestCase):
@@ -664,3 +677,60 @@ class ETagGZipMiddlewareTest(TestCase):
         nogzip_etag = response.get('ETag')
 
         self.assertNotEqual(gzip_etag, nogzip_etag)
+
+class TransactionMiddlewareTest(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+    """
+    Test the transaction middleware.
+    """
+    def setUp(self):
+        super(TransactionMiddlewareTest, self).setUp()
+        self.request = HttpRequest()
+        self.request.META = {
+            'SERVER_NAME': 'testserver',
+            'SERVER_PORT': 80,
+        }
+        self.request.path = self.request.path_info = "/"
+        self.response = HttpResponse()
+        self.response.status_code = 200
+
+    def tearDown(self):
+        transaction.abort()
+        super(TransactionMiddlewareTest, self).tearDown()
+
+    def test_request(self):
+        TransactionMiddleware().process_request(self.request)
+        self.assertFalse(transaction.get_autocommit())
+
+    def test_managed_response(self):
+        transaction.enter_transaction_management()
+        Band.objects.create(name='The Beatles')
+        self.assertTrue(transaction.is_dirty())
+        TransactionMiddleware().process_response(self.request, self.response)
+        self.assertFalse(transaction.is_dirty())
+        self.assertEqual(Band.objects.count(), 1)
+
+    def test_exception(self):
+        transaction.enter_transaction_management()
+        Band.objects.create(name='The Beatles')
+        self.assertTrue(transaction.is_dirty())
+        TransactionMiddleware().process_exception(self.request, None)
+        self.assertFalse(transaction.is_dirty())
+        self.assertEqual(Band.objects.count(), 0)
+
+    def test_failing_commit(self):
+        # It is possible that connection.commit() fails. Check that
+        # TransactionMiddleware handles such cases correctly.
+        try:
+            def raise_exception():
+                raise IntegrityError()
+            connections[DEFAULT_DB_ALIAS].commit = raise_exception
+            transaction.enter_transaction_management()
+            Band.objects.create(name='The Beatles')
+            self.assertTrue(transaction.is_dirty())
+            with self.assertRaises(IntegrityError):
+                TransactionMiddleware().process_response(self.request, None)
+            self.assertFalse(transaction.is_dirty())
+            self.assertEqual(Band.objects.count(), 0)
+            self.assertFalse(transaction.is_managed())
+        finally:
+            del connections[DEFAULT_DB_ALIAS].commit
diff --git a/tests/regressiontests/middleware/urls.py b/tests/middleware/urls.py
similarity index 100%
rename from tests/regressiontests/middleware/urls.py
rename to tests/middleware/urls.py
diff --git a/tests/modeltests/timezones/__init__.py b/tests/middleware_exceptions/__init__.py
similarity index 100%
rename from tests/modeltests/timezones/__init__.py
rename to tests/middleware_exceptions/__init__.py
diff --git a/tests/regressiontests/logging_tests/models.py b/tests/middleware_exceptions/models.py
similarity index 100%
rename from tests/regressiontests/logging_tests/models.py
rename to tests/middleware_exceptions/models.py
diff --git a/tests/regressiontests/middleware_exceptions/tests.py b/tests/middleware_exceptions/tests.py
similarity index 98%
rename from tests/regressiontests/middleware_exceptions/tests.py
rename to tests/middleware_exceptions/tests.py
index 586aa0f004..18f8cd1ba3 100644
--- a/tests/regressiontests/middleware_exceptions/tests.py
+++ b/tests/middleware_exceptions/tests.py
@@ -94,7 +94,7 @@ class BadExceptionMiddleware(TestMiddleware):
 
 
 class BaseMiddlewareExceptionTest(TestCase):
-    urls = 'regressiontests.middleware_exceptions.urls'
+    urls = 'middleware_exceptions.urls'
 
     def setUp(self):
         self.exceptions = []
@@ -374,7 +374,7 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self._add_middleware(middleware)
         self._add_middleware(pre_middleware)
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [
-                "The view regressiontests.middleware_exceptions.views.null_view didn't return an HttpResponse object.",
+                "The view middleware_exceptions.views.null_view didn't return an HttpResponse object.",
             ],
             ValueError())
 
@@ -391,7 +391,7 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self._add_middleware(middleware)
         self._add_middleware(pre_middleware)
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [
-                "The view regressiontests.middleware_exceptions.views.null_view didn't return an HttpResponse object."
+                "The view middleware_exceptions.views.null_view didn't return an HttpResponse object."
             ],
             ValueError())
 
@@ -685,7 +685,7 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self._add_middleware(bad_middleware)
         self._add_middleware(pre_middleware)
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [
-                "The view regressiontests.middleware_exceptions.views.null_view didn't return an HttpResponse object.",
+                "The view middleware_exceptions.views.null_view didn't return an HttpResponse object.",
                 'Test Response Exception'
             ])
 
@@ -702,7 +702,7 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self._add_middleware(bad_middleware)
         self._add_middleware(pre_middleware)
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [
-                "The view regressiontests.middleware_exceptions.views.null_view didn't return an HttpResponse object."
+                "The view middleware_exceptions.views.null_view didn't return an HttpResponse object."
             ],
             ValueError())
 
@@ -770,7 +770,7 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
 
 _missing = object()
 class RootUrlconfTests(TestCase):
-    urls = 'regressiontests.middleware_exceptions.urls'
+    urls = 'middleware_exceptions.urls'
 
     def test_missing_root_urlconf(self):
         try:
diff --git a/tests/regressiontests/middleware_exceptions/urls.py b/tests/middleware_exceptions/urls.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/urls.py
rename to tests/middleware_exceptions/urls.py
diff --git a/tests/regressiontests/middleware_exceptions/views.py b/tests/middleware_exceptions/views.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/views.py
rename to tests/middleware_exceptions/views.py
diff --git a/tests/regressiontests/model_fields/4x8.png b/tests/model_fields/4x8.png
similarity index 100%
rename from tests/regressiontests/model_fields/4x8.png
rename to tests/model_fields/4x8.png
diff --git a/tests/regressiontests/model_fields/8x4.png b/tests/model_fields/8x4.png
similarity index 100%
rename from tests/regressiontests/model_fields/8x4.png
rename to tests/model_fields/8x4.png
diff --git a/tests/modeltests/transactions/__init__.py b/tests/model_fields/__init__.py
similarity index 100%
rename from tests/modeltests/transactions/__init__.py
rename to tests/model_fields/__init__.py
diff --git a/tests/regressiontests/model_fields/models.py b/tests/model_fields/models.py
similarity index 98%
rename from tests/regressiontests/model_fields/models.py
rename to tests/model_fields/models.py
index 1d20f44fae..c3b2f7fccb 100644
--- a/tests/regressiontests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -106,6 +106,10 @@ class VerboseNameField(models.Model):
 class DecimalLessThanOne(models.Model):
     d = models.DecimalField(max_digits=3, decimal_places=3)
 
+class DataModel(models.Model):
+    short_data = models.BinaryField(max_length=10, default=b'\x08')
+    data = models.BinaryField()
+
 ###############################################################################
 # FileField
 
diff --git a/tests/regressiontests/model_fields/imagefield.py b/tests/model_fields/test_imagefield.py
similarity index 100%
rename from tests/regressiontests/model_fields/imagefield.py
rename to tests/model_fields/test_imagefield.py
diff --git a/tests/regressiontests/model_fields/tests.py b/tests/model_fields/tests.py
similarity index 90%
rename from tests/regressiontests/model_fields/tests.py
rename to tests/model_fields/tests.py
index a49894e36c..9af8325040 100644
--- a/tests/regressiontests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -6,16 +6,16 @@ from decimal import Decimal
 from django import test
 from django import forms
 from django.core.exceptions import ValidationError
-from django.db import models
+from django.db import models, IntegrityError
 from django.db.models.fields.files import FieldFile
 from django.utils import six
 from django.utils import unittest
 
 from .models import (Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post,
-    NullBooleanModel, BooleanModel, Document, RenamedField, VerboseNameField,
-    FksToBooleans)
+    NullBooleanModel, BooleanModel, DataModel, Document, RenamedField,
+    VerboseNameField, FksToBooleans)
 
-from .imagefield import (ImageFieldTests, ImageFieldTwoDimensionsTests,
+from .test_imagefield import (ImageFieldTests, ImageFieldTwoDimensionsTests,
     TwoImageFieldTests, ImageFieldNoDimensionsTests,
     ImageFieldOneDimensionTests, ImageFieldDimensionsFirstTests,
     ImageFieldUsingFileTests)
@@ -73,6 +73,16 @@ class BasicFieldTests(test.TestCase):
 
         self.assertEqual(m._meta.get_field('id').verbose_name, 'verbose pk')
 
+    def test_formclass_with_choices(self):
+        # regression for 18162
+        class CustomChoiceField(forms.TypedChoiceField):
+            pass
+        choices = [('a@b.cc', 'a@b.cc'), ('b@b.cc', 'b@b.cc')]
+        field = models.CharField(choices=choices)
+        klass = CustomChoiceField
+        self.assertIsInstance(field.formfield(form_class=klass), klass)
+
+
 class DecimalFieldTests(test.TestCase):
     def test_to_python(self):
         f = models.DecimalField(max_digits=4, decimal_places=2)
@@ -255,6 +265,18 @@ class BooleanFieldTests(unittest.TestCase):
         self.assertEqual(mc.bf.bfield, False)
         self.assertEqual(mc.nbf.nbfield, False)
 
+    def test_null_default(self):
+        """
+        Check that a BooleanField defaults to None -- which isn't
+        a valid value (#15124).
+        """
+        b = BooleanModel()
+        self.assertIsNone(b.bfield)
+        with self.assertRaises(IntegrityError):
+            b.save()
+        nb = NullBooleanModel()
+        self.assertIsNone(nb.nbfield)
+        nb.save()           # no error
 
 class ChoicesTests(test.TestCase):
     def test_choices_and_field_display(self):
@@ -414,3 +436,25 @@ class FileFieldTests(unittest.TestCase):
         field = d._meta.get_field('myfile')
         field.save_form_data(d, 'else.txt')
         self.assertEqual(d.myfile, 'else.txt')
+
+
+class BinaryFieldTests(test.TestCase):
+    binary_data = b'\x00\x46\xFE'
+
+    def test_set_and_retrieve(self):
+        data_set = (self.binary_data, six.memoryview(self.binary_data))
+        for bdata in data_set:
+            dm = DataModel(data=bdata)
+            dm.save()
+            dm = DataModel.objects.get(pk=dm.pk)
+            self.assertEqual(bytes(dm.data), bytes(bdata))
+            # Resave (=update)
+            dm.save()
+            dm = DataModel.objects.get(pk=dm.pk)
+            self.assertEqual(bytes(dm.data), bytes(bdata))
+            # Test default value
+            self.assertEqual(bytes(dm.short_data), b'\x08')
+
+    def test_max_length(self):
+        dm = DataModel(short_data=self.binary_data*4)
+        self.assertRaises(ValidationError, dm.full_clean)
diff --git a/tests/modeltests/update/__init__.py b/tests/model_forms/__init__.py
similarity index 100%
rename from tests/modeltests/update/__init__.py
rename to tests/model_forms/__init__.py
diff --git a/tests/modeltests/model_forms/models.py b/tests/model_forms/models.py
similarity index 93%
rename from tests/modeltests/model_forms/models.py
rename to tests/model_forms/models.py
index 132da2d318..25c780f1c2 100644
--- a/tests/modeltests/model_forms/models.py
+++ b/tests/model_forms/models.py
@@ -16,6 +16,7 @@ from django.db import models
 from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 
+from shared_models.models import Author, Book
 
 temp_storage_dir = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
 temp_storage = FileSystemStorage(temp_storage_dir)
@@ -44,23 +45,13 @@ class Category(models.Model):
     def __repr__(self):
         return self.__str__()
 
-@python_2_unicode_compatible
-class Writer(models.Model):
-    name = models.CharField(max_length=50, help_text='Use both first and last names.')
-
-    class Meta:
-        ordering = ('name',)
-
-    def __str__(self):
-        return self.name
-
 @python_2_unicode_compatible
 class Article(models.Model):
     headline = models.CharField(max_length=50)
     slug = models.SlugField()
     pub_date = models.DateField()
     created = models.DateField(editable=False)
-    writer = models.ForeignKey(Writer)
+    writer = models.ForeignKey(Author)
     article = models.TextField()
     categories = models.ManyToManyField(Category, blank=True)
     status = models.PositiveIntegerField(choices=ARTICLE_STATUS, blank=True, null=True)
@@ -80,12 +71,12 @@ class ImprovedArticle(models.Model):
 class ImprovedArticleWithParentLink(models.Model):
     article = models.OneToOneField(Article, parent_link=True)
 
-class BetterWriter(Writer):
+class BetterAuthor(Author):
     score = models.IntegerField()
 
 @python_2_unicode_compatible
-class WriterProfile(models.Model):
-    writer = models.OneToOneField(Writer, primary_key=True)
+class AuthorProfile(models.Model):
+    writer = models.OneToOneField(Author, primary_key=True)
     age = models.PositiveIntegerField()
 
     def __str__(self):
@@ -192,14 +183,6 @@ class Inventory(models.Model):
     def __repr__(self):
         return self.__str__()
 
-class Book(models.Model):
-    title = models.CharField(max_length=40)
-    author = models.ForeignKey(Writer, blank=True, null=True)
-    special_id = models.IntegerField(blank=True, null=True, unique=True)
-
-    class Meta:
-        unique_together = ('title', 'author')
-
 class BookXtra(models.Model):
     isbn = models.CharField(max_length=16, unique=True)
     suffix1 = models.IntegerField(blank=True, default=0)
@@ -263,3 +246,18 @@ class FlexibleDatePost(models.Model):
     slug = models.CharField(max_length=50, unique_for_year='posted', blank=True)
     subtitle = models.CharField(max_length=50, unique_for_month='posted', blank=True)
     posted = models.DateField(blank=True, null=True)
+
+@python_2_unicode_compatible
+class Colour(models.Model):
+    name = models.CharField(max_length=50)
+
+    def __iter__(self):
+        for number in xrange(5):
+            yield number
+
+    def __str__(self):
+        return self.name
+
+class ColourfulItem(models.Model):
+    name = models.CharField(max_length=50)
+    colours = models.ManyToManyField(Colour)
diff --git a/tests/regressiontests/file_storage/test.png b/tests/model_forms/test.png
similarity index 100%
rename from tests/regressiontests/file_storage/test.png
rename to tests/model_forms/test.png
diff --git a/tests/modeltests/model_forms/test2.png b/tests/model_forms/test2.png
similarity index 100%
rename from tests/modeltests/model_forms/test2.png
rename to tests/model_forms/test2.png
diff --git a/tests/modeltests/model_forms/tests.py b/tests/model_forms/tests.py
similarity index 92%
rename from tests/modeltests/model_forms/tests.py
rename to tests/model_forms/tests.py
index 9699b155c0..96c3ecbdce 100644
--- a/tests/modeltests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -5,6 +5,7 @@ import os
 from decimal import Decimal
 
 from django import forms
+from django.core.exceptions import FieldError
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.validators import ValidationError
 from django.db import connection
@@ -15,11 +16,14 @@ from django.utils.unittest import skipUnless
 from django.test import TestCase
 from django.utils import six
 
-from .models import (Article, ArticleStatus, BetterWriter, BigInt, Book,
+from shared_models.models import Author, Book
+
+from .models import (Article, ArticleStatus, BetterAuthor, BigInt,
     Category, CommaSeparatedInteger, CustomFieldForExclusionModel, DerivedBook,
     DerivedPost, ExplicitPK, FlexibleDatePost, ImprovedArticle,
     ImprovedArticleWithParentLink, Inventory, Post, Price,
-    Product, TextFile, Writer, WriterProfile, test_images)
+    Product, TextFile, AuthorProfile, Colour, ColourfulItem,
+    test_images)
 
 if test_images:
     from .models import ImageFile, OptionalImageFile
@@ -43,11 +47,13 @@ class PriceForm(forms.ModelForm):
 
 class BookForm(forms.ModelForm):
     class Meta:
-       model = Book
+        fields = ['title', 'author', 'pubdate']
+        model = Book
 
 
 class DerivedBookForm(forms.ModelForm):
     class Meta:
+        fields = ['title', 'author', 'isbn', 'suffix1', 'suffix2']
         model = DerivedBook
 
 
@@ -67,11 +73,11 @@ class DerivedPostForm(forms.ModelForm):
         model = DerivedPost
 
 
-class CustomWriterForm(forms.ModelForm):
+class CustomAuthorForm(forms.ModelForm):
    name = forms.CharField(required=False)
 
    class Meta:
-       model = Writer
+       model = Author
 
 
 class FlexDatePostForm(forms.ModelForm):
@@ -100,7 +106,7 @@ class PartialArticleForm(forms.ModelForm):
 
 class RoykoForm(forms.ModelForm):
     class Meta:
-        model = Writer
+        model = Author
 
 class TestArticleForm(forms.ModelForm):
     class Meta:
@@ -132,6 +138,9 @@ class ShortCategory(forms.ModelForm):
     slug = forms.CharField(max_length=5)
     url = forms.CharField(max_length=3)
 
+    class Meta:
+        model = Category
+
 class ImprovedArticleForm(forms.ModelForm):
     class Meta:
         model = ImprovedArticle
@@ -140,13 +149,13 @@ class ImprovedArticleWithParentLinkForm(forms.ModelForm):
     class Meta:
         model = ImprovedArticleWithParentLink
 
-class BetterWriterForm(forms.ModelForm):
+class BetterAuthorForm(forms.ModelForm):
     class Meta:
-        model = BetterWriter
+        model = BetterAuthor
 
-class WriterProfileForm(forms.ModelForm):
+class AuthorProfileForm(forms.ModelForm):
     class Meta:
-        model = WriterProfile
+        model = AuthorProfile
 
 class TextFileForm(forms.ModelForm):
     class Meta:
@@ -174,6 +183,10 @@ class PriceFormWithoutQuantity(forms.ModelForm):
         model = Price
         exclude = ('quantity',)
 
+class ColourfulItemForm(forms.ModelForm):
+    class Meta:
+        model = ColourfulItem
+
 
 class ModelFormBaseTest(TestCase):
     def test_base_form(self):
@@ -198,13 +211,13 @@ class ModelFormBaseTest(TestCase):
                                      forms.fields.BooleanField))
 
     def test_override_field(self):
-        class WriterForm(forms.ModelForm):
+        class AuthorForm(forms.ModelForm):
             book = forms.CharField(required=False)
 
             class Meta:
-                model = Writer
+                model = Author
 
-        wf = WriterForm({'name': 'Richard Lockridge'})
+        wf = AuthorForm({'name': 'Richard Lockridge'})
         self.assertTrue(wf.is_valid())
 
     def test_limit_fields(self):
@@ -216,6 +229,22 @@ class ModelFormBaseTest(TestCase):
         self.assertEqual(list(LimitFields.base_fields),
                          ['url'])
 
+    def test_limit_nonexistent_field(self):
+        expected_msg = 'Unknown field(s) (nonexistent) specified for Category'
+        with self.assertRaisesMessage(FieldError, expected_msg):
+            class InvalidCategoryForm(forms.ModelForm):
+                class Meta:
+                    model = Category
+                    fields = ['nonexistent']
+
+    def test_limit_fields_with_string(self):
+        expected_msg = "CategoryForm.Meta.fields cannot be a string. Did you mean to type: ('url',)?"
+        with self.assertRaisesMessage(TypeError, expected_msg):
+            class CategoryForm(forms.ModelForm):
+                class Meta:
+                    model = Category
+                    fields = ('url') # note the missing comma
+
     def test_exclude_fields(self):
         class ExcludeFields(forms.ModelForm):
             class Meta:
@@ -225,6 +254,23 @@ class ModelFormBaseTest(TestCase):
         self.assertEqual(list(ExcludeFields.base_fields),
                          ['name', 'slug'])
 
+    def test_exclude_nonexistent_field(self):
+        class ExcludeFields(forms.ModelForm):
+            class Meta:
+                model = Category
+                exclude = ['nonexistent']
+
+        self.assertEqual(list(ExcludeFields.base_fields),
+                         ['name', 'slug', 'url'])
+
+    def test_exclude_fields_with_string(self):
+        expected_msg = "CategoryForm.Meta.exclude cannot be a string. Did you mean to type: ('url',)?"
+        with self.assertRaisesMessage(TypeError, expected_msg):
+            class CategoryForm(forms.ModelForm):
+                class Meta:
+                    model = Category
+                    exclude = ('url') # note the missing comma
+
     def test_confused_form(self):
         class ConfusedForm(forms.ModelForm):
             """ Using 'fields' *and* 'exclude'. Not sure why you'd want to do
@@ -272,6 +318,19 @@ class ModelFormBaseTest(TestCase):
             ['headline', 'slug', 'pub_date', 'writer', 'article', 'categories', 'status']
         )
 
+    def test_invalid_meta_model(self):
+        class InvalidModelForm(forms.ModelForm):
+            class Meta:
+                pass  # no model
+
+        # Can't create new form
+        with self.assertRaises(ValueError):
+            f = InvalidModelForm()
+
+        # Even if you provide a model instance
+        with self.assertRaises(ValueError):
+            f = InvalidModelForm(instance=Category)
+
     def test_subcategory_form(self):
         class SubCategoryForm(BaseCategoryForm):
             """ Subclassing without specifying a Meta on the class will use
@@ -390,7 +449,7 @@ class ValidationTest(TestCase):
         assert form.is_valid()
 
     def test_notrequired_overrides_notblank(self):
-        form = CustomWriterForm({})
+        form = CustomAuthorForm({})
         assert form.is_valid()
 
 
@@ -399,7 +458,7 @@ class ValidationTest(TestCase):
 # unique/unique_together validation
 class UniqueTest(TestCase):
     def setUp(self):
-        self.writer = Writer.objects.create(name='Mike Royko')
+        self.author = Author.objects.create(name='Mike Royko')
 
     def test_simple_unique(self):
         form = ProductForm({'slug': 'teddy-bear-blue'})
@@ -423,33 +482,31 @@ class UniqueTest(TestCase):
 
     def test_unique_null(self):
         title = 'I May Be Wrong But I Doubt It'
-        form = BookForm({'title': title, 'author': self.writer.pk})
+        form = BookForm({'title': title, 'author': self.author.pk, 'pubdate': '2012-12-12 00:00:00'})
         self.assertTrue(form.is_valid())
         form.save()
-        form = BookForm({'title': title, 'author': self.writer.pk})
+        form = BookForm({'title': title, 'author': self.author.pk, 'pubdate': '2012-12-12 00:00:00'})
         self.assertFalse(form.is_valid())
         self.assertEqual(len(form.errors), 1)
         self.assertEqual(form.errors['__all__'], ['Book with this Title and Author already exists.'])
-        form = BookForm({'title': title})
+        form = BookForm({'title': title, 'pubdate': '2012-12-12 00:00:00'})
         self.assertTrue(form.is_valid())
         form.save()
-        form = BookForm({'title': title})
+        form = BookForm({'title': title, 'pubdate': '2012-12-12 00:00:00'})
         self.assertTrue(form.is_valid())
 
     def test_inherited_unique(self):
-        title = 'Boss'
-        Book.objects.create(title=title, author=self.writer, special_id=1)
-        form = DerivedBookForm({'title': 'Other', 'author': self.writer.pk, 'special_id': '1', 'isbn': '12345'})
+        form = BetterAuthorForm({'name': 'Mike Royko', 'score': 3})
         self.assertFalse(form.is_valid())
         self.assertEqual(len(form.errors), 1)
-        self.assertEqual(form.errors['special_id'], ['Book with this Special id already exists.'])
+        self.assertEqual(form.errors['name'], ['Author with this Name already exists.'])
 
     def test_inherited_unique_together(self):
         title = 'Boss'
-        form = BookForm({'title': title, 'author': self.writer.pk})
+        form = BookForm({'title': title, 'author': self.author.pk, 'pubdate': '2012-12-12 00:00:00'})
         self.assertTrue(form.is_valid())
         form.save()
-        form = DerivedBookForm({'title': title, 'author': self.writer.pk, 'isbn': '12345'})
+        form = DerivedBookForm({'title': title, 'author': self.author.pk, 'isbn': '12345'})
         self.assertFalse(form.is_valid())
         self.assertEqual(len(form.errors), 1)
         self.assertEqual(form.errors['__all__'], ['Book with this Title and Author already exists.'])
@@ -457,8 +514,9 @@ class UniqueTest(TestCase):
     def test_abstract_inherited_unique(self):
         title = 'Boss'
         isbn = '12345'
-        dbook = DerivedBook.objects.create(title=title, author=self.writer, isbn=isbn)
-        form = DerivedBookForm({'title': 'Other', 'author': self.writer.pk, 'isbn': isbn})
+        dbook = DerivedBook.objects.create(title=title, author=self.author, isbn=isbn,
+            pubdate='2012-12-12 00:00')
+        form = DerivedBookForm({'title': 'Other', 'author': self.author.pk, 'isbn': isbn})
         self.assertFalse(form.is_valid())
         self.assertEqual(len(form.errors), 1)
         self.assertEqual(form.errors['isbn'], ['Derived book with this Isbn already exists.'])
@@ -466,10 +524,11 @@ class UniqueTest(TestCase):
     def test_abstract_inherited_unique_together(self):
         title = 'Boss'
         isbn = '12345'
-        dbook = DerivedBook.objects.create(title=title, author=self.writer, isbn=isbn)
+        dbook = DerivedBook.objects.create(title=title, author=self.author, isbn=isbn,
+            pubdate='2012-12-12 00:00')
         form = DerivedBookForm({
                     'title': 'Other',
-                    'author': self.writer.pk,
+                    'author': self.author.pk,
                     'isbn': '9876',
                     'suffix1': '0',
                     'suffix2': '0'
@@ -570,7 +629,7 @@ class ModelToDictTests(TestCase):
         ]
         for c in categories:
             c.save()
-        writer = Writer(name='Test writer')
+        writer = Author(name='Test writer')
         writer.save()
 
         art = Article(
@@ -679,10 +738,10 @@ class OldFormForXTests(TestCase):
         with self.assertRaises(ValueError):
             f.save()
 
-        # Create a couple of Writers.
-        w_royko = Writer(name='Mike Royko')
+        # Create a couple of Authors.
+        w_royko = Author(name='Mike Royko')
         w_royko.save()
-        w_woodward = Writer(name='Bob Woodward')
+        w_woodward = Author(name='Bob Woodward')
         w_woodward.save()
         # ManyToManyFields are represented by a MultipleChoiceField, ForeignKeys and any
         # fields with the 'choices' attribute are represented by a ChoiceField.
@@ -720,9 +779,9 @@ class OldFormForXTests(TestCase):
 
         # When the ModelForm is passed an instance, that instance's current values are
         # inserted as 'initial' data in each Field.
-        w = Writer.objects.get(name='Mike Royko')
+        w = Author.objects.get(name='Mike Royko')
         f = RoykoForm(auto_id=False, instance=w)
-        self.assertHTMLEqual(six.text_type(f), '''<tr><th>Name:</th><td><input type="text" name="name" value="Mike Royko" maxlength="50" /><br /><span class="helptext">Use both first and last names.</span></td></tr>''')
+        self.assertHTMLEqual(six.text_type(f), '''<tr><th>Name:</th><td><input type="text" name="name" value="Mike Royko" maxlength="100" /><br /><span class="helptext">Use both first and last names.</span></td></tr>''')
 
         art = Article(
                     headline='Test article',
@@ -934,7 +993,7 @@ class OldFormForXTests(TestCase):
 
         c4 = Category.objects.create(name='Fourth', url='4th')
         self.assertEqual(c4.name, 'Fourth')
-        w_bernstein = Writer.objects.create(name='Carl Bernstein')
+        w_bernstein = Author.objects.create(name='Carl Bernstein')
         self.assertEqual(w_bernstein.name, 'Carl Bernstein')
         self.assertHTMLEqual(f.as_ul(), '''<li>Headline: <input type="text" name="headline" maxlength="50" /></li>
 <li>Slug: <input type="text" name="slug" maxlength="50" /></li>
@@ -968,6 +1027,7 @@ class OldFormForXTests(TestCase):
             (c2.pk, "It's a test"),
             (c3.pk, 'Third'),
             (c4.pk, 'Fourth')])
+        self.assertEqual(5, len(f.choices))
         with self.assertRaises(ValidationError):
             f.clean('')
         with self.assertRaises(ValidationError):
@@ -1110,17 +1170,17 @@ class OldFormForXTests(TestCase):
 
         self.assertEqual(list(ImprovedArticleWithParentLinkForm.base_fields), [])
 
-        bw = BetterWriter(name='Joe Better', score=10)
+        bw = BetterAuthor(name='Joe Better', score=10)
         bw.save()
         self.assertEqual(sorted(model_to_dict(bw)),
-                         ['id', 'name', 'score', 'writer_ptr'])
+                         ['author_ptr', 'id', 'name', 'score'])
 
-        form = BetterWriterForm({'name': 'Some Name', 'score': 12})
+        form = BetterAuthorForm({'name': 'Some Name', 'score': 12})
         self.assertEqual(form.is_valid(), True)
         bw2 = form.save()
         bw2.delete()
 
-        form = WriterProfileForm()
+        form = AuthorProfileForm()
         self.assertHTMLEqual(form.as_p(), '''<p><label for="id_writer">Writer:</label> <select name="writer" id="id_writer">
 <option value="" selected="selected">---------</option>
 <option value="%s">Bob Woodward</option>
@@ -1128,17 +1188,17 @@ class OldFormForXTests(TestCase):
 <option value="%s">Joe Better</option>
 <option value="%s">Mike Royko</option>
 </select></p>
-<p><label for="id_age">Age:</label> <input type="text" name="age" id="id_age" /></p>''' % (w_woodward.pk, w_bernstein.pk, bw.pk, w_royko.pk))
+<p><label for="id_age">Age:</label> <input type="number" name="age" id="id_age" min="0" /></p>''' % (w_woodward.pk, w_bernstein.pk, bw.pk, w_royko.pk))
 
         data = {
             'writer': six.text_type(w_woodward.pk),
             'age': '65',
         }
-        form = WriterProfileForm(data)
+        form = AuthorProfileForm(data)
         instance = form.save()
         self.assertEqual(six.text_type(instance), 'Bob Woodward is 65')
 
-        form = WriterProfileForm(instance=instance)
+        form = AuthorProfileForm(instance=instance)
         self.assertHTMLEqual(form.as_p(), '''<p><label for="id_writer">Writer:</label> <select name="writer" id="id_writer">
 <option value="">---------</option>
 <option value="%s" selected="selected">Bob Woodward</option>
@@ -1146,7 +1206,7 @@ class OldFormForXTests(TestCase):
 <option value="%s">Joe Better</option>
 <option value="%s">Mike Royko</option>
 </select></p>
-<p><label for="id_age">Age:</label> <input type="text" name="age" value="65" id="id_age" /></p>''' % (w_woodward.pk, w_bernstein.pk, bw.pk, w_royko.pk))
+<p><label for="id_age">Age:</label> <input type="number" name="age" value="65" id="id_age" min="0" /></p>''' % (w_woodward.pk, w_bernstein.pk, bw.pk, w_royko.pk))
 
     def test_file_field(self):
         # Test conditions when files is either not given or empty.
@@ -1518,3 +1578,15 @@ class OldFormForXTests(TestCase):
                          ['name'])
         self.assertHTMLEqual(six.text_type(CustomFieldForExclusionForm()),
                          '''<tr><th><label for="id_name">Name:</label></th><td><input id="id_name" type="text" name="name" maxlength="10" /></td></tr>''')
+
+    def test_iterable_model_m2m(self) :
+        colour = Colour.objects.create(name='Blue')
+        form = ColourfulItemForm()
+        self.maxDiff = 1024
+        self.assertHTMLEqual(
+            form.as_p(),
+            """<p><label for="id_name">Name:</label> <input id="id_name" type="text" name="name" maxlength="50" /></p>
+        <p><label for="id_colours">Colours:</label> <select multiple="multiple" name="colours" id="id_colours">
+        <option value="%(blue_pk)s">Blue</option>
+        </select> <span class="helptext"> Hold down "Control", or "Command" on a Mac, to select more than one.</span></p>"""
+            % {'blue_pk': colour.pk})
diff --git a/tests/modeltests/update_only_fields/__init__.py b/tests/model_forms_regress/__init__.py
similarity index 100%
rename from tests/modeltests/update_only_fields/__init__.py
rename to tests/model_forms_regress/__init__.py
diff --git a/tests/regressiontests/model_forms_regress/models.py b/tests/model_forms_regress/models.py
similarity index 100%
rename from tests/regressiontests/model_forms_regress/models.py
rename to tests/model_forms_regress/models.py
diff --git a/tests/regressiontests/model_forms_regress/tests.py b/tests/model_forms_regress/tests.py
similarity index 100%
rename from tests/regressiontests/model_forms_regress/tests.py
rename to tests/model_forms_regress/tests.py
diff --git a/tests/modeltests/user_commands/__init__.py b/tests/model_formsets/__init__.py
similarity index 100%
rename from tests/modeltests/user_commands/__init__.py
rename to tests/model_formsets/__init__.py
diff --git a/tests/modeltests/model_formsets/models.py b/tests/model_formsets/models.py
similarity index 100%
rename from tests/modeltests/model_formsets/models.py
rename to tests/model_formsets/models.py
diff --git a/tests/modeltests/model_formsets/tests.py b/tests/model_formsets/tests.py
similarity index 91%
rename from tests/modeltests/model_formsets/tests.py
rename to tests/model_formsets/tests.py
index e28560b237..8d0c017a61 100644
--- a/tests/modeltests/model_formsets/tests.py
+++ b/tests/model_formsets/tests.py
@@ -42,21 +42,29 @@ class DeletionTests(TestCase):
         doesn't cause validation errors.
         """
         PoetFormSet = modelformset_factory(Poet, can_delete=True)
+        poet = Poet.objects.create(name='test')
+        # One existing untouched and two new unvalid forms
         data = {
-            'form-TOTAL_FORMS': '1',
-            'form-INITIAL_FORMS': '0',
+            'form-TOTAL_FORMS': '3',
+            'form-INITIAL_FORMS': '1',
             'form-MAX_NUM_FORMS': '0',
-            'form-0-id': '',
-            'form-0-name': 'x' * 1000,
+            'form-0-id': six.text_type(poet.id),
+            'form-0-name': 'test',
+            'form-1-id': '',
+            'form-1-name': 'x' * 1000, # Too long
+            'form-1-id': six.text_type(poet.id), # Violate unique constraint
+            'form-1-name': 'test2',
         }
         formset = PoetFormSet(data, queryset=Poet.objects.all())
         # Make sure this form doesn't pass validation.
         self.assertEqual(formset.is_valid(), False)
-        self.assertEqual(Poet.objects.count(), 0)
+        self.assertEqual(Poet.objects.count(), 1)
 
         # Then make sure that it *does* pass validation and delete the object,
-        # even though the data isn't actually valid.
+        # even though the data in new forms aren't actually valid.
         data['form-0-DELETE'] = 'on'
+        data['form-1-DELETE'] = 'on'
+        data['form-2-DELETE'] = 'on'
         formset = PoetFormSet(data, queryset=Poet.objects.all())
         self.assertEqual(formset.is_valid(), True)
         formset.save()
@@ -64,7 +72,7 @@ class DeletionTests(TestCase):
 
     def test_change_form_deletion_when_invalid(self):
         """
-        Make sure that an add form that is filled out, but marked for deletion
+        Make sure that a change form that is filled out, but marked for deletion
         doesn't cause validation errors.
         """
         PoetFormSet = modelformset_factory(Poet, can_delete=True)
@@ -384,7 +392,7 @@ class ModelFormsetTest(TestCase):
         self.assertEqual(len(formset.forms), 1)
         self.assertHTMLEqual(formset.forms[0].as_p(),
             '<p><label for="id_form-0-name">Name:</label> <input id="id_form-0-name" type="text" name="form-0-name" maxlength="100" /></p>\n'
-            '<p><label for="id_form-0-write_speed">Write speed:</label> <input type="text" name="form-0-write_speed" id="id_form-0-write_speed" /><input type="hidden" name="form-0-author_ptr" id="id_form-0-author_ptr" /></p>')
+            '<p><label for="id_form-0-write_speed">Write speed:</label> <input type="number" name="form-0-write_speed" id="id_form-0-write_speed" /><input type="hidden" name="form-0-author_ptr" id="id_form-0-author_ptr" /></p>')
 
         data = {
             'form-TOTAL_FORMS': '1', # the number of forms rendered
@@ -407,10 +415,10 @@ class ModelFormsetTest(TestCase):
         self.assertEqual(len(formset.forms), 2)
         self.assertHTMLEqual(formset.forms[0].as_p(),
             '<p><label for="id_form-0-name">Name:</label> <input id="id_form-0-name" type="text" name="form-0-name" value="Ernest Hemingway" maxlength="100" /></p>\n'
-            '<p><label for="id_form-0-write_speed">Write speed:</label> <input type="text" name="form-0-write_speed" value="10" id="id_form-0-write_speed" /><input type="hidden" name="form-0-author_ptr" value="%d" id="id_form-0-author_ptr" /></p>' % hemingway_id)
+            '<p><label for="id_form-0-write_speed">Write speed:</label> <input type="number" name="form-0-write_speed" value="10" id="id_form-0-write_speed" /><input type="hidden" name="form-0-author_ptr" value="%d" id="id_form-0-author_ptr" /></p>' % hemingway_id)
         self.assertHTMLEqual(formset.forms[1].as_p(),
             '<p><label for="id_form-1-name">Name:</label> <input id="id_form-1-name" type="text" name="form-1-name" maxlength="100" /></p>\n'
-            '<p><label for="id_form-1-write_speed">Write speed:</label> <input type="text" name="form-1-write_speed" id="id_form-1-write_speed" /><input type="hidden" name="form-1-author_ptr" id="id_form-1-author_ptr" /></p>')
+            '<p><label for="id_form-1-write_speed">Write speed:</label> <input type="number" name="form-1-write_speed" id="id_form-1-write_speed" /><input type="hidden" name="form-1-author_ptr" id="id_form-1-author_ptr" /></p>')
 
         data = {
             'form-TOTAL_FORMS': '2', # the number of forms rendered
@@ -543,6 +551,7 @@ class ModelFormsetTest(TestCase):
     def test_inline_formsets_with_custom_pk(self):
         # Test inline formsets where the inline-edited object has a custom
         # primary key that is not the fk to the parent object.
+        self.maxDiff = 1024
 
         AuthorBooksFormSet2 = inlineformset_factory(Author, BookWithCustomPK, can_delete=False, extra=1)
         author = Author.objects.create(pk=1, name='Charles Baudelaire')
@@ -550,7 +559,7 @@ class ModelFormsetTest(TestCase):
         formset = AuthorBooksFormSet2(instance=author)
         self.assertEqual(len(formset.forms), 1)
         self.assertHTMLEqual(formset.forms[0].as_p(),
-            '<p><label for="id_bookwithcustompk_set-0-my_pk">My pk:</label> <input type="text" name="bookwithcustompk_set-0-my_pk" id="id_bookwithcustompk_set-0-my_pk" /></p>\n'
+            '<p><label for="id_bookwithcustompk_set-0-my_pk">My pk:</label> <input id="id_bookwithcustompk_set-0-my_pk" type="number" name="bookwithcustompk_set-0-my_pk" maxlength="6" /></p>\n'
             '<p><label for="id_bookwithcustompk_set-0-title">Title:</label> <input id="id_bookwithcustompk_set-0-title" type="text" name="bookwithcustompk_set-0-title" maxlength="100" /><input type="hidden" name="bookwithcustompk_set-0-author" value="1" id="id_bookwithcustompk_set-0-author" /></p>')
 
         data = {
@@ -798,7 +807,7 @@ class ModelFormsetTest(TestCase):
             '<option value="%d">Joe Perry at Giordanos</option>\n'
             '<option value="%d">Jack Berry at Giordanos</option>\n'
             '</select></p>\n'
-            '<p><label for="id_form-0-age">Age:</label> <input type="text" name="form-0-age" id="id_form-0-age" /></p>'
+            '<p><label for="id_form-0-age">Age:</label> <input type="number" name="form-0-age" id="id_form-0-age" min="0" /></p>'
             % (owner1.auto_id, owner2.auto_id))
 
         owner1 = Owner.objects.get(name='Joe Perry')
@@ -808,7 +817,7 @@ class ModelFormsetTest(TestCase):
         formset = FormSet(instance=owner1)
         self.assertEqual(len(formset.forms), 1)
         self.assertHTMLEqual(formset.forms[0].as_p(),
-            '<p><label for="id_ownerprofile-0-age">Age:</label> <input type="text" name="ownerprofile-0-age" id="id_ownerprofile-0-age" /><input type="hidden" name="ownerprofile-0-owner" value="%d" id="id_ownerprofile-0-owner" /></p>'
+            '<p><label for="id_ownerprofile-0-age">Age:</label> <input type="number" name="ownerprofile-0-age" id="id_ownerprofile-0-age" min="0" /><input type="hidden" name="ownerprofile-0-owner" value="%d" id="id_ownerprofile-0-owner" /></p>'
             % owner1.auto_id)
 
         data = {
@@ -829,7 +838,7 @@ class ModelFormsetTest(TestCase):
         formset = FormSet(instance=owner1)
         self.assertEqual(len(formset.forms), 1)
         self.assertHTMLEqual(formset.forms[0].as_p(),
-            '<p><label for="id_ownerprofile-0-age">Age:</label> <input type="text" name="ownerprofile-0-age" value="54" id="id_ownerprofile-0-age" /><input type="hidden" name="ownerprofile-0-owner" value="%d" id="id_ownerprofile-0-owner" /></p>'
+            '<p><label for="id_ownerprofile-0-age">Age:</label> <input type="number" name="ownerprofile-0-age" value="54" id="id_ownerprofile-0-age" min="0" /><input type="hidden" name="ownerprofile-0-owner" value="%d" id="id_ownerprofile-0-owner" /></p>'
             % owner1.auto_id)
 
         data = {
@@ -890,6 +899,33 @@ class ModelFormsetTest(TestCase):
         self.assertFalse(formset.is_valid())
         self.assertEqual(formset.errors, [{'slug': ['Product with this Slug already exists.']}])
 
+    def test_modelformset_validate_max_flag(self):
+        # If validate_max is set and max_num is less than TOTAL_FORMS in the
+        # data, then throw an exception. MAX_NUM_FORMS in the data is
+        # irrelevant here (it's output as a hint for the client but its
+        # value in the returned data is not checked)
+
+        data = {
+            'form-TOTAL_FORMS': '2',
+            'form-INITIAL_FORMS': '0',
+            'form-MAX_NUM_FORMS': '2', # should be ignored
+            'form-0-price': '12.00',
+            'form-0-quantity': '1',
+            'form-1-price': '24.00',
+            'form-1-quantity': '2',
+        }
+
+        FormSet = modelformset_factory(Price, extra=1, max_num=1, validate_max=True)
+        formset = FormSet(data)
+        self.assertFalse(formset.is_valid())
+        self.assertEqual(formset.non_form_errors(), ['Please submit 1 or fewer forms.'])
+
+        # Now test the same thing without the validate_max flag to ensure
+        # default behavior is unchanged
+        FormSet = modelformset_factory(Price, extra=1, max_num=1)
+        formset = FormSet(data)
+        self.assertTrue(formset.is_valid())
+
     def test_unique_together_validation(self):
         FormSet = modelformset_factory(Price, extra=1)
         data = {
@@ -985,7 +1021,7 @@ class ModelFormsetTest(TestCase):
         result = re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?:\.\d+)?', '__DATETIME__', result)
         self.assertHTMLEqual(result,
             '<p><label for="id_membership_set-0-date_joined">Date joined:</label> <input type="text" name="membership_set-0-date_joined" value="__DATETIME__" id="id_membership_set-0-date_joined" /><input type="hidden" name="initial-membership_set-0-date_joined" value="__DATETIME__" id="initial-membership_set-0-id_membership_set-0-date_joined" /></p>\n'
-            '<p><label for="id_membership_set-0-karma">Karma:</label> <input type="text" name="membership_set-0-karma" id="id_membership_set-0-karma" /><input type="hidden" name="membership_set-0-person" value="%d" id="id_membership_set-0-person" /><input type="hidden" name="membership_set-0-id" id="id_membership_set-0-id" /></p>'
+            '<p><label for="id_membership_set-0-karma">Karma:</label> <input type="number" name="membership_set-0-karma" id="id_membership_set-0-karma" /><input type="hidden" name="membership_set-0-person" value="%d" id="id_membership_set-0-person" /><input type="hidden" name="membership_set-0-id" id="id_membership_set-0-id" /></p>'
             % person.id)
 
         # test for validation with callable defaults. Validations rely on hidden fields
@@ -1062,6 +1098,38 @@ class ModelFormsetTest(TestCase):
         FormSet = modelformset_factory(ClassyMexicanRestaurant, fields=["tacos_are_yummy"])
         self.assertEqual(sorted(FormSet().forms[0].fields.keys()), ['restaurant', 'tacos_are_yummy'])
 
+    def test_model_formset_with_initial_model_instance(self):
+        # has_changed should compare model instance and primary key
+        # see #18898
+        FormSet = modelformset_factory(Poem)
+        john_milton = Poet(name="John Milton")
+        john_milton.save()
+        data = {
+            'form-TOTAL_FORMS': 1,
+            'form-INITIAL_FORMS': 0,
+            'form-MAX_NUM_FORMS': '',
+            'form-0-name': '',
+            'form-0-poet': str(john_milton.id),
+        }
+        formset = FormSet(initial=[{'poet': john_milton}], data=data)
+        self.assertFalse(formset.extra_forms[0].has_changed())
+
+    def test_model_formset_with_initial_queryset(self):
+        # has_changed should work with queryset and list of pk's
+        # see #18898
+        FormSet = modelformset_factory(AuthorMeeting)
+        author = Author.objects.create(pk=1, name='Charles Baudelaire')
+        data = {
+            'form-TOTAL_FORMS': 1,
+            'form-INITIAL_FORMS': 0,
+            'form-MAX_NUM_FORMS': '',
+            'form-0-name': '',
+            'form-0-created': '',
+            'form-0-authors': list(Author.objects.values_list('id', flat=True)),
+        }
+        formset = FormSet(initial=[{'authors': Author.objects.all()}], data=data)
+        self.assertFalse(formset.extra_forms[0].has_changed())
+
     def test_prevent_duplicates_from_with_the_same_formset(self):
         FormSet = modelformset_factory(Product, extra=2)
         data = {
@@ -1190,3 +1258,27 @@ class ModelFormsetTest(TestCase):
         self.assertFalse(formset.is_valid())
         self.assertEqual(formset._non_form_errors,
             ['Please correct the duplicate data for subtitle which must be unique for the month in posted.'])
+
+
+class TestModelFormsetWidgets(TestCase):
+    def test_modelformset_factory_widgets(self):
+        widgets = {
+            'name': forms.TextInput(attrs={'class': 'poet'})
+        }
+        PoetFormSet = modelformset_factory(Poet, widgets=widgets)
+        form = PoetFormSet.form()
+        self.assertHTMLEqual(
+            "%s" % form['name'],
+            '<input id="id_name" maxlength="100" type="text" class="poet" name="name" />'
+        )
+
+    def test_inlineformset_factory_widgets(self):
+        widgets = {
+            'title': forms.TextInput(attrs={'class': 'book'})
+        }
+        BookFormSet = inlineformset_factory(Author, Book, widgets=widgets)
+        form = BookFormSet.form()
+        self.assertHTMLEqual(
+            "%s" % form['title'],
+            '<input class="book" id="id_title" maxlength="100" name="title" type="text" />'
+        )
diff --git a/tests/modeltests/user_commands/management/__init__.py b/tests/model_formsets_regress/__init__.py
similarity index 100%
rename from tests/modeltests/user_commands/management/__init__.py
rename to tests/model_formsets_regress/__init__.py
diff --git a/tests/regressiontests/model_formsets_regress/models.py b/tests/model_formsets_regress/models.py
similarity index 100%
rename from tests/regressiontests/model_formsets_regress/models.py
rename to tests/model_formsets_regress/models.py
diff --git a/tests/regressiontests/model_formsets_regress/tests.py b/tests/model_formsets_regress/tests.py
similarity index 96%
rename from tests/regressiontests/model_formsets_regress/tests.py
rename to tests/model_formsets_regress/tests.py
index 8cadcfc409..fd35eda854 100644
--- a/tests/regressiontests/model_formsets_regress/tests.py
+++ b/tests/model_formsets_regress/tests.py
@@ -261,14 +261,17 @@ class FormsetTests(TestCase):
             formset.save()
 
 
-class CustomWidget(forms.CharField):
+class CustomWidget(forms.widgets.TextInput):
     pass
 
 
 class UserSiteForm(forms.ModelForm):
     class Meta:
         model = UserSite
-        widgets = {'data': CustomWidget}
+        widgets = {
+            'id': CustomWidget,
+            'data': CustomWidget,
+        }
 
 
 class Callback(object):
@@ -283,24 +286,27 @@ class Callback(object):
 
 class FormfieldCallbackTests(TestCase):
     """
-    Regression for #13095: Using base forms with widgets
-    defined in Meta should not raise errors.
+    Regression for #13095 and #17683: Using base forms with widgets
+    defined in Meta should not raise errors and BaseModelForm should respect
+    the specified pk widget.
     """
 
     def test_inlineformset_factory_default(self):
         Formset = inlineformset_factory(User, UserSite, form=UserSiteForm)
         form = Formset().forms[0]
+        self.assertTrue(isinstance(form['id'].field.widget, CustomWidget))
         self.assertTrue(isinstance(form['data'].field.widget, CustomWidget))
 
     def test_modelformset_factory_default(self):
         Formset = modelformset_factory(UserSite, form=UserSiteForm)
         form = Formset().forms[0]
+        self.assertTrue(isinstance(form['id'].field.widget, CustomWidget))
         self.assertTrue(isinstance(form['data'].field.widget, CustomWidget))
 
     def assertCallbackCalled(self, callback):
         id_field, user_field, data_field = UserSite._meta.fields
         expected_log = [
-            (id_field, {}),
+            (id_field, {'widget': CustomWidget}),
             (user_field, {}),
             (data_field, {'widget': CustomWidget}),
         ]
@@ -318,7 +324,6 @@ class FormfieldCallbackTests(TestCase):
                              formfield_callback=callback)
         self.assertCallbackCalled(callback)
 
-
 class BaseCustomDeleteFormSet(BaseFormSet):
     """
     A formset mix-in that lets a form decide if it's to be deleted.
diff --git a/tests/modeltests/user_commands/management/commands/__init__.py b/tests/model_inheritance/__init__.py
similarity index 100%
rename from tests/modeltests/user_commands/management/commands/__init__.py
rename to tests/model_inheritance/__init__.py
diff --git a/tests/modeltests/model_inheritance/models.py b/tests/model_inheritance/models.py
similarity index 100%
rename from tests/modeltests/model_inheritance/models.py
rename to tests/model_inheritance/models.py
diff --git a/tests/modeltests/model_inheritance/tests.py b/tests/model_inheritance/tests.py
similarity index 90%
rename from tests/modeltests/model_inheritance/tests.py
rename to tests/model_inheritance/tests.py
index 16d2242fbe..dc40d2d2e0 100644
--- a/tests/modeltests/model_inheritance/tests.py
+++ b/tests/model_inheritance/tests.py
@@ -1,9 +1,11 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from operator import attrgetter
 
 from django.core.exceptions import FieldError
+from django.db import connection
 from django.test import TestCase
+from django.test.utils import CaptureQueriesContext
 from django.utils import six
 
 from .models import (Chef, CommonInfo, ItalianRestaurant, ParkingLot, Place,
@@ -292,5 +294,27 @@ class ModelInheritanceTests(TestCase):
             rating=4,
             chef=c
         )
-        with self.assertNumQueries(6):
+        with self.assertNumQueries(3):
             ir.save()
+
+    def test_update_parent_filtering(self):
+        """
+        Test that updating a field of a model subclass doesn't issue an UPDATE
+        query constrained by an inner query.
+        Refs #10399
+        """
+        supplier = Supplier.objects.create(
+            name='Central market',
+            address='610 some street'
+        )
+        # Capture the expected query in a database agnostic way
+        with CaptureQueriesContext(connection) as captured_queries:
+            Place.objects.filter(pk=supplier.pk).update(name=supplier.name)
+        expected_sql = captured_queries[0]['sql']
+        # Capture the queries executed when a subclassed model instance is saved.
+        with CaptureQueriesContext(connection) as captured_queries:
+            supplier.save(update_fields=('name',))
+        for query in captured_queries:
+            sql = query['sql']
+            if 'UPDATE' in sql:
+                self.assertEqual(expected_sql, sql)
diff --git a/tests/modeltests/validators/__init__.py b/tests/model_inheritance_regress/__init__.py
similarity index 100%
rename from tests/modeltests/validators/__init__.py
rename to tests/model_inheritance_regress/__init__.py
diff --git a/tests/regressiontests/model_inheritance_regress/models.py b/tests/model_inheritance_regress/models.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_regress/models.py
rename to tests/model_inheritance_regress/models.py
diff --git a/tests/regressiontests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py
similarity index 93%
rename from tests/regressiontests/model_inheritance_regress/tests.py
rename to tests/model_inheritance_regress/tests.py
index 6855d70071..c2c9337485 100644
--- a/tests/regressiontests/model_inheritance_regress/tests.py
+++ b/tests/model_inheritance_regress/tests.py
@@ -8,6 +8,7 @@ from operator import attrgetter
 from django import forms
 
 from django.test import TestCase
+from django.utils.unittest import expectedFailure
 
 from .models import (Place, Restaurant, ItalianRestaurant, ParkingLot,
     ParkingLot2, ParkingLot3, Supplier, Wholesaler, Child, SelfRefParent,
@@ -134,8 +135,8 @@ class ModelInheritanceTest(TestCase):
         obj = Child.objects.create(
             name='child',
             created=datetime.datetime(2008, 6, 26, 17, 0, 0))
-        dates = list(Child.objects.dates('created', 'month'))
-        self.assertEqual(dates, [datetime.datetime(2008, 6, 1, 0, 0)])
+        datetimes = list(Child.objects.datetimes('created', 'month'))
+        self.assertEqual(datetimes, [datetime.datetime(2008, 6, 1, 0, 0)])
 
     def test_issue_7276(self):
         # Regression test for #7276: calling delete() on a model with
@@ -180,11 +181,11 @@ class ModelInheritanceTest(TestCase):
         """
         Regression test for #6755
         """
-        r = Restaurant(serves_pizza=False)
+        r = Restaurant(serves_pizza=False, serves_hot_dogs=False)
         r.save()
         self.assertEqual(r.id, r.place_ptr_id)
         orig_id = r.id
-        r = Restaurant(place_ptr_id=orig_id, serves_pizza=True)
+        r = Restaurant(place_ptr_id=orig_id, serves_pizza=True, serves_hot_dogs=False)
         r.save()
         self.assertEqual(r.id, orig_id)
         self.assertEqual(r.id, r.place_ptr_id)
@@ -422,3 +423,19 @@ class ModelInheritanceTest(TestCase):
         form = ProfileForm({'username': "user_with_profile", 'extra': "hello"},
                            instance=p)
         self.assertTrue(form.is_valid())
+
+    def test_inheritance_joins(self):
+        # Test for #17502 - check that filtering through two levels of
+        # inheritance chain doesn't generate extra joins.
+        qs = ItalianRestaurant.objects.all()
+        self.assertEqual(str(qs.query).count('JOIN'), 2)
+        qs = ItalianRestaurant.objects.filter(name='foo')
+        self.assertEqual(str(qs.query).count('JOIN'), 2)
+
+    @expectedFailure
+    def test_inheritance_values_joins(self):
+        # It would be nice (but not too important) to skip the middle join in
+        # this case. Skipping is possible as nothing from the middle model is
+        # used in the qs and top contains direct pointer to the bottom model.
+        qs = ItalianRestaurant.objects.values_list('serves_gnocchi').filter(name='foo')
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
diff --git a/tests/regressiontests/__init__.py b/tests/model_inheritance_same_model_name/__init__.py
similarity index 100%
rename from tests/regressiontests/__init__.py
rename to tests/model_inheritance_same_model_name/__init__.py
diff --git a/tests/modeltests/model_inheritance_same_model_name/models.py b/tests/model_inheritance_same_model_name/models.py
similarity index 92%
rename from tests/modeltests/model_inheritance_same_model_name/models.py
rename to tests/model_inheritance_same_model_name/models.py
index 801724df18..b4a6b930df 100644
--- a/tests/modeltests/model_inheritance_same_model_name/models.py
+++ b/tests/model_inheritance_same_model_name/models.py
@@ -10,7 +10,7 @@ from __future__ import absolute_import
 
 from django.db import models
 
-from ..model_inheritance.models import NamedURL
+from model_inheritance.models import NamedURL
 from django.utils.encoding import python_2_unicode_compatible
 
 #
diff --git a/tests/modeltests/model_inheritance_same_model_name/tests.py b/tests/model_inheritance_same_model_name/tests.py
similarity index 88%
rename from tests/modeltests/model_inheritance_same_model_name/tests.py
rename to tests/model_inheritance_same_model_name/tests.py
index 13d51f1a67..8f22578013 100644
--- a/tests/modeltests/model_inheritance_same_model_name/tests.py
+++ b/tests/model_inheritance_same_model_name/tests.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from django.test import TestCase
 
-from ..model_inheritance.models import Title
+from model_inheritance.models import Title
 
 
 class InheritanceSameModelNameTests(TestCase):
@@ -14,7 +14,7 @@ class InheritanceSameModelNameTests(TestCase):
         self.title = Title.objects.create(title='Lorem Ipsum')
 
     def test_inheritance_related_name(self):
-        from modeltests.model_inheritance.models import Copy
+        from model_inheritance.models import Copy
         self.assertEqual(
             self.title.attached_model_inheritance_copy_set.create(
                 content='Save $ on V1agr@',
@@ -23,7 +23,7 @@ class InheritanceSameModelNameTests(TestCase):
             ), Copy.objects.get(content='Save $ on V1agr@'))
 
     def test_inheritance_with_same_model_name(self):
-        from modeltests.model_inheritance_same_model_name.models import Copy
+        from model_inheritance_same_model_name.models import Copy
         self.assertEqual(
             self.title.attached_model_inheritance_same_model_name_copy_set.create(
                 content='The Web framework for perfectionists with deadlines.',
diff --git a/tests/regressiontests/admin_changelist/__init__.py b/tests/model_inheritance_select_related/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_changelist/__init__.py
rename to tests/model_inheritance_select_related/__init__.py
diff --git a/tests/regressiontests/model_inheritance_select_related/models.py b/tests/model_inheritance_select_related/models.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_select_related/models.py
rename to tests/model_inheritance_select_related/models.py
diff --git a/tests/regressiontests/model_inheritance_select_related/tests.py b/tests/model_inheritance_select_related/tests.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_select_related/tests.py
rename to tests/model_inheritance_select_related/tests.py
diff --git a/tests/regressiontests/max_lengths/__init__.py b/tests/model_package/__init__.py
similarity index 100%
rename from tests/regressiontests/max_lengths/__init__.py
rename to tests/model_package/__init__.py
diff --git a/tests/modeltests/model_package/models/__init__.py b/tests/model_package/models/__init__.py
similarity index 100%
rename from tests/modeltests/model_package/models/__init__.py
rename to tests/model_package/models/__init__.py
diff --git a/tests/modeltests/model_package/models/article.py b/tests/model_package/models/article.py
similarity index 100%
rename from tests/modeltests/model_package/models/article.py
rename to tests/model_package/models/article.py
diff --git a/tests/modeltests/model_package/models/publication.py b/tests/model_package/models/publication.py
similarity index 100%
rename from tests/modeltests/model_package/models/publication.py
rename to tests/model_package/models/publication.py
diff --git a/tests/modeltests/model_package/tests.py b/tests/model_package/tests.py
similarity index 100%
rename from tests/modeltests/model_package/tests.py
rename to tests/model_package/tests.py
diff --git a/tests/regressiontests/admin_filters/__init__.py b/tests/model_permalink/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_filters/__init__.py
rename to tests/model_permalink/__init__.py
diff --git a/tests/regressiontests/model_permalink/models.py b/tests/model_permalink/models.py
similarity index 100%
rename from tests/regressiontests/model_permalink/models.py
rename to tests/model_permalink/models.py
diff --git a/tests/regressiontests/model_permalink/tests.py b/tests/model_permalink/tests.py
similarity index 94%
rename from tests/regressiontests/model_permalink/tests.py
rename to tests/model_permalink/tests.py
index 049f338c2e..257648ca5f 100644
--- a/tests/regressiontests/model_permalink/tests.py
+++ b/tests/model_permalink/tests.py
@@ -6,7 +6,7 @@ from .models import Guitarist
 
 
 class PermalinkTests(TestCase):
-    urls = 'regressiontests.model_permalink.urls'
+    urls = 'model_permalink.urls'
 
     def test_permalink(self):
         g = Guitarist(name='Adrien Moignard', slug='adrienmoignard')
diff --git a/tests/regressiontests/model_permalink/urls.py b/tests/model_permalink/urls.py
similarity index 100%
rename from tests/regressiontests/model_permalink/urls.py
rename to tests/model_permalink/urls.py
diff --git a/tests/regressiontests/admin_inlines/__init__.py b/tests/model_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_inlines/__init__.py
rename to tests/model_regress/__init__.py
diff --git a/tests/regressiontests/model_regress/models.py b/tests/model_regress/models.py
similarity index 100%
rename from tests/regressiontests/model_regress/models.py
rename to tests/model_regress/models.py
diff --git a/tests/regressiontests/model_regress/tests.py b/tests/model_regress/tests.py
similarity index 88%
rename from tests/regressiontests/model_regress/tests.py
rename to tests/model_regress/tests.py
index c90fe98658..c1e864c270 100644
--- a/tests/regressiontests/model_regress/tests.py
+++ b/tests/model_regress/tests.py
@@ -7,6 +7,8 @@ from django.core.exceptions import ValidationError
 from django.test import TestCase, skipUnlessDBFeature
 from django.utils import six
 from django.utils import tzinfo
+from django.db import router
+from django.db.models.sql import InsertQuery
 
 from .models import (Worker, Article, Party, Event, Department,
     BrokenUnicodeMethod, NonAutoPK, Model1, Model2, Model3)
@@ -27,6 +29,16 @@ class ModelTests(TestCase):
         """
         Worker.objects.filter(department__lte=0)
 
+    def test_sql_insert_compiler_return_id_attribute(self):
+        """
+        Regression test for #14019: SQLInsertCompiler.as_sql() failure
+        """
+        db = router.db_for_write(Party)
+        query = InsertQuery(Party)
+        query.insert_values([Party._meta.fields[0]], [], raw=False)
+        # this line will raise an AttributeError without the accompanying fix
+        query.get_compiler(using=db).as_sql()
+
     def test_empty_choice(self):
         # NOTE: Part of the regression test here is merely parsing the model
         # declaration. The verbose_name, in particular, did not always work.
@@ -57,6 +69,7 @@ class ModelTests(TestCase):
         Party.objects.create(when=datetime.datetime(1999, 12, 31))
         Party.objects.create(when=datetime.datetime(1998, 12, 31))
         Party.objects.create(when=datetime.datetime(1999, 1, 1))
+        Party.objects.create(when=datetime.datetime(1, 3, 3))
         self.assertQuerysetEqual(
             Party.objects.filter(when__month=2), []
         )
@@ -104,6 +117,20 @@ class ModelTests(TestCase):
             attrgetter("when")
         )
 
+        # Regression test for #18969
+        self.assertQuerysetEqual(
+                Party.objects.filter(when__year=1), [
+                        datetime.date(1, 3, 3),
+                    ],
+                attrgetter("when")
+        )
+        self.assertQuerysetEqual(
+                Party.objects.filter(when__year='1'), [
+                        datetime.date(1, 3, 3),
+                    ],
+                attrgetter("when")
+       )
+
     def test_date_filter_null(self):
         # Date filtering was failing with NULL date values in SQLite
         # (regression test for #3501, amongst other things).
diff --git a/tests/regressiontests/admin_ordering/__init__.py b/tests/modeladmin/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_ordering/__init__.py
rename to tests/modeladmin/__init__.py
diff --git a/tests/regressiontests/modeladmin/models.py b/tests/modeladmin/models.py
similarity index 100%
rename from tests/regressiontests/modeladmin/models.py
rename to tests/modeladmin/models.py
diff --git a/tests/regressiontests/modeladmin/tests.py b/tests/modeladmin/tests.py
similarity index 99%
rename from tests/regressiontests/modeladmin/tests.py
rename to tests/modeladmin/tests.py
index b0a181218b..e5450ab8ff 100644
--- a/tests/regressiontests/modeladmin/tests.py
+++ b/tests/modeladmin/tests.py
@@ -69,7 +69,7 @@ class ModelAdminTests(TestCase):
         # If we specify the fields argument, fieldsets_add and fielsets_change should
         # just stick the fields into a formsets structure and return it.
         class BandAdmin(ModelAdmin):
-             fields = ['name']
+            fields = ['name']
 
         ma = BandAdmin(Band, self.site)
 
@@ -1074,7 +1074,7 @@ class ValidationTests(unittest.TestCase):
                 return 'awesomeness'
             def get_choices(self, request):
                 return (('bit', 'A bit awesome'), ('very', 'Very awesome'), )
-            def get_query_set(self, cl, qs):
+            def get_queryset(self, cl, qs):
                 return qs
 
         class ValidationTestModelAdmin(ModelAdmin):
diff --git a/tests/modeltests/empty/no_models/tests.py b/tests/modeltests/empty/no_models/tests.py
deleted file mode 100644
index 6292ca9f74..0000000000
--- a/tests/modeltests/empty/no_models/tests.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.test import TestCase
-
-
-class NoModelTests(TestCase):
-    """ A placeholder test case. See modeltests.empty.tests for more info. """
-    pass
diff --git a/tests/modeltests/get_latest/models.py b/tests/modeltests/get_latest/models.py
deleted file mode 100644
index fe594dd802..0000000000
--- a/tests/modeltests/get_latest/models.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-8. get_latest_by
-
-Models can have a ``get_latest_by`` attribute, which should be set to the name
-of a ``DateField`` or ``DateTimeField``. If ``get_latest_by`` exists, the
-model's manager will get a ``latest()`` method, which will return the latest
-object in the database according to that field. "Latest" means "having the date
-farthest into the future."
-"""
-
-from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
-
-
-@python_2_unicode_compatible
-class Article(models.Model):
-    headline = models.CharField(max_length=100)
-    pub_date = models.DateField()
-    expire_date = models.DateField()
-    class Meta:
-        get_latest_by = 'pub_date'
-
-    def __str__(self):
-        return self.headline
-
-@python_2_unicode_compatible
-class Person(models.Model):
-    name = models.CharField(max_length=30)
-    birthday = models.DateField()
-
-    # Note that this model doesn't have "get_latest_by" set.
-
-    def __str__(self):
-        return self.name
diff --git a/tests/modeltests/get_latest/tests.py b/tests/modeltests/get_latest/tests.py
deleted file mode 100644
index 948af6045a..0000000000
--- a/tests/modeltests/get_latest/tests.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from __future__ import absolute_import
-
-from datetime import datetime
-
-from django.test import TestCase
-
-from .models import Article, Person
-
-
-class LatestTests(TestCase):
-    def test_latest(self):
-        # Because no Articles exist yet, latest() raises ArticleDoesNotExist.
-        self.assertRaises(Article.DoesNotExist, Article.objects.latest)
-
-        a1 = Article.objects.create(
-            headline="Article 1", pub_date=datetime(2005, 7, 26),
-            expire_date=datetime(2005, 9, 1)
-        )
-        a2 = Article.objects.create(
-            headline="Article 2", pub_date=datetime(2005, 7, 27),
-            expire_date=datetime(2005, 7, 28)
-        )
-        a3 = Article.objects.create(
-            headline="Article 3", pub_date=datetime(2005, 7, 27),
-            expire_date=datetime(2005, 8, 27)
-        )
-        a4 = Article.objects.create(
-            headline="Article 4", pub_date=datetime(2005, 7, 28),
-            expire_date=datetime(2005, 7, 30)
-        )
-
-        # Get the latest Article.
-        self.assertEqual(Article.objects.latest(), a4)
-        # Get the latest Article that matches certain filters.
-        self.assertEqual(
-            Article.objects.filter(pub_date__lt=datetime(2005, 7, 27)).latest(),
-            a1
-        )
-
-        # Pass a custom field name to latest() to change the field that's used
-        # to determine the latest object.
-        self.assertEqual(Article.objects.latest('expire_date'), a1)
-        self.assertEqual(
-            Article.objects.filter(pub_date__gt=datetime(2005, 7, 26)).latest('expire_date'),
-            a3,
-        )
-
-        # Ensure that latest() overrides any other ordering specified on the query. Refs #11283.
-        self.assertEqual(Article.objects.order_by('id').latest(), a4)
-
-    def test_latest_manual(self):
-        # You can still use latest() with a model that doesn't have
-        # "get_latest_by" set -- just pass in the field name manually.
-        p1 = Person.objects.create(name="Ralph", birthday=datetime(1950, 1, 1))
-        p2 = Person.objects.create(name="Stephanie", birthday=datetime(1960, 2, 3))
-        self.assertRaises(AssertionError, Person.objects.latest)
-
-        self.assertEqual(Person.objects.latest("birthday"), p2)
diff --git a/tests/modeltests/lookup/tests.py b/tests/modeltests/lookup/tests.py
deleted file mode 100644
index 98358e3d10..0000000000
--- a/tests/modeltests/lookup/tests.py
+++ /dev/null
@@ -1,688 +0,0 @@
-from __future__ import absolute_import, unicode_literals
-
-from datetime import datetime
-from operator import attrgetter
-
-from django.core.exceptions import FieldError
-from django.test import TestCase, skipUnlessDBFeature
-
-from .models import Author, Article, Tag, Game, Season, Player
-
-
-class LookupTests(TestCase):
-
-    def setUp(self):
-        # Create a few Authors.
-        self.au1 = Author(name='Author 1')
-        self.au1.save()
-        self.au2 = Author(name='Author 2')
-        self.au2.save()
-        # Create a couple of Articles.
-        self.a1 = Article(headline='Article 1', pub_date=datetime(2005, 7, 26), author=self.au1)
-        self.a1.save()
-        self.a2 = Article(headline='Article 2', pub_date=datetime(2005, 7, 27), author=self.au1)
-        self.a2.save()
-        self.a3 = Article(headline='Article 3', pub_date=datetime(2005, 7, 27), author=self.au1)
-        self.a3.save()
-        self.a4 = Article(headline='Article 4', pub_date=datetime(2005, 7, 28), author=self.au1)
-        self.a4.save()
-        self.a5 = Article(headline='Article 5', pub_date=datetime(2005, 8, 1, 9, 0), author=self.au2)
-        self.a5.save()
-        self.a6 = Article(headline='Article 6', pub_date=datetime(2005, 8, 1, 8, 0), author=self.au2)
-        self.a6.save()
-        self.a7 = Article(headline='Article 7', pub_date=datetime(2005, 7, 27), author=self.au2)
-        self.a7.save()
-        # Create a few Tags.
-        self.t1 = Tag(name='Tag 1')
-        self.t1.save()
-        self.t1.articles.add(self.a1, self.a2, self.a3)
-        self.t2 = Tag(name='Tag 2')
-        self.t2.save()
-        self.t2.articles.add(self.a3, self.a4, self.a5)
-        self.t3 = Tag(name='Tag 3')
-        self.t3.save()
-        self.t3.articles.add(self.a5, self.a6, self.a7)
-
-    def test_exists(self):
-        # We can use .exists() to check that there are some
-        self.assertTrue(Article.objects.exists())
-        for a in Article.objects.all():
-            a.delete()
-        # There should be none now!
-        self.assertFalse(Article.objects.exists())
-
-    def test_lookup_int_as_str(self):
-        # Integer value can be queried using string
-        self.assertQuerysetEqual(Article.objects.filter(id__iexact=str(self.a1.id)),
-                                 ['<Article: Article 1>'])
-
-    @skipUnlessDBFeature('supports_date_lookup_using_string')
-    def test_lookup_date_as_str(self):
-        # A date lookup can be performed using a string search
-        self.assertQuerysetEqual(Article.objects.filter(pub_date__startswith='2005'),
-            [
-                '<Article: Article 5>',
-                '<Article: Article 6>',
-                '<Article: Article 4>',
-                '<Article: Article 2>',
-                '<Article: Article 3>',
-                '<Article: Article 7>',
-                '<Article: Article 1>',
-            ])
-
-    def test_iterator(self):
-        # Each QuerySet gets iterator(), which is a generator that "lazily"
-        # returns results using database-level iteration.
-        self.assertQuerysetEqual(Article.objects.iterator(),
-            [
-                'Article 5',
-                'Article 6',
-                'Article 4',
-                'Article 2',
-                'Article 3',
-                'Article 7',
-                'Article 1',
-            ],
-            transform=attrgetter('headline'))
-        # iterator() can be used on any QuerySet.
-        self.assertQuerysetEqual(
-            Article.objects.filter(headline__endswith='4').iterator(),
-            ['Article 4'],
-            transform=attrgetter('headline'))
-
-    def test_count(self):
-        # count() returns the number of objects matching search criteria.
-        self.assertEqual(Article.objects.count(), 7)
-        self.assertEqual(Article.objects.filter(pub_date__exact=datetime(2005, 7, 27)).count(), 3)
-        self.assertEqual(Article.objects.filter(headline__startswith='Blah blah').count(), 0)
-
-        # count() should respect sliced query sets.
-        articles = Article.objects.all()
-        self.assertEqual(articles.count(), 7)
-        self.assertEqual(articles[:4].count(), 4)
-        self.assertEqual(articles[1:100].count(), 6)
-        self.assertEqual(articles[10:100].count(), 0)
-
-        # Date and date/time lookups can also be done with strings.
-        self.assertEqual(Article.objects.filter(pub_date__exact='2005-07-27 00:00:00').count(), 3)
-
-    def test_in_bulk(self):
-        # in_bulk() takes a list of IDs and returns a dictionary mapping IDs to objects.
-        arts = Article.objects.in_bulk([self.a1.id, self.a2.id])
-        self.assertEqual(arts[self.a1.id], self.a1)
-        self.assertEqual(arts[self.a2.id], self.a2)
-        self.assertEqual(Article.objects.in_bulk([self.a3.id]), {self.a3.id: self.a3})
-        self.assertEqual(Article.objects.in_bulk(set([self.a3.id])), {self.a3.id: self.a3})
-        self.assertEqual(Article.objects.in_bulk(frozenset([self.a3.id])), {self.a3.id: self.a3})
-        self.assertEqual(Article.objects.in_bulk((self.a3.id,)), {self.a3.id: self.a3})
-        self.assertEqual(Article.objects.in_bulk([1000]), {})
-        self.assertEqual(Article.objects.in_bulk([]), {})
-        self.assertEqual(Article.objects.in_bulk(iter([self.a1.id])), {self.a1.id: self.a1})
-        self.assertEqual(Article.objects.in_bulk(iter([])), {})
-        self.assertRaises(TypeError, Article.objects.in_bulk)
-        self.assertRaises(TypeError, Article.objects.in_bulk, headline__startswith='Blah')
-
-    def test_values(self):
-        # values() returns a list of dictionaries instead of object instances --
-        # and you can specify which fields you want to retrieve.
-        identity = lambda x:x
-        self.assertQuerysetEqual(Article.objects.values('headline'),
-            [
-                {'headline': 'Article 5'},
-                {'headline': 'Article 6'},
-                {'headline': 'Article 4'},
-                {'headline': 'Article 2'},
-                {'headline': 'Article 3'},
-                {'headline': 'Article 7'},
-                {'headline': 'Article 1'},
-            ],
-            transform=identity)
-        self.assertQuerysetEqual(
-            Article.objects.filter(pub_date__exact=datetime(2005, 7, 27)).values('id'),
-            [{'id': self.a2.id}, {'id': self.a3.id}, {'id': self.a7.id}],
-            transform=identity)
-        self.assertQuerysetEqual(Article.objects.values('id', 'headline'),
-            [
-                {'id': self.a5.id, 'headline': 'Article 5'},
-                {'id': self.a6.id, 'headline': 'Article 6'},
-                {'id': self.a4.id, 'headline': 'Article 4'},
-                {'id': self.a2.id, 'headline': 'Article 2'},
-                {'id': self.a3.id, 'headline': 'Article 3'},
-                {'id': self.a7.id, 'headline': 'Article 7'},
-                {'id': self.a1.id, 'headline': 'Article 1'},
-            ],
-            transform=identity)
-        # You can use values() with iterator() for memory savings,
-        # because iterator() uses database-level iteration.
-        self.assertQuerysetEqual(Article.objects.values('id', 'headline').iterator(),
-            [
-                {'headline': 'Article 5', 'id': self.a5.id},
-                {'headline': 'Article 6', 'id': self.a6.id},
-                {'headline': 'Article 4', 'id': self.a4.id},
-                {'headline': 'Article 2', 'id': self.a2.id},
-                {'headline': 'Article 3', 'id': self.a3.id},
-                {'headline': 'Article 7', 'id': self.a7.id},
-                {'headline': 'Article 1', 'id': self.a1.id},
-            ],
-            transform=identity)
-        # The values() method works with "extra" fields specified in extra(select).
-        self.assertQuerysetEqual(
-            Article.objects.extra(select={'id_plus_one': 'id + 1'}).values('id', 'id_plus_one'),
-            [
-                {'id': self.a5.id, 'id_plus_one': self.a5.id + 1},
-                {'id': self.a6.id, 'id_plus_one': self.a6.id + 1},
-                {'id': self.a4.id, 'id_plus_one': self.a4.id + 1},
-                {'id': self.a2.id, 'id_plus_one': self.a2.id + 1},
-                {'id': self.a3.id, 'id_plus_one': self.a3.id + 1},
-                {'id': self.a7.id, 'id_plus_one': self.a7.id + 1},
-                {'id': self.a1.id, 'id_plus_one': self.a1.id + 1},
-            ],
-            transform=identity)
-        data = {
-            'id_plus_one': 'id+1',
-            'id_plus_two': 'id+2',
-            'id_plus_three': 'id+3',
-            'id_plus_four': 'id+4',
-            'id_plus_five': 'id+5',
-            'id_plus_six': 'id+6',
-            'id_plus_seven': 'id+7',
-            'id_plus_eight': 'id+8',
-        }
-        self.assertQuerysetEqual(
-            Article.objects.filter(id=self.a1.id).extra(select=data).values(*data.keys()),
-            [{
-                'id_plus_one': self.a1.id + 1,
-                'id_plus_two': self.a1.id + 2,
-                'id_plus_three': self.a1.id + 3,
-                'id_plus_four': self.a1.id + 4,
-                'id_plus_five': self.a1.id + 5,
-                'id_plus_six': self.a1.id + 6,
-                'id_plus_seven': self.a1.id + 7,
-                'id_plus_eight': self.a1.id + 8,
-            }], transform=identity)
-        # You can specify fields from forward and reverse relations, just like filter().
-        self.assertQuerysetEqual(
-            Article.objects.values('headline', 'author__name'),
-            [
-                {'headline': self.a5.headline, 'author__name': self.au2.name},
-                {'headline': self.a6.headline, 'author__name': self.au2.name},
-                {'headline': self.a4.headline, 'author__name': self.au1.name},
-                {'headline': self.a2.headline, 'author__name': self.au1.name},
-                {'headline': self.a3.headline, 'author__name': self.au1.name},
-                {'headline': self.a7.headline, 'author__name': self.au2.name},
-                {'headline': self.a1.headline, 'author__name': self.au1.name},
-            ], transform=identity)
-        self.assertQuerysetEqual(
-            Author.objects.values('name', 'article__headline').order_by('name', 'article__headline'),
-            [
-                {'name': self.au1.name, 'article__headline': self.a1.headline},
-                {'name': self.au1.name, 'article__headline': self.a2.headline},
-                {'name': self.au1.name, 'article__headline': self.a3.headline},
-                {'name': self.au1.name, 'article__headline': self.a4.headline},
-                {'name': self.au2.name, 'article__headline': self.a5.headline},
-                {'name': self.au2.name, 'article__headline': self.a6.headline},
-                {'name': self.au2.name, 'article__headline': self.a7.headline},
-            ], transform=identity)
-        self.assertQuerysetEqual(
-            Author.objects.values('name', 'article__headline', 'article__tag__name').order_by('name', 'article__headline', 'article__tag__name'),
-            [
-                {'name': self.au1.name, 'article__headline': self.a1.headline, 'article__tag__name': self.t1.name},
-                {'name': self.au1.name, 'article__headline': self.a2.headline, 'article__tag__name': self.t1.name},
-                {'name': self.au1.name, 'article__headline': self.a3.headline, 'article__tag__name': self.t1.name},
-                {'name': self.au1.name, 'article__headline': self.a3.headline, 'article__tag__name': self.t2.name},
-                {'name': self.au1.name, 'article__headline': self.a4.headline, 'article__tag__name': self.t2.name},
-                {'name': self.au2.name, 'article__headline': self.a5.headline, 'article__tag__name': self.t2.name},
-                {'name': self.au2.name, 'article__headline': self.a5.headline, 'article__tag__name': self.t3.name},
-                {'name': self.au2.name, 'article__headline': self.a6.headline, 'article__tag__name': self.t3.name},
-                {'name': self.au2.name, 'article__headline': self.a7.headline, 'article__tag__name': self.t3.name},
-            ], transform=identity)
-        # However, an exception FieldDoesNotExist will be thrown if you specify
-        # a non-existent field name in values() (a field that is neither in the
-        # model nor in extra(select)).
-        self.assertRaises(FieldError,
-            Article.objects.extra(select={'id_plus_one': 'id + 1'}).values,
-            'id', 'id_plus_two')
-        # If you don't specify field names to values(), all are returned.
-        self.assertQuerysetEqual(Article.objects.filter(id=self.a5.id).values(),
-            [{
-                'id': self.a5.id,
-                'author_id': self.au2.id,
-                'headline': 'Article 5',
-                'pub_date': datetime(2005, 8, 1, 9, 0)
-            }], transform=identity)
-
-    def test_values_list(self):
-        # values_list() is similar to values(), except that the results are
-        # returned as a list of tuples, rather than a list of dictionaries.
-        # Within each tuple, the order of the elements is the same as the order
-        # of fields in the values_list() call.
-        identity = lambda x:x
-        self.assertQuerysetEqual(Article.objects.values_list('headline'),
-            [
-                ('Article 5',),
-                ('Article 6',),
-                ('Article 4',),
-                ('Article 2',),
-                ('Article 3',),
-                ('Article 7',),
-                ('Article 1',),
-            ], transform=identity)
-        self.assertQuerysetEqual(Article.objects.values_list('id').order_by('id'),
-            [(self.a1.id,), (self.a2.id,), (self.a3.id,), (self.a4.id,), (self.a5.id,), (self.a6.id,), (self.a7.id,)],
-            transform=identity)
-        self.assertQuerysetEqual(
-            Article.objects.values_list('id', flat=True).order_by('id'),
-            [self.a1.id, self.a2.id, self.a3.id, self.a4.id, self.a5.id, self.a6.id, self.a7.id],
-            transform=identity)
-        self.assertQuerysetEqual(
-            Article.objects.extra(select={'id_plus_one': 'id+1'})
-                           .order_by('id').values_list('id'),
-            [(self.a1.id,), (self.a2.id,), (self.a3.id,), (self.a4.id,), (self.a5.id,), (self.a6.id,), (self.a7.id,)],
-            transform=identity)
-        self.assertQuerysetEqual(
-            Article.objects.extra(select={'id_plus_one': 'id+1'})
-                           .order_by('id').values_list('id_plus_one', 'id'),
-            [
-                (self.a1.id+1, self.a1.id),
-                (self.a2.id+1, self.a2.id),
-                (self.a3.id+1, self.a3.id),
-                (self.a4.id+1, self.a4.id),
-                (self.a5.id+1, self.a5.id),
-                (self.a6.id+1, self.a6.id),
-                (self.a7.id+1, self.a7.id)
-            ],
-            transform=identity)
-        self.assertQuerysetEqual(
-            Article.objects.extra(select={'id_plus_one': 'id+1'})
-                           .order_by('id').values_list('id', 'id_plus_one'),
-            [
-                (self.a1.id, self.a1.id+1),
-                (self.a2.id, self.a2.id+1),
-                (self.a3.id, self.a3.id+1),
-                (self.a4.id, self.a4.id+1),
-                (self.a5.id, self.a5.id+1),
-                (self.a6.id, self.a6.id+1),
-                (self.a7.id, self.a7.id+1)
-            ],
-            transform=identity)
-        self.assertQuerysetEqual(
-            Author.objects.values_list('name', 'article__headline', 'article__tag__name').order_by('name', 'article__headline', 'article__tag__name'),
-            [
-                (self.au1.name, self.a1.headline, self.t1.name),
-                (self.au1.name, self.a2.headline, self.t1.name),
-                (self.au1.name, self.a3.headline, self.t1.name),
-                (self.au1.name, self.a3.headline, self.t2.name),
-                (self.au1.name, self.a4.headline, self.t2.name),
-                (self.au2.name, self.a5.headline, self.t2.name),
-                (self.au2.name, self.a5.headline, self.t3.name),
-                (self.au2.name, self.a6.headline, self.t3.name),
-                (self.au2.name, self.a7.headline, self.t3.name),
-            ], transform=identity)
-        self.assertRaises(TypeError, Article.objects.values_list, 'id', 'headline', flat=True)
-
-    def test_get_next_previous_by(self):
-        # Every DateField and DateTimeField creates get_next_by_FOO() and
-        # get_previous_by_FOO() methods. In the case of identical date values,
-        # these methods will use the ID as a fallback check. This guarantees
-        # that no records are skipped or duplicated.
-        self.assertEqual(repr(self.a1.get_next_by_pub_date()),
-                         '<Article: Article 2>')
-        self.assertEqual(repr(self.a2.get_next_by_pub_date()),
-                         '<Article: Article 3>')
-        self.assertEqual(repr(self.a2.get_next_by_pub_date(headline__endswith='6')),
-                         '<Article: Article 6>')
-        self.assertEqual(repr(self.a3.get_next_by_pub_date()),
-                         '<Article: Article 7>')
-        self.assertEqual(repr(self.a4.get_next_by_pub_date()),
-                         '<Article: Article 6>')
-        self.assertRaises(Article.DoesNotExist, self.a5.get_next_by_pub_date)
-        self.assertEqual(repr(self.a6.get_next_by_pub_date()),
-                         '<Article: Article 5>')
-        self.assertEqual(repr(self.a7.get_next_by_pub_date()),
-                         '<Article: Article 4>')
-
-        self.assertEqual(repr(self.a7.get_previous_by_pub_date()),
-                         '<Article: Article 3>')
-        self.assertEqual(repr(self.a6.get_previous_by_pub_date()),
-                         '<Article: Article 4>')
-        self.assertEqual(repr(self.a5.get_previous_by_pub_date()),
-                         '<Article: Article 6>')
-        self.assertEqual(repr(self.a4.get_previous_by_pub_date()),
-                         '<Article: Article 7>')
-        self.assertEqual(repr(self.a3.get_previous_by_pub_date()),
-                         '<Article: Article 2>')
-        self.assertEqual(repr(self.a2.get_previous_by_pub_date()),
-                         '<Article: Article 1>')
-
-    def test_escaping(self):
-        # Underscores, percent signs and backslashes have special meaning in the
-        # underlying SQL code, but Django handles the quoting of them automatically.
-        a8 = Article(headline='Article_ with underscore', pub_date=datetime(2005, 11, 20))
-        a8.save()
-        self.assertQuerysetEqual(Article.objects.filter(headline__startswith='Article'),
-            [
-                '<Article: Article_ with underscore>',
-                '<Article: Article 5>',
-                '<Article: Article 6>',
-                '<Article: Article 4>',
-                '<Article: Article 2>',
-                '<Article: Article 3>',
-                '<Article: Article 7>',
-                '<Article: Article 1>',
-            ])
-        self.assertQuerysetEqual(Article.objects.filter(headline__startswith='Article_'),
-                                 ['<Article: Article_ with underscore>'])
-        a9 = Article(headline='Article% with percent sign', pub_date=datetime(2005, 11, 21))
-        a9.save()
-        self.assertQuerysetEqual(Article.objects.filter(headline__startswith='Article'),
-            [
-                '<Article: Article% with percent sign>',
-                '<Article: Article_ with underscore>',
-                '<Article: Article 5>',
-                '<Article: Article 6>',
-                '<Article: Article 4>',
-                '<Article: Article 2>',
-                '<Article: Article 3>',
-                '<Article: Article 7>',
-                '<Article: Article 1>',
-            ])
-        self.assertQuerysetEqual(Article.objects.filter(headline__startswith='Article%'),
-                                 ['<Article: Article% with percent sign>'])
-        a10 = Article(headline='Article with \\ backslash', pub_date=datetime(2005, 11, 22))
-        a10.save()
-        self.assertQuerysetEqual(Article.objects.filter(headline__contains='\\'),
-                                 ['<Article: Article with \ backslash>'])
-
-    def test_exclude(self):
-        a8 = Article.objects.create(headline='Article_ with underscore', pub_date=datetime(2005, 11, 20))
-        a9 = Article.objects.create(headline='Article% with percent sign', pub_date=datetime(2005, 11, 21))
-        a10 = Article.objects.create(headline='Article with \\ backslash', pub_date=datetime(2005, 11, 22))
-
-        # exclude() is the opposite of filter() when doing lookups:
-        self.assertQuerysetEqual(
-            Article.objects.filter(headline__contains='Article').exclude(headline__contains='with'),
-            [
-                '<Article: Article 5>',
-                '<Article: Article 6>',
-                '<Article: Article 4>',
-                '<Article: Article 2>',
-                '<Article: Article 3>',
-                '<Article: Article 7>',
-                '<Article: Article 1>',
-            ])
-        self.assertQuerysetEqual(Article.objects.exclude(headline__startswith="Article_"),
-            [
-                '<Article: Article with \\ backslash>',
-                '<Article: Article% with percent sign>',
-                '<Article: Article 5>',
-                '<Article: Article 6>',
-                '<Article: Article 4>',
-                '<Article: Article 2>',
-                '<Article: Article 3>',
-                '<Article: Article 7>',
-                '<Article: Article 1>',
-            ])
-        self.assertQuerysetEqual(Article.objects.exclude(headline="Article 7"),
-            [
-                '<Article: Article with \\ backslash>',
-                '<Article: Article% with percent sign>',
-                '<Article: Article_ with underscore>',
-                '<Article: Article 5>',
-                '<Article: Article 6>',
-                '<Article: Article 4>',
-                '<Article: Article 2>',
-                '<Article: Article 3>',
-                '<Article: Article 1>',
-            ])
-
-    def test_none(self):
-       # none() returns an EmptyQuerySet that behaves like any other QuerySet object
-        self.assertQuerysetEqual(Article.objects.none(), [])
-        self.assertQuerysetEqual(
-            Article.objects.none().filter(headline__startswith='Article'), [])
-        self.assertQuerysetEqual(
-            Article.objects.filter(headline__startswith='Article').none(), [])
-        self.assertEqual(Article.objects.none().count(), 0)
-        self.assertEqual(
-            Article.objects.none().update(headline="This should not take effect"), 0)
-        self.assertQuerysetEqual(
-            [article for article in Article.objects.none().iterator()],
-            [])
-
-    def test_in(self):
-        # using __in with an empty list should return an empty query set
-        self.assertQuerysetEqual(Article.objects.filter(id__in=[]), [])
-        self.assertQuerysetEqual(Article.objects.exclude(id__in=[]),
-            [
-                '<Article: Article 5>',
-                '<Article: Article 6>',
-                '<Article: Article 4>',
-                '<Article: Article 2>',
-                '<Article: Article 3>',
-                '<Article: Article 7>',
-                '<Article: Article 1>',
-            ])
-
-    def test_error_messages(self):
-        # Programming errors are pointed out with nice error messages
-        try:
-            Article.objects.filter(pub_date_year='2005').count()
-            self.fail('FieldError not raised')
-        except FieldError as ex:
-            self.assertEqual(str(ex), "Cannot resolve keyword 'pub_date_year' "
-                             "into field. Choices are: author, headline, id, pub_date, tag")
-        try:
-            Article.objects.filter(headline__starts='Article')
-            self.fail('FieldError not raised')
-        except FieldError as ex:
-            self.assertEqual(str(ex), "Join on field 'headline' not permitted. "
-                             "Did you misspell 'starts' for the lookup type?")
-
-    def test_regex(self):
-        # Create some articles with a bit more interesting headlines for testing field lookups:
-        for a in Article.objects.all():
-            a.delete()
-        now = datetime.now()
-        a1 = Article(pub_date=now, headline='f')
-        a1.save()
-        a2 = Article(pub_date=now, headline='fo')
-        a2.save()
-        a3 = Article(pub_date=now, headline='foo')
-        a3.save()
-        a4 = Article(pub_date=now, headline='fooo')
-        a4.save()
-        a5 = Article(pub_date=now, headline='hey-Foo')
-        a5.save()
-        a6 = Article(pub_date=now, headline='bar')
-        a6.save()
-        a7 = Article(pub_date=now, headline='AbBa')
-        a7.save()
-        a8 = Article(pub_date=now, headline='baz')
-        a8.save()
-        a9 = Article(pub_date=now, headline='baxZ')
-        a9.save()
-        # zero-or-more
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'fo*'),
-            ['<Article: f>', '<Article: fo>', '<Article: foo>', '<Article: fooo>'])
-        self.assertQuerysetEqual(Article.objects.filter(headline__iregex=r'fo*'),
-            [
-                '<Article: f>',
-                '<Article: fo>',
-                '<Article: foo>',
-                '<Article: fooo>',
-                '<Article: hey-Foo>',
-            ])
-        # one-or-more
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'fo+'),
-            ['<Article: fo>', '<Article: foo>', '<Article: fooo>'])
-        # wildcard
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'fooo?'),
-            ['<Article: foo>', '<Article: fooo>'])
-        # leading anchor
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'^b'),
-            ['<Article: bar>', '<Article: baxZ>', '<Article: baz>'])
-        self.assertQuerysetEqual(Article.objects.filter(headline__iregex=r'^a'),
-            ['<Article: AbBa>'])
-        # trailing anchor
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'z$'),
-            ['<Article: baz>'])
-        self.assertQuerysetEqual(Article.objects.filter(headline__iregex=r'z$'),
-            ['<Article: baxZ>', '<Article: baz>'])
-        # character sets
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'ba[rz]'),
-            ['<Article: bar>', '<Article: baz>'])
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'ba.[RxZ]'),
-            ['<Article: baxZ>'])
-        self.assertQuerysetEqual(Article.objects.filter(headline__iregex=r'ba[RxZ]'),
-            ['<Article: bar>', '<Article: baxZ>', '<Article: baz>'])
-
-        # and more articles:
-        a10 = Article(pub_date=now, headline='foobar')
-        a10.save()
-        a11 = Article(pub_date=now, headline='foobaz')
-        a11.save()
-        a12 = Article(pub_date=now, headline='ooF')
-        a12.save()
-        a13 = Article(pub_date=now, headline='foobarbaz')
-        a13.save()
-        a14 = Article(pub_date=now, headline='zoocarfaz')
-        a14.save()
-        a15 = Article(pub_date=now, headline='barfoobaz')
-        a15.save()
-        a16 = Article(pub_date=now, headline='bazbaRFOO')
-        a16.save()
-
-        # alternation
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'oo(f|b)'),
-            [
-                '<Article: barfoobaz>',
-                '<Article: foobar>',
-                '<Article: foobarbaz>',
-                '<Article: foobaz>',
-            ])
-        self.assertQuerysetEqual(Article.objects.filter(headline__iregex=r'oo(f|b)'),
-            [
-                '<Article: barfoobaz>',
-                '<Article: foobar>',
-                '<Article: foobarbaz>',
-                '<Article: foobaz>',
-                '<Article: ooF>',
-            ])
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'^foo(f|b)'),
-            ['<Article: foobar>', '<Article: foobarbaz>', '<Article: foobaz>'])
-
-        # greedy matching
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'b.*az'),
-            [
-                '<Article: barfoobaz>',
-                '<Article: baz>',
-                '<Article: bazbaRFOO>',
-                '<Article: foobarbaz>',
-                '<Article: foobaz>',
-            ])
-        self.assertQuerysetEqual(Article.objects.filter(headline__iregex=r'b.*ar'),
-            [
-                '<Article: bar>',
-                '<Article: barfoobaz>',
-                '<Article: bazbaRFOO>',
-                '<Article: foobar>',
-                '<Article: foobarbaz>',
-            ])
-
-    @skipUnlessDBFeature('supports_regex_backreferencing')
-    def test_regex_backreferencing(self):
-        # grouping and backreferences
-        now = datetime.now()
-        a10 = Article(pub_date=now, headline='foobar')
-        a10.save()
-        a11 = Article(pub_date=now, headline='foobaz')
-        a11.save()
-        a12 = Article(pub_date=now, headline='ooF')
-        a12.save()
-        a13 = Article(pub_date=now, headline='foobarbaz')
-        a13.save()
-        a14 = Article(pub_date=now, headline='zoocarfaz')
-        a14.save()
-        a15 = Article(pub_date=now, headline='barfoobaz')
-        a15.save()
-        a16 = Article(pub_date=now, headline='bazbaRFOO')
-        a16.save()
-        self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'b(.).*b\1'),
-            ['<Article: barfoobaz>', '<Article: bazbaRFOO>', '<Article: foobarbaz>'])
-
-    def test_nonfield_lookups(self):
-        """
-        Ensure that a lookup query containing non-fields raises the proper
-        exception.
-        """
-        with self.assertRaises(FieldError):
-            Article.objects.filter(headline__blahblah=99)
-        with self.assertRaises(FieldError):
-            Article.objects.filter(headline__blahblah__exact=99)
-        with self.assertRaises(FieldError):
-            Article.objects.filter(blahblah=99)
-
-    def test_lookup_collision(self):
-        """
-        Ensure that genuine field names don't collide with built-in lookup
-        types ('year', 'gt', 'range', 'in' etc.).
-        Refs #11670.
-        """
-
-        # Here we're using 'gt' as a code number for the year, e.g. 111=>2009.
-        season_2009 = Season.objects.create(year=2009, gt=111)
-        season_2009.games.create(home="Houston Astros", away="St. Louis Cardinals")
-        season_2010 = Season.objects.create(year=2010, gt=222)
-        season_2010.games.create(home="Houston Astros", away="Chicago Cubs")
-        season_2010.games.create(home="Houston Astros", away="Milwaukee Brewers")
-        season_2010.games.create(home="Houston Astros", away="St. Louis Cardinals")
-        season_2011 = Season.objects.create(year=2011, gt=333)
-        season_2011.games.create(home="Houston Astros", away="St. Louis Cardinals")
-        season_2011.games.create(home="Houston Astros", away="Milwaukee Brewers")
-        hunter_pence = Player.objects.create(name="Hunter Pence")
-        hunter_pence.games = Game.objects.filter(season__year__in=[2009, 2010])
-        pudge = Player.objects.create(name="Ivan Rodriquez")
-        pudge.games = Game.objects.filter(season__year=2009)
-        pedro_feliz = Player.objects.create(name="Pedro Feliz")
-        pedro_feliz.games = Game.objects.filter(season__year__in=[2011])
-        johnson = Player.objects.create(name="Johnson")
-        johnson.games = Game.objects.filter(season__year__in=[2011])
-
-        # Games in 2010
-        self.assertEqual(Game.objects.filter(season__year=2010).count(), 3)
-        self.assertEqual(Game.objects.filter(season__year__exact=2010).count(), 3)
-        self.assertEqual(Game.objects.filter(season__gt=222).count(), 3)
-        self.assertEqual(Game.objects.filter(season__gt__exact=222).count(), 3)
-
-        # Games in 2011
-        self.assertEqual(Game.objects.filter(season__year=2011).count(), 2)
-        self.assertEqual(Game.objects.filter(season__year__exact=2011).count(), 2)
-        self.assertEqual(Game.objects.filter(season__gt=333).count(), 2)
-        self.assertEqual(Game.objects.filter(season__gt__exact=333).count(), 2)
-        self.assertEqual(Game.objects.filter(season__year__gt=2010).count(), 2)
-        self.assertEqual(Game.objects.filter(season__gt__gt=222).count(), 2)
-
-        # Games played in 2010 and 2011
-        self.assertEqual(Game.objects.filter(season__year__in=[2010, 2011]).count(), 5)
-        self.assertEqual(Game.objects.filter(season__year__gt=2009).count(), 5)
-        self.assertEqual(Game.objects.filter(season__gt__in=[222, 333]).count(), 5)
-        self.assertEqual(Game.objects.filter(season__gt__gt=111).count(), 5)
-
-        # Players who played in 2009
-        self.assertEqual(Player.objects.filter(games__season__year=2009).distinct().count(), 2)
-        self.assertEqual(Player.objects.filter(games__season__year__exact=2009).distinct().count(), 2)
-        self.assertEqual(Player.objects.filter(games__season__gt=111).distinct().count(), 2)
-        self.assertEqual(Player.objects.filter(games__season__gt__exact=111).distinct().count(), 2)
-
-        # Players who played in 2010
-        self.assertEqual(Player.objects.filter(games__season__year=2010).distinct().count(), 1)
-        self.assertEqual(Player.objects.filter(games__season__year__exact=2010).distinct().count(), 1)
-        self.assertEqual(Player.objects.filter(games__season__gt=222).distinct().count(), 1)
-        self.assertEqual(Player.objects.filter(games__season__gt__exact=222).distinct().count(), 1)
-
-        # Players who played in 2011
-        self.assertEqual(Player.objects.filter(games__season__year=2011).distinct().count(), 2)
-        self.assertEqual(Player.objects.filter(games__season__year__exact=2011).distinct().count(), 2)
-        self.assertEqual(Player.objects.filter(games__season__gt=333).distinct().count(), 2)
-        self.assertEqual(Player.objects.filter(games__season__year__gt=2010).distinct().count(), 2)
-        self.assertEqual(Player.objects.filter(games__season__gt__gt=222).distinct().count(), 2)
diff --git a/tests/modeltests/test_client/tests.py b/tests/modeltests/test_client/tests.py
deleted file mode 100644
index 6ad51ac9a0..0000000000
--- a/tests/modeltests/test_client/tests.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Validate that you can override the default test suite
-
-from django.utils import unittest
-
-
-def suite():
-    """
-    Define a suite that deliberately ignores a test defined in
-    this module.
-    """
-
-    testSuite = unittest.TestSuite()
-    testSuite.addTest(SampleTests('testGoodStuff'))
-    return testSuite
-
-class SampleTests(unittest.TestCase):
-    def testGoodStuff(self):
-        pass
-
-    def testBadStuff(self):
-        self.fail("This test shouldn't run")
diff --git a/tests/modeltests/transactions/tests.py b/tests/modeltests/transactions/tests.py
deleted file mode 100644
index f3246eef2a..0000000000
--- a/tests/modeltests/transactions/tests.py
+++ /dev/null
@@ -1,310 +0,0 @@
-from __future__ import absolute_import
-
-from django.db import connection, transaction, IntegrityError
-from django.test import TransactionTestCase, skipUnlessDBFeature
-
-from .models import Reporter
-
-
-class TransactionTests(TransactionTestCase):
-    def create_a_reporter_then_fail(self, first, last):
-        a = Reporter(first_name=first, last_name=last)
-        a.save()
-        raise Exception("I meant to do that")
-
-    def remove_a_reporter(self, first_name):
-        r = Reporter.objects.get(first_name="Alice")
-        r.delete()
-
-    def manually_managed(self):
-        r = Reporter(first_name="Dirk", last_name="Gently")
-        r.save()
-        transaction.commit()
-
-    def manually_managed_mistake(self):
-        r = Reporter(first_name="Edward", last_name="Woodward")
-        r.save()
-        # Oops, I forgot to commit/rollback!
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_autocommit(self):
-        """
-        The default behavior is to autocommit after each save() action.
-        """
-        self.assertRaises(Exception,
-            self.create_a_reporter_then_fail,
-            "Alice", "Smith"
-        )
-
-        # The object created before the exception still exists
-        self.assertEqual(Reporter.objects.count(), 1)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_autocommit_decorator(self):
-        """
-        The autocommit decorator works exactly the same as the default behavior.
-        """
-        autocomitted_create_then_fail = transaction.autocommit(
-            self.create_a_reporter_then_fail
-        )
-        self.assertRaises(Exception,
-            autocomitted_create_then_fail,
-            "Alice", "Smith"
-        )
-        # Again, the object created before the exception still exists
-        self.assertEqual(Reporter.objects.count(), 1)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_autocommit_decorator_with_using(self):
-        """
-        The autocommit decorator also works with a using argument.
-        """
-        autocomitted_create_then_fail = transaction.autocommit(using='default')(
-            self.create_a_reporter_then_fail
-        )
-        self.assertRaises(Exception,
-            autocomitted_create_then_fail,
-            "Alice", "Smith"
-        )
-        # Again, the object created before the exception still exists
-        self.assertEqual(Reporter.objects.count(), 1)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_commit_on_success(self):
-        """
-        With the commit_on_success decorator, the transaction is only committed
-        if the function doesn't throw an exception.
-        """
-        committed_on_success = transaction.commit_on_success(
-            self.create_a_reporter_then_fail)
-        self.assertRaises(Exception, committed_on_success, "Dirk", "Gently")
-        # This time the object never got saved
-        self.assertEqual(Reporter.objects.count(), 0)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_commit_on_success_with_using(self):
-        """
-        The commit_on_success decorator also works with a using argument.
-        """
-        using_committed_on_success = transaction.commit_on_success(using='default')(
-            self.create_a_reporter_then_fail
-        )
-        self.assertRaises(Exception,
-            using_committed_on_success,
-            "Dirk", "Gently"
-        )
-        # This time the object never got saved
-        self.assertEqual(Reporter.objects.count(), 0)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_commit_on_success_succeed(self):
-        """
-        If there aren't any exceptions, the data will get saved.
-        """
-        Reporter.objects.create(first_name="Alice", last_name="Smith")
-        remove_comitted_on_success = transaction.commit_on_success(
-            self.remove_a_reporter
-        )
-        remove_comitted_on_success("Alice")
-        self.assertEqual(list(Reporter.objects.all()), [])
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_commit_on_success_exit(self):
-        @transaction.autocommit()
-        def gen_reporter():
-            @transaction.commit_on_success
-            def create_reporter():
-                Reporter.objects.create(first_name="Bobby", last_name="Tables")
-
-            create_reporter()
-            # Much more formal
-            r = Reporter.objects.get()
-            r.first_name = "Robert"
-            r.save()
-
-        gen_reporter()
-        r = Reporter.objects.get()
-        self.assertEqual(r.first_name, "Robert")
-
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_manually_managed(self):
-        """
-        You can manually manage transactions if you really want to, but you
-        have to remember to commit/rollback.
-        """
-        manually_managed = transaction.commit_manually(self.manually_managed)
-        manually_managed()
-        self.assertEqual(Reporter.objects.count(), 1)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_manually_managed_mistake(self):
-        """
-        If you forget, you'll get bad errors.
-        """
-        manually_managed_mistake = transaction.commit_manually(
-            self.manually_managed_mistake
-        )
-        self.assertRaises(transaction.TransactionManagementError,
-            manually_managed_mistake)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_manually_managed_with_using(self):
-        """
-        The commit_manually function also works with a using argument.
-        """
-        using_manually_managed_mistake = transaction.commit_manually(using='default')(
-            self.manually_managed_mistake
-        )
-        self.assertRaises(transaction.TransactionManagementError,
-            using_manually_managed_mistake
-        )
-
-
-class TransactionRollbackTests(TransactionTestCase):
-    def execute_bad_sql(self):
-        cursor = connection.cursor()
-        cursor.execute("INSERT INTO transactions_reporter (first_name, last_name) VALUES ('Douglas', 'Adams');")
-        transaction.set_dirty()
-
-    @skipUnlessDBFeature('requires_rollback_on_dirty_transaction')
-    def test_bad_sql(self):
-        """
-        Regression for #11900: If a function wrapped by commit_on_success
-        writes a transaction that can't be committed, that transaction should
-        be rolled back. The bug is only visible using the psycopg2 backend,
-        though the fix is generally a good idea.
-        """
-        execute_bad_sql = transaction.commit_on_success(self.execute_bad_sql)
-        self.assertRaises(IntegrityError, execute_bad_sql)
-        transaction.rollback()
-
-class TransactionContextManagerTests(TransactionTestCase):
-    def create_reporter_and_fail(self):
-        Reporter.objects.create(first_name="Bob", last_name="Holtzman")
-        raise Exception
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_autocommit(self):
-        """
-        The default behavior is to autocommit after each save() action.
-        """
-        with self.assertRaises(Exception):
-            self.create_reporter_and_fail()
-        # The object created before the exception still exists
-        self.assertEqual(Reporter.objects.count(), 1)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_autocommit_context_manager(self):
-        """
-        The autocommit context manager works exactly the same as the default
-        behavior.
-        """
-        with self.assertRaises(Exception):
-            with transaction.autocommit():
-                self.create_reporter_and_fail()
-
-        self.assertEqual(Reporter.objects.count(), 1)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_autocommit_context_manager_with_using(self):
-        """
-        The autocommit context manager also works with a using argument.
-        """
-        with self.assertRaises(Exception):
-            with transaction.autocommit(using="default"):
-                self.create_reporter_and_fail()
-
-        self.assertEqual(Reporter.objects.count(), 1)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_commit_on_success(self):
-        """
-        With the commit_on_success context manager, the transaction is only
-        committed if the block doesn't throw an exception.
-        """
-        with self.assertRaises(Exception):
-            with transaction.commit_on_success():
-                self.create_reporter_and_fail()
-
-        self.assertEqual(Reporter.objects.count(), 0)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_commit_on_success_with_using(self):
-        """
-        The commit_on_success context manager also works with a using argument.
-        """
-        with self.assertRaises(Exception):
-            with transaction.commit_on_success(using="default"):
-                self.create_reporter_and_fail()
-
-        self.assertEqual(Reporter.objects.count(), 0)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_commit_on_success_succeed(self):
-        """
-        If there aren't any exceptions, the data will get saved.
-        """
-        Reporter.objects.create(first_name="Alice", last_name="Smith")
-        with transaction.commit_on_success():
-            Reporter.objects.filter(first_name="Alice").delete()
-
-        self.assertQuerysetEqual(Reporter.objects.all(), [])
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_commit_on_success_exit(self):
-        with transaction.autocommit():
-            with transaction.commit_on_success():
-                Reporter.objects.create(first_name="Bobby", last_name="Tables")
-
-            # Much more formal
-            r = Reporter.objects.get()
-            r.first_name = "Robert"
-            r.save()
-
-        r = Reporter.objects.get()
-        self.assertEqual(r.first_name, "Robert")
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_manually_managed(self):
-        """
-        You can manually manage transactions if you really want to, but you
-        have to remember to commit/rollback.
-        """
-        with transaction.commit_manually():
-            Reporter.objects.create(first_name="Libby", last_name="Holtzman")
-            transaction.commit()
-        self.assertEqual(Reporter.objects.count(), 1)
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_manually_managed_mistake(self):
-        """
-        If you forget, you'll get bad errors.
-        """
-        with self.assertRaises(transaction.TransactionManagementError):
-            with transaction.commit_manually():
-                Reporter.objects.create(first_name="Scott", last_name="Browning")
-
-    @skipUnlessDBFeature('supports_transactions')
-    def test_manually_managed_with_using(self):
-        """
-        The commit_manually function also works with a using argument.
-        """
-        with self.assertRaises(transaction.TransactionManagementError):
-            with transaction.commit_manually(using="default"):
-                Reporter.objects.create(first_name="Walter", last_name="Cronkite")
-
-    @skipUnlessDBFeature('requires_rollback_on_dirty_transaction')
-    def test_bad_sql(self):
-        """
-        Regression for #11900: If a block wrapped by commit_on_success
-        writes a transaction that can't be committed, that transaction should
-        be rolled back. The bug is only visible using the psycopg2 backend,
-        though the fix is generally a good idea.
-        """
-        with self.assertRaises(IntegrityError):
-            with transaction.commit_on_success():
-                cursor = connection.cursor()
-                cursor.execute("INSERT INTO transactions_reporter (first_name, last_name) VALUES ('Douglas', 'Adams');")
-                transaction.set_dirty()
-        transaction.rollback()
diff --git a/tests/regressiontests/admin_registration/__init__.py b/tests/multiple_database/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_registration/__init__.py
rename to tests/multiple_database/__init__.py
diff --git a/tests/regressiontests/multiple_database/fixtures/multidb-common.json b/tests/multiple_database/fixtures/multidb-common.json
similarity index 100%
rename from tests/regressiontests/multiple_database/fixtures/multidb-common.json
rename to tests/multiple_database/fixtures/multidb-common.json
diff --git a/tests/regressiontests/multiple_database/fixtures/multidb.default.json b/tests/multiple_database/fixtures/multidb.default.json
similarity index 100%
rename from tests/regressiontests/multiple_database/fixtures/multidb.default.json
rename to tests/multiple_database/fixtures/multidb.default.json
diff --git a/tests/regressiontests/multiple_database/fixtures/multidb.other.json b/tests/multiple_database/fixtures/multidb.other.json
similarity index 100%
rename from tests/regressiontests/multiple_database/fixtures/multidb.other.json
rename to tests/multiple_database/fixtures/multidb.other.json
diff --git a/tests/regressiontests/multiple_database/fixtures/pets.json b/tests/multiple_database/fixtures/pets.json
similarity index 100%
rename from tests/regressiontests/multiple_database/fixtures/pets.json
rename to tests/multiple_database/fixtures/pets.json
diff --git a/tests/regressiontests/multiple_database/models.py b/tests/multiple_database/models.py
similarity index 100%
rename from tests/regressiontests/multiple_database/models.py
rename to tests/multiple_database/models.py
diff --git a/tests/regressiontests/multiple_database/tests.py b/tests/multiple_database/tests.py
similarity index 99%
rename from tests/regressiontests/multiple_database/tests.py
rename to tests/multiple_database/tests.py
index a903ea11a0..2bff7b3b66 100644
--- a/tests/regressiontests/multiple_database/tests.py
+++ b/tests/multiple_database/tests.py
@@ -3,6 +3,7 @@ from __future__ import absolute_import, unicode_literals
 import datetime
 import pickle
 from operator import attrgetter
+import warnings
 
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
@@ -1596,7 +1597,7 @@ class AuthTestCase(TestCase):
         new_io = StringIO()
         management.call_command('dumpdata', 'auth', format='json', database='other', stdout=new_io)
         command_output = new_io.getvalue().strip()
-        self.assertTrue('"email": "alice@example.com",' in command_output)
+        self.assertTrue('"email": "alice@example.com"' in command_output)
 
 
 @override_settings(AUTH_PROFILE_MODULE='multiple_database.UserProfile')
@@ -1612,8 +1613,10 @@ class UserProfileTestCase(TestCase):
         bob_profile = UserProfile(user=bob, flavor='crunchy frog')
         bob_profile.save()
 
-        self.assertEqual(alice.get_profile().flavor, 'chocolate')
-        self.assertEqual(bob.get_profile().flavor, 'crunchy frog')
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            self.assertEqual(alice.get_profile().flavor, 'chocolate')
+            self.assertEqual(bob.get_profile().flavor, 'crunchy frog')
 
 class AntiPetRouter(object):
     # A router that only expresses an opinion on syncdb,
@@ -1758,6 +1761,11 @@ class SignalTests(TestCase):
         self.assertEqual(pre_delete_receiver._database, "other")
         self.assertEqual(post_delete_receiver._database, "other")
 
+        signals.pre_save.disconnect(sender=Person, receiver=pre_save_receiver)
+        signals.post_save.disconnect(sender=Person, receiver=post_save_receiver)
+        signals.pre_delete.disconnect(sender=Person, receiver=pre_delete_receiver)
+        signals.post_delete.disconnect(sender=Person, receiver=post_delete_receiver)
+
     def test_database_arg_m2m(self):
         """
         Test that the m2m_changed signal has a correct database arg (#13552)
diff --git a/tests/regressiontests/admin_scripts/__init__.py b/tests/mutually_referential/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/__init__.py
rename to tests/mutually_referential/__init__.py
diff --git a/tests/modeltests/mutually_referential/models.py b/tests/mutually_referential/models.py
similarity index 100%
rename from tests/modeltests/mutually_referential/models.py
rename to tests/mutually_referential/models.py
diff --git a/tests/modeltests/mutually_referential/tests.py b/tests/mutually_referential/tests.py
similarity index 100%
rename from tests/modeltests/mutually_referential/tests.py
rename to tests/mutually_referential/tests.py
diff --git a/tests/regressiontests/admin_scripts/app_with_import/__init__.py b/tests/nested_foreign_keys/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/app_with_import/__init__.py
rename to tests/nested_foreign_keys/__init__.py
diff --git a/tests/regressiontests/nested_foreign_keys/models.py b/tests/nested_foreign_keys/models.py
similarity index 100%
rename from tests/regressiontests/nested_foreign_keys/models.py
rename to tests/nested_foreign_keys/models.py
diff --git a/tests/regressiontests/nested_foreign_keys/tests.py b/tests/nested_foreign_keys/tests.py
similarity index 97%
rename from tests/regressiontests/nested_foreign_keys/tests.py
rename to tests/nested_foreign_keys/tests.py
index a976d12453..5cb23cfb9c 100644
--- a/tests/regressiontests/nested_foreign_keys/tests.py
+++ b/tests/nested_foreign_keys/tests.py
@@ -71,6 +71,12 @@ class NestedForeignKeysTests(TestCase):
         self.assertEqual(Event.objects.filter(screeningnullfk__movie=self.movie).count(), 1)
         self.assertEqual(Event.objects.exclude(screeningnullfk__movie=self.movie).count(), 2)
 
+    def test_null_exclude(self):
+        screening = ScreeningNullFK.objects.create(movie=None)
+        ScreeningNullFK.objects.create(movie=self.movie)
+        self.assertEqual(
+            list(ScreeningNullFK.objects.exclude(movie__id=self.movie.pk)),
+            [screening])
 
     # This test failed in #16715 because in some cases INNER JOIN was selected
     # for the second foreign key relation instead of LEFT OUTER JOIN.
diff --git a/tests/regressiontests/admin_scripts/broken_app/__init__.py b/tests/null_fk/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/broken_app/__init__.py
rename to tests/null_fk/__init__.py
diff --git a/tests/regressiontests/null_fk/models.py b/tests/null_fk/models.py
similarity index 100%
rename from tests/regressiontests/null_fk/models.py
rename to tests/null_fk/models.py
diff --git a/tests/regressiontests/null_fk/tests.py b/tests/null_fk/tests.py
similarity index 100%
rename from tests/regressiontests/null_fk/tests.py
rename to tests/null_fk/tests.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/__init__.py b/tests/null_fk_ordering/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/__init__.py
rename to tests/null_fk_ordering/__init__.py
diff --git a/tests/regressiontests/null_fk_ordering/models.py b/tests/null_fk_ordering/models.py
similarity index 100%
rename from tests/regressiontests/null_fk_ordering/models.py
rename to tests/null_fk_ordering/models.py
diff --git a/tests/regressiontests/null_fk_ordering/tests.py b/tests/null_fk_ordering/tests.py
similarity index 100%
rename from tests/regressiontests/null_fk_ordering/tests.py
rename to tests/null_fk_ordering/tests.py
diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py b/tests/null_queries/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
rename to tests/null_queries/__init__.py
diff --git a/tests/regressiontests/null_queries/models.py b/tests/null_queries/models.py
similarity index 88%
rename from tests/regressiontests/null_queries/models.py
rename to tests/null_queries/models.py
index 25560fbab7..9070dd4873 100644
--- a/tests/regressiontests/null_queries/models.py
+++ b/tests/null_queries/models.py
@@ -28,4 +28,5 @@ class OuterB(models.Model):
 
 class Inner(models.Model):
     first = models.ForeignKey(OuterA)
-    second = models.ForeignKey(OuterB, null=True)
+    # second would clash with the __second lookup.
+    third = models.ForeignKey(OuterB, null=True)
diff --git a/tests/regressiontests/null_queries/tests.py b/tests/null_queries/tests.py
similarity index 93%
rename from tests/regressiontests/null_queries/tests.py
rename to tests/null_queries/tests.py
index 47c99fbcb3..93e72d55d8 100644
--- a/tests/regressiontests/null_queries/tests.py
+++ b/tests/null_queries/tests.py
@@ -55,17 +55,17 @@ class NullQueriesTests(TestCase):
         """
         obj = OuterA.objects.create()
         self.assertQuerysetEqual(
-            OuterA.objects.filter(inner__second=None),
+            OuterA.objects.filter(inner__third=None),
             ['<OuterA: OuterA object>']
         )
         self.assertQuerysetEqual(
-            OuterA.objects.filter(inner__second__data=None),
+            OuterA.objects.filter(inner__third__data=None),
             ['<OuterA: OuterA object>']
         )
 
         inner_obj = Inner.objects.create(first=obj)
         self.assertQuerysetEqual(
-            Inner.objects.filter(first__inner__second=None),
+            Inner.objects.filter(first__inner__third=None),
             ['<Inner: Inner object>']
         )
 
diff --git a/tests/regressiontests/admin_scripts/custom_templates/app_template/__init__.py b/tests/one_to_one/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/app_template/__init__.py
rename to tests/one_to_one/__init__.py
diff --git a/tests/modeltests/one_to_one/models.py b/tests/one_to_one/models.py
similarity index 100%
rename from tests/modeltests/one_to_one/models.py
rename to tests/one_to_one/models.py
diff --git a/tests/modeltests/one_to_one/tests.py b/tests/one_to_one/tests.py
similarity index 100%
rename from tests/modeltests/one_to_one/tests.py
rename to tests/one_to_one/tests.py
diff --git a/tests/regressiontests/admin_scripts/custom_templates/project_template/project_name/__init__.py b/tests/one_to_one_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/custom_templates/project_template/project_name/__init__.py
rename to tests/one_to_one_regress/__init__.py
diff --git a/tests/regressiontests/one_to_one_regress/models.py b/tests/one_to_one_regress/models.py
similarity index 91%
rename from tests/regressiontests/one_to_one_regress/models.py
rename to tests/one_to_one_regress/models.py
index 38b801f40e..058baafc82 100644
--- a/tests/regressiontests/one_to_one_regress/models.py
+++ b/tests/one_to_one_regress/models.py
@@ -24,14 +24,14 @@ class Restaurant(models.Model):
 @python_2_unicode_compatible
 class Bar(models.Model):
     place = models.OneToOneField(Place)
-    serves_cocktails = models.BooleanField()
+    serves_cocktails = models.BooleanField(default=True)
 
     def __str__(self):
         return "%s the bar" % self.place.name
 
 class UndergroundBar(models.Model):
     place = models.OneToOneField(Place, null=True)
-    serves_cocktails = models.BooleanField()
+    serves_cocktails = models.BooleanField(default=True)
 
 @python_2_unicode_compatible
 class Favorites(models.Model):
diff --git a/tests/regressiontests/one_to_one_regress/tests.py b/tests/one_to_one_regress/tests.py
similarity index 100%
rename from tests/regressiontests/one_to_one_regress/tests.py
rename to tests/one_to_one_regress/tests.py
diff --git a/tests/regressiontests/admin_scripts/management/__init__.py b/tests/or_lookups/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/__init__.py
rename to tests/or_lookups/__init__.py
diff --git a/tests/modeltests/or_lookups/models.py b/tests/or_lookups/models.py
similarity index 100%
rename from tests/modeltests/or_lookups/models.py
rename to tests/or_lookups/models.py
diff --git a/tests/modeltests/or_lookups/tests.py b/tests/or_lookups/tests.py
similarity index 100%
rename from tests/modeltests/or_lookups/tests.py
rename to tests/or_lookups/tests.py
diff --git a/tests/regressiontests/admin_scripts/management/commands/__init__.py b/tests/order_with_respect_to/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/management/commands/__init__.py
rename to tests/order_with_respect_to/__init__.py
diff --git a/tests/modeltests/order_with_respect_to/models.py b/tests/order_with_respect_to/models.py
similarity index 100%
rename from tests/modeltests/order_with_respect_to/models.py
rename to tests/order_with_respect_to/models.py
diff --git a/tests/modeltests/order_with_respect_to/tests.py b/tests/order_with_respect_to/tests.py
similarity index 100%
rename from tests/modeltests/order_with_respect_to/tests.py
rename to tests/order_with_respect_to/tests.py
diff --git a/tests/regressiontests/admin_scripts/simple_app/__init__.py b/tests/ordering/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_scripts/simple_app/__init__.py
rename to tests/ordering/__init__.py
diff --git a/tests/modeltests/ordering/models.py b/tests/ordering/models.py
similarity index 100%
rename from tests/modeltests/ordering/models.py
rename to tests/ordering/models.py
diff --git a/tests/modeltests/ordering/tests.py b/tests/ordering/tests.py
similarity index 100%
rename from tests/modeltests/ordering/tests.py
rename to tests/ordering/tests.py
diff --git a/tests/regressiontests/admin_util/__init__.py b/tests/pagination/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_util/__init__.py
rename to tests/pagination/__init__.py
diff --git a/tests/regressiontests/pagination/custom.py b/tests/pagination/custom.py
similarity index 100%
rename from tests/regressiontests/pagination/custom.py
rename to tests/pagination/custom.py
diff --git a/tests/regressiontests/pagination/models.py b/tests/pagination/models.py
similarity index 100%
rename from tests/regressiontests/pagination/models.py
rename to tests/pagination/models.py
diff --git a/tests/regressiontests/pagination/tests.py b/tests/pagination/tests.py
similarity index 100%
rename from tests/regressiontests/pagination/tests.py
rename to tests/pagination/tests.py
diff --git a/tests/regressiontests/admin_validation/__init__.py b/tests/prefetch_related/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_validation/__init__.py
rename to tests/prefetch_related/__init__.py
diff --git a/tests/modeltests/prefetch_related/models.py b/tests/prefetch_related/models.py
similarity index 97%
rename from tests/modeltests/prefetch_related/models.py
rename to tests/prefetch_related/models.py
index e58997d200..81c569844f 100644
--- a/tests/modeltests/prefetch_related/models.py
+++ b/tests/prefetch_related/models.py
@@ -87,8 +87,8 @@ class Qualification(models.Model):
 
 
 class TeacherManager(models.Manager):
-    def get_query_set(self):
-        return super(TeacherManager, self).get_query_set().prefetch_related('qualifications')
+    def get_queryset(self):
+        return super(TeacherManager, self).get_queryset().prefetch_related('qualifications')
 
 
 @python_2_unicode_compatible
diff --git a/tests/modeltests/prefetch_related/tests.py b/tests/prefetch_related/tests.py
similarity index 100%
rename from tests/modeltests/prefetch_related/tests.py
rename to tests/prefetch_related/tests.py
diff --git a/tests/regressiontests/admin_views/__init__.py b/tests/properties/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_views/__init__.py
rename to tests/properties/__init__.py
diff --git a/tests/modeltests/properties/models.py b/tests/properties/models.py
similarity index 100%
rename from tests/modeltests/properties/models.py
rename to tests/properties/models.py
diff --git a/tests/modeltests/properties/tests.py b/tests/properties/tests.py
similarity index 100%
rename from tests/modeltests/properties/tests.py
rename to tests/properties/tests.py
diff --git a/tests/regressiontests/admin_widgets/__init__.py b/tests/proxy_model_inheritance/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_widgets/__init__.py
rename to tests/proxy_model_inheritance/__init__.py
diff --git a/tests/regressiontests/aggregation_regress/__init__.py b/tests/proxy_model_inheritance/app1/__init__.py
similarity index 100%
rename from tests/regressiontests/aggregation_regress/__init__.py
rename to tests/proxy_model_inheritance/app1/__init__.py
diff --git a/tests/modeltests/proxy_model_inheritance/app1/models.py b/tests/proxy_model_inheritance/app1/models.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/app1/models.py
rename to tests/proxy_model_inheritance/app1/models.py
diff --git a/tests/regressiontests/app_loading/__init__.py b/tests/proxy_model_inheritance/app2/__init__.py
similarity index 100%
rename from tests/regressiontests/app_loading/__init__.py
rename to tests/proxy_model_inheritance/app2/__init__.py
diff --git a/tests/modeltests/proxy_model_inheritance/app2/models.py b/tests/proxy_model_inheritance/app2/models.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/app2/models.py
rename to tests/proxy_model_inheritance/app2/models.py
diff --git a/tests/modeltests/proxy_model_inheritance/models.py b/tests/proxy_model_inheritance/models.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/models.py
rename to tests/proxy_model_inheritance/models.py
diff --git a/tests/modeltests/proxy_model_inheritance/tests.py b/tests/proxy_model_inheritance/tests.py
similarity index 100%
rename from tests/modeltests/proxy_model_inheritance/tests.py
rename to tests/proxy_model_inheritance/tests.py
diff --git a/tests/regressiontests/app_loading/not_installed/__init__.py b/tests/proxy_models/__init__.py
similarity index 100%
rename from tests/regressiontests/app_loading/not_installed/__init__.py
rename to tests/proxy_models/__init__.py
diff --git a/tests/proxy_models/fixtures/myhorses.json b/tests/proxy_models/fixtures/myhorses.json
new file mode 100644
index 0000000000..15943064c8
--- /dev/null
+++ b/tests/proxy_models/fixtures/myhorses.json
@@ -0,0 +1,24 @@
+[
+    {
+        "pk": 100,
+        "model": "proxy_models.BaseUser",
+        "fields": {
+            "name": "Django Pony"
+        }
+    },
+    {
+        "pk": 100,
+        "model": "proxy_models.TrackerUser",
+        "fields": {
+            "status": "emperor"
+        }
+    },
+    {
+        "pk": 100,
+        "model": "proxy_models.Issue",
+        "fields": {
+            "summary": "Pony's Issue",
+            "assignee": 100
+        }
+    }
+]
\ No newline at end of file
diff --git a/tests/modeltests/proxy_models/fixtures/mypeople.json b/tests/proxy_models/fixtures/mypeople.json
similarity index 100%
rename from tests/modeltests/proxy_models/fixtures/mypeople.json
rename to tests/proxy_models/fixtures/mypeople.json
diff --git a/tests/modeltests/proxy_models/models.py b/tests/proxy_models/models.py
similarity index 94%
rename from tests/modeltests/proxy_models/models.py
rename to tests/proxy_models/models.py
index 6c962aadc8..ffb36657e1 100644
--- a/tests/modeltests/proxy_models/models.py
+++ b/tests/proxy_models/models.py
@@ -10,12 +10,12 @@ from django.utils.encoding import python_2_unicode_compatible
 # A couple of managers for testing managing overriding in proxy model cases.
 
 class PersonManager(models.Manager):
-    def get_query_set(self):
-        return super(PersonManager, self).get_query_set().exclude(name="fred")
+    def get_queryset(self):
+        return super(PersonManager, self).get_queryset().exclude(name="fred")
 
 class SubManager(models.Manager):
-    def get_query_set(self):
-        return super(SubManager, self).get_query_set().exclude(name="wilma")
+    def get_queryset(self):
+        return super(SubManager, self).get_queryset().exclude(name="wilma")
 
 @python_2_unicode_compatible
 class Person(models.Model):
diff --git a/tests/modeltests/proxy_models/tests.py b/tests/proxy_models/tests.py
similarity index 93%
rename from tests/modeltests/proxy_models/tests.py
rename to tests/proxy_models/tests.py
index d1c95467ee..77d2ba9a74 100644
--- a/tests/modeltests/proxy_models/tests.py
+++ b/tests/proxy_models/tests.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
 import copy
 
 from django.conf import settings
+from django.contrib import admin
 from django.contrib.contenttypes.models import ContentType
 from django.core import management
 from django.core.exceptions import FieldError
@@ -14,7 +15,7 @@ from django.test import TestCase
 from .models import (MyPerson, Person, StatusPerson, LowerStatusPerson,
     MyPersonProxy, Abstract, OtherPerson, User, UserProxy, UserProxyProxy,
     Country, State, StateProxy, TrackerUser, BaseUser, Bug, ProxyTrackerUser,
-    Improvement, ProxyProxyBug, ProxyBug, ProxyImprovement)
+    Improvement, ProxyProxyBug, ProxyBug, ProxyImprovement, Issue)
 
 
 class ProxyModelTests(TestCase):
@@ -360,3 +361,22 @@ class ProxyModelTests(TestCase):
         management.call_command('loaddata', 'mypeople.json', verbosity=0, commit=False)
         p = MyPerson.objects.get(pk=100)
         self.assertEqual(p.name, 'Elvis Presley')
+
+
+class ProxyModelAdminTests(TestCase):
+    fixtures = ['myhorses']
+
+    def test_cascade_delete_proxy_model_admin_warning(self):
+        """
+        Test if admin gives warning about cascade deleting models referenced
+        to concrete model by deleting proxy object.
+        """
+        tracker_user = TrackerUser.objects.all()[0]
+        base_user = BaseUser.objects.all()[0]
+        issue = Issue.objects.all()[0]
+        with self.assertNumQueries(7):
+            collector = admin.util.NestedObjects('default')
+            collector.collect(ProxyTrackerUser.objects.all())
+        self.assertTrue(tracker_user in collector.edges.get(None, ()))
+        self.assertTrue(base_user in collector.edges.get(None, ()))
+        self.assertTrue(issue in collector.edges.get(tracker_user, ()))
diff --git a/tests/regressiontests/backends/__init__.py b/tests/queries/__init__.py
similarity index 100%
rename from tests/regressiontests/backends/__init__.py
rename to tests/queries/__init__.py
diff --git a/tests/regressiontests/queries/models.py b/tests/queries/models.py
similarity index 83%
rename from tests/regressiontests/queries/models.py
rename to tests/queries/models.py
index 73b9762150..71346d8be9 100644
--- a/tests/regressiontests/queries/models.py
+++ b/tests/queries/models.py
@@ -64,6 +64,7 @@ class Annotation(models.Model):
 class ExtraInfo(models.Model):
     info = models.CharField(max_length=100)
     note = models.ForeignKey(Note)
+    value = models.IntegerField(null=True)
 
     class Meta:
         ordering = ['info']
@@ -175,8 +176,8 @@ class LoopZ(models.Model):
 
 # A model and custom default manager combination.
 class CustomManager(models.Manager):
-    def get_query_set(self):
-        qs = super(CustomManager, self).get_query_set()
+    def get_queryset(self):
+        qs = super(CustomManager, self).get_queryset()
         return qs.filter(public=True, tag__name='t1')
 
 @python_2_unicode_compatible
@@ -196,8 +197,8 @@ class Detail(models.Model):
     data = models.CharField(max_length=10)
 
 class MemberManager(models.Manager):
-    def get_query_set(self):
-        return super(MemberManager, self).get_query_set().select_related("details")
+    def get_queryset(self):
+        return super(MemberManager, self).get_queryset().select_related("details")
 
 class Member(models.Model):
     name = models.CharField(max_length=10)
@@ -421,3 +422,78 @@ class Responsibility(models.Model):
 
     def __str__(self):
         return self.description
+
+# Models for disjunction join promotion low level testing.
+class FK1(models.Model):
+    f1 = models.TextField()
+    f2 = models.TextField()
+
+class FK2(models.Model):
+    f1 = models.TextField()
+    f2 = models.TextField()
+
+class FK3(models.Model):
+    f1 = models.TextField()
+    f2 = models.TextField()
+
+class BaseA(models.Model):
+    a = models.ForeignKey(FK1, null=True)
+    b = models.ForeignKey(FK2, null=True)
+    c = models.ForeignKey(FK3, null=True)
+
+@python_2_unicode_compatible
+class Identifier(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name
+
+class Program(models.Model):
+    identifier = models.OneToOneField(Identifier)
+
+class Channel(models.Model):
+    programs = models.ManyToManyField(Program)
+    identifier = models.OneToOneField(Identifier)
+
+class Book(models.Model):
+    title = models.TextField()
+    chapter = models.ForeignKey('Chapter')
+
+class Chapter(models.Model):
+    title = models.TextField()
+    paragraph = models.ForeignKey('Paragraph')
+
+
+class Paragraph(models.Model):
+    text = models.TextField()
+    page = models.ManyToManyField('Page')
+
+class Page(models.Model):
+    text = models.TextField()
+
+class MyObject(models.Model):
+    parent = models.ForeignKey('self', null=True, blank=True, related_name='children')
+    data = models.CharField(max_length=100)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+# Models for #17600 regressions
+@python_2_unicode_compatible
+class Order(models.Model):
+    id = models.IntegerField(primary_key=True)
+
+    class Meta:
+        ordering = ('pk', )
+
+    def __str__(self):
+        return '%s' % self.pk
+
+@python_2_unicode_compatible
+class OrderItem(models.Model):
+    order = models.ForeignKey(Order, related_name='items')
+    status = models.IntegerField()
+
+    class Meta:
+        ordering = ('pk', )
+
+    def __str__(self):
+        return '%s' % self.pk
diff --git a/tests/regressiontests/queries/tests.py b/tests/queries/tests.py
similarity index 81%
rename from tests/regressiontests/queries/tests.py
rename to tests/queries/tests.py
index 75e27769b4..cdc26248c9 100644
--- a/tests/regressiontests/queries/tests.py
+++ b/tests/queries/tests.py
@@ -8,8 +8,8 @@ import sys
 from django.conf import settings
 from django.core.exceptions import FieldError
 from django.db import DatabaseError, connection, connections, DEFAULT_DB_ALIAS
-from django.db.models import Count
-from django.db.models.query import Q, ITER_CHUNK_SIZE, EmptyQuerySet
+from django.db.models import Count, F, Q
+from django.db.models.query import ITER_CHUNK_SIZE
 from django.db.models.sql.where import WhereNode, EverythingNode, NothingNode
 from django.db.models.sql.datastructures import EmptyResultSet
 from django.test import TestCase, skipUnlessDBFeature
@@ -23,8 +23,9 @@ from .models import (Annotation, Article, Author, Celebrity, Child, Cover,
     Ranking, Related, Report, ReservedName, Tag, TvChef, Valid, X, Food, Eaten,
     Node, ObjectA, ObjectB, ObjectC, CategoryItem, SimpleCategory,
     SpecialCategory, OneToOneCategory, NullableName, ProxyCategory,
-    SingleObject, RelatedObject, ModelA, ModelD, Responsibility, Job,
-    JobResponsibilities)
+    SingleObject, RelatedObject, ModelA, ModelB, ModelC, ModelD, Responsibility,
+    Job, JobResponsibilities, BaseA, Identifier, Program, Channel, Page,
+    Paragraph, Chapter, Book, MyObject, Order, OrderItem)
 
 
 class BaseQuerysetTest(TestCase):
@@ -52,8 +53,8 @@ class Queries1Tests(BaseQuerysetTest):
 
         # Create these out of order so that sorting by 'id' will be different to sorting
         # by 'info'. Helps detect some problems later.
-        self.e2 = ExtraInfo.objects.create(info='e2', note=n2)
-        e1 = ExtraInfo.objects.create(info='e1', note=self.n1)
+        self.e2 = ExtraInfo.objects.create(info='e2', note=n2, value=41)
+        e1 = ExtraInfo.objects.create(info='e1', note=self.n1, value=42)
 
         self.a1 = Author.objects.create(name='a1', num=1001, extra=e1)
         self.a2 = Author.objects.create(name='a2', num=2002, extra=e1)
@@ -550,37 +551,37 @@ class Queries1Tests(BaseQuerysetTest):
     def test_tickets_6180_6203(self):
         # Dates with limits and/or counts
         self.assertEqual(Item.objects.count(), 4)
-        self.assertEqual(Item.objects.dates('created', 'month').count(), 1)
-        self.assertEqual(Item.objects.dates('created', 'day').count(), 2)
-        self.assertEqual(len(Item.objects.dates('created', 'day')), 2)
-        self.assertEqual(Item.objects.dates('created', 'day')[0], datetime.datetime(2007, 12, 19, 0, 0))
+        self.assertEqual(Item.objects.datetimes('created', 'month').count(), 1)
+        self.assertEqual(Item.objects.datetimes('created', 'day').count(), 2)
+        self.assertEqual(len(Item.objects.datetimes('created', 'day')), 2)
+        self.assertEqual(Item.objects.datetimes('created', 'day')[0], datetime.datetime(2007, 12, 19, 0, 0))
 
     def test_tickets_7087_12242(self):
         # Dates with extra select columns
         self.assertQuerysetEqual(
-            Item.objects.dates('created', 'day').extra(select={'a': 1}),
+            Item.objects.datetimes('created', 'day').extra(select={'a': 1}),
             ['datetime.datetime(2007, 12, 19, 0, 0)', 'datetime.datetime(2007, 12, 20, 0, 0)']
         )
         self.assertQuerysetEqual(
-            Item.objects.extra(select={'a': 1}).dates('created', 'day'),
+            Item.objects.extra(select={'a': 1}).datetimes('created', 'day'),
             ['datetime.datetime(2007, 12, 19, 0, 0)', 'datetime.datetime(2007, 12, 20, 0, 0)']
         )
 
         name="one"
         self.assertQuerysetEqual(
-            Item.objects.dates('created', 'day').extra(where=['name=%s'], params=[name]),
+            Item.objects.datetimes('created', 'day').extra(where=['name=%s'], params=[name]),
             ['datetime.datetime(2007, 12, 19, 0, 0)']
         )
 
         self.assertQuerysetEqual(
-            Item.objects.extra(where=['name=%s'], params=[name]).dates('created', 'day'),
+            Item.objects.extra(where=['name=%s'], params=[name]).datetimes('created', 'day'),
             ['datetime.datetime(2007, 12, 19, 0, 0)']
         )
 
     def test_ticket7155(self):
         # Nullable dates
         self.assertQuerysetEqual(
-            Item.objects.dates('modified', 'day'),
+            Item.objects.datetimes('modified', 'day'),
             ['datetime.datetime(2007, 12, 19, 0, 0)']
         )
 
@@ -663,31 +664,32 @@ class Queries1Tests(BaseQuerysetTest):
             Item.objects.filter(created__in=[self.time1, self.time2]),
             ['<Item: one>', '<Item: two>']
         )
-
     def test_ticket7235(self):
         # An EmptyQuerySet should not raise exceptions if it is filtered.
-        q = EmptyQuerySet()
-        self.assertQuerysetEqual(q.all(), [])
-        self.assertQuerysetEqual(q.filter(x=10), [])
-        self.assertQuerysetEqual(q.exclude(y=3), [])
-        self.assertQuerysetEqual(q.complex_filter({'pk': 1}), [])
-        self.assertQuerysetEqual(q.select_related('spam', 'eggs'), [])
-        self.assertQuerysetEqual(q.annotate(Count('eggs')), [])
-        self.assertQuerysetEqual(q.order_by('-pub_date', 'headline'), [])
-        self.assertQuerysetEqual(q.distinct(), [])
-        self.assertQuerysetEqual(
-            q.extra(select={'is_recent': "pub_date > '2006-01-01'"}),
-            []
-        )
-        q.query.low_mark = 1
-        self.assertRaisesMessage(
-            AssertionError,
-            'Cannot change a query once a slice has been taken',
-            q.extra, select={'is_recent': "pub_date > '2006-01-01'"}
-        )
-        self.assertQuerysetEqual(q.reverse(), [])
-        self.assertQuerysetEqual(q.defer('spam', 'eggs'), [])
-        self.assertQuerysetEqual(q.only('spam', 'eggs'), [])
+        Eaten.objects.create(meal='m')
+        q = Eaten.objects.none()
+        with self.assertNumQueries(0):
+            self.assertQuerysetEqual(q.all(), [])
+            self.assertQuerysetEqual(q.filter(meal='m'), [])
+            self.assertQuerysetEqual(q.exclude(meal='m'), [])
+            self.assertQuerysetEqual(q.complex_filter({'pk': 1}), [])
+            self.assertQuerysetEqual(q.select_related('food'), [])
+            self.assertQuerysetEqual(q.annotate(Count('food')), [])
+            self.assertQuerysetEqual(q.order_by('meal', 'food'), [])
+            self.assertQuerysetEqual(q.distinct(), [])
+            self.assertQuerysetEqual(
+                q.extra(select={'foo': "1"}),
+                []
+            )
+            q.query.low_mark = 1
+            self.assertRaisesMessage(
+                AssertionError,
+                'Cannot change a query once a slice has been taken',
+                q.extra, select={'foo': "1"}
+            )
+            self.assertQuerysetEqual(q.reverse(), [])
+            self.assertQuerysetEqual(q.defer('meal'), [])
+            self.assertQuerysetEqual(q.only('meal'), [])
 
     def test_ticket7791(self):
         # There were "issues" when ordering and distinct-ing on fields related
@@ -698,7 +700,7 @@ class Queries1Tests(BaseQuerysetTest):
         )
 
         # Pickling of DateQuerySets used to fail
-        qs = Item.objects.dates('created', 'month')
+        qs = Item.objects.datetimes('created', 'month')
         _ = pickle.loads(pickle.dumps(qs))
 
     def test_ticket9997(self):
@@ -832,7 +834,6 @@ class Queries1Tests(BaseQuerysetTest):
             Note.objects.filter(Q(extrainfo__author=self.a1)|Q(extrainfo=xx)),
             ['<Note: n1>', '<Note: n3>']
         )
-        xx.delete()
         q = Note.objects.filter(Q(extrainfo__author=self.a1)|Q(extrainfo=xx)).query
         self.assertEqual(
             len([x[2] for x in q.alias_map.values() if x[2] == q.LOUTER and q.alias_refcount[x[1]]]),
@@ -878,7 +879,6 @@ class Queries1Tests(BaseQuerysetTest):
             Item.objects.filter(Q(tags__name='t4')),
             [repr(i) for i in Item.objects.filter(~Q(~Q(tags__name='t4')))])
 
-    @unittest.expectedFailure
     def test_exclude_in(self):
         self.assertQuerysetEqual(
             Item.objects.exclude(Q(tags__name__in=['t4', 't3'])),
@@ -1105,6 +1105,13 @@ class Queries1Tests(BaseQuerysetTest):
         self.assertTrue(str(q3.query).count('LEFT OUTER JOIN') == 1)
         self.assertTrue(str(q3.query).count('INNER JOIN') == 0)
 
+    def test_ticket19672(self):
+        self.assertQuerysetEqual(
+            Report.objects.filter(Q(creator__isnull=False) &
+                                  ~Q(creator__extra__value=41)),
+            ['<Report: r1>']
+        )
+
 
 class Queries2Tests(TestCase):
     def setUp(self):
@@ -1234,8 +1241,8 @@ class Queries3Tests(BaseQuerysetTest):
         # field
         self.assertRaisesMessage(
             AssertionError,
-            "'name' isn't a DateField.",
-            Item.objects.dates, 'name', 'month'
+            "'name' isn't a DateTimeField.",
+            Item.objects.datetimes, 'name', 'month'
         )
 
 class Queries4Tests(BaseQuerysetTest):
@@ -1292,9 +1299,9 @@ class Queries4Tests(BaseQuerysetTest):
         q1 = Author.objects.filter(report__name='r5')
         q2 = Author.objects.filter(report__name='r4').filter(report__name='r1')
         combined = q1|q2
-        self.assertEquals(str(combined.query).count('JOIN'), 2)
-        self.assertEquals(len(combined), 1)
-        self.assertEquals(combined[0].name, 'a1')
+        self.assertEqual(str(combined.query).count('JOIN'), 2)
+        self.assertEqual(len(combined), 1)
+        self.assertEqual(combined[0].name, 'a1')
 
     def test_ticket7095(self):
         # Updates that are filtered on the model being updated are somewhat
@@ -1643,8 +1650,8 @@ class NullableRelOrderingTests(TestCase):
         # and that join must be LEFT join. The already existing join to related
         # objects must be kept INNER. So, we have both a INNER and a LEFT join
         # in the query.
-        self.assertEquals(str(qs.query).count('LEFT'), 1)
-        self.assertEquals(str(qs.query).count('INNER'), 1)
+        self.assertEqual(str(qs.query).count('LEFT'), 1)
+        self.assertEqual(str(qs.query).count('INNER'), 1)
         self.assertQuerysetEqual(
             qs,
             ['<Plaything: p2>']
@@ -1778,7 +1785,6 @@ class Queries6Tests(TestCase):
 
         # Nested queries are possible (although should be used with care, since
         # they have performance problems on backends like MySQL.
-
         self.assertQuerysetEqual(
             Annotation.objects.filter(notes__in=Note.objects.filter(note="n1")),
             ['<Annotation: a1>']
@@ -1918,6 +1924,7 @@ class SubqueryTests(TestCase):
 
 
 class CloneTests(TestCase):
+
     def test_evaluated_queryset_as_argument(self):
         "#13227 -- If a queryset is already evaluated, it can still be used as a query arg"
         n = Note(note='Test1', misc='misc')
@@ -1932,11 +1939,44 @@ class CloneTests(TestCase):
         # that query in a way that involves cloning.
         self.assertEqual(ExtraInfo.objects.filter(note__in=n_list)[0].info, 'good')
 
+    def test_no_model_options_cloning(self):
+        """
+        Test that cloning a queryset does not get out of hand. While complete
+        testing is impossible, this is a sanity check against invalid use of
+        deepcopy. refs #16759.
+        """
+        opts_class = type(Note._meta)
+        note_deepcopy = getattr(opts_class, "__deepcopy__", None)
+        opts_class.__deepcopy__ = lambda obj, memo: self.fail("Model options shouldn't be cloned.")
+        try:
+            Note.objects.filter(pk__lte=F('pk') + 1).all()
+        finally:
+            if note_deepcopy is None:
+                delattr(opts_class, "__deepcopy__")
+            else:
+                opts_class.__deepcopy__ = note_deepcopy
+
+    def test_no_fields_cloning(self):
+        """
+        Test that cloning a queryset does not get out of hand. While complete
+        testing is impossible, this is a sanity check against invalid use of
+        deepcopy. refs #16759.
+        """
+        opts_class = type(Note._meta.get_field_by_name("misc")[0])
+        note_deepcopy = getattr(opts_class, "__deepcopy__", None)
+        opts_class.__deepcopy__ = lambda obj, memo: self.fail("Model fields shouldn't be cloned")
+        try:
+            Note.objects.filter(note=F('misc')).all()
+        finally:
+            if note_deepcopy is None:
+                delattr(opts_class, "__deepcopy__")
+            else:
+                opts_class.__deepcopy__ = note_deepcopy
 
 class EmptyQuerySetTests(TestCase):
     def test_emptyqueryset_values(self):
-        # #14366 -- Calling .values() on an EmptyQuerySet and then cloning that
-        # should not cause an error"
+        # #14366 -- Calling .values() on an empty QuerySet and then cloning
+        # that should not cause an error
         self.assertQuerysetEqual(
             Number.objects.none().values('num').order_by('num'), []
         )
@@ -1952,9 +1992,9 @@ class EmptyQuerySetTests(TestCase):
         )
 
     def test_ticket_19151(self):
-        # #19151 -- Calling .values() or .values_list() on an EmptyQuerySet
-        # should return EmptyQuerySet and not cause an error.
-        q = EmptyQuerySet()
+        # #19151 -- Calling .values() or .values_list() on an empty QuerySet
+        # should return an empty QuerySet and not cause an error.
+        q = Author.objects.none()
         self.assertQuerysetEqual(q.values(), [])
         self.assertQuerysetEqual(q.values_list(), [])
 
@@ -2134,8 +2174,10 @@ class ConditionalTests(BaseQuerysetTest):
     @skipUnlessDBFeature('supports_1000_query_parameters')
     def test_ticket14244(self):
         # Test that the "in" lookup works with lists of 1000 items or more.
+        # The numbers amount is picked to force three different IN batches
+        # for Oracle, yet to be less than 2100 parameter limit for MSSQL.
+        numbers = range(2050)
         Number.objects.all().delete()
-        numbers = range(2500)
         Number.objects.bulk_create(Number(num=num) for num in numbers)
         self.assertEqual(
             Number.objects.filter(num__in=numbers[:1000]).count(),
@@ -2151,7 +2193,7 @@ class ConditionalTests(BaseQuerysetTest):
         )
         self.assertEqual(
             Number.objects.filter(num__in=numbers).count(),
-            2500
+            len(numbers)
         )
 
 
@@ -2246,6 +2288,103 @@ class ExcludeTest(TestCase):
             Responsibility.objects.exclude(jobs__name='Manager'),
             ['<Responsibility: Programming>'])
 
+class ExcludeTest17600(TestCase):
+    """
+    Some regressiontests for ticket #17600. Some of these likely duplicate
+    other existing tests.
+    """
+
+    def setUp(self):
+        # Create a few Orders.
+        self.o1 = Order.objects.create(pk=1)
+        self.o2 = Order.objects.create(pk=2)
+        self.o3 = Order.objects.create(pk=3)
+
+        # Create some OrderItems for the first order with homogeneous
+        # status_id values
+        self.oi1 = OrderItem.objects.create(order=self.o1, status=1)
+        self.oi2 = OrderItem.objects.create(order=self.o1, status=1)
+        self.oi3 = OrderItem.objects.create(order=self.o1, status=1)
+
+        # Create some OrderItems for the second order with heterogeneous
+        # status_id values
+        self.oi4 = OrderItem.objects.create(order=self.o2, status=1)
+        self.oi5 = OrderItem.objects.create(order=self.o2, status=2)
+        self.oi6 = OrderItem.objects.create(order=self.o2, status=3)
+
+        # Create some OrderItems for the second order with heterogeneous
+        # status_id values
+        self.oi7 = OrderItem.objects.create(order=self.o3, status=2)
+        self.oi8 = OrderItem.objects.create(order=self.o3, status=3)
+        self.oi9 = OrderItem.objects.create(order=self.o3, status=4)
+
+    def test_exclude_plain(self):
+        """
+        This should exclude Orders which have some items with status 1
+
+        """
+        self.assertQuerysetEqual(
+            Order.objects.exclude(items__status=1),
+            ['<Order: 3>'])
+
+    def test_exclude_plain_distinct(self):
+        """
+        This should exclude Orders which have some items with status 1
+
+        """
+        self.assertQuerysetEqual(
+            Order.objects.exclude(items__status=1).distinct(),
+            ['<Order: 3>'])
+
+    def test_exclude_with_q_object_distinct(self):
+        """
+        This should exclude Orders which have some items with status 1
+
+        """
+        self.assertQuerysetEqual(
+            Order.objects.exclude(Q(items__status=1)).distinct(),
+            ['<Order: 3>'])
+
+    def test_exclude_with_q_object_no_distinct(self):
+        """
+        This should exclude Orders which have some items with status 1
+
+        """
+        self.assertQuerysetEqual(
+            Order.objects.exclude(Q(items__status=1)),
+            ['<Order: 3>'])
+
+    def test_exclude_with_q_is_equal_to_plain_exclude(self):
+        """
+        Using exclude(condition) and exclude(Q(condition)) should
+        yield the same QuerySet
+
+        """
+        self.assertEqual(
+            list(Order.objects.exclude(items__status=1).distinct()),
+            list(Order.objects.exclude(Q(items__status=1)).distinct()))
+
+    def test_exclude_with_q_is_equal_to_plain_exclude_variation(self):
+        """
+        Using exclude(condition) and exclude(Q(condition)) should
+        yield the same QuerySet
+
+        """
+        self.assertEqual(
+            list(Order.objects.exclude(items__status=1)),
+            list(Order.objects.exclude(Q(items__status=1)).distinct()))
+
+    @unittest.expectedFailure
+    def test_only_orders_with_all_items_having_status_1(self):
+        """
+        This should only return orders having ALL items set to status 1, or
+        those items not having any orders at all. The correct way to write
+        this query in SQL seems to be using two nested subqueries.
+        """
+        self.assertQuerysetEqual(
+            Order.objects.exclude(~Q(items__status=1)).distinct(),
+            ['<Order: 1>'])
+
 class NullInExcludeTest(TestCase):
     def setUp(self):
         NullableName.objects.create(name='i1')
@@ -2281,6 +2420,14 @@ class NullInExcludeTest(TestCase):
             NullableName.objects.exclude(name__in=[None]),
             ['i1'], attrgetter('name'))
 
+    def test_double_exclude(self):
+        self.assertEqual(
+            list(NullableName.objects.filter(~~Q(name='i1'))),
+            list(NullableName.objects.filter(Q(name='i1'))))
+        self.assertNotIn(
+            'IS NOT NULL',
+            str(NullableName.objects.filter(~~Q(name='i1')).query))
+
 class EmptyStringsAsNullTest(TestCase):
     """
     Test that filtering on non-null character fields works as expected.
@@ -2388,8 +2535,12 @@ class WhereNodeTest(TestCase):
 
 class NullJoinPromotionOrTest(TestCase):
     def setUp(self):
-        d = ModelD.objects.create(name='foo')
-        ModelA.objects.create(name='bar', d=d)
+        self.d1 = ModelD.objects.create(name='foo')
+        d2 = ModelD.objects.create(name='bar')
+        self.a1 = ModelA.objects.create(name='a1', d=self.d1)
+        c = ModelC.objects.create(name='c')
+        b = ModelB.objects.create(name='b', c=c)
+        self.a2 = ModelA.objects.create(name='a2', b=b, d=d2)
 
     def test_ticket_17886(self):
         # The first Q-object is generating the match, the rest of the filters
@@ -2403,12 +2554,38 @@ class NullJoinPromotionOrTest(TestCase):
             Q(b__c__name='foo')
         )
         qset = ModelA.objects.filter(q_obj)
-        self.assertEqual(len(qset), 1)
+        self.assertEqual(list(qset), [self.a1])
         # We generate one INNER JOIN to D. The join is direct and not nullable
         # so we can use INNER JOIN for it. However, we can NOT use INNER JOIN
         # for the b->c join, as a->b is nullable.
         self.assertEqual(str(qset.query).count('INNER JOIN'), 1)
 
+    def test_isnull_filter_promotion(self):
+        qs = ModelA.objects.filter(Q(b__name__isnull=True))
+        self.assertEqual(str(qs.query).count('LEFT OUTER'), 1)
+        self.assertEqual(list(qs), [self.a1])
+
+        qs = ModelA.objects.filter(~Q(b__name__isnull=True))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(list(qs), [self.a2])
+
+        qs = ModelA.objects.filter(~~Q(b__name__isnull=True))
+        self.assertEqual(str(qs.query).count('LEFT OUTER'), 1)
+        self.assertEqual(list(qs), [self.a1])
+
+        qs = ModelA.objects.filter(Q(b__name__isnull=False))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(list(qs), [self.a2])
+
+        qs = ModelA.objects.filter(~Q(b__name__isnull=False))
+        self.assertEqual(str(qs.query).count('LEFT OUTER'), 1)
+        self.assertEqual(list(qs), [self.a1])
+
+        qs = ModelA.objects.filter(~~Q(b__name__isnull=False))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(list(qs), [self.a2])
+
+
 class ReverseJoinTrimmingTest(TestCase):
     def test_reverse_trimming(self):
         # Check that we don't accidentally trim reverse joins - we can't know
@@ -2417,4 +2594,240 @@ class ReverseJoinTrimmingTest(TestCase):
         t = Tag.objects.create()
         qs = Tag.objects.filter(annotation__tag=t.pk)
         self.assertIn('INNER JOIN', str(qs.query))
-        self.assertEquals(list(qs), [])
+        self.assertEqual(list(qs), [])
+
+class JoinReuseTest(TestCase):
+    """
+    Test that the queries reuse joins sensibly (for example, direct joins
+    are always reused).
+    """
+    def test_fk_reuse(self):
+        qs = Annotation.objects.filter(tag__name='foo').filter(tag__name='bar')
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
+
+    def test_fk_reuse_select_related(self):
+        qs = Annotation.objects.filter(tag__name='foo').select_related('tag')
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
+
+    def test_fk_reuse_annotation(self):
+        qs = Annotation.objects.filter(tag__name='foo').annotate(cnt=Count('tag__name'))
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
+
+    def test_fk_reuse_disjunction(self):
+        qs = Annotation.objects.filter(Q(tag__name='foo') | Q(tag__name='bar'))
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
+
+    def test_fk_reuse_order_by(self):
+        qs = Annotation.objects.filter(tag__name='foo').order_by('tag__name')
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
+
+    def test_revo2o_reuse(self):
+        qs = Detail.objects.filter(member__name='foo').filter(member__name='foo')
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
+
+    def test_revfk_noreuse(self):
+        qs = Author.objects.filter(report__name='r4').filter(report__name='r1')
+        self.assertEqual(str(qs.query).count('JOIN'), 2)
+
+class DisjunctionPromotionTests(TestCase):
+    def test_disjunction_promotion1(self):
+        # Pre-existing join, add two ORed filters to the same join,
+        # all joins can be INNER JOINS.
+        qs = BaseA.objects.filter(a__f1='foo')
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        qs = qs.filter(Q(b__f1='foo') | Q(b__f2='foo'))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 2)
+        # Reverse the order of AND and OR filters.
+        qs = BaseA.objects.filter(Q(b__f1='foo') | Q(b__f2='foo'))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        qs = qs.filter(a__f1='foo')
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 2)
+
+    def test_disjunction_promotion2(self):
+        qs = BaseA.objects.filter(a__f1='foo')
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        # Now we have two different joins in an ORed condition, these
+        # must be OUTER joins. The pre-existing join should remain INNER.
+        qs = qs.filter(Q(b__f1='foo') | Q(c__f2='foo'))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 2)
+        # Reverse case.
+        qs = BaseA.objects.filter(Q(b__f1='foo') | Q(c__f2='foo'))
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 2)
+        qs = qs.filter(a__f1='foo')
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 2)
+
+    def test_disjunction_promotion3(self):
+        qs = BaseA.objects.filter(a__f2='bar')
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        # The ANDed a__f2 filter allows us to use keep using INNER JOIN
+        # even inside the ORed case. If the join to a__ returns nothing,
+        # the ANDed filter for a__f2 can't be true.
+        qs = qs.filter(Q(a__f1='foo') | Q(b__f2='foo'))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 1)
+
+    @unittest.expectedFailure
+    def test_disjunction_promotion3_failing(self):
+        # Now the ORed filter creates LOUTER join, but we do not have
+        # logic to unpromote it for the AND filter after it. The query
+        # results will be correct, but we have one LOUTER JOIN too much
+        # currently.
+        qs = BaseA.objects.filter(
+            Q(a__f1='foo') | Q(b__f2='foo')).filter(a__f2='bar')
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 1)
+
+    def test_disjunction_promotion4(self):
+        qs = BaseA.objects.filter(Q(a=1) | Q(a=2))
+        self.assertEqual(str(qs.query).count('JOIN'), 0)
+        qs = qs.filter(a__f1='foo')
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        qs = BaseA.objects.filter(a__f1='foo')
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        qs = qs.filter(Q(a=1) | Q(a=2))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+
+    def test_disjunction_promotion5(self):
+        qs = BaseA.objects.filter(Q(a=1) | Q(a=2))
+        # Note that the above filters on a force the join to an
+        # inner join even if it is trimmed.
+        self.assertEqual(str(qs.query).count('JOIN'), 0)
+        qs = qs.filter(Q(a__f1='foo') | Q(b__f1='foo'))
+        # So, now the a__f1 join doesn't need promotion.
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 1)
+
+    @unittest.expectedFailure
+    def test_disjunction_promotion5_failing(self):
+        qs = BaseA.objects.filter(Q(a__f1='foo') | Q(b__f1='foo'))
+        # Now the join to a is created as LOUTER
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 0)
+        # The below filter should force the a to be inner joined. But,
+        # this is failing as we do not have join unpromotion logic.
+        qs = BaseA.objects.filter(Q(a=1) | Q(a=2))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 1)
+
+    def test_disjunction_promotion6(self):
+        qs = BaseA.objects.filter(Q(a=1) | Q(a=2))
+        self.assertEqual(str(qs.query).count('JOIN'), 0)
+        qs = BaseA.objects.filter(Q(a__f1='foo') & Q(b__f1='foo'))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 2)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 0)
+
+        qs = BaseA.objects.filter(Q(a__f1='foo') & Q(b__f1='foo'))
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 0)
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 2)
+        qs = qs.filter(Q(a=1) | Q(a=2))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 2)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 0)
+
+    def test_disjunction_promotion7(self):
+        qs = BaseA.objects.filter(Q(a=1) | Q(a=2))
+        self.assertEqual(str(qs.query).count('JOIN'), 0)
+        qs = BaseA.objects.filter(Q(a__f1='foo') | (Q(b__f1='foo') & Q(a__f1='bar')))
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 1)
+        qs = BaseA.objects.filter(
+            (Q(a__f1='foo') | Q(b__f1='foo')) & (Q(a__f1='bar') | Q(c__f1='foo'))
+        )
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 3)
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 0)
+        qs = BaseA.objects.filter(
+            (Q(a__f1='foo') | (Q(a__f1='bar')) & (Q(b__f1='bar') | Q(c__f1='foo')))
+        )
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 2)
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+
+    def test_disjunction_promotion_fexpression(self):
+        qs = BaseA.objects.filter(Q(a__f1=F('b__f1')) | Q(b__f1='foo'))
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 1)
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 1)
+        qs = BaseA.objects.filter(Q(a__f1=F('c__f1')) | Q(b__f1='foo'))
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 3)
+        qs = BaseA.objects.filter(Q(a__f1=F('b__f1')) | Q(a__f2=F('b__f2')) | Q(c__f1='foo'))
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 3)
+        qs = BaseA.objects.filter(Q(a__f1=F('c__f1')) | (Q(pk=1) & Q(pk=2)))
+        self.assertEqual(str(qs.query).count('LEFT OUTER JOIN'), 2)
+        self.assertEqual(str(qs.query).count('INNER JOIN'), 0)
+
+
+class ManyToManyExcludeTest(TestCase):
+    def test_exclude_many_to_many(self):
+        Identifier.objects.create(name='extra')
+        program = Program.objects.create(identifier=Identifier.objects.create(name='program'))
+        channel = Channel.objects.create(identifier=Identifier.objects.create(name='channel'))
+        channel.programs.add(program)
+
+        # channel contains 'program1', so all Identifiers except that one
+        # should be returned
+        self.assertQuerysetEqual(
+            Identifier.objects.exclude(program__channel=channel).order_by('name'),
+            ['<Identifier: channel>', '<Identifier: extra>']
+        )
+        self.assertQuerysetEqual(
+            Identifier.objects.exclude(program__channel=None).order_by('name'),
+            ['<Identifier: program>']
+        )
+
+    def test_ticket_12823(self):
+        pg3 = Page.objects.create(text='pg3')
+        pg2 = Page.objects.create(text='pg2')
+        pg1 = Page.objects.create(text='pg1')
+        pa1 = Paragraph.objects.create(text='pa1')
+        pa1.page = [pg1, pg2]
+        pa2 = Paragraph.objects.create(text='pa2')
+        pa2.page = [pg2, pg3]
+        pa3 = Paragraph.objects.create(text='pa3')
+        ch1 = Chapter.objects.create(title='ch1', paragraph=pa1)
+        ch2 = Chapter.objects.create(title='ch2', paragraph=pa2)
+        ch3 = Chapter.objects.create(title='ch3', paragraph=pa3)
+        b1 = Book.objects.create(title='b1', chapter=ch1)
+        b2 = Book.objects.create(title='b2', chapter=ch2)
+        b3 = Book.objects.create(title='b3', chapter=ch3)
+        q = Book.objects.exclude(chapter__paragraph__page__text='pg1')
+        self.assertNotIn('IS NOT NULL', str(q.query))
+        self.assertEqual(len(q), 2)
+        self.assertNotIn(b1, q)
+        self.assertIn(b2, q)
+        self.assertIn(b3, q)
+
+class RelabelCloneTest(TestCase):
+    def test_ticket_19964(self):
+        my1 = MyObject.objects.create(data='foo')
+        my1.parent = my1
+        my1.save()
+        my2 = MyObject.objects.create(data='bar', parent=my1)
+        parents = MyObject.objects.filter(parent=F('id'))
+        children = MyObject.objects.filter(parent__in=parents).exclude(parent=F('id'))
+        self.assertEqual(list(parents), [my1])
+        # Evaluating the children query (which has parents as part of it) does
+        # not change results for the parents query.
+        self.assertEqual(list(children), [my2])
+        self.assertEqual(list(parents), [my1])
+
+class Ticket20101Tests(TestCase):
+    def test_ticket_20101(self):
+        """
+        Tests QuerySet ORed combining in exclude subquery case.
+        """
+        t = Tag.objects.create(name='foo')
+        a1 = Annotation.objects.create(tag=t, name='a1')
+        a2 = Annotation.objects.create(tag=t, name='a2')
+        a3 = Annotation.objects.create(tag=t, name='a3')
+        n = Note.objects.create(note='foo', misc='bar')
+        qs1 = Note.objects.exclude(annotation__in=[a1, a2])
+        qs2 = Note.objects.filter(annotation__in=[a3])
+        self.assertTrue(n in qs1)
+        self.assertFalse(n in qs2)
+        self.assertTrue(n in (qs1 | qs2))
+
+class EmptyStringPromotionTests(TestCase):
+    def test_empty_string_promotion(self):
+        qs = RelatedObject.objects.filter(single__name='')
+        if connection.features.interprets_empty_strings_as_nulls:
+            self.assertIn('LEFT OUTER JOIN', str(qs.query))
+        else:
+            self.assertNotIn('LEFT OUTER JOIN', str(qs.query))
diff --git a/tests/regressiontests/bug639/__init__.py b/tests/queryset_pickle/__init__.py
similarity index 100%
rename from tests/regressiontests/bug639/__init__.py
rename to tests/queryset_pickle/__init__.py
diff --git a/tests/regressiontests/queryset_pickle/models.py b/tests/queryset_pickle/models.py
similarity index 91%
rename from tests/regressiontests/queryset_pickle/models.py
rename to tests/queryset_pickle/models.py
index d3500c903b..4bcfcfbf04 100644
--- a/tests/regressiontests/queryset_pickle/models.py
+++ b/tests/queryset_pickle/models.py
@@ -6,16 +6,16 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
 
-def standalone_number(self):
+def standalone_number():
     return 1
 
 class Numbers(object):
     @staticmethod
-    def get_static_number(self):
+    def get_static_number():
         return 2
 
     @classmethod
-    def get_class_number(self):
+    def get_class_number(cls):
         return 3
 
     def get_member_number(self):
diff --git a/tests/regressiontests/queryset_pickle/tests.py b/tests/queryset_pickle/tests.py
similarity index 94%
rename from tests/regressiontests/queryset_pickle/tests.py
rename to tests/queryset_pickle/tests.py
index ab32e8f647..da1bb8cb73 100644
--- a/tests/regressiontests/queryset_pickle/tests.py
+++ b/tests/queryset_pickle/tests.py
@@ -9,6 +9,9 @@ from .models import Group, Event, Happening
 
 
 class PickleabilityTestCase(TestCase):
+    def setUp(self):
+        Happening.objects.create() # make sure the defaults are working (#20158)
+
     def assert_pickles(self, qs):
         self.assertEqual(list(pickle.loads(pickle.dumps(qs))), list(qs))
 
diff --git a/tests/regressiontests/bug8245/__init__.py b/tests/raw_query/__init__.py
similarity index 100%
rename from tests/regressiontests/bug8245/__init__.py
rename to tests/raw_query/__init__.py
diff --git a/tests/modeltests/raw_query/fixtures/raw_query_books.json b/tests/raw_query/fixtures/raw_query_books.json
similarity index 100%
rename from tests/modeltests/raw_query/fixtures/raw_query_books.json
rename to tests/raw_query/fixtures/raw_query_books.json
diff --git a/tests/modeltests/raw_query/models.py b/tests/raw_query/models.py
similarity index 100%
rename from tests/modeltests/raw_query/models.py
rename to tests/raw_query/models.py
diff --git a/tests/modeltests/raw_query/tests.py b/tests/raw_query/tests.py
similarity index 100%
rename from tests/modeltests/raw_query/tests.py
rename to tests/raw_query/tests.py
diff --git a/tests/regressiontests/builtin_server/tests.py b/tests/regressiontests/builtin_server/tests.py
deleted file mode 100644
index c8dc77e42e..0000000000
--- a/tests/regressiontests/builtin_server/tests.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from __future__ import unicode_literals
-
-from io import BytesIO
-
-from django.core.servers.basehttp import ServerHandler
-from django.utils.unittest import TestCase
-
-#
-# Tests for #9659: wsgi.file_wrapper in the builtin server.
-# We need to mock a couple of of handlers and keep track of what
-# gets called when using a couple kinds of WSGI apps.
-#
-
-class DummyHandler(object):
-    def log_request(*args, **kwargs):
-        pass
-
-class FileWrapperHandler(ServerHandler):
-    def __init__(self, *args, **kwargs):
-        ServerHandler.__init__(self, *args, **kwargs)
-        self.request_handler = DummyHandler()
-        self._used_sendfile = False
-
-    def sendfile(self):
-        self._used_sendfile = True
-        return True
-
-def wsgi_app(environ, start_response):
-    start_response(str('200 OK'), [(str('Content-Type'), str('text/plain'))])
-    return [b'Hello World!']
-
-def wsgi_app_file_wrapper(environ, start_response):
-    start_response(str('200 OK'), [(str('Content-Type'), str('text/plain'))])
-    return environ['wsgi.file_wrapper'](BytesIO(b'foo'))
-
-class WSGIFileWrapperTests(TestCase):
-    """
-    Test that the wsgi.file_wrapper works for the builting server.
-    """
-
-    def test_file_wrapper_uses_sendfile(self):
-        env = {'SERVER_PROTOCOL': 'HTTP/1.0'}
-        handler = FileWrapperHandler(None, BytesIO(), BytesIO(), env)
-        handler.run(wsgi_app_file_wrapper)
-        self.assertTrue(handler._used_sendfile)
-        self.assertEqual(handler.stdout.getvalue(), b'')
-        self.assertEqual(handler.stderr.getvalue(), b'')
-
-    def test_file_wrapper_no_sendfile(self):
-        env = {'SERVER_PROTOCOL': 'HTTP/1.0'}
-        handler = FileWrapperHandler(None, BytesIO(), BytesIO(), env)
-        handler.run(wsgi_app)
-        self.assertFalse(handler._used_sendfile)
-        self.assertEqual(handler.stdout.getvalue().splitlines()[-1], b'Hello World!')
-        self.assertEqual(handler.stderr.getvalue(), b'')
diff --git a/tests/regressiontests/comment_tests/custom_comments/__init__.py b/tests/regressiontests/comment_tests/custom_comments/__init__.py
deleted file mode 100644
index 598927eace..0000000000
--- a/tests/regressiontests/comment_tests/custom_comments/__init__.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from django.core import urlresolvers
-from regressiontests.comment_tests.custom_comments.models import CustomComment 
-from regressiontests.comment_tests.custom_comments.forms import CustomCommentForm
-
-def get_model():
-    return CustomComment 
-
-def get_form():
-    return CustomCommentForm
-
-def get_form_target():
-    return urlresolvers.reverse(
-        "regressiontests.comment_tests.custom_comments.views.custom_submit_comment"
-    )
-
-def get_flag_url(c):
-    return urlresolvers.reverse(
-        "regressiontests.comment_tests.custom_comments.views.custom_flag_comment", 
-        args=(c.id,)
-    )
-
-def get_delete_url(c):
-    return urlresolvers.reverse(
-        "regressiontests.comment_tests.custom_comments.views.custom_delete_comment", 
-        args=(c.id,)
-    )
-
-def get_approve_url(c):
-    return urlresolvers.reverse(
-        "regressiontests.comment_tests.custom_comments.views.custom_approve_comment", 
-        args=(c.id,)
-    )
diff --git a/tests/regressiontests/forms/tests/__init__.py b/tests/regressiontests/forms/tests/__init__.py
deleted file mode 100644
index 6708e54c79..0000000000
--- a/tests/regressiontests/forms/tests/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from __future__ import absolute_import
-
-from .error_messages import (FormsErrorMessagesTestCase,
-    ModelChoiceFieldErrorMessagesTestCase)
-from .extra import FormsExtraTestCase, FormsExtraL10NTestCase
-from .fields import FieldsTests
-from .forms import FormsTestCase
-from .formsets import (FormsFormsetTestCase, FormsetAsFooTests,
-    TestIsBoundBehavior, TestEmptyFormSet)
-from .input_formats import (LocalizedTimeTests, CustomTimeInputFormatsTests,
-    SimpleTimeFormatTests, LocalizedDateTests, CustomDateInputFormatsTests,
-    SimpleDateFormatTests, LocalizedDateTimeTests,
-    CustomDateTimeInputFormatsTests, SimpleDateTimeFormatTests)
-from .media import FormsMediaTestCase, StaticFormsMediaTestCase
-from .models import (TestTicket12510, ModelFormCallableModelDefault,
-    FormsModelTestCase, RelatedModelFormTests)
-from .regressions import FormsRegressionsTestCase
-from .util import FormsUtilTestCase
-from .validators import TestFieldWithValidators
-from .widgets import (FormsWidgetTestCase, FormsI18NWidgetsTestCase,
-    WidgetTests, LiveWidgetTests, ClearableFileInputTests)
diff --git a/tests/regressiontests/forms/tests/validators.py b/tests/regressiontests/forms/tests/validators.py
deleted file mode 100644
index a4cb324815..0000000000
--- a/tests/regressiontests/forms/tests/validators.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django import forms
-from django.core import validators
-from django.core.exceptions import ValidationError
-from django.utils.unittest import TestCase
-
-
-class TestFieldWithValidators(TestCase):
-    def test_all_errors_get_reported(self):
-        field = forms.CharField(
-            validators=[validators.validate_integer, validators.validate_email]
-        )
-        self.assertRaises(ValidationError, field.clean, 'not int nor mail')
-        try:
-            field.clean('not int nor mail')
-        except ValidationError as e:
-            self.assertEqual(2, len(e.messages))
diff --git a/tests/regressiontests/generic_views/tests.py b/tests/regressiontests/generic_views/tests.py
deleted file mode 100644
index 3f80600efe..0000000000
--- a/tests/regressiontests/generic_views/tests.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import absolute_import
-
-from .base import (ViewTest, TemplateViewTest, RedirectViewTest,
-    GetContextDataTest)
-from .dates import (ArchiveIndexViewTests, YearArchiveViewTests,
-    MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests,
-    DateDetailViewTests)
-from .detail import DetailViewTest
-from .edit import (FormMixinTests, BasicFormTests, ModelFormMixinTests,
-    CreateViewTests, UpdateViewTests, DeleteViewTests)
-from .list import ListViewTests
diff --git a/tests/regressiontests/handlers/tests.py b/tests/regressiontests/handlers/tests.py
deleted file mode 100644
index 8676a448d9..0000000000
--- a/tests/regressiontests/handlers/tests.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from django.core.handlers.wsgi import WSGIHandler
-from django.test import RequestFactory
-from django.test.utils import override_settings
-from django.utils import unittest
-
-class HandlerTests(unittest.TestCase):
-
-    # Mangle settings so the handler will fail
-    @override_settings(MIDDLEWARE_CLASSES=42)
-    def test_lock_safety(self):
-        """
-        Tests for bug #11193 (errors inside middleware shouldn't leave
-        the initLock locked).
-        """
-        # Try running the handler, it will fail in load_middleware
-        handler = WSGIHandler()
-        self.assertEqual(handler.initLock.locked(), False)
-        with self.assertRaises(Exception):
-            handler(None, None)
-        self.assertEqual(handler.initLock.locked(), False)
-
-    def test_bad_path_info(self):
-        """Tests for bug #15672 ('request' referenced before assignment)"""
-        environ = RequestFactory().get('/').environ
-        environ['PATH_INFO'] = b'\xed'
-        handler = WSGIHandler()
-        response = handler(environ, lambda *a, **k: None)
-        self.assertEqual(response.status_code, 400)
diff --git a/tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.mo b/tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.mo
deleted file mode 100644
index 49a657b455..0000000000
Binary files a/tests/regressiontests/i18n/commands/locale/it/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/tests/regressiontests/i18n/commands/tests.py b/tests/regressiontests/i18n/commands/tests.py
deleted file mode 100644
index e00ef72d59..0000000000
--- a/tests/regressiontests/i18n/commands/tests.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import os
-import re
-from subprocess import Popen, PIPE
-
-from django.utils import six
-
-can_run_extraction_tests = False
-can_run_compilation_tests = False
-
-def find_command(cmd, path=None, pathext=None):
-    if path is None:
-        path = os.environ.get('PATH', []).split(os.pathsep)
-    if isinstance(path, six.string_types):
-        path = [path]
-    # check if there are funny path extensions for executables, e.g. Windows
-    if pathext is None:
-        pathext = os.environ.get('PATHEXT', '.COM;.EXE;.BAT;.CMD').split(os.pathsep)
-    # don't use extensions if the command ends with one of them
-    for ext in pathext:
-        if cmd.endswith(ext):
-            pathext = ['']
-            break
-    # check if we find the command on PATH
-    for p in path:
-        f = os.path.join(p, cmd)
-        if os.path.isfile(f):
-            return f
-        for ext in pathext:
-            fext = f + ext
-            if os.path.isfile(fext):
-                return fext
-    return None
-
-# checks if it can find xgettext on the PATH and
-# imports the extraction tests if yes
-xgettext_cmd = find_command('xgettext')
-if xgettext_cmd:
-    p = Popen('%s --version' % xgettext_cmd, shell=True, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt', universal_newlines=True)
-    output = p.communicate()[0]
-    match = re.search(r'(?P<major>\d+)\.(?P<minor>\d+)', output)
-    if match:
-        xversion = (int(match.group('major')), int(match.group('minor')))
-        if xversion >= (0, 15):
-            can_run_extraction_tests = True
-    del p
-
-if find_command('msgfmt'):
-    can_run_compilation_tests = True
diff --git a/tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.mo b/tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.mo
deleted file mode 100644
index f825e3918b..0000000000
Binary files a/tests/regressiontests/i18n/other/locale/de/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/tests/regressiontests/indexes/models.py b/tests/regressiontests/indexes/models.py
deleted file mode 100644
index 9758377f99..0000000000
--- a/tests/regressiontests/indexes/models.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django.db import models
-
-
-class Article(models.Model):
-    headline = models.CharField(max_length=100)
-    pub_date = models.DateTimeField()
-
-    class Meta:
-        index_together = [
-            ["headline", "pub_date"],
-        ]
diff --git a/tests/regressiontests/indexes/tests.py b/tests/regressiontests/indexes/tests.py
deleted file mode 100644
index 0dac881fa9..0000000000
--- a/tests/regressiontests/indexes/tests.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from django.core.management.color import no_style
-from django.db import connections, DEFAULT_DB_ALIAS
-from django.test import TestCase
-
-from .models import Article
-
-
-class IndexesTests(TestCase):
-    def test_index_together(self):
-        connection = connections[DEFAULT_DB_ALIAS]
-        index_sql = connection.creation.sql_indexes_for_model(Article, no_style())
-        self.assertEqual(len(index_sql), 1)
diff --git a/tests/regressiontests/initial_sql_regress/tests.py b/tests/regressiontests/initial_sql_regress/tests.py
deleted file mode 100644
index 39d8921061..0000000000
--- a/tests/regressiontests/initial_sql_regress/tests.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from django.core.management.color import no_style
-from django.core.management.sql import custom_sql_for_model
-from django.db import connections, DEFAULT_DB_ALIAS
-from django.test import TestCase
-
-from .models import Simple
-
-
-class InitialSQLTests(TestCase):
-    # The format of the included SQL file for this test suite is important.
-    # It must end with a trailing newline in order to test the fix for #2161.
-
-    def test_initial_sql(self):
-        # As pointed out by #14661, test data loaded by custom SQL
-        # can't be relied upon; as a result, the test framework flushes the
-        # data contents before every test. This test validates that this has
-        # occurred.
-        self.assertEqual(Simple.objects.count(), 0)
-
-    def test_custom_sql(self):
-        # Simulate the custom SQL loading by syncdb
-        connection = connections[DEFAULT_DB_ALIAS]
-        custom_sql = custom_sql_for_model(Simple, no_style(), connection)
-        self.assertEqual(len(custom_sql), 8)
-        cursor = connection.cursor()
-        for sql in custom_sql:
-            cursor.execute(sql)
-        self.assertEqual(Simple.objects.count(), 8)
diff --git a/tests/regressiontests/inspectdb/models.py b/tests/regressiontests/inspectdb/models.py
deleted file mode 100644
index 4a6621402f..0000000000
--- a/tests/regressiontests/inspectdb/models.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from django.db import models
-
-
-class People(models.Model):
-    name = models.CharField(max_length=255)
-
-class Message(models.Model):
-    from_field = models.ForeignKey(People, db_column='from_id')
-
-class PeopleData(models.Model):
-    people_pk = models.ForeignKey(People, primary_key=True)
-    ssn = models.CharField(max_length=11)
-
-class PeopleMoreData(models.Model):
-    people_unique = models.ForeignKey(People, unique=True)
-    license = models.CharField(max_length=255)
-
-class DigitsInColumnName(models.Model):
-    all_digits = models.CharField(max_length=11, db_column='123')
-    leading_digit = models.CharField(max_length=11, db_column='4extra')
-    leading_digits = models.CharField(max_length=11, db_column='45extra')
-
-class SpecialColumnName(models.Model):
-    field = models.IntegerField(db_column='field')
-    # Underscores
-    field_field_0 = models.IntegerField(db_column='Field_')
-    field_field_1 = models.IntegerField(db_column='Field__')
-    field_field_2 = models.IntegerField(db_column='__field')
-    # Other chars
-    prc_x = models.IntegerField(db_column='prc(%) x')
diff --git a/tests/regressiontests/inspectdb/tests.py b/tests/regressiontests/inspectdb/tests.py
deleted file mode 100644
index 028d263337..0000000000
--- a/tests/regressiontests/inspectdb/tests.py
+++ /dev/null
@@ -1,76 +0,0 @@
-from __future__ import unicode_literals
-
-from django.core.management import call_command
-from django.db import connection
-from django.test import TestCase, skipUnlessDBFeature
-from django.utils.six import StringIO
-
-
-class InspectDBTestCase(TestCase):
-
-    def test_stealth_table_name_filter_option(self):
-        out = StringIO()
-        # Lets limit the introspection to tables created for models of this
-        # application
-        call_command('inspectdb',
-                     table_name_filter=lambda tn:tn.startswith('inspectdb_'),
-                     stdout=out)
-        error_message = "inspectdb has examined a table that should have been filtered out."
-        # contrib.contenttypes is one of the apps always installed when running
-        # the Django test suite, check that one of its tables hasn't been
-        # inspected
-        self.assertNotIn("class DjangoContentType(models.Model):", out.getvalue(), msg=error_message)
-
-    @skipUnlessDBFeature('can_introspect_foreign_keys')
-    def test_attribute_name_not_python_keyword(self):
-        out = StringIO()
-        # Lets limit the introspection to tables created for models of this
-        # application
-        call_command('inspectdb',
-                     table_name_filter=lambda tn:tn.startswith('inspectdb_'),
-                     stdout=out)
-        output = out.getvalue()
-        error_message = "inspectdb generated an attribute name which is a python keyword"
-        self.assertNotIn("from = models.ForeignKey(InspectdbPeople)", output, msg=error_message)
-        # As InspectdbPeople model is defined after InspectdbMessage, it should be quoted
-        self.assertIn("from_field = models.ForeignKey('InspectdbPeople', db_column='from_id')",
-            output)
-        self.assertIn("people_pk = models.ForeignKey(InspectdbPeople, primary_key=True)",
-            output)
-        self.assertIn("people_unique = models.ForeignKey(InspectdbPeople, unique=True)",
-            output)
-
-    def test_digits_column_name_introspection(self):
-        """Introspection of column names consist/start with digits (#16536/#17676)"""
-        out = StringIO()
-        # Lets limit the introspection to tables created for models of this
-        # application
-        call_command('inspectdb',
-                     table_name_filter=lambda tn:tn.startswith('inspectdb_'),
-                     stdout=out)
-        output = out.getvalue()
-        error_message = "inspectdb generated a model field name which is a number"
-        self.assertNotIn("    123 = models.CharField", output, msg=error_message)
-        self.assertIn("number_123 = models.CharField", output)
-
-        error_message = "inspectdb generated a model field name which starts with a digit"
-        self.assertNotIn("    4extra = models.CharField", output, msg=error_message)
-        self.assertIn("number_4extra = models.CharField", output)
-
-        self.assertNotIn("    45extra = models.CharField", output, msg=error_message)
-        self.assertIn("number_45extra = models.CharField", output)
-
-    def test_special_column_name_introspection(self):
-        """
-        Introspection of column names containing special characters,
-        unsuitable for Python identifiers
-        """
-        out = StringIO()
-        call_command('inspectdb', stdout=out)
-        output = out.getvalue()
-        base_name = 'Field' if connection.vendor != 'oracle' else 'field'
-        self.assertIn("field = models.IntegerField()", output)
-        self.assertIn("field_field = models.IntegerField(db_column='%s_')" % base_name, output)
-        self.assertIn("field_field_0 = models.IntegerField(db_column='%s__')" % base_name, output)
-        self.assertIn("field_field_1 = models.IntegerField(db_column='__field')", output)
-        self.assertIn("prc_x = models.IntegerField(db_column='prc(%) x')", output)
diff --git a/tests/regressiontests/localflavor/generic/tests.py b/tests/regressiontests/localflavor/generic/tests.py
deleted file mode 100644
index 4db26838fa..0000000000
--- a/tests/regressiontests/localflavor/generic/tests.py
+++ /dev/null
@@ -1,90 +0,0 @@
-from __future__ import unicode_literals
-
-import datetime
-
-from django.contrib.localflavor.generic.forms import DateField, DateTimeField
-
-from django.test import SimpleTestCase
-
-
-class GenericLocalFlavorTests(SimpleTestCase):
-    def test_GenericDateField(self):
-        error_invalid = ['Enter a valid date.']
-        valid = {
-            datetime.date(2006, 10, 25): datetime.date(2006, 10, 25),
-            datetime.datetime(2006, 10, 25, 14, 30): datetime.date(2006, 10, 25),
-            datetime.datetime(2006, 10, 25, 14, 30, 59): datetime.date(2006, 10, 25),
-            datetime.datetime(2006, 10, 25, 14, 30, 59, 200): datetime.date(2006, 10, 25),
-            '2006-10-25': datetime.date(2006, 10, 25),
-            '25/10/2006': datetime.date(2006, 10, 25),
-            '25/10/06': datetime.date(2006, 10, 25),
-            'Oct 25 2006': datetime.date(2006, 10, 25),
-            'October 25 2006': datetime.date(2006, 10, 25),
-            'October 25, 2006': datetime.date(2006, 10, 25),
-            '25 October 2006': datetime.date(2006, 10, 25),
-            '25 October, 2006': datetime.date(2006, 10, 25),
-        }
-        invalid = {
-            '2006-4-31': error_invalid,
-            '200a-10-25': error_invalid,
-            '10/25/06': error_invalid,
-        }
-        self.assertFieldOutput(DateField, valid, invalid, empty_value=None)
-
-        # DateField with optional input_formats parameter
-        valid = {
-            datetime.date(2006, 10, 25): datetime.date(2006, 10, 25),
-            datetime.datetime(2006, 10, 25, 14, 30): datetime.date(2006, 10, 25),
-            '2006 10 25': datetime.date(2006, 10, 25),
-        }
-        invalid = {
-            '2006-10-25': error_invalid,
-            '25/10/2006': error_invalid,
-            '25/10/06': error_invalid,
-        }
-        kwargs = {'input_formats':['%Y %m %d'],}
-        self.assertFieldOutput(DateField,
-            valid, invalid, field_kwargs=kwargs, empty_value=None
-        )
-
-    def test_GenericDateTimeField(self):
-        error_invalid = ['Enter a valid date/time.']
-        valid = {
-            datetime.date(2006, 10, 25): datetime.datetime(2006, 10, 25, 0, 0),
-            datetime.datetime(2006, 10, 25, 14, 30): datetime.datetime(2006, 10, 25, 14, 30),
-            datetime.datetime(2006, 10, 25, 14, 30, 59): datetime.datetime(2006, 10, 25, 14, 30, 59),
-            datetime.datetime(2006, 10, 25, 14, 30, 59, 200): datetime.datetime(2006, 10, 25, 14, 30, 59, 200),
-            '2006-10-25 14:30:45': datetime.datetime(2006, 10, 25, 14, 30, 45),
-            '2006-10-25 14:30:00': datetime.datetime(2006, 10, 25, 14, 30),
-            '2006-10-25 14:30': datetime.datetime(2006, 10, 25, 14, 30),
-            '2006-10-25': datetime.datetime(2006, 10, 25, 0, 0),
-            '25/10/2006 14:30:45': datetime.datetime(2006, 10, 25, 14, 30, 45),
-            '25/10/2006 14:30:00': datetime.datetime(2006, 10, 25, 14, 30),
-            '25/10/2006 14:30': datetime.datetime(2006, 10, 25, 14, 30),
-            '25/10/2006': datetime.datetime(2006, 10, 25, 0, 0),
-            '25/10/06 14:30:45': datetime.datetime(2006, 10, 25, 14, 30, 45),
-            '25/10/06 14:30:00': datetime.datetime(2006, 10, 25, 14, 30),
-            '25/10/06 14:30': datetime.datetime(2006, 10, 25, 14, 30),
-            '25/10/06': datetime.datetime(2006, 10, 25, 0, 0),
-        }
-        invalid = {
-            'hello': error_invalid,
-            '2006-10-25 4:30 p.m.': error_invalid,
-        }
-        self.assertFieldOutput(DateTimeField, valid, invalid, empty_value=None)
-
-        # DateTimeField with optional input_formats paramter
-        valid = {
-            datetime.date(2006, 10, 25): datetime.datetime(2006, 10, 25, 0, 0),
-            datetime.datetime(2006, 10, 25, 14, 30): datetime.datetime(2006, 10, 25, 14, 30),
-            datetime.datetime(2006, 10, 25, 14, 30, 59): datetime.datetime(2006, 10, 25, 14, 30, 59),
-            datetime.datetime(2006, 10, 25, 14, 30, 59, 200): datetime.datetime(2006, 10, 25, 14, 30, 59, 200),
-            '2006 10 25 2:30 PM': datetime.datetime(2006, 10, 25, 14, 30),
-        }
-        invalid = {
-            '2006-10-25 14:30:45': error_invalid,
-        }
-        kwargs = {'input_formats':['%Y %m %d %I:%M %p'],}
-        self.assertFieldOutput(DateTimeField,
-            valid, invalid, field_kwargs=kwargs, empty_value=None
-        )
diff --git a/tests/regressiontests/localflavor/tests.py b/tests/regressiontests/localflavor/tests.py
deleted file mode 100644
index 52b771c405..0000000000
--- a/tests/regressiontests/localflavor/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from __future__ import absolute_import
-
-from .generic.tests import GenericLocalFlavorTests
diff --git a/tests/regressiontests/pagination/__init__.py b/tests/regressiontests/pagination/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/queries/__init__.py b/tests/regressiontests/queries/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/queryset_pickle/__init__.py b/tests/regressiontests/queryset_pickle/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/resolve_url/__init__.py b/tests/regressiontests/resolve_url/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/reverse_single_related/__init__.py b/tests/regressiontests/reverse_single_related/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/select_related_onetoone/__init__.py b/tests/regressiontests/select_related_onetoone/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/select_related_regress/__init__.py b/tests/regressiontests/select_related_regress/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/serializers_regress/__init__.py b/tests/regressiontests/serializers_regress/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/servers/__init__.py b/tests/regressiontests/servers/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/settings_tests/__init__.py b/tests/regressiontests/settings_tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/signals_regress/__init__.py b/tests/regressiontests/signals_regress/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/signals_regress/models.py b/tests/regressiontests/signals_regress/models.py
deleted file mode 100644
index 829314c06c..0000000000
--- a/tests/regressiontests/signals_regress/models.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
-
-
-@python_2_unicode_compatible
-class Author(models.Model):
-    name = models.CharField(max_length=20)
-
-    def __str__(self):
-        return self.name
-
-@python_2_unicode_compatible
-class Book(models.Model):
-    name = models.CharField(max_length=20)
-    authors = models.ManyToManyField(Author)
-
-    def __str__(self):
-        return self.name
diff --git a/tests/regressiontests/signed_cookies_tests/__init__.py b/tests/regressiontests/signed_cookies_tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/signing/__init__.py b/tests/regressiontests/signing/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/signing/models.py b/tests/regressiontests/signing/models.py
deleted file mode 100644
index 71abcc5198..0000000000
--- a/tests/regressiontests/signing/models.py
+++ /dev/null
@@ -1 +0,0 @@
-# models.py file for tests to run.
diff --git a/tests/regressiontests/sites_framework/__init__.py b/tests/regressiontests/sites_framework/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/special_headers/__init__.py b/tests/regressiontests/special_headers/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/staticfiles_tests/__init__.py b/tests/regressiontests/staticfiles_tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/staticfiles_tests/apps/__init__.py b/tests/regressiontests/staticfiles_tests/apps/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/__init__.py b/tests/regressiontests/staticfiles_tests/apps/no_label/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/__init__.py b/tests/regressiontests/staticfiles_tests/apps/test/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/staticfiles_tests/urls/__init__.py b/tests/regressiontests/staticfiles_tests/urls/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/string_lookup/__init__.py b/tests/regressiontests/string_lookup/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/swappable_models/__init__.py b/tests/regressiontests/swappable_models/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/syndication/__init__.py b/tests/regressiontests/syndication/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/templates/__init__.py b/tests/regressiontests/templates/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/templates/templatetags/__init__.py b/tests/regressiontests/templates/templatetags/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/templates/templatetags/subpackage/__init__.py b/tests/regressiontests/templates/templatetags/subpackage/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/test_client_regress/__init__.py b/tests/regressiontests/test_client_regress/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/test_runner/__init__.py b/tests/regressiontests/test_runner/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/test_runner/invalid_app/models/__init__.py b/tests/regressiontests/test_runner/invalid_app/models/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/test_runner/valid_app/models/__init__.py b/tests/regressiontests/test_runner/valid_app/models/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/test_runner/valid_app/tests/__init__.py b/tests/regressiontests/test_runner/valid_app/tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/test_utils/__init__.py b/tests/regressiontests/test_utils/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/text/__init__.py b/tests/regressiontests/text/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/transactions_regress/__init__.py b/tests/regressiontests/transactions_regress/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/urlpatterns_reverse/__init__.py b/tests/regressiontests/urlpatterns_reverse/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/urlpatterns_reverse/erroneous_urls.py b/tests/regressiontests/urlpatterns_reverse/erroneous_urls.py
deleted file mode 100644
index d1e4f3db5d..0000000000
--- a/tests/regressiontests/urlpatterns_reverse/erroneous_urls.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.conf.urls import patterns, url
-
-urlpatterns = patterns('',
-    # View has erroneous import
-    url(r'erroneous_inner/$', 'regressiontests.urlpatterns_reverse.views.erroneous_view'),
-    # Module has erroneous import
-    url(r'erroneous_outer/$', 'regressiontests.urlpatterns_reverse.erroneous_views_module.erroneous_view'),
-    # View does not exist
-    url(r'missing_inner/$', 'regressiontests.urlpatterns_reverse.views.missing_view'),
-    # View is not callable
-    url(r'uncallable/$', 'regressiontests.urlpatterns_reverse.views.uncallable'),
-    # Module does not exist
-    url(r'missing_outer/$', 'regressiontests.urlpatterns_reverse.missing_module.missing_view'),
-    # Regex contains an error (refs #6170)
-    url(r'(regex_error/$', 'regressiontestes.urlpatterns_reverse.views.empty_view'),
-)
diff --git a/tests/regressiontests/urlpatterns_reverse/middleware.py b/tests/regressiontests/urlpatterns_reverse/middleware.py
deleted file mode 100644
index 03749e9570..0000000000
--- a/tests/regressiontests/urlpatterns_reverse/middleware.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from . import urlconf_inner
-
-
-class ChangeURLconfMiddleware(object):
-    def process_request(self, request):
-        request.urlconf = urlconf_inner.__name__
-
-class NullChangeURLconfMiddleware(object):
-    def process_request(self, request):
-        request.urlconf = None
diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py
deleted file mode 100644
index 7a3e22078e..0000000000
--- a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Used by the ErrorHandlerResolutionTests test case.
-
-from django.conf.urls import patterns
-
-urlpatterns = patterns('')
-
-handler404 = 'regressiontests.urlpatterns_reverse.views.empty_view'
-handler500 = 'regressiontests.urlpatterns_reverse.views.empty_view'
diff --git a/tests/regressiontests/utils/__init__.py b/tests/regressiontests/utils/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/utils/models.py b/tests/regressiontests/utils/models.py
deleted file mode 100644
index 97a72bab14..0000000000
--- a/tests/regressiontests/utils/models.py
+++ /dev/null
@@ -1 +0,0 @@
-# Test runner needs a models.py file.
diff --git a/tests/regressiontests/utils/test_module/__init__.py b/tests/regressiontests/utils/test_module/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py
deleted file mode 100644
index 11dd7c320e..0000000000
--- a/tests/regressiontests/utils/tests.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-Tests for django.utils.
-"""
-from __future__ import absolute_import
-
-from .archive import TestBzip2Tar, TestGzipTar, TestTar, TestZip
-from .baseconv import TestBaseConv
-from .checksums import TestUtilsChecksums
-from .crypto import TestUtilsCryptoMisc, TestUtilsCryptoPBKDF2
-from .datastructures import (DictWrapperTests, ImmutableListTests,
-    MergeDictTests, MultiValueDictTests, SortedDictTests)
-from .dateformat import DateFormatTests
-from .dateparse import DateParseTests
-from .datetime_safe import DatetimeTests
-from .decorators import DecoratorFromMiddlewareTests
-from .encoding import TestEncodingUtils
-from .feedgenerator import FeedgeneratorTest
-from .functional import FunctionalTestCase
-from .html import TestUtilsHtml
-from .http import TestUtilsHttp, ETagProcessingTests, HttpDateProcessingTests
-from .ipv6 import TestUtilsIPv6
-from .jslex import JsToCForGettextTest, JsTokensTest
-from .module_loading import CustomLoader, DefaultLoader, EggLoader
-from .numberformat import TestNumberFormat
-from .os_utils import SafeJoinTests
-from .regex_helper import NormalizeTests
-from .simplelazyobject import TestUtilsSimpleLazyObject
-from .termcolors import TermColorTests
-from .text import TestUtilsText
-from .timesince import TimesinceTests
-from .timezone import TimezoneTests
-from .tzinfo import TzinfoTests
diff --git a/tests/regressiontests/version/__init__.py b/tests/regressiontests/version/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/views/templatetags/__init__.py b/tests/regressiontests/views/templatetags/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/views/tests/__init__.py b/tests/regressiontests/views/tests/__init__.py
deleted file mode 100644
index 17f3f4562d..0000000000
--- a/tests/regressiontests/views/tests/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from __future__ import absolute_import
-
-from .debug import (DebugViewTests, ExceptionReporterTests,
-    ExceptionReporterTests, PlainTextReportTests, ExceptionReporterFilterTests,
-    AjaxResponseExceptionReporterFilter)
-from .defaults import DefaultsTests
-from .i18n import JsI18NTests, I18NTests, JsI18NTestsMultiPackage, JavascriptI18nTests
-from .shortcuts import ShortcutTests
-from .specials import URLHandling
-from .static import StaticHelperTest, StaticUtilsTests, StaticTests
diff --git a/tests/regressiontests/wsgi/__init__.py b/tests/regressiontests/wsgi/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/regressiontests/requests/__init__.py b/tests/requests/__init__.py
similarity index 100%
rename from tests/regressiontests/requests/__init__.py
rename to tests/requests/__init__.py
diff --git a/tests/regressiontests/requests/models.py b/tests/requests/models.py
similarity index 100%
rename from tests/regressiontests/requests/models.py
rename to tests/requests/models.py
diff --git a/tests/regressiontests/requests/tests.py b/tests/requests/tests.py
similarity index 73%
rename from tests/regressiontests/requests/tests.py
rename to tests/requests/tests.py
index adf824dff7..daf426ea47 100644
--- a/tests/regressiontests/requests/tests.py
+++ b/tests/requests/tests.py
@@ -6,17 +6,21 @@ import warnings
 from datetime import datetime, timedelta
 from io import BytesIO
 
+from django.db import connection, connections, DEFAULT_DB_ALIAS
+from django.core import signals
 from django.core.exceptions import SuspiciousOperation
 from django.core.handlers.wsgi import WSGIRequest, LimitedStream
 from django.http import HttpRequest, HttpResponse, parse_cookie, build_request_repr, UnreadablePostError
+from django.test import SimpleTestCase, TransactionTestCase
 from django.test.client import FakePayload
 from django.test.utils import override_settings, str_prefix
-from django.utils import unittest
+from django.utils import six
+from django.utils.unittest import skipIf
 from django.utils.http import cookie_date, urlencode
 from django.utils.timezone import utc
 
 
-class RequestsTests(unittest.TestCase):
+class RequestsTests(SimpleTestCase):
     def test_httprequest(self):
         request = HttpRequest()
         self.assertEqual(list(request.GET.keys()), [])
@@ -46,6 +50,44 @@ class RequestsTests(unittest.TestCase):
         self.assertEqual(request.META['REQUEST_METHOD'], 'bogus')
         self.assertEqual(request.META['SCRIPT_NAME'], '')
 
+    def test_wsgirequest_with_script_name(self):
+        """
+        Ensure that the request's path is correctly assembled, regardless of
+        whether or not the SCRIPT_NAME has a trailing slash.
+        Refs #20169.
+        """
+        # With trailing slash
+        request = WSGIRequest({'PATH_INFO': '/somepath/', 'SCRIPT_NAME': '/PREFIX/', 'REQUEST_METHOD': 'get', 'wsgi.input': BytesIO(b'')})
+        self.assertEqual(request.path, '/PREFIX/somepath/')
+        # Without trailing slash
+        request = WSGIRequest({'PATH_INFO': '/somepath/', 'SCRIPT_NAME': '/PREFIX', 'REQUEST_METHOD': 'get', 'wsgi.input': BytesIO(b'')})
+        self.assertEqual(request.path, '/PREFIX/somepath/')
+
+    def test_wsgirequest_with_force_script_name(self):
+        """
+        Ensure that the FORCE_SCRIPT_NAME setting takes precedence over the
+        request's SCRIPT_NAME environment parameter.
+        Refs #20169.
+        """
+        with override_settings(FORCE_SCRIPT_NAME='/FORCED_PREFIX/'):
+            request = WSGIRequest({'PATH_INFO': '/somepath/', 'SCRIPT_NAME': '/PREFIX/', 'REQUEST_METHOD': 'get', 'wsgi.input': BytesIO(b'')})
+            self.assertEqual(request.path, '/FORCED_PREFIX/somepath/')
+
+    def test_wsgirequest_path_with_force_script_name_trailing_slash(self):
+        """
+        Ensure that the request's path is correctly assembled, regardless of
+        whether or not the FORCE_SCRIPT_NAME setting has a trailing slash.
+        Refs #20169.
+        """
+        # With trailing slash
+        with override_settings(FORCE_SCRIPT_NAME='/FORCED_PREFIX/'):
+            request = WSGIRequest({'PATH_INFO': '/somepath/', 'REQUEST_METHOD': 'get', 'wsgi.input': BytesIO(b'')})
+            self.assertEqual(request.path, '/FORCED_PREFIX/somepath/')
+        # Without trailing slash
+        with override_settings(FORCE_SCRIPT_NAME='/FORCED_PREFIX'):
+            request = WSGIRequest({'PATH_INFO': '/somepath/', 'REQUEST_METHOD': 'get', 'wsgi.input': BytesIO(b'')})
+            self.assertEqual(request.path, '/FORCED_PREFIX/somepath/')
+
     def test_wsgirequest_repr(self):
         request = WSGIRequest({'PATH_INFO': '/somepath/', 'REQUEST_METHOD': 'get', 'wsgi.input': BytesIO(b'')})
         request.GET = {'get-key': 'get-value'}
@@ -57,6 +99,16 @@ class RequestsTests(unittest.TestCase):
         self.assertEqual(build_request_repr(request, path_override='/otherpath/', GET_override={'a': 'b'}, POST_override={'c': 'd'}, COOKIES_override={'e': 'f'}, META_override={'g': 'h'}),
                          str_prefix("<WSGIRequest\npath:/otherpath/,\nGET:{%(_)s'a': %(_)s'b'},\nPOST:{%(_)s'c': %(_)s'd'},\nCOOKIES:{%(_)s'e': %(_)s'f'},\nMETA:{%(_)s'g': %(_)s'h'}>"))
 
+    def test_wsgirequest_path_info(self):
+        def wsgi_str(path_info):
+            path_info = path_info.encode('utf-8')           # Actual URL sent by the browser (bytestring)
+            if six.PY3:
+                path_info = path_info.decode('iso-8859-1')  # Value in the WSGI environ dict (native string)
+            return path_info
+        # Regression for #19468
+        request = WSGIRequest({'PATH_INFO': wsgi_str("/سلام/"), 'REQUEST_METHOD': 'get', 'wsgi.input': BytesIO(b'')})
+        self.assertEqual(request.path, "/سلام/")
+
     def test_parse_cookie(self):
         self.assertEqual(parse_cookie('invalid@key=true'), {})
 
@@ -70,7 +122,13 @@ class RequestsTests(unittest.TestCase):
         self.assertEqual(request.build_absolute_uri(location="/path/with:colons"),
             'http://www.example.com/path/with:colons')
 
-    @override_settings(USE_X_FORWARDED_HOST=False)
+    @override_settings(
+        USE_X_FORWARDED_HOST=False,
+        ALLOWED_HOSTS=[
+            'forward.com', 'example.com', 'internal.com', '12.34.56.78',
+            '[2001:19f0:feee::dead:beef:cafe]', 'xn--4ca9at.com',
+            '.multitenant.com', 'INSENSITIVE.com',
+            ])
     def test_http_get_host(self):
         # Check if X_FORWARDED_HOST is provided.
         request = HttpRequest()
@@ -117,6 +175,9 @@ class RequestsTests(unittest.TestCase):
             '[2001:19f0:feee::dead:beef:cafe]',
             '[2001:19f0:feee::dead:beef:cafe]:8080',
             'xn--4ca9at.com', # Punnycode for öäü.com
+            'anything.multitenant.com',
+            'multitenant.com',
+            'insensitive.com',
         ]
 
         poisoned_hosts = [
@@ -125,6 +186,7 @@ class RequestsTests(unittest.TestCase):
             'example.com:dr.frankenstein@evil.tld:80',
             'example.com:80/badpath',
             'example.com: recovermypassword.com',
+            'other.com', # not in ALLOWED_HOSTS
         ]
 
         for host in legit_hosts:
@@ -142,7 +204,7 @@ class RequestsTests(unittest.TestCase):
                 }
                 request.get_host()
 
-    @override_settings(USE_X_FORWARDED_HOST=True)
+    @override_settings(USE_X_FORWARDED_HOST=True, ALLOWED_HOSTS=['*'])
     def test_http_get_host_with_x_forwarded_host(self):
         # Check if X_FORWARDED_HOST is provided.
         request = HttpRequest()
@@ -215,6 +277,66 @@ class RequestsTests(unittest.TestCase):
                 request.get_host()
 
 
+    @override_settings(DEBUG=True, ALLOWED_HOSTS=[])
+    def test_host_validation_disabled_in_debug_mode(self):
+        """If ALLOWED_HOSTS is empty and DEBUG is True, all hosts pass."""
+        request = HttpRequest()
+        request.META = {
+            'HTTP_HOST': 'example.com',
+        }
+        self.assertEqual(request.get_host(), 'example.com')
+
+
+    @override_settings(ALLOWED_HOSTS=[])
+    def test_get_host_suggestion_of_allowed_host(self):
+        """get_host() makes helpful suggestions if a valid-looking host is not in ALLOWED_HOSTS."""
+        msg_invalid_host = "Invalid HTTP_HOST header: %r."
+        msg_suggestion = msg_invalid_host + "You may need to add %r to ALLOWED_HOSTS."
+
+        for host in [ # Valid-looking hosts
+            'example.com',
+            '12.34.56.78',
+            '[2001:19f0:feee::dead:beef:cafe]',
+            'xn--4ca9at.com', # Punnycode for öäü.com
+        ]:
+            request = HttpRequest()
+            request.META = {'HTTP_HOST': host}
+            self.assertRaisesMessage(
+                SuspiciousOperation,
+                msg_suggestion % (host, host),
+                request.get_host
+            )
+
+        for domain, port in [ # Valid-looking hosts with a port number
+            ('example.com', 80),
+            ('12.34.56.78', 443),
+            ('[2001:19f0:feee::dead:beef:cafe]', 8080),
+        ]:
+            host = '%s:%s' % (domain, port)
+            request = HttpRequest()
+            request.META = {'HTTP_HOST': host}
+            self.assertRaisesMessage(
+                SuspiciousOperation,
+                msg_suggestion % (host, domain),
+                request.get_host
+            )
+
+        for host in [ # Invalid hosts
+            'example.com@evil.tld',
+            'example.com:dr.frankenstein@evil.tld',
+            'example.com:dr.frankenstein@evil.tld:80',
+            'example.com:80/badpath',
+            'example.com: recovermypassword.com',
+        ]:
+            request = HttpRequest()
+            request.META = {'HTTP_HOST': host}
+            self.assertRaisesMessage(
+                SuspiciousOperation,
+                msg_invalid_host % host,
+                request.get_host
+            )
+
+
     def test_near_expiration(self):
         "Cookie will expire when an near expiration time is provided"
         response = HttpResponse()
@@ -496,20 +618,6 @@ class RequestsTests(unittest.TestCase):
         self.assertEqual(request.read(13), b'--boundary\r\nC')
         self.assertEqual(request.POST, {'name': ['value']})
 
-    def test_raw_post_data_returns_body(self):
-        """
-        HttpRequest.raw_post_body should be the same as HttpRequest.body
-        """
-        payload = FakePayload('Hello There!')
-        request = WSGIRequest({
-            'REQUEST_METHOD': 'POST',
-            'CONTENT_LENGTH': len(payload),
-            'wsgi.input': payload,
-        })
-
-        with warnings.catch_warnings(record=True):
-            self.assertEqual(request.body, request.raw_post_data)
-
     def test_POST_connection_error(self):
         """
         If wsgi.input.read() raises an exception while trying to read() the
@@ -525,8 +633,59 @@ class RequestsTests(unittest.TestCase):
                                'CONTENT_LENGTH': len(payload),
                                'wsgi.input': ExplodingBytesIO(payload)})
 
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            with self.assertRaises(UnreadablePostError):
-                request.raw_post_data
-            self.assertEqual(len(w), 1)
+        with self.assertRaises(UnreadablePostError):
+            request.body
+
+
+@skipIf(connection.vendor == 'sqlite'
+        and connection.settings_dict['NAME'] in ('', ':memory:'),
+        "Cannot establish two connections to an in-memory SQLite database.")
+class DatabaseConnectionHandlingTests(TransactionTestCase):
+
+    def setUp(self):
+        # Use a temporary connection to avoid messing with the main one.
+        self._old_default_connection = connections['default']
+        del connections['default']
+
+    def tearDown(self):
+        try:
+            connections['default'].close()
+        finally:
+            connections['default'] = self._old_default_connection
+
+    def test_request_finished_db_state(self):
+        # Force closing connection on request end
+        connection.settings_dict['CONN_MAX_AGE'] = 0
+
+        # The GET below will not succeed, but it will give a response with
+        # defined ._handler_class. That is needed for sending the
+        # request_finished signal.
+        response = self.client.get('/')
+        # Make sure there is an open connection
+        connection.cursor()
+        connection.enter_transaction_management()
+        signals.request_finished.send(sender=response._handler_class)
+        self.assertEqual(len(connection.transaction_state), 0)
+
+    def test_request_finished_failed_connection(self):
+        # Force closing connection on request end
+        connection.settings_dict['CONN_MAX_AGE'] = 0
+
+        connection.enter_transaction_management()
+        connection.set_dirty()
+        # Test that the rollback doesn't succeed (for example network failure
+        # could cause this).
+        def fail_horribly():
+            raise Exception("Horrible failure!")
+        connection._rollback = fail_horribly
+        try:
+            with self.assertRaises(Exception):
+                signals.request_finished.send(sender=self.__class__)
+            # The connection's state wasn't cleaned up
+            self.assertEqual(len(connection.transaction_state), 1)
+        finally:
+            del connection._rollback
+        # The connection will be cleaned on next request where the conn
+        # works again.
+        signals.request_finished.send(sender=self.__class__)
+        self.assertEqual(len(connection.transaction_state), 0)
diff --git a/tests/regressiontests/builtin_server/__init__.py b/tests/reserved_names/__init__.py
similarity index 100%
rename from tests/regressiontests/builtin_server/__init__.py
rename to tests/reserved_names/__init__.py
diff --git a/tests/modeltests/reserved_names/models.py b/tests/reserved_names/models.py
similarity index 100%
rename from tests/modeltests/reserved_names/models.py
rename to tests/reserved_names/models.py
diff --git a/tests/modeltests/reserved_names/tests.py b/tests/reserved_names/tests.py
similarity index 94%
rename from tests/modeltests/reserved_names/tests.py
rename to tests/reserved_names/tests.py
index 87f7a42ec4..ddffe08d34 100644
--- a/tests/modeltests/reserved_names/tests.py
+++ b/tests/reserved_names/tests.py
@@ -42,8 +42,8 @@ class ReservedNameTests(TestCase):
         self.generate()
         resp = Thing.objects.dates('where', 'year')
         self.assertEqual(list(resp), [
-            datetime.datetime(2005, 1, 1, 0, 0),
-            datetime.datetime(2006, 1, 1, 0, 0),
+            datetime.date(2005, 1, 1),
+            datetime.date(2006, 1, 1),
         ])
 
     def test_month_filter(self):
diff --git a/tests/regressiontests/bulk_create/__init__.py b/tests/resolve_url/__init__.py
similarity index 100%
rename from tests/regressiontests/bulk_create/__init__.py
rename to tests/resolve_url/__init__.py
diff --git a/tests/regressiontests/resolve_url/models.py b/tests/resolve_url/models.py
similarity index 100%
rename from tests/regressiontests/resolve_url/models.py
rename to tests/resolve_url/models.py
diff --git a/tests/regressiontests/resolve_url/tests.py b/tests/resolve_url/tests.py
similarity index 100%
rename from tests/regressiontests/resolve_url/tests.py
rename to tests/resolve_url/tests.py
diff --git a/tests/regressiontests/cache/__init__.py b/tests/reverse_lookup/__init__.py
similarity index 100%
rename from tests/regressiontests/cache/__init__.py
rename to tests/reverse_lookup/__init__.py
diff --git a/tests/modeltests/reverse_lookup/models.py b/tests/reverse_lookup/models.py
similarity index 100%
rename from tests/modeltests/reverse_lookup/models.py
rename to tests/reverse_lookup/models.py
diff --git a/tests/modeltests/reverse_lookup/tests.py b/tests/reverse_lookup/tests.py
similarity index 100%
rename from tests/modeltests/reverse_lookup/tests.py
rename to tests/reverse_lookup/tests.py
diff --git a/tests/regressiontests/comment_tests/__init__.py b/tests/reverse_single_related/__init__.py
similarity index 100%
rename from tests/regressiontests/comment_tests/__init__.py
rename to tests/reverse_single_related/__init__.py
diff --git a/tests/regressiontests/reverse_single_related/models.py b/tests/reverse_single_related/models.py
similarity index 67%
rename from tests/regressiontests/reverse_single_related/models.py
rename to tests/reverse_single_related/models.py
index 898be8411b..30ba345120 100644
--- a/tests/regressiontests/reverse_single_related/models.py
+++ b/tests/reverse_single_related/models.py
@@ -2,8 +2,8 @@ from django.db import models
 
 
 class SourceManager(models.Manager):
-    def get_query_set(self):
-        return super(SourceManager, self).get_query_set().filter(is_public=True)
+    def get_queryset(self):
+        return super(SourceManager, self).get_queryset().filter(is_public=True)
 
 class Source(models.Model):
     is_public = models.BooleanField()
diff --git a/tests/regressiontests/reverse_single_related/tests.py b/tests/reverse_single_related/tests.py
similarity index 100%
rename from tests/regressiontests/reverse_single_related/tests.py
rename to tests/reverse_single_related/tests.py
diff --git a/tests/runtests.py b/tests/runtests.py
index 8c56e273b5..ee2488c4a1 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -1,35 +1,28 @@
 #!/usr/bin/env python
+import logging
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
-import warnings
 
 from django import contrib
 from django.utils._os import upath
 from django.utils import six
 
-# databrowse is deprecated, but we still want to run its tests
-warnings.filterwarnings('ignore', "The Databrowse contrib app is deprecated",
-                        DeprecationWarning, 'django.contrib.databrowse')
-
 CONTRIB_DIR_NAME = 'django.contrib'
-MODEL_TESTS_DIR_NAME = 'modeltests'
-REGRESSION_TESTS_DIR_NAME = 'regressiontests'
 
 TEST_TEMPLATE_DIR = 'templates'
 
-RUNTESTS_DIR = os.path.dirname(upath(__file__))
+RUNTESTS_DIR = os.path.abspath(os.path.dirname(upath(__file__)))
 CONTRIB_DIR = os.path.dirname(upath(contrib.__file__))
-MODEL_TEST_DIR = os.path.join(RUNTESTS_DIR, MODEL_TESTS_DIR_NAME)
-REGRESSION_TEST_DIR = os.path.join(RUNTESTS_DIR, REGRESSION_TESTS_DIR_NAME)
 TEMP_DIR = tempfile.mkdtemp(prefix='django_')
 os.environ['DJANGO_TEST_TEMP_DIR'] = TEMP_DIR
 
-REGRESSION_SUBDIRS_TO_SKIP = []
+SUBDIRS_TO_SKIP = ['templates']
 
 ALWAYS_INSTALLED_APPS = [
+    'shared_models',
     'django.contrib.contenttypes',
     'django.contrib.auth',
     'django.contrib.sites',
@@ -40,12 +33,11 @@ ALWAYS_INSTALLED_APPS = [
     'django.contrib.comments',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'django.contrib.databrowse',
     'django.contrib.staticfiles',
     'django.contrib.humanize',
-    'regressiontests.staticfiles_tests',
-    'regressiontests.staticfiles_tests.apps.test',
-    'regressiontests.staticfiles_tests.apps.no_label',
+    'staticfiles_tests',
+    'staticfiles_tests.apps.test',
+    'staticfiles_tests.apps.no_label',
 ]
 
 def geodjango(settings):
@@ -57,30 +49,27 @@ def geodjango(settings):
 def get_test_modules():
     modules = []
     for loc, dirpath in (
-        (MODEL_TESTS_DIR_NAME, MODEL_TEST_DIR),
-        (REGRESSION_TESTS_DIR_NAME, REGRESSION_TEST_DIR),
+        (None, RUNTESTS_DIR),
         (CONTRIB_DIR_NAME, CONTRIB_DIR)):
         for f in os.listdir(dirpath):
-            if (f.startswith('__init__') or
-                f.startswith('.') or
+            if ('.' in f or
                 # Python 3 byte code dirs (PEP 3147)
                 f == '__pycache__' or
                 f.startswith('sql') or
-                os.path.basename(f) in REGRESSION_SUBDIRS_TO_SKIP):
+                os.path.basename(f) in SUBDIRS_TO_SKIP or
+                os.path.isfile(f)):
                 continue
             modules.append((loc, f))
     return modules
 
 def setup(verbosity, test_labels):
     from django.conf import settings
+    from django.db.models.loading import get_apps, load_app
     state = {
         'INSTALLED_APPS': settings.INSTALLED_APPS,
         'ROOT_URLCONF': getattr(settings, "ROOT_URLCONF", ""),
         'TEMPLATE_DIRS': settings.TEMPLATE_DIRS,
-        'USE_I18N': settings.USE_I18N,
-        'LOGIN_URL': settings.LOGIN_URL,
         'LANGUAGE_CODE': settings.LANGUAGE_CODE,
-        'MIDDLEWARE_CLASSES': settings.MIDDLEWARE_CLASSES,
         'STATIC_URL': settings.STATIC_URL,
         'STATIC_ROOT': settings.STATIC_ROOT,
     }
@@ -91,25 +80,18 @@ def setup(verbosity, test_labels):
     settings.STATIC_URL = '/static/'
     settings.STATIC_ROOT = os.path.join(TEMP_DIR, 'static')
     settings.TEMPLATE_DIRS = (os.path.join(RUNTESTS_DIR, TEST_TEMPLATE_DIR),)
-    settings.USE_I18N = True
     settings.LANGUAGE_CODE = 'en'
-    settings.LOGIN_URL = 'django.contrib.auth.views.login'
-    settings.MIDDLEWARE_CLASSES = (
-        'django.contrib.sessions.middleware.SessionMiddleware',
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.messages.middleware.MessageMiddleware',
-        'django.middleware.common.CommonMiddleware',
-    )
     settings.SITE_ID = 1
-    # For testing comment-utils, we require the MANAGERS attribute
-    # to be set, so that a test email is sent out which we catch
-    # in our tests.
-    settings.MANAGERS = ("admin@djangoproject.com",)
+
+    if verbosity > 0:
+        # Ensure any warnings captured to logging are piped through a verbose
+        # logging handler.  If any -W options were passed explicitly on command
+        # line, warnings are not captured, and this has no effect.
+        logger = logging.getLogger('py.warnings')
+        handler = logging.StreamHandler()
+        logger.addHandler(handler)
 
     # Load all the ALWAYS_INSTALLED_APPS.
-    # (This import statement is intentionally delayed until after we
-    # access settings because of the USE_I18N dependency.)
-    from django.db.models.loading import get_apps, load_app
     get_apps()
 
     # Load all the test model apps.
@@ -124,7 +106,10 @@ def setup(verbosity, test_labels):
         settings.INSTALLED_APPS.extend(['django.contrib.gis', 'django.contrib.sitemaps'])
 
     for module_dir, module_name in test_modules:
-        module_label = '.'.join([module_dir, module_name])
+        if module_dir:
+            module_label = '.'.join([module_dir, module_name])
+        else:
+            module_label = module_name
         # if the module was named on the command line, or
         # no modules were named (i.e., run all), import
         # this module and add it to the list to test.
@@ -306,7 +291,11 @@ if __name__ == "__main__":
         '--liveserver', action='store', dest='liveserver', default=None,
         help='Overrides the default address where the live server (used with '
              'LiveServerTestCase) is expected to run from. The default value '
-             'is localhost:8081.'),
+             'is localhost:8081.')
+    parser.add_option(
+        '--selenium', action='store_true', dest='selenium',
+        default=False,
+        help='Run the Selenium tests as well (if Selenium is installed)')
     options, args = parser.parse_args()
     if options.settings:
         os.environ['DJANGO_SETTINGS_MODULE'] = options.settings
@@ -319,6 +308,9 @@ if __name__ == "__main__":
     if options.liveserver is not None:
         os.environ['DJANGO_LIVE_TEST_SERVER_ADDRESS'] = options.liveserver
 
+    if options.selenium:
+        os.environ['DJANGO_SELENIUM_TESTS'] = '1'
+
     if options.bisect:
         bisect_tests(options.bisect, options, args)
     elif options.pair:
diff --git a/tests/regressiontests/context_processors/__init__.py b/tests/save_delete_hooks/__init__.py
similarity index 100%
rename from tests/regressiontests/context_processors/__init__.py
rename to tests/save_delete_hooks/__init__.py
diff --git a/tests/modeltests/save_delete_hooks/models.py b/tests/save_delete_hooks/models.py
similarity index 100%
rename from tests/modeltests/save_delete_hooks/models.py
rename to tests/save_delete_hooks/models.py
diff --git a/tests/modeltests/save_delete_hooks/tests.py b/tests/save_delete_hooks/tests.py
similarity index 100%
rename from tests/modeltests/save_delete_hooks/tests.py
rename to tests/save_delete_hooks/tests.py
diff --git a/tests/regressiontests/createsuperuser/__init__.py b/tests/schema/__init__.py
similarity index 100%
rename from tests/regressiontests/createsuperuser/__init__.py
rename to tests/schema/__init__.py
diff --git a/tests/modeltests/schema/models.py b/tests/schema/models.py
similarity index 100%
rename from tests/modeltests/schema/models.py
rename to tests/schema/models.py
diff --git a/tests/modeltests/schema/tests.py b/tests/schema/tests.py
similarity index 99%
rename from tests/modeltests/schema/tests.py
rename to tests/schema/tests.py
index 6ac72b4c02..72c0c07af5 100644
--- a/tests/modeltests/schema/tests.py
+++ b/tests/schema/tests.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import copy
 import datetime
-from django.test import TestCase
+from django.test import TransactionTestCase
 from django.utils.unittest import skipUnless
 from django.db import connection, DatabaseError, IntegrityError
 from django.db.models.fields import IntegerField, TextField, CharField, SlugField
@@ -10,7 +10,7 @@ from django.db.models.loading import cache, default_cache, AppCache
 from .models import Author, AuthorWithM2M, Book, BookWithSlug, BookWithM2M, Tag, TagUniqueRename, UniqueTest
 
 
-class SchemaTests(TestCase):
+class SchemaTests(TransactionTestCase):
     """
     Tests that the schema-alteration code works correctly.
 
@@ -26,9 +26,7 @@ class SchemaTests(TestCase):
 
     def setUp(self):
         # Make sure we're in manual transaction mode
-        connection.commit_unless_managed()
-        connection.enter_transaction_management()
-        connection.managed(True)
+        connection.set_autocommit(False)
         # The unmanaged models need to be removed after the test in order to
         # prevent bad interactions with the flush operation in other tests.
         self.app_cache = AppCache()
@@ -40,10 +38,11 @@ class SchemaTests(TestCase):
 
     def tearDown(self):
         # Delete any tables made for our models
+        connection.rollback()
         self.delete_tables()
         # Rollback anything that may have happened
         connection.rollback()
-        connection.leave_transaction_management()
+        connection.set_autocommit(True)
         cache.set_cache(default_cache)
         cache.app_models['schema'] = {}  # One M2M gets left in the old cache
 
diff --git a/tests/regressiontests/admin_custom_urls/__init__.py b/tests/select_for_update/__init__.py
similarity index 100%
rename from tests/regressiontests/admin_custom_urls/__init__.py
rename to tests/select_for_update/__init__.py
diff --git a/tests/modeltests/select_for_update/models.py b/tests/select_for_update/models.py
similarity index 100%
rename from tests/modeltests/select_for_update/models.py
rename to tests/select_for_update/models.py
diff --git a/tests/modeltests/select_for_update/tests.py b/tests/select_for_update/tests.py
similarity index 91%
rename from tests/modeltests/select_for_update/tests.py
rename to tests/select_for_update/tests.py
index e3e4d9e7e2..c2fa22705a 100644
--- a/tests/modeltests/select_for_update/tests.py
+++ b/tests/select_for_update/tests.py
@@ -24,8 +24,7 @@ requires_threading = unittest.skipUnless(threading, 'requires threading')
 class SelectForUpdateTests(TransactionTestCase):
 
     def setUp(self):
-        transaction.enter_transaction_management(True)
-        transaction.managed(True)
+        transaction.enter_transaction_management()
         self.person = Person.objects.create(name='Reinhardt')
 
         # We have to commit here so that code in run_select_for_update can
@@ -37,7 +36,6 @@ class SelectForUpdateTests(TransactionTestCase):
         new_connections = ConnectionHandler(settings.DATABASES)
         self.new_connection = new_connections[DEFAULT_DB_ALIAS]
         self.new_connection.enter_transaction_management()
-        self.new_connection.managed(True)
 
         # We need to set settings.DEBUG to True so we can capture
         # the output SQL to examine.
@@ -48,9 +46,8 @@ class SelectForUpdateTests(TransactionTestCase):
         try:
             # We don't really care if this fails - some of the tests will set
             # this in the course of their run.
-            transaction.managed(False)
-            transaction.leave_transaction_management()
-            self.new_connection.leave_transaction_management()
+            transaction.abort()
+            self.new_connection.abort()
         except transaction.TransactionManagementError:
             pass
         self.new_connection.close()
@@ -73,7 +70,7 @@ class SelectForUpdateTests(TransactionTestCase):
 
     def end_blocking_transaction(self):
         # Roll back the blocking transaction.
-        self.new_connection._rollback()
+        self.new_connection.rollback()
 
     def has_for_update_sql(self, tested_connection, nowait=False):
         # Examine the SQL that was executed to determine whether it
@@ -82,9 +79,6 @@ class SelectForUpdateTests(TransactionTestCase):
         sql = tested_connection.queries[-1]['sql']
         return bool(sql.find(for_update_sql) > -1)
 
-    def check_exc(self, exc):
-        self.assertTrue(isinstance(exc, DatabaseError))
-
     @skipUnlessDBFeature('has_select_for_update')
     def test_for_update_sql_generated(self):
         """
@@ -119,6 +113,7 @@ class SelectForUpdateTests(TransactionTestCase):
         """
         self.start_blocking_transaction()
         status = []
+
         thread = threading.Thread(
             target=self.run_select_for_update,
             args=(status,),
@@ -129,7 +124,7 @@ class SelectForUpdateTests(TransactionTestCase):
         time.sleep(1)
         thread.join()
         self.end_blocking_transaction()
-        self.check_exc(status[-1])
+        self.assertIsInstance(status[-1], DatabaseError)
 
     # In Python 2.6 beta and some final releases, exceptions raised in __len__
     # are swallowed (Python issue 1242657), so these cases return an empty
@@ -164,8 +159,7 @@ class SelectForUpdateTests(TransactionTestCase):
         try:
             # We need to enter transaction management again, as this is done on
             # per-thread basis
-            transaction.enter_transaction_management(True)
-            transaction.managed(True)
+            transaction.enter_transaction_management()
             people = list(
                 Person.objects.all().select_for_update(nowait=nowait)
             )
@@ -177,6 +171,7 @@ class SelectForUpdateTests(TransactionTestCase):
         finally:
             # This method is run in a separate thread. It uses its own
             # database connection. Close it without waiting for the GC.
+            transaction.abort()
             connection.close()
 
     @requires_threading
@@ -260,7 +255,7 @@ class SelectForUpdateTests(TransactionTestCase):
         time.sleep(1)
         thread.join()
         self.end_blocking_transaction()
-        self.check_exc(status[-1])
+        self.assertIsInstance(status[-1], DatabaseError)
 
     @skipUnlessDBFeature('has_select_for_update')
     def test_transaction_dirty_managed(self):
@@ -271,13 +266,3 @@ class SelectForUpdateTests(TransactionTestCase):
         """
         people = list(Person.objects.select_for_update())
         self.assertTrue(transaction.is_dirty())
-
-    @skipUnlessDBFeature('has_select_for_update')
-    def test_transaction_not_dirty_unmanaged(self):
-        """ If we're not under txn management, the txn will never be
-        marked as dirty.
-        """
-        transaction.managed(False)
-        transaction.leave_transaction_management()
-        people = list(Person.objects.select_for_update())
-        self.assertFalse(transaction.is_dirty())
diff --git a/tests/regressiontests/csrf_tests/__init__.py b/tests/select_related/__init__.py
similarity index 100%
rename from tests/regressiontests/csrf_tests/__init__.py
rename to tests/select_related/__init__.py
diff --git a/tests/modeltests/select_related/models.py b/tests/select_related/models.py
similarity index 100%
rename from tests/modeltests/select_related/models.py
rename to tests/select_related/models.py
diff --git a/tests/modeltests/select_related/tests.py b/tests/select_related/tests.py
similarity index 83%
rename from tests/modeltests/select_related/tests.py
rename to tests/select_related/tests.py
index 557a5c318a..27d65fecb1 100644
--- a/tests/modeltests/select_related/tests.py
+++ b/tests/select_related/tests.py
@@ -1,5 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
+import warnings
+
 from django.test import TestCase
 
 from .models import Domain, Kingdom, Phylum, Klass, Order, Family, Genus, Species
@@ -53,7 +55,9 @@ class SelectRelatedTests(TestCase):
         extra queries
         """
         with self.assertNumQueries(1):
-            person = Species.objects.select_related(depth=10).get(name="sapiens")
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore", DeprecationWarning)
+                person = Species.objects.select_related(depth=10).get(name="sapiens")
             domain = person.genus.family.order.klass.phylum.kingdom.domain
             self.assertEqual(domain.name, 'Eukaryota')
 
@@ -94,7 +98,9 @@ class SelectRelatedTests(TestCase):
         """
         # Notice: one fewer queries than above because of depth=1
         with self.assertNumQueries(expected):
-            pea = Species.objects.select_related(depth=depth).get(name="sativum")
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore", DeprecationWarning)
+                pea = Species.objects.select_related(depth=depth).get(name="sativum")
             self.assertEqual(
                 pea.genus.family.order.klass.phylum.kingdom.domain.name,
                 'Eukaryota'
@@ -113,14 +119,18 @@ class SelectRelatedTests(TestCase):
         particular level. This can be used on lists as well.
         """
         with self.assertNumQueries(5):
-            world = Species.objects.all().select_related(depth=2)
-            orders = [o.genus.family.order.name for o in world]
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore", DeprecationWarning)
+                world = Species.objects.all().select_related(depth=2)
+                orders = [o.genus.family.order.name for o in world]
             self.assertEqual(sorted(orders),
                 ['Agaricales', 'Diptera', 'Fabales', 'Primates'])
 
     def test_select_related_with_extra(self):
-        s = Species.objects.all().select_related(depth=1)\
-            .extra(select={'a': 'select_related_species.id + 10'})[0]
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            s = Species.objects.all().select_related(depth=1)\
+                .extra(select={'a': 'select_related_species.id + 10'})[0]
         self.assertEqual(s.id + 10, s.a)
 
     def test_certain_fields(self):
@@ -156,7 +166,9 @@ class SelectRelatedTests(TestCase):
             self.assertEqual(s, 'Diptera')
 
     def test_depth_fields_fails(self):
-        self.assertRaises(TypeError,
-            Species.objects.select_related,
-            'genus__family__order', depth=4
-        )
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
+            self.assertRaises(TypeError,
+                Species.objects.select_related,
+                'genus__family__order', depth=4
+            )
diff --git a/tests/regressiontests/custom_columns_regress/__init__.py b/tests/select_related_onetoone/__init__.py
similarity index 100%
rename from tests/regressiontests/custom_columns_regress/__init__.py
rename to tests/select_related_onetoone/__init__.py
diff --git a/tests/regressiontests/select_related_onetoone/models.py b/tests/select_related_onetoone/models.py
similarity index 100%
rename from tests/regressiontests/select_related_onetoone/models.py
rename to tests/select_related_onetoone/models.py
diff --git a/tests/regressiontests/select_related_onetoone/tests.py b/tests/select_related_onetoone/tests.py
similarity index 97%
rename from tests/regressiontests/select_related_onetoone/tests.py
rename to tests/select_related_onetoone/tests.py
index d4a1275e49..fce8fc4e73 100644
--- a/tests/regressiontests/select_related_onetoone/tests.py
+++ b/tests/select_related_onetoone/tests.py
@@ -183,11 +183,11 @@ class ReverseSelectRelatedTestCase(TestCase):
         p = Parent2.objects.select_related('child1').only(
             'id2',  'child1__value').get(name2="n2")
         with self.assertNumQueries(1):
-            self.assertEquals(p.name2, 'n2')
+            self.assertEqual(p.name2, 'n2')
         p = Parent2.objects.select_related('child1').only(
             'id2',  'child1__value').get(name2="n2")
         with self.assertNumQueries(1):
-            self.assertEquals(p.child1.name2, 'n2')
+            self.assertEqual(p.child1.name2, 'n2')
 
     @unittest.expectedFailure
     def test_inheritance_deferred2(self):
@@ -202,9 +202,9 @@ class ReverseSelectRelatedTestCase(TestCase):
             self.assertEqual(p.child1.child4.id2, c.id2)
         p = qs.get(name2="n2")
         with self.assertNumQueries(1):
-            self.assertEquals(p.child1.name2, 'n2')
+            self.assertEqual(p.child1.name2, 'n2')
         p = qs.get(name2="n2")
         with self.assertNumQueries(1):
-            self.assertEquals(p.child1.name1, 'n1')
+            self.assertEqual(p.child1.name1, 'n1')
         with self.assertNumQueries(1):
-            self.assertEquals(p.child1.child4.name1, 'n1')
+            self.assertEqual(p.child1.child4.name1, 'n1')
diff --git a/tests/regressiontests/custom_managers_regress/__init__.py b/tests/select_related_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/custom_managers_regress/__init__.py
rename to tests/select_related_regress/__init__.py
diff --git a/tests/regressiontests/select_related_regress/models.py b/tests/select_related_regress/models.py
similarity index 90%
rename from tests/regressiontests/select_related_regress/models.py
rename to tests/select_related_regress/models.py
index a291a547f7..620b8eb5ea 100644
--- a/tests/regressiontests/select_related_regress/models.py
+++ b/tests/select_related_regress/models.py
@@ -94,3 +94,17 @@ class Item(models.Model):
 
     def __str__(self):
         return self.name
+
+# Models for testing bug #19870.
+@python_2_unicode_compatible
+class Fowl(models.Model):
+    name = models.CharField(max_length=10)
+
+    def __str__(self):
+        return self.name
+
+class Hen(Fowl):
+    pass
+
+class Chick(Fowl):
+    mother = models.ForeignKey(Hen)
diff --git a/tests/regressiontests/select_related_regress/tests.py b/tests/select_related_regress/tests.py
similarity index 80%
rename from tests/regressiontests/select_related_regress/tests.py
rename to tests/select_related_regress/tests.py
index 7f93a1c33c..f6d21b2dd9 100644
--- a/tests/regressiontests/select_related_regress/tests.py
+++ b/tests/select_related_regress/tests.py
@@ -5,7 +5,7 @@ from django.utils import six
 
 from .models import (Building, Child, Device, Port, Item, Country, Connection,
     ClientStatus, State, Client, SpecialClient, TUser, Person, Student,
-    Organizer, Class, Enrollment)
+    Organizer, Class, Enrollment, Hen, Chick)
 
 
 class SelectRelatedRegressTests(TestCase):
@@ -139,3 +139,37 @@ class SelectRelatedRegressTests(TestCase):
         self.assertEqual(troy.name, 'Troy Buswell')
         self.assertEqual(troy.value, 42)
         self.assertEqual(troy.state.name, 'Western Australia')
+
+    def test_null_join_promotion(self):
+        australia = Country.objects.create(name='Australia')
+        active = ClientStatus.objects.create(name='active')
+
+        wa = State.objects.create(name="Western Australia", country=australia)
+        bob = Client.objects.create(name='Bob', status=active)
+        jack = Client.objects.create(name='Jack', status=active, state=wa)
+        qs = Client.objects.filter(state=wa).select_related('state')
+        with self.assertNumQueries(1):
+            self.assertEqual(list(qs), [jack])
+            self.assertEqual(qs[0].state, wa)
+            # The select_related join wasn't promoted as there was already an
+            # existing (even if trimmed) inner join to state.
+            self.assertFalse('LEFT OUTER' in str(qs.query))
+        qs = Client.objects.select_related('state').order_by('name')
+        with self.assertNumQueries(1):
+            self.assertEqual(list(qs), [bob, jack])
+            self.assertIs(qs[0].state, None)
+            self.assertEqual(qs[1].state, wa)
+            # The select_related join was promoted as there is already an
+            # existing join.
+            self.assertTrue('LEFT OUTER' in str(qs.query))
+
+    def test_regression_19870(self):
+        """
+        Regression for #19870
+
+        """
+        hen = Hen.objects.create(name='Hen')
+        chick = Chick.objects.create(name='Chick', mother=hen)
+
+        self.assertEqual(Chick.objects.all()[0].mother.name, 'Hen')
+        self.assertEqual(Chick.objects.select_related()[0].mother.name, 'Hen')
diff --git a/tests/regressiontests/datatypes/__init__.py b/tests/serializers/__init__.py
similarity index 100%
rename from tests/regressiontests/datatypes/__init__.py
rename to tests/serializers/__init__.py
diff --git a/tests/modeltests/serializers/models.py b/tests/serializers/models.py
similarity index 100%
rename from tests/modeltests/serializers/models.py
rename to tests/serializers/models.py
diff --git a/tests/modeltests/serializers/tests.py b/tests/serializers/tests.py
similarity index 97%
rename from tests/modeltests/serializers/tests.py
rename to tests/serializers/tests.py
index e39f17b68a..a96a1af748 100644
--- a/tests/modeltests/serializers/tests.py
+++ b/tests/serializers/tests.py
@@ -255,7 +255,7 @@ class SerializersTestBase(object):
         for obj in deserial_objs:
             self.assertFalse(obj.object.id)
             obj.save()
-        self.assertEqual(Category.objects.all().count(), 4)
+        self.assertEqual(Category.objects.all().count(), 5)
 
 
 class SerializersTransactionTestBase(object):
@@ -268,7 +268,6 @@ class SerializersTransactionTestBase(object):
         # within a transaction in order to test forward reference
         # handling.
         transaction.enter_transaction_management()
-        transaction.managed(True)
         objs = serializers.deserialize(self.serializer_name, self.fwd_ref_str)
         with connection.constraint_checks_disabled():
             for obj in objs:
@@ -290,6 +289,9 @@ class XmlSerializerTestCase(SerializersTestBase, TestCase):
     <object model="serializers.category">
         <field type="CharField" name="name">Reference</field>
     </object>
+    <object model="serializers.category">
+        <field type="CharField" name="name">Non-fiction</field>
+    </object>
 </django-objects>"""
 
     @staticmethod
@@ -351,7 +353,15 @@ class XmlSerializerTransactionTestCase(SerializersTransactionTestBase, Transacti
 
 class JsonSerializerTestCase(SerializersTestBase, TestCase):
     serializer_name = "json"
-    pkless_str = """[{"pk": null, "model": "serializers.category", "fields": {"name": "Reference"}}]"""
+    pkless_str = """[
+    {
+        "pk": null,
+        "model": "serializers.category",
+        "fields": {"name": "Reference"}
+    }, {
+        "model": "serializers.category",
+        "fields": {"name": "Non-fiction"}
+    }]"""
 
     @staticmethod
     def _validate_output(serial_str):
@@ -433,6 +443,9 @@ else:
         pkless_str = """- fields:
     name: Reference
   pk: null
+  model: serializers.category
+- fields:
+    name: Non-fiction
   model: serializers.category"""
 
         @staticmethod
diff --git a/tests/regressiontests/dates/__init__.py b/tests/serializers_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/dates/__init__.py
rename to tests/serializers_regress/__init__.py
diff --git a/tests/regressiontests/serializers_regress/models.py b/tests/serializers_regress/models.py
similarity index 99%
rename from tests/regressiontests/serializers_regress/models.py
rename to tests/serializers_regress/models.py
index af261f9cbc..21fe073122 100644
--- a/tests/regressiontests/serializers_regress/models.py
+++ b/tests/serializers_regress/models.py
@@ -12,6 +12,9 @@ from django.contrib.contenttypes.models import ContentType
 # The following classes are for testing basic data
 # marshalling, including NULL values, where allowed.
 
+class BinaryData(models.Model):
+    data = models.BinaryField(null=True)
+
 class BooleanData(models.Model):
     data = models.BooleanField()
 
diff --git a/tests/regressiontests/serializers_regress/tests.py b/tests/serializers_regress/tests.py
similarity index 93%
rename from tests/regressiontests/serializers_regress/tests.py
rename to tests/serializers_regress/tests.py
index 2583a1ea04..72e3825d91 100644
--- a/tests/regressiontests/serializers_regress/tests.py
+++ b/tests/serializers_regress/tests.py
@@ -10,6 +10,7 @@ from __future__ import absolute_import, unicode_literals
 
 import datetime
 import decimal
+from django.core.serializers.xml_serializer import DTDForbidden
 
 try:
     import yaml
@@ -23,10 +24,11 @@ from django.db import connection, models
 from django.http import HttpResponse
 from django.test import TestCase
 from django.utils import six
+from django.utils.encoding import force_text
 from django.utils.functional import curry
 from django.utils.unittest import skipUnless
 
-from .models import (BooleanData, CharData, DateData, DateTimeData, EmailData,
+from .models import (BinaryData, BooleanData, CharData, DateData, DateTimeData, EmailData,
     FileData, FilePathData, DecimalData, FloatData, IntegerData, IPAddressData,
     GenericIPAddressData, NullBooleanData, PositiveIntegerData,
     PositiveSmallIntegerData, SlugData, SmallData, TextData, TimeData,
@@ -115,10 +117,17 @@ def inherited_create(pk, klass, data):
 # test data objects of various kinds
 def data_compare(testcase, pk, klass, data):
     instance = klass.objects.get(id=pk)
-    testcase.assertEqual(data, instance.data,
-         "Objects with PK=%d not equal; expected '%s' (%s), got '%s' (%s)" % (
-            pk, data, type(data), instance.data, type(instance.data))
-    )
+    if klass == BinaryData and data is not None:
+        testcase.assertEqual(bytes(data), bytes(instance.data),
+             "Objects with PK=%d not equal; expected '%s' (%s), got '%s' (%s)" % (
+                pk, repr(bytes(data)), type(data), repr(bytes(instance.data)),
+                type(instance.data))
+        )
+    else:
+        testcase.assertEqual(data, instance.data,
+             "Objects with PK=%d not equal; expected '%s' (%s), got '%s' (%s)" % (
+                pk, data, type(data), instance, type(instance.data))
+        )
 
 def generic_compare(testcase, pk, klass, data):
     instance = klass.objects.get(id=pk)
@@ -174,8 +183,10 @@ inherited_obj = (inherited_create, inherited_compare)
 
 test_data = [
     # Format: (data type, PK value, Model Class, data)
-    (data_obj, 1, BooleanData, True),
-    (data_obj, 2, BooleanData, False),
+    (data_obj, 1, BinaryData, six.memoryview(b"\x05\xFD\x00")),
+    (data_obj, 2, BinaryData, None),
+    (data_obj, 5, BooleanData, True),
+    (data_obj, 6, BooleanData, False),
     (data_obj, 10, CharData, "Test Char Data"),
     (data_obj, 11, CharData, ""),
     (data_obj, 12, CharData, "None"),
@@ -506,7 +517,6 @@ def streamTest(format, self):
             self.assertEqual(string_data, stream.getvalue())
         else:
             self.assertEqual(string_data, stream.content.decode('utf-8'))
-        stream.close()
 
 for format in serializers.get_serializer_formats():
     setattr(SerializerTests, 'test_' + format + '_serializer', curry(serializerTest, format))
@@ -515,3 +525,17 @@ for format in serializers.get_serializer_formats():
     if format != 'python':
         setattr(SerializerTests, 'test_' + format + '_serializer_stream', curry(streamTest, format))
 
+
+class XmlDeserializerSecurityTests(TestCase):
+
+    def test_no_dtd(self):
+        """
+        The XML deserializer shouldn't allow a DTD.
+
+        This is the most straightforward way to prevent all entity definitions
+        and avoid both external entities and entity-expansion attacks.
+
+        """
+        xml = '<?xml version="1.0" standalone="no"?><!DOCTYPE example SYSTEM "http://example.com/example.dtd">'
+        with self.assertRaises(DTDForbidden):
+            next(serializers.deserialize('xml', xml))
diff --git a/tests/regressiontests/db_typecasts/__init__.py b/tests/servers/__init__.py
similarity index 100%
rename from tests/regressiontests/db_typecasts/__init__.py
rename to tests/servers/__init__.py
diff --git a/tests/regressiontests/servers/fixtures/testdata.json b/tests/servers/fixtures/testdata.json
similarity index 100%
rename from tests/regressiontests/servers/fixtures/testdata.json
rename to tests/servers/fixtures/testdata.json
diff --git a/tests/regressiontests/servers/media/example_media_file.txt b/tests/servers/media/example_media_file.txt
similarity index 100%
rename from tests/regressiontests/servers/media/example_media_file.txt
rename to tests/servers/media/example_media_file.txt
diff --git a/tests/regressiontests/servers/models.py b/tests/servers/models.py
similarity index 100%
rename from tests/regressiontests/servers/models.py
rename to tests/servers/models.py
diff --git a/tests/regressiontests/servers/static/example_static_file.txt b/tests/servers/static/example_static_file.txt
similarity index 100%
rename from tests/regressiontests/servers/static/example_static_file.txt
rename to tests/servers/static/example_static_file.txt
diff --git a/tests/regressiontests/servers/tests.py b/tests/servers/tests.py
similarity index 98%
rename from tests/regressiontests/servers/tests.py
rename to tests/servers/tests.py
index 1a7552ed11..920149477c 100644
--- a/tests/regressiontests/servers/tests.py
+++ b/tests/servers/tests.py
@@ -30,7 +30,7 @@ TEST_SETTINGS = {
 
 
 class LiveServerBase(LiveServerTestCase):
-    urls = 'regressiontests.servers.urls'
+    urls = 'servers.urls'
     fixtures = ['testdata.json']
 
     @classmethod
@@ -96,6 +96,8 @@ class LiveServerAddress(LiveServerBase):
             raise Exception("The line above should have raised an exception")
         except exception:
             pass
+        finally:
+            super(LiveServerAddress, cls).tearDownClass()
 
     def test_test_test(self):
         # Intentionally empty method so that the test is picked up by the
diff --git a/tests/regressiontests/servers/urls.py b/tests/servers/urls.py
similarity index 100%
rename from tests/regressiontests/servers/urls.py
rename to tests/servers/urls.py
diff --git a/tests/regressiontests/servers/views.py b/tests/servers/views.py
similarity index 100%
rename from tests/regressiontests/servers/views.py
rename to tests/servers/views.py
diff --git a/tests/regressiontests/decorators/__init__.py b/tests/settings_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/decorators/__init__.py
rename to tests/settings_tests/__init__.py
diff --git a/tests/regressiontests/middleware_exceptions/models.py b/tests/settings_tests/models.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/models.py
rename to tests/settings_tests/models.py
diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/settings_tests/tests.py
similarity index 82%
rename from tests/regressiontests/settings_tests/tests.py
rename to tests/settings_tests/tests.py
index 68f620b5c9..97e43ff0eb 100644
--- a/tests/regressiontests/settings_tests/tests.py
+++ b/tests/settings_tests/tests.py
@@ -287,67 +287,3 @@ class SecureProxySslHeaderTest(TestCase):
         req = HttpRequest()
         req.META['HTTP_X_FORWARDED_PROTOCOL'] = 'https'
         self.assertEqual(req.is_secure(), True)
-
-class EnvironmentVariableTest(TestCase):
-    """
-    Ensures proper settings file is used in setup_environ if
-    DJANGO_SETTINGS_MODULE is set in the environment.
-    """
-    # Decide what to do with these tests when setup_environ() gets removed in Django 1.6
-    def setUp(self):
-        self.original_value = os.environ.get('DJANGO_SETTINGS_MODULE')
-        self.save_warnings_state()
-        warnings.filterwarnings('ignore', category=DeprecationWarning, module='django.core.management')
-
-    def tearDown(self):
-        self.restore_warnings_state()
-        if self.original_value:
-            os.environ['DJANGO_SETTINGS_MODULE'] = self.original_value
-        elif 'DJANGO_SETTINGS_MODULE' in os.environ:
-            del(os.environ['DJANGO_SETTINGS_MODULE'])
-
-    def test_env_var_used(self):
-        """
-        If the environment variable is set, do not ignore it. However, the
-        kwarg original_settings_path takes precedence.
-
-        This tests both plus the default (neither set).
-        """
-        from django.core.management import setup_environ
-
-        # whatever was already there
-        original_module =  os.environ.get(
-            'DJANGO_SETTINGS_MODULE',
-            'the default'
-        )
-
-        # environment variable set by user
-        user_override = 'custom.settings'
-
-        # optional argument to setup_environ
-        orig_path = 'original.path'
-
-        # expect default
-        setup_environ(global_settings)
-        self.assertEqual(
-            os.environ.get('DJANGO_SETTINGS_MODULE'),
-            original_module
-        )
-
-        # override with environment variable
-        os.environ['DJANGO_SETTINGS_MODULE'] = user_override
-        setup_environ(global_settings)
-
-        self.assertEqual(
-            os.environ.get('DJANGO_SETTINGS_MODULE'),
-            user_override
-        )
-
-        # pass in original_settings_path (should take precedence)
-        os.environ['DJANGO_SETTINGS_MODULE'] = user_override
-        setup_environ(global_settings, original_settings_path = orig_path)
-
-        self.assertEqual(
-            os.environ.get('DJANGO_SETTINGS_MODULE'),
-            orig_path
-        )
diff --git a/tests/regressiontests/defaultfilters/__init__.py b/tests/shared_models/__init__.py
similarity index 100%
rename from tests/regressiontests/defaultfilters/__init__.py
rename to tests/shared_models/__init__.py
diff --git a/tests/shared_models/models.py b/tests/shared_models/models.py
new file mode 100644
index 0000000000..145edad1bf
--- /dev/null
+++ b/tests/shared_models/models.py
@@ -0,0 +1,37 @@
+from __future__ import unicode_literals
+
+from django.db import models
+from django.utils import timezone
+from django.utils.encoding import python_2_unicode_compatible
+
+
+class Tag(models.Model):
+    name = models.CharField(max_length=255)
+
+
+@python_2_unicode_compatible
+class Author(models.Model):
+    name = models.CharField(max_length=100, help_text='Use both first and last names.',
+        unique=True)
+
+    class Meta:
+        ordering = ['name']
+
+    def __str__(self):
+        return self.name
+
+
+@python_2_unicode_compatible
+class Book(models.Model):
+    title = models.CharField(max_length=200)
+    pages = models.IntegerField(default=0)
+    author = models.ForeignKey(Author, null=True, blank=True)
+    pubdate = models.DateTimeField()
+    tags = models.ManyToManyField(Tag)
+
+    class Meta:
+        ordering = ['-pubdate', 'title']
+        unique_together = ['title', 'author']
+
+    def __str__(self):
+        return self.title
diff --git a/tests/regressiontests/defer_regress/__init__.py b/tests/signals/__init__.py
similarity index 100%
rename from tests/regressiontests/defer_regress/__init__.py
rename to tests/signals/__init__.py
diff --git a/tests/modeltests/signals/models.py b/tests/signals/models.py
similarity index 100%
rename from tests/modeltests/signals/models.py
rename to tests/signals/models.py
diff --git a/tests/modeltests/signals/tests.py b/tests/signals/tests.py
similarity index 100%
rename from tests/modeltests/signals/tests.py
rename to tests/signals/tests.py
diff --git a/tests/regressiontests/expressions_regress/__init__.py b/tests/signals_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/expressions_regress/__init__.py
rename to tests/signals_regress/__init__.py
diff --git a/tests/regressiontests/settings_tests/models.py b/tests/signals_regress/models.py
similarity index 100%
rename from tests/regressiontests/settings_tests/models.py
rename to tests/signals_regress/models.py
diff --git a/tests/regressiontests/signals_regress/tests.py b/tests/signals_regress/tests.py
similarity index 95%
rename from tests/regressiontests/signals_regress/tests.py
rename to tests/signals_regress/tests.py
index 8fb3ad5a48..b806d2116e 100644
--- a/tests/regressiontests/signals_regress/tests.py
+++ b/tests/signals_regress/tests.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import
 from django.db import models
 from django.test import TestCase
 
-from .models import Author, Book
+from shared_models.models import Author, Book
 
 
 class SignalsRegressTests(TestCase):
@@ -77,7 +77,7 @@ class SignalsRegressTests(TestCase):
             "Is created"
         ])
 
-        b1 = Book(name='Snow Crash')
+        b1 = Book(title='Snow Crash', pubdate='2012-02-02 12:00')
         self.assertEqual(self.get_signal_output(b1.save), [
             "pre_save signal, Snow Crash",
             "post_save signal, Snow Crash",
@@ -87,7 +87,7 @@ class SignalsRegressTests(TestCase):
     def test_m2m_signals(self):
         """ Assigning and removing to/from m2m shouldn't generate an m2m signal """
 
-        b1 = Book(name='Snow Crash')
+        b1 = Book(title='Snow Crash', pubdate='2012-02-02 12:00')
         self.get_signal_output(b1.save)
         a1 = Author(name='Neal Stephenson')
         self.get_signal_output(a1.save)
diff --git a/tests/regressiontests/extra_regress/__init__.py b/tests/signed_cookies_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/extra_regress/__init__.py
rename to tests/signed_cookies_tests/__init__.py
diff --git a/tests/regressiontests/middleware/models.py b/tests/signed_cookies_tests/models.py
similarity index 100%
rename from tests/regressiontests/middleware/models.py
rename to tests/signed_cookies_tests/models.py
diff --git a/tests/regressiontests/signed_cookies_tests/tests.py b/tests/signed_cookies_tests/tests.py
similarity index 100%
rename from tests/regressiontests/signed_cookies_tests/tests.py
rename to tests/signed_cookies_tests/tests.py
diff --git a/tests/regressiontests/file_uploads/__init__.py b/tests/signing/__init__.py
similarity index 100%
rename from tests/regressiontests/file_uploads/__init__.py
rename to tests/signing/__init__.py
diff --git a/tests/regressiontests/signed_cookies_tests/models.py b/tests/signing/models.py
similarity index 100%
rename from tests/regressiontests/signed_cookies_tests/models.py
rename to tests/signing/models.py
diff --git a/tests/regressiontests/signing/tests.py b/tests/signing/tests.py
similarity index 100%
rename from tests/regressiontests/signing/tests.py
rename to tests/signing/tests.py
diff --git a/tests/regressiontests/fixtures_regress/__init__.py b/tests/sites_framework/__init__.py
similarity index 100%
rename from tests/regressiontests/fixtures_regress/__init__.py
rename to tests/sites_framework/__init__.py
diff --git a/tests/regressiontests/sites_framework/models.py b/tests/sites_framework/models.py
similarity index 100%
rename from tests/regressiontests/sites_framework/models.py
rename to tests/sites_framework/models.py
diff --git a/tests/regressiontests/sites_framework/tests.py b/tests/sites_framework/tests.py
similarity index 100%
rename from tests/regressiontests/sites_framework/tests.py
rename to tests/sites_framework/tests.py
diff --git a/tests/regressiontests/forms/__init__.py b/tests/special_headers/__init__.py
similarity index 100%
rename from tests/regressiontests/forms/__init__.py
rename to tests/special_headers/__init__.py
diff --git a/tests/regressiontests/special_headers/fixtures/data.xml b/tests/special_headers/fixtures/data.xml
similarity index 100%
rename from tests/regressiontests/special_headers/fixtures/data.xml
rename to tests/special_headers/fixtures/data.xml
diff --git a/tests/regressiontests/special_headers/models.py b/tests/special_headers/models.py
similarity index 100%
rename from tests/regressiontests/special_headers/models.py
rename to tests/special_headers/models.py
diff --git a/tests/regressiontests/special_headers/templates/special_headers/article_detail.html b/tests/special_headers/templates/special_headers/article_detail.html
similarity index 100%
rename from tests/regressiontests/special_headers/templates/special_headers/article_detail.html
rename to tests/special_headers/templates/special_headers/article_detail.html
diff --git a/tests/regressiontests/special_headers/tests.py b/tests/special_headers/tests.py
similarity index 91%
rename from tests/regressiontests/special_headers/tests.py
rename to tests/special_headers/tests.py
index b890adbbad..b4b704ae21 100644
--- a/tests/regressiontests/special_headers/tests.py
+++ b/tests/special_headers/tests.py
@@ -6,7 +6,7 @@ from django.test.utils import override_settings
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class SpecialHeadersTest(TestCase):
     fixtures = ['data.xml']
-    urls = 'regressiontests.special_headers.urls'
+    urls = 'special_headers.urls'
 
     def test_xheaders(self):
         user = User.objects.get(username='super')
@@ -32,7 +32,7 @@ class SpecialHeadersTest(TestCase):
         self.client.login(username='super', password='secret')
         response = self.client.head('/special_headers/xview/func/')
         self.assertTrue('X-View' in response)
-        self.assertEqual(response['X-View'], 'regressiontests.special_headers.views.xview')
+        self.assertEqual(response['X-View'], 'special_headers.views.xview')
         user.is_staff = False
         user.save()
         response = self.client.head('/special_headers/xview/func/')
@@ -50,7 +50,7 @@ class SpecialHeadersTest(TestCase):
         self.client.login(username='super', password='secret')
         response = self.client.head('/special_headers/xview/class/')
         self.assertTrue('X-View' in response)
-        self.assertEqual(response['X-View'], 'regressiontests.special_headers.views.XViewClass')
+        self.assertEqual(response['X-View'], 'special_headers.views.XViewClass')
         user.is_staff = False
         user.save()
         response = self.client.head('/special_headers/xview/class/')
diff --git a/tests/regressiontests/special_headers/urls.py b/tests/special_headers/urls.py
similarity index 100%
rename from tests/regressiontests/special_headers/urls.py
rename to tests/special_headers/urls.py
diff --git a/tests/regressiontests/special_headers/views.py b/tests/special_headers/views.py
similarity index 100%
rename from tests/regressiontests/special_headers/views.py
rename to tests/special_headers/views.py
diff --git a/tests/regressiontests/generic_inline_admin/__init__.py b/tests/staticfiles_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/generic_inline_admin/__init__.py
rename to tests/staticfiles_tests/__init__.py
diff --git a/tests/regressiontests/generic_relations_regress/__init__.py b/tests/staticfiles_tests/apps/__init__.py
similarity index 100%
rename from tests/regressiontests/generic_relations_regress/__init__.py
rename to tests/staticfiles_tests/apps/__init__.py
diff --git a/tests/regressiontests/generic_views/__init__.py b/tests/staticfiles_tests/apps/no_label/__init__.py
similarity index 100%
rename from tests/regressiontests/generic_views/__init__.py
rename to tests/staticfiles_tests/apps/no_label/__init__.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/models.py b/tests/staticfiles_tests/apps/no_label/models.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/no_label/models.py
rename to tests/staticfiles_tests/apps/no_label/models.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/no_label/static/file2.txt b/tests/staticfiles_tests/apps/no_label/static/file2.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/no_label/static/file2.txt
rename to tests/staticfiles_tests/apps/no_label/static/file2.txt
diff --git a/tests/regressiontests/get_or_create_regress/__init__.py b/tests/staticfiles_tests/apps/test/__init__.py
similarity index 100%
rename from tests/regressiontests/get_or_create_regress/__init__.py
rename to tests/staticfiles_tests/apps/test/__init__.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/models.py b/tests/staticfiles_tests/apps/test/models.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/models.py
rename to tests/staticfiles_tests/apps/test/models.py
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/otherdir/odfile.txt b/tests/staticfiles_tests/apps/test/otherdir/odfile.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/otherdir/odfile.txt
rename to tests/staticfiles_tests/apps/test/otherdir/odfile.txt
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/CVS b/tests/staticfiles_tests/apps/test/static/test/CVS
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/CVS
rename to tests/staticfiles_tests/apps/test/static/test/CVS
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/file.txt b/tests/staticfiles_tests/apps/test/static/test/file.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/file.txt
rename to tests/staticfiles_tests/apps/test/static/test/file.txt
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/file1.txt b/tests/staticfiles_tests/apps/test/static/test/file1.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/file1.txt
rename to tests/staticfiles_tests/apps/test/static/test/file1.txt
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/nonascii.css b/tests/staticfiles_tests/apps/test/static/test/nonascii.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/nonascii.css
rename to tests/staticfiles_tests/apps/test/static/test/nonascii.css
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/test.ignoreme b/tests/staticfiles_tests/apps/test/static/test/test.ignoreme
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/test.ignoreme
rename to tests/staticfiles_tests/apps/test/static/test/test.ignoreme
diff --git a/tests/regressiontests/staticfiles_tests/apps/test/static/test/window.png b/tests/staticfiles_tests/apps/test/static/test/window.png
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/apps/test/static/test/window.png
rename to tests/staticfiles_tests/apps/test/static/test/window.png
diff --git a/tests/regressiontests/staticfiles_tests/models.py b/tests/staticfiles_tests/models.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/models.py
rename to tests/staticfiles_tests/models.py
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/absolute.css b/tests/staticfiles_tests/project/documents/cached/absolute.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/absolute.css
rename to tests/staticfiles_tests/project/documents/cached/absolute.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/fonts/font.eot b/tests/staticfiles_tests/project/documents/cached/css/fonts/font.eot
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/fonts/font.eot
rename to tests/staticfiles_tests/project/documents/cached/css/fonts/font.eot
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/fonts/font.svg b/tests/staticfiles_tests/project/documents/cached/css/fonts/font.svg
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/fonts/font.svg
rename to tests/staticfiles_tests/project/documents/cached/css/fonts/font.svg
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/fragments.css b/tests/staticfiles_tests/project/documents/cached/css/fragments.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/fragments.css
rename to tests/staticfiles_tests/project/documents/cached/css/fragments.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/ignored.css b/tests/staticfiles_tests/project/documents/cached/css/ignored.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/ignored.css
rename to tests/staticfiles_tests/project/documents/cached/css/ignored.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/img/window.png b/tests/staticfiles_tests/project/documents/cached/css/img/window.png
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/img/window.png
rename to tests/staticfiles_tests/project/documents/cached/css/img/window.png
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/css/window.css b/tests/staticfiles_tests/project/documents/cached/css/window.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/css/window.css
rename to tests/staticfiles_tests/project/documents/cached/css/window.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/denorm.css b/tests/staticfiles_tests/project/documents/cached/denorm.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/denorm.css
rename to tests/staticfiles_tests/project/documents/cached/denorm.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/img/relative.png b/tests/staticfiles_tests/project/documents/cached/img/relative.png
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/img/relative.png
rename to tests/staticfiles_tests/project/documents/cached/img/relative.png
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/import.css b/tests/staticfiles_tests/project/documents/cached/import.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/import.css
rename to tests/staticfiles_tests/project/documents/cached/import.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/other.css b/tests/staticfiles_tests/project/documents/cached/other.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/other.css
rename to tests/staticfiles_tests/project/documents/cached/other.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/relative.css b/tests/staticfiles_tests/project/documents/cached/relative.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/relative.css
rename to tests/staticfiles_tests/project/documents/cached/relative.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/styles.css b/tests/staticfiles_tests/project/documents/cached/styles.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/styles.css
rename to tests/staticfiles_tests/project/documents/cached/styles.css
diff --git a/tests/staticfiles_tests/project/documents/cached/styles_insensitive.css b/tests/staticfiles_tests/project/documents/cached/styles_insensitive.css
new file mode 100644
index 0000000000..57904ad415
--- /dev/null
+++ b/tests/staticfiles_tests/project/documents/cached/styles_insensitive.css
@@ -0,0 +1 @@
+@IMporT uRL("other.css");
\ No newline at end of file
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/url.css b/tests/staticfiles_tests/project/documents/cached/url.css
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/cached/url.css
rename to tests/staticfiles_tests/project/documents/cached/url.css
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/subdir/test.txt b/tests/staticfiles_tests/project/documents/subdir/test.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/subdir/test.txt
rename to tests/staticfiles_tests/project/documents/subdir/test.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/test.txt b/tests/staticfiles_tests/project/documents/test.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/test.txt
rename to tests/staticfiles_tests/project/documents/test.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/test/camelCase.txt b/tests/staticfiles_tests/project/documents/test/camelCase.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/test/camelCase.txt
rename to tests/staticfiles_tests/project/documents/test/camelCase.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/documents/test/file.txt b/tests/staticfiles_tests/project/documents/test/file.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/documents/test/file.txt
rename to tests/staticfiles_tests/project/documents/test/file.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/prefixed/test.txt b/tests/staticfiles_tests/project/prefixed/test.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/prefixed/test.txt
rename to tests/staticfiles_tests/project/prefixed/test.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/site_media/media/media-file.txt b/tests/staticfiles_tests/project/site_media/media/media-file.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/site_media/media/media-file.txt
rename to tests/staticfiles_tests/project/site_media/media/media-file.txt
diff --git a/tests/regressiontests/staticfiles_tests/project/site_media/static/testfile.txt b/tests/staticfiles_tests/project/site_media/static/testfile.txt
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/project/site_media/static/testfile.txt
rename to tests/staticfiles_tests/project/site_media/static/testfile.txt
diff --git a/tests/regressiontests/staticfiles_tests/storage.py b/tests/staticfiles_tests/storage.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/storage.py
rename to tests/staticfiles_tests/storage.py
diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py
similarity index 95%
rename from tests/regressiontests/staticfiles_tests/tests.py
rename to tests/staticfiles_tests/tests.py
index 90c8621d0b..0391b8b018 100644
--- a/tests/regressiontests/staticfiles_tests/tests.py
+++ b/tests/staticfiles_tests/tests.py
@@ -195,21 +195,33 @@ class TestFindStatic(CollectionTestCase, TestDefaults):
         call_command('findstatic', filepath, all=False, verbosity=0, stdout=out)
         out.seek(0)
         lines = [l.strip() for l in out.readlines()]
-        with codecs.open(force_text(lines[1].strip()), "r", "utf-8") as f:
+        with codecs.open(force_text(lines[0].strip()), "r", "utf-8") as f:
             return f.read()
 
     def test_all_files(self):
         """
-        Test that findstatic returns all candidate files if run without --first.
+        Test that findstatic returns all candidate files if run without --first and -v1.
         """
         out = six.StringIO()
-        call_command('findstatic', 'test/file.txt', verbosity=0, stdout=out)
+        call_command('findstatic', 'test/file.txt', verbosity=1, stdout=out)
         out.seek(0)
         lines = [l.strip() for l in out.readlines()]
         self.assertEqual(len(lines), 3)  # three because there is also the "Found <file> here" line
         self.assertIn('project', force_text(lines[1]))
         self.assertIn('apps', force_text(lines[2]))
 
+    def test_all_files_less_verbose(self):
+        """
+        Test that findstatic returns all candidate files if run without --first and -v0.
+        """
+        out = six.StringIO()
+        call_command('findstatic', 'test/file.txt', verbosity=0, stdout=out)
+        out.seek(0)
+        lines = [l.strip() for l in out.readlines()]
+        self.assertEqual(len(lines), 2)
+        self.assertIn('project', force_text(lines[0]))
+        self.assertIn('apps', force_text(lines[1]))
+
 
 class TestCollection(CollectionTestCase, TestDefaults):
     """
@@ -287,8 +299,8 @@ class TestCollectionFilesOverride(CollectionTestCase):
     Check for proper handling of apps order in INSTALLED_APPS even if file modification
     dates are in different order:
 
-        'regressiontests.staticfiles_tests.apps.test',
-        'regressiontests.staticfiles_tests.apps.no_label',
+        'staticfiles_tests.apps.test',
+        'staticfiles_tests.apps.no_label',
 
     """
     def setUp(self):
@@ -338,7 +350,7 @@ class TestCollectionFilesOverride(CollectionTestCase):
 
 
 @override_settings(
-    STATICFILES_STORAGE='regressiontests.staticfiles_tests.storage.DummyStorage',
+    STATICFILES_STORAGE='staticfiles_tests.storage.DummyStorage',
 )
 class TestCollectionNonLocalStorage(CollectionTestCase, TestNoFilesCreated):
     """
@@ -530,10 +542,18 @@ class TestCollectionCachedStorage(BaseCollectionTestCase,
         cache_validator.validate_key(cache_key)
         self.assertEqual(cache_key, 'staticfiles:821ea71ef36f95b3922a77f7364670e7')
 
+    def test_css_import_case_insensitive(self):
+        relpath = self.cached_file_path("cached/styles_insensitive.css")
+        self.assertEqual(relpath, "cached/styles_insensitive.2f0151cca872.css")
+        with storage.staticfiles_storage.open(relpath) as relfile:
+            content = relfile.read()
+            self.assertNotIn(b"cached/other.css", content)
+            self.assertIn(b"other.d41d8cd98f00.css", content)
+
 
 # we set DEBUG to False here since the template tag wouldn't work otherwise
 @override_settings(**dict(TEST_SETTINGS,
-    STATICFILES_STORAGE='regressiontests.staticfiles_tests.storage.SimpleCachedStaticFilesStorage',
+    STATICFILES_STORAGE='staticfiles_tests.storage.SimpleCachedStaticFilesStorage',
     DEBUG=False,
 ))
 class TestCollectionSimpleCachedStorage(BaseCollectionTestCase,
@@ -593,7 +613,7 @@ class TestServeStatic(StaticFilesTestCase):
     """
     Test static asset serving view.
     """
-    urls = 'regressiontests.staticfiles_tests.urls.default'
+    urls = 'staticfiles_tests.urls.default'
 
     def _response(self, filepath):
         return self.client.get(
@@ -630,7 +650,7 @@ class TestServeStaticWithURLHelper(TestServeStatic, TestDefaults):
     """
     Test static asset serving view with staticfiles_urlpatterns helper.
     """
-    urls = 'regressiontests.staticfiles_tests.urls.helper'
+    urls = 'staticfiles_tests.urls.helper'
 
 
 class TestServeAdminMedia(TestServeStatic):
diff --git a/tests/regressiontests/handlers/__init__.py b/tests/staticfiles_tests/urls/__init__.py
similarity index 100%
rename from tests/regressiontests/handlers/__init__.py
rename to tests/staticfiles_tests/urls/__init__.py
diff --git a/tests/regressiontests/staticfiles_tests/urls/default.py b/tests/staticfiles_tests/urls/default.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/urls/default.py
rename to tests/staticfiles_tests/urls/default.py
diff --git a/tests/regressiontests/staticfiles_tests/urls/helper.py b/tests/staticfiles_tests/urls/helper.py
similarity index 100%
rename from tests/regressiontests/staticfiles_tests/urls/helper.py
rename to tests/staticfiles_tests/urls/helper.py
diff --git a/tests/regressiontests/http_utils/__init__.py b/tests/str/__init__.py
similarity index 100%
rename from tests/regressiontests/http_utils/__init__.py
rename to tests/str/__init__.py
diff --git a/tests/modeltests/str/models.py b/tests/str/models.py
similarity index 100%
rename from tests/modeltests/str/models.py
rename to tests/str/models.py
diff --git a/tests/modeltests/str/tests.py b/tests/str/tests.py
similarity index 96%
rename from tests/modeltests/str/tests.py
rename to tests/str/tests.py
index 31869583aa..bd85c48d05 100644
--- a/tests/modeltests/str/tests.py
+++ b/tests/str/tests.py
@@ -28,7 +28,7 @@ class SimpleTests(TestCase):
             headline='Girl wins €12.500 in lottery',
             pub_date=datetime.datetime(2005, 7, 28)
         )
-        self.assertRaisesRegexp(RuntimeError, "Did you apply "
+        six.assertRaisesRegex(self, RuntimeError, "Did you apply "
             "@python_2_unicode_compatible without defining __str__\?", str, a)
 
     def test_international(self):
diff --git a/tests/regressiontests/httpwrappers/__init__.py b/tests/string_lookup/__init__.py
similarity index 100%
rename from tests/regressiontests/httpwrappers/__init__.py
rename to tests/string_lookup/__init__.py
diff --git a/tests/regressiontests/string_lookup/models.py b/tests/string_lookup/models.py
similarity index 100%
rename from tests/regressiontests/string_lookup/models.py
rename to tests/string_lookup/models.py
diff --git a/tests/regressiontests/string_lookup/tests.py b/tests/string_lookup/tests.py
similarity index 100%
rename from tests/regressiontests/string_lookup/tests.py
rename to tests/string_lookup/tests.py
diff --git a/tests/regressiontests/i18n/__init__.py b/tests/swappable_models/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/__init__.py
rename to tests/swappable_models/__init__.py
diff --git a/tests/regressiontests/swappable_models/models.py b/tests/swappable_models/models.py
similarity index 100%
rename from tests/regressiontests/swappable_models/models.py
rename to tests/swappable_models/models.py
diff --git a/tests/regressiontests/swappable_models/tests.py b/tests/swappable_models/tests.py
similarity index 82%
rename from tests/regressiontests/swappable_models/tests.py
rename to tests/swappable_models/tests.py
index 75644e32aa..d3d61341d2 100644
--- a/tests/regressiontests/swappable_models/tests.py
+++ b/tests/swappable_models/tests.py
@@ -9,6 +9,8 @@ from django.db.models.loading import cache
 from django.test import TestCase
 from django.test.utils import override_settings
 
+from swappable_models.models import Article
+
 
 class SwappableModelTests(TestCase):
     def setUp(self):
@@ -44,3 +46,13 @@ class SwappableModelTests(TestCase):
                        for ct in ContentType.objects.all()]
         self.assertIn(('swappable_models', 'alternatearticle'), apps_models)
         self.assertNotIn(('swappable_models', 'article'), apps_models)
+
+    @override_settings(TEST_ARTICLE_MODEL='swappable_models.article')
+    def test_case_insensitive(self):
+        "Model names are case insensitive. Check that model swapping honors this."
+        try:
+            Article.objects.all()
+        except AttributeError:
+            self.fail('Swappable model names should be case insensitive.')
+
+        self.assertIsNone(Article._meta.swapped)
diff --git a/tests/regressiontests/i18n/contenttypes/__init__.py b/tests/syndication/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/contenttypes/__init__.py
rename to tests/syndication/__init__.py
diff --git a/tests/regressiontests/syndication/feeds.py b/tests/syndication/feeds.py
similarity index 83%
rename from tests/regressiontests/syndication/feeds.py
rename to tests/syndication/feeds.py
index 04a67f4bdb..0956820bf0 100644
--- a/tests/regressiontests/syndication/feeds.py
+++ b/tests/syndication/feeds.py
@@ -42,6 +42,19 @@ class TestRss2Feed(views.Feed):
     item_copyright = 'Copyright (c) 2007, Sally Smith'
 
 
+class TestRss2FeedWithGuidIsPermaLinkTrue(TestRss2Feed):
+    def item_guid_is_permalink(self, item):
+        return True
+
+
+class TestRss2FeedWithGuidIsPermaLinkFalse(TestRss2Feed):
+    def item_guid(self, item):
+        return str(item.pk)
+
+    def item_guid_is_permalink(self, item):
+        return False
+
+
 class TestRss091Feed(TestRss2Feed):
     feed_type = feedgenerator.RssUserland091Feed
 
@@ -84,6 +97,19 @@ class TemplateFeed(TestRss2Feed):
         return "Not in a template"
 
 
+class TemplateContextFeed(TestRss2Feed):
+    """
+    A feed to test custom context data in templates for title or description.
+    """
+    title_template = 'syndication/title_context.html'
+    description_template = 'syndication/description_context.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(TemplateContextFeed, self).get_context_data(**kwargs)
+        context['foo'] = 'bar'
+        return context
+
+
 class NaiveDatesFeed(TestAtomFeed):
     """
     A feed with naive (non-timezone-aware) dates.
diff --git a/tests/regressiontests/syndication/fixtures/feeddata.json b/tests/syndication/fixtures/feeddata.json
similarity index 100%
rename from tests/regressiontests/syndication/fixtures/feeddata.json
rename to tests/syndication/fixtures/feeddata.json
diff --git a/tests/regressiontests/syndication/models.py b/tests/syndication/models.py
similarity index 100%
rename from tests/regressiontests/syndication/models.py
rename to tests/syndication/models.py
diff --git a/tests/regressiontests/syndication/templates/syndication/description.html b/tests/syndication/templates/syndication/description.html
similarity index 100%
rename from tests/regressiontests/syndication/templates/syndication/description.html
rename to tests/syndication/templates/syndication/description.html
diff --git a/tests/syndication/templates/syndication/description_context.html b/tests/syndication/templates/syndication/description_context.html
new file mode 100644
index 0000000000..319d84b1b0
--- /dev/null
+++ b/tests/syndication/templates/syndication/description_context.html
@@ -0,0 +1 @@
+{{ obj }} (foo is {{ foo }})
\ No newline at end of file
diff --git a/tests/regressiontests/syndication/templates/syndication/title.html b/tests/syndication/templates/syndication/title.html
similarity index 100%
rename from tests/regressiontests/syndication/templates/syndication/title.html
rename to tests/syndication/templates/syndication/title.html
diff --git a/tests/syndication/templates/syndication/title_context.html b/tests/syndication/templates/syndication/title_context.html
new file mode 100644
index 0000000000..319d84b1b0
--- /dev/null
+++ b/tests/syndication/templates/syndication/title_context.html
@@ -0,0 +1 @@
+{{ obj }} (foo is {{ foo }})
\ No newline at end of file
diff --git a/tests/regressiontests/syndication/tests.py b/tests/syndication/tests.py
similarity index 85%
rename from tests/regressiontests/syndication/tests.py
rename to tests/syndication/tests.py
index 10413b4ddd..1627f7182b 100644
--- a/tests/regressiontests/syndication/tests.py
+++ b/tests/syndication/tests.py
@@ -35,7 +35,7 @@ class SyndicationFeedTest(FeedTestCase):
     """
     Tests for the high-level syndication feed framework.
     """
-    urls = 'regressiontests.syndication.urls'
+    urls = 'syndication.urls'
 
     def test_rss2_feed(self):
         """
@@ -103,9 +103,43 @@ class SyndicationFeedTest(FeedTestCase):
             'author': 'test@example.com (Sally Smith)',
         })
         self.assertCategories(items[0], ['python', 'testing'])
-
         for item in items:
             self.assertChildNodes(item, ['title', 'link', 'description', 'guid', 'category', 'pubDate', 'author'])
+            # Assert that <guid> does not have any 'isPermaLink' attribute
+            self.assertIsNone(item.getElementsByTagName(
+                'guid')[0].attributes.get('isPermaLink'))
+
+    def test_rss2_feed_guid_permalink_false(self):
+        """
+        Test if the 'isPermaLink' attribute of <guid> element of an item
+        in the RSS feed is 'false'.
+        """
+        response = self.client.get(
+            '/syndication/rss2/guid_ispermalink_false/')
+        doc = minidom.parseString(response.content)
+        chan = doc.getElementsByTagName(
+            'rss')[0].getElementsByTagName('channel')[0]
+        items = chan.getElementsByTagName('item')
+        for item in items:
+            self.assertEqual(
+                item.getElementsByTagName('guid')[0].attributes.get(
+                    'isPermaLink').value, "false")
+
+    def test_rss2_feed_guid_permalink_true(self):
+        """
+        Test if the 'isPermaLink' attribute of <guid> element of an item
+        in the RSS feed is 'true'.
+        """
+        response = self.client.get(
+            '/syndication/rss2/guid_ispermalink_true/')
+        doc = minidom.parseString(response.content)
+        chan = doc.getElementsByTagName(
+            'rss')[0].getElementsByTagName('channel')[0]
+        items = chan.getElementsByTagName('item')
+        for item in items:
+            self.assertEqual(
+                item.getElementsByTagName('guid')[0].attributes.get(
+                    'isPermaLink').value, "true")
 
     def test_rss091_feed(self):
         """
@@ -289,6 +323,22 @@ class SyndicationFeedTest(FeedTestCase):
             'link': 'http://example.com/blog/1/',
         })
 
+    def test_template_context_feed(self):
+        """
+        Test that custom context data can be passed to templates for title
+        and description.
+        """
+        response = self.client.get('/syndication/template_context/')
+        doc = minidom.parseString(response.content)
+        feed = doc.getElementsByTagName('rss')[0]
+        chan = feed.getElementsByTagName('channel')[0]
+        items = chan.getElementsByTagName('item')
+
+        self.assertChildNodeContent(items[0], {
+            'title': 'My first entry (foo is bar)',
+            'description': 'My first entry (foo is bar)',
+        })
+
     def test_add_domain(self):
         """
         Test add_domain() prefixes domains onto the correct URLs.
diff --git a/tests/regressiontests/syndication/urls.py b/tests/syndication/urls.py
similarity index 73%
rename from tests/regressiontests/syndication/urls.py
rename to tests/syndication/urls.py
index 57f9d81a73..1dd7e92332 100644
--- a/tests/regressiontests/syndication/urls.py
+++ b/tests/syndication/urls.py
@@ -8,6 +8,10 @@ from . import feeds
 urlpatterns = patterns('django.contrib.syndication.views',
     (r'^syndication/complex/(?P<foo>.*)/$', feeds.ComplexFeed()),
     (r'^syndication/rss2/$', feeds.TestRss2Feed()),
+    (r'^syndication/rss2/guid_ispermalink_true/$',
+        feeds.TestRss2FeedWithGuidIsPermaLinkTrue()),
+    (r'^syndication/rss2/guid_ispermalink_false/$',
+        feeds.TestRss2FeedWithGuidIsPermaLinkFalse()),
     (r'^syndication/rss091/$', feeds.TestRss091Feed()),
     (r'^syndication/no_pubdate/$', feeds.TestNoPubdateFeed()),
     (r'^syndication/atom/$', feeds.TestAtomFeed()),
@@ -17,4 +21,5 @@ urlpatterns = patterns('django.contrib.syndication.views',
     (r'^syndication/feedurl/$', feeds.TestFeedUrlFeed()),
     (r'^syndication/articles/$', feeds.ArticlesFeed()),
     (r'^syndication/template/$', feeds.TemplateFeed()),
+    (r'^syndication/template_context/$', feeds.TemplateContextFeed()),
 )
diff --git a/tests/regressiontests/i18n/other/__init__.py b/tests/tablespaces/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/other/__init__.py
rename to tests/tablespaces/__init__.py
diff --git a/tests/modeltests/tablespaces/models.py b/tests/tablespaces/models.py
similarity index 100%
rename from tests/modeltests/tablespaces/models.py
rename to tests/tablespaces/models.py
diff --git a/tests/modeltests/tablespaces/tests.py b/tests/tablespaces/tests.py
similarity index 100%
rename from tests/modeltests/tablespaces/tests.py
rename to tests/tablespaces/tests.py
diff --git a/tests/regressiontests/i18n/other/locale/__init__.py b/tests/template_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/__init__.py
rename to tests/template_tests/__init__.py
diff --git a/tests/regressiontests/templates/alternate_urls.py b/tests/template_tests/alternate_urls.py
similarity index 100%
rename from tests/regressiontests/templates/alternate_urls.py
rename to tests/template_tests/alternate_urls.py
diff --git a/tests/regressiontests/templates/eggs/tagsegg.egg b/tests/template_tests/eggs/tagsegg.egg
similarity index 100%
rename from tests/regressiontests/templates/eggs/tagsegg.egg
rename to tests/template_tests/eggs/tagsegg.egg
diff --git a/tests/regressiontests/templates/filters.py b/tests/template_tests/filters.py
similarity index 100%
rename from tests/regressiontests/templates/filters.py
rename to tests/template_tests/filters.py
diff --git a/tests/regressiontests/templates/loaders.py b/tests/template_tests/loaders.py
similarity index 100%
rename from tests/regressiontests/templates/loaders.py
rename to tests/template_tests/loaders.py
diff --git a/tests/regressiontests/templates/models.py b/tests/template_tests/models.py
similarity index 100%
rename from tests/regressiontests/templates/models.py
rename to tests/template_tests/models.py
diff --git a/tests/regressiontests/templates/templates/broken_base.html b/tests/template_tests/templates/broken_base.html
similarity index 100%
rename from tests/regressiontests/templates/templates/broken_base.html
rename to tests/template_tests/templates/broken_base.html
diff --git a/tests/regressiontests/templates/templates/first/test.html b/tests/template_tests/templates/first/test.html
similarity index 100%
rename from tests/regressiontests/templates/templates/first/test.html
rename to tests/template_tests/templates/first/test.html
diff --git a/tests/regressiontests/templates/templates/inclusion.html b/tests/template_tests/templates/inclusion.html
similarity index 100%
rename from tests/regressiontests/templates/templates/inclusion.html
rename to tests/template_tests/templates/inclusion.html
diff --git a/tests/regressiontests/templates/templates/response.html b/tests/template_tests/templates/response.html
similarity index 100%
rename from tests/regressiontests/templates/templates/response.html
rename to tests/template_tests/templates/response.html
diff --git a/tests/regressiontests/templates/templates/second/test.html b/tests/template_tests/templates/second/test.html
similarity index 100%
rename from tests/regressiontests/templates/templates/second/test.html
rename to tests/template_tests/templates/second/test.html
diff --git a/tests/regressiontests/templates/templates/ssi include with spaces.html b/tests/template_tests/templates/ssi include with spaces.html
similarity index 100%
rename from tests/regressiontests/templates/templates/ssi include with spaces.html
rename to tests/template_tests/templates/ssi include with spaces.html
diff --git a/tests/regressiontests/templates/templates/ssi_include.html b/tests/template_tests/templates/ssi_include.html
similarity index 100%
rename from tests/regressiontests/templates/templates/ssi_include.html
rename to tests/template_tests/templates/ssi_include.html
diff --git a/tests/regressiontests/templates/templates/test_context.html b/tests/template_tests/templates/test_context.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_context.html
rename to tests/template_tests/templates/test_context.html
diff --git a/tests/regressiontests/templates/templates/test_extends_error.html b/tests/template_tests/templates/test_extends_error.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_extends_error.html
rename to tests/template_tests/templates/test_extends_error.html
diff --git a/tests/regressiontests/templates/templates/test_incl_tag_current_app.html b/tests/template_tests/templates/test_incl_tag_current_app.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_incl_tag_current_app.html
rename to tests/template_tests/templates/test_incl_tag_current_app.html
diff --git a/tests/regressiontests/templates/templates/test_incl_tag_use_l10n.html b/tests/template_tests/templates/test_incl_tag_use_l10n.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_incl_tag_use_l10n.html
rename to tests/template_tests/templates/test_incl_tag_use_l10n.html
diff --git a/tests/regressiontests/templates/templates/test_include_error.html b/tests/template_tests/templates/test_include_error.html
similarity index 100%
rename from tests/regressiontests/templates/templates/test_include_error.html
rename to tests/template_tests/templates/test_include_error.html
diff --git a/tests/regressiontests/i18n/other/locale/de/__init__.py b/tests/template_tests/templatetags/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/other/locale/de/__init__.py
rename to tests/template_tests/templatetags/__init__.py
diff --git a/tests/regressiontests/templates/templatetags/bad_tag.py b/tests/template_tests/templatetags/bad_tag.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/bad_tag.py
rename to tests/template_tests/templatetags/bad_tag.py
diff --git a/tests/regressiontests/templates/templatetags/broken_tag.py b/tests/template_tests/templatetags/broken_tag.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/broken_tag.py
rename to tests/template_tests/templatetags/broken_tag.py
diff --git a/tests/regressiontests/templates/templatetags/custom.py b/tests/template_tests/templatetags/custom.py
similarity index 98%
rename from tests/regressiontests/templates/templatetags/custom.py
rename to tests/template_tests/templatetags/custom.py
index 3f51353880..32035ab59e 100644
--- a/tests/regressiontests/templates/templatetags/custom.py
+++ b/tests/template_tests/templatetags/custom.py
@@ -12,6 +12,13 @@ register = template.Library()
 def trim(value, num):
     return value[:num]
 
+@register.filter
+def noop(value, param=None):
+    """A noop filter that always return its first argument and does nothing with
+    its second (optional) one.
+    Useful for testing out whitespace in filter arguments (see #19882)."""
+    return value
+
 @register.simple_tag
 def no_params():
     """Expected no_params __doc__"""
diff --git a/tests/regressiontests/i18n/patterns/__init__.py b/tests/template_tests/templatetags/subpackage/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/__init__.py
rename to tests/template_tests/templatetags/subpackage/__init__.py
diff --git a/tests/regressiontests/templates/templatetags/subpackage/echo.py b/tests/template_tests/templatetags/subpackage/echo.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/subpackage/echo.py
rename to tests/template_tests/templatetags/subpackage/echo.py
diff --git a/tests/regressiontests/templates/templatetags/subpackage/echo_invalid.py b/tests/template_tests/templatetags/subpackage/echo_invalid.py
similarity index 100%
rename from tests/regressiontests/templates/templatetags/subpackage/echo_invalid.py
rename to tests/template_tests/templatetags/subpackage/echo_invalid.py
diff --git a/tests/regressiontests/templates/callables.py b/tests/template_tests/test_callables.py
similarity index 100%
rename from tests/regressiontests/templates/callables.py
rename to tests/template_tests/test_callables.py
diff --git a/tests/regressiontests/templates/context.py b/tests/template_tests/test_context.py
similarity index 100%
rename from tests/regressiontests/templates/context.py
rename to tests/template_tests/test_context.py
diff --git a/tests/regressiontests/templates/custom.py b/tests/template_tests/test_custom.py
similarity index 100%
rename from tests/regressiontests/templates/custom.py
rename to tests/template_tests/test_custom.py
diff --git a/tests/regressiontests/templates/nodelist.py b/tests/template_tests/test_nodelist.py
similarity index 100%
rename from tests/regressiontests/templates/nodelist.py
rename to tests/template_tests/test_nodelist.py
diff --git a/tests/regressiontests/templates/parser.py b/tests/template_tests/test_parser.py
similarity index 85%
rename from tests/regressiontests/templates/parser.py
rename to tests/template_tests/test_parser.py
index 6c9deee9ff..9422da80d7 100644
--- a/tests/regressiontests/templates/parser.py
+++ b/tests/template_tests/test_parser.py
@@ -4,8 +4,10 @@ Testing some internals of the template processing. These are *not* examples to b
 from __future__ import unicode_literals
 
 from django.template import (TokenParser, FilterExpression, Parser, Variable,
-    TemplateSyntaxError)
+    Template, TemplateSyntaxError)
+from django.test.utils import override_settings
 from django.utils.unittest import TestCase
+from django.utils import six
 
 
 class ParserTests(TestCase):
@@ -83,3 +85,11 @@ class ParserTests(TestCase):
         self.assertRaises(TemplateSyntaxError,
             Variable, "article._hidden"
         )
+
+    @override_settings(DEBUG=True, TEMPLATE_DEBUG=True)
+    def test_compile_filter_error(self):
+        # regression test for #19819
+        msg = "Could not parse the remainder: '@bar' from 'foo@bar'"
+        with six.assertRaisesRegex(self, TemplateSyntaxError, msg) as cm:
+            Template("{% if 1 %}{{ foo@bar }}{% endif %}")
+        self.assertEqual(cm.exception.django_template_source[1], (10, 23))
diff --git a/tests/regressiontests/templates/response.py b/tests/template_tests/test_response.py
similarity index 97%
rename from tests/regressiontests/templates/response.py
rename to tests/template_tests/test_response.py
index c4da50af6b..6acc45626f 100644
--- a/tests/regressiontests/templates/response.py
+++ b/tests/template_tests/test_response.py
@@ -15,13 +15,13 @@ from django.utils._os import upath
 
 def test_processor(request):
     return {'processors': 'yes'}
-test_processor_name = 'regressiontests.templates.response.test_processor'
+test_processor_name = 'template_tests.test_response.test_processor'
 
 
 # A test middleware that installs a temporary URLConf
 class CustomURLConfMiddleware(object):
     def process_request(self, request):
-        request.urlconf = 'regressiontests.templates.alternate_urls'
+        request.urlconf = 'template_tests.alternate_urls'
 
 
 class SimpleTemplateResponseTest(TestCase):
@@ -298,12 +298,12 @@ class TemplateResponseTest(TestCase):
 
 
 class CustomURLConfTest(TestCase):
-    urls = 'regressiontests.templates.urls'
+    urls = 'template_tests.urls'
 
     def setUp(self):
         self.old_MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES
         settings.MIDDLEWARE_CLASSES = list(settings.MIDDLEWARE_CLASSES) + [
-            'regressiontests.templates.response.CustomURLConfMiddleware'
+            'template_tests.test_response.CustomURLConfMiddleware'
         ]
 
     def tearDown(self):
@@ -316,7 +316,7 @@ class CustomURLConfTest(TestCase):
 
 
 class CacheMiddlewareTest(TestCase):
-    urls = 'regressiontests.templates.alternate_urls'
+    urls = 'template_tests.alternate_urls'
 
     def setUp(self):
         self.old_MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES
diff --git a/tests/regressiontests/templates/smartif.py b/tests/template_tests/test_smartif.py
similarity index 100%
rename from tests/regressiontests/templates/smartif.py
rename to tests/template_tests/test_smartif.py
diff --git a/tests/regressiontests/templates/unicode.py b/tests/template_tests/test_unicode.py
similarity index 100%
rename from tests/regressiontests/templates/unicode.py
rename to tests/template_tests/test_unicode.py
diff --git a/tests/regressiontests/templates/tests.py b/tests/template_tests/tests.py
similarity index 91%
rename from tests/regressiontests/templates/tests.py
rename to tests/template_tests/tests.py
index d21434a12e..da1562d2d5 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/template_tests/tests.py
@@ -17,12 +17,12 @@ try:
     from urllib.parse import urljoin
 except ImportError:     # Python 2
     from urlparse import urljoin
+import warnings
 
 from django import template
-from django.template import (base as template_base, Context, RequestContext,
-    Template)
 from django.core import urlresolvers
-from django.template import loader
+from django.template import (base as template_base, loader, Context,
+    RequestContext, Template, TemplateSyntaxError)
 from django.template.loaders import app_directories, filesystem, cached
 from django.test import RequestFactory, TestCase
 from django.test.utils import (setup_test_template_loader,
@@ -36,14 +36,14 @@ from django.utils.safestring import mark_safe
 from django.utils import six
 from django.utils.tzinfo import LocalTimezone
 
-from .callables import CallableVariablesTests
-from .context import ContextTests
-from .custom import CustomTagTests, CustomFilterTests
-from .parser import ParserTests
-from .unicode import UnicodeTests
-from .nodelist import NodelistTest, ErrorIndexTest
-from .smartif import SmartIfTests
-from .response import (TemplateResponseTest, CacheMiddlewareTest,
+from .test_callables import CallableVariablesTests
+from .test_context import ContextTests
+from .test_custom import CustomTagTests, CustomFilterTests
+from .test_parser import ParserTests
+from .test_unicode import UnicodeTests
+from .test_nodelist import NodelistTest, ErrorIndexTest
+from .test_smartif import SmartIfTests
+from .test_response import (TemplateResponseTest, CacheMiddlewareTest,
     SimpleTemplateResponseTest, CustomURLConfTest)
 
 try:
@@ -54,6 +54,12 @@ except ImportError as e:
     else:
         raise
 
+# NumPy installed?
+try:
+    import numpy
+except ImportError:
+    numpy = False
+
 from . import filters
 
 #################################
@@ -359,24 +365,38 @@ class Templates(TestCase):
     @override_settings(SETTINGS_MODULE=None, TEMPLATE_DEBUG=True)
     def test_url_reverse_no_settings_module(self):
         # Regression test for #9005
-        from django.template import Template, Context
-
         t = Template('{% url will_not_match %}')
         c = Context()
         with self.assertRaises(urlresolvers.NoReverseMatch):
             t.render(c)
 
+    @override_settings(TEMPLATE_STRING_IF_INVALID='%s is invalid', SETTINGS_MODULE='also_something')
+    def test_url_reverse_view_name(self):
+        # Regression test for #19827
+        t = Template('{% url will_not_match %}')
+        c = Context()
+        try:
+            t.render(c)
+        except urlresolvers.NoReverseMatch:
+            tb = sys.exc_info()[2]
+            depth = 0
+            while tb.tb_next is not None:
+                tb = tb.tb_next
+                depth += 1
+            self.assertTrue(depth > 5,
+                "The traceback context was lost when reraising the traceback. See #19827")
+
     def test_url_explicit_exception_for_old_syntax_at_run_time(self):
         # Regression test for #19280
         t = Template('{% url path.to.view %}')      # not quoted = old syntax
         c = Context()
-        with self.assertRaisesRegexp(urlresolvers.NoReverseMatch,
+        with six.assertRaisesRegex(self, urlresolvers.NoReverseMatch,
                 "The syntax changed in Django 1.5, see the docs."):
             t.render(c)
 
     def test_url_explicit_exception_for_old_syntax_at_compile_time(self):
         # Regression test for #19392
-        with self.assertRaisesRegexp(template.TemplateSyntaxError,
+        with six.assertRaisesRegex(self, template.TemplateSyntaxError,
                 "The syntax of 'url' changed in Django 1.5, see the docs."):
             t = Template('{% url my-view %}')      # not a variable = old syntax
 
@@ -395,12 +415,44 @@ class Templates(TestCase):
 
     def test_invalid_block_suggestion(self):
         # See #7876
-        from django.template import Template, TemplateSyntaxError
         try:
             t = Template("{% if 1 %}lala{% endblock %}{% endif %}")
         except TemplateSyntaxError as e:
             self.assertEqual(e.args[0], "Invalid block tag: 'endblock', expected 'elif', 'else' or 'endif'")
 
+    def test_ifchanged_concurrency(self):
+        # Tests for #15849
+        template = Template('[0{% for x in foo %},{% with var=get_value %}{% ifchanged %}{{ var }}{% endifchanged %}{% endwith %}{% endfor %}]')
+
+        # Using generator to mimic concurrency.
+        # The generator is not passed to the 'for' loop, because it does a list(values)
+        # instead, call gen.next() in the template to control the generator.
+        def gen():
+            yield 1
+            yield 2
+            # Simulate that another thread is now rendering.
+            # When the IfChangeNode stores state at 'self' it stays at '3' and skip the last yielded value below.
+            iter2 = iter([1, 2, 3])
+            output2 = template.render(Context({'foo': range(3), 'get_value': lambda: next(iter2)}))
+            self.assertEqual(output2, '[0,1,2,3]', 'Expected [0,1,2,3] in second parallel template, got {0}'.format(output2))
+            yield 3
+
+        gen1 = gen()
+        output1 = template.render(Context({'foo': range(3), 'get_value': lambda: next(gen1)}))
+        self.assertEqual(output1, '[0,1,2,3]', 'Expected [0,1,2,3] in first template, got {0}'.format(output1))
+
+    def test_cache_regression_20130(self):
+        t = Template('{% load cache %}{% cache 1 regression_20130 %}foo{% endcache %}')
+        cachenode = t.nodelist[1]
+        self.assertEqual(cachenode.fragment_name, 'regression_20130')
+
+    def test_ifchanged_render_once(self):
+        """ Test for ticket #19890. The content of ifchanged template tag was
+        rendered twice."""
+        template = Template('{% load cycle from future %}{% ifchanged %}{% cycle "1st time" "2nd time" %}{% endifchanged %}')
+        output = template.render(Context({}))
+        self.assertEqual(output, '1st time')
+
     def test_templates(self):
         template_tests = self.get_template_tests()
         filter_tests = filters.get_filter_tests()
@@ -435,7 +487,7 @@ class Templates(TestCase):
 
         # Warm the URL reversing cache. This ensures we don't pay the cost
         # warming the cache during one of the tests.
-        urlresolvers.reverse('regressiontests.templates.views.client_action',
+        urlresolvers.reverse('template_tests.views.client_action',
                              kwargs={'id':0,'action':"update"})
 
         for name, vals in tests:
@@ -473,7 +525,10 @@ class Templates(TestCase):
                 for is_cached in (False, True):
                     try:
                         try:
-                            test_template = loader.get_template(name)
+                            with warnings.catch_warnings():
+                                # Ignore pending deprecations of the old syntax of the 'cycle' and 'firstof' tags.
+                                warnings.filterwarnings("ignore", category=PendingDeprecationWarning, module='django.template.base')
+                                test_template = loader.get_template(name)
                         except ShouldNotExecuteException:
                             failures.append("Template test (Cached='%s', TEMPLATE_STRING_IF_INVALID='%s', TEMPLATE_DEBUG=%s): %s -- FAILED. Template loading invoked method that shouldn't have been invoked." % (is_cached, invalid_str, template_debug, name))
 
@@ -767,6 +822,11 @@ class Templates(TestCase):
             'cycle23': ("{% for x in values %}{% cycle 'a' 'b' 'c' as abc silent %}{{ abc }}{{ x }}{% endfor %}", {'values': [1,2,3,4]}, "a1b2c3a4"),
             'included-cycle': ('{{ abc }}', {'abc': 'xxx'}, 'xxx'),
             'cycle24': ("{% for x in values %}{% cycle 'a' 'b' 'c' as abc silent %}{% include 'included-cycle' %}{% endfor %}", {'values': [1,2,3,4]}, "abca"),
+            'cycle25': ('{% cycle a as abc %}', {'a': '<'}, '<'),
+
+            'cycle26': ('{% load cycle from future %}{% cycle a b as ab %}{% cycle ab %}', {'a': '<', 'b': '>'}, '&lt;&gt;'),
+            'cycle27': ('{% load cycle from future %}{% autoescape off %}{% cycle a b as ab %}{% cycle ab %}{% endautoescape %}', {'a': '<', 'b': '>'}, '<>'),
+            'cycle28': ('{% load cycle from future %}{% cycle a|safe b as ab %}{% cycle ab %}', {'a': '<', 'b': '>'}, '<&gt;'),
 
             ### EXCEPTIONS ############################################################
 
@@ -798,7 +858,12 @@ class Templates(TestCase):
             'firstof07': ('{% firstof a b "c" %}', {'a':0}, 'c'),
             'firstof08': ('{% firstof a b "c and d" %}', {'a':0,'b':0}, 'c and d'),
             'firstof09': ('{% firstof %}', {}, template.TemplateSyntaxError),
-            'firstof10': ('{% firstof a %}', {'a': '<'}, '<'), # Variables are NOT auto-escaped.
+            'firstof10': ('{% firstof a %}', {'a': '<'}, '<'),
+
+            'firstof11': ('{% load firstof from future %}{% firstof a b %}', {'a': '<', 'b': '>'}, '&lt;'),
+            'firstof12': ('{% load firstof from future %}{% firstof a b %}', {'a': '', 'b': '>'}, '&gt;'),
+            'firstof13': ('{% load firstof from future %}{% autoescape off %}{% firstof a %}{% endautoescape %}', {'a': '<'}, '<'),
+            'firstof14': ('{% load firstof from future %}{% firstof a|safe b %}', {'a': '<'}, '<'),
 
             ### FOR TAG ###############################################################
             'for-tag01': ("{% for val in values %}{{ val }}{% endfor %}", {"values": [1, 2, 3]}, "123"),
@@ -827,6 +892,8 @@ class Templates(TestCase):
             'for-tag-empty01': ("{% for val in values %}{{ val }}{% empty %}empty text{% endfor %}", {"values": [1, 2, 3]}, "123"),
             'for-tag-empty02': ("{% for val in values %}{{ val }}{% empty %}values array empty{% endfor %}", {"values": []}, "values array empty"),
             'for-tag-empty03': ("{% for val in values %}{{ val }}{% empty %}values array not found{% endfor %}", {}, "values array not found"),
+            # Ticket 19882
+            'for-tag-filter-ws': ("{% load custom %}{% for x in s|noop:'x y' %}{{ x }}{% endfor %}", {'s': 'abc'}, 'abc'),
 
             ### IF TAG ################################################################
             'if-tag01': ("{% if foo %}yes{% else %}no{% endif %}", {"foo": True}, "yes"),
@@ -995,6 +1062,9 @@ class Templates(TestCase):
 
             'ifchanged-else04': ('{% for id in ids %}{% ifchanged %}***{{ id }}*{% else %}...{% endifchanged %}{{ forloop.counter }}{% endfor %}', {'ids': [1,1,2,2,2,3,4]}, '***1*1...2***2*3...4...5***3*6***4*7'),
 
+            # Test whitespace in filter arguments
+            'ifchanged-filter-ws': ('{% load custom %}{% for n in num %}{% ifchanged n|noop:"x y" %}..{% endifchanged %}{{ n }}{% endfor %}', {'num': (1,2,3)}, '..1..2..3'),
+
             ### IFEQUAL TAG ###########################################################
             'ifequal01': ("{% ifequal a b %}yes{% endifequal %}", {"a": 1, "b": 2}, ""),
             'ifequal02': ("{% ifequal a b %}yes{% endifequal %}", {"a": 1, "b": 1}, "yes"),
@@ -1327,7 +1397,10 @@ class Templates(TestCase):
             'i18n33': ('{% load i18n %}{{ langcode|language_name }} {{ langcode|language_name_local }} {{ langcode|language_bidi }}', {'langcode': 'nl'}, 'Dutch Nederlands False'),
 
             # blocktrans handling of variables which are not in the context.
-            'i18n34': ('{% load i18n %}{% blocktrans %}{{ missing }}{% endblocktrans %}', {}, ''),
+            # this should work as if blocktrans was not there (bug #19915)
+            'i18n34': ('{% load i18n %}{% blocktrans %}{{ missing }}{% endblocktrans %}', {}, ('', 'INVALID')),
+            'i18n34_2': ("{% load i18n %}{% blocktrans with a='α' %}{{ missing }}{% endblocktrans %}", {}, ('', 'INVALID')),
+            'i18n34_3': ('{% load i18n %}{% blocktrans with a=anton %}{{ missing }}{% endblocktrans %}', {'anton': 'α'}, ('', 'INVALID')),
 
             # trans tag with as var
             'i18n35': ('{% load i18n %}{% trans "Page not found" as page_not_found %}{{ page_not_found }}', {'LANGUAGE_CODE': 'de'}, "Seite nicht gefunden"),
@@ -1335,6 +1408,10 @@ class Templates(TestCase):
             'i18n36': ('{% load i18n %}{% trans "Page not found" as page_not_found noop %}{{ page_not_found }}', {'LANGUAGE_CODE': 'de'}, "Page not found"),
             'i18n37': ('{% load i18n %}{% trans "Page not found" as page_not_found %}{% blocktrans %}Error: {{ page_not_found }}{% endblocktrans %}', {'LANGUAGE_CODE': 'de'}, "Error: Seite nicht gefunden"),
 
+            # Test whitespace in filter arguments
+            'i18n38': ('{% load i18n custom %}{% get_language_info for "de"|noop:"x y" as l %}{{ l.code }}: {{ l.name }}/{{ l.name_local }} bidi={{ l.bidi }}', {}, 'de: German/Deutsch bidi=False'),
+            'i18n38_2': ('{% load i18n custom %}{% get_language_info_list for langcodes|noop:"x y" as langs %}{% for l in langs %}{{ l.code }}: {{ l.name }}/{{ l.name_local }} bidi={{ l.bidi }}; {% endfor %}', {'langcodes': ['it', 'no']}, 'it: Italian/italiano bidi=False; no: Norwegian/norsk bidi=False; '),
+
             ### HANDLING OF TEMPLATE_STRING_IF_INVALID ###################################
 
             'invalidstr01': ('{{ var|default:"Foo" }}', {}, ('Foo','INVALID')),
@@ -1416,6 +1493,16 @@ class Templates(TestCase):
                                     {'foo': 'z', 'bar': ['a', 'd']}]},
                           'abc:xy,ad:z,'),
 
+            # Test syntax
+            'regroup05': ('{% regroup data by bar as %}', {},
+                           template.TemplateSyntaxError),
+            'regroup06': ('{% regroup data by bar thisaintright grouped %}', {},
+                           template.TemplateSyntaxError),
+            'regroup07': ('{% regroup data thisaintright bar as grouped %}', {},
+                           template.TemplateSyntaxError),
+            'regroup08': ('{% regroup data by bar as grouped toomanyargs %}', {},
+                           template.TemplateSyntaxError),
+
             ### SSI TAG ########################################################
 
             # Test normal behavior
@@ -1484,6 +1571,9 @@ class Templates(TestCase):
             'widthratio14a': ('{% widthratio a b c %}', {'a':0,'b':100,'c':'c'}, template.TemplateSyntaxError),
             'widthratio14b': ('{% widthratio a b c %}', {'a':0,'b':100,'c':None}, template.TemplateSyntaxError),
 
+            # Test whitespace in filter argument
+            'widthratio15': ('{% load custom %}{% widthratio a|noop:"x y" b 0 %}', {'a':50,'b':100}, '0'),
+
             ### WITH TAG ########################################################
             'with01': ('{% with key=dict.key %}{{ key }}{% endwith %}', {'dict': {'key': 50}}, '50'),
             'legacywith01': ('{% with dict.key as key %}{{ key }}{% endwith %}', {'dict': {'key': 50}}, '50'),
@@ -1513,33 +1603,33 @@ class Templates(TestCase):
 
             ### URL TAG ########################################################
             # Successes
-            'url01': ('{% url "regressiontests.templates.views.client" client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'),
-            'url02': ('{% url "regressiontests.templates.views.client_action" id=client.id action="update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'),
-            'url02a': ('{% url "regressiontests.templates.views.client_action" client.id "update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'),
-            'url02b': ("{% url 'regressiontests.templates.views.client_action' id=client.id action='update' %}", {'client': {'id': 1}}, '/url_tag/client/1/update/'),
-            'url02c': ("{% url 'regressiontests.templates.views.client_action' client.id 'update' %}", {'client': {'id': 1}}, '/url_tag/client/1/update/'),
-            'url03': ('{% url "regressiontests.templates.views.index" %}', {}, '/url_tag/'),
+            'url01': ('{% url "template_tests.views.client" client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'),
+            'url02': ('{% url "template_tests.views.client_action" id=client.id action="update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'),
+            'url02a': ('{% url "template_tests.views.client_action" client.id "update" %}', {'client': {'id': 1}}, '/url_tag/client/1/update/'),
+            'url02b': ("{% url 'template_tests.views.client_action' id=client.id action='update' %}", {'client': {'id': 1}}, '/url_tag/client/1/update/'),
+            'url02c': ("{% url 'template_tests.views.client_action' client.id 'update' %}", {'client': {'id': 1}}, '/url_tag/client/1/update/'),
+            'url03': ('{% url "template_tests.views.index" %}', {}, '/url_tag/'),
             'url04': ('{% url "named.client" client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'),
             'url05': ('{% url "метка_оператора" v %}', {'v': 'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
             'url06': ('{% url "метка_оператора_2" tag=v %}', {'v': 'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
-            'url07': ('{% url "regressiontests.templates.views.client2" tag=v %}', {'v': 'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
+            'url07': ('{% url "template_tests.views.client2" tag=v %}', {'v': 'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
             'url08': ('{% url "метка_оператора" v %}', {'v': 'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
             'url09': ('{% url "метка_оператора_2" tag=v %}', {'v': 'Ω'}, '/url_tag/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4/%CE%A9/'),
-            'url10': ('{% url "regressiontests.templates.views.client_action" id=client.id action="two words" %}', {'client': {'id': 1}}, '/url_tag/client/1/two%20words/'),
-            'url11': ('{% url "regressiontests.templates.views.client_action" id=client.id action="==" %}', {'client': {'id': 1}}, '/url_tag/client/1/==/'),
-            'url12': ('{% url "regressiontests.templates.views.client_action" id=client.id action="," %}', {'client': {'id': 1}}, '/url_tag/client/1/,/'),
-            'url13': ('{% url "regressiontests.templates.views.client_action" id=client.id action=arg|join:"-" %}', {'client': {'id': 1}, 'arg':['a','b']}, '/url_tag/client/1/a-b/'),
-            'url14': ('{% url "regressiontests.templates.views.client_action" client.id arg|join:"-" %}', {'client': {'id': 1}, 'arg':['a','b']}, '/url_tag/client/1/a-b/'),
-            'url15': ('{% url "regressiontests.templates.views.client_action" 12 "test" %}', {}, '/url_tag/client/12/test/'),
-            'url18': ('{% url "regressiontests.templates.views.client" "1,2" %}', {}, '/url_tag/client/1,2/'),
+            'url10': ('{% url "template_tests.views.client_action" id=client.id action="two words" %}', {'client': {'id': 1}}, '/url_tag/client/1/two%20words/'),
+            'url11': ('{% url "template_tests.views.client_action" id=client.id action="==" %}', {'client': {'id': 1}}, '/url_tag/client/1/%3D%3D/'),
+            'url12': ('{% url "template_tests.views.client_action" id=client.id action="," %}', {'client': {'id': 1}}, '/url_tag/client/1/%2C/'),
+            'url13': ('{% url "template_tests.views.client_action" id=client.id action=arg|join:"-" %}', {'client': {'id': 1}, 'arg':['a','b']}, '/url_tag/client/1/a-b/'),
+            'url14': ('{% url "template_tests.views.client_action" client.id arg|join:"-" %}', {'client': {'id': 1}, 'arg':['a','b']}, '/url_tag/client/1/a-b/'),
+            'url15': ('{% url "template_tests.views.client_action" 12 "test" %}', {}, '/url_tag/client/12/test/'),
+            'url18': ('{% url "template_tests.views.client" "1,2" %}', {}, '/url_tag/client/1%2C2/'),
 
-            'url19': ('{% url named_url client.id %}', {'named_url': 'regressiontests.templates.views.client', 'client': {'id': 1}}, '/url_tag/client/1/'),
+            'url19': ('{% url named_url client.id %}', {'named_url': 'template_tests.views.client', 'client': {'id': 1}}, '/url_tag/client/1/'),
             'url20': ('{% url url_name_in_var client.id %}', {'url_name_in_var': 'named.client', 'client': {'id': 1}}, '/url_tag/named-client/1/'),
 
             # Failures
             'url-fail01': ('{% url %}', {}, template.TemplateSyntaxError),
             'url-fail02': ('{% url "no_such_view" %}', {}, (urlresolvers.NoReverseMatch, urlresolvers.NoReverseMatch)),
-            'url-fail03': ('{% url "regressiontests.templates.views.client" %}', {}, (urlresolvers.NoReverseMatch, urlresolvers.NoReverseMatch)),
+            'url-fail03': ('{% url "template_tests.views.client" %}', {}, (urlresolvers.NoReverseMatch, urlresolvers.NoReverseMatch)),
             'url-fail04': ('{% url "view" id, %}', {}, template.TemplateSyntaxError),
             'url-fail05': ('{% url "view" id= %}', {}, template.TemplateSyntaxError),
             'url-fail06': ('{% url "view" a.id=id %}', {}, template.TemplateSyntaxError),
@@ -1549,7 +1639,7 @@ class Templates(TestCase):
 
             'url-fail11': ('{% url named_url %}', {}, (urlresolvers.NoReverseMatch, urlresolvers.NoReverseMatch)),
             'url-fail12': ('{% url named_url %}', {'named_url': 'no_such_view'}, (urlresolvers.NoReverseMatch, urlresolvers.NoReverseMatch)),
-            'url-fail13': ('{% url named_url %}', {'named_url': 'regressiontests.templates.views.client'}, (urlresolvers.NoReverseMatch, urlresolvers.NoReverseMatch)),
+            'url-fail13': ('{% url named_url %}', {'named_url': 'template_tests.views.client'}, (urlresolvers.NoReverseMatch, urlresolvers.NoReverseMatch)),
             'url-fail14': ('{% url named_url id, %}', {'named_url': 'view'}, template.TemplateSyntaxError),
             'url-fail15': ('{% url named_url id= %}', {'named_url': 'view'}, template.TemplateSyntaxError),
             'url-fail16': ('{% url named_url a.id=id %}', {'named_url': 'view'}, template.TemplateSyntaxError),
@@ -1558,8 +1648,8 @@ class Templates(TestCase):
             'url-fail19': ('{% url named_url id=", %}', {'named_url': 'view'}, template.TemplateSyntaxError),
 
             # {% url ... as var %}
-            'url-asvar01': ('{% url "regressiontests.templates.views.index" as url %}', {}, ''),
-            'url-asvar02': ('{% url "regressiontests.templates.views.index" as url %}{{ url }}', {}, '/url_tag/'),
+            'url-asvar01': ('{% url "template_tests.views.index" as url %}', {}, ''),
+            'url-asvar02': ('{% url "template_tests.views.index" as url %}{{ url }}', {}, '/url_tag/'),
             'url-asvar03': ('{% url "no_such_view" as url %}{{ url }}', {}, ''),
 
             ### CACHE TAG ######################################################
@@ -1585,6 +1675,9 @@ class Templates(TestCase):
             # Regression test for #11270.
             'cache17': ('{% load cache %}{% cache 10 long_cache_key poem %}Some Content{% endcache %}', {'poem': 'Oh freddled gruntbuggly/Thy micturations are to me/As plurdled gabbleblotchits/On a lurgid bee/That mordiously hath bitled out/Its earted jurtles/Into a rancid festering/Or else I shall rend thee in the gobberwarts with my blurglecruncheon/See if I dont.'}, 'Some Content'),
 
+            # Test whitespace in filter arguments
+            'cache18': ('{% load cache custom %}{% cache 2|noop:"x y" cache18 %}cache18{% endcache %}', {}, 'cache18'),
+
 
             ### AUTOESCAPE TAG ##############################################
             'autoescape-tag01': ("{% autoescape off %}hello{% endautoescape %}", {}, "hello"),
@@ -1649,6 +1742,17 @@ class Templates(TestCase):
             'verbatim-tag05': ('{% verbatim %}{% endverbatim %}{% verbatim %}{% endverbatim %}', {}, ''),
             'verbatim-tag06': ("{% verbatim special %}Don't {% endverbatim %} just yet{% endverbatim special %}", {}, "Don't {% endverbatim %} just yet"),
         }
+
+        if numpy:
+            tests.update({
+                # Numpy's array-index syntax allows a template to access a certain item of a subscriptable object.
+                'numpy-array-index01': ("{{ var.1 }}", {"var": numpy.array(["first item", "second item"])}, "second item"),
+
+                # Fail silently when the array index is out of range.
+                'numpy-array-index02': ("{{ var.5 }}", {"var": numpy.array(["first item", "second item"])}, ("", "INVALID")),
+            })
+
+
         return tests
 
 class TemplateTagLoading(unittest.TestCase):
diff --git a/tests/regressiontests/templates/urls.py b/tests/template_tests/urls.py
similarity index 83%
rename from tests/regressiontests/templates/urls.py
rename to tests/template_tests/urls.py
index fe7f9c1f30..b5498fade1 100644
--- a/tests/regressiontests/templates/urls.py
+++ b/tests/template_tests/urls.py
@@ -16,5 +16,5 @@ urlpatterns = patterns('',
 
     # Unicode strings are permitted everywhere.
     url(r'^Юникод/(\w+)/$', views.client2, name="метка_оператора"),
-    url(r'^Юникод/(?P<tag>\S+)/$', 'regressiontests.templates.views.client2', name="метка_оператора_2"),
+    url(r'^Юникод/(?P<tag>\S+)/$', 'template_tests.views.client2', name="метка_оператора_2"),
 )
diff --git a/tests/regressiontests/templates/views.py b/tests/template_tests/views.py
similarity index 100%
rename from tests/regressiontests/templates/views.py
rename to tests/template_tests/views.py
diff --git a/tests/regressiontests/i18n/patterns/urls/__init__.py b/tests/test_client/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/patterns/urls/__init__.py
rename to tests/test_client/__init__.py
diff --git a/tests/modeltests/test_client/fixtures/testdata.json b/tests/test_client/fixtures/testdata.json
similarity index 100%
rename from tests/modeltests/test_client/fixtures/testdata.json
rename to tests/test_client/fixtures/testdata.json
diff --git a/tests/regressiontests/test_client_regress/models.py b/tests/test_client/models.py
similarity index 100%
rename from tests/regressiontests/test_client_regress/models.py
rename to tests/test_client/models.py
diff --git a/tests/modeltests/test_client/models.py b/tests/test_client/tests.py
similarity index 100%
rename from tests/modeltests/test_client/models.py
rename to tests/test_client/tests.py
diff --git a/tests/modeltests/test_client/urls.py b/tests/test_client/urls.py
similarity index 100%
rename from tests/modeltests/test_client/urls.py
rename to tests/test_client/urls.py
diff --git a/tests/modeltests/test_client/views.py b/tests/test_client/views.py
similarity index 96%
rename from tests/modeltests/test_client/views.py
rename to tests/test_client/views.py
index 477a27b178..f760466497 100644
--- a/tests/modeltests/test_client/views.py
+++ b/tests/test_client/views.py
@@ -154,8 +154,8 @@ def _permission_protected_view(request):
                  name='Permissions Template')
     c = Context({'user': request.user})
     return HttpResponse(t.render(c))
-permission_protected_view = permission_required('modeltests.test_perm')(_permission_protected_view)
-permission_protected_view_exception = permission_required('modeltests.test_perm', raise_exception=True)(_permission_protected_view)
+permission_protected_view = permission_required('permission_not_granted')(_permission_protected_view)
+permission_protected_view_exception = permission_required('permission_not_granted', raise_exception=True)(_permission_protected_view)
 
 class _ViewManager(object):
     @method_decorator(login_required)
@@ -166,7 +166,7 @@ class _ViewManager(object):
         c = Context({'user': request.user})
         return HttpResponse(t.render(c))
 
-    @method_decorator(permission_required('modeltests.test_perm'))
+    @method_decorator(permission_required('permission_not_granted'))
     def permission_protected_view(self, request):
         t = Template('This is a permission protected test using a method. '
                      'Username is {{ user.username }}. '
diff --git a/tests/regressiontests/i18n/resolution/__init__.py b/tests/test_client_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/i18n/resolution/__init__.py
rename to tests/test_client_regress/__init__.py
diff --git a/tests/regressiontests/test_client_regress/bad_templates/404.html b/tests/test_client_regress/bad_templates/404.html
similarity index 100%
rename from tests/regressiontests/test_client_regress/bad_templates/404.html
rename to tests/test_client_regress/bad_templates/404.html
diff --git a/tests/regressiontests/test_client_regress/fixtures/testdata.json b/tests/test_client_regress/fixtures/testdata.json
similarity index 100%
rename from tests/regressiontests/test_client_regress/fixtures/testdata.json
rename to tests/test_client_regress/fixtures/testdata.json
diff --git a/tests/regressiontests/text/models.py b/tests/test_client_regress/models.py
similarity index 100%
rename from tests/regressiontests/text/models.py
rename to tests/test_client_regress/models.py
diff --git a/tests/regressiontests/test_client_regress/session.py b/tests/test_client_regress/session.py
similarity index 100%
rename from tests/regressiontests/test_client_regress/session.py
rename to tests/test_client_regress/session.py
diff --git a/tests/regressiontests/test_client_regress/templates/request_context.html b/tests/test_client_regress/templates/request_context.html
similarity index 100%
rename from tests/regressiontests/test_client_regress/templates/request_context.html
rename to tests/test_client_regress/templates/request_context.html
diff --git a/tests/regressiontests/test_client_regress/templates/unicode.html b/tests/test_client_regress/templates/unicode.html
similarity index 100%
rename from tests/regressiontests/test_client_regress/templates/unicode.html
rename to tests/test_client_regress/templates/unicode.html
diff --git a/tests/regressiontests/test_client_regress/tests.py b/tests/test_client_regress/tests.py
similarity index 97%
rename from tests/regressiontests/test_client_regress/tests.py
rename to tests/test_client_regress/tests.py
index 5ba5d3c4b3..2582b210c4 100644
--- a/tests/regressiontests/test_client_regress/tests.py
+++ b/tests/test_client_regress/tests.py
@@ -131,6 +131,18 @@ class AssertContainsTests(TestCase):
         self.assertNotContains(r, 'はたけ')
         self.assertNotContains(r, b'\xe3\x81\xaf\xe3\x81\x9f\xe3\x81\x91'.decode('utf-8'))
 
+    def test_binary_contains(self):
+        r = self.client.get('/test_client_regress/check_binary/')
+        self.assertContains(r, b'%PDF-1.4\r\n%\x93\x8c\x8b\x9e')
+        with self.assertRaises(AssertionError):
+            self.assertContains(r, b'%PDF-1.4\r\n%\x93\x8c\x8b\x9e', count=2)
+
+    def test_binary_not_contains(self):
+        r = self.client.get('/test_client_regress/check_binary/')
+        self.assertNotContains(r, b'%ODF-1.4\r\n%\x93\x8c\x8b\x9e')
+        with self.assertRaises(AssertionError):
+            self.assertNotContains(r, b'%PDF-1.4\r\n%\x93\x8c\x8b\x9e')
+
     def test_nontext_contains(self):
         r = self.client.get('/test_client_regress/no_template_view/')
         self.assertContains(r, ugettext_lazy('once'))
@@ -554,7 +566,7 @@ class LoginTests(TestCase):
 
 @override_settings(
     PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),
-    SESSION_ENGINE='regressiontests.test_client_regress.session'
+    SESSION_ENGINE='test_client_regress.session'
 )
 class SessionEngineTests(TestCase):
     fixtures = ['testdata']
@@ -644,7 +656,7 @@ class TemplateExceptionTests(TestCase):
 # it was changed, and another one (without self.urls) to check it was reverted on
 # teardown. This pair of tests relies upon the alphabetical ordering of test execution.
 class UrlconfSubstitutionTests(TestCase):
-    urls = 'regressiontests.test_client_regress.urls'
+    urls = 'test_client_regress.urls'
 
     def test_urlconf_was_changed(self):
         "TestCase can enforce a custom URLconf on a per-test basis"
@@ -783,6 +795,13 @@ class RequestMethodTests(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.content, b'request method: DELETE')
 
+    def test_patch(self):
+        "Request a view via request method PATCH"
+        response = self.client.patch('/test_client_regress/request_methods/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, b'request method: PATCH')
+
+
 class RequestMethodStringDataTests(TestCase):
     def test_post(self):
         "Request a view with string data via request method POST"
@@ -800,6 +819,14 @@ class RequestMethodStringDataTests(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.content, b'request method: PUT')
 
+    def test_patch(self):
+        "Request a view with string data via request method PATCH"
+        # Regression test for #17797
+        data = '{"test": "json"}'
+        response = self.client.patch('/test_client_regress/request_methods/', data=data, content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, b'request method: PATCH')
+
 class QueryStringTests(TestCase):
     def test_get_like_requests(self):
         # See: https://code.djangoproject.com/ticket/10571.
diff --git a/tests/regressiontests/test_client_regress/urls.py b/tests/test_client_regress/urls.py
similarity index 97%
rename from tests/regressiontests/test_client_regress/urls.py
rename to tests/test_client_regress/urls.py
index d869c234eb..1332537d57 100644
--- a/tests/regressiontests/test_client_regress/urls.py
+++ b/tests/test_client_regress/urls.py
@@ -28,6 +28,7 @@ urlpatterns = patterns('',
     (r'^check_session/$', views.check_session_view),
     (r'^request_methods/$', views.request_methods_view),
     (r'^check_unicode/$', views.return_unicode),
+    (r'^check_binary/$', views.return_undecodable_binary),
     (r'^parse_unicode_json/$', views.return_json_file),
     (r'^check_headers/$', views.check_headers),
     (r'^check_headers_redirect/$', RedirectView.as_view(url='/test_client_regress/check_headers/')),
diff --git a/tests/regressiontests/test_client_regress/views.py b/tests/test_client_regress/views.py
similarity index 96%
rename from tests/regressiontests/test_client_regress/views.py
rename to tests/test_client_regress/views.py
index 9b0654806b..7e86ffd8ca 100644
--- a/tests/regressiontests/test_client_regress/views.py
+++ b/tests/test_client_regress/views.py
@@ -70,6 +70,11 @@ def request_methods_view(request):
 def return_unicode(request):
     return render_to_response('unicode.html')
 
+def return_undecodable_binary(request):
+    return HttpResponse(
+        b'%PDF-1.4\r\n%\x93\x8c\x8b\x9e ReportLab Generated PDF document http://www.reportlab.com'
+    )
+
 def return_json_file(request):
     "A view that parses and returns a JSON string as a file."
     match = CONTENT_TYPE_RE.match(request.META['CONTENT_TYPE'])
diff --git a/tests/regressiontests/indexes/__init__.py b/tests/test_runner/__init__.py
similarity index 100%
rename from tests/regressiontests/indexes/__init__.py
rename to tests/test_runner/__init__.py
diff --git a/tests/regressiontests/initial_sql_regress/__init__.py b/tests/test_runner/deprecation_app/__init__.py
similarity index 100%
rename from tests/regressiontests/initial_sql_regress/__init__.py
rename to tests/test_runner/deprecation_app/__init__.py
diff --git a/tests/test_runner/deprecation_app/models.py b/tests/test_runner/deprecation_app/models.py
new file mode 100644
index 0000000000..71a8362390
--- /dev/null
+++ b/tests/test_runner/deprecation_app/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/tests/test_runner/deprecation_app/tests.py b/tests/test_runner/deprecation_app/tests.py
new file mode 100644
index 0000000000..6dee0888ec
--- /dev/null
+++ b/tests/test_runner/deprecation_app/tests.py
@@ -0,0 +1,11 @@
+import warnings
+
+from django.test import TestCase
+
+warnings.warn("module-level warning from deprecation_app", DeprecationWarning)
+
+class DummyTest(TestCase):
+    def test_warn(self):
+        warnings.warn("warning from test", DeprecationWarning)
+
+
diff --git a/tests/regressiontests/test_runner/invalid_app/__init__.py b/tests/test_runner/invalid_app/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/invalid_app/__init__.py
rename to tests/test_runner/invalid_app/__init__.py
diff --git a/tests/regressiontests/inline_formsets/__init__.py b/tests/test_runner/invalid_app/models/__init__.py
similarity index 100%
rename from tests/regressiontests/inline_formsets/__init__.py
rename to tests/test_runner/invalid_app/models/__init__.py
diff --git a/tests/regressiontests/test_runner/invalid_app/tests/__init__.py b/tests/test_runner/invalid_app/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/invalid_app/tests/__init__.py
rename to tests/test_runner/invalid_app/tests/__init__.py
diff --git a/tests/regressiontests/test_runner/models.py b/tests/test_runner/models.py
similarity index 100%
rename from tests/regressiontests/test_runner/models.py
rename to tests/test_runner/models.py
diff --git a/tests/regressiontests/test_runner/tests.py b/tests/test_runner/tests.py
similarity index 78%
rename from tests/regressiontests/test_runner/tests.py
rename to tests/test_runner/tests.py
index c723f162a4..9f0cc794b7 100644
--- a/tests/regressiontests/test_runner/tests.py
+++ b/tests/test_runner/tests.py
@@ -1,8 +1,9 @@
 """
 Tests for django test runner
 """
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
+import sys
 from optparse import make_option
 
 from django.core.exceptions import ImproperlyConfigured
@@ -14,12 +15,12 @@ from django.test.testcases import connections_support_transactions
 from django.utils import unittest
 from django.utils.importlib import import_module
 
-from ..admin_scripts.tests import AdminScriptTestCase
+from admin_scripts.tests import AdminScriptTestCase
 from .models import Person
 
 
-TEST_APP_OK = 'regressiontests.test_runner.valid_app.models'
-TEST_APP_ERROR = 'regressiontests.test_runner.invalid_app.models'
+TEST_APP_OK = 'test_runner.valid_app.models'
+TEST_APP_ERROR = 'test_runner.invalid_app.models'
 
 
 class DependencyOrderingTests(unittest.TestCase):
@@ -145,10 +146,15 @@ class ManageCommandTests(unittest.TestCase):
 
     def test_custom_test_runner(self):
         call_command('test', 'sites',
-                     testrunner='regressiontests.test_runner.tests.MockTestRunner')
+                     testrunner='test_runner.tests.MockTestRunner')
         self.assertTrue(MockTestRunner.invoked,
                         "The custom test runner has not been invoked")
 
+    def test_bad_test_runner(self):
+        with self.assertRaises(AttributeError):
+            call_command('test', 'sites',
+                testrunner='test_runner.NonExistentRunner')
+
 
 class CustomOptionsTestRunner(simple.DjangoTestSuiteRunner):
     option_list = (
@@ -172,7 +178,7 @@ class CustomTestRunnerOptionsTests(AdminScriptTestCase):
 
     def setUp(self):
         settings = {
-            'TEST_RUNNER': '\'regressiontests.test_runner.tests.CustomOptionsTestRunner\'',
+            'TEST_RUNNER': '\'test_runner.tests.CustomOptionsTestRunner\'',
         }
         self.write_settings('settings.py', sdict=settings)
 
@@ -180,25 +186,26 @@ class CustomTestRunnerOptionsTests(AdminScriptTestCase):
         self.remove_settings('settings.py')
 
     def test_default_options(self):
-        args = ['test', '--settings=regressiontests.settings']
+        args = ['test', '--settings=test_project.settings']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, '1:2:3')
 
     def test_default_and_given_options(self):
-        args = ['test', '--settings=regressiontests.settings', '--option_b=foo']
+        args = ['test', '--settings=test_project.settings', '--option_b=foo']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, '1:foo:3')
 
     def test_option_name_and_value_separated(self):
-        args = ['test', '--settings=regressiontests.settings', '--option_b', 'foo']
+        args = ['test', '--settings=test_project.settings', '--option_b', 'foo']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, '1:foo:3')
 
     def test_all_options_given(self):
-        args = ['test', '--settings=regressiontests.settings', '--option_a=bar', '--option_b=foo', '--option_c=31337']
+        args = ['test', '--settings=test_project.settings', '--option_a=bar',
+                '--option_b=foo', '--option_c=31337']
         out, err = self.run_django_admin(args)
         self.assertNoOutput(err)
         self.assertOutput(out, 'bar:foo:31337')
@@ -261,6 +268,48 @@ class Sqlite3InMemoryTestDbs(unittest.TestCase):
                 db.connections = old_db_connections
 
 
+class DummyBackendTest(unittest.TestCase):
+    def test_setup_databases(self):
+        """
+        Test that setup_databases() doesn't fail with dummy database backend.
+        """
+        runner = DjangoTestSuiteRunner(verbosity=0)
+        old_db_connections = db.connections
+        try:
+            db.connections = db.ConnectionHandler({})
+            old_config = runner.setup_databases()
+            runner.teardown_databases(old_config)
+        except Exception as e:
+            self.fail("setup_databases/teardown_databases unexpectedly raised "
+                      "an error: %s" % e)
+        finally:
+            db.connections = old_db_connections
+
+
+class DeprecationDisplayTest(AdminScriptTestCase):
+    # tests for 19546
+    def setUp(self):
+        settings = {'INSTALLED_APPS': '("test_runner.deprecation_app",)',
+                    'DATABASES': '{"default": {"ENGINE":"django.db.backends.sqlite3", "NAME":":memory:"}}' }
+        self.write_settings('settings.py', sdict=settings)
+
+    def tearDown(self):
+        self.remove_settings('settings.py')
+
+    def test_runner_deprecation_verbosity_default(self):
+        args = ['test', '--settings=test_project.settings']
+        out, err = self.run_django_admin(args)
+        self.assertIn("DeprecationWarning: warning from test", err)
+        self.assertIn("DeprecationWarning: module-level warning from deprecation_app", err)
+
+    @unittest.skipIf(sys.version_info[:2] == (2, 6),
+        "On Python 2.6, DeprecationWarnings are visible anyway")
+    def test_runner_deprecation_verbosity_zero(self):
+        args = ['test', '--settings=settings', '--verbosity=0']
+        out, err = self.run_django_admin(args)
+        self.assertFalse("DeprecationWarning: warning from test" in err)
+
+
 class AutoIncrementResetTest(TransactionTestCase):
     """
     Here we test creating the same model two times in different test methods,
diff --git a/tests/regressiontests/test_runner/valid_app/__init__.py b/tests/test_runner/valid_app/__init__.py
similarity index 100%
rename from tests/regressiontests/test_runner/valid_app/__init__.py
rename to tests/test_runner/valid_app/__init__.py
diff --git a/tests/regressiontests/introspection/__init__.py b/tests/test_runner/valid_app/models/__init__.py
similarity index 100%
rename from tests/regressiontests/introspection/__init__.py
rename to tests/test_runner/valid_app/models/__init__.py
diff --git a/tests/regressiontests/localflavor/__init__.py b/tests/test_runner/valid_app/tests/__init__.py
similarity index 100%
rename from tests/regressiontests/localflavor/__init__.py
rename to tests/test_runner/valid_app/tests/__init__.py
diff --git a/tests/test_sqlite.py b/tests/test_sqlite.py
index c04ef97cd0..6bce452c79 100644
--- a/tests/test_sqlite.py
+++ b/tests/test_sqlite.py
@@ -22,9 +22,8 @@ DATABASES = {
 }
 
 SECRET_KEY = "django_tests_secret_key"
-# To speed up tests under SQLite we use the MD5 hasher as the default one. 
-# This should not be needed under other databases, as the relative speedup
-# is only marginal there.
+
+# Use a fast hasher to speed up tests.
 PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.MD5PasswordHasher',
 )
diff --git a/tests/regressiontests/localflavor/generic/__init__.py b/tests/test_suite_override/__init__.py
similarity index 100%
rename from tests/regressiontests/localflavor/generic/__init__.py
rename to tests/test_suite_override/__init__.py
diff --git a/tests/regressiontests/urlpatterns_reverse/models.py b/tests/test_suite_override/models.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/models.py
rename to tests/test_suite_override/models.py
diff --git a/tests/test_suite_override/tests.py b/tests/test_suite_override/tests.py
new file mode 100644
index 0000000000..dea110434f
--- /dev/null
+++ b/tests/test_suite_override/tests.py
@@ -0,0 +1,34 @@
+from django.db.models import get_app
+from django.test.simple import build_suite
+from django.utils import unittest
+
+
+def suite():
+    testSuite = unittest.TestSuite()
+    testSuite.addTest(SuiteOverrideTest('test_suite_override'))
+    return testSuite
+
+
+class SuiteOverrideTest(unittest.TestCase):
+    def test_suite_override(self):
+        """
+        Validate that you can define a custom suite when running tests with
+        ``django.test.simple.DjangoTestSuiteRunner`` (which builds up a test
+        suite using ``build_suite``).
+        """
+
+        app = get_app("test_suite_override")
+        suite = build_suite(app)
+        self.assertEqual(suite.countTestCases(), 1)
+
+
+class SampleTests(unittest.TestCase):
+    """These tests should not be discovered, due to the custom suite."""
+    def test_one(self):
+        pass
+
+    def test_two(self):
+        pass
+
+    def test_three(self):
+        pass
diff --git a/tests/regressiontests/logging_tests/__init__.py b/tests/test_utils/__init__.py
similarity index 100%
rename from tests/regressiontests/logging_tests/__init__.py
rename to tests/test_utils/__init__.py
diff --git a/tests/test_utils/doctest_output.py b/tests/test_utils/doctest_output.py
new file mode 100644
index 0000000000..724364428a
--- /dev/null
+++ b/tests/test_utils/doctest_output.py
@@ -0,0 +1,77 @@
+from django.utils import six
+
+__test__ = {"API_TEST": r"""
+# Some checks of the doctest output normalizer.
+# Standard doctests do fairly
+>>> import json
+>>> from django.utils.xmlutils import SimplerXMLGenerator
+>>> from django.utils.six import StringIO
+
+>>> def produce_json():
+...     return json.dumps(['foo', {'bar': ('baz', None, 1.0, 2), 'whiz': 42}])
+
+>>> def produce_xml():
+...     stream = StringIO()
+...     xml = SimplerXMLGenerator(stream, encoding='utf-8')
+...     xml.startDocument()
+...     xml.startElement("foo", {"aaa" : "1.0", "bbb": "2.0"})
+...     xml.startElement("bar", {"ccc" : "3.0"})
+...     xml.characters("Hello")
+...     xml.endElement("bar")
+...     xml.startElement("whiz", {})
+...     xml.characters("Goodbye")
+...     xml.endElement("whiz")
+...     xml.endElement("foo")
+...     xml.endDocument()
+...     return stream.getvalue()
+
+>>> def produce_xml_fragment():
+...     stream = StringIO()
+...     xml = SimplerXMLGenerator(stream, encoding='utf-8')
+...     xml.startElement("foo", {"aaa": "1.0", "bbb": "2.0"})
+...     xml.characters("Hello")
+...     xml.endElement("foo")
+...     xml.startElement("bar", {"ccc": "3.0", "ddd": "4.0"})
+...     xml.endElement("bar")
+...     return stream.getvalue()
+
+# JSON output is normalized for field order, so it doesn't matter
+# which order json dictionary attributes are listed in output
+>>> produce_json()
+'["foo", {"bar": ["baz", null, 1.0, 2], "whiz": 42}]'
+
+>>> produce_json()
+'["foo", {"whiz": 42, "bar": ["baz", null, 1.0, 2]}]'
+
+# XML output is normalized for attribute order, so it doesn't matter
+# which order XML element attributes are listed in output
+>>> produce_xml()
+'<?xml version="1.0" encoding="UTF-8"?>\n<foo aaa="1.0" bbb="2.0"><bar ccc="3.0">Hello</bar><whiz>Goodbye</whiz></foo>'
+
+>>> produce_xml()
+'<?xml version="1.0" encoding="UTF-8"?>\n<foo bbb="2.0" aaa="1.0"><bar ccc="3.0">Hello</bar><whiz>Goodbye</whiz></foo>'
+
+>>> produce_xml_fragment()
+'<foo aaa="1.0" bbb="2.0">Hello</foo><bar ccc="3.0" ddd="4.0"></bar>'
+
+>>> produce_xml_fragment()
+'<foo bbb="2.0" aaa="1.0">Hello</foo><bar ddd="4.0" ccc="3.0"></bar>'
+
+"""}
+
+if not six.PY3:
+    __test__["API_TEST"] += """
+>>> def produce_long():
+...     return 42L
+
+>>> def produce_int():
+...     return 42
+
+# Long values are normalized and are comparable to normal integers ...
+>>> produce_long()
+42
+
+# ... and vice versa
+>>> produce_int()
+42L
+"""
diff --git a/tests/regressiontests/test_utils/fixtures/should_not_be_loaded.json b/tests/test_utils/fixtures/should_not_be_loaded.json
similarity index 100%
rename from tests/regressiontests/test_utils/fixtures/should_not_be_loaded.json
rename to tests/test_utils/fixtures/should_not_be_loaded.json
diff --git a/tests/regressiontests/test_utils/models.py b/tests/test_utils/models.py
similarity index 100%
rename from tests/regressiontests/test_utils/models.py
rename to tests/test_utils/models.py
diff --git a/tests/regressiontests/test_utils/templates/template_used/alternative.html b/tests/test_utils/templates/template_used/alternative.html
similarity index 100%
rename from tests/regressiontests/test_utils/templates/template_used/alternative.html
rename to tests/test_utils/templates/template_used/alternative.html
diff --git a/tests/regressiontests/test_utils/templates/template_used/base.html b/tests/test_utils/templates/template_used/base.html
similarity index 100%
rename from tests/regressiontests/test_utils/templates/template_used/base.html
rename to tests/test_utils/templates/template_used/base.html
diff --git a/tests/regressiontests/test_utils/templates/template_used/extends.html b/tests/test_utils/templates/template_used/extends.html
similarity index 100%
rename from tests/regressiontests/test_utils/templates/template_used/extends.html
rename to tests/test_utils/templates/template_used/extends.html
diff --git a/tests/regressiontests/test_utils/templates/template_used/include.html b/tests/test_utils/templates/template_used/include.html
similarity index 100%
rename from tests/regressiontests/test_utils/templates/template_used/include.html
rename to tests/test_utils/templates/template_used/include.html
diff --git a/tests/regressiontests/test_utils/tests.py b/tests/test_utils/tests.py
similarity index 84%
rename from tests/regressiontests/test_utils/tests.py
rename to tests/test_utils/tests.py
index d5d49b2104..d72a482819 100644
--- a/tests/regressiontests/test_utils/tests.py
+++ b/tests/test_utils/tests.py
@@ -1,11 +1,17 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
+import warnings
 
+from django.db import connection
 from django.forms import EmailField, IntegerField
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
+from django.test.html import HTMLParseError, parse_html
+from django.test.simple import make_doctest
+from django.test.utils import CaptureQueriesContext
 from django.utils import six
+from django.utils import unittest
 from django.utils.unittest import skip
 
 from .models import Person
@@ -23,7 +29,7 @@ class SkippingTestCase(TestCase):
 
 
 class AssertNumQueriesTests(TestCase):
-    urls = 'regressiontests.test_utils.urls'
+    urls = 'test_utils.urls'
 
     def test_assert_num_queries(self):
         def test_func():
@@ -94,8 +100,62 @@ class AssertQuerysetEqualTests(TestCase):
         )
 
 
+class CaptureQueriesContextManagerTests(TestCase):
+    urls = 'test_utils.urls'
+
+    def setUp(self):
+        self.person_pk = six.text_type(Person.objects.create(name='test').pk)
+
+    def test_simple(self):
+        with CaptureQueriesContext(connection) as captured_queries:
+            Person.objects.get(pk=self.person_pk)
+        self.assertEqual(len(captured_queries), 1)
+        self.assertIn(self.person_pk, captured_queries[0]['sql'])
+
+        with CaptureQueriesContext(connection) as captured_queries:
+            pass
+        self.assertEqual(0, len(captured_queries))
+
+    def test_within(self):
+        with CaptureQueriesContext(connection) as captured_queries:
+            Person.objects.get(pk=self.person_pk)
+            self.assertEqual(len(captured_queries), 1)
+            self.assertIn(self.person_pk, captured_queries[0]['sql'])
+
+    def test_nested(self):
+        with CaptureQueriesContext(connection) as captured_queries:
+            Person.objects.count()
+            with CaptureQueriesContext(connection) as nested_captured_queries:
+                Person.objects.count()
+        self.assertEqual(1, len(nested_captured_queries))
+        self.assertEqual(2, len(captured_queries))
+
+    def test_failure(self):
+        with self.assertRaises(TypeError):
+            with CaptureQueriesContext(connection):
+                raise TypeError
+
+    def test_with_client(self):
+        with CaptureQueriesContext(connection) as captured_queries:
+            self.client.get("/test_utils/get_person/%s/" % self.person_pk)
+        self.assertEqual(len(captured_queries), 1)
+        self.assertIn(self.person_pk, captured_queries[0]['sql'])
+
+        with CaptureQueriesContext(connection) as captured_queries:
+            self.client.get("/test_utils/get_person/%s/" % self.person_pk)
+        self.assertEqual(len(captured_queries), 1)
+        self.assertIn(self.person_pk, captured_queries[0]['sql'])
+
+        with CaptureQueriesContext(connection) as captured_queries:
+            self.client.get("/test_utils/get_person/%s/" % self.person_pk)
+            self.client.get("/test_utils/get_person/%s/" % self.person_pk)
+        self.assertEqual(len(captured_queries), 2)
+        self.assertIn(self.person_pk, captured_queries[0]['sql'])
+        self.assertIn(self.person_pk, captured_queries[1]['sql'])
+
+
 class AssertNumQueriesContextManagerTests(TestCase):
-    urls = 'regressiontests.test_utils.urls'
+    urls = 'test_utils.urls'
 
     def test_simple(self):
         with self.assertNumQueries(0):
@@ -219,30 +279,31 @@ class SaveRestoreWarningState(TestCase):
         # In reality this test could be satisfied by many broken implementations
         # of save_warnings_state/restore_warnings_state (e.g. just
         # warnings.resetwarnings()) , but it is difficult to test more.
-        import warnings
-        self.save_warnings_state()
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", DeprecationWarning)
 
-        class MyWarning(Warning):
-            pass
+            self.save_warnings_state()
 
-        # Add a filter that causes an exception to be thrown, so we can catch it
-        warnings.simplefilter("error", MyWarning)
-        self.assertRaises(Warning, lambda: warnings.warn("warn", MyWarning))
+            class MyWarning(Warning):
+                pass
 
-        # Now restore.
-        self.restore_warnings_state()
-        # After restoring, we shouldn't get an exception. But we don't want a
-        # warning printed either, so we have to silence the warning.
-        warnings.simplefilter("ignore", MyWarning)
-        warnings.warn("warn", MyWarning)
+            # Add a filter that causes an exception to be thrown, so we can catch it
+            warnings.simplefilter("error", MyWarning)
+            self.assertRaises(Warning, lambda: warnings.warn("warn", MyWarning))
 
-        # Remove the filter we just added.
-        self.restore_warnings_state()
+            # Now restore.
+            self.restore_warnings_state()
+            # After restoring, we shouldn't get an exception. But we don't want a
+            # warning printed either, so we have to silence the warning.
+            warnings.simplefilter("ignore", MyWarning)
+            warnings.warn("warn", MyWarning)
+
+            # Remove the filter we just added.
+            self.restore_warnings_state()
 
 
 class HTMLEqualTests(TestCase):
     def test_html_parser(self):
-        from django.test.html import parse_html
         element = parse_html('<div><p>Hello</p></div>')
         self.assertEqual(len(element.children), 1)
         self.assertEqual(element.children[0].name, 'p')
@@ -256,7 +317,6 @@ class HTMLEqualTests(TestCase):
         self.assertEqual(dom[0], 'foo')
 
     def test_parse_html_in_script(self):
-        from django.test.html import parse_html
         parse_html('<script>var a = "<p" + ">";</script>');
         parse_html('''
             <script>
@@ -272,8 +332,6 @@ class HTMLEqualTests(TestCase):
         self.assertEqual(dom.children[0], "<p>foo</p> '</scr'+'ipt>' <span>bar</span>")
 
     def test_self_closing_tags(self):
-        from django.test.html import parse_html
-
         self_closing_tags = ('br' , 'hr', 'input', 'img', 'meta', 'spacer',
             'link', 'frame', 'base', 'col')
         for tag in self_closing_tags:
@@ -397,7 +455,6 @@ class HTMLEqualTests(TestCase):
         </html>""")
 
     def test_html_contain(self):
-        from django.test.html import parse_html
         # equal html contains each other
         dom1 = parse_html('<p>foo')
         dom2 = parse_html('<p>foo</p>')
@@ -421,7 +478,6 @@ class HTMLEqualTests(TestCase):
         self.assertTrue(dom1 in dom2)
 
     def test_count(self):
-        from django.test.html import parse_html
         # equal html contains each other one time
         dom1 = parse_html('<p>foo')
         dom2 = parse_html('<p>foo</p>')
@@ -456,7 +512,6 @@ class HTMLEqualTests(TestCase):
         self.assertEqual(dom2.count(dom1), 0)
 
     def test_parsing_errors(self):
-        from django.test.html import HTMLParseError, parse_html
         with self.assertRaises(AssertionError):
             self.assertHTMLEqual('<p>', '')
         with self.assertRaises(AssertionError):
@@ -485,7 +540,6 @@ class HTMLEqualTests(TestCase):
             self.assertContains(response, '<p "whats" that>')
 
     def test_unicode_handling(self):
-        from django.http import HttpResponse
         response = HttpResponse('<p class="help">Some help text for the title (with unicode ŠĐĆŽćžšđ)</p>')
         self.assertContains(response, '<p class="help">Some help text for the title (with unicode ŠĐĆŽćžšđ)</p>', html=True)
 
@@ -569,79 +623,10 @@ class AssertFieldOutputTests(SimpleTestCase):
             }
         self.assertFieldOutput(MyCustomField, {}, {}, empty_value=None)
 
-__test__ = {"API_TEST": r"""
-# Some checks of the doctest output normalizer.
-# Standard doctests do fairly
->>> import json
->>> from django.utils.xmlutils import SimplerXMLGenerator
->>> from django.utils.six import StringIO
 
->>> def produce_json():
-...     return json.dumps(['foo', {'bar': ('baz', None, 1.0, 2), 'whiz': 42}])
+class DoctestNormalizerTest(SimpleTestCase):
 
->>> def produce_xml():
-...     stream = StringIO()
-...     xml = SimplerXMLGenerator(stream, encoding='utf-8')
-...     xml.startDocument()
-...     xml.startElement("foo", {"aaa" : "1.0", "bbb": "2.0"})
-...     xml.startElement("bar", {"ccc" : "3.0"})
-...     xml.characters("Hello")
-...     xml.endElement("bar")
-...     xml.startElement("whiz", {})
-...     xml.characters("Goodbye")
-...     xml.endElement("whiz")
-...     xml.endElement("foo")
-...     xml.endDocument()
-...     return stream.getvalue()
-
->>> def produce_xml_fragment():
-...     stream = StringIO()
-...     xml = SimplerXMLGenerator(stream, encoding='utf-8')
-...     xml.startElement("foo", {"aaa": "1.0", "bbb": "2.0"})
-...     xml.characters("Hello")
-...     xml.endElement("foo")
-...     xml.startElement("bar", {"ccc": "3.0", "ddd": "4.0"})
-...     xml.endElement("bar")
-...     return stream.getvalue()
-
-# JSON output is normalized for field order, so it doesn't matter
-# which order json dictionary attributes are listed in output
->>> produce_json()
-'["foo", {"bar": ["baz", null, 1.0, 2], "whiz": 42}]'
-
->>> produce_json()
-'["foo", {"whiz": 42, "bar": ["baz", null, 1.0, 2]}]'
-
-# XML output is normalized for attribute order, so it doesn't matter
-# which order XML element attributes are listed in output
->>> produce_xml()
-'<?xml version="1.0" encoding="UTF-8"?>\n<foo aaa="1.0" bbb="2.0"><bar ccc="3.0">Hello</bar><whiz>Goodbye</whiz></foo>'
-
->>> produce_xml()
-'<?xml version="1.0" encoding="UTF-8"?>\n<foo bbb="2.0" aaa="1.0"><bar ccc="3.0">Hello</bar><whiz>Goodbye</whiz></foo>'
-
->>> produce_xml_fragment()
-'<foo aaa="1.0" bbb="2.0">Hello</foo><bar ccc="3.0" ddd="4.0"></bar>'
-
->>> produce_xml_fragment()
-'<foo bbb="2.0" aaa="1.0">Hello</foo><bar ddd="4.0" ccc="3.0"></bar>'
-
-"""}
-
-if not six.PY3:
-    __test__["API_TEST"] += """
->>> def produce_long():
-...     return 42L
-
->>> def produce_int():
-...     return 42
-
-# Long values are normalized and are comparable to normal integers ...
->>> produce_long()
-42
-
-# ... and vice versa
->>> produce_int()
-42L
-
-"""
+    def test_normalizer(self):
+        suite = make_doctest("test_utils.doctest_output")
+        failures = unittest.TextTestRunner(stream=six.StringIO()).run(suite)
+        self.assertEqual(failures.failures, [])
diff --git a/tests/regressiontests/test_utils/urls.py b/tests/test_utils/urls.py
similarity index 100%
rename from tests/regressiontests/test_utils/urls.py
rename to tests/test_utils/urls.py
diff --git a/tests/regressiontests/test_utils/views.py b/tests/test_utils/views.py
similarity index 100%
rename from tests/regressiontests/test_utils/views.py
rename to tests/test_utils/views.py
diff --git a/tests/regressiontests/m2m_regress/__init__.py b/tests/text/__init__.py
similarity index 100%
rename from tests/regressiontests/m2m_regress/__init__.py
rename to tests/text/__init__.py
diff --git a/tests/regressiontests/version/models.py b/tests/text/models.py
similarity index 100%
rename from tests/regressiontests/version/models.py
rename to tests/text/models.py
diff --git a/tests/regressiontests/text/tests.py b/tests/text/tests.py
similarity index 61%
rename from tests/regressiontests/text/tests.py
rename to tests/text/tests.py
index e61c14d103..c14f3baf82 100644
--- a/tests/regressiontests/text/tests.py
+++ b/tests/text/tests.py
@@ -2,12 +2,16 @@
 from __future__ import unicode_literals
 
 from django.test import TestCase
-from django.utils.encoding import iri_to_uri
+from django.utils.encoding import iri_to_uri, force_text
+from django.utils.functional import lazy
 from django.utils.http import (cookie_date, http_date,
     urlquote, urlquote_plus, urlunquote, urlunquote_plus)
+from django.utils import six
 from django.utils.text import get_text_list, smart_split
 from django.utils.translation import override
 
+lazystr = lazy(force_text, six.text_type)
+
 
 class TextTests(TestCase):
     """
@@ -25,40 +29,36 @@ class TextTests(TestCase):
 
     def test_smart_split(self):
 
-        self.assertEqual(list(smart_split(r'''This is "a person" test.''')),
-            ['This', 'is', '"a person"', 'test.'])
-
-        self.assertEqual(list(smart_split(r'''This is "a person's" test.'''))[2],
-            '"a person\'s"')
-
-        self.assertEqual(list(smart_split(r'''This is "a person\"s" test.'''))[2],
-            '"a person\\"s"')
-
-        self.assertEqual(list(smart_split('''"a 'one''')), ['"a', "'one"])
-
-        self.assertEqual(list(smart_split(r'''all friends' tests'''))[1],
-            "friends'")
-
-        self.assertEqual(list(smart_split('url search_page words="something else"')),
-            ['url', 'search_page', 'words="something else"'])
-
-        self.assertEqual(list(smart_split("url search_page words='something else'")),
-            ['url', 'search_page', "words='something else'"])
-
-        self.assertEqual(list(smart_split('url search_page words "something else"')),
-            ['url', 'search_page', 'words', '"something else"'])
-
-        self.assertEqual(list(smart_split('url search_page words-"something else"')),
-            ['url', 'search_page', 'words-"something else"'])
-
-        self.assertEqual(list(smart_split('url search_page words=hello')),
-            ['url', 'search_page', 'words=hello'])
-
-        self.assertEqual(list(smart_split('url search_page words="something else')),
-            ['url', 'search_page', 'words="something', 'else'])
-
-        self.assertEqual(list(smart_split("cut:','|cut:' '")),
-            ["cut:','|cut:' '"])
+        testdata = [
+            ('This is "a person" test.',
+                ['This', 'is', '"a person"', 'test.']),
+            ('This is "a person\'s" test.',
+                ['This', 'is', '"a person\'s"', 'test.']),
+            ('This is "a person\\"s" test.',
+                ['This', 'is', '"a person\\"s"', 'test.']),
+            ('"a \'one',
+                ['"a', "'one"]),
+            ('all friends\' tests',
+                ['all', 'friends\'', 'tests']),
+            ('url search_page words="something else"',
+                ['url', 'search_page', 'words="something else"']),
+            ("url search_page words='something else'",
+                ['url', 'search_page', "words='something else'"]),
+            ('url search_page words "something else"',
+                ['url', 'search_page', 'words', '"something else"']),
+            ('url search_page words-"something else"',
+                ['url', 'search_page', 'words-"something else"']),
+            ('url search_page words=hello',
+                ['url', 'search_page', 'words=hello']),
+            ('url search_page words="something else',
+                ['url', 'search_page', 'words="something', 'else']),
+            ("cut:','|cut:' '",
+                ["cut:','|cut:' '"]),
+            (lazystr("a b c d"),  # Test for #20231
+                ['a', 'b', 'c', 'd']),
+        ]
+        for test, expected in testdata:
+            self.assertEqual(list(smart_split(test)), expected)
 
     def test_urlquote(self):
         self.assertEqual(urlquote('Paris & Orl\xe9ans'),
diff --git a/tests/regressiontests/managers_regress/__init__.py b/tests/timezones/__init__.py
similarity index 100%
rename from tests/regressiontests/managers_regress/__init__.py
rename to tests/timezones/__init__.py
diff --git a/tests/modeltests/timezones/admin.py b/tests/timezones/admin.py
similarity index 100%
rename from tests/modeltests/timezones/admin.py
rename to tests/timezones/admin.py
diff --git a/tests/modeltests/timezones/fixtures/tz_users.xml b/tests/timezones/fixtures/tz_users.xml
similarity index 100%
rename from tests/modeltests/timezones/fixtures/tz_users.xml
rename to tests/timezones/fixtures/tz_users.xml
diff --git a/tests/modeltests/timezones/forms.py b/tests/timezones/forms.py
similarity index 100%
rename from tests/modeltests/timezones/forms.py
rename to tests/timezones/forms.py
diff --git a/tests/modeltests/timezones/models.py b/tests/timezones/models.py
similarity index 100%
rename from tests/modeltests/timezones/models.py
rename to tests/timezones/models.py
diff --git a/tests/modeltests/timezones/tests.py b/tests/timezones/tests.py
similarity index 88%
rename from tests/modeltests/timezones/tests.py
rename to tests/timezones/tests.py
index 2fdf6733a0..dce5c3041d 100644
--- a/tests/modeltests/timezones/tests.py
+++ b/tests/timezones/tests.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 import datetime
 import os
+import re
 import sys
 import time
 import warnings
@@ -188,13 +189,16 @@ class LegacyDatabaseTests(TestCase):
         self.assertEqual(Event.objects.filter(dt__gte=dt2).count(), 1)
         self.assertEqual(Event.objects.filter(dt__gt=dt2).count(), 0)
 
-    def test_query_date_related_filters(self):
+    def test_query_datetime_lookups(self):
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0))
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0))
         self.assertEqual(Event.objects.filter(dt__year=2011).count(), 2)
         self.assertEqual(Event.objects.filter(dt__month=1).count(), 2)
         self.assertEqual(Event.objects.filter(dt__day=1).count(), 2)
         self.assertEqual(Event.objects.filter(dt__week_day=7).count(), 2)
+        self.assertEqual(Event.objects.filter(dt__hour=1).count(), 1)
+        self.assertEqual(Event.objects.filter(dt__minute=30).count(), 2)
+        self.assertEqual(Event.objects.filter(dt__second=0).count(), 2)
 
     def test_query_aggregation(self):
         # Only min and max make sense for datetimes.
@@ -229,15 +233,30 @@ class LegacyDatabaseTests(TestCase):
                 [afternoon_min_dt],
                 transform=lambda d: d.dt)
 
-    def test_query_dates(self):
+    def test_query_datetimes(self):
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0))
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0))
-        self.assertQuerysetEqual(Event.objects.dates('dt', 'year'),
-                [datetime.datetime(2011, 1, 1)], transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.dates('dt', 'month'),
-                [datetime.datetime(2011, 1, 1)], transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.dates('dt', 'day'),
-                [datetime.datetime(2011, 1, 1)], transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'year'),
+                [datetime.datetime(2011, 1, 1, 0, 0, 0)],
+                transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'month'),
+                [datetime.datetime(2011, 1, 1, 0, 0, 0)],
+                transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'day'),
+                [datetime.datetime(2011, 1, 1, 0, 0, 0)],
+                transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'hour'),
+                [datetime.datetime(2011, 1, 1, 1, 0, 0),
+                 datetime.datetime(2011, 1, 1, 4, 0, 0)],
+                transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'minute'),
+                [datetime.datetime(2011, 1, 1, 1, 30, 0),
+                 datetime.datetime(2011, 1, 1, 4, 30, 0)],
+                transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'second'),
+                [datetime.datetime(2011, 1, 1, 1, 30, 0),
+                 datetime.datetime(2011, 1, 1, 4, 30, 0)],
+                transform=lambda d: d)
 
     def test_raw_sql(self):
         # Regression test for #17755
@@ -397,17 +416,32 @@ class NewDatabaseTests(TestCase):
                 msg = str(warning.message)
                 self.assertTrue(msg.startswith("DateTimeField received a naive datetime"))
 
-    def test_query_date_related_filters(self):
-        # These two dates fall in the same day in EAT, but in different days,
-        # years and months in UTC, and aggregation is performed in UTC when
-        # time zone support is enabled. This test could be changed if the
-        # implementation is changed to perform the aggregation is local time.
+    @skipUnlessDBFeature('has_zoneinfo_database')
+    def test_query_datetime_lookups(self):
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT))
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT))
-        self.assertEqual(Event.objects.filter(dt__year=2011).count(), 1)
-        self.assertEqual(Event.objects.filter(dt__month=1).count(), 1)
-        self.assertEqual(Event.objects.filter(dt__day=1).count(), 1)
-        self.assertEqual(Event.objects.filter(dt__week_day=7).count(), 1)
+        self.assertEqual(Event.objects.filter(dt__year=2011).count(), 2)
+        self.assertEqual(Event.objects.filter(dt__month=1).count(), 2)
+        self.assertEqual(Event.objects.filter(dt__day=1).count(), 2)
+        self.assertEqual(Event.objects.filter(dt__week_day=7).count(), 2)
+        self.assertEqual(Event.objects.filter(dt__hour=1).count(), 1)
+        self.assertEqual(Event.objects.filter(dt__minute=30).count(), 2)
+        self.assertEqual(Event.objects.filter(dt__second=0).count(), 2)
+
+    @skipUnlessDBFeature('has_zoneinfo_database')
+    def test_query_datetime_lookups_in_other_timezone(self):
+        Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT))
+        Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT))
+        with timezone.override(UTC):
+            # These two dates fall in the same day in EAT, but in different days,
+            # years and months in UTC.
+            self.assertEqual(Event.objects.filter(dt__year=2011).count(), 1)
+            self.assertEqual(Event.objects.filter(dt__month=1).count(), 1)
+            self.assertEqual(Event.objects.filter(dt__day=1).count(), 1)
+            self.assertEqual(Event.objects.filter(dt__week_day=7).count(), 1)
+            self.assertEqual(Event.objects.filter(dt__hour=22).count(), 1)
+            self.assertEqual(Event.objects.filter(dt__minute=30).count(), 2)
+            self.assertEqual(Event.objects.filter(dt__second=0).count(), 2)
 
     def test_query_aggregation(self):
         # Only min and max make sense for datetimes.
@@ -442,22 +476,61 @@ class NewDatabaseTests(TestCase):
                 [afternoon_min_dt],
                 transform=lambda d: d.dt)
 
-    def test_query_dates(self):
-        # Same comment as in test_query_date_related_filters.
+    @skipUnlessDBFeature('has_zoneinfo_database')
+    def test_query_datetimes(self):
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT))
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT))
-        self.assertQuerysetEqual(Event.objects.dates('dt', 'year'),
-                [datetime.datetime(2010, 1, 1, tzinfo=UTC),
-                 datetime.datetime(2011, 1, 1, tzinfo=UTC)],
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'year'),
+                [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
                 transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.dates('dt', 'month'),
-                [datetime.datetime(2010, 12, 1, tzinfo=UTC),
-                 datetime.datetime(2011, 1, 1, tzinfo=UTC)],
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'month'),
+                [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
                 transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.dates('dt', 'day'),
-                [datetime.datetime(2010, 12, 31, tzinfo=UTC),
-                 datetime.datetime(2011, 1, 1, tzinfo=UTC)],
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'day'),
+                [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
                 transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'hour'),
+                [datetime.datetime(2011, 1, 1, 1, 0, 0, tzinfo=EAT),
+                 datetime.datetime(2011, 1, 1, 4, 0, 0, tzinfo=EAT)],
+                transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'minute'),
+                [datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT),
+                 datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT)],
+                transform=lambda d: d)
+        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'second'),
+                [datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT),
+                 datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT)],
+                transform=lambda d: d)
+
+    @skipUnlessDBFeature('has_zoneinfo_database')
+    def test_query_datetimes_in_other_timezone(self):
+        Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT))
+        Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT))
+        with timezone.override(UTC):
+            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'year'),
+                    [datetime.datetime(2010, 1, 1, 0, 0, 0, tzinfo=UTC),
+                     datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
+                    transform=lambda d: d)
+            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'month'),
+                    [datetime.datetime(2010, 12, 1, 0, 0, 0, tzinfo=UTC),
+                     datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
+                    transform=lambda d: d)
+            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'day'),
+                    [datetime.datetime(2010, 12, 31, 0, 0, 0, tzinfo=UTC),
+                     datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
+                    transform=lambda d: d)
+            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'hour'),
+                    [datetime.datetime(2010, 12, 31, 22, 0, 0, tzinfo=UTC),
+                     datetime.datetime(2011, 1, 1, 1, 0, 0, tzinfo=UTC)],
+                    transform=lambda d: d)
+            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'minute'),
+                    [datetime.datetime(2010, 12, 31, 22, 30, 0, tzinfo=UTC),
+                     datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=UTC)],
+                    transform=lambda d: d)
+            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'second'),
+                    [datetime.datetime(2010, 12, 31, 22, 30, 0, tzinfo=UTC),
+                     datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=UTC)],
+                    transform=lambda d: d)
 
     def test_raw_sql(self):
         # Regression test for #17755
@@ -504,7 +577,9 @@ class SerializationTests(TestCase):
         self.assertXMLEqual(field.childNodes[0].wholeText, dt)
 
     def assert_yaml_contains_datetime(self, yaml, dt):
-        self.assertIn("- fields: {dt: !!timestamp '%s'}" % dt, yaml)
+        # Depending on the yaml dumper, '!timestamp' might be absent
+        six.assertRegex(self, yaml,
+            r"- fields: {dt: !(!timestamp)? '%s'}" % re.escape(dt))
 
     def test_naive_datetime(self):
         dt = datetime.datetime(2011, 9, 1, 13, 20, 30)
@@ -972,7 +1047,7 @@ class NewFormsTests(TestCase):
                   PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminTests(TestCase):
 
-    urls = 'modeltests.timezones.urls'
+    urls = 'timezones.urls'
     fixtures = ['tz_users.xml']
 
     def setUp(self):
diff --git a/tests/modeltests/timezones/urls.py b/tests/timezones/urls.py
similarity index 100%
rename from tests/modeltests/timezones/urls.py
rename to tests/timezones/urls.py
diff --git a/tests/regressiontests/many_to_one_regress/__init__.py b/tests/transactions/__init__.py
similarity index 100%
rename from tests/regressiontests/many_to_one_regress/__init__.py
rename to tests/transactions/__init__.py
diff --git a/tests/modeltests/transactions/models.py b/tests/transactions/models.py
similarity index 90%
rename from tests/modeltests/transactions/models.py
rename to tests/transactions/models.py
index 0f8d6b16ec..6c2bcfd23f 100644
--- a/tests/modeltests/transactions/models.py
+++ b/tests/transactions/models.py
@@ -22,4 +22,4 @@ class Reporter(models.Model):
         ordering = ('first_name', 'last_name')
 
     def __str__(self):
-        return "%s %s" % (self.first_name, self.last_name)
+        return ("%s %s" % (self.first_name, self.last_name)).strip()
diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py
new file mode 100644
index 0000000000..aeb9bc3d2c
--- /dev/null
+++ b/tests/transactions/tests.py
@@ -0,0 +1,635 @@
+from __future__ import absolute_import
+
+import sys
+import warnings
+
+from django.db import connection, transaction, IntegrityError
+from django.test import TransactionTestCase, skipUnlessDBFeature
+from django.utils import six
+from django.utils.unittest import skipIf, skipUnless
+
+from .models import Reporter
+
+
+@skipUnless(connection.features.uses_savepoints,
+        "'atomic' requires transactions and savepoints.")
+class AtomicTests(TransactionTestCase):
+    """
+    Tests for the atomic decorator and context manager.
+
+    The tests make assertions on internal attributes because there isn't a
+    robust way to ask the database for its current transaction state.
+
+    Since the decorator syntax is converted into a context manager (see the
+    implementation), there are only a few basic tests with the decorator
+    syntax and the bulk of the tests use the context manager syntax.
+    """
+
+    def test_decorator_syntax_commit(self):
+        @transaction.atomic
+        def make_reporter():
+            Reporter.objects.create(first_name="Tintin")
+        make_reporter()
+        self.assertQuerysetEqual(Reporter.objects.all(), ['<Reporter: Tintin>'])
+
+    def test_decorator_syntax_rollback(self):
+        @transaction.atomic
+        def make_reporter():
+            Reporter.objects.create(first_name="Haddock")
+            raise Exception("Oops, that's his last name")
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            make_reporter()
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_alternate_decorator_syntax_commit(self):
+        @transaction.atomic()
+        def make_reporter():
+            Reporter.objects.create(first_name="Tintin")
+        make_reporter()
+        self.assertQuerysetEqual(Reporter.objects.all(), ['<Reporter: Tintin>'])
+
+    def test_alternate_decorator_syntax_rollback(self):
+        @transaction.atomic()
+        def make_reporter():
+            Reporter.objects.create(first_name="Haddock")
+            raise Exception("Oops, that's his last name")
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            make_reporter()
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_commit(self):
+        with transaction.atomic():
+            Reporter.objects.create(first_name="Tintin")
+        self.assertQuerysetEqual(Reporter.objects.all(), ['<Reporter: Tintin>'])
+
+    def test_rollback(self):
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            with transaction.atomic():
+                Reporter.objects.create(first_name="Haddock")
+                raise Exception("Oops, that's his last name")
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_nested_commit_commit(self):
+        with transaction.atomic():
+            Reporter.objects.create(first_name="Tintin")
+            with transaction.atomic():
+                Reporter.objects.create(first_name="Archibald", last_name="Haddock")
+        self.assertQuerysetEqual(Reporter.objects.all(),
+                ['<Reporter: Archibald Haddock>', '<Reporter: Tintin>'])
+
+    def test_nested_commit_rollback(self):
+        with transaction.atomic():
+            Reporter.objects.create(first_name="Tintin")
+            with six.assertRaisesRegex(self, Exception, "Oops"):
+                with transaction.atomic():
+                    Reporter.objects.create(first_name="Haddock")
+                    raise Exception("Oops, that's his last name")
+        self.assertQuerysetEqual(Reporter.objects.all(), ['<Reporter: Tintin>'])
+
+    def test_nested_rollback_commit(self):
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            with transaction.atomic():
+                Reporter.objects.create(last_name="Tintin")
+                with transaction.atomic():
+                    Reporter.objects.create(last_name="Haddock")
+                raise Exception("Oops, that's his first name")
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_nested_rollback_rollback(self):
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            with transaction.atomic():
+                Reporter.objects.create(last_name="Tintin")
+                with six.assertRaisesRegex(self, Exception, "Oops"):
+                    with transaction.atomic():
+                        Reporter.objects.create(first_name="Haddock")
+                    raise Exception("Oops, that's his last name")
+                raise Exception("Oops, that's his first name")
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_merged_commit_commit(self):
+        with transaction.atomic():
+            Reporter.objects.create(first_name="Tintin")
+            with transaction.atomic(savepoint=False):
+                Reporter.objects.create(first_name="Archibald", last_name="Haddock")
+        self.assertQuerysetEqual(Reporter.objects.all(),
+                ['<Reporter: Archibald Haddock>', '<Reporter: Tintin>'])
+
+    def test_merged_commit_rollback(self):
+        with transaction.atomic():
+            Reporter.objects.create(first_name="Tintin")
+            with six.assertRaisesRegex(self, Exception, "Oops"):
+                with transaction.atomic(savepoint=False):
+                    Reporter.objects.create(first_name="Haddock")
+                    raise Exception("Oops, that's his last name")
+        # Writes in the outer block are rolled back too.
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_merged_rollback_commit(self):
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            with transaction.atomic():
+                Reporter.objects.create(last_name="Tintin")
+                with transaction.atomic(savepoint=False):
+                    Reporter.objects.create(last_name="Haddock")
+                raise Exception("Oops, that's his first name")
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_merged_rollback_rollback(self):
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            with transaction.atomic():
+                Reporter.objects.create(last_name="Tintin")
+                with six.assertRaisesRegex(self, Exception, "Oops"):
+                    with transaction.atomic(savepoint=False):
+                        Reporter.objects.create(first_name="Haddock")
+                    raise Exception("Oops, that's his last name")
+                raise Exception("Oops, that's his first name")
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_reuse_commit_commit(self):
+        atomic = transaction.atomic()
+        with atomic:
+            Reporter.objects.create(first_name="Tintin")
+            with atomic:
+                Reporter.objects.create(first_name="Archibald", last_name="Haddock")
+        self.assertQuerysetEqual(Reporter.objects.all(),
+                ['<Reporter: Archibald Haddock>', '<Reporter: Tintin>'])
+
+    def test_reuse_commit_rollback(self):
+        atomic = transaction.atomic()
+        with atomic:
+            Reporter.objects.create(first_name="Tintin")
+            with six.assertRaisesRegex(self, Exception, "Oops"):
+                with atomic:
+                    Reporter.objects.create(first_name="Haddock")
+                    raise Exception("Oops, that's his last name")
+        self.assertQuerysetEqual(Reporter.objects.all(), ['<Reporter: Tintin>'])
+
+    def test_reuse_rollback_commit(self):
+        atomic = transaction.atomic()
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            with atomic:
+                Reporter.objects.create(last_name="Tintin")
+                with atomic:
+                    Reporter.objects.create(last_name="Haddock")
+                raise Exception("Oops, that's his first name")
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_reuse_rollback_rollback(self):
+        atomic = transaction.atomic()
+        with six.assertRaisesRegex(self, Exception, "Oops"):
+            with atomic:
+                Reporter.objects.create(last_name="Tintin")
+                with six.assertRaisesRegex(self, Exception, "Oops"):
+                    with atomic:
+                        Reporter.objects.create(first_name="Haddock")
+                    raise Exception("Oops, that's his last name")
+                raise Exception("Oops, that's his first name")
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+
+class AtomicInsideTransactionTests(AtomicTests):
+    """All basic tests for atomic should also pass within an existing transaction."""
+
+    def setUp(self):
+        self.atomic = transaction.atomic()
+        self.atomic.__enter__()
+
+    def tearDown(self):
+        self.atomic.__exit__(*sys.exc_info())
+
+
+@skipIf(connection.features.autocommits_when_autocommit_is_off,
+        "This test requires a non-autocommit mode that doesn't autocommit.")
+class AtomicWithoutAutocommitTests(AtomicTests):
+    """All basic tests for atomic should also pass when autocommit is turned off."""
+
+    def setUp(self):
+        transaction.set_autocommit(False)
+
+    def tearDown(self):
+        # The tests access the database after exercising 'atomic', initiating
+        # a transaction ; a rollback is required before restoring autocommit.
+        transaction.rollback()
+        transaction.set_autocommit(True)
+
+
+@skipIf(connection.features.autocommits_when_autocommit_is_off,
+        "This test requires a non-autocommit mode that doesn't autocommit.")
+class AtomicInsideLegacyTransactionManagementTests(AtomicTests):
+
+    def setUp(self):
+        transaction.enter_transaction_management()
+
+    def tearDown(self):
+        # The tests access the database after exercising 'atomic', making the
+        # connection dirty; a rollback is required to make it clean.
+        transaction.rollback()
+        transaction.leave_transaction_management()
+
+
+@skipUnless(connection.features.uses_savepoints,
+        "'atomic' requires transactions and savepoints.")
+class AtomicMergeTests(TransactionTestCase):
+    """Test merging transactions with savepoint=False."""
+
+    def test_merged_outer_rollback(self):
+        with transaction.atomic():
+            Reporter.objects.create(first_name="Tintin")
+            with transaction.atomic(savepoint=False):
+                Reporter.objects.create(first_name="Archibald", last_name="Haddock")
+                with six.assertRaisesRegex(self, Exception, "Oops"):
+                    with transaction.atomic(savepoint=False):
+                        Reporter.objects.create(first_name="Tournesol")
+                        raise Exception("Oops, that's his last name")
+                # It wasn't possible to roll back
+                self.assertEqual(Reporter.objects.count(), 3)
+            # It wasn't possible to roll back
+            self.assertEqual(Reporter.objects.count(), 3)
+        # The outer block must roll back
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    def test_merged_inner_savepoint_rollback(self):
+        with transaction.atomic():
+            Reporter.objects.create(first_name="Tintin")
+            with transaction.atomic():
+                Reporter.objects.create(first_name="Archibald", last_name="Haddock")
+                with six.assertRaisesRegex(self, Exception, "Oops"):
+                    with transaction.atomic(savepoint=False):
+                        Reporter.objects.create(first_name="Tournesol")
+                        raise Exception("Oops, that's his last name")
+                # It wasn't possible to roll back
+                self.assertEqual(Reporter.objects.count(), 3)
+            # The first block with a savepoint must roll back
+            self.assertEqual(Reporter.objects.count(), 1)
+        self.assertQuerysetEqual(Reporter.objects.all(), ['<Reporter: Tintin>'])
+
+    def test_merged_outer_rollback_after_inner_failure_and_inner_success(self):
+        with transaction.atomic():
+            Reporter.objects.create(first_name="Tintin")
+            # Inner block without a savepoint fails
+            with six.assertRaisesRegex(self, Exception, "Oops"):
+                with transaction.atomic(savepoint=False):
+                    Reporter.objects.create(first_name="Haddock")
+                    raise Exception("Oops, that's his last name")
+            # It wasn't possible to roll back
+            self.assertEqual(Reporter.objects.count(), 2)
+            # Inner block with a savepoint succeeds
+            with transaction.atomic(savepoint=False):
+                Reporter.objects.create(first_name="Archibald", last_name="Haddock")
+            # It still wasn't possible to roll back
+            self.assertEqual(Reporter.objects.count(), 3)
+        # The outer block must rollback
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+
+@skipUnless(connection.features.uses_savepoints,
+        "'atomic' requires transactions and savepoints.")
+class AtomicErrorsTests(TransactionTestCase):
+
+    def test_atomic_prevents_setting_autocommit(self):
+        autocommit = transaction.get_autocommit()
+        with transaction.atomic():
+            with self.assertRaises(transaction.TransactionManagementError):
+                transaction.set_autocommit(not autocommit)
+        # Make sure autocommit wasn't changed.
+        self.assertEqual(connection.autocommit, autocommit)
+
+    def test_atomic_prevents_calling_transaction_methods(self):
+        with transaction.atomic():
+            with self.assertRaises(transaction.TransactionManagementError):
+                transaction.commit()
+            with self.assertRaises(transaction.TransactionManagementError):
+                transaction.rollback()
+
+    def test_atomic_prevents_calling_transaction_management_methods(self):
+        with transaction.atomic():
+            with self.assertRaises(transaction.TransactionManagementError):
+                transaction.enter_transaction_management()
+            with self.assertRaises(transaction.TransactionManagementError):
+                transaction.leave_transaction_management()
+
+
+class AtomicMiscTests(TransactionTestCase):
+
+    def test_wrap_callable_instance(self):
+        # Regression test for #20028
+        class Callable(object):
+            def __call__(self):
+                pass
+        # Must not raise an exception
+        transaction.atomic(Callable())
+
+
+class IgnorePendingDeprecationWarningsMixin(object):
+
+    def setUp(self):
+        super(IgnorePendingDeprecationWarningsMixin, self).setUp()
+        self.catch_warnings = warnings.catch_warnings()
+        self.catch_warnings.__enter__()
+        warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
+
+    def tearDown(self):
+        self.catch_warnings.__exit__(*sys.exc_info())
+        super(IgnorePendingDeprecationWarningsMixin, self).tearDown()
+
+
+class TransactionTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+
+    def create_a_reporter_then_fail(self, first, last):
+        a = Reporter(first_name=first, last_name=last)
+        a.save()
+        raise Exception("I meant to do that")
+
+    def remove_a_reporter(self, first_name):
+        r = Reporter.objects.get(first_name="Alice")
+        r.delete()
+
+    def manually_managed(self):
+        r = Reporter(first_name="Dirk", last_name="Gently")
+        r.save()
+        transaction.commit()
+
+    def manually_managed_mistake(self):
+        r = Reporter(first_name="Edward", last_name="Woodward")
+        r.save()
+        # Oops, I forgot to commit/rollback!
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_autocommit(self):
+        """
+        The default behavior is to autocommit after each save() action.
+        """
+        self.assertRaises(Exception,
+            self.create_a_reporter_then_fail,
+            "Alice", "Smith"
+        )
+
+        # The object created before the exception still exists
+        self.assertEqual(Reporter.objects.count(), 1)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_autocommit_decorator(self):
+        """
+        The autocommit decorator works exactly the same as the default behavior.
+        """
+        autocomitted_create_then_fail = transaction.autocommit(
+            self.create_a_reporter_then_fail
+        )
+        self.assertRaises(Exception,
+            autocomitted_create_then_fail,
+            "Alice", "Smith"
+        )
+        # Again, the object created before the exception still exists
+        self.assertEqual(Reporter.objects.count(), 1)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_autocommit_decorator_with_using(self):
+        """
+        The autocommit decorator also works with a using argument.
+        """
+        autocomitted_create_then_fail = transaction.autocommit(using='default')(
+            self.create_a_reporter_then_fail
+        )
+        self.assertRaises(Exception,
+            autocomitted_create_then_fail,
+            "Alice", "Smith"
+        )
+        # Again, the object created before the exception still exists
+        self.assertEqual(Reporter.objects.count(), 1)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success(self):
+        """
+        With the commit_on_success decorator, the transaction is only committed
+        if the function doesn't throw an exception.
+        """
+        committed_on_success = transaction.commit_on_success(
+            self.create_a_reporter_then_fail)
+        self.assertRaises(Exception, committed_on_success, "Dirk", "Gently")
+        # This time the object never got saved
+        self.assertEqual(Reporter.objects.count(), 0)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success_with_using(self):
+        """
+        The commit_on_success decorator also works with a using argument.
+        """
+        using_committed_on_success = transaction.commit_on_success(using='default')(
+            self.create_a_reporter_then_fail
+        )
+        self.assertRaises(Exception,
+            using_committed_on_success,
+            "Dirk", "Gently"
+        )
+        # This time the object never got saved
+        self.assertEqual(Reporter.objects.count(), 0)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success_succeed(self):
+        """
+        If there aren't any exceptions, the data will get saved.
+        """
+        Reporter.objects.create(first_name="Alice", last_name="Smith")
+        remove_comitted_on_success = transaction.commit_on_success(
+            self.remove_a_reporter
+        )
+        remove_comitted_on_success("Alice")
+        self.assertEqual(list(Reporter.objects.all()), [])
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success_exit(self):
+        @transaction.autocommit()
+        def gen_reporter():
+            @transaction.commit_on_success
+            def create_reporter():
+                Reporter.objects.create(first_name="Bobby", last_name="Tables")
+
+            create_reporter()
+            # Much more formal
+            r = Reporter.objects.get()
+            r.first_name = "Robert"
+            r.save()
+
+        gen_reporter()
+        r = Reporter.objects.get()
+        self.assertEqual(r.first_name, "Robert")
+
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_manually_managed(self):
+        """
+        You can manually manage transactions if you really want to, but you
+        have to remember to commit/rollback.
+        """
+        manually_managed = transaction.commit_manually(self.manually_managed)
+        manually_managed()
+        self.assertEqual(Reporter.objects.count(), 1)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_manually_managed_mistake(self):
+        """
+        If you forget, you'll get bad errors.
+        """
+        manually_managed_mistake = transaction.commit_manually(
+            self.manually_managed_mistake
+        )
+        self.assertRaises(transaction.TransactionManagementError,
+            manually_managed_mistake)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_manually_managed_with_using(self):
+        """
+        The commit_manually function also works with a using argument.
+        """
+        using_manually_managed_mistake = transaction.commit_manually(using='default')(
+            self.manually_managed_mistake
+        )
+        self.assertRaises(transaction.TransactionManagementError,
+            using_manually_managed_mistake
+        )
+
+
+class TransactionRollbackTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+    def execute_bad_sql(self):
+        cursor = connection.cursor()
+        cursor.execute("INSERT INTO transactions_reporter (first_name, last_name) VALUES ('Douglas', 'Adams');")
+
+    @skipUnlessDBFeature('requires_rollback_on_dirty_transaction')
+    def test_bad_sql(self):
+        """
+        Regression for #11900: If a function wrapped by commit_on_success
+        writes a transaction that can't be committed, that transaction should
+        be rolled back. The bug is only visible using the psycopg2 backend,
+        though the fix is generally a good idea.
+        """
+        execute_bad_sql = transaction.commit_on_success(self.execute_bad_sql)
+        self.assertRaises(IntegrityError, execute_bad_sql)
+        transaction.rollback()
+
+class TransactionContextManagerTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+    def create_reporter_and_fail(self):
+        Reporter.objects.create(first_name="Bob", last_name="Holtzman")
+        raise Exception
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_autocommit(self):
+        """
+        The default behavior is to autocommit after each save() action.
+        """
+        with self.assertRaises(Exception):
+            self.create_reporter_and_fail()
+        # The object created before the exception still exists
+        self.assertEqual(Reporter.objects.count(), 1)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_autocommit_context_manager(self):
+        """
+        The autocommit context manager works exactly the same as the default
+        behavior.
+        """
+        with self.assertRaises(Exception):
+            with transaction.autocommit():
+                self.create_reporter_and_fail()
+
+        self.assertEqual(Reporter.objects.count(), 1)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_autocommit_context_manager_with_using(self):
+        """
+        The autocommit context manager also works with a using argument.
+        """
+        with self.assertRaises(Exception):
+            with transaction.autocommit(using="default"):
+                self.create_reporter_and_fail()
+
+        self.assertEqual(Reporter.objects.count(), 1)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success(self):
+        """
+        With the commit_on_success context manager, the transaction is only
+        committed if the block doesn't throw an exception.
+        """
+        with self.assertRaises(Exception):
+            with transaction.commit_on_success():
+                self.create_reporter_and_fail()
+
+        self.assertEqual(Reporter.objects.count(), 0)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success_with_using(self):
+        """
+        The commit_on_success context manager also works with a using argument.
+        """
+        with self.assertRaises(Exception):
+            with transaction.commit_on_success(using="default"):
+                self.create_reporter_and_fail()
+
+        self.assertEqual(Reporter.objects.count(), 0)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success_succeed(self):
+        """
+        If there aren't any exceptions, the data will get saved.
+        """
+        Reporter.objects.create(first_name="Alice", last_name="Smith")
+        with transaction.commit_on_success():
+            Reporter.objects.filter(first_name="Alice").delete()
+
+        self.assertQuerysetEqual(Reporter.objects.all(), [])
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_commit_on_success_exit(self):
+        with transaction.autocommit():
+            with transaction.commit_on_success():
+                Reporter.objects.create(first_name="Bobby", last_name="Tables")
+
+            # Much more formal
+            r = Reporter.objects.get()
+            r.first_name = "Robert"
+            r.save()
+
+        r = Reporter.objects.get()
+        self.assertEqual(r.first_name, "Robert")
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_manually_managed(self):
+        """
+        You can manually manage transactions if you really want to, but you
+        have to remember to commit/rollback.
+        """
+        with transaction.commit_manually():
+            Reporter.objects.create(first_name="Libby", last_name="Holtzman")
+            transaction.commit()
+        self.assertEqual(Reporter.objects.count(), 1)
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_manually_managed_mistake(self):
+        """
+        If you forget, you'll get bad errors.
+        """
+        with self.assertRaises(transaction.TransactionManagementError):
+            with transaction.commit_manually():
+                Reporter.objects.create(first_name="Scott", last_name="Browning")
+
+    @skipUnlessDBFeature('supports_transactions')
+    def test_manually_managed_with_using(self):
+        """
+        The commit_manually function also works with a using argument.
+        """
+        with self.assertRaises(transaction.TransactionManagementError):
+            with transaction.commit_manually(using="default"):
+                Reporter.objects.create(first_name="Walter", last_name="Cronkite")
+
+    @skipUnlessDBFeature('requires_rollback_on_dirty_transaction')
+    def test_bad_sql(self):
+        """
+        Regression for #11900: If a block wrapped by commit_on_success
+        writes a transaction that can't be committed, that transaction should
+        be rolled back. The bug is only visible using the psycopg2 backend,
+        though the fix is generally a good idea.
+        """
+        with self.assertRaises(IntegrityError):
+            with transaction.commit_on_success():
+                cursor = connection.cursor()
+                cursor.execute("INSERT INTO transactions_reporter (first_name, last_name) VALUES ('Douglas', 'Adams');")
+        transaction.rollback()
diff --git a/tests/regressiontests/middleware/__init__.py b/tests/transactions_regress/__init__.py
similarity index 100%
rename from tests/regressiontests/middleware/__init__.py
rename to tests/transactions_regress/__init__.py
diff --git a/tests/regressiontests/transactions_regress/models.py b/tests/transactions_regress/models.py
similarity index 76%
rename from tests/regressiontests/transactions_regress/models.py
rename to tests/transactions_regress/models.py
index e8bca8ada2..e09e81d93d 100644
--- a/tests/regressiontests/transactions_regress/models.py
+++ b/tests/transactions_regress/models.py
@@ -1,10 +1,15 @@
 from django.db import models
 
+
 class Mod(models.Model):
     fld = models.IntegerField()
 
+class SubMod(Mod):
+    cnt = models.IntegerField(unique=True)
+
 class M2mA(models.Model):
     others = models.ManyToManyField('M2mB')
 
+
 class M2mB(models.Model):
     fld = models.IntegerField()
diff --git a/tests/regressiontests/transactions_regress/tests.py b/tests/transactions_regress/tests.py
similarity index 58%
rename from tests/regressiontests/transactions_regress/tests.py
rename to tests/transactions_regress/tests.py
index 5d1ab2c6f6..fb3f257dab 100644
--- a/tests/regressiontests/transactions_regress/tests.py
+++ b/tests/transactions_regress/tests.py
@@ -1,15 +1,35 @@
 from __future__ import absolute_import
 
-from django.db import connection, connections, transaction, DEFAULT_DB_ALIAS, DatabaseError
+from django.db import (connection, connections, transaction, DEFAULT_DB_ALIAS, DatabaseError,
+                       IntegrityError)
 from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError
 from django.test import TransactionTestCase, skipUnlessDBFeature
 from django.test.utils import override_settings
 from django.utils.unittest import skipIf, skipUnless
 
-from .models import Mod, M2mA, M2mB
+from transactions.tests import IgnorePendingDeprecationWarningsMixin
 
+from .models import Mod, M2mA, M2mB, SubMod
 
-class TestTransactionClosing(TransactionTestCase):
+class ModelInheritanceTests(TransactionTestCase):
+    def test_save(self):
+        # First, create a SubMod, then try to save another with conflicting
+        # cnt field. The problem was that transactions were committed after
+        # every parent save when not in managed transaction. As the cnt
+        # conflict is in the second model, we can check if the first save
+        # was committed or not.
+        SubMod(fld=1, cnt=1).save()
+        # We should have committed the transaction for the above - assert this.
+        connection.rollback()
+        self.assertEqual(SubMod.objects.count(), 1)
+        try:
+            SubMod(fld=2, cnt=1).save()
+        except IntegrityError:
+            connection.rollback()
+        self.assertEqual(SubMod.objects.count(), 1)
+        self.assertEqual(Mod.objects.count(), 1)
+
+class TestTransactionClosing(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
     """
     Tests to make sure that transactions are properly closed
     when they should be, and aren't left pending after operations
@@ -42,7 +62,7 @@ class TestTransactionClosing(TransactionTestCase):
         @commit_manually
         def non_comitter():
             "Execute a managed transaction with read-only operations and fail to commit"
-            _ = Mod.objects.count()
+            Mod.objects.count()
 
         self.assertRaises(TransactionManagementError, non_comitter)
 
@@ -56,7 +76,7 @@ class TestTransactionClosing(TransactionTestCase):
             """
             Perform a database query, then commit the transaction
             """
-            _ = Mod.objects.count()
+            Mod.objects.count()
             transaction.commit()
 
         try:
@@ -74,7 +94,7 @@ class TestTransactionClosing(TransactionTestCase):
             """
             Perform a database query, then rollback the transaction
             """
-            _ = Mod.objects.count()
+            Mod.objects.count()
             transaction.rollback()
 
         try:
@@ -90,9 +110,9 @@ class TestTransactionClosing(TransactionTestCase):
         @commit_manually
         def fake_committer():
             "Query, commit, then query again, leaving with a pending transaction"
-            _ = Mod.objects.count()
+            Mod.objects.count()
             transaction.commit()
-            _ = Mod.objects.count()
+            Mod.objects.count()
 
         self.assertRaises(TransactionManagementError, fake_committer)
 
@@ -138,7 +158,8 @@ class TestTransactionClosing(TransactionTestCase):
         @transaction.commit_on_success
         def create_system_user():
             "Create a user in a transaction"
-            user = User.objects.create_user(username='system', password='iamr00t', email='root@SITENAME.com')
+            user = User.objects.create_user(username='system', password='iamr00t',
+                                            email='root@SITENAME.com')
             # Redundant, just makes sure the user id was read back from DB
             Mod.objects.create(fld=user.pk)
 
@@ -161,61 +182,137 @@ class TestTransactionClosing(TransactionTestCase):
         """
         self.test_failing_query_transaction_closed()
 
+@skipIf(connection.vendor == 'sqlite' and
+        (connection.settings_dict['NAME'] == ':memory:' or
+         not connection.settings_dict['NAME']),
+        'Test uses multiple connections, but in-memory sqlite does not support this')
+class TestNewConnection(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+    """
+    Check that new connections don't have special behaviour.
+    """
+    def setUp(self):
+        self._old_backend = connections[DEFAULT_DB_ALIAS]
+        settings = self._old_backend.settings_dict.copy()
+        new_backend = self._old_backend.__class__(settings, DEFAULT_DB_ALIAS)
+        connections[DEFAULT_DB_ALIAS] = new_backend
+
+    def tearDown(self):
+        try:
+            connections[DEFAULT_DB_ALIAS].abort()
+            connections[DEFAULT_DB_ALIAS].close()
+        finally:
+            connections[DEFAULT_DB_ALIAS] = self._old_backend
+
+    def test_commit(self):
+        """
+        Users are allowed to commit and rollback connections.
+        """
+        connection.set_autocommit(False)
+        try:
+            # The starting value is False, not None.
+            self.assertIs(connection._dirty, False)
+            list(Mod.objects.all())
+            self.assertTrue(connection.is_dirty())
+            connection.commit()
+            self.assertFalse(connection.is_dirty())
+            list(Mod.objects.all())
+            self.assertTrue(connection.is_dirty())
+            connection.rollback()
+            self.assertFalse(connection.is_dirty())
+        finally:
+            connection.set_autocommit(True)
+
+    def test_enter_exit_management(self):
+        orig_dirty = connection._dirty
+        connection.enter_transaction_management()
+        connection.leave_transaction_management()
+        self.assertEqual(orig_dirty, connection._dirty)
+
 
 @skipUnless(connection.vendor == 'postgresql',
             "This test only valid for PostgreSQL")
-class TestPostgresAutocommit(TransactionTestCase):
+class TestPostgresAutocommitAndIsolation(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
     """
-    Tests to make sure psycopg2's autocommit mode is restored after entering
-    and leaving transaction management. Refs #16047.
+    Tests to make sure psycopg2's autocommit mode and isolation level
+    is restored after entering and leaving transaction management.
+    Refs #16047, #18130.
     """
     def setUp(self):
         from psycopg2.extensions import (ISOLATION_LEVEL_AUTOCOMMIT,
-                                         ISOLATION_LEVEL_READ_COMMITTED)
+                                         ISOLATION_LEVEL_SERIALIZABLE,
+                                         TRANSACTION_STATUS_IDLE)
         self._autocommit = ISOLATION_LEVEL_AUTOCOMMIT
-        self._read_committed = ISOLATION_LEVEL_READ_COMMITTED
+        self._serializable = ISOLATION_LEVEL_SERIALIZABLE
+        self._idle = TRANSACTION_STATUS_IDLE
 
         # We want a clean backend with autocommit = True, so
         # first we need to do a bit of work to have that.
         self._old_backend = connections[DEFAULT_DB_ALIAS]
         settings = self._old_backend.settings_dict.copy()
         opts = settings['OPTIONS'].copy()
-        opts['autocommit'] = True
+        opts['isolation_level'] = ISOLATION_LEVEL_SERIALIZABLE
         settings['OPTIONS'] = opts
         new_backend = self._old_backend.__class__(settings, DEFAULT_DB_ALIAS)
         connections[DEFAULT_DB_ALIAS] = new_backend
 
     def tearDown(self):
-        connections[DEFAULT_DB_ALIAS] = self._old_backend
+        try:
+            connections[DEFAULT_DB_ALIAS].abort()
+        finally:
+            connections[DEFAULT_DB_ALIAS].close()
+            connections[DEFAULT_DB_ALIAS] = self._old_backend
 
     def test_initial_autocommit_state(self):
-        self.assertTrue(connection.features.uses_autocommit)
-        self.assertEqual(connection.isolation_level, self._autocommit)
+        # Autocommit is activated when the connection is created.
+        connection.cursor().close()
+        self.assertTrue(connection.autocommit)
 
     def test_transaction_management(self):
         transaction.enter_transaction_management()
-        transaction.managed(True)
-        self.assertEqual(connection.isolation_level, self._read_committed)
+        self.assertFalse(connection.autocommit)
+        self.assertEqual(connection.isolation_level, self._serializable)
 
         transaction.leave_transaction_management()
-        self.assertEqual(connection.isolation_level, self._autocommit)
+        self.assertTrue(connection.autocommit)
 
     def test_transaction_stacking(self):
         transaction.enter_transaction_management()
-        transaction.managed(True)
-        self.assertEqual(connection.isolation_level, self._read_committed)
+        self.assertFalse(connection.autocommit)
+        self.assertEqual(connection.isolation_level, self._serializable)
 
         transaction.enter_transaction_management()
-        self.assertEqual(connection.isolation_level, self._read_committed)
+        self.assertFalse(connection.autocommit)
+        self.assertEqual(connection.isolation_level, self._serializable)
 
         transaction.leave_transaction_management()
-        self.assertEqual(connection.isolation_level, self._read_committed)
+        self.assertFalse(connection.autocommit)
+        self.assertEqual(connection.isolation_level, self._serializable)
 
         transaction.leave_transaction_management()
-        self.assertEqual(connection.isolation_level, self._autocommit)
+        self.assertTrue(connection.autocommit)
+
+    def test_enter_autocommit(self):
+        transaction.enter_transaction_management()
+        self.assertFalse(connection.autocommit)
+        self.assertEqual(connection.isolation_level, self._serializable)
+        list(Mod.objects.all())
+        self.assertTrue(transaction.is_dirty())
+        # Enter autocommit mode again.
+        transaction.enter_transaction_management(False)
+        self.assertFalse(transaction.is_dirty())
+        self.assertEqual(
+            connection.connection.get_transaction_status(),
+            self._idle)
+        list(Mod.objects.all())
+        self.assertFalse(transaction.is_dirty())
+        transaction.leave_transaction_management()
+        self.assertFalse(connection.autocommit)
+        self.assertEqual(connection.isolation_level, self._serializable)
+        transaction.leave_transaction_management()
+        self.assertTrue(connection.autocommit)
 
 
-class TestManyToManyAddTransaction(TransactionTestCase):
+class TestManyToManyAddTransaction(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
     def test_manyrelated_add_commit(self):
         "Test for https://code.djangoproject.com/ticket/16818"
         a = M2mA.objects.create()
@@ -230,8 +327,10 @@ class TestManyToManyAddTransaction(TransactionTestCase):
         self.assertEqual(a.others.count(), 1)
 
 
-class SavepointTest(TransactionTestCase):
+class SavepointTest(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
 
+    @skipIf(connection.vendor == 'sqlite',
+            "SQLite doesn't support savepoints in managed mode")
     @skipUnlessDBFeature('uses_savepoints')
     def test_savepoint_commit(self):
         @commit_manually
@@ -239,7 +338,7 @@ class SavepointTest(TransactionTestCase):
             mod = Mod.objects.create(fld=1)
             pk = mod.pk
             sid = transaction.savepoint()
-            mod1 = Mod.objects.filter(pk=pk).update(fld=10)
+            Mod.objects.filter(pk=pk).update(fld=10)
             transaction.savepoint_commit(sid)
             mod2 = Mod.objects.get(pk=pk)
             transaction.commit()
@@ -247,7 +346,9 @@ class SavepointTest(TransactionTestCase):
 
         work()
 
-    @skipIf(connection.vendor == 'mysql' and \
+    @skipIf(connection.vendor == 'sqlite',
+            "SQLite doesn't support savepoints in managed mode")
+    @skipIf(connection.vendor == 'mysql' and
             connection.features._mysql_storage_engine == 'MyISAM',
             "MyISAM MySQL storage engine doesn't support savepoints")
     @skipUnlessDBFeature('uses_savepoints')
@@ -257,7 +358,7 @@ class SavepointTest(TransactionTestCase):
             mod = Mod.objects.create(fld=1)
             pk = mod.pk
             sid = transaction.savepoint()
-            mod1 = Mod.objects.filter(pk=pk).update(fld=20)
+            Mod.objects.filter(pk=pk).update(fld=20)
             transaction.savepoint_rollback(sid)
             mod2 = Mod.objects.get(pk=pk)
             transaction.commit()
diff --git a/tests/regressiontests/mail/__init__.py b/tests/unmanaged_models/__init__.py
similarity index 100%
rename from tests/regressiontests/mail/__init__.py
rename to tests/unmanaged_models/__init__.py
diff --git a/tests/modeltests/unmanaged_models/models.py b/tests/unmanaged_models/models.py
similarity index 100%
rename from tests/modeltests/unmanaged_models/models.py
rename to tests/unmanaged_models/models.py
diff --git a/tests/modeltests/unmanaged_models/tests.py b/tests/unmanaged_models/tests.py
similarity index 100%
rename from tests/modeltests/unmanaged_models/tests.py
rename to tests/unmanaged_models/tests.py
diff --git a/tests/regressiontests/middleware_exceptions/__init__.py b/tests/update/__init__.py
similarity index 100%
rename from tests/regressiontests/middleware_exceptions/__init__.py
rename to tests/update/__init__.py
diff --git a/tests/modeltests/update/models.py b/tests/update/models.py
similarity index 100%
rename from tests/modeltests/update/models.py
rename to tests/update/models.py
diff --git a/tests/modeltests/update/tests.py b/tests/update/tests.py
similarity index 100%
rename from tests/modeltests/update/tests.py
rename to tests/update/tests.py
diff --git a/tests/regressiontests/model_fields/__init__.py b/tests/update_only_fields/__init__.py
similarity index 100%
rename from tests/regressiontests/model_fields/__init__.py
rename to tests/update_only_fields/__init__.py
diff --git a/tests/modeltests/update_only_fields/models.py b/tests/update_only_fields/models.py
similarity index 100%
rename from tests/modeltests/update_only_fields/models.py
rename to tests/update_only_fields/models.py
diff --git a/tests/modeltests/update_only_fields/tests.py b/tests/update_only_fields/tests.py
similarity index 98%
rename from tests/modeltests/update_only_fields/tests.py
rename to tests/update_only_fields/tests.py
index 9ca0f968d1..97c05ddc79 100644
--- a/tests/modeltests/update_only_fields/tests.py
+++ b/tests/update_only_fields/tests.py
@@ -207,6 +207,9 @@ class UpdateOnlyFieldsTests(TestCase):
         self.assertEqual(len(post_save_data[0]), 1)
         self.assertTrue('name' in post_save_data[0])
 
+        pre_save.disconnect(pre_save_receiver)
+        post_save.disconnect(post_save_receiver)
+
     def test_update_fields_incorrect_params(self):
         s = Person.objects.create(name='Sara', gender='F')
 
@@ -233,6 +236,9 @@ class UpdateOnlyFieldsTests(TestCase):
         self.assertEqual(len(pre_save_data), 0)
         self.assertEqual(len(post_save_data), 0)
 
+        pre_save.disconnect(pre_save_receiver)
+        post_save.disconnect(post_save_receiver)
+
     def test_num_queries_inheritance(self):
         s = Employee.objects.create(name='Sara', gender='F')
         s.employee_num = 1
diff --git a/tests/regressiontests/model_forms_regress/__init__.py b/tests/urlpatterns_reverse/__init__.py
similarity index 100%
rename from tests/regressiontests/model_forms_regress/__init__.py
rename to tests/urlpatterns_reverse/__init__.py
diff --git a/tests/urlpatterns_reverse/erroneous_urls.py b/tests/urlpatterns_reverse/erroneous_urls.py
new file mode 100644
index 0000000000..ac6b6f7cb3
--- /dev/null
+++ b/tests/urlpatterns_reverse/erroneous_urls.py
@@ -0,0 +1,16 @@
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns('',
+    # View has erroneous import
+    url(r'erroneous_inner/$', 'urlpatterns_reverse.views.erroneous_view'),
+    # Module has erroneous import
+    url(r'erroneous_outer/$', 'urlpatterns_reverse.erroneous_views_module.erroneous_view'),
+    # View does not exist
+    url(r'missing_inner/$', 'urlpatterns_reverse.views.missing_view'),
+    # View is not callable
+    url(r'uncallable/$', 'urlpatterns_reverse.views.uncallable'),
+    # Module does not exist
+    url(r'missing_outer/$', 'urlpatterns_reverse.missing_module.missing_view'),
+    # Regex contains an error (refs #6170)
+    url(r'(regex_error/$', 'regressiontestes.urlpatterns_reverse.views.empty_view'),
+)
diff --git a/tests/regressiontests/urlpatterns_reverse/erroneous_views_module.py b/tests/urlpatterns_reverse/erroneous_views_module.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/erroneous_views_module.py
rename to tests/urlpatterns_reverse/erroneous_views_module.py
diff --git a/tests/regressiontests/urlpatterns_reverse/extra_urls.py b/tests/urlpatterns_reverse/extra_urls.py
similarity index 66%
rename from tests/regressiontests/urlpatterns_reverse/extra_urls.py
rename to tests/urlpatterns_reverse/extra_urls.py
index c737f8b5c4..d3a04e6b31 100644
--- a/tests/regressiontests/urlpatterns_reverse/extra_urls.py
+++ b/tests/urlpatterns_reverse/extra_urls.py
@@ -12,6 +12,6 @@ from .views import empty_view
 urlpatterns = patterns('',
     url(r'^e-places/(\d+)/$', empty_view, name='extra-places'),
     url(r'^e-people/(?P<name>\w+)/$', empty_view, name="extra-people"),
-    url('', include('regressiontests.urlpatterns_reverse.included_urls2')),
-    url(r'^prefix/(?P<prefix>\w+)/', include('regressiontests.urlpatterns_reverse.included_urls2')),
+    url('', include('urlpatterns_reverse.included_urls2')),
+    url(r'^prefix/(?P<prefix>\w+)/', include('urlpatterns_reverse.included_urls2')),
 )
diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py b/tests/urlpatterns_reverse/included_named_urls.py
similarity index 78%
rename from tests/regressiontests/urlpatterns_reverse/included_named_urls.py
rename to tests/urlpatterns_reverse/included_named_urls.py
index af03097df1..353aed255e 100644
--- a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
+++ b/tests/urlpatterns_reverse/included_named_urls.py
@@ -9,6 +9,6 @@ urlpatterns = patterns('',
     url(r'^$', empty_view, name="named-url3"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url4"),
     url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
-    (r'^included/', include('regressiontests.urlpatterns_reverse.included_named_urls2')),
+    (r'^included/', include('urlpatterns_reverse.included_named_urls2')),
 )
 
diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py b/tests/urlpatterns_reverse/included_named_urls2.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
rename to tests/urlpatterns_reverse/included_named_urls2.py
diff --git a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py
similarity index 72%
rename from tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
rename to tests/urlpatterns_reverse/included_namespace_urls.py
index 8fe69ab8ed..7a2096ecd9 100644
--- a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
+++ b/tests/urlpatterns_reverse/included_namespace_urls.py
@@ -8,7 +8,7 @@ from .views import view_class_instance
 
 testobj3 = URLObject('testapp', 'test-ns3')
 
-urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
+urlpatterns = patterns('urlpatterns_reverse.views',
     url(r'^normal/$', 'empty_view', name='inc-normal-view'),
     url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-normal-view'),
 
@@ -20,7 +20,7 @@ urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
     url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance, name='inc-view-class'),
 
     (r'^test3/', include(testobj3.urls)),
-    (r'^ns-included3/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns3')),
-    (r'^ns-included4/', include('regressiontests.urlpatterns_reverse.namespace_urls', namespace='inc-ns4')),
+    (r'^ns-included3/', include('urlpatterns_reverse.included_urls', namespace='inc-ns3')),
+    (r'^ns-included4/', include('urlpatterns_reverse.namespace_urls', namespace='inc-ns4')),
 )
 
diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls.py b/tests/urlpatterns_reverse/included_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/included_urls.py
rename to tests/urlpatterns_reverse/included_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls2.py b/tests/urlpatterns_reverse/included_urls2.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/included_urls2.py
rename to tests/urlpatterns_reverse/included_urls2.py
diff --git a/tests/urlpatterns_reverse/middleware.py b/tests/urlpatterns_reverse/middleware.py
new file mode 100644
index 0000000000..fbf577786e
--- /dev/null
+++ b/tests/urlpatterns_reverse/middleware.py
@@ -0,0 +1,35 @@
+from __future__ import absolute_import
+
+from django.core.urlresolvers import reverse
+from django.http import HttpResponse, StreamingHttpResponse
+
+from . import urlconf_inner
+
+
+class ChangeURLconfMiddleware(object):
+    def process_request(self, request):
+        request.urlconf = urlconf_inner.__name__
+
+class NullChangeURLconfMiddleware(object):
+    def process_request(self, request):
+        request.urlconf = None
+
+class ReverseInnerInResponseMiddleware(object):
+    def process_response(self, *args, **kwargs):
+        return HttpResponse(reverse('inner'))
+
+class ReverseOuterInResponseMiddleware(object):
+    def process_response(self, *args, **kwargs):
+        return HttpResponse(reverse('outer'))
+
+class ReverseInnerInStreaming(object):
+    def process_view(self, *args, **kwargs):
+        def stream():
+            yield reverse('inner')
+        return StreamingHttpResponse(stream())
+
+class ReverseOuterInStreaming(object):
+    def process_view(self, *args, **kwargs):
+        def stream():
+            yield reverse('outer')
+        return StreamingHttpResponse(stream())
diff --git a/tests/regressiontests/wsgi/models.py b/tests/urlpatterns_reverse/models.py
similarity index 100%
rename from tests/regressiontests/wsgi/models.py
rename to tests/urlpatterns_reverse/models.py
diff --git a/tests/regressiontests/urlpatterns_reverse/named_urls.py b/tests/urlpatterns_reverse/named_urls.py
similarity index 78%
rename from tests/regressiontests/urlpatterns_reverse/named_urls.py
rename to tests/urlpatterns_reverse/named_urls.py
index 8df336cf4b..3290cab29c 100644
--- a/tests/regressiontests/urlpatterns_reverse/named_urls.py
+++ b/tests/urlpatterns_reverse/named_urls.py
@@ -9,5 +9,5 @@ urlpatterns = patterns('',
     url(r'^$', empty_view, name="named-url1"),
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url2"),
     url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
-    (r'^included/', include('regressiontests.urlpatterns_reverse.included_named_urls')),
+    (r'^included/', include('urlpatterns_reverse.included_named_urls')),
 )
diff --git a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py
similarity index 70%
rename from tests/regressiontests/urlpatterns_reverse/namespace_urls.py
rename to tests/urlpatterns_reverse/namespace_urls.py
index ab2e77af24..cf960070ec 100644
--- a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
+++ b/tests/urlpatterns_reverse/namespace_urls.py
@@ -25,7 +25,7 @@ default_testobj = URLObject('testapp', 'testapp')
 otherobj1 = URLObject('nodefault', 'other-ns1')
 otherobj2 = URLObject('nodefault', 'other-ns2')
 
-urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
+urlpatterns = patterns('urlpatterns_reverse.views',
     url(r'^normal/$', 'empty_view', name='normal-view'),
     url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='normal-view'),
     url(r'^resolver_match/$', 'pass_resolver_match_view', name='test-resolver-match'),
@@ -47,13 +47,13 @@ urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
     (r'^other1/', include(otherobj1.urls)),
     (r'^other[246]/', include(otherobj2.urls)),
 
-    (r'^ns-included[135]/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')),
-    (r'^ns-included2/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')),
+    (r'^ns-included[135]/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')),
+    (r'^ns-included2/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')),
 
-    (r'^included/', include('regressiontests.urlpatterns_reverse.included_namespace_urls')),
-    (r'^inc(?P<outer>\d+)/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns5')),
+    (r'^included/', include('urlpatterns_reverse.included_namespace_urls')),
+    (r'^inc(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls', namespace='inc-ns5')),
 
-    (r'^ns-outer/(?P<outer>\d+)/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
+    (r'^ns-outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
 
-    (r'^\+\\\$\*/', include('regressiontests.urlpatterns_reverse.namespace_urls', namespace='special')),
+    (r'^\+\\\$\*/', include('urlpatterns_reverse.namespace_urls', namespace='special')),
 )
diff --git a/tests/regressiontests/urlpatterns_reverse/no_urls.py b/tests/urlpatterns_reverse/no_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/no_urls.py
rename to tests/urlpatterns_reverse/no_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py b/tests/urlpatterns_reverse/reverse_lazy_urls.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py
rename to tests/urlpatterns_reverse/reverse_lazy_urls.py
diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
similarity index 85%
rename from tests/regressiontests/urlpatterns_reverse/tests.py
rename to tests/urlpatterns_reverse/tests.py
index eb3afe8201..24f96fac7c 100644
--- a/tests/regressiontests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -9,7 +9,7 @@ from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
 from django.core.urlresolvers import (reverse, resolve, get_callable,
     get_resolver, NoReverseMatch, Resolver404, ResolverMatch, RegexURLResolver,
     RegexURLPattern)
-from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
+from django.http import HttpRequest, HttpResponseRedirect, HttpResponsePermanentRedirect
 from django.shortcuts import redirect
 from django.test import TestCase
 from django.utils import unittest, six
@@ -30,8 +30,8 @@ resolve_test_data = (
     ('/included/mixed_args/42/37/', 'inc-mixed-args', None, '', views.empty_view, tuple(), {'arg2': '37'}),
 
     # Unnamed views will be resolved to the function/class name
-    ('/unnamed/normal/42/37/', 'regressiontests.urlpatterns_reverse.views.empty_view', None, '', views.empty_view, tuple(), {'arg1': '42', 'arg2': '37'}),
-    ('/unnamed/view_class/42/37/', 'regressiontests.urlpatterns_reverse.views.ViewClass', None, '', views.view_class_instance, tuple(), {'arg1': '42', 'arg2': '37'}),
+    ('/unnamed/normal/42/37/', 'urlpatterns_reverse.views.empty_view', None, '', views.empty_view, tuple(), {'arg1': '42', 'arg2': '37'}),
+    ('/unnamed/view_class/42/37/', 'urlpatterns_reverse.views.ViewClass', None, '', views.view_class_instance, tuple(), {'arg1': '42', 'arg2': '37'}),
 
     # If you have no kwargs, you get an args list.
     ('/no_kwargs/42/37/', 'no-kwargs', None, '', views.empty_view, ('42','37'), {}),
@@ -97,7 +97,11 @@ test_data = (
     ('product', '/product/chocolate+($2.00)/', [], {'price': '2.00', 'product': 'chocolate'}),
     ('headlines', '/headlines/2007.5.21/', [], dict(year=2007, month=5, day=21)),
     ('windows', r'/windows_path/C:%5CDocuments%20and%20Settings%5Cspam/', [], dict(drive_name='C', path=r'Documents and Settings\spam')),
-    ('special', r'/special_chars/+%5C$*/', [r'+\$*'], {}),
+    ('special', r'/special_chars/%2B%5C%24%2A/', [r'+\$*'], {}),
+    ('special', r'/special_chars/some%20resource/', [r'some resource'], {}),
+    ('special', r'/special_chars/10%25%20complete/', [r'10% complete'], {}),
+    ('special', r'/special_chars/some%20resource/', [], {'chars': r'some resource'}),
+    ('special', r'/special_chars/10%25%20complete/', [], {'chars': r'10% complete'}),
     ('special', NoReverseMatch, [''], {}),
     ('mixed', '/john/0/', [], {'name': 'john'}),
     ('repeats', '/repeats/a/', [], {}),
@@ -131,8 +135,8 @@ test_data = (
     # correct view for the arguments provided.
     ('kwargs_view', '/arg_view/', [], {}),
     ('kwargs_view', '/arg_view/10/', [], {'arg1':10}),
-    ('regressiontests.urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/', [], {}),
-    ('regressiontests.urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/10/', [], {'arg1':10}),
+    ('urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/', [], {}),
+    ('urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/10/', [], {'arg1':10}),
     ('non_path_include', '/includes/non_path_include/', [], {}),
 
     # Tests for #13154
@@ -143,7 +147,7 @@ test_data = (
 )
 
 class NoURLPatternsTests(TestCase):
-    urls = 'regressiontests.urlpatterns_reverse.no_urls'
+    urls = 'urlpatterns_reverse.no_urls'
 
     def test_no_urls_exception(self):
         """
@@ -152,11 +156,11 @@ class NoURLPatternsTests(TestCase):
         resolver = RegexURLResolver(r'^$', self.urls)
 
         self.assertRaisesMessage(ImproperlyConfigured,
-            "The included urlconf regressiontests.urlpatterns_reverse.no_urls "\
+            "The included urlconf urlpatterns_reverse.no_urls "\
             "doesn't have any patterns in it", getattr, resolver, 'url_patterns')
 
 class URLPatternReverse(TestCase):
-    urls = 'regressiontests.urlpatterns_reverse.urls'
+    urls = 'urlpatterns_reverse.urls'
 
     def test_urlpattern_reverse(self):
         for name, expected, args, kwargs in test_data:
@@ -183,6 +187,11 @@ class URLPatternReverse(TestCase):
         self.assertEqual('/bump%2520map/includes/non_path_include/',
                reverse('non_path_include', prefix='/bump%20map/'))
 
+    def test_non_urlsafe_prefix_with_args(self):
+        # Regression for #20022
+        self.assertEqual('/%7Eme/places/1/',
+                reverse('places', args=[1], prefix='/~me/'))
+
 class ResolverTests(unittest.TestCase):
     def test_resolver_repr(self):
         """
@@ -190,7 +199,7 @@ class ResolverTests(unittest.TestCase):
         (#17892).
         """
         # Pick a resolver from a namespaced urlconf
-        resolver = get_resolver('regressiontests.urlpatterns_reverse.namespace_urls')
+        resolver = get_resolver('urlpatterns_reverse.namespace_urls')
         sub_resolver = resolver.namespace_dict['test-ns1'][1]
         self.assertIn('<RegexURLPattern list>', repr(sub_resolver))
 
@@ -214,7 +223,7 @@ class ResolverTests(unittest.TestCase):
         exception contains a list in the right format for printing out in
         the DEBUG 404 page with both the patterns and URL names, if available.
         """
-        urls = 'regressiontests.urlpatterns_reverse.named_urls'
+        urls = 'urlpatterns_reverse.named_urls'
         # this list matches the expected URL types and names returned when
         # you try to resolve a non-existent URL in the first level of included
         # URLs in named_urls.py (e.g., '/included/non-existent-url')
@@ -245,7 +254,7 @@ class ResolverTests(unittest.TestCase):
                             self.assertEqual(t.name, e['name'], 'Wrong URL name.  Expected "%s", got "%s".' % (e['name'], t.name))
 
 class ReverseLazyTest(TestCase):
-    urls = 'regressiontests.urlpatterns_reverse.reverse_lazy_urls'
+    urls = 'urlpatterns_reverse.reverse_lazy_urls'
 
     def test_redirect_with_lazy_reverse(self):
         response = self.client.get('/redirect/')
@@ -260,7 +269,7 @@ class ReverseLazyTest(TestCase):
         self.assertEqual(response.status_code, 200)
 
 class ReverseShortcutTests(TestCase):
-    urls = 'regressiontests.urlpatterns_reverse.urls'
+    urls = 'urlpatterns_reverse.urls'
 
     def test_redirect_to_object(self):
         # We don't really need a model; just something with a get_absolute_url
@@ -270,36 +279,36 @@ class ReverseShortcutTests(TestCase):
 
         res = redirect(FakeObj())
         self.assertTrue(isinstance(res, HttpResponseRedirect))
-        self.assertEqual(res['Location'], '/hi-there/')
+        self.assertEqual(res.url, '/hi-there/')
 
         res = redirect(FakeObj(), permanent=True)
         self.assertTrue(isinstance(res, HttpResponsePermanentRedirect))
-        self.assertEqual(res['Location'], '/hi-there/')
+        self.assertEqual(res.url, '/hi-there/')
 
     def test_redirect_to_view_name(self):
         res = redirect('hardcoded2')
-        self.assertEqual(res['Location'], '/hardcoded/doc.pdf')
+        self.assertEqual(res.url, '/hardcoded/doc.pdf')
         res = redirect('places', 1)
-        self.assertEqual(res['Location'], '/places/1/')
+        self.assertEqual(res.url, '/places/1/')
         res = redirect('headlines', year='2008', month='02', day='17')
-        self.assertEqual(res['Location'], '/headlines/2008.02.17/')
+        self.assertEqual(res.url, '/headlines/2008.02.17/')
         self.assertRaises(NoReverseMatch, redirect, 'not-a-view')
 
     def test_redirect_to_url(self):
         res = redirect('/foo/')
-        self.assertEqual(res['Location'], '/foo/')
+        self.assertEqual(res.url, '/foo/')
         res = redirect('http://example.com/')
-        self.assertEqual(res['Location'], 'http://example.com/')
+        self.assertEqual(res.url, 'http://example.com/')
 
     def test_redirect_view_object(self):
         from .views import absolute_kwargs_view
         res = redirect(absolute_kwargs_view)
-        self.assertEqual(res['Location'], '/absolute_arg_view/')
+        self.assertEqual(res.url, '/absolute_arg_view/')
         self.assertRaises(NoReverseMatch, redirect, absolute_kwargs_view, wrong_argument=None)
 
 
 class NamespaceTests(TestCase):
-    urls = 'regressiontests.urlpatterns_reverse.namespace_urls'
+    urls = 'urlpatterns_reverse.namespace_urls'
 
     def test_ambiguous_object(self):
         "Names deployed via dynamic URL objects that require namespaces can't be resolved"
@@ -453,13 +462,66 @@ class RequestURLconfTests(TestCase):
         )
         self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/')
 
+    def test_reverse_inner_in_response_middleware(self):
+        """
+        Test reversing an URL from the *overridden* URLconf from inside
+        a response middleware.
+        """
+        settings.MIDDLEWARE_CLASSES += (
+            '%s.ChangeURLconfMiddleware' % middleware.__name__,
+            '%s.ReverseInnerInResponseMiddleware' % middleware.__name__,
+        )
+        response = self.client.get('/second_test/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, b'/second_test/')
+
+    def test_reverse_outer_in_response_middleware(self):
+        """
+        Test reversing an URL from the *default* URLconf from inside
+        a response middleware.
+        """
+        settings.MIDDLEWARE_CLASSES += (
+            '%s.ChangeURLconfMiddleware' % middleware.__name__,
+            '%s.ReverseOuterInResponseMiddleware' % middleware.__name__,
+        )
+        message = "Reverse for 'outer' with arguments '()' and keyword arguments '{}' not found."
+        with self.assertRaisesMessage(NoReverseMatch, message):
+            self.client.get('/second_test/')
+
+    def test_reverse_inner_in_streaming(self):
+        """
+        Test reversing an URL from the *overridden* URLconf from inside
+        a streaming response.
+        """
+        settings.MIDDLEWARE_CLASSES += (
+            '%s.ChangeURLconfMiddleware' % middleware.__name__,
+            '%s.ReverseInnerInStreaming' % middleware.__name__,
+        )
+        response = self.client.get('/second_test/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(b''.join(response), b'/second_test/')
+
+    def test_reverse_outer_in_streaming(self):
+        """
+        Test reversing an URL from the *default* URLconf from inside
+        a streaming response.
+        """
+        settings.MIDDLEWARE_CLASSES += (
+            '%s.ChangeURLconfMiddleware' % middleware.__name__,
+            '%s.ReverseOuterInStreaming' % middleware.__name__,
+        )
+        message = "Reverse for 'outer' with arguments '()' and keyword arguments '{}' not found."
+        with self.assertRaisesMessage(NoReverseMatch, message):
+            self.client.get('/second_test/')
+            b''.join(self.client.get('/second_test/'))
+
 class ErrorHandlerResolutionTests(TestCase):
     """Tests for handler404 and handler500"""
 
     def setUp(self):
         from django.core.urlresolvers import RegexURLResolver
-        urlconf = 'regressiontests.urlpatterns_reverse.urls_error_handlers'
-        urlconf_callables = 'regressiontests.urlpatterns_reverse.urls_error_handlers_callables'
+        urlconf = 'urlpatterns_reverse.urls_error_handlers'
+        urlconf_callables = 'urlpatterns_reverse.urls_error_handlers_callables'
         self.resolver = RegexURLResolver(r'^$', urlconf)
         self.callable_resolver = RegexURLResolver(r'^$', urlconf_callables)
 
@@ -476,7 +538,7 @@ class ErrorHandlerResolutionTests(TestCase):
         self.assertEqual(self.callable_resolver.resolve500(), handler)
 
 class DefaultErrorHandlerTests(TestCase):
-    urls = 'regressiontests.urlpatterns_reverse.urls_without_full_import'
+    urls = 'urlpatterns_reverse.urls_without_full_import'
 
     def test_default_handler(self):
         "If the urls.py doesn't specify handlers, the defaults are used"
@@ -499,7 +561,7 @@ class NoRootUrlConfTests(TestCase):
         self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/')
 
 class ResolverMatchTests(TestCase):
-    urls = 'regressiontests.urlpatterns_reverse.namespace_urls'
+    urls = 'urlpatterns_reverse.namespace_urls'
 
     def test_urlpattern_resolve(self):
         for path, name, app_name, namespace, func, args, kwargs in resolve_test_data:
@@ -529,8 +591,12 @@ class ResolverMatchTests(TestCase):
         resolver_match = response.resolver_match
         self.assertEqual(resolver_match.url_name, 'test-resolver-match')
 
+    def test_resolver_match_on_request_before_resolution(self):
+        request = HttpRequest()
+        self.assertIsNone(request.resolver_match)
+
 class ErroneousViewTests(TestCase):
-    urls = 'regressiontests.urlpatterns_reverse.erroneous_urls'
+    urls = 'urlpatterns_reverse.erroneous_urls'
 
     def test_erroneous_resolve(self):
         self.assertRaises(ImportError, self.client.get, '/erroneous_inner/')
@@ -554,9 +620,9 @@ class ViewLoadingTests(TestCase):
         # ViewDoesNotExist, ...
         six.assertRaisesRegex(self, ViewDoesNotExist, ".*View does not exist in.*",
             get_callable,
-            'regressiontests.urlpatterns_reverse.views.i_should_not_exist')
+            'urlpatterns_reverse.views.i_should_not_exist')
         # ... but if the AttributeError is caused by something else don't
         # swallow it.
         self.assertRaises(AttributeError, get_callable,
-            'regressiontests.urlpatterns_reverse.views_broken.i_am_broken')
+            'urlpatterns_reverse.views_broken.i_am_broken')
 
diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py b/tests/urlpatterns_reverse/urlconf_inner.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urlconf_inner.py
rename to tests/urlpatterns_reverse/urlconf_inner.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py b/tests/urlpatterns_reverse/urlconf_outer.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urlconf_outer.py
rename to tests/urlpatterns_reverse/urlconf_outer.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py
similarity index 93%
rename from tests/regressiontests/urlpatterns_reverse/urls.py
rename to tests/urlpatterns_reverse/urls.py
index 1d4ae73c67..1dbc8d889f 100644
--- a/tests/regressiontests/urlpatterns_reverse/urls.py
+++ b/tests/urlpatterns_reverse/urls.py
@@ -40,7 +40,7 @@ urlpatterns = patterns('',
             name="headlines"),
     url(r'^windows_path/(?P<drive_name>[A-Z]):\\(?P<path>.+)/$', empty_view,
             name="windows"),
-    url(r'^special_chars/(.+)/$', empty_view, name="special"),
+    url(r'^special_chars/(?P<chars>.+)/$', empty_view, name="special"),
     url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"),
     url(r'^repeats/a{1,2}/$', empty_view, name="repeats"),
     url(r'^repeats/a{2,4}/$', empty_view, name="repeats2"),
@@ -49,8 +49,8 @@ urlpatterns = patterns('',
     url(r'^test/1/?', empty_view, name="test"),
     url(r'^(?i)test/2/?$', empty_view, name="test2"),
     url(r'^outer/(?P<outer>\d+)/',
-            include('regressiontests.urlpatterns_reverse.included_urls')),
-    url('', include('regressiontests.urlpatterns_reverse.extra_urls')),
+            include('urlpatterns_reverse.included_urls')),
+    url('', include('urlpatterns_reverse.extra_urls')),
 
     # This is non-reversible, but we shouldn't blow up when parsing it.
     url(r'^(?:foo|bar)(\w+)/$', empty_view, name="disjunction"),
diff --git a/tests/urlpatterns_reverse/urls_error_handlers.py b/tests/urlpatterns_reverse/urls_error_handlers.py
new file mode 100644
index 0000000000..be4f42afbc
--- /dev/null
+++ b/tests/urlpatterns_reverse/urls_error_handlers.py
@@ -0,0 +1,8 @@
+# Used by the ErrorHandlerResolutionTests test case.
+
+from django.conf.urls import patterns
+
+urlpatterns = patterns('')
+
+handler404 = 'urlpatterns_reverse.views.empty_view'
+handler500 = 'urlpatterns_reverse.views.empty_view'
diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py b/tests/urlpatterns_reverse/urls_error_handlers_callables.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py
rename to tests/urlpatterns_reverse/urls_error_handlers_callables.py
diff --git a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py b/tests/urlpatterns_reverse/urls_without_full_import.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py
rename to tests/urlpatterns_reverse/urls_without_full_import.py
diff --git a/tests/regressiontests/urlpatterns_reverse/views.py b/tests/urlpatterns_reverse/views.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/views.py
rename to tests/urlpatterns_reverse/views.py
diff --git a/tests/regressiontests/urlpatterns_reverse/views_broken.py b/tests/urlpatterns_reverse/views_broken.py
similarity index 100%
rename from tests/regressiontests/urlpatterns_reverse/views_broken.py
rename to tests/urlpatterns_reverse/views_broken.py
diff --git a/tests/urls.py b/tests/urls.py
index 4f37ab5f52..1540e71e18 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,33 +1,33 @@
 from django.conf.urls import patterns, include
 
 urlpatterns = patterns('',
-    # test_client modeltest urls
-    (r'^test_client/', include('modeltests.test_client.urls')),
-    (r'^test_client_regress/', include('regressiontests.test_client_regress.urls')),
+    # test_client urls
+    (r'^test_client/', include('test_client.urls')),
+    (r'^test_client_regress/', include('test_client_regress.urls')),
 
     # File upload test views
-    (r'^file_uploads/', include('regressiontests.file_uploads.urls')),
+    (r'^file_uploads/', include('file_uploads.urls')),
 
     # Always provide the auth system login and logout views
     (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
     (r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
 
     # test urlconf for {% url %} template tag
-    (r'^url_tag/', include('regressiontests.templates.urls')),
+    (r'^url_tag/', include('template_tests.urls')),
 
     # django built-in views
-    (r'^views/', include('regressiontests.views.urls')),
+    (r'^views/', include('view_tests.urls')),
 
     # test urlconf for middleware tests
-    (r'^middleware/', include('regressiontests.middleware.urls')),
+    (r'^middleware/', include('middleware.urls')),
 
     # admin widget tests
-    (r'widget_admin/', include('regressiontests.admin_widgets.urls')),
+    (r'widget_admin/', include('admin_widgets.urls')),
 
     # admin custom URL tests
-    (r'^custom_urls/', include('regressiontests.admin_custom_urls.urls')),
+    (r'^custom_urls/', include('admin_custom_urls.urls')),
 
     # admin scripts tests
-    (r'^admin_scripts/', include('regressiontests.admin_scripts.urls')),
+    (r'^admin_scripts/', include('admin_scripts.urls')),
 
 )
diff --git a/tests/regressiontests/model_formsets_regress/__init__.py b/tests/user_commands/__init__.py
similarity index 100%
rename from tests/regressiontests/model_formsets_regress/__init__.py
rename to tests/user_commands/__init__.py
diff --git a/tests/regressiontests/model_inheritance_regress/__init__.py b/tests/user_commands/management/__init__.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_regress/__init__.py
rename to tests/user_commands/management/__init__.py
diff --git a/tests/regressiontests/model_inheritance_select_related/__init__.py b/tests/user_commands/management/commands/__init__.py
similarity index 100%
rename from tests/regressiontests/model_inheritance_select_related/__init__.py
rename to tests/user_commands/management/commands/__init__.py
diff --git a/tests/modeltests/user_commands/management/commands/dance.py b/tests/user_commands/management/commands/dance.py
similarity index 100%
rename from tests/modeltests/user_commands/management/commands/dance.py
rename to tests/user_commands/management/commands/dance.py
diff --git a/tests/user_commands/management/commands/leave_locale_alone_false.py b/tests/user_commands/management/commands/leave_locale_alone_false.py
new file mode 100644
index 0000000000..8ebb607d5a
--- /dev/null
+++ b/tests/user_commands/management/commands/leave_locale_alone_false.py
@@ -0,0 +1,10 @@
+from django.core.management.base import BaseCommand
+from django.utils import translation
+
+class Command(BaseCommand):
+
+    can_import_settings = True
+    leave_locale_alone = False
+
+    def handle(self, *args, **options):
+        return translation.get_language()
diff --git a/tests/user_commands/management/commands/leave_locale_alone_true.py b/tests/user_commands/management/commands/leave_locale_alone_true.py
new file mode 100644
index 0000000000..e0f923591e
--- /dev/null
+++ b/tests/user_commands/management/commands/leave_locale_alone_true.py
@@ -0,0 +1,10 @@
+from django.core.management.base import BaseCommand
+from django.utils import translation
+
+class Command(BaseCommand):
+
+    can_import_settings = True
+    leave_locale_alone = True
+
+    def handle(self, *args, **options):
+        return translation.get_language()
diff --git a/tests/modeltests/user_commands/models.py b/tests/user_commands/models.py
similarity index 100%
rename from tests/modeltests/user_commands/models.py
rename to tests/user_commands/models.py
diff --git a/tests/modeltests/user_commands/tests.py b/tests/user_commands/tests.py
similarity index 62%
rename from tests/modeltests/user_commands/tests.py
rename to tests/user_commands/tests.py
index d25911c09f..bf555e66b9 100644
--- a/tests/modeltests/user_commands/tests.py
+++ b/tests/user_commands/tests.py
@@ -1,13 +1,14 @@
 import sys
 
 from django.core import management
-from django.core.management.base import CommandError
-from django.test import TestCase
+from django.core.management import CommandError
+from django.core.management.utils import popen_wrapper
+from django.test import SimpleTestCase
 from django.utils import translation
 from django.utils.six import StringIO
 
 
-class CommandTests(TestCase):
+class CommandTests(SimpleTestCase):
     def test_command(self):
         out = StringIO()
         management.call_command('dance', stdout=out)
@@ -44,3 +45,23 @@ class CommandTests(TestCase):
         finally:
             sys.stderr = old_stderr
         self.assertIn("CommandError", err.getvalue())
+
+    def test_default_en_us_locale_set(self):
+        # Forces en_us when set to true
+        out = StringIO()
+        with translation.override('pl'):
+            management.call_command('leave_locale_alone_false', stdout=out)
+            self.assertEqual(out.getvalue(), "en-us\n")
+
+    def test_configured_locale_preserved(self):
+        # Leaves locale from settings when set to false
+        out = StringIO()
+        with translation.override('pl'):
+            management.call_command('leave_locale_alone_true', stdout=out)
+            self.assertEqual(out.getvalue(), "pl\n")
+
+
+class UtilsTests(SimpleTestCase):
+
+    def test_no_existent_external_program(self):
+        self.assertRaises(CommandError, popen_wrapper, ['a_42_command_that_doesnt_exist_42'])
diff --git a/tests/regressiontests/model_permalink/__init__.py b/tests/utils_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/model_permalink/__init__.py
rename to tests/utils_tests/__init__.py
diff --git a/tests/regressiontests/utils/archives/foobar.tar b/tests/utils_tests/archives/foobar.tar
similarity index 100%
rename from tests/regressiontests/utils/archives/foobar.tar
rename to tests/utils_tests/archives/foobar.tar
diff --git a/tests/regressiontests/utils/archives/foobar.tar.bz2 b/tests/utils_tests/archives/foobar.tar.bz2
similarity index 100%
rename from tests/regressiontests/utils/archives/foobar.tar.bz2
rename to tests/utils_tests/archives/foobar.tar.bz2
diff --git a/tests/regressiontests/utils/archives/foobar.tar.gz b/tests/utils_tests/archives/foobar.tar.gz
similarity index 100%
rename from tests/regressiontests/utils/archives/foobar.tar.gz
rename to tests/utils_tests/archives/foobar.tar.gz
diff --git a/tests/regressiontests/utils/archives/foobar.zip b/tests/utils_tests/archives/foobar.zip
similarity index 100%
rename from tests/regressiontests/utils/archives/foobar.zip
rename to tests/utils_tests/archives/foobar.zip
diff --git a/tests/regressiontests/utils/eggs/test_egg.egg b/tests/utils_tests/eggs/test_egg.egg
similarity index 100%
rename from tests/regressiontests/utils/eggs/test_egg.egg
rename to tests/utils_tests/eggs/test_egg.egg
diff --git a/tests/utils_tests/files/strip_tags1.html b/tests/utils_tests/files/strip_tags1.html
new file mode 100644
index 0000000000..8e9ee1d8fd
--- /dev/null
+++ b/tests/utils_tests/files/strip_tags1.html
@@ -0,0 +1,1302 @@
+<!DOCTYPE html>
+<html>
+  <head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# githubog: http://ogp.me/ns/fb/githubog#">
+    <meta charset='utf-8'>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>Improved regex in strip_tags ·  d7504a3 · django/django</title>
+    <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub" />
+    <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub" />
+    <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-114.png" />
+    <link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114.png" />
+    <link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-144.png" />
+    <link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144.png" />
+    <link rel="logo" type="image/svg" href="http://github-media-downloads.s3.amazonaws.com/github-logo.svg" />
+    <meta name="msapplication-TileImage" content="/windows-tile.png">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    
+    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+
+    <meta content="authenticity_token" name="csrf-param" />
+<meta content="Vbmuc30dLLFdm7POIe3xfTa4nODYc/la/wLrI1OLEOI=" name="csrf-token" />
+
+    <link href="https://a248.e.akamai.net/assets.github.com/assets/github-f70e4783e00fd4884a9e5e651a43933c9881caa8.css" media="all" rel="stylesheet" type="text/css" />
+    <link href="https://a248.e.akamai.net/assets.github.com/assets/github2-0d31290d073dea4d8671e2b8c747629aeb074034.css" media="all" rel="stylesheet" type="text/css" />
+    
+
+
+      <script src="https://a248.e.akamai.net/assets.github.com/assets/frameworks-d76b58e749b52bc47a4c46620bf2c320fabe5248.js" type="text/javascript"></script>
+      <script src="https://a248.e.akamai.net/assets.github.com/assets/github-67b55380cff8d6766b298e6935a3c1db7d5c6d5d.js" type="text/javascript"></script>
+      
+      <meta http-equiv="x-pjax-version" content="1212ad79754350a805cefbcd08a3dadf">
+
+        <link data-pjax-transient rel='alternate' type='text/plain+diff' href="&#x2F;django&#x2F;django&#x2F;commit&#x2F;d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e.diff">
+  <link data-pjax-transient rel='alternate' type='text/plain+patch' href="&#x2F;django&#x2F;django&#x2F;commit&#x2F;d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e.patch">
+  <link data-pjax-transient rel='permalink' type='text/html' href="&#x2F;django&#x2F;django&#x2F;commit&#x2F;d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e">
+    <meta property="og:title" content="django"/>
+    <meta property="og:type" content="githubog:gitrepository"/>
+    <meta property="og:url" content="https://github.com/django/django"/>
+    <meta property="og:image" content="https://secure.gravatar.com/avatar/fd542381031aa84dca86628ece84fc07?s=420&amp;d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png"/>
+    <meta property="og:site_name" content="GitHub"/>
+    <meta property="og:description" content="django - The Web framework for perfectionists with deadlines."/>
+    <meta property="twitter:card" content="summary"/>
+    <meta property="twitter:site" content="@GitHub">
+    <meta property="twitter:title" content="django/django"/>
+
+    <meta name="description" content="django - The Web framework for perfectionists with deadlines." />
+
+  <link href="https://github.com/django/django/commits/d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e.atom" rel="alternate" title="Recent Commits to django:d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e" type="application/atom+xml" />
+
+  </head>
+
+
+  <body class="logged_in  linux vis-public env-production  ">
+    <div id="wrapper">
+
+      <div class="header header-logged-in true">
+  <div class="container clearfix">
+
+    <a class="header-logo-blacktocat" href="https://github.com/">
+  <span class="mega-icon mega-icon-blacktocat"></span>
+</a>
+
+    <div class="divider-vertical"></div>
+
+      <a href="/django/django/notifications" class="notification-indicator tooltipped downwards contextually-unread" title="You have unread notifications in this repository">
+    <span class="mail-status unread"></span>
+  </a>
+  <div class="divider-vertical"></div>
+
+
+      <div class="command-bar js-command-bar  ">
+            <form accept-charset="UTF-8" action="/search" class="command-bar-form" id="top_search_form" method="get">
+  <a href="/search/advanced" class="advanced-search-icon tooltipped downwards command-bar-search" id="advanced_search" title="Advanced search"><span class="mini-icon mini-icon-advanced-search "></span></a>
+
+  <input type="text" name="q" id="js-command-bar-field" placeholder="Search or type a command" tabindex="1" data-username="claudep" autocapitalize="off">
+
+  <span class="mini-icon help tooltipped downwards" title="Show command bar help">
+    <span class="mini-icon mini-icon-help"></span>
+  </span>
+
+  <input type="hidden" name="ref" value="commandbar">
+
+  <div class="divider-vertical"></div>
+</form>
+        <ul class="top-nav">
+            <li class="explore"><a href="https://github.com/explore">Explore</a></li>
+            <li><a href="https://gist.github.com">Gist</a></li>
+            <li><a href="/blog">Blog</a></li>
+          <li><a href="http://help.github.com">Help</a></li>
+        </ul>
+      </div>
+
+    
+
+  
+    <ul id="user-links">
+      <li>
+        <a href="https://github.com/claudep" class="name">
+          <img height="20" src="https://secure.gravatar.com/avatar/cf4198670f0073174b475634964b576b?s=140&amp;d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png" width="20" /> claudep
+        </a>
+      </li>
+      <li>
+        <a href="/new" id="new_repo" class="tooltipped downwards" title="Create a new repo">
+          <span class="mini-icon mini-icon-create"></span>
+        </a>
+      </li>
+      <li>
+        <a href="/settings/profile" id="account_settings"
+          class="tooltipped downwards"
+          title="Account settings ">
+          <span class="mini-icon mini-icon-account-settings"></span>
+        </a>
+      </li>
+      <li>
+        <a href="/logout" data-method="post" id="logout" class="tooltipped downwards" title="Sign out">
+          <span class="mini-icon mini-icon-logout"></span>
+        </a>
+      </li>
+    </ul>
+
+
+
+    
+  </div>
+</div>
+
+            <div class="site hfeed" itemscope itemtype="http://schema.org/WebPage">
+      <div class="hentry">
+        
+        <div class="pagehead repohead instapaper_ignore readability-menu ">
+          <div class="container">
+            <div class="title-actions-bar">
+              
+
+
+<ul class="pagehead-actions">
+
+    <li class="nspr">
+      <a href="/django/django/pull/new/d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e" class="button minibutton btn-pull-request" icon_class="mini-icon-pull-request"><span class="mini-icon mini-icon-pull-request"></span>Pull Request</a>
+    </li>
+
+    <li class="subscription">
+      <form accept-charset="UTF-8" action="/notifications/subscribe" data-autosubmit="true" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="authenticity_token" type="hidden" value="Vbmuc30dLLFdm7POIe3xfTa4nODYc/la/wLrI1OLEOI=" /></div>  <input id="repository_id" name="repository_id" type="hidden" value="4164482" />
+
+    <div class="select-menu js-menu-container js-select-menu">
+      <span class="minibutton select-menu-button js-menu-target">
+        <span class="js-select-button">
+          <span class="mini-icon mini-icon-watching"></span>
+          Watch
+        </span>
+      </span>
+
+      <div class="select-menu-modal-holder js-menu-content">
+        <div class="select-menu-modal">
+          <div class="select-menu-header">
+            <span class="select-menu-title">Notification status</span>
+            <span class="mini-icon mini-icon-remove-close js-menu-close"></span>
+          </div> <!-- /.select-menu-header -->
+
+          <div class="select-menu-list js-navigation-container">
+
+            <div class="select-menu-item js-navigation-item js-navigation-target selected">
+              <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+              <div class="select-menu-item-text">
+                <input checked="checked" id="do_included" name="do" type="radio" value="included" />
+                <h4>Not watching</h4>
+                <span class="description">You only receive notifications for discussions in which you participate or are @mentioned.</span>
+                <span class="js-select-button-text hidden-select-button-text">
+                  <span class="mini-icon mini-icon-watching"></span>
+                  Watch
+                </span>
+              </div>
+            </div> <!-- /.select-menu-item -->
+
+            <div class="select-menu-item js-navigation-item js-navigation-target ">
+              <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+              <div class="select-menu-item-text">
+                <input id="do_subscribed" name="do" type="radio" value="subscribed" />
+                <h4>Watching</h4>
+                <span class="description">You receive notifications for all discussions in this repository.</span>
+                <span class="js-select-button-text hidden-select-button-text">
+                  <span class="mini-icon mini-icon-unwatch"></span>
+                  Unwatch
+                </span>
+              </div>
+            </div> <!-- /.select-menu-item -->
+
+            <div class="select-menu-item js-navigation-item js-navigation-target ">
+              <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+              <div class="select-menu-item-text">
+                <input id="do_ignore" name="do" type="radio" value="ignore" />
+                <h4>Ignoring</h4>
+                <span class="description">You do not receive any notifications for discussions in this repository.</span>
+                <span class="js-select-button-text hidden-select-button-text">
+                  <span class="mini-icon mini-icon-mute"></span>
+                  Stop ignoring
+                </span>
+              </div>
+            </div> <!-- /.select-menu-item -->
+
+          </div> <!-- /.select-menu-list -->
+
+        </div> <!-- /.select-menu-modal -->
+      </div> <!-- /.select-menu-modal-holder -->
+    </div> <!-- /.select-menu -->
+
+</form>
+    </li>
+
+    <li class="js-toggler-container js-social-container starring-container on">
+      <a href="/django/django/unstar" class="minibutton js-toggler-target star-button starred upwards" title="Unstar this repo" data-remote="true" data-method="post" rel="nofollow">
+        <span class="mini-icon mini-icon-remove-star"></span>
+        <span class="text">Unstar</span>
+      </a>
+      <a href="/django/django/star" class="minibutton js-toggler-target star-button unstarred upwards" title="Star this repo" data-remote="true" data-method="post" rel="nofollow">
+        <span class="mini-icon mini-icon-star"></span>
+        <span class="text">Star</span>
+      </a>
+      <a class="social-count js-social-count" href="/django/django/stargazers">5,939</a>
+    </li>
+
+        <li>
+          <a href="/django/django/fork_select" class="minibutton js-toggler-target fork-button lighter upwards" title="Fork this repo" rel="facebox nofollow">
+            <span class="mini-icon mini-icon-branch-create"></span>
+            <span class="text">Fork</span>
+          </a>
+          <a href="/django/django/network" class="social-count">1,909</a>
+        </li>
+
+
+</ul>
+
+              <h1 itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="entry-title public">
+                <span class="repo-label"><span>public</span></span>
+                <span class="mega-icon mega-icon-public-repo"></span>
+                <span class="author vcard">
+                  <a href="/django" class="url fn" itemprop="url" rel="author">
+                  <span itemprop="title">django</span>
+                  </a></span> /
+                <strong><a href="/django/django" class="js-current-repository">django</a></strong>
+              </h1>
+            </div>
+
+            
+  <ul class="tabs">
+    <li><a href="/django/django" class="selected" highlight="repo_source repo_downloads repo_commits repo_tags repo_branches">Code</a></li>
+    <li><a href="/django/django/network" highlight="repo_network">Network</a></li>
+    <li><a href="/django/django/pulls" highlight="repo_pulls">Pull Requests <span class='counter'>177</span></a></li>
+
+
+
+
+    <li><a href="/django/django/graphs" highlight="repo_graphs repo_contributors">Graphs</a></li>
+
+      <li>
+        <a href="/django/django/settings">Settings</a>
+      </li>
+
+  </ul>
+  
+<div class="tabnav">
+
+  <span class="tabnav-right">
+    <ul class="tabnav-tabs">
+          <li><a href="/django/django/tags" class="tabnav-tab" highlight="repo_tags">Tags <span class="counter ">39</span></a></li>
+    </ul>
+    
+  </span>
+
+  <div class="tabnav-widget scope">
+
+
+    <div class="select-menu js-menu-container js-select-menu js-branch-menu">
+      <a class="minibutton select-menu-button js-menu-target" data-hotkey="w" data-ref="">
+        <span class="mini-icon mini-icon-tree"></span>
+        <i>tree:</i>
+        <span class="js-select-button">d7504a3d7b</span>
+      </a>
+
+      <div class="select-menu-modal-holder js-menu-content js-navigation-container">
+
+        <div class="select-menu-modal">
+          <div class="select-menu-header">
+            <span class="select-menu-title">Switch branches/tags</span>
+            <span class="mini-icon mini-icon-remove-close js-menu-close"></span>
+          </div> <!-- /.select-menu-header -->
+
+          <div class="select-menu-filters">
+            <div class="select-menu-text-filter">
+              <input type="text" id="commitish-filter-field" class="js-filterable-field js-navigation-enable" placeholder="Find or create a branch…">
+            </div>
+            <div class="select-menu-tabs">
+              <ul>
+                <li class="select-menu-tab">
+                  <a href="#" data-tab-filter="branches" class="js-select-menu-tab">Branches</a>
+                </li>
+                <li class="select-menu-tab">
+                  <a href="#" data-tab-filter="tags" class="js-select-menu-tab">Tags</a>
+                </li>
+              </ul>
+            </div><!-- /.select-menu-tabs -->
+          </div><!-- /.select-menu-filters -->
+
+          <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket css-truncate" data-tab-filter="branches">
+
+            <div data-filterable-for="commitish-filter-field" data-filterable-type="substring">
+
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/boulder-oracle-sprint" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/boulder-oracle-sprint" rel="nofollow" title="attic/boulder-oracle-sprint">attic/boulder-oracle-sprint</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/full-history" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/full-history" rel="nofollow" title="attic/full-history">attic/full-history</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/generic-auth" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/generic-auth" rel="nofollow" title="attic/generic-auth">attic/generic-auth</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/gis" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/gis" rel="nofollow" title="attic/gis">attic/gis</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/i18n" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/i18n" rel="nofollow" title="attic/i18n">attic/i18n</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/magic-removal" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/magic-removal" rel="nofollow" title="attic/magic-removal">attic/magic-removal</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/multi-auth" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/multi-auth" rel="nofollow" title="attic/multi-auth">attic/multi-auth</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/multiple-db-support" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/multiple-db-support" rel="nofollow" title="attic/multiple-db-support">attic/multiple-db-support</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/new-admin" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/new-admin" rel="nofollow" title="attic/new-admin">attic/new-admin</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/newforms-admin" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/newforms-admin" rel="nofollow" title="attic/newforms-admin">attic/newforms-admin</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/per-object-permissions" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/per-object-permissions" rel="nofollow" title="attic/per-object-permissions">attic/per-object-permissions</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/queryset-refactor" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/queryset-refactor" rel="nofollow" title="attic/queryset-refactor">attic/queryset-refactor</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/schema-evolution" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/schema-evolution" rel="nofollow" title="attic/schema-evolution">attic/schema-evolution</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/schema-evolution-ng" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/schema-evolution-ng" rel="nofollow" title="attic/schema-evolution-ng">attic/schema-evolution-ng</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/search-api" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/search-api" rel="nofollow" title="attic/search-api">attic/search-api</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/sqlalchemy" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/sqlalchemy" rel="nofollow" title="attic/sqlalchemy">attic/sqlalchemy</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/attic/unicode" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="attic/unicode" rel="nofollow" title="attic/unicode">attic/unicode</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/master" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="master" rel="nofollow" title="master">master</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2009/admin-ui" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2009/admin-ui" rel="nofollow" title="soc2009/admin-ui">soc2009/admin-ui</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2009/http-wsgi-improvements" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2009/http-wsgi-improvements" rel="nofollow" title="soc2009/http-wsgi-improvements">soc2009/http-wsgi-improvements</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2009/i18n-improvements" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2009/i18n-improvements" rel="nofollow" title="soc2009/i18n-improvements">soc2009/i18n-improvements</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2009/model-validation" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2009/model-validation" rel="nofollow" title="soc2009/model-validation">soc2009/model-validation</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2009/multidb" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2009/multidb" rel="nofollow" title="soc2009/multidb">soc2009/multidb</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2009/test-improvements" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2009/test-improvements" rel="nofollow" title="soc2009/test-improvements">soc2009/test-improvements</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2010/app-loading" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2010/app-loading" rel="nofollow" title="soc2010/app-loading">soc2010/app-loading</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2010/query-refactor" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2010/query-refactor" rel="nofollow" title="soc2010/query-refactor">soc2010/query-refactor</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/soc2010/test-refactor" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="soc2010/test-refactor" rel="nofollow" title="soc2010/test-refactor">soc2010/test-refactor</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/0.90.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/0.90.x" rel="nofollow" title="stable/0.90.x">stable/0.90.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/0.91.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/0.91.x" rel="nofollow" title="stable/0.91.x">stable/0.91.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/0.95.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/0.95.x" rel="nofollow" title="stable/0.95.x">stable/0.95.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/0.96.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/0.96.x" rel="nofollow" title="stable/0.96.x">stable/0.96.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/1.0.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/1.0.x" rel="nofollow" title="stable/1.0.x">stable/1.0.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/1.1.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/1.1.x" rel="nofollow" title="stable/1.1.x">stable/1.1.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/1.2.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/1.2.x" rel="nofollow" title="stable/1.2.x">stable/1.2.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/1.3.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/1.3.x" rel="nofollow" title="stable/1.3.x">stable/1.3.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/1.4.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/1.4.x" rel="nofollow" title="stable/1.4.x">stable/1.4.x</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/stable/1.5.x" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="stable/1.5.x" rel="nofollow" title="stable/1.5.x">stable/1.5.x</a>
+                </div> <!-- /.select-menu-item -->
+            </div>
+
+              <form accept-charset="UTF-8" action="/django/django/branches" class="js-create-branch select-menu-item select-menu-new-item-form js-navigation-item js-navigation-target js-new-item-form" method="post"><div style="margin:0;padding:0;display:inline"><input name="authenticity_token" type="hidden" value="Vbmuc30dLLFdm7POIe3xfTa4nODYc/la/wLrI1OLEOI=" /></div>
+
+                <span class="mini-icon mini-icon-branch-create select-menu-item-icon"></span>
+                <div class="select-menu-item-text">
+                  <h4>Create branch: <span class="js-new-item-name"></span></h4>
+                  <span class="description">from ‘d7504a3’</span>
+                </div>
+                <input type="hidden" name="name" id="name" class="js-new-item-submit" />
+                <input type="hidden" name="branch" id="branch" value="d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e" />
+                <input type="hidden" name="path" id="branch" value="" />
+              </form> <!-- /.select-menu-item -->
+
+          </div> <!-- /.select-menu-list -->
+
+
+          <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket css-truncate" data-tab-filter="tags">
+            <div data-filterable-for="commitish-filter-field" data-filterable-type="substring">
+
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.5c2" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.5c2" rel="nofollow" title="1.5c2">1.5c2</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.5c1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.5c1" rel="nofollow" title="1.5c1">1.5c1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.5b2" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.5b2" rel="nofollow" title="1.5b2">1.5b2</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.5b1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.5b1" rel="nofollow" title="1.5b1">1.5b1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.5a1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.5a1" rel="nofollow" title="1.5a1">1.5a1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.5.1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.5.1" rel="nofollow" title="1.5.1">1.5.1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.5" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.5" rel="nofollow" title="1.5">1.5</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.4.5" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.4.5" rel="nofollow" title="1.4.5">1.4.5</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.4.4" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.4.4" rel="nofollow" title="1.4.4">1.4.4</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.4.3" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.4.3" rel="nofollow" title="1.4.3">1.4.3</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.4.2" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.4.2" rel="nofollow" title="1.4.2">1.4.2</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.4.1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.4.1" rel="nofollow" title="1.4.1">1.4.1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.4" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.4" rel="nofollow" title="1.4">1.4</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.3.7" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.3.7" rel="nofollow" title="1.3.7">1.3.7</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.3.6" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.3.6" rel="nofollow" title="1.3.6">1.3.6</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.3.5" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.3.5" rel="nofollow" title="1.3.5">1.3.5</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.3.4" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.3.4" rel="nofollow" title="1.3.4">1.3.4</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.3.3" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.3.3" rel="nofollow" title="1.3.3">1.3.3</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.3.2" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.3.2" rel="nofollow" title="1.3.2">1.3.2</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.3.1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.3.1" rel="nofollow" title="1.3.1">1.3.1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.3" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.3" rel="nofollow" title="1.3">1.3</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.2.7" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.2.7" rel="nofollow" title="1.2.7">1.2.7</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.2.6" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.2.6" rel="nofollow" title="1.2.6">1.2.6</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.2.5" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.2.5" rel="nofollow" title="1.2.5">1.2.5</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.2.4" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.2.4" rel="nofollow" title="1.2.4">1.2.4</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.2.3" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.2.3" rel="nofollow" title="1.2.3">1.2.3</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.2.2" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.2.2" rel="nofollow" title="1.2.2">1.2.2</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.2.1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.2.1" rel="nofollow" title="1.2.1">1.2.1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.2" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.2" rel="nofollow" title="1.2">1.2</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.1.4" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.1.4" rel="nofollow" title="1.1.4">1.1.4</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.1.3" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.1.3" rel="nofollow" title="1.1.3">1.1.3</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.1.2" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.1.2" rel="nofollow" title="1.1.2">1.1.2</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.1.1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.1.1" rel="nofollow" title="1.1.1">1.1.1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.1" rel="nofollow" title="1.1">1.1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.0.4" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.0.4" rel="nofollow" title="1.0.4">1.0.4</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.0.3" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.0.3" rel="nofollow" title="1.0.3">1.0.3</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.0.2" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.0.2" rel="nofollow" title="1.0.2">1.0.2</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.0.1" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.0.1" rel="nofollow" title="1.0.1">1.0.1</a>
+                </div> <!-- /.select-menu-item -->
+                <div class="select-menu-item js-navigation-item js-navigation-target ">
+                  <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+                  <a href="/django/django/commit/1.0" class="js-navigation-open select-menu-item-text js-select-button-text css-truncate-target" data-name="1.0" rel="nofollow" title="1.0">1.0</a>
+                </div> <!-- /.select-menu-item -->
+            </div>
+
+            <div class="select-menu-no-results">Nothing to show</div>
+
+          </div> <!-- /.select-menu-list -->
+
+        </div> <!-- /.select-menu-modal -->
+      </div> <!-- /.select-menu-modal-holder -->
+    </div> <!-- /.select-menu -->
+
+  </div> <!-- /.scope -->
+
+  <ul class="tabnav-tabs">
+    <li><a href="/django/django" class="tabnav-tab" highlight="repo_source">Files</a></li>
+    <li><a href="/django/django/commits/" class="selected tabnav-tab" highlight="repo_commits">Commits</a></li>
+    <li><a href="/django/django/branches" class="tabnav-tab" highlight="repo_branches" rel="nofollow">Branches <span class="counter ">37</span></a></li>
+  </ul>
+
+</div>
+
+  
+  
+  
+
+
+            
+          </div>
+        </div><!-- /.repohead -->
+
+        <div id="js-repo-pjax-container" class="container context-loader-container" data-pjax-container>
+          
+
+
+  <div class="commit full-commit ">
+    <a href="/django/django/tree/d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e" class="browse-button" title="Browse the code at this point in the history" rel="nofollow">Browse code</a>
+
+      <p class="commit-title">
+        Improved regex in strip_tags
+      </p>
+
+      <div class="commit-desc"><pre>Thanks Pablo Recio for the report. Refs #19237.</pre></div>
+
+    <div class="commit-meta clearfix">
+      <span class="sha-block">commit <span class="sha js-selectable-text">d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e</span></span>
+
+      <span class="sha-block" data-pjax>
+        1 parent
+          
+          <a href="/django/django/commit/afa3e1633431137f4e76c7efc359b579f4d9c08e" class="sha" data-hotkey="p">afa3e16</a>
+      </span>
+
+      <div class="authorship">
+        <img class="gravatar" height="24" src="https://secure.gravatar.com/avatar/cf4198670f0073174b475634964b576b?s=140&amp;d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png" width="24" />
+        <span class="author-name"><a href="/claudep" rel="author">claudep</a></span>
+        authored <time class="js-relative-date" datetime="2013-02-06T12:20:43-08:00" title="2013-02-06 12:20:43">February 06, 2013</time>
+
+      </div>
+    </div>
+  </div>
+
+    <a name="diff-stat"></a>
+    
+<div id='toc' class="details-collapse js-details-container ">
+  <p class="explain">
+    <span class="mini-icon mini-icon-diff"></span>Showing <strong>2 changed files</strong>
+    with <strong>2 additions</strong>
+    and <strong>1 deletion</strong>.
+  <a href="#" class="minibutton show-diff-stats js-details-target">Show Diff Stats</a>
+  <a href="#" class="minibutton hide-diff-stats js-details-target">Hide Diff Stats</a></p>
+
+  <ol class="content collapse js-transitionable">
+    <li>
+      <span class="diffstat">
+          <a href="#diff-0" class="tooltipped leftwards" title="1 addition &amp; 1 deletion">
+            2
+            <span class="diffstat-bar"> <i class='plus'>&#xf053;</i><i class='minus'>&#xf053;</i>&#xf053;&#xf053;&#xf053; </span>
+          </a>
+      </span>
+      <span class='mini-icon mini-icon-modified' title='modified'></span> <a href="#diff-0">django/utils/html.py</a>
+    </li>
+    <li>
+      <span class="diffstat">
+          <a href="#diff-1" class="tooltipped leftwards" title="1 addition &amp; 0 deletions">
+            1
+            <span class="diffstat-bar"> <i class='plus'>&#xf053;</i>&#xf053;&#xf053;&#xf053;&#xf053; </span>
+          </a>
+      </span>
+      <span class='mini-icon mini-icon-modified' title='modified'></span> <a href="#diff-1">tests/regressiontests/utils/html.py</a>
+    </li>
+  </ol>
+</div>
+
+    
+<div id="files" class="diff-view commentable">
+    <div id="diff-0" class="file js-details-container">
+      <div class="meta" data-path="django/utils/html.py">
+        <div class="info">
+            <span class="diffstat tooltipped rightwards" title="1 addition &amp; 1 deletion">2 <span class="diffstat-bar"><i class='plus'>&#xf053;</i><i class='minus'>&#xf053;</i>&#xf053;&#xf053;&#xf053;</span></span>
+
+          <span class="js-selectable-text css-truncate css-truncate-target" title="django/utils/html.py">
+            django/utils/html.py
+          </span>
+          
+        </div>
+        <div class="actions">
+          <span class="show-inline-notes">
+            <label>
+              <input type="checkbox" checked="checked" class="js-show-inline-comments-toggle">
+              show inline notes
+            </label>
+          </span>
+          <div class="button-group">
+              <a href="/django/django/blob/d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e/django/utils/html.py" class="minibutton" rel="nofollow">View file @ <code>d7504a3</code></a>
+          </div>
+        </div>
+      </div>
+
+          <div class="data highlight ">
+            <table class="diff-table">
+                <tr id="django-utils-html-py-P0" data-position='0'>
+                  <td id="L0L32" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">...</span>
+                  </td>
+                  <td id="L0R32" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">...</span>
+                  </td>
+                  <td class="gc diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=0&amp;line=32"></b>
+                    @@&nbsp;-33,7&nbsp;+33,7&nbsp;@@
+                  </td>
+                </tr>
+                <tr id="django-utils-html-py-P1" data-position='1'>
+                  <td id="L0L33" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">33</span>
+                  </td>
+                  <td id="L0R33" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">33</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=1&amp;line=33"></b>
+                    &nbsp;html_gunk_re&nbsp;=&nbsp;re.compile(r&#39;(?:&lt;br&nbsp;clear=&quot;all&quot;&gt;|&lt;i&gt;&lt;\/i&gt;|&lt;b&gt;&lt;\/b&gt;|&lt;em&gt;&lt;\/em&gt;|&lt;strong&gt;&lt;\/strong&gt;|&lt;\/?smallcaps&gt;|&lt;\/?uppercase&gt;)&#39;,&nbsp;re.IGNORECASE)
+                  </td>
+                </tr>
+                <tr id="django-utils-html-py-P2" data-position='2'>
+                  <td id="L0L34" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">34</span>
+                  </td>
+                  <td id="L0R34" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">34</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=2&amp;line=34"></b>
+                    &nbsp;hard_coded_bullets_re&nbsp;=&nbsp;re.compile(r&#39;((?:&lt;p&gt;(?:%s).*?[a-zA-Z].*?&lt;/p&gt;\s*)+)&#39;&nbsp;%&nbsp;&#39;|&#39;.join([re.escape(x)&nbsp;for&nbsp;x&nbsp;in&nbsp;DOTS]),&nbsp;re.DOTALL)
+                  </td>
+                </tr>
+                <tr id="django-utils-html-py-P3" data-position='3'>
+                  <td id="L0L35" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">35</span>
+                  </td>
+                  <td id="L0R35" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">35</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=3&amp;line=35"></b>
+                    &nbsp;trailing_empty_content_re&nbsp;=&nbsp;re.compile(r&#39;(?:&lt;p&gt;(?:&amp;nbsp;|\s|&lt;br&nbsp;\/&gt;)*?&lt;/p&gt;\s*)+\Z&#39;)
+                  </td>
+                </tr>
+                <tr id="django-utils-html-py-P4" data-position='4'>
+                  <td id="L0L36" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">36</span>
+                  </td>
+                  <td id="L0R35" class="line_numbers linkable-line-number empty-cell">
+                    <span class="line-number-content">&nbsp;</span>
+                  </td>
+                  <td class="gd diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=4&amp;line=36"></b>
+                    -strip_tags_re&nbsp;=&nbsp;re.compile(r&#39;&lt;/?\S([^=<span class="x"></span>]*=(\s*&quot;[^&quot;]*&quot;|\s*\&#39;[^\&#39;]*\&#39;|\S*)|[^&gt;])*?&gt;&#39;,&nbsp;re.IGNORECASE)
+                  </td>
+                </tr>
+                <tr id="django-utils-html-py-P5" data-position='5'>
+                  <td id="L0L36" class="line_numbers linkable-line-number empty-cell">
+                    <span class="line-number-content">&nbsp;</span>
+                  </td>
+                  <td id="L0R36" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">36</span>
+                  </td>
+                  <td class="gi diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=5&amp;line=36"></b>
+                    +strip_tags_re&nbsp;=&nbsp;re.compile(r&#39;&lt;/?\S([^=<span class="x">&gt;</span>]*=(\s*&quot;[^&quot;]*&quot;|\s*\&#39;[^\&#39;]*\&#39;|\S*)|[^&gt;])*?&gt;&#39;,&nbsp;re.IGNORECASE)
+                  </td>
+                </tr>
+                <tr id="django-utils-html-py-P6" data-position='6'>
+                  <td id="L0L37" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">37</span>
+                  </td>
+                  <td id="L0R37" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">37</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=6&amp;line=37"></b>
+                    &nbsp;
+                  </td>
+                </tr>
+                <tr id="django-utils-html-py-P7" data-position='7'>
+                  <td id="L0L38" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">38</span>
+                  </td>
+                  <td id="L0R38" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">38</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=7&amp;line=38"></b>
+                    &nbsp;
+                  </td>
+                </tr>
+                <tr id="django-utils-html-py-P8" data-position='8'>
+                  <td id="L0L39" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">39</span>
+                  </td>
+                  <td id="L0R39" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">39</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=django/utils/html.py&amp;position=8&amp;line=39"></b>
+                    &nbsp;def&nbsp;escape(text):
+                  </td>
+                </tr>
+            </table>
+          </div>
+
+      <div class="file-comments-place-holder" data-path="django/utils/html.py"></div>
+    </div>
+    <div id="diff-1" class="file js-details-container">
+      <div class="meta" data-path="tests/regressiontests/utils/html.py">
+        <div class="info">
+            <span class="diffstat tooltipped rightwards" title="1 addition &amp; 0 deletions">1 <span class="diffstat-bar"><i class='plus'>&#xf053;</i>&#xf053;&#xf053;&#xf053;&#xf053;</span></span>
+
+          <span class="js-selectable-text css-truncate css-truncate-target" title="tests/regressiontests/utils/html.py">
+            tests/regressiontests/utils/html.py
+          </span>
+          
+        </div>
+        <div class="actions">
+          <span class="show-inline-notes">
+            <label>
+              <input type="checkbox" checked="checked" class="js-show-inline-comments-toggle">
+              show inline notes
+            </label>
+          </span>
+          <div class="button-group">
+              <a href="/django/django/blob/d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e/tests/regressiontests/utils/html.py" class="minibutton" rel="nofollow">View file @ <code>d7504a3</code></a>
+          </div>
+        </div>
+      </div>
+
+          <div class="data highlight ">
+            <table class="diff-table">
+                <tr id="tests-regressiontests-utils-html-py-P0" data-position='0'>
+                  <td id="L1L67" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">...</span>
+                  </td>
+                  <td id="L1R67" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">...</span>
+                  </td>
+                  <td class="gc diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=tests/regressiontests/utils/html.py&amp;position=0&amp;line=67"></b>
+                    @@&nbsp;-68,6&nbsp;+68,7&nbsp;@@&nbsp;def&nbsp;test_strip_tags(self):
+                  </td>
+                </tr>
+                <tr id="tests-regressiontests-utils-html-py-P1" data-position='1'>
+                  <td id="L1L68" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">68</span>
+                  </td>
+                  <td id="L1R68" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">68</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=tests/regressiontests/utils/html.py&amp;position=1&amp;line=68"></b>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(&#39;a&lt;p&nbsp;onclick=&quot;alert(\&#39;&lt;test&gt;\&#39;)&quot;&gt;b&lt;/p&gt;c&#39;,&nbsp;&#39;abc&#39;),
+                  </td>
+                </tr>
+                <tr id="tests-regressiontests-utils-html-py-P2" data-position='2'>
+                  <td id="L1L69" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">69</span>
+                  </td>
+                  <td id="L1R69" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">69</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=tests/regressiontests/utils/html.py&amp;position=2&amp;line=69"></b>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(&#39;a&lt;p&nbsp;a&nbsp;&gt;b&lt;/p&gt;c&#39;,&nbsp;&#39;abc&#39;),
+                  </td>
+                </tr>
+                <tr id="tests-regressiontests-utils-html-py-P3" data-position='3'>
+                  <td id="L1L70" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">70</span>
+                  </td>
+                  <td id="L1R70" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">70</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=tests/regressiontests/utils/html.py&amp;position=3&amp;line=70"></b>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(&#39;d&lt;a:b&nbsp;c:d&gt;e&lt;/p&gt;f&#39;,&nbsp;&#39;def&#39;),
+                  </td>
+                </tr>
+                <tr id="tests-regressiontests-utils-html-py-P4" data-position='4'>
+                  <td id="L1L70" class="line_numbers linkable-line-number empty-cell">
+                    <span class="line-number-content">&nbsp;</span>
+                  </td>
+                  <td id="L1R71" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">71</span>
+                  </td>
+                  <td class="gi diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=tests/regressiontests/utils/html.py&amp;position=4&amp;line=71"></b>
+                    +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(&#39;&lt;strong&gt;foo&lt;/strong&gt;&lt;a&nbsp;href=&quot;http://example.com&quot;&gt;bar&lt;/a&gt;&#39;,&nbsp;&#39;foobar&#39;),
+                  </td>
+                </tr>
+                <tr id="tests-regressiontests-utils-html-py-P5" data-position='5'>
+                  <td id="L1L71" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">71</span>
+                  </td>
+                  <td id="L1R72" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">72</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=tests/regressiontests/utils/html.py&amp;position=5&amp;line=72"></b>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;)
+                  </td>
+                </tr>
+                <tr id="tests-regressiontests-utils-html-py-P6" data-position='6'>
+                  <td id="L1L72" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">72</span>
+                  </td>
+                  <td id="L1R73" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">73</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=tests/regressiontests/utils/html.py&amp;position=6&amp;line=73"></b>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for&nbsp;value,&nbsp;output&nbsp;in&nbsp;items:
+                  </td>
+                </tr>
+                <tr id="tests-regressiontests-utils-html-py-P7" data-position='7'>
+                  <td id="L1L73" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">73</span>
+                  </td>
+                  <td id="L1R74" class="line_numbers linkable-line-number">
+                    <span class="line-number-content">74</span>
+                  </td>
+                  <td class=" diff-line line">
+                      <b class="add-bubble mini-icon mini-icon-add-comment" data-remote="/django/django/commit_comment/form?commit_id=d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e&amp;path=tests/regressiontests/utils/html.py&amp;position=7&amp;line=74"></b>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;self.check_output(f,&nbsp;value,&nbsp;output)
+                  </td>
+                </tr>
+            </table>
+          </div>
+
+      <div class="file-comments-place-holder" data-path="tests/regressiontests/utils/html.py"></div>
+    </div>
+</div>
+
+
+<div id="all_commit_comments">
+
+
+  <h2 class="commit-comments-header">
+    0 notes
+    on commit <code class="commit-comments-header-sha">d7504a3</code>
+    <span class="commit-comments-toggle-line-notes-wrapper"><label><input id="js-inline-comments-toggle" class="commit-comments-toggle-line-notes" type="checkbox">Show line notes below</label></span>
+  </h2>
+  <div id="comments" class="only-commit-comments comment-holder commit-comments">
+  </div>
+
+    <div class="discussion-bubble js-comment-container">
+      <img class="discussion-bubble-avatar" height="48" src="https://secure.gravatar.com/avatar/cf4198670f0073174b475634964b576b?s=140&amp;d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png" width="48" />
+
+      <form accept-charset="UTF-8" action="/django/django/commit_comment/create" method="post"><div style="margin:0;padding:0;display:inline"><input name="authenticity_token" type="hidden" value="Vbmuc30dLLFdm7POIe3xfTa4nODYc/la/wLrI1OLEOI=" /></div>
+        <div class="discussion-bubble-content bubble">
+          <div class="discussion-bubble-inner">
+            <input type='hidden' name='commit_id' value='d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e'>
+            
+
+<div class="js-previewable-comment-form previewable-comment-form write-selected" data-preview-url="/preview?repository=4164482">
+  <div class="comment-form-head tabnav">
+    <ul class="tabnav-tabs">
+      <li><a href="#write_bucket_525" class="tabnav-tab write-tab js-write-tab selected">Write</a></li>
+      <li><a href="#preview_bucket_525" class="tabnav-tab preview-tab js-preview-tab">Preview</a></li>
+    </ul>
+    <span class="tabnav-right">
+      <span class="tabnav-widget text">Comments are parsed with <a href="http://github.github.com/github-flavored-markdown/" class="gfm-help" target="_blank">GitHub Flavored Markdown</a></span>
+    </span>
+  </div>
+  <div class="comment-form-error js-comment-form-error" style="display:none;"></div>
+
+  <div id="write_bucket_525" class="write-content js-write-bucket js-uploadable-container upload-enabled is-default" data-model="asset">
+    
+<a href="#fullscreen_comment_body_525" class="enable-fullscreen js-enable-fullscreen tooltipped
+  leftwards " title="Zen Mode">
+  <span class="mini-icon mini-icon-fullscreen"></span>
+</a>
+
+    <textarea name="comment[body]"
+              tabindex="2"
+              id="comment_body_525"
+              placeholder="Leave a comment"
+              class="js-comment-field js-size-to-fit input-with-fullscreen-icon"
+              data-suggester="525_new_preview_suggester"
+              required></textarea>
+
+    
+  <p class="drag-and-drop">
+    <span class="default">
+      Attach images by dragging &amp; dropping them or
+      <input type="file" multiple="multiple" class="manual-file-chooser js-manual-file-chooser">
+      <a class="manual-file-chooser-text" href="#">choose an image</a>
+    </span>
+    <span class="loading">
+      <img alt="Octocat-spinner-32" height="16" src="https://a248.e.akamai.net/assets.github.com/images/spinners/octocat-spinner-32.gif?1338945075" width="16" /> Uploading your images now…
+    </span>
+    <span class="error bad-file">
+      Unfortunately we don't support that file type yet. Try image files less than 5MB.
+    </span>
+    <span class="error bad-browser">
+      This browser doesn't support image attachments.
+    </span>
+    <span class="error failed-request">
+      Something went really wrong and we can't process that image.
+    </span>
+  </p>
+
+  </div>
+  <div id="preview_bucket_525" class="preview-content js-preview-bucket">
+    
+<div id="openstruct-163168300" class="js-comment comment">
+  <div class="comment-header normal-comment-header">
+      <img class="comment-header-gravatar" height="22" src="https://secure.gravatar.com/avatar/cf4198670f0073174b475634964b576b?s=140&amp;d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png" width="22" />
+    <a href="/claudep" class="comment-header-author">claudep</a>
+    <span class='comment-header-action-text'>
+      <a href="#openstruct-163168300">
+      commented
+      </a>
+    </span>
+
+    <span class="comment-header-right">
+      <a href="#openstruct-163168300" class="comment-header-date"><time class="js-relative-date" datetime="2013-04-01T06:45:26-07:00" title="2013-04-01 06:45:26">April 01, 2013</time></a>
+    </span>
+  </div> <!-- /.comment-header -->
+
+
+  <div class="comment-content">
+    <div class="edit-comment-hide">
+      <div class="js-comment-body comment-body markdown-body " data-body-version="">
+          <p>Nothing to preview</p>
+      </div>
+    </div>
+  </div> <!-- /.comment-content -->
+</div> <!-- /.comment -->
+
+  </div>
+
+  <div class="suggester-container">
+    <div class="suggester js-navigation-container" id="525_new_preview_suggester"
+         data-url="/django/django/suggestions/commit">
+    </div>
+  </div>
+</div>
+
+          </div>
+        </div>
+
+        <div class="form-actions">
+          <div class="tip">
+            <img alt="Commit_comment_tip" height="35" src="https://a248.e.akamai.net/assets.github.com/images/modules/commit/commit_comment_tip.gif?1347524281" width="95" />
+            <p><strong>Tip:</strong> You can also add notes to lines in a file. Hover to the left of a line to make a note</p>
+          </div>
+          <button type="submit" class="button primary" tabindex="2" data-disable-invalid data-disable-with>Comment on this commit</button>
+        </div>
+</form>    </div><!-- /.discussion-bubble -->
+
+
+
+</div>
+
+  
+
+<div class="thread-subscription-status clearfix">
+  <span class="mega-icon mega-icon-notifications"></span>
+
+    <div class="select-menu js-menu-container js-select-menu">
+
+      <form accept-charset="UTF-8" action="/notifications/thread" data-autosubmit="true" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="authenticity_token" type="hidden" value="Vbmuc30dLLFdm7POIe3xfTa4nODYc/la/wLrI1OLEOI=" /></div>      <input id="repository_id" name="repository_id" type="hidden" value="4164482" />
+      <input id="thread_id" name="thread_id" type="hidden" value="d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e" />
+      <input id="thread_class" name="thread_class" type="hidden" value="c" />
+
+      <span class="minibutton select-menu-button js-menu-target">
+        <span class="js-select-button">
+          <span class="mini-icon mini-icon-watching"></span>
+          Watch thread
+        </span>
+      </span>
+
+      <div class="select-menu-modal-holder js-menu-content js-navigation-container">
+        <div class="select-menu-modal">
+          <div class="select-menu-header">
+            <span class="select-menu-title">Thread notifications</span>
+            <span class="mini-icon mini-icon-remove-close js-menu-close"></span>
+          </div> <!-- /.select-menu-header -->
+
+          <div class="select-menu-list">
+
+            <div class="select-menu-item js-navigation-item js-navigation-target selected">
+              <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+              <div class="select-menu-item-text">
+                <input checked="checked" id="id_unsubscribe" name="id" type="radio" value="unsubscribe" />
+                <h4>Not watching</h4>
+                <span class="description">You only receive notifications for this thread if you participate or are @mentioned.</span>
+                <span class="js-select-button-text hidden-select-button-text">
+                  <span class="mini-icon mini-icon-watching"></span>
+                  Watch thread
+                </span>
+              </div>
+            </div> <!-- /.select-menu-item -->
+
+            <div class="select-menu-item js-navigation-item js-navigation-target ">
+              <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+              <div class="select-menu-item-text">
+                <input checked="checked" id="id_subscribe" name="id" type="radio" value="subscribe" />
+                <h4>Watching</h4>
+                <span class="description">Receive all notifications for this thread.</span>
+                <span class="js-select-button-text hidden-select-button-text">
+                  <span class="mini-icon mini-icon-unwatch"></span>
+                  Unwatch thread
+                </span>
+              </div>
+            </div> <!-- /.select-menu-item -->
+
+            <div class="select-menu-item js-navigation-item js-navigation-target ">
+              <span class="select-menu-item-icon mini-icon mini-icon-confirm"></span>
+              <div class="select-menu-item-text">
+                <input checked="checked" id="id_mute" name="id" type="radio" value="mute" />
+                <h4>Ignoring</h4>
+                <span class="description">You do not receive notifications for this thread.</span>
+                <span class="js-select-button-text hidden-select-button-text">
+                  <span class="mini-icon mini-icon-mute ignored"></span>
+                  Stop ignoring thread
+                </span>
+              </div>
+            </div> <!-- /.select-menu-item -->
+
+          </div> <!-- /.select-menu-list -->
+        </div> <!-- /.select-menu-modal -->
+      </div> <!-- /.select-menu-modal-holder -->
+</form>    </div> <!-- /.select-menu -->
+
+    <p class="reason">You only receive notifications for this thread when you participate or are @mentioned.</p>
+</div>
+
+
+
+<!-- COMMENTS -->
+<div id='diff-comment-data' style='display:none'>
+</div>
+
+
+        </div>
+      </div>
+      <div class="context-overlay"></div>
+    </div>
+
+      <div id="footer-push"></div><!-- hack for sticky footer -->
+    </div><!-- end of wrapper - hack for sticky footer -->
+
+      <!-- footer -->
+      <div id="footer">
+  <div class="container clearfix">
+
+      <dl class="footer_nav">
+        <dt>GitHub</dt>
+        <dd><a href="https://github.com/about">About us</a></dd>
+        <dd><a href="https://github.com/blog">Blog</a></dd>
+        <dd><a href="https://github.com/contact">Contact &amp; support</a></dd>
+        <dd><a href="http://enterprise.github.com/">GitHub Enterprise</a></dd>
+        <dd><a href="http://status.github.com/">Site status</a></dd>
+      </dl>
+
+      <dl class="footer_nav">
+        <dt>Applications</dt>
+        <dd><a href="http://mac.github.com/">GitHub for Mac</a></dd>
+        <dd><a href="http://windows.github.com/">GitHub for Windows</a></dd>
+        <dd><a href="http://eclipse.github.com/">GitHub for Eclipse</a></dd>
+        <dd><a href="http://mobile.github.com/">GitHub mobile apps</a></dd>
+      </dl>
+
+      <dl class="footer_nav">
+        <dt>Services</dt>
+        <dd><a href="http://get.gaug.es/">Gauges: Web analytics</a></dd>
+        <dd><a href="http://speakerdeck.com">Speaker Deck: Presentations</a></dd>
+        <dd><a href="https://gist.github.com">Gist: Code snippets</a></dd>
+        <dd><a href="http://jobs.github.com/">Job board</a></dd>
+      </dl>
+
+      <dl class="footer_nav">
+        <dt>Documentation</dt>
+        <dd><a href="http://help.github.com/">GitHub Help</a></dd>
+        <dd><a href="http://developer.github.com/">Developer API</a></dd>
+        <dd><a href="http://github.github.com/github-flavored-markdown/">GitHub Flavored Markdown</a></dd>
+        <dd><a href="http://pages.github.com/">GitHub Pages</a></dd>
+      </dl>
+
+      <dl class="footer_nav">
+        <dt>More</dt>
+        <dd><a href="http://training.github.com/">Training</a></dd>
+        <dd><a href="https://github.com/edu">Students &amp; teachers</a></dd>
+        <dd><a href="http://shop.github.com">The Shop</a></dd>
+        <dd><a href="/plans">Plans &amp; pricing</a></dd>
+        <dd><a href="http://octodex.github.com/">The Octodex</a></dd>
+      </dl>
+
+      <hr class="footer-divider">
+
+
+    <p class="right">&copy; 2013 <span title="0.09734s from fe2.rs.github.com">GitHub</span>, Inc. All rights reserved.</p>
+    <a class="left" href="https://github.com/">
+      <span class="mega-icon mega-icon-invertocat"></span>
+    </a>
+    <ul id="legal">
+        <li><a href="https://github.com/site/terms">Terms of Service</a></li>
+        <li><a href="https://github.com/site/privacy">Privacy</a></li>
+        <li><a href="https://github.com/security">Security</a></li>
+    </ul>
+
+  </div><!-- /.container -->
+
+</div><!-- /.#footer -->
+
+
+    <div class="fullscreen-overlay js-fullscreen-overlay" id="fullscreen_overlay">
+  <div class="fullscreen-container js-fullscreen-container">
+    <div class="textarea-wrap">
+      <textarea name="fullscreen-contents" id="fullscreen-contents" class="js-fullscreen-contents" placeholder="" data-suggester="fullscreen_suggester"></textarea>
+          <div class="suggester-container">
+              <div class="suggester fullscreen-suggester js-navigation-container" id="fullscreen_suggester"
+                 data-url="/django/django/suggestions/commit">
+              </div>
+          </div>
+    </div>
+  </div>
+  <div class="fullscreen-sidebar">
+    <a href="#" class="exit-fullscreen js-exit-fullscreen tooltipped leftwards" title="Exit Zen Mode">
+      <span class="mega-icon mega-icon-normalscreen"></span>
+    </a>
+    <a href="#" class="theme-switcher js-theme-switcher tooltipped leftwards"
+      title="Switch themes">
+      <span class="mini-icon mini-icon-brightness"></span>
+    </a>
+  </div>
+</div>
+
+
+
+    <div id="ajax-error-message" class="flash flash-error">
+      <span class="mini-icon mini-icon-exclamation"></span>
+      Something went wrong with that request. Please try again.
+      <a href="#" class="mini-icon mini-icon-remove-close ajax-error-dismiss"></a>
+    </div>
+
+    
+    
+    <span id='server_response_time' data-time='0.09780' data-host='fe2'></span>
+    
+  </body>
+</html>
+
diff --git a/tests/utils_tests/files/strip_tags2.txt b/tests/utils_tests/files/strip_tags2.txt
new file mode 100644
index 0000000000..6b2a4033c2
--- /dev/null
+++ b/tests/utils_tests/files/strip_tags2.txt
@@ -0,0 +1,118 @@
+_**Prerequisite**: You are already aware of the [basics of building a HelloWorld](http://developer.android.com/training/index.html) in Android and know [how to use the APIs provided in the support library](http://developer.android.com/training/basics/fragments/support-lib.html)._
+
+_The code example is available on [github](http://github.com/iontech/Fragments_Example "Fragments Example")._
+_____________________________________________________________
+Ever wanted a code snippet from an Activity to be available to other activities? Perhaps a Button or a ListView, maybe a Layout or any View/ViewGroup for that matter? Fragments let us do just that.
+
+Necessity is the mother of invention.  
+Before understanding what Fragments are and how they work, we must first realize their existence in the first place.
+
+The Problem
+-----------
+Suppose we have an Android app with two Activities- [*FirstActivity*](https://github.com/iontech/Fragments_Example/blob/master/src/main/java/com/github/iontech/fragments_example/FirstActivity.java) and [*SecondActivity*](https://github.com/iontech/Fragments_Example/blob/master/src/main/java/com/github/iontech/fragments_example/SecondActivity.java).  
+*FirstActivity* contains two Views, a `TextView` (*textView*) and a `Button` (*button1*); and *button1* has an `onClick()` callback that `Toast`'s a simple message "Button pressed".  
+*SecondActivity* contains both the Views present in *FirstActivity* and a `Button` (*button2*).
+
+Now we want to utilize the two layout components(Views) of *FirstActivity* in *SecondActivity*, we can go about this with two approaches:
+
+1. Copy and Paste the xml elements of the two Views.
+2. Create a separate layout for common Views and reuse it using `` layout element.  
+    More about this [here](http://developer.android.com/training/improving-layouts/reusing-layouts.html).
+
+Electing the second approach makes sense cause it enables us to make reusable layouts. Everything seems great till now. We are able to make reusable layouts and use them as many times as we want.
+
+Now recollect that we have an `onClick()` callback assigned to *button1*. How do we reuse the same callback functionality of *button1* across multiple Activities? `` lets us reuse layouts and not the Activity source.  
+This is where Fragments come into play.
+
+Fragments
+---------
+<center> ![image](http://iontech.files.wordpress.com/2013/01/androidfragmentation1-264x300.png) </center>
+Fragments encompass both layout resource and Java source. Hence, unlike ``, they allow us to reuse the View components along with their functionality, if needed.
+Fragments were first introduced in Honeycomb(API 11), living under the `android.app` package.  
+**Note**: API 11 implies that Fragments have no support for devices less than Honeycomb and, for the record, as of writing this post, [more than 50% of Android devices worldwide run versions of Android below Honeycomb](http://developer.android.com/about/dashboards/index.html). Developer dissapointed? You don't have to be, cause google has been cautious enough to add the Fragment APIs to the support library. Yay!
+
+In the support library Fragment APIs sit in the `android.support.v4.app` package. This post assumes that your `minSdk` support is below API 11. Hence we concentrate on the Fragment APIs of the support library.
+
+### Diving into code
+
+Performing code reuse with Fragments involves three major steps:
+
+1. Creating reusable View components - Creating a layout for the fragment.
+2. Creating reusable Java source - Writing the layout's corresponding Fragment class.
+3. Employing the reusable components in Activity - Making an Activity to host this Fragment.
+
+#### 1. Creating reusable View components
+##### Creating a layout for the Fragment
+This is done precisely as we do it for our activity layouts. The layout contains a root element (ViewGroup) defining the layout, For instance in our example we use a LinearLayout and its child elements(the reusable Views) that we want to have in our fragment.
+
+> [fragment_common.xml](https://github.com/iontech/Fragments_Example/blob/master/res/layout/fragment_common.xml)
+
+    
+
+      
+    
+    	<button>
+
+    
+
+#### 2. Creating reusable Java source
+##### Writing the layout's corresponding Fragment class
+
+> [CommonFragment.java](https://github.com/iontech/Fragments_Example/blob/master/src/main/java/com/github/iontech/fragments_example/CommonFragment.java)
+
+This class will inherit `Fragment` class and must override the `onCreateView()` method.
+In this method we inflate the fragment layout using the following line of code.
+
+    View view = inflater.inflate(R.layout.fragment_common, container, false);
+
+*container* is the parent ViewGroup that the fragment's UI should be attached to.
+Once inflation is done, we can perform various operations on the component views of the fragment.
+Accessing the view elements from the layout is done exactly as we do in an Activity (using `findViewById()`) except that we use the `View` for the fragment's UI or an instance of the host Activity.
+
+In Activity we access Views(a Button for our example) as follows
+
+    Button button1 = (Button) findViewById(R.id.button1);    
+In Fragment, we need to use the inflated view(if in `onCreateView()`) or get the instance of the host activity and access the views through this instance(when in a [lifecycle callback](http://developer.android.com/guide/components/fragments.html#Lifecycle "Fragment lifecycle callbacks") after `onCreateView()`, I generally do it in `onActivityCreated()`).
+
+    Button button1 = (Button) view.findViewById(R.id.button1);
+or
+
+    Button button1 = (Button) getActivity().findViewById(R.id.button1);
+`getActivity()` returns the instance of the Activity that is hosting this Fragment.
+
+Finally, in `onCreateView()` we must return the View for the fragment's UI.
+
+    return view;
+    
+#### 3. Employing the reusable components in Activity
+##### Making an Activity to host this Fragment
+This is done in two ways, statically by adding `` elements into the Activity layout or dynamically, at run time, by using `FragmentTransaction`s.
+**Note**: First thing we need to ensure is that our Activity extends `FragmentActivity` class instead of the regular `Activity`.
+If the `minSdk` is API 11 or higher, then we can leave our inheritance to `Activity` class and not bother about `FragmentActivity`.
+
+##### a. Static approach to hosting the Fragments
+###### Adding `` element in activity layout
+
+> [activity_static.xml](https://github.com/iontech/Fragments_Example/blob/master/res/layout/activity_static.xml)
+
+Inorder to statically add a Fragment into your Activity, just add `` element with the necessary layout attributes and the `android:name` attribute set to the fully qualified class name of the corresponding Fragment.
+
+    
+##### b. Dynamic approach
+###### Using `FragmentTransaction`s
+
+> [ADynamicFragmentActivity.java](https://github.com/iontech/Fragments_Example/blob/master/src/main/java/com/github/iontech/fragments_example/ADynamicFragmentActivity.java)
+
+Can be done using `FragmentManager` and `FragmentTransaction` classes. We call `add()`, in our FragmentActivity implementation, on an instance of `FragmentTransaction` to add a fragment to the host Activity. But that is not enough to show the fragment on the screen, i.e. the FragmentTransaction is not complete. We must call `commit()` to finish the transaction.
+
+    CommonFragment fragment = new CommonFragment();
+    FragmentManager manager = getSupportFragmentManager();
+    FragmentTransaction transaction = manager.beginTransaction();
+    transaction.add(R.id.dynamicFragmentLayout, fragment);
+    transaction.commit();
+
+Similarly Fragments can be removed(`remove()`) as well as replaced(`replace()`) from the activity all at runtime.
+
+Congratulations, now you can use Fragments to write reusable code and easily host them over multiple activities.
+
+Please try again. Till next time.
diff --git a/tests/utils_tests/models.py b/tests/utils_tests/models.py
new file mode 100644
index 0000000000..de8f9e3803
--- /dev/null
+++ b/tests/utils_tests/models.py
@@ -0,0 +1,13 @@
+from django.db import models
+
+
+class Category(models.Model):
+    name = models.CharField(max_length=100)
+
+    def next(self):
+        return self
+
+
+class Thing(models.Model):
+    name = models.CharField(max_length=100)
+    category = models.ForeignKey(Category)
diff --git a/tests/regressiontests/utils/archive.py b/tests/utils_tests/test_archive.py
similarity index 100%
rename from tests/regressiontests/utils/archive.py
rename to tests/utils_tests/test_archive.py
diff --git a/tests/regressiontests/utils/baseconv.py b/tests/utils_tests/test_baseconv.py
similarity index 100%
rename from tests/regressiontests/utils/baseconv.py
rename to tests/utils_tests/test_baseconv.py
diff --git a/tests/regressiontests/utils/checksums.py b/tests/utils_tests/test_checksums.py
similarity index 100%
rename from tests/regressiontests/utils/checksums.py
rename to tests/utils_tests/test_checksums.py
diff --git a/tests/regressiontests/utils/crypto.py b/tests/utils_tests/test_crypto.py
similarity index 100%
rename from tests/regressiontests/utils/crypto.py
rename to tests/utils_tests/test_crypto.py
diff --git a/tests/regressiontests/utils/datastructures.py b/tests/utils_tests/test_datastructures.py
similarity index 98%
rename from tests/regressiontests/utils/datastructures.py
rename to tests/utils_tests/test_datastructures.py
index f65fc5c770..3161c04f97 100644
--- a/tests/regressiontests/utils/datastructures.py
+++ b/tests/utils_tests/test_datastructures.py
@@ -139,14 +139,14 @@ class SortedDictTests(SimpleTestCase):
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")
             d.insert(0, "hello", "world")
-        assert w[0].category is PendingDeprecationWarning
+        assert w[0].category is DeprecationWarning
 
     def test_value_for_index(self):
         d = SortedDict({"a": 3})
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")
             self.assertEqual(d.value_for_index(0), 3)
-        assert w[0].category is PendingDeprecationWarning
+        assert w[0].category is DeprecationWarning
 
 
 class MergeDictTests(SimpleTestCase):
diff --git a/tests/regressiontests/utils/dateformat.py b/tests/utils_tests/test_dateformat.py
similarity index 98%
rename from tests/regressiontests/utils/dateformat.py
rename to tests/utils_tests/test_dateformat.py
index 0f4fd67f6f..78cedaf764 100644
--- a/tests/regressiontests/utils/dateformat.py
+++ b/tests/utils_tests/test_dateformat.py
@@ -14,6 +14,7 @@ class DateFormatTests(unittest.TestCase):
     def setUp(self):
         self.old_TZ = os.environ.get('TZ')
         os.environ['TZ'] = 'Europe/Copenhagen'
+        self._orig_lang = translation.get_language()
         translation.activate('en-us')
 
         try:
@@ -25,6 +26,7 @@ class DateFormatTests(unittest.TestCase):
             self.tz_tests = False
 
     def tearDown(self):
+        translation.activate(self._orig_lang)
         if self.old_TZ is None:
             del os.environ['TZ']
         else:
diff --git a/tests/regressiontests/utils/dateparse.py b/tests/utils_tests/test_dateparse.py
similarity index 100%
rename from tests/regressiontests/utils/dateparse.py
rename to tests/utils_tests/test_dateparse.py
diff --git a/tests/regressiontests/utils/datetime_safe.py b/tests/utils_tests/test_datetime_safe.py
similarity index 100%
rename from tests/regressiontests/utils/datetime_safe.py
rename to tests/utils_tests/test_datetime_safe.py
diff --git a/tests/regressiontests/utils/decorators.py b/tests/utils_tests/test_decorators.py
similarity index 100%
rename from tests/regressiontests/utils/decorators.py
rename to tests/utils_tests/test_decorators.py
diff --git a/tests/regressiontests/utils/encoding.py b/tests/utils_tests/test_encoding.py
similarity index 57%
rename from tests/regressiontests/utils/encoding.py
rename to tests/utils_tests/test_encoding.py
index d191845518..7aaba25a7a 100644
--- a/tests/regressiontests/utils/encoding.py
+++ b/tests/utils_tests/test_encoding.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.utils import unittest
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, filepath_to_uri
 
 
 class TestEncodingUtils(unittest.TestCase):
@@ -15,3 +15,9 @@ class TestEncodingUtils(unittest.TestCase):
         exc = ValueError(error_msg)
         result = force_bytes(exc)
         self.assertEqual(result, error_msg.encode('utf-8'))
+
+    def test_filepath_to_uri(self):
+        self.assertEqual(filepath_to_uri('upload\\чубака.mp4'),
+            'upload/%D1%87%D1%83%D0%B1%D0%B0%D0%BA%D0%B0.mp4')
+        self.assertEqual(filepath_to_uri('upload\\чубака.mp4'.encode('utf-8')),
+            'upload/%D1%87%D1%83%D0%B1%D0%B0%D0%BA%D0%B0.mp4')
diff --git a/tests/regressiontests/utils/feedgenerator.py b/tests/utils_tests/test_feedgenerator.py
similarity index 100%
rename from tests/regressiontests/utils/feedgenerator.py
rename to tests/utils_tests/test_feedgenerator.py
diff --git a/tests/regressiontests/utils/functional.py b/tests/utils_tests/test_functional.py
similarity index 56%
rename from tests/regressiontests/utils/functional.py
rename to tests/utils_tests/test_functional.py
index 90a6f08630..3bb50007c6 100644
--- a/tests/regressiontests/utils/functional.py
+++ b/tests/utils_tests/test_functional.py
@@ -1,5 +1,5 @@
 from django.utils import unittest
-from django.utils.functional import lazy, lazy_property
+from django.utils.functional import lazy, lazy_property, cached_property
 
 
 class FunctionalTestCase(unittest.TestCase):
@@ -37,3 +37,30 @@ class FunctionalTestCase(unittest.TestCase):
 
         self.assertRaises(NotImplementedError, lambda: A().do)
         self.assertEqual(B().do, 'DO IT')
+
+    def test_cached_property(self):
+        """
+        Test that cached_property caches its value,
+        and that it behaves like a property
+        """
+
+        class A(object):
+
+            @cached_property
+            def value(self):
+                return 1, object()
+
+        a = A()
+
+        # check that it is cached
+        self.assertEqual(a.value, a.value)
+
+        # check that it returns the right thing
+        self.assertEqual(a.value[0], 1)
+
+        # check that state isn't shared between instances
+        a2 = A()
+        self.assertNotEqual(a.value, a2.value)
+
+        # check that it behaves like a property when there's no instance
+        self.assertIsInstance(A.value, cached_property)
diff --git a/tests/regressiontests/utils/html.py b/tests/utils_tests/test_html.py
similarity index 88%
rename from tests/regressiontests/utils/html.py
rename to tests/utils_tests/test_html.py
index a0226c4765..090cc32d1c 100644
--- a/tests/regressiontests/utils/html.py
+++ b/tests/utils_tests/test_html.py
@@ -1,10 +1,14 @@
 from __future__ import unicode_literals
 
-import unittest
+from datetime import datetime
+import os
 
 from django.utils import html
+from django.utils._os import upath
+from django.utils.unittest import TestCase
 
-class TestUtilsHtml(unittest.TestCase):
+
+class TestUtilsHtml(TestCase):
 
     def check_output(self, function, value, output=None):
         """
@@ -68,10 +72,22 @@ class TestUtilsHtml(unittest.TestCase):
             ('a<p onclick="alert(\'<test>\')">b</p>c', 'abc'),
             ('a<p a >b</p>c', 'abc'),
             ('d<a:b c:d>e</p>f', 'def'),
+            ('<strong>foo</strong><a href="http://example.com">bar</a>', 'foobar'),
         )
         for value, output in items:
             self.check_output(f, value, output)
 
+        # Test with more lengthy content (also catching performance regressions)
+        for filename in ('strip_tags1.html', 'strip_tags2.txt'):
+            path = os.path.join(os.path.dirname(upath(__file__)), 'files', filename)
+            with open(path, 'r') as fp:
+                start = datetime.now()
+                stripped = html.strip_tags(fp.read())
+                elapsed = datetime.now() - start
+            self.assertEqual(elapsed.seconds, 0)
+            self.assertIn("Please try again.", stripped)
+            self.assertNotIn('<', stripped)
+
     def test_strip_spaces_between_tags(self):
         f = html.strip_spaces_between_tags
         # Strings that should come out untouched.
diff --git a/tests/regressiontests/utils/http.py b/tests/utils_tests/test_http.py
similarity index 100%
rename from tests/regressiontests/utils/http.py
rename to tests/utils_tests/test_http.py
diff --git a/tests/regressiontests/utils/ipv6.py b/tests/utils_tests/test_ipv6.py
similarity index 100%
rename from tests/regressiontests/utils/ipv6.py
rename to tests/utils_tests/test_ipv6.py
diff --git a/tests/utils_tests/test_itercompat.py b/tests/utils_tests/test_itercompat.py
new file mode 100644
index 0000000000..02d3463370
--- /dev/null
+++ b/tests/utils_tests/test_itercompat.py
@@ -0,0 +1,11 @@
+from django.test import TestCase
+
+from .models import Category, Thing
+
+
+class TestIsIterator(TestCase):
+    def test_regression(self):
+        """This failed on Django 1.5/Py2.6 because category has a next method."""
+        category = Category.objects.create(name='category')
+        Thing.objects.create(category=category)
+        Thing.objects.filter(category=category)
diff --git a/tests/regressiontests/utils/jslex.py b/tests/utils_tests/test_jslex.py
similarity index 100%
rename from tests/regressiontests/utils/jslex.py
rename to tests/utils_tests/test_jslex.py
diff --git a/tests/regressiontests/model_regress/__init__.py b/tests/utils_tests/test_module/__init__.py
similarity index 100%
rename from tests/regressiontests/model_regress/__init__.py
rename to tests/utils_tests/test_module/__init__.py
diff --git a/tests/regressiontests/utils/test_module/bad_module.py b/tests/utils_tests/test_module/bad_module.py
similarity index 100%
rename from tests/regressiontests/utils/test_module/bad_module.py
rename to tests/utils_tests/test_module/bad_module.py
diff --git a/tests/regressiontests/utils/test_module/good_module.py b/tests/utils_tests/test_module/good_module.py
similarity index 100%
rename from tests/regressiontests/utils/test_module/good_module.py
rename to tests/utils_tests/test_module/good_module.py
diff --git a/tests/regressiontests/utils/module_loading.py b/tests/utils_tests/test_module_loading.py
similarity index 75%
rename from tests/regressiontests/utils/module_loading.py
rename to tests/utils_tests/test_module_loading.py
index 3fc92b0862..0a905ef2f1 100644
--- a/tests/regressiontests/utils/module_loading.py
+++ b/tests/utils_tests/test_module_loading.py
@@ -3,9 +3,10 @@ import sys
 import imp
 from zipimport import zipimporter
 
+from django.core.exceptions import ImproperlyConfigured
 from django.utils import unittest
 from django.utils.importlib import import_module
-from django.utils.module_loading import module_has_submodule
+from django.utils.module_loading import import_by_path, module_has_submodule
 from django.utils._os import upath
 
 
@@ -18,35 +19,35 @@ class DefaultLoader(unittest.TestCase):
 
     def test_loader(self):
         "Normal module existence can be tested"
-        test_module = import_module('regressiontests.utils.test_module')
+        test_module = import_module('utils_tests.test_module')
         test_no_submodule = import_module(
-            'regressiontests.utils.test_no_submodule')
+            'utils_tests.test_no_submodule')
 
         # An importable child
         self.assertTrue(module_has_submodule(test_module, 'good_module'))
-        mod = import_module('regressiontests.utils.test_module.good_module')
+        mod = import_module('utils_tests.test_module.good_module')
         self.assertEqual(mod.content, 'Good Module')
 
         # A child that exists, but will generate an import error if loaded
         self.assertTrue(module_has_submodule(test_module, 'bad_module'))
-        self.assertRaises(ImportError, import_module, 'regressiontests.utils.test_module.bad_module')
+        self.assertRaises(ImportError, import_module, 'utils_tests.test_module.bad_module')
 
         # A child that doesn't exist
         self.assertFalse(module_has_submodule(test_module, 'no_such_module'))
-        self.assertRaises(ImportError, import_module, 'regressiontests.utils.test_module.no_such_module')
+        self.assertRaises(ImportError, import_module, 'utils_tests.test_module.no_such_module')
 
         # A child that doesn't exist, but is the name of a package on the path
         self.assertFalse(module_has_submodule(test_module, 'django'))
-        self.assertRaises(ImportError, import_module, 'regressiontests.utils.test_module.django')
+        self.assertRaises(ImportError, import_module, 'utils_tests.test_module.django')
 
         # Don't be confused by caching of import misses
-        import types  # causes attempted import of regressiontests.utils.types
-        self.assertFalse(module_has_submodule(sys.modules['regressiontests.utils'], 'types'))
+        import types  # causes attempted import of utils_tests.types
+        self.assertFalse(module_has_submodule(sys.modules['utils_tests'], 'types'))
 
         # A module which doesn't have a __path__ (so no submodules)
         self.assertFalse(module_has_submodule(test_no_submodule, 'anything'))
         self.assertRaises(ImportError, import_module,
-            'regressiontests.utils.test_no_submodule.anything')
+            'utils_tests.test_no_submodule.anything')
 
 class EggLoader(unittest.TestCase):
     def setUp(self):
@@ -103,6 +104,33 @@ class EggLoader(unittest.TestCase):
         self.assertFalse(module_has_submodule(egg_module, 'no_such_module'))
         self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.no_such_module')
 
+
+class ModuleImportTestCase(unittest.TestCase):
+    def test_import_by_path(self):
+        cls = import_by_path(
+            'django.utils.module_loading.import_by_path')
+        self.assertEqual(cls, import_by_path)
+
+        # Test exceptions raised
+        for path in ('no_dots_in_path', 'unexistent.path',
+                'utils_tests.unexistent'):
+            self.assertRaises(ImproperlyConfigured, import_by_path, path)
+
+        with self.assertRaises(ImproperlyConfigured) as cm:
+            import_by_path('unexistent.module.path', error_prefix="Foo")
+        self.assertTrue(str(cm.exception).startswith('Foo'))
+
+    def test_import_error_traceback(self):
+        """Test preserving the original traceback on an ImportError."""
+        try:
+            import_by_path('test_module.bad_module.content')
+        except ImproperlyConfigured:
+            traceback = sys.exc_info()[2]
+
+        self.assertIsNotNone(traceback.tb_next.tb_next,
+            'Should have more than the calling frame in the traceback.')
+
+
 class ProxyFinder(object):
     def __init__(self):
         self._cache = {}
diff --git a/tests/regressiontests/utils/test_no_submodule.py b/tests/utils_tests/test_no_submodule.py
similarity index 100%
rename from tests/regressiontests/utils/test_no_submodule.py
rename to tests/utils_tests/test_no_submodule.py
diff --git a/tests/regressiontests/utils/numberformat.py b/tests/utils_tests/test_numberformat.py
similarity index 100%
rename from tests/regressiontests/utils/numberformat.py
rename to tests/utils_tests/test_numberformat.py
diff --git a/tests/regressiontests/utils/os_utils.py b/tests/utils_tests/test_os_utils.py
similarity index 100%
rename from tests/regressiontests/utils/os_utils.py
rename to tests/utils_tests/test_os_utils.py
diff --git a/tests/regressiontests/utils/regex_helper.py b/tests/utils_tests/test_regex_helper.py
similarity index 100%
rename from tests/regressiontests/utils/regex_helper.py
rename to tests/utils_tests/test_regex_helper.py
diff --git a/tests/regressiontests/utils/simplelazyobject.py b/tests/utils_tests/test_simplelazyobject.py
similarity index 70%
rename from tests/regressiontests/utils/simplelazyobject.py
rename to tests/utils_tests/test_simplelazyobject.py
index 3f81e8f608..883e60aa81 100644
--- a/tests/regressiontests/utils/simplelazyobject.py
+++ b/tests/utils_tests/test_simplelazyobject.py
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
 
 import copy
 import pickle
+import sys
 
-from django.test.utils import str_prefix
 from django.utils import six
 from django.utils.unittest import TestCase
 from django.utils.functional import SimpleLazyObject, empty
@@ -59,10 +59,18 @@ class TestUtilsSimpleLazyObject(TestCase):
                          hash(SimpleLazyObject(complex_object)))
 
     def test_repr(self):
-        # For debugging, it will really confuse things if there is no clue that
-        # SimpleLazyObject is actually a proxy object. So we don't
-        # proxy __repr__
-        self.assertTrue("SimpleLazyObject" in repr(SimpleLazyObject(complex_object)))
+        # First, for an unevaluated SimpleLazyObject
+        x = SimpleLazyObject(complex_object)
+        # __repr__ contains __repr__ of setup function and does not evaluate
+        # the SimpleLazyObject
+        self.assertEqual("<SimpleLazyObject: %r>" % complex_object, repr(x))
+        self.assertEqual(empty, x._wrapped)
+
+        # Second, for an evaluated SimpleLazyObject
+        name = x.name  # evaluate
+        self.assertTrue(isinstance(x._wrapped, _ComplexObject))
+        # __repr__ contains __repr__ of wrapped object
+        self.assertEqual("<SimpleLazyObject: %r>" % x._wrapped, repr(x))
 
     def test_bytes(self):
         self.assertEqual(b"I am _ComplexObject('joe')",
@@ -89,14 +97,14 @@ class TestUtilsSimpleLazyObject(TestCase):
         self.assertEqual(s2, complex_object())
 
         # Second, for an evaluated SimpleLazyObject
-        name = s.name # evaluate
+        name = s.name  # evaluate
         self.assertIsNot(s._wrapped, empty)
         s3 = copy.deepcopy(s)
         self.assertEqual(s3, complex_object())
 
-
     def test_none(self):
         i = [0]
+
         def f():
             i[0] += 1
             return None
@@ -121,3 +129,26 @@ class TestUtilsSimpleLazyObject(TestCase):
         self.assertEqual(unpickled, x)
         self.assertEqual(six.text_type(unpickled), six.text_type(x))
         self.assertEqual(unpickled.name, x.name)
+
+    def test_dict(self):
+        # See ticket #18447
+        lazydict = SimpleLazyObject(lambda: {'one': 1})
+        self.assertEqual(lazydict['one'], 1)
+        lazydict['one'] = -1
+        self.assertEqual(lazydict['one'], -1)
+        del lazydict['one']
+        with self.assertRaises(KeyError):
+            lazydict['one']
+
+    def test_trace(self):
+        # See ticket #19456
+        old_trace_func = sys.gettrace()
+        try:
+            def trace_func(frame, event, arg):
+                frame.f_locals['self'].__class__
+                if old_trace_func is not None:
+                    old_trace_func(frame, event, arg)
+            sys.settrace(trace_func)
+            SimpleLazyObject(None)
+        finally:
+            sys.settrace(old_trace_func)
diff --git a/tests/regressiontests/utils/termcolors.py b/tests/utils_tests/test_termcolors.py
similarity index 94%
rename from tests/regressiontests/utils/termcolors.py
rename to tests/utils_tests/test_termcolors.py
index 23fcf557f8..8cc28009cd 100644
--- a/tests/regressiontests/utils/termcolors.py
+++ b/tests/utils_tests/test_termcolors.py
@@ -1,5 +1,7 @@
 from django.utils import unittest
-from django.utils.termcolors import parse_color_setting, PALETTES, DEFAULT_PALETTE, LIGHT_PALETTE, DARK_PALETTE, NOCOLOR_PALETTE
+from django.utils.termcolors import (parse_color_setting, PALETTES,
+    DEFAULT_PALETTE, LIGHT_PALETTE, DARK_PALETTE, NOCOLOR_PALETTE, colorize)
+
 
 class TermColorTests(unittest.TestCase):
 
@@ -146,3 +148,10 @@ class TermColorTests(unittest.TestCase):
         self.assertEqual(parse_color_setting('error=green,bLiNk'),
                           dict(PALETTES[NOCOLOR_PALETTE],
                             ERROR={'fg':'green', 'opts': ('blink',)}))
+
+    def test_colorize_empty_text(self):
+        self.assertEqual(colorize(text=None), '\x1b[m\x1b[0m')
+        self.assertEqual(colorize(text=''), '\x1b[m\x1b[0m')
+
+        self.assertEqual(colorize(text=None, opts=('noreset')), '\x1b[m')
+        self.assertEqual(colorize(text='', opts=('noreset')), '\x1b[m')
diff --git a/tests/regressiontests/utils/text.py b/tests/utils_tests/test_text.py
similarity index 61%
rename from tests/regressiontests/utils/text.py
rename to tests/utils_tests/test_text.py
index ebf67952f9..c9dde6b1b3 100644
--- a/tests/regressiontests/utils/text.py
+++ b/tests/utils_tests/test_text.py
@@ -8,8 +8,6 @@ from django.utils import text
 
 class TestUtilsText(SimpleTestCase):
 
-    # In Django 1.6 truncate_words() and truncate_html_words() will be removed
-    # so these tests will need to be adapted accordingly
     def test_truncate_chars(self):
         truncator = text.Truncator(
             'The quick brown fox jumped over the lazy dog.'
@@ -57,45 +55,32 @@ class TestUtilsText(SimpleTestCase):
             truncator.words(4, '[snip]'))
 
     def test_truncate_html_words(self):
-        truncator = text.Truncator('<p><strong><em>The quick brown fox jumped '
-            'over the lazy dog.</em></strong></p>')
-        self.assertEqual('<p><strong><em>The quick brown fox jumped over the '
-            'lazy dog.</em></strong></p>', truncator.words(10, html=True))
-        self.assertEqual('<p><strong><em>The quick brown fox...</em>'
+        truncator = text.Truncator('<p id="par"><strong><em>The quick brown fox'
+            ' jumped over the lazy dog.</em></strong></p>')
+        self.assertEqual('<p id="par"><strong><em>The quick brown fox jumped over'
+            ' the lazy dog.</em></strong></p>', truncator.words(10, html=True))
+        self.assertEqual('<p id="par"><strong><em>The quick brown fox...</em>'
             '</strong></p>', truncator.words(4, html=True))
-        self.assertEqual('<p><strong><em>The quick brown fox....</em>'
+        self.assertEqual('<p id="par"><strong><em>The quick brown fox....</em>'
             '</strong></p>', truncator.words(4, '....', html=True))
-        self.assertEqual('<p><strong><em>The quick brown fox</em></strong>'
-            '</p>', truncator.words(4, '', html=True))
+        self.assertEqual('<p id="par"><strong><em>The quick brown fox</em>'
+            '</strong></p>', truncator.words(4, '', html=True))
+
         # Test with new line inside tag
         truncator = text.Truncator('<p>The quick <a href="xyz.html"\n'
             'id="mylink">brown fox</a> jumped over the lazy dog.</p>')
         self.assertEqual('<p>The quick <a href="xyz.html"\n'
             'id="mylink">brown...</a></p>', truncator.words(3, '...', html=True))
 
-    def test_old_truncate_words(self):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            self.assertEqual('The quick brown fox jumped over the lazy dog.',
-                text.truncate_words('The quick brown fox jumped over the lazy dog.', 10))
-            self.assertEqual('The quick brown fox ...',
-                text.truncate_words('The quick brown fox jumped over the lazy dog.', 4))
-            self.assertEqual('The quick brown fox ....',
-                text.truncate_words('The quick brown fox jumped over the lazy dog.', 4, '....'))
-            self.assertGreater(len(w), 0)
-
-    def test_old_truncate_html_words(self):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
-            self.assertEqual('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>',
-                text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 10))
-            self.assertEqual('<p><strong><em>The quick brown fox ...</em></strong></p>',
-                text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 4))
-            self.assertEqual('<p><strong><em>The quick brown fox ....</em></strong></p>',
-                text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 4, '....'))
-            self.assertEqual('<p><strong><em>The quick brown fox</em></strong></p>',
-                text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 4, None))
-            self.assertGreater(len(w), 0)
+        # Test self-closing tags
+        truncator = text.Truncator('<br/>The <hr />quick brown fox jumped over'
+            ' the lazy dog.')
+        self.assertEqual('<br/>The <hr />quick brown...',
+            truncator.words(3, '...', html=True ))
+        truncator = text.Truncator('<br>The <hr/>quick <em>brown fox</em> '
+            'jumped over the lazy dog.')
+        self.assertEqual('<br>The <hr/>quick <em>brown...</em>',
+            truncator.words(3, '...', html=True ))
 
     def test_wrap(self):
         digits = '1234 67 9'
diff --git a/tests/regressiontests/utils/timesince.py b/tests/utils_tests/test_timesince.py
similarity index 100%
rename from tests/regressiontests/utils/timesince.py
rename to tests/utils_tests/test_timesince.py
diff --git a/tests/regressiontests/utils/timezone.py b/tests/utils_tests/test_timezone.py
similarity index 55%
rename from tests/regressiontests/utils/timezone.py
rename to tests/utils_tests/test_timezone.py
index 991600c8b9..650198e8ff 100644
--- a/tests/regressiontests/utils/timezone.py
+++ b/tests/utils_tests/test_timezone.py
@@ -3,9 +3,14 @@ import datetime
 import pickle
 from django.test.utils import override_settings
 from django.utils import timezone
+from django.utils.tzinfo import FixedOffset
 from django.utils import unittest
 
 
+EAT = FixedOffset(180)      # Africa/Nairobi
+ICT = FixedOffset(420)      # Asia/Bangkok
+
+
 class TimezoneTests(unittest.TestCase):
 
     def test_localtime(self):
@@ -20,6 +25,31 @@ class TimezoneTests(unittest.TestCase):
         with override_settings(USE_TZ=False):
             self.assertTrue(timezone.is_naive(timezone.now()))
 
+    def test_override(self):
+        default = timezone.get_default_timezone()
+        try:
+            timezone.activate(ICT)
+
+            with timezone.override(EAT):
+                self.assertIs(EAT, timezone.get_current_timezone())
+            self.assertIs(ICT, timezone.get_current_timezone())
+
+            with timezone.override(None):
+                self.assertIs(default, timezone.get_current_timezone())
+            self.assertIs(ICT, timezone.get_current_timezone())
+
+            timezone.deactivate()
+
+            with timezone.override(EAT):
+                self.assertIs(EAT, timezone.get_current_timezone())
+            self.assertIs(default, timezone.get_current_timezone())
+
+            with timezone.override(None):
+                self.assertIs(default, timezone.get_current_timezone())
+            self.assertIs(default, timezone.get_current_timezone())
+        finally:
+            timezone.deactivate()
+
     def test_copy(self):
         self.assertIsInstance(copy.copy(timezone.UTC()), timezone.UTC)
         self.assertIsInstance(copy.copy(timezone.LocalTimezone()), timezone.LocalTimezone)
diff --git a/tests/regressiontests/utils/tzinfo.py b/tests/utils_tests/test_tzinfo.py
similarity index 100%
rename from tests/regressiontests/utils/tzinfo.py
rename to tests/utils_tests/test_tzinfo.py
diff --git a/tests/utils_tests/tests.py b/tests/utils_tests/tests.py
new file mode 100644
index 0000000000..8d7fda4800
--- /dev/null
+++ b/tests/utils_tests/tests.py
@@ -0,0 +1,34 @@
+"""
+Tests for django.utils.
+"""
+from __future__ import absolute_import
+
+from .test_archive import TestBzip2Tar, TestGzipTar, TestTar, TestZip
+from .test_baseconv import TestBaseConv
+from .test_checksums import TestUtilsChecksums
+from .test_crypto import TestUtilsCryptoMisc, TestUtilsCryptoPBKDF2
+from .test_datastructures import (DictWrapperTests, ImmutableListTests,
+    MergeDictTests, MultiValueDictTests, SortedDictTests)
+from .test_dateformat import DateFormatTests
+from .test_dateparse import DateParseTests
+from .test_datetime_safe import DatetimeTests
+from .test_decorators import DecoratorFromMiddlewareTests
+from .test_encoding import TestEncodingUtils
+from .test_feedgenerator import FeedgeneratorTest
+from .test_functional import FunctionalTestCase
+from .test_html import TestUtilsHtml
+from .test_http import TestUtilsHttp, ETagProcessingTests, HttpDateProcessingTests
+from .test_itercompat import TestIsIterator
+from .test_ipv6 import TestUtilsIPv6
+from .test_jslex import JsToCForGettextTest, JsTokensTest
+from .test_module_loading import (CustomLoader, DefaultLoader, EggLoader,
+    ModuleImportTestCase)
+from .test_numberformat import TestNumberFormat
+from .test_os_utils import SafeJoinTests
+from .test_regex_helper import NormalizeTests
+from .test_simplelazyobject import TestUtilsSimpleLazyObject
+from .test_termcolors import TermColorTests
+from .test_text import TestUtilsText
+from .test_timesince import TimesinceTests
+from .test_timezone import TimezoneTests
+from .test_tzinfo import TzinfoTests
diff --git a/tests/modeltests/validation/__init__.py b/tests/validation/__init__.py
similarity index 100%
rename from tests/modeltests/validation/__init__.py
rename to tests/validation/__init__.py
diff --git a/tests/modeltests/validation/models.py b/tests/validation/models.py
similarity index 100%
rename from tests/modeltests/validation/models.py
rename to tests/validation/models.py
diff --git a/tests/modeltests/validation/test_custom_messages.py b/tests/validation/test_custom_messages.py
similarity index 100%
rename from tests/modeltests/validation/test_custom_messages.py
rename to tests/validation/test_custom_messages.py
diff --git a/tests/modeltests/validation/test_error_messages.py b/tests/validation/test_error_messages.py
similarity index 100%
rename from tests/modeltests/validation/test_error_messages.py
rename to tests/validation/test_error_messages.py
diff --git a/tests/modeltests/validation/test_unique.py b/tests/validation/test_unique.py
similarity index 100%
rename from tests/modeltests/validation/test_unique.py
rename to tests/validation/test_unique.py
diff --git a/tests/modeltests/validation/validators.py b/tests/validation/test_validators.py
similarity index 100%
rename from tests/modeltests/validation/validators.py
rename to tests/validation/test_validators.py
diff --git a/tests/modeltests/validation/tests.py b/tests/validation/tests.py
similarity index 98%
rename from tests/modeltests/validation/tests.py
rename to tests/validation/tests.py
index 58b7b94e7f..ead1b57981 100644
--- a/tests/modeltests/validation/tests.py
+++ b/tests/validation/tests.py
@@ -12,7 +12,7 @@ from .models import (Author, Article, ModelToValidate,
 from .test_custom_messages import CustomMessagesTest
 from .test_error_messages import ValidationMessagesTest
 from .test_unique import GetUniqueCheckTests, PerformUniqueChecksTest
-from .validators import TestModelsWithValidators
+from .test_validators import TestModelsWithValidators
 
 
 class BaseModelValidationTests(ValidationTestCase):
@@ -55,7 +55,7 @@ class BaseModelValidationTests(ValidationTestCase):
 
     def test_wrong_url_value_raises_error(self):
         mtv = ModelToValidate(number=10, name='Some Name', url='not a url')
-        self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', ['Enter a valid value.'])
+        self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', ['Enter a valid URL.'])
 
     def test_text_greater_that_charfields_max_length_raises_erros(self):
         mtv = ModelToValidate(number=10, name='Some Name'*100)
diff --git a/tests/regressiontests/modeladmin/__init__.py b/tests/validators/__init__.py
similarity index 100%
rename from tests/regressiontests/modeladmin/__init__.py
rename to tests/validators/__init__.py
diff --git a/tests/regressiontests/multiple_database/__init__.py b/tests/validators/models.py
similarity index 100%
rename from tests/regressiontests/multiple_database/__init__.py
rename to tests/validators/models.py
diff --git a/tests/modeltests/validators/tests.py b/tests/validators/tests.py
similarity index 98%
rename from tests/modeltests/validators/tests.py
rename to tests/validators/tests.py
index 0174a606df..6b46c53cc3 100644
--- a/tests/modeltests/validators/tests.py
+++ b/tests/validators/tests.py
@@ -29,6 +29,9 @@ TEST_DATA = (
     (validate_email, 'example@valid-----hyphens.com', None),
     (validate_email, 'example@valid-with-hyphens.com', None),
     (validate_email, 'test@domain.with.idn.tld.उदाहरण.परीक्षा', None),
+    (validate_email, 'email@localhost', None),
+    (EmailValidator(whitelist=['localdomain']), 'email@localdomain', None),
+    (validate_email, '"test@test"@example.com', None),
 
     (validate_email, None, ValidationError),
     (validate_email, '', ValidationError),
diff --git a/tests/regressiontests/nested_foreign_keys/__init__.py b/tests/version/__init__.py
similarity index 100%
rename from tests/regressiontests/nested_foreign_keys/__init__.py
rename to tests/version/__init__.py
diff --git a/tests/regressiontests/null_fk/__init__.py b/tests/version/models.py
similarity index 100%
rename from tests/regressiontests/null_fk/__init__.py
rename to tests/version/models.py
diff --git a/tests/regressiontests/version/tests.py b/tests/version/tests.py
similarity index 90%
rename from tests/regressiontests/version/tests.py
rename to tests/version/tests.py
index 9b849ee4ba..64621a5cb6 100644
--- a/tests/regressiontests/version/tests.py
+++ b/tests/version/tests.py
@@ -1,6 +1,7 @@
 import re
 
 from django import get_version
+from django.utils import six
 from django.utils.unittest import TestCase
 
 class VersionTests(TestCase):
@@ -10,7 +11,7 @@ class VersionTests(TestCase):
         # This will return a different result when it's run within or outside
         # of a git clone: 1.4.devYYYYMMDDHHMMSS or 1.4.
         ver_string = get_version(ver_tuple)
-        self.assertRegexpMatches(ver_string, r'1\.4(\.dev\d+)?')
+        six.assertRegex(self, ver_string, r'1\.4(\.dev\d+)?')
 
     def test_releases(self):
         tuples_to_strings = (
diff --git a/tests/regressiontests/views/__init__.py b/tests/view_tests/__init__.py
similarity index 100%
rename from tests/regressiontests/views/__init__.py
rename to tests/view_tests/__init__.py
diff --git a/tests/regressiontests/views/app0/__init__.py b/tests/view_tests/app0/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app0/__init__.py
rename to tests/view_tests/app0/__init__.py
diff --git a/tests/regressiontests/views/app0/locale/en/LC_MESSAGES/djangojs.mo b/tests/view_tests/app0/locale/en/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app0/locale/en/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/app0/locale/en/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app0/locale/en/LC_MESSAGES/djangojs.po b/tests/view_tests/app0/locale/en/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app0/locale/en/LC_MESSAGES/djangojs.po
rename to tests/view_tests/app0/locale/en/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/app1/__init__.py b/tests/view_tests/app1/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app1/__init__.py
rename to tests/view_tests/app1/__init__.py
diff --git a/tests/regressiontests/views/app1/locale/fr/LC_MESSAGES/djangojs.mo b/tests/view_tests/app1/locale/fr/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app1/locale/fr/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/app1/locale/fr/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app1/locale/fr/LC_MESSAGES/djangojs.po b/tests/view_tests/app1/locale/fr/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app1/locale/fr/LC_MESSAGES/djangojs.po
rename to tests/view_tests/app1/locale/fr/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/app2/__init__.py b/tests/view_tests/app2/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app2/__init__.py
rename to tests/view_tests/app2/__init__.py
diff --git a/tests/regressiontests/views/app2/locale/fr/LC_MESSAGES/djangojs.mo b/tests/view_tests/app2/locale/fr/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app2/locale/fr/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/app2/locale/fr/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app2/locale/fr/LC_MESSAGES/djangojs.po b/tests/view_tests/app2/locale/fr/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app2/locale/fr/LC_MESSAGES/djangojs.po
rename to tests/view_tests/app2/locale/fr/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/app3/__init__.py b/tests/view_tests/app3/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app3/__init__.py
rename to tests/view_tests/app3/__init__.py
diff --git a/tests/regressiontests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.mo b/tests/view_tests/app3/locale/es_AR/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/app3/locale/es_AR/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.po b/tests/view_tests/app3/locale/es_AR/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app3/locale/es_AR/LC_MESSAGES/djangojs.po
rename to tests/view_tests/app3/locale/es_AR/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/app4/__init__.py b/tests/view_tests/app4/__init__.py
similarity index 100%
rename from tests/regressiontests/views/app4/__init__.py
rename to tests/view_tests/app4/__init__.py
diff --git a/tests/regressiontests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.mo b/tests/view_tests/app4/locale/es_AR/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/app4/locale/es_AR/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.po b/tests/view_tests/app4/locale/es_AR/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/app4/locale/es_AR/LC_MESSAGES/djangojs.po
rename to tests/view_tests/app4/locale/es_AR/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/fixtures/testdata.json b/tests/view_tests/fixtures/testdata.json
similarity index 83%
rename from tests/regressiontests/views/fixtures/testdata.json
rename to tests/view_tests/fixtures/testdata.json
index ab68407ab6..8663328c9e 100644
--- a/tests/regressiontests/views/fixtures/testdata.json
+++ b/tests/view_tests/fixtures/testdata.json
@@ -19,44 +19,44 @@
     },
     {
         "pk": 1,
-        "model": "views.author",
+        "model": "view_tests.author",
         "fields": {
             "name": "Boris"
         }
     },
     {
         "pk": 1,
-        "model": "views.article",
+        "model": "view_tests.article",
         "fields": {
             "author": 1,
             "title": "Old Article",
             "slug": "old_article",
             "date_created": "2001-01-01 21:22:23"
         }
-    }, 
+    },
     {
-        "pk": 2, 
-        "model": "views.article", 
+        "pk": 2,
+        "model": "view_tests.article",
         "fields": {
-            "author": 1, 
+            "author": 1,
             "title": "Current Article",
             "slug": "current_article",
             "date_created": "2007-09-17 21:22:23"
         }
-    }, 
+    },
     {
-        "pk": 3, 
-        "model": "views.article", 
+        "pk": 3,
+        "model": "view_tests.article",
         "fields": {
-            "author": 1, 
+            "author": 1,
             "title": "Future Article",
             "slug": "future_article",
             "date_created": "3000-01-01 21:22:23"
         }
-    }, 
+    },
 	{
         "pk": 1,
-        "model": "views.urlarticle",
+        "model": "view_tests.urlarticle",
         "fields": {
             "author": 1,
             "title": "Old Article",
diff --git a/tests/regressiontests/views/generic_urls.py b/tests/view_tests/generic_urls.py
similarity index 86%
rename from tests/regressiontests/views/generic_urls.py
rename to tests/view_tests/generic_urls.py
index 0f214d12d5..c3ac1fcafa 100644
--- a/tests/regressiontests/views/generic_urls.py
+++ b/tests/view_tests/generic_urls.py
@@ -32,8 +32,8 @@ urlpatterns = patterns('',
     (r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
 
     # Special URLs for particular regression cases.
-    url('^中文/$', 'regressiontests.views.views.redirect'),
-    url('^中文/target/$', 'regressiontests.views.views.index_page'),
+    url('^中文/$', 'view_tests.views.redirect'),
+    url('^中文/target/$', 'view_tests.views.index_page'),
 )
 
 # rediriects, both temporary and permanent, with non-ASCII targets
@@ -44,10 +44,10 @@ urlpatterns += patterns('',
         url='/中文/target/', permanent=True)),
 )
 
-urlpatterns += patterns('regressiontests.views.views',
+urlpatterns += patterns('view_tests.views',
     (r'^shortcuts/render_to_response/$', 'render_to_response_view'),
     (r'^shortcuts/render_to_response/request_context/$', 'render_to_response_view_with_request_context'),
-    (r'^shortcuts/render_to_response/mimetype/$', 'render_to_response_view_with_mimetype'),
+    (r'^shortcuts/render_to_response/content_type/$', 'render_to_response_view_with_content_type'),
     (r'^shortcuts/render/$', 'render_view'),
     (r'^shortcuts/render/base_context/$', 'render_view_with_base_context'),
     (r'^shortcuts/render/content_type/$', 'render_view_with_content_type'),
diff --git a/tests/regressiontests/views/locale/de/LC_MESSAGES/djangojs.mo b/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/locale/de/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/locale/de/LC_MESSAGES/djangojs.po b/tests/view_tests/locale/de/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/locale/de/LC_MESSAGES/djangojs.po
rename to tests/view_tests/locale/de/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/locale/es/LC_MESSAGES/djangojs.mo b/tests/view_tests/locale/es/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/locale/es/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/locale/es/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/locale/es/LC_MESSAGES/djangojs.po b/tests/view_tests/locale/es/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/locale/es/LC_MESSAGES/djangojs.po
rename to tests/view_tests/locale/es/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/locale/fr/LC_MESSAGES/djangojs.mo b/tests/view_tests/locale/fr/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/locale/fr/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/locale/fr/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/locale/fr/LC_MESSAGES/djangojs.po b/tests/view_tests/locale/fr/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/locale/fr/LC_MESSAGES/djangojs.po
rename to tests/view_tests/locale/fr/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/locale/ru/LC_MESSAGES/djangojs.mo b/tests/view_tests/locale/ru/LC_MESSAGES/djangojs.mo
similarity index 100%
rename from tests/regressiontests/views/locale/ru/LC_MESSAGES/djangojs.mo
rename to tests/view_tests/locale/ru/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/views/locale/ru/LC_MESSAGES/djangojs.po b/tests/view_tests/locale/ru/LC_MESSAGES/djangojs.po
similarity index 100%
rename from tests/regressiontests/views/locale/ru/LC_MESSAGES/djangojs.po
rename to tests/view_tests/locale/ru/LC_MESSAGES/djangojs.po
diff --git a/tests/regressiontests/views/media/file.txt b/tests/view_tests/media/file.txt
similarity index 100%
rename from tests/regressiontests/views/media/file.txt
rename to tests/view_tests/media/file.txt
diff --git a/tests/regressiontests/views/media/file.txt.gz b/tests/view_tests/media/file.txt.gz
similarity index 100%
rename from tests/regressiontests/views/media/file.txt.gz
rename to tests/view_tests/media/file.txt.gz
diff --git a/tests/regressiontests/views/media/file.unknown b/tests/view_tests/media/file.unknown
similarity index 100%
rename from tests/regressiontests/views/media/file.unknown
rename to tests/view_tests/media/file.unknown
diff --git a/tests/regressiontests/views/models.py b/tests/view_tests/models.py
similarity index 100%
rename from tests/regressiontests/views/models.py
rename to tests/view_tests/models.py
diff --git a/tests/regressiontests/views/templates/debug/render_test.html b/tests/view_tests/templates/debug/render_test.html
similarity index 100%
rename from tests/regressiontests/views/templates/debug/render_test.html
rename to tests/view_tests/templates/debug/render_test.html
diff --git a/tests/regressiontests/views/templates/debug/template_exception.html b/tests/view_tests/templates/debug/template_exception.html
similarity index 100%
rename from tests/regressiontests/views/templates/debug/template_exception.html
rename to tests/view_tests/templates/debug/template_exception.html
diff --git a/tests/regressiontests/views/templates/jsi18n.html b/tests/view_tests/templates/jsi18n.html
similarity index 100%
rename from tests/regressiontests/views/templates/jsi18n.html
rename to tests/view_tests/templates/jsi18n.html
diff --git a/tests/regressiontests/null_fk_ordering/__init__.py b/tests/view_tests/templatetags/__init__.py
similarity index 100%
rename from tests/regressiontests/null_fk_ordering/__init__.py
rename to tests/view_tests/templatetags/__init__.py
diff --git a/tests/regressiontests/views/templatetags/debugtags.py b/tests/view_tests/templatetags/debugtags.py
similarity index 100%
rename from tests/regressiontests/views/templatetags/debugtags.py
rename to tests/view_tests/templatetags/debugtags.py
diff --git a/tests/view_tests/tests/__init__.py b/tests/view_tests/tests/__init__.py
new file mode 100644
index 0000000000..bfb2ed7376
--- /dev/null
+++ b/tests/view_tests/tests/__init__.py
@@ -0,0 +1,10 @@
+from __future__ import absolute_import
+
+from .test_debug import (DebugViewTests, ExceptionReporterTests,
+    ExceptionReporterTests, PlainTextReportTests, ExceptionReporterFilterTests,
+    AjaxResponseExceptionReporterFilter)
+from .test_defaults import DefaultsTests
+from .test_i18n import JsI18NTests, I18NTests, JsI18NTestsMultiPackage, JavascriptI18nTests
+from .test_shortcuts import ShortcutTests
+from .test_specials import URLHandling
+from .test_static import StaticHelperTest, StaticUtilsTests, StaticTests
diff --git a/tests/regressiontests/views/tests/debug.py b/tests/view_tests/tests/test_debug.py
similarity index 86%
rename from tests/regressiontests/views/tests/debug.py
rename to tests/view_tests/tests/test_debug.py
index 4fdaad5010..b44cd88abe 100644
--- a/tests/regressiontests/views/tests/debug.py
+++ b/tests/view_tests/tests/test_debug.py
@@ -7,7 +7,6 @@ import inspect
 import os
 import sys
 
-from django.conf import settings
 from django.core import mail
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.urlresolvers import reverse
@@ -19,12 +18,13 @@ from django.views.debug import ExceptionReporter
 
 from .. import BrokenException, except_args
 from ..views import (sensitive_view, non_sensitive_view, paranoid_view,
-    custom_exception_reporter_filter_view, sensitive_method_view)
+    custom_exception_reporter_filter_view, sensitive_method_view,
+    sensitive_args_function_caller, sensitive_kwargs_function_caller)
 
 
 @override_settings(DEBUG=True, TEMPLATE_DEBUG=True)
 class DebugViewTests(TestCase):
-    urls = "regressiontests.views.urls"
+    urls = "view_tests.urls"
 
     def test_files(self):
         response = self.client.get('/raises/')
@@ -306,17 +306,28 @@ class ExceptionReportTestMixin(object):
             response = view(request)
             self.assertEqual(len(mail.outbox), 1)
             email = mail.outbox[0]
+
             # Frames vars are never shown in plain text email reports.
-            body = force_text(email.body)
-            self.assertNotIn('cooked_eggs', body)
-            self.assertNotIn('scrambled', body)
-            self.assertNotIn('sauce', body)
-            self.assertNotIn('worcestershire', body)
+            body_plain = force_text(email.body)
+            self.assertNotIn('cooked_eggs', body_plain)
+            self.assertNotIn('scrambled', body_plain)
+            self.assertNotIn('sauce', body_plain)
+            self.assertNotIn('worcestershire', body_plain)
+
+            # Frames vars are shown in html email reports.
+            body_html = force_text(email.alternatives[0][0])
+            self.assertIn('cooked_eggs', body_html)
+            self.assertIn('scrambled', body_html)
+            self.assertIn('sauce', body_html)
+            self.assertIn('worcestershire', body_html)
+
             if check_for_POST_params:
                 for k, v in self.breakfast_data.items():
                     # All POST parameters are shown.
-                    self.assertIn(k, body)
-                    self.assertIn(v, body)
+                    self.assertIn(k, body_plain)
+                    self.assertIn(v, body_plain)
+                    self.assertIn(k, body_html)
+                    self.assertIn(v, body_html)
 
     def verify_safe_email(self, view, check_for_POST_params=True):
         """
@@ -328,22 +339,35 @@ class ExceptionReportTestMixin(object):
             response = view(request)
             self.assertEqual(len(mail.outbox), 1)
             email = mail.outbox[0]
+
             # Frames vars are never shown in plain text email reports.
-            body = force_text(email.body)
-            self.assertNotIn('cooked_eggs', body)
-            self.assertNotIn('scrambled', body)
-            self.assertNotIn('sauce', body)
-            self.assertNotIn('worcestershire', body)
+            body_plain = force_text(email.body)
+            self.assertNotIn('cooked_eggs', body_plain)
+            self.assertNotIn('scrambled', body_plain)
+            self.assertNotIn('sauce', body_plain)
+            self.assertNotIn('worcestershire', body_plain)
+
+            # Frames vars are shown in html email reports.
+            body_html = force_text(email.alternatives[0][0])
+            self.assertIn('cooked_eggs', body_html)
+            self.assertIn('scrambled', body_html)
+            self.assertIn('sauce', body_html)
+            self.assertNotIn('worcestershire', body_html)
+
             if check_for_POST_params:
                 for k, v in self.breakfast_data.items():
                     # All POST parameters' names are shown.
-                    self.assertIn(k, body)
+                    self.assertIn(k, body_plain)
                 # Non-sensitive POST parameters' values are shown.
-                self.assertIn('baked-beans-value', body)
-                self.assertIn('hash-brown-value', body)
+                self.assertIn('baked-beans-value', body_plain)
+                self.assertIn('hash-brown-value', body_plain)
+                self.assertIn('baked-beans-value', body_html)
+                self.assertIn('hash-brown-value', body_html)
                 # Sensitive POST parameters' values are not shown.
-                self.assertNotIn('sausage-value', body)
-                self.assertNotIn('bacon-value', body)
+                self.assertNotIn('sausage-value', body_plain)
+                self.assertNotIn('bacon-value', body_plain)
+                self.assertNotIn('sausage-value', body_html)
+                self.assertNotIn('bacon-value', body_html)
 
     def verify_paranoid_email(self, view):
         """
@@ -445,6 +469,36 @@ class ExceptionReporterFilterTests(TestCase, ExceptionReportTestMixin):
             self.verify_safe_email(sensitive_method_view,
                                    check_for_POST_params=False)
 
+    def test_sensitive_function_arguments(self):
+        """
+        Ensure that sensitive variables don't leak in the sensitive_variables
+        decorator's frame, when those variables are passed as arguments to the
+        decorated function.
+        Refs #19453.
+        """
+        with self.settings(DEBUG=True):
+            self.verify_unsafe_response(sensitive_args_function_caller)
+            self.verify_unsafe_email(sensitive_args_function_caller)
+
+        with self.settings(DEBUG=False):
+            self.verify_safe_response(sensitive_args_function_caller, check_for_POST_params=False)
+            self.verify_safe_email(sensitive_args_function_caller, check_for_POST_params=False)
+
+    def test_sensitive_function_keyword_arguments(self):
+        """
+        Ensure that sensitive variables don't leak in the sensitive_variables
+        decorator's frame, when those variables are passed as keyword arguments
+        to the decorated function.
+        Refs #19453.
+        """
+        with self.settings(DEBUG=True):
+            self.verify_unsafe_response(sensitive_kwargs_function_caller)
+            self.verify_unsafe_email(sensitive_kwargs_function_caller)
+
+        with self.settings(DEBUG=False):
+            self.verify_safe_response(sensitive_kwargs_function_caller, check_for_POST_params=False)
+            self.verify_safe_email(sensitive_kwargs_function_caller, check_for_POST_params=False)
+
 
 class AjaxResponseExceptionReporterFilter(TestCase, ExceptionReportTestMixin):
     """
diff --git a/tests/regressiontests/views/tests/defaults.py b/tests/view_tests/tests/test_defaults.py
similarity index 58%
rename from tests/regressiontests/views/tests/defaults.py
rename to tests/view_tests/tests/test_defaults.py
index 3ca7f79136..5efd338d34 100644
--- a/tests/regressiontests/views/tests/defaults.py
+++ b/tests/view_tests/tests/test_defaults.py
@@ -13,43 +13,6 @@ class DefaultsTests(TestCase):
     non_existing_urls = ['/views/non_existing_url/', # this is in urls.py
                          '/views/other_non_existing_url/'] # this NOT in urls.py
 
-    def test_shortcut_with_absolute_url(self):
-        "Can view a shortcut for an Author object that has a get_absolute_url method"
-        for obj in Author.objects.all():
-            short_url = '/views/shortcut/%s/%s/' % (ContentType.objects.get_for_model(Author).id, obj.pk)
-            response = self.client.get(short_url)
-            self.assertRedirects(response, 'http://testserver%s' % obj.get_absolute_url(),
-                                 status_code=302, target_status_code=404)
-
-    def test_shortcut_no_absolute_url(self):
-        "Shortcuts for an object that has no get_absolute_url method raises 404"
-        for obj in Article.objects.all():
-            short_url = '/views/shortcut/%s/%s/' % (ContentType.objects.get_for_model(Article).id, obj.pk)
-            response = self.client.get(short_url)
-            self.assertEqual(response.status_code, 404)
-
-    def test_wrong_type_pk(self):
-        short_url = '/views/shortcut/%s/%s/' % (ContentType.objects.get_for_model(Author).id, 'nobody/expects')
-        response = self.client.get(short_url)
-        self.assertEqual(response.status_code, 404)
-
-    def test_shortcut_bad_pk(self):
-        short_url = '/views/shortcut/%s/%s/' % (ContentType.objects.get_for_model(Author).id, '42424242')
-        response = self.client.get(short_url)
-        self.assertEqual(response.status_code, 404)
-
-    def test_nonint_content_type(self):
-        an_author = Author.objects.all()[0]
-        short_url = '/views/shortcut/%s/%s/' % ('spam', an_author.pk)
-        response = self.client.get(short_url)
-        self.assertEqual(response.status_code, 404)
-
-    def test_bad_content_type(self):
-        an_author = Author.objects.all()[0]
-        short_url = '/views/shortcut/%s/%s/' % (42424242, an_author.pk)
-        response = self.client.get(short_url)
-        self.assertEqual(response.status_code, 404)
-
     def test_page_not_found(self):
         "A 404 status is returned by the page_not_found view"
         for url in self.non_existing_urls:
diff --git a/tests/regressiontests/views/tests/i18n.py b/tests/view_tests/tests/test_i18n.py
similarity index 91%
rename from tests/regressiontests/views/tests/i18n.py
rename to tests/view_tests/tests/test_i18n.py
index b1dc8808a1..5a3bdd1062 100644
--- a/tests/regressiontests/views/tests/i18n.py
+++ b/tests/view_tests/tests/test_i18n.py
@@ -2,6 +2,7 @@
 from __future__ import absolute_import
 
 import gettext
+import os
 from os import path
 
 from django.conf import settings
@@ -44,7 +45,7 @@ class I18NTests(TestCase):
         lang_code, lang_name = settings.LANGUAGES[0]
         post_data = dict(language=lang_code, next='//unsafe/redirection/')
         response = self.client.post('/views/i18n/setlang/', data=post_data)
-        self.assertEqual(response['Location'], 'http://testserver/')
+        self.assertEqual(response.url, 'http://testserver/')
         self.assertEqual(self.client.session['django_language'], lang_code)
 
     def test_setlang_reversal(self):
@@ -60,13 +61,13 @@ class I18NTests(TestCase):
                 else:
                     trans_txt = catalog.ugettext('this is to be translated')
                 response = self.client.get('/views/jsi18n/')
-                # in response content must to be a line like that:
-                # catalog['this is to be translated'] = 'same_that_trans_txt'
+                # response content must include a line like:
+                # "this is to be translated": <value of trans_txt Python variable>
                 # javascript_quote is used to be able to check unicode strings
                 self.assertContains(response, javascript_quote(trans_txt), 1)
                 if lang_code == 'fr':
                     # Message with context (msgctxt)
-                    self.assertContains(response, "['month name\x04May'] = 'mai';", 1)
+                    self.assertContains(response, r'"month name\u0004May": "mai"', 1)
 
 
 class JsI18NTests(TestCase):
@@ -118,7 +119,7 @@ class JsI18NTests(TestCase):
         available. The Javascript i18n view must return a NON empty language catalog
         with the proper English translations. See #13726 for more details.
         """
-        extended_apps = list(settings.INSTALLED_APPS) + ['regressiontests.views.app0']
+        extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app0']
         with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps):
             with override('en-us'):
                 response = self.client.get('/views/jsi18n_english_translation/')
@@ -148,7 +149,7 @@ class JsI18NTestsMultiPackage(TestCase):
         translations of multiple Python packages is requested. See #13388,
         #3594 and #13514 for more details.
         """
-        extended_apps = list(settings.INSTALLED_APPS) + ['regressiontests.views.app1', 'regressiontests.views.app2']
+        extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app1', 'view_tests.app2']
         with self.settings(LANGUAGE_CODE='en-us', INSTALLED_APPS=extended_apps):
             with override('fr'):
                 response = self.client.get('/views/jsi18n_multi_packages1/')
@@ -159,7 +160,7 @@ class JsI18NTestsMultiPackage(TestCase):
         Similar to above but with neither default or requested language being
         English.
         """
-        extended_apps = list(settings.INSTALLED_APPS) + ['regressiontests.views.app3', 'regressiontests.views.app4']
+        extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app3', 'view_tests.app4']
         with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps):
             with override('es-ar'):
                 response = self.client.get('/views/jsi18n_multi_packages2/')
@@ -176,9 +177,13 @@ class JsI18NTestsMultiPackage(TestCase):
                     javascript_quote('este texto de app3 debe ser traducido'))
 
 
+skip_selenium = not os.environ.get('DJANGO_SELENIUM_TESTS', False)
+
+
+@unittest.skipIf(skip_selenium, 'Selenium tests not requested')
 @unittest.skipUnless(firefox, 'Selenium not installed')
 class JavascriptI18nTests(LiveServerTestCase):
-    urls = 'regressiontests.views.urls'
+    urls = 'view_tests.urls'
 
     @classmethod
     def setUpClass(cls):
@@ -192,7 +197,7 @@ class JavascriptI18nTests(LiveServerTestCase):
 
     @override_settings(LANGUAGE_CODE='de')
     def test_javascript_gettext(self):
-        extended_apps = list(settings.INSTALLED_APPS) + ['regressiontests.views']
+        extended_apps = list(settings.INSTALLED_APPS) + ['view_tests']
         with self.settings(INSTALLED_APPS=extended_apps):
             self.selenium.get('%s%s' % (self.live_server_url, '/jsi18n_template/'))
 
@@ -210,7 +215,7 @@ class JavascriptI18nTests(LiveServerTestCase):
             self.assertEqual(elem.text, "455 Resultate")
 
     def test_escaping(self):
-        extended_apps = list(settings.INSTALLED_APPS) + ['regressiontests.views']
+        extended_apps = list(settings.INSTALLED_APPS) + ['view_tests']
         with self.settings(INSTALLED_APPS=extended_apps):
             response = self.client.get('%s%s' % (self.live_server_url, '/jsi18n_admin/'))
             self.assertContains(response, '\\x04')
diff --git a/tests/regressiontests/views/tests/shortcuts.py b/tests/view_tests/tests/test_shortcuts.py
similarity index 96%
rename from tests/regressiontests/views/tests/shortcuts.py
rename to tests/view_tests/tests/test_shortcuts.py
index 62bd82f4a7..74c556f41a 100644
--- a/tests/regressiontests/views/tests/shortcuts.py
+++ b/tests/view_tests/tests/test_shortcuts.py
@@ -7,7 +7,7 @@ from django.test.utils import override_settings
     STATIC_URL='/path/to/static/media/',
 )
 class ShortcutTests(TestCase):
-    urls = 'regressiontests.views.generic_urls'
+    urls = 'view_tests.generic_urls'
 
     def test_render_to_response(self):
         response = self.client.get('/shortcuts/render_to_response/')
@@ -21,8 +21,8 @@ class ShortcutTests(TestCase):
         self.assertEqual(response.content, b'FOO.BAR../path/to/static/media/\n')
         self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
 
-    def test_render_to_response_with_mimetype(self):
-        response = self.client.get('/shortcuts/render_to_response/mimetype/')
+    def test_render_to_response_with_content_type(self):
+        response = self.client.get('/shortcuts/render_to_response/content_type/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.content, b'FOO.BAR..\n')
         self.assertEqual(response['Content-Type'], 'application/x-rendertest')
diff --git a/tests/regressiontests/views/tests/specials.py b/tests/view_tests/tests/test_specials.py
similarity index 96%
rename from tests/regressiontests/views/tests/specials.py
rename to tests/view_tests/tests/test_specials.py
index 7d652841f8..fc1dd98c0e 100644
--- a/tests/regressiontests/views/tests/specials.py
+++ b/tests/view_tests/tests/test_specials.py
@@ -8,7 +8,7 @@ class URLHandling(TestCase):
     """
     Tests for URL handling in views and responses.
     """
-    urls = 'regressiontests.views.generic_urls'
+    urls = 'view_tests.generic_urls'
     redirect_target = "/%E4%B8%AD%E6%96%87/target/"
 
     def test_combining_redirect(self):
diff --git a/tests/regressiontests/views/tests/static.py b/tests/view_tests/tests/test_static.py
similarity index 96%
rename from tests/regressiontests/views/tests/static.py
rename to tests/view_tests/tests/test_static.py
index 8b8ef8ba9b..bdd9fbfc0b 100644
--- a/tests/regressiontests/views/tests/static.py
+++ b/tests/view_tests/tests/test_static.py
@@ -27,7 +27,6 @@ class StaticTests(TestCase):
         for filename in media_files:
             response = self.client.get('/views/%s/%s' % (self.prefix, filename))
             response_content = b''.join(response)
-            response.close()
             file_path = path.join(media_dir, filename)
             with open(file_path, 'rb') as fp:
                 self.assertEqual(fp.read(), response_content)
@@ -36,14 +35,12 @@ class StaticTests(TestCase):
 
     def test_unknown_mime_type(self):
         response = self.client.get('/views/%s/file.unknown' % self.prefix)
-        response.close()
         self.assertEqual('application/octet-stream', response['Content-Type'])
 
     def test_copes_with_empty_path_component(self):
         file_name = 'file.txt'
         response = self.client.get('/views/%s//%s' % (self.prefix, file_name))
         response_content = b''.join(response)
-        response.close()
         with open(path.join(media_dir, file_name), 'rb') as fp:
             self.assertEqual(fp.read(), response_content)
 
@@ -52,7 +49,6 @@ class StaticTests(TestCase):
         response = self.client.get('/views/%s/%s' % (self.prefix, file_name),
             HTTP_IF_MODIFIED_SINCE='Thu, 1 Jan 1970 00:00:00 GMT')
         response_content = b''.join(response)
-        response.close()
         with open(path.join(media_dir, file_name), 'rb') as fp:
             self.assertEqual(fp.read(), response_content)
 
@@ -77,7 +73,6 @@ class StaticTests(TestCase):
         response = self.client.get('/views/%s/%s' % (self.prefix, file_name),
                                    HTTP_IF_MODIFIED_SINCE=invalid_date)
         response_content = b''.join(response)
-        response.close()
         with open(path.join(media_dir, file_name), 'rb') as fp:
             self.assertEqual(fp.read(), response_content)
         self.assertEqual(len(response_content),
@@ -94,7 +89,6 @@ class StaticTests(TestCase):
         response = self.client.get('/views/%s/%s' % (self.prefix, file_name),
                                    HTTP_IF_MODIFIED_SINCE=invalid_date)
         response_content = b''.join(response)
-        response.close()
         with open(path.join(media_dir, file_name), 'rb') as fp:
             self.assertEqual(fp.read(), response_content)
         self.assertEqual(len(response_content),
diff --git a/tests/regressiontests/views/urls.py b/tests/view_tests/urls.py
similarity index 82%
rename from tests/regressiontests/views/urls.py
rename to tests/view_tests/urls.py
index 2c06557ae9..52e2eb474e 100644
--- a/tests/regressiontests/views/urls.py
+++ b/tests/view_tests/urls.py
@@ -15,34 +15,33 @@ locale_dir = path.join(base_dir, 'locale')
 
 js_info_dict = {
     'domain': 'djangojs',
-    'packages': ('regressiontests.views',),
+    'packages': ('view_tests',),
 }
 
 js_info_dict_english_translation = {
     'domain': 'djangojs',
-    'packages': ('regressiontests.views.app0',),
+    'packages': ('view_tests.app0',),
 }
 
 js_info_dict_multi_packages1 = {
     'domain': 'djangojs',
-    'packages': ('regressiontests.views.app1', 'regressiontests.views.app2'),
+    'packages': ('view_tests.app1', 'view_tests.app2'),
 }
 
 js_info_dict_multi_packages2 = {
     'domain': 'djangojs',
-    'packages': ('regressiontests.views.app3', 'regressiontests.views.app4'),
+    'packages': ('view_tests.app3', 'view_tests.app4'),
 }
 
 js_info_dict_admin = {
     'domain': 'djangojs',
-    'packages': ('django.contrib.admin', 'regressiontests.views'),
+    'packages': ('django.contrib.admin', 'view_tests'),
 }
 
 urlpatterns = patterns('',
     (r'^$', views.index_page),
 
     # Default views
-    (r'^shortcut/(\d+)/(.*)/$', 'django.views.defaults.shortcut'),
     (r'^non_existing_url/', 'django.views.defaults.page_not_found'),
     (r'^server_error/', 'django.views.defaults.server_error'),
 
@@ -64,7 +63,7 @@ urlpatterns = patterns('',
     (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': media_dir}),
 )
 
-urlpatterns += patterns('regressiontests.views.views',
+urlpatterns += patterns('view_tests.views',
     url(r'view_exception/(?P<n>\d+)/$', 'view_exception', name='view_exception'),
     url(r'template_exception/(?P<n>\d+)/$', 'template_exception', name='template_exception'),
     url(r'^raises_template_does_not_exist/$', 'raises_template_does_not_exist', name='raises_template_does_not_exist'),
diff --git a/tests/regressiontests/views/views.py b/tests/view_tests/views.py
similarity index 84%
rename from tests/regressiontests/views/views.py
rename to tests/view_tests/views.py
index ed9d61144a..50ad98ac2d 100644
--- a/tests/regressiontests/views/views.py
+++ b/tests/view_tests/views.py
@@ -68,11 +68,11 @@ def render_to_response_view_with_request_context(request):
         'bar': 'BAR',
     }, context_instance=RequestContext(request))
 
-def render_to_response_view_with_mimetype(request):
+def render_to_response_view_with_content_type(request):
     return render_to_response('debug/render_test.html', {
         'foo': 'FOO',
         'bar': 'BAR',
-    }, mimetype='application/x-rendertest')
+    }, content_type='application/x-rendertest')
 
 def render_view(request):
     return render(request, 'debug/render_test.html', {
@@ -132,6 +132,7 @@ def send_log(request, exc_info):
         ][0]
     orig_filters = admin_email_handler.filters
     admin_email_handler.filters = []
+    admin_email_handler.include_html = True
     logger.error('Internal Server Error: %s', request.path,
         exc_info=exc_info,
         extra={
@@ -184,6 +185,38 @@ def paranoid_view(request):
         send_log(request, exc_info)
         return technical_500_response(request, *exc_info)
 
+def sensitive_args_function_caller(request):
+    try:
+        sensitive_args_function(''.join(['w', 'o', 'r', 'c', 'e', 's', 't', 'e', 'r', 's', 'h', 'i', 'r', 'e']))
+    except Exception:
+        exc_info = sys.exc_info()
+        send_log(request, exc_info)
+        return technical_500_response(request, *exc_info)
+
+@sensitive_variables('sauce')
+def sensitive_args_function(sauce):
+    # Do not just use plain strings for the variables' values in the code
+    # so that the tests don't return false positives when the function's source
+    # is displayed in the exception report.
+    cooked_eggs = ''.join(['s', 'c', 'r', 'a', 'm', 'b', 'l', 'e', 'd'])
+    raise Exception
+
+def sensitive_kwargs_function_caller(request):
+    try:
+        sensitive_kwargs_function(''.join(['w', 'o', 'r', 'c', 'e', 's', 't', 'e', 'r', 's', 'h', 'i', 'r', 'e']))
+    except Exception:
+        exc_info = sys.exc_info()
+        send_log(request, exc_info)
+        return technical_500_response(request, *exc_info)
+
+@sensitive_variables('sauce')
+def sensitive_kwargs_function(sauce=None):
+    # Do not just use plain strings for the variables' values in the code
+    # so that the tests don't return false positives when the function's source
+    # is displayed in the exception report.
+    cooked_eggs = ''.join(['s', 'c', 'r', 'a', 'm', 'b', 'l', 'e', 'd'])
+    raise Exception
+
 class UnsafeExceptionReporterFilter(SafeExceptionReporterFilter):
     """
     Ignores all the filtering done by its parent class.
@@ -230,4 +263,4 @@ class Klass(object):
             return technical_500_response(request, *exc_info)
 
 def sensitive_method_view(request):
-    return Klass().method(request)
\ No newline at end of file
+    return Klass().method(request)
diff --git a/tests/regressiontests/null_queries/__init__.py b/tests/wsgi/__init__.py
similarity index 100%
rename from tests/regressiontests/null_queries/__init__.py
rename to tests/wsgi/__init__.py
diff --git a/tests/regressiontests/one_to_one_regress/__init__.py b/tests/wsgi/models.py
similarity index 100%
rename from tests/regressiontests/one_to_one_regress/__init__.py
rename to tests/wsgi/models.py
diff --git a/tests/regressiontests/wsgi/tests.py b/tests/wsgi/tests.py
similarity index 80%
rename from tests/regressiontests/wsgi/tests.py
rename to tests/wsgi/tests.py
index 6c1483d2cd..a66258d4eb 100644
--- a/tests/regressiontests/wsgi/tests.py
+++ b/tests/wsgi/tests.py
@@ -2,7 +2,9 @@ from __future__ import unicode_literals
 
 from django.core.exceptions import ImproperlyConfigured
 from django.core.servers.basehttp import get_internal_wsgi_application
+from django.core.signals import request_started
 from django.core.wsgi import get_wsgi_application
+from django.db import close_old_connections
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
@@ -10,7 +12,13 @@ from django.utils import six, unittest
 
 
 class WSGITest(TestCase):
-    urls = "regressiontests.wsgi.urls"
+    urls = "wsgi.urls"
+
+    def setUp(self):
+        request_started.disconnect(close_old_connections)
+
+    def tearDown(self):
+        request_started.connect(close_old_connections)
 
     def test_get_wsgi_application(self):
         """
@@ -44,7 +52,7 @@ class WSGITest(TestCase):
 
 
 class GetInternalWSGIApplicationTest(unittest.TestCase):
-    @override_settings(WSGI_APPLICATION="regressiontests.wsgi.wsgi.application")
+    @override_settings(WSGI_APPLICATION="wsgi.wsgi.application")
     def test_success(self):
         """
         If ``WSGI_APPLICATION`` is a dotted path, the referenced object is
@@ -81,19 +89,19 @@ class GetInternalWSGIApplicationTest(unittest.TestCase):
             basehttp.get_wsgi_application = _orig_get_wsgi_app
 
 
-    @override_settings(WSGI_APPLICATION="regressiontests.wsgi.noexist.app")
+    @override_settings(WSGI_APPLICATION="wsgi.noexist.app")
     def test_bad_module(self):
         with six.assertRaisesRegex(self,
             ImproperlyConfigured,
-            r"^WSGI application 'regressiontests.wsgi.noexist.app' could not be loaded; could not import module 'regressiontests.wsgi.noexist':"):
+            r"^WSGI application 'wsgi.noexist.app' could not be loaded; Error importing.*"):
 
             get_internal_wsgi_application()
 
 
-    @override_settings(WSGI_APPLICATION="regressiontests.wsgi.wsgi.noexist")
+    @override_settings(WSGI_APPLICATION="wsgi.wsgi.noexist")
     def test_bad_name(self):
         with six.assertRaisesRegex(self,
             ImproperlyConfigured,
-            r"^WSGI application 'regressiontests.wsgi.wsgi.noexist' could not be loaded; can't find 'noexist' in module 'regressiontests.wsgi.wsgi':"):
+            r"^WSGI application 'wsgi.wsgi.noexist' could not be loaded; Module.*"):
 
             get_internal_wsgi_application()
diff --git a/tests/regressiontests/wsgi/urls.py b/tests/wsgi/urls.py
similarity index 100%
rename from tests/regressiontests/wsgi/urls.py
rename to tests/wsgi/urls.py
diff --git a/tests/regressiontests/wsgi/wsgi.py b/tests/wsgi/wsgi.py
similarity index 100%
rename from tests/regressiontests/wsgi/wsgi.py
rename to tests/wsgi/wsgi.py